From 1a49f0d164ce94bc3fce227a68aa3796e22347e1 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 9 Mar 2017 18:54:10 -0800
Subject: one role.

---
 view/tpl/install_settings.tpl | 1 -
 1 file changed, 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
index f7a0108a8..62dcbb8b3 100755
--- a/view/tpl/install_settings.tpl
+++ b/view/tpl/install_settings.tpl
@@ -19,7 +19,6 @@
 
 {{include file="field_input.tpl" field=$adminmail}}
 {{include file="field_input.tpl" field=$siteurl}}
-{{include file="field_select.tpl" field=$server_role}}
 
 {{include file="field_select_grouped.tpl" field=$timezone}}
 
-- 
cgit v1.2.3


From 6f3493bb3ca3718d4b69278c96df384c8a4d5811 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 12 Mar 2017 15:50:47 -0700
Subject: db issues

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

(limited to 'view')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 0581989ec..11e107d2a 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -177,7 +177,7 @@
 				<a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-question-circle"></i></a>
 			</li>
 			{{/if}}
-			<li class="">
+			<li class="" id="app-menu">
 				<a href="#" data-toggle="dropdown"><i class="fa fa-bars"></i></a>
 				<ul class="dropdown-menu">
 					{{foreach $navapps as $navapp}}
-- 
cgit v1.2.3


From 41fd72920995cd2844f0262c03685edf45f93723 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 13 Mar 2017 18:40:07 -0700
Subject: remove the unimplemented upload limit site settings

---
 view/tpl/admin_site.tpl | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'view')

diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 0bb3ceb15..1cdb4a56b 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -71,9 +71,6 @@
 	{{include file="field_select.tpl" field=$access_policy}}
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
-	<h3>{{$upload}}</h3>
-	{{include file="field_input.tpl" field=$maximagesize}}
-	
 	<h3>{{$corporate}}</h3>
 	{{include file="field_checkbox.tpl" field=$verify_email}}
 	{{include file="field_checkbox.tpl" field=$feed_contacts}}
-- 
cgit v1.2.3


From a153368814b9753e06ab4731fd2b19a1c394b1b1 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 13 Mar 2017 18:58:23 -0700
Subject: make redbasic compatible with red 5.x

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

(limited to 'view')

diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index 95d5a2001..c76e77cf1 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -5,7 +5,7 @@
  *   * Description: Hubzilla standard theme
  *   * Version: 2.0
  *   * MinVersion: 2.2RC
- *   * MaxVersion: 3.0
+ *   * MaxVersion: 6.0
  *   * Author: Fabrixxm
  *   * Maintainer: Mike Macgirvin
  *   * Maintainer: Mario Vavti
-- 
cgit v1.2.3


From e891380ed571082612859554fb8fa805dc822b1a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 18:42:51 -0700
Subject: dim class was un-themed

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

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c632dbc74..1c185a5d5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1104,7 +1104,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
 .contact-block-content {
 	margin-top: 10px;
 }
-.contact-block-img.archived, .app-deleted {
+.contact-block-img.archived, .app-deleted, .dim {
 	opacity: 0.3;
 	filter:alpha(opacity=30);
 }
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index f15742f78..452e0eeec 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -35,7 +35,7 @@
 						<td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
 						<td class="tools">
 							<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
-							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs{{if ($c.allowcode)}} btn-danger{{/if}}" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
 							<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
 						</td>
 					</tr>
-- 
cgit v1.2.3


From 32a9487ff9901bcd59d65a410becbed832dd2e2f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 18:46:50 -0700
Subject: use dim for the button border also

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

(limited to 'view')

diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index 452e0eeec..f15742f78 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -35,7 +35,7 @@
 						<td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
 						<td class="tools">
 							<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
-							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs{{if ($c.allowcode)}} btn-danger{{/if}}" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
 							<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
 						</td>
 					</tr>
-- 
cgit v1.2.3


From 4afeefb5ce2119541a6d2a0a0b332c7a9a59a2b4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 18 Mar 2017 16:41:43 -0700
Subject: various input filter fixes

---
 view/tpl/wiki.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index ea31c23a3..dbf8b9285 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -107,7 +107,8 @@
 <script>
 	window.wiki_resource_id = '{{$resource_id}}';
 	window.wiki_page_name = '{{$page}}';
-	window.wiki_page_content = `{{$content}}`;
+//	window.wiki_page_content = "{{$content|escape:'javascript'}}";
+	window.wiki_page_content = {{$content}};
 	window.wiki_page_commit = '{{$commit}}';
 
 	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
-- 
cgit v1.2.3


From 7a611c6d47020d227630a96de8026da4dae5f862 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 20 Mar 2017 18:14:50 -0700
Subject: create channel_store_lowlevel() and remove more diaspora stuff from
 core.

---
 view/tpl/profile_vcard.tpl       | 3 ---
 view/tpl/profile_vcard_short.tpl | 4 ----
 2 files changed, 7 deletions(-)

(limited to 'view')

diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 9bd534fd8..c17a7878c 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -49,9 +49,6 @@
 
 	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url">{{$profile.homepage}}</dd></dl>{{/if}}
 
-	{{if $diaspora}}
-	{{include file="diaspora_vcard.tpl"}}
-	{{/if}}
 
 </div>
 <div id="clear"></div>
diff --git a/view/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl
index 0984a4e5f..5d87d52c6 100755
--- a/view/tpl/profile_vcard_short.tpl
+++ b/view/tpl/profile_vcard_short.tpl
@@ -30,10 +30,6 @@
 
 	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}
 
-	{{if $diaspora}}
-	{{include file="diaspora_vcard.tpl"}}
-	{{/if}}
-
 <div id="clear"></div>
 
 {{$chanmenu}}
-- 
cgit v1.2.3


From 35fc7328de3237ef9727e6f729ffe4df4697a421 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 20 Mar 2017 19:41:03 -0700
Subject: even more fine tuning of the markdown purifier - especially when used
 with the wiki

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

(limited to 'view')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index dbf8b9285..2865adec2 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -108,7 +108,7 @@
 	window.wiki_resource_id = '{{$resource_id}}';
 	window.wiki_page_name = '{{$page}}';
 //	window.wiki_page_content = "{{$content|escape:'javascript'}}";
-	window.wiki_page_content = {{$content}};
+	window.wiki_page_content = '{{$content|escape:'quotes'}}';
 	window.wiki_page_commit = '{{$commit}}';
 
 	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
-- 
cgit v1.2.3


From 82631c3413b7fc7025f46cd23c17d3ea292cf16c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 00:40:19 -0700
Subject: more markdown purification

---
 view/tpl/wiki.tpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 2865adec2..c831ab33d 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -107,8 +107,7 @@
 <script>
 	window.wiki_resource_id = '{{$resource_id}}';
 	window.wiki_page_name = '{{$page}}';
-//	window.wiki_page_content = "{{$content|escape:'javascript'}}";
-	window.wiki_page_content = '{{$content|escape:'quotes'}}';
+	window.wiki_page_content = '{{$content|escape:'javascript'}}';
 	window.wiki_page_commit = '{{$commit}}';
 
 	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
-- 
cgit v1.2.3


From bedc39342514a37d311274210f30a4abd14284fa Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 20:11:48 -0700
Subject: begin the process of using the relevant attach directory/path for
 photo albums instead of an album basename which may not be unique. Created an
 'ellipsify()' function to shorten long names and keep the beginning and end
 intact

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

(limited to 'view')

diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index de1105bbc..177fecad5 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,11 +1,11 @@
 <div id="side-bar-photos-albums" class="widget">
 	<h3>{{$title}}</h3>
 	<ul class="nav nav-pills nav-stacked">
-		<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li>
+		<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li>
 		{{if $albums}}
 		{{foreach $albums as $al}}
-		{{if $al.text}}
-		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.text}}</a></li>
+		{{if $al.shorttext}}
+		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.shorttext}}</a></li>
 		{{/if}}
 		{{/foreach}}
 		{{/if}}
-- 
cgit v1.2.3


From c3c1572683be325a2cc8a357125cb98ebd68d11e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 22 Mar 2017 21:40:43 -0700
Subject: allow setting the system email name/address/reply

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

(limited to 'view')

diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 1cdb4a56b..6fd0fd9ce 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -51,6 +51,11 @@
 	{{include file="field_textarea.tpl" field=$banner}}
 	{{include file="field_textarea.tpl" field=$siteinfo}}
 	{{include file="field_textarea.tpl" field=$admininfo}}
+
+    {{include file="field_input.tpl" field=$reply_address}}
+    {{include file="field_input.tpl" field=$from_email}}
+    {{include file="field_input.tpl" field=$from_email_name}}
+
 	{{include file="field_select.tpl" field=$language}}
 	{{include file="field_select.tpl" field=$theme}}
     {{include file="field_select.tpl" field=$theme_mobile}}
-- 
cgit v1.2.3


From ad3a3273660600be7932229a7af0293c1f04e28b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Mar 2017 18:16:40 -0700
Subject: scaling issue with fa-th and fa-bars icons when using
 boostrap-red.css:37 #navbar-collapse-1 i { font-size 1.0rem; }; FF 52.0.1 on
 Win7; 0.9rem and 1.1rem both render much better. 1.1 is a bit large so going
 with 0.9

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

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 69886b141..73f71fe7f 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -35,7 +35,7 @@ nav .badge {
 
 
 #navbar-collapse-1 i {
-	font-size: 1rem;
+	font-size: 0.9rem;
 }
 
 nav .dropdown-menu {
-- 
cgit v1.2.3


From 8cb4a29a518fe13c1c6adb37b3c2fb48c9cbaffc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 5 Apr 2017 19:21:27 -0700
Subject: revert grid and bars icon size change

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

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index feddc652a..92b4bce48 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -34,7 +34,7 @@ nav .badge {
 }
 
 #navbar-collapse-1 i {
-	font-size: 0.9rem;
+	font-size: 1.0rem;
 }
 
 nav .dropdown-menu {
-- 
cgit v1.2.3


From dbef80f7bdf43047c721518f888eb859cda1ea0e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 7 Apr 2017 13:37:18 -0700
Subject: fix from downstream

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

(limited to 'view')

diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index c565ccaf1..a238e61bc 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,7 +1,7 @@
 <div id="side-bar-photos-albums" class="widget">
 	<h3>{{$title}}</h3>
 	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li>
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent}}</a></li>
 		{{if $albums}}
 		{{foreach $albums as $al}}
 		{{if $al.shorttext}}
-- 
cgit v1.2.3


From 397fef519c7929c70636c50015f7a0389062bab5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 18 Apr 2017 21:18:49 -0700
Subject: give the item_obscured flag a new lease on life by using it to
 designate third party client-side e2ee or binary content which can only be
 downloaded and not viewed directly on the web (as a side effect this also
 allows binary files to be submitted as activities/content). The content
 display is suppressed and replaced with a download button. This is unfinished
 but harmless to backport while work is in progress unless told otherwise.
 Future development will take care of the remaining loose ends.

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

(limited to 'view')

diff --git a/view/tpl/item_binary.tpl b/view/tpl/item_binary.tpl
new file mode 100644
index 000000000..b19f7e7dd
--- /dev/null
+++ b/view/tpl/item_binary.tpl
@@ -0,0 +1,3 @@
+<p>
+<center><a class="zrl" href="{{$url}}"><button class="btn btn-warning fakelink">{{$download}}</button></a></center>
+</p>
-- 
cgit v1.2.3


From b88be137ca68c6b52e13ce1738fbc55651f37138 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 25 Apr 2017 20:48:38 -0700
Subject: provide a broken feed for services which require a broken feed

---
 view/tpl/atom_feed.tpl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'view')

diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
index fb606af27..ba50867ff 100755
--- a/view/tpl/atom_feed.tpl
+++ b/view/tpl/atom_feed.tpl
@@ -16,11 +16,8 @@
   <generator uri="http://hubzilla.org" version="{{$version}}">{{$red}}</generator>
   <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
   <link rel="alternate" type="text/html" href="{{$profile_page}}" />
-{{if $hub}}
-  {{$hub}}
-{{/if}}
-{{if $salmon}}
-  {{$salmon}}
+{{if $author}}
+{{$author}}
 {{/if}}
 
   <updated>{{$feed_updated}}</updated>
-- 
cgit v1.2.3


From 42ed73ed4ac55ac62214301097f7d72cbcb37238 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 1 May 2017 21:07:11 -0700
Subject: add cdav files

---
 view/tpl/cdav_addressbook.tpl        | 462 +++++++++++++++++++++++++++++++++++
 view/tpl/cdav_calendar.tpl           | 349 ++++++++++++++++++++++++++
 view/tpl/cdav_widget_addressbook.tpl |  66 +++++
 view/tpl/cdav_widget_calendar.tpl    | 121 +++++++++
 4 files changed, 998 insertions(+)
 create mode 100644 view/tpl/cdav_addressbook.tpl
 create mode 100644 view/tpl/cdav_calendar.tpl
 create mode 100644 view/tpl/cdav_widget_addressbook.tpl
 create mode 100644 view/tpl/cdav_widget_calendar.tpl

(limited to 'view')

diff --git a/view/tpl/cdav_addressbook.tpl b/view/tpl/cdav_addressbook.tpl
new file mode 100644
index 000000000..587a95caa
--- /dev/null
+++ b/view/tpl/cdav_addressbook.tpl
@@ -0,0 +1,462 @@
+<script>
+$(document).ready(function() {
+
+	$(document).on('click', '.vcard-header, .vcard-cancel-btn', updateView);
+	$(document).on('click', '.add-field', doAdd);
+	$(document).on('click', '.remove-field', doRemove);
+
+	function updateView() {
+		var id = $(this).data('id');
+		var action = $(this).data('action');
+		var header = $('#vcard-header-' + id);
+		var cancel = $('#vcard-cancel-' + id);
+		var addField = $('#vcard-add-field-' + id);
+		var info = $('#vcard-info-' + id);
+		var vcardPreview = $('#vcard-preview-' + id);
+		var fn = $('#vcard-fn-' + id);
+
+		if(action === 'open') {
+			$(header).addClass('active');
+			$(cancel).show();
+			$(addField).show();
+			$(info).show();
+			$(fn).show();
+			$(vcardPreview).hide();
+		}
+		else {
+			$(header).removeClass('active');
+			$(cancel).hide();
+			$(addField).hide();
+			$(info).hide();
+			$(fn).hide();
+			$(vcardPreview).show();
+		}
+	}
+
+	function doAdd(e) {
+		e.preventDefault();
+		var what = $(this).data('add');
+		var id = $(this).data('id');
+		var element = '#template-form-' + what;
+		var where = '#card_form_' + id;
+
+		$(element + ' .remove-field').attr('data-id', id)
+
+		if(what === 'vcard-adr') {
+			var adrCount = $(where + ' .form-' + what).length;
+			var attrName = 'adr[' + adrCount + '][]';
+			$(element + ' input').attr('name', attrName);
+		}
+
+		if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') {
+			$(where + ' .add-' + what).hide()
+		}
+
+		$(element).clone().removeAttr('id').appendTo(where + ' .form-' + what + '-wrapper');
+	}
+
+	function doRemove() {
+		var what = $(this).data('remove');
+		var element = $(this).parents('div.form-' + what);
+		var where = '#card_form_' + $(this).data('id');
+
+		if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') {
+			$(where + ' .add-' + what).show()
+		}
+
+		$(element).remove();
+	}
+
+});
+</script>
+<div id="template-form-vcard-org" class="form-group form-vcard-org">
+	<div class="form-group form-vcard-org">
+		<input type="text" name="org" value="" placeholder="{{$org_label}}">
+		<i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	</div>
+</div>
+
+<div id="template-form-vcard-title" class="form-group form-vcard-title">
+	<div class="form-group form-vcard-title">
+		<input type="text" name="title" value="" placeholder="{{$title_label}}">
+		<i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	</div>
+</div>
+
+<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
+	<select name="tel_type[]">
+		<option value="CELL">{{$mobile}}</option>
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
+	<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-email" class="form-group form-vcard-email">
+	<select name="email_type[]">
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
+	<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
+	<select name="impp_type[]">
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
+	<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-url" class="form-group form-vcard-url">
+	<select name="url_type[]">
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="url[]" value="" placeholder="{{$url_label}}">
+	<i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-adr" class="form-group form-vcard-adr">
+	<div class="form-group">
+		<select name="adr_type[]">
+			<option value="HOME">{{$home}}</option>
+			<option value="WORK">{{$work}}</option>
+			<option value="OTHER">{{$other}}</option>
+		</select>
+		<label>{{$adr_label}}</label>
+		<i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$po_box}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$extra}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$street}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$locality}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$region}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$zip_code}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$country}}">
+	</div>
+</div>
+
+<div id="template-form-vcard-note" class="form-group form-vcard-note">
+	<label>{{$note_label}}</label>
+	<i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	<textarea name="note" class="form-control"></textarea>
+</div>
+
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<button type="button" class="btn btn-success btn-sm float-right" onclick="openClose('create_form')"><i class="fa fa-plus-circle"></i> {{$add_card}}</button>
+		<h2>{{$displayname}}</h2>
+	</div>
+	<div id="create_form" class="section-content-tools-wrapper">
+		<form id="card_form_new" method="post" action="">
+			<input type="hidden" name="target" value="{{$id}}">
+			<div class="dropdown pull-right">
+				<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+				<div class="dropdown-menu dropdown-menu-right">
+					<a class="dropdown-item add-vcard-org add-field" style="display: none" href="#" data-add="vcard-org" data-id="new">{{$org_label}}</a>
+					<a class="dropdown-item add-vcard-title add-field" style="display: none" href="#" data-add="vcard-title" data-id="new">{{$title_label}}</a>
+					<a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="new">{{$tel_label}}</a>
+					<a class="dropdown-item add-vcard-email add-field" href="#" data-add="vcard-email" data-id="new">{{$email_label}}</a>
+					<a class="dropdown-item add-vcard-impp add-field" href="#" data-add="vcard-impp" data-id="new">{{$impp_label}}</a>
+					<a class="dropdown-item add-vcard-url add-field" href="#" data-add="vcard-url" data-id="new">{{$url_label}}</a>
+					<a class="dropdown-item add-vcard-adr add-field" href="#" data-add="vcard-adr" data-id="new">{{$adr_label}}</a>
+					<a class="dropdown-item add-vcard-note add-field" href="#" data-add="vcard-note" data-id="new">{{$note_label}}</a>
+				</div>
+			</div>
+
+			<div class="vcard-fn-create form-group">
+				<div class="form-vcard-fn-wrapper">
+					<div class="form-group form-vcard-fn">
+						<div class="vcard-nophoto"><i class="fa fa-user"></i></div><input type="text" name="fn" value="" placeholder="{{$name_label}}">
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-org form-group">
+				<div class="form-vcard-org-wrapper">
+					<div class="form-group form-vcard-org">
+						<input type="text" name="org" value="" placeholder="{{$org_label}}">
+						<i data-remove="vcard-org" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-title form-group">
+				<div class="form-vcard-title-wrapper">
+					<div class="form-group form-vcard-title">
+						<input type="text" name="title" value="" placeholder="{{$title_label}}">
+						<i data-remove="vcard-title" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-tel form-group">
+				<div class="form-vcard-tel-wrapper">
+					<div class="form-group form-vcard-tel">
+						<select name="tel_type[]">
+							<option value="CELL">{{$mobile}}</option>
+							<option value="HOME">{{$home}}</option>
+							<option value="WORK">{{$work}}</option>
+							<option value="OTHER">{{$other}}</option>
+						</select>
+						<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
+						<i data-remove="vcard-tel" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+
+			<div class="vcard-email form-group">
+				<div class="form-vcard-email-wrapper">
+					<div class="form-group form-vcard-email">
+						<select name="email_type[]">
+							<option value="HOME">{{$home}}</option>
+							<option value="WORK">{{$work}}</option>
+							<option value="OTHER">{{$other}}</option>
+						</select>
+						<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
+						<i data-remove="vcard-email" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-impp form-group">
+				<div class="form-vcard-impp-wrapper">
+				</div>
+			</div>
+
+			<div class="vcard-url form-group">
+				<div class="form-vcard-url-wrapper">
+				</div>
+			</div>
+
+			<div class="vcard-adr form-group">
+				<div class="form-vcard-adr-wrapper">
+				</div>
+			</div>
+
+			<div class="vcard-note form-group">
+				<div class="form-vcard-note-wrapper">
+				</div>
+			</div>
+
+			<button type="submit" name="create" value="create_card" class="btn btn-primary btn-sm pull-right">{{$create}}</button>
+			<button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('create_form')">{{$cancel}}</button>
+			<div class="clear"></div>
+		</form>
+	</div>
+
+	{{foreach $cards as $card}}
+	<form id="card_form_{{$card.id}}" method="post" action="">
+		<input type="hidden" name="target" value="{{$id}}">
+		<input type="hidden" name="uri" value="{{$card.uri}}">
+		<div class="section-content-wrapper-np">
+			<div id="vcard-cancel-{{$card.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
+			<div id="vcard-add-field-{{$card.id}}" class="dropdown pull-right vcard-add-field">
+				<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+				<div class="dropdown-menu dropdown-menu-right">
+					<a class="dropdown-item add-vcard-org add-field"{{if $card.org}} style="display: none"{{/if}} href="#" data-add="vcard-org" data-id="{{$card.id}}">{{$org_label}}</a>
+					<a class="dropdown-item add-vcard-title add-field"{{if $card.title}} style="display: none"{{/if}} href="#" data-add="vcard-title" data-id="{{$card.id}}">{{$title_label}}</a>
+					<a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="{{$card.id}}">{{$tel_label}}</a>
+					<a class="dropdown-item add-vcard-email add-field" href="#" data-add="vcard-email" data-id="{{$card.id}}">{{$email_label}}</a>
+					<a class="dropdown-item add-vcard-impp add-field" href="#" data-add="vcard-impp" data-id="{{$card.id}}">{{$impp_label}}</a>
+					<a class="dropdown-item add-vcard-url add-field" href="#" data-add="vcard-url" data-id="{{$card.id}}">{{$url_label}}</a>
+					<a class="dropdown-item add-vcard-adr add-field" href="#" data-add="vcard-adr" data-id="{{$card.id}}">{{$adr_label}}</a>
+					<a class="dropdown-item add-vcard-note add-field"{{if $card.note}} style="display: none"{{/if}} href="#" data-add="vcard-note" data-id="{{$card.id}}">{{$note_label}}</a>
+				</div>
+			</div>
+			<div id="vcard-header-{{$card.id}}" class="vcard-header" data-id="{{$card.id}}" data-action="open">
+				{{if $card.photo}}<img class="vcard-photo" src="{{$card.photo}}" width="32px" height="32px">{{else}}<div class="vcard-nophoto"><i class="fa fa-user"></i></div>{{/if}}
+				<span id="vcard-preview-{{$card.id}}" class="vcard-preview">
+					{{if $card.fn}}<span class="vcard-fn-preview">{{$card.fn}}</span>{{/if}}
+					{{if $card.emails.0.address}}<span class="vcard-email-preview hidden-xs">{{$card.emails.0.address}}</span>{{/if}}
+					{{if $card.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$card.tels.0.nr}}</span>{{/if}}
+				</span>
+				<input id="vcard-fn-{{$card.id}}" class="vcard-fn" type="text" name="fn" value="{{$card.fn}}" size="{{$card.fn|count_characters:true}}" placeholder="{{$name_label}}">
+			</div>
+		</div>
+		<div id="vcard-info-{{$card.id}}" class="vcard-info section-content-wrapper">
+
+			<div class="vcard-org form-group">
+				<div class="form-vcard-org-wrapper">
+					{{if $card.org}}
+					<div class="form-group form-vcard-org">
+						<input type="text" name="org" value="{{$card.org}}" size="{{$card.org|count_characters:true}}" placeholder="{{$org_label}}">
+						<i data-remove="vcard-org" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-title form-group">
+				<div class="form-vcard-title-wrapper">
+					{{if $card.title}}
+					<div class="form-group form-vcard-title">
+						<input type="text" name="title" value="{{$card.title}}" size="{{$card.title|count_characters:true}}" placeholder="{{$title_label}}">
+						<i data-remove="vcard-title" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/if}}
+				</div>
+			</div>
+
+
+			<div class="vcard-tel form-group">
+				<div class="form-vcard-tel-wrapper">
+					{{if $card.tels}}
+					{{foreach $card.tels as $tel}}
+					<div class="form-group form-vcard-tel">
+						<select name="tel_type[]">
+							<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
+							<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
+							<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
+						<i data-remove="vcard-tel" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+
+			<div class="vcard-email form-group">
+				<div class="form-vcard-email-wrapper">
+					{{if $card.emails}}
+					{{foreach $card.emails as $email}}
+					<div class="form-group form-vcard-email">
+						<select name="email_type[]">
+							<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
+							<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
+						<i data-remove="vcard-email" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-impp form-group">
+				<div class="form-vcard-impp-wrapper">
+					{{if $card.impps}}
+					{{foreach $card.impps as $impp}}
+					<div class="form-group form-vcard-impp">
+						<select name="impp_type[]">
+							<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
+							<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
+						<i data-remove="vcard-impp" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-url form-group">
+				<div class="form-vcard-url-wrapper">
+					{{if $card.urls}}
+					{{foreach $card.urls as $url}}
+					<div class="form-group form-vcard-url">
+						<select name="url_type[]">
+							<option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option>
+							<option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $url.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $url.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="url[]" value="{{$url.address}}" size="{{$url.address|count_characters:true}}" placeholder="{{$url_label}}">
+						<i data-remove="vcard-url" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-adr form-group">
+				<div class="form-vcard-adr-wrapper">
+					{{if $card.adrs}}
+					{{foreach $card.adrs as $adr}}
+					<div class="form-group form-vcard-adr">
+						<div class="form-group">
+							<label>{{$adr_label}}</label>
+							<select name="adr_type[]">
+								<option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option>
+								<option value="HOME"{{if $adr.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+								<option value="WORK"{{if $adr.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+								<option value="OTHER"{{if $adr.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+							</select>
+							<i data-remove="vcard-adr" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}">
+						</div>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-note form-group form-vcard-note">
+				<div class="form-vcard-note-wrapper">
+					{{if $card.note}}
+					<label>{{$note_label}}</label>
+					<i data-remove="vcard-note" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					<textarea name="note" class="form-control">{{$card.note}}</textarea>
+					{{/if}}
+				</div>
+			</div>
+
+
+			<button type="submit" name="update" value="update_card" class="btn btn-primary btn-sm pull-right">{{$update}}</button>
+			<button type="submit" name="delete" value="delete_card" class="btn btn-danger btn-sm">{{$delete}}</button>
+			<button type="button" class="btn btn-outline-secondary btn-sm vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel">{{$cancel}}</button>
+			<div class="clear"></div>
+		</div>
+	</form>
+	{{/foreach}}
+</div>
diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
new file mode 100644
index 000000000..5d683d751
--- /dev/null
+++ b/view/tpl/cdav_calendar.tpl
@@ -0,0 +1,349 @@
+<script>
+
+var new_event = [];
+var new_event_id = Math.random().toString(36).substring(7);
+var views = {'month' : '{{$month}}', 'agendaWeek' : '{{$week}}', 'agendaDay' : '{{$day}}', 'listMonth' : '{{$list_month}}', 'listWeek' : '{{$list_week}}', 'listDay' : '{{$list_day}}'};
+
+$(document).ready(function() {
+	$('#calendar').fullCalendar({
+		eventSources: [ {{$sources}} ],
+
+		header: false,
+		eventTextColor: 'white',
+
+		lang: '{{$lang}}',
+		firstDay: {{$first_day}},
+
+		monthNames: aStr['monthNames'],
+		monthNamesShort: aStr['monthNamesShort'],
+		dayNames: aStr['dayNames'],
+		dayNamesShort: aStr['dayNamesShort'],
+		allDayText: aStr['allday'],
+
+		timeFormat: 'HH:mm',
+		timezone: 'local',
+
+		defaultTimedEventDuration: '01:00:00',
+		snapDuration: '00:15:00',
+
+		dayClick: function(date, jsEvent, view) {
+
+			if(new_event.length)
+				$('#calendar').fullCalendar( 'removeEventSource', new_event);
+
+			$('#event_uri').val('');
+			$('#id_title').val('New event');
+			$('#calendar_select').val($("#calendar_select option:first").val()).attr('disabled', false);
+			$('#id_dtstart').val(date.format());
+			$('#id_dtend').val(date.hasTime() ? date.add(1, 'hours').format() : date.add(1, 'days').format());
+			$('#id_description').val('');
+			$('#id_location').val('');
+			$('#event_submit').val('create_event').html('Create');
+			$('#event_delete').hide();
+
+			new_event = [{ id: new_event_id, title  : 'New event', start: $('#id_dtstart').val(), end: $('#id_dtend').val(), editable: true, color: '#bbb' }]
+			$('#calendar').fullCalendar( 'addEventSource', new_event);
+		},
+
+		eventClick: function(event, jsEvent, view) {
+
+			if(event.id == new_event_id) {
+				$(window).scrollTop(0);
+				$('.section-content-tools-wrapper, #event_form_wrapper').show();
+				$('#recurrence_warning').hide();
+				$('#id_title').focus().val('');
+				return false;
+			}
+
+			if($('main').hasClass('fullscreen') && view.type !== 'month' && event.rw)
+				$('#calendar').fullCalendar('option', 'height', 'auto');
+
+			if(new_event.length && event.rw) {
+				$('#calendar').fullCalendar( 'removeEventSource', new_event);
+			}
+
+			if(!event.recurrent && event.rw) {
+				var start_clone = moment(event.start);
+				var noend_allday = start_clone.add(1, 'day').format('YYYY-MM-DD');
+
+				$(window).scrollTop(0);
+				$('.section-content-tools-wrapper, #event_form_wrapper').show();
+				$('#recurrence_warning').hide();
+				$('#id_title').focus();
+
+				$('#event_uri').val(event.uri);
+				$('#id_title').val(event.title);
+				$('#calendar_select').val(event.calendar_id[0] + ':' + event.calendar_id[1]).attr('disabled', true);
+				$('#id_dtstart').val(event.start.format());
+				$('#id_dtend').val(event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday);
+				$('#id_description').val(event.description);
+				$('#id_location').val(event.location);
+				$('#event_submit').val('update_event').html('Update');
+				$('#event_delete').show();
+			}
+			else if(event.recurrent && event.rw) {
+				$('.section-content-tools-wrapper, #recurrence_warning').show();
+				$('#event_form_wrapper').hide();
+				$('#event_uri').val(event.uri);
+				$('#calendar_select').val(event.calendar_id[0] + ':' + event.calendar_id[1]).attr('disabled', true);
+			}
+		},
+
+		eventResize: function(event, delta, revertFunc) {
+
+			$('#id_title').val(event.title);
+			$('#id_dtstart').val(event.start.format());
+			$('#id_dtend').val(event.end.format());
+
+			$.post( 'cdav/calendar', {
+				'update': 'resize',
+				'id[]': event.calendar_id,
+				'uri': event.uri,
+				'dtstart': event.start ? event.start.format() : '',
+				'dtend': event.end ? event.end.format() : ''
+			})
+			.fail(function() {
+				revertFunc();
+			});
+		},
+
+		eventDrop: function(event, delta, revertFunc) {
+
+			var start_clone = moment(event.start);
+			var noend_allday = start_clone.add(1, 'day').format('YYYY-MM-DD');
+
+			$('#id_title').val(event.title);
+			$('#id_dtstart').val(event.start.format());
+			$('#id_dtend').val(event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday);
+
+			$.post( 'cdav/calendar', {
+				'update': 'drop',
+				'id[]': event.calendar_id,
+				'uri': event.uri,
+				'dtstart': event.start ? event.start.format() : '',
+				'dtend': event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday
+			})
+			.fail(function() {
+				revertFunc();
+			});
+		},
+
+		loading: function(isLoading, view) {
+			$('#events-spinner').spin('tiny');
+			$('#events-spinner > i').css('color', 'transparent');
+			if(!isLoading) {
+				$('#events-spinner').spin(false);
+				$('#events-spinner > i').css('color', '');
+			}
+		}
+	});
+
+	// echo the title
+	var view = $('#calendar').fullCalendar('getView');
+
+	$('#title').text(view.title);
+
+	$('#view_selector').html(views[view.name]);
+
+	$('.color-edit').colorpicker({ input: '.color-edit-input' });
+
+	$(document).on('click','#fullscreen-btn', on_fullscreen);
+	$(document).on('click','#inline-btn', on_inline);
+
+	$(document).on('click','#event_submit', on_submit);
+	$(document).on('click','#event_more', on_more);
+	$(document).on('click','#event_cancel, #event_cancel_recurrent', reset_form);
+	$(document).on('click','#event_delete, #event_delete_recurrent', on_delete);
+
+});
+
+function changeView(action, viewName) {
+	$('#calendar').fullCalendar(action, viewName);
+	var view = $('#calendar').fullCalendar('getView');
+
+	if($('main').hasClass('fullscreen'))
+		if(view.name !== 'month')
+			$('.section-content-tools-wrapper').css('display') === 'none' ? on_fullscreen() : on_inline() ;
+		else
+			on_fullscreen();
+	else
+		on_inline();
+
+	$('#title').text(view.title);
+	$('#view_selector').html(views[view.name]);
+}
+
+function add_remove_json_source(source, color, editable, status) {
+
+	if(status === undefined)
+		status = 'fa-calendar-check-o';
+
+	if(status === 'drop') {
+		reset_form();
+		$('#calendar').fullCalendar( 'removeEventSource', source );
+		return;
+	}
+
+	var parts = source.split('/');
+	var id = parts[4];
+
+	var selector = '#calendar-btn-' + id;
+
+	if($(selector).hasClass('fa-calendar-o')) {
+		$('#calendar').fullCalendar( 'addEventSource', { url: source, color: color, editable: editable });
+		$(selector).removeClass('fa-calendar-o');
+		$(selector).addClass(status);
+		$.get('/cdav/calendar/switch/' + id + '/1');
+	}
+	else {
+		$('#calendar').fullCalendar( 'removeEventSource', source );
+		$(selector).removeClass(status);
+		$(selector).addClass('fa-calendar-o');
+		$.get('/cdav/calendar/switch/' + id + '/0');
+	}
+}
+
+function on_fullscreen() {
+	var view = $('#calendar').fullCalendar('getView');
+	if(($('.section-content-tools-wrapper').css('display') === 'none') || ($('.section-content-tools-wrapper').css('display') !== 'none' && view.type === 'month'))
+		$('#calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
+}
+
+function on_inline() {
+	var view = $('#calendar').fullCalendar('getView');
+	((view.type === 'month') ? $('#calendar').fullCalendar('option', 'height', '') : $('#calendar').fullCalendar('option', 'height', 'auto'));
+}
+
+function on_submit() {
+	$.post( 'cdav/calendar', {
+		'submit': $('#event_submit').val(),
+		'target': $('#calendar_select').val(),
+		'uri': $('#event_uri').val(),
+		'title': $('#id_title').val(),
+		'dtstart': $('#id_dtstart').val(),
+		'dtend': $('#id_dtend').val(),
+		'description': $('#id_description').val(),
+		'location': $('#id_location').val()
+	})
+	.done(function() {
+		$('#calendar').fullCalendar( 'refetchEventSources', [ {{$sources}} ] );
+		reset_form();
+	});
+}
+
+function on_delete() {
+	$.post( 'cdav/calendar', {
+		'delete': 'delete',
+		'target': $('#calendar_select').val(),
+		'uri': $('#event_uri').val(),
+	})
+	.done(function() {
+		$('#calendar').fullCalendar( 'refetchEventSources', [ {{$sources}} ] );
+		reset_form();
+	});
+}
+
+function reset_form() {
+	$('.section-content-tools-wrapper, #event_form_wrapper, #recurrence_warning').hide();
+
+	$('#event_submit').val('');
+	$('#calendar_select').val('');
+	$('#event_uri').val('');
+	$('#id_title').val('');
+	$('#id_dtstart').val('');
+	$('#id_dtend').val('');
+
+	if(new_event.length)
+		$('#calendar').fullCalendar( 'removeEventSource', new_event);
+
+	if($('#more_block').hasClass('open'))
+		on_more();
+
+	if($('main').hasClass('fullscreen'))
+		on_fullscreen();
+}
+
+function on_more() {
+	if($('#more_block').hasClass('open')) {
+		$('#event_more').html('<i class="fa fa-caret-down"></i> {{$more}}');
+		$('#more_block').removeClass('open').hide();
+	}
+	else {
+		$('#event_more').html('<i class="fa fa-caret-up"></i> {{$less}}');
+		$('#more_block').addClass('open').show();
+	}
+}
+
+</script>
+
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="float-right">
+			<div class="dropdown">
+				<button id="view_selector" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"></button>
+				<div class="dropdown-menu">
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
+					<div class="dropdown-divider"></div>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listMonth'); return false;">{{$list_month}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listWeek'); return false;">{{$list_week}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listDay'); return false;">{{$list_day}}</a></li>
+				</div>
+				<div class="btn-group">
+					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
+					<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
+				</div>
+				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+				<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+			</div>
+		</div>
+		<h2 id="title"></h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-tools-wrapper" style="display: none">
+		<div id="recurrence_warning" style="display: none">
+			<div class="section-content-warning-wrapper">
+				{{$recurrence_warning}}
+			</div>
+			<div>
+				<button id="event_delete_recurrent" type="button" class="btn btn-danger btn-sm">{{$delete_all}}</button>
+				<button id="event_cancel_recurrent" type="button" class="btn btn-outline-secondary btn-sm">{{$cancel}}</button>
+			</div>
+		</div>
+		<div id="event_form_wrapper" style="display: none">
+			<form id="event_form" method="post" action="">
+				<input id="event_uri" type="hidden" name="uri" value="">
+				{{include file="field_input.tpl" field=$title}}
+				<label for="calendar_select">{{$calendar_select_label}}</label>
+				<select id="calendar_select" name="target" class="form-control form-group">
+					{{foreach $writable_calendars as $writable_calendar}}
+					<option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}{{if $writable_calendar.sharer}} ({{$writable_calendar.sharer}}){{/if}}</option>
+					{{/foreach}}
+				</select>
+				<div id="more_block" style="display: none;">
+					{{include file="field_input.tpl" field=$dtstart}}
+					{{include file="field_input.tpl" field=$dtend}}
+					{{include file="field_textarea.tpl" field=$description}}
+					{{include file="field_textarea.tpl" field=$location}}
+				</div>
+				<div class="form-group">
+					<div class="pull-right">
+						<button id="event_more" type="button" class="btn btn-outline-secondary btn-sm"><i class="fa fa-caret-down"></i> {{$more}}</button>
+						<button id="event_submit" type="button" value="" class="btn btn-primary btn-sm"></button>
+
+					</div>
+					<div>
+						<button id="event_delete" type="button" class="btn btn-danger btn-sm">{{$delete}}</button>
+						<button id="event_cancel" type="button" class="btn btn-outline-secondary btn-sm">{{$cancel}}</button>
+					</div>
+					<div class="clear"></div>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="section-content-wrapper-np">
+		<div id="calendar"></div>
+	</div>
+</div>
diff --git a/view/tpl/cdav_widget_addressbook.tpl b/view/tpl/cdav_widget_addressbook.tpl
new file mode 100644
index 000000000..c875dc977
--- /dev/null
+++ b/view/tpl/cdav_widget_addressbook.tpl
@@ -0,0 +1,66 @@
+<div class="widget">
+	<h3>{{$addressbooks_label}}</h3>
+	{{foreach $addressbooks as $addressbook}}
+	<div id="addressbook-{{$addressbook.id}}" class="ml-3">
+		<div class="form-group">
+			<i class="fa fa-user generic-icons"></i><a href="/cdav/addressbook/{{$addressbook.id}}">{{$addressbook.displayname}}</a>
+			<div class="float-right">
+				<i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-addressbook-{{$addressbook.id}}')"></i>
+				<a href="/cdav/addressbooks/{{$addressbook.ownernick}}/{{$addressbook.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
+				<a href="#" onclick="dropItem('/cdav/addressbook/drop/{{$addressbook.id}}', '#addressbook-{{$addressbook.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+			</div>
+		</div>
+		<div id="edit-addressbook-{{$addressbook.id}}" class="sub-menu" style="display: none;">
+			<form id="edit-addressbook-{{$addressbook.id}}" method="post" action="">
+				<label for="edit-{{$addressbook.id}}">{{$edit_label}}</label>
+				<div id="edit-form-{{$addressbook.id}}" class="form-group">
+					<input id="id-{{$addressbook.id}}" name="id" type="hidden" value="{{$addressbook.id}}">
+					<input id="edit-{{$addressbook.id}}" name="{DAV:}displayname" type="text" value="{{$addressbook.displayname}}" class="form-control">
+				</div>
+				<div class="form-group">
+					<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
+				</div>
+			</form>
+		</div>
+	</div>
+	{{/foreach}}
+</div>
+
+<div class="widget">
+	<h3>{{$tools_label}}</h3>
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('create-addressbook'); return false;"><i class="fa fa-user-plus generic-icons"></i> {{$create_label}}</a>
+		</li>
+		<div id="create-addressbook" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form method="post" action="">
+					<div class="form-group">
+						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control form-group">
+						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('upload-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+		</li>
+		<div id="upload-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+					<div class="form-group">
+						<select id="import" name="target" class="form-control">
+							<option value="">{{$import_placeholder}}</option>
+							{{foreach $addressbooks as $addressbook}}
+							<option value="{{$addressbook.id}}">{{$addressbook.displayname}}</option>
+							{{/foreach}}
+						</select>
+					</div>
+					<div class="form-group">
+						<input class="form-control-file w-100" id="addressbook-upload-choose" type="file" name="userfile" />
+					</div>
+					<button class="btn btn-primary btn-sm" type="submit" name="a_upload" value="a_upload">{{$upload}}</button>
+				</form>
+			</div>
+		</div>
+	</ul>
+</div>
diff --git a/view/tpl/cdav_widget_calendar.tpl b/view/tpl/cdav_widget_calendar.tpl
new file mode 100644
index 000000000..ec2257a19
--- /dev/null
+++ b/view/tpl/cdav_widget_calendar.tpl
@@ -0,0 +1,121 @@
+{{if $my_calendars}}
+<div class="widget">
+	<h3>{{$my_calendars_label}}</h3>
+	{{foreach $my_calendars as $calendar}}
+	<div id="calendar-{{$calendar.calendarid}}">
+		<div class="ml-3{{if !$calendar@last}} form-group{{/if}}">
+			<i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}fa-calendar-check-o{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}})" style="color: {{$calendar.color}};"></i>{{$calendar.displayname}}
+			<div class="float-right">
+				<i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-calendar-{{$calendar.calendarid}}')"></i>
+				<a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
+				<i id="share-icon" class="fa fa-share-alt fakelink generic-icons" onclick="openClose('share-calendar-{{$calendar.calendarid}}')"></i>
+				<a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+			</div>
+			<div id="share-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};">
+				{{if $calendar.sharees}}
+				{{foreach $calendar.sharees as $sharee}}
+				<div id="sharee-{{$calendar.calendarid}}" class="form-group">
+					<i class="fa fa-share generic-icons"></i>{{$sharee.name}}&nbsp;{{$sharee.access}}
+					<div class="pull-right">
+						<a href="#" onclick="dropItem('/cdav/calendar/dropsharee/{{$calendar.calendarid}}/{{$calendar.instanceid}}/{{$sharee.hash}}', '#sharee-{{$calendar.calendarid}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+					</div>
+				</div>
+				{{/foreach}}
+				{{/if}}
+				<form method="post" action="">
+					<label for="share-{{$calendar.calendarid}}">{{$share_label}}</label>
+					<input name="calendarid" type="hidden" value="{{$calendar.calendarid}}">
+					<input name="instanceid" type="hidden" value="{{$calendar.instanceid}}">
+					<div class="form-group">
+						<select id="share-{{$calendar.calendarid}}" name="sharee" class="form-control">
+							{{$sharee_options}}
+						</select>
+					</div>
+					<div class="form-group">
+						<select name="access" class="form-control">
+							{{$access_options}}
+						</select>
+					</div>
+					<div class="form-group">
+						<button type="submit" name="share" value="share" class="btn btn-primary btn-sm">{{$share}}</button>
+					</div>
+				</form>
+			</div>
+			<div id="edit-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};">
+				<form id="edit-calendar-{{$calendar.calendarid}}" method="post" action="" class="colorpicker-component color-edit">
+					<input id="id-{{$calendar.calendarid}}" name="id" type="hidden" value="{{$calendar.calendarid}}:{{$calendar.instanceid}}">
+					<input id="color-{{$calendar.calendarid}}" name="color" type="hidden" value="{{$calendar.color}}" class="color-edit-input">
+					<label for="edit-form-{{$calendar.calendarid}}">{{$edit_label}}</label>
+					<div id="edit-form-{{$calendar.calendarid}}" class="input-group form-group">
+						<input id="create-{{$calendar.calendarid}}" name="{DAV:}displayname" type="text" value="{{$calendar.displayname}}" class="form-control">
+						<span class="input-group-addon"><i></i></span>
+					</div>
+					<div class="form-group">
+						<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+	{{/foreach}}
+</div>
+{{/if}}
+
+{{if $shared_calendars}}
+<div class="widget">
+	<h3>{{$shared_calendars_label}}</h3>
+	{{foreach $shared_calendars as $calendar}}
+	<div id="shared-calendar-{{$calendar.calendarid}}" class="ml-3{{if !$calendar@last}} form-group{{/if}}">
+		<i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}{{if $calendar.access == 'read-write'}}fa-calendar-check-o{{else}}fa-calendar-times-o{{/if}}{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, {{if $calendar.access == 'read-write'}}'fa-calendar-check-o'{{else}}'fa-calendar-times-o'{{/if}})"  style="color: {{$calendar.color}};"></i>{{$calendar.displayname}} ({{$calendar.sharer}})
+		<div class="pull-right">
+			<a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
+			<a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#shared-calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+		</div>
+	</div>
+	{{/foreach}}
+</div>
+{{/if}}
+
+<div class="widget">
+	<h3>{{$tools_label}}</h3>
+	<div class="nav nav-pills flex-column">
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('create-calendar'); return false;"><i class="fa fa-calendar-plus-o generic-icons"></i> {{$create_label}}</a>
+		</li>
+		<div id="create-calendar" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form method="post" action="" class="colorpicker-component color-edit">
+					<input id="color" name="color" type="hidden" value="#3a87ad" class="color-edit-input">
+					<div id="create-form" class="input-group form-group">
+						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control">
+						<span class="input-group-addon"><i></i></span>
+					</div>
+					<div class="form-group">
+						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('upload-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+		</li>
+		<div id="upload-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<div class="form-group">
+						<select id="import" name="target" class="form-control">
+							<option value="">{{$import_placeholder}}</option>
+							{{foreach $writable_calendars as $writable_calendar}}
+							<option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}</option>
+							{{/foreach}}
+						</select>
+					</div>
+					<div class="form-group">
+						<input class="form-control-file w-100" id="event-upload-choose" type="file" name="userfile" />
+					</div>
+					<button class="btn btn-primary btn-sm" type="submit" name="c_upload" value="c_upload">{{$upload}}</button>
+				</form>
+			</div>
+		</div>
+	</div>
+</div>
-- 
cgit v1.2.3


From e332d1074f1b663ec66d37b0f575df2e41d5535c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 1 May 2017 21:10:04 -0700
Subject: move theme specific files to theme dir

---
 view/theme/redbasic/tpl/404.tpl                    |   3 +
 view/theme/redbasic/tpl/abook_edit.tpl             | 519 ++++++++++++++++++
 view/theme/redbasic/tpl/achievements.tpl           |   9 +
 view/theme/redbasic/tpl/acl_selector.tpl           |  64 +++
 view/theme/redbasic/tpl/admin_account_edit.tpl     |  23 +
 view/theme/redbasic/tpl/admin_accounts.tpl         |  88 +++
 view/theme/redbasic/tpl/admin_aside.tpl            |  46 ++
 view/theme/redbasic/tpl/admin_channels.tpl         |  51 ++
 view/theme/redbasic/tpl/admin_hubloc.tpl           |  27 +
 view/theme/redbasic/tpl/admin_logs.tpl             |  19 +
 view/theme/redbasic/tpl/admin_plugins.tpl          | 190 +++++++
 view/theme/redbasic/tpl/admin_plugins_addrepo.tpl  |   9 +
 view/theme/redbasic/tpl/admin_plugins_details.tpl  |  58 ++
 view/theme/redbasic/tpl/admin_profiles.tpl         |  38 ++
 view/theme/redbasic/tpl/admin_queue.tpl            |  15 +
 view/theme/redbasic/tpl/admin_security.tpl         |  33 ++
 .../theme/redbasic/tpl/admin_settings_features.tpl |  31 ++
 view/theme/redbasic/tpl/admin_site.tpl             | 101 ++++
 view/theme/redbasic/tpl/admin_summary.tpl          |  43 ++
 view/theme/redbasic/tpl/album_edit.tpl             |  22 +
 view/theme/redbasic/tpl/alt_pager.tpl              |   4 +
 view/theme/redbasic/tpl/api_config_xml.tpl         |  66 +++
 view/theme/redbasic/tpl/api_friends_xml.tpl        |   5 +
 view/theme/redbasic/tpl/api_ratelimit_xml.tpl      |   6 +
 view/theme/redbasic/tpl/api_status_xml.tpl         |  46 ++
 view/theme/redbasic/tpl/api_test_xml.tpl           |   1 +
 view/theme/redbasic/tpl/api_timeline_atom.tpl      |  90 ++++
 view/theme/redbasic/tpl/api_timeline_rss.tpl       |  26 +
 view/theme/redbasic/tpl/api_timeline_xml.tpl       |  20 +
 view/theme/redbasic/tpl/api_user_xml.tpl           |  46 ++
 view/theme/redbasic/tpl/app.tpl                    |  30 ++
 view/theme/redbasic/tpl/app_create.tpl             |  40 ++
 view/theme/redbasic/tpl/atom_feed.tpl              |  30 ++
 view/theme/redbasic/tpl/attach_edit.tpl            |  31 ++
 view/theme/redbasic/tpl/birthdays_reminder.tpl     |  10 +
 view/theme/redbasic/tpl/blocklist.tpl              |  69 +++
 view/theme/redbasic/tpl/bookmarkedchats.tpl        |  10 +
 view/theme/redbasic/tpl/build_query.tpl            |  65 +++
 view/theme/redbasic/tpl/categories_widget.tpl      |  12 +
 view/theme/redbasic/tpl/cdav_addressbook.tpl       | 462 ++++++++++++++++
 view/theme/redbasic/tpl/cdav_calendar.tpl          | 349 ++++++++++++
 .../theme/redbasic/tpl/cdav_widget_addressbook.tpl |  66 +++
 view/theme/redbasic/tpl/cdav_widget_calendar.tpl   | 121 +++++
 view/theme/redbasic/tpl/channel.tpl                |  49 ++
 view/theme/redbasic/tpl/channel_id_select.tpl      |   7 +
 view/theme/redbasic/tpl/channel_import.tpl         |  43 ++
 view/theme/redbasic/tpl/channels.tpl               |  24 +
 view/theme/redbasic/tpl/chanview.tpl               |   1 +
 view/theme/redbasic/tpl/chat.tpl                   | 346 ++++++++++++
 view/theme/redbasic/tpl/chatroom_members.tpl       |   5 +
 view/theme/redbasic/tpl/chatroom_new.tpl           |  12 +
 view/theme/redbasic/tpl/chatroomlist.tpl           |  10 +
 view/theme/redbasic/tpl/chatrooms.tpl              |  41 ++
 view/theme/redbasic/tpl/cloud.tpl                  |   4 +
 view/theme/redbasic/tpl/cloud_actionspanel.tpl     |  42 ++
 view/theme/redbasic/tpl/cloud_directory.tpl        |  45 ++
 view/theme/redbasic/tpl/cloud_header.tpl           |  16 +
 view/theme/redbasic/tpl/comment_item.tpl           |  67 +++
 view/theme/redbasic/tpl/common_friends.tpl         |  15 +
 view/theme/redbasic/tpl/common_tabs.tpl            |  17 +
 view/theme/redbasic/tpl/connection_template.tpl    |  48 ++
 view/theme/redbasic/tpl/connections.tpl            |  36 ++
 view/theme/redbasic/tpl/contact_block.tpl          |  14 +
 view/theme/redbasic/tpl/contact_head.tpl           |  30 ++
 view/theme/redbasic/tpl/contact_slider.tpl         |  20 +
 view/theme/redbasic/tpl/contact_template.tpl       |   8 +
 view/theme/redbasic/tpl/contactsajax.tpl           |   3 +
 view/theme/redbasic/tpl/conv.tpl                   |  17 +
 view/theme/redbasic/tpl/conv_frame.tpl             |   5 +
 view/theme/redbasic/tpl/conv_item.tpl              | 250 +++++++++
 view/theme/redbasic/tpl/conv_list.tpl              | 251 +++++++++
 view/theme/redbasic/tpl/conversation.tpl           |  20 +
 view/theme/redbasic/tpl/convobj.tpl                |   4 +
 view/theme/redbasic/tpl/cover_photo.tpl            |  29 +
 view/theme/redbasic/tpl/cover_photo_widget.tpl     |  76 +++
 view/theme/redbasic/tpl/cropbody.tpl               |  58 ++
 view/theme/redbasic/tpl/cropcover.tpl              |  58 ++
 view/theme/redbasic/tpl/crophead.tpl               |   4 +
 view/theme/redbasic/tpl/delegate.tpl               |  57 ++
 view/theme/redbasic/tpl/design_tools.tpl           |   9 +
 view/theme/redbasic/tpl/diaspora_vcard.tpl         |  69 +++
 view/theme/redbasic/tpl/dir_sort_links.tpl         |   8 +
 view/theme/redbasic/tpl/directajax.tpl             |   4 +
 view/theme/redbasic/tpl/directory_header.tpl       |  22 +
 view/theme/redbasic/tpl/direntry.tpl               |  77 +++
 view/theme/redbasic/tpl/display-head.tpl           |   8 +
 view/theme/redbasic/tpl/dreport.tpl                |  28 +
 view/theme/redbasic/tpl/edpost_head.tpl            |  14 +
 view/theme/redbasic/tpl/email_notify_html.tpl      |  27 +
 view/theme/redbasic/tpl/email_notify_text.tpl      |  13 +
 view/theme/redbasic/tpl/event.tpl                  |  16 +
 view/theme/redbasic/tpl/event_cal.tpl              |  14 +
 view/theme/redbasic/tpl/event_form.tpl             | 130 +++++
 view/theme/redbasic/tpl/event_head.tpl             | 160 ++++++
 view/theme/redbasic/tpl/event_item_content.tpl     |  10 +
 view/theme/redbasic/tpl/event_item_header.tpl      |  11 +
 view/theme/redbasic/tpl/events-js.tpl              |  31 ++
 view/theme/redbasic/tpl/events_cal-js.tpl          |  20 +
 view/theme/redbasic/tpl/events_menu_side.tpl       |   8 +
 view/theme/redbasic/tpl/events_reminder.tpl        |  10 +
 view/theme/redbasic/tpl/events_tools_side.tpl      |  17 +
 view/theme/redbasic/tpl/failed_updates.tpl         |  18 +
 view/theme/redbasic/tpl/field.tpl                  |   3 +
 view/theme/redbasic/tpl/field_acheckbox.tpl        |  23 +
 view/theme/redbasic/tpl/field_checkbox.tpl         |   5 +
 view/theme/redbasic/tpl/field_colorinput.tpl       |   6 +
 view/theme/redbasic/tpl/field_combobox.tpl         |  18 +
 view/theme/redbasic/tpl/field_custom.tpl           |   5 +
 view/theme/redbasic/tpl/field_input.tpl            |   5 +
 view/theme/redbasic/tpl/field_intcheckbox.tpl      |   5 +
 view/theme/redbasic/tpl/field_password.tpl         |   5 +
 view/theme/redbasic/tpl/field_radio.tpl            |   8 +
 view/theme/redbasic/tpl/field_richtext.tpl         |   5 +
 view/theme/redbasic/tpl/field_select.tpl           |   7 +
 view/theme/redbasic/tpl/field_select_disabled.tpl  |   7 +
 view/theme/redbasic/tpl/field_select_grouped.tpl   |  12 +
 view/theme/redbasic/tpl/field_select_raw.tpl       |   7 +
 view/theme/redbasic/tpl/field_textarea.tpl         |   5 +
 view/theme/redbasic/tpl/field_themeselect.tpl      |  13 +
 view/theme/redbasic/tpl/field_yesno.tpl            |  13 +
 view/theme/redbasic/tpl/fileas_widget.tpl          |  12 +
 view/theme/redbasic/tpl/filebrowser.tpl            |  84 +++
 view/theme/redbasic/tpl/filer_dialog.tpl           |  19 +
 view/theme/redbasic/tpl/follow.tpl                 |  14 +
 view/theme/redbasic/tpl/force_image_reload.tpl     |  72 +++
 view/theme/redbasic/tpl/generic_addon_settings.tpl |  19 +
 view/theme/redbasic/tpl/generic_links_widget.tpl   |  11 +
 view/theme/redbasic/tpl/generic_modal.tpl          |  17 +
 view/theme/redbasic/tpl/group_drop.tpl             |   7 +
 view/theme/redbasic/tpl/group_edit.tpl             |  26 +
 view/theme/redbasic/tpl/group_selection.tpl        |   8 +
 view/theme/redbasic/tpl/group_side.tpl             |  26 +
 view/theme/redbasic/tpl/groupeditor.tpl            |  16 +
 view/theme/redbasic/tpl/hdr.tpl                    |   3 +
 view/theme/redbasic/tpl/head.tpl                   |  21 +
 view/theme/redbasic/tpl/help.tpl                   |  33 ++
 view/theme/redbasic/tpl/install.tpl                |   9 +
 view/theme/redbasic/tpl/install_checks.tpl         |  24 +
 view/theme/redbasic/tpl/install_db.tpl             |  30 ++
 view/theme/redbasic/tpl/install_settings.tpl       |  28 +
 view/theme/redbasic/tpl/invite.tpl                 |  28 +
 view/theme/redbasic/tpl/item_attach.tpl            |   5 +
 view/theme/redbasic/tpl/item_binary.tpl            |   3 +
 view/theme/redbasic/tpl/item_categories.tpl        |   8 +
 view/theme/redbasic/tpl/item_filer.tpl             |   8 +
 view/theme/redbasic/tpl/item_import.tpl            |  13 +
 view/theme/redbasic/tpl/jot-header.tpl             | 598 +++++++++++++++++++++
 view/theme/redbasic/tpl/jot.tpl                    | 303 +++++++++++
 view/theme/redbasic/tpl/jot_geotag.tpl             |   7 +
 view/theme/redbasic/tpl/js_strings.tpl             |  57 ++
 view/theme/redbasic/tpl/lang_selector.tpl          |  13 +
 view/theme/redbasic/tpl/layoutlist.tpl             |  71 +++
 view/theme/redbasic/tpl/like_noshare.tpl           |   5 +
 view/theme/redbasic/tpl/locmanage.tpl              |  41 ++
 view/theme/redbasic/tpl/login.tpl                  |  21 +
 view/theme/redbasic/tpl/logout.tpl                 |   6 +
 view/theme/redbasic/tpl/lostpass.tpl               |  17 +
 view/theme/redbasic/tpl/mail_conv.tpl              |  38 ++
 view/theme/redbasic/tpl/mail_display.tpl           |  24 +
 view/theme/redbasic/tpl/mail_head.tpl              |   8 +
 view/theme/redbasic/tpl/mail_list.tpl              |   7 +
 view/theme/redbasic/tpl/main_slider.tpl            |  38 ++
 view/theme/redbasic/tpl/match.tpl                  |  16 +
 view/theme/redbasic/tpl/menuedit.tpl               |  33 ++
 view/theme/redbasic/tpl/menulist.tpl               |  40 ++
 view/theme/redbasic/tpl/message_side.tpl           |   9 +
 view/theme/redbasic/tpl/micropro_img.tpl           |   1 +
 view/theme/redbasic/tpl/micropro_txt.tpl           |   1 +
 view/theme/redbasic/tpl/mitemedit.tpl              |  42 ++
 view/theme/redbasic/tpl/mitemlist.tpl              |  34 ++
 view/theme/redbasic/tpl/mood_content.tpl           |  33 ++
 view/theme/redbasic/tpl/msg-header.tpl             |  81 +++
 view/theme/redbasic/tpl/myapps.tpl                 |  17 +
 view/theme/redbasic/tpl/nav.tpl                    | 222 ++++++++
 view/theme/redbasic/tpl/nav_login.tpl              |  18 +
 view/theme/redbasic/tpl/new_channel.tpl            |  34 ++
 view/theme/redbasic/tpl/notes.tpl                  |  35 ++
 view/theme/redbasic/tpl/notifications.tpl          |  11 +
 view/theme/redbasic/tpl/notify.tpl                 |   3 +
 view/theme/redbasic/tpl/nwiki_page_history.tpl     |  59 ++
 view/theme/redbasic/tpl/oauth_authorize.tpl        |  10 +
 view/theme/redbasic/tpl/oauth_authorize_done.tpl   |   4 +
 view/theme/redbasic/tpl/oembed_video.tpl           |   4 +
 view/theme/redbasic/tpl/oexchange_xrd.tpl          |  33 ++
 view/theme/redbasic/tpl/page_display.tpl           |  14 +
 view/theme/redbasic/tpl/page_display_empty.tpl     |   1 +
 view/theme/redbasic/tpl/pdledit.tpl                |  24 +
 view/theme/redbasic/tpl/peoplefind.tpl             |  17 +
 view/theme/redbasic/tpl/photo_album.tpl            |  32 ++
 view/theme/redbasic/tpl/photo_albums.tpl           |  13 +
 view/theme/redbasic/tpl/photo_drop.tpl             |   3 +
 view/theme/redbasic/tpl/photo_item.tpl             |  34 ++
 view/theme/redbasic/tpl/photo_top.tpl              |   4 +
 view/theme/redbasic/tpl/photo_view.tpl             | 172 ++++++
 view/theme/redbasic/tpl/photos_recent.tpl          |  23 +
 view/theme/redbasic/tpl/photos_upload.tpl          |  61 +++
 view/theme/redbasic/tpl/photosajax.tpl             |   4 +
 view/theme/redbasic/tpl/poco_entry_xml.tpl         |   8 +
 view/theme/redbasic/tpl/poco_xml.tpl               |  18 +
 view/theme/redbasic/tpl/poke_content.tpl           |  48 ++
 view/theme/redbasic/tpl/posted_date_widget.tpl     |  46 ++
 view/theme/redbasic/tpl/prep.tpl                   |  31 ++
 view/theme/redbasic/tpl/profdef_edit.tpl           |  16 +
 view/theme/redbasic/tpl/profed_head.tpl            |   2 +
 view/theme/redbasic/tpl/profile_advanced.tpl       | 341 ++++++++++++
 view/theme/redbasic/tpl/profile_edit.tpl           | 401 ++++++++++++++
 view/theme/redbasic/tpl/profile_entry.tpl          |  11 +
 view/theme/redbasic/tpl/profile_listing_header.tpl |  12 +
 view/theme/redbasic/tpl/profile_photo.tpl          |  48 ++
 view/theme/redbasic/tpl/profile_tabs.tpl           |   5 +
 view/theme/redbasic/tpl/profile_vcard.tpl          |  62 +++
 view/theme/redbasic/tpl/profile_vcard_short.tpl    |  38 ++
 view/theme/redbasic/tpl/prv_message.tpl            | 104 ++++
 view/theme/redbasic/tpl/pwdreset.tpl               |  17 +
 view/theme/redbasic/tpl/rating_form.tpl            |  25 +
 view/theme/redbasic/tpl/rating_slider.tpl          |  19 +
 view/theme/redbasic/tpl/rbmark.tpl                 |  16 +
 view/theme/redbasic/tpl/register.tpl               |  61 +++
 view/theme/redbasic/tpl/remote_friends_common.tpl  |  21 +
 view/theme/redbasic/tpl/remote_login.tpl           |   1 +
 view/theme/redbasic/tpl/removeaccount.tpl          |  20 +
 view/theme/redbasic/tpl/removeme.tpl               |  20 +
 view/theme/redbasic/tpl/rmagic.tpl                 |   9 +
 view/theme/redbasic/tpl/safesearch.tpl             |   6 +
 view/theme/redbasic/tpl/saved_searches.tpl         |  12 +
 view/theme/redbasic/tpl/search_item.tpl            | 114 ++++
 view/theme/redbasic/tpl/searchbox.tpl              |  12 +
 view/theme/redbasic/tpl/section_title.tpl          |   5 +
 view/theme/redbasic/tpl/select_timezone.tpl        |  11 +
 view/theme/redbasic/tpl/sellpage_edit.tpl          |  23 +
 view/theme/redbasic/tpl/sellpage_submit.tpl        |   3 +
 view/theme/redbasic/tpl/sellpage_view.tpl          |  11 +
 view/theme/redbasic/tpl/settings.tpl               | 192 +++++++
 view/theme/redbasic/tpl/settings_account.tpl       |  28 +
 view/theme/redbasic/tpl/settings_addons.tpl        |  11 +
 view/theme/redbasic/tpl/settings_connectors.tpl    |  10 +
 view/theme/redbasic/tpl/settings_display.tpl       |  86 +++
 view/theme/redbasic/tpl/settings_features.tpl      |  30 ++
 view/theme/redbasic/tpl/settings_nick_set.tpl      |   8 +
 view/theme/redbasic/tpl/settings_oauth.tpl         |  36 ++
 view/theme/redbasic/tpl/settings_oauth_edit.tpl    |  22 +
 view/theme/redbasic/tpl/settings_permcats.tpl      |  64 +++
 view/theme/redbasic/tpl/settings_tokens.tpl        |  72 +++
 view/theme/redbasic/tpl/sharedwithme.tpl           |  26 +
 view/theme/redbasic/tpl/show_thing.tpl             |  16 +
 view/theme/redbasic/tpl/siteinfo.tpl               |  41 ++
 view/theme/redbasic/tpl/sitesearch.tpl             |   5 +
 view/theme/redbasic/tpl/sources_edit.tpl           |  24 +
 view/theme/redbasic/tpl/sources_list.tpl           |  17 +
 view/theme/redbasic/tpl/sources_new.tpl            |  17 +
 view/theme/redbasic/tpl/suggest_friends.tpl        |  16 +
 view/theme/redbasic/tpl/suggest_page.tpl           |   9 +
 view/theme/redbasic/tpl/suggest_widget.tpl         |  10 +
 view/theme/redbasic/tpl/thing_edit.tpl             |  41 ++
 view/theme/redbasic/tpl/thing_input.tpl            |  41 ++
 view/theme/redbasic/tpl/threaded_conversation.tpl  |   8 +
 view/theme/redbasic/tpl/toggle_mobile_footer.tpl   |   2 +
 view/theme/redbasic/tpl/uexport.tpl                |  19 +
 view/theme/redbasic/tpl/usermenu.tpl               |  20 +
 view/theme/redbasic/tpl/viewcontact_template.tpl   |  13 +
 view/theme/redbasic/tpl/viewcontactsajax.tpl       |   3 +
 view/theme/redbasic/tpl/webpage_export_list.tpl    | 124 +++++
 view/theme/redbasic/tpl/webpage_import.tpl         | 126 +++++
 view/theme/redbasic/tpl/webpagelist.tpl            |  76 +++
 .../theme/redbasic/tpl/website_portation_tools.tpl |  60 +++
 view/theme/redbasic/tpl/wiki.tpl                   | 469 ++++++++++++++++
 view/theme/redbasic/tpl/wiki_page_history.tpl      |  59 ++
 view/theme/redbasic/tpl/wiki_page_list.tpl         |  76 +++
 view/theme/redbasic/tpl/wikilist.tpl               |  78 +++
 view/theme/redbasic/tpl/wikilist_widget.tpl        |   8 +
 view/theme/redbasic/tpl/write_pages.tpl            |   3 +
 view/theme/redbasic/tpl/xchan_vcard.tpl            |  10 +
 view/theme/redbasic/tpl/xrd_diaspora.tpl           |   3 +
 view/theme/redbasic/tpl/xrd_host.tpl               |  11 +
 view/theme/redbasic/tpl/xrd_person.tpl             |  31 ++
 view/theme/redbasic/tpl/zcard.tpl                  | 144 +++++
 view/theme/redbasic/tpl/zcard_embed.tpl            |   8 +
 view/tpl/404.tpl                                   |   3 -
 view/tpl/abook_edit.tpl                            | 519 ------------------
 view/tpl/achievements.tpl                          |   9 -
 view/tpl/acl_selector.tpl                          |  64 ---
 view/tpl/admin_account_edit.tpl                    |  23 -
 view/tpl/admin_accounts.tpl                        |  88 ---
 view/tpl/admin_aside.tpl                           |  46 --
 view/tpl/admin_channels.tpl                        |  51 --
 view/tpl/admin_hubloc.tpl                          |  27 -
 view/tpl/admin_logs.tpl                            |  19 -
 view/tpl/admin_plugins.tpl                         | 190 -------
 view/tpl/admin_plugins_addrepo.tpl                 |   9 -
 view/tpl/admin_plugins_details.tpl                 |  58 --
 view/tpl/admin_profiles.tpl                        |  38 --
 view/tpl/admin_queue.tpl                           |  15 -
 view/tpl/admin_security.tpl                        |  33 --
 view/tpl/admin_settings_features.tpl               |  31 --
 view/tpl/admin_site.tpl                            | 101 ----
 view/tpl/admin_summary.tpl                         |  43 --
 view/tpl/album_edit.tpl                            |  22 -
 view/tpl/alt_pager.tpl                             |   4 -
 view/tpl/api_config_xml.tpl                        |  66 ---
 view/tpl/api_friends_xml.tpl                       |   5 -
 view/tpl/api_ratelimit_xml.tpl                     |   6 -
 view/tpl/api_status_xml.tpl                        |  46 --
 view/tpl/api_test_xml.tpl                          |   1 -
 view/tpl/api_timeline_atom.tpl                     |  90 ----
 view/tpl/api_timeline_rss.tpl                      |  26 -
 view/tpl/api_timeline_xml.tpl                      |  20 -
 view/tpl/api_user_xml.tpl                          |  46 --
 view/tpl/app.tpl                                   |  30 --
 view/tpl/app_create.tpl                            |  40 --
 view/tpl/atom_feed.tpl                             |  30 --
 view/tpl/attach_edit.tpl                           |  31 --
 view/tpl/birthdays_reminder.tpl                    |  10 -
 view/tpl/blocklist.tpl                             |  69 ---
 view/tpl/bookmarkedchats.tpl                       |  10 -
 view/tpl/build_query.tpl                           |  65 ---
 view/tpl/categories_widget.tpl                     |  12 -
 view/tpl/cdav_addressbook.tpl                      | 462 ----------------
 view/tpl/cdav_calendar.tpl                         | 349 ------------
 view/tpl/cdav_widget_addressbook.tpl               |  66 ---
 view/tpl/cdav_widget_calendar.tpl                  | 121 -----
 view/tpl/channel.tpl                               |  49 --
 view/tpl/channel_id_select.tpl                     |   7 -
 view/tpl/channel_import.tpl                        |  43 --
 view/tpl/channels.tpl                              |  24 -
 view/tpl/chanview.tpl                              |   1 -
 view/tpl/chat.tpl                                  | 346 ------------
 view/tpl/chatroom_members.tpl                      |   5 -
 view/tpl/chatroom_new.tpl                          |  12 -
 view/tpl/chatroomlist.tpl                          |  10 -
 view/tpl/chatrooms.tpl                             |  41 --
 view/tpl/cloud.tpl                                 |   4 -
 view/tpl/cloud_actionspanel.tpl                    |  42 --
 view/tpl/cloud_directory.tpl                       |  45 --
 view/tpl/cloud_header.tpl                          |  16 -
 view/tpl/comment_item.tpl                          |  67 ---
 view/tpl/common_friends.tpl                        |  15 -
 view/tpl/common_tabs.tpl                           |  17 -
 view/tpl/connection_template.tpl                   |  48 --
 view/tpl/connections.tpl                           |  36 --
 view/tpl/contact_block.tpl                         |  14 -
 view/tpl/contact_head.tpl                          |  30 --
 view/tpl/contact_slider.tpl                        |  20 -
 view/tpl/contact_template.tpl                      |   8 -
 view/tpl/contactsajax.tpl                          |   3 -
 view/tpl/conv.tpl                                  |  17 -
 view/tpl/conv_frame.tpl                            |   5 -
 view/tpl/conv_item.tpl                             | 250 ---------
 view/tpl/conv_list.tpl                             | 251 ---------
 view/tpl/conversation.tpl                          |  20 -
 view/tpl/convobj.tpl                               |   4 -
 view/tpl/cover_photo.tpl                           |  29 -
 view/tpl/cover_photo_widget.tpl                    |  76 ---
 view/tpl/cropbody.tpl                              |  58 --
 view/tpl/cropcover.tpl                             |  58 --
 view/tpl/crophead.tpl                              |   4 -
 view/tpl/delegate.tpl                              |  57 --
 view/tpl/design_tools.tpl                          |   9 -
 view/tpl/diaspora_vcard.tpl                        |  69 ---
 view/tpl/dir_sort_links.tpl                        |   8 -
 view/tpl/directajax.tpl                            |   4 -
 view/tpl/directory_header.tpl                      |  22 -
 view/tpl/direntry.tpl                              |  77 ---
 view/tpl/display-head.tpl                          |   8 -
 view/tpl/dreport.tpl                               |  28 -
 view/tpl/edpost_head.tpl                           |  14 -
 view/tpl/email_notify_html.tpl                     |  27 -
 view/tpl/email_notify_text.tpl                     |  13 -
 view/tpl/event.tpl                                 |  16 -
 view/tpl/event_cal.tpl                             |  14 -
 view/tpl/event_form.tpl                            | 130 -----
 view/tpl/event_head.tpl                            | 160 ------
 view/tpl/event_item_content.tpl                    |  10 -
 view/tpl/event_item_header.tpl                     |  11 -
 view/tpl/events-js.tpl                             |  31 --
 view/tpl/events_cal-js.tpl                         |  20 -
 view/tpl/events_menu_side.tpl                      |   8 -
 view/tpl/events_reminder.tpl                       |  10 -
 view/tpl/events_tools_side.tpl                     |  17 -
 view/tpl/failed_updates.tpl                        |  18 -
 view/tpl/field.tpl                                 |   3 -
 view/tpl/field_acheckbox.tpl                       |  23 -
 view/tpl/field_checkbox.tpl                        |   5 -
 view/tpl/field_colorinput.tpl                      |   6 -
 view/tpl/field_combobox.tpl                        |  18 -
 view/tpl/field_custom.tpl                          |   5 -
 view/tpl/field_input.tpl                           |   5 -
 view/tpl/field_intcheckbox.tpl                     |   5 -
 view/tpl/field_password.tpl                        |   5 -
 view/tpl/field_radio.tpl                           |   8 -
 view/tpl/field_richtext.tpl                        |   5 -
 view/tpl/field_select.tpl                          |   7 -
 view/tpl/field_select_disabled.tpl                 |   7 -
 view/tpl/field_select_grouped.tpl                  |  12 -
 view/tpl/field_select_raw.tpl                      |   7 -
 view/tpl/field_textarea.tpl                        |   5 -
 view/tpl/field_themeselect.tpl                     |  13 -
 view/tpl/field_yesno.tpl                           |  13 -
 view/tpl/fileas_widget.tpl                         |  12 -
 view/tpl/filebrowser.tpl                           |  84 ---
 view/tpl/filer_dialog.tpl                          |  19 -
 view/tpl/follow.tpl                                |  14 -
 view/tpl/force_image_reload.tpl                    |  72 ---
 view/tpl/generic_addon_settings.tpl                |  19 -
 view/tpl/generic_links_widget.tpl                  |  11 -
 view/tpl/generic_modal.tpl                         |  17 -
 view/tpl/group_drop.tpl                            |   7 -
 view/tpl/group_edit.tpl                            |  26 -
 view/tpl/group_selection.tpl                       |   8 -
 view/tpl/group_side.tpl                            |  26 -
 view/tpl/groupeditor.tpl                           |  16 -
 view/tpl/hdr.tpl                                   |   3 -
 view/tpl/head.tpl                                  |  21 -
 view/tpl/help.tpl                                  |  33 --
 view/tpl/install.tpl                               |   9 -
 view/tpl/install_checks.tpl                        |  24 -
 view/tpl/install_db.tpl                            |  30 --
 view/tpl/install_settings.tpl                      |  28 -
 view/tpl/invite.tpl                                |  28 -
 view/tpl/item_attach.tpl                           |   5 -
 view/tpl/item_binary.tpl                           |   3 -
 view/tpl/item_categories.tpl                       |   8 -
 view/tpl/item_filer.tpl                            |   8 -
 view/tpl/item_import.tpl                           |  13 -
 view/tpl/jot-header.tpl                            | 598 ---------------------
 view/tpl/jot.tpl                                   | 303 -----------
 view/tpl/jot_geotag.tpl                            |   7 -
 view/tpl/js_strings.tpl                            |  57 --
 view/tpl/lang_selector.tpl                         |  13 -
 view/tpl/layoutlist.tpl                            |  71 ---
 view/tpl/like_noshare.tpl                          |   5 -
 view/tpl/locmanage.tpl                             |  41 --
 view/tpl/login.tpl                                 |  21 -
 view/tpl/logout.tpl                                |   6 -
 view/tpl/lostpass.tpl                              |  17 -
 view/tpl/mail_conv.tpl                             |  38 --
 view/tpl/mail_display.tpl                          |  24 -
 view/tpl/mail_head.tpl                             |   8 -
 view/tpl/mail_list.tpl                             |   7 -
 view/tpl/main_slider.tpl                           |  38 --
 view/tpl/match.tpl                                 |  16 -
 view/tpl/menuedit.tpl                              |  33 --
 view/tpl/menulist.tpl                              |  40 --
 view/tpl/message_side.tpl                          |   9 -
 view/tpl/micropro_img.tpl                          |   1 -
 view/tpl/micropro_txt.tpl                          |   1 -
 view/tpl/mitemedit.tpl                             |  42 --
 view/tpl/mitemlist.tpl                             |  34 --
 view/tpl/mood_content.tpl                          |  33 --
 view/tpl/msg-header.tpl                            |  81 ---
 view/tpl/myapps.tpl                                |  17 -
 view/tpl/nav.tpl                                   | 222 --------
 view/tpl/nav_login.tpl                             |  18 -
 view/tpl/new_channel.tpl                           |  34 --
 view/tpl/notes.tpl                                 |  35 --
 view/tpl/notifications.tpl                         |  11 -
 view/tpl/notify.tpl                                |   3 -
 view/tpl/nwiki_page_history.tpl                    |  59 --
 view/tpl/oauth_authorize.tpl                       |  10 -
 view/tpl/oauth_authorize_done.tpl                  |   4 -
 view/tpl/oembed_video.tpl                          |   4 -
 view/tpl/oexchange_xrd.tpl                         |  33 --
 view/tpl/page_display.tpl                          |  14 -
 view/tpl/page_display_empty.tpl                    |   1 -
 view/tpl/pdledit.tpl                               |  24 -
 view/tpl/peoplefind.tpl                            |  17 -
 view/tpl/photo_album.tpl                           |  32 --
 view/tpl/photo_albums.tpl                          |  13 -
 view/tpl/photo_drop.tpl                            |   3 -
 view/tpl/photo_item.tpl                            |  34 --
 view/tpl/photo_top.tpl                             |   4 -
 view/tpl/photo_view.tpl                            | 172 ------
 view/tpl/photos_recent.tpl                         |  23 -
 view/tpl/photos_upload.tpl                         |  61 ---
 view/tpl/photosajax.tpl                            |   4 -
 view/tpl/poco_entry_xml.tpl                        |   8 -
 view/tpl/poco_xml.tpl                              |  18 -
 view/tpl/poke_content.tpl                          |  48 --
 view/tpl/posted_date_widget.tpl                    |  46 --
 view/tpl/prep.tpl                                  |  31 --
 view/tpl/profdef_edit.tpl                          |  16 -
 view/tpl/profed_head.tpl                           |   2 -
 view/tpl/profile_advanced.tpl                      | 341 ------------
 view/tpl/profile_edit.tpl                          | 401 --------------
 view/tpl/profile_entry.tpl                         |  11 -
 view/tpl/profile_listing_header.tpl                |  12 -
 view/tpl/profile_photo.tpl                         |  48 --
 view/tpl/profile_tabs.tpl                          |   5 -
 view/tpl/profile_vcard.tpl                         |  62 ---
 view/tpl/profile_vcard_short.tpl                   |  38 --
 view/tpl/prv_message.tpl                           | 104 ----
 view/tpl/pwdreset.tpl                              |  17 -
 view/tpl/rating_form.tpl                           |  25 -
 view/tpl/rating_slider.tpl                         |  19 -
 view/tpl/rbmark.tpl                                |  16 -
 view/tpl/register.tpl                              |  61 ---
 view/tpl/remote_friends_common.tpl                 |  21 -
 view/tpl/remote_login.tpl                          |   1 -
 view/tpl/removeaccount.tpl                         |  20 -
 view/tpl/removeme.tpl                              |  20 -
 view/tpl/rmagic.tpl                                |   9 -
 view/tpl/safesearch.tpl                            |   6 -
 view/tpl/saved_searches.tpl                        |  12 -
 view/tpl/search_item.tpl                           | 114 ----
 view/tpl/searchbox.tpl                             |  12 -
 view/tpl/section_title.tpl                         |   5 -
 view/tpl/select_timezone.tpl                       |  11 -
 view/tpl/sellpage_edit.tpl                         |  23 -
 view/tpl/sellpage_submit.tpl                       |   3 -
 view/tpl/sellpage_view.tpl                         |  11 -
 view/tpl/settings.tpl                              | 192 -------
 view/tpl/settings_account.tpl                      |  28 -
 view/tpl/settings_addons.tpl                       |  11 -
 view/tpl/settings_connectors.tpl                   |  10 -
 view/tpl/settings_display.tpl                      |  86 ---
 view/tpl/settings_features.tpl                     |  30 --
 view/tpl/settings_nick_set.tpl                     |   8 -
 view/tpl/settings_oauth.tpl                        |  36 --
 view/tpl/settings_oauth_edit.tpl                   |  22 -
 view/tpl/settings_permcats.tpl                     |  64 ---
 view/tpl/settings_tokens.tpl                       |  72 ---
 view/tpl/sharedwithme.tpl                          |  26 -
 view/tpl/show_thing.tpl                            |  16 -
 view/tpl/siteinfo.tpl                              |  41 --
 view/tpl/sitesearch.tpl                            |   5 -
 view/tpl/sources_edit.tpl                          |  24 -
 view/tpl/sources_list.tpl                          |  17 -
 view/tpl/sources_new.tpl                           |  17 -
 view/tpl/suggest_friends.tpl                       |  16 -
 view/tpl/suggest_page.tpl                          |   9 -
 view/tpl/suggest_widget.tpl                        |  10 -
 view/tpl/thing_edit.tpl                            |  41 --
 view/tpl/thing_input.tpl                           |  41 --
 view/tpl/threaded_conversation.tpl                 |   8 -
 view/tpl/toggle_mobile_footer.tpl                  |   2 -
 view/tpl/uexport.tpl                               |  19 -
 view/tpl/usermenu.tpl                              |  20 -
 view/tpl/viewcontact_template.tpl                  |  13 -
 view/tpl/viewcontactsajax.tpl                      |   3 -
 view/tpl/webpage_export_list.tpl                   | 124 -----
 view/tpl/webpage_import.tpl                        | 126 -----
 view/tpl/webpagelist.tpl                           |  76 ---
 view/tpl/website_portation_tools.tpl               |  60 ---
 view/tpl/wiki.tpl                                  | 469 ----------------
 view/tpl/wiki_page_history.tpl                     |  59 --
 view/tpl/wiki_page_list.tpl                        |  76 ---
 view/tpl/wikilist.tpl                              |  78 ---
 view/tpl/wikilist_widget.tpl                       |   8 -
 view/tpl/write_pages.tpl                           |   3 -
 view/tpl/xchan_vcard.tpl                           |  10 -
 view/tpl/xrd_diaspora.tpl                          |   3 -
 view/tpl/xrd_host.tpl                              |  11 -
 view/tpl/xrd_person.tpl                            |  31 --
 view/tpl/zcard.tpl                                 | 144 -----
 view/tpl/zcard_embed.tpl                           |   8 -
 554 files changed, 12312 insertions(+), 12312 deletions(-)
 create mode 100755 view/theme/redbasic/tpl/404.tpl
 create mode 100755 view/theme/redbasic/tpl/abook_edit.tpl
 create mode 100644 view/theme/redbasic/tpl/achievements.tpl
 create mode 100755 view/theme/redbasic/tpl/acl_selector.tpl
 create mode 100644 view/theme/redbasic/tpl/admin_account_edit.tpl
 create mode 100755 view/theme/redbasic/tpl/admin_accounts.tpl
 create mode 100755 view/theme/redbasic/tpl/admin_aside.tpl
 create mode 100755 view/theme/redbasic/tpl/admin_channels.tpl
 create mode 100755 view/theme/redbasic/tpl/admin_hubloc.tpl
 create mode 100755 view/theme/redbasic/tpl/admin_logs.tpl
 create mode 100755 view/theme/redbasic/tpl/admin_plugins.tpl
 create mode 100644 view/theme/redbasic/tpl/admin_plugins_addrepo.tpl
 create mode 100755 view/theme/redbasic/tpl/admin_plugins_details.tpl
 create mode 100644 view/theme/redbasic/tpl/admin_profiles.tpl
 create mode 100644 view/theme/redbasic/tpl/admin_queue.tpl
 create mode 100755 view/theme/redbasic/tpl/admin_security.tpl
 create mode 100644 view/theme/redbasic/tpl/admin_settings_features.tpl
 create mode 100755 view/theme/redbasic/tpl/admin_site.tpl
 create mode 100755 view/theme/redbasic/tpl/admin_summary.tpl
 create mode 100755 view/theme/redbasic/tpl/album_edit.tpl
 create mode 100644 view/theme/redbasic/tpl/alt_pager.tpl
 create mode 100755 view/theme/redbasic/tpl/api_config_xml.tpl
 create mode 100755 view/theme/redbasic/tpl/api_friends_xml.tpl
 create mode 100755 view/theme/redbasic/tpl/api_ratelimit_xml.tpl
 create mode 100755 view/theme/redbasic/tpl/api_status_xml.tpl
 create mode 100755 view/theme/redbasic/tpl/api_test_xml.tpl
 create mode 100755 view/theme/redbasic/tpl/api_timeline_atom.tpl
 create mode 100755 view/theme/redbasic/tpl/api_timeline_rss.tpl
 create mode 100755 view/theme/redbasic/tpl/api_timeline_xml.tpl
 create mode 100755 view/theme/redbasic/tpl/api_user_xml.tpl
 create mode 100644 view/theme/redbasic/tpl/app.tpl
 create mode 100644 view/theme/redbasic/tpl/app_create.tpl
 create mode 100755 view/theme/redbasic/tpl/atom_feed.tpl
 create mode 100644 view/theme/redbasic/tpl/attach_edit.tpl
 create mode 100755 view/theme/redbasic/tpl/birthdays_reminder.tpl
 create mode 100644 view/theme/redbasic/tpl/blocklist.tpl
 create mode 100644 view/theme/redbasic/tpl/bookmarkedchats.tpl
 create mode 100755 view/theme/redbasic/tpl/build_query.tpl
 create mode 100755 view/theme/redbasic/tpl/categories_widget.tpl
 create mode 100644 view/theme/redbasic/tpl/cdav_addressbook.tpl
 create mode 100644 view/theme/redbasic/tpl/cdav_calendar.tpl
 create mode 100644 view/theme/redbasic/tpl/cdav_widget_addressbook.tpl
 create mode 100644 view/theme/redbasic/tpl/cdav_widget_calendar.tpl
 create mode 100755 view/theme/redbasic/tpl/channel.tpl
 create mode 100644 view/theme/redbasic/tpl/channel_id_select.tpl
 create mode 100755 view/theme/redbasic/tpl/channel_import.tpl
 create mode 100755 view/theme/redbasic/tpl/channels.tpl
 create mode 100755 view/theme/redbasic/tpl/chanview.tpl
 create mode 100644 view/theme/redbasic/tpl/chat.tpl
 create mode 100644 view/theme/redbasic/tpl/chatroom_members.tpl
 create mode 100644 view/theme/redbasic/tpl/chatroom_new.tpl
 create mode 100644 view/theme/redbasic/tpl/chatroomlist.tpl
 create mode 100644 view/theme/redbasic/tpl/chatrooms.tpl
 create mode 100644 view/theme/redbasic/tpl/cloud.tpl
 create mode 100644 view/theme/redbasic/tpl/cloud_actionspanel.tpl
 create mode 100644 view/theme/redbasic/tpl/cloud_directory.tpl
 create mode 100644 view/theme/redbasic/tpl/cloud_header.tpl
 create mode 100755 view/theme/redbasic/tpl/comment_item.tpl
 create mode 100755 view/theme/redbasic/tpl/common_friends.tpl
 create mode 100755 view/theme/redbasic/tpl/common_tabs.tpl
 create mode 100755 view/theme/redbasic/tpl/connection_template.tpl
 create mode 100755 view/theme/redbasic/tpl/connections.tpl
 create mode 100755 view/theme/redbasic/tpl/contact_block.tpl
 create mode 100755 view/theme/redbasic/tpl/contact_head.tpl
 create mode 100755 view/theme/redbasic/tpl/contact_slider.tpl
 create mode 100755 view/theme/redbasic/tpl/contact_template.tpl
 create mode 100644 view/theme/redbasic/tpl/contactsajax.tpl
 create mode 100755 view/theme/redbasic/tpl/conv.tpl
 create mode 100755 view/theme/redbasic/tpl/conv_frame.tpl
 create mode 100755 view/theme/redbasic/tpl/conv_item.tpl
 create mode 100755 view/theme/redbasic/tpl/conv_list.tpl
 create mode 100755 view/theme/redbasic/tpl/conversation.tpl
 create mode 100755 view/theme/redbasic/tpl/convobj.tpl
 create mode 100755 view/theme/redbasic/tpl/cover_photo.tpl
 create mode 100755 view/theme/redbasic/tpl/cover_photo_widget.tpl
 create mode 100755 view/theme/redbasic/tpl/cropbody.tpl
 create mode 100755 view/theme/redbasic/tpl/cropcover.tpl
 create mode 100755 view/theme/redbasic/tpl/crophead.tpl
 create mode 100755 view/theme/redbasic/tpl/delegate.tpl
 create mode 100644 view/theme/redbasic/tpl/design_tools.tpl
 create mode 100644 view/theme/redbasic/tpl/diaspora_vcard.tpl
 create mode 100644 view/theme/redbasic/tpl/dir_sort_links.tpl
 create mode 100644 view/theme/redbasic/tpl/directajax.tpl
 create mode 100755 view/theme/redbasic/tpl/directory_header.tpl
 create mode 100755 view/theme/redbasic/tpl/direntry.tpl
 create mode 100755 view/theme/redbasic/tpl/display-head.tpl
 create mode 100644 view/theme/redbasic/tpl/dreport.tpl
 create mode 100755 view/theme/redbasic/tpl/edpost_head.tpl
 create mode 100755 view/theme/redbasic/tpl/email_notify_html.tpl
 create mode 100755 view/theme/redbasic/tpl/email_notify_text.tpl
 create mode 100755 view/theme/redbasic/tpl/event.tpl
 create mode 100755 view/theme/redbasic/tpl/event_cal.tpl
 create mode 100755 view/theme/redbasic/tpl/event_form.tpl
 create mode 100755 view/theme/redbasic/tpl/event_head.tpl
 create mode 100644 view/theme/redbasic/tpl/event_item_content.tpl
 create mode 100755 view/theme/redbasic/tpl/event_item_header.tpl
 create mode 100755 view/theme/redbasic/tpl/events-js.tpl
 create mode 100755 view/theme/redbasic/tpl/events_cal-js.tpl
 create mode 100755 view/theme/redbasic/tpl/events_menu_side.tpl
 create mode 100755 view/theme/redbasic/tpl/events_reminder.tpl
 create mode 100755 view/theme/redbasic/tpl/events_tools_side.tpl
 create mode 100755 view/theme/redbasic/tpl/failed_updates.tpl
 create mode 100755 view/theme/redbasic/tpl/field.tpl
 create mode 100755 view/theme/redbasic/tpl/field_acheckbox.tpl
 create mode 100755 view/theme/redbasic/tpl/field_checkbox.tpl
 create mode 100644 view/theme/redbasic/tpl/field_colorinput.tpl
 create mode 100755 view/theme/redbasic/tpl/field_combobox.tpl
 create mode 100755 view/theme/redbasic/tpl/field_custom.tpl
 create mode 100755 view/theme/redbasic/tpl/field_input.tpl
 create mode 100755 view/theme/redbasic/tpl/field_intcheckbox.tpl
 create mode 100755 view/theme/redbasic/tpl/field_password.tpl
 create mode 100755 view/theme/redbasic/tpl/field_radio.tpl
 create mode 100755 view/theme/redbasic/tpl/field_richtext.tpl
 create mode 100755 view/theme/redbasic/tpl/field_select.tpl
 create mode 100644 view/theme/redbasic/tpl/field_select_disabled.tpl
 create mode 100644 view/theme/redbasic/tpl/field_select_grouped.tpl
 create mode 100755 view/theme/redbasic/tpl/field_select_raw.tpl
 create mode 100755 view/theme/redbasic/tpl/field_textarea.tpl
 create mode 100755 view/theme/redbasic/tpl/field_themeselect.tpl
 create mode 100755 view/theme/redbasic/tpl/field_yesno.tpl
 create mode 100755 view/theme/redbasic/tpl/fileas_widget.tpl
 create mode 100755 view/theme/redbasic/tpl/filebrowser.tpl
 create mode 100755 view/theme/redbasic/tpl/filer_dialog.tpl
 create mode 100755 view/theme/redbasic/tpl/follow.tpl
 create mode 100644 view/theme/redbasic/tpl/force_image_reload.tpl
 create mode 100644 view/theme/redbasic/tpl/generic_addon_settings.tpl
 create mode 100755 view/theme/redbasic/tpl/generic_links_widget.tpl
 create mode 100644 view/theme/redbasic/tpl/generic_modal.tpl
 create mode 100755 view/theme/redbasic/tpl/group_drop.tpl
 create mode 100755 view/theme/redbasic/tpl/group_edit.tpl
 create mode 100755 view/theme/redbasic/tpl/group_selection.tpl
 create mode 100755 view/theme/redbasic/tpl/group_side.tpl
 create mode 100755 view/theme/redbasic/tpl/groupeditor.tpl
 create mode 100644 view/theme/redbasic/tpl/hdr.tpl
 create mode 100755 view/theme/redbasic/tpl/head.tpl
 create mode 100644 view/theme/redbasic/tpl/help.tpl
 create mode 100755 view/theme/redbasic/tpl/install.tpl
 create mode 100755 view/theme/redbasic/tpl/install_checks.tpl
 create mode 100755 view/theme/redbasic/tpl/install_db.tpl
 create mode 100755 view/theme/redbasic/tpl/install_settings.tpl
 create mode 100755 view/theme/redbasic/tpl/invite.tpl
 create mode 100644 view/theme/redbasic/tpl/item_attach.tpl
 create mode 100644 view/theme/redbasic/tpl/item_binary.tpl
 create mode 100644 view/theme/redbasic/tpl/item_categories.tpl
 create mode 100644 view/theme/redbasic/tpl/item_filer.tpl
 create mode 100755 view/theme/redbasic/tpl/item_import.tpl
 create mode 100755 view/theme/redbasic/tpl/jot-header.tpl
 create mode 100755 view/theme/redbasic/tpl/jot.tpl
 create mode 100755 view/theme/redbasic/tpl/jot_geotag.tpl
 create mode 100755 view/theme/redbasic/tpl/js_strings.tpl
 create mode 100755 view/theme/redbasic/tpl/lang_selector.tpl
 create mode 100644 view/theme/redbasic/tpl/layoutlist.tpl
 create mode 100755 view/theme/redbasic/tpl/like_noshare.tpl
 create mode 100644 view/theme/redbasic/tpl/locmanage.tpl
 create mode 100755 view/theme/redbasic/tpl/login.tpl
 create mode 100755 view/theme/redbasic/tpl/logout.tpl
 create mode 100755 view/theme/redbasic/tpl/lostpass.tpl
 create mode 100755 view/theme/redbasic/tpl/mail_conv.tpl
 create mode 100755 view/theme/redbasic/tpl/mail_display.tpl
 create mode 100755 view/theme/redbasic/tpl/mail_head.tpl
 create mode 100755 view/theme/redbasic/tpl/mail_list.tpl
 create mode 100755 view/theme/redbasic/tpl/main_slider.tpl
 create mode 100755 view/theme/redbasic/tpl/match.tpl
 create mode 100644 view/theme/redbasic/tpl/menuedit.tpl
 create mode 100644 view/theme/redbasic/tpl/menulist.tpl
 create mode 100755 view/theme/redbasic/tpl/message_side.tpl
 create mode 100755 view/theme/redbasic/tpl/micropro_img.tpl
 create mode 100755 view/theme/redbasic/tpl/micropro_txt.tpl
 create mode 100644 view/theme/redbasic/tpl/mitemedit.tpl
 create mode 100644 view/theme/redbasic/tpl/mitemlist.tpl
 create mode 100755 view/theme/redbasic/tpl/mood_content.tpl
 create mode 100755 view/theme/redbasic/tpl/msg-header.tpl
 create mode 100755 view/theme/redbasic/tpl/myapps.tpl
 create mode 100755 view/theme/redbasic/tpl/nav.tpl
 create mode 100644 view/theme/redbasic/tpl/nav_login.tpl
 create mode 100755 view/theme/redbasic/tpl/new_channel.tpl
 create mode 100644 view/theme/redbasic/tpl/notes.tpl
 create mode 100755 view/theme/redbasic/tpl/notifications.tpl
 create mode 100755 view/theme/redbasic/tpl/notify.tpl
 create mode 100644 view/theme/redbasic/tpl/nwiki_page_history.tpl
 create mode 100755 view/theme/redbasic/tpl/oauth_authorize.tpl
 create mode 100755 view/theme/redbasic/tpl/oauth_authorize_done.tpl
 create mode 100755 view/theme/redbasic/tpl/oembed_video.tpl
 create mode 100755 view/theme/redbasic/tpl/oexchange_xrd.tpl
 create mode 100755 view/theme/redbasic/tpl/page_display.tpl
 create mode 100644 view/theme/redbasic/tpl/page_display_empty.tpl
 create mode 100644 view/theme/redbasic/tpl/pdledit.tpl
 create mode 100755 view/theme/redbasic/tpl/peoplefind.tpl
 create mode 100755 view/theme/redbasic/tpl/photo_album.tpl
 create mode 100755 view/theme/redbasic/tpl/photo_albums.tpl
 create mode 100755 view/theme/redbasic/tpl/photo_drop.tpl
 create mode 100755 view/theme/redbasic/tpl/photo_item.tpl
 create mode 100755 view/theme/redbasic/tpl/photo_top.tpl
 create mode 100755 view/theme/redbasic/tpl/photo_view.tpl
 create mode 100755 view/theme/redbasic/tpl/photos_recent.tpl
 create mode 100755 view/theme/redbasic/tpl/photos_upload.tpl
 create mode 100755 view/theme/redbasic/tpl/photosajax.tpl
 create mode 100755 view/theme/redbasic/tpl/poco_entry_xml.tpl
 create mode 100755 view/theme/redbasic/tpl/poco_xml.tpl
 create mode 100755 view/theme/redbasic/tpl/poke_content.tpl
 create mode 100755 view/theme/redbasic/tpl/posted_date_widget.tpl
 create mode 100644 view/theme/redbasic/tpl/prep.tpl
 create mode 100644 view/theme/redbasic/tpl/profdef_edit.tpl
 create mode 100755 view/theme/redbasic/tpl/profed_head.tpl
 create mode 100755 view/theme/redbasic/tpl/profile_advanced.tpl
 create mode 100755 view/theme/redbasic/tpl/profile_edit.tpl
 create mode 100755 view/theme/redbasic/tpl/profile_entry.tpl
 create mode 100755 view/theme/redbasic/tpl/profile_listing_header.tpl
 create mode 100755 view/theme/redbasic/tpl/profile_photo.tpl
 create mode 100644 view/theme/redbasic/tpl/profile_tabs.tpl
 create mode 100755 view/theme/redbasic/tpl/profile_vcard.tpl
 create mode 100755 view/theme/redbasic/tpl/profile_vcard_short.tpl
 create mode 100755 view/theme/redbasic/tpl/prv_message.tpl
 create mode 100755 view/theme/redbasic/tpl/pwdreset.tpl
 create mode 100644 view/theme/redbasic/tpl/rating_form.tpl
 create mode 100644 view/theme/redbasic/tpl/rating_slider.tpl
 create mode 100644 view/theme/redbasic/tpl/rbmark.tpl
 create mode 100755 view/theme/redbasic/tpl/register.tpl
 create mode 100755 view/theme/redbasic/tpl/remote_friends_common.tpl
 create mode 100644 view/theme/redbasic/tpl/remote_login.tpl
 create mode 100644 view/theme/redbasic/tpl/removeaccount.tpl
 create mode 100755 view/theme/redbasic/tpl/removeme.tpl
 create mode 100755 view/theme/redbasic/tpl/rmagic.tpl
 create mode 100644 view/theme/redbasic/tpl/safesearch.tpl
 create mode 100644 view/theme/redbasic/tpl/saved_searches.tpl
 create mode 100755 view/theme/redbasic/tpl/search_item.tpl
 create mode 100644 view/theme/redbasic/tpl/searchbox.tpl
 create mode 100644 view/theme/redbasic/tpl/section_title.tpl
 create mode 100644 view/theme/redbasic/tpl/select_timezone.tpl
 create mode 100644 view/theme/redbasic/tpl/sellpage_edit.tpl
 create mode 100644 view/theme/redbasic/tpl/sellpage_submit.tpl
 create mode 100644 view/theme/redbasic/tpl/sellpage_view.tpl
 create mode 100755 view/theme/redbasic/tpl/settings.tpl
 create mode 100755 view/theme/redbasic/tpl/settings_account.tpl
 create mode 100755 view/theme/redbasic/tpl/settings_addons.tpl
 create mode 100755 view/theme/redbasic/tpl/settings_connectors.tpl
 create mode 100755 view/theme/redbasic/tpl/settings_display.tpl
 create mode 100755 view/theme/redbasic/tpl/settings_features.tpl
 create mode 100755 view/theme/redbasic/tpl/settings_nick_set.tpl
 create mode 100755 view/theme/redbasic/tpl/settings_oauth.tpl
 create mode 100755 view/theme/redbasic/tpl/settings_oauth_edit.tpl
 create mode 100644 view/theme/redbasic/tpl/settings_permcats.tpl
 create mode 100644 view/theme/redbasic/tpl/settings_tokens.tpl
 create mode 100644 view/theme/redbasic/tpl/sharedwithme.tpl
 create mode 100644 view/theme/redbasic/tpl/show_thing.tpl
 create mode 100755 view/theme/redbasic/tpl/siteinfo.tpl
 create mode 100644 view/theme/redbasic/tpl/sitesearch.tpl
 create mode 100644 view/theme/redbasic/tpl/sources_edit.tpl
 create mode 100644 view/theme/redbasic/tpl/sources_list.tpl
 create mode 100644 view/theme/redbasic/tpl/sources_new.tpl
 create mode 100755 view/theme/redbasic/tpl/suggest_friends.tpl
 create mode 100755 view/theme/redbasic/tpl/suggest_page.tpl
 create mode 100644 view/theme/redbasic/tpl/suggest_widget.tpl
 create mode 100644 view/theme/redbasic/tpl/thing_edit.tpl
 create mode 100644 view/theme/redbasic/tpl/thing_input.tpl
 create mode 100755 view/theme/redbasic/tpl/threaded_conversation.tpl
 create mode 100755 view/theme/redbasic/tpl/toggle_mobile_footer.tpl
 create mode 100644 view/theme/redbasic/tpl/uexport.tpl
 create mode 100644 view/theme/redbasic/tpl/usermenu.tpl
 create mode 100755 view/theme/redbasic/tpl/viewcontact_template.tpl
 create mode 100644 view/theme/redbasic/tpl/viewcontactsajax.tpl
 create mode 100644 view/theme/redbasic/tpl/webpage_export_list.tpl
 create mode 100644 view/theme/redbasic/tpl/webpage_import.tpl
 create mode 100644 view/theme/redbasic/tpl/webpagelist.tpl
 create mode 100644 view/theme/redbasic/tpl/website_portation_tools.tpl
 create mode 100644 view/theme/redbasic/tpl/wiki.tpl
 create mode 100644 view/theme/redbasic/tpl/wiki_page_history.tpl
 create mode 100644 view/theme/redbasic/tpl/wiki_page_list.tpl
 create mode 100644 view/theme/redbasic/tpl/wikilist.tpl
 create mode 100644 view/theme/redbasic/tpl/wikilist_widget.tpl
 create mode 100644 view/theme/redbasic/tpl/write_pages.tpl
 create mode 100755 view/theme/redbasic/tpl/xchan_vcard.tpl
 create mode 100644 view/theme/redbasic/tpl/xrd_diaspora.tpl
 create mode 100755 view/theme/redbasic/tpl/xrd_host.tpl
 create mode 100755 view/theme/redbasic/tpl/xrd_person.tpl
 create mode 100644 view/theme/redbasic/tpl/zcard.tpl
 create mode 100644 view/theme/redbasic/tpl/zcard_embed.tpl
 delete mode 100755 view/tpl/404.tpl
 delete mode 100755 view/tpl/abook_edit.tpl
 delete mode 100644 view/tpl/achievements.tpl
 delete mode 100755 view/tpl/acl_selector.tpl
 delete mode 100644 view/tpl/admin_account_edit.tpl
 delete mode 100755 view/tpl/admin_accounts.tpl
 delete mode 100755 view/tpl/admin_aside.tpl
 delete mode 100755 view/tpl/admin_channels.tpl
 delete mode 100755 view/tpl/admin_hubloc.tpl
 delete mode 100755 view/tpl/admin_logs.tpl
 delete mode 100755 view/tpl/admin_plugins.tpl
 delete mode 100644 view/tpl/admin_plugins_addrepo.tpl
 delete mode 100755 view/tpl/admin_plugins_details.tpl
 delete mode 100644 view/tpl/admin_profiles.tpl
 delete mode 100644 view/tpl/admin_queue.tpl
 delete mode 100755 view/tpl/admin_security.tpl
 delete mode 100644 view/tpl/admin_settings_features.tpl
 delete mode 100755 view/tpl/admin_site.tpl
 delete mode 100755 view/tpl/admin_summary.tpl
 delete mode 100755 view/tpl/album_edit.tpl
 delete mode 100644 view/tpl/alt_pager.tpl
 delete mode 100755 view/tpl/api_config_xml.tpl
 delete mode 100755 view/tpl/api_friends_xml.tpl
 delete mode 100755 view/tpl/api_ratelimit_xml.tpl
 delete mode 100755 view/tpl/api_status_xml.tpl
 delete mode 100755 view/tpl/api_test_xml.tpl
 delete mode 100755 view/tpl/api_timeline_atom.tpl
 delete mode 100755 view/tpl/api_timeline_rss.tpl
 delete mode 100755 view/tpl/api_timeline_xml.tpl
 delete mode 100755 view/tpl/api_user_xml.tpl
 delete mode 100644 view/tpl/app.tpl
 delete mode 100644 view/tpl/app_create.tpl
 delete mode 100755 view/tpl/atom_feed.tpl
 delete mode 100644 view/tpl/attach_edit.tpl
 delete mode 100755 view/tpl/birthdays_reminder.tpl
 delete mode 100644 view/tpl/blocklist.tpl
 delete mode 100644 view/tpl/bookmarkedchats.tpl
 delete mode 100755 view/tpl/build_query.tpl
 delete mode 100755 view/tpl/categories_widget.tpl
 delete mode 100644 view/tpl/cdav_addressbook.tpl
 delete mode 100644 view/tpl/cdav_calendar.tpl
 delete mode 100644 view/tpl/cdav_widget_addressbook.tpl
 delete mode 100644 view/tpl/cdav_widget_calendar.tpl
 delete mode 100755 view/tpl/channel.tpl
 delete mode 100644 view/tpl/channel_id_select.tpl
 delete mode 100755 view/tpl/channel_import.tpl
 delete mode 100755 view/tpl/channels.tpl
 delete mode 100755 view/tpl/chanview.tpl
 delete mode 100644 view/tpl/chat.tpl
 delete mode 100644 view/tpl/chatroom_members.tpl
 delete mode 100644 view/tpl/chatroom_new.tpl
 delete mode 100644 view/tpl/chatroomlist.tpl
 delete mode 100644 view/tpl/chatrooms.tpl
 delete mode 100644 view/tpl/cloud.tpl
 delete mode 100644 view/tpl/cloud_actionspanel.tpl
 delete mode 100644 view/tpl/cloud_directory.tpl
 delete mode 100644 view/tpl/cloud_header.tpl
 delete mode 100755 view/tpl/comment_item.tpl
 delete mode 100755 view/tpl/common_friends.tpl
 delete mode 100755 view/tpl/common_tabs.tpl
 delete mode 100755 view/tpl/connection_template.tpl
 delete mode 100755 view/tpl/connections.tpl
 delete mode 100755 view/tpl/contact_block.tpl
 delete mode 100755 view/tpl/contact_head.tpl
 delete mode 100755 view/tpl/contact_slider.tpl
 delete mode 100755 view/tpl/contact_template.tpl
 delete mode 100644 view/tpl/contactsajax.tpl
 delete mode 100755 view/tpl/conv.tpl
 delete mode 100755 view/tpl/conv_frame.tpl
 delete mode 100755 view/tpl/conv_item.tpl
 delete mode 100755 view/tpl/conv_list.tpl
 delete mode 100755 view/tpl/conversation.tpl
 delete mode 100755 view/tpl/convobj.tpl
 delete mode 100755 view/tpl/cover_photo.tpl
 delete mode 100755 view/tpl/cover_photo_widget.tpl
 delete mode 100755 view/tpl/cropbody.tpl
 delete mode 100755 view/tpl/cropcover.tpl
 delete mode 100755 view/tpl/crophead.tpl
 delete mode 100755 view/tpl/delegate.tpl
 delete mode 100644 view/tpl/design_tools.tpl
 delete mode 100644 view/tpl/diaspora_vcard.tpl
 delete mode 100644 view/tpl/dir_sort_links.tpl
 delete mode 100644 view/tpl/directajax.tpl
 delete mode 100755 view/tpl/directory_header.tpl
 delete mode 100755 view/tpl/direntry.tpl
 delete mode 100755 view/tpl/display-head.tpl
 delete mode 100644 view/tpl/dreport.tpl
 delete mode 100755 view/tpl/edpost_head.tpl
 delete mode 100755 view/tpl/email_notify_html.tpl
 delete mode 100755 view/tpl/email_notify_text.tpl
 delete mode 100755 view/tpl/event.tpl
 delete mode 100755 view/tpl/event_cal.tpl
 delete mode 100755 view/tpl/event_form.tpl
 delete mode 100755 view/tpl/event_head.tpl
 delete mode 100644 view/tpl/event_item_content.tpl
 delete mode 100755 view/tpl/event_item_header.tpl
 delete mode 100755 view/tpl/events-js.tpl
 delete mode 100755 view/tpl/events_cal-js.tpl
 delete mode 100755 view/tpl/events_menu_side.tpl
 delete mode 100755 view/tpl/events_reminder.tpl
 delete mode 100755 view/tpl/events_tools_side.tpl
 delete mode 100755 view/tpl/failed_updates.tpl
 delete mode 100755 view/tpl/field.tpl
 delete mode 100755 view/tpl/field_acheckbox.tpl
 delete mode 100755 view/tpl/field_checkbox.tpl
 delete mode 100644 view/tpl/field_colorinput.tpl
 delete mode 100755 view/tpl/field_combobox.tpl
 delete mode 100755 view/tpl/field_custom.tpl
 delete mode 100755 view/tpl/field_input.tpl
 delete mode 100755 view/tpl/field_intcheckbox.tpl
 delete mode 100755 view/tpl/field_password.tpl
 delete mode 100755 view/tpl/field_radio.tpl
 delete mode 100755 view/tpl/field_richtext.tpl
 delete mode 100755 view/tpl/field_select.tpl
 delete mode 100644 view/tpl/field_select_disabled.tpl
 delete mode 100644 view/tpl/field_select_grouped.tpl
 delete mode 100755 view/tpl/field_select_raw.tpl
 delete mode 100755 view/tpl/field_textarea.tpl
 delete mode 100755 view/tpl/field_themeselect.tpl
 delete mode 100755 view/tpl/field_yesno.tpl
 delete mode 100755 view/tpl/fileas_widget.tpl
 delete mode 100755 view/tpl/filebrowser.tpl
 delete mode 100755 view/tpl/filer_dialog.tpl
 delete mode 100755 view/tpl/follow.tpl
 delete mode 100644 view/tpl/force_image_reload.tpl
 delete mode 100644 view/tpl/generic_addon_settings.tpl
 delete mode 100755 view/tpl/generic_links_widget.tpl
 delete mode 100644 view/tpl/generic_modal.tpl
 delete mode 100755 view/tpl/group_drop.tpl
 delete mode 100755 view/tpl/group_edit.tpl
 delete mode 100755 view/tpl/group_selection.tpl
 delete mode 100755 view/tpl/group_side.tpl
 delete mode 100755 view/tpl/groupeditor.tpl
 delete mode 100644 view/tpl/hdr.tpl
 delete mode 100755 view/tpl/head.tpl
 delete mode 100644 view/tpl/help.tpl
 delete mode 100755 view/tpl/install.tpl
 delete mode 100755 view/tpl/install_checks.tpl
 delete mode 100755 view/tpl/install_db.tpl
 delete mode 100755 view/tpl/install_settings.tpl
 delete mode 100755 view/tpl/invite.tpl
 delete mode 100644 view/tpl/item_attach.tpl
 delete mode 100644 view/tpl/item_binary.tpl
 delete mode 100644 view/tpl/item_categories.tpl
 delete mode 100644 view/tpl/item_filer.tpl
 delete mode 100755 view/tpl/item_import.tpl
 delete mode 100755 view/tpl/jot-header.tpl
 delete mode 100755 view/tpl/jot.tpl
 delete mode 100755 view/tpl/jot_geotag.tpl
 delete mode 100755 view/tpl/js_strings.tpl
 delete mode 100755 view/tpl/lang_selector.tpl
 delete mode 100644 view/tpl/layoutlist.tpl
 delete mode 100755 view/tpl/like_noshare.tpl
 delete mode 100644 view/tpl/locmanage.tpl
 delete mode 100755 view/tpl/login.tpl
 delete mode 100755 view/tpl/logout.tpl
 delete mode 100755 view/tpl/lostpass.tpl
 delete mode 100755 view/tpl/mail_conv.tpl
 delete mode 100755 view/tpl/mail_display.tpl
 delete mode 100755 view/tpl/mail_head.tpl
 delete mode 100755 view/tpl/mail_list.tpl
 delete mode 100755 view/tpl/main_slider.tpl
 delete mode 100755 view/tpl/match.tpl
 delete mode 100644 view/tpl/menuedit.tpl
 delete mode 100644 view/tpl/menulist.tpl
 delete mode 100755 view/tpl/message_side.tpl
 delete mode 100755 view/tpl/micropro_img.tpl
 delete mode 100755 view/tpl/micropro_txt.tpl
 delete mode 100644 view/tpl/mitemedit.tpl
 delete mode 100644 view/tpl/mitemlist.tpl
 delete mode 100755 view/tpl/mood_content.tpl
 delete mode 100755 view/tpl/msg-header.tpl
 delete mode 100755 view/tpl/myapps.tpl
 delete mode 100755 view/tpl/nav.tpl
 delete mode 100644 view/tpl/nav_login.tpl
 delete mode 100755 view/tpl/new_channel.tpl
 delete mode 100644 view/tpl/notes.tpl
 delete mode 100755 view/tpl/notifications.tpl
 delete mode 100755 view/tpl/notify.tpl
 delete mode 100644 view/tpl/nwiki_page_history.tpl
 delete mode 100755 view/tpl/oauth_authorize.tpl
 delete mode 100755 view/tpl/oauth_authorize_done.tpl
 delete mode 100755 view/tpl/oembed_video.tpl
 delete mode 100755 view/tpl/oexchange_xrd.tpl
 delete mode 100755 view/tpl/page_display.tpl
 delete mode 100644 view/tpl/page_display_empty.tpl
 delete mode 100644 view/tpl/pdledit.tpl
 delete mode 100755 view/tpl/peoplefind.tpl
 delete mode 100755 view/tpl/photo_album.tpl
 delete mode 100755 view/tpl/photo_albums.tpl
 delete mode 100755 view/tpl/photo_drop.tpl
 delete mode 100755 view/tpl/photo_item.tpl
 delete mode 100755 view/tpl/photo_top.tpl
 delete mode 100755 view/tpl/photo_view.tpl
 delete mode 100755 view/tpl/photos_recent.tpl
 delete mode 100755 view/tpl/photos_upload.tpl
 delete mode 100755 view/tpl/photosajax.tpl
 delete mode 100755 view/tpl/poco_entry_xml.tpl
 delete mode 100755 view/tpl/poco_xml.tpl
 delete mode 100755 view/tpl/poke_content.tpl
 delete mode 100755 view/tpl/posted_date_widget.tpl
 delete mode 100644 view/tpl/prep.tpl
 delete mode 100644 view/tpl/profdef_edit.tpl
 delete mode 100755 view/tpl/profed_head.tpl
 delete mode 100755 view/tpl/profile_advanced.tpl
 delete mode 100755 view/tpl/profile_edit.tpl
 delete mode 100755 view/tpl/profile_entry.tpl
 delete mode 100755 view/tpl/profile_listing_header.tpl
 delete mode 100755 view/tpl/profile_photo.tpl
 delete mode 100644 view/tpl/profile_tabs.tpl
 delete mode 100755 view/tpl/profile_vcard.tpl
 delete mode 100755 view/tpl/profile_vcard_short.tpl
 delete mode 100755 view/tpl/prv_message.tpl
 delete mode 100755 view/tpl/pwdreset.tpl
 delete mode 100644 view/tpl/rating_form.tpl
 delete mode 100644 view/tpl/rating_slider.tpl
 delete mode 100644 view/tpl/rbmark.tpl
 delete mode 100755 view/tpl/register.tpl
 delete mode 100755 view/tpl/remote_friends_common.tpl
 delete mode 100644 view/tpl/remote_login.tpl
 delete mode 100644 view/tpl/removeaccount.tpl
 delete mode 100755 view/tpl/removeme.tpl
 delete mode 100755 view/tpl/rmagic.tpl
 delete mode 100644 view/tpl/safesearch.tpl
 delete mode 100644 view/tpl/saved_searches.tpl
 delete mode 100755 view/tpl/search_item.tpl
 delete mode 100644 view/tpl/searchbox.tpl
 delete mode 100644 view/tpl/section_title.tpl
 delete mode 100644 view/tpl/select_timezone.tpl
 delete mode 100644 view/tpl/sellpage_edit.tpl
 delete mode 100644 view/tpl/sellpage_submit.tpl
 delete mode 100644 view/tpl/sellpage_view.tpl
 delete mode 100755 view/tpl/settings.tpl
 delete mode 100755 view/tpl/settings_account.tpl
 delete mode 100755 view/tpl/settings_addons.tpl
 delete mode 100755 view/tpl/settings_connectors.tpl
 delete mode 100755 view/tpl/settings_display.tpl
 delete mode 100755 view/tpl/settings_features.tpl
 delete mode 100755 view/tpl/settings_nick_set.tpl
 delete mode 100755 view/tpl/settings_oauth.tpl
 delete mode 100755 view/tpl/settings_oauth_edit.tpl
 delete mode 100644 view/tpl/settings_permcats.tpl
 delete mode 100644 view/tpl/settings_tokens.tpl
 delete mode 100644 view/tpl/sharedwithme.tpl
 delete mode 100644 view/tpl/show_thing.tpl
 delete mode 100755 view/tpl/siteinfo.tpl
 delete mode 100644 view/tpl/sitesearch.tpl
 delete mode 100644 view/tpl/sources_edit.tpl
 delete mode 100644 view/tpl/sources_list.tpl
 delete mode 100644 view/tpl/sources_new.tpl
 delete mode 100755 view/tpl/suggest_friends.tpl
 delete mode 100755 view/tpl/suggest_page.tpl
 delete mode 100644 view/tpl/suggest_widget.tpl
 delete mode 100644 view/tpl/thing_edit.tpl
 delete mode 100644 view/tpl/thing_input.tpl
 delete mode 100755 view/tpl/threaded_conversation.tpl
 delete mode 100755 view/tpl/toggle_mobile_footer.tpl
 delete mode 100644 view/tpl/uexport.tpl
 delete mode 100644 view/tpl/usermenu.tpl
 delete mode 100755 view/tpl/viewcontact_template.tpl
 delete mode 100644 view/tpl/viewcontactsajax.tpl
 delete mode 100644 view/tpl/webpage_export_list.tpl
 delete mode 100644 view/tpl/webpage_import.tpl
 delete mode 100644 view/tpl/webpagelist.tpl
 delete mode 100644 view/tpl/website_portation_tools.tpl
 delete mode 100644 view/tpl/wiki.tpl
 delete mode 100644 view/tpl/wiki_page_history.tpl
 delete mode 100644 view/tpl/wiki_page_list.tpl
 delete mode 100644 view/tpl/wikilist.tpl
 delete mode 100644 view/tpl/wikilist_widget.tpl
 delete mode 100644 view/tpl/write_pages.tpl
 delete mode 100755 view/tpl/xchan_vcard.tpl
 delete mode 100644 view/tpl/xrd_diaspora.tpl
 delete mode 100755 view/tpl/xrd_host.tpl
 delete mode 100755 view/tpl/xrd_person.tpl
 delete mode 100644 view/tpl/zcard.tpl
 delete mode 100644 view/tpl/zcard_embed.tpl

(limited to 'view')

diff --git a/view/theme/redbasic/tpl/404.tpl b/view/theme/redbasic/tpl/404.tpl
new file mode 100755
index 000000000..c9b51a63b
--- /dev/null
+++ b/view/theme/redbasic/tpl/404.tpl
@@ -0,0 +1,3 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$message}}</h1>
+</div>
diff --git a/view/theme/redbasic/tpl/abook_edit.tpl b/view/theme/redbasic/tpl/abook_edit.tpl
new file mode 100755
index 000000000..9fb5c4b18
--- /dev/null
+++ b/view/theme/redbasic/tpl/abook_edit.tpl
@@ -0,0 +1,519 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $notself}}
+		<div class="pull-right">
+			<div class="btn-group">
+				<button id="connection-dropdown" class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
+				</button>
+				<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
+					<a class="dropdown-item" href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a>
+					<a class="dropdown-item" href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a>
+					{{if $tools.fetchvc}}
+					<a class="dropdown-item" href="{{$tools.fetchvc.url}}" title="{{$tools.fetchvc.title}}">{{$tools.fetchvc.label}}</a>
+					{{/if}}
+					<a class="dropdown-item" href="#" title="{{$tools.refresh.title}}" onclick="window.location.href='{{$tools.refresh.url}}'; return false;">{{$tools.refresh.label}}</a>
+					<a class="dropdown-item" href="#" title="{{$tools.rephoto.title}}" onclick="window.location.href='{{$tools.rephoto.url}}'; return false;">{{$tools.rephoto.label}}</a>
+					<div class="dropdown-divider"></div>
+					<a class="dropdown-item" href="#" title="{{$tools.block.title}}" onclick="window.location.href='{{$tools.block.url}}'; return false;">{{$tools.block.label}}</a>
+					<a class="dropdown-item" href="#" title="{{$tools.ignore.title}}" onclick="window.location.href='{{$tools.ignore.url}}'; return false;">{{$tools.ignore.label}}</a>
+					<a class="dropdown-item" href="#" title="{{$tools.archive.title}}" onclick="window.location.href='{{$tools.archive.url}}'; return false;">{{$tools.archive.label}}</a>					<a class="dropdown-item" href="#" title="{{$tools.hide.title}}" onclick="window.location.href='{{$tools.hide.url}}'; return false;">{{$tools.hide.label}}</a>
+					<a class="dropdown-item" href="#" title="{{$tools.delete.title}}" onclick="window.location.href='{{$tools.delete.url}}'; return false;">{{$tools.delete.label}}</a>
+				</div>
+			</div>
+			{{if $abook_prev || $abook_next}}
+			<div class="btn-group">
+				<a href="connedit/{{$abook_prev}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a>
+				<div class="btn-group" >
+					<button class="btn btn-outline-secondary btn-sm{{if $is_pending}} disabled{{/if}}" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button>
+					<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
+						{{foreach $sections as $s}}
+						<a class="dropdown-item" href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a>
+						{{/foreach}}
+					</div>
+				</div>
+				<a href="connedit/{{$abook_next}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_next}} disabled{{/if}}" ><i class="fa fa-forward"></i></a>
+			</div>
+			{{/if}}
+		</div>
+		{{/if}}
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper-np">
+		{{if $notself}}
+		{{foreach $tools as $tool}}
+		{{if $tool.info}}
+		<div class="section-content-danger-wrapper">
+			<div>
+				{{$tool.info}}
+			</div>
+		</div>
+		{{/if}}
+		{{/foreach}}
+		<div class="section-content-info-wrapper">
+			<div>
+				{{$addr_text}} <strong>'{{$addr}}'</strong>			
+			</div>
+			{{if $locstr}}
+			<div>
+				{{$loc_text}} {{$locstr}}
+			</div>
+			{{/if}}
+			{{if $last_update}}
+			<div>
+				{{$lastupdtext}} {{$last_update}}
+			</div>
+			{{/if}}
+		</div>
+		{{/if}}
+
+		<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
+
+		<input type="hidden" name="contact_id" value="{{$contact_id}}">
+		<input type="hidden" name="section" value="{{$section}}">
+
+		<div class="panel-group" id="contact-edit-tools" role="tablist" aria-multiselectable="true">
+			{{if $notself}}
+
+			{{if $is_pending}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="pending-tool">
+					<h3>
+						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse">
+							{{$pending_label}}
+						</a>
+					</h3>
+				</div>
+				<div id="pending-tool-collapse" class="panel-collapse collapse show" role="tabpanel" aria-labelledby="pending-tool">
+					<div class="section-content-tools-wrapper">
+						{{include file="field_checkbox.tpl" field=$unapproved}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			{{/if}}
+			{{if ! $is_pending}}
+			<div id="template-form-vcard-org" class="form-group form-vcard-org">
+				<div class="form-group form-vcard-org">
+					<input type="text" name="org" value="" placeholder="{{$org_label}}">
+					<i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				</div>
+			</div>
+
+			<div id="template-form-vcard-title" class="form-group form-vcard-title">
+				<div class="form-group form-vcard-title">
+					<input type="text" name="title" value="" placeholder="{{$title_label}}">
+					<i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				</div>
+			</div>
+
+			<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
+				<select name="tel_type[]">
+					<option value="CELL">{{$mobile}}</option>
+					<option value="HOME">{{$home}}</option>
+					<option value="WORK">{{$work}}</option>
+					<option value="OTHER">{{$other}}</option>
+				</select>
+				<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
+				<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+			</div>
+
+			<div id="template-form-vcard-email" class="form-group form-vcard-email">
+				<select name="email_type[]">
+					<option value="HOME">{{$home}}</option>
+					<option value="WORK">{{$work}}</option>
+					<option value="OTHER">{{$other}}</option>
+				</select>
+				<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
+				<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+			</div>
+
+			<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
+				<select name="impp_type[]">
+					<option value="HOME">{{$home}}</option>
+					<option value="WORK">{{$work}}</option>
+					<option value="OTHER">{{$other}}</option>
+				</select>
+				<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
+				<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+			</div>
+
+			<div id="template-form-vcard-url" class="form-group form-vcard-url">
+				<select name="url_type[]">
+					<option value="HOME">{{$home}}</option>
+					<option value="WORK">{{$work}}</option>
+					<option value="OTHER">{{$other}}</option>
+				</select>
+				<input type="text" name="url[]" value="" placeholder="{{$url_label}}">
+				<i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+			</div>
+
+			<div id="template-form-vcard-adr" class="form-group form-vcard-adr">
+				<div class="form-group">
+					<select name="adr_type[]">
+						<option value="HOME">{{$home}}</option>
+						<option value="WORK">{{$work}}</option>
+						<option value="OTHER">{{$other}}</option>
+					</select>
+					<label>{{$adr_label}}</label>
+					<i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$po_box}}">
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$extra}}">
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$street}}">
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$locality}}">
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$region}}">
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$zip_code}}">
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$country}}">
+				</div>
+			</div>
+
+			<div id="template-form-vcard-note" class="form-group form-vcard-note">
+				<label>{{$note_label}}</label>
+				<i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				<textarea name="note" class="form-control"></textarea>
+			</div>
+
+			<div class="section-content-wrapper-np">
+				<div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
+				<div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field">
+					<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+					<ul class="dropdown-menu">
+						<li class="add-vcard-org"{{if $vcard.org}} style="display: none"{{/if}}><a href="#" data-add="vcard-org" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$org_label}}</a></li>
+						<li class="add-vcard-title"{{if $vcard.title}} style="display: none"{{/if}}><a href="#" data-add="vcard-title" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$title_label}}</a></li>
+						<li class="add-vcard-tel"><a href="#" data-add="vcard-tel" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$tel_label}}</a></li>
+						<li class="add-vcard-email"><a href="#" data-add="vcard-email" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$email_label}}</a></li>
+						<li class="add-vcard-impp"><a href="#" data-add="vcard-impp" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$impp_label}}</a></li>
+						<li class="add-vcard-url"><a href="#" data-add="vcard-url" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$url_label}}</a></li>
+						<li class="add-vcard-adr"><a href="#" data-add="vcard-adr" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$adr_label}}</a></li>
+						<li class="add-vcard-note"{{if $vcard.note}} style="display: none"{{/if}}><a href="#" data-add="vcard-note" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$note_label}}</a></li>
+					</ul>
+				</div>
+				<div id="vcard-header-{{$vcard.id}}" class="vcard-header" data-id="{{$vcard.id}}" data-action="open">
+					<i class="vcard-fn-preview fa fa-address-card-o"></i>
+					<span id="vcard-preview-{{$vcard.id}}" class="vcard-preview">
+						{{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}}
+						{{if $vcard.emails.0.address}}<span class="vcard-email-preview d-none d-md-table-cell"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}}
+						{{if $vcard.tels.0}}<span class="vcard-tel-preview d-none d-md-table-cell">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}}
+					</span>
+					<input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}">
+				</div>
+			</div>
+			<div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper">
+
+				<div class="vcard-org form-group">
+					<div class="form-vcard-org-wrapper">
+						{{if $vcard.org}}
+						<div class="form-group form-vcard-org">
+							<input type="text" name="org" value="{{$vcard.org}}" size="{{$vcard.org|count_characters:true}}" placeholder="{{$org_label}}">
+							<i data-remove="vcard-org" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						{{/if}}
+					</div>
+				</div>
+
+				<div class="vcard-title form-group">
+					<div class="form-vcard-title-wrapper">
+						{{if $vcard.title}}
+						<div class="form-group form-vcard-title">
+							<input type="text" name="title" value="{{$vcard.title}}" size="{{$vcard.title|count_characters:true}}" placeholder="{{$title_label}}">
+							<i data-remove="vcard-title" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						{{/if}}
+					</div>
+				</div>
+
+
+				<div class="vcard-tel form-group">
+					<div class="form-vcard-tel-wrapper">
+						{{if $vcard.tels}}
+						{{foreach $vcard.tels as $tel}}
+						<div class="form-group form-vcard-tel">
+							<select name="tel_type[]">
+								<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
+								<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
+								<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+								<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+								<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+							</select>
+							<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
+							<i data-remove="vcard-tel" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+
+
+				<div class="vcard-email form-group">
+					<div class="form-vcard-email-wrapper">
+						{{if $vcard.emails}}
+						{{foreach $vcard.emails as $email}}
+						<div class="form-group form-vcard-email">
+							<select name="email_type[]">
+								<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
+								<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+								<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+								<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+							</select>
+							<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
+							<i data-remove="vcard-email" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+
+				<div class="vcard-impp form-group">
+					<div class="form-vcard-impp-wrapper">
+						{{if $vcard.impps}}
+						{{foreach $vcard.impps as $impp}}
+						<div class="form-group form-vcard-impp">
+							<select name="impp_type[]">
+								<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
+								<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+								<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+								<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+							</select>
+							<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
+							<i data-remove="vcard-impp" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+
+				<div class="vcard-url form-group">
+					<div class="form-vcard-url-wrapper">
+						{{if $vcard.urls}}
+						{{foreach $vcard.urls as $url}}
+						<div class="form-group form-vcard-url">
+							<select name="url_type[]">
+								<option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option>
+								<option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+								<option value="WORK"{{if $url.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+								<option value="OTHER"{{if $url.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+							</select>
+							<input type="text" name="url[]" value="{{$url.address}}" size="{{$url.address|count_characters:true}}" placeholder="{{$url_label}}">
+							<i data-remove="vcard-url" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+
+				<div class="vcard-adr form-group">
+					<div class="form-vcard-adr-wrapper">
+						{{if $vcard.adrs}}
+						{{foreach $vcard.adrs as $adr}}
+						<div class="form-group form-vcard-adr">
+							<div class="form-group">
+								<label>{{$adr_label}}</label>
+								<select name="adr_type[]">
+									<option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option>
+									<option value="HOME"{{if $adr.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+									<option value="WORK"{{if $adr.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+									<option value="OTHER"{{if $adr.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+								</select>
+								<i data-remove="vcard-adr" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}">
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}">
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}">
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}">
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}">
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}">
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}">
+							</div>
+						</div>
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+
+				<div class="vcard-note form-group form-vcard-note">
+					<div class="form-vcard-note-wrapper">
+						{{if $vcard.note}}
+						<label>{{$note_label}}</label>
+						<i data-remove="vcard-note" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						<textarea name="note" class="form-control">{{$vcard.note}}</textarea>
+						{{/if}}
+					</div>
+				</div>
+
+
+				<div class="settings-submit-wrapper" >
+					<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+				</div>
+
+			</div>
+			{{/if}}
+
+			{{if $affinity}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="affinity-tool">
+					<h3>
+						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#affinity-tool-collapse" aria-expanded="true" aria-controls="affinity-tool-collapse">
+							{{$affinity}}
+						</a>
+					</h3>
+				</div>
+				<div id="affinity-tool-collapse" class="panel-collapse collapse{{if $section == 'affinity'}} show{{/if}}" role="tabpanel" aria-labelledby="affinity-tool">
+					<div class="section-content-tools-wrapper">
+						{{if $slide}}
+						<div class="form-group"><strong>{{$lbl_slider}}</strong></div>
+						{{$slide}}
+						<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
+						{{/if}}
+
+						{{if $multiprofs}}
+						<div class="form-group">
+							<strong>{{$lbl_vis2}}</strong>
+							{{$profile_select}}
+						</div>
+						{{/if}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			{{/if}}
+
+			{{if $connfilter}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="fitert-tool">
+					<h3>
+						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#fitert-tool-collapse" aria-expanded="true" aria-controls="fitert-tool-collapse">
+							{{$connfilter_label}}
+						</a>
+					</h3>
+				</div>
+				<div id="fitert-tool-collapse" class="panel-collapse collapse{{if $section == 'filter' }} show{{/if}}" role="tabpanel" aria-labelledby="fitert-tool">
+					<div class="section-content-tools-wrapper">
+						{{include file="field_textarea.tpl" field=$incl}}
+						{{include file="field_textarea.tpl" field=$excl}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			{{else}}
+			<input type="hidden" name="{{$incl.0}}" value="{{$incl.2}}" />
+			<input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" />
+			{{/if}}
+
+			{{if $rating}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="rating-tool">
+					<h3>
+						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#rating-tool-collapse" aria-expanded="true" aria-controls="rating-tool-collapse">
+							{{$lbl_rating}}
+						</a>
+					</h3>
+				</div>
+				<div id="rating-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="rating-tool">
+					<div class="section-content-tools-wrapper">
+						<div class="section-content-warning-wrapper">
+							{{$rating_info}}
+						</div>
+						<div class="form-group"><strong>{{$lbl_rating_label}}</strong></div>
+						{{$rating}}
+						{{include file="field_textarea.tpl" field=$rating_text}}
+						<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			{{/if}}
+
+			{{/if}}
+
+			{{if ! $is_pending}}
+			<div class="panel">
+				{{if $notself}}
+				<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
+					<h3>
+						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
+							{{$permlbl}}
+						</a>
+					</h3>
+				</div>
+				{{/if}}
+				<div id="perms-tool-collapse" class="panel-collapse collapse{{if $self || $section === 'perms'}} show{{/if}}" role="tabpanel" aria-labelledby="perms-tool">
+					<div class="section-content-tools-wrapper">
+						<div class="section-content-warning-wrapper">
+						{{if $notself}}{{$permnote}}{{/if}}
+						{{if $self}}{{$permnote_self}}{{/if}}
+						</div>
+
+						{{if $permcat_enable}}
+						<div class="loading-role-rotator"></div>
+						<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
+						{{include file="field_select.tpl" field=$permcat}}
+						{{/if}}
+
+						<table id="perms-tool-table" class=form-group>
+							<tr>
+								<td></td>
+								{{if $notself}}
+								<td class="abook-them">{{$them}}</td>
+								{{/if}}
+								<td colspan="2" class="abook-me">{{$me}}</td>
+							</tr>
+							{{foreach $perms as $prm}}
+							{{include file="field_acheckbox.tpl" field=$prm}}
+							{{/foreach}}
+						</table>
+
+						{{if $self}}
+						<div>
+							<div class="section-content-info-wrapper">
+								{{$autolbl}}
+							</div>
+							{{include file="field_checkbox.tpl" field=$autoperms}}
+						</div>
+						{{/if}}
+
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			{{/if}}
+		</div>
+		</form>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/achievements.tpl b/view/theme/redbasic/tpl/achievements.tpl
new file mode 100644
index 000000000..7d503cc53
--- /dev/null
+++ b/view/theme/redbasic/tpl/achievements.tpl
@@ -0,0 +1,9 @@
+<div class="generic-content-wrapper">
+<p>{{$newmembertext}}</p>
+
+{{if $profilebadge}}<div id="profile-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
+{{if $contactbadge}}<div id="contact-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
+{{if $keywordsbadge}}<div id="keywords-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
+{{if $channelsbadge}}<div id="channels-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
+
+</div>
diff --git a/view/theme/redbasic/tpl/acl_selector.tpl b/view/theme/redbasic/tpl/acl_selector.tpl
new file mode 100755
index 000000000..f4f851c8a
--- /dev/null
+++ b/view/theme/redbasic/tpl/acl_selector.tpl
@@ -0,0 +1,64 @@
+<form>
+<div class="modal" id="aclModal">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title">
+					<i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}
+					{{if $helpUrl}}
+					<a target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-fw fa-question"></i></a>
+					{{/if}}
+				</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="section-content-wrapper">
+				{{if $aclModalDesc}}
+				<div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div>
+				{{/if}}
+				<label for="acl-select">{{$select_label}}</label>
+				<select id="acl-select" name="optionsRadios" class="form-control form-group">
+					<option id="acl-showall" value="public" {{$public_selected}}>{{$showall}}</option>
+					{{$groups}}
+					<option id="acl-onlyme" value="onlyme" {{$justme_selected}}>{{$onlyme}}</option>
+					<option id="acl-custom" value="custom" {{$custom_selected}}>{{$custom}}</option>
+				</select>
+
+				{{if $showallOrigin}}
+				<div id="acl-info" class="form-group">
+					<i class="fa fa-info-circle"></i>&nbsp;{{$showallOrigin}}
+				</div>
+				{{/if}}
+
+				<div id="acl-wrapper">
+					<div id="acl-list">
+						<input class="form-control" type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
+						<small class="text-muted">{{$showlimitedDesc}}</small>
+						<div id="acl-list-content"></div>
+					</div>
+				</div>
+
+				<div class="acl-list-item" rel="acl-template" style="display:none">
+					<div class="acl-item-header">
+						<img class="menu-img-1" data-src="{0}"> {1}
+					</div>
+					<button class="acl-button-hide btn btn-sm btn-outline-danger"><i class="fa fa-times"></i> {{$hide}}</button>
+					<button class="acl-button-show btn btn-sm btn-outline-success"><i class="fa fa-check"></i> {{$show}}</button>
+				</div>
+			</div>
+			<div class="modal-footer clear">
+				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$aclModalDismiss}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+</form>
+<script>
+	// compatibility issue with bootstrap v4
+	//$('[data-toggle="popover"]').popover(); // Init the popover, if present
+
+	if(typeof acl=="undefined"){
+		acl = new ACL(
+			baseurl+"/acl"
+		);
+	}
+</script>
diff --git a/view/theme/redbasic/tpl/admin_account_edit.tpl b/view/theme/redbasic/tpl/admin_account_edit.tpl
new file mode 100644
index 000000000..82d137de4
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_account_edit.tpl
@@ -0,0 +1,23 @@
+<h2>{{$title}}</h2>
+
+<h3>{{$account.account_email}}</h3>
+
+
+<form action="admin/account_edit/{{$account.account_id}}" method="post" >
+<input type="hidden" name="aid" value="{{$account.account_id}}" />
+
+{{include file="field_password.tpl" field=$pass1}}
+{{include file="field_password.tpl" field=$pass2}}
+
+{{if $z_server_role == 'pro'}}
+{{include file="field_select.tpl" field=$account_level}}
+{{else}}
+<input type="hidden" name="account_level" value="{{$account_level.2}}" />
+{{/if}}
+{{include file="field_select.tpl" field=$account_language}}
+{{include file="field_input.tpl" field=$service_class}}
+
+
+<input type="submit" name="submit" value="{{$submit}}" />
+
+</form>
diff --git a/view/theme/redbasic/tpl/admin_accounts.tpl b/view/theme/redbasic/tpl/admin_accounts.tpl
new file mode 100755
index 000000000..3535363a0
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_accounts.tpl
@@ -0,0 +1,88 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function toggle_selectall(cls){
+		$("."+cls).prop("checked", !$("."+cls).prop("checked"));
+		return false;
+	}
+</script>
+<div class="generic-content-wrapper-styled" id="adminpage">
+	<h1>{{$title}} - {{$page}}</h1>
+
+	<form action="{{$baseurl}}/admin/accounts" method="post">
+		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id="pending">
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.account_created}}</td>
+					<td class="email">{{$u.account_email}}</td>
+					<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			<div class="selectall"><a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"> <input type="submit" name="page_users_approve" value="{{$approve}}"></div>
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+
+
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id="users">
+				<thead>
+				<tr>
+					{{foreach $th_users as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td class="account_id">{{$u.account_id}}</td>
+						<td class="email">{{if $u.blocked}}
+							<a href="admin/account_edit/{{$u.account_id}}"><i>{{$u.account_email}}</i></a>
+						{{else}}
+							<a href="admin/account_edit/{{$u.account_id}}"><strong>{{$u.account_email}}</strong></a>
+						{{/if}}</td>
+						<td class="channels">{{$u.channels}}</td>
+						<td class="register_date">{{$u.account_created}}</td>
+						<td class="login_date">{{$u.account_lastlog}}</td>
+						<td class="account_expires">{{$u.account_expires}}</td>
+						<td class="service_class">{{$u.account_service_class}}</td>
+						<td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
+						<td class="tools">
+							<a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}"  class="btn btn-outline-secondary btn-sm" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div>
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/theme/redbasic/tpl/admin_aside.tpl b/view/theme/redbasic/tpl/admin_aside.tpl
new file mode 100755
index 000000000..99f139e57
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_aside.tpl
@@ -0,0 +1,46 @@
+<script>
+	// update pending count //
+	$(function(){
+
+		$("nav").bind('nav-update',  function(e,data){
+			var elm = $('#pending-update');
+			var register = $(data).find('register').text();
+			if (register=="0") { register=""; elm.hide();} else { elm.show(); }
+			elm.html(register);
+		});
+	});
+</script>
+<div class="widget">
+<h3>{{$admtxt}}</h3>
+<ul class="nav nav-pills flex-column">
+	{{foreach $admin as $link}}
+	<li class="nav-item"><a class="nav-link" href='{{$link.0}}'>{{$link.1}}{{if $link.3}}<span id='{{$link.3}}' title='{{$link.4}}'></span>{{/if}}</a></li>
+	{{/foreach}}
+</ul>
+</div>
+
+{{if $admin.update}}
+<ul class="nav nav-pills flex-column">
+	<li class="nav-item"><a class="nav-link" href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+	<li class="nav-item"><a class="nav-link" href=''>Important Changes</a></li>
+</ul>
+{{/if}}
+
+
+{{if $plugins}}
+<div class="widget">
+<h3>{{$plugadmtxt}}</h3>
+<ul class="nav nav-pills flex-column">
+	{{foreach $plugins as $l}}
+	<li class="nav-item"><a class="nav-link" href='{{$l.0}}'>{{$l.1}}</a></li>
+	{{/foreach}}
+</ul>
+</div>
+{{/if}}
+	
+<div class="widget">	
+<h3>{{$logtxt}}</h3>
+<ul class="nav nav-pills flex-column">
+	<li class="nav-item"><a class="nav-link" href='{{$logs.0}}'>{{$logs.1}}</a></li>
+</ul>
+</div>
diff --git a/view/theme/redbasic/tpl/admin_channels.tpl b/view/theme/redbasic/tpl/admin_channels.tpl
new file mode 100755
index 000000000..452e0eeec
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_channels.tpl
@@ -0,0 +1,51 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div class = "generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/channels" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_channels}}</h3>
+		{{if $channels}}
+			<table id='channels'>
+				<thead>
+				<tr>
+					{{foreach $th_channels as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $channels as $c}}
+					<tr>
+						<td class='channel_id'>{{$c.channel_id}}</td>
+						<td class='channel_name'><a href="channel/{{$c.channel_address}}">{{$c.channel_name}}</a></td>
+						<td class='channel_address'>{{$c.channel_address}}</td>
+						<td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
+						<td class="tools">
+							<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs{{if ($c.allowcode)}} btn-danger{{/if}}" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('channels_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_channels_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_channels_code" value="{{$code}}/{{$uncode}}" /> <input type="submit" name="page_channels_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO CHANNELS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/theme/redbasic/tpl/admin_hubloc.tpl b/view/theme/redbasic/tpl/admin_hubloc.tpl
new file mode 100755
index 000000000..1bd1f0122
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_hubloc.tpl
@@ -0,0 +1,27 @@
+<div class="generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+
+	<table id='server'>
+		<thead>
+			<tr>
+			{{foreach $th_hubloc as $th}}<th>{{$th}}</th>{{/foreach}}
+			</tr>
+		</thead>
+		<tbody>
+			
+			{{foreach $hubloc as $hub}}<tr>
+			<td>{{$hub.hubloc_id}}</td><td>{{$hub.hubloc_addr}}</td><td>{{$hub.hubloc_host}}</td><td>{{$hub.hubloc_status}}</td>
+			<td>
+			<form action="{{$baseurl}}/admin/hubloc" method="post">
+			<input type="hidden" name="hublocid" value="{{$hub.hubloc_id}}">
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			<input type='hidden' name='url' value='{{$hub.hubloc_host}}'>
+			<input type="submit" name="check" value="check" >
+			<input type="submit" name="repair" value="repair" ></td>
+			</form>
+			</tr>{{/foreach}}
+		</tbody>
+	</table>
+
+
+</div>
diff --git a/view/theme/redbasic/tpl/admin_logs.tpl b/view/theme/redbasic/tpl/admin_logs.tpl
new file mode 100755
index 000000000..6d2d7834c
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_logs.tpl
@@ -0,0 +1,19 @@
+<div class="generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/logs" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_checkbox.tpl" field=$debugging}}
+	{{include file="field_input.tpl" field=$logfile}}
+	{{include file="field_select.tpl" field=$loglevel}}
+	
+	<div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>
+	
+	</form>
+	
+	<h3>{{$logname}}</h3>
+	<div style="width:100%; height:400px; overflow: auto; "><pre>{{$data}}</pre></div>
+<!--	<iframe src='{{$baseurl}}/{{$logname}}' style="width:100%; height:400px"></iframe> -->
+	<!-- <div class="submit"><input type="submit" name="page_logs_clear_log" value="{{$clear}}" /></div> -->
+</div>
diff --git a/view/theme/redbasic/tpl/admin_plugins.tpl b/view/theme/redbasic/tpl/admin_plugins.tpl
new file mode 100755
index 000000000..fd5ae7d5e
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_plugins.tpl
@@ -0,0 +1,190 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $allowManageRepos}}
+		<div class="pull-right">
+			<button class="btn btn-success btn-sm" onclick="openClose('form');">{{$managerepos}}</button>
+		</div>
+		{{/if}}
+		<h2 id="title">{{$title}} - {{$page}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}>
+         
+        <div class="clear"></div>
+        <div class="section-title-wrapper" style="margin-top: 20px;">
+          <h2>{{$installedtitle}}</h2>
+          <div class="clear"></div>
+        </div>
+      <div class="table-responsive section-content-tools-wrapper">
+      <table class="table table-responsive table-striped table-hover">
+        {{foreach $addonrepos as $repo}}
+        <tr>
+            <td style="width: 70%;">
+				<span class="pull-left">{{$repo.name}}</span><span id="update-message-{{$repo.name}}" style="margin-left: 20px;"></span>
+            </td>
+            <td style="width: 15%;">
+              <button class="btn btn-sm btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i>&nbsp;{{$repoUpdateButton}}</button>
+            </td>
+            <td style="width: 15%;">
+              <button class="btn btn-sm btn-danger pull-right" style="margin-left: 10px; margin-right: 0px;" onclick="removeAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-trash-o'></i>&nbsp;{{$repoRemoveButton}}</button>
+            </td>
+        <div class="clear"></div>
+        </td></tr>
+        {{/foreach}}
+        </table>
+      </div>
+      <div class="clear"></div>
+         <div class="section-title-wrapper">
+          <h2>{{$addnewrepotitle}}</h2>
+          <div class="clear"></div>
+        </div>
+		{{$form}}
+    </div>
+      <div class="clear"></div>
+    <div id="chat-rotator-wrapper" class="center-block">
+        <div id="chat-rotator"></div>
+    </div>
+    <div class="clear"></div>
+	<div class="section-content-wrapper-np">
+      {{foreach $plugins as $p}}
+      <div class="section-content-tools-wrapper" id="pluginslist">		
+		<div class="contact-info plugin {{$p.1}}">
+            {{if ! $p.2.disabled}}				
+            <a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><i class='fa {{if $p.1==on}}fa-check-square-o{{else}}fa-square-o{{/if}} admin-icons'></i></a>
+            {{else}}
+            <i class='fa fa-stop admin-icons'></i>
+            {{/if}}
+            <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>{{if $p.2.disabled}} {{$disabled}}{{/if}}
+            {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
+
+            <div class='desc'>{{$p.2.description}}</div>
+		</div>
+	</div>
+    {{/foreach}}
+      
+	</div>
+</div>
+{{$newRepoModal}}
+<script>
+  
+  // TODO: Implement a simple interface controller that reconfigures the modal dialog
+  // for each action in a more organized way
+  
+  function adminPluginsAddRepo() {
+      $("#generic-modal-ok-{{$newRepoModalID}}").removeClass('btn-success');
+      $("#generic-modal-ok-{{$newRepoModalID}}").addClass('btn-primary');
+      var repoURL = $('#id_repoURL').val();
+      var repoName = $('#id_repoName').val();
+      $('#chat-rotator').spin('tiny');
+      $.post(
+        "/admin/plugins/addrepo", {repoURL: repoURL, repoName: repoName}, 
+            function(response) {
+                $('#chat-rotator').spin(false);
+                if (response.success) {
+                  var modalBody = $('#generic-modal-body-{{$newRepoModalID}}');
+                  modalBody.html('<div>'+response.repo.readme+'</div>');
+                  modalBody.append('<h2>Repo Info</h2><p>Message: ' + response.message + '</p>');
+                  modalBody.append('<h4>Branches</h4><p>'+JSON.stringify(response.repo.branches)+'</p>');
+                  modalBody.append('<h4>Remotes</h4><p>'+JSON.stringify(response.repo.remote)+'</p>');
+                  $('.modal-dialog').width('80%');
+                  $("#generic-modal-ok-{{$newRepoModalID}}").off('click');
+                  $("#generic-modal-ok-{{$newRepoModalID}}").click(function () {
+                    installAddonRepo();
+                  });
+                  $('#generic-modal-{{$newRepoModalID}}').modal();
+                } else {
+                    window.console.log('Error adding repo :' + response['message']);
+                }
+                return false;
+            },
+        'json');
+  }
+  
+  function installAddonRepo() {
+      var repoURL = $('#id_repoURL').val();
+      var repoName = $('#id_repoName').val();
+      $.post(
+        "/admin/plugins/installrepo", {repoURL: repoURL, repoName: repoName}, 
+            function(response) {
+                if (response.success) {
+                  $('#generic-modal-title-{{$newRepoModalID}}').html('Addon repo installed');
+                  var modalBody = $('#generic-modal-body-{{$newRepoModalID}}');
+                  modalBody.html('<h2>Repo Info</h2><p>Message: ' + response.message + '</p>');
+                  modalBody.append('<h4>Branches</h4><p>'+JSON.stringify(response.repo.branches)+'</p>');
+                  modalBody.append('<h4>Remotes</h4><p>'+JSON.stringify(response.repo.remote)+'</p>');
+                  $('.modal-dialog').width('80%');
+                  //$("#generic-modal-cancel-{{$newRepoModalID}}").hide();
+                  $("#generic-modal-ok-{{$newRepoModalID}}").html('OK');
+                  $("#generic-modal-ok-{{$newRepoModalID}}").removeClass('btn-primary');
+                  $("#generic-modal-ok-{{$newRepoModalID}}").addClass('btn-success');
+                  $("#generic-modal-ok-{{$newRepoModalID}}").off('click');
+                  $("#generic-modal-ok-{{$newRepoModalID}}").click(function () {
+                    $('#generic-modal-{{$newRepoModalID}}').modal('hide');
+                    if(confirm('Repo installed. Click OK to refresh page.')) {
+                      location.reload();
+                    }
+                  });
+                  $('#generic-modal-{{$newRepoModalID}}').modal();
+              
+                } else {
+                    window.console.log('Error installing repo :' + response['message']);
+                    alert('Error installing addon repo!');
+                }
+                return false;
+            },
+        'json');
+  }
+  function updateAddonRepo(repoName) {
+    if(confirm('Are you sure you want to update the addon repo ' + repoName + '?')) {
+      $.post(
+        "/admin/plugins/updaterepo", {repoName: repoName}, 
+            function(response) {
+                if (response.success) {
+                  window.console.log('Addon repo '+repoName+' successfully updated :' + response['message']);
+                  //alert('Addon repo updated.');
+				  $('#update-message-' + repoName).css('background-color', 'yellow');
+				  $('#update-message-' + repoName).html('Repo updated!');
+				  setTimeout(function () {
+					  $('#update-message-' + repoName).html('');
+				  }, 60000);
+                } else {
+                  window.console.log('Error updating repo :' + response['message']);
+                  //alert('Error updating addon repo!');
+				  $('#update-message-' + repoName).css('background-color', 'red');
+				  $('#update-message-' + repoName).html('Error updating repo!');
+				  setTimeout(function () {
+					  $('#update-message-' + repoName).html('');
+				  }, 60000);
+                }
+                return false;
+            },
+        'json');
+    }
+  }
+  function switchAddonRepoBranch(repoName) {
+    window.console.log('switchAddonRepoBranch: ' + repoName);
+    // TODO: Discover the available branches and create an interface to switch between them
+  }
+  
+  function removeAddonRepo(repoName) {
+    // TODO: Unlink the addons
+    if(confirm('Are you sure you want to remove the addon repo ' + repoName + '?')) {
+      $.post(
+        "/admin/plugins/removerepo", {repoName: repoName}, 
+            function(response) {
+                if (response.success) {
+                  window.console.log('Addon repo '+repoName+' successfully removed :' + response['message']);
+                  if(confirm('Repo deleted. Click OK to refresh page.')) {
+                    location.reload();
+                  }
+                } else {
+                  window.console.log('Error removing repo :' + response['message']);
+                  alert('Error removing addon repo!');
+                }
+                return false;
+            },
+        'json');
+    }
+  }  
+  
+</script>
\ No newline at end of file
diff --git a/view/theme/redbasic/tpl/admin_plugins_addrepo.tpl b/view/theme/redbasic/tpl/admin_plugins_addrepo.tpl
new file mode 100644
index 000000000..de7b465bb
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_plugins_addrepo.tpl
@@ -0,0 +1,9 @@
+<form id="add-plugin-repo-form" action="{{$post}}" method="post" >
+
+    <p class="descriptive-text">{{$desc}}</p>
+    {{include file="field_input.tpl" field=$repoURL}}
+    {{include file="field_input.tpl" field=$repoName}}
+    <div class="btn-group pull-right">
+		<button id="add-plugin-repo-submit" class="btn btn-primary" type="submit" name="submit" onclick="adminPluginsAddRepo(); return false;">{{$submit}}</button>
+	</div>
+</form>
diff --git a/view/theme/redbasic/tpl/admin_plugins_details.tpl b/view/theme/redbasic/tpl/admin_plugins_details.tpl
new file mode 100755
index 000000000..309fc9569
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_plugins_details.tpl
@@ -0,0 +1,58 @@
+<div class = "generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+
+	<p>{{if ! $info.disabled}}<i class='toggleplugin fa {{if $status==on}}fa-check-square-o{{else}}fa-square-o{{/if}} admin-icons'></i>{{else}}<i class='fa fa-stop admin-icons'></i>{{/if}} {{$info.name}} - {{$info.version}}{{if ! $info.disabled}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a>{{/if}}</p>
+
+	{{if $info.disabled}}
+	<p>{{$disabled}}</p>
+	{{/if}}
+
+	<p>{{$info.description}}</p>
+	
+	{{foreach $info.author as $a}}
+	<p class="author">{{$str_author}}
+		{{$a.name}}{{if $a.link}} {{$a.link}}{{/if}}
+	</p>
+	{{/foreach}}
+
+	{{if $info.minversion}}
+	<p class="versionlimit">{{$str_minversion}}{{$info.minversion}}</p>
+	{{/if}}
+	{{if $info.maxversion}}
+	<p class="versionlimit">{{$str_maxversion}}{{$info.maxversion}}</p>
+	{{/if}}
+	{{if $info.minphpversion}}
+	<p class="versionlimit">{{$str_minphpversion}}{{$info.minphpversion}}</p>
+	{{/if}}
+	{{if $info.serverroles}}
+	<p class="versionlimit">{{$str_serverroles}}{{$info.serverroles}}</p>
+	{{/if}}
+	{{if $info.requires}}
+	<p class="versionlimit">{{$str_requires}}{{$info.requires}}</p>
+	{{/if}}
+
+
+	{{foreach $info.maintainer as $a}}
+	<p class="maintainer">{{$str_maintainer}}
+		{{$a.name}}{{if $a.link}} {{$a.link}}{{/if}}
+	</p>
+	{{/foreach}}
+	
+	{{if $screenshot}}
+	<a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a>
+	{{/if}}
+
+	{{if $admin_form}}
+	<h3>{{$settings}}</h3>
+	<form method="post" action="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/">
+		{{$admin_form}}
+	</form>
+	{{/if}}
+
+	{{if $readme}}
+	<h3>Readme</h3>
+	<div id="plugin_readme">
+		{{$readme}}
+	</div>
+	{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/admin_profiles.tpl b/view/theme/redbasic/tpl/admin_profiles.tpl
new file mode 100644
index 000000000..e3a08449c
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_profiles.tpl
@@ -0,0 +1,38 @@
+<div class="generic-content-wrapper">
+<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-sm pull-right" href="admin/profs/new"><i class="fa fa-plus-circle"></i>&nbsp;{{$new}}</a><h2>{{$title}}</h2>
+<div class="clear"></div>
+</div>
+
+<div class="section-content-tools-wrapper">
+
+<div class="section-content-info-wrapper">{{$all_desc}}
+<br /><br />
+{{$all}}
+</div>
+
+<form action="admin/profs" method="post">
+
+{{include file="field_textarea.tpl" field=$basic}}
+{{include file="field_textarea.tpl" field=$advanced}}
+
+<input type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+
+
+
+{{if $cust_fields}}
+<br /><br />
+<div><strong>{{$cust_field_desc}}</strong></div>
+<br />
+
+<table width="100%">
+{{foreach $cust_fields as $field}}
+<tr><td>{{$field.field_name}}</td><td>{{$field.field_desc}}</td><td><a class="btn btn-danger btn-sm" href="admin/profs/drop/{{$field.id}}" title="{{$drop}}"><i class="fa fa-trash-o"></i>&nbsp;{{$drop}}</a> <a class="btn btn-sm" title="{{$edit}}" href="admin/profs/{{$field.id}}" ><i class="fa fa-pencil"></i></a></td></tr>
+{{/foreach}}
+</table>
+{{/if}}
+
+</div>
+
+</div>
diff --git a/view/theme/redbasic/tpl/admin_queue.tpl b/view/theme/redbasic/tpl/admin_queue.tpl
new file mode 100644
index 000000000..9d3d848c9
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_queue.tpl
@@ -0,0 +1,15 @@
+<div class="generic-content-wrapper-styled">
+<h3>{{$banner}}</h3>
+
+{{if $hasentries}}
+
+<table cellpadding="10" id="admin-queue-table"><tr><td>{{$numentries}}&nbsp;&nbsp;</td><td>{{$desturl}}</td><td>{{$priority}}</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+
+{{foreach $entries as $e}}
+
+<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td><td>{{$e.priority}}</td>{{if $expert}}<td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-outline-secondary"><i class="fa fa-times"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-outline-secondary"><i class="fa fa-trash-o"></i></a></td>{{/if}}</tr>
+{{/foreach}}
+
+</table>
+
+{{/if}}
diff --git a/view/theme/redbasic/tpl/admin_security.tpl b/view/theme/redbasic/tpl/admin_security.tpl
new file mode 100755
index 000000000..409e9fc7d
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_security.tpl
@@ -0,0 +1,33 @@
+<div class="generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+
+	<form action="{{$baseurl}}/admin/security" method="post">
+
+	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$transport_security}}
+	{{include file="field_checkbox.tpl" field=$content_security}}
+	{{include file="field_checkbox.tpl" field=$embed_sslonly}}
+
+	{{include file="field_textarea.tpl" field=$allowed_email}}
+	{{include file="field_textarea.tpl" field=$not_allowed_email}}	
+
+	{{include file="field_textarea.tpl" field=$whitelisted_sites}}
+	{{include file="field_textarea.tpl" field=$blacklisted_sites}}
+
+	{{include file="field_textarea.tpl" field=$whitelisted_channels}}
+	{{include file="field_textarea.tpl" field=$blacklisted_channels}}
+
+	{{include file="field_textarea.tpl" field=$embed_allow}}
+	{{include file="field_textarea.tpl" field=$embed_deny}}
+
+
+	<div class="admin-submit-wrapper" >
+		<input type="submit" name="submit" class="admin-submit" value="{{$submit}}" />
+	</div>
+
+	</form>
+
+</div>
diff --git a/view/theme/redbasic/tpl/admin_settings_features.tpl b/view/theme/redbasic/tpl/admin_settings_features.tpl
new file mode 100644
index 000000000..2d5cf7e0b
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_settings_features.tpl
@@ -0,0 +1,31 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<form action="admin/features" method="post" autocomplete="off">
+	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+	<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
+		{{foreach $features as $g => $f}}
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
+				<h3>
+					<a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
+						{{$f.0}}
+					</a>
+				</h3>
+			</div>
+			<div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} in{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
+				<div class="section-content-tools-wrapper">
+					{{foreach $f.1 as $fcat}}
+						{{include file="field_checkbox.tpl" field=$fcat.0}}
+						{{include file="field_checkbox.tpl" field=$fcat.1}}
+					{{/foreach}}
+					<div class="settings-submit-wrapper" >
+						<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		{{/foreach}}
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/admin_site.tpl b/view/theme/redbasic/tpl/admin_site.tpl
new file mode 100755
index 000000000..6fd0fd9ce
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_site.tpl
@@ -0,0 +1,101 @@
+<script>
+	$(function(){
+		
+		$("#cnftheme").colorbox({
+			width: 800,
+			onLoad: function(){
+				var theme = $("#id_theme :selected").val();
+				$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
+			}, 
+			onComplete: function(){
+				$(this).colorbox.resize(); 
+				$("#colorbox form").submit(function(e){
+					var url = $(this).attr('action');
+					// can't get .serialize() to work...
+					var data={};
+					$(this).find("input").each(function(){
+						data[$(this).attr('name')] = $(this).val();
+					});
+					$(this).find("select").each(function(){
+						data[$(this).attr('name')] = $(this).children(":selected").val();
+					});
+					console.log(":)", url, data);
+					
+					$.post(url, data, function(data) {
+						if(timer) clearTimeout(timer);
+						NavUpdate();
+						$.colorbox.close();
+					})
+					
+					return false;
+				});
+				
+			}
+		});
+	});
+</script>
+<div id="adminpage" class="generic-content-wrapper-styled">
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_select.tpl" field=$server_role}}
+
+	{{if $z_server_role == 'pro'}}
+	{{include file="field_select.tpl" field=$techlevel}}
+    {{include file="field_checkbox.tpl" field=$techlock}}
+	{{/if}}
+
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_textarea.tpl" field=$siteinfo}}
+	{{include file="field_textarea.tpl" field=$admininfo}}
+
+    {{include file="field_input.tpl" field=$reply_address}}
+    {{include file="field_input.tpl" field=$from_email}}
+    {{include file="field_input.tpl" field=$from_email_name}}
+
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+    {{include file="field_select.tpl" field=$theme_mobile}}
+    {{include file="field_input.tpl" field=$frontpage}}
+    {{include file="field_checkbox.tpl" field=$mirror_frontpage}}
+    {{include file="field_checkbox.tpl" field=$login_on_homepage}}
+    {{include file="field_checkbox.tpl" field=$enable_context_help}}
+	{{if $directory_server}}
+		{{include file="field_select.tpl" field=$directory_server}}
+	{{/if}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$registration}}</h3>
+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	{{include file="field_checkbox.tpl" field=$invite_only}}
+	{{include file="field_select.tpl" field=$access_policy}}
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+
+	<h3>{{$corporate}}</h3>
+	{{include file="field_checkbox.tpl" field=$verify_email}}
+	{{include file="field_checkbox.tpl" field=$feed_contacts}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$disable_discover_tab}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$advanced}}</h3>
+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$delivery_batch_count}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	{{include file="field_input.tpl" field=$default_expire_days}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	</form>
+</div>
diff --git a/view/theme/redbasic/tpl/admin_summary.tpl b/view/theme/redbasic/tpl/admin_summary.tpl
new file mode 100755
index 000000000..ca94b0ef7
--- /dev/null
+++ b/view/theme/redbasic/tpl/admin_summary.tpl
@@ -0,0 +1,43 @@
+<div class="generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+{{if $adminalertmsg}}
+	<p class="alert alert-warning" role="alert">{{$adminalertmsg}}</p>
+{{/if}}
+{{if $upgrade}}
+	<p class="alert alert-warning" role="alert">{{$upgrade}}</p>
+{{/if}}
+	<dl>
+		<dt>{{$queues.label}}</dt>
+		<dd>{{$queues.queue}}</dd>
+	</dl>
+	<dl>
+		<dt>{{$accounts.0}}</dt>
+		<dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd>
+	</dl>
+	<dl>
+		<dt>{{$pending.0}}</dt>
+		<dd>{{$pending.1}}</dt>
+	</dl>
+	<dl>
+		<dt>{{$channels.0}}</dt>
+		<dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd>
+	</dl>
+	<dl>
+		<dt>{{$plugins.0}}</dt>
+		<dd>
+		{{foreach $plugins.1 as $p}} {{$p}} {{/foreach}}
+		</dd>
+	</dl>
+	<dl>
+		<dt>{{$version.0}}</dt>
+		<dd>{{$version.1}} - {{$build}}</dd>
+	</dl>
+	<dl>
+		<dt>{{$vmaster.0}}</dt>
+		<dd>{{$vmaster.1}}</dd>
+	</dl>
+	<dl>
+		<dt>{{$vdev.0}}</dt>
+		<dd>{{$vdev.1}}</dd>
+	</dl>
+</div>
\ No newline at end of file
diff --git a/view/theme/redbasic/tpl/album_edit.tpl b/view/theme/redbasic/tpl/album_edit.tpl
new file mode 100755
index 000000000..f5495f149
--- /dev/null
+++ b/view/theme/redbasic/tpl/album_edit.tpl
@@ -0,0 +1,22 @@
+<div id="photo-album-edit-wrapper" class="section-content-tools-wrapper">
+	<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
+		<div class="form-group">
+			<label id="photo-album-edit-name-label" for="photo-album-edit-name">{{$nametext}}</label>
+			<input type="text" name="albumname" placeholder="{{$name_placeholder}}" value="{{$album}}" class="form-control" list="dl-album-edit" />
+			<datalist id="dl-album-edit">
+			{{foreach $albums as $al}}
+				{{if $al.text}}
+				<option value="{{$al.text}}">
+				{{/if}}
+			{{/foreach}}
+			</datalist>
+		</div>
+		<div class="form-group">
+			<button id="photo-album-edit-submit" type="submit" name="submit" class="btn btn-primary btn-sm pull-right" />{{$submit}}</button>
+			<button id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" class="btn btn-danger btn-sm pull-left" onclick="return confirmDelete();" />{{$dropsubmit}}</button>
+		</div>
+	</form>
+	<div id="photo-album-edit-end" class="clear"></div>
+</div>
+
+
diff --git a/view/theme/redbasic/tpl/alt_pager.tpl b/view/theme/redbasic/tpl/alt_pager.tpl
new file mode 100644
index 000000000..b46dc7662
--- /dev/null
+++ b/view/theme/redbasic/tpl/alt_pager.tpl
@@ -0,0 +1,4 @@
+<div class="pager">
+{{if $has_less}}<a href="{{$url}}&page={{$prevpage}}" class="pager-prev">{{$less}}</a>{{/if}}
+{{if $has_more}}{{if $has_less}}&nbsp;|&nbsp;{{/if}}<a href="{{$url}}&page={{$nextpage}}" class="pager-next">{{$more}}</a>{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/api_config_xml.tpl b/view/theme/redbasic/tpl/api_config_xml.tpl
new file mode 100755
index 000000000..8c0766c73
--- /dev/null
+++ b/view/theme/redbasic/tpl/api_config_xml.tpl
@@ -0,0 +1,66 @@
+<config>
+ <site>
+  <name>{{$config.site.name}}</name>
+  <server>{{$config.site.server}}</server>
+  <theme>default</theme>
+  <path></path>
+  <logo>{{$config.site.logo}}</logo>
+
+  <fancy>true</fancy>
+  <language>en</language>
+  <email>{{$config.site.email}}</email>
+  <broughtby></broughtby>
+  <broughtbyurl></broughtbyurl>
+  <timezone>UTC</timezone>
+  <closed>{{$config.site.closed}}</closed>
+
+  <inviteonly>false</inviteonly>
+  <private>{{$config.site.private}}</private>
+  <textlimit>{{$config.site.textlimit}}</textlimit>
+  <ssl>{{$config.site.ssl}}</ssl>
+  <sslserver>{{$config.site.sslserver}}</sslserver>
+  <shorturllength>30</shorturllength>
+
+</site>
+ <license>
+  <type>cc</type>
+  <owner></owner>
+  <url>http://creativecommons.org/licenses/by/3.0/</url>
+  <title>Creative Commons Attribution 3.0</title>
+  <image>http://i.creativecommons.org/l/by/3.0/80x15.png</image>
+
+</license>
+ <nickname>
+  <featured></featured>
+</nickname>
+ <profile>
+  <biolimit></biolimit>
+</profile>
+ <group>
+  <desclimit></desclimit>
+</group>
+ <notice>
+
+  <contentlimit></contentlimit>
+</notice>
+ <throttle>
+  <enabled>false</enabled>
+  <count>20</count>
+  <timespan>600</timespan>
+</throttle>
+ <xmpp>
+
+  <enabled>false</enabled>
+  <server>INVALID SERVER</server>
+  <port>5222</port>
+  <user>update</user>
+</xmpp>
+ <integration>
+  <source>StatusNet</source>
+
+</integration>
+ <attachments>
+  <uploads>false</uploads>
+  <file_quota>0</file_quota>
+</attachments>
+</config>
diff --git a/view/theme/redbasic/tpl/api_friends_xml.tpl b/view/theme/redbasic/tpl/api_friends_xml.tpl
new file mode 100755
index 000000000..f2a7234d1
--- /dev/null
+++ b/view/theme/redbasic/tpl/api_friends_xml.tpl
@@ -0,0 +1,5 @@
+<users type="array">
+	{{foreach $users as $user}}
+	{{include file="api_user_xml.tpl"}}
+	{{/foreach}}
+</users>
diff --git a/view/theme/redbasic/tpl/api_ratelimit_xml.tpl b/view/theme/redbasic/tpl/api_ratelimit_xml.tpl
new file mode 100755
index 000000000..e4b470a25
--- /dev/null
+++ b/view/theme/redbasic/tpl/api_ratelimit_xml.tpl
@@ -0,0 +1,6 @@
+<hash>
+ <remaining-hits type="integer">{{$hash.remaining_hits}}</remaining-hits>
+ <hourly-limit type="integer">{{$hash.hourly_limit}}</hourly-limit>
+ <reset-time type="datetime">{{$hash.reset_time}}</reset-time>
+ <reset_time_in_seconds type="integer">{{$hash.resettime_in_seconds}}</reset_time_in_seconds>
+</hash>
diff --git a/view/theme/redbasic/tpl/api_status_xml.tpl b/view/theme/redbasic/tpl/api_status_xml.tpl
new file mode 100755
index 000000000..cbb736e22
--- /dev/null
+++ b/view/theme/redbasic/tpl/api_status_xml.tpl
@@ -0,0 +1,46 @@
+<status>{{if $status}}
+    <created_at>{{$status.created_at}}</created_at>
+    <id>{{$status.id}}</id>
+    <text>{{$status.text}}</text>
+    <source>{{$status.source}}</source>
+    <truncated>{{$status.truncated}}</truncated>
+    <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id>
+    <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id>
+    <favorited>{{$status.favorited}}</favorited>
+    <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
+    <geo>{{$status.geo}}</geo>
+    <coordinates>{{$status.coordinates}}</coordinates>
+    <place>{{$status.place}}</place>
+    <contributors>{{$status.contributors}}</contributors>
+	<user>
+	  <id>{{$status.user.id}}</id>
+	  <name>{{$status.user.name}}</name>
+	  <screen_name>{{$status.user.screen_name}}</screen_name>
+	  <location>{{$status.user.location}}</location>
+	  <description>{{$status.user.description}}</description>
+	  <profile_image_url>{{$status.user.profile_image_url}}</profile_image_url>
+	  <url>{{$status.user.url}}</url>
+	  <protected>{{$status.user.protected}}</protected>
+	  <followers_count>{{$status.user.followers}}</followers_count>
+	  <profile_background_color>{{$status.user.profile_background_color}}</profile_background_color>
+  	  <profile_text_color>{{$status.user.profile_text_color}}</profile_text_color>
+  	  <profile_link_color>{{$status.user.profile_link_color}}</profile_link_color>
+  	  <profile_sidebar_fill_color>{{$status.user.profile_sidebar_fill_color}}</profile_sidebar_fill_color>
+  	  <profile_sidebar_border_color>{{$status.user.profile_sidebar_border_color}}</profile_sidebar_border_color>
+  	  <friends_count>{{$status.user.friends_count}}</friends_count>
+  	  <created_at>{{$status.user.created_at}}</created_at>
+  	  <favourites_count>{{$status.user.favourites_count}}</favourites_count>
+  	  <utc_offset>{{$status.user.utc_offset}}</utc_offset>
+  	  <time_zone>{{$status.user.time_zone}}</time_zone>
+  	  <profile_background_image_url>{{$status.user.profile_background_image_url}}</profile_background_image_url>
+  	  <profile_background_tile>{{$status.user.profile_background_tile}}</profile_background_tile>
+  	  <profile_use_background_image>{{$status.user.profile_use_background_image}}</profile_use_background_image>
+  	  <notifications></notifications>
+  	  <geo_enabled>{{$status.user.geo_enabled}}</geo_enabled>
+  	  <verified>{{$status.user.verified}}</verified>
+  	  <following></following>
+  	  <statuses_count>{{$status.user.statuses_count}}</statuses_count>
+  	  <lang>{{$status.user.lang}}</lang>
+  	  <contributors_enabled>{{$status.user.contributors_enabled}}</contributors_enabled>
+	  </user>
+{{/if}}</status>
diff --git a/view/theme/redbasic/tpl/api_test_xml.tpl b/view/theme/redbasic/tpl/api_test_xml.tpl
new file mode 100755
index 000000000..80a541c39
--- /dev/null
+++ b/view/theme/redbasic/tpl/api_test_xml.tpl
@@ -0,0 +1 @@
+<ok>{{$ok}}</ok>
diff --git a/view/theme/redbasic/tpl/api_timeline_atom.tpl b/view/theme/redbasic/tpl/api_timeline_atom.tpl
new file mode 100755
index 000000000..e8bfb689e
--- /dev/null
+++ b/view/theme/redbasic/tpl/api_timeline_atom.tpl
@@ -0,0 +1,90 @@
+<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
+ <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
+ <id>{{$rss.self}}</id>
+ <title>Friendika</title>
+ <subtitle>Friendika API feed</subtitle>
+ <logo>{{$rss.logo}}</logo>
+ <updated>{{$rss.atom_updated}}</updated>
+ <link type="text/html" rel="alternate" href="{{$rss.alternate}}"/>
+ <link type="application/atom+xml" rel="self" href="{{$rss.self}}"/>
+ 
+ 
+ <author>
+	<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
+	<uri>{{$user.url}}</uri>
+	<name>{{$user.name}}</name>
+	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
+	<georss:point></georss:point>
+	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
+	<poco:displayName>{{$user.name}}</poco:displayName>
+	<poco:urls>
+		<poco:type>homepage</poco:type>
+		<poco:value>{{$user.url}}</poco:value>
+		<poco:primary>true</poco:primary>
+	</poco:urls>
+	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
+ </author>
+
+ <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
+ <activity:subject>
+	<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
+	<id>{{$user.contact_url}}</id>
+	<title>{{$user.name}}</title>
+	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
+	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
+	<poco:displayName>{{$user.name}}</poco:displayName>
+	<poco:urls>
+		<poco:type>homepage</poco:type>
+		<poco:value>{{$user.url}}</poco:value>
+		<poco:primary>true</poco:primary>
+	</poco:urls>
+	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
+ </activity:subject>
+ 
+ 
+  	{{foreach $statuses as $status}}
+	<entry>
+		<activity:obj_type>{{$status.objecttype}}</activity:obj_type>
+		<id>{{$status.message_id}}</id>
+		<title>{{$status.text}}</title>
+		<content type="html">{{$status.statusnet_html}}</content>
+		<link rel="alternate" type="text/html" href="{{$status.url}}"/>
+		<activity:verb>{{$status.verb}}</activity:verb>
+		<published>{{$status.published}}</published>
+		<updated>{{$status.updated}}</updated>
+
+		<link rel="self" type="application/atom+xml" href="{{$status.self}}"/>
+		<link rel="edit" type="application/atom+xml" href="{{$status.edit}}"/>
+		<statusnet:notice_info local_id="{{$status.id}}" source="{{$status.source}}" >
+		</statusnet:notice_info>
+
+		<author>
+			<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
+			<uri>{{$status.user.url}}</uri>
+			<name>{{$status.user.name}}</name>
+			<link rel="alternate" type="text/html" href="{{$status.user.url}}"/>
+			<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$status.user.profile_image_url}}"/>
+
+			<georss:point/>
+			<poco:preferredUsername>{{$status.user.screen_name}}</poco:preferredUsername>
+			<poco:displayName>{{$status.user.name}}</poco:displayName>
+			<poco:address/>
+			<poco:urls>
+				<poco:type>homepage</poco:type>
+				<poco:value>{{$status.user.url}}</poco:value>
+				<poco:primary>true</poco:primary>
+			</poco:urls>
+		</author>
+		<link rel="ostatus:conversation" type="text/html" href="{{$status.url}}"/> 
+
+	</entry>    
+    {{/foreach}}
+</feed>
diff --git a/view/theme/redbasic/tpl/api_timeline_rss.tpl b/view/theme/redbasic/tpl/api_timeline_rss.tpl
new file mode 100755
index 000000000..86c645e99
--- /dev/null
+++ b/view/theme/redbasic/tpl/api_timeline_rss.tpl
@@ -0,0 +1,26 @@
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
+  <channel>
+    <title>Friendika</title>
+    <link>{{$rss.alternate}}</link>
+    <atom:link type="application/rss+xml" rel="self" href="{{$rss.self}}"/>
+    <description>Friendika timeline</description>
+    <language>{{$rss.language}}</language>
+    <ttl>40</ttl>
+	<image>
+		<link>{{$user.link}}</link>
+		<title>{{$user.name}}'s items</title>
+		<url>{{$user.profile_image_url}}</url>
+	</image>
+	
+{{foreach $statuses as $status}}
+  <item>
+    <title>{{$status.user.name}}: {{$status.text}}</title>
+    <description>{{$status.text}}</description>
+    <pubDate>{{$status.created_at}}</pubDate>
+    <guid>{{$status.url}}</guid>
+    <link>{{$status.url}}</link>
+    <twitter:source>{{$status.source}}</twitter:source>
+  </item>
+{{/foreach}}
+  </channel>
+</rss>
diff --git a/view/theme/redbasic/tpl/api_timeline_xml.tpl b/view/theme/redbasic/tpl/api_timeline_xml.tpl
new file mode 100755
index 000000000..f14d73e9c
--- /dev/null
+++ b/view/theme/redbasic/tpl/api_timeline_xml.tpl
@@ -0,0 +1,20 @@
+<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
+{{foreach $statuses as $status}} <status>
+  <text>{{$status.text}}</text>
+  <truncated>{{$status.truncated}}</truncated>
+  <created_at>{{$status.created_at}}</created_at>
+  <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id>
+  <source>{{$status.source}}</source>
+  <id>{{$status.id}}</id>
+  <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id>
+  <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
+  <geo>{{$status.geo}}</geo>
+  <favorited>{{$status.favorited}}</favorited>
+{{include file="api_user_xml.tpl" user=$status.user}}  <statusnet:html>{{$status.statusnet_html}}</statusnet:html>
+  <statusnet:conversation_id>{{$status.statusnet_conversation_id}}</statusnet:conversation_id>
+  <url>{{$status.url}}</url>
+  <coordinates>{{$status.coordinates}}</coordinates>
+  <place>{{$status.place}}</place>
+  <contributors>{{$status.contributors}}</contributors>
+ </status>
+{{/foreach}}</statuses>
diff --git a/view/theme/redbasic/tpl/api_user_xml.tpl b/view/theme/redbasic/tpl/api_user_xml.tpl
new file mode 100755
index 000000000..3b51992f6
--- /dev/null
+++ b/view/theme/redbasic/tpl/api_user_xml.tpl
@@ -0,0 +1,46 @@
+  <user>
+   <id>{{$user.id}}</id>
+   <name>{{$user.name}}</name>
+   <screen_name>{{$user.screen_name}}</screen_name>
+   <location>{{$user.location}}</location>
+   <description>{{$user.description}}</description>
+   <profile_image_url>{{$user.profile_image_url}}</profile_image_url>
+   <url>{{$user.url}}</url>
+   <protected>{{$user.protected}}</protected>
+   <followers_count>{{$user.followers_count}}</followers_count>
+   <friends_count>{{$user.friends_count}}</friends_count>
+   <created_at>{{$user.created_at}}</created_at>
+   <favourites_count>{{$user.favourites_count}}</favourites_count>
+   <utc_offset>{{$user.utc_offset}}</utc_offset>
+   <time_zone>{{$user.time_zone}}</time_zone>
+   <statuses_count>{{$user.statuses_count}}</statuses_count>
+   <following>{{$user.following}}</following>
+   <profile_background_color>{{$user.profile_background_color}}</profile_background_color>
+   <profile_text_color>{{$user.profile_text_color}}</profile_text_color>
+   <profile_link_color>{{$user.profile_link_color}}</profile_link_color>
+   <profile_sidebar_fill_color>{{$user.profile_sidebar_fill_color}}</profile_sidebar_fill_color>
+   <profile_sidebar_border_color>{{$user.profile_sidebar_border_color}}</profile_sidebar_border_color>
+   <profile_background_image_url>{{$user.profile_background_image_url}}</profile_background_image_url>
+   <profile_background_tile>{{$user.profile_background_tile}}</profile_background_tile>
+   <profile_use_background_image>{{$user.profile_use_background_image}}</profile_use_background_image>
+   <notifications>{{$user.notifications}}</notifications>
+   <geo_enabled>{{$user.geo_enabled}}</geo_enabled>
+   <verified>{{$user.verified}}</verified>
+   <lang>{{$user.lang}}</lang>
+   <contributors_enabled>{{$user.contributors_enabled}}</contributors_enabled>
+   <status>{{if $user.status}}
+    <created_at>{{$user.status.created_at}}</created_at>
+    <id>{{$user.status.id}}</id>
+    <text>{{$user.status.text}}</text>
+    <source>{{$user.status.source}}</source>
+    <truncated>{{$user.status.truncated}}</truncated>
+    <in_reply_to_status_id>{{$user.status.in_reply_to_status_id}}</in_reply_to_status_id>
+    <in_reply_to_user_id>{{$user.status.in_reply_to_user_id}}</in_reply_to_user_id>
+    <favorited>{{$user.status.favorited}}</favorited>
+    <in_reply_to_screen_name>{{$user.status.in_reply_to_screen_name}}</in_reply_to_screen_name>
+    <geo>{{$user.status.geo}}</geo>
+    <coordinates>{{$user.status.coordinates}}</coordinates>
+    <place>{{$user.status.place}}</place>
+    <contributors>{{$user.status.contributors}}</contributors>
+  {{/if}}</status>
+  </user>
diff --git a/view/theme/redbasic/tpl/app.tpl b/view/theme/redbasic/tpl/app.tpl
new file mode 100644
index 000000000..28f28611e
--- /dev/null
+++ b/view/theme/redbasic/tpl/app.tpl
@@ -0,0 +1,30 @@
+{{if !$navapps}}
+<div class="app-container">
+	<div class="app-detail{{if $deleted}} app-deleted{{/if}}">
+		<a href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $app.desc}} title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}}
+			<div class="app-name" style="text-align:center;">{{$app.name}}</div>
+		</a>
+	</div>
+	{{if $app.type !== 'system'}}
+	{{if $purchase}}
+	<div class="app-purchase">
+		<a href="{{$app.page}}" class="btn btn-outline-secondary" title="{{$purchase}}" ><i class="fa fa-external"></i></a>
+	</div>
+	{{/if}}
+	{{if $install || $update || $delete || $feature}}
+	<div class="app-tools">
+		<form action="{{$hosturl}}appman" method="post">
+		<input type="hidden" name="papp" value="{{$app.papp}}" />
+		{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-outline-secondary btn-sm" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}}
+		{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}}
+		{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}}
+		{{if $feature}}<button type="submit" name="feature" value="feature" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-star"{{if $featured}} style="color: gold"{{/if}}></i></button>{{/if}}
+		</form>
+	</div>
+	{{/if}}
+	{{/if}}
+</div>
+{{else}}
+<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
+{{/if}}
+
diff --git a/view/theme/redbasic/tpl/app_create.tpl b/view/theme/redbasic/tpl/app_create.tpl
new file mode 100644
index 000000000..5075ce5e2
--- /dev/null
+++ b/view/theme/redbasic/tpl/app_create.tpl
@@ -0,0 +1,40 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$banner}}</h2>
+	</div>
+
+	<div class="clearfix section-content-wrapper">
+		<form action="appman" method="post">
+		{{if $guid}}
+		<input type="hidden" name="guid" value="{{$guid}}" />
+		{{/if}}
+		{{if $author}}
+		<input type="hidden" name="author" value="{{$author}}" />
+		{{/if}}
+		{{if $addr}}
+		<input type="hidden" name="addr" value="{{$addr}}" />
+		{{/if}}
+
+		<input type="hidden" name="requires" value="{{$requires}}" />
+		<input type="hidden" name="system" value="{{$system}}" />
+		<input type="hidden" name="plugin" value="{{$plugin}}" />
+
+
+		{{include file="field_input.tpl" field=$name}}
+		{{include file="field_input.tpl" field=$categories}}
+		{{include file="field_input.tpl" field=$url}}
+		{{include file="field_textarea.tpl" field=$desc}}
+		{{include file="field_input.tpl" field=$photo}}
+		{{include file="field_input.tpl" field=$version}}
+		{{include file="field_input.tpl" field=$price}}
+		{{include file="field_input.tpl" field=$page}}
+
+		{{if $embed}}
+		{{include file="field_textarea.tpl" field=$embed}}
+		{{/if}}
+
+		<button class="btn btn-primary float-right" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+
+		</form>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/atom_feed.tpl b/view/theme/redbasic/tpl/atom_feed.tpl
new file mode 100755
index 000000000..ba50867ff
--- /dev/null
+++ b/view/theme/redbasic/tpl/atom_feed.tpl
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<feed xmlns="http://www.w3.org/2005/Atom"
+      xmlns:thr="http://purl.org/syndication/thread/1.0"
+      xmlns:at="http://purl.org/atompub/tombstones/1.0"
+      xmlns:media="http://purl.org/syndication/atommedia"
+      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
+      xmlns:zot="http://purl.org/zot"
+      xmlns:as="http://activitystrea.ms/spec/1.0/"
+      xmlns:georss="http://www.georss.org/georss"
+      xmlns:poco="http://portablecontacts.net/spec/1.0"
+      xmlns:ostatus="http://ostatus.org/schema/1.0"
+      xmlns:statusnet="http://status.net/schema/api/1/" >
+
+  <id>{{$feed_id}}</id>
+  <title>{{$feed_title}}</title>
+  <generator uri="http://hubzilla.org" version="{{$version}}">{{$red}}</generator>
+  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
+  <link rel="alternate" type="text/html" href="{{$profile_page}}" />
+{{if $author}}
+{{$author}}
+{{/if}}
+
+  <updated>{{$feed_updated}}</updated>
+
+  <zot:owner>
+    <name>{{$name}}</name>
+    <uri>{{$profile_page}}</uri>
+    <link rel="photo"  type="{{$mimephoto}}" media:width="175" media:height="175" href="{{$photo}}" />
+    <link rel="avatar" type="{{$mimephoto}}" media:width="175" media:height="175" href="{{$photo}}" />
+  </zot:owner>
diff --git a/view/theme/redbasic/tpl/attach_edit.tpl b/view/theme/redbasic/tpl/attach_edit.tpl
new file mode 100644
index 000000000..62442ff7a
--- /dev/null
+++ b/view/theme/redbasic/tpl/attach_edit.tpl
@@ -0,0 +1,31 @@
+<form id="attach_edit_form_{{$file.id}}" action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" class="acl-form" data-form_id="attach_edit_form_{{$file.id}}" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+	<input type="hidden" name="channelnick" value="{{$channelnick}}" />
+	<input type="hidden" name="filehash" value="{{$file.hash}}" />
+	<input type="hidden" name="uid" value="{{$uid}}" />
+	<input type="hidden" name="fileid" value="{{$file.id}}" />
+	{{if !$isadir}}{{include file="field_checkbox.tpl" field=$notify}}{{/if}}
+	{{if $isadir}}{{include file="field_checkbox.tpl" field=$recurse}}{{/if}}
+	<div id="attach-edit-tools-share" class="btn-group form-group">
+		{{if !$isadir}}
+		<a href="/rpost?attachment=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-outline-secondary btn-sm" title="{{$attach_btn_title}}">
+			<i class="fa fa-share-square-o jot-icons"></i>
+		</a>
+		{{/if}}
+		<button id="link-btn" class="btn btn-outline-secondary btn-sm" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}">
+			<i class="fa fa-link jot-icons"></i>
+		</button>
+	</div>
+	<div id="attach-edit-perms" class="btn-group pull-right">
+		<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button">
+			<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
+		</button>
+		<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit">
+			{{$submit}}
+		</button>
+	</div>
+	<div id="link-code" class="form-group">
+		<label for="">{{$cpldesc}}</label>
+		<input type="text" class="form-control" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/>
+	</div>
+</form>
+
diff --git a/view/theme/redbasic/tpl/birthdays_reminder.tpl b/view/theme/redbasic/tpl/birthdays_reminder.tpl
new file mode 100755
index 000000000..d0500364a
--- /dev/null
+++ b/view/theme/redbasic/tpl/birthdays_reminder.tpl
@@ -0,0 +1,10 @@
+{{if $count}}
+<div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div>
+<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div>
+<div id="birthday-title-end"></div>
+{{foreach $events as $event}}
+<div class="birthday-list" id="birthday-{{$event.id}}"></a> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
+{{/foreach}}
+</div>
+{{/if}}
+
diff --git a/view/theme/redbasic/tpl/blocklist.tpl b/view/theme/redbasic/tpl/blocklist.tpl
new file mode 100644
index 000000000..7f400bba2
--- /dev/null
+++ b/view/theme/redbasic/tpl/blocklist.tpl
@@ -0,0 +1,69 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $editor}}
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('block-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{if $editor}}
+	<div id="block-editor" class="section-content-tools-wrapper">
+		{{$editor}}
+	</div>
+	{{/if}}
+	{{if $pages}}
+	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+		<table id="block-list-table">
+			<tr>
+				<th width="1%">{{$name}}</th>
+				<th width="94%">{{$blocktitle}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%" class="d-none d-md-table-cell">{{$created}}</th>
+				<th width="1%" class="d-none d-md-table-cell">{{$edited}}</th>
+			</tr>
+			{{foreach $pages as $key => $items}}
+			{{foreach $items as $item}}
+			<tr id="block-list-item-{{$item.url}}">
+				<td>
+					{{if $view}}
+					<a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a>
+					{{else}}
+					{{$item.name}}
+					{{/if}}
+				</td>
+				<td>
+					{{$item.title}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $item.bb_element}}
+					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+					{{/if}}
+				</td>
+				<td class="d-none d-md-table-cell">
+					{{$item.created}}
+				</td>
+				<td class="d-none d-md-table-cell">
+					{{$item.edited}}
+				</td>
+			</tr>
+			{{/foreach}}
+			{{/foreach}}
+		</table>
+	</div>
+	<div class="clear"></div>
+	{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/bookmarkedchats.tpl b/view/theme/redbasic/tpl/bookmarkedchats.tpl
new file mode 100644
index 000000000..3aabf835a
--- /dev/null
+++ b/view/theme/redbasic/tpl/bookmarkedchats.tpl
@@ -0,0 +1,10 @@
+{{if $rooms}}
+<div id="chatroom_bookmarks" class="widget">
+<h3>{{$header}}</h3>
+<ul class="bookmarkchat nav nav-pills nav-stacked">
+{{foreach $rooms as $room}}
+<li><a href="{{$room.xchat_url}}">{{$room.xchat_desc}}</a></li>
+{{/foreach}}
+</ul>
+</div>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/build_query.tpl b/view/theme/redbasic/tpl/build_query.tpl
new file mode 100755
index 000000000..a76d4e549
--- /dev/null
+++ b/view/theme/redbasic/tpl/build_query.tpl
@@ -0,0 +1,65 @@
+<script> 
+
+	var bParam_cmd = "{{$baseurl}}/update_{{$pgtype}}";
+
+
+	var bParam_uid = {{$uid}};
+	var bParam_gid = {{$gid}};
+	var bParam_cid = {{$cid}};
+	var bParam_cmin = {{$cmin}};
+	var bParam_cmax = {{$cmax}};
+	var bParam_star = {{$star}};
+	var bParam_liked = {{$liked}};
+	var bParam_conv = {{$conv}};
+	var bParam_spam = {{$spam}};
+	var bParam_new = {{$nouveau}};
+	var bParam_page = {{$page}};
+	var bParam_wall = {{$wall}};
+	var bParam_list = {{$list}};
+	var bParam_fh = {{$fh}};
+	var bParam_static = {{$static}};
+
+	var bParam_search = "{{$search}}";
+	var bParam_xchan = "{{$xchan}}";
+	var bParam_order = "{{$order}}";
+	var bParam_file = "{{$file}}";
+	var bParam_cats = "{{$cats}}";
+	var bParam_tags = "{{$tags}}";
+	var bParam_dend = "{{$dend}}";
+	var bParam_dbegin = "{{$dbegin}}";
+	var bParam_mid = "{{$mid}}";
+	var bParam_verb = "{{$verb}}";
+
+	function buildCmd() {
+		var udargs = ((page_load) ? "/load" : "");
+		var bCmd = bParam_cmd + udargs + "?f=" ;
+		if(bParam_uid) bCmd = bCmd + "&p=" + bParam_uid;
+		if(bParam_cmin != 0) bCmd = bCmd + "&cmin=" + bParam_cmin;
+		if(bParam_cmax != 99) bCmd = bCmd + "&cmax=" + bParam_cmax;
+		if(bParam_gid != 0) { bCmd = bCmd + "&gid=" + bParam_gid; } else
+		if(bParam_cid != 0) { bCmd = bCmd + "&cid=" + bParam_cid; }
+		if(bParam_static != 0) { bCmd = bCmd + "&static=" + bParam_static; }
+		if(bParam_star != 0) bCmd = bCmd + "&star=" + bParam_star;
+		if(bParam_liked != 0) bCmd = bCmd + "&liked=" + bParam_liked;
+		if(bParam_conv!= 0) bCmd = bCmd + "&conv=" + bParam_conv;
+		if(bParam_spam != 0) bCmd = bCmd + "&spam=" + bParam_spam;
+		if(bParam_new != 0) bCmd = bCmd + "&new=" + bParam_new;
+		if(bParam_wall != 0) bCmd = bCmd + "&wall=" + bParam_wall;
+		if(bParam_list != 0) bCmd = bCmd + "&list=" + bParam_list;
+		if(bParam_fh != 0) bCmd = bCmd + "&fh=" + bParam_fh;
+		if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search;
+		if(bParam_xchan != "") bCmd = bCmd + "&xchan=" + bParam_xchan;
+		if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order;
+		if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file;
+		if(bParam_cats != "") bCmd = bCmd + "&cat=" + bParam_cats;
+		if(bParam_tags != "") bCmd = bCmd + "&tag=" + bParam_tags;
+		if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
+		if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin;
+		if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid;
+		if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb;
+		if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
+		return(bCmd);
+	}
+
+</script>
+
diff --git a/view/theme/redbasic/tpl/categories_widget.tpl b/view/theme/redbasic/tpl/categories_widget.tpl
new file mode 100755
index 000000000..72478aa3d
--- /dev/null
+++ b/view/theme/redbasic/tpl/categories_widget.tpl
@@ -0,0 +1,12 @@
+<div id="categories-sidebar" class="widget">
+	<h3>{{$title}}</h3>
+	<div id="categories-sidebar-desc">{{$desc}}</div>
+	
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item"><a href="{{$base}}" class="nav-link{{if $sel_all}} active{{/if}}">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+		<li class="nav-item"><a  href="{{$base}}?f=&cat={{$term.name}}" class="nav-link{{if $term.selected}} active{{/if}}">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/redbasic/tpl/cdav_addressbook.tpl b/view/theme/redbasic/tpl/cdav_addressbook.tpl
new file mode 100644
index 000000000..587a95caa
--- /dev/null
+++ b/view/theme/redbasic/tpl/cdav_addressbook.tpl
@@ -0,0 +1,462 @@
+<script>
+$(document).ready(function() {
+
+	$(document).on('click', '.vcard-header, .vcard-cancel-btn', updateView);
+	$(document).on('click', '.add-field', doAdd);
+	$(document).on('click', '.remove-field', doRemove);
+
+	function updateView() {
+		var id = $(this).data('id');
+		var action = $(this).data('action');
+		var header = $('#vcard-header-' + id);
+		var cancel = $('#vcard-cancel-' + id);
+		var addField = $('#vcard-add-field-' + id);
+		var info = $('#vcard-info-' + id);
+		var vcardPreview = $('#vcard-preview-' + id);
+		var fn = $('#vcard-fn-' + id);
+
+		if(action === 'open') {
+			$(header).addClass('active');
+			$(cancel).show();
+			$(addField).show();
+			$(info).show();
+			$(fn).show();
+			$(vcardPreview).hide();
+		}
+		else {
+			$(header).removeClass('active');
+			$(cancel).hide();
+			$(addField).hide();
+			$(info).hide();
+			$(fn).hide();
+			$(vcardPreview).show();
+		}
+	}
+
+	function doAdd(e) {
+		e.preventDefault();
+		var what = $(this).data('add');
+		var id = $(this).data('id');
+		var element = '#template-form-' + what;
+		var where = '#card_form_' + id;
+
+		$(element + ' .remove-field').attr('data-id', id)
+
+		if(what === 'vcard-adr') {
+			var adrCount = $(where + ' .form-' + what).length;
+			var attrName = 'adr[' + adrCount + '][]';
+			$(element + ' input').attr('name', attrName);
+		}
+
+		if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') {
+			$(where + ' .add-' + what).hide()
+		}
+
+		$(element).clone().removeAttr('id').appendTo(where + ' .form-' + what + '-wrapper');
+	}
+
+	function doRemove() {
+		var what = $(this).data('remove');
+		var element = $(this).parents('div.form-' + what);
+		var where = '#card_form_' + $(this).data('id');
+
+		if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') {
+			$(where + ' .add-' + what).show()
+		}
+
+		$(element).remove();
+	}
+
+});
+</script>
+<div id="template-form-vcard-org" class="form-group form-vcard-org">
+	<div class="form-group form-vcard-org">
+		<input type="text" name="org" value="" placeholder="{{$org_label}}">
+		<i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	</div>
+</div>
+
+<div id="template-form-vcard-title" class="form-group form-vcard-title">
+	<div class="form-group form-vcard-title">
+		<input type="text" name="title" value="" placeholder="{{$title_label}}">
+		<i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	</div>
+</div>
+
+<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
+	<select name="tel_type[]">
+		<option value="CELL">{{$mobile}}</option>
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
+	<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-email" class="form-group form-vcard-email">
+	<select name="email_type[]">
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
+	<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
+	<select name="impp_type[]">
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
+	<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-url" class="form-group form-vcard-url">
+	<select name="url_type[]">
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="url[]" value="" placeholder="{{$url_label}}">
+	<i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-adr" class="form-group form-vcard-adr">
+	<div class="form-group">
+		<select name="adr_type[]">
+			<option value="HOME">{{$home}}</option>
+			<option value="WORK">{{$work}}</option>
+			<option value="OTHER">{{$other}}</option>
+		</select>
+		<label>{{$adr_label}}</label>
+		<i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$po_box}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$extra}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$street}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$locality}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$region}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$zip_code}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$country}}">
+	</div>
+</div>
+
+<div id="template-form-vcard-note" class="form-group form-vcard-note">
+	<label>{{$note_label}}</label>
+	<i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	<textarea name="note" class="form-control"></textarea>
+</div>
+
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<button type="button" class="btn btn-success btn-sm float-right" onclick="openClose('create_form')"><i class="fa fa-plus-circle"></i> {{$add_card}}</button>
+		<h2>{{$displayname}}</h2>
+	</div>
+	<div id="create_form" class="section-content-tools-wrapper">
+		<form id="card_form_new" method="post" action="">
+			<input type="hidden" name="target" value="{{$id}}">
+			<div class="dropdown pull-right">
+				<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+				<div class="dropdown-menu dropdown-menu-right">
+					<a class="dropdown-item add-vcard-org add-field" style="display: none" href="#" data-add="vcard-org" data-id="new">{{$org_label}}</a>
+					<a class="dropdown-item add-vcard-title add-field" style="display: none" href="#" data-add="vcard-title" data-id="new">{{$title_label}}</a>
+					<a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="new">{{$tel_label}}</a>
+					<a class="dropdown-item add-vcard-email add-field" href="#" data-add="vcard-email" data-id="new">{{$email_label}}</a>
+					<a class="dropdown-item add-vcard-impp add-field" href="#" data-add="vcard-impp" data-id="new">{{$impp_label}}</a>
+					<a class="dropdown-item add-vcard-url add-field" href="#" data-add="vcard-url" data-id="new">{{$url_label}}</a>
+					<a class="dropdown-item add-vcard-adr add-field" href="#" data-add="vcard-adr" data-id="new">{{$adr_label}}</a>
+					<a class="dropdown-item add-vcard-note add-field" href="#" data-add="vcard-note" data-id="new">{{$note_label}}</a>
+				</div>
+			</div>
+
+			<div class="vcard-fn-create form-group">
+				<div class="form-vcard-fn-wrapper">
+					<div class="form-group form-vcard-fn">
+						<div class="vcard-nophoto"><i class="fa fa-user"></i></div><input type="text" name="fn" value="" placeholder="{{$name_label}}">
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-org form-group">
+				<div class="form-vcard-org-wrapper">
+					<div class="form-group form-vcard-org">
+						<input type="text" name="org" value="" placeholder="{{$org_label}}">
+						<i data-remove="vcard-org" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-title form-group">
+				<div class="form-vcard-title-wrapper">
+					<div class="form-group form-vcard-title">
+						<input type="text" name="title" value="" placeholder="{{$title_label}}">
+						<i data-remove="vcard-title" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-tel form-group">
+				<div class="form-vcard-tel-wrapper">
+					<div class="form-group form-vcard-tel">
+						<select name="tel_type[]">
+							<option value="CELL">{{$mobile}}</option>
+							<option value="HOME">{{$home}}</option>
+							<option value="WORK">{{$work}}</option>
+							<option value="OTHER">{{$other}}</option>
+						</select>
+						<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
+						<i data-remove="vcard-tel" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+
+			<div class="vcard-email form-group">
+				<div class="form-vcard-email-wrapper">
+					<div class="form-group form-vcard-email">
+						<select name="email_type[]">
+							<option value="HOME">{{$home}}</option>
+							<option value="WORK">{{$work}}</option>
+							<option value="OTHER">{{$other}}</option>
+						</select>
+						<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
+						<i data-remove="vcard-email" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-impp form-group">
+				<div class="form-vcard-impp-wrapper">
+				</div>
+			</div>
+
+			<div class="vcard-url form-group">
+				<div class="form-vcard-url-wrapper">
+				</div>
+			</div>
+
+			<div class="vcard-adr form-group">
+				<div class="form-vcard-adr-wrapper">
+				</div>
+			</div>
+
+			<div class="vcard-note form-group">
+				<div class="form-vcard-note-wrapper">
+				</div>
+			</div>
+
+			<button type="submit" name="create" value="create_card" class="btn btn-primary btn-sm pull-right">{{$create}}</button>
+			<button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('create_form')">{{$cancel}}</button>
+			<div class="clear"></div>
+		</form>
+	</div>
+
+	{{foreach $cards as $card}}
+	<form id="card_form_{{$card.id}}" method="post" action="">
+		<input type="hidden" name="target" value="{{$id}}">
+		<input type="hidden" name="uri" value="{{$card.uri}}">
+		<div class="section-content-wrapper-np">
+			<div id="vcard-cancel-{{$card.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
+			<div id="vcard-add-field-{{$card.id}}" class="dropdown pull-right vcard-add-field">
+				<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+				<div class="dropdown-menu dropdown-menu-right">
+					<a class="dropdown-item add-vcard-org add-field"{{if $card.org}} style="display: none"{{/if}} href="#" data-add="vcard-org" data-id="{{$card.id}}">{{$org_label}}</a>
+					<a class="dropdown-item add-vcard-title add-field"{{if $card.title}} style="display: none"{{/if}} href="#" data-add="vcard-title" data-id="{{$card.id}}">{{$title_label}}</a>
+					<a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="{{$card.id}}">{{$tel_label}}</a>
+					<a class="dropdown-item add-vcard-email add-field" href="#" data-add="vcard-email" data-id="{{$card.id}}">{{$email_label}}</a>
+					<a class="dropdown-item add-vcard-impp add-field" href="#" data-add="vcard-impp" data-id="{{$card.id}}">{{$impp_label}}</a>
+					<a class="dropdown-item add-vcard-url add-field" href="#" data-add="vcard-url" data-id="{{$card.id}}">{{$url_label}}</a>
+					<a class="dropdown-item add-vcard-adr add-field" href="#" data-add="vcard-adr" data-id="{{$card.id}}">{{$adr_label}}</a>
+					<a class="dropdown-item add-vcard-note add-field"{{if $card.note}} style="display: none"{{/if}} href="#" data-add="vcard-note" data-id="{{$card.id}}">{{$note_label}}</a>
+				</div>
+			</div>
+			<div id="vcard-header-{{$card.id}}" class="vcard-header" data-id="{{$card.id}}" data-action="open">
+				{{if $card.photo}}<img class="vcard-photo" src="{{$card.photo}}" width="32px" height="32px">{{else}}<div class="vcard-nophoto"><i class="fa fa-user"></i></div>{{/if}}
+				<span id="vcard-preview-{{$card.id}}" class="vcard-preview">
+					{{if $card.fn}}<span class="vcard-fn-preview">{{$card.fn}}</span>{{/if}}
+					{{if $card.emails.0.address}}<span class="vcard-email-preview hidden-xs">{{$card.emails.0.address}}</span>{{/if}}
+					{{if $card.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$card.tels.0.nr}}</span>{{/if}}
+				</span>
+				<input id="vcard-fn-{{$card.id}}" class="vcard-fn" type="text" name="fn" value="{{$card.fn}}" size="{{$card.fn|count_characters:true}}" placeholder="{{$name_label}}">
+			</div>
+		</div>
+		<div id="vcard-info-{{$card.id}}" class="vcard-info section-content-wrapper">
+
+			<div class="vcard-org form-group">
+				<div class="form-vcard-org-wrapper">
+					{{if $card.org}}
+					<div class="form-group form-vcard-org">
+						<input type="text" name="org" value="{{$card.org}}" size="{{$card.org|count_characters:true}}" placeholder="{{$org_label}}">
+						<i data-remove="vcard-org" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-title form-group">
+				<div class="form-vcard-title-wrapper">
+					{{if $card.title}}
+					<div class="form-group form-vcard-title">
+						<input type="text" name="title" value="{{$card.title}}" size="{{$card.title|count_characters:true}}" placeholder="{{$title_label}}">
+						<i data-remove="vcard-title" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/if}}
+				</div>
+			</div>
+
+
+			<div class="vcard-tel form-group">
+				<div class="form-vcard-tel-wrapper">
+					{{if $card.tels}}
+					{{foreach $card.tels as $tel}}
+					<div class="form-group form-vcard-tel">
+						<select name="tel_type[]">
+							<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
+							<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
+							<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
+						<i data-remove="vcard-tel" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+
+			<div class="vcard-email form-group">
+				<div class="form-vcard-email-wrapper">
+					{{if $card.emails}}
+					{{foreach $card.emails as $email}}
+					<div class="form-group form-vcard-email">
+						<select name="email_type[]">
+							<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
+							<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
+						<i data-remove="vcard-email" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-impp form-group">
+				<div class="form-vcard-impp-wrapper">
+					{{if $card.impps}}
+					{{foreach $card.impps as $impp}}
+					<div class="form-group form-vcard-impp">
+						<select name="impp_type[]">
+							<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
+							<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
+						<i data-remove="vcard-impp" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-url form-group">
+				<div class="form-vcard-url-wrapper">
+					{{if $card.urls}}
+					{{foreach $card.urls as $url}}
+					<div class="form-group form-vcard-url">
+						<select name="url_type[]">
+							<option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option>
+							<option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $url.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $url.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="url[]" value="{{$url.address}}" size="{{$url.address|count_characters:true}}" placeholder="{{$url_label}}">
+						<i data-remove="vcard-url" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-adr form-group">
+				<div class="form-vcard-adr-wrapper">
+					{{if $card.adrs}}
+					{{foreach $card.adrs as $adr}}
+					<div class="form-group form-vcard-adr">
+						<div class="form-group">
+							<label>{{$adr_label}}</label>
+							<select name="adr_type[]">
+								<option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option>
+								<option value="HOME"{{if $adr.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+								<option value="WORK"{{if $adr.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+								<option value="OTHER"{{if $adr.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+							</select>
+							<i data-remove="vcard-adr" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}">
+						</div>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-note form-group form-vcard-note">
+				<div class="form-vcard-note-wrapper">
+					{{if $card.note}}
+					<label>{{$note_label}}</label>
+					<i data-remove="vcard-note" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					<textarea name="note" class="form-control">{{$card.note}}</textarea>
+					{{/if}}
+				</div>
+			</div>
+
+
+			<button type="submit" name="update" value="update_card" class="btn btn-primary btn-sm pull-right">{{$update}}</button>
+			<button type="submit" name="delete" value="delete_card" class="btn btn-danger btn-sm">{{$delete}}</button>
+			<button type="button" class="btn btn-outline-secondary btn-sm vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel">{{$cancel}}</button>
+			<div class="clear"></div>
+		</div>
+	</form>
+	{{/foreach}}
+</div>
diff --git a/view/theme/redbasic/tpl/cdav_calendar.tpl b/view/theme/redbasic/tpl/cdav_calendar.tpl
new file mode 100644
index 000000000..5d683d751
--- /dev/null
+++ b/view/theme/redbasic/tpl/cdav_calendar.tpl
@@ -0,0 +1,349 @@
+<script>
+
+var new_event = [];
+var new_event_id = Math.random().toString(36).substring(7);
+var views = {'month' : '{{$month}}', 'agendaWeek' : '{{$week}}', 'agendaDay' : '{{$day}}', 'listMonth' : '{{$list_month}}', 'listWeek' : '{{$list_week}}', 'listDay' : '{{$list_day}}'};
+
+$(document).ready(function() {
+	$('#calendar').fullCalendar({
+		eventSources: [ {{$sources}} ],
+
+		header: false,
+		eventTextColor: 'white',
+
+		lang: '{{$lang}}',
+		firstDay: {{$first_day}},
+
+		monthNames: aStr['monthNames'],
+		monthNamesShort: aStr['monthNamesShort'],
+		dayNames: aStr['dayNames'],
+		dayNamesShort: aStr['dayNamesShort'],
+		allDayText: aStr['allday'],
+
+		timeFormat: 'HH:mm',
+		timezone: 'local',
+
+		defaultTimedEventDuration: '01:00:00',
+		snapDuration: '00:15:00',
+
+		dayClick: function(date, jsEvent, view) {
+
+			if(new_event.length)
+				$('#calendar').fullCalendar( 'removeEventSource', new_event);
+
+			$('#event_uri').val('');
+			$('#id_title').val('New event');
+			$('#calendar_select').val($("#calendar_select option:first").val()).attr('disabled', false);
+			$('#id_dtstart').val(date.format());
+			$('#id_dtend').val(date.hasTime() ? date.add(1, 'hours').format() : date.add(1, 'days').format());
+			$('#id_description').val('');
+			$('#id_location').val('');
+			$('#event_submit').val('create_event').html('Create');
+			$('#event_delete').hide();
+
+			new_event = [{ id: new_event_id, title  : 'New event', start: $('#id_dtstart').val(), end: $('#id_dtend').val(), editable: true, color: '#bbb' }]
+			$('#calendar').fullCalendar( 'addEventSource', new_event);
+		},
+
+		eventClick: function(event, jsEvent, view) {
+
+			if(event.id == new_event_id) {
+				$(window).scrollTop(0);
+				$('.section-content-tools-wrapper, #event_form_wrapper').show();
+				$('#recurrence_warning').hide();
+				$('#id_title').focus().val('');
+				return false;
+			}
+
+			if($('main').hasClass('fullscreen') && view.type !== 'month' && event.rw)
+				$('#calendar').fullCalendar('option', 'height', 'auto');
+
+			if(new_event.length && event.rw) {
+				$('#calendar').fullCalendar( 'removeEventSource', new_event);
+			}
+
+			if(!event.recurrent && event.rw) {
+				var start_clone = moment(event.start);
+				var noend_allday = start_clone.add(1, 'day').format('YYYY-MM-DD');
+
+				$(window).scrollTop(0);
+				$('.section-content-tools-wrapper, #event_form_wrapper').show();
+				$('#recurrence_warning').hide();
+				$('#id_title').focus();
+
+				$('#event_uri').val(event.uri);
+				$('#id_title').val(event.title);
+				$('#calendar_select').val(event.calendar_id[0] + ':' + event.calendar_id[1]).attr('disabled', true);
+				$('#id_dtstart').val(event.start.format());
+				$('#id_dtend').val(event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday);
+				$('#id_description').val(event.description);
+				$('#id_location').val(event.location);
+				$('#event_submit').val('update_event').html('Update');
+				$('#event_delete').show();
+			}
+			else if(event.recurrent && event.rw) {
+				$('.section-content-tools-wrapper, #recurrence_warning').show();
+				$('#event_form_wrapper').hide();
+				$('#event_uri').val(event.uri);
+				$('#calendar_select').val(event.calendar_id[0] + ':' + event.calendar_id[1]).attr('disabled', true);
+			}
+		},
+
+		eventResize: function(event, delta, revertFunc) {
+
+			$('#id_title').val(event.title);
+			$('#id_dtstart').val(event.start.format());
+			$('#id_dtend').val(event.end.format());
+
+			$.post( 'cdav/calendar', {
+				'update': 'resize',
+				'id[]': event.calendar_id,
+				'uri': event.uri,
+				'dtstart': event.start ? event.start.format() : '',
+				'dtend': event.end ? event.end.format() : ''
+			})
+			.fail(function() {
+				revertFunc();
+			});
+		},
+
+		eventDrop: function(event, delta, revertFunc) {
+
+			var start_clone = moment(event.start);
+			var noend_allday = start_clone.add(1, 'day').format('YYYY-MM-DD');
+
+			$('#id_title').val(event.title);
+			$('#id_dtstart').val(event.start.format());
+			$('#id_dtend').val(event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday);
+
+			$.post( 'cdav/calendar', {
+				'update': 'drop',
+				'id[]': event.calendar_id,
+				'uri': event.uri,
+				'dtstart': event.start ? event.start.format() : '',
+				'dtend': event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday
+			})
+			.fail(function() {
+				revertFunc();
+			});
+		},
+
+		loading: function(isLoading, view) {
+			$('#events-spinner').spin('tiny');
+			$('#events-spinner > i').css('color', 'transparent');
+			if(!isLoading) {
+				$('#events-spinner').spin(false);
+				$('#events-spinner > i').css('color', '');
+			}
+		}
+	});
+
+	// echo the title
+	var view = $('#calendar').fullCalendar('getView');
+
+	$('#title').text(view.title);
+
+	$('#view_selector').html(views[view.name]);
+
+	$('.color-edit').colorpicker({ input: '.color-edit-input' });
+
+	$(document).on('click','#fullscreen-btn', on_fullscreen);
+	$(document).on('click','#inline-btn', on_inline);
+
+	$(document).on('click','#event_submit', on_submit);
+	$(document).on('click','#event_more', on_more);
+	$(document).on('click','#event_cancel, #event_cancel_recurrent', reset_form);
+	$(document).on('click','#event_delete, #event_delete_recurrent', on_delete);
+
+});
+
+function changeView(action, viewName) {
+	$('#calendar').fullCalendar(action, viewName);
+	var view = $('#calendar').fullCalendar('getView');
+
+	if($('main').hasClass('fullscreen'))
+		if(view.name !== 'month')
+			$('.section-content-tools-wrapper').css('display') === 'none' ? on_fullscreen() : on_inline() ;
+		else
+			on_fullscreen();
+	else
+		on_inline();
+
+	$('#title').text(view.title);
+	$('#view_selector').html(views[view.name]);
+}
+
+function add_remove_json_source(source, color, editable, status) {
+
+	if(status === undefined)
+		status = 'fa-calendar-check-o';
+
+	if(status === 'drop') {
+		reset_form();
+		$('#calendar').fullCalendar( 'removeEventSource', source );
+		return;
+	}
+
+	var parts = source.split('/');
+	var id = parts[4];
+
+	var selector = '#calendar-btn-' + id;
+
+	if($(selector).hasClass('fa-calendar-o')) {
+		$('#calendar').fullCalendar( 'addEventSource', { url: source, color: color, editable: editable });
+		$(selector).removeClass('fa-calendar-o');
+		$(selector).addClass(status);
+		$.get('/cdav/calendar/switch/' + id + '/1');
+	}
+	else {
+		$('#calendar').fullCalendar( 'removeEventSource', source );
+		$(selector).removeClass(status);
+		$(selector).addClass('fa-calendar-o');
+		$.get('/cdav/calendar/switch/' + id + '/0');
+	}
+}
+
+function on_fullscreen() {
+	var view = $('#calendar').fullCalendar('getView');
+	if(($('.section-content-tools-wrapper').css('display') === 'none') || ($('.section-content-tools-wrapper').css('display') !== 'none' && view.type === 'month'))
+		$('#calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
+}
+
+function on_inline() {
+	var view = $('#calendar').fullCalendar('getView');
+	((view.type === 'month') ? $('#calendar').fullCalendar('option', 'height', '') : $('#calendar').fullCalendar('option', 'height', 'auto'));
+}
+
+function on_submit() {
+	$.post( 'cdav/calendar', {
+		'submit': $('#event_submit').val(),
+		'target': $('#calendar_select').val(),
+		'uri': $('#event_uri').val(),
+		'title': $('#id_title').val(),
+		'dtstart': $('#id_dtstart').val(),
+		'dtend': $('#id_dtend').val(),
+		'description': $('#id_description').val(),
+		'location': $('#id_location').val()
+	})
+	.done(function() {
+		$('#calendar').fullCalendar( 'refetchEventSources', [ {{$sources}} ] );
+		reset_form();
+	});
+}
+
+function on_delete() {
+	$.post( 'cdav/calendar', {
+		'delete': 'delete',
+		'target': $('#calendar_select').val(),
+		'uri': $('#event_uri').val(),
+	})
+	.done(function() {
+		$('#calendar').fullCalendar( 'refetchEventSources', [ {{$sources}} ] );
+		reset_form();
+	});
+}
+
+function reset_form() {
+	$('.section-content-tools-wrapper, #event_form_wrapper, #recurrence_warning').hide();
+
+	$('#event_submit').val('');
+	$('#calendar_select').val('');
+	$('#event_uri').val('');
+	$('#id_title').val('');
+	$('#id_dtstart').val('');
+	$('#id_dtend').val('');
+
+	if(new_event.length)
+		$('#calendar').fullCalendar( 'removeEventSource', new_event);
+
+	if($('#more_block').hasClass('open'))
+		on_more();
+
+	if($('main').hasClass('fullscreen'))
+		on_fullscreen();
+}
+
+function on_more() {
+	if($('#more_block').hasClass('open')) {
+		$('#event_more').html('<i class="fa fa-caret-down"></i> {{$more}}');
+		$('#more_block').removeClass('open').hide();
+	}
+	else {
+		$('#event_more').html('<i class="fa fa-caret-up"></i> {{$less}}');
+		$('#more_block').addClass('open').show();
+	}
+}
+
+</script>
+
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="float-right">
+			<div class="dropdown">
+				<button id="view_selector" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"></button>
+				<div class="dropdown-menu">
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
+					<div class="dropdown-divider"></div>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listMonth'); return false;">{{$list_month}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listWeek'); return false;">{{$list_week}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listDay'); return false;">{{$list_day}}</a></li>
+				</div>
+				<div class="btn-group">
+					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
+					<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
+				</div>
+				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+				<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+			</div>
+		</div>
+		<h2 id="title"></h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-tools-wrapper" style="display: none">
+		<div id="recurrence_warning" style="display: none">
+			<div class="section-content-warning-wrapper">
+				{{$recurrence_warning}}
+			</div>
+			<div>
+				<button id="event_delete_recurrent" type="button" class="btn btn-danger btn-sm">{{$delete_all}}</button>
+				<button id="event_cancel_recurrent" type="button" class="btn btn-outline-secondary btn-sm">{{$cancel}}</button>
+			</div>
+		</div>
+		<div id="event_form_wrapper" style="display: none">
+			<form id="event_form" method="post" action="">
+				<input id="event_uri" type="hidden" name="uri" value="">
+				{{include file="field_input.tpl" field=$title}}
+				<label for="calendar_select">{{$calendar_select_label}}</label>
+				<select id="calendar_select" name="target" class="form-control form-group">
+					{{foreach $writable_calendars as $writable_calendar}}
+					<option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}{{if $writable_calendar.sharer}} ({{$writable_calendar.sharer}}){{/if}}</option>
+					{{/foreach}}
+				</select>
+				<div id="more_block" style="display: none;">
+					{{include file="field_input.tpl" field=$dtstart}}
+					{{include file="field_input.tpl" field=$dtend}}
+					{{include file="field_textarea.tpl" field=$description}}
+					{{include file="field_textarea.tpl" field=$location}}
+				</div>
+				<div class="form-group">
+					<div class="pull-right">
+						<button id="event_more" type="button" class="btn btn-outline-secondary btn-sm"><i class="fa fa-caret-down"></i> {{$more}}</button>
+						<button id="event_submit" type="button" value="" class="btn btn-primary btn-sm"></button>
+
+					</div>
+					<div>
+						<button id="event_delete" type="button" class="btn btn-danger btn-sm">{{$delete}}</button>
+						<button id="event_cancel" type="button" class="btn btn-outline-secondary btn-sm">{{$cancel}}</button>
+					</div>
+					<div class="clear"></div>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="section-content-wrapper-np">
+		<div id="calendar"></div>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/cdav_widget_addressbook.tpl b/view/theme/redbasic/tpl/cdav_widget_addressbook.tpl
new file mode 100644
index 000000000..c875dc977
--- /dev/null
+++ b/view/theme/redbasic/tpl/cdav_widget_addressbook.tpl
@@ -0,0 +1,66 @@
+<div class="widget">
+	<h3>{{$addressbooks_label}}</h3>
+	{{foreach $addressbooks as $addressbook}}
+	<div id="addressbook-{{$addressbook.id}}" class="ml-3">
+		<div class="form-group">
+			<i class="fa fa-user generic-icons"></i><a href="/cdav/addressbook/{{$addressbook.id}}">{{$addressbook.displayname}}</a>
+			<div class="float-right">
+				<i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-addressbook-{{$addressbook.id}}')"></i>
+				<a href="/cdav/addressbooks/{{$addressbook.ownernick}}/{{$addressbook.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
+				<a href="#" onclick="dropItem('/cdav/addressbook/drop/{{$addressbook.id}}', '#addressbook-{{$addressbook.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+			</div>
+		</div>
+		<div id="edit-addressbook-{{$addressbook.id}}" class="sub-menu" style="display: none;">
+			<form id="edit-addressbook-{{$addressbook.id}}" method="post" action="">
+				<label for="edit-{{$addressbook.id}}">{{$edit_label}}</label>
+				<div id="edit-form-{{$addressbook.id}}" class="form-group">
+					<input id="id-{{$addressbook.id}}" name="id" type="hidden" value="{{$addressbook.id}}">
+					<input id="edit-{{$addressbook.id}}" name="{DAV:}displayname" type="text" value="{{$addressbook.displayname}}" class="form-control">
+				</div>
+				<div class="form-group">
+					<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
+				</div>
+			</form>
+		</div>
+	</div>
+	{{/foreach}}
+</div>
+
+<div class="widget">
+	<h3>{{$tools_label}}</h3>
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('create-addressbook'); return false;"><i class="fa fa-user-plus generic-icons"></i> {{$create_label}}</a>
+		</li>
+		<div id="create-addressbook" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form method="post" action="">
+					<div class="form-group">
+						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control form-group">
+						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('upload-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+		</li>
+		<div id="upload-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+					<div class="form-group">
+						<select id="import" name="target" class="form-control">
+							<option value="">{{$import_placeholder}}</option>
+							{{foreach $addressbooks as $addressbook}}
+							<option value="{{$addressbook.id}}">{{$addressbook.displayname}}</option>
+							{{/foreach}}
+						</select>
+					</div>
+					<div class="form-group">
+						<input class="form-control-file w-100" id="addressbook-upload-choose" type="file" name="userfile" />
+					</div>
+					<button class="btn btn-primary btn-sm" type="submit" name="a_upload" value="a_upload">{{$upload}}</button>
+				</form>
+			</div>
+		</div>
+	</ul>
+</div>
diff --git a/view/theme/redbasic/tpl/cdav_widget_calendar.tpl b/view/theme/redbasic/tpl/cdav_widget_calendar.tpl
new file mode 100644
index 000000000..ec2257a19
--- /dev/null
+++ b/view/theme/redbasic/tpl/cdav_widget_calendar.tpl
@@ -0,0 +1,121 @@
+{{if $my_calendars}}
+<div class="widget">
+	<h3>{{$my_calendars_label}}</h3>
+	{{foreach $my_calendars as $calendar}}
+	<div id="calendar-{{$calendar.calendarid}}">
+		<div class="ml-3{{if !$calendar@last}} form-group{{/if}}">
+			<i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}fa-calendar-check-o{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}})" style="color: {{$calendar.color}};"></i>{{$calendar.displayname}}
+			<div class="float-right">
+				<i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-calendar-{{$calendar.calendarid}}')"></i>
+				<a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
+				<i id="share-icon" class="fa fa-share-alt fakelink generic-icons" onclick="openClose('share-calendar-{{$calendar.calendarid}}')"></i>
+				<a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+			</div>
+			<div id="share-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};">
+				{{if $calendar.sharees}}
+				{{foreach $calendar.sharees as $sharee}}
+				<div id="sharee-{{$calendar.calendarid}}" class="form-group">
+					<i class="fa fa-share generic-icons"></i>{{$sharee.name}}&nbsp;{{$sharee.access}}
+					<div class="pull-right">
+						<a href="#" onclick="dropItem('/cdav/calendar/dropsharee/{{$calendar.calendarid}}/{{$calendar.instanceid}}/{{$sharee.hash}}', '#sharee-{{$calendar.calendarid}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+					</div>
+				</div>
+				{{/foreach}}
+				{{/if}}
+				<form method="post" action="">
+					<label for="share-{{$calendar.calendarid}}">{{$share_label}}</label>
+					<input name="calendarid" type="hidden" value="{{$calendar.calendarid}}">
+					<input name="instanceid" type="hidden" value="{{$calendar.instanceid}}">
+					<div class="form-group">
+						<select id="share-{{$calendar.calendarid}}" name="sharee" class="form-control">
+							{{$sharee_options}}
+						</select>
+					</div>
+					<div class="form-group">
+						<select name="access" class="form-control">
+							{{$access_options}}
+						</select>
+					</div>
+					<div class="form-group">
+						<button type="submit" name="share" value="share" class="btn btn-primary btn-sm">{{$share}}</button>
+					</div>
+				</form>
+			</div>
+			<div id="edit-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};">
+				<form id="edit-calendar-{{$calendar.calendarid}}" method="post" action="" class="colorpicker-component color-edit">
+					<input id="id-{{$calendar.calendarid}}" name="id" type="hidden" value="{{$calendar.calendarid}}:{{$calendar.instanceid}}">
+					<input id="color-{{$calendar.calendarid}}" name="color" type="hidden" value="{{$calendar.color}}" class="color-edit-input">
+					<label for="edit-form-{{$calendar.calendarid}}">{{$edit_label}}</label>
+					<div id="edit-form-{{$calendar.calendarid}}" class="input-group form-group">
+						<input id="create-{{$calendar.calendarid}}" name="{DAV:}displayname" type="text" value="{{$calendar.displayname}}" class="form-control">
+						<span class="input-group-addon"><i></i></span>
+					</div>
+					<div class="form-group">
+						<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+	{{/foreach}}
+</div>
+{{/if}}
+
+{{if $shared_calendars}}
+<div class="widget">
+	<h3>{{$shared_calendars_label}}</h3>
+	{{foreach $shared_calendars as $calendar}}
+	<div id="shared-calendar-{{$calendar.calendarid}}" class="ml-3{{if !$calendar@last}} form-group{{/if}}">
+		<i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}{{if $calendar.access == 'read-write'}}fa-calendar-check-o{{else}}fa-calendar-times-o{{/if}}{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, {{if $calendar.access == 'read-write'}}'fa-calendar-check-o'{{else}}'fa-calendar-times-o'{{/if}})"  style="color: {{$calendar.color}};"></i>{{$calendar.displayname}} ({{$calendar.sharer}})
+		<div class="pull-right">
+			<a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
+			<a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#shared-calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+		</div>
+	</div>
+	{{/foreach}}
+</div>
+{{/if}}
+
+<div class="widget">
+	<h3>{{$tools_label}}</h3>
+	<div class="nav nav-pills flex-column">
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('create-calendar'); return false;"><i class="fa fa-calendar-plus-o generic-icons"></i> {{$create_label}}</a>
+		</li>
+		<div id="create-calendar" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form method="post" action="" class="colorpicker-component color-edit">
+					<input id="color" name="color" type="hidden" value="#3a87ad" class="color-edit-input">
+					<div id="create-form" class="input-group form-group">
+						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control">
+						<span class="input-group-addon"><i></i></span>
+					</div>
+					<div class="form-group">
+						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('upload-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+		</li>
+		<div id="upload-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<div class="form-group">
+						<select id="import" name="target" class="form-control">
+							<option value="">{{$import_placeholder}}</option>
+							{{foreach $writable_calendars as $writable_calendar}}
+							<option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}</option>
+							{{/foreach}}
+						</select>
+					</div>
+					<div class="form-group">
+						<input class="form-control-file w-100" id="event-upload-choose" type="file" name="userfile" />
+					</div>
+					<button class="btn btn-primary btn-sm" type="submit" name="c_upload" value="c_upload">{{$upload}}</button>
+				</form>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/channel.tpl b/view/theme/redbasic/tpl/channel.tpl
new file mode 100755
index 000000000..1a84f1e66
--- /dev/null
+++ b/view/theme/redbasic/tpl/channel.tpl
@@ -0,0 +1,49 @@
+<div class="section-subtitle-wrapper">
+	<div class="pull-right">
+		{{if $channel.default_links}}
+		{{if $channel.default}}
+		<div>
+			<i class="fa fa-check-square-o"></i>&nbsp;{{$msg_default}}
+		</div>
+		{{else}}
+		<a href="manage/{{$channel.channel_id}}/default" class="make-default-link">
+			<i class="fa fa-square-o"></i>&nbsp;{{$msg_make_default}}
+		</a>
+		{{/if}}
+		{{/if}}
+		{{if $channel.delegate}}
+			{{$delegated_desc}}
+		{{/if}}
+	</div>
+	<h3>
+		{{if $selected == $channel.channel_id}}
+		<i class="selected-channel fa fa-circle" title="{{$msg_selected}}"></i>
+		{{/if}}
+		{{if $channel.delegate}}
+		<i class="fa fa-arrow-circle-right" title="{{$delegated_desc}}"></i>
+		{{/if}}
+		{{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" title="{{$channel.channel_name}}">{{/if}}
+			{{$channel.channel_name}}
+		{{if $selected != $channel.channel_id}}</a>{{/if}}
+	</h3>
+	<div class="clear"></div>
+</div>
+<div class="section-content-wrapper">
+	<div class="channel-photo-wrapper">
+		{{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}">{{/if}}
+			<img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" />
+		{{if $selected != $channel.channel_id}}</a>{{/if}}
+	</div>
+	<div class="channel-notifications-wrapper">
+		{{if !$channel.delegate}}
+		<div class="channel-notification">
+			<i class="fa fa-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i>
+			{{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}}
+		</div>
+		<div class="channel-notification">
+			<i class="fa fa-user{{if $channel.intros != 0}} new-notification{{/if}}"></i>
+			{{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}}
+		</div>
+		{{/if}}
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/channel_id_select.tpl b/view/theme/redbasic/tpl/channel_id_select.tpl
new file mode 100644
index 000000000..ecebd4bc0
--- /dev/null
+++ b/view/theme/redbasic/tpl/channel_id_select.tpl
@@ -0,0 +1,7 @@
+{{if $channels}}
+<select name="dest_channel" id="dest-channel-select"> 
+{{foreach $channels as $c}}
+<option {{if $c.channel_id == $selected}}selected="selected"{{/if}} value="{{$c.channel_id}}">{{$c.channel_name}}</option>
+{{/foreach}}
+</select>
+{{/if}}
\ No newline at end of file
diff --git a/view/theme/redbasic/tpl/channel_import.tpl b/view/theme/redbasic/tpl/channel_import.tpl
new file mode 100755
index 000000000..baffe9b06
--- /dev/null
+++ b/view/theme/redbasic/tpl/channel_import.tpl
@@ -0,0 +1,43 @@
+<h2>{{$title}}</h2>
+
+<form action="import" method="post" enctype="multipart/form-data" id="import-channel-form">
+	<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+	<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>
+
+	<label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label>
+	<input type="file" name="filename" id="import-filename" class="import-input" value="" />
+	<div id="import-filename-end" class="import-field-end"></div>
+
+	<div id="import-choice" class="descriptive-paragraph">{{$choice}}</div>
+
+	<label for="import-old-address" id="label-import-old-address" class="import-label" >{{$label_old_address}}</label>
+	<input type="text" name="old_address" id="import-old-address" class="import-input" value="" />
+	<div id="import-old-address-end" class="import-field-end"></div>
+
+	<label for="import-old-email" id="label-import-old-email" class="import-label" >{{$label_old_email}}</label>
+	<input type="text" name="email" id="import-old-email" class="import-input" value="{{$email}}" />
+	<div id="import-old-email-end" class="import-field-end"></div>
+
+	<label for="import-old-pass" id="label-import-old-pass" class="import-label" >{{$label_old_pass}}</label>
+	<input type="password" name="password" id="import-old-pass" class="import-input" value="{{$pass}}" />
+	<div id="import-old-pass-end" class="import-field-end"></div>
+
+	<input type="checkbox" name="import_posts" id="import-posts" value="1" />
+	<label for="import-posts" id="label-import-posts">{{$label_import_posts}}</label>
+	<div id="import-posts-end" class="import-field-end"></div>
+
+	<div id="import-common-desc" class="descriptive-paragraph">{{$common}}</div>
+
+	<input type="checkbox" name="make_primary" id="import-make-primary" value="1" />
+	<label for="import-make-primary" id="label-import-make-primary">{{$label_import_primary}}</label>
+	<div id="import-make-primary-end" class="import-field-end"></div>
+
+	<input type="checkbox" name="moving" id="import-moving" value="1" />
+	<label for="import-moving" id="label-import-moving">{{$label_import_moving}}</label>
+	<div id="import-moving-end" class="import-field-end"></div>
+
+	<input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" />
+	<div id="import-submit-end" class="import-field-end"></div>
+
+	<div id="import-common-desc" class="descriptive-paragraph">{{$pleasewait}}</div>
+</form>
diff --git a/view/theme/redbasic/tpl/channels.tpl b/view/theme/redbasic/tpl/channels.tpl
new file mode 100755
index 000000000..f484b49e5
--- /dev/null
+++ b/view/theme/redbasic/tpl/channels.tpl
@@ -0,0 +1,24 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<a class="btn btn-success btn-sm pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="fa fa-plus-circle"></i>&nbsp;{{$create.2}}</a>
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper-np">
+		{{if $channel_usage_message}}
+		<div id="channel-usage-message" class="section-content-warning-wrapper">
+			{{$channel_usage_message}}
+		</div>
+		{{/if}}
+		<div id="channels-desc" class="section-content-info-wrapper">
+			{{$desc}}
+		</div>
+		{{foreach $all_channels as $chn}}
+			{{include file="channel.tpl" channel=$chn}}
+		{{/foreach}}
+		{{if $delegates}}
+			{{foreach $delegates as $chn}}
+				{{include file="channel.tpl" channel=$chn}}
+			{{/foreach}}
+		{{/if}}
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/chanview.tpl b/view/theme/redbasic/tpl/chanview.tpl
new file mode 100755
index 000000000..39fafaf8e
--- /dev/null
+++ b/view/theme/redbasic/tpl/chanview.tpl
@@ -0,0 +1 @@
+<a href="{{$url}}">{{$url}}</a>
diff --git a/view/theme/redbasic/tpl/chat.tpl b/view/theme/redbasic/tpl/chat.tpl
new file mode 100644
index 000000000..22f3465bf
--- /dev/null
+++ b/view/theme/redbasic/tpl/chat.tpl
@@ -0,0 +1,346 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			{{if $is_owner}}
+			<form id="chat-destroy" method="post" action="chat">
+				<input type="hidden" name="room_name" value="{{$room_name}}" />
+				<input type="hidden" name="action" value="drop" />
+				<button class="btn btn-danger btn-sm" type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$drop}}</button>
+			</form>
+			{{/if}}
+			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
+		</div>
+		<h2>{{$room_name}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="chatContainer" class="section-content-wrapper">
+		<div id="chatTopBar">
+			<div id="chatLineHolder"></div>
+		</div>
+		<div class="clear"></div>
+		<div id="chatBottomBar" >
+			<form id="chat-form" method="post" action="#">
+				<input type="hidden" name="room_id" value="{{$room_id}}" />
+				<div class="form-group">
+					<textarea id="chatText" name="chat_text" class="form-control"></textarea>
+				</div>
+				<div id="chat-submit-wrapper">
+					<div id="chat-submit" class="dropup pull-right">
+						<button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="fa fa-cog"></i></button>
+						<button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+						<div class="dropdown-menu dropdown-menu-right">
+							<a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online"><i class="fa fa-circle online"></i>&nbsp;{{$online}}</a>
+							<a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away"><i class="fa fa-circle away"></i>&nbsp;{{$away}}</a>
+							<a class="dropdown-item" href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave"><i class="fa fa-circle leave"></i>&nbsp;{{$leave}}</a>
+                       					<div class="dropdown-divider"></div>
+                        				<a id="toggle-notifications" class="dropdown-item" href="" onclick="toggleChatNotifications(); return false;"><i id="toggle-notifications-icon" class="fa fa-bell-slash-o"></i>&nbsp;Toggle notifications</a>
+                        				<a id="toggle-notifications-audio" class="dropdown-item disabled" href="" onclick="toggleChatNotificationAudio(); return false;"><i id="toggle-notifications-audio-icon" class="fa fa-volume-off"></i>&nbsp;Toggle sound</a>
+							{{if $bookmark_link}}
+                         				<div class="dropdown-divider"></div>
+							<a class="dropdown-item" href="{{$bookmark_link}}" target="_blank" ><i class="fa fa-bookmark"></i>&nbsp;{{$bookmark}}</a>
+							{{/if}}
+						</div>
+					</div>
+					<div id="chat-tools" class="btn-toolbar pull-left">
+						<div class="btn-group mr-2">
+							<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'chatText'); return false;">
+								<i class="fa fa-bold jot-icons"></i>
+							</button>
+							<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'chatText'); return false;">
+								<i class="fa fa-italic jot-icons"></i>
+							</button>
+							<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'chatText'); return false;">
+								<i class="fa fa-underline jot-icons"></i>
+							</button>
+							<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'chatText'); return false;">
+								<i class="fa fa-quote-left jot-icons"></i>
+							</button>
+							<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'chatText'); return false;">
+								<i class="fa fa-terminal jot-icons"></i>
+							</button>
+						</div>
+						<div class="btn-group mr-2 d-none d-md-flex">
+							<button id="chat-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="chatJotGetLink(); return false;" >
+								<i id="chat-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i>
+							</button>
+						</div>
+						{{if $feature_encrypt}}
+						<div class="btn-group mr-2 d-none d-md-flex">
+							<button id="chat-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="red_encrypt('{{$cipher}}', '#chatText', $('#chatText').val()); return false;">
+								<i id="chat-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i>
+							</button>
+						</div>
+						{{/if}}
+						<div class="btn-group dropup d-md-none">
+							<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+								<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
+							</button>
+							<div class="dropdown-menu">
+								<a class="dropdown-item" href="#" onclick="chatJotGetLink(); return false;" ><i class="fa fa-link"></i>&nbsp;{{$insert}}</a>
+								{{if $feature_encrypt}}
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}', '#chatText' ,$('#chatText').val()); return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
+								{{/if}}
+							</div>
+						</div>
+					</div>
+					<div id="chat-rotator-wrapper" class="pull-left">
+						<div id="chat-rotator"></div>
+					</div>
+					<div class="clear"></div>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+
+<script>
+var room_id = {{$room_id}};
+var last_chat = 0;
+var chat_timer = null;
+
+$(document).ready(function() {
+	$('#chatTopBar').spin('small');
+	chat_timer = setTimeout(load_chats,300);
+	$('#chatroom_bookmarks, #vcard').hide();
+	$('#chatroom_list, #chatroom_members').show();
+	adjustInlineTopBarHeight();
+    chatNotificationInit();
+});
+
+$(window).resize(function () {
+	if($('main').hasClass('fullscreen')) {
+		adjustFullscreenTopBarHeight();
+	}
+	else {
+		adjustInlineTopBarHeight();
+	}
+});
+
+$('#chat-form').submit(function(ev) {
+	$('body').css('cursor','wait');
+	$.post("chatsvc", $('#chat-form').serialize(),function(data) {
+			if(chat_timer) clearTimeout(chat_timer);
+			$('#chatText').val('');
+			load_chats();
+			$('body').css('cursor','auto');
+		},'json');
+	ev.preventDefault();
+});
+
+function load_chats() {
+	$.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat + ((stopped) ? '&stopped=1' : ''),function(data) {
+		if(data.success && (! stopped)) {
+			update_inroom(data.inroom);
+			update_chats(data.chats);
+			$('#chatTopBar').spin(false);
+		}
+	});
+	
+	chat_timer = setTimeout(load_chats,10000);
+
+}
+
+var previousChatRoomMembers = null; // initialize chat room member change register
+var currentChatRoomMembers = null; // initialize chat room member change register
+function update_inroom(inroom) {
+	var html = document.createElement('div');
+	var count = inroom.length;
+	$.each( inroom, function(index, item) {
+		var newNode = document.createElement('div');
+		newNode.setAttribute('class', 'member-item');
+		$(newNode).html('<img class="menu-img-2" src="' + item.img + '" alt="' + item.name + '" /> ' + '<span class="contactname">' + item.name + '</span><span class="' + item.status_class + '">' + item.status + '</span>');
+		html.appendChild(newNode);
+	});
+    memberChange = chatRoomMembersChange(inroom); // get list of arrivals and departures
+    if(memberChange.membersArriving.length > 0) {
+      // Issue pop-up notification if anyone enters the room.
+      chat_issue_notification(JSON.stringify(memberChange.membersArriving.pop().name) + ' entered the room', 'Hubzilla Chat');
+    }
+	$('#chatMembers').html(html);
+}
+
+// Determine if the new list of chat room members has any new members or if any have left
+function chatRoomMembersChange(inroom) {
+    previousChatRoomMembers = currentChatRoomMembers;
+    currentChatRoomMembers = inroom;
+      var membersArriving = [];
+      var membersLeaving = [];
+    if(previousChatRoomMembers !== null) {
+      var newMember = false;
+      $.each( currentChatRoomMembers, function(index, currMember) {
+        newMember = true;
+        $.each( previousChatRoomMembers, function(index, prevMember) {
+          if (prevMember.name === currMember.name) {
+              newMember = false;
+          }
+        });
+        if (newMember === true) {
+          membersArriving.push(currMember);
+        }
+      });
+    }
+    return {membersArriving: membersArriving, membersLeaving: membersLeaving};
+}
+
+function update_chats(chats) {
+	var count = chats.length;
+	$.each( chats, function(index, item) {
+		last_chat = item.id;
+		var newNode = document.createElement('div');
+
+		if(item.self) {
+			newNode.setAttribute('class', 'chat-item-self clear');
+			$(newNode).html('<div class="chat-body-self"><div class="chat-item-title-self wall-item-ago"><span class="chat-item-name-self">' + item.name + ' </span><span class="autotime chat-item-time-self" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text-self">' + item.text + '</div></div><img class="chat-item-photo-self" src="' + item.img + '" alt="' + item.name + '" />');
+		}
+		else {
+			newNode.setAttribute('class', 'chat-item clear');
+			$(newNode).html('<img class="chat-item-photo" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body"><div class="chat-item-title wall-item-ago"><span class="chat-item-name">' + item.name + ' </span><span class="autotime chat-item-time" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text">' + item.text + '</div></div>');
+            chat_issue_notification(item.name + ':\n' + item.text, 'Hubzilla Chat');
+		}
+		$('#chatLineHolder').append(newNode);
+		$(".autotime").timeago();
+
+		var elem = document.getElementById('chatTopBar');
+		elem.scrollTop = elem.scrollHeight;
+	});
+}
+
+var chat_notify_granted = false; // Initialize notification permission to denied
+var chat_notify_enabled = false;
+var chat_notify_audio_enabled = false;
+var chat_notify_audio = {};
+// Request notification access from the user
+// TODO: Check Hubzilla member config setting before requesting permission
+function chatNotificationInit() {
+  
+    if (!("Notification" in window)) {
+        window.console.log("This browser does not support system notifications");
+    }
+    // Let's check whether notification permissions have already been granted
+    else if (Notification.permission === "granted") {
+        // If it's okay let's create a notification
+        chat_notify_granted = true; //var notification = new Notification("Hi there!");
+    }
+
+    // Otherwise, we need to ask the user for permission
+    else if (Notification.permission !== 'denied') {
+        Notification.requestPermission(function (permission) {
+            // If the user accepts, let's create a notification
+            if (permission === "granted") {
+                chat_notify_granted = true; //var notification = new Notification("Hi there!");
+            }
+        });
+    }
+    // Encode a wav audio file in base64 and create the audio object for game alerts
+    //var base64string = 'UklGRr4VAABXQVZFZm10IBAAAAABAAEAIlYAACJWAAABAAgAZGF0YZkVAACAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIBxcnJycoGNjY2NjYyMjIyMg3FxcXFxcXJycnJ0jY2NjY2NjIyMjIx1cXFxcXFxcnJycoKNjY2NjY2MjIyMgXFxcXFxcXJycnJ2jY2NjY2NjIyMjIxzcXFxcXFxcnJycoSNjY2NjY2MjIyMgHFxcXFxcXJycnJ4jY2NjY2NjIyMjIxycXFxcXFycnJycoWNjY2NjY2MjIyMf3FxcXFxcXJycnJ5jY2NjY2NjIyMjIxxcXFxcXFycnJycoeNjY2NjY2MjIyMfnFxcXFxcXJycnJ7jY2NjY2NjIyMjIpxcXFxcXFycnJycomNjY2NjYyMjIyMfHFxcXFxcXJycnJ8jY2NjY2NjIyMjIhycnJycoyLi4uLi4uLioqKfHFxcXFxcnJycnJyc4yMjIuLi4uLi4uKin5xcXFxcnJycnJyc3OMjIyMi4uLi4uLi4p/cXFxcnJycnJyc3Nzi4yMjIyLi4uLi4uLgHBwcXFxcXFxcnJycouNjY2NjYyMjIyMjIBwcHFxcXFxcXJycnKLjY2NjY2MjIyMjIyBcHFxcXFxcXJycnJyio2NjY2NjIyMjIyMgnBxcXFxcXFycnJycomNjY2NjY2MjIyMjINwcXFxcXFxcnJycnKIjY2NjY2NjIyMjIyEcHFxcXFxcXJycnJyh42NjY2NjYyMjIyMhXBxcXFxcXFycnJycoaNjY2NjY2MjIyMjIZwcXFxcXFxcnJycnKFjY2NjY2NjIyMjIyHcHFxcXFxcXJycnJyhI2NjY2NjYyMjIyMiHBxcXFxcXFycnJycoONjY2NjY2MjIyMjIlwcXFxcXFxcnJycnKCjY2NjY2NjIyMjIyKcHFxcXFxcXJycnJygY2NjYyMjIyLi4uLi4uLioqKioqKdnBxcXFxcXFycnKAi4uLi4uLioqKioJxcXFxcXFycnJydIyMi4uLi4uLi4qKdXFxcXFycnJycnKBjIyLi4uLi4uLioFxcXFycnJycXFydY2NjYyMjIyMjIyLc3BwcXFxcXFxcnKDjY2NjIyMjIyMjIBwcHFxcXFxcXJyd42NjY2MjIyMjIyMcnBxcXFxcXFycnKFjY2NjYyMjIyMjH9wcXFxcXFxcnJyeY2NjY2NjIyMjIyMcHFxcXFxcXJycnKHjY2NjY2MjIyMjH5xcXFxcXFycnJyeo2NjY2NjIyMjIyKcHFxcXFxcXJycnKIjY2NjY2MjIyMjHxxcXFxcXFycnJyfI2NjY2NjYyMjIyJcXFxcXFxcXJycnKKjY2NjY2MjIyMjHtxcXFxcXFycnJyfo2NjY2NjYyMjIyHcXFxcXFxcnJycnKMjY2NjY2MjIuLi3lycnJycnJzc3Nzf4yMjIyMjIuLi4uFcnJycnJycnNzc3OMjIyMjIyMi4uLi3hycnJycnJzc3NzgIyMjIyMjIuLi4uDcnJycnJycnNzc3SMjIyMjIyMi4uLi3dycnJycnJzc3NzgYyMjIyMjIuLi4uCcnJycnJyc3Nzc3aMjIyMjIyMi4uLi3VycnJycnJzc3Nzg4yMjIyMjIuLi4uAcnJycnJyc3Nzc3eMjIyMjIyMi4uLi3RycnJycnJzc3NzhIyMjIyMjIuLi4uAcnJycnJyc3Nzc3mMjIyMjIyMi4uLi3JycnJycnJzc3NzhoyMjIyMjIuLi4t+cnJycnJyc3Nzc3qMjIyMjIyLi4uLinJycnNzc3N0dHR0h4uLi4uLi4qKiop9c3Nzc3Nzc3R0dHyLi4uLi4uLioqKiHNzc3Nzc3N0dHR0iIuLi4uLi4qKiop8c3Nzc3Nzc3R0dH2Li4uLi4uLioqKhnNzc3Nzc3N0dHR0iYuLi4uLi4qKiop6c3Nzc3Nzc3R0dH+Li4uLi4uLioqKhXNzc3Nzc3N0dHR0i4uLi4uLi4qKiop5c3Nzc3Nzc3R0dICLi4uLi4uLioqKhHNzc3Nzc3N0dHR1i4uLi4uLi4qKiop4c3Nzc3NzdHR0dIGLi4uLi4uLioqKgnNzc3Nzc3N0dHR2i4uLi4uLi4qKiop2c3Nzc3NzdHR0dIKLi4uLi4uLioqKgXNzc3Nzc3N0dHR3i4uLi4uLi4qKiol2dHR0dHR0dHV1dYOKioqKioqKiYmJgHR0dHR0dHR0dXV5ioqKioqKiomJiYl0dHR0dHR0dHV1dYSKioqKioqKiYmJf3R0dHR0dHR0dXV7ioqKioqKiomJiYl0dHR0dHR0dHV1dYaKioqKioqKiYmJfnR0dHR0dHR1dXV8ioqKioqKioqJiYd0dHR0dHR0dHV1dYeKioqKioqKiYmJfHR0dHR0dHR1dXV9ioqKioqKiomJiYZ0dHR0dHR0dHV1dYiKioqKioqKiYmJe3R0dHR0dHR1dXV+ioqKioqKiomJiYV0dHR0dHR0dHV1dYmKioqKioqKiYmJenR0dHR0dHR1dXWAioqKiYmJiYmIiIN1dXV1dXV1dXZ2domJiYmJiYmJiYiIeXV1dXV1dXV1dnaAiYmJiYmJiYmIiIJ1dXV1dXV1dXZ2d4mJiYmJiYmJiYiIeHV1dXV1dXV1dnaBiYmJiYmJiYmIiIF1dXV1dXV1dXZ2eImJiYmJiYmJiYiId3V1dXV1dXV1dnaCiYmJiYmJiYmIiIB1dXV1dXV1dXZ2eYmJiYmJiYmJiIiIdnV1dXV1dXV1dnaDiYmJiYmJiYmIiH91dXV1dXV1dXZ2e4mJiYmJiYmJiIiIdXV1dXV1dXV1dnaFiYmJiYmJiYmIiH51dXV1dXV1dXZ2fImJiYmJiYmJiIiHdXV1dXV1dXV1dnaGiYmJiYmJiYmIiH11dXV1dXV1dXZ2fYiIiIiIiIiIiIiFdnZ2dnZ2dnZ2d3eGiIiIiIiIiIiIh3x2dnZ2dnZ2dnd3foiIiIiIiIiIiIeEdnZ2dnZ2dnZ2d3eHiIiIiIiIiIiIh3t2dnZ2dnZ2dnZ3f4iIiIiIiIiIiIeDdnZ2dnZ2dnZ2d3eIiIiIiIiIiIiIh3p2dnZ2dnZ2dnZ3gIiIiIiIiIiIiIeCdnZ2dnZ2dnZ2d3iIiIiIiIiIiIiIh3l2dnZ2dnZ2dnZ3gIiIiIiIiIiIiIeBdnZ2dnZ2dnZ2d3mIiIiIiIiIiIiHh3h2dnZ2dnZ2dnZ3goiIiIiIiIiIiIeAdnZ2dnZ2dnZ2d3qIiIiIiIiIiIiHh3d2dnZ2dnZ2dnZ3g4iIiIiIh4eHh4eAd3d3d3d3d3d3d3uHh4eHh4eHh4eHhnd3d3d3d3d3d3d3g4eHh4eHh4eHh4d/d3d3d3d3d3d3d3yHh4eHh4eHh4eHhnd3d3d3d3d3d3d4hIeHh4eHh4eHh4d+d3d3d3d3d3d3d32Hh4eHh4eHh4eHhXd3d3d3d3d3d3d4hYeHh4eHh4eHh4d9d3d3d3d3d3d3d36Hh4eHh4eHh4eHhHd3d3d3d3d3d3d4hoeHh4eHh4eHh4d8d3d3d3d3d3d3d3+Hh4eHh4eHh4eHg3d3d3d3d3d3d3d4h4eHh4eHh4eHh4d7d3d3d3d3d3d3d4CHh4eHh4eHh4eHgnd3d3d3d3d3d3d5h4aGhoaGhoaGhoZ7eHh4eHh4eHh4eICGhoaGhoaGhoaGgXh4eHh4eHh4eHh6h4aGhoaGhoaGhoZ6eHh4eHh4eHh4eIGGhoaGhoaGhoaGgHh4eHh4eHh4eHh7hoaGhoaGhoaGhoZ5eHh4eHh4eHh4eIKGhoaGhoaGhoaGgHh4eHh4eHh4eHh7hoaGhoaGhoaGhoZ4eHh4eHh4eHh4eIKGhoaGhoaGhoaGf3h4eHh4eHh4eHh8hoaGhoaGhoaGhoV4eHh4eHh4eHh4eIOGhoaGhoaGhoaGfnh4eHh4eHh4eHh9hoaGhoaGhoaGhoR4eHh4eHh4eHh4eISGhoaGhoaGhoaGfXh4eHh4eHh4eHh+hoaGhoaGhoaGhoR4eHh4eHh5eXl5eYSFhYWFhYWFhYWFfXl5eXl5eXl5eXl/hYWFhYWFhYWFhYJ5eXl5eXl5eXl5eYWFhYWFhYWFhYWFfHl5eXl5eXl5eXmAhYWFhYWFhYWFhYF5eXl5eXl5eXl5eYWFhYWFhYWFhYWFe3l5eXl5eXl5eXmAhYWFhYWFhYWFhYF5eXl5eXl5eXl5eoWFhYWFhYWFhYWFe3l5eXl5eXl5eXmAhYWFhYWFhYWFhYB5eXl5eXl5eXl5e4WFhYWFhYWFhYWFenl5eXl5eXl5eXmBhYWFhYWFhYWFhYB5eXl5eXl5eXl5fIWFhYWFhYWFhYWFeXl5eXl5eXl5eXmChYWFhYWFhYWFhX95enp6f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f4CAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAA';
+    var base64string = 'UklGRvQbAABXQVZFZm10IBAAAAABAAEAIlYAAESsAAACABAAZGF0YdAbAADk/qz+y/5X/pP+Pv53/j/+UP5//p7+nf6j/rf+HP/u/gP/Ff/B/v/+3/63/qz+sf6G/pn+U/6h/hL+ef5o/qz+hf6q/tf+SP/k/i7/7v4b/6f+M//S/hv/uf7Y/nX+3/5k/sz+V/6f/nT+kf6V/uv+4v48/9T+Vf/S/vT++f72/sD+zP7c/uD+k/5t/rv+Tv7G/lX+fv6W/un+/v7//jz/KP8v/z3/E/9g/+H+m//1/kr//P5O/+r+NP/R/g//4P4a/zz/ff+6//n/jP/8/0z/cf8f/xX//f4t/+z+4v6q/gj/qv5y/kv+mP7V/oX+gP7l/gX/+f7f/pH+P/7f/UD+KP5E/hH+RP4H/m7+/v1S/gT+h/4Q/j/+GP4P/tH98P27/ST++v1F/gz+Hv6v/WH+Lf63/hz+UP43/ov+oP5y/jX+TP6C/v3+xP69/l7+nv7t/uH+MP/X/pz+uP6T/ij+V/5B/i3/d/1Q+xH7z/tL+3X7+/0oBFkF2QS1CcILQwrTDmQTChOuEfwTuw4hBaL8/fey+VH9ff20/D79f/3L+eD2bvHQ587gC9t20FnG2cN5xYPFbMV0xuHIUsqUyu3N6NxK7SL0DfqRBIoP7RecHxApjTF4M4Uvqyp6KvUpuybyIjIhPR5PHAcbVxglFf8SDRAADWEIWwNw/Pz3o/Pl8V/1fvsn/Zb9XQBtBuoJkAtaD0YVZBfDFXUUaxSHFNUVmRZDFj4WMBZbFokU1BG0D5APIg/cDZwJAAfSBeEFGAMLAOr+Tf0b+y/6CvrF+hz65fmH+R766fkD/DD9zP26/E/+1gBHAsMC8wPBBRYFlANfBJcFdgWAA68CvgLdArsByQBpAOn/cf7m/X39rfvT+V/4oPcg9QHzW/QW9vv0DPR79cT3/fZ99WL1+/aI96j4Dfkm+sH6oPwe/av98/39/2oBtwFUAa4BIQJ+AnUAZf+5/4cA6v4e/cH89fy++yj7o/lh+Ef3OfcR9xf25/SK9Db0UPPT8eLxUvSI9GvzTvMY9cj13PUh9rL30Pex+Nj58Prc+l77svyJ/sv+JQDGAPMA+f8FAO//JgD0/9z/1P94/yH9Yfte+iX7rvrz+ML3HfeP9sr1K/Ua9ov2PfaJ9un2OfeZ98T3wff8+Tz83v3x/RH/EgBYAXcCiAMyBJEE8AQwBR4FLQbaBvEHegemBrEFTAXEA9sBR/7f/KP8f/yU+oL4Ifjh9vX0XfQT9Gv06/PW853z+vOp9JL1r/aZ+Bn6RPup/Mf9xv80AfsCiwQ5BW0GVQcHCOwIFAo3C44KSAmnBzMHNAfKBg8FDQT3AawBAwE0ALz+4f1K/Xz92Pwk/eL8J/0J/P37qvxM/J77YvxN/WL+xv7D/0UAqAAQAbcBWwMkBbQGVgdIBzsIDgmICXkKJAq6Ci0L1wvrCqkKtApGC2EKWQlsCb8JYghYBzsGaAbeBrkGlQSHAgMB7wCG/wf/pv5l/jP9rvzh+y/8Wvsz+/H7EP2n/tX/NgAgAZMBzgNWBV0GGwcnCBAKIwtKDKEMVA1jDZoNFA2VDAUMggsKC20KQwo8CaEHtAZfBUwEoQK6ATYA1P8//jb9DPt9+lX6xfoB+iT6cPo0++T7yfwe/fX9l/6y/0MAmQHiAvMDCAVyBpAHpQgTCcUJHwoPCxgMdwzZDCUNJg0tDWoMswvbCm8JugimB7UGgAUtBIICUQH0/1n/SP10/Df7SPoO+YH4wPiR+ez5gfpg+k37FPxi/fD9AP8PAEwBTQI1BGQFpQeuCZ8LKg33DgMQ1xABESkR3RCWEMUPkA4wDQoLHQkgB7QF8AOXAe7+fv2X+zf6yvgf9y31KPS285XzLPSp9Rn2IPeO91L50Prk/Eb+bgBPAt0E7AbFCeoL8w2ODx4RARIdE9AS9hJgEs4RDBBsDqQMQQr5B6cFGANwAGn9l/rz9/T0kvKQ8Azv4u1Z7ffsuuyl7S3vG/AX8cvxKPS59S34QfoE/fX/awNbBT0ICwrnDCMOdg9NEO0Q0BCsEMoPHA85DUwL1wieBtoDTQGD/r37cPhT9ZHyefBZ7u7rnupz6Zjox+jU6HzpOOo06/TsYe7F8DXzJPad+Hv7rP4lAtkE2wf7CRQMcw2DDhUPtw84D3IPIQ7QDKkKdAgWBq8D+QAz/nf6b/f0853wzOzq6YznlOUa5FXjTeIo4l7iKeP24/TlNOgy6p/ske/o8uX1F/k+/I7/HgIfBfIG4QgTChsLwwtdC7IKHQlYB8wFkwL5/2H8Z/lF9ejxqu3z6RnlpOFa3u/b8tmI2HbXHNfC1q3Xq9g+2gvcct4P4aHk0eeM677vrPNw9/b6Wv5pAQ4E6gVjB4oIPQnlCKgIuAdABgQExAGM/qz7n/cE9Hzv9Orf5QTinN3V2mrXINXf0pTR1NDo0G3RCtPy1NfXKtqc3bLgMOWq6VTupfIP9wf78f5AAh8FhAetCRELHAz0C8YLZAoFCYAGuwMTADz8a/jd84PvruoY5hfh89zg2HXWctMm0VXPvs51z/3QLNN41STYfdvO3m7joOfY7Dbx9PVk+uH/pQP6B/EKjw2xDyERFRJxEroRzRCYDpAMYAn3BbkBk/0R+Tz0PO/b6ebkMOB+3MrYMtaX037SEdL00tTU0Nd52mrdmOC55EnoVO0r8hj4XP3wAsoHIA3GEF4UKRegGWIbZhyCHEscxRrjGN0V+RIYD84KtQV/AEf7P/Z/8Z7smOfK43Tg/d0e3BzbfNvh3CzffuHI5EvozeuV7xf0m/h1/TMCLggGDt4T/BcgHO8fEyM5JdcmVietJw0n+iWTI6ggnRwyGYwUmg8aCv8E/f7K+X70L/D/69voueU/5NXjsORm5g3oZeoR7mzxSvXG+B39uwG9Bs8LsRB+FskcdCIjJz4r0y1LML0xxDKTMt8xxTBULqormygsJL8fSRofFcAOYgkoA9X9n/j29K3wr+2t6/nrmuy07UbvUfH48lz1Wvhk/XkCcQg7DiQUZxk/HlkjVClLLrcyQDZzOLU6STvJO+86RDlXN1g0oDBuLJsnNyJZHFEW6A9qCkME+f7N+aP19PFX8IHv8e+y75zvi/BY8wb3AvuT/48EWwk4D/4URxuXINIlmyoGMMU0qjhTO0g9oz4tPzw/Lj58PJY5KTbfMfss6ieKIi4cbhbtD+MJDwSM/s75XfZE82rxhfDA8InwzPCU8kT1Ofht/NgA9gXyCgkRlRaJHD4hYCbwKgUwozMMN/44kTo/O2Y7eDrDOBA2EzNXLzAroyU6IJIauRS+Dq0IDwOm/Rn5U/XV8Vbvze2y7Ajtee317cbv6PJ/9hz7hf92BPsIhQ6ME/UYzx3OIt0m2iqkLcowJTIZM9IyEDLwMA0v3iu+KMQkkyBuGwkWCBC0Cu8EIv+q+RP1qvD67JjpK+dm5tflQuav563p8OtQ7oTx7fTI+Or9GALsBpIL5hB9FcoZMR1OIMYhwyM6JPMk8iPXIhkhux4VG4YXmhJLDhsJawQl/zj6v/Tn7y/rjueO49zgtd5y3QPd19yv3XjfceEB5P7m1+oy7mDy6vZr+/X/PQSOCCsMcA/BEc0T1hTuFf8VvhWEFL8ScRCuDfQJvAX6AKn8zPcK89HtT+k65GbgS9xv2QbWodSr05TTYNNe1MrVrNdQ2rvdj+BX5BXodOyl8DT1qPlu/ewAmQP5BaYHwggOCTMJxwisB/kFDQR+Ae39bvqu9m3yLe5y6Zzl/OBJ3WvZ3db602/SKNCnzyjP3s+z0D3SStSz1qnZi91c4DXkY+fP62rvcfPN9sD5+PtF/sv/PQGIAW4BtABj/wn+lfsB+Qb2P/Ly7uPq3+Yv44nf59v01wXVEtL2zxTOxc37zJ7N8c0uz7PQXdM91mDZiNxY4KnjjucA6zPvMfLu9HL3E/pw+zD9V/3V/Xv9L/2e+xL6nvfU9ODxOe/h67PomOQf4aPdMdqf15/UCdIv0BrP8s60z/vPotEb03TVxNc426Xed+ID5qjpYO0D8Zbz+/Yf+bL7Lf3C/lf/LwCa/1D/vf1+/AL6wPdt9efyi+9N7L7ohuZe44fgvd3D287ZcNhB1x7XS9cP2E/ZmdoY3UDfaeLV5Wrpee388CD0Qffp+fz8+P79ADACfAOnAzAEVgOIAscAV//0/Nb6B/iS9ajyoe8W7DTppObQ5JvipuCh3hPett2l3YfdG9+Q4ADjY+UY6OnqGe5n8Rn1kvjS+0j+GwFaAzgF8wbgB6wIjAhvCMQGhQWEA4EBov52/Cn5g/Za847wI+7966fp8+eM5V3k9+O85Nbk6uU15w7qKuyD7+XxQ/Vb+En89P/zAhYGzQktDNgOVxAGEgIS/hEAEQwQ7w6vDFgKrgfqBBQBq/3t+iT4h/Ua87Hwz+6g7UPsneto7Dvtru6T8JXzDvab+YD8VQCtAyIIHQtuD4gSvBXyF60ZThtJHEocNRyvGiUZRBbmE8kQjQ2/CbcFuQEq/nz63fZ18xTxTe887tvtfO5r79rw2PKh9e746fxhAYsFdAo3DwwU5hetG+seGCLHI/4loybuJsolEyT6IUEfFBx9GHMT8w6ECXIFqwA+/NT3j/Ql8QbvPO0M7Tvt5u7T8N3zDfcf+6n/xwQhCuEPOBWUGs4fdSSIKJQrJy6xL+YvkC+QLkEsqynTJXkhWBzwFj8RXAttBXT/vfn49Fzw9O0L62fqWOrO6+LtE/Eo9D74HP0nA9EJHBF3Fy4erSSsKmovxzOjNgc5tjlnOa83lDXmMdwtuChPIhccahUEDpQGVf9K+ePzHO8U63fotuZ95u7n0elT7UHxcfbZ+5QCFwlxEd8YOCAEJ2UtrDJdN0Q6wTxfPSI99DpeOKczti5PKBki/BpsE3ML7gPL+8n0su526XHlHuPP4VHih+QK6NjsHPIl91T9BAVeDZcVvx2yJXoseDLCNg06lzu6PL878zkYN48z3S6iKcwixRt6EyYLkAKy+szyF+3H5+Tjv+DB3+nfbuLV5d7qSfA9953+cAZNDrgWfB4/JtgsrTK5Njo55ToBO6M5GTdiM7ku0CjgIbsarRKDCo4BtPmJ8v3rDObB4brett2F3RHgs+Ph6IHuevW1/KcFCQ4tF88frCjzL8o1YDrRPLU93D0XPAU5KDTCLt4nbiB/FzAOuwNo+gnxH+ht4Gjai9Zg1GHUq9VX2NvcseK+6UHyFPvfBMsOVxnKI1EtFjWFO98/aUKWQudBSj97PK03tTHdKQEhmxZUCxj/lPOf55Ld+9SizlPJUcdnxvvH1Mrwzx7X6+Bj6672BgMrDzwaIibXMGI5Lz9jQ/VFcEZRRQBDmj8jO141yS15JHcZiAww/sjw1+Ou2CPPGce+wVq/yb4EwXHEusrC0qXdaej89CkC5g9rHEMpoDMBPExBjkS1RaNF/UPsQYc+DTpnM+0rKiKEFmQIDPm26ZfbP8/PxIy8wrc4tke2Crkbv7jGVNB62/jnv/W8AwUSVB+pK2Y1Az2JQKZCXELDQbA+zjtcN5Iy9SuVI5gYWQvM+5Lspd3BzwvDcrlQshGvea6lsD21rrz0xdfR4N447RP8gwq7GCQmzTAVOMI7mT1lPX88ljopNwgzoS0zJzQefRO0BWD27+Tl1EvFtLjZrnSouKSjpHWnKK1ttL6+c8oM2VboUPikB4wW1SJKLUMz0DaTN3o30TXVM54wgSzPJugfvBZiC8X8UOzH2rLJ2Lqzrqql2Z+SnfOeDKOYqdayvL28y3baYuqf+k4KoxhPJAMs8DAHM9kzUzI4MBstfClVJGweARZtDNz++O703R7Nx7zzrq+jKJ3zmTqaAZ2Po8KrpLYawyTSMOE98TABqBA1HVsmOiyNLocvNy+aLegq9CbzIVAb2hI0CGP6xeqo2UnJOLqirUqjxJ0em0+c4Z9lpYitbbkQx8XVM+VK9H8DJRJPHZ4lSiqLLK4sUyy8KZYmfCF9G54TAwoW/ljv1N4iz8rAtrQYqrei6J6vnnWhyKbqrTW4g8QU0mbgfe9t/qgLnxgrIsQoviukLAAswSkCJswhJxtmEw0Jdvzf7APerc6pwBi0garDoy+hzqDZo9apArGTuwnIs9Wi5Pvy5gEoD2kbBSQsKpIthi66LN0ppCVpIDwZxg+TBPf2puih2Z/LYr8Qtfetfqljp++oBq04tCC9pMg+1cnid/AN/zIM+RgbIsop2C1/LzQv7SzNKJAj9hs6E3kH//r87E/fD9Jjxru8frbpspmy87TeuX/B78o91jji+u7e/AYK0BUqIHcoPS5WMfAx9TDOLRco/iA0F2IMav8d8t/k/tmBz3XGDcAPvce8R79+w6HKttOr3iDrGPlgBkMTih4PKasv3DQ7N8A2RTQHMEMp2CBvFmkKqfxs7dzettLFx8m+27kFuK25+L2RxMPNc9kb5vf04QPPEpIgsSyqNs084T9mQC8+xjrUNC0taCKPFWgFVfTf4hXTCsXLuvSyMK+4rnWxV7iqwo3OCN0B7Uv+Fw/UH+4uijocQuVG7UfvRqZEmEDKOqoyyShpG3sKpfYO46PQ0cBJtN+r3Kj6qaqud7fnwlXRyOEu9PoG4BrcLMw7xkUwTNtOw0+2TiBMf0d+Qck5xS81IjwRnvw46ELU78Nst+6veaxZrtOzu73uyq/adOyC/yMTuiUvNkdD7UsCUTNT71IzUcBN1EiLQjo6qC9JIjERZf/s7NXcoc/nxvTB/cDtw9/KnNSY4ULvz/7PDSIdWCq6Nm5AO0e9SVdKHUjsRJg/hzhlL+gkjxjxCnb+EvTA6svjfd9Y3irfC+NP6WnxlPpHBIIOoxeFH/Yl4CqVLUMuDS3AKcgkKR7QFaMN6gTa/HT1J/B07Jjruey18Ij0b/qAAdIJQRJnGysjMyk5LWUv7S4iLQMoUiHfGLIPOgW4+i3w6eai3uDZ6dfg13XaqeAu6c3yT/7kClEXoSPTLqs3ST5+QiZEDUKZPQs2LSx9HygSdwKC89/kXdgizkHH9MMaxS3JVtDk2p3nrfWUBUAVsSQFMto95UWjSqpKCklpRPA9hjWoKZgbrwvj+n7rU9wW0HnG/cFcwRnEaMp/1A3hYO5w/ecMHxwIKaE0dTyFQdBCrEFsPkU4jS+oJWgZWQwg/vbx4uZO3jrYjdVt1bfY1d1g5lnv3fk5BKkOexitIPslminMKgcq+SWsILEZixHWCNoAa/nR8u3sH+oI6ojrae7J8uP40/9NB1QOlxSeGcocjB6RHuIbvRdsEQ8L0wMN/eH1TPDa6jvoDuea6LnrTPDj9kj+mwWoDRgV4BomHwIifiKNIfsdGBnvEd0KaALr+kvzeOvg5WXjIuP75FDozu2M9Gr8BwWzDaoVphuDICYjeSOjIQkePhiREQ8JpQAv+ATxHOoj5S7i1OGX443nGeyy8rD6RwM9CzcTHhnhHfofYSCXHlUbchUjDxMIpQBW+fnyDO0v6TXnQufE6PDr/vC99kD9PwT8CngQ4xOVFlMXRhawEzgPSAoqBOD9HPhf8yPvF+yc6hHrZewP8Pn0GPv2ANoHNA3wEm8VjhdjFxcWyxL8DTgIGwK1++z1OvBJ7ALpj+fc5oDoO+xb8RH3vP3RA+kJNw7/EZQUQhViFFgS4Q7PCoAF6QBX+2X2bvLG72vusu3S7v7w0fME90n79v5kA50GTAnGCjEM1QuiCsYI5waeA/cA1v3s+y35GfiU9wr4nPj4+f36Af2P/o8A8AH7AqUDBQT7A6sDiAKYAWEAWv9Q/r/9Wf0f/Vn9zf38/TL+Z/+c/z8AZgBpAJ3/m//S/0L/lP6X/s39Kv6//WX++P5nAOEAIgK/Ar8DrgPHA0QDmAK/AWoA9/5f/Xj7Ovpx+IH3yvZA9//3Lfmi+n38af5FAeMDOQY5CB0JMgp9CoUKPQl2B3MFFQNJALv9qvu5+fb3L/eS9ob3D/hs+WH6lfzq/X0AyQFwA44EugVyBsQGZwZbBmcFGQVjA5UCWQHnAKwAdQAGAEIAGQC5APEArQFDAncCNQL+AYMBRQGsAL3/F/5D/a38FPwV/J38TP24/f7+iAB3AjgDLgTyBA4GkQYnB9sGYQYKBfUDrwGNADr+Gf1d+4v6uPlf+Qz59vl5+tj7Df1+/hsA6wEZA4oE7wS4BXoFQAUlBP4CvQEeAPL9Ivzw+b74gPdV9jX2rPVS9gb3yvic+qD8/f6oAGMCTQQSBbIFdAVsBV4EYAMBAXz/Hf04+3P4Y/cr9aDzvPIy88fzSfQ69YT3cfny+wv+AQGWAp8EBgaaBrsGngbEBdUDOgLW/3j9xPpT+LD2pvQB87HxN/Fd8RXya/NI9UX3Nvk6/HP+YAFTA0UF8gWjBkUGTgZvBWYERwInAK79RPu2+Nf2fvT88pbxFPEC8RXydfJI9Kb13feA+Sn7Hf3F/gYAxgAmAcABMwHfAOn/Lv9V/hH9ePzH+9b6MPpf+Z34WPjg99b3APf99hr3X/eG92n3VPe29zP3svdl9/X3A/gM+X75v/oY+2T88PwI/uf+jP+1/5L/Y/9Z/23+7f1e/DL7/PiQ9xn2S/WA9HLzivKU8hbz9/Nj9VD2Kfih+RL8yf1B/3gAcwFuARYB0gC1AJj/pP5I/bf7+vmw+LX2mPVt9MH0f/QI9VT1WPZ/9yP5BPqC+7P8+P2r/nj/HQC2AGQABgAG/5r+Vf3Q/L/7+/om+nL5Ivne+Gj4DfgL+IL4Afl1+Qf6x/qW+wz8lPzu/I79R/7//or+8f4p/sz9Q/2j/BD8B/x5+/H6Mvps+qf5k/ka+cj5pPn/+Rz6DPtt+1r88PyZ/b79Sv7Q/iX/h/6v/gz+A/5f/dP8ZvwZ/In7+Pqj+p/6jvqK+r36y/p3+4v7L/y3/PH81P1j/s3+DP8g/6L/VP+n/wr/sv9X/xn/SP5P/uv9Nf6t/fH9rP2v/QP+Ff4d/oz+Rf6l/lX+pf6k/qn+Av92/3P/yP/Y/wUACADT/5EAsADZAB4BBgFXAYwBsQHXAS8BAQGYAEgA2v+8/2n/zf9I/4H/w/48/zv/9f8gAHoAGAG7AcIBdQLZAscCmwIBA3sC2QK3AvgCZwJAAqQBfwH8ALUAUAAGABQAfAAiAJMAlgCNAMEAJwFRAa4BcQKxAuwClQKUAosCmAJ8ApcCEAIRAscBrwGSAYcBRQEuAaQA6ABcAOwAxQBYAeUAcQEYAVUBZgELArwBLAJmAugC5wIMA/ICIAO3At0CVQJcAhYC8wHKAacBhQFwAYMBegGOARQBZwGcATwCWgKtAn8C6wIBAyUDKwP9AvsC/AKiArwCNQJtAtEB0QERASMBqgC1AKsAvQCoAMwAuQCuAKEA/gDLAFwBDQFuAVQB/wGPAYUBgwFxARoBKwEXAfwA2wDPAHsAsgBcAP//+v+z/4T/S/9L//r+8P5D/7z/yf+IAPr/dABVAFIAXACcALYA5gDkABIBpgCoAOr/0v9f/2//0f7w/j3+ev4a/hD+7v02/kz+';
+    chat_notify_audio = new Audio("data:audio/wav;base64," + base64string);
+
+}
+
+// Issue a pop-up notification using the web standard Notification API
+// https://developer.mozilla.org/docs/Web/API/notification
+var chat_issue_notification = function (theBody,theTitle) {
+    if ( !chat_notify_granted || !chat_notify_enabled) {
+        return;
+    }
+    var nIcon = "/images/icons/48/group.png";
+    var options = {
+        body: theBody,
+        icon: nIcon,
+        silent: false
+    }
+    var n = new Notification(theTitle,options);
+    n.onclick = function (event) {
+        setTimeout(n.close.bind(n), 300); 
+    } 
+    if(chat_notify_audio_enabled) {
+      chat_notify_audio.play();
+    }
+}
+
+
+function toggleChatNotificationAudio() {
+	if(!chat_notify_audio_enabled) {
+		chat_notify_audio_enabled = true;
+        $('#toggle-notifications-audio-icon').removeClass('fa-volume-off');
+        $('#toggle-notifications-audio-icon').addClass('fa-volume-up');
+	}
+	else {
+		chat_notify_audio_enabled = false;
+        $('#toggle-notifications-audio-icon').removeClass('fa-volume-up');
+        $('#toggle-notifications-audio-icon').addClass('fa-volume-off');
+	}
+}
+
+function toggleChatNotifications() {
+	if(!chat_notify_enabled) {
+		chat_notify_enabled = true;
+        $('#toggle-notifications-icon').addClass('fa-bell');
+        $('#toggle-notifications-icon').removeClass('fa-bell-slash-o');
+        $('#toggle-notifications-audio').removeClass('disabled');
+	}
+	else {
+		chat_notify_enabled = false;
+        $('#toggle-notifications-icon').addClass('fa-bell-slash-o');
+        $('#toggle-notifications-icon').removeClass('fa-bell');
+        $('#toggle-notifications-audio').addClass('disabled');
+	}
+}
+
+function chatJotGetLink() {
+	reply = prompt("{{$linkurl}}");
+	if(reply && reply.length) {
+		$('#chat-rotator').spin('tiny');
+		$.get('linkinfo?f=&url=' + reply, function(data) {
+			addmailtext(data);
+			$('#chat-rotator').spin(false);
+		});
+	}
+}
+
+function addmailtext(data) {
+	var currentText = $("#chatText").val();
+	$("#chatText").val(currentText + data);
+}
+
+function adjustFullscreenTopBarHeight() {
+	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 16);
+	$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
+}
+
+function adjustInlineTopBarHeight() {
+	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23);
+	$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
+}
+
+function isMobile() {
+	if( navigator.userAgent.match(/Android/i)
+		 || navigator.userAgent.match(/webOS/i)
+		 || navigator.userAgent.match(/iPhone/i)
+		 || navigator.userAgent.match(/iPad/i)
+		 || navigator.userAgent.match(/iPod/i)
+		 || navigator.userAgent.match(/BlackBerry/i)
+		 || navigator.userAgent.match(/Windows Phone/i)
+	 ){
+		return true;
+	}
+	else {
+		 return false;
+	}
+}
+
+$(function(){
+	$('#chatText').keypress(function(e){
+		if (e.keyCode == 13 && e.shiftKey||isMobile()) {
+			//do nothing
+		}
+		else if (e.keyCode == 13) {
+			e.preventDefault();
+			$('#chat-form').trigger('submit');
+		}
+	});
+});
+</script>
diff --git a/view/theme/redbasic/tpl/chatroom_members.tpl b/view/theme/redbasic/tpl/chatroom_members.tpl
new file mode 100644
index 000000000..ea5fbede8
--- /dev/null
+++ b/view/theme/redbasic/tpl/chatroom_members.tpl
@@ -0,0 +1,5 @@
+<div id="chatroom_members" class="widget">
+	<h3>{{$header}}</h3>
+	<div id="chatMembers"></div>
+</div>
+
diff --git a/view/theme/redbasic/tpl/chatroom_new.tpl b/view/theme/redbasic/tpl/chatroom_new.tpl
new file mode 100644
index 000000000..1497939f6
--- /dev/null
+++ b/view/theme/redbasic/tpl/chatroom_new.tpl
@@ -0,0 +1,12 @@
+<div id="chatroom-new" class="section-content-tools-wrapper">
+	<form id="chatroom-new-form" action="chat" method="post" class="acl-form" data-form_id="chatroom-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+		{{include file="field_input.tpl" field=$name}}
+		{{include file="field_input.tpl" field=$chat_expire}}
+		<div class="btn-group pull-right">
+			<button id="dbtn-acl" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button>
+			<button id="dbtn-submit" class="acl-submit btn btn-primary" type="submit" name="submit" value="{{$submit}}" data-formid="chatroom-new-form">{{$submit}}</button>
+		</div>
+		<div class="clear"></div>
+	</form>
+</div>
+{{$acl}}
diff --git a/view/theme/redbasic/tpl/chatroomlist.tpl b/view/theme/redbasic/tpl/chatroomlist.tpl
new file mode 100644
index 000000000..a81b8ec1e
--- /dev/null
+++ b/view/theme/redbasic/tpl/chatroomlist.tpl
@@ -0,0 +1,10 @@
+<div id="chatroom_list" class="widget">
+	<h3>{{$header}}</h3>
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}">{{$overview}}</a></li>
+		{{foreach $items as $item}}
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$item.cr_id}}"><span class="badge pull-right">{{$item.cr_inroom}}</span>{{$item.cr_name}}</a></li>
+		{{/foreach}}
+	</ul>
+</div>
+
diff --git a/view/theme/redbasic/tpl/chatrooms.tpl b/view/theme/redbasic/tpl/chatrooms.tpl
new file mode 100644
index 000000000..71a2acada
--- /dev/null
+++ b/view/theme/redbasic/tpl/chatrooms.tpl
@@ -0,0 +1,41 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $is_owner}}
+		<button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$newroom}}</button>
+		{{/if}}
+		<h2>{{$header}}</h2>
+	</div>
+	{{if $is_owner}}
+	{{$chatroom_new}}
+	{{/if}}
+	{{if $rooms}}
+	<div class="section-content-wrapper-np">
+		<table id="chatrooms-index">
+			<tr>
+				<th width="97%">{{$name}}</th>
+				<th width="1%">{{$expire}}</th>
+				<th width="1%" class="chatrooms-index-tool"></th>
+				<th width="1%"></th>
+			</tr>
+			{{foreach $rooms as $room}}
+			<tr class="chatroom-index-row">
+				<td><a href="{{$baseurl}}/chat/{{$nickname}}/{{$room.cr_id}}">{{$room.cr_name}}</a></td>
+				<td>{{$room.cr_expire}}&nbsp;min</td>
+				<td class="chatrooms-index-tool{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} dropdown float-right{{/if}}">
+					{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}}
+					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('chatroom',{{$room.cr_id}});"></i>
+					<ul id="panel-{{$room.cr_id}}" class="lockview-panel dropdown-menu"></ul>
+					{{/if}}
+				</td>
+				<td><span class="badge badge-default">{{$room.cr_inroom}}</span></td>
+			</tr>
+			{{/foreach}}
+		</table>
+
+	</div>
+	{{else}}
+	<div class="section-content-wrapper">
+		{{$norooms}}
+	</div>
+	{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/cloud.tpl b/view/theme/redbasic/tpl/cloud.tpl
new file mode 100644
index 000000000..d1567af9f
--- /dev/null
+++ b/view/theme/redbasic/tpl/cloud.tpl
@@ -0,0 +1,4 @@
+<div class="generic-content-wrapper">
+{{include file="cloud_header.tpl"}}
+{{include file="cloud_directory.tpl"}}
+</div>
diff --git a/view/theme/redbasic/tpl/cloud_actionspanel.tpl b/view/theme/redbasic/tpl/cloud_actionspanel.tpl
new file mode 100644
index 000000000..0ebecce29
--- /dev/null
+++ b/view/theme/redbasic/tpl/cloud_actionspanel.tpl
@@ -0,0 +1,42 @@
+<div id="files-mkdir-tools" class="section-content-tools-wrapper">
+	<label for="files-mkdir">{{$folder_header}}</label>
+	<form id="mkdir-form" method="post" action="file_upload" class="acl-form" data-form_id="mkdir-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+		<input type="hidden" name="folder" value="{{$folder}}" />
+		<input type="hidden" name="channick" value="{{$channick}}" />
+		<input type="hidden" name="return_url" value="{{$return_url}}" />
+		<input id="files-mkdir" type="text" name="filename" class="form-control form-group">
+		<div class="pull-right btn-group">
+			<div class="btn-group">
+				{{if $lockstate}}
+				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
+					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
+				</button>
+				{{/if}}
+				<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
+			</div>
+		</div>
+	</form>
+	<div class="clear"></div>
+</div>
+<div id="files-upload-tools" class="section-content-tools-wrapper">
+	{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}{{$info}}</div>{{/if}}
+	<form id="ajax-upload-files" method="post" action="file_upload" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+		<input type="hidden" name="directory" value="{{$path}}" />
+		<input type="hidden" name="channick" value="{{$channick}}" />
+		<input type="hidden" name="return_url" value="{{$return_url}}" />
+		<label for="files-upload">{{$upload_header}}</label>
+		<input class="form-group pull-left" id="files-upload" type="file" name="userfile">
+		<div class="pull-right btn-group">
+			<div class="btn-group">
+				{{if $lockstate}}
+				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
+					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
+				</button>
+				{{/if}}
+				<button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
+			</div>
+		</div>
+	</form>
+	<div class="clear"></div>
+</div>
+{{$aclselect}}
diff --git a/view/theme/redbasic/tpl/cloud_directory.tpl b/view/theme/redbasic/tpl/cloud_directory.tpl
new file mode 100644
index 000000000..adc8584c3
--- /dev/null
+++ b/view/theme/redbasic/tpl/cloud_directory.tpl
@@ -0,0 +1,45 @@
+<div id="cloud-drag-area" class="section-content-wrapper-np">
+	<table id="cloud-index">
+		<tr>
+			<th width="1%"></th>
+			<th width="92%">{{$name}}</th>
+			<th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th>
+			<th width="1%">{{*{{$type}}*}}</th>
+			<th width="1%" class="d-none d-md-table-cell">{{$size}}</th>
+			<th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th>
+		</tr>
+	{{if $parentpath}}
+		<tr>
+			<td><i class="fa fa-level-up"></i>{{*{{$parentpath.icon}}*}}</td>
+			<td><a href="{{$parentpath.path}}" title="{{$parent}}">..</a></td>
+			<td></td><td></td><td></td><td></td>
+			<td>{{*[{{$parent}}]*}}</td>
+			<td class="d-none d-md-table-cell"></td>
+			<td class="d-none d-md-table-cell"></td>
+		</tr>
+	{{/if}}
+		<tr id="new-upload-progress-bar--1"></tr> {{* this is needed to append the upload files in the right order *}}
+	{{foreach $entries as $item}}
+		<tr id="cloud-index-{{$item.attachId}}">
+			<td><i class="fa {{$item.iconFromType}}" title="{{$item.type}}"></i></td>
+			<td><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td>
+	{{if $item.is_owner}}
+			<td class="cloud-index-tool">{{$item.attachIcon}}</td>
+			<td id="file-edit-{{$item.attachId}}" class="cloud-index-tool"></td>
+			<td class="cloud-index-tool"><i class="fakelink fa fa-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td>
+			<td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
+
+	{{else}}
+			<td></td><td></td><td></td><td></td>
+	{{/if}}
+			<td>{{*{{$item.type}}*}}</td>
+			<td class="d-none d-md-table-cell">{{$item.sizeFormatted}}</td>
+			<td class="d-none d-md-table-cell">{{$item.lastmodified}}</td>
+		</tr>
+		<tr id="cloud-tools-{{$item.attachId}}">
+			<td id="perms-panel-{{$item.attachId}}" colspan="9"></td>
+		</tr>
+
+	{{/foreach}}
+	</table>
+</div>
diff --git a/view/theme/redbasic/tpl/cloud_header.tpl b/view/theme/redbasic/tpl/cloud_header.tpl
new file mode 100644
index 000000000..c1e589341
--- /dev/null
+++ b/view/theme/redbasic/tpl/cloud_header.tpl
@@ -0,0 +1,16 @@
+<div class="section-title-wrapper">
+	{{if $actionspanel}}
+	<div class="pull-right">
+		{{if $is_owner}}
+		<a href="/sharedwithme" class="btn btn-sm btn-outline-secondary"><i class="fa fa-cloud-download"></i>&nbsp;{{$shared}}</a>
+		{{/if}}
+		<button id="files-create-btn" class="btn btn-sm btn-primary" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="fa fa-folder-o"></i>&nbsp;{{$create}}</button>
+		<button id="files-upload-btn" class="btn btn-sm btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload}}</button>
+	</div>
+	{{/if}}
+	<h2>{{$header}}</h2>
+	<div class="clear"></div>
+</div>
+{{if $actionspanel}}
+	{{$actionspanel}}
+{{/if}}
diff --git a/view/theme/redbasic/tpl/comment_item.tpl b/view/theme/redbasic/tpl/comment_item.tpl
new file mode 100755
index 000000000..f490483b8
--- /dev/null
+++ b/view/theme/redbasic/tpl/comment_item.tpl
@@ -0,0 +1,67 @@
+		{{if $threaded}}
+		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+		{{else}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+		{{/if}}
+			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$comment}}</textarea>
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
+					</select>
+				{{/if}}
+				<div id="comment-tools-{{$id}}" class="pt-2 comment-tools">
+					<div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left">
+						<div class="btn-group mr-2">
+							<button class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;">
+								<i class="fa fa-bold comment-icon"></i>
+							</button>
+							<button class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;">
+								<i class="fa fa-italic comment-icon"></i>
+							</button>
+							<button class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;">
+								<i class="fa fa-underline comment-icon"></i>
+							</button>
+							<button class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;">
+								<i class="fa fa-quote-left comment-icon"></i>
+							</button>
+							<button class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;">
+								<i class="fa fa-terminal comment-icon"></i>
+							</button>
+						</div>
+						<div class="btn-group mr-2">
+							<button class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;">
+								<i class="fa fa-link comment-icon"></i>
+							</button>
+						</div>
+						{{if $feature_encrypt}}
+						<div class="btn-group mr-2">
+							<button class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;">
+								<i class="fa fa-key comment-icon"></i>
+							</button>
+						</div>
+						{{/if}}
+						{{$comment_buttons}}
+					</div>
+					<div class="btn-group float-right" id="comment-edit-submit-wrapper-{{$id}}">
+						{{if $preview}}
+						<button id="comment-edit-presubmit-{{$id}}" class="btn btn-outline-secondary btn-sm" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}">
+							<i class="fa fa-eye comment-icon" ></i>
+						</button>
+						{{/if}}
+						<button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-sm" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button>
+					</div>
+				</div>
+				<div class="clear"></div>
+			</form>
+		</div>
+		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview"></div>
diff --git a/view/theme/redbasic/tpl/common_friends.tpl b/view/theme/redbasic/tpl/common_friends.tpl
new file mode 100755
index 000000000..489717e78
--- /dev/null
+++ b/view/theme/redbasic/tpl/common_friends.tpl
@@ -0,0 +1,15 @@
+<div class="profile-match-wrapper">
+	<div class="profile-match-photo">
+		<a href="{{$url}}">
+			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
+	</div>
+	{{if $note}}
+	<div class="profile-match-note">{{$note}}</div>
+	{{/if}}	
+	<div class="profile-match-end"></div>
+</div>
diff --git a/view/theme/redbasic/tpl/common_tabs.tpl b/view/theme/redbasic/tpl/common_tabs.tpl
new file mode 100755
index 000000000..29c46369b
--- /dev/null
+++ b/view/theme/redbasic/tpl/common_tabs.tpl
@@ -0,0 +1,17 @@
+<div class="mb-4 d-none d-md-block">
+	<ul class="nav nav-tabs nav-fill">
+		{{foreach $tabs as $tab}}
+		<li class="nav-item"{{if $tab.id}} id="{{$tab.id}}"{{/if}}><a class="nav-link{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+		{{/foreach}}
+	</ul>
+</div>
+<div class="d-md-none dropdown clearfix" style="position:fixed; right:7px; top:4.5rem; z-index:1020">
+	<button type="button" class="btn btn-outline-secondary btn-sm float-right" data-toggle="dropdown">
+		<i class="fa fa-bars"></i>
+	</button>
+	<div class="dropdown-menu dropdown-menu-right">
+		{{foreach $tabs as $tab}}
+		<a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a>
+		{{/foreach}}
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/connection_template.tpl b/view/theme/redbasic/tpl/connection_template.tpl
new file mode 100755
index 000000000..16915abda
--- /dev/null
+++ b/view/theme/redbasic/tpl/connection_template.tpl
@@ -0,0 +1,48 @@
+<div id="contact-entry-wrapper-{{$contact.id}}">
+	<div class="section-subtitle-wrapper clearfix">
+		<div class="pull-right">
+			{{if $contact.approve && $contact.ignore}}
+			<form action="connedit/{{$contact.id}}" method="post" >
+			<button type="submit" class="btn btn-success btn-sm" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="fa fa-check"></i> {{$contact.approve}}</button>
+
+			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-sm" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a>
+
+			{{/if}}
+			<a href="#" class="btn btn-danger btn-sm" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
+			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i></a>
+			{{if $contact.approve}}
+			</form>
+			{{/if}}
+		</div>
+		<h3>{{if $contact.public_forum}}<i class="fa fa-comments-o"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a>{{if $contact.phone}}&nbsp;<a class="btn btn-outline-secondary btn-sm" href="tel:{{$contact.phone}}" title="{{$contact.call}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</h3>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<div class="contact-photo-wrapper" >
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
+		</div>
+		<div class="contact-info">
+			{{if $contact.status}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.status_label}}:</span> {{$contact.status}}
+			</div>
+			{{/if}}
+			{{if $contact.connected}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.connected_label}}:</span> <span class="autotime" title="{{$contact.connected}}"></span>
+			</div>
+			{{/if}}
+			{{if $contact.webbie}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.webbie_label}}:</span> {{$contact.webbie}}
+			</div>
+			{{/if}}
+			{{if $contact.network}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}">{{$contact.recent_label}}</a>
+			</div>
+			{{/if}}
+		</div>
+
+	</div>
+</div>
+
diff --git a/view/theme/redbasic/tpl/connections.tpl b/view/theme/redbasic/tpl/connections.tpl
new file mode 100755
index 000000000..13261965a
--- /dev/null
+++ b/view/theme/redbasic/tpl/connections.tpl
@@ -0,0 +1,36 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper clearfix">
+		<div class="dropdown pull-right">
+			<button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus()">
+				<i class="fa fa-search"></i>&nbsp;{{$label}}
+			</button>
+			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
+				<i class="fa fa-sort"></i>
+			</button>
+			<div class="dropdown-menu dropdown-menu-right">
+				{{foreach $tabs as $menu}}
+				<a class="dropdown-item" href="{{$menu.url}}">{{$menu.label}}</a>
+				{{/foreach}}
+			</div>
+		</div>
+		{{if $finding}}<h2>{{$finding}}</h2>{{else}}<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>{{/if}}
+	</div>
+	<div id="contacts-search-form" class="section-content-tools-wrapper">
+		<form action="{{$cmd}}" method="get" >
+			<div class="input-group form-group">
+				<input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
+				<div class="input-group-btn">
+					<button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-fw fa-search"></i></button>
+				</div>
+			</div>
+		</form>
+	</div>
+	<div id="connections-wrapper clearfix">
+		{{foreach $contacts as $contact}}
+			{{include file="connection_template.tpl"}}
+		{{/foreach}}
+		<div id="page-end"></div>
+	</div>
+</div>
+<script>$(document).ready(function() { loadingPage = false;});</script>
+<div id="page-spinner"></div>
diff --git a/view/theme/redbasic/tpl/contact_block.tpl b/view/theme/redbasic/tpl/contact_block.tpl
new file mode 100755
index 000000000..580a8a41c
--- /dev/null
+++ b/view/theme/redbasic/tpl/contact_block.tpl
@@ -0,0 +1,14 @@
+<div id="contact-block" class="widget">
+	<h3>{{$contacts}}</h3>
+	{{if $micropro}}
+	{{if $viewconnections}}
+	<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
+	{{/if}}
+	<div class='contact-block-content'>
+	{{foreach $micropro as $m}}
+		{{$m}}
+	{{/foreach}}
+	</div>
+	{{/if}}
+</div>
+<div class="clear"></div>
diff --git a/view/theme/redbasic/tpl/contact_head.tpl b/view/theme/redbasic/tpl/contact_head.tpl
new file mode 100755
index 000000000..72e7edbfb
--- /dev/null
+++ b/view/theme/redbasic/tpl/contact_head.tpl
@@ -0,0 +1,30 @@
+<script language="javascript" type="text/javascript"
+          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          <script language="javascript" type="text/javascript">
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "{{$editselect}}",
+	elements: "contact-edit-info",
+	plugins : "bbcode",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_styles : "blockquote,code",
+	gecko_spellcheck : true,
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	force_p_newlines : false,
+	force_br_newlines : true,
+	forced_root_block : '',
+	content_css: "{{$baseurl}}/view/custom_tinymce.css"
+
+
+});
+
+
+</script>
+
diff --git a/view/theme/redbasic/tpl/contact_slider.tpl b/view/theme/redbasic/tpl/contact_slider.tpl
new file mode 100755
index 000000000..550abc147
--- /dev/null
+++ b/view/theme/redbasic/tpl/contact_slider.tpl
@@ -0,0 +1,20 @@
+<div id="contact-slider" class="slider form-group"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div>
+<script>
+$(document).ready(function() {
+	// The slider does not render correct if width is given in % and
+	// the slider container is hidden (display: none) during rendering.
+	// So let's unhide it to render and hide again afterwards.
+	if(!$("#affinity-tool-collapse").hasClass("in")) {
+		$("#affinity-tool-collapse").addClass("in");
+		makeContactSlider();
+		$("#affinity-tool-collapse").removeClass("in");
+	}
+	else {
+		makeContactSlider();
+	}
+});
+
+function makeContactSlider() {
+	$("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: [{{$labels}}], width:'98%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); }  });
+}
+</script>
diff --git a/view/theme/redbasic/tpl/contact_template.tpl b/view/theme/redbasic/tpl/contact_template.tpl
new file mode 100755
index 000000000..3d1bfa4a4
--- /dev/null
+++ b/view/theme/redbasic/tpl/contact_template.tpl
@@ -0,0 +1,8 @@
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
+	<div class="contact-entry-photo-wrapper" >
+		<a href="{{$contact.link}}" title="{{$contact.img_hover}}" ><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+	<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/redbasic/tpl/contactsajax.tpl b/view/theme/redbasic/tpl/contactsajax.tpl
new file mode 100644
index 000000000..a6b5ad791
--- /dev/null
+++ b/view/theme/redbasic/tpl/contactsajax.tpl
@@ -0,0 +1,3 @@
+{{foreach $contacts as $contact}}
+{{include file="connection_template.tpl"}}
+{{/foreach}}
diff --git a/view/theme/redbasic/tpl/conv.tpl b/view/theme/redbasic/tpl/conv.tpl
new file mode 100755
index 000000000..ddb959b84
--- /dev/null
+++ b/view/theme/redbasic/tpl/conv.tpl
@@ -0,0 +1,17 @@
+{{foreach $threads as $thread}}
+<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper">
+	{{foreach $thread.items as $item}}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
+			</div>
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
+		
+		{{include file="{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+</div>
+{{/foreach}}
diff --git a/view/theme/redbasic/tpl/conv_frame.tpl b/view/theme/redbasic/tpl/conv_frame.tpl
new file mode 100755
index 000000000..aa7b55e9b
--- /dev/null
+++ b/view/theme/redbasic/tpl/conv_frame.tpl
@@ -0,0 +1,5 @@
+<div id="threads-begin"></div>
+<div id="threads-end"></div>
+<div id="conversation-end"></div>
+<div id="page-spinner"></div>
+
diff --git a/view/theme/redbasic/tpl/conv_item.tpl b/view/theme/redbasic/tpl/conv_item.tpl
new file mode 100755
index 000000000..2d51af4ff
--- /dev/null
+++ b/view/theme/redbasic/tpl/conv_item.tpl
@@ -0,0 +1,250 @@
+{{if $item.comment_firstcollapsed}}
+<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+	<span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span>&nbsp;<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
+</div>
+<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}">
+		<a name="item_{{$item.id}}" ></a>
+		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+			<div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
+				{{if $item.photo}}
+				<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
+					{{$item.photo}}
+				</div>
+				{{/if}}
+				{{if $item.event}}
+				<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
+					{{$item.event}}
+				</div>
+				{{/if}}
+				{{if $item.title && !$item.event}}
+				<div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}">
+					{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}
+				</div>
+				{{if ! $item.is_new}}
+				<hr class="m-0">
+				{{/if}}
+				{{/if}}
+				<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
+					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
+							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+						</div>
+					</div>
+					{{if $item.lock}}
+					<div class="wall-item-lock dropdown">
+						<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
+						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
+					</div>
+					{{/if}}
+					<div class="wall-item-author">
+						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
+					</div>
+					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
+						{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+					</div>
+				</div>
+
+				{{if $item.body}}
+				<div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}">
+					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
+						{{$item.body}}
+					</div>
+				</div>
+				{{/if}}
+				{{if $item.has_tags}}
+				<div class="p-2 wall-item-tools clearfix">
+
+					<div class="body-tags">
+						<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
+					</div>
+				{{**
+					{{if $item.mentions}}
+					<div class="body-tags" id="item-mentions">
+						<span class="tag">{{$item.mentions}}</span>
+					</div>
+					{{/if}}
+					{{if $item.tags}}
+					<div class="body-tags" id="item-tags">
+						<span class="tag">{{$item.tags}}</span>
+					</div>
+					{{/if}}
+					{{if $item.categories}}
+					<div class="body-tags" id="item-categories">
+						<span class="tag p-category">{{$item.categories}}</span>
+					</div>
+					{{/if}}
+					{{if $item.folders}}
+					<div class="body-tags" id="item-folders">
+						<span class="tag">{{$item.folders}}</span>
+					</div>
+					{{/if}}
+				**}}
+				</div>
+				{{/if}}
+				<div class="p-2 clearfix wall-item-tools">
+					<div class="wall-item-tools-right pull-right">
+						{{if $item.toplevel && $item.emojis && $item.reactions}}
+						<div class="btn-group dropdown">
+							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
+								<i class="fa fa-smile-o"></i>
+							</button>
+							<div class="dropdown-menu dropdown-menu-right">
+							{{foreach $item.reactions as $react}}
+								<a class="dropdown-item clearfix" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="menu-img-2" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a>
+							{{/foreach}}
+							</div>
+						</div>
+						{{/if}}
+						<div class="btn-group dropdown">
+							{{if $item.like}}
+							<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
+								<i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i>
+							</button>
+							{{/if}}
+							{{if $item.dislike}}
+							<button type="button" title="{{$item.dislike.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;">
+								<i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i>
+							</button>
+							{{/if}}
+							{{if $item.isevent}}
+							<div class="btn-group dropdown">
+								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
+									<i class="fa fa-calendar-check-o"></i>
+								</button>
+								<div class="dropdown-menu">
+									<a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
+										<i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}}
+									</a>
+									<a class="dropdown-item" href="#" title="{{$item.attend.1}}" onclick="itemAddToCal({{$item.id}}), dolike({{$item.id}},'attendno'); return false;">
+										<i class="item-act-list fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> {{$item.attend.1}}
+									</a>
+									<a class="dropdown-item" href="#" title="{{$item.attend.2}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;">
+										<i class="item-act-list fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> {{$item.attend.2}}
+									</a>
+								</div>
+							</div>
+							{{/if}}
+							{{if $item.canvote}}
+							<div class="btn-group dropdown">
+								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}">
+									<i class="fa fa-check-square-o"></i>
+								</button>
+								<div class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}">
+									<a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;">
+										<i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}}
+									</a>
+									<a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;">
+										 <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}}
+									</a> 
+									<a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;">
+										<i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}}
+									</a>
+								</div>
+							</div>
+							{{/if}}
+							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
+								<i class="fa fa-cog"></i>
+							</button>
+							<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
+								{{if $item.share}}
+								<a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a>
+								{{/if}}
+								{{if $item.plink}}
+								<a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a>
+								{{/if}}
+								{{if $item.edpost}}
+								<a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a>
+								{{/if}}
+								{{if $item.tagger}}
+								<a class="dropdown-item" href="#"  onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a>
+								{{/if}}
+								{{if $item.filer}}
+								<a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a>
+								{{/if}}
+								{{if $item.bookmark}}
+								<a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a>
+								{{/if}}
+								{{if $item.addtocal}}
+								<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
+								{{/if}}
+								{{if $item.star}}
+								<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
+								{{/if}}
+								{{if $item.thread_action_menu}}
+								{{foreach $item.thread_action_menu as $mitem}}
+								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a>
+								{{/foreach}}
+								{{/if}}
+								{{if $item.drop.dropping}}
+								<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
+								{{/if}}
+								{{if $item.thread_author_menu}}
+								<div class="dropdown-divider"></div>
+								{{foreach $item.thread_author_menu as $mitem}}
+								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
+								{{/foreach}}
+								{{/if}}
+								{{if $item.edpost && $item.dreport}}
+								<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
+								{{/if}}
+							</div>
+						</div>
+					</div>
+					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
+
+					{{if $item.responses || $item.attachments}}
+					<div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count &&  $item.attachments)}} btn-group{{/if}}">
+						{{if $item.attachments}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
+							<div class="dropdown-menu">{{$item.attachments}}</div>
+						</div>
+						{{/if}}
+						{{foreach $item.responses as $verb=>$response}}
+						{{if $response.count}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
+							{{if $response.modal}}
+							<div class="modal" id="{{$verb}}Modal-{{$item.id}}">
+								<div class="modal-dialog">
+									<div class="modal-content">
+										<div class="modal-header">
+											<h4 class="modal-title">{{$response.count}} {{$response.button}}</h4>
+											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+										</div>
+										<div class="modal-body response-list">
+											<ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul>
+										</div>
+										<div class="modal-footer clear">
+											<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$item.modal_dismiss}}</button>
+										</div>
+									</div><!-- /.modal-content -->
+								</div><!-- /.modal-dialog -->
+							</div><!-- /.modal -->
+							{{else}}
+							<div class="dropdown-menu">{{foreach $response.list as $liker}}{{$liker}}{{/foreach}}</div>
+							{{/if}}
+						</div>
+						{{/if}}
+						{{/foreach}}
+					</div>
+					{{/if}}
+				</div>
+			</div>
+		</div>
+		{{if $item.toplevel}}
+		{{foreach $item.children as $child}}
+			{{include file="{{$child.template}}" item=$child}}
+		{{/foreach}}
+		{{/if}}
+		{{if $item.comment}}
+		<div class="p-2 wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" >
+			{{$item.comment}}
+		</div>
+		{{/if}}
+	</div>
+{{if $item.comment_lastcollapsed}}
+</div>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/conv_list.tpl b/view/theme/redbasic/tpl/conv_list.tpl
new file mode 100755
index 000000000..59153e41f
--- /dev/null
+++ b/view/theme/redbasic/tpl/conv_list.tpl
@@ -0,0 +1,251 @@
+{{if $item.comment_firstcollapsed}}
+<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+	<span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span>&nbsp;<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
+</div>
+<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}">
+		<a name="item_{{$item.id}}" ></a>
+		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+			<div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
+				{{if $item.photo}}
+				<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
+					{{$item.photo}}
+				</div>
+				{{/if}}
+				{{if $item.event}}
+				<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
+					{{$item.event}}
+				</div>
+				{{/if}}
+				{{if $item.title && !$item.event}}
+				<div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}">
+					{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}
+				</div>
+				{{if ! $item.is_new}}
+				<hr class="m-0">
+				{{/if}}
+				{{/if}}
+				<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
+					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
+							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+						</div>
+					</div>
+					{{if $item.lock}}
+					<div class="wall-item-lock dropdown">
+						<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
+						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
+					</div>
+					{{/if}}
+					<div class="wall-item-author">
+						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
+					</div>
+					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
+						{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+					</div>
+				</div>
+
+				{{if $item.body}}
+				<div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}">
+					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
+						{{$item.body}}
+					</div>
+				</div>
+				{{/if}}
+				{{if $item.has_tags}}
+				<div class="p-2 wall-item-tools clearfix">
+
+					<div class="body-tags">
+						<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
+					</div>
+				{{**
+					{{if $item.mentions}}
+					<div class="body-tags" id="item-mentions">
+						<span class="tag">{{$item.mentions}}</span>
+					</div>
+					{{/if}}
+					{{if $item.tags}}
+					<div class="body-tags" id="item-tags">
+						<span class="tag">{{$item.tags}}</span>
+					</div>
+					{{/if}}
+					{{if $item.categories}}
+					<div class="body-tags" id="item-categories">
+						<span class="tag p-category">{{$item.categories}}</span>
+					</div>
+					{{/if}}
+					{{if $item.folders}}
+					<div class="body-tags" id="item-folders">
+						<span class="tag">{{$item.folders}}</span>
+					</div>
+					{{/if}}
+				**}}
+				</div>
+				{{/if}}
+				<div class="p-2 clearfix wall-item-tools">
+					<div class="wall-item-tools-right pull-right">
+						{{if $item.toplevel && $item.emojis && $item.reactions}}
+						<div class="btn-group dropdown">
+							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
+								<i class="fa fa-smile-o"></i>
+							</button>
+							<div class="dropdown-menu dropdown-menu-right">
+							{{foreach $item.reactions as $react}}
+								<a class="dropdown-item clearfix" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="menu-img-2" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a>
+							{{/foreach}}
+							</div>
+						</div>
+						{{/if}}
+						<div class="btn-group dropdown">
+							{{if $item.like}}
+							<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
+								<i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i>
+							</button>
+							{{/if}}
+							{{if $item.dislike}}
+							<button type="button" title="{{$item.dislike.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;">
+								<i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i>
+							</button>
+							{{/if}}
+							{{if $item.isevent}}
+							<div class="btn-group dropdown">
+								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
+									<i class="fa fa-calendar-check-o"></i>
+								</button>
+								<div class="dropdown-menu">
+									<a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
+										<i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}}
+									</a>
+									<a class="dropdown-item" href="#" title="{{$item.attend.1}}" onclick="itemAddToCal({{$item.id}}), dolike({{$item.id}},'attendno'); return false;">
+										<i class="item-act-list fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> {{$item.attend.1}}
+									</a>
+									<a class="dropdown-item" href="#" title="{{$item.attend.2}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;">
+										<i class="item-act-list fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> {{$item.attend.2}}
+									</a>
+								</div>
+							</div>
+							{{/if}}
+							{{if $item.canvote}}
+							<div class="btn-group dropdown">
+								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}">
+									<i class="fa fa-check-square-o"></i>
+								</button>
+								<div class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}">
+									<a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;">
+										<i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}}
+									</a>
+									<a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;">
+										 <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}}
+									</a> 
+									<a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;">
+										<i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}}
+									</a>
+								</div>
+							</div>
+							{{/if}}
+							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
+								<i class="fa fa-cog"></i>
+							</button>
+							<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
+								{{if $item.share}}
+								<a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a>
+								{{/if}}
+								{{if $item.plink}}
+								<a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a>
+								{{/if}}
+								{{if $item.edpost}}
+								<a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a>
+								{{/if}}
+								{{if $item.tagger}}
+								<a class="dropdown-item" href="#"  onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a>
+								{{/if}}
+								{{if $item.filer}}
+								<a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a>
+								{{/if}}
+								{{if $item.bookmark}}
+								<a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a>
+								{{/if}}
+								{{if $item.addtocal}}
+								<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
+								{{/if}}
+								{{if $item.star}}
+								<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
+								{{/if}}
+								{{if $item.thread_action_menu}}
+								{{foreach $item.thread_action_menu as $mitem}}
+								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a>
+								{{/foreach}}
+								{{/if}}
+								{{if $item.drop.dropping}}
+								<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
+								{{/if}}
+								{{if $item.thread_author_menu}}
+								<div class="dropdown-divider"></div>
+								{{foreach $item.thread_author_menu as $mitem}}
+								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
+								{{/foreach}}
+								{{/if}}
+								{{if $item.edpost && $item.dreport}}
+								<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
+								{{/if}}
+							</div>
+						</div>
+					</div>
+					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
+					<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}">
+						{{if $item.attachments}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
+							<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
+						</div>
+						{{/if}}
+						<div class="wall-item-list-comments btn-group">
+							<a class="btn btn-outline-secondary btn-sm" href="{{$item.viewthread}}">
+								{{$item.comment_count_txt}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}</span>{{/if}}
+							</a>
+						</div>
+						{{if $item.unseen_comments}}
+						<div class="unseen-wall-indicator-{{$item.id}} btn-group">
+							<button class="btn btn-outline-secondary btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;">
+								<i class="fa fa-check-square-o"></i>
+							</button>
+						</div>
+						{{/if}}
+						{{if $item.responses }}
+						{{foreach $item.responses as $verb=>$response}}
+						{{if $response.count}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
+							{{if $response.modal}}
+							<div class="modal" id="{{$verb}}Modal-{{$item.id}}">
+								<div class="modal-dialog">
+									<div class="modal-content">
+										<div class="modal-header">
+											<h4 class="modal-title">{{$response.count}} {{$response.button}}</h4>
+											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+										</div>
+										<div class="modal-body response-list">
+											<ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul>
+										</div>
+										<div class="modal-footer clear">
+											<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$item.modal_dismiss}}</button>
+										</div>
+									</div><!-- /.modal-content -->
+								</div><!-- /.modal-dialog -->
+							</div><!-- /.modal -->
+							{{else}}
+							<div class="dropdown-menu">{{foreach $response.list as $liker}}{{$liker}}{{/foreach}}</div>
+							{{/if}}
+						</div>
+						{{/if}}
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+{{if $item.comment_lastcollapsed}}
+</div>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/conversation.tpl b/view/theme/redbasic/tpl/conversation.tpl
new file mode 100755
index 000000000..82c7be922
--- /dev/null
+++ b/view/theme/redbasic/tpl/conversation.tpl
@@ -0,0 +1,20 @@
+<div id="threads-begin"></div>
+{{foreach $threads as $thread}}
+<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper generic-content-wrapper">
+	{{foreach $thread.items as $item}}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
+			</div>
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
+		
+		{{include file="{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+</div>
+{{/foreach}}
+<div id="threads-end"></div>
+<div id="conversation-end"></div>
diff --git a/view/theme/redbasic/tpl/convobj.tpl b/view/theme/redbasic/tpl/convobj.tpl
new file mode 100755
index 000000000..d5cee1170
--- /dev/null
+++ b/view/theme/redbasic/tpl/convobj.tpl
@@ -0,0 +1,4 @@
+{{foreach $threads as $item}}
+{{include file="{{$item.template}}"}}
+{{/foreach}}
+
diff --git a/view/theme/redbasic/tpl/cover_photo.tpl b/view/theme/redbasic/tpl/cover_photo.tpl
new file mode 100755
index 000000000..4352501ae
--- /dev/null
+++ b/view/theme/redbasic/tpl/cover_photo.tpl
@@ -0,0 +1,29 @@
+<div id="profile-photo-content" class="generic-content-wrapper">
+    <div class="section-title-wrapper">
+    <h2>{{$title}}</h2>
+    </div>
+    <div class="section-content-wrapper">
+
+		<form enctype="multipart/form-data" action="cover_photo" method="post">
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+		<div id="profile-photo-upload-wrapper">
+
+			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
+			<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
+			<div class="clear"></div>
+			<br />
+			<br />
+			<div id="profile-photo-submit-wrapper">
+				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+			</div>
+		</div>
+
+		</form>
+		<br />
+		<br />
+		<div id="profile-photo-link-select-wrapper">
+			{{$select}}
+		</div>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/cover_photo_widget.tpl b/view/theme/redbasic/tpl/cover_photo_widget.tpl
new file mode 100755
index 000000000..a9c384d2f
--- /dev/null
+++ b/view/theme/redbasic/tpl/cover_photo_widget.tpl
@@ -0,0 +1,76 @@
+<script>
+	var aside_padding_top;
+	var section_padding_top;
+	var coverSlid = false;
+
+	$(document).ready(function() {
+
+		aside_padding_top = parseInt($('aside').css('padding-top'));
+		section_padding_top = parseInt($('section').css('padding-top'));
+
+		$(document).on('click', slideUpCover);
+
+		if($('#cover-photo').length && $(window).width() > 755) {
+			if($(window).scrollTop() < $('#cover-photo').height()) {
+				$('.navbar').removeClass('fixed-top');
+				$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
+				$('main').css('opacity', 0);
+			}
+		}
+		else {
+			$('#cover-photo').remove();
+			coverSlid = true;
+		}
+	});
+
+	$(window).scroll(function () {
+		if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
+			$('.navbar').addClass('fixed-top');
+			$('main').css('margin-top', '');
+			$('main').css('opacity', 1);
+			coverSlid = true;
+		}
+		else if ($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){
+			if(coverSlid) {
+				$(window).scrollTop(Math.ceil($('#cover-photo').height()));
+				setTimeout(function(){ coverSlid = false; }, 1000);
+			}
+			else {
+				if($(window).scrollTop() < $('#cover-photo').height()) {
+					$('.navbar').removeClass('fixed-top');
+					$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
+					$('main').css('opacity', 0);
+				}
+			}
+		}
+		if($('#cover-photo').length && $('main').css('opacity') < 1) {
+			$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
+		}
+	});
+
+	$(window).resize(function () {
+		if($('#cover-photo').length && $(window).width() < 755) {
+			$('#cover-photo').remove();
+			$('.navbar').addClass('fixed-top');
+			$('main').css('opacity', 1);
+			coverSlid = true;
+		}
+
+	});
+
+	function slideUpCover() {
+		if(coverSlid) {
+			return;
+		}
+		$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' });
+		return;
+	}
+</script>
+
+<div id="cover-photo" title="{{$hovertitle}}">
+	{{$photo_html}}
+	<div id="cover-photo-caption">
+		<h1>{{$title}}</h1>
+		<h3>{{$subtitle}}</h3>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/cropbody.tpl b/view/theme/redbasic/tpl/cropbody.tpl
new file mode 100755
index 000000000..01d9a24a0
--- /dev/null
+++ b/view/theme/redbasic/tpl/cropbody.tpl
@@ -0,0 +1,58 @@
+<h1>{{$title}}</h1>
+<p id="cropimage-desc">
+{{$desc}}
+</p>
+<div id="cropimage-wrapper">
+<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<script type="text/javascript" language="javascript">
+
+	function onEndCrop( coords, dimensions ) {
+		$( 'x1' ).value = coords.x1;
+		$( 'y1' ).value = coords.y1;
+		$( 'x2' ).value = coords.x2;
+		$( 'y2' ).value = coords.y2;
+		$( 'width' ).value = dimensions.width;
+		$( 'height' ).value = dimensions.height;
+	}
+
+	Event.observe( window, 'load', function() {
+		new Cropper.ImgWithPreview(
+		'croppa',
+		{
+			previewWrap: 'previewWrap',
+			minWidth: 300,
+			minHeight: 300,
+			maxWidth: 1024,
+			maxHeight: 1024,
+			ratioDim: { x: 100, y:100 },
+			displayOnInit: true,
+			onEndCrop: onEndCrop
+		}
+		);
+	}
+	);
+
+</script>
+
+<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<input type='hidden' name='profile' value='{{$profile}}'>
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="{{$done}}" />
+</div>
+
+</form>
diff --git a/view/theme/redbasic/tpl/cropcover.tpl b/view/theme/redbasic/tpl/cropcover.tpl
new file mode 100755
index 000000000..04b96a603
--- /dev/null
+++ b/view/theme/redbasic/tpl/cropcover.tpl
@@ -0,0 +1,58 @@
+<h1>{{$title}}</h1>
+<p id="cropimage-desc">
+{{$desc}}
+</p>
+<div id="cropimage-wrapper">
+<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<script type="text/javascript" language="javascript">
+
+	function onEndCrop( coords, dimensions ) {
+		$( 'x1' ).value = coords.x1;
+		$( 'y1' ).value = coords.y1;
+		$( 'x2' ).value = coords.x2;
+		$( 'y2' ).value = coords.y2;
+		$( 'width' ).value = dimensions.width;
+		$( 'height' ).value = dimensions.height;
+	}
+
+	Event.observe( window, 'load', function() {
+		new Cropper.ImgWithPreview(
+		'croppa',
+		{
+			previewWrap: 'previewWrap',
+			minWidth: 240,
+			minHeight: 87,
+			maxWidth: 320,
+			maxHeight: 116,
+			ratioDim: { x: 100, y:36 },
+			displayOnInit: true,
+			onEndCrop: onEndCrop
+		}
+		);
+	}
+	);
+
+</script>
+
+<form action="cover_photo/{{$resource}}" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<input type='hidden' name='profile' value='{{$profile}}'>
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="{{$done}}" />
+</div>
+
+</form>
diff --git a/view/theme/redbasic/tpl/crophead.tpl b/view/theme/redbasic/tpl/crophead.tpl
new file mode 100755
index 000000000..48f375426
--- /dev/null
+++ b/view/theme/redbasic/tpl/crophead.tpl
@@ -0,0 +1,4 @@
+      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
+      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/redbasic/tpl/delegate.tpl b/view/theme/redbasic/tpl/delegate.tpl
new file mode 100755
index 000000000..cbaa8da86
--- /dev/null
+++ b/view/theme/redbasic/tpl/delegate.tpl
@@ -0,0 +1,57 @@
+<h3>{{$header}}</h3>
+
+<div id="delegate-desc" class="delegate-desc">{{$desc}}</div>
+
+{{if $managers}}
+<h3>{{$head_managers}}</h3>
+
+{{foreach $managers as $x}}
+
+<div class="contact-block-div">
+<a class="contact-block-link" href="#" >
+<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
+</a>
+</div>
+
+{{/foreach}}
+<div class="clear"></div>
+<hr />
+{{/if}}
+
+
+<h3>{{$head_delegates}}</h3>
+
+{{if $delegates}}
+{{foreach $delegates as $x}}
+
+<div class="contact-block-div">
+<a class="contact-block-link" href="{{$base}}/delegate/remove/{{$x.uid}}" >
+<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
+</a>
+</div>
+
+{{/foreach}}
+<div class="clear"></div>
+{{else}}
+{{$none}}
+{{/if}}
+<hr />
+
+
+<h3>{{$head_potentials}}</h3>
+{{if $potentials}}
+{{foreach $potentials as $x}}
+
+<div class="contact-block-div">
+<a class="contact-block-link" href="{{$base}}/delegate/add/{{$x.uid}}" >
+<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
+</a>
+</div>
+
+{{/foreach}}
+<div class="clear"></div>
+{{else}}
+{{$none}}
+{{/if}}
+<hr />
+
diff --git a/view/theme/redbasic/tpl/design_tools.tpl b/view/theme/redbasic/tpl/design_tools.tpl
new file mode 100644
index 000000000..bc7d46dc1
--- /dev/null
+++ b/view/theme/redbasic/tpl/design_tools.tpl
@@ -0,0 +1,9 @@
+<div id="design-tools" class="widget design-tools">
+	<h3>{{$title}}</h3>
+	<div class="nav nav-pills flex-column">
+		<a class="nav-link" href="blocks/{{$who}}">{{$blocks}}</a>
+		<a class="nav-link" href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a>
+		<a class="nav-link" href="layouts/{{$who}}">{{$layout}}</a>
+		<a class="nav-link" href="webpages/{{$who}}">{{$pages}}</a>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/diaspora_vcard.tpl b/view/theme/redbasic/tpl/diaspora_vcard.tpl
new file mode 100644
index 000000000..017eb555c
--- /dev/null
+++ b/view/theme/redbasic/tpl/diaspora_vcard.tpl
@@ -0,0 +1,69 @@
+<div style="display:none;">
+	<dl class="entity_uid">
+ 		<dt>Uid</dt>
+ 		<dd>
+			<span class="uid p-uid">{{$diaspora.guid}}</span>
+ 		</dd>
+	</dl>
+	<dl class='entity_nickname'>
+		<dt>Nickname</dt>
+		<dd>		
+			<span class="nickname p-nickname">{{$diaspora.nickname}}</span>
+		</dd>
+	</dl>
+	<dl class='entity_full_name'>
+		<dt>Full name</dt>
+		<dd>
+			<span class='fn p-name'>{{$diaspora.fullname}}</span>
+		</dd>
+	</dl>
+
+	<dl class='entity_first_name'>
+		<dt>First name</dt>
+		<dd>
+		<span class='given_name p-given-name'>{{$diaspora.firstname}}</span>
+		</dd>
+	</dl>
+	<dl class='entity_family_name'>
+		<dt>Family name</dt>
+		<dd>
+		<span class='family_name p-family-name'>{{$diaspora.lastname}}</span>
+		</dd>
+	</dl>
+	<dl class="entity_url">
+		<dt>URL</dt>
+		<dd>
+			<a href="{{$diaspora.podloc}}/" id="pod_location" class="url" rel="me" >{{$diaspora.podloc}}/</a>
+		</dd>
+	</dl>
+	<dl class="entity_photo">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}" />
+		</dd>
+	</dl>
+	<dl class="entity_photo_medium">
+		<dt>Photo</dt>
+		<dd> 
+			<img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}" />
+		</dd>
+	</dl>
+	<dl class="entity_photo_small">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}" />
+		</dd>
+	</dl>
+	<dl class="entity_searchable">
+		<dt>Searchable</dt>
+		<dd>
+			<span class="searchable">{{$diaspora.searchable}}</span>
+		</dd>
+	</dl>
+	<dl class="entity_key">
+		<dt>Key</dt>
+		<dd>
+		<pre class="key">{{$diaspora.pubkey}}</pre>
+		</dd>
+	</dl>
+</div>
diff --git a/view/theme/redbasic/tpl/dir_sort_links.tpl b/view/theme/redbasic/tpl/dir_sort_links.tpl
new file mode 100644
index 000000000..9346a7455
--- /dev/null
+++ b/view/theme/redbasic/tpl/dir_sort_links.tpl
@@ -0,0 +1,8 @@
+<div class="widget" id="dir_sort_links">
+<h3>{{$header}}</h3>
+
+{{include file="field_checkbox.tpl" field=$safemode}}
+{{include file="field_checkbox.tpl" field=$globaldir}}
+{{include file="field_checkbox.tpl" field=$pubforums}}
+
+</div>
diff --git a/view/theme/redbasic/tpl/directajax.tpl b/view/theme/redbasic/tpl/directajax.tpl
new file mode 100644
index 000000000..8faec4222
--- /dev/null
+++ b/view/theme/redbasic/tpl/directajax.tpl
@@ -0,0 +1,4 @@
+{{foreach $entries as $entry}}
+{{include file="direntry.tpl"}}
+{{/foreach}}
+
diff --git a/view/theme/redbasic/tpl/directory_header.tpl b/view/theme/redbasic/tpl/directory_header.tpl
new file mode 100755
index 000000000..71e991f3a
--- /dev/null
+++ b/view/theme/redbasic/tpl/directory_header.tpl
@@ -0,0 +1,22 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper clearfix">
+		<div class="btn-group pull-right">
+			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
+				<i class="fa fa-sort"></i>
+			</button>
+			<div class="dropdown-menu dropdown-menu-right">
+				<a class="dropdown-item" href="directory?f=&order=date{{$suggest}}">{{$date}}</a>
+				<a class="dropdown-item" href="directory?f=&order=normal{{$suggest}}">{{$normal}}</a>
+				<a class="dropdown-item" href="directory?f=&order=reversedate{{$suggest}}">{{$reversedate}}</a>
+				<a class="dropdown-item" href="directory?f=&order=reverse{{$suggest}}">{{$reverse}}</a>
+			</div>
+		</div>
+		<h2>{{$dirlbl}}{{if $search}}:&nbsp;{{$safetxt}}{{/if}}</h2>
+	</div>
+	{{foreach $entries as $entry}}
+		{{include file="direntry.tpl"}}
+	{{/foreach}}
+	<div id="page-end"></div>
+</div>
+<script>$(document).ready(function() { loadingPage = false;});</script>
+<div id="page-spinner"></div>
diff --git a/view/theme/redbasic/tpl/direntry.tpl b/view/theme/redbasic/tpl/direntry.tpl
new file mode 100755
index 000000000..f7ec7db23
--- /dev/null
+++ b/view/theme/redbasic/tpl/direntry.tpl
@@ -0,0 +1,77 @@
+<div class="directory-item{{if $entry.safe}} safe{{/if}}" id="directory-item-{{$entry.hash}}" >
+	<div class="section-subtitle-wrapper clearfix">
+		<div class="pull-right">
+			{{if $entry.viewrate}}
+				{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-outline-secondary btn-sm">{{$entry.total_ratings}}</a>{{/if}}
+			{{/if}}
+			{{if $entry.ignlink}}
+			<a class="directory-ignore btn btn-warning btn-sm" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a>
+			{{/if}}
+			{{if $entry.connect}}
+			<a class="btn btn-success btn-sm" href="{{$entry.connect}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conn_label}}</a>
+			{{/if}}
+			{{if $entry.viewrate}}
+				{{if $entry.canrate}}<button class="btn btn-outline-secondary btn-sm" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="fa fa-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
+			{{/if}}
+		</div>
+		<h3>{{if $entry.public_forum}}<i class="fa fa-comments-o" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="fa fa-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
+	</div>
+	<div class="section-content-tools-wrapper directory-collapse">
+		<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" >
+			<div class="contact-photo" id="directory-photo-{{$entry.hash}}" >
+				<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.hash}}" >
+					<img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" />
+				</a>
+			</div>
+		</div>
+		<div class="contact-info">
+			{{if $entry.common_friends}}
+			<div id="dir-common" class="contact-info-element">
+				<span class="contact-info-label">{{$entry.common_label}}</span> {{$entry.common_count}}
+			</div>
+			{{/if}}
+
+			{{if $entry.pdesc}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.pdesc_label}}</span> {{$entry.pdesc}}
+			</div>
+			{{/if}}
+
+			{{if $entry.age}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.age_label}}</span> {{$entry.age}}
+			</div>
+			{{/if}}
+
+			{{if $entry.location}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.location_label}}</span> {{$entry.location}}
+			</div>
+			{{/if}}
+
+			{{if $entry.hometown}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.hometown_label}}</span> {{$entry.hometown}}
+			</div>
+			{{/if}}
+
+			{{if $entry.homepage}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.homepage}}</span> {{$entry.homepageurl}}
+			</div>
+			{{/if}}
+
+			{{if $entry.kw}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.kw}}</span> {{$entry.keywords}}
+			</div>
+			{{/if}}
+
+			{{if $entry.about}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.about_label}}</span> {{$entry.about}}
+			</div>
+			{{/if}}
+		</div>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/display-head.tpl b/view/theme/redbasic/tpl/display-head.tpl
new file mode 100755
index 000000000..913784d98
--- /dev/null
+++ b/view/theme/redbasic/tpl/display-head.tpl
@@ -0,0 +1,8 @@
+<script>
+$(document).ready(function() {
+	$(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
+	// make auto-complete work in more places
+	$(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
+});
+</script>
+
diff --git a/view/theme/redbasic/tpl/dreport.tpl b/view/theme/redbasic/tpl/dreport.tpl
new file mode 100644
index 000000000..1f5915609
--- /dev/null
+++ b/view/theme/redbasic/tpl/dreport.tpl
@@ -0,0 +1,28 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $table == 'item'}}
+		<div class="dropdown pull-right">
+			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$options}}">
+				<i class="fa fa-sort-desc"></i>
+			</button>
+			<ul class="dropdown-menu">
+				<li><a href="dreport/push/{{$mid}}">{{$push}}</a></li>
+			</ul>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+	</div>
+
+	<div>
+	<table>
+	{{if $entries}}
+	{{foreach $entries as $e}}
+	<tr>
+		<td width="40%">{{$e.name}}</td>
+		<td width="20%">{{$e.result}}</td>
+		<td width="20%">{{$e.time}}</td>
+	</tr>
+	{{/foreach}}
+	{{/if}}
+	</table>
+</div>
diff --git a/view/theme/redbasic/tpl/edpost_head.tpl b/view/theme/redbasic/tpl/edpost_head.tpl
new file mode 100755
index 000000000..b2ab5db4e
--- /dev/null
+++ b/view/theme/redbasic/tpl/edpost_head.tpl
@@ -0,0 +1,14 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $delete}}
+		<div class="pull-right">
+			<a  href="item/drop/{{$id}}" id="delete-btn" class="btn btn-sm btn-danger" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$delete}}</a>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="webpage-editor" class="section-content-tools-wrapper">
+		{{$editor}}
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/email_notify_html.tpl b/view/theme/redbasic/tpl/email_notify_html.tpl
new file mode 100755
index 000000000..5b4954c8e
--- /dev/null
+++ b/view/theme/redbasic/tpl/email_notify_html.tpl
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>{{$banner}}</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;">
+	<tbody>
+	<tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src="{{$notify_icon}}"><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
+
+
+	<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
+
+
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
+		<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
+	<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
+	<tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr>
+	<tr><td style="padding:11px 0;" colspan="2">{{$hitemlink}}</td></tr>
+	<tr><td></td><td>{{$thanks}}</td></tr>
+	<tr><td></td><td>{{$site_admin}}</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
diff --git a/view/theme/redbasic/tpl/email_notify_text.tpl b/view/theme/redbasic/tpl/email_notify_text.tpl
new file mode 100755
index 000000000..56925c18b
--- /dev/null
+++ b/view/theme/redbasic/tpl/email_notify_text.tpl
@@ -0,0 +1,13 @@
+{{$preamble}}
+	
+{{$title}}
+
+{{$textversion}}
+				
+{{$tsitelink}}
+
+{{$titemlink}}
+
+{{$thanks}}
+{{$site_admin}}
+
diff --git a/view/theme/redbasic/tpl/event.tpl b/view/theme/redbasic/tpl/event.tpl
new file mode 100755
index 000000000..cc0bfc1c7
--- /dev/null
+++ b/view/theme/redbasic/tpl/event.tpl
@@ -0,0 +1,16 @@
+{{foreach $events as $event}}
+	<div class="event-wrapper">
+		<div class="event">
+			<div class="event-owner">
+				{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}}
+			</div>
+			{{$event.html}}
+			<div class="event-buttons">
+				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="fa fa-external-link btn btn-outline-secondary" ></i></a>{{/if}}
+				{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>{{/if}}
+				{{if $event.drop}}<a href="{{$event.drop.0}}" title="{{$event.drop.1}}" class="drop-event-link"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>{{/if}}
+			</div>
+			<div class="clear"></div>
+		</div>
+	</div>
+{{/foreach}}
diff --git a/view/theme/redbasic/tpl/event_cal.tpl b/view/theme/redbasic/tpl/event_cal.tpl
new file mode 100755
index 000000000..d7662786b
--- /dev/null
+++ b/view/theme/redbasic/tpl/event_cal.tpl
@@ -0,0 +1,14 @@
+{{foreach $events as $event}}
+	<div class="event-wrapper">
+		<div class="event">
+			<div class="event-owner">
+				{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}}
+			</div>
+			{{$event.html}}
+			<div class="event-buttons">
+				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="fa fa-external-link btn btn-outline-secondary" ></i></a>{{/if}}
+			</div>
+			<div class="clear"></div>
+		</div>
+	</div>
+{{/foreach}}
diff --git a/view/theme/redbasic/tpl/event_form.tpl b/view/theme/redbasic/tpl/event_form.tpl
new file mode 100755
index 000000000..d07a06b67
--- /dev/null
+++ b/view/theme/redbasic/tpl/event_form.tpl
@@ -0,0 +1,130 @@
+<form id="event-edit-form" action="{{$post}}" method="post" class="acl-form" data-form_id="event-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+
+	<input type="hidden" name="event_id" value="{{$eid}}" />
+	<input type="hidden" name="event_hash" value="{{$event_hash}}" />
+	<input type="hidden" name="xchan" value="{{$xchan}}" />
+	<input type="hidden" name="mid" value="{{$mid}}" />
+	<input type="hidden" name="type" value="{{$type}}" />
+	<input type="hidden" name="preview" id="event-edit-preview" value="0" />
+
+
+	{{include file="field_input.tpl" field=$summary}}
+
+	{{if $tz_choose}}
+	{{include file="field_select_grouped.tpl" field=$timezone}}
+	{{/if}}
+
+	{{$s_dsel}}
+
+	{{$f_dsel}}
+
+	{{include file="field_checkbox.tpl" field=$nofinish}}
+
+	<div id="advanced" style="display:none">
+
+		{{include file="field_checkbox.tpl" field=$adjust}}
+
+		{{if $catsenabled}}
+		<div id="event-category-text"><b>{{$c_text}}</b></div>
+		<div id="events-category-wrap">
+			<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput" />
+		</div>
+		{{/if}}
+
+		<div class="form-group">
+			<div class="form-group">
+				<div id="event-desc-text"><b>{{$d_text}}</b></div>
+				<textarea id="comment-edit-text-desc" class="form-control" name="desc" >{{$d_orig}}</textarea>
+			</div>
+			<div id="comment-tools-desc" class="comment-tools" style="display: block;" >
+				<div id="comment-edit-bb-desc" class="btn-toolbar">
+					<div class='btn-group mr-2'>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'desc');">
+							<i class="fa fa-bold comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'desc');">
+							<i class="fa fa-italic comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'desc');">
+							<i class="fa fa-underline comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('none','quote','desc');">
+							<i class="fa fa-quote-left comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'desc');">
+							<i class="fa fa-terminal comment-icon"></i>
+						</button>
+					</div>
+					<div class='btn-group'>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'desc');">
+							<i class="fa fa-camera comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'desc');">
+							<i class="fa fa-link comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'desc');">
+							<i class="fa fa-video-camera comment-icon"></i>
+						</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="form-group">
+				<div id="event-location-text"><b>{{$l_text}}</b></div>
+				<textarea id="comment-edit-text-loc" class="form-control" name="location">{{$l_orig}}</textarea>
+			</div>
+			<div id="comment-tools-loc" class="comment-tools" style="display: block;" >
+				<div id="comment-edit-bb-loc" class="btn-toolbar">
+					<div class='btn-group mr-2'>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'loc');">
+							<i class="fa fa-bold comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'loc');">
+							<i class="fa fa-italic comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'loc');">
+							<i class="fa fa-underline comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('none','quote','loc');">
+							<i class="fa fa-quote-left comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'loc');">
+							<i class="fa fa-terminal comment-icon"></i>
+						</button>
+					</div>
+					<div class='btn-group'>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'loc');">
+							<i class="fa fa-camera comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'loc');">
+							<i class="fa fa-link comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'loc');">
+							<i class="fa fa-video-camera comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$mapper}}" onclick="insertbbcomment('none','map','loc');">
+							<i class="fa fa-globe comment-icon"></i>
+						</button>
+					</div>
+
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="clear"></div>
+
+	<button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('advanced');">{{$advanced}}</button>
+	<div class="btn-group float-right">
+		<button id="event-edit-preview-btn" class="btn btn-outline-secondary btn-sm" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button>
+		{{if ! $eid}}
+		<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button>
+		{{/if}}
+		<button id="event-submit" class="btn btn-primary btn-sm" type="submit" name="submit">{{$submit}}</button>
+	</div>
+</form>
+
+{{if ! $eid}}
+	{{$acl}}
+{{/if}}
diff --git a/view/theme/redbasic/tpl/event_head.tpl b/view/theme/redbasic/tpl/event_head.tpl
new file mode 100755
index 000000000..3b2cb5041
--- /dev/null
+++ b/view/theme/redbasic/tpl/event_head.tpl
@@ -0,0 +1,160 @@
+<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
+<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
+<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/locale-all.js"></script>
+
+<script>
+	function showEvent(eventid) {
+		$.get(
+			'{{$baseurl}}{{$module_url}}/?id='+eventid,
+			function(data){
+				$.colorbox({ scrolling: false, html: data, onComplete: function() { $.colorbox.resize(); }});
+			}
+		);			
+	}
+	
+	function doEventPreview() {
+		$('#event-edit-preview').val(1);
+		$.post('events',$('#event-edit-form').serialize(), function(data) {
+			$.colorbox({ html: data });
+		});
+		$('#event-edit-preview').val(0);
+	}
+
+	function exportDate() {
+		var moment = $('#events-calendar').fullCalendar('getDate');
+		var sT = 'events/' + moment.year() + '/' + (moment.month() + 1) + '/export';
+		window.location.href=sT;
+	}
+	
+	function changeView(action, viewName) {
+		$('#events-calendar').fullCalendar(action, viewName);
+		var view = $('#events-calendar').fullCalendar('getView');
+
+		if(view.type !== 'month' && !$('main').hasClass('fullscreen')) {
+			$('#events-calendar').fullCalendar('option', 'height', 'auto');
+		}
+		else {
+			$('#events-calendar').fullCalendar('option', 'height', '');
+		}
+
+		if($('main').hasClass('fullscreen')) {
+			$('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
+		}
+
+		$('#title').text(view.title);
+	}
+
+
+	$(document).ready(function() {
+		$('#events-calendar').fullCalendar({
+			events: '{{$baseurl}}{{$module_url}}/json',
+			header: false,
+			eventTextColor: 'white',
+			lang: '{{$lang}}',
+			firstDay: {{$first_day}},
+
+			eventLimit: 3,
+
+			monthNames: aStr['monthNames'],
+			monthNamesShort: aStr['monthNamesShort'],
+			dayNames: aStr['dayNames'],
+			dayNamesShort: aStr['dayNamesShort'],
+
+			allDayText: aStr['allday'],
+			timeFormat: 'HH:mm',
+			eventClick: function(calEvent, jsEvent, view) {
+				showEvent(calEvent.id);
+			},
+			loading: function(isLoading, view) {
+				$('#events-spinner').spin('tiny');
+				$('#events-spinner > i').css('color', 'transparent');
+				if(!isLoading) {
+					$('#events-spinner').spin(false);
+					$('#events-spinner > i').css('color', '');
+					$('td.fc-day').dblclick(function() {
+						openMenu('form');
+						//window.location.href='/events/new?start='+$(this).data('date');
+					});
+				}
+			},
+
+			eventRender: function(event, element, view) {
+
+				//console.log(view.name);
+				if (event.item['author']['xchan_name']==null) return;
+
+				switch(view.name){
+					case "month":
+					element.find(".fc-title").html(
+						"<img src='{0}' style='height:12px;width:12px;' title='{1}'>&nbsp;<span title='{3}{4}'>{2}</span>".format(
+							event.item['author']['xchan_photo_s'],
+							event.item['author']['xchan_name'],
+							event.title,
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
+					));
+					break;
+					case "agendaWeek":
+					element.find(".fc-title").html(
+						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
+							event.item['author']['xchan_photo_s'],
+							event.item['author']['xchan_name'],
+							event.title,
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
+					));
+					break;
+					case "agendaDay":
+					element.find(".fc-title").html(
+						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
+							event.item['author']['xchan_photo_s'],
+							event.item['author']['xchan_name'],
+							event.title,
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
+					));
+					break;
+				}
+			}
+			
+		});
+		
+		// center on date
+		// @fixme does not work for cal/$nick module_url
+		var args=location.href.replace(baseurl,"").split("/");
+		{{if $modparams == 2}}
+		if (args.length>=5) {
+			$("#events-calendar").fullCalendar('gotoDate',args[3] , args[4]-1);
+		}
+		{{else}}
+		if (args.length>=4) {
+			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
+		}
+		{{/if}} 
+		
+		// show event popup
+		var hash = location.hash.split("-")
+		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
+		
+		// echo the title
+		var view = $('#events-calendar').fullCalendar('getView');
+		$('#title').text(view.title);
+
+		// shift the finish time date on start time date change automagically
+		var origsval = $('#id_start_text').val();
+		$('#id_start_text').change(function() {
+			var origfval = $('#id_finish_text').val();
+			if(origfval) {
+				var sval = $('#id_start_text').val();
+				var diff = moment(sval).diff(origsval);
+				var fval = moment(origfval).add(diff, 'millisecond').format("YYYY-MM-DD HH:mm");
+				$('#id_finish_text').val(fval);
+				origsval = sval;
+			}
+		});
+
+	});
+
+</script>
+
diff --git a/view/theme/redbasic/tpl/event_item_content.tpl b/view/theme/redbasic/tpl/event_item_content.tpl
new file mode 100644
index 000000000..76e0f4616
--- /dev/null
+++ b/view/theme/redbasic/tpl/event_item_content.tpl
@@ -0,0 +1,10 @@
+{{if $description}}
+<div class="event-item-description">
+	{{$description}}
+</div>
+{{/if}}
+{{if $location}}
+<div class="event-item-location">
+	<span class="event-item-label">{{$location_label}}</span>&nbsp;<span class="event-item-location">{{$location}}</span>
+</div>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/event_item_header.tpl b/view/theme/redbasic/tpl/event_item_header.tpl
new file mode 100755
index 000000000..6247aaf6f
--- /dev/null
+++ b/view/theme/redbasic/tpl/event_item_header.tpl
@@ -0,0 +1,11 @@
+<div class="event-item-title">
+	<h3><i class="fa fa-calendar"></i>&nbsp;{{$title}}</h3>
+</div>
+<div class="event-item-start">
+	<span class="event-item-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
+</div>
+{{if $finish}}
+<div class="event-item-start">
+	<span class="event-item-label">{{$dtend_label}}</span>&nbsp;<span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
+</div>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/events-js.tpl b/view/theme/redbasic/tpl/events-js.tpl
new file mode 100755
index 000000000..9d32c76be
--- /dev/null
+++ b/view/theme/redbasic/tpl/events-js.tpl
@@ -0,0 +1,31 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<div class="dropdown">
+				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i>&nbsp;{{$view_label}}</button>
+				<div class="dropdown-menu">
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a>
+				</div>
+				<button class="btn btn-success btn-sm" onclick="openClose('form');">{{$new_event.1}}</button>
+				<div class="btn-group">
+					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
+					<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
+				</div>
+				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+				<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+			</div>
+		</div>
+		<h2 id="title"></h2>
+		<div class="clear"></div>
+	</div>
+	<div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}>
+		{{$form}}
+	</div>
+	<div class="clear"></div>
+	<div class="section-content-wrapper-np">
+		<div id="events-calendar"></div>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/events_cal-js.tpl b/view/theme/redbasic/tpl/events_cal-js.tpl
new file mode 100755
index 000000000..ba9e16dd6
--- /dev/null
+++ b/view/theme/redbasic/tpl/events_cal-js.tpl
@@ -0,0 +1,20 @@
+{{$tabs}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<div class="btn-group">
+				<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
+				<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+				<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
+			</div>
+			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+		</div>
+		<h2 id="title"></h2>
+		<div class="clear"></div>
+	</div>
+	<div class="clear"></div>
+	<div class="section-content-wrapper-np">
+		<div id="events-calendar"></div>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/events_menu_side.tpl b/view/theme/redbasic/tpl/events_menu_side.tpl
new file mode 100755
index 000000000..b9a9062b1
--- /dev/null
+++ b/view/theme/redbasic/tpl/events_menu_side.tpl
@@ -0,0 +1,8 @@
+<div class="widget">
+	<h3>{{$title}}</h3>
+	<ul class="nav nav-pills nav-stacked">
+		<li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
+		<li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
+		<li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
+	</ul>
+</div>
diff --git a/view/theme/redbasic/tpl/events_reminder.tpl b/view/theme/redbasic/tpl/events_reminder.tpl
new file mode 100755
index 000000000..fd6a1a5c7
--- /dev/null
+++ b/view/theme/redbasic/tpl/events_reminder.tpl
@@ -0,0 +1,10 @@
+{{if $count}}
+<div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div>
+<div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title}}</div>
+<div id="event-title-end"></div>
+{{foreach $events as $event}}
+<div class="event-list" id="event-{{$event.id}}"></a> <a href="events/{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
+{{/foreach}}
+</div>
+{{/if}}
+
diff --git a/view/theme/redbasic/tpl/events_tools_side.tpl b/view/theme/redbasic/tpl/events_tools_side.tpl
new file mode 100755
index 000000000..e22f95c1e
--- /dev/null
+++ b/view/theme/redbasic/tpl/events_tools_side.tpl
@@ -0,0 +1,17 @@
+<div class="widget">
+	<h3>{{$title}}</h3>
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item"><a class="nav-link" href="#" onclick="exportDate(); return false;"><i class="fa fa-arrow-circle-o-down"></i>&nbsp;{{$export}}</a></li>
+		<li class="nav-item"><a class="nav-link" href="#" onclick="openClose('event-upload-form'); return false;"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$import}}</a></li>
+	</ul>
+	<div id="event-upload-form" class="sub-menu-wrapper">
+		<div class="sub-menu">
+			<form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
+				<div class="form-group">
+					<input id="event-upload-choose" class="form-control-file w-100" type="file" name="userfile" />
+				</div>
+				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
+			</form>
+		</div>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/failed_updates.tpl b/view/theme/redbasic/tpl/failed_updates.tpl
new file mode 100755
index 000000000..f53f1f478
--- /dev/null
+++ b/view/theme/redbasic/tpl/failed_updates.tpl
@@ -0,0 +1,18 @@
+<div class="generic-content-wrapper-styled">
+<h2>{{$banner}}</h2>
+
+<div id="failed_updates_desc">{{$desc}}</div>
+
+{{if $failed}}
+{{foreach $failed as $f}}
+
+<h4>{{$f}}</h4>
+<ul>
+<li><a href="{{$base}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li>
+<li><a href="{{$base}}/admin/dbsync/{{$f}}">{{$apply}}</a></li>
+</ul>
+
+<hr />
+{{/foreach}}
+{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/field.tpl b/view/theme/redbasic/tpl/field.tpl
new file mode 100755
index 000000000..942cfcef5
--- /dev/null
+++ b/view/theme/redbasic/tpl/field.tpl
@@ -0,0 +1,3 @@
+ {{if $field.0==select}}
+ {{include file="field_select.tpl"}}
+ {{/if}}
diff --git a/view/theme/redbasic/tpl/field_acheckbox.tpl b/view/theme/redbasic/tpl/field_acheckbox.tpl
new file mode 100755
index 000000000..c87b9ac79
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_acheckbox.tpl
@@ -0,0 +1,23 @@
+<tr class="highlight">
+	<td>
+		<label class="mainlabel" for='me_id_{{$field.0}}'>{{$field.1}}</label><br>
+		<span class='field_abook_help'>{{$field.6}}</span>
+	</td>
+	{{if $notself}}
+	<td class="abook-them">
+		{{if $field.2}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}}
+	</td>
+	{{/if}}
+	<td class="abook-me">
+		{{if $self || !$field.5 || $twocol }}
+		<input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />
+		{{/if}}
+		{{if $notself && $field.5}}
+		<input type="hidden" name='{{$field.0}}' value="{{if $field.7}}1{{else}}0{{/if}}" />
+		{{if $field.3}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}}
+		{{/if}}
+	</td>
+	<td>
+		{{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="fa fa-check-square-o"></i>{{else}} <i class="fa fa-square-o"></i>{{/if}}{{/if}}</span>{{/if}}
+	</td>
+</tr>
diff --git a/view/theme/redbasic/tpl/field_checkbox.tpl b/view/theme/redbasic/tpl/field_checkbox.tpl
new file mode 100755
index 000000000..f779f937c
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_checkbox.tpl
@@ -0,0 +1,5 @@
+	<div id="{{$field.0}}_container" class="clearfix form-group checkbox">
+		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<div class="float-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div>
+		<small class="form-text text-muted">{{$field.3}}</small>
+	</div>
diff --git a/view/theme/redbasic/tpl/field_colorinput.tpl b/view/theme/redbasic/tpl/field_colorinput.tpl
new file mode 100644
index 000000000..9b6f33462
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_colorinput.tpl
@@ -0,0 +1,6 @@
+	<div class='form-group field input color'>
+		<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
+		<input class='form-control color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
+		<span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span>
+		<div id='end_{{$field.0}}' class='field_end'></div>
+	</div>
diff --git a/view/theme/redbasic/tpl/field_combobox.tpl b/view/theme/redbasic/tpl/field_combobox.tpl
new file mode 100755
index 000000000..12d00a08d
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_combobox.tpl
@@ -0,0 +1,18 @@
+<div class="form-group">
+	<label class="" for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label>
+	<input class="form-control" id="id_{{$field.0}}" type="text" list="data_{{$field.0}}"{{if $field.5}} {{$field.5}}{{/if}}>
+	<datalist id="data_{{$field.0}}" >
+		{{foreach $field.4 as $opt=>$val}}
+		<option value="{{$val}}">
+		{{/foreach}}
+	</datalist>
+	{{**
+	<input id="id_{{$field.0}}" class="form-control" type="text" value="{{$field.2}}">
+	<select id="select_{{$field.0}}" class="form-control" onChange="$('#id_{{$field.0}}').val($(this).val())">
+		<option value="">{{$field.5}}</option>
+		{{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
+	</select>
+	**}} 
+	<span class='field_help'>{{$field.3}}</span>
+</div>
+
diff --git a/view/theme/redbasic/tpl/field_custom.tpl b/view/theme/redbasic/tpl/field_custom.tpl
new file mode 100755
index 000000000..907b4c50e
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_custom.tpl
@@ -0,0 +1,5 @@
+	<div class='form-group field custom'>
+		<label for='{{$field.0}}'>{{$field.1}}</label>
+		{{$field.2}}
+		<span class='help-block'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/redbasic/tpl/field_input.tpl b/view/theme/redbasic/tpl/field_input.tpl
new file mode 100755
index 000000000..65a837e5f
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_input.tpl
@@ -0,0 +1,5 @@
+	<div id="id_{{$field.0}}_wrapper" class="form-group">
+		<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
+		<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>
+		<small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small>
+	</div>
diff --git a/view/theme/redbasic/tpl/field_intcheckbox.tpl b/view/theme/redbasic/tpl/field_intcheckbox.tpl
new file mode 100755
index 000000000..abfe6e189
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_intcheckbox.tpl
@@ -0,0 +1,5 @@
+	<div class="clearfix form-group checkbox">
+		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<div class="pull-right"><input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for="id_{{$field.0}}"> <span class="onoffswitch-inner" data-on="{{if $field.5}}{{$field.5.1}}{{/if}}" data-off="{{if $field.5}}{{$field.5.0}}{{/if}}"></span><span class="onoffswitch-switch"></span> </label></div>
+		<small class="form-text text-muted">{{$field.4}}</small>
+	</div>
diff --git a/view/theme/redbasic/tpl/field_password.tpl b/view/theme/redbasic/tpl/field_password.tpl
new file mode 100755
index 000000000..fa5e14582
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_password.tpl
@@ -0,0 +1,5 @@
+	<div class="form-group">
+		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<input class="form-control" type="password" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
+		<small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small>
+	</div>
diff --git a/view/theme/redbasic/tpl/field_radio.tpl b/view/theme/redbasic/tpl/field_radio.tpl
new file mode 100755
index 000000000..6b5f52de6
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_radio.tpl
@@ -0,0 +1,8 @@
+	<div class="form-group field radio">
+		<label for='id_{{$field.0}}_{{$field.2}}'>
+			<input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}>
+			{{$field.1}}
+		</label>
+		<span class='help-block'>{{$field.3}}</span>
+	</div>
+	<div class="clear"></div>
diff --git a/view/theme/redbasic/tpl/field_richtext.tpl b/view/theme/redbasic/tpl/field_richtext.tpl
new file mode 100755
index 000000000..378e02a62
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_richtext.tpl
@@ -0,0 +1,5 @@
+	<div class='field richtext'>
+		<label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
+		<textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext">{{$field.2}}</textarea>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/redbasic/tpl/field_select.tpl b/view/theme/redbasic/tpl/field_select.tpl
new file mode 100755
index 000000000..cda9a823a
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_select.tpl
@@ -0,0 +1,7 @@
+	<div class="form-group">
+		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}">
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<small class="form-text text-muted">{{$field.3}}</small>
+	</div>
diff --git a/view/theme/redbasic/tpl/field_select_disabled.tpl b/view/theme/redbasic/tpl/field_select_disabled.tpl
new file mode 100644
index 000000000..ee5e1508f
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_select_disabled.tpl
@@ -0,0 +1,7 @@
+	<div class='form-group field select'>
+		<label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select class="form-control" disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'>
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<span class='help-block'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/redbasic/tpl/field_select_grouped.tpl b/view/theme/redbasic/tpl/field_select_grouped.tpl
new file mode 100644
index 000000000..e6d1479de
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_select_grouped.tpl
@@ -0,0 +1,12 @@
+	<div class='form-group field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'>
+			{{foreach $field.4 as $group=>$opts}}
+				<optgroup label='{{$group}}'>
+				{{foreach $opts as $opt=>$val}}
+					<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+				{{/foreach}}
+				</optgroup>
+		</select>
+		<span class='help-block'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/redbasic/tpl/field_select_raw.tpl b/view/theme/redbasic/tpl/field_select_raw.tpl
new file mode 100755
index 000000000..2780df58c
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_select_raw.tpl
@@ -0,0 +1,7 @@
+	<div class='form-group field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'>
+			{{$field.4}}
+		</select>
+		<span class='help-block'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/redbasic/tpl/field_textarea.tpl b/view/theme/redbasic/tpl/field_textarea.tpl
new file mode 100755
index 000000000..437dece93
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_textarea.tpl
@@ -0,0 +1,5 @@
+	<div class="form-group">
+		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<textarea class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea>
+		<small class="form-text text-muted">{{$field.3}}</small>
+	</div>
diff --git a/view/theme/redbasic/tpl/field_themeselect.tpl b/view/theme/redbasic/tpl/field_themeselect.tpl
new file mode 100755
index 000000000..7a529774c
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_themeselect.tpl
@@ -0,0 +1,13 @@
+	{{if $field.5 == 'preview'}}
+		<script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script>
+	{{/if}}
+	<div class='form-group field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5 == 'preview'}}onchange="previewTheme(this);"{{/if}} >
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<span class='field_help'>{{$field.3}}</span>
+		{{if $field.5=='preview'}}
+			<div id="theme-preview"></div>
+		{{/if}}
+	</div>
diff --git a/view/theme/redbasic/tpl/field_yesno.tpl b/view/theme/redbasic/tpl/field_yesno.tpl
new file mode 100755
index 000000000..8a4cda55b
--- /dev/null
+++ b/view/theme/redbasic/tpl/field_yesno.tpl
@@ -0,0 +1,13 @@
+	<div class='clearfix form-group'>
+		<label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
+		<div class='onoff' id="id_{{$field.0}}_onoff">
+			<input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+			<a href="#" class='off'>
+				{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
+			</a>
+			<a href="#" class='on'>
+				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
+			</a>
+		</div>
+		<small class='form-text text-muted'>{{$field.3}}</small>
+	</div>
diff --git a/view/theme/redbasic/tpl/fileas_widget.tpl b/view/theme/redbasic/tpl/fileas_widget.tpl
new file mode 100755
index 000000000..a6a69b89c
--- /dev/null
+++ b/view/theme/redbasic/tpl/fileas_widget.tpl
@@ -0,0 +1,12 @@
+<div id="fileas-sidebar" class="widget">
+	<h3>{{$title}}</h3>
+	<div id="nets-desc">{{$desc}}</div>
+	
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item"><a class="nav-link{{if $sel_all}} active{{/if}}" href="{{$base}}">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+		<li class="nav-item"><a class="nav-link{{if $term.selected}} active{{/if}}" href="{{$base}}?f=&file={{$term.name}}">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/redbasic/tpl/filebrowser.tpl b/view/theme/redbasic/tpl/filebrowser.tpl
new file mode 100755
index 000000000..787f7c0cd
--- /dev/null
+++ b/view/theme/redbasic/tpl/filebrowser.tpl
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html>
+	<head>
+	<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
+	<style>
+		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
+		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
+		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
+		.filebrowser ul{ list-style-type: none; padding:0px; }
+		.filebrowser.folders a { display: block; padding: 0.3em }
+		.filebrowser.folders a:hover { background-color: #f0f0ee; }
+		.filebrowser.files.image { overflow: auto; height: auto; }
+		.filebrowser.files.image img { height:50px;}
+		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
+		.filebrowser.files.image span { display: none;}
+		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
+		.filebrowser.files a { display: block;  padding: 0.3em}
+		.filebrowser.files a:hover { background-color: #f0f0ee; }
+		.filebrowser a { text-decoration: none; }
+	</style>
+	<script>
+		var FileBrowserDialogue = {
+			init : function () {
+				// Here goes your code for setting your custom things onLoad.
+			},
+			mySubmit : function (URL) {
+				//var URL = document.my_form.my_field.value;
+				var win = tinyMCEPopup.getWindowArg("window");
+
+				// insert information now
+				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
+
+				// are we an image browser
+				if (typeof(win.ImageDialog) != "undefined") {
+					// we are, so update image dimensions...
+					if (win.ImageDialog.getImageData)
+						win.ImageDialog.getImageData();
+
+					// ... and preview if necessary
+					if (win.ImageDialog.showPreviewImage)
+						win.ImageDialog.showPreviewImage(URL);
+				}
+
+				// close popup window
+				tinyMCEPopup.close();
+			}
+		}
+
+		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
+	</script>
+	</head>
+	<body>
+	
+	<div class="tabs">
+		<ul >
+			<li class="current"><span>FileBrowser</span></li>
+		</ul>
+	</div>
+	<div class="panel_wrapper">
+
+		<div id="general_panel" class="panel current">
+			<div class="filebrowser path">
+				{{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
+			</div>
+			<div class="filebrowser folders">
+				<ul>
+					{{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
+				</ul>
+			</div>
+			<div class="filebrowser files {{$type}}">
+				<ul>
+				{{foreach $files as $f}}
+					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
+				{{/foreach}}
+				</ul>
+			</div>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
+	</div>	
+	</body>
+	
+</html>
diff --git a/view/theme/redbasic/tpl/filer_dialog.tpl b/view/theme/redbasic/tpl/filer_dialog.tpl
new file mode 100755
index 000000000..61860d10f
--- /dev/null
+++ b/view/theme/redbasic/tpl/filer_dialog.tpl
@@ -0,0 +1,19 @@
+<div class="modal" id="item-filer-dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">{{$title}}</h4>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        {{include file="field_combobox.tpl"}}
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">{{$cancel}}</button>
+        <button id="filer_save" type="button" class="btn btn-primary">{{$submit}}</button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/view/theme/redbasic/tpl/follow.tpl b/view/theme/redbasic/tpl/follow.tpl
new file mode 100755
index 000000000..4def1415d
--- /dev/null
+++ b/view/theme/redbasic/tpl/follow.tpl
@@ -0,0 +1,14 @@
+<div id="follow-sidebar" class="widget">
+	<h3>{{$connect}}</h3>
+	<form action="follow" method="post" />
+		<div class="input-group">
+			<input class="form-control form-control-sm" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
+			<div class="input-group-btn">
+				<button class="btn btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
+			</div>
+		</div>
+	</form>
+	{{if $abook_usage_message}}
+	<div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div>
+	{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/force_image_reload.tpl b/view/theme/redbasic/tpl/force_image_reload.tpl
new file mode 100644
index 000000000..839bd22b5
--- /dev/null
+++ b/view/theme/redbasic/tpl/force_image_reload.tpl
@@ -0,0 +1,72 @@
+{{* 
+Force the browser to reload an image from the server instead of the cache.
+based on an answer from http://stackoverflow.com/a/22429796/3343347
+
+Usage: Set $imgUrl to the src url you want to be re-fetched from the server
+
+*}}
+
+<script>
+  $(document).ready(
+    function() {
+      forceImgReload("{{$imgUrl}}");
+    }
+  );
+
+  {{* 
+    * find and return any existing img tags with a matching src url, and set them to an intermediate 
+    * src url so they can later be reverted back once the cached version has been updated.
+    *}}
+  function prepareImagesForReload(srcUrl) {
+
+    var result = $("img[src='" + srcUrl + "']").get();
+
+    for (i = 0; i < result.length; i++) {
+      {{* 
+        * Set the image to a reloading image, in this case an animated "reloading" svg 
+        * Ideally this wont be displayed long enough to matter.
+        *}}
+      result[i].src = "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100' preserveAspectRatio='xMidYMid' class='uil-reload'%3E%3Cpath fill='none' class='bk' d='M0 0h100v100H0z'/%3E%3Cg%3E%3Cpath d='M50 15a35 35 0 1 0 24.787 10.213' fill='none' stroke='%23777' stroke-width='12'/%3E%3Cpath d='M50 0v30l16-15L50 0' fill='%23777'/%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 50 50' to='360 50 50' dur='1s' repeatCount='indefinite'/%3E%3C/g%3E%3C/svg%3E";
+    }
+
+    return result;
+  }
+
+  function restoreImages(srcUrl, imgList) {
+
+    for (i = 0; i < imgList.length; i++) {
+      imgList[i].src = srcUrl;
+    }
+  }
+
+  function forceImgReload(srcUrl) {
+    var imgList;
+    var step = 0; 
+    var iframe = window.document.createElement("iframe");   // Hidden iframe, in which to perform the load+reload.
+  
+    {{* Callback function, called after iframe load+reload completes (or fails).
+        Will be called TWICE unless twostage-mode process is cancelled. (Once after load, once after reload). *}}
+    var iframeLoadCallback = function(e) { 
+
+      if (step === 0) { 
+        // initial load just completed.  Note that it doesn't actually matter if this load succeeded or not.
+      
+        step = 1; 
+        imgList = prepareImagesForReload(srcUrl); 
+        iframe.contentWindow.location.reload(true); // initiate forced-reload!
+      
+      } else if (step === 1) {
+        // forced re-load is done 
+
+        restoreImages(srcUrl, imgList);
+        if (iframe.parentNode) iframe.parentNode.removeChild(iframe);
+      }
+    }
+
+    iframe.style.display = "none";
+    window.parent.document.body.appendChild(iframe); {{* NOTE: if this is done AFTER setting src, Firefox MAY fail to fire the load event! *}}
+    iframe.addEventListener("load",  iframeLoadCallback, false);
+    iframe.addEventListener("error", iframeLoadCallback, false);
+    iframe.src = srcUrl;  
+  }
+</script>
diff --git a/view/theme/redbasic/tpl/generic_addon_settings.tpl b/view/theme/redbasic/tpl/generic_addon_settings.tpl
new file mode 100644
index 000000000..bf39b2aea
--- /dev/null
+++ b/view/theme/redbasic/tpl/generic_addon_settings.tpl
@@ -0,0 +1,19 @@
+<div class="panel">
+	<div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings">
+		<h3>
+			<a title="{{$addon.2}}" data-toggle="collapse" data-parent="#settings" href="#{{$addon.0}}-settings-content" aria-controls="{{$addon.0}}-settings-content">
+				{{$addon.1}}
+			</a>
+		</h3>
+	</div>
+	<div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings">
+		<div class="section-content-tools-wrapper">
+			{{$content}}
+			{{if $addon.0}}
+			<div class="settings-submit-wrapper" >
+				<button id="{{$addon.0}}-submit" type="submit" name="{{$addon.0}}-submit" class="btn btn-primary" value="{{$addon.3}}">{{$addon.3}}</button>
+			</div>
+			{{/if}}
+		</div>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/generic_links_widget.tpl b/view/theme/redbasic/tpl/generic_links_widget.tpl
new file mode 100755
index 000000000..67801e666
--- /dev/null
+++ b/view/theme/redbasic/tpl/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div class="widget{{if $class}} {{$class}}{{/if}}">
+	{{if $title}}<h3>{{$title}}</h3>{{/if}}
+	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
+	
+	<ul class="nav nav-pills flex-column">
+		{{foreach $items as $item}}
+		<li class="nav-item"><a href="{{$item.url}}" class="nav-link{{if $item.selected}} active{{/if}}">{{$item.label}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/redbasic/tpl/generic_modal.tpl b/view/theme/redbasic/tpl/generic_modal.tpl
new file mode 100644
index 000000000..18279b6f7
--- /dev/null
+++ b/view/theme/redbasic/tpl/generic_modal.tpl
@@ -0,0 +1,17 @@
+<div class="modal" id="generic-modal-{{$id}}" tabindex="-1" role="dialog" aria-labelledby="generic-modal-{{$id}}" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title" id="generic-modal-title-{{$id}}">{{$title}}</h4>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+      </div>
+      <div class="modal-body" id="generic-modal-body-{{$id}}"></div>
+      <div class="modal-footer">
+        <button id="generic-modal-cancel-{{$id}}" type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$cancel}}</button>
+	{{if $ok}}
+        <button id="generic-modal-ok-{{$id}}" type="button" class="btn btn-primary">{{$ok}}</button>
+	{{/if}}
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
diff --git a/view/theme/redbasic/tpl/group_drop.tpl b/view/theme/redbasic/tpl/group_drop.tpl
new file mode 100755
index 000000000..627debc80
--- /dev/null
+++ b/view/theme/redbasic/tpl/group_drop.tpl
@@ -0,0 +1,7 @@
+<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
+	<a href="group/drop/{{$id}}?t={{$form_security_token}}" 
+		onclick="return confirmDelete();" 
+		id="group-delete-icon-{{$id}}" 
+		class="group-delete-icon btn btn-outline-secondary" title="{{$delete}}" ><i class="fa fa-trash-o drop-icons"></i></a>
+</div>
+<div class="group-delete-end"></div>
diff --git a/view/theme/redbasic/tpl/group_edit.tpl b/view/theme/redbasic/tpl/group_edit.tpl
new file mode 100755
index 000000000..d9412a6f7
--- /dev/null
+++ b/view/theme/redbasic/tpl/group_edit.tpl
@@ -0,0 +1,26 @@
+<div class="generic-content-wrapper-styled">
+<h2>{{$title}}</h2>
+
+
+<div id="group-edit-wrapper" >
+	<form action="group/{{$gid}}" id="group-edit-form" method="post" >
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		{{include file="field_input.tpl" field=$gname}}
+		{{include file="field_checkbox.tpl" field=$public}}
+		{{if $drop}}{{$drop}}{{/if}}
+		<div id="group-edit-submit-wrapper" >
+			<input type="submit" name="submit" value="{{$submit}}" >
+		</div>
+		<div id="group-edit-select-end" ></div>
+	</form>
+</div>
+
+
+{{if $groupeditor}}
+	<div id="group-update-wrapper">
+		{{include file="groupeditor.tpl"}}
+	</div>
+{{/if}}
+{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/group_selection.tpl b/view/theme/redbasic/tpl/group_selection.tpl
new file mode 100755
index 000000000..270d2aa79
--- /dev/null
+++ b/view/theme/redbasic/tpl/group_selection.tpl
@@ -0,0 +1,8 @@
+<div class="form-group field custom">
+<label for="group-selection" id="group-selection-lbl">{{$label}}</label>
+<select class="form-control" name="group-selection" id="group-selection" >
+{{foreach $groups as $group}}
+<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option>
+{{/foreach}}
+</select>
+</div>
diff --git a/view/theme/redbasic/tpl/group_side.tpl b/view/theme/redbasic/tpl/group_side.tpl
new file mode 100755
index 000000000..14f714ae9
--- /dev/null
+++ b/view/theme/redbasic/tpl/group_side.tpl
@@ -0,0 +1,26 @@
+<div class="widget" id="group-sidebar">
+	<h3>{{$title}}</h3>
+	<div>
+		<ul class="nav nav-pills flex-column">
+			{{foreach $groups as $group}}
+			<li class="nav-item nav-item-hack">
+				{{if $group.cid}}
+				<i id="group-{{$group.id}}" class="widget-nav-pills-checkbox fa fa-fw {{if $group.ismember}}fa-check-square-o{{else}}fa-square-o{{/if}}" onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}'); return true;"></i>
+				{{/if}}
+				{{if $group.edit}}
+				<a href="{{$group.edit.href}}" class="nav-link{{if $group.selected}} active{{/if}} widget-nav-pills-icons" title="{{$edittext}}"><i class="fa fa-fw fa-pencil"></i></a>
+				{{/if}}
+				<a class="nav-link{{if $group.selected}} active{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
+			</li>
+			{{/foreach}}
+			<li class="nav-item">
+				<a class="nav-link" href="group/new" title="{{$createtext}}" ><i class="fa fa-plus-circle"></i> {{$createtext}}</a>
+			</li>
+		</ul>
+
+	</div>
+</div>
+
+
+
+
diff --git a/view/theme/redbasic/tpl/groupeditor.tpl b/view/theme/redbasic/tpl/groupeditor.tpl
new file mode 100755
index 000000000..c79bb0a2a
--- /dev/null
+++ b/view/theme/redbasic/tpl/groupeditor.tpl
@@ -0,0 +1,16 @@
+<div id="group">
+<h3>{{$groupeditor.label_members}}</h3>
+<div id="group-members" class="contact_list">
+{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
+</div>
+<div id="group-members-end"></div>
+<hr id="group-separator" />
+</div>
+
+<div id="contacts">
+<h3>{{$groupeditor.label_contacts}}</h3>
+<div id="group-all-contacts" class="contact_list">
+{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
+</div>
+<div id="group-all-contacts-end"></div>
+</div>
diff --git a/view/theme/redbasic/tpl/hdr.tpl b/view/theme/redbasic/tpl/hdr.tpl
new file mode 100644
index 000000000..cccee2229
--- /dev/null
+++ b/view/theme/redbasic/tpl/hdr.tpl
@@ -0,0 +1,3 @@
+<div id="nav-notifications-template" rel="template">
+	<a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}"><img class="menu-img-3" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a>
+</div>
diff --git a/view/theme/redbasic/tpl/head.tpl b/view/theme/redbasic/tpl/head.tpl
new file mode 100755
index 000000000..5f874426c
--- /dev/null
+++ b/view/theme/redbasic/tpl/head.tpl
@@ -0,0 +1,21 @@
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<base href="{{$baseurl}}/" />
+<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" />
+{{$metas}}
+{{$head_css}}
+{{$js_strings}}
+{{$head_js}}
+{{$linkrel}}
+{{$plugins}}
+<script>
+	var updateInterval = {{$update_interval}};
+	var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}};
+	var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
+	var justifiedGalleryActive = false;
+	{{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}}
+	{{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}}
+	var preloadImages = {{$preload_images}};
+</script>
+
+
+
diff --git a/view/theme/redbasic/tpl/help.tpl b/view/theme/redbasic/tpl/help.tpl
new file mode 100644
index 000000000..43b061dcc
--- /dev/null
+++ b/view/theme/redbasic/tpl/help.tpl
@@ -0,0 +1,33 @@
+<div id="help-content" class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}: {{$heading}}</h2>
+	</div>
+	<div class="section-content-wrapper" id="doco-content">
+		<h3 id="doco-top-toc-heading">
+			<span class="fakelink" onclick="docoTocToggle(); return false;">
+				<i class="fa fa-fw fa-caret-right fakelink" id="doco-toc-toggle"></i>
+				{{$tocHeading}}
+			</span>
+		</h3>
+		<ul id="doco-top-toc" style="margin-bottom: 1.5em; display: none;"></ul>
+		{{$content}}
+	</div>
+</div>
+
+<script>
+	// Generate the table of contents in the side nav menu (see view/tpl/help.tpl)
+	$(document).ready(function () {
+		$('#doco-top-toc').toc({content: "#doco-content", headings: "h3,h4,h5,h6"});
+	});
+	
+	function docoTocToggle() {
+		if($('#doco-top-toc').is(':visible')) {
+			$('#doco-toc-toggle').removeClass('fa-cog').addClass('fa-caret-right');
+		} else {
+			$('#doco-toc-toggle').removeClass('fa-caret-right').addClass('fa-caret-down');
+		}
+		$('#doco-top-toc').toggle();
+		
+		return false;
+	}
+</script>
diff --git a/view/theme/redbasic/tpl/install.tpl b/view/theme/redbasic/tpl/install.tpl
new file mode 100755
index 000000000..0e77aa97b
--- /dev/null
+++ b/view/theme/redbasic/tpl/install.tpl
@@ -0,0 +1,9 @@
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+
+{{if $status}}
+<h3 class="error-message">{{$status}}</h3>
+{{/if}}
+
+{{$text}}
diff --git a/view/theme/redbasic/tpl/install_checks.tpl b/view/theme/redbasic/tpl/install_checks.tpl
new file mode 100755
index 000000000..ad0aef6a3
--- /dev/null
+++ b/view/theme/redbasic/tpl/install_checks.tpl
@@ -0,0 +1,24 @@
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+<form  action="{{$baseurl}}/index.php?q=setup" method="post">
+<table>
+{{foreach $checks as $check}}
+	<tr><td>{{$check.title}} </td><td><i class="fa {{if $check.status}}fa-check-square-o{{else}}{{if $check.required}}fa-square-o{{else}}fa-exclamation{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr>
+	{{if $check.help}}
+	<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
+	{{/if}}
+{{/foreach}}
+</table>
+
+{{if $phpath}}
+	<input type="hidden" name="phpath" value="{{$phpath}}">
+{{/if}}
+
+{{if $passed}}
+	<input type="hidden" name="pass" value="2">
+	<input type="submit" value="{{$next}}">
+{{else}}
+	<input type="hidden" name="pass" value="1">
+	<input type="submit" value="{{$reload}}">
+{{/if}}
+</form>
diff --git a/view/theme/redbasic/tpl/install_db.tpl b/view/theme/redbasic/tpl/install_db.tpl
new file mode 100755
index 000000000..1a58de129
--- /dev/null
+++ b/view/theme/redbasic/tpl/install_db.tpl
@@ -0,0 +1,30 @@
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+
+<p>
+{{$info_01}}<br>
+{{$info_02}}<br>
+{{$info_03}}
+</p>
+
+{{if $status}}
+<h3 class="error-message">{{$status}}</h3>
+{{/if}}
+
+<form id="install-form" action="{{$baseurl}}/setup" method="post">
+
+<input type="hidden" name="phpath" value="{{$phpath}}" />
+<input type="hidden" name="pass" value="3" />
+
+{{include file="field_input.tpl" field=$dbhost}}
+{{include file="field_input.tpl" field=$dbport}}
+{{include file="field_input.tpl" field=$dbuser}}
+{{include file="field_password.tpl" field=$dbpass}}
+{{include file="field_input.tpl" field=$dbdata}}
+{{include file="field_select.tpl" field=$dbtype}}
+
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
+
+</form>
+
diff --git a/view/theme/redbasic/tpl/install_settings.tpl b/view/theme/redbasic/tpl/install_settings.tpl
new file mode 100755
index 000000000..62dcbb8b3
--- /dev/null
+++ b/view/theme/redbasic/tpl/install_settings.tpl
@@ -0,0 +1,28 @@
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+
+{{if $status}}
+<h3 class="error-message">{{$status}}</h3>
+{{/if}}
+
+<form id="install-form" action="{{$baseurl}}/setup" method="post">
+
+<input type="hidden" name="phpath" value="{{$phpath}}" />
+<input type="hidden" name="dbhost" value="{{$dbhost}}" />
+<input type="hidden" name="dbport" value="{{$dbport}}" />
+<input type="hidden" name="dbuser" value="{{$dbuser}}" />
+<input type="hidden" name="dbpass" value="{{$dbpass}}" />
+<input type="hidden" name="dbdata" value="{{$dbdata}}" />
+<input type="hidden" name="dbtype" value="{{$dbtype}}" />
+<input type="hidden" name="pass" value="4" />
+
+{{include file="field_input.tpl" field=$adminmail}}
+{{include file="field_input.tpl" field=$siteurl}}
+
+{{include file="field_select_grouped.tpl" field=$timezone}}
+
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
+
+</form>
+
diff --git a/view/theme/redbasic/tpl/invite.tpl b/view/theme/redbasic/tpl/invite.tpl
new file mode 100755
index 000000000..440e1e02b
--- /dev/null
+++ b/view/theme/redbasic/tpl/invite.tpl
@@ -0,0 +1,28 @@
+<div id="invite" class="generic-content-wrapper">
+  <div class="section-title-wrapper">
+    <h2>{{$invite}}</h2>
+  </div>
+  <div class="section-content-wrapper">
+
+    <form action="invite" method="post" id="invite-form" >
+
+      <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+      <div id="invite-recipient-textarea" class="form-group field custom">
+        <label for="recipients">{{$addr_text}}</label>
+        <textarea id="invite-recipients" name="recipients" rows="6" class="form-control"></textarea>
+      </div>
+
+      <div id="invite-message-textarea" class="form-group field custom">
+        <label for="message">{{$msg_text}}</label>
+        <textarea id="invite-message" name="message" rows="12" class="form-control">{{$default_message}}</textarea>
+      </div>
+
+      <div id="invite-submit-wrapper" class="form-group">
+        <button class="btn btn-primary btn-sm" type="submit" id="invite-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+      </div>
+
+    </form>
+
+  </div>
+</div>
diff --git a/view/theme/redbasic/tpl/item_attach.tpl b/view/theme/redbasic/tpl/item_attach.tpl
new file mode 100644
index 000000000..95e38c0bd
--- /dev/null
+++ b/view/theme/redbasic/tpl/item_attach.tpl
@@ -0,0 +1,5 @@
+{{if $attaches}}
+{{foreach $attaches as $a}}
+<a class="dropdown-item" href="{{$a.url}}" title="{{$a.title}}"><i class="fa {{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a>
+{{/foreach}}
+{{/if}}
diff --git a/view/theme/redbasic/tpl/item_binary.tpl b/view/theme/redbasic/tpl/item_binary.tpl
new file mode 100644
index 000000000..b19f7e7dd
--- /dev/null
+++ b/view/theme/redbasic/tpl/item_binary.tpl
@@ -0,0 +1,3 @@
+<p>
+<center><a class="zrl" href="{{$url}}"><button class="btn btn-warning fakelink">{{$download}}</button></a></center>
+</p>
diff --git a/view/theme/redbasic/tpl/item_categories.tpl b/view/theme/redbasic/tpl/item_categories.tpl
new file mode 100644
index 000000000..e1b183c0d
--- /dev/null
+++ b/view/theme/redbasic/tpl/item_categories.tpl
@@ -0,0 +1,8 @@
+{{if $categories}}
+<!--div class="categorytags"-->
+{{foreach $categories as $cat}}
+<span class="item-category badge badge-pill badge-warning"><i class="fa fa-asterisk"></i>&nbsp;{{if $cat.url}}<a class="text-white" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
+{{/foreach}}
+<!--/div-->
+{{/if}}
+
diff --git a/view/theme/redbasic/tpl/item_filer.tpl b/view/theme/redbasic/tpl/item_filer.tpl
new file mode 100644
index 000000000..4eb621f93
--- /dev/null
+++ b/view/theme/redbasic/tpl/item_filer.tpl
@@ -0,0 +1,8 @@
+{{if $categories}}
+<!--div class="filesavetags"-->
+{{foreach $categories as $cat}}
+<span class="item-category badge badge-pill badge-danger"><i class="fa fa-folder-o"></i>&nbsp;{{$cat.term}}&nbsp;<a href="{{$cat.removelink}}" class="text-white" title="{{$remove}}"><i class="fa fa-close"></i></a></span>
+{{/foreach}}
+<!--/div-->
+{{/if}}
+
diff --git a/view/theme/redbasic/tpl/item_import.tpl b/view/theme/redbasic/tpl/item_import.tpl
new file mode 100755
index 000000000..e976417e1
--- /dev/null
+++ b/view/theme/redbasic/tpl/item_import.tpl
@@ -0,0 +1,13 @@
+<h2>{{$title}}</h2>
+
+<form action="import_items" method="post" enctype="multipart/form-data" id="import-channel-form">
+	<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+	<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>
+
+	<label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label>
+	<input type="file" name="filename" id="import-filename" class="import-input" value="" />
+	<div id="import-filename-end" class="import-field-end"></div>
+
+	<input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" />
+	<div id="import-submit-end" class="import-field-end"></div>
+</form>
diff --git a/view/theme/redbasic/tpl/jot-header.tpl b/view/theme/redbasic/tpl/jot-header.tpl
new file mode 100755
index 000000000..1cc5a898a
--- /dev/null
+++ b/view/theme/redbasic/tpl/jot-header.tpl
@@ -0,0 +1,598 @@
+<script language="javascript" type="text/javascript">
+
+var editor = false;
+var plaintext = '{{$editselect}}';
+var pretext = '{{$pretext}}';
+
+function initEditor(cb){
+	if (editor==false){
+		$("#profile-jot-text-loading").spin('small').show();
+		{{$geotag}}
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").spin(false).hide();
+			$("#profile-jot-text").css({ 'height': 200 });
+			{{if $bbco_autocomplete}}
+			$("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode
+			{{/if}}
+			{{if $editor_autocomplete}}
+			if(typeof channelId === 'undefined')
+				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
+			else
+				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections
+			{{/if}}
+			editor = true;
+			  $("a#jot-perms-icon").colorbox({ 
+				  'inline' : true, 
+				  'transition' : 'elastic' 
+			});
+			$(".jothidden").show();
+			$("#profile-jot-text").addClass('jot-expanded');
+			if (typeof cb!="undefined") cb();
+			if(pretext.length)
+				addeditortext(pretext);
+			return;
+		}
+		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: {{$editselect}},
+			auto_focus: "profile-jot-text",
+			plugins : "bbcode,paste,autoresize, inlinepopups",
+			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+			theme_advanced_buttons2 : "",
+			theme_advanced_buttons3 : "",
+			theme_advanced_toolbar_location : "top",
+			theme_advanced_toolbar_align : "center",
+			theme_advanced_blockformats : "blockquote,code",
+			gecko_spellcheck : true,
+			paste_text_sticky : true,
+			entity_encoding : "raw",
+			add_unload_trigger : false,
+			remove_linebreaks : false,
+			force_p_newlines : false,
+			force_br_newlines : true,
+			forced_root_block : '',
+			convert_urls: false,
+			content_css: "{{$baseurl}}/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			file_browser_callback : "fcFileBrowser",
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null)
+						cPopup.onkey(e);
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) cPopup = null;
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$("#profile-jot-text-loading").spin(false).hide();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+
+			}
+		});
+
+		editor = true;
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+</script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>
+<script>
+	$(document).ready(function() {
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+
+		var upload_title = $('#wall-image-upload').attr('title');
+		var attach_title = $('#wall-file-upload').attr('title');
+		try {
+			var uploader = new window.AjaxUpload('wall-image-upload',
+			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
+				name: 'userfile',
+				title: upload_title,
+				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#jot-media').val($('#jot-media').val() + response);
+					$('#profile-rotator').spin(false);
+				}
+			});
+		} catch (e) {
+		}
+		try {
+			var uploader_sub = new window.AjaxUpload('wall-image-upload-sub',
+			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
+				name: 'userfile',
+				title: upload_title,
+				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#jot-media').val($('#jot-media').val() + response);
+					$('#profile-rotator').spin(false);
+				}
+			});
+		} catch(e) {
+		}
+		try {
+			var file_uploader = new window.AjaxUpload('wall-file-upload',
+			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
+				name: 'userfile',
+				title: attach_title,
+				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#jot-media').val($('#jot-media').val() + response);
+					$('#profile-rotator').spin(false);
+				}
+			});
+		} catch(e) {
+		}
+		try {
+			var file_uploader_sub = new window.AjaxUpload('wall-file-upload-sub',
+			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
+				name: 'userfile',
+				title: attach_title,
+				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#jot-media').val($('#jot-media').val() + response);
+					$('#profile-rotator').spin(false);
+				}
+			});
+		} catch(e) {
+		}
+        
+        
+        // call initialization file
+        if (window.File && window.FileList && window.FileReader) {
+          DragDropUploadInit();
+        }
+	});
+
+	function deleteCheckedItems() {
+		var checkedstr = '';
+
+		$('.item-select').each( function() {
+			if($(this).is(':checked')) {
+				if(checkedstr.length != 0) {
+					checkedstr = checkedstr + ',' + $(this).val();
+				}
+				else {
+					checkedstr = $(this).val();
+				}
+			}
+		});
+		$.post('item', { dropitems: checkedstr }, function(data) {
+			window.location.reload();
+		});
+	}
+
+	function jotGetLink() {
+            textarea = document.getElementById('profile-jot-text');
+            if (textarea.selectionStart || textarea.selectionStart == "0") {
+                    var start = textarea.selectionStart;
+                    var end = textarea.selectionEnd;	
+                    if (end > start) {
+                        reply = prompt("{{$linkurl}}");
+                        if(reply && reply.length) {
+                            textarea.value = textarea.value.substring(0, start) + "[url=" + reply + "]" + textarea.value.substring(start, end) + "[/url]" + textarea.value.substring(end, textarea.value.length);
+                        }
+                    } else {
+                        reply = prompt("{{$linkurl}}");
+                        if(reply && reply.length) {
+                            reply = bin2hex(reply);
+                            $('#profile-rotator').spin('tiny');
+                            $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
+                                    addeditortext(data);
+                                    $('#profile-rotator').spin(false);
+                            });
+                        }
+                    }
+            }
+	}
+
+	function jotGetLocation() {
+		reply = prompt("{{$whereareu}}", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotGetExpiry() {
+		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+		$('#expiryModal').modal();
+		$('#expiry-modal-OKButton').on('click', function() {
+			reply=$('#expiration-date').val();
+			if(reply && reply.length) {
+				$('#jot-expire').val(reply);
+				$('#expiryModal').modal('hide');
+			}
+		})
+	}
+
+	function jotGetPubDate() {
+		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+		$('#createdModal').modal();
+		$('#created-modal-OKButton').on('click', function() {
+			reply=$('#created-date').val();
+			if(reply && reply.length) {
+				$('#jot-created').val(reply);
+				$('#createdModal').modal('hide');
+			}
+		})
+	}
+
+
+	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
+		$('#like-rotator-' + id).spin('tiny');
+		$.get('{{$baseurl}}/share/' + id, function(data) {
+			if (!editor) $("#profile-jot-text").val("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).spin(false);
+				$(window).scrollTop(0);
+			});
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound) {
+			event.preventDefault();
+			var editwin = '#' + event.target.id;
+			var commentwin = false;
+			if(editwin) {
+				commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
+				if(commentwin) {
+					var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
+					$('#comment-edit-text-' + commentid).addClass('hover');
+				}
+			}
+		}
+	}
+
+	function linkdropexit(event) {
+		var editwin = '#' + event.target.id;
+		var commentwin = false;
+		if(editwin) {
+			commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
+			if(commentwin) {
+				var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
+				$('#comment-edit-text-' + commentid).removeClass('hover');
+			}
+		}
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.preventDefault();
+		var editwin = '#' + event.target.id;
+		var commentwin = false;
+		if(editwin) {
+			commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
+			if(commentwin) {
+				var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
+				commentOpen(document.getElementById(event.target.id),commentid);
+
+			}
+		}
+
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').spin('tiny');
+			$.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
+				if(commentwin) {
+					$(editwin).val( $(editwin).val() + data );
+					$('#profile-rotator').spin(false);
+				}
+				else {
+					if (!editor) $("#profile-jot-text").val("");
+					initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').spin(false);
+					});
+				}
+			});
+		}
+	}
+
+	function itemTag(id) {
+		reply = prompt("{{$term}}");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('{{$baseurl}}/tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
+	function itemFiler(id) {
+		if($('#item-filer-dialog').length)
+			$('#item-filer-dialog').remove();
+
+		$.get('filer/', function(data){
+			$('body').append(data);
+			$('#item-filer-dialog').modal('show');
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('{{$baseurl}}/filer/' + id + '?term=' + reply, NavUpdate);
+//					if(timer) clearTimeout(timer);
+//					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$('#item-filer-dialog').modal('hide');
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	function itemBookmark(id) {
+		$.get('{{$baseurl}}/bookmarks?f=&item=' + id);
+		if(timer) clearTimeout(timer);
+		timer = setTimeout(NavUpdate,1000);
+	}
+
+	function itemAddToCal(id) {
+		$.get('{{$baseurl}}/events/add/' + id);
+		if(timer) clearTimeout(timer);
+		timer = setTimeout(NavUpdate,1000);
+	}
+
+	function toggleVoting() {
+		if($('#jot-consensus').val() > 0) {
+			$('#jot-consensus').val(0);
+			$('#profile-voting, #profile-voting-sub').removeClass('fa-check-square-o').addClass('fa-square-o');
+		}
+		else {
+			$('#jot-consensus').val(1);
+			$('#profile-voting, #profile-voting-sub').removeClass('fa-square-o').addClass('fa-check-square-o');
+		}
+	}
+
+	function toggleNoComment() {
+		if($('#jot-nocomment').val() > 0) {
+			$('#jot-nocomment').val(0);
+			$('#profile-nocomment, #profile-nocomment-sub').removeClass('fa-comments-o').addClass('fa-comments');
+			$('#profile-nocomment-wrapper').attr('title', '{{$nocomment_enabled}}');
+		}
+		else {
+			$('#jot-nocomment').val(1);
+			$('#profile-nocomment, #profile-nocomment-sub').removeClass('fa-comments').addClass('fa-comments-o');
+			$('#profile-nocomment-wrapper').attr('title', '{{$nocomment_disabled}}');
+		}
+	}
+
+	function jotReact(id,icon) {
+		if(id && icon) {
+			$.get('{{$baseurl}}/react?f=&postid=' + id + '&emoji=' + icon);
+			if(timer) clearTimeout(timer);
+			timer = setTimeout(NavUpdate,1000);
+		}
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').attr('disabled', true);
+	}
+
+
+    var initializeEmbedPhotoDialog = function () {
+        $('.embed-photo-selected-photo').each(function (index) {
+            $(this).removeClass('embed-photo-selected-photo');
+        });
+        getPhotoAlbumList();
+        $('#embedPhotoModalBodyAlbumDialog').off('click');
+        $('#embedPhotoModal').modal('show');
+    };
+
+    var choosePhotoFromAlbum = function (album) {
+        $.post("embedphotos/album", {name: album},
+            function(data) {
+                if (data['status']) {
+                    $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
+                    $('#embedPhotoModalBodyAlbumDialog').html('\
+                            <div><div class="nav nav-pills flex-column">\n\
+                                <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
+                                    <i class="fa fa-chevron-left"></i>&nbsp\n\
+                                    {{$modaldiffalbum}}\n\
+                                    </a>\n\
+                                </li>\n\
+                            </div><br></div>')
+                    $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
+                    $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
+                        evt.preventDefault();
+                        var image = document.getElementById(evt.target.id);
+                        if (typeof($(image).parent()[0]) !== 'undefined') {
+                            var imageparent = document.getElementById($(image).parent()[0].id);
+                            $(imageparent).toggleClass('embed-photo-selected-photo');
+                        }
+                    });
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
+                    $('#embed-photo-OKButton').click(function () {
+                        $('.embed-photo-selected-photo').each(function (index) {
+                            var href = $(this).attr('href');
+                            $.post("embedphotos/photolink", {href: href},
+                                function(ddata) {
+                                    if (ddata['status']) {
+                                        addeditortext(ddata['photolink']);
+                                    } else {
+                                        window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
+                                    }
+                                    return false;
+                                },
+                            'json');
+                        });
+                        $('#embedPhotoModalBodyAlbumDialog').html('');
+                        $('#embedPhotoModalBodyAlbumDialog').off('click');
+                        $('#embedPhotoModal').modal('hide');
+                    });
+                } else {
+                    window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+
+    var getPhotoAlbumList = function () {
+        $.post("embedphotos/albumlist", {},
+            function(data) {
+                if (data['status']) {
+                    var albums = data['albumlist']; //JSON.parse(data['albumlist']);
+                    $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
+                    $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
+                    for(var i=0; i<albums.length; i++) {
+                        var albumName = albums[i].text;
+			var jsAlbumName = albums[i].jstext;
+			var albumLink = '<li class="nav-item">';
+			albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
+                        albumLink += '</li>';
+                        $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+                    }
+                    $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
+                } else {
+                    window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+
+    //
+    // initialize
+    function DragDropUploadInit() {
+
+      var filedrag = $("#profile-jot-text");
+
+      // is XHR2 available?
+      var xhr = new XMLHttpRequest();
+      if (xhr.upload) {
+
+        // file drop
+        filedrag.on("dragover", DragDropUploadFileHover);
+        filedrag.on("dragleave", DragDropUploadFileHover);
+        filedrag.on("drop", DragDropUploadFileSelectHandler);
+
+      }
+
+      window.filesToUpload = 0;
+      window.fileUploadsCompleted = 0;
+
+
+    }
+
+    // file drag hover
+    function DragDropUploadFileHover(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      e.target.className = (e.type == "dragover" ? "hover" : "");
+    }
+
+    // file selection
+    function DragDropUploadFileSelectHandler(e) {
+
+      // cancel event and hover styling
+      DragDropUploadFileHover(e);
+	  if (!editor) $("#profile-jot-text").val("");
+
+
+      // fetch FileList object
+      var files = e.target.files || e.originalEvent.dataTransfer.files;
+      // process all File objects
+      for (var i = 0, f; f = files[i]; i++) {
+        DragDropUploadFile(f, i);
+      }
+
+    }
+
+    // upload  files
+    function DragDropUploadFile(file, idx) {
+
+      window.filesToUpload = window.filesToUpload + 1;
+
+      var xhr = new XMLHttpRequest();
+      xhr.withCredentials = true;   // Include the SESSION cookie info for authentication
+      (xhr.upload || xhr).addEventListener('progress', function (e) {
+         $('#profile-rotator').spin('tiny');
+      });
+      xhr.addEventListener('load', function (e) {
+        //console.log('xhr upload complete', e);
+        window.fileUploadsCompleted = window.fileUploadsCompleted + 1;
+
+		initEditor(function() {
+			addeditortext(xhr.responseText);
+		});
+
+		$('#jot-media').val($('#jot-media').val() + xhr.responseText);
+        // When all the uploads have completed, refresh the page
+        if (window.filesToUpload > 0 && window.fileUploadsCompleted === window.filesToUpload) {  
+          $('#profile-rotator').spin(false);
+          window.fileUploadsCompleted = window.filesToUpload = 0;
+        }
+      });
+      // POST to the wall_upload endpoint
+      xhr.open('post', '{{$baseurl}}/wall_attach/{{$nickname}}', true);
+
+      var data = new FormData();
+      data.append('userfile', file);
+      xhr.send(data);
+    }
+
+</script>
+
+<script>
+$( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-delete-link,.block-delete-link", function(e) {
+	var link = $(this).attr("href"); // "get" the intended link in a var
+
+	if (typeof(eval($.fn.modal)) === 'function'){
+		e.preventDefault();
+		bootbox.confirm("<h4>{{$confirmdelete}}</h4>",function(result) {
+			if (result) {
+				document.location.href = link;
+			}
+		});
+	} else {
+		return confirm("{{$confirmdelete}}");
+	}
+});
+</script>
diff --git a/view/theme/redbasic/tpl/jot.tpl b/view/theme/redbasic/tpl/jot.tpl
new file mode 100755
index 000000000..dbbb470c5
--- /dev/null
+++ b/view/theme/redbasic/tpl/jot.tpl
@@ -0,0 +1,303 @@
+<form id="profile-jot-form" action="{{$action}}" method="post" class="acl-form" data-form_id="profile-jot-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+	{{$mimeselect}}
+	{{$layoutselect}}
+	{{if $id_select}}
+	<div class="channel-id-select-div">
+		<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
+	</div>
+	{{/if}}
+	<div class="mb-4" id="profile-jot-wrapper">
+		{{if $parent}}
+		<input type="hidden" name="parent" value="{{$parent}}" />
+		{{/if}}
+		<input type="hidden" name="obj_type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="expire" id="jot-expire" value="{{$defexpire}}" />
+		<input type="hidden" name="created" id="jot-created" value="{{$defpublish}}" />
+		<input type="hidden" name="media_str" id="jot-media" value="" />
+		<input type="hidden" name="source" id="jot-source" value="{{$source}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="webpage" value="{{$webpage}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
+		<input type="hidden" id="jot-nocomment" name="nocomment" value="{{if $nocomment}}{{$nocomment}}{{else}}0{{/if}}" />
+
+		{{if $webpage}}
+		<div id="jot-pagetitle-wrap" class="jothidden">
+			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
+		</div>
+		{{/if}}
+		<div id="jot-title-wrap" class="jothidden">
+			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex="1" value="{{$title}}">
+		</div>
+		{{if $catsenabled}}
+		<div id="jot-category-wrap" class="jothidden">
+			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput">
+		</div>
+		{{/if}}
+		<div id="jot-text-wrap">
+			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$share}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$content}}</textarea>
+		</div>
+		{{if $attachment}}
+		<div id="jot-attachment-wrap">
+			<input class="jot-attachment" name="attachment" id="jot-attachment" type="text" value="{{$attachment}}" readonly="readonly" onclick="this.select();">
+		</div>
+		{{/if}}
+		<div id="profile-jot-submit-wrapper" class="clearfix p-2 jothidden">
+			<div id="profile-jot-submit-left" class="btn-toolbar float-left">
+				{{if $bbcode}}
+				<div class="btn-group mr-2">
+					<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;">
+						<i class="fa fa-bold jot-icons"></i>
+					</button>
+					<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;">
+						<i class="fa fa-italic jot-icons"></i>
+					</button>
+					<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;">
+						<i class="fa fa-underline jot-icons"></i>
+					</button>
+					<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;">
+						<i class="fa fa-quote-left jot-icons"></i>
+					</button>
+					<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;">
+						<i class="fa fa-terminal jot-icons"></i>
+					</button>
+				</div>
+				{{/if}}
+				{{if $visitor}}
+				<div class="btn-group mr-2 d-none d-lg-flex">
+					{{if $writefiles}}
+					<button id="wall-file-upload" class="btn btn-outline-secondary btn-sm" title="{{$attach}}" >
+						<i id="wall-file-upload-icon" class="fa fa-paperclip jot-icons"></i>
+					</button>
+					{{/if}}
+					{{if $weblink}}
+					<button id="profile-link-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
+						<i id="profile-link" class="fa fa-link jot-icons"></i>
+					</button>
+					{{/if}}
+					{{if $embedPhotos}}
+					<button id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
+						<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i>
+					</button>
+					{{/if}}
+				</div>
+				<div class="btn-group mr-2 d-none d-lg-flex">
+					{{if $setloc}}
+					<button id="profile-location-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
+						<i id="profile-location" class="fa fa-globe jot-icons"></i>
+					</button>
+					{{/if}}
+					{{if $clearloc}}
+					<button id="profile-nolocation-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled">
+						<i id="profile-nolocation" class="fa fa-circle-o jot-icons"></i>
+					</button>
+					{{/if}}
+				{{else}}
+				<div class="btn-group d-none d-lg-flex">
+				{{/if}}
+				{{if $feature_expire}}
+					<button id="profile-expire-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
+						<i id="profile-expires" class="fa fa-eraser jot-icons"></i>
+					</button>
+				{{/if}}
+				{{if $feature_future}}
+					<button id="profile-future-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;">
+						<i id="profile-future" class="fa fa-clock-o jot-icons"></i>
+					</button>
+				{{/if}}
+				{{if $feature_encrypt}}
+					<button id="profile-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
+						<i id="profile-encrypt" class="fa fa-key jot-icons"></i>
+					</button>
+				{{/if}}
+				{{if $feature_voting}}
+					<button id="profile-voting-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$voting}}" onclick="toggleVoting();return false;">
+						<i id="profile-voting" class="fa fa-square-o jot-icons"></i>
+					</button>
+				{{/if}}
+				{{if $feature_nocomment}}
+					<button id="profile-nocomment-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$nocommenttitle}}" onclick="toggleNoComment();return false;">
+						<i id="profile-nocomment" class="fa fa-comments jot-icons"></i>
+					</button>
+				{{/if}}
+				</div>
+				{{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}}
+				<div class="btn-group d-lg-none">
+					<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+						<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
+					</button>
+					<div class="dropdown-menu">
+						{{if $visitor}}
+						{{if $writefiles}}
+						<a class="dropdown-item" id="wall-file-upload-sub" href="#" ><i class="fa fa-paperclip"></i>&nbsp;{{$attach}}</a>
+						{{/if}}
+						{{if $weblink}}
+						<a class="dropdown-item" href="#" onclick="jotGetLink(); return false;"><i class="fa fa-link"></i>&nbsp;{{$weblink}}</a>
+						{{/if}}
+						{{if $embedPhotos}}
+						<a class="dropdown-item" href="#" onclick="initializeEmbedPhotoDialog(); return false;"><i class="fa fa-file-image-o jot-icons"></i>&nbsp;{{$embedPhotos}}</a>
+						{{/if}}
+						{{if $setloc}}
+						<a class="dropdown-item" href="#" onclick="jotGetLocation(); return false;"><i class="fa fa-globe"></i>&nbsp;{{$setloc}}</a>
+						{{/if}}
+						{{if $clearloc}}
+						<a class="dropdown-item" href="#" onclick="jotClearLocation(); return false;"><i class="fa fa-circle-o"></i>&nbsp;{{$clearloc}}</a>
+						{{/if}}
+						{{/if}}
+						{{if $feature_expire}}
+						<a class="dropdown-item" href="#" onclick="jotGetExpiry(); return false;"><i class="fa fa-eraser"></i>&nbsp;{{$expires}}</a>
+						{{/if}}
+						{{if $feature_future}}
+						<a class="dropdown-item" href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i>&nbsp;{{$future_txt}}</a>
+						{{/if}}
+						{{if $feature_encrypt}}
+						<a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
+						{{/if}}
+						{{if $feature_voting}}
+						<a class="dropdown-item" href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="fa fa-square-o"></i>&nbsp;{{$voting}}</a>
+						{{/if}}
+						{{if $feature_nocomment}}
+						<a class="dropdown-item" href="#" onclick="toggleNoComment(); return false;"><i id="profile-nocomment-sub" class="fa fa-comments"></i>&nbsp;{{$nocommenttitlesub}}</a>
+						{{/if}}
+					</div>
+				</div>
+				{{/if}}
+			</div>
+			<div id="profile-rotator-wrapper" class="float-left">
+				<div id="profile-rotator"></div>
+			</div>
+			<div id="profile-jot-submit-right" class="btn-group float-right">
+				{{if $preview}}
+				<button class="btn btn-outline-secondary btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
+					<i class="fa fa-eye jot-icons" ></i>
+				</button>
+				{{/if}}
+				{{if $jotnets}}
+				<button id="dbtn-jotnets" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#jotnetsModal" type="button" title="{{$jotnets_label}}" style="{{if $lockstate == 'lock'}}display: none;{{/if}}">
+					<i class="fa fa-share-alt jot-icons"></i>
+				</button>
+				{{/if}}
+				{{if $showacl}}
+				<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form">
+					<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons{{if $bang}} jot-lock-warn{{/if}}"></i>
+				</button>
+				{{/if}}
+				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex="3" name="button-submit">{{$share}}</button>
+			</div>
+			<div class="clear"></div>
+			{{if $jotplugins}}
+			<div id="profile-jot-plugin-wrapper" class="mt-2">
+				{{$jotplugins}}
+			</div>
+			{{/if}}
+			{{if $jotnets}}
+			<div class="modal" id="jotnetsModal" tabindex="-1" role="dialog" aria-labelledby="jotnetsModalLabel" aria-hidden="true">
+				<div class="modal-dialog">
+					<div class="modal-content">
+						<div class="modal-header">
+							<h4 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h4>
+							<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+						</div>
+						<div class="modal-body">
+							{{$jotnets}}
+						</div>
+						<div class="modal-footer">
+							<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
+						</div>
+					</div><!-- /.modal-content -->
+				</div><!-- /.modal-dialog -->
+			</div><!-- /.modal -->
+			{{/if}}
+		</div>
+	</div>
+</form>
+
+<div id="jot-preview-content" style="display:none;"></div>
+
+{{$acl}}
+
+{{if $feature_expire}}
+<!-- Modal for item expiry-->
+<div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="modal-body form-group" style="width:90%">
+				<div class="date">
+					<input type="text" placeholder="yyyy-mm-dd HH:MM" name="start_text" id="expiration-date" class="form-control" />
+				</div>
+				<script>
+					$(function () {
+						var picker = $('#expiration-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 });
+					});
+				</script>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$expiryModalCANCEL}}</button>
+				<button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+{{/if}}
+
+{{if $feature_future}}
+<div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="modal-body form-group" style="width:90%">
+				<div class="date">
+					<input type="text" placeholder="yyyy-mm-dd HH:MM" name="created_text" id="created-date" class="form-control" />
+				</div>
+				<script>
+					$(function () {
+						var picker = $('#created-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 });
+					});
+				</script>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$expiryModalCANCEL}}</button>
+				<button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+{{/if}}
+
+{{if $embedPhotos}}
+<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="modal-body" id="embedPhotoModalBody" >
+				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
+					<div id="embedPhotoModalBodyAlbumList"></div>
+				</div>
+				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
+				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+{{/if}}
+
+{{if $content || $attachment || $expanded}}
+<script>initEditor();</script>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/jot_geotag.tpl b/view/theme/redbasic/tpl/jot_geotag.tpl
new file mode 100755
index 000000000..60f128850
--- /dev/null
+++ b/view/theme/redbasic/tpl/jot_geotag.tpl
@@ -0,0 +1,7 @@
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
+			$('#profile-nolocation-wrapper').attr('disabled', false);
+		});
+	}
+
diff --git a/view/theme/redbasic/tpl/js_strings.tpl b/view/theme/redbasic/tpl/js_strings.tpl
new file mode 100755
index 000000000..4243c2ea5
--- /dev/null
+++ b/view/theme/redbasic/tpl/js_strings.tpl
@@ -0,0 +1,57 @@
+<script>
+
+	var aStr = {
+
+		'delitem'     : "{{$delitem}}",
+		'comment'     : "{{$comment}}",
+		'showmore'    : "{{$showmore}}",
+		'showfewer'   : "{{$showfewer}}",
+		'divgrowmore' : "{{$divgrowmore}}",
+		'divgrowless' : "{{$divgrowless}}",
+		'pwshort'     : "{{$pwshort}}",
+		'pwnomatch'   : "{{$pwnomatch}}",
+		'everybody'   : "{{$everybody}}",
+		'passphrase'  : "{{$passphrase}}",
+		'passhint'    : "{{$passhint}}",
+		'permschange' : "{{$permschange}}",
+		'closeAll'    : "{{$closeAll}}",
+		'nothingnew'  : "{{$nothingnew}}",
+		'rating_desc' : "{{$rating_desc}}",
+		'rating_val'  : "{{$rating_val}}",
+		'rating_text' : "{{$rating_text}}",
+		'submit'      : "{{$submit}}",
+		'linkurl'     : "{{$linkurl}}",
+		'leavethispage' : "{{$leavethispage}}",
+		'location'    : "{{$location}}",
+
+		't01' : "{{$t01}}",
+		't02' : "{{$t02}}",
+		't03' : "{{$t03}}",
+		't04' : "{{$t04}}",
+		't05' : "{{$t05}}",
+		't06' : "{{$t06}}",
+		't07' : "{{$t07}}",
+		't08' : "{{$t08}}",
+		't09' : "{{$t09}}",
+		't10' : "{{$t10}}",
+		't11' : "{{$t11}}",
+		't12' : "{{$t12}}",
+		't13' : "{{$t13}}",
+		't14' : "{{$t14}}",
+		't15' : "{{$t15}}",
+		't16' : "{{$t16}}",
+		't17' : "{{$t17}}",
+
+		'monthNames' : [ "{{$January}}","{{$February}}","{{$March}}","{{$April}}","{{$May}}","{{$June}}","{{$July}}","{{$August}}","{{$September}}","{{$October}}","{{$November}}","{{$December}}" ],
+		'monthNamesShort' : [ "{{$Jan}}","{{$Feb}}","{{$Mar}}","{{$Apr}}","{{$MayShort}}","{{$Jun}}","{{$Jul}}","{{$Aug}}","{{$Sep}}","{{$Oct}}","{{$Nov}}","{{$Dec}}" ],
+		'dayNames' : ["{{$Sunday}}","{{$Monday}}","{{$Tuesday}}","{{$Wednesday}}","{{$Thursday}}","{{$Friday}}","{{$Saturday}}"],
+		'dayNamesShort' : ["{{$Sun}}","{{$Mon}}","{{$Tue}}","{{$Wed}}","{{$Thu}}","{{$Fri}}","{{$Sat}}"],
+		'today' : "{{$today}}",
+		'month' : "{{$month}}",
+		'week' : "{{$week}}",
+		'day' : "{{$day}}",
+		'allday' : "{{$allday}}"
+	};
+
+</script>
+		
diff --git a/view/theme/redbasic/tpl/lang_selector.tpl b/view/theme/redbasic/tpl/lang_selector.tpl
new file mode 100755
index 000000000..1324442f3
--- /dev/null
+++ b/view/theme/redbasic/tpl/lang_selector.tpl
@@ -0,0 +1,13 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$title}}</h1>
+<br />
+<div id="language-selector" >
+	<form action="#" method="post" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{foreach $langs.0 as $v=>$l}}
+				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
+			{{/foreach}}
+		</select>
+	</form>
+</div>
+</div>
diff --git a/view/theme/redbasic/tpl/layoutlist.tpl b/view/theme/redbasic/tpl/layoutlist.tpl
new file mode 100644
index 000000000..1bbe14893
--- /dev/null
+++ b/view/theme/redbasic/tpl/layoutlist.tpl
@@ -0,0 +1,71 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $editor}}
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('layout-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
+			<a href="{{$help.url}}" target="_blank" class="btn btn-sm btn-warning" title="{{$help.title}}"><i class="fa fa-info"></i>&nbsp;{{$help.text}}</a>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{if $editor}}
+	<div id="layout-editor" class="section-content-tools-wrapper">
+		{{$editor}}
+	</div>
+	{{/if}}
+
+	{{if $pages}}
+	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+		<table id="layout-list-table">
+			<tr>
+				<th width="1%">{{$name}}</th>
+				<th width="94%">{{$descr}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%" class="d-none d-md-table-cell">{{$created}}</th>
+				<th width="1%" class="d-none d-md-table-cell">{{$edited}}</th>
+			</tr>
+			{{foreach $pages as $key => $items}}
+			{{foreach $items as $item}}
+			<tr id="layout-list-item-{{$item.url}}">
+				<td>
+					{{if $view}}
+					<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
+					{{else}}
+					{{$item.title}}
+					{{/if}}
+				</td>
+				<td>
+					{{$item.descr}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $item.bb_element}}
+					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+					{{/if}}
+				</td>
+				<td class="d-none d-md-table-cell">
+					{{$item.created}}
+				</td>
+				<td class="d-none d-md-table-cell">
+					{{$item.edited}}
+				</td>
+			</tr>
+			{{/foreach}}
+			{{/foreach}}
+		</table>
+	</div>
+	<div class="clear"></div>
+	{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/like_noshare.tpl b/view/theme/redbasic/tpl/like_noshare.tpl
new file mode 100755
index 000000000..e83b885fe
--- /dev/null
+++ b/view/theme/redbasic/tpl/like_noshare.tpl
@@ -0,0 +1,5 @@
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
+	<i class="fa fa-thumbs-o-up item-tool btn btn-outline-secondary" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i>
+	<i class="fa fa-thumbs-o-down item-tool btn btn-outline-secondary" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i>
+	<div id="like-rotator-{{$id}}" class="like-rotator"></div>
+</div>
diff --git a/view/theme/redbasic/tpl/locmanage.tpl b/view/theme/redbasic/tpl/locmanage.tpl
new file mode 100644
index 000000000..a8c75b6a8
--- /dev/null
+++ b/view/theme/redbasic/tpl/locmanage.tpl
@@ -0,0 +1,41 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<script>
+			function primehub(id) {
+				$.post(baseurl + '/locs','primary='+id,function(data) { window.location.href=window.location.href; });
+			}
+			function drophub(id) {
+				$.post(baseurl + '/locs','drop='+id,function(data) { window.location.href=window.location.href; });
+			}
+		</script>
+		<button class="btn btn-success btn-sm pull-right" onclick="window.location.href='/locs/f=&sync=1'; return false;"><i class="fa fa-refresh"></i>&nbsp;{{$sync}}</button>
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper-np">
+		<div class="section-content-warning-wrapper">
+			{{$sync_text}}
+		</div>
+		<div class="section-content-info-wrapper">
+			{{$drop_text}}<br>
+			{{$last_resort}}
+		</div>
+		<table id="locs-index">
+			<tr>
+				<th>{{$addr}}</th>
+				<th class="d-none d-md-table-cell">{{$loc}}</th>
+				<th>{{$mkprm}}</th>
+				<th>{{$drop}}</th>
+			</tr>
+			{{foreach $hubs as $hub}}
+			{{if ! $hub.deleted }}
+			<tr class="locs-index-row">
+				<td>{{$hub.hubloc_addr}}</td>
+				<td class="d-none d-md-table-cell">{{$hub.hubloc_url}}</td>
+				<td>{{if $hub.primary}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o primehub" onclick="primehub({{$hub.hubloc_id}}); return false;"></i>{{/if}}</td>
+				<td><i class="fa fa-trash-o drophub" onclick="drophub({{$hub.hubloc_id}}); return false;"></i></td>
+			</tr>
+			{{/if}}
+			{{/foreach}}
+		</table>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/login.tpl b/view/theme/redbasic/tpl/login.tpl
new file mode 100755
index 000000000..3d3faa41c
--- /dev/null
+++ b/view/theme/redbasic/tpl/login.tpl
@@ -0,0 +1,21 @@
+<form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+	<div id="login-main">
+		<div id="login-input" class="form-group">
+			{{include file="field_input.tpl" field=$lname}}
+			{{include file="field_password.tpl" field=$lpassword}}
+			{{include file="field_checkbox.tpl" field=$remember_me}}
+			<button type="submit" name="submit" class="btn btn-block btn-primary">{{$login}}</button>
+		</div>
+		<div id="login-extra-links">
+			{{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link" class="pull-right">{{$register.desc}}</a>{{/if}}
+			<a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+		</div>
+	</div>
+	{{foreach $hiddens as $k=>$v}}
+		<input type="hidden" name="{{$k}}" value="{{$v}}" />
+	{{/foreach}}
+</form>
+{{if $login_page}}
+<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/logout.tpl b/view/theme/redbasic/tpl/logout.tpl
new file mode 100755
index 000000000..7548ed196
--- /dev/null
+++ b/view/theme/redbasic/tpl/logout.tpl
@@ -0,0 +1,6 @@
+<form action="{{$dest_url}}" method="post" >
+<div class="logout-wrapper">
+<input type="hidden" name="auth-params" value="logout" />
+<input type="submit" name="submit" id="logout-button" value="{{$logout}}" />
+</div>
+</form>
diff --git a/view/theme/redbasic/tpl/lostpass.tpl b/view/theme/redbasic/tpl/lostpass.tpl
new file mode 100755
index 000000000..8ecfd215b
--- /dev/null
+++ b/view/theme/redbasic/tpl/lostpass.tpl
@@ -0,0 +1,17 @@
+<div class="generic-content-wrapper-styled">
+<h3>{{$title}}</h3>
+
+<p id="lostpass-desc">
+{{$desc}}
+</p>
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper">
+        <label for="login-name" id="label-login-name">{{$name}}</label>
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+		<input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
+</div>
+<div id="login-extra-end"></div>
+<div id="login-submit-end"></div>
+</form>
+</div>
diff --git a/view/theme/redbasic/tpl/mail_conv.tpl b/view/theme/redbasic/tpl/mail_conv.tpl
new file mode 100755
index 000000000..759517b7f
--- /dev/null
+++ b/view/theme/redbasic/tpl/mail_conv.tpl
@@ -0,0 +1,38 @@
+<div id="mail-{{$mail.id}}" class="mb-2 clearfix mail-conv-outside-wrapper">
+	<div class="mb-2 clearfix wall-item-head">
+		<div class="wall-item-info" >
+			<a href="{{$mail.from_url}}"><img class="wall-item-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a>
+		</div>
+		<div class="mail-conv-detail">
+			{{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}}
+			<div class="wall-item-name"><a class="wall-item-name-link" href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
+			<div class="autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div>
+		</div>
+	</div>
+	<div class="clearfix mail-conv-content">
+		<div class="clearfix mail-conv-body">
+			{{$mail.body}}
+		</div>
+		{{if $mail.attachments}}
+		<div class="dropdown float-left">
+			<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-fw fa-paperclip"></i></button>
+			<div class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</div>
+		</div>
+		{{/if}}
+		<div class="float-right dropdown">
+			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}">
+				<i class="fa fa-cog"></i>
+			</button>
+			<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}">
+				{{if $mail.can_recall}}
+				<a class="dropdown-item" href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-fw fa-undo"></i>&nbsp;{{$mail.recall}}</a>
+				{{/if}}
+				<a class="dropdown-item" href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-fw fa-trash-o"></i>&nbsp;{{$mail.delete}}</a>
+				{{if $mail.can_recall}}
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a>
+				{{/if}}
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/mail_display.tpl b/view/theme/redbasic/tpl/mail_display.tpl
new file mode 100755
index 000000000..e8549a49b
--- /dev/null
+++ b/view/theme/redbasic/tpl/mail_display.tpl
@@ -0,0 +1,24 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+			{{if $mailbox == 'combined'}}
+			<a class="btn btn-sm btn-danger" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$delete}}</a>
+			{{/if}}
+		</div>
+		<h2>{{$prvmsg_header}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-wrapper">
+		{{foreach $mails as $mail}}
+			{{include file="mail_conv.tpl"}}
+		{{/foreach}}
+
+		{{if $canreply}}
+		{{include file="prv_message.tpl"}}
+		{{else}}
+		{{$unknown_text}}
+		{{/if}}
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/mail_head.tpl b/view/theme/redbasic/tpl/mail_head.tpl
new file mode 100755
index 000000000..aac592a5f
--- /dev/null
+++ b/view/theme/redbasic/tpl/mail_head.tpl
@@ -0,0 +1,8 @@
+<div class="widget">
+	<h3>{{$header}}</h3>
+	<ul class="nav nav-pills flex-column">
+	{{foreach $messages as $message}}
+		{{include file="mail_list.tpl"}}
+	{{/foreach}}
+	</ul>
+</div>
diff --git a/view/theme/redbasic/tpl/mail_list.tpl b/view/theme/redbasic/tpl/mail_list.tpl
new file mode 100755
index 000000000..827c7628f
--- /dev/null
+++ b/view/theme/redbasic/tpl/mail_list.tpl
@@ -0,0 +1,7 @@
+<li class="nav-item">
+	<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}">
+		<span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br>
+		<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
+		<span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span>
+	</a>
+</li>
diff --git a/view/theme/redbasic/tpl/main_slider.tpl b/view/theme/redbasic/tpl/main_slider.tpl
new file mode 100755
index 000000000..a4e2e1925
--- /dev/null
+++ b/view/theme/redbasic/tpl/main_slider.tpl
@@ -0,0 +1,38 @@
+<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div>
+<script>
+$(document).ready(function() {
+	var old_cmin = 0;
+	var old_cmax = 99;
+
+	$("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false,  onstatechange: function(v) { 
+		var carr = v.split(",");
+		if(carr[0] != bParam_cmin) {
+			old_cmin = bParam_cmin;
+	 		bParam_cmin = carr[0];
+		}
+		if(carr[1] != bParam_cmax) {
+			old_cmax = bParam_cmax; 
+			bParam_cmax = carr[1];
+		}
+		networkRefresh();
+ 	} });
+
+	var slideTimer = null;
+	function networkRefresh() {
+		$("#profile-jot-text-loading").show();
+
+		if((document.readyState !== "complete") || (slideTimer !== null))
+			return;
+		if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax))
+			return;
+		setTimeout(function() { $("#profile-jot-text-loading").spin('small'); }, 1000 );
+		slideTimer = setTimeout(networkTimerRefresh,2000);
+	}
+
+	function networkTimerRefresh() {
+		slideTimer = null;
+		page_load = true;
+		liveUpdate();
+	}
+});
+</script>
diff --git a/view/theme/redbasic/tpl/match.tpl b/view/theme/redbasic/tpl/match.tpl
new file mode 100755
index 000000000..a5ebb043c
--- /dev/null
+++ b/view/theme/redbasic/tpl/match.tpl
@@ -0,0 +1,16 @@
+<div class="profile-match-wrapper">
+	<div class="profile-match-photo">
+		<a href="{{$url}}">
+			<img src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$conntxt}}</a></div>
+	{{/if}}
+
+</div>
diff --git a/view/theme/redbasic/tpl/menuedit.tpl b/view/theme/redbasic/tpl/menuedit.tpl
new file mode 100644
index 000000000..84b16dc0b
--- /dev/null
+++ b/view/theme/redbasic/tpl/menuedit.tpl
@@ -0,0 +1,33 @@
+{{if $header}}
+<div class="generic-content-wrapper">
+<div class="section-title-wrapper">
+	{{if $menu_edit_link}}
+	<div class="pull-right">
+		<a href="{{$menu_edit_link}}" title="{{$hintedit}}" class="btn btn-sm btn-success"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$editcontents}}</a>
+	</div>
+	{{/if}}
+	<h2>{{$header}}</h2>
+	<div class="clear"></div>
+</div>
+{{/if}}
+<div id="menu-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
+	<form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" >
+		{{if $menu_id}}
+		<input type="hidden" name="menu_id" value="{{$menu_id}}" />
+		{{/if}}
+		{{if $menu_system}}
+		<input type="hidden" name="menu_system" value="{{$menu_system}}" />
+		{{/if}}
+		{{include file="field_input.tpl" field=$menu_name}}
+		{{include file="field_input.tpl" field=$menu_desc}}
+
+		{{include file="field_checkbox.tpl" field=$menu_bookmark}}
+		<div class="menuedit-submit-wrapper form-group pull-right" >
+			<button type="submit" name="submit" class="btn btn-primary">{{$submit}}&nbsp;<i class="fa fa-caret-right"></i></button>
+		</div>
+		<div class="clear"></div>
+	</form>
+</div>
+{{if $header}}
+</div>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/menulist.tpl b/view/theme/redbasic/tpl/menulist.tpl
new file mode 100644
index 000000000..e23035062
--- /dev/null
+++ b/view/theme/redbasic/tpl/menulist.tpl
@@ -0,0 +1,40 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('menu-creator');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$hintnew}}</button>
+		</div>
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+
+	{{$create}}
+
+	{{if $menus }}
+	<div id="menulist-content-wrapper" class="section-content-wrapper-np">
+		<table id="menu-list-table">
+			<tr>
+				<th width="1%"></th>
+				<th width="1%">{{$nametitle}}</th>
+				<th width="93%">{{$desctitle}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%" class="d-none d-md-table-cell">{{$created}}</th>
+				<th width="1%" class="d-none d-md-table-cell">{{$edited}}</th>
+			</tr>
+			{{foreach $menus as $m }}
+			<tr id="menu-list-item-{{$m.menu_id}}">
+				<td>{{if $m.bookmark}}<i class="fa fa-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td>
+				<td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td>
+				<td>{{$m.menu_desc}}</td>
+				<td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
+				<td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a></td>
+				<td class="menu-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
+				<td class="d-none d-md-table-cell">{{$m.menu_created}}</td>
+				<td class="d-none d-md-table-cell">{{$m.menu_edited}}</td>
+			</tr>
+			{{/foreach}}
+		</table>
+	</div>
+	{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/message_side.tpl b/view/theme/redbasic/tpl/message_side.tpl
new file mode 100755
index 000000000..2ac61bf76
--- /dev/null
+++ b/view/theme/redbasic/tpl/message_side.tpl
@@ -0,0 +1,9 @@
+<div class="widget">
+	<h3>{{$title}}</h3>
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item"><a href="{{$combined.url}}" class="nav-link{{if $combined.sel}} active{{/if}}">{{$combined.label}}</a></li>
+		<li class="nav-item"><a href="{{$inbox.url}}" class="nav-link{{if $inbox.sel}} active{{/if}}">{{$inbox.label}}</a></li>
+		<li class="nav-item"><a href="{{$outbox.url}}" class="nav-link{{if $outbox.sel}} active{{/if}}">{{$outbox.label}}</a></li>
+		<li class="nav-item"><a href="{{$new.url}}" class="nav-link{{if $new.sel}} active{{/if}}">{{$new.label}}</a></li>
+	</ul>
+</div>
diff --git a/view/theme/redbasic/tpl/micropro_img.tpl b/view/theme/redbasic/tpl/micropro_img.tpl
new file mode 100755
index 000000000..a7c5973f3
--- /dev/null
+++ b/view/theme/redbasic/tpl/micropro_img.tpl
@@ -0,0 +1 @@
+<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="" /></a></div>
diff --git a/view/theme/redbasic/tpl/micropro_txt.tpl b/view/theme/redbasic/tpl/micropro_txt.tpl
new file mode 100755
index 000000000..295e7940d
--- /dev/null
+++ b/view/theme/redbasic/tpl/micropro_txt.tpl
@@ -0,0 +1 @@
+<div class="contact-block-textdiv{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}} title="{{$title}}">{{$name}}</a></div>
diff --git a/view/theme/redbasic/tpl/mitemedit.tpl b/view/theme/redbasic/tpl/mitemedit.tpl
new file mode 100644
index 000000000..9f696fc23
--- /dev/null
+++ b/view/theme/redbasic/tpl/mitemedit.tpl
@@ -0,0 +1,42 @@
+{{if $header}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$header}}</h2>
+	</div>
+{{/if}}
+	<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
+		<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" class="acl-form" data-form_id="mitemedit" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+			<input type="hidden" name="menu_id" value="{{$menu_id}}" />
+			{{if $mitem_id}}
+			<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
+			{{/if}}
+			{{include file="field_input.tpl" field=$mitem_desc}}
+			{{include file="field_input.tpl" field=$mitem_link}}
+			{{if $menu_names}}
+			<datalist id="menu-names">
+				{{foreach $menu_names as $menu_name}}
+				<option value="{{$menu_name}}">
+				{{/foreach}}
+			</datalist>
+			{{/if}}
+			{{include file="field_input.tpl" field=$mitem_order}}
+			{{include file="field_checkbox.tpl" field=$usezid}}
+			{{include file="field_checkbox.tpl" field=$newwin}}
+			<div class="pull-right form-group">
+				<div class="btn-group">
+					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+						<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
+					</button>
+					{{if $submit_more}}
+					<button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="fa fa-caret-right"></i></button>
+					{{/if}}
+					<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+				</div>
+			</div>
+			<div class="clear"></div>
+		</form>
+		{{$aclselect}}
+	</div>
+{{if $header}}
+</div>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/mitemlist.tpl b/view/theme/redbasic/tpl/mitemlist.tpl
new file mode 100644
index 000000000..b28cdfc7e
--- /dev/null
+++ b/view/theme/redbasic/tpl/mitemlist.tpl
@@ -0,0 +1,34 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('menu-element-creator');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$hintnew}}</button>
+		</div>
+		<h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
+		<div class="clear"></div>
+	</div>
+
+	{{$create}}
+
+	{{if $mlist }}
+	<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
+		<table id="mitem-list-table">
+			<tr>
+				<th width="1%">{{$nametitle}}</th>
+				<th width="96%">{{$targettitle}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+			</tr>
+			{{foreach $mlist as $m }}
+			<tr id="mitem-list-item-{{$m.mitem_id}}">
+				<td width="1%">{{$m.mitem_desc}}</td>
+				<td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
+				<td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
+				<td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
+				<td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
+			</tr>
+			{{/foreach}}
+		</table>
+	</div>
+	{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/mood_content.tpl b/view/theme/redbasic/tpl/mood_content.tpl
new file mode 100755
index 000000000..315ee4c8a
--- /dev/null
+++ b/view/theme/redbasic/tpl/mood_content.tpl
@@ -0,0 +1,33 @@
+
+<div id="mood-content" class="generic-content-wrapper">
+    <div class="section-title-wrapper">
+    <h2>{{$title}}</h2>
+    </div>
+    <div class="section-content-wrapper">
+
+	    <div id="mood-desc">{{$desc}}</div>
+
+		<br />
+		<br />
+
+
+		<form action="mood" method="get">
+		<br />
+		<br />
+
+		<input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" />
+
+		<div class="form-group field custom">
+			<select name="verb" id="mood-verb-select" class="form-control" >
+			{{foreach $verbs as $v}}
+				<option value="{{$v.0}}">{{$v.1}}</option>
+			{{/foreach}}
+			</select>
+		</div>
+		<br />
+		<br />
+
+		<input type="submit" name="submit" value="{{$submit}}" />
+		</form>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/msg-header.tpl b/view/theme/redbasic/tpl/msg-header.tpl
new file mode 100755
index 000000000..013e1cfdc
--- /dev/null
+++ b/view/theme/redbasic/tpl/msg-header.tpl
@@ -0,0 +1,81 @@
+<script type="text/javascript" src="view/js/ajaxupload.js" ></script>
+<script language="javascript" type="text/javascript">
+
+	$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
+
+
+	$(document).ready(function() {
+
+		var file_uploader = new window.AjaxUpload(
+			'prvmail-attach-wrapper',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addmailtext(response);
+					$('#prvmail-rotator').spin(false);
+				}
+			}
+		);
+
+		var file_uploader_sub = new window.AjaxUpload(
+			'prvmail-attach-sub',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addmailtext(response);
+					$('#prvmail-rotator').spin(false);
+				}
+			}
+		);
+
+
+	});
+
+	function prvmailJotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			$('#prvmail-rotator').spin('tiny');
+			$.get('linkinfo?f=&url=' + reply, function(data) {
+				addmailtext(data);
+				$('#prvmail-rotator').spin(false);
+			});
+		}
+	}
+
+	function prvmailGetExpiry() {
+		reply = prompt("{{$expireswhen}}", $('#inp-prvmail-expires').val());
+		if(reply && reply.length) {
+			$('#inp-prvmail-expires').val(reply);
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#prvmail-rotator').spin('tiny');
+			$.get('linkinfo?f=&url=' + reply, function(data) {
+				addmailtext(data);
+				$('#prvmail-rotator').spin(false);
+			});
+		}
+	}
+
+	function addmailtext(data) {
+		var currentText = $("#prvmail-text").val();
+		$("#prvmail-text").val(currentText + data);
+	}	
+
+
+
+</script>
+
diff --git a/view/theme/redbasic/tpl/myapps.tpl b/view/theme/redbasic/tpl/myapps.tpl
new file mode 100755
index 000000000..ccefa4a49
--- /dev/null
+++ b/view/theme/redbasic/tpl/myapps.tpl
@@ -0,0 +1,17 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $authed}}
+		{{if $create}}
+		<a href="appman" class="pull-right btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</a>
+		{{else}}
+		<a href="apps/edit{{if $cat}}/?f=&cat={{$cat}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a>
+		{{/if}}
+		{{/if}}
+		<h2>{{$title}}{{if $cat}} - {{$cat}}{{/if}}</h2>
+	</div>
+	<div class="clearfix section-content-wrapper">
+		{{foreach $apps as $ap}}
+		{{$ap}}
+		{{/foreach}}
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/nav.tpl b/view/theme/redbasic/tpl/nav.tpl
new file mode 100755
index 000000000..c5b378b4f
--- /dev/null
+++ b/view/theme/redbasic/tpl/nav.tpl
@@ -0,0 +1,222 @@
+{{if $nav.login && !$userinfo}}
+<div class="d-md-none p-1">
+	<a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
+		{{$nav.loginmenu.1.1}}
+	</a>
+	{{if $nav.register}}
+	<a class="btn btn-warning btn-sm text-white" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
+		{{$nav.register.1}}
+	</a>
+	{{/if}}
+</div>
+{{/if}}
+{{if $userinfo}}
+<div class="dropdown usermenu">
+	<div class="fakelink" data-toggle="dropdown">
+		<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
+		<i class="fa fa-caret-down"></i>
+	</div>
+	{{if $localuser}}
+	<div class="dropdown-menu">
+		{{foreach $nav.usermenu as $usermenu}}
+		<a class="dropdown-item"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
+		{{/foreach}}
+		{{if $nav.manage}}
+		<a class="dropdown-item" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
+		{{/if}}	
+		{{if $nav.channels}}
+		{{foreach $nav.channels as $chan}}
+		<a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a>
+		{{/foreach}}
+		{{/if}}
+		{{if $nav.profiles}}
+		<a class="dropdown-item" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a>
+		{{/if}}
+		{{if $nav.settings}}
+		<div class="dropdown-divider"></div>
+		<a class="dropdown-item" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
+		{{/if}}
+		{{if $nav.admin}}
+		<div class="dropdown-divider"></div>
+		<a class="dropdown-item" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
+		{{/if}}
+		{{if $nav.logout}}
+		<div class="dropdown-divider"></div>
+		<a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a>
+		{{/if}}
+	</div>
+	{{else}}
+	{{if $nav.rusermenu}}
+	<div class="dropdown-menu" role="menu" aria-labelledby="avatar">
+		<a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a>
+		<a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a>
+	</div>
+	{{/if}}
+	{{/if}}
+</div>
+{{/if}}
+<div class="navbar-toggler-right">
+	{{if $nav.help.6}}
+	<button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;">
+		<i class="fa fa-question-circle"></i>
+	</button>
+	{{/if}}
+	<button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
+		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
+	</button>
+	{{if $localuser}}
+	<button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1">
+		<i class="fa fa-exclamation-circle"></i>
+	</button>
+	{{/if}}
+	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
+		<i class="fa fa-bars"></i>
+	</button>
+</div>
+<div class="collapse navbar-collapse" id="navbar-collapse-1">
+	<ul class="navbar-nav mr-auto">
+		{{if $nav.network}}
+		<li class="nav-item dropdown net-button" style="display: none;">
+			<a class="nav-link" href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu">
+				<i class="fa fa-fw fa-th"></i>
+				<span class="badge badge-pill badge-default net-update"></span>
+			</a>
+			<div id="nav-network-menu" class="dropdown-menu" rel="network">
+				<a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a>
+				<a class="dropdown-item" id="nav-network-mark-all"href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.home}}
+		<li class="nav-item dropdown home-button" style="display: none;">
+			<a class="nav-link" href="#" title="{{$nav.home.3}}" id="{{$nav.home.4}}" data-toggle="dropdown" rel="#nav-home-menu">
+				<i class="fa fa-fw fa-home"></i>
+				<span class="badge badge-pill badge-danger home-update"></span>
+			</a>
+			<div id="nav-home-menu" class="dropdown-menu" rel="home">
+				<a class="dropdown-item" id="nav-home-see-all" href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a>
+				<a class="dropdown-item" id="nav-home-mark-all" href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.messages}}
+		<li class="nav-item dropdown mail-button" style="display: none;">
+			<a class="nav-link" href="#" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}" data-toggle="dropdown" rel="#nav-messages-menu">
+				<i class="fa fa-fw fa-envelope"></i>
+				<span class="badge badge-pill badge-danger mail-update"></span>
+			</a>
+			<div id="nav-messages-menu" class="dropdown-menu" rel="messages">
+				<a class="dropdown-item" id="nav-messages-see-all" href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a>
+				<a class="dropdown-item" id="nav-messages-mark-all" href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.all_events}}
+		<li class="nav-item dropdown all_events-button" style="display: none;">
+			<a class="nav-link" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu">
+				<i class="fa fa-fw fa-calendar"></i>
+				<span class="badge badge-pill badge-default all_events-update"></span>
+			</a>
+			<div id="nav-all_events-menu" class="dropdown-menu" rel="all_events">
+				<a class="dropdown-item" id="nav-all_events-see-all" href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a>
+				<a class="dropdown-item" id="nav-all_events-mark-all" href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.intros}}
+		<li class="nav-item dropdown intro-button" style="display: none;">
+			<a class="nav-link" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu">
+				<i class="fa fa-fw fa-users"></i>
+				<span class="badge badge-pill badge-danger intro-update"></span>
+			</a>
+			<div id="nav-intros-menu" class="dropdown-menu" rel="intros">
+				<a class="dropdown-item" id="nav-intros-see-all" href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.notifications}}
+		<li class="nav-item dropdown notify-button" style="display: none;">
+			<a class="nav-link" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu">
+				<i class="fa fa-fw fa-exclamation"></i>
+				<span class="badge badge-pill badge-danger notify-update"></span>
+			</a>
+			<div id="nav-notify-menu" class="dropdown-menu" rel="notify">
+				<a class="dropdown-item" id="nav-notify-see-all" href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a>
+				<a class="dropdown-item" id="nav-notify-mark-all" href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.login && !$userinfo}}
+		<li class="nav-item">
+			<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a>
+		</li>
+		{{/if}}
+		{{if $nav.register}}
+		<li class="nav-item {{$nav.register.2}} d-none d-md-flex">
+			<a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a>
+		</li>
+		{{/if}}
+		{{if $nav.alogout}}
+		<li class="nav-item {{$nav.alogout.2}} d-none d-md-flex">
+			<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+
+	<div id="banner" class="navbar-text d-none d-md-flex">{{$banner}}</div>
+
+	<ul id="nav-right" class="navbar-nav ml-auto d-none d-md-flex">
+		<li class="nav-item collapse clearfix" id="nav-search">
+			<form class="form-inline" method="get" action="search" role="search">
+				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
+			</form>
+			<div id="nav-search-spinner"></div>
+		</li>
+		<li class="nav-item" id="nav-search-btn">
+			<a class="nav-link" href="#nav-search" title="{{$nav.search.3}}" onclick="openMenu('nav-search'); closeMenu('nav-search-btn'); $('#nav-search-text').focus(); return false;"><i class="fa fa-fw fa-search"></i></a>
+		</li>
+		{{if $nav.help.6}}
+		<li class="nav-item dropdown {{$sel.help}}">
+			<a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-question-circle"></i></a>
+		</li>
+		{{/if}}
+		<li class="nav-item dropdown" id="app-menu">
+			<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
+			<div class="dropdown-menu dropdown-menu-right">
+				{{foreach $navapps as $navapp}}
+				{{$navapp}}
+				{{/foreach}}
+				{{if $localuser}}
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+				{{/if}}
+			</div>
+		</li>
+	</ul>
+</div>
+<div class="collapse d-md-none" id="navbar-collapse-2">
+	<div class="navbar-nav mr-auto">
+		{{foreach $navapps as $navapp}}
+		{{$navapp|replace:'dropdown-item':'nav-link'}}
+		{{/foreach}}
+		{{if $localuser}}
+		<div class="dropdown-divider"></div>
+		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+		{{/if}}
+	</div>
+</div>
+{{if $nav.help.6}}
+<div id="contextual-help-content" class="contextual-help-content">
+	{{$nav.help.5}}
+	<div class="float-right">
+		<a class="btn btn-primary btn-sm" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-question"></i>&nbsp;{{$fulldocs}}</a>
+		<a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-times"></i></a>
+	</div>
+</div>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/nav_login.tpl b/view/theme/redbasic/tpl/nav_login.tpl
new file mode 100644
index 000000000..b361b1a14
--- /dev/null
+++ b/view/theme/redbasic/tpl/nav_login.tpl
@@ -0,0 +1,18 @@
+{{if $nav.login && !$userinfo}}
+<div id="nav-login" class="modal" tabindex="-1" role="dialog">
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title">{{$nav.loginmenu.1.1}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+			</div>
+			<div class="modal-body">
+				<div class="form-group">
+					{{$nav.login}}
+					{{$nav.remote_login}}
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/new_channel.tpl b/view/theme/redbasic/tpl/new_channel.tpl
new file mode 100755
index 000000000..cc1983ac4
--- /dev/null
+++ b/view/theme/redbasic/tpl/new_channel.tpl
@@ -0,0 +1,34 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		<div class="section-content-info-wrapper">
+			{{$desc}}
+		</div>
+		{{if $channel_usage_message}}
+		<div class="section-content-warning-wrapper">
+			{{$channel_usage_message}}
+		</div>
+		{{/if}}
+		<form action="new_channel" method="post" id="newchannel-form">
+			{{if $default_role}}
+				<input type="hidden" name="permissions_role" value="{{$default_role}}" />
+			{{else}}
+				{{include file="field_select_grouped.tpl" field=$role}}
+			{{/if}}
+
+			{{include file="field_input.tpl" field=$name}}
+			<div id="name-spinner"></div>
+
+			{{include file="field_input.tpl" field=$nickname}}
+			<div id="nick-spinner"></div>
+
+			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
+			<div id="newchannel-submit-end" class="clear"></div>
+
+			<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
+			<div id="newchannel-import-end" class="clear"></div>
+		</form>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/notes.tpl b/view/theme/redbasic/tpl/notes.tpl
new file mode 100644
index 000000000..c6d5d8a73
--- /dev/null
+++ b/view/theme/redbasic/tpl/notes.tpl
@@ -0,0 +1,35 @@
+<div class="widget">
+	<h3>{{$banner}}</h3>
+	<textarea name="note_text" id="note-text">{{$text}}</textarea>
+	<script>
+		var noteSaveTimer = null;
+		var noteText = $('#note-text');
+
+		$(document).ready(function(e){
+			noteText.on('change keyup keydown paste cut', function () {
+				noteText.height(0).height(noteText[0].scrollHeight);
+				$(document.body).trigger("sticky_kit:recalc");
+			}).change();
+		});
+
+		$(document).on('focusout',"#note-text",function(e){
+			if(noteSaveTimer)
+				clearTimeout(noteSaveTimer);
+			notePostFinal();
+			noteSaveTimer = null;
+		});
+
+		$(document).on('focusin',"#note-text",function(e){
+			noteSaveTimer = setTimeout(noteSaveChanges,10000);
+		});
+
+		function notePostFinal() {
+			$.post('notes/sync', { 'note_text' : $('#note-text').val() });
+		}
+
+		function noteSaveChanges() {
+			$.post('notes', { 'note_text' : $('#note-text').val() });
+			noteSaveTimer = setTimeout(noteSaveChanges,10000);
+		}
+	</script>
+</div>
diff --git a/view/theme/redbasic/tpl/notifications.tpl b/view/theme/redbasic/tpl/notifications.tpl
new file mode 100755
index 000000000..0b24da7c3
--- /dev/null
+++ b/view/theme/redbasic/tpl/notifications.tpl
@@ -0,0 +1,11 @@
+<div class="generic-content-wrapper-styled">
+
+<h1>{{$notif_header}}</h1>
+
+{{if $notifications_available}}
+<a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a>
+{{/if}}
+<div class="notif-network-wrapper">
+	{{$notif_content}}
+</div>
+</div>
diff --git a/view/theme/redbasic/tpl/notify.tpl b/view/theme/redbasic/tpl/notify.tpl
new file mode 100755
index 000000000..d3c79be82
--- /dev/null
+++ b/view/theme/redbasic/tpl/notify.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+</div>
diff --git a/view/theme/redbasic/tpl/nwiki_page_history.tpl b/view/theme/redbasic/tpl/nwiki_page_history.tpl
new file mode 100644
index 000000000..b1c6c9284
--- /dev/null
+++ b/view/theme/redbasic/tpl/nwiki_page_history.tpl
@@ -0,0 +1,59 @@
+<style>
+  .diff {
+    width:100%;
+    word-break: break-all;
+  }
+
+  .diff td{
+    padding:0 0.667em;
+    vertical-align:top;
+    white-space:pre;
+    white-space:pre-wrap;
+    font-family:Consolas,'Courier New',Courier,monospace;
+    font-size:1.0em;
+    line-height:1.333;
+  }
+
+  .diff span{
+    display:block;
+    min-height:1.333em;
+    margin-top:-1px;
+    padding:0 3px;
+  }
+
+  * html .diff span{
+    height:1.333em;
+  }
+
+  .diff span:first-child{
+    margin-top:0;
+  }
+
+  .diffDeleted span{
+    border:1px solid rgb(255,192,192);
+    background:rgb(255,224,224);
+  }
+
+  .diffInserted span{
+    border:1px solid rgb(192,255,192);
+    background:rgb(224,255,224);
+  }
+</style>
+<table class="" style="width: 100%;">
+  {{foreach $pageHistory as $commit}}
+  <tr class="wikis-index-row"><td>
+      <table id="rev-{{$commit.revision}}" onclick="$('#details-{{$commit.revision}}').show()" style="width: 100%;">
+        <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td>
+            <td rowspan="3" width="20%" align="right">
+		{{if $permsWrite}}
+              <button id="revert-{{$commit.revision}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.revision}}')">Revert</button>
+              <br><br>
+		{{/if}}
+              <button id="compare-{{$commit.revision}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.revision}}')">Compare</button>
+            </td></tr>
+        <tr><td>{{$name_lbl}}</td><td>{{$commit.name}}</td></tr>
+        <tr><td>{{$msg_label}}</td><td>{{$commit.title}}</td></tr>
+      </table>
+    </td></tr>
+  {{/foreach}}          
+</table>
diff --git a/view/theme/redbasic/tpl/oauth_authorize.tpl b/view/theme/redbasic/tpl/oauth_authorize.tpl
new file mode 100755
index 000000000..2b7afa80e
--- /dev/null
+++ b/view/theme/redbasic/tpl/oauth_authorize.tpl
@@ -0,0 +1,10 @@
+<h1>{{$title}}</h1>
+
+<div class='oauthapp'>
+	<img src='{{$app.icon}}'>
+	<h4>{{$app.name}}</h4>
+</div>
+<h3>{{$authorize}}</h3>
+<form method="POST">
+<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes}}" /></div>
+</form>
diff --git a/view/theme/redbasic/tpl/oauth_authorize_done.tpl b/view/theme/redbasic/tpl/oauth_authorize_done.tpl
new file mode 100755
index 000000000..2e91e0125
--- /dev/null
+++ b/view/theme/redbasic/tpl/oauth_authorize_done.tpl
@@ -0,0 +1,4 @@
+<h1>{{$title}}</h1>
+
+<p>{{$info}}</p>
+<code>{{$code}}</code>
diff --git a/view/theme/redbasic/tpl/oembed_video.tpl b/view/theme/redbasic/tpl/oembed_video.tpl
new file mode 100755
index 000000000..b0cfed2e5
--- /dev/null
+++ b/view/theme/redbasic/tpl/oembed_video.tpl
@@ -0,0 +1,4 @@
+<a href="{{$embedurl}}" onclick="this.innerHTML=Base64.decode('{{$escapedhtml}}'); return false;" style="float:left; margin: 1em; position: relative;">
+	<img width="{{$tw}}" height="{{$th}}" src="{{$turl}}" />
+	<div style="position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;"></div>
+</a>
diff --git a/view/theme/redbasic/tpl/oexchange_xrd.tpl b/view/theme/redbasic/tpl/oexchange_xrd.tpl
new file mode 100755
index 000000000..e865e07d9
--- /dev/null
+++ b/view/theme/redbasic/tpl/oexchange_xrd.tpl
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+        
+    <Subject>{{$base}}</Subject>
+
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/vendor">Zotlabs</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/title">Hubzilla</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/name">Hubzilla</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Hubzilla</Property>
+
+    <Link 
+        rel="icon" 
+        href="{{$base}}/images/hz-16.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel="icon32" 
+        href="{{$base}}/images/hz-32.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
+        href="{{$base}}/oexchange"
+        type="text/html" 
+        />
+</XRD>
+
diff --git a/view/theme/redbasic/tpl/page_display.tpl b/view/theme/redbasic/tpl/page_display.tpl
new file mode 100755
index 000000000..a320920c7
--- /dev/null
+++ b/view/theme/redbasic/tpl/page_display.tpl
@@ -0,0 +1,14 @@
+<div class="page">
+	<div class="generic-content-wrapper" id="page-content-wrapper" >
+		{{if $title}}
+		<div class="section-title-wrapper">
+			<h2 class="page-title">{{$title}}</h2>
+		</div>
+		{{/if}}
+		<div class="section-content-wrapper">
+			<div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
+			<div class="page-date">{{$date}}</div>
+			<div class="page-body">{{$body}}</div>
+		</div>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/page_display_empty.tpl b/view/theme/redbasic/tpl/page_display_empty.tpl
new file mode 100644
index 000000000..9f000dee8
--- /dev/null
+++ b/view/theme/redbasic/tpl/page_display_empty.tpl
@@ -0,0 +1 @@
+{{$body}}
\ No newline at end of file
diff --git a/view/theme/redbasic/tpl/pdledit.tpl b/view/theme/redbasic/tpl/pdledit.tpl
new file mode 100644
index 000000000..cef93d324
--- /dev/null
+++ b/view/theme/redbasic/tpl/pdledit.tpl
@@ -0,0 +1,24 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$header}}</h1>
+
+<h2>{{$mname}} {{$module}}</h2>
+
+<br />
+<a href="help/comanche" target="hubzilla-help">{{$help}}</a>
+<br />
+<br />
+
+
+
+<form action="pdledit" method="post" >
+<input type="hidden" name="module" value="{{$module}}" />
+<textarea rows="24" cols="80" name="content">{{$content}}</textarea>
+
+<br />
+<input type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+<script>
+	$('textarea').bbco_autocomplete('comanche');
+</script>
+</div>
diff --git a/view/theme/redbasic/tpl/peoplefind.tpl b/view/theme/redbasic/tpl/peoplefind.tpl
new file mode 100755
index 000000000..2ecfbaff9
--- /dev/null
+++ b/view/theme/redbasic/tpl/peoplefind.tpl
@@ -0,0 +1,17 @@
+<div id="peoplefind-sidebar" class="widget">
+	<h3>{{$findpeople}}</h3>
+	<form action="directory" method="post" />
+		<div class="input-group form-group">
+			<input class="form-control form-control-sm" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
+			<div class="input-group-btn">
+				<button class="btn btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button>
+			</div>
+		</div>
+	</form>
+	<ul class="nav nav-pills flex-column">
+		{{if $similar}}<li class="nav-item"><a class="nav-link" href="match" >{{$similar}}</a></li>{{/if}}
+		{{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}}
+		<li class="nav-item"><a class="nav-link" href="randprof" >{{$random}}</a></li>
+		{{if $loggedin}}{{if $inv}}<li class="nav-item"><a class="nav-link" href="invite" >{{$inv}}</a></li>{{/if}}{{/if}}
+	</ul>
+</div>
diff --git a/view/theme/redbasic/tpl/photo_album.tpl b/view/theme/redbasic/tpl/photo_album.tpl
new file mode 100755
index 000000000..8bacb1575
--- /dev/null
+++ b/view/theme/redbasic/tpl/photo_album.tpl
@@ -0,0 +1,32 @@
+<div class="{{if !$no_fullscreen_btn}}generic-content-wrapper{{/if}}">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			{{if $order}}
+			<a class="btn btn-outline-secondary btn-sm" href="{{$order.1}}" title="{{$order.0}}"><i class="fa fa-sort"></i></a>
+			{{/if}}
+			<div class="btn-group btn-group">
+				{{if $album_edit.1}}
+				<i class="fa fa-pencil btn btn-outline-secondary btn-sm" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
+				{{/if}}
+				{{if $can_post}}
+				<button class="btn btn-sm btn-success btn-sm" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
+				{{/if}}
+			</div>
+		</div>
+		<h2>{{$album}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{$upload_form}}
+	{{$album_edit.1}}
+	<div class="section-content-wrapper-np">
+		<div id="photo-album-contents-{{$album_id}}">
+			{{foreach $photos as $photo}}
+				{{include file="photo_top.tpl"}}
+			{{/foreach}}
+			<div id="page-end"></div>
+		</div>
+	</div>
+</div>
+<div class="photos-end"></div>
+<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
+<div id="page-spinner"></div>
diff --git a/view/theme/redbasic/tpl/photo_albums.tpl b/view/theme/redbasic/tpl/photo_albums.tpl
new file mode 100755
index 000000000..a238e61bc
--- /dev/null
+++ b/view/theme/redbasic/tpl/photo_albums.tpl
@@ -0,0 +1,13 @@
+<div id="side-bar-photos-albums" class="widget">
+	<h3>{{$title}}</h3>
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent}}</a></li>
+		{{if $albums}}
+		{{foreach $albums as $al}}
+		{{if $al.shorttext}}
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li>
+		{{/if}}
+		{{/foreach}}
+		{{/if}}
+	</ul>
+</div>
diff --git a/view/theme/redbasic/tpl/photo_drop.tpl b/view/theme/redbasic/tpl/photo_drop.tpl
new file mode 100755
index 000000000..664e5338c
--- /dev/null
+++ b/view/theme/redbasic/tpl/photo_drop.tpl
@@ -0,0 +1,3 @@
+<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
+	<a class="btn btn-outline-secondary btn-sm" href="#" onclick="dropItem('item/drop/{{$id}}', '#wall-item-outside-wrapper-{{$id}}'); return false;" title="{{$delete}}" ><i class="fa fa-trash-o"></i></a>
+</div>
diff --git a/view/theme/redbasic/tpl/photo_item.tpl b/view/theme/redbasic/tpl/photo_item.tpl
new file mode 100755
index 000000000..ec643c4a9
--- /dev/null
+++ b/view/theme/redbasic/tpl/photo_item.tpl
@@ -0,0 +1,34 @@
+<div class="wall-item-outside-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-outside-wrapper-{{$id}}" >
+	<div class="wall-item-content-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;">
+		<div class="wall-item-head">
+			<div class="wall-item-info" id="wall-item-info-{{$id}}" >
+				<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
+					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
+					<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
+				</div>
+			</div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
+				<div class="wall-item-author">
+					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a>
+				</div>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
+			</div>
+		</div>
+		<div class="wall-item-content" id="wall-item-content-{{$id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
+			<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
+
+		</div>
+		{{if $drop}}
+		<div class="wall-item-tools" id="wall-item-tools-{{$id}}" >
+			<div class="wall-item-tools-right pull-right">
+				{{$drop}}
+			</div>
+			<div class="clear"></div>
+		</div>
+		{{/if}}
+		<div class="clear"></div>
+		{{$comment}}
+	</div>
+</div>
+
diff --git a/view/theme/redbasic/tpl/photo_top.tpl b/view/theme/redbasic/tpl/photo_top.tpl
new file mode 100755
index 000000000..a86aa7f80
--- /dev/null
+++ b/view/theme/redbasic/tpl/photo_top.tpl
@@ -0,0 +1,4 @@
+<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
+	<img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
+</a>
+
diff --git a/view/theme/redbasic/tpl/photo_view.tpl b/view/theme/redbasic/tpl/photo_view.tpl
new file mode 100755
index 000000000..2431329ec
--- /dev/null
+++ b/view/theme/redbasic/tpl/photo_view.tpl
@@ -0,0 +1,172 @@
+<div id="live-photos"></div>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			{{if $tools || $map || $edit}}
+			<div class="btn-group">
+				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
+					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
+				</button>
+				<div class="dropdown-menu dropdown-menu-right flex-column">
+					{{if $tools}}
+					<a class="dropdown-item" href="{{$tools.profile.0}}"><i class="fa fa-user"></i>&nbsp;{{$tools.profile.1}}</a>
+					<a class="dropdown-item" href="{{$tools.cover.0}}"><i class="fa fa-picture-o"></i>&nbsp;{{$tools.cover.1}}</a>
+					{{/if}}
+					{{if $map}}
+					<a class="dropdown-item" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="fa fa-globe"></i>&nbsp;{{$map_text}}</a>
+					{{/if}}
+					{{if $edit}}
+					<a class="dropdown-item acl-form-trigger" href="#"  title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i>&nbsp;{{$edit.edit}}</a>
+					{{/if}}
+				</div>
+			</div>
+			{{/if}}
+			{{if $lock}}
+			<div class="btn-group">
+				<button id="lockview" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ><i class="fa fa-lock"></i></button>
+				<ul id="panel-{{$id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
+			</div>
+			{{/if}}
+			{{if $prevlink || $nextlink}}
+			<div class="btn-group">
+				{{if $prevlink}}
+				<a href="{{$prevlink.0}}" class="btn btn-outline-secondary btn-sm" title="{{$prevlink.1}}"><i class="fa fa-backward"></i></a>
+				{{/if}}
+				{{if $nextlink}}
+				<a href="{{$nextlink.0}}" class="btn btn-outline-secondary btn-sm" title="{{$nextlink.1}}"><i class="fa fa-forward"></i></a>
+				{{/if}}
+			</div>
+			{{/if}}
+		</div>
+		<h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="photo-map">
+	{{$map}}
+	</div>
+	<div id="photo-edit" class="section-content-tools-wrapper">
+		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" class="acl-form" data-form_id="photo_edit_form" data-allow_cid='{{$edit.allow_cid}}' data-allow_gid='{{$edit.allow_gid}}' data-deny_cid='{{$edit.deny_cid}}' data-deny_gid='{{$edit.deny_gid}}'>
+			<input type="hidden" name="item_id" value="{{$edit.item_id}}" />
+			{{* album renaming is not supported atm.
+			<div class="form-group">
+				<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum_label}}</label>
+				<input id="photo-edit-albumname" class="form-control" type="text" name="albname" value="{{$edit.album}}" placeholder="{{$edit.newalbum_placeholder}}" list="dl-albums" />
+				{{if $edit.albums}}
+				<datalist id="dl-albums">
+				{{foreach $edit.albums as $al}}
+					{{if $al.text}}
+					<option value="{{$al.text}}">
+					{{/if}}
+				{{/foreach}}
+				</datalist>
+				{{/if}}
+			</div>
+			*}}
+			<div class="form-group">
+				<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
+				<input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" />
+			</div>
+			<div class="form-group">
+				<label id="photo-edit-tags-label" for="photo-edit-newtag">{{$edit.tag_label}}</label>
+				<input name="newtag" id="photo-edit-newtag" class="form-control" title="{{$edit.help_tags}}" type="text" />
+			</div>
+			<div class="form-group">
+				{{include file="field_select.tpl" field=$edit.album_select}}
+			</div>
+			<div class="form-group">
+				<label class="radio-inline" id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw"><input id="photo-edit-rotate-cw" type="radio" name="rotate" value="1" />{{$edit.rotatecw}}</label>
+				<label class="radio-inline" id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw"><input id="photo-edit-rotate-ccw" type="radio" name="rotate" value="2" />{{$edit.rotateccw}}</label>
+			</div>
+			{{if $edit.adult_enabled}}
+			<div class="form-group">
+			{{include file="field_checkbox.tpl" field=$edit.adult}}
+			</div>
+			{{/if}}
+
+			<div class="form-group pull-left">
+				<button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button>
+			</div>
+			<div class="form-group btn-group pull-right">
+				{{if $edit.aclselect}}
+				<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+					<i id="jot-perms-icon" class="fa fa-{{$edit.lockstate}}"></i>
+				</button>
+				{{/if}}
+				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
+			</div>
+		</form>
+		{{$edit.aclselect}}
+		<div id="photo-edit-end" class="clear"></div>
+	</div>
+	<div id="photo-view-wrapper">
+		<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
+		<div id="photo-photo-end" class="clear"></div>
+		{{if $tags}}
+		<div class="photo-item-tools-left" id="in-this-photo">
+			<span id="in-this-photo-text">{{$tag_hdr}}</span>
+			{{foreach $tags as $t}}
+				{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}" onclick="return confirmDelete();"><i class="fa fa-times"></i></a>&nbsp;</span>{{/if}}
+			{{/foreach}}
+		</div>
+		{{/if}}
+		<div class="photo-item-tools">
+			{{if $responses.count }}
+			<div class="photo-item-tools-left pull-left">
+				<div class="{{if $responses.count > 1}}btn-group{{/if}}">
+				{{foreach $responses as $verb=>$response}}
+					{{if $response.count}}
+					<div class="btn-group">
+						<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button>
+						{{if $response.list_part}}
+						<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+						{{else}}
+						<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+						{{/if}}
+						{{if $response.list_part}}
+						<div class="modal" id="{{$verb}}Modal-{{$id}}">
+							<div class="modal-dialog">
+								<div class="modal-content">
+									<div class="modal-header">
+										<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+										<h4 class="modal-title">{{$response.title}}</h4>
+									</div>
+									<div class="modal-body">
+										<ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+									</div>
+									<div class="modal-footer clear">
+										<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$modal_dismiss}}</button>
+									</div>
+								</div><!-- /.modal-content -->
+							</div><!-- /.modal-dialog -->
+						</div><!-- /.modal -->
+						{{/if}}
+					</div>
+					{{/if}}
+				{{/foreach}}
+				</div>
+			</div>
+			{{/if}}
+			{{if $likebuttons}}
+			<div class="photo-item-tools-right btn-group pull-right">
+				<button type="button" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$likebuttons.id}},'like'); return false">
+					<i class="fa fa-thumbs-o-up" title="{{$likebuttons.likethis}}"></i>
+				</button>
+				<button type="button" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$likebuttons.id}},'dislike'); return false">
+					<i class="fa fa-thumbs-o-down" title="{{$likebuttons.nolike}}"></i>
+				</button>
+			</div>
+			<div id="like-rotator-{{$likebuttons.id}}" class="photo-like-rotator pull-right"></div>
+			{{/if}}
+			<div class="clear"></div>
+		</div>
+	</div>
+	{{$comments}}
+	{{if $commentbox}}
+	<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
+		{{$commentbox}}
+	</div>
+	{{/if}}
+	<div class="clear"></div>
+</div>
+{{$paginate}}
+
diff --git a/view/theme/redbasic/tpl/photos_recent.tpl b/view/theme/redbasic/tpl/photos_recent.tpl
new file mode 100755
index 000000000..8fe631ca6
--- /dev/null
+++ b/view/theme/redbasic/tpl/photos_recent.tpl
@@ -0,0 +1,23 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			{{if $can_post}}
+			<button class="btn btn-sm btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
+			{{/if}}
+		</div>
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{$upload_form}}
+	<div class="section-content-wrapper-np">
+		<div id="photo-album-contents-{{$album_id}}">
+			{{foreach $photos as $photo}}
+				{{include file="photo_top.tpl"}}
+			{{/foreach}}
+			<div id="page-end"></div>
+		</div>
+	</div>
+</div>
+<div class="photos-end"></div>
+<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
+<div id="page-spinner"></div>
diff --git a/view/theme/redbasic/tpl/photos_upload.tpl b/view/theme/redbasic/tpl/photos_upload.tpl
new file mode 100755
index 000000000..d52bad5a2
--- /dev/null
+++ b/view/theme/redbasic/tpl/photos_upload.tpl
@@ -0,0 +1,61 @@
+<div id="photo-upload-form">
+	<div class="section-content-tools-wrapper">
+		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
+
+			<div class="form-group">
+				<label for="photos-upload-album">{{$newalbum_label}}</label>
+				<input type="text" class="form-control" id="photos-upload-album" name="newalbum" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload">
+				<datalist id="dl-photo-upload">
+				{{foreach $albums as $al}}
+					{{if $al.text}}
+					<option value="{{$al.text}}" />
+					{{/if}}
+				{{/foreach}}
+				</datalist>
+			</div>
+			{{if $default}}
+			<div class="form-group">
+				<input id="photos-upload-choose" type="file" name="userfile" />
+			</div>
+			{{include file="field_input.tpl" field=$caption}}
+			{{include file="field_checkbox.tpl" field=$visible}}
+			<div id="body-textarea">
+			{{include file="field_textarea.tpl" field=$body}}
+			</div>
+			<div class="pull-right btn-group">
+				<div class="btn-group">
+					{{if $lockstate}}
+					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+						<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
+					</button>
+					{{/if}}
+					<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
+				</div>
+
+			</div>
+			{{/if}}
+			<div class="clear"></div>
+
+			{{if $uploader}}
+			{{include file="field_input.tpl" field=$caption}}
+			{{include file="field_checkbox.tpl" field=$visible}}
+			<div id="body-textarea">
+			{{include file="field_textarea.tpl" field=$body}}
+			</div>
+			<div id="photos-upload-perms" class="btn-group pull-right">
+				{{if $lockstate}}
+				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+					<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
+				</button>
+				{{/if}}
+				<div class="pull-right">
+					{{$uploader}}
+				</div>
+			</div>
+			{{/if}}
+		</form>
+	</div>
+	{{$aclselect}}
+	<div id="photos-upload-end" class="clear"></div>
+</div>
diff --git a/view/theme/redbasic/tpl/photosajax.tpl b/view/theme/redbasic/tpl/photosajax.tpl
new file mode 100755
index 000000000..45191db85
--- /dev/null
+++ b/view/theme/redbasic/tpl/photosajax.tpl
@@ -0,0 +1,4 @@
+{{foreach $photos as $photo}}
+{{include file="photo_top.tpl"}}
+{{/foreach}}
+<script>justifyPhotosAjax('photo-album-contents-{{$album_id}}')</script>
diff --git a/view/theme/redbasic/tpl/poco_entry_xml.tpl b/view/theme/redbasic/tpl/poco_entry_xml.tpl
new file mode 100755
index 000000000..30b6268dc
--- /dev/null
+++ b/view/theme/redbasic/tpl/poco_entry_xml.tpl
@@ -0,0 +1,8 @@
+<entry>
+{{if $entry.id}}<id>{{$entry.id}}</id>{{/if}}
+{{if $entry.displayName}}<displayName>{{$entry.displayName}}</displayName>{{/if}}
+{{if $entry.preferredUsername}}<preferredUsername>{{$entry.preferredUsername}}</preferredUsername>{{/if}}
+{{if $entry.rating}}<rating>{{$entry.rating}}</rating>{{/if}}
+{{if $entry.urls}}{{foreach $entry.urls as $url}}<urls><value>{{$url.value}}</value><type>{{$url.type}}</type></urls>{{/foreach}}{{/if}}
+{{if $entry.photos}}{{foreach $entry.photos as $photo}}<photos><value>{{$photo.value}}</value><type>{{$photo.type}}</type></photos>{{/foreach}}{{/if}}
+</entry>
diff --git a/view/theme/redbasic/tpl/poco_xml.tpl b/view/theme/redbasic/tpl/poco_xml.tpl
new file mode 100755
index 000000000..0e38a692c
--- /dev/null
+++ b/view/theme/redbasic/tpl/poco_xml.tpl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<response>
+{{if $response.sorted}}<sorted>{{$response.sorted}}</sorted>{{/if}}
+{{if $response.filtered}}<filtered>{{$response.filtered}}</filtered>{{/if}}
+{{if $response.updatedSince}}<updatedSince>{{$response.updatedSince}}</updatedSince>{{/if}}
+<startIndex>{{$response.startIndex}}</startIndex>
+<itemsPerPage>{{$response.itemsPerPage}}</itemsPerPage>
+<totalResults>{{$response.totalResults}}</totalResults>
+
+
+{{if $response.totalResults}}
+{{foreach $response.entry as $entry}}
+{{include file="poco_entry_xml.tpl"}}
+{{/foreach}}
+{{else}}
+<entry></entry>
+{{/if}}
+</response>
diff --git a/view/theme/redbasic/tpl/poke_content.tpl b/view/theme/redbasic/tpl/poke_content.tpl
new file mode 100755
index 000000000..f368cb024
--- /dev/null
+++ b/view/theme/redbasic/tpl/poke_content.tpl
@@ -0,0 +1,48 @@
+
+<div id="poke-content" class="generic-content-wrapper">
+    <div class="section-title-wrapper">
+    <h2>{{$title}}</h2>
+    </div>
+    <div class="section-content-wrapper">
+
+	<div id="poke-desc">{{$desc}}</div>
+
+<br />
+<br />
+
+
+<form action="poke" method="get">
+
+
+<div class="form-group field input">
+	<label id="poke-recip-label" for="poke-recip">{{$clabel}}</label>
+	<input class="form-control" id="poke-recip" type="text" value="{{$name}}" name="pokename" autocomplete="off" />
+</div>
+
+	<input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
+	<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
+
+
+{{if $poke_basic}}
+<input type="hidden" name="verb" value="poke" />
+{{else}}
+<div class="form-group field custom">
+	<label for="poke-verb-select" id="poke-verb-lbl">{{$choice}}</label>
+	<select class="form-control" name="verb" id="poke-verb-select" >
+	{{foreach $verbs as $v}}
+	<option value="{{$v.0}}">{{$v.1}}</option>
+	{{/foreach}}
+	</select>
+</div>
+{{/if}}
+
+{{if ! $parent}}
+{{include file="field_checkbox.tpl" field=$private}}
+{{/if}}
+
+<input type="submit" name="submit" value="{{$submit}}" />
+</form>
+
+
+    </div>
+</div>
diff --git a/view/theme/redbasic/tpl/posted_date_widget.tpl b/view/theme/redbasic/tpl/posted_date_widget.tpl
new file mode 100755
index 000000000..fb43c744b
--- /dev/null
+++ b/view/theme/redbasic/tpl/posted_date_widget.tpl
@@ -0,0 +1,46 @@
+<script>
+
+function toggle_posted_date_button() {
+	if($('#posted-date-dropdown').is(':visible')) {
+		$('#posted-date-icon').removeClass('fa-caret-up');
+		$('#posted-date-icon').addClass('fa-cog');
+		$('#posted-date-dropdown').hide();
+	}
+	else {
+		$('#posted-date-icon').addClass('fa-caret-up');
+		$('#posted-date-icon').removeClass('fa-cog');
+		$('#posted-date-dropdown').show();
+	}
+}
+</script>
+		
+
+<div id="datebrowse-sidebar" class="widget">
+	<h3>{{$title}}</h3>
+	<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
+	<ul id="posted-date-selector" class="nav nav-pills flex-column">
+		{{foreach $dates as $y => $arr}}
+		{{if $y == $cutoff_year}}
+		</ul>
+		<div id="posted-date-dropdown" style="display: none;">
+		<ul id="posted-date-selector-drop" class="nav nav-pills flex-column">
+		{{/if}} 
+		<li class="nav-item" id="posted-date-selector-year-{{$y}}">
+			<a class="nav-link" href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a>
+		</li>
+		<div id="posted-date-selector-{{$y}}" style="display: none;">
+			<ul class="posted-date-selector-months nav nav-pills flex-column">
+				{{foreach $arr as $d}}
+				<li class="nav-item">
+					<a class="nav-link" href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}{{if $showend}}&dbegin={{$d.2}}{{/if}}'); return false;">{{$d.0}}</a>
+				</li>
+				{{/foreach}}
+			</ul>
+		</div>
+		{{/foreach}}
+		{{if $cutoff}}
+		</div>
+		<button class="btn btn-outline-secondary btn-sm" onclick="toggle_posted_date_button(); return false;"><i id="posted-date-icon" class="fa fa-cog"></i></button>
+		{{/if}}
+	</ul>
+</div>
diff --git a/view/theme/redbasic/tpl/prep.tpl b/view/theme/redbasic/tpl/prep.tpl
new file mode 100644
index 000000000..debba13a8
--- /dev/null
+++ b/view/theme/redbasic/tpl/prep.tpl
@@ -0,0 +1,31 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$header}}</h1>
+
+{{if $site}}
+<h3>{{$website}} {{$site}}</h3>
+{{/if}}
+
+
+{{if $raters}}
+{{foreach $raters as $r}}
+
+<div class="directory-item lframe" id="directory-item-{{$r.xchan_hash}}" >
+
+<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$r.xchan_hash}}" >
+<div class="contact-photo" id="directory-photo-{{$r.xchan_hash}}" >
+<a href="{{$r.xchan_url}}" class="directory-profile-link" id="directory-profile-link-{{$r.xchan_hash}}" ><img class="directory-photo-img" src="{{$r.xchan_photo_m}}" alt="{{$r.xchan_addr}}" title="{{$r.xchan_addr}}" /></a>
+</div>
+</div>
+<div class="prep-details contact-info">
+<a href="{{$r.xchan_url}}" class="directory-profile-link" id="directory-profile-link-{{$r.xchan_hash}}" ><div class="contact-name">{{$r.xchan_name}}</div></a>
+<div class="rating-value">{{$rating_lbl}} <span class="prep-rating-value">{{$r.xlink_rating}}</span></div>
+{{if $r.xlink_rating_text}}
+<div class="rating-text">{{$rating_text_label}} {{$r.xlink_rating_text}}
+</div>
+{{/if}}
+</div>
+<div class="clear"></div>
+</div>
+{{/foreach}}
+{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/profdef_edit.tpl b/view/theme/redbasic/tpl/profdef_edit.tpl
new file mode 100644
index 000000000..bfe85314d
--- /dev/null
+++ b/view/theme/redbasic/tpl/profdef_edit.tpl
@@ -0,0 +1,16 @@
+<h3>{{$header}}</h3>
+
+<form action="admin/profs" method="post" >
+
+{{if $id}}
+<input type="hidden" name="id" value="{{$id}}" />
+{{/if}}
+
+{{include file="field_input.tpl" field=$field_name}}
+{{include file="field_input.tpl" field=$field_type}}
+{{include file="field_input.tpl" field=$field_desc}}
+{{include file="field_input.tpl" field=$field_help}}
+
+<input name="submit" type="submit" value="{{$submit}}" />
+
+</form>
diff --git a/view/theme/redbasic/tpl/profed_head.tpl b/view/theme/redbasic/tpl/profed_head.tpl
new file mode 100755
index 000000000..ce774052a
--- /dev/null
+++ b/view/theme/redbasic/tpl/profed_head.tpl
@@ -0,0 +1,2 @@
+<script language="javascript" type="text/javascript"></script>
+
diff --git a/view/theme/redbasic/tpl/profile_advanced.tpl b/view/theme/redbasic/tpl/profile_advanced.tpl
new file mode 100755
index 000000000..c56062459
--- /dev/null
+++ b/view/theme/redbasic/tpl/profile_advanced.tpl
@@ -0,0 +1,341 @@
+<div id="profile-content-wrapper" class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="float-right">
+			{{if $profile.like_count}}
+			<div class="btn-group">
+				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button>
+				{{if $profile.likers}}
+				<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
+				{{/if}}
+			</div>
+			{{/if}}
+			{{if $profile.canlike}}
+			<div class="btn-group">
+				<button type="button" class="btn btn-success btn-sm" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
+					<i class="fa fa-thumbs-o-up" title="{{$profile.likethis}}"></i>
+				</button>
+			</div>
+			{{/if}}
+			{{if $editmenu.multi}}
+			<div class="btn-group">
+				<a class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
+				<div class="dropdown-menu dropdown-menu-right">
+					{{foreach $editmenu.menu.entries as $e}}
+					<a class="dropdown-item" href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'> {{$e.profile_name}}</a>
+					{{/foreach}}
+					<a class="dropdown-item" href="profile_photo" >{{$editmenu.menu.chg_photo}}</a>
+					{{if $editmenu.menu.cr_new}}
+					<a class="dropdown-item" href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a>
+					{{/if}}
+				</div>
+			</div>
+			{{elseif $editmenu}}
+			<div class="btn-group">
+				<a class="btn btn-primary btn-sm" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
+			</div>
+			{{/if}}
+			{{if $exportlink}}
+			<div class="btn-group">
+				<a class="btn btn-outline-secondary btn-sm" href="{{$exportlink}}" ><i class="fa fa-vcard"></i>&nbsp;{{$export}}</a>
+			</div>
+			{{/if}}
+		</div>
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-wrapper">
+
+	{{foreach $fields as $f}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		{{if $f == 'name'}}
+			<dl id="aprofile-fullname" class="aprofile">
+			 <dt>{{$profile.fullname.0}}</dt>
+			 <dd>{{$profile.fullname.1}}</dd>
+			</dl>
+		{{/if}}
+
+		{{if $f == 'fullname'}}
+			<dl id="aprofile-fullname" class="aprofile">
+			 <dt>{{$profile.fullname.0}}</dt>
+			 <dd>{{$profile.fullname.1}}</dd>
+			</dl>
+		{{/if}}
+
+		{{if $f == 'gender'}}
+		{{if $profile.gender}}
+		<dl id="aprofile-gender" class="aprofile">
+		 <dt>{{$profile.gender.0}}</dt>
+		 <dd>{{$profile.gender.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'birthday'}}
+		{{if $profile.birthday}}
+		<dl id="aprofile-birthday" class="aprofile">
+		 <dt>{{$profile.birthday.0}}</dt>
+		 <dd>{{$profile.birthday.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'age'}}
+		{{if $profile.age}}
+		<dl id="aprofile-age" class="aprofile">
+		 <dt>{{$profile.age.0}}</dt>
+		 <dd>{{$profile.age.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'marital'}}
+		{{if $profile.marital}}
+		<dl id="aprofile-marital" class="aprofile">
+		 <dt><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$profile.marital.0}}</dt>
+		 <dd>{{$profile.marital.1}}{{if in_array('partner',$fields)}}{{if $profile.marital.partner}} ({{$profile.marital.partner}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'sexual'}}
+		{{if $profile.sexual}}
+		<dl id="aprofile-sexual" class="aprofile">
+		 <dt>{{$profile.sexual.0}}</dt>
+		 <dd>{{$profile.sexual.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'keywords'}}
+		{{if $profile.keywords}}
+		<dl id="aprofile-tags" class="aprofile">
+		 <dt>{{$profile.keywords.0}}</dt>
+		 <dd>{{$profile.keywords.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'homepage'}}
+		{{if $profile.homepage}}
+		<dl id="aprofile-homepage" class="aprofile">
+		 <dt>{{$profile.homepage.0}}</dt>
+		 <dd>{{$profile.homepage.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'hometown'}}
+		{{if $profile.hometown}}
+		<dl id="aprofile-hometown" class="aprofile">
+		 <dt>{{$profile.hometown.0}}</dt>
+		 <dd>{{$profile.hometown.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'politic'}}
+		{{if $profile.politic}}
+		<dl id="aprofile-politic" class="aprofile">
+		 <dt>{{$profile.politic.0}}</dt>
+		 <dd>{{$profile.politic.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'religion'}}
+		{{if $profile.religion}}
+		<dl id="aprofile-religion" class="aprofile">
+		 <dt>{{$profile.religion.0}}</dt>
+		 <dd>{{$profile.religion.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'about'}}
+		{{if $profile.about}}
+		<dl id="aprofile-about" class="aprofile">
+		 <dt>{{$profile.about.0}}</dt>
+		 <dd>{{$profile.about.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'interest'}}
+		{{if $profile.interest}}
+		<dl id="aprofile-interest" class="aprofile">
+		 <dt>{{$profile.interest.0}}</dt>
+		 <dd>{{$profile.interest.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'likes'}}
+		{{if $profile.likes}}
+		<dl id="aprofile-likes" class="aprofile">
+		 <dt>{{$profile.likes.0}}</dt>
+		 <dd>{{$profile.likes.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'dislikes'}}
+		{{if $profile.dislikes}}
+		<dl id="aprofile-dislikes" class="aprofile">
+		 <dt>{{$profile.dislikes.0}}</dt>
+		 <dd>{{$profile.dislikes.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'contact'}}
+		{{if $profile.contact}}
+		<dl id="aprofile-contact" class="aprofile">
+		 <dt>{{$profile.contact.0}}</dt>
+		 <dd>{{$profile.contact.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'channels'}}
+		{{if $profile.channels}}
+		<dl id="aprofile-channels" class="aprofile">
+		 <dt>{{$profile.channels.0}}</dt>
+		 <dd>{{$profile.channels.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'music'}}
+		{{if $profile.music}}
+		<dl id="aprofile-music" class="aprofile">
+		 <dt>{{$profile.music.0}}</dt>
+		 <dd>{{$profile.music.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'book'}}
+		{{if $profile.book}}
+		<dl id="aprofile-book" class="aprofile">
+		 <dt>{{$profile.book.0}}</dt>
+		 <dd>{{$profile.book.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'tv'}}
+		{{if $profile.tv}}
+		<dl id="aprofile-tv" class="aprofile">
+		 <dt>{{$profile.tv.0}}</dt>
+		 <dd>{{$profile.tv.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'film'}}
+		{{if $profile.film}}
+		<dl id="aprofile-film" class="aprofile">
+		 <dt>{{$profile.film.0}}</dt>
+		 <dd>{{$profile.film.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'romance'}}
+		{{if $profile.romance}}
+		<dl id="aprofile-romance" class="aprofile">
+		 <dt>{{$profile.romance.0}}</dt>
+		 <dd>{{$profile.romance.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'employment'}}
+		{{if $profile.employment}}
+		<dl id="aprofile-work" class="aprofile">
+		 <dt>{{$profile.employment.0}}</dt>
+		 <dd>{{$profile.employment.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'education'}}
+		{{if $profile.education}}
+		<dl id="aprofile-education" class="aprofile">
+		 <dt>{{$profile.education.0}}</dt>
+		 <dd>{{$profile.education.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{foreach $profile.extra_fields as $fld}}
+		{{if $f == $fld}}
+		{{if $profile.$fld}}
+		<dl id="aprofile-{{$fld}}" class="aprofile">
+		 <dt>{{$profile.$fld.0}}</dt>
+		 <dd>{{$profile.$fld.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+		{{/foreach}}
+	{{/foreach}}
+
+
+		{{if $things}}
+		{{foreach $things as $key => $items}}
+		<b>{{$profile.fullname.1}} {{$key}}</b>
+		<ul class="profile-thing-list">
+		{{foreach $items as $item}}
+		<li>{{if $item.img}}<a href="{{$item.url}}" ><img src="{{$item.img}}" class="profile-thing-img" width="100" height="100" alt="{{$item.term}}" /></a>{{/if}}
+		<a href="{{$item.editurl}}" >{{$item.term}}</a>
+		{{if $profile.canlike}}<br />
+		<button type="button" class="btn btn-outline-secondary btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" >
+		<i class="fa fa-thumbs-o-up" title="{{$likethis}}"></i>
+		</button>
+		{{/if}}
+		{{if $item.like_count}}
+		<div class="btn-group">
+		<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button>
+		{{if $item.likes}}
+		<ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}"><img class="dropdown-menu-img-xs" src="{{$liker.xchan_photo_s}}" alt="{{$liker.name}}" /> {{$liker.xchan_name}}</a></li>{{/foreach}}</ul>
+		{{/if}}
+		</div>
+		{{/if}}
+		</li>
+		{{/foreach}}
+		</ul>
+		<div class="clear"></div>
+		{{/foreach}}
+		{{/if}}
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/profile_edit.tpl b/view/theme/redbasic/tpl/profile_edit.tpl
new file mode 100755
index 000000000..05137479f
--- /dev/null
+++ b/view/theme/redbasic/tpl/profile_edit.tpl
@@ -0,0 +1,401 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="dropdown float-right" id="profile-edit-links">
+			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+				<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
+			</button>
+			<div class="dropdown-menu">
+				<a class="dropdown-item" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="fa fa-fw fa-user"></i>&nbsp;{{$profpic}}</a>
+				{{if $is_default}}
+				<a class="dropdown-item" href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="fa fa-fw fa-picture-o"></i>&nbsp;{{$coverpic}}</a>
+				{{/if}}
+				{{if ! $is_default}}
+				<a class="dropdown-item" href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-fw fa-pencil"></i>&nbsp;{{$editvis}}</a>
+				{{/if}}
+				<a class="dropdown-item" href="thing" id="profile-edit-thing-link" title="{{$addthing}}"><i class="fa fa-fw fa-plus-circle"></i>&nbsp;{{$addthing}}</a>
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a>
+				{{if $profile_clone_link}}
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a>
+				{{/if}}
+				{{if $exportable}}
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="profiles/export/{{$profile_id}}">{{$lbl_export}}</a>
+				<a class="dropdown-item" href="#" onClick="openClose('profile-upload-form'); return false;">{{$lbl_import}}</a>
+				{{/if}}
+				{{if ! $is_default}}
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$del_prof}}</a>
+				{{/if}}
+			</div>
+		</div>
+		<h2>{{$banner}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-tools-wrapper" id="profile-upload-form">
+		<label id="profile-upload-choose-label" for="profile-upload-choose" >{{$lbl_import}}</label>
+		<input id="profile-upload-choose" type="file" name="userfile">
+	</div>
+
+		<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" >
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+			{{if $is_default}}
+			<div class="section-content-info-wrapper">{{$default}}</div>
+			{{/if}}
+
+			<div class="panel-group" id="profile-edit-wrapper" role="tablist" aria-multiselectable="true">
+				<div class="panel">
+					<div class="section-subtitle-wrapper" role="tab" id="personal">
+						<h3>
+							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#personal-collapse" aria-expanded="true" aria-controls="personal-collapse">
+								{{$personal}}
+							</a>
+						</h3>
+					</div>
+					<div id="personal-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="personal">
+						<div class="section-content-tools-wrapper">
+							{{include file="field_input.tpl" field=$profile_name}}
+
+							{{include file="field_input.tpl" field=$name}}
+
+							{{if $fields.pdesc}}
+							{{include file="field_input.tpl" field=$pdesc}}
+							{{/if}}
+
+							{{if $fields.gender}}
+							<div id="profile-edit-gender-wrapper" class="form-group field select" >
+							<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}}</label>
+							{{if $advanced}}
+							{{$gender}}
+							{{else}}
+							{{$gender_min}}
+							{{/if}}
+							</div>
+							<div class="clear"></div>
+							{{/if}}
+
+							{{if $fields.dob}}
+							{{$dob}}
+							{{/if}}
+
+							{{include file="field_checkbox.tpl" field=$hide_friends}}
+
+							<div class="form-group" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+							</div>
+							<div class="clear"></div>
+						</div>
+					</div>
+				</div>
+
+				{{if $fields.comms }}
+
+				<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
+					<select name="tel_type[]">
+						<option value="CELL">{{$mobile}}</option>
+						<option value="HOME">{{$home}}</option>
+						<option value="WORK">{{$work}}</option>
+						<option value="OTHER">{{$other}}</option>
+					</select>
+					<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
+					<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				</div>
+
+				<div id="template-form-vcard-email" class="form-group form-vcard-email">
+					<select name="email_type[]">
+						<option value="HOME">{{$home}}</option>
+						<option value="WORK">{{$work}}</option>
+						<option value="OTHER">{{$other}}</option>
+					</select>
+					<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
+					<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				</div>
+
+				<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
+					<select name="impp_type[]">
+						<option value="HOME">{{$home}}</option>
+						<option value="WORK">{{$work}}</option>
+						<option value="OTHER">{{$other}}</option>
+					</select>
+					<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
+					<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				</div>
+
+				<div class="section-content-wrapper-np">
+					<div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
+					<div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field">
+						<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+						<ul class="dropdown-menu">
+							<li class="add-vcard-tel"><a href="#" data-add="vcard-tel" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$tel_label}}</a></li>
+							<li class="add-vcard-email"><a href="#" data-add="vcard-email" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$email_label}}</a></li>
+							<li class="add-vcard-impp"><a href="#" data-add="vcard-impp" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$impp_label}}</a></li>
+						</ul>
+					</div>
+					<div id="vcard-header-{{$vcard.id}}" class="vcard-header" data-id="{{$vcard.id}}" data-action="open">
+						<i class="vcard-fn-preview fa fa-address-card-o"></i>
+						<span id="vcard-preview-{{$vcard.id}}" class="vcard-preview">
+							{{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}}
+							{{if $vcard.emails.0.address}}<span class="vcard-email-preview hidden-xs"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}}
+							{{if $vcard.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}}
+						</span>
+						<input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}">
+					</div>
+				</div>
+				<div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper">
+
+					<div class="vcard-tel form-group">
+						<div class="form-vcard-tel-wrapper">
+							{{if $vcard.tels}}
+							{{foreach $vcard.tels as $tel}}
+							<div class="form-group form-vcard-tel">
+								<select name="tel_type[]">
+									<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
+									<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
+									<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+									<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+									<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+								</select>
+								<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
+								<i data-remove="vcard-tel" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+							</div>
+							{{/foreach}}
+							{{/if}}
+						</div>
+					</div>
+
+
+					<div class="vcard-email form-group">
+						<div class="form-vcard-email-wrapper">
+							{{if $vcard.emails}}
+							{{foreach $vcard.emails as $email}}
+							<div class="form-group form-vcard-email">
+								<select name="email_type[]">
+									<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
+									<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+									<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+									<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+								</select>
+								<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
+								<i data-remove="vcard-email" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+							</div>
+							{{/foreach}}
+							{{/if}}
+						</div>
+					</div>
+
+					<div class="vcard-impp form-group">
+						<div class="form-vcard-impp-wrapper">
+							{{if $vcard.impps}}
+							{{foreach $vcard.impps as $impp}}
+							<div class="form-group form-vcard-impp">
+								<select name="impp_type[]">
+									<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
+									<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+									<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+									<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+								</select>
+								<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
+								<i data-remove="vcard-impp" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+							</div>
+							{{/foreach}}
+							{{/if}}
+						</div>
+					</div>
+
+					<div class="settings-submit-wrapper" >
+						<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+					</div>
+				</div>
+				{{/if}}
+
+
+				{{if $fields.address || $fields.locality || $fields.postal_code || $fields.region || $fields.country_name || $fields.hometown}}
+				<div class="panel">
+					<div class="section-subtitle-wrapper" role="tab" id="location">
+						<h3>
+							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#location-collapse" aria-expanded="true" aria-controls="location-collapse">
+								{{$location}}
+							</a>
+						</h3>
+					</div>
+					<div id="location-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="location">
+						<div class="section-content-tools-wrapper">
+							{{if $fields.address}}
+							{{include file="field_input.tpl" field=$address}}
+							{{/if}}
+
+							{{if $fields.locality}}
+							{{include file="field_input.tpl" field=$locality}}
+							{{/if}}
+
+							{{if $fields.postal_code}}
+							{{include file="field_input.tpl" field=$postal_code}}
+							{{/if}}
+
+							{{if $fields.region}}
+							{{include file="field_input.tpl" field=$region}}
+							{{/if}}
+
+							{{if $fields.country_name}}
+							{{include file="field_input.tpl" field=$country_name}}
+							{{/if}}
+
+							{{if $fields.hometown}}
+							{{include file="field_input.tpl" field=$hometown}}
+							{{/if}}
+
+							<div class="form-group" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+							</div>
+							<div class="clear"></div>
+						</div>
+					</div>
+				</div>
+
+				{{/if}}
+
+				{{if $fields.marital || $fields.sexual}}
+				<div class="panel">
+					<div class="section-subtitle-wrapper" role="tab" id="relation">
+						<h3>
+							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#relation-collapse" aria-expanded="true" aria-controls="relation-collapse">
+								{{$relation}}
+							</a>
+						</h3>
+					</div>
+					<div id="relation-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relation">
+						<div class="section-content-tools-wrapper">
+							{{if $fields.marital }}
+							<div id="profile-edit-marital-wrapper" class="form-group field" >
+							<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$lbl_marital}}</label>
+							{{if $advanced}}
+							{{$marital}}
+							{{else}}
+							{{$marital_min}}
+							{{/if}}
+							</div>
+							<div class="clear"></div>
+
+							{{if $fields.partner}}
+							{{include file="field_input.tpl" field=$with}}
+							{{/if}}
+
+							{{if $fields.howlong}}
+							{{include file="field_input.tpl" field=$howlong}}
+							{{/if}}
+							{{/if}}
+
+							{{if $fields.sexual}}
+							<div id="profile-edit-sexual-wrapper" class="form-group field" >
+							<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}}</label>
+							{{$sexual}}
+							</div>
+							<div class="clear"></div>
+							{{/if}}
+
+							<div class="form-group" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+							</div>
+							<div class="clear"></div>
+						</div>
+					</div>
+				</div>
+				{{/if}}
+				{{if $fields.keywords || $fields.politic || $fields.religion || $fields.about || $fields.contact || $fields.homepage || $fields.interest || $fields.likes || $fields.dislikes || $fields.channels || $fields.music || $fields.book || $fields.tv || $fields.film || $fields.romance || $fields.employment || $fields.education || $extra_fields}}
+				<div class="panel">
+					<div class="section-subtitle-wrapper" role="tab" id="miscellaneous">
+						<h3>
+							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#miscellaneous-collapse" aria-expanded="true" aria-controls="miscellaneous-collapse">
+								{{$miscellaneous}}
+							</a>
+						</h3>
+					</div>
+					<div id="miscellaneous-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous">
+						<div class="section-content-tools-wrapper">
+							{{if $fields.homepage}}
+							{{include file="field_input.tpl" field=$homepage}}
+							{{/if}}
+
+							{{if $fields.keywords}}
+							{{include file="field_input.tpl" field=$keywords}}
+							{{/if}}
+
+							{{if $fields.politic}}
+							{{include file="field_input.tpl" field=$politic}}
+							{{/if}}
+
+							{{if $fields.religion}}
+							{{include file="field_input.tpl" field=$religion}}
+							{{/if}}
+
+							{{if $fields.about}}
+							{{include file="field_textarea.tpl" field=$about}}
+							{{/if}}
+
+							{{if $fields.contact}}
+							{{include file="field_textarea.tpl" field=$contact}}
+							{{/if}}
+
+							{{if $fields.interest}}
+							{{include file="field_textarea.tpl" field=$interest}}
+							{{/if}}
+
+							{{if $fields.likes}}
+							{{include file="field_textarea.tpl" field=$likes}}
+							{{/if}}
+
+							{{if $fields.dislikes}}
+							{{include file="field_textarea.tpl" field=$dislikes}}
+							{{/if}}
+
+							{{if $fields.channels}}
+							{{include file="field_textarea.tpl" field=$channels}}
+							{{/if}}
+
+							{{if $fields.music}}
+							{{include file="field_textarea.tpl" field=$music}}
+							{{/if}}
+
+							{{if $fields.book}}
+							{{include file="field_textarea.tpl" field=$book}}
+							{{/if}}
+
+							{{if $fields.tv}}
+							{{include file="field_textarea.tpl" field=$tv}}
+							{{/if}}
+
+							{{if $fields.film}}
+							{{include file="field_textarea.tpl" field=$film}}
+							{{/if}}
+
+							{{if $fields.romance}}
+							{{include file="field_textarea.tpl" field=$romance}}
+							{{/if}}
+
+							{{if $fields.employment}}
+							{{include file="field_textarea.tpl" field=$employ}}
+							{{/if}}
+
+							{{if $fields.education}}
+							{{include file="field_textarea.tpl" field=$education}}
+							{{/if}}
+
+							{{if $extra_fields}}
+							{{foreach $extra_fields as $field }}
+							{{include file="field_input.tpl" field=$field}}
+							{{/foreach}}
+							{{/if}}
+							<div class="form-group" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+							</div>
+							<div class="clear"></div>
+						</div>
+					</div>
+				</div>
+				{{/if}}
+			</div>
+		</form>
+</div>
+
diff --git a/view/theme/redbasic/tpl/profile_entry.tpl b/view/theme/redbasic/tpl/profile_entry.tpl
new file mode 100755
index 000000000..9ae870738
--- /dev/null
+++ b/view/theme/redbasic/tpl/profile_entry.tpl
@@ -0,0 +1,11 @@
+<div class="profile-listing-row">
+	<div class="profile-listing-cell" >
+		<a href="profiles/{{$id}}"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
+	</div>
+	<div class="profile-listing-cell" id="profile-listing-name-{{$id}}">
+		<a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a>
+	</div>
+	<div class="profile-listing-cell">
+		{{$visible}}
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/profile_listing_header.tpl b/view/theme/redbasic/tpl/profile_listing_header.tpl
new file mode 100755
index 000000000..42abf2735
--- /dev/null
+++ b/view/theme/redbasic/tpl/profile_listing_header.tpl
@@ -0,0 +1,12 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<a class="btn btn-success btn-sm pull-right" href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" ><i class="fa fa-plus-circle"></i>&nbsp;{{$cr_new}}</a>
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		<div class="profile-listing-table">
+			{{$profiles}}
+		</div>
+	</div>
+
+</div>
diff --git a/view/theme/redbasic/tpl/profile_photo.tpl b/view/theme/redbasic/tpl/profile_photo.tpl
new file mode 100755
index 000000000..ca107bfcc
--- /dev/null
+++ b/view/theme/redbasic/tpl/profile_photo.tpl
@@ -0,0 +1,48 @@
+<div id="profile-photo-content" class="generic-content-wrapper">
+    <div class="section-title-wrapper">
+    <h2>{{$title}}</h2>
+    </div>
+    <div class="section-content-wrapper">
+
+		<form enctype="multipart/form-data" action="profile_photo" method="post">
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+		<div id="profile-photo-upload-wrapper">
+
+			{{if $importfile}}
+			<input type="hidden" name="importfile" value="{{$importfile}}">
+			{{else}}
+			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
+			<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
+			{{/if}}
+			<div class="clear"></div>
+
+
+			{{if $single}}
+			<input type="hidden" name="profile" value="{{$profile0.id}}" />
+			{{else}}
+
+			<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label>
+			<select name="profile" id="profile-photo-profiles" class="form-control" >
+			{{foreach $profiles as $p}}
+				<option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option>
+			{{/foreach}}
+			</select>
+			<div class="clear"></div>
+			<br />
+			<br />
+			{{/if}}
+
+			<div id="profile-photo-submit-wrapper">
+				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+			</div>
+		</div>
+
+		</form>
+		<br />
+		<br />
+		<div id="profile-photo-link-select-wrapper">
+		{{$select}}
+		</div>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/profile_tabs.tpl b/view/theme/redbasic/tpl/profile_tabs.tpl
new file mode 100644
index 000000000..49b74bb8f
--- /dev/null
+++ b/view/theme/redbasic/tpl/profile_tabs.tpl
@@ -0,0 +1,5 @@
+<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}:</div>
+{{foreach $tabs as $tab}}
+<a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a>
+{{/foreach}}
+<div class="dropdown-divider"></div>
diff --git a/view/theme/redbasic/tpl/profile_vcard.tpl b/view/theme/redbasic/tpl/profile_vcard.tpl
new file mode 100755
index 000000000..c17a7878c
--- /dev/null
+++ b/view/theme/redbasic/tpl/profile_vcard.tpl
@@ -0,0 +1,62 @@
+<div class="vcard h-card">
+	{{if ! $zcard}}
+	<div id="profile-photo-wrapper"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}"></div>
+	{{/if}}
+	{{if $connect}}
+	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
+	{{/if}}
+	{{if ! $zcard}}
+	{{if $editmenu.multi}}
+	<div class="dropdown">
+	<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
+	<ul class="dropdown-menu" role="menu">
+		{{foreach $editmenu.menu.entries as $e}}
+		<li>
+			<a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}</a>
+		</li>
+		{{/foreach}}
+		<li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li>
+		{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
+	</ul>
+	</div>
+	{{elseif $editmenu}}
+	<a class="profile-edit-side-link" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
+	{{/if}}
+	{{/if}}
+
+	{{if ! $zcard}}
+	<div class="fn p-name">{{$profile.fullname}}{{if $profile.online}} <i class="fa fa-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
+	{{if $reddress}}<div class="reddress">{{$profile.reddress}}</div>{{/if}}		
+	{{/if}}
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr h-adr">
+			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region p-region">{{$profile.region}}</span>
+				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url">{{$profile.homepage}}</dd></dl>{{/if}}
+
+
+</div>
+<div id="clear"></div>
+
+{{$rating}}
+
+{{$chanmenu}}
+
+{{$contact_block}}
+
+
diff --git a/view/theme/redbasic/tpl/profile_vcard_short.tpl b/view/theme/redbasic/tpl/profile_vcard_short.tpl
new file mode 100755
index 000000000..5d87d52c6
--- /dev/null
+++ b/view/theme/redbasic/tpl/profile_vcard_short.tpl
@@ -0,0 +1,38 @@
+{{$contact_block}}
+
+	{{if $connect}}
+	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
+	{{/if}}
+
+
+{{$rating}}
+
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}
+
+<div id="clear"></div>
+
+{{$chanmenu}}
+
+
+
diff --git a/view/theme/redbasic/tpl/prv_message.tpl b/view/theme/redbasic/tpl/prv_message.tpl
new file mode 100755
index 000000000..925447ff2
--- /dev/null
+++ b/view/theme/redbasic/tpl/prv_message.tpl
@@ -0,0 +1,104 @@
+{{if $new}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+{{/if}}
+		<div id="prvmail-wrapper" >
+			<form id="prvmail-form" action="mail" method="post" >
+				<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
+				<input type="hidden" name="media_str" id="jot-media" value="" />
+				<input type="hidden" name="preview" id="mail-preview" value="0" />
+				{{if $new}}
+				<div class="form-group">
+					<label for="recip">{{$to}}</label>
+					<input class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" />
+					<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+				</div>
+				<div class="form-group">
+					<label for="prvmail-subject">{{$subject}}</label>
+					<input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" />
+				</div>
+				{{/if}}
+				{{if $reply}}
+				<input type="hidden" name="replyto" value="{{$parent}}" />
+				<input type="hidden" name="messageto" value="{{$recphash}}" />
+				<input type="hidden" name="subject" value="{{$subjtxt}}" />
+				{{/if}}
+				<div class="form-group">
+					<label for="prvmail-text">{{$yourmessage}}</label>
+					<textarea class="form-control" id="prvmail-text" name="body"{{if $new}} style="height: 10em;"{{/if}}>{{$text}}</textarea>
+				</div>
+				<div id="prvmail-submit-wrapper" class="form-group">
+					<div id="prvmail-submit" class="float-right btn-group">
+						<button class="btn btn-outline-secondary btn-sm" id="prvmail-preview" title="{{$preview}}" onclick="preview_mail(); return false;"><i class="fa fa-eye"></i></button>
+						<button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+					</div>
+					<div id="prvmail-tools" class="btn-toolbar float-left">
+						<div class="btn-group mr-2">
+							<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;">
+								<i class="fa fa-bold jot-icons"></i>
+							</button>
+							<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'prvmail-text'); return false;">
+								<i class="fa fa-italic jot-icons"></i>
+							</button>
+							<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'prvmail-text'); return false;">
+								<i class="fa fa-underline jot-icons"></i>
+							</button>
+							<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'prvmail-text'); return false;">
+								<i class="fa fa-quote-left jot-icons"></i>
+							</button>
+							<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'prvmail-text'); return false;">
+								<i class="fa fa-terminal jot-icons"></i>
+							</button>
+						</div>
+						<div class="btn-group d-none d-lg-flex mr-2">
+							<button id="prvmail-attach-wrapper" class="btn btn-outline-secondary btn-sm" >
+								<i id="prvmail-attach" class="fa fa-paperclip jot-icons" title="{{$attach}}"></i>
+							</button>
+							<button id="prvmail-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailJotGetLink(); return false;" >
+								<i id="prvmail-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i>
+							</button>
+						</div>
+						{{if $feature_expire || $feature_encrypt}}
+						<div class="btn-group d-none d-lg-flex mr-2">
+							{{if $feature_expire}}
+							<button id="prvmail-expire-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailGetExpiry();return false;" >
+								<i id="prvmail-expires" class="fa fa-eraser jot-icons" title="{{$expires}}" ></i>
+							</button>
+							{{/if}}
+							{{if $feature_encrypt}}
+							<button id="prvmail-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;">
+								<i id="prvmail-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i>
+							</button>
+							{{/if}}
+						</div>
+						{{/if}}
+						<div class="btn-group d-lg-none">
+							<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+								<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
+							</button>
+							<div class="dropdown-menu dropdown-menu-right" role="menu">
+								<a class="dropdown-item" href="#" id="prvmail-attach-sub"><i class="fa fa-paperclip"></i>&nbsp;{{$attach}}</a>
+								<a class="dropdown-item" href="#" onclick="prvmailJotGetLink(); return false;" ><i class="fa fa-link"></i>&nbsp;{{$insert}}</a>
+								{{if $feature_expire || $feature_encrypt}}
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item" href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="fa fa-eraser"></i>&nbsp;{{$expires}}</a>
+								<a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
+								{{/if}}
+							</div>
+						</div>
+					</div>
+					<div id="prvmail-rotator-wrapper" class="float-left">
+						<div id="prvmail-rotator"></div>
+					</div>
+					<div class="clear"></div>
+				</div>
+				<div id="mail-preview-content" style="display: none;"></div>
+			</form>
+		</div>
+{{if $new}}
+	</div>
+</div>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/pwdreset.tpl b/view/theme/redbasic/tpl/pwdreset.tpl
new file mode 100755
index 000000000..dc17ed57a
--- /dev/null
+++ b/view/theme/redbasic/tpl/pwdreset.tpl
@@ -0,0 +1,17 @@
+<div class="generic-content-wrapper-styled">
+<h3>{{$lbl1}}</h3>
+
+<p>
+{{$lbl2}}
+</p>
+<p>
+{{$lbl3}}
+</p>
+<p>{{$newpass}}</p>
+<p>
+{{$lbl4}} {{$lbl5}}
+</p>
+<p>
+{{$lbl6}}
+</p>
+</div>
diff --git a/view/theme/redbasic/tpl/rating_form.tpl b/view/theme/redbasic/tpl/rating_form.tpl
new file mode 100644
index 000000000..4bd826484
--- /dev/null
+++ b/view/theme/redbasic/tpl/rating_form.tpl
@@ -0,0 +1,25 @@
+<div class="generic-content-wrapper-styled">
+<h3>{{$header}}</h3>
+
+<div class="rating-target-name">{{if $site}}{{$website}} {{$site}}{{else}}{{$tgt_name}}{{/if}}</div>
+
+<h3>{{$lbl_rating}}</h3>
+
+<form action="rate" method="post">
+
+{{$rating}}
+
+<input type="hidden" name="execute" value="1" />
+<input type="hidden" name="target" value="{{$target}}" />
+
+<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
+<br />
+<h3 class="abook-rating-text-desc">{{$lbl_rating_txt}}</h3>
+<textarea name="rating_text" id="rating-text" >{{$rating_txt}}</textarea>
+
+<div class="clear"></div>
+
+<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
+
+</form>
+</div>
diff --git a/view/theme/redbasic/tpl/rating_slider.tpl b/view/theme/redbasic/tpl/rating_slider.tpl
new file mode 100644
index 000000000..4c36504e6
--- /dev/null
+++ b/view/theme/redbasic/tpl/rating_slider.tpl
@@ -0,0 +1,19 @@
+<div id="rating-slider" class="slider form-group"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div>
+<script>
+$(document).ready(function() {
+	// The slider does not render correct if width is given in % and
+	// the slider container is hidden (display: none) during rendering.
+	// So let's unhide it to render and hide again afterwards.
+	if(!$("#rating-tool-collapse").hasClass("in")) {
+		$("#rating-tool-collapse").addClass("in");
+		makeRatingSlider();
+		$("#rating-tool-collapse").removeClass("in");
+	}
+	else {
+		makeRatingSlider();
+	}
+});
+function makeRatingSlider() {
+	$("#rating-range").jRange({ from: -10, to: 10, step: 1, width:'98%', showLabels: false, showScale: true, scale : [ '-10','-8','-6','-4','-2','0','2','4','6','8','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); }  });
+}
+</script>
diff --git a/view/theme/redbasic/tpl/rbmark.tpl b/view/theme/redbasic/tpl/rbmark.tpl
new file mode 100644
index 000000000..bead1de2f
--- /dev/null
+++ b/view/theme/redbasic/tpl/rbmark.tpl
@@ -0,0 +1,16 @@
+<h3>{{$header}}</h3>
+
+
+<form action="rbmark" method="post" >
+
+<input type="hidden" name="private" value="{{$private}}" />
+<input type="hidden" name="ischat" value="{{$ischat}}" />
+
+{{include file="field_input.tpl" field=$url}}
+{{include file="field_input.tpl" field=$title}}
+{{include file="field_select.tpl" field=$menus}}
+{{include file="field_input.tpl" field=$menu_name}}
+
+<input type="submit" name="submit" value="{{$submit}}" />
+
+</form>
diff --git a/view/theme/redbasic/tpl/register.tpl b/view/theme/redbasic/tpl/register.tpl
new file mode 100755
index 000000000..c84934626
--- /dev/null
+++ b/view/theme/redbasic/tpl/register.tpl
@@ -0,0 +1,61 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		<form action="register" method="post" id="register-form">
+			{{if $reg_is}}
+			<div class="section-content-warning-wrapper">
+				<div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div>
+				<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div>
+			</div>
+			{{/if}}
+
+			{{if $registertext}}
+			<div id="register-text" class="descriptive-paragraph">{{$registertext}}</div>
+			{{/if}}
+
+			{{if $invitations}}
+			<div class="section-content-info-wrapper">
+				<div id="register-invite-desc" class="descriptive-paragraph">{{$invite_desc}}</div>
+			</div>
+			{{include file="field_input.tpl" field=$invite_code}}
+			{{/if}}
+
+			{{include file="field_input.tpl" field=$email}}
+
+			{{include file="field_password.tpl" field=$pass1}}
+
+			{{include file="field_password.tpl" field=$pass2}}
+
+			{{if $auto_create}}
+				{{if $default_role}}
+				<input type="hidden" name="permissions_role" value="{{$default_role}}" />
+				{{else}}
+				<div class="section-content-info-wrapper">
+					{{$help_role}}
+				</div>
+				{{include file="field_select_grouped.tpl" field=$role}}
+				{{/if}}
+
+				{{include file="field_input.tpl" field=$name}}
+				<div id="name-spinner"></div>
+
+				{{include file="field_input.tpl" field=$nickname}}
+				<div id="nick-spinner"></div>
+			{{/if}}
+
+			{{if $enable_tos}}
+			{{include file="field_checkbox.tpl" field=$tos}}
+			{{else}}
+			<input type="hidden" name="tos" value="1" />
+			{{/if}}
+
+			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
+			<div id="register-submit-end" class="register-field-end"></div>
+		</form>
+			<br />
+			<div class="descriptive-text">{{$verify_note}}</div>
+
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/remote_friends_common.tpl b/view/theme/redbasic/tpl/remote_friends_common.tpl
new file mode 100755
index 000000000..d6d2fd211
--- /dev/null
+++ b/view/theme/redbasic/tpl/remote_friends_common.tpl
@@ -0,0 +1,21 @@
+<div id="remote-friends-in-common" class="bigwidget">
+	<div id="rfic-desc">{{$desc}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{if $linkmore}}<a href="{{$base}}/common/{{$uid}}">{{$more}}</a>{{/if}}</div>
+	{{if $items}}
+	{{foreach $items as $item}}
+	<div class="profile-match-wrapper">
+		<div class="profile-match-photo">
+			<a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}">
+				<img src="{{$item.xchan_photo_m}}" width="80" height="80" alt="{{$item.xchan_name}}" title="{{$item.xchan_name}}" />
+			</a>
+		</div>
+		<div class="profile-match-break"></div>
+		<div class="profile-match-name">
+			<a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}" title="{{$item.xchan_name}}">{{$item.xchan_name}}</a>
+		</div>
+		<div class="profile-match-end"></div>
+	</div>
+	{{/foreach}}
+	{{/if}}
+	<div id="rfic-end" class="clear"></div>
+</div>
+
diff --git a/view/theme/redbasic/tpl/remote_login.tpl b/view/theme/redbasic/tpl/remote_login.tpl
new file mode 100644
index 000000000..e6d387265
--- /dev/null
+++ b/view/theme/redbasic/tpl/remote_login.tpl
@@ -0,0 +1 @@
+<a href="rmagic" class="btn btn-block btn-success rmagic-button">{{$title}}</a>
diff --git a/view/theme/redbasic/tpl/removeaccount.tpl b/view/theme/redbasic/tpl/removeaccount.tpl
new file mode 100644
index 000000000..ce6c8ac22
--- /dev/null
+++ b/view/theme/redbasic/tpl/removeaccount.tpl
@@ -0,0 +1,20 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-danger-wrapper" id="remove-account-desc">
+		<strong>{{$desc.0}}</strong>{{$desc.1}}<strong>{{$desc.2}}</strong>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<form action="{{$basedir}}/removeaccount" autocomplete="off" method="post" >
+			<input type="hidden" name="verify" value="{{$hash}}" />
+			<div class="form-group" id="remove-account-pass-wrapper">
+				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
+				<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password"  value=" " />
+			</div>
+			{{include file="field_checkbox.tpl" field=$global}}
+			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
+		</form>
+	</div>
+</div>
+
diff --git a/view/theme/redbasic/tpl/removeme.tpl b/view/theme/redbasic/tpl/removeme.tpl
new file mode 100755
index 000000000..40b9546d2
--- /dev/null
+++ b/view/theme/redbasic/tpl/removeme.tpl
@@ -0,0 +1,20 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-danger-wrapper" id="remove-account-desc">
+		<strong>{{$desc.0}}</strong>{{$desc.1}}<strong>{{$desc.2}}</strong>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<form action="{{$basedir}}/removeme" autocomplete="off" method="post" >
+			<input type="hidden" name="verify" value="{{$hash}}" />
+			<div class="form-group" id="remove-account-pass-wrapper">
+				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
+				<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " />
+			</div>
+			{{include file="field_checkbox.tpl" field=$global}}
+			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
+		</form>
+	</div>
+</div>
+
diff --git a/view/theme/redbasic/tpl/rmagic.tpl b/view/theme/redbasic/tpl/rmagic.tpl
new file mode 100755
index 000000000..9d84e4a36
--- /dev/null
+++ b/view/theme/redbasic/tpl/rmagic.tpl
@@ -0,0 +1,9 @@
+<div class="generic-content-wrapper-styled">
+	<h3>{{$title}}</h3>
+	<form action="rmagic" method="post" >
+		<div class="form-group">
+			{{include file="field_input.tpl" field=$address}}
+			<input class="btn btn-primary" type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" />
+		</div>
+	</form>
+</div>
diff --git a/view/theme/redbasic/tpl/safesearch.tpl b/view/theme/redbasic/tpl/safesearch.tpl
new file mode 100644
index 000000000..58ce22741
--- /dev/null
+++ b/view/theme/redbasic/tpl/safesearch.tpl
@@ -0,0 +1,6 @@
+<div id="directory_safemode" class="widget">
+<h3>{{$safemode}}</h3>
+<ul class="nav nav-pills nav-stacked">
+	<li><a href="toggle_safesearch">{{$toggle}}</a></li>
+</ul>
+</div>
diff --git a/view/theme/redbasic/tpl/saved_searches.tpl b/view/theme/redbasic/tpl/saved_searches.tpl
new file mode 100644
index 000000000..ff2d044ef
--- /dev/null
+++ b/view/theme/redbasic/tpl/saved_searches.tpl
@@ -0,0 +1,12 @@
+<div class="widget saved-search-widget clearfix">
+	<h3 id="search">{{$title}}</h3>
+	{{$searchbox}}
+	<ul id="saved-search-list" class="nav nav-pills flex-column">
+		{{foreach $saved as $search}}
+		<li class="nav-item nav-item-hack" id="search-term-{{$search.id}}">
+			<a class="nav-link widget-nav-pills-icons" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropfa-floppy-od-search-term-{{$search.id}}" class="fa fa-trash-o drop-icons" ></i></a>
+			<a id="saved-search-term-{{$search.id}}" class="nav-link{{if $search.selected}} active{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a>
+		</li>
+		{{/foreach}}
+	</ul>
+</div>
diff --git a/view/theme/redbasic/tpl/search_item.tpl b/view/theme/redbasic/tpl/search_item.tpl
new file mode 100755
index 000000000..66618a216
--- /dev/null
+++ b/view/theme/redbasic/tpl/search_item.tpl
@@ -0,0 +1,114 @@
+<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 clearfix generic-content-wrapper{{/if}}">
+	<a name="{{$item.id}}" ></a>
+	<div class="clearfix wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+		<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}">
+			{{if $item.photo}}
+			<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
+				{{$item.photo}}
+			</div>
+			{{/if}}
+			{{if $item.event}}
+			<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
+				{{$item.event}}
+			</div>
+			{{/if}}
+			{{if $item.title && !$item.event}}
+			<div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}">
+				{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}
+			</div>
+			{{if ! $item.is_new}}
+			<hr class="m-0">
+			{{/if}}
+			{{/if}}
+			<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
+				<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+					<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
+						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+					</div>
+				</div>
+				{{if $item.lock}}
+				<div class="wall-item-lock dropdown">
+					<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+				</div>
+				{{/if}}
+				<div class="wall-item-author">
+					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
+				</div>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
+					{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+				</div>
+			</div>
+			{{if $item.body}}
+			<div class="p-2 clrearfix {{if $item.is_photo}} wall-photo-item{{else}} wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}">
+				<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
+					{{$item.body}}
+				</div>
+			</div>
+			{{/if}}
+			{{if $item.has_tags}}
+			<div class="p-2 wall-item-tools clearfix">
+				<div class="body-tags">
+					<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
+				</div>
+			{{**
+				{{if $item.mentions}}
+				<div class="body-tags" id="item-mentions">
+					<span class="tag">{{$item.mentions}}</span>
+				</div>
+				{{/if}}
+				{{if $item.tags}}
+				<div class="body-tags" id="item-tags">
+					<span class="tag">{{$item.tags}}</span>
+				</div>
+				{{/if}}
+				{{if $item.categories}}
+				<div class="body-tags" id="item-categories">
+					<span class="tag">{{$item.categories}}</span>
+				</div>
+				{{/if}}
+				{{if $item.folders}}
+				<div class="body-tags" id="item-folders">
+					<span class="tag">{{$item.folders}}</span>
+				</div>
+				{{/if}}
+			**}}
+			</div>
+			{{/if}}
+			<div class="p-2 clearfix wall-item-tools">
+				<div class="wall-item-tools-right btn-group pull-right">
+					<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
+						<i class="fa fa-cog"></i>
+					</button>
+					<div class="dropdown-menu dropdown-menu-right">
+						{{if $item.thread_action_menu}}
+						{{foreach $item.thread_action_menu as $mitem}}
+						<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-{{$mitem.icon}}"></i> {{$mitem.title}}</a></li>
+						{{/foreach}}
+						{{/if}}
+						{{if $item.drop.dropping}}
+						<a class="dropdown-item" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li>
+						{{/if}}
+						{{if $item.thread_author_menu}}
+						<div class="dropdown-divider"></div>
+						{{foreach $item.thread_author_menu as $mitem}}
+						<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a></li>
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+				{{if $item.attachments}}
+				<div class="wall-item-tools-left btn-group">
+					<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
+					<div class="dropdown-menu">{{$item.attachments}}</div>
+				</div>
+				{{/if}}
+			</div>
+		</div>
+		{{if $item.conv}}
+		<div class="p-2 wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+		</div>
+		{{/if}}
+	</div>
+</div>
+
diff --git a/view/theme/redbasic/tpl/searchbox.tpl b/view/theme/redbasic/tpl/searchbox.tpl
new file mode 100644
index 000000000..8f7ac5162
--- /dev/null
+++ b/view/theme/redbasic/tpl/searchbox.tpl
@@ -0,0 +1,12 @@
+<form action="{{$action_url}}" method="get" >
+	<input type="hidden" name="f" value="" />
+	<div id="{{$id}}" class="input-group">
+		<input class="form-control form-control-sm" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
+		<div class="input-group-btn">
+			<button type="submit" name="submit" class="btn btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button>
+			{{if $savedsearch}}
+			<button type="submit" name="searchsave" class="btn btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button>
+			{{/if}}
+		</div>
+	</div>
+</form>
diff --git a/view/theme/redbasic/tpl/section_title.tpl b/view/theme/redbasic/tpl/section_title.tpl
new file mode 100644
index 000000000..338e57042
--- /dev/null
+++ b/view/theme/redbasic/tpl/section_title.tpl
@@ -0,0 +1,5 @@
+<div class="section-title-wrapper">
+	<h2>{{$title}}</h2>
+	<div class="clear"></div>
+</div>
+
diff --git a/view/theme/redbasic/tpl/select_timezone.tpl b/view/theme/redbasic/tpl/select_timezone.tpl
new file mode 100644
index 000000000..2820a54f4
--- /dev/null
+++ b/view/theme/redbasic/tpl/select_timezone.tpl
@@ -0,0 +1,11 @@
+{{* TODO: Make id configurabel *}}
+<select id='timezone_select' name='timezone'>
+{{foreach $continents as $continent => $cities}}
+<optgroup label="{{$continent}}">
+{{foreach $cities as $city => $value}}
+<option value='{{$value}}' {{if $value == $selected}}selected='selected'{{/if}}>{{$city}}</option>
+{{/foreach}}
+</optgroup>
+{{/foreach}}
+</select>
+
diff --git a/view/theme/redbasic/tpl/sellpage_edit.tpl b/view/theme/redbasic/tpl/sellpage_edit.tpl
new file mode 100644
index 000000000..0a4726fb2
--- /dev/null
+++ b/view/theme/redbasic/tpl/sellpage_edit.tpl
@@ -0,0 +1,23 @@
+<h1>{{$header}}</h1>
+<form id="sellpage-edit" action="connect/{{$address}}" method="post">
+
+{{include file="field_checkbox.tpl" field=$premium}}
+
+<div class="descriptive-text">{{$desc}}</div>
+
+<div class="sellpage-editbody">
+<p id="sellpage-bodydesc" >
+{{$lbl_about}}
+</p>
+
+<textarea rows="10" cols="72" id="sellpage-textinp" name="text" >{{$text}}</textarea>
+
+</div>
+<div id="sellpage-editbody-end"></div>
+
+
+<div class="descriptive-text">{{$lbl2}}</div>
+<div class="sellpage-final">{{$desc2}}</div>
+
+<input type="submit" name="submit" value="{{$submit}}" />
+</form>
diff --git a/view/theme/redbasic/tpl/sellpage_submit.tpl b/view/theme/redbasic/tpl/sellpage_submit.tpl
new file mode 100644
index 000000000..2bd735ea4
--- /dev/null
+++ b/view/theme/redbasic/tpl/sellpage_submit.tpl
@@ -0,0 +1,3 @@
+<form id="sellpage-submit" action="connect/{{$address}}" method="post">
+<input type="submit" name="submit" value="{{$continue}}" />
+</form>
\ No newline at end of file
diff --git a/view/theme/redbasic/tpl/sellpage_view.tpl b/view/theme/redbasic/tpl/sellpage_view.tpl
new file mode 100644
index 000000000..20a65ffbe
--- /dev/null
+++ b/view/theme/redbasic/tpl/sellpage_view.tpl
@@ -0,0 +1,11 @@
+<div class="generic-content-wrapper">
+<h1>{{$header}}</h1>
+
+<div class="descriptive-text">{{$desc}}</div>
+
+<div class="sellpage-body">{{$text}}</div>
+
+<div class="sellpage-final">{{$desc2}}</div>
+
+{{$submit}}
+</div>
diff --git a/view/theme/redbasic/tpl/settings.tpl b/view/theme/redbasic/tpl/settings.tpl
new file mode 100755
index 000000000..dd5fecb43
--- /dev/null
+++ b/view/theme/redbasic/tpl/settings.tpl
@@ -0,0 +1,192 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-sm pull-right" href="removeme"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>{{/if}}
+		<h2>{{$ptitle}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{$nickname_block}}
+	<form action="settings" id="settings-form" method="post" autocomplete="off" class="acl-form" data-form_id="settings-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
+		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="basic-settings">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse">
+							{{$h_basic}}
+						</a>
+					</h3>
+				</div>
+				<div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings">
+					<div class="section-content-tools-wrapper">
+						{{include file="field_input.tpl" field=$username}}
+						{{include file="field_select_grouped.tpl" field=$timezone}}
+						{{include file="field_input.tpl" field=$defloc}}
+						{{include file="field_checkbox.tpl" field=$allowloc}}
+						{{include file="field_checkbox.tpl" field=$adult}}
+						{{include file="field_input.tpl" field=$photo_path}}
+						{{include file="field_input.tpl" field=$attach_path}}
+						{{if $basic_addon}}
+						{{$basic_addon}}
+						{{/if}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse">
+							{{$h_prv}}
+						</a>
+					</h3>
+				</div>
+				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings">
+					<div class="section-content-tools-wrapper">
+						{{if $server_role != 'basic'}}
+						{{include file="field_select_grouped.tpl" field=$role}}
+						{{/if}}
+						<div id="advanced-perm" style="display:{{if $permissions_set && $server_role != 'basic' }}none{{else}}block{{/if}};">
+
+							{{if $server_role != 'basic'}}
+							<div class="form-group">
+								<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button>
+							</div>
+							<div class="modal" id="apsModal">
+								<div class="modal-dialog">
+									<div class="modal-content">
+										<div class="modal-header">
+											<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+											<h4 class="modal-title">{{$lbl_p2macro}}</h4>
+										</div>
+										<div class="modal-body">
+										{{foreach $permiss_arr as $permit}}
+											{{include file="field_select.tpl" field=$permit}}
+										{{/foreach}}
+										</div>
+										<div class="modal-footer">
+											<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
+										</div>
+									</div><!-- /.modal-content -->
+								</div><!-- /.modal-dialog -->
+							</div><!-- /.modal -->
+							{{/if}}
+							<div id="settings-default-perms" class="form-group" >
+								<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button>
+							</div>
+							{{$group_select}}
+							{{include file="field_checkbox.tpl" field=$hide_presence}}
+							{{$profile_in_dir}}
+						</div>
+						<div class="settings-common-perms">
+							{{$suggestme}}
+							{{include file="field_checkbox.tpl" field=$blocktags}}
+							{{include file="field_input.tpl" field=$expire}}
+						</div>
+						{{if $permcat_enable}}
+						{{include file="field_select.tpl" field=$defpermcat}}
+						{{/if}}
+
+						{{if $sec_addon}}
+						{{$sec_addon}}
+						{{/if}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="notification-settings">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse">
+							{{$h_not}}
+						</a>
+					</h3>
+				</div>
+				<div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings">
+					<div class="section-content-tools-wrapper">
+						<div id="settings-notifications">
+							<h3>{{$activity_options}}</h3>
+							<div class="group">
+								{{*not yet implemented *}}
+								{{*include file="field_checkbox.tpl" field=$post_joingroup*}}
+								{{include file="field_checkbox.tpl" field=$post_newfriend}}
+								{{include file="field_checkbox.tpl" field=$post_profilechange}}
+							</div>
+							<h3>{{$lbl_not}}</h3>
+							<div class="group">
+								{{include file="field_intcheckbox.tpl" field=$notify1}}
+								{{include file="field_intcheckbox.tpl" field=$notify2}}
+								{{include file="field_intcheckbox.tpl" field=$notify3}}
+								{{include file="field_intcheckbox.tpl" field=$notify4}}
+								{{*include file="field_intcheckbox.tpl" field=$notify9*}}
+								{{include file="field_intcheckbox.tpl" field=$notify5}}
+								{{include file="field_intcheckbox.tpl" field=$notify6}}
+								{{include file="field_intcheckbox.tpl" field=$notify7}}
+								{{include file="field_intcheckbox.tpl" field=$notify8}}
+							</div>
+							<h3>{{$lbl_vnot}}</h3>
+							<div class="group">
+								{{include file="field_intcheckbox.tpl" field=$vnotify1}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify2}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify3}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify4}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify5}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify6}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify10}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify7}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify8}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify9}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify11}}
+								{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}}
+								{{include file="field_input.tpl" field=$evdays}}
+							</div>
+						</div>
+						{{if $notify_addon}}
+						{{$notify_addon}}
+						{{/if}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#miscellaneous-settings-collapse" aria-expanded="true" aria-controls="miscellaneous-settings-collapse">
+							{{$lbl_misc}}
+						</a>
+					</h3>
+				</div>
+				<div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
+					<div class="section-content-tools-wrapper">
+						{{if $menus}}
+						<div class="form-group channel-menu">
+							<label for="channel_menu">{{$menu_desc}}</label>
+							<select name="channel_menu" class="form-control">
+							{{foreach $menus as $menu }}
+								<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option>
+							{{/foreach}}
+							</select>
+						</div>
+						{{/if}}
+						{{include file="field_checkbox.tpl" field=$cal_first_day}}
+
+						{{if $misc_addon}}
+						{{$misc_addon}}
+						{{/if}}
+
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</form>
+	{{$aclselect}}
+</div>
diff --git a/view/theme/redbasic/tpl/settings_account.tpl b/view/theme/redbasic/tpl/settings_account.tpl
new file mode 100755
index 000000000..b7fdfb9a9
--- /dev/null
+++ b/view/theme/redbasic/tpl/settings_account.tpl
@@ -0,0 +1,28 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<a title="{{$removeaccount}}" class="btn btn-danger btn-sm pull-right" href="removeaccount"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<form action="settings/account" id="settings-account-form" method="post" autocomplete="off" >
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		<div class="section-content-tools-wrapper">
+			{{include file="field_input.tpl" field=$email}}
+			{{include file="field_password.tpl" field=$origpass}}
+			{{include file="field_password.tpl" field=$password1}}
+			{{include file="field_password.tpl" field=$password2}}
+
+			{{if $z_server_role == 'pro' && ! $techlock}}
+			{{include file="field_select.tpl" field=$techlevel}}
+			{{else}}
+			<input type="hidden" name="techlevel" value="{{$techlevel.2}}" />
+			{{/if}}
+
+			<div class="settings-submit-wrapper" >
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+			{{$account_settings}}
+		</div>
+	</form>
+</div>
+
diff --git a/view/theme/redbasic/tpl/settings_addons.tpl b/view/theme/redbasic/tpl/settings_addons.tpl
new file mode 100755
index 000000000..52f8d9d3f
--- /dev/null
+++ b/view/theme/redbasic/tpl/settings_addons.tpl
@@ -0,0 +1,11 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<form action="settings/featured" method="post" autocomplete="off">
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		<div class="panel-group" id="settings" role="tablist">
+			{{$settings_addons}}
+		</div>
+	</form>
+</div>
diff --git a/view/theme/redbasic/tpl/settings_connectors.tpl b/view/theme/redbasic/tpl/settings_connectors.tpl
new file mode 100755
index 000000000..8bea9ca63
--- /dev/null
+++ b/view/theme/redbasic/tpl/settings_connectors.tpl
@@ -0,0 +1,10 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$title}}</h1>
+
+<form action="settings/connectors" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+{{$settings_connectors}}
+
+</form>
+</div>
diff --git a/view/theme/redbasic/tpl/settings_display.tpl b/view/theme/redbasic/tpl/settings_display.tpl
new file mode 100755
index 000000000..d8c1ac7aa
--- /dev/null
+++ b/view/theme/redbasic/tpl/settings_display.tpl
@@ -0,0 +1,86 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$ptitle}}</h2>
+	</div>
+	<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
+			{{if $theme || $mobile_theme}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content">
+							{{$d_tset}}
+						</a>
+					</h3>
+				</div>
+				<div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings">
+					<div class="section-content-tools-wrapper">
+						{{if $theme}}
+							{{include file="field_themeselect.tpl" field=$theme}}
+						{{/if}}
+						{{if $schema}}
+							{{include file="field_select.tpl" field=$schema}}
+						{{/if}}
+						{{if $mobile_theme}}
+							{{include file="field_themeselect.tpl" field=$mobile_theme}}
+						{{/if}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			{{/if}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content">
+							{{$d_ctset}}
+						</a>
+					</h3>
+				</div>
+				<div id="custom-settings-content" class="collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
+					<div class="section-content-tools-wrapper">
+						{{if $theme_config}}
+							{{$theme_config}}
+						{{/if}}
+					</div>
+				</div>
+			</div>
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content">
+							{{$d_cset}}
+						</a>
+					</h3>
+				</div>
+				<div id="content-settings-content" class="collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
+					<div class="section-content-wrapper">
+						{{include file="field_input.tpl" field=$ajaxint}}
+						{{include file="field_input.tpl" field=$itemspage}}
+						{{include file="field_input.tpl" field=$channel_divmore_height}}
+						{{include file="field_input.tpl" field=$network_divmore_height}}
+						{{include file="field_checkbox.tpl" field=$nosmile}}
+						{{include file="field_checkbox.tpl" field=$title_tosource}}
+						{{include file="field_checkbox.tpl" field=$channel_list_mode}}
+						{{include file="field_checkbox.tpl" field=$network_list_mode}}
+						{{include file="field_checkbox.tpl" field=$user_scalable}}
+						{{include file="field_checkbox.tpl" field=$preload_images}}
+						{{include file="field_checkbox.tpl" field=$manual_update}}
+						{{if $expert}}
+						<div class="form-group">
+							<a class="btn btn-outline-secondary "href="pdledit">{{$layout_editor}}</a>
+						</div>
+						{{/if}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</form>
+</div>
diff --git a/view/theme/redbasic/tpl/settings_features.tpl b/view/theme/redbasic/tpl/settings_features.tpl
new file mode 100755
index 000000000..dfe049a7a
--- /dev/null
+++ b/view/theme/redbasic/tpl/settings_features.tpl
@@ -0,0 +1,30 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<form action="settings/features" method="post" autocomplete="off">
+	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+	<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
+		{{foreach $features as $g => $f}}
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
+				<h3>
+					<a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
+						{{$f.0}}
+					</a>
+				</h3>
+			</div>
+			<div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
+				<div class="section-content-tools-wrapper">
+					{{foreach $f.1 as $fcat}}
+						{{include file="field_checkbox.tpl" field=$fcat}}
+					{{/foreach}}
+					<div class="settings-submit-wrapper" >
+						<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		{{/foreach}}
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/settings_nick_set.tpl b/view/theme/redbasic/tpl/settings_nick_set.tpl
new file mode 100755
index 000000000..76fe7cd8d
--- /dev/null
+++ b/view/theme/redbasic/tpl/settings_nick_set.tpl
@@ -0,0 +1,8 @@
+<div id="settings-nick-wrapper" class="section-content-info-wrapper">
+<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong></div>
+{{if $davpath}}
+<br>
+<div id="settings-dav-desc">{{$davdesc}} <strong>'{{$davpath}}'</strong></div>
+{{/if}}
+</div>
+<div id="settings-nick-end" ></div>
diff --git a/view/theme/redbasic/tpl/settings_oauth.tpl b/view/theme/redbasic/tpl/settings_oauth.tpl
new file mode 100755
index 000000000..811cfcec5
--- /dev/null
+++ b/view/theme/redbasic/tpl/settings_oauth.tpl
@@ -0,0 +1,36 @@
+<div class="generic-content-wrapper">
+<div class="section-title-wrapper">
+	<h2>{{$title}}</h2>
+</div>
+
+<div class="section-content-tools-wrapper">
+<form action="settings/oauth" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	<div id="profile-edit-links">
+		<ul>
+			<li>
+				<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a>
+			</li>
+		</ul>
+	</div>
+
+	{{foreach $apps as $app}}
+	<div class='oauthapp'>
+		<img src='{{$app.icon}}' class="{{if $app.icon}} {{else}}noicon{{/if}}">
+		{{if $app.clname}}<h4>{{$app.clname}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}}
+		{{if $app.my}}
+			{{if $app.oauth_token}}
+			<div class="settings-submit-wrapper" ><button class="settings-submit"  type="submit" name="remove" value="{{$app.oauth_token}}">{{$remove}}</button></div>
+			{{/if}}
+		{{/if}}
+		{{if $app.my}}
+		<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
+		<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
+		{{/if}}		
+	</div>
+	{{/foreach}}
+
+</form>
+</div>
+</div>
diff --git a/view/theme/redbasic/tpl/settings_oauth_edit.tpl b/view/theme/redbasic/tpl/settings_oauth_edit.tpl
new file mode 100755
index 000000000..b94dec48a
--- /dev/null
+++ b/view/theme/redbasic/tpl/settings_oauth_edit.tpl
@@ -0,0 +1,22 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+<div class="section-content-tools-wrapper">
+<form method="POST">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$key}}
+{{include file="field_input.tpl" field=$secret}}
+{{include file="field_input.tpl" field=$redirect}}
+{{include file="field_input.tpl" field=$icon}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+<input type="submit" name="cancel" class="settings-submit" value="{{$cancel}}" />
+</div>
+
+</form>
+</div>
+</div>
diff --git a/view/theme/redbasic/tpl/settings_permcats.tpl b/view/theme/redbasic/tpl/settings_permcats.tpl
new file mode 100644
index 000000000..f6bb9b036
--- /dev/null
+++ b/view/theme/redbasic/tpl/settings_permcats.tpl
@@ -0,0 +1,64 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<div class="section-content-info-wrapper">
+			{{$desc}}
+		</div>
+
+		<form action="settings/permcats" id="settings-permcats-form" method="post" autocomplete="off" >
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			{{include file="field_input.tpl" field=$name}}
+
+			<div class="settings-submit-wrapper form-group">
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+	</div>
+
+	<div class="panel">
+		<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
+			<h3>
+				<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
+				{{$permlbl}}
+				</a>
+			</h3>
+		</div>
+		<div id="perms-tool-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="perms-tool">
+			<div class="section-content-tools-wrapper">
+				<div class="section-content-warning-wrapper">
+				{{$permnote}}
+				</div>
+
+				<table id="perms-tool-table" class=form-group>
+					<tr>
+						<td></td><td colspan="2" class="abook-me">{{$me}}</td>
+					</tr>
+						{{foreach $perms as $prm}}
+						{{include file="field_acheckbox.tpl" field=$prm}}
+						{{/foreach}}
+				</table>
+
+				<div class="settings-submit-wrapper" >
+					<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+				</div>
+			</div>
+		</div>
+		{{if $permcats}}
+		<div class="section-content-wrapper-np">
+			<table id="permcat-index">
+			{{foreach $permcats as $k => $v}}
+			<tr class="permcat-row-{{$k}}">
+				<td width="99%"><a href="settings/permcats/{{$k}}">{{$k}}</a></td>
+				<td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td>
+			</tr>
+			{{/foreach}}
+			</table>
+		</div>
+		{{/if}}
+
+	</div>
+	</form>
+
+</div>
diff --git a/view/theme/redbasic/tpl/settings_tokens.tpl b/view/theme/redbasic/tpl/settings_tokens.tpl
new file mode 100644
index 000000000..48190c00c
--- /dev/null
+++ b/view/theme/redbasic/tpl/settings_tokens.tpl
@@ -0,0 +1,72 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<div class="section-content-info-wrapper">
+			{{$desc}}
+		</div>
+
+		<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
+			{{include file="field_input.tpl" field=$name}}
+			{{include file="field_input.tpl" field=$token}}
+			{{include file="field_input.tpl" field=$expires}}
+			<div class="settings-submit-wrapper form-group">
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+	</div>
+
+	<div class="panel">
+		<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
+			<h3>
+				<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
+				{{$permlbl}}
+				</a>
+			</h3>
+		</div>
+		<div id="perms-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="perms-tool">
+			<div class="section-content-tools-wrapper">
+				<div class="section-content-warning-wrapper">
+				{{$permnote}}
+				</div>
+
+				<table id="perms-tool-table" class=form-group>
+					<tr>
+						<td></td><td colspan="2" class="abook-me">{{$me}}</td>
+					</tr>
+						{{foreach $perms as $prm}}
+						{{include file="field_acheckbox.tpl" field=$prm}}
+						{{/foreach}}
+				</table>
+
+				<div class="settings-submit-wrapper" >
+					<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	</form>
+
+	<div class="descriptive-text">{{$desc2}}</div>
+	<ul>
+		<li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
+		<li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
+	</ul>
+
+	{{if $tokens}}
+	<div class="section-content-wrapper-np">
+		<table id="atoken-index">
+			{{foreach $tokens as $t}}
+			<tr id="atoken-index-{{$t.atoken_id}}" class="atoken-index-row">
+				<td width="99%"><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td>
+				<td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td>
+			</tr>
+			{{/foreach}}
+		</table>
+
+	</div>
+	{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/sharedwithme.tpl b/view/theme/redbasic/tpl/sharedwithme.tpl
new file mode 100644
index 000000000..68bdd6faa
--- /dev/null
+++ b/view/theme/redbasic/tpl/sharedwithme.tpl
@@ -0,0 +1,26 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-sm btn-outline-secondary pull-right"><i class="fa fa-trash-o"></i>&nbsp;{{$dropall}}</a>
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper-np">
+		<table id="cloud-index">
+			<tr>
+				<th width="1%"></th>
+				<th width="92%">{{$name}}</th>
+				<th width="1%"></th>
+				<th width="1%" class="d-none d-md-table-cell">{{$size}}</th>
+				<th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th>
+			</tr>
+		{{foreach $items as $item}}
+			<tr id="cloud-index-{{$item.id}}">
+				<td><i class="fa {{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td>
+				<td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}}&nbsp;<span class="label label-success">{{$label_new}}</span>{{/if}}</td>
+				<td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
+				<td class="d-none d-md-table-cell">{{$item.objfilesize}}</td>
+				<td class="d-none d-md-table-cell">{{$item.objedited}}</td>
+			</tr>
+		{{/foreach}}
+		</table>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/show_thing.tpl b/view/theme/redbasic/tpl/show_thing.tpl
new file mode 100644
index 000000000..d738c9fc9
--- /dev/null
+++ b/view/theme/redbasic/tpl/show_thing.tpl
@@ -0,0 +1,16 @@
+<h2>{{$header}}</h2>
+{{if $thing}}
+<div class="thing-show">
+{{if $thing.obj_imgurl}}<a href="{{$thing.obj_url}}" ><img src="{{$thing.obj_imgurl}}" width="175" height="175" alt="{{$thing.obj_term}}" /></a>{{/if}}
+<a href="{{$thing.obj_url}}" >{{$thing.obj_term}}</a>
+</div>
+{{if $canedit}}
+<div class="thing-edit-links">
+<a href="thing/edit/{{$thing.obj_obj}}" title="{{$edit}}" class="btn btn-outline-secondary" ><i class="fa fa-pencil thing-edit-icon"></i></a>
+<a href="thing/drop/{{$thing.obj_obj}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-outline-secondary" ><i class="fa fa-trash-o drop-icons"></i></a>
+</div>
+<div class="thing-edit-links-end"></div>
+{{/if}}
+
+{{/if}}
+
diff --git a/view/theme/redbasic/tpl/siteinfo.tpl b/view/theme/redbasic/tpl/siteinfo.tpl
new file mode 100755
index 000000000..a5b99fd83
--- /dev/null
+++ b/view/theme/redbasic/tpl/siteinfo.tpl
@@ -0,0 +1,41 @@
+<div class="generic-content-wrapper-styled">
+<h2>{{$title}}</h2>
+
+<h3>{{$sitenametxt}}</h3>
+
+<div>{{$sitename}}</div>
+
+<h3>{{$headline}}</h3>
+
+<div>{{if $site_about}}{{$site_about}}{{else}}--{{/if}}</div>
+
+<h3>{{$admin_headline}}</h3>
+
+<div>{{if $admin_about}}{{$admin_about}}{{else}}--{{/if}}</div>
+
+<br><br>
+<div><a href="help/TermsOfService">{{$terms}}</a></div>
+
+<hr>
+
+<h2>{{$prj_header}}</h2>
+
+<div>{{$prj_name}} ({{$z_server_role}})</div>
+
+{{if $prj_version}}
+<div>{{$prj_version}}</div>
+{{/if}}
+
+
+<h3>{{$prj_linktxt}}</h3>
+
+<div>{{$prj_link}}</div>
+
+<h3>{{$prj_srctxt}}</h3>
+
+<div>{{$prj_src}}</div>
+
+<br><br>
+<div>{{$prj_transport}} ({{$transport_link}})</div>
+
+</div>
diff --git a/view/theme/redbasic/tpl/sitesearch.tpl b/view/theme/redbasic/tpl/sitesearch.tpl
new file mode 100644
index 000000000..8dbf8cef5
--- /dev/null
+++ b/view/theme/redbasic/tpl/sitesearch.tpl
@@ -0,0 +1,5 @@
+<div class="widget saved-search-widget">
+	<h3 id="search">{{$title}}</h3>
+	{{$searchbox}}
+	<div class="clear"></div>
+</div>
diff --git a/view/theme/redbasic/tpl/sources_edit.tpl b/view/theme/redbasic/tpl/sources_edit.tpl
new file mode 100644
index 000000000..61f6e8cb0
--- /dev/null
+++ b/view/theme/redbasic/tpl/sources_edit.tpl
@@ -0,0 +1,24 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$title}}</h1>
+
+<div class="descriptive-text">{{$desc}}</div>
+
+<form action="sources" method="post">
+<input type="hidden" name="source" value="{{$id}}" />
+<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
+{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$tags}}
+{{include file="field_textarea.tpl" field=$words}}
+
+<div class="sources-submit-wrapper" >
+<input type="submit" name="submit" class="sources-submit" value="{{$submit}}" />
+</div>
+</form>
+<br />
+<br />
+<a href="sources/{{$id}}/drop">{{$drop}}</a>
+</div>
+
+
+
+
diff --git a/view/theme/redbasic/tpl/sources_list.tpl b/view/theme/redbasic/tpl/sources_list.tpl
new file mode 100644
index 000000000..76be35b1a
--- /dev/null
+++ b/view/theme/redbasic/tpl/sources_list.tpl
@@ -0,0 +1,17 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$title}}</h1>
+
+<div class="descriptive-text">{{$desc}}</div>
+
+<div class="sources-links">
+<a href="sources/new">{{$new}}</a>
+</div>
+
+{{if $sources}}
+<ul class="sources-list">
+{{foreach $sources as $source}}
+<li><a href="sources/{{$source.src_id}}">{{$source.xchan_name}}</a></li>
+{{/foreach}}
+</ul>
+{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/sources_new.tpl b/view/theme/redbasic/tpl/sources_new.tpl
new file mode 100644
index 000000000..bbc22df84
--- /dev/null
+++ b/view/theme/redbasic/tpl/sources_new.tpl
@@ -0,0 +1,17 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$title}}</h1>
+
+<div class="descriptive-text">{{$desc}}</div>
+
+<form action="sources" method="post">
+<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
+{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$tags}}
+{{include file="field_textarea.tpl" field=$words}}
+
+<div class="sources-submit-wrapper" >
+<input type="submit" name="submit" class="sources-submit" value="{{$submit}}" />
+</div>
+</form>
+</div>
+
diff --git a/view/theme/redbasic/tpl/suggest_friends.tpl b/view/theme/redbasic/tpl/suggest_friends.tpl
new file mode 100755
index 000000000..95f24cd63
--- /dev/null
+++ b/view/theme/redbasic/tpl/suggest_friends.tpl
@@ -0,0 +1,16 @@
+<div class="profile-match-wrapper">
+	<div class="profile-match-photo">
+		<a href="{{$entry.url}}">
+			<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.profile}}]" />
+		</a>
+	</div>
+	<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="fa fa-times drop-icons btn btn-outline-secondary"></i></a>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $entry.connlnk}}
+	<div class="profile-match-connect btn btn-outline-secondary"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conntxt}}</a></div>
+	{{/if}}
+</div>
diff --git a/view/theme/redbasic/tpl/suggest_page.tpl b/view/theme/redbasic/tpl/suggest_page.tpl
new file mode 100755
index 000000000..97837c852
--- /dev/null
+++ b/view/theme/redbasic/tpl/suggest_page.tpl
@@ -0,0 +1,9 @@
+<h3>{{$title}}</h3>
+
+{{if $entries}}
+{{foreach $entries as $child}}
+{{include file="suggest_friends.tpl" entry=$child}}
+{{/foreach}}
+{{/if}}
+
+<div class="clear"></div>
diff --git a/view/theme/redbasic/tpl/suggest_widget.tpl b/view/theme/redbasic/tpl/suggest_widget.tpl
new file mode 100644
index 000000000..7b9afa668
--- /dev/null
+++ b/view/theme/redbasic/tpl/suggest_widget.tpl
@@ -0,0 +1,10 @@
+<div class="widget suggestions-widget">
+<h3>{{$title}}</h3>
+{{if $entries}}
+{{foreach $entries as $child}}
+{{include file="suggest_friends.tpl" entry=$child}}
+{{/foreach}}
+{{/if}}
+<div class="clear"></div>
+<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div>
+</div>
diff --git a/view/theme/redbasic/tpl/thing_edit.tpl b/view/theme/redbasic/tpl/thing_edit.tpl
new file mode 100644
index 000000000..62a7c02c8
--- /dev/null
+++ b/view/theme/redbasic/tpl/thing_edit.tpl
@@ -0,0 +1,41 @@
+<h2>{{$thing_hdr}}</h2>
+<form id="thing-edit-form" action="thing" method="post" class="acl-form" data-form_id="thing-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+<input type="hidden" name="term_hash" value="{{$thing_hash}}" />
+
+{{if $multiprof }}
+<div class="thing-profile-label">{{$profile_lbl}}</div>
+
+<div class="thing-profile">{{$profile_select}}</div>
+<div class="thing-field-end"></div>
+{{/if}}
+
+<div class="thing-verb-label">{{$verb_lbl}}</div>
+
+<div class="thing-verb">{{$verb_select}}</div>
+<div class="thing-field-end"></div>
+
+
+<label class="thing-label" for="thing-term">{{$thing_lbl}}</label>
+<input type="text" class="thing-input" id="thing-term" name="term" value="{{$thething}}" />
+<div class="thing-field-end"></div>
+<label class="thing-label" for="thing-url">{{$url_lbl}}</label>
+<input type="text" class="thing-input" id="thing-url" name="url" value="{{$theurl}}" />
+<div class="thing-field-end"></div>
+<label class="thing-label" for="thing-img">{{$img_lbl}}</label>
+<input type="text" class="thing-input" id="thing-img" name="img" value="{{$imgurl}}" />
+<div class="thing-field-end"></div>
+
+{{include file="field_checkbox.tpl" field=$activity}}
+
+<div class="thing-end"></div> 
+
+{{if $lockstate}}
+	<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+		<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
+	</button>
+{{/if}}
+
+
+<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
+</form>
+{{$aclselect}}
diff --git a/view/theme/redbasic/tpl/thing_input.tpl b/view/theme/redbasic/tpl/thing_input.tpl
new file mode 100644
index 000000000..90fb093e4
--- /dev/null
+++ b/view/theme/redbasic/tpl/thing_input.tpl
@@ -0,0 +1,41 @@
+<h2>{{$thing_hdr}}</h2>
+<form id="thing-new-form" action="thing" method="post" class="acl-form" data-form_id="thing-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+
+{{if $multiprof }}
+<div class="thing-profile-label">{{$profile_lbl}}</div>
+
+<div class="thing-profile">{{$profile_select}}</div>
+<div class="thing-field-end"></div>
+{{/if}}
+
+
+<div class="thing-verb-label">{{$verb_lbl}}</div>
+
+<div class="thing-verb">{{$verb_select}}</div>
+<div class="thing-field-end"></div>
+
+
+<label class="thing-label" for="thing-term">{{$thing_lbl}}</label>
+<input type="text" class="thing-input" id="thing-term" name="term" />
+<div class="thing-field-end"></div>
+<label class="thing-label" for="thing-url">{{$url_lbl}}</label>
+<input type="text" class="thing-input" id="thing-url" name="url" />
+<div class="thing-field-end"></div>
+<label class="thing-label" for="thing-img">{{$img_lbl}}</label>
+<input type="text" class="thing-input" id="thing-img" name="img" />
+<div class="thing-field-end"></div>
+
+{{include file="field_checkbox.tpl" field=$activity}}
+
+<div class="thing-end"></div> 
+
+{{if $lockstate}}
+	<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+		<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
+	</button>
+{{/if}}
+
+
+<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
+</form>
+{{$aclselect}}
diff --git a/view/theme/redbasic/tpl/threaded_conversation.tpl b/view/theme/redbasic/tpl/threaded_conversation.tpl
new file mode 100755
index 000000000..ea5c3c281
--- /dev/null
+++ b/view/theme/redbasic/tpl/threaded_conversation.tpl
@@ -0,0 +1,8 @@
+{{if $photo_item}}
+{{$photo_item}}
+{{/if}}
+{{foreach $threads as $thread_item}}
+{{include file="{{$thread_item.template}}" item=$thread_item}}
+{{/foreach}}
+
+<div id="conversation-end"></div>
diff --git a/view/theme/redbasic/tpl/toggle_mobile_footer.tpl b/view/theme/redbasic/tpl/toggle_mobile_footer.tpl
new file mode 100755
index 000000000..82c0197ba
--- /dev/null
+++ b/view/theme/redbasic/tpl/toggle_mobile_footer.tpl
@@ -0,0 +1,2 @@
+<a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a>
+
diff --git a/view/theme/redbasic/tpl/uexport.tpl b/view/theme/redbasic/tpl/uexport.tpl
new file mode 100644
index 000000000..7eafd97a6
--- /dev/null
+++ b/view/theme/redbasic/tpl/uexport.tpl
@@ -0,0 +1,19 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		<b><a href="uexport/basic">{{$basictitle}}</a></b></p>
+		<p>{{$basic}}</p>
+
+		<p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p>
+		<p>{{$full}}</p>
+	
+		<p>{{$extra}}</p>
+		<p>{{$extra2}}</p>
+		<p>{{$extra3}}</p>
+
+		<p>{{$extra4}}</p>
+
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/usermenu.tpl b/view/theme/redbasic/tpl/usermenu.tpl
new file mode 100644
index 000000000..c51728c34
--- /dev/null
+++ b/view/theme/redbasic/tpl/usermenu.tpl
@@ -0,0 +1,20 @@
+{{if $wrap}}
+<div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}">
+{{/if}}
+	{{if $menu.menu_desc}}
+	<h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="fa fa-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3>
+	{{/if}}
+	{{if $items}}
+	<ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills flex-column{{elseif !$wrap || $class}} {{$class}}{{/if}}">
+		{{foreach $items as $mitem }}
+		<li id="pmenu-item-{{$mitem.mitem_id}}" class="nav-item pmenu-item{{if $mitem.submenu}} dropdown{{/if}}">
+			<a href="{{if $mitem.submenu}}#{{else}}{{$mitem.mitem_link}}{{/if}}" class="nav-link {{if $mitem.submenu}} dropdown-toggle{{/if}}"{{if $mitem.submenu}} data-toggle="dropdown"{{/if}}{{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}{{if $mitem.submenu}}<span class="caret"></span>{{/if}}</a>
+			{{if $mitem.submenu}}{{$mitem.submenu}}{{/if}}
+		</li>
+		{{/foreach }}
+	</ul>
+	{{/if}}
+{{if $wrap}}
+	<div class="pmenu-end"></div>
+</div>
+{{/if}}
diff --git a/view/theme/redbasic/tpl/viewcontact_template.tpl b/view/theme/redbasic/tpl/viewcontact_template.tpl
new file mode 100755
index 000000000..2b7144450
--- /dev/null
+++ b/view/theme/redbasic/tpl/viewcontact_template.tpl
@@ -0,0 +1,13 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper clearfix">
+		{{foreach $contacts as $contact}}
+		{{include file="contact_template.tpl"}}
+		{{/foreach}}
+		<div id="page-end"></div>
+	</div>
+</div>
+<script>$(document).ready(function() { loadingPage = false;});</script>
+<div id="page-spinner"></div>
diff --git a/view/theme/redbasic/tpl/viewcontactsajax.tpl b/view/theme/redbasic/tpl/viewcontactsajax.tpl
new file mode 100644
index 000000000..68be228be
--- /dev/null
+++ b/view/theme/redbasic/tpl/viewcontactsajax.tpl
@@ -0,0 +1,3 @@
+{{foreach $contacts as $contact}}
+{{include file="contact_template.tpl"}}
+{{/foreach}}
diff --git a/view/theme/redbasic/tpl/webpage_export_list.tpl b/view/theme/redbasic/tpl/webpage_export_list.tpl
new file mode 100644
index 000000000..b22b3818a
--- /dev/null
+++ b/view/theme/redbasic/tpl/webpage_export_list.tpl
@@ -0,0 +1,124 @@
+<div class="generic-content-wrapper">
+		<form action="" method="post" autocomplete="on" >
+		<input type="hidden" name="action" value="{{$action}}">
+		<div class="section-title-wrapper">
+			<div class="pull-right">				
+					<button class="btn btn-md btn-success" type="submit" name="submit" value="{{$exportbtn}}">{{$exportbtn}}</button>
+			</div>
+			<h2>{{$title}}</h2>
+			<div class="clear"></div>
+		</div>
+		<div id="import-website-content-wrapper" class="section-content-wrapper">
+				<div class="pull-left">
+						<button id="toggle-select-all" class="btn btn-sm btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i>&nbsp;Toggle Select All</button>
+				</div>
+				<div class="clear"></div>
+				<hr>
+				<!--<h4>Pages</h4>-->
+				<div>
+				<table class="table-striped table-responsive table-hover" style="width: 100%;">
+						<thead>
+								<tr><th></th><th>Page Link</th><th>Page Title</th><th>Type</th></tr>
+						</thead>
+						{{foreach $pages as $page}}
+								<tr>
+									<td width="30px" style="padding-right: 20px;">
+										<div class='squaredThree'>
+										<input type="checkbox" id="page_{{$page.mid}}" name="page[]" value="{{$page.mid}}">
+										<label for="page_{{$page.mid}}"></label>
+										</div>
+									</td>
+									<td width="30%">
+										<div class="desc">
+											{{$page.pagetitle}}<br>
+										</div>
+									</td>
+									<td width="55%">
+										<div class='desc'>
+											{{$page.title}}<br>
+										</div>
+									</td>
+									<td width="15%">
+										<div class='desc'>
+											{{$page.mimetype}}<br>
+										</div>
+									</td>
+								</tr>
+						{{/foreach}}
+				</table>
+				</div>
+				<hr>
+				<div class="clear"></div>
+				<!--<h4>Layouts</h4>-->
+				<div>
+				<table class="table-striped table-responsive table-hover" style="width: 100%;">
+						<thead>
+								<tr><th width="20px"></th><th>Layout Name</th><th>Layout Description</th><th>Type</th></tr>
+						</thead>
+						{{foreach $layouts as $layout}}
+								<tr>
+									<td width="30px" style="padding-right: 20px;">
+										<div class='squaredThree'>
+										<input type="checkbox" id="layout_{{$layout.mid}}" name="layout[]" value="{{$layout.mid}}">
+										<label for="layout_{{$layout.mid}}"></label>
+										</div>
+									</td>
+									<td width="30%">
+										<div class="desc">
+											{{$layout.name}}<br>
+										</div>
+									</td>
+									<td width="55%">
+										<div class='desc'>
+											{{$layout.description}}<br>
+										</div>
+									</td>
+									<td width="15%">
+										<div class='desc'>
+											{{$layout.mimetype}}<br>
+										</div>
+									</td>
+								</tr>
+						{{/foreach}}
+				</table>
+				</div>
+				<hr>
+				<div class="clear"></div>
+				<!--<h4>Blocks</h4>-->
+				<div>
+				<table class="table-striped table-responsive table-hover" style="width: 100%;">
+						<thead>
+								<tr><th width="30px"></th><th>Block Name</th><th>Block Title</th><th>Type</th></tr>
+						</thead>
+						{{foreach $blocks as $block}}
+								<tr>
+									<td width="30px" style="padding-right: 20px;">
+										<div class='squaredThree'>
+										<input type="checkbox" id="block_{{$block.mid}}" name="block[]" value="{{$block.mid}}">
+										<label for="block_{{$block.mid}}"></label>
+										</div>
+									</td>
+									<td width="30%">
+										<div class="desc">
+											{{$block.name}}<br>
+										</div>
+									</td>
+									<td width="55%">
+										<div class='desc'>
+											{{$block.title}}<br>
+										</div>
+									</td>
+									<td width=15%">
+										<div class='desc'>
+											{{$block.mimetype}}<br>
+										</div>
+									</td>
+								</tr>
+						{{/foreach}}
+				</table>
+				</div>
+				
+		</div>
+		</form>
+</div>
+
diff --git a/view/theme/redbasic/tpl/webpage_import.tpl b/view/theme/redbasic/tpl/webpage_import.tpl
new file mode 100644
index 000000000..955288c1e
--- /dev/null
+++ b/view/theme/redbasic/tpl/webpage_import.tpl
@@ -0,0 +1,126 @@
+<div class="generic-content-wrapper">
+		<form action="" method="post" autocomplete="on" >
+		<input type="hidden" name="action" value="importselected">
+		<div class="section-title-wrapper">
+			<div class="pull-right">				
+					<button class="btn btn-md btn-success" type="submit" name="submit" value="{{$importbtn}}">{{$importbtn}}</button>
+			</div>
+			<h2>{{$title}}</h2>
+			<div class="clear"></div>
+		</div>
+		<div id="import-website-content-wrapper" class="section-content-wrapper">
+						<div class="pull-left">
+								<button id="toggle-select-all" class="btn btn-sm btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i>&nbsp;Toggle Select All</button>
+						</div>
+						<div class="clear"></div>
+						<h4>Scanned Pages</h4>
+						<div>
+						<table class="table-striped table-responsive table-hover" style="width: 100%;">
+							<tr><td>Import?</td><td>Page</td><!--<td>Existing Page</td>--></tr>
+						{{foreach $pages as $page}}
+								<tr>
+									<td>
+										<div class='squaredTwo'>
+										<input type="checkbox" id="page_{{$page.pagelink}}" name="page[]" value="{{$page.pagelink}}">
+										<label for="page_{{$page.pagelink}}"></label>
+										</div>
+									</td>
+									<td>
+										<div class='desc'>
+											Page Link: {{$page.pagelink}}<br>
+											Layout: {{$page.layout}}<br>
+											Title: {{$page.title}}<br>
+											Content File: {{$page.contentfile}}<br>
+											Type: {{$page.type}}<br>
+										</div>
+									</td>
+								<!-- TODO: Retrieve existing element information to avoid accidental overwriting
+									<td>
+										<div class='desc'>
+											Name: {{$page.curpage.pagelink}}<br>
+											Layout: {{$page.curpage.layout}}<br>
+											Title: {{$page.curpage.title}}<br>
+											Last edit: {{$page.curpage.edited}}<br>
+											Type: {{$page.curpage.type}}<br>
+										</div>
+									</td>
+								-->
+								</tr>
+						{{/foreach}}
+						</table>
+						</div>
+
+
+						<h4>Scanned Layouts</h4>
+						<div>
+						<table class="table-striped table-responsive table-hover" style="width: 100%;">
+								<tr><td>Import?</td><td>Layout</td><!--<td>Existing Layout</td>--></tr>
+						{{foreach $layouts as $layout}}
+										<tr>
+												<td>
+														<div class='squaredTwo'>
+														<input type="checkbox" id="layout_{{$layout.name}}" name="layout[]" value="{{$layout.name}}">
+														<label for="layout_{{$layout.name}}"></label>
+														</div>
+												</td>
+												<td>
+														<div class='desc'>
+																Name: {{$layout.name}}<br>
+																Description: {{$layout.description}}<br>
+																Content File: {{$layout.contentfile}}<br>
+														</div>
+												</td>
+												<!-- TODO: Retrieve existing element information to avoid accidental overwriting
+												<td>
+														<div class='desc'>
+																Name: {{$layout.curblock.name}}<br>
+																Title: {{$layout.curblock.description}}<br>
+																Last edit: {{$layout.curblock.edited}}<br>
+														</div>
+												</td>
+												-->
+										</tr>
+						{{/foreach}}
+						</table>
+						</div>
+
+						<h4>Scanned Blocks</h4>
+						<div>
+						<table class="table-striped table-responsive table-hover" style="width: 100%;">
+								<tr><td>Import?</td><td>Block</td><!--<td>Existing Block</td>--></tr>
+						{{foreach $blocks as $block}}
+										<tr>
+												<td>
+														<div class='squaredTwo'>
+														<input type="checkbox" id="block_{{$block.name}}" name="block[]" value="{{$block.name}}">
+														<label for="block_{{$block.name}}"></label>
+														</div>
+												</td>
+												<td>
+														<div class='desc'>
+																Name: {{$block.name}}<br>
+																Title: {{$block.title}}<br>
+																Content File: {{$block.contentfile}}<br>
+																Type: {{$block.type}}<br>
+														</div>
+												</td>
+												<!-- TODO: Retrieve existing element information to avoid accidental overwriting
+												<td>
+														<div class='desc'>
+																Name: {{$block.curblock.name}}<br>
+																Title: {{$block.curblock.title}}<br>
+																Last edit: {{$block.curblock.edited}}<br>
+																Type: {{$block.curblock.type}}<br>
+														</div>
+												</td>
+												-->
+										</tr>
+						{{/foreach}}
+						</table>
+						</div>
+				
+		</div>
+		<div class="clear"></div>
+		</form>
+</div>
+
diff --git a/view/theme/redbasic/tpl/webpagelist.tpl b/view/theme/redbasic/tpl/webpagelist.tpl
new file mode 100644
index 000000000..fcf9de75a
--- /dev/null
+++ b/view/theme/redbasic/tpl/webpagelist.tpl
@@ -0,0 +1,76 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $editor}}
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-sm btn-success acl-form-trigger" onclick="openClose('webpage-editor');" data-form_id="profile-jot-form"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
+		</div>
+		{{/if}}
+		<h2>{{$listtitle}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{if $editor}}
+	<div id="webpage-editor" class="section-content-tools-wrapper">
+		{{$editor}}
+	</div>
+	{{/if}}
+	{{if $pages}}
+	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+		<table id="webpage-list-table">
+			<tr>
+				<th width="1%">{{$pagelink_txt}}</th>
+				<th width="95%">{{$title_txt}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%" class="d-none d-md-table-cell">{{$created_txt}}</th>
+				<th width="1%" class="d-none d-md-table-cell">{{$edited_txt}}</th>
+			</tr>
+			{{foreach $pages as $key => $items}}
+			{{foreach $items as $item}}
+			<tr id="webpage-list-item-{{$item.url}}">
+				<td>
+					{{if $view}}
+					<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
+					{{else}}
+					{{$item.pagetitle}}
+					{{/if}}
+				</td>
+				<td>
+					{{$item.title}}
+				</td>
+				<td class="webpage-list-tool dropdown">
+					{{if $item.lockstate=='lock'}}
+					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i>
+					<ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $item.bb_element}}
+					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+					{{/if}}
+				</td>
+				<td class="d-none d-md-table-cell">
+					{{$item.created}}
+				</td>
+				<td class="d-none d-md-table-cell">
+					{{$item.edited}}
+				</td>
+			</tr>
+			{{/foreach}}
+			{{/foreach}}
+		</table>
+	</div>
+	{{/if}}
+	<div class="clear"></div>
+</div>
diff --git a/view/theme/redbasic/tpl/website_portation_tools.tpl b/view/theme/redbasic/tpl/website_portation_tools.tpl
new file mode 100644
index 000000000..0d131cb17
--- /dev/null
+++ b/view/theme/redbasic/tpl/website_portation_tools.tpl
@@ -0,0 +1,60 @@
+<div id="website-portation-tools" class="widget">
+	<div class="nav nav-pills flex-column">
+		<a class="nav-link"  href="#" onclick="openClose('import-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+		<div id="import-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<input type="hidden" name="action" value="scan">
+					<p class="descriptive-text">{{$file_import_text}}</p>
+					<div class="form-group">
+						<input class="form-control" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
+					</div>
+					<div class="form-group">
+						<button class="btn btn-primary btn-sm" type="submit" name="cloudsubmit" value="{{$select}}">Submit</button>
+					</div>
+					<!-- Or upload a zipped file containing the website -->
+					<p class="descriptive-text">{{$file_upload_text}}</p>
+					<div class="form-group">
+						<input class="form-control-file w-100" type="file" name="zip_file" />
+					</div>
+					<div class="form-group">
+						<button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Submit</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+	<div class="nav nav-pills flex-column">
+		<a class="nav-link" href="#" onclick="openClose('export-form'); openClose('export-cloud-form'); return false;"><i class="fa fa-share-square-o generic-icons"></i> {{$export_label}}</a>
+		<div id="export-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<input type="hidden" name="action" value="exportzipfile">
+					<!-- Or download a zipped file containing the website -->
+					<p class="descriptive-text">{{$file_download_text}}</p>
+					<div class="form-group">
+						<input class="form-control" type="text" name="zipfilename" title="{{$filename_hint}}" placeholder="{{$filename_desc}}" value="" />
+					</div>
+					<div class="form-group">
+						<button class="btn btn-primary btn-sm" type="submit" name="w_download" value="w_download">Submit</button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<div id="export-cloud-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<input type="hidden" name="action" value="exportcloud">
+					<!-- Or export the website elements to a cloud files folder -->
+					<p style="margin-top: 10px;" class="descriptive-text">{{$cloud_export_text}}</p>
+					<div class="form-group">
+						<input class="form-control" type="text" name="exportcloudpath" title="{{$cloud_export_hint}}" placeholder="{{$cloud_export_desc}}" />
+					</div>
+					<div class="form-group">
+						<button class="btn btn-primary btn-sm" type="submit" name="exportcloudsubmit" value="{{$cloud_export_select}}">Submit</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/view/theme/redbasic/tpl/wiki.tpl b/view/theme/redbasic/tpl/wiki.tpl
new file mode 100644
index 000000000..564db3324
--- /dev/null
+++ b/view/theme/redbasic/tpl/wiki.tpl
@@ -0,0 +1,469 @@
+<div class="generic-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			{{if $showPageControls}}
+			<div id="page-tools" class="btn-group" style="display: none;">
+				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
+					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
+				</button>
+				<div class="dropdown-menu dropdown-menu-right">
+					{{if $renamePage}}
+					<a class="dropdown-item rename-page" href="#"><i class="fa fa-fw fa-edit"></i>&nbsp;{{$renamePage}}</a>
+					{{/if}}
+					<a id="embed-image" class="dropdown-item" href="#"><i class="fa fa-fw fa-picture-o"></i>&nbsp;Embed Image</a>
+				</div>
+			</div>	
+			{{/if}}
+			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button>
+		</div>
+		<h2>
+			<span id="wiki-header-name">{{$wikiheaderName}}</span>:
+			<span id="wiki-header-page">{{$wikiheaderPage}}</span>
+		</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
+		<form id="rename-page-form" action="wiki/rename/page" method="post" >
+			{{include file="field_input.tpl" field=$pageRename}}
+			<div class="form-group">
+				<div class="pull-right">
+					<button id="rename-page-submit" class="btn btn-primary" type="submit" name="submit">Submit</button>
+				</div>
+				<div>
+					<button class="btn btn-outline-secondary rename-page" type="button">Cancel</button>
+				</div>
+				<div class="clear"></div>
+			</div>
+		</form>
+	</div>
+	<div id="wiki-content-container" class="section-content-wrapper">
+		<ul class="nav nav-tabs" id="wiki-nav-tabs">
+			<li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li>
+			<li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li>
+			<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
+		</ul>
+		<div class="tab-content" id="wiki-page-tabs">
+			<div id="edit-pane" class="tab-pane">
+				{{if !$mimeType || $mimeType == 'text/markdown'}}
+				<div id="ace-editor"></div>
+				{{else}}
+				<div id="editor-wrapper">
+					<textarea id="editor">{{$content}}</textarea>
+				</div>
+				{{/if}}
+				{{if $showPageControls}}
+				<div>
+					<div id="id_{{$commitMsg.0}}_wrapper" class="field input">
+						<div class="input-group">
+							<input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
+							<div class="input-group-btn">
+								<button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
+							</div>
+						</div>
+					</div>
+				</div>
+				{{/if}}
+			</div>
+			<div id="preview-pane" class="tab-pane active">
+				<div id="wiki-preview">
+					{{$renderedContent}}
+				</div>
+			</div>
+			<div id="page-history-pane" class="tab-pane">
+				<div id="page-history-list"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+{{$wikiModal}}
+
+<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="modal-body" id="embedPhotoModalBody" >
+				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
+					<div id="embedPhotoModalBodyAlbumList"></div>
+				</div>
+				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
+				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+<script>
+	window.wiki_resource_id = '{{$resource_id}}';
+	window.wiki_page_name = '{{$page}}';
+	window.wiki_page_content = '{{$content|escape:'javascript'}}';
+	window.wiki_page_commit = '{{$commit}}';
+
+	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
+	$("#generic-modal-ok-{{$wikiModalID}}").addClass('btn-danger');
+
+	$('.rename-page').click(function (ev) {
+		$('#rename-page-form-wrapper').toggle();
+		ev.preventDefault();
+	});
+
+	$( "#rename-page-form" ).submit(function( event ) {
+		$.post("wiki/{{$channel}}/rename/page", 
+		{
+			oldName: window.wiki_page_name, 
+			newName: $('#id_pageRename').val(), 
+			resource_id: window.wiki_resource_id
+		}, 
+		function (data) {
+			if (data.success) {
+				$('#rename-page-form-wrapper').hide();
+				window.console.log('data: ' + JSON.stringify(data));
+				window.wiki_page_name = data.name.urlName;
+				$('#wiki-header-page').html(data.name.htmlName);
+				wiki_refresh_page_list();
+			} else {
+				window.console.log('Error renaming page.');
+			}
+		}, 'json');    
+		event.preventDefault();
+	});
+
+	{{if !$mimeType || $mimeType == 'text/markdown'}}
+	var editor = ace.edit("ace-editor");
+	editor.setOptions({
+		theme: "ace/theme/github",
+		mode: "ace/mode/markdown",
+
+		maxLines: Infinity,
+		minLines: 30,
+
+		wrap: true,
+
+		printMargin: false
+	});
+
+	editor.getSession().setValue(window.wiki_page_content);
+	window.editor = editor; // Store the editor in the window object so the anonymous function can use it.
+	{{else}}
+	window.editor = editor = $('#editor');
+	{{/if}}
+
+	{{if !$showPageControls}}
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		editor.setReadOnly(true); // Disable editing if the viewer lacks edit permission
+		{{else}}
+		editor.prop('readonly', true);
+		{{/if}}
+	{{/if}}
+
+	$('#edit-pane-tab').click(function (ev) {
+		setTimeout(function() {
+			window.editor.focus();
+			if($('main').hasClass('fullscreen')) {
+				adjustFullscreenEditorHeight();
+			}
+			else {
+				adjustInlineEditorHeight();
+			}
+		}, 500); // Return the focus to the editor allowing immediate text entry
+		$('#page-tools').show();
+	});
+
+	$('#wiki-get-preview').click(function (ev) {
+		$.post("wiki/{{$channel}}/preview", {
+			{{if !$mimeType || $mimeType == 'text/markdown'}}
+			content: editor.getValue(),
+			{{else}}
+			content: editor.val(),
+			{{/if}}
+			resource_id: window.wiki_resource_id
+		},
+		function (data) {
+		if (data.success) {
+			$('#wiki-preview').html(data.html);
+			{{if !$mimeType || $mimeType == 'text/markdown'}}
+			$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
+			{{/if}}
+			$('#page-tools').hide();
+		} else {
+			window.console.log('Error previewing page.');
+		}
+		}, 'json');
+		ev.preventDefault();
+	});
+
+	$('#wiki-get-history').click(function (ev) {
+		$.post("wiki/{{$channel}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
+			if (data.success) {
+				$('#page-history-list').html(data.historyHTML);
+				$('#page-tools').hide();
+			} else {
+				window.console.log('Error getting page history.');
+			}
+			}, 'json');
+			ev.preventDefault();
+		});
+
+	function wiki_refresh_page_list() {
+		if (window.wiki_resource_id === '') {
+			return false;
+		}
+		$.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) {
+			if (data.success) {
+				$('#wiki_page_list_container').html(data.pages);
+				$('#wiki_page_list_container').show();
+			} else {
+				alert('Error fetching page list!');
+				window.console.log('Error fetching page list!');
+			}
+		}, 'json');
+		return false;
+	}
+
+	$('#save-page').click(function (ev) {
+		if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
+			window.console.log('You must have a wiki page open in order to edit pages.');
+			ev.preventDefault();
+			return false;
+		}
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		var currentContent = editor.getValue();
+		{{else}}
+		var currentContent = editor.val();
+		{{/if}}
+
+		if (window.wiki_page_content === currentContent) {
+			$('#save-page').addClass('disabled');  // Disable the save button
+			window.console.log('No edits to save.');
+			ev.preventDefault();
+			return false;
+		}
+		$.post("wiki/{{$channel}}/save/page", {
+			content: currentContent, 
+			commitMsg: $('#id_commitMsg').val(),
+			name: window.wiki_page_name, 
+			resource_id: window.wiki_resource_id
+		}, 
+		function (data) {
+			if (data.success) {
+				window.console.log('Page saved successfully.');
+				window.wiki_page_content = currentContent;
+				$('#id_commitMsg').val(''); // Clear the commit message box
+				$('#save-page').addClass('disabled');  // Disable the save button
+				{{if !$mimeType || $mimeType == 'text/markdown'}}
+				window.editor.getSession().getUndoManager().markClean();  // Reset the undo history for the editor
+				{{/if}}
+
+				window.editor.focus();  // Return focus to the editor for continued editing
+				// $('#wiki-get-history').click();
+			} else {
+				alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups 
+				window.console.log('Error saving page.');
+			}
+		}, 'json');
+		ev.preventDefault();
+	});
+
+	function wiki_revert_page(commitHash) {
+		if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
+			window.console.log('You must have a wiki page open in order to revert pages.');
+			return false;
+		}
+		$.post("wiki/{{$channel}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
+		function (data) {
+			if (data.success) {
+			$('button[id^=revert-]').removeClass('btn-success');
+			$('button[id^=revert-]').addClass('btn-danger');
+			$('button[id^=revert-]').html('Revert');
+			$('#revert-'+commitHash).removeClass('btn-danger');
+			$('#revert-'+commitHash).addClass('btn-success');
+			$('#revert-'+commitHash).html('Page reverted<br>but not saved');
+			window.wiki_page_commit = commitHash;
+			// put contents in editor
+			editor.getSession().setValue(data.content);
+			} else {
+			window.console.log('Error reverting page.');
+			}
+		}, 'json');
+	}
+
+	function wiki_compare_page(compareCommit) {
+		if (window.wiki_resource_id === '' || window.wiki_page_name === '' || window.wiki_page_commit === '') {
+			window.console.log('You must have a wiki page open in order to revert pages.');
+			return false;
+		}
+		$.post("wiki/{{$channel}}/compare/page", {
+			compareCommit: compareCommit, 
+			currentCommit: window.wiki_page_commit, 
+			name: window.wiki_page_name, 
+			resource_id: window.wiki_resource_id
+		}, 
+		function (data) {
+			console.log(data);
+			if (data.success) {
+				var modalBody = $('#generic-modal-body-{{$wikiModalID}}');
+				modalBody.html('<div class="descriptive-text">'+data.diff+'</div>');
+				$('.modal-dialog').addClass('modal-lg');
+				$("#generic-modal-ok-{{$wikiModalID}}").off('click');
+				$("#generic-modal-ok-{{$wikiModalID}}").click(function () {
+					wiki_revert_page(compareCommit);
+					$('#generic-modal-{{$wikiModalID}}').modal('hide');
+				});
+				$('#generic-modal-{{$wikiModalID}}').modal();
+			} else {
+				window.console.log('Error comparing page.');
+			}
+		}, 'json');
+	}
+
+	function adjustFullscreenEditorHeight() {
+		$('#editor, #ace-editor').height($(window).height() - $('#id_commitMsg_wrapper').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('#wiki-nav-tabs').outerHeight(true) - 17);
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		editor.setOptions({
+			maxLines: null,
+			minLines: null
+		});
+		editor.resize();
+		{{/if}}
+	}
+
+	function adjustInlineEditorHeight() {
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		editor.setOptions({
+			maxLines: Infinity,
+			minLines: 30
+		});
+		editor.resize();
+		{{else}}
+		editor.height(editor[0].scrollHeight);
+		{{/if}}
+	}
+
+	$('#embed-image').click(function (ev) {
+		initializeEmbedPhotoDialog();
+		ev.preventDefault();
+	});
+
+	var initializeEmbedPhotoDialog = function () {
+		$('.embed-photo-selected-photo').each(function (index) {
+			$(this).removeClass('embed-photo-selected-photo');
+		});
+		getPhotoAlbumList();
+		$('#embedPhotoModalBodyAlbumDialog').off('click');
+		$('#embedPhotoModal').modal();
+	};
+
+	var choosePhotoFromAlbum = function (album) {
+		$.post("embedphotos/album", {name: album},
+			function(data) {
+				if (data['status']) {
+					$('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
+					$('#embedPhotoModalBodyAlbumDialog').html('\
+							<div><ul class="nav nav-pills flex-column">\n\
+								<li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
+									<i class="fa fa-chevron-left"></i>&nbsp;\n\
+									{{$modaldiffalbum}}\n\
+									</a>\n\
+								</li>\n\
+							</ul><br></div>')
+					$('#embedPhotoModalBodyAlbumDialog').append(data['content']);
+					$('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
+						evt.preventDefault();
+						var image = document.getElementById(evt.target.id);
+						if (typeof($(image).parent()[0]) !== 'undefined') {
+							var imageparent = document.getElementById($(image).parent()[0].id);
+							$(imageparent).toggleClass('embed-photo-selected-photo');
+						}
+					});
+					$('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+					$('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
+					$('#embed-photo-OKButton').click(function () {
+						$('.embed-photo-selected-photo').each(function (index) {
+							var href = $(this).attr('href');
+							$.post("embedphotos/photolink", {href: href},
+								function(ddata) {
+									if (ddata['status']) {
+										{{if !$mimeType || $mimeType == 'text/markdown'}}
+										var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' )
+										editor.getSession().insert(editor.getCursorPosition(), imgURL)
+										{{else}}
+										var currentContent = $('#editor').val();
+										$('#editor').val(currentContent + ddata['photolink']);
+										{{/if}}
+									} else {
+										window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
+									}
+									return false;
+								},
+							'json');
+						});
+						$('#embedPhotoModalBodyAlbumDialog').html('');
+						$('#embedPhotoModalBodyAlbumDialog').off('click');
+						$('#embedPhotoModal').modal('hide');
+					});
+				} else {
+					window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
+				}
+				return false;
+			},
+		'json');
+	};
+
+	var getPhotoAlbumList = function () {
+		$.post("embedphotos/albumlist", {},
+			function(data) {
+				if (data['status']) {
+					var albums = data['albumlist']; //JSON.parse(data['albumlist']);
+					$('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
+					$('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
+					for(var i = 0; i < albums.length; i++) {
+						var albumName = albums[i].text;
+						var jsAlbumName = albums[i].jstext;
+						var albumLink = '<li class="nav-item">';
+						albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
+						albumLink += '</li>';
+						$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+					}
+					$('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
+					$('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
+				} else {
+					window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
+				}
+				return false;
+			},
+		'json');
+	};
+
+	$(document).ready(function () {
+		wiki_refresh_page_list();
+
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
+		window.editor.on("input", function() {
+			if(window.editor.getSession().getUndoManager().isClean()) {
+				$('#save-page').addClass('disabled');
+			} else {
+				$('#save-page').removeClass('disabled');
+			}
+		});
+		{{else}}
+		window.editor.on("input", function() {
+			$('#save-page').removeClass('disabled');
+		});
+		window.editor.bbco_autocomplete('bbcode');
+		{{/if}}
+	});
+
+	$(window).resize(function () {
+		if($('main').hasClass('fullscreen')) {
+			adjustFullscreenEditorHeight();
+		}
+	});
+</script>
diff --git a/view/theme/redbasic/tpl/wiki_page_history.tpl b/view/theme/redbasic/tpl/wiki_page_history.tpl
new file mode 100644
index 000000000..9e5ba0f9c
--- /dev/null
+++ b/view/theme/redbasic/tpl/wiki_page_history.tpl
@@ -0,0 +1,59 @@
+<style>
+  .diff {
+    width:100%;
+    word-break: break-all;
+  }
+
+  .diff td{
+    padding:0 0.667em;
+    vertical-align:top;
+    white-space:pre;
+    white-space:pre-wrap;
+    font-family:Consolas,'Courier New',Courier,monospace;
+    font-size:1.0em;
+    line-height:1.333;
+  }
+
+  .diff span{
+    display:block;
+    min-height:1.333em;
+    margin-top:-1px;
+    padding:0 3px;
+  }
+
+  * html .diff span{
+    height:1.333em;
+  }
+
+  .diff span:first-child{
+    margin-top:0;
+  }
+
+  .diffDeleted span{
+    border:1px solid rgb(255,192,192);
+    background:rgb(255,224,224);
+  }
+
+  .diffInserted span{
+    border:1px solid rgb(192,255,192);
+    background:rgb(224,255,224);
+  }
+</style>
+<table class="table-striped table-responsive table-hover" style="width: 100%;">
+  {{foreach $pageHistory as $commit}}
+  <tr><td>
+      <table id="rev-{{$commit.hash}}" onclick="$('#details-{{$commit.hash}}').show()" width="100%">
+        <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td>
+            <td rowspan="3" width="20%" align="right">
+		{{if $permsWrite}}
+              <button id="revert-{{$commit.hash}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button>
+              <br><br>
+		{{/if}}
+              <button id="compare-{{$commit.hash}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.hash}}')">Compare</button>
+            </td></tr>
+        <tr><td>Name</td><td>{{$commit.name}} &lt;{{$commit.email}}&gt;</td></tr>
+        <tr><td>Message</td><td>{{$commit.title}}</td></tr>
+      </table>
+    </td></tr>
+  {{/foreach}}          
+</table>
diff --git a/view/theme/redbasic/tpl/wiki_page_list.tpl b/view/theme/redbasic/tpl/wiki_page_list.tpl
new file mode 100644
index 000000000..44fba15cc
--- /dev/null
+++ b/view/theme/redbasic/tpl/wiki_page_list.tpl
@@ -0,0 +1,76 @@
+{{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}}
+<div id="wiki_page_list" class="widget" >
+	<h3>{{$header}}</h3>
+	<ul class="nav nav-pills flex-column">
+		{{if $pages}}
+		{{foreach $pages as $page}}
+		<li class="nav-item nav-item-hack" id="{{$page.link_id}}">
+			{{if $page.resource_id && $candel}}
+			<i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.url}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i>
+			{{/if}}
+			<a class="nav-link" href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a>
+		</li>
+		{{/foreach}}
+		{{/if}}
+		{{if $canadd}}
+		<li class="nav-item"><a class="nav-link" href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i>&nbsp;{{$addnew}}</a></li>
+		{{/if}}
+	</ul>
+	{{if $canadd}}
+	<div id="new-page-form-wrapper" class="sub-menu" style="display:none;">
+		<form id="new-page-form" action="wiki/{{$channel}}/create/page" method="post" >
+			<input type="hidden" name="resource_id" value="{{$resource_id}}">
+			{{include file="field_input.tpl" field=$pageName}}
+			<button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button>
+		</form>
+	</div>
+	{{/if}}
+</div>
+{{if $not_refresh}}</div>{{/if}}
+
+<script>
+	$('#new-page-submit').click(function (ev) {
+		$.post("wiki/{{$channel}}/create/page", {pageName: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, 
+		function(data) {
+			if(data.success) {
+				window.location = data.url;
+			} else {
+				window.console.log('Error creating page.');
+			}
+		}, 'json');
+		ev.preventDefault();
+	});
+
+	function wiki_delete_page(wiki_page_name, wiki_page_url, wiki_resource_id, wiki_link_id) {
+		if(!confirm('Are you sure you want to delete the page: ' + wiki_page_name)) {
+			return;
+		}
+		$.post("wiki/{{$channel}}/delete/page", {name: wiki_page_url, resource_id: wiki_resource_id},
+		function (data) {
+			if (data.success) {
+				window.console.log('Page deleted successfully.');
+				if(wiki_page_url == window.wiki_page_name) {
+					var url = window.location.href;
+					if(url.substr(-1) == '/')
+						url = url.substr(0, url.length - 2);
+					url = url.split('/');
+					url.pop();
+					window.location = url.join('/');
+				}
+				else {
+					$('#' + wiki_link_id).remove();
+				}
+			} else {
+				alert('Error deleting page.'); // TODO: Replace alerts with auto-timeout popups
+				window.console.log('Error deleting page.');
+			}
+		}, 'json');
+		return false;
+	}
+
+	function wiki_show_new_page_form() {
+		$('#new-page-form-wrapper').toggle();
+		$('#id_pageName').focus();
+		return false;
+	}
+</script>
diff --git a/view/theme/redbasic/tpl/wikilist.tpl b/view/theme/redbasic/tpl/wikilist.tpl
new file mode 100644
index 000000000..760cf41b9
--- /dev/null
+++ b/view/theme/redbasic/tpl/wikilist.tpl
@@ -0,0 +1,78 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $owner}}
+		<button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$create}}</button>
+		{{/if}}
+		<h2>{{$header}}</h2>
+	</div>
+	{{if $owner}}
+	<div id="new-wiki-form-wrapper" class="section-content-tools-wrapper">
+		<form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+			{{include file="field_input.tpl" field=$wikiName}}
+			{{include file="field_select.tpl" field=$mimeType}}
+			{{include file="field_checkbox.tpl" field=$notify}}
+			<div>
+				<div class="btn-group pull-right">
+					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">
+						<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
+					</button>
+					<button id="new-wiki-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
+				</div>
+			</div>
+		</form>
+		{{$acl}}
+		<div class="clear"></div>
+	</div>
+	{{/if}}
+	<div class="section-content-wrapper-np">
+		<table id="wikis-index">
+			<tr>
+				<th width="96%">{{$name}}</th>
+				<th width="1%">{{$type}}</th>
+				<th width="1%" class="wikis-index-tool"></th>
+				<!-- th width="1%" class="wikis-index-tool"></th -->
+				{{if $owner}}
+				<th width="1%"></th>
+				{{/if}}
+			</tr>
+			{{foreach $wikis as $wiki}}
+			<tr class="wikis-index-row">
+				<td><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a></td>
+				<td>{{$wiki.mimeType}}</td>
+				<td class="wiki-index-tool dropdown">
+					{{if $wiki.lock}}
+					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i></button>
+					<ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
+					{{/if}}
+				</td>
+				<!-- td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td -->
+				{{if $owner}}
+				<td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td>
+				{{/if}}
+			</tr>
+			{{/foreach}}
+		</table>
+	</div>
+</div>
+<script>
+	{{if $owner}}
+	function wiki_delete_wiki(wikiHtmlName, resource_id) {
+		if(!confirm('Are you sure you want to delete the entire wiki: ' + JSON.stringify(wikiHtmlName))) {
+			return;
+		}
+		$.post("wiki/{{$channel}}/delete/wiki", {resource_id: resource_id}, function (data) {
+			if (data.success) {
+				window.console.log('Wiki deleted');
+				// Refresh list and redirect page as necessary
+				window.location = 'wiki/{{$channel}}';
+			} else {
+				alert('Error deleting wiki!');
+				window.console.log('Error deleting wiki.');
+			}
+		}, 'json');
+	}
+	{{/if}}
+	function wiki_download_wiki(resource_id) {
+			window.location = "wiki/{{$channel}}/download/wiki/" + resource_id;
+	}
+</script>
diff --git a/view/theme/redbasic/tpl/wikilist_widget.tpl b/view/theme/redbasic/tpl/wikilist_widget.tpl
new file mode 100644
index 000000000..9853f9850
--- /dev/null
+++ b/view/theme/redbasic/tpl/wikilist_widget.tpl
@@ -0,0 +1,8 @@
+<div id="wiki_list" class="widget">
+	<h3>{{$header}}</h3>
+	<ul class="nav nav-pills flex-column">
+		{{foreach $wikis as $wiki}}
+		<li class="nav-item"><a class="nav-link" href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}">{{$wiki.title}}</a></li> 
+		{{/foreach}}
+	</ul>
+</div>
diff --git a/view/theme/redbasic/tpl/write_pages.tpl b/view/theme/redbasic/tpl/write_pages.tpl
new file mode 100644
index 000000000..53146ee30
--- /dev/null
+++ b/view/theme/redbasic/tpl/write_pages.tpl
@@ -0,0 +1,3 @@
+<div id="write-pages" class="bigwidget">
+<span id="wp-new"><a href="{{$newurl}}">{{$new}}</a></span> <span id="wp-edit"><a href="{{$editurl}}">{{$edit}}</a></span>
+</div>
diff --git a/view/theme/redbasic/tpl/xchan_vcard.tpl b/view/theme/redbasic/tpl/xchan_vcard.tpl
new file mode 100755
index 000000000..ac796cd47
--- /dev/null
+++ b/view/theme/redbasic/tpl/xchan_vcard.tpl
@@ -0,0 +1,10 @@
+<div id="vcard" class="vcard h-card">
+<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo u-photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
+{{if $connect}}
+<div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
+{{/if}}
+<div class="fn p-name">{{$name}}</div>
+</div>
+
+
+
diff --git a/view/theme/redbasic/tpl/xrd_diaspora.tpl b/view/theme/redbasic/tpl/xrd_diaspora.tpl
new file mode 100644
index 000000000..aa0d8c740
--- /dev/null
+++ b/view/theme/redbasic/tpl/xrd_diaspora.tpl
@@ -0,0 +1,3 @@
+	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
+	<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
+	<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />
diff --git a/view/theme/redbasic/tpl/xrd_host.tpl b/view/theme/redbasic/tpl/xrd_host.tpl
new file mode 100755
index 000000000..2a40dcf47
--- /dev/null
+++ b/view/theme/redbasic/tpl/xrd_host.tpl
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
+     xmlns:hm='http://host-meta.net/xrd/1.0'>
+ 
+    <hm:Host>{{$zhost}}</hm:Host>
+ 
+    <Link rel='lrdd' type="application/xrd+xml" template='{{$zroot}}/xrd/?uri={uri}' />
+	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
+        href="{{$zroot}}/oexchange/xrd" />
+
+</XRD>
diff --git a/view/theme/redbasic/tpl/xrd_person.tpl b/view/theme/redbasic/tpl/xrd_person.tpl
new file mode 100755
index 000000000..93fdcb1df
--- /dev/null
+++ b/view/theme/redbasic/tpl/xrd_person.tpl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+ 
+    <Subject>{{$accturi}}</Subject>
+	{{if $aliases}}{{foreach $aliases as $a}}
+	<Alias>{{$a}}</Alias>   
+	{{/foreach}}{{/if}}
+
+    <Link rel="http://schemas.google.com/g/2010#updates-from" 
+          type="application/atom+xml" 
+          href="{{$atom}}" />
+    <Link rel="http://webfinger.net/rel/profile-page"
+          type="text/html"
+          href="{{$profile_url}}" />
+    <Link rel="http://portablecontacts.net/spec/1.0"
+          href="{{$poco_url}}" />
+    <Link rel="http://webfinger.net/rel/avatar"
+          type="image/jpeg"
+          href="{{$photo}}" />
+    <Link rel="http://microformats.org/profile/hcard"
+          type="text/html"
+          href="{{$hcard_url}}" />
+    <Link rel="http://ostatus.org/schema/1.0/subscribe"
+          template="{{$subscribe}}" />
+
+   <Link rel="magic-public-key"
+          href="{{$modexp}}" />
+
+	{{$dspr}}
+
+</XRD>
diff --git a/view/theme/redbasic/tpl/zcard.tpl b/view/theme/redbasic/tpl/zcard.tpl
new file mode 100644
index 000000000..908f07631
--- /dev/null
+++ b/view/theme/redbasic/tpl/zcard.tpl
@@ -0,0 +1,144 @@
+<style>
+{{if $size == 'hz_large'}}
+.hz_card {
+/*	-moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); 
+	transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */
+	font-family: sans-serif, arial, freesans;
+}
+.hz_cover_photo {
+	max-width: 100%;
+}
+.hz_profile_photo {
+	position: relative;
+	top: -300px;
+	left: 30px;
+	background-color: white;
+	border: 1px solid #ddd;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	padding: 10px;
+	width: 320px;
+	height: 320px;
+}
+
+.hz_name {
+	position: relative;
+	top: -100px;
+	left: 400px;
+	color: #fff;
+	font-size: 48px;
+    text-rendering: optimizelegibility;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
+}
+.hz_addr {
+	position: relative;
+	top: -110px;
+	left: 400px;
+	color: #fff;
+	font-size: 24px;
+    text-rendering: optimizelegibility;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
+}	
+{{elseif $size == 'hz_medium'}}
+.hz_card {
+/*	-moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); 
+	transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */
+	font-family: sans-serif, arial, freesans;
+	width: 100%;
+	overflow: hidden; 
+	height: 390px; 
+}
+.hz_cover_photo img {
+	width: {{$maxwidth}}px;
+/*	max-width: 100%; */
+}
+.hz_profile_photo {
+	position: relative;
+	top: -165px;
+	left: 30px;
+
+	width: 150px;
+	height: 150px;
+}
+.hz_profile_photo img {
+	background-color: white;
+	border: 1px solid #ddd;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	padding: 5px;
+	width: 150px;
+	height: 150px;
+}
+
+.hz_name {
+	position: relative;
+	top: -100px;
+	left: 210px;
+	color: #fff;
+	font-size: 32px;
+    text-rendering: optimizelegibility;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
+}
+.hz_addr {
+	position: relative;
+	top: -100px;
+	left: 210px;
+	color: #fff;
+	font-size: 18px;
+    text-rendering: optimizelegibility;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
+}	
+
+
+{{else}}
+.hz_card {
+/*	-moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); 
+	transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */
+	font-family: sans-serif, arial, freesans;
+}
+.hz_cover_photo {
+	max-width: 100%;
+}
+.hz_profile_photo {
+	position: relative;
+	top: -75px;
+	left: 20px;
+	background-color: white;
+	border: 1px solid #ddd;
+/*	border-radius: 5px;
+	-moz-border-radius: 5px; */
+	padding: 3px;
+	width: 80px;
+	height: 80px;
+}
+
+.hz_name {
+	position: relative;
+	top: -40px;
+	left: 120px;
+	color: #fff;
+	font-size: 18px;
+    text-rendering: optimizelegibility;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
+}
+.hz_addr {
+	position: relative;
+	top: -40px;
+	left: 120px;
+	color: #fff;
+	font-size: 10px;
+    text-rendering: optimizelegibility;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
+}	
+{{/if}}
+
+</style>
+
+<div class="hz_card {{$size}}">
+	<div class="hz_cover_photo"><img src="{{$cover.href}}" alt="{{$zcard.chan.xchan_name}}" />
+		<div class="hz_name">{{$zcard.chan.xchan_name}}</div>
+		<div class="hz_addr">{{$zcard.chan.channel_addr}}</div>
+	</div>
+	<div class="hz_profile_photo"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></div>
+</div>
+
diff --git a/view/theme/redbasic/tpl/zcard_embed.tpl b/view/theme/redbasic/tpl/zcard_embed.tpl
new file mode 100644
index 000000000..5c7a925e3
--- /dev/null
+++ b/view/theme/redbasic/tpl/zcard_embed.tpl
@@ -0,0 +1,8 @@
+<div class="hz_card {{$size}}">
+	<div class="hz_cover_photo" style="max-width: 100;"><a href="{{$zcard.chan.xchan_url}}"><img src="{{$cover.href}}" alt="{{$zcard.chan.xchan_name}}" /></a>
+		<div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 18px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.xchan_name}}</div>
+		<div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 10px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.channel_addr}}</div>
+	</div>
+	<div style="position:relative;top: -75px;left: 20px;background-color: white;border: 1px solid #ddd;padding: 3px;width: 80px;height: 80px;"><a href="{{$zcard.chan.xchan_url}}"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></a></div>
+</div>
+
diff --git a/view/tpl/404.tpl b/view/tpl/404.tpl
deleted file mode 100755
index c9b51a63b..000000000
--- a/view/tpl/404.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$message}}</h1>
-</div>
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
deleted file mode 100755
index 9fb5c4b18..000000000
--- a/view/tpl/abook_edit.tpl
+++ /dev/null
@@ -1,519 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $notself}}
-		<div class="pull-right">
-			<div class="btn-group">
-				<button id="connection-dropdown" class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
-				</button>
-				<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
-					<a class="dropdown-item" href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a>
-					<a class="dropdown-item" href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a>
-					{{if $tools.fetchvc}}
-					<a class="dropdown-item" href="{{$tools.fetchvc.url}}" title="{{$tools.fetchvc.title}}">{{$tools.fetchvc.label}}</a>
-					{{/if}}
-					<a class="dropdown-item" href="#" title="{{$tools.refresh.title}}" onclick="window.location.href='{{$tools.refresh.url}}'; return false;">{{$tools.refresh.label}}</a>
-					<a class="dropdown-item" href="#" title="{{$tools.rephoto.title}}" onclick="window.location.href='{{$tools.rephoto.url}}'; return false;">{{$tools.rephoto.label}}</a>
-					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="#" title="{{$tools.block.title}}" onclick="window.location.href='{{$tools.block.url}}'; return false;">{{$tools.block.label}}</a>
-					<a class="dropdown-item" href="#" title="{{$tools.ignore.title}}" onclick="window.location.href='{{$tools.ignore.url}}'; return false;">{{$tools.ignore.label}}</a>
-					<a class="dropdown-item" href="#" title="{{$tools.archive.title}}" onclick="window.location.href='{{$tools.archive.url}}'; return false;">{{$tools.archive.label}}</a>					<a class="dropdown-item" href="#" title="{{$tools.hide.title}}" onclick="window.location.href='{{$tools.hide.url}}'; return false;">{{$tools.hide.label}}</a>
-					<a class="dropdown-item" href="#" title="{{$tools.delete.title}}" onclick="window.location.href='{{$tools.delete.url}}'; return false;">{{$tools.delete.label}}</a>
-				</div>
-			</div>
-			{{if $abook_prev || $abook_next}}
-			<div class="btn-group">
-				<a href="connedit/{{$abook_prev}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a>
-				<div class="btn-group" >
-					<button class="btn btn-outline-secondary btn-sm{{if $is_pending}} disabled{{/if}}" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button>
-					<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
-						{{foreach $sections as $s}}
-						<a class="dropdown-item" href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a>
-						{{/foreach}}
-					</div>
-				</div>
-				<a href="connedit/{{$abook_next}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_next}} disabled{{/if}}" ><i class="fa fa-forward"></i></a>
-			</div>
-			{{/if}}
-		</div>
-		{{/if}}
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper-np">
-		{{if $notself}}
-		{{foreach $tools as $tool}}
-		{{if $tool.info}}
-		<div class="section-content-danger-wrapper">
-			<div>
-				{{$tool.info}}
-			</div>
-		</div>
-		{{/if}}
-		{{/foreach}}
-		<div class="section-content-info-wrapper">
-			<div>
-				{{$addr_text}} <strong>'{{$addr}}'</strong>			
-			</div>
-			{{if $locstr}}
-			<div>
-				{{$loc_text}} {{$locstr}}
-			</div>
-			{{/if}}
-			{{if $last_update}}
-			<div>
-				{{$lastupdtext}} {{$last_update}}
-			</div>
-			{{/if}}
-		</div>
-		{{/if}}
-
-		<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
-
-		<input type="hidden" name="contact_id" value="{{$contact_id}}">
-		<input type="hidden" name="section" value="{{$section}}">
-
-		<div class="panel-group" id="contact-edit-tools" role="tablist" aria-multiselectable="true">
-			{{if $notself}}
-
-			{{if $is_pending}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="pending-tool">
-					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse">
-							{{$pending_label}}
-						</a>
-					</h3>
-				</div>
-				<div id="pending-tool-collapse" class="panel-collapse collapse show" role="tabpanel" aria-labelledby="pending-tool">
-					<div class="section-content-tools-wrapper">
-						{{include file="field_checkbox.tpl" field=$unapproved}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{/if}}
-			{{if ! $is_pending}}
-			<div id="template-form-vcard-org" class="form-group form-vcard-org">
-				<div class="form-group form-vcard-org">
-					<input type="text" name="org" value="" placeholder="{{$org_label}}">
-					<i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				</div>
-			</div>
-
-			<div id="template-form-vcard-title" class="form-group form-vcard-title">
-				<div class="form-group form-vcard-title">
-					<input type="text" name="title" value="" placeholder="{{$title_label}}">
-					<i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				</div>
-			</div>
-
-			<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
-				<select name="tel_type[]">
-					<option value="CELL">{{$mobile}}</option>
-					<option value="HOME">{{$home}}</option>
-					<option value="WORK">{{$work}}</option>
-					<option value="OTHER">{{$other}}</option>
-				</select>
-				<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
-				<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-			</div>
-
-			<div id="template-form-vcard-email" class="form-group form-vcard-email">
-				<select name="email_type[]">
-					<option value="HOME">{{$home}}</option>
-					<option value="WORK">{{$work}}</option>
-					<option value="OTHER">{{$other}}</option>
-				</select>
-				<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
-				<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-			</div>
-
-			<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
-				<select name="impp_type[]">
-					<option value="HOME">{{$home}}</option>
-					<option value="WORK">{{$work}}</option>
-					<option value="OTHER">{{$other}}</option>
-				</select>
-				<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
-				<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-			</div>
-
-			<div id="template-form-vcard-url" class="form-group form-vcard-url">
-				<select name="url_type[]">
-					<option value="HOME">{{$home}}</option>
-					<option value="WORK">{{$work}}</option>
-					<option value="OTHER">{{$other}}</option>
-				</select>
-				<input type="text" name="url[]" value="" placeholder="{{$url_label}}">
-				<i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-			</div>
-
-			<div id="template-form-vcard-adr" class="form-group form-vcard-adr">
-				<div class="form-group">
-					<select name="adr_type[]">
-						<option value="HOME">{{$home}}</option>
-						<option value="WORK">{{$work}}</option>
-						<option value="OTHER">{{$other}}</option>
-					</select>
-					<label>{{$adr_label}}</label>
-					<i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$po_box}}">
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$extra}}">
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$street}}">
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$locality}}">
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$region}}">
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$zip_code}}">
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$country}}">
-				</div>
-			</div>
-
-			<div id="template-form-vcard-note" class="form-group form-vcard-note">
-				<label>{{$note_label}}</label>
-				<i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				<textarea name="note" class="form-control"></textarea>
-			</div>
-
-			<div class="section-content-wrapper-np">
-				<div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
-				<div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field">
-					<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
-					<ul class="dropdown-menu">
-						<li class="add-vcard-org"{{if $vcard.org}} style="display: none"{{/if}}><a href="#" data-add="vcard-org" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$org_label}}</a></li>
-						<li class="add-vcard-title"{{if $vcard.title}} style="display: none"{{/if}}><a href="#" data-add="vcard-title" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$title_label}}</a></li>
-						<li class="add-vcard-tel"><a href="#" data-add="vcard-tel" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$tel_label}}</a></li>
-						<li class="add-vcard-email"><a href="#" data-add="vcard-email" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$email_label}}</a></li>
-						<li class="add-vcard-impp"><a href="#" data-add="vcard-impp" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$impp_label}}</a></li>
-						<li class="add-vcard-url"><a href="#" data-add="vcard-url" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$url_label}}</a></li>
-						<li class="add-vcard-adr"><a href="#" data-add="vcard-adr" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$adr_label}}</a></li>
-						<li class="add-vcard-note"{{if $vcard.note}} style="display: none"{{/if}}><a href="#" data-add="vcard-note" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$note_label}}</a></li>
-					</ul>
-				</div>
-				<div id="vcard-header-{{$vcard.id}}" class="vcard-header" data-id="{{$vcard.id}}" data-action="open">
-					<i class="vcard-fn-preview fa fa-address-card-o"></i>
-					<span id="vcard-preview-{{$vcard.id}}" class="vcard-preview">
-						{{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}}
-						{{if $vcard.emails.0.address}}<span class="vcard-email-preview d-none d-md-table-cell"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}}
-						{{if $vcard.tels.0}}<span class="vcard-tel-preview d-none d-md-table-cell">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}}
-					</span>
-					<input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}">
-				</div>
-			</div>
-			<div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper">
-
-				<div class="vcard-org form-group">
-					<div class="form-vcard-org-wrapper">
-						{{if $vcard.org}}
-						<div class="form-group form-vcard-org">
-							<input type="text" name="org" value="{{$vcard.org}}" size="{{$vcard.org|count_characters:true}}" placeholder="{{$org_label}}">
-							<i data-remove="vcard-org" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						{{/if}}
-					</div>
-				</div>
-
-				<div class="vcard-title form-group">
-					<div class="form-vcard-title-wrapper">
-						{{if $vcard.title}}
-						<div class="form-group form-vcard-title">
-							<input type="text" name="title" value="{{$vcard.title}}" size="{{$vcard.title|count_characters:true}}" placeholder="{{$title_label}}">
-							<i data-remove="vcard-title" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						{{/if}}
-					</div>
-				</div>
-
-
-				<div class="vcard-tel form-group">
-					<div class="form-vcard-tel-wrapper">
-						{{if $vcard.tels}}
-						{{foreach $vcard.tels as $tel}}
-						<div class="form-group form-vcard-tel">
-							<select name="tel_type[]">
-								<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
-								<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
-								<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-								<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-								<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-							</select>
-							<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
-							<i data-remove="vcard-tel" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-
-
-				<div class="vcard-email form-group">
-					<div class="form-vcard-email-wrapper">
-						{{if $vcard.emails}}
-						{{foreach $vcard.emails as $email}}
-						<div class="form-group form-vcard-email">
-							<select name="email_type[]">
-								<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
-								<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-								<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-								<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-							</select>
-							<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
-							<i data-remove="vcard-email" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-
-				<div class="vcard-impp form-group">
-					<div class="form-vcard-impp-wrapper">
-						{{if $vcard.impps}}
-						{{foreach $vcard.impps as $impp}}
-						<div class="form-group form-vcard-impp">
-							<select name="impp_type[]">
-								<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
-								<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-								<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-								<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-							</select>
-							<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
-							<i data-remove="vcard-impp" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-
-				<div class="vcard-url form-group">
-					<div class="form-vcard-url-wrapper">
-						{{if $vcard.urls}}
-						{{foreach $vcard.urls as $url}}
-						<div class="form-group form-vcard-url">
-							<select name="url_type[]">
-								<option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option>
-								<option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-								<option value="WORK"{{if $url.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-								<option value="OTHER"{{if $url.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-							</select>
-							<input type="text" name="url[]" value="{{$url.address}}" size="{{$url.address|count_characters:true}}" placeholder="{{$url_label}}">
-							<i data-remove="vcard-url" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-
-				<div class="vcard-adr form-group">
-					<div class="form-vcard-adr-wrapper">
-						{{if $vcard.adrs}}
-						{{foreach $vcard.adrs as $adr}}
-						<div class="form-group form-vcard-adr">
-							<div class="form-group">
-								<label>{{$adr_label}}</label>
-								<select name="adr_type[]">
-									<option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option>
-									<option value="HOME"{{if $adr.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-									<option value="WORK"{{if $adr.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-									<option value="OTHER"{{if $adr.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-								</select>
-								<i data-remove="vcard-adr" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}">
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}">
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}">
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}">
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}">
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}">
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}">
-							</div>
-						</div>
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-
-				<div class="vcard-note form-group form-vcard-note">
-					<div class="form-vcard-note-wrapper">
-						{{if $vcard.note}}
-						<label>{{$note_label}}</label>
-						<i data-remove="vcard-note" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						<textarea name="note" class="form-control">{{$vcard.note}}</textarea>
-						{{/if}}
-					</div>
-				</div>
-
-
-				<div class="settings-submit-wrapper" >
-					<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-				</div>
-
-			</div>
-			{{/if}}
-
-			{{if $affinity}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="affinity-tool">
-					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#affinity-tool-collapse" aria-expanded="true" aria-controls="affinity-tool-collapse">
-							{{$affinity}}
-						</a>
-					</h3>
-				</div>
-				<div id="affinity-tool-collapse" class="panel-collapse collapse{{if $section == 'affinity'}} show{{/if}}" role="tabpanel" aria-labelledby="affinity-tool">
-					<div class="section-content-tools-wrapper">
-						{{if $slide}}
-						<div class="form-group"><strong>{{$lbl_slider}}</strong></div>
-						{{$slide}}
-						<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
-						{{/if}}
-
-						{{if $multiprofs}}
-						<div class="form-group">
-							<strong>{{$lbl_vis2}}</strong>
-							{{$profile_select}}
-						</div>
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{/if}}
-
-			{{if $connfilter}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="fitert-tool">
-					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#fitert-tool-collapse" aria-expanded="true" aria-controls="fitert-tool-collapse">
-							{{$connfilter_label}}
-						</a>
-					</h3>
-				</div>
-				<div id="fitert-tool-collapse" class="panel-collapse collapse{{if $section == 'filter' }} show{{/if}}" role="tabpanel" aria-labelledby="fitert-tool">
-					<div class="section-content-tools-wrapper">
-						{{include file="field_textarea.tpl" field=$incl}}
-						{{include file="field_textarea.tpl" field=$excl}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{else}}
-			<input type="hidden" name="{{$incl.0}}" value="{{$incl.2}}" />
-			<input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" />
-			{{/if}}
-
-			{{if $rating}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="rating-tool">
-					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#rating-tool-collapse" aria-expanded="true" aria-controls="rating-tool-collapse">
-							{{$lbl_rating}}
-						</a>
-					</h3>
-				</div>
-				<div id="rating-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="rating-tool">
-					<div class="section-content-tools-wrapper">
-						<div class="section-content-warning-wrapper">
-							{{$rating_info}}
-						</div>
-						<div class="form-group"><strong>{{$lbl_rating_label}}</strong></div>
-						{{$rating}}
-						{{include file="field_textarea.tpl" field=$rating_text}}
-						<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{/if}}
-
-			{{/if}}
-
-			{{if ! $is_pending}}
-			<div class="panel">
-				{{if $notself}}
-				<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
-					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
-							{{$permlbl}}
-						</a>
-					</h3>
-				</div>
-				{{/if}}
-				<div id="perms-tool-collapse" class="panel-collapse collapse{{if $self || $section === 'perms'}} show{{/if}}" role="tabpanel" aria-labelledby="perms-tool">
-					<div class="section-content-tools-wrapper">
-						<div class="section-content-warning-wrapper">
-						{{if $notself}}{{$permnote}}{{/if}}
-						{{if $self}}{{$permnote_self}}{{/if}}
-						</div>
-
-						{{if $permcat_enable}}
-						<div class="loading-role-rotator"></div>
-						<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
-						{{include file="field_select.tpl" field=$permcat}}
-						{{/if}}
-
-						<table id="perms-tool-table" class=form-group>
-							<tr>
-								<td></td>
-								{{if $notself}}
-								<td class="abook-them">{{$them}}</td>
-								{{/if}}
-								<td colspan="2" class="abook-me">{{$me}}</td>
-							</tr>
-							{{foreach $perms as $prm}}
-							{{include file="field_acheckbox.tpl" field=$prm}}
-							{{/foreach}}
-						</table>
-
-						{{if $self}}
-						<div>
-							<div class="section-content-info-wrapper">
-								{{$autolbl}}
-							</div>
-							{{include file="field_checkbox.tpl" field=$autoperms}}
-						</div>
-						{{/if}}
-
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{/if}}
-		</div>
-		</form>
-	</div>
-</div>
diff --git a/view/tpl/achievements.tpl b/view/tpl/achievements.tpl
deleted file mode 100644
index 7d503cc53..000000000
--- a/view/tpl/achievements.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="generic-content-wrapper">
-<p>{{$newmembertext}}</p>
-
-{{if $profilebadge}}<div id="profile-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
-{{if $contactbadge}}<div id="contact-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
-{{if $keywordsbadge}}<div id="keywords-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
-{{if $channelsbadge}}<div id="channels-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
-
-</div>
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
deleted file mode 100755
index f4f851c8a..000000000
--- a/view/tpl/acl_selector.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<form>
-<div class="modal" id="aclModal">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title">
-					<i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}
-					{{if $helpUrl}}
-					<a target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-fw fa-question"></i></a>
-					{{/if}}
-				</h4>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-			</div>
-			<div class="section-content-wrapper">
-				{{if $aclModalDesc}}
-				<div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div>
-				{{/if}}
-				<label for="acl-select">{{$select_label}}</label>
-				<select id="acl-select" name="optionsRadios" class="form-control form-group">
-					<option id="acl-showall" value="public" {{$public_selected}}>{{$showall}}</option>
-					{{$groups}}
-					<option id="acl-onlyme" value="onlyme" {{$justme_selected}}>{{$onlyme}}</option>
-					<option id="acl-custom" value="custom" {{$custom_selected}}>{{$custom}}</option>
-				</select>
-
-				{{if $showallOrigin}}
-				<div id="acl-info" class="form-group">
-					<i class="fa fa-info-circle"></i>&nbsp;{{$showallOrigin}}
-				</div>
-				{{/if}}
-
-				<div id="acl-wrapper">
-					<div id="acl-list">
-						<input class="form-control" type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
-						<small class="text-muted">{{$showlimitedDesc}}</small>
-						<div id="acl-list-content"></div>
-					</div>
-				</div>
-
-				<div class="acl-list-item" rel="acl-template" style="display:none">
-					<div class="acl-item-header">
-						<img class="menu-img-1" data-src="{0}"> {1}
-					</div>
-					<button class="acl-button-hide btn btn-sm btn-outline-danger"><i class="fa fa-times"></i> {{$hide}}</button>
-					<button class="acl-button-show btn btn-sm btn-outline-success"><i class="fa fa-check"></i> {{$show}}</button>
-				</div>
-			</div>
-			<div class="modal-footer clear">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$aclModalDismiss}}</button>
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-</form>
-<script>
-	// compatibility issue with bootstrap v4
-	//$('[data-toggle="popover"]').popover(); // Init the popover, if present
-
-	if(typeof acl=="undefined"){
-		acl = new ACL(
-			baseurl+"/acl"
-		);
-	}
-</script>
diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl
deleted file mode 100644
index 82d137de4..000000000
--- a/view/tpl/admin_account_edit.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<h2>{{$title}}</h2>
-
-<h3>{{$account.account_email}}</h3>
-
-
-<form action="admin/account_edit/{{$account.account_id}}" method="post" >
-<input type="hidden" name="aid" value="{{$account.account_id}}" />
-
-{{include file="field_password.tpl" field=$pass1}}
-{{include file="field_password.tpl" field=$pass2}}
-
-{{if $z_server_role == 'pro'}}
-{{include file="field_select.tpl" field=$account_level}}
-{{else}}
-<input type="hidden" name="account_level" value="{{$account_level.2}}" />
-{{/if}}
-{{include file="field_select.tpl" field=$account_language}}
-{{include file="field_input.tpl" field=$service_class}}
-
-
-<input type="submit" name="submit" value="{{$submit}}" />
-
-</form>
diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl
deleted file mode 100755
index 3535363a0..000000000
--- a/view/tpl/admin_accounts.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("{{$confirm_delete_multi}}");
-	}
-	function toggle_selectall(cls){
-		$("."+cls).prop("checked", !$("."+cls).prop("checked"));
-		return false;
-	}
-</script>
-<div class="generic-content-wrapper-styled" id="adminpage">
-	<h1>{{$title}} - {{$page}}</h1>
-
-	<form action="{{$baseurl}}/admin/accounts" method="post">
-		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-
-		<h3>{{$h_pending}}</h3>
-		{{if $pending}}
-			<table id="pending">
-				<thead>
-				<tr>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{foreach $pending as $u}}
-				<tr>
-					<td class="created">{{$u.account_created}}</td>
-					<td class="email">{{$u.account_email}}</td>
-					<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
-					</td>
-				</tr>
-			{{/foreach}}
-				</tbody>
-			</table>
-			<div class="selectall"><a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"> <input type="submit" name="page_users_approve" value="{{$approve}}"></div>
-		{{else}}
-			<p>{{$no_pending}}</p>
-		{{/if}}
-
-
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id="users">
-				<thead>
-				<tr>
-					{{foreach $th_users as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td class="account_id">{{$u.account_id}}</td>
-						<td class="email">{{if $u.blocked}}
-							<a href="admin/account_edit/{{$u.account_id}}"><i>{{$u.account_email}}</i></a>
-						{{else}}
-							<a href="admin/account_edit/{{$u.account_id}}"><strong>{{$u.account_email}}</strong></a>
-						{{/if}}</td>
-						<td class="channels">{{$u.channels}}</td>
-						<td class="register_date">{{$u.account_created}}</td>
-						<td class="login_date">{{$u.account_lastlog}}</td>
-						<td class="account_expires">{{$u.account_expires}}</td>
-						<td class="service_class">{{$u.account_service_class}}</td>
-						<td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
-						<td class="tools">
-							<a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}"  class="btn btn-outline-secondary btn-sm" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div>
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-</div>
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
deleted file mode 100755
index 99f139e57..000000000
--- a/view/tpl/admin_aside.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<script>
-	// update pending count //
-	$(function(){
-
-		$("nav").bind('nav-update',  function(e,data){
-			var elm = $('#pending-update');
-			var register = $(data).find('register').text();
-			if (register=="0") { register=""; elm.hide();} else { elm.show(); }
-			elm.html(register);
-		});
-	});
-</script>
-<div class="widget">
-<h3>{{$admtxt}}</h3>
-<ul class="nav nav-pills flex-column">
-	{{foreach $admin as $link}}
-	<li class="nav-item"><a class="nav-link" href='{{$link.0}}'>{{$link.1}}{{if $link.3}}<span id='{{$link.3}}' title='{{$link.4}}'></span>{{/if}}</a></li>
-	{{/foreach}}
-</ul>
-</div>
-
-{{if $admin.update}}
-<ul class="nav nav-pills flex-column">
-	<li class="nav-item"><a class="nav-link" href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
-	<li class="nav-item"><a class="nav-link" href=''>Important Changes</a></li>
-</ul>
-{{/if}}
-
-
-{{if $plugins}}
-<div class="widget">
-<h3>{{$plugadmtxt}}</h3>
-<ul class="nav nav-pills flex-column">
-	{{foreach $plugins as $l}}
-	<li class="nav-item"><a class="nav-link" href='{{$l.0}}'>{{$l.1}}</a></li>
-	{{/foreach}}
-</ul>
-</div>
-{{/if}}
-	
-<div class="widget">	
-<h3>{{$logtxt}}</h3>
-<ul class="nav nav-pills flex-column">
-	<li class="nav-item"><a class="nav-link" href='{{$logs.0}}'>{{$logs.1}}</a></li>
-</ul>
-</div>
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
deleted file mode 100755
index 452e0eeec..000000000
--- a/view/tpl/admin_channels.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("{{$confirm_delete_multi}}");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div class = "generic-content-wrapper-styled" id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/channels" method="post">
-        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		
-		<h3>{{$h_channels}}</h3>
-		{{if $channels}}
-			<table id='channels'>
-				<thead>
-				<tr>
-					{{foreach $th_channels as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $channels as $c}}
-					<tr>
-						<td class='channel_id'>{{$c.channel_id}}</td>
-						<td class='channel_name'><a href="channel/{{$c.channel_address}}">{{$c.channel_name}}</a></td>
-						<td class='channel_address'>{{$c.channel_address}}</td>
-						<td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
-						<td class="tools">
-							<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
-							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs{{if ($c.allowcode)}} btn-danger{{/if}}" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
-							<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('channels_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_channels_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_channels_code" value="{{$code}}/{{$uncode}}" /> <input type="submit" name="page_channels_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
-		{{else}}
-			NO CHANNELS?!?
-		{{/if}}
-	</form>
-</div>
diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl
deleted file mode 100755
index 1bd1f0122..000000000
--- a/view/tpl/admin_hubloc.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="generic-content-wrapper-styled" id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-
-	<table id='server'>
-		<thead>
-			<tr>
-			{{foreach $th_hubloc as $th}}<th>{{$th}}</th>{{/foreach}}
-			</tr>
-		</thead>
-		<tbody>
-			
-			{{foreach $hubloc as $hub}}<tr>
-			<td>{{$hub.hubloc_id}}</td><td>{{$hub.hubloc_addr}}</td><td>{{$hub.hubloc_host}}</td><td>{{$hub.hubloc_status}}</td>
-			<td>
-			<form action="{{$baseurl}}/admin/hubloc" method="post">
-			<input type="hidden" name="hublocid" value="{{$hub.hubloc_id}}">
-			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-			<input type='hidden' name='url' value='{{$hub.hubloc_host}}'>
-			<input type="submit" name="check" value="check" >
-			<input type="submit" name="repair" value="repair" ></td>
-			</form>
-			</tr>{{/foreach}}
-		</tbody>
-	</table>
-
-
-</div>
diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
deleted file mode 100755
index 6d2d7834c..000000000
--- a/view/tpl/admin_logs.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="generic-content-wrapper-styled" id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/logs" method="post">
-    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-	{{include file="field_checkbox.tpl" field=$debugging}}
-	{{include file="field_input.tpl" field=$logfile}}
-	{{include file="field_select.tpl" field=$loglevel}}
-	
-	<div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>
-	
-	</form>
-	
-	<h3>{{$logname}}</h3>
-	<div style="width:100%; height:400px; overflow: auto; "><pre>{{$data}}</pre></div>
-<!--	<iframe src='{{$baseurl}}/{{$logname}}' style="width:100%; height:400px"></iframe> -->
-	<!-- <div class="submit"><input type="submit" name="page_logs_clear_log" value="{{$clear}}" /></div> -->
-</div>
diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
deleted file mode 100755
index fd5ae7d5e..000000000
--- a/view/tpl/admin_plugins.tpl
+++ /dev/null
@@ -1,190 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $allowManageRepos}}
-		<div class="pull-right">
-			<button class="btn btn-success btn-sm" onclick="openClose('form');">{{$managerepos}}</button>
-		</div>
-		{{/if}}
-		<h2 id="title">{{$title}} - {{$page}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}>
-         
-        <div class="clear"></div>
-        <div class="section-title-wrapper" style="margin-top: 20px;">
-          <h2>{{$installedtitle}}</h2>
-          <div class="clear"></div>
-        </div>
-      <div class="table-responsive section-content-tools-wrapper">
-      <table class="table table-responsive table-striped table-hover">
-        {{foreach $addonrepos as $repo}}
-        <tr>
-            <td style="width: 70%;">
-				<span class="pull-left">{{$repo.name}}</span><span id="update-message-{{$repo.name}}" style="margin-left: 20px;"></span>
-            </td>
-            <td style="width: 15%;">
-              <button class="btn btn-sm btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i>&nbsp;{{$repoUpdateButton}}</button>
-            </td>
-            <td style="width: 15%;">
-              <button class="btn btn-sm btn-danger pull-right" style="margin-left: 10px; margin-right: 0px;" onclick="removeAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-trash-o'></i>&nbsp;{{$repoRemoveButton}}</button>
-            </td>
-        <div class="clear"></div>
-        </td></tr>
-        {{/foreach}}
-        </table>
-      </div>
-      <div class="clear"></div>
-         <div class="section-title-wrapper">
-          <h2>{{$addnewrepotitle}}</h2>
-          <div class="clear"></div>
-        </div>
-		{{$form}}
-    </div>
-      <div class="clear"></div>
-    <div id="chat-rotator-wrapper" class="center-block">
-        <div id="chat-rotator"></div>
-    </div>
-    <div class="clear"></div>
-	<div class="section-content-wrapper-np">
-      {{foreach $plugins as $p}}
-      <div class="section-content-tools-wrapper" id="pluginslist">		
-		<div class="contact-info plugin {{$p.1}}">
-            {{if ! $p.2.disabled}}				
-            <a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><i class='fa {{if $p.1==on}}fa-check-square-o{{else}}fa-square-o{{/if}} admin-icons'></i></a>
-            {{else}}
-            <i class='fa fa-stop admin-icons'></i>
-            {{/if}}
-            <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>{{if $p.2.disabled}} {{$disabled}}{{/if}}
-            {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
-
-            <div class='desc'>{{$p.2.description}}</div>
-		</div>
-	</div>
-    {{/foreach}}
-      
-	</div>
-</div>
-{{$newRepoModal}}
-<script>
-  
-  // TODO: Implement a simple interface controller that reconfigures the modal dialog
-  // for each action in a more organized way
-  
-  function adminPluginsAddRepo() {
-      $("#generic-modal-ok-{{$newRepoModalID}}").removeClass('btn-success');
-      $("#generic-modal-ok-{{$newRepoModalID}}").addClass('btn-primary');
-      var repoURL = $('#id_repoURL').val();
-      var repoName = $('#id_repoName').val();
-      $('#chat-rotator').spin('tiny');
-      $.post(
-        "/admin/plugins/addrepo", {repoURL: repoURL, repoName: repoName}, 
-            function(response) {
-                $('#chat-rotator').spin(false);
-                if (response.success) {
-                  var modalBody = $('#generic-modal-body-{{$newRepoModalID}}');
-                  modalBody.html('<div>'+response.repo.readme+'</div>');
-                  modalBody.append('<h2>Repo Info</h2><p>Message: ' + response.message + '</p>');
-                  modalBody.append('<h4>Branches</h4><p>'+JSON.stringify(response.repo.branches)+'</p>');
-                  modalBody.append('<h4>Remotes</h4><p>'+JSON.stringify(response.repo.remote)+'</p>');
-                  $('.modal-dialog').width('80%');
-                  $("#generic-modal-ok-{{$newRepoModalID}}").off('click');
-                  $("#generic-modal-ok-{{$newRepoModalID}}").click(function () {
-                    installAddonRepo();
-                  });
-                  $('#generic-modal-{{$newRepoModalID}}').modal();
-                } else {
-                    window.console.log('Error adding repo :' + response['message']);
-                }
-                return false;
-            },
-        'json');
-  }
-  
-  function installAddonRepo() {
-      var repoURL = $('#id_repoURL').val();
-      var repoName = $('#id_repoName').val();
-      $.post(
-        "/admin/plugins/installrepo", {repoURL: repoURL, repoName: repoName}, 
-            function(response) {
-                if (response.success) {
-                  $('#generic-modal-title-{{$newRepoModalID}}').html('Addon repo installed');
-                  var modalBody = $('#generic-modal-body-{{$newRepoModalID}}');
-                  modalBody.html('<h2>Repo Info</h2><p>Message: ' + response.message + '</p>');
-                  modalBody.append('<h4>Branches</h4><p>'+JSON.stringify(response.repo.branches)+'</p>');
-                  modalBody.append('<h4>Remotes</h4><p>'+JSON.stringify(response.repo.remote)+'</p>');
-                  $('.modal-dialog').width('80%');
-                  //$("#generic-modal-cancel-{{$newRepoModalID}}").hide();
-                  $("#generic-modal-ok-{{$newRepoModalID}}").html('OK');
-                  $("#generic-modal-ok-{{$newRepoModalID}}").removeClass('btn-primary');
-                  $("#generic-modal-ok-{{$newRepoModalID}}").addClass('btn-success');
-                  $("#generic-modal-ok-{{$newRepoModalID}}").off('click');
-                  $("#generic-modal-ok-{{$newRepoModalID}}").click(function () {
-                    $('#generic-modal-{{$newRepoModalID}}').modal('hide');
-                    if(confirm('Repo installed. Click OK to refresh page.')) {
-                      location.reload();
-                    }
-                  });
-                  $('#generic-modal-{{$newRepoModalID}}').modal();
-              
-                } else {
-                    window.console.log('Error installing repo :' + response['message']);
-                    alert('Error installing addon repo!');
-                }
-                return false;
-            },
-        'json');
-  }
-  function updateAddonRepo(repoName) {
-    if(confirm('Are you sure you want to update the addon repo ' + repoName + '?')) {
-      $.post(
-        "/admin/plugins/updaterepo", {repoName: repoName}, 
-            function(response) {
-                if (response.success) {
-                  window.console.log('Addon repo '+repoName+' successfully updated :' + response['message']);
-                  //alert('Addon repo updated.');
-				  $('#update-message-' + repoName).css('background-color', 'yellow');
-				  $('#update-message-' + repoName).html('Repo updated!');
-				  setTimeout(function () {
-					  $('#update-message-' + repoName).html('');
-				  }, 60000);
-                } else {
-                  window.console.log('Error updating repo :' + response['message']);
-                  //alert('Error updating addon repo!');
-				  $('#update-message-' + repoName).css('background-color', 'red');
-				  $('#update-message-' + repoName).html('Error updating repo!');
-				  setTimeout(function () {
-					  $('#update-message-' + repoName).html('');
-				  }, 60000);
-                }
-                return false;
-            },
-        'json');
-    }
-  }
-  function switchAddonRepoBranch(repoName) {
-    window.console.log('switchAddonRepoBranch: ' + repoName);
-    // TODO: Discover the available branches and create an interface to switch between them
-  }
-  
-  function removeAddonRepo(repoName) {
-    // TODO: Unlink the addons
-    if(confirm('Are you sure you want to remove the addon repo ' + repoName + '?')) {
-      $.post(
-        "/admin/plugins/removerepo", {repoName: repoName}, 
-            function(response) {
-                if (response.success) {
-                  window.console.log('Addon repo '+repoName+' successfully removed :' + response['message']);
-                  if(confirm('Repo deleted. Click OK to refresh page.')) {
-                    location.reload();
-                  }
-                } else {
-                  window.console.log('Error removing repo :' + response['message']);
-                  alert('Error removing addon repo!');
-                }
-                return false;
-            },
-        'json');
-    }
-  }  
-  
-</script>
\ No newline at end of file
diff --git a/view/tpl/admin_plugins_addrepo.tpl b/view/tpl/admin_plugins_addrepo.tpl
deleted file mode 100644
index de7b465bb..000000000
--- a/view/tpl/admin_plugins_addrepo.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<form id="add-plugin-repo-form" action="{{$post}}" method="post" >
-
-    <p class="descriptive-text">{{$desc}}</p>
-    {{include file="field_input.tpl" field=$repoURL}}
-    {{include file="field_input.tpl" field=$repoName}}
-    <div class="btn-group pull-right">
-		<button id="add-plugin-repo-submit" class="btn btn-primary" type="submit" name="submit" onclick="adminPluginsAddRepo(); return false;">{{$submit}}</button>
-	</div>
-</form>
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
deleted file mode 100755
index 309fc9569..000000000
--- a/view/tpl/admin_plugins_details.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class = "generic-content-wrapper-styled" id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-
-	<p>{{if ! $info.disabled}}<i class='toggleplugin fa {{if $status==on}}fa-check-square-o{{else}}fa-square-o{{/if}} admin-icons'></i>{{else}}<i class='fa fa-stop admin-icons'></i>{{/if}} {{$info.name}} - {{$info.version}}{{if ! $info.disabled}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a>{{/if}}</p>
-
-	{{if $info.disabled}}
-	<p>{{$disabled}}</p>
-	{{/if}}
-
-	<p>{{$info.description}}</p>
-	
-	{{foreach $info.author as $a}}
-	<p class="author">{{$str_author}}
-		{{$a.name}}{{if $a.link}} {{$a.link}}{{/if}}
-	</p>
-	{{/foreach}}
-
-	{{if $info.minversion}}
-	<p class="versionlimit">{{$str_minversion}}{{$info.minversion}}</p>
-	{{/if}}
-	{{if $info.maxversion}}
-	<p class="versionlimit">{{$str_maxversion}}{{$info.maxversion}}</p>
-	{{/if}}
-	{{if $info.minphpversion}}
-	<p class="versionlimit">{{$str_minphpversion}}{{$info.minphpversion}}</p>
-	{{/if}}
-	{{if $info.serverroles}}
-	<p class="versionlimit">{{$str_serverroles}}{{$info.serverroles}}</p>
-	{{/if}}
-	{{if $info.requires}}
-	<p class="versionlimit">{{$str_requires}}{{$info.requires}}</p>
-	{{/if}}
-
-
-	{{foreach $info.maintainer as $a}}
-	<p class="maintainer">{{$str_maintainer}}
-		{{$a.name}}{{if $a.link}} {{$a.link}}{{/if}}
-	</p>
-	{{/foreach}}
-	
-	{{if $screenshot}}
-	<a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a>
-	{{/if}}
-
-	{{if $admin_form}}
-	<h3>{{$settings}}</h3>
-	<form method="post" action="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/">
-		{{$admin_form}}
-	</form>
-	{{/if}}
-
-	{{if $readme}}
-	<h3>Readme</h3>
-	<div id="plugin_readme">
-		{{$readme}}
-	</div>
-	{{/if}}
-</div>
diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl
deleted file mode 100644
index e3a08449c..000000000
--- a/view/tpl/admin_profiles.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="generic-content-wrapper">
-<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-sm pull-right" href="admin/profs/new"><i class="fa fa-plus-circle"></i>&nbsp;{{$new}}</a><h2>{{$title}}</h2>
-<div class="clear"></div>
-</div>
-
-<div class="section-content-tools-wrapper">
-
-<div class="section-content-info-wrapper">{{$all_desc}}
-<br /><br />
-{{$all}}
-</div>
-
-<form action="admin/profs" method="post">
-
-{{include file="field_textarea.tpl" field=$basic}}
-{{include file="field_textarea.tpl" field=$advanced}}
-
-<input type="submit" name="submit" value="{{$submit}}" />
-
-</form>
-
-
-
-{{if $cust_fields}}
-<br /><br />
-<div><strong>{{$cust_field_desc}}</strong></div>
-<br />
-
-<table width="100%">
-{{foreach $cust_fields as $field}}
-<tr><td>{{$field.field_name}}</td><td>{{$field.field_desc}}</td><td><a class="btn btn-danger btn-sm" href="admin/profs/drop/{{$field.id}}" title="{{$drop}}"><i class="fa fa-trash-o"></i>&nbsp;{{$drop}}</a> <a class="btn btn-sm" title="{{$edit}}" href="admin/profs/{{$field.id}}" ><i class="fa fa-pencil"></i></a></td></tr>
-{{/foreach}}
-</table>
-{{/if}}
-
-</div>
-
-</div>
diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl
deleted file mode 100644
index 9d3d848c9..000000000
--- a/view/tpl/admin_queue.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h3>{{$banner}}</h3>
-
-{{if $hasentries}}
-
-<table cellpadding="10" id="admin-queue-table"><tr><td>{{$numentries}}&nbsp;&nbsp;</td><td>{{$desturl}}</td><td>{{$priority}}</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-
-{{foreach $entries as $e}}
-
-<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td><td>{{$e.priority}}</td>{{if $expert}}<td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-outline-secondary"><i class="fa fa-times"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-outline-secondary"><i class="fa fa-trash-o"></i></a></td>{{/if}}</tr>
-{{/foreach}}
-
-</table>
-
-{{/if}}
diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
deleted file mode 100755
index 409e9fc7d..000000000
--- a/view/tpl/admin_security.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="generic-content-wrapper-styled" id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-
-	<form action="{{$baseurl}}/admin/security" method="post">
-
-	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-
-	{{include file="field_checkbox.tpl" field=$block_public}}
-	{{include file="field_checkbox.tpl" field=$transport_security}}
-	{{include file="field_checkbox.tpl" field=$content_security}}
-	{{include file="field_checkbox.tpl" field=$embed_sslonly}}
-
-	{{include file="field_textarea.tpl" field=$allowed_email}}
-	{{include file="field_textarea.tpl" field=$not_allowed_email}}	
-
-	{{include file="field_textarea.tpl" field=$whitelisted_sites}}
-	{{include file="field_textarea.tpl" field=$blacklisted_sites}}
-
-	{{include file="field_textarea.tpl" field=$whitelisted_channels}}
-	{{include file="field_textarea.tpl" field=$blacklisted_channels}}
-
-	{{include file="field_textarea.tpl" field=$embed_allow}}
-	{{include file="field_textarea.tpl" field=$embed_deny}}
-
-
-	<div class="admin-submit-wrapper" >
-		<input type="submit" name="submit" class="admin-submit" value="{{$submit}}" />
-	</div>
-
-	</form>
-
-</div>
diff --git a/view/tpl/admin_settings_features.tpl b/view/tpl/admin_settings_features.tpl
deleted file mode 100644
index 2d5cf7e0b..000000000
--- a/view/tpl/admin_settings_features.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<form action="admin/features" method="post" autocomplete="off">
-	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-	<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
-		{{foreach $features as $g => $f}}
-		<div class="panel">
-			<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
-				<h3>
-					<a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
-						{{$f.0}}
-					</a>
-				</h3>
-			</div>
-			<div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} in{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
-				<div class="section-content-tools-wrapper">
-					{{foreach $f.1 as $fcat}}
-						{{include file="field_checkbox.tpl" field=$fcat.0}}
-						{{include file="field_checkbox.tpl" field=$fcat.1}}
-					{{/foreach}}
-					<div class="settings-submit-wrapper" >
-						<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-					</div>
-				</div>
-			</div>
-		</div>
-		{{/foreach}}
-	</div>
-</div>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
deleted file mode 100755
index 6fd0fd9ce..000000000
--- a/view/tpl/admin_site.tpl
+++ /dev/null
@@ -1,101 +0,0 @@
-<script>
-	$(function(){
-		
-		$("#cnftheme").colorbox({
-			width: 800,
-			onLoad: function(){
-				var theme = $("#id_theme :selected").val();
-				$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
-			}, 
-			onComplete: function(){
-				$(this).colorbox.resize(); 
-				$("#colorbox form").submit(function(e){
-					var url = $(this).attr('action');
-					// can't get .serialize() to work...
-					var data={};
-					$(this).find("input").each(function(){
-						data[$(this).attr('name')] = $(this).val();
-					});
-					$(this).find("select").each(function(){
-						data[$(this).attr('name')] = $(this).children(":selected").val();
-					});
-					console.log(":)", url, data);
-					
-					$.post(url, data, function(data) {
-						if(timer) clearTimeout(timer);
-						NavUpdate();
-						$.colorbox.close();
-					})
-					
-					return false;
-				});
-				
-			}
-		});
-	});
-</script>
-<div id="adminpage" class="generic-content-wrapper-styled">
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-	{{include file="field_input.tpl" field=$sitename}}
-	{{include file="field_select.tpl" field=$server_role}}
-
-	{{if $z_server_role == 'pro'}}
-	{{include file="field_select.tpl" field=$techlevel}}
-    {{include file="field_checkbox.tpl" field=$techlock}}
-	{{/if}}
-
-	{{include file="field_textarea.tpl" field=$banner}}
-	{{include file="field_textarea.tpl" field=$siteinfo}}
-	{{include file="field_textarea.tpl" field=$admininfo}}
-
-    {{include file="field_input.tpl" field=$reply_address}}
-    {{include file="field_input.tpl" field=$from_email}}
-    {{include file="field_input.tpl" field=$from_email_name}}
-
-	{{include file="field_select.tpl" field=$language}}
-	{{include file="field_select.tpl" field=$theme}}
-    {{include file="field_select.tpl" field=$theme_mobile}}
-    {{include file="field_input.tpl" field=$frontpage}}
-    {{include file="field_checkbox.tpl" field=$mirror_frontpage}}
-    {{include file="field_checkbox.tpl" field=$login_on_homepage}}
-    {{include file="field_checkbox.tpl" field=$enable_context_help}}
-	{{if $directory_server}}
-		{{include file="field_select.tpl" field=$directory_server}}
-	{{/if}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$registration}}</h3>
-	{{include file="field_input.tpl" field=$register_text}}
-	{{include file="field_select.tpl" field=$register_policy}}
-	{{include file="field_checkbox.tpl" field=$invite_only}}
-	{{include file="field_select.tpl" field=$access_policy}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-
-	<h3>{{$corporate}}</h3>
-	{{include file="field_checkbox.tpl" field=$verify_email}}
-	{{include file="field_checkbox.tpl" field=$feed_contacts}}
-	{{include file="field_checkbox.tpl" field=$force_publish}}
-	{{include file="field_checkbox.tpl" field=$disable_discover_tab}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$advanced}}</h3>
-	{{include file="field_input.tpl" field=$proxy}}
-	{{include file="field_input.tpl" field=$proxyuser}}
-	{{include file="field_input.tpl" field=$timeout}}
-	{{include file="field_input.tpl" field=$delivery_interval}}
-	{{include file="field_input.tpl" field=$delivery_batch_count}}
-	{{include file="field_input.tpl" field=$poll_interval}}
-	{{include file="field_input.tpl" field=$maxloadavg}}
-	{{include file="field_input.tpl" field=$abandon_days}}
-	{{include file="field_input.tpl" field=$default_expire_days}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	</form>
-</div>
diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
deleted file mode 100755
index ca94b0ef7..000000000
--- a/view/tpl/admin_summary.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="generic-content-wrapper-styled" id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-{{if $adminalertmsg}}
-	<p class="alert alert-warning" role="alert">{{$adminalertmsg}}</p>
-{{/if}}
-{{if $upgrade}}
-	<p class="alert alert-warning" role="alert">{{$upgrade}}</p>
-{{/if}}
-	<dl>
-		<dt>{{$queues.label}}</dt>
-		<dd>{{$queues.queue}}</dd>
-	</dl>
-	<dl>
-		<dt>{{$accounts.0}}</dt>
-		<dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd>
-	</dl>
-	<dl>
-		<dt>{{$pending.0}}</dt>
-		<dd>{{$pending.1}}</dt>
-	</dl>
-	<dl>
-		<dt>{{$channels.0}}</dt>
-		<dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd>
-	</dl>
-	<dl>
-		<dt>{{$plugins.0}}</dt>
-		<dd>
-		{{foreach $plugins.1 as $p}} {{$p}} {{/foreach}}
-		</dd>
-	</dl>
-	<dl>
-		<dt>{{$version.0}}</dt>
-		<dd>{{$version.1}} - {{$build}}</dd>
-	</dl>
-	<dl>
-		<dt>{{$vmaster.0}}</dt>
-		<dd>{{$vmaster.1}}</dd>
-	</dl>
-	<dl>
-		<dt>{{$vdev.0}}</dt>
-		<dd>{{$vdev.1}}</dd>
-	</dl>
-</div>
\ No newline at end of file
diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
deleted file mode 100755
index f5495f149..000000000
--- a/view/tpl/album_edit.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<div id="photo-album-edit-wrapper" class="section-content-tools-wrapper">
-	<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
-		<div class="form-group">
-			<label id="photo-album-edit-name-label" for="photo-album-edit-name">{{$nametext}}</label>
-			<input type="text" name="albumname" placeholder="{{$name_placeholder}}" value="{{$album}}" class="form-control" list="dl-album-edit" />
-			<datalist id="dl-album-edit">
-			{{foreach $albums as $al}}
-				{{if $al.text}}
-				<option value="{{$al.text}}">
-				{{/if}}
-			{{/foreach}}
-			</datalist>
-		</div>
-		<div class="form-group">
-			<button id="photo-album-edit-submit" type="submit" name="submit" class="btn btn-primary btn-sm pull-right" />{{$submit}}</button>
-			<button id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" class="btn btn-danger btn-sm pull-left" onclick="return confirmDelete();" />{{$dropsubmit}}</button>
-		</div>
-	</form>
-	<div id="photo-album-edit-end" class="clear"></div>
-</div>
-
-
diff --git a/view/tpl/alt_pager.tpl b/view/tpl/alt_pager.tpl
deleted file mode 100644
index b46dc7662..000000000
--- a/view/tpl/alt_pager.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="pager">
-{{if $has_less}}<a href="{{$url}}&page={{$prevpage}}" class="pager-prev">{{$less}}</a>{{/if}}
-{{if $has_more}}{{if $has_less}}&nbsp;|&nbsp;{{/if}}<a href="{{$url}}&page={{$nextpage}}" class="pager-next">{{$more}}</a>{{/if}}
-</div>
diff --git a/view/tpl/api_config_xml.tpl b/view/tpl/api_config_xml.tpl
deleted file mode 100755
index 8c0766c73..000000000
--- a/view/tpl/api_config_xml.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<config>
- <site>
-  <name>{{$config.site.name}}</name>
-  <server>{{$config.site.server}}</server>
-  <theme>default</theme>
-  <path></path>
-  <logo>{{$config.site.logo}}</logo>
-
-  <fancy>true</fancy>
-  <language>en</language>
-  <email>{{$config.site.email}}</email>
-  <broughtby></broughtby>
-  <broughtbyurl></broughtbyurl>
-  <timezone>UTC</timezone>
-  <closed>{{$config.site.closed}}</closed>
-
-  <inviteonly>false</inviteonly>
-  <private>{{$config.site.private}}</private>
-  <textlimit>{{$config.site.textlimit}}</textlimit>
-  <ssl>{{$config.site.ssl}}</ssl>
-  <sslserver>{{$config.site.sslserver}}</sslserver>
-  <shorturllength>30</shorturllength>
-
-</site>
- <license>
-  <type>cc</type>
-  <owner></owner>
-  <url>http://creativecommons.org/licenses/by/3.0/</url>
-  <title>Creative Commons Attribution 3.0</title>
-  <image>http://i.creativecommons.org/l/by/3.0/80x15.png</image>
-
-</license>
- <nickname>
-  <featured></featured>
-</nickname>
- <profile>
-  <biolimit></biolimit>
-</profile>
- <group>
-  <desclimit></desclimit>
-</group>
- <notice>
-
-  <contentlimit></contentlimit>
-</notice>
- <throttle>
-  <enabled>false</enabled>
-  <count>20</count>
-  <timespan>600</timespan>
-</throttle>
- <xmpp>
-
-  <enabled>false</enabled>
-  <server>INVALID SERVER</server>
-  <port>5222</port>
-  <user>update</user>
-</xmpp>
- <integration>
-  <source>StatusNet</source>
-
-</integration>
- <attachments>
-  <uploads>false</uploads>
-  <file_quota>0</file_quota>
-</attachments>
-</config>
diff --git a/view/tpl/api_friends_xml.tpl b/view/tpl/api_friends_xml.tpl
deleted file mode 100755
index f2a7234d1..000000000
--- a/view/tpl/api_friends_xml.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<users type="array">
-	{{foreach $users as $user}}
-	{{include file="api_user_xml.tpl"}}
-	{{/foreach}}
-</users>
diff --git a/view/tpl/api_ratelimit_xml.tpl b/view/tpl/api_ratelimit_xml.tpl
deleted file mode 100755
index e4b470a25..000000000
--- a/view/tpl/api_ratelimit_xml.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<hash>
- <remaining-hits type="integer">{{$hash.remaining_hits}}</remaining-hits>
- <hourly-limit type="integer">{{$hash.hourly_limit}}</hourly-limit>
- <reset-time type="datetime">{{$hash.reset_time}}</reset-time>
- <reset_time_in_seconds type="integer">{{$hash.resettime_in_seconds}}</reset_time_in_seconds>
-</hash>
diff --git a/view/tpl/api_status_xml.tpl b/view/tpl/api_status_xml.tpl
deleted file mode 100755
index cbb736e22..000000000
--- a/view/tpl/api_status_xml.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<status>{{if $status}}
-    <created_at>{{$status.created_at}}</created_at>
-    <id>{{$status.id}}</id>
-    <text>{{$status.text}}</text>
-    <source>{{$status.source}}</source>
-    <truncated>{{$status.truncated}}</truncated>
-    <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id>
-    <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id>
-    <favorited>{{$status.favorited}}</favorited>
-    <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
-    <geo>{{$status.geo}}</geo>
-    <coordinates>{{$status.coordinates}}</coordinates>
-    <place>{{$status.place}}</place>
-    <contributors>{{$status.contributors}}</contributors>
-	<user>
-	  <id>{{$status.user.id}}</id>
-	  <name>{{$status.user.name}}</name>
-	  <screen_name>{{$status.user.screen_name}}</screen_name>
-	  <location>{{$status.user.location}}</location>
-	  <description>{{$status.user.description}}</description>
-	  <profile_image_url>{{$status.user.profile_image_url}}</profile_image_url>
-	  <url>{{$status.user.url}}</url>
-	  <protected>{{$status.user.protected}}</protected>
-	  <followers_count>{{$status.user.followers}}</followers_count>
-	  <profile_background_color>{{$status.user.profile_background_color}}</profile_background_color>
-  	  <profile_text_color>{{$status.user.profile_text_color}}</profile_text_color>
-  	  <profile_link_color>{{$status.user.profile_link_color}}</profile_link_color>
-  	  <profile_sidebar_fill_color>{{$status.user.profile_sidebar_fill_color}}</profile_sidebar_fill_color>
-  	  <profile_sidebar_border_color>{{$status.user.profile_sidebar_border_color}}</profile_sidebar_border_color>
-  	  <friends_count>{{$status.user.friends_count}}</friends_count>
-  	  <created_at>{{$status.user.created_at}}</created_at>
-  	  <favourites_count>{{$status.user.favourites_count}}</favourites_count>
-  	  <utc_offset>{{$status.user.utc_offset}}</utc_offset>
-  	  <time_zone>{{$status.user.time_zone}}</time_zone>
-  	  <profile_background_image_url>{{$status.user.profile_background_image_url}}</profile_background_image_url>
-  	  <profile_background_tile>{{$status.user.profile_background_tile}}</profile_background_tile>
-  	  <profile_use_background_image>{{$status.user.profile_use_background_image}}</profile_use_background_image>
-  	  <notifications></notifications>
-  	  <geo_enabled>{{$status.user.geo_enabled}}</geo_enabled>
-  	  <verified>{{$status.user.verified}}</verified>
-  	  <following></following>
-  	  <statuses_count>{{$status.user.statuses_count}}</statuses_count>
-  	  <lang>{{$status.user.lang}}</lang>
-  	  <contributors_enabled>{{$status.user.contributors_enabled}}</contributors_enabled>
-	  </user>
-{{/if}}</status>
diff --git a/view/tpl/api_test_xml.tpl b/view/tpl/api_test_xml.tpl
deleted file mode 100755
index 80a541c39..000000000
--- a/view/tpl/api_test_xml.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<ok>{{$ok}}</ok>
diff --git a/view/tpl/api_timeline_atom.tpl b/view/tpl/api_timeline_atom.tpl
deleted file mode 100755
index e8bfb689e..000000000
--- a/view/tpl/api_timeline_atom.tpl
+++ /dev/null
@@ -1,90 +0,0 @@
-<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
- <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
- <id>{{$rss.self}}</id>
- <title>Friendika</title>
- <subtitle>Friendika API feed</subtitle>
- <logo>{{$rss.logo}}</logo>
- <updated>{{$rss.atom_updated}}</updated>
- <link type="text/html" rel="alternate" href="{{$rss.alternate}}"/>
- <link type="application/atom+xml" rel="self" href="{{$rss.self}}"/>
- 
- 
- <author>
-	<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
-	<uri>{{$user.url}}</uri>
-	<name>{{$user.name}}</name>
-	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
-	<georss:point></georss:point>
-	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
-	<poco:displayName>{{$user.name}}</poco:displayName>
-	<poco:urls>
-		<poco:type>homepage</poco:type>
-		<poco:value>{{$user.url}}</poco:value>
-		<poco:primary>true</poco:primary>
-	</poco:urls>
-	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
- </author>
-
- <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
- <activity:subject>
-	<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
-	<id>{{$user.contact_url}}</id>
-	<title>{{$user.name}}</title>
-	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
-	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
-	<poco:displayName>{{$user.name}}</poco:displayName>
-	<poco:urls>
-		<poco:type>homepage</poco:type>
-		<poco:value>{{$user.url}}</poco:value>
-		<poco:primary>true</poco:primary>
-	</poco:urls>
-	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
- </activity:subject>
- 
- 
-  	{{foreach $statuses as $status}}
-	<entry>
-		<activity:obj_type>{{$status.objecttype}}</activity:obj_type>
-		<id>{{$status.message_id}}</id>
-		<title>{{$status.text}}</title>
-		<content type="html">{{$status.statusnet_html}}</content>
-		<link rel="alternate" type="text/html" href="{{$status.url}}"/>
-		<activity:verb>{{$status.verb}}</activity:verb>
-		<published>{{$status.published}}</published>
-		<updated>{{$status.updated}}</updated>
-
-		<link rel="self" type="application/atom+xml" href="{{$status.self}}"/>
-		<link rel="edit" type="application/atom+xml" href="{{$status.edit}}"/>
-		<statusnet:notice_info local_id="{{$status.id}}" source="{{$status.source}}" >
-		</statusnet:notice_info>
-
-		<author>
-			<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
-			<uri>{{$status.user.url}}</uri>
-			<name>{{$status.user.name}}</name>
-			<link rel="alternate" type="text/html" href="{{$status.user.url}}"/>
-			<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$status.user.profile_image_url}}"/>
-
-			<georss:point/>
-			<poco:preferredUsername>{{$status.user.screen_name}}</poco:preferredUsername>
-			<poco:displayName>{{$status.user.name}}</poco:displayName>
-			<poco:address/>
-			<poco:urls>
-				<poco:type>homepage</poco:type>
-				<poco:value>{{$status.user.url}}</poco:value>
-				<poco:primary>true</poco:primary>
-			</poco:urls>
-		</author>
-		<link rel="ostatus:conversation" type="text/html" href="{{$status.url}}"/> 
-
-	</entry>    
-    {{/foreach}}
-</feed>
diff --git a/view/tpl/api_timeline_rss.tpl b/view/tpl/api_timeline_rss.tpl
deleted file mode 100755
index 86c645e99..000000000
--- a/view/tpl/api_timeline_rss.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
-  <channel>
-    <title>Friendika</title>
-    <link>{{$rss.alternate}}</link>
-    <atom:link type="application/rss+xml" rel="self" href="{{$rss.self}}"/>
-    <description>Friendika timeline</description>
-    <language>{{$rss.language}}</language>
-    <ttl>40</ttl>
-	<image>
-		<link>{{$user.link}}</link>
-		<title>{{$user.name}}'s items</title>
-		<url>{{$user.profile_image_url}}</url>
-	</image>
-	
-{{foreach $statuses as $status}}
-  <item>
-    <title>{{$status.user.name}}: {{$status.text}}</title>
-    <description>{{$status.text}}</description>
-    <pubDate>{{$status.created_at}}</pubDate>
-    <guid>{{$status.url}}</guid>
-    <link>{{$status.url}}</link>
-    <twitter:source>{{$status.source}}</twitter:source>
-  </item>
-{{/foreach}}
-  </channel>
-</rss>
diff --git a/view/tpl/api_timeline_xml.tpl b/view/tpl/api_timeline_xml.tpl
deleted file mode 100755
index f14d73e9c..000000000
--- a/view/tpl/api_timeline_xml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
-{{foreach $statuses as $status}} <status>
-  <text>{{$status.text}}</text>
-  <truncated>{{$status.truncated}}</truncated>
-  <created_at>{{$status.created_at}}</created_at>
-  <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id>
-  <source>{{$status.source}}</source>
-  <id>{{$status.id}}</id>
-  <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id>
-  <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
-  <geo>{{$status.geo}}</geo>
-  <favorited>{{$status.favorited}}</favorited>
-{{include file="api_user_xml.tpl" user=$status.user}}  <statusnet:html>{{$status.statusnet_html}}</statusnet:html>
-  <statusnet:conversation_id>{{$status.statusnet_conversation_id}}</statusnet:conversation_id>
-  <url>{{$status.url}}</url>
-  <coordinates>{{$status.coordinates}}</coordinates>
-  <place>{{$status.place}}</place>
-  <contributors>{{$status.contributors}}</contributors>
- </status>
-{{/foreach}}</statuses>
diff --git a/view/tpl/api_user_xml.tpl b/view/tpl/api_user_xml.tpl
deleted file mode 100755
index 3b51992f6..000000000
--- a/view/tpl/api_user_xml.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-  <user>
-   <id>{{$user.id}}</id>
-   <name>{{$user.name}}</name>
-   <screen_name>{{$user.screen_name}}</screen_name>
-   <location>{{$user.location}}</location>
-   <description>{{$user.description}}</description>
-   <profile_image_url>{{$user.profile_image_url}}</profile_image_url>
-   <url>{{$user.url}}</url>
-   <protected>{{$user.protected}}</protected>
-   <followers_count>{{$user.followers_count}}</followers_count>
-   <friends_count>{{$user.friends_count}}</friends_count>
-   <created_at>{{$user.created_at}}</created_at>
-   <favourites_count>{{$user.favourites_count}}</favourites_count>
-   <utc_offset>{{$user.utc_offset}}</utc_offset>
-   <time_zone>{{$user.time_zone}}</time_zone>
-   <statuses_count>{{$user.statuses_count}}</statuses_count>
-   <following>{{$user.following}}</following>
-   <profile_background_color>{{$user.profile_background_color}}</profile_background_color>
-   <profile_text_color>{{$user.profile_text_color}}</profile_text_color>
-   <profile_link_color>{{$user.profile_link_color}}</profile_link_color>
-   <profile_sidebar_fill_color>{{$user.profile_sidebar_fill_color}}</profile_sidebar_fill_color>
-   <profile_sidebar_border_color>{{$user.profile_sidebar_border_color}}</profile_sidebar_border_color>
-   <profile_background_image_url>{{$user.profile_background_image_url}}</profile_background_image_url>
-   <profile_background_tile>{{$user.profile_background_tile}}</profile_background_tile>
-   <profile_use_background_image>{{$user.profile_use_background_image}}</profile_use_background_image>
-   <notifications>{{$user.notifications}}</notifications>
-   <geo_enabled>{{$user.geo_enabled}}</geo_enabled>
-   <verified>{{$user.verified}}</verified>
-   <lang>{{$user.lang}}</lang>
-   <contributors_enabled>{{$user.contributors_enabled}}</contributors_enabled>
-   <status>{{if $user.status}}
-    <created_at>{{$user.status.created_at}}</created_at>
-    <id>{{$user.status.id}}</id>
-    <text>{{$user.status.text}}</text>
-    <source>{{$user.status.source}}</source>
-    <truncated>{{$user.status.truncated}}</truncated>
-    <in_reply_to_status_id>{{$user.status.in_reply_to_status_id}}</in_reply_to_status_id>
-    <in_reply_to_user_id>{{$user.status.in_reply_to_user_id}}</in_reply_to_user_id>
-    <favorited>{{$user.status.favorited}}</favorited>
-    <in_reply_to_screen_name>{{$user.status.in_reply_to_screen_name}}</in_reply_to_screen_name>
-    <geo>{{$user.status.geo}}</geo>
-    <coordinates>{{$user.status.coordinates}}</coordinates>
-    <place>{{$user.status.place}}</place>
-    <contributors>{{$user.status.contributors}}</contributors>
-  {{/if}}</status>
-  </user>
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
deleted file mode 100644
index 28f28611e..000000000
--- a/view/tpl/app.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{{if !$navapps}}
-<div class="app-container">
-	<div class="app-detail{{if $deleted}} app-deleted{{/if}}">
-		<a href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $app.desc}} title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}}
-			<div class="app-name" style="text-align:center;">{{$app.name}}</div>
-		</a>
-	</div>
-	{{if $app.type !== 'system'}}
-	{{if $purchase}}
-	<div class="app-purchase">
-		<a href="{{$app.page}}" class="btn btn-outline-secondary" title="{{$purchase}}" ><i class="fa fa-external"></i></a>
-	</div>
-	{{/if}}
-	{{if $install || $update || $delete || $feature}}
-	<div class="app-tools">
-		<form action="{{$hosturl}}appman" method="post">
-		<input type="hidden" name="papp" value="{{$app.papp}}" />
-		{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-outline-secondary btn-sm" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}}
-		{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}}
-		{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}}
-		{{if $feature}}<button type="submit" name="feature" value="feature" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-star"{{if $featured}} style="color: gold"{{/if}}></i></button>{{/if}}
-		</form>
-	</div>
-	{{/if}}
-	{{/if}}
-</div>
-{{else}}
-<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
-{{/if}}
-
diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl
deleted file mode 100644
index 5075ce5e2..000000000
--- a/view/tpl/app_create.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$banner}}</h2>
-	</div>
-
-	<div class="clearfix section-content-wrapper">
-		<form action="appman" method="post">
-		{{if $guid}}
-		<input type="hidden" name="guid" value="{{$guid}}" />
-		{{/if}}
-		{{if $author}}
-		<input type="hidden" name="author" value="{{$author}}" />
-		{{/if}}
-		{{if $addr}}
-		<input type="hidden" name="addr" value="{{$addr}}" />
-		{{/if}}
-
-		<input type="hidden" name="requires" value="{{$requires}}" />
-		<input type="hidden" name="system" value="{{$system}}" />
-		<input type="hidden" name="plugin" value="{{$plugin}}" />
-
-
-		{{include file="field_input.tpl" field=$name}}
-		{{include file="field_input.tpl" field=$categories}}
-		{{include file="field_input.tpl" field=$url}}
-		{{include file="field_textarea.tpl" field=$desc}}
-		{{include file="field_input.tpl" field=$photo}}
-		{{include file="field_input.tpl" field=$version}}
-		{{include file="field_input.tpl" field=$price}}
-		{{include file="field_input.tpl" field=$page}}
-
-		{{if $embed}}
-		{{include file="field_textarea.tpl" field=$embed}}
-		{{/if}}
-
-		<button class="btn btn-primary float-right" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
-
-		</form>
-	</div>
-</div>
diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
deleted file mode 100755
index ba50867ff..000000000
--- a/view/tpl/atom_feed.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<feed xmlns="http://www.w3.org/2005/Atom"
-      xmlns:thr="http://purl.org/syndication/thread/1.0"
-      xmlns:at="http://purl.org/atompub/tombstones/1.0"
-      xmlns:media="http://purl.org/syndication/atommedia"
-      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
-      xmlns:zot="http://purl.org/zot"
-      xmlns:as="http://activitystrea.ms/spec/1.0/"
-      xmlns:georss="http://www.georss.org/georss"
-      xmlns:poco="http://portablecontacts.net/spec/1.0"
-      xmlns:ostatus="http://ostatus.org/schema/1.0"
-      xmlns:statusnet="http://status.net/schema/api/1/" >
-
-  <id>{{$feed_id}}</id>
-  <title>{{$feed_title}}</title>
-  <generator uri="http://hubzilla.org" version="{{$version}}">{{$red}}</generator>
-  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
-  <link rel="alternate" type="text/html" href="{{$profile_page}}" />
-{{if $author}}
-{{$author}}
-{{/if}}
-
-  <updated>{{$feed_updated}}</updated>
-
-  <zot:owner>
-    <name>{{$name}}</name>
-    <uri>{{$profile_page}}</uri>
-    <link rel="photo"  type="{{$mimephoto}}" media:width="175" media:height="175" href="{{$photo}}" />
-    <link rel="avatar" type="{{$mimephoto}}" media:width="175" media:height="175" href="{{$photo}}" />
-  </zot:owner>
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
deleted file mode 100644
index 62442ff7a..000000000
--- a/view/tpl/attach_edit.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<form id="attach_edit_form_{{$file.id}}" action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" class="acl-form" data-form_id="attach_edit_form_{{$file.id}}" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-	<input type="hidden" name="channelnick" value="{{$channelnick}}" />
-	<input type="hidden" name="filehash" value="{{$file.hash}}" />
-	<input type="hidden" name="uid" value="{{$uid}}" />
-	<input type="hidden" name="fileid" value="{{$file.id}}" />
-	{{if !$isadir}}{{include file="field_checkbox.tpl" field=$notify}}{{/if}}
-	{{if $isadir}}{{include file="field_checkbox.tpl" field=$recurse}}{{/if}}
-	<div id="attach-edit-tools-share" class="btn-group form-group">
-		{{if !$isadir}}
-		<a href="/rpost?attachment=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-outline-secondary btn-sm" title="{{$attach_btn_title}}">
-			<i class="fa fa-share-square-o jot-icons"></i>
-		</a>
-		{{/if}}
-		<button id="link-btn" class="btn btn-outline-secondary btn-sm" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}">
-			<i class="fa fa-link jot-icons"></i>
-		</button>
-	</div>
-	<div id="attach-edit-perms" class="btn-group pull-right">
-		<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button">
-			<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
-		</button>
-		<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit">
-			{{$submit}}
-		</button>
-	</div>
-	<div id="link-code" class="form-group">
-		<label for="">{{$cpldesc}}</label>
-		<input type="text" class="form-control" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/>
-	</div>
-</form>
-
diff --git a/view/tpl/birthdays_reminder.tpl b/view/tpl/birthdays_reminder.tpl
deleted file mode 100755
index d0500364a..000000000
--- a/view/tpl/birthdays_reminder.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{if $count}}
-<div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div>
-<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div>
-<div id="birthday-title-end"></div>
-{{foreach $events as $event}}
-<div class="birthday-list" id="birthday-{{$event.id}}"></a> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
-{{/foreach}}
-</div>
-{{/if}}
-
diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl
deleted file mode 100644
index 7f400bba2..000000000
--- a/view/tpl/blocklist.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $editor}}
-		<div class="pull-right">
-			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('block-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
-		</div>
-		{{/if}}
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{if $editor}}
-	<div id="block-editor" class="section-content-tools-wrapper">
-		{{$editor}}
-	</div>
-	{{/if}}
-	{{if $pages}}
-	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
-		<table id="block-list-table">
-			<tr>
-				<th width="1%">{{$name}}</th>
-				<th width="94%">{{$blocktitle}}</th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%" class="d-none d-md-table-cell">{{$created}}</th>
-				<th width="1%" class="d-none d-md-table-cell">{{$edited}}</th>
-			</tr>
-			{{foreach $pages as $key => $items}}
-			{{foreach $items as $item}}
-			<tr id="block-list-item-{{$item.url}}">
-				<td>
-					{{if $view}}
-					<a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a>
-					{{else}}
-					{{$item.name}}
-					{{/if}}
-				</td>
-				<td>
-					{{$item.title}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $edit}}
-					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $item.bb_element}}
-					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $edit}}
-					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-					{{/if}}
-				</td>
-				<td class="d-none d-md-table-cell">
-					{{$item.created}}
-				</td>
-				<td class="d-none d-md-table-cell">
-					{{$item.edited}}
-				</td>
-			</tr>
-			{{/foreach}}
-			{{/foreach}}
-		</table>
-	</div>
-	<div class="clear"></div>
-	{{/if}}
-</div>
diff --git a/view/tpl/bookmarkedchats.tpl b/view/tpl/bookmarkedchats.tpl
deleted file mode 100644
index 3aabf835a..000000000
--- a/view/tpl/bookmarkedchats.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{if $rooms}}
-<div id="chatroom_bookmarks" class="widget">
-<h3>{{$header}}</h3>
-<ul class="bookmarkchat nav nav-pills nav-stacked">
-{{foreach $rooms as $room}}
-<li><a href="{{$room.xchat_url}}">{{$room.xchat_desc}}</a></li>
-{{/foreach}}
-</ul>
-</div>
-{{/if}}
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
deleted file mode 100755
index a76d4e549..000000000
--- a/view/tpl/build_query.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-<script> 
-
-	var bParam_cmd = "{{$baseurl}}/update_{{$pgtype}}";
-
-
-	var bParam_uid = {{$uid}};
-	var bParam_gid = {{$gid}};
-	var bParam_cid = {{$cid}};
-	var bParam_cmin = {{$cmin}};
-	var bParam_cmax = {{$cmax}};
-	var bParam_star = {{$star}};
-	var bParam_liked = {{$liked}};
-	var bParam_conv = {{$conv}};
-	var bParam_spam = {{$spam}};
-	var bParam_new = {{$nouveau}};
-	var bParam_page = {{$page}};
-	var bParam_wall = {{$wall}};
-	var bParam_list = {{$list}};
-	var bParam_fh = {{$fh}};
-	var bParam_static = {{$static}};
-
-	var bParam_search = "{{$search}}";
-	var bParam_xchan = "{{$xchan}}";
-	var bParam_order = "{{$order}}";
-	var bParam_file = "{{$file}}";
-	var bParam_cats = "{{$cats}}";
-	var bParam_tags = "{{$tags}}";
-	var bParam_dend = "{{$dend}}";
-	var bParam_dbegin = "{{$dbegin}}";
-	var bParam_mid = "{{$mid}}";
-	var bParam_verb = "{{$verb}}";
-
-	function buildCmd() {
-		var udargs = ((page_load) ? "/load" : "");
-		var bCmd = bParam_cmd + udargs + "?f=" ;
-		if(bParam_uid) bCmd = bCmd + "&p=" + bParam_uid;
-		if(bParam_cmin != 0) bCmd = bCmd + "&cmin=" + bParam_cmin;
-		if(bParam_cmax != 99) bCmd = bCmd + "&cmax=" + bParam_cmax;
-		if(bParam_gid != 0) { bCmd = bCmd + "&gid=" + bParam_gid; } else
-		if(bParam_cid != 0) { bCmd = bCmd + "&cid=" + bParam_cid; }
-		if(bParam_static != 0) { bCmd = bCmd + "&static=" + bParam_static; }
-		if(bParam_star != 0) bCmd = bCmd + "&star=" + bParam_star;
-		if(bParam_liked != 0) bCmd = bCmd + "&liked=" + bParam_liked;
-		if(bParam_conv!= 0) bCmd = bCmd + "&conv=" + bParam_conv;
-		if(bParam_spam != 0) bCmd = bCmd + "&spam=" + bParam_spam;
-		if(bParam_new != 0) bCmd = bCmd + "&new=" + bParam_new;
-		if(bParam_wall != 0) bCmd = bCmd + "&wall=" + bParam_wall;
-		if(bParam_list != 0) bCmd = bCmd + "&list=" + bParam_list;
-		if(bParam_fh != 0) bCmd = bCmd + "&fh=" + bParam_fh;
-		if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search;
-		if(bParam_xchan != "") bCmd = bCmd + "&xchan=" + bParam_xchan;
-		if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order;
-		if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file;
-		if(bParam_cats != "") bCmd = bCmd + "&cat=" + bParam_cats;
-		if(bParam_tags != "") bCmd = bCmd + "&tag=" + bParam_tags;
-		if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
-		if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin;
-		if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid;
-		if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb;
-		if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
-		return(bCmd);
-	}
-
-</script>
-
diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl
deleted file mode 100755
index 72478aa3d..000000000
--- a/view/tpl/categories_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="categories-sidebar" class="widget">
-	<h3>{{$title}}</h3>
-	<div id="categories-sidebar-desc">{{$desc}}</div>
-	
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a href="{{$base}}" class="nav-link{{if $sel_all}} active{{/if}}">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-		<li class="nav-item"><a  href="{{$base}}?f=&cat={{$term.name}}" class="nav-link{{if $term.selected}} active{{/if}}">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/tpl/cdav_addressbook.tpl b/view/tpl/cdav_addressbook.tpl
deleted file mode 100644
index 587a95caa..000000000
--- a/view/tpl/cdav_addressbook.tpl
+++ /dev/null
@@ -1,462 +0,0 @@
-<script>
-$(document).ready(function() {
-
-	$(document).on('click', '.vcard-header, .vcard-cancel-btn', updateView);
-	$(document).on('click', '.add-field', doAdd);
-	$(document).on('click', '.remove-field', doRemove);
-
-	function updateView() {
-		var id = $(this).data('id');
-		var action = $(this).data('action');
-		var header = $('#vcard-header-' + id);
-		var cancel = $('#vcard-cancel-' + id);
-		var addField = $('#vcard-add-field-' + id);
-		var info = $('#vcard-info-' + id);
-		var vcardPreview = $('#vcard-preview-' + id);
-		var fn = $('#vcard-fn-' + id);
-
-		if(action === 'open') {
-			$(header).addClass('active');
-			$(cancel).show();
-			$(addField).show();
-			$(info).show();
-			$(fn).show();
-			$(vcardPreview).hide();
-		}
-		else {
-			$(header).removeClass('active');
-			$(cancel).hide();
-			$(addField).hide();
-			$(info).hide();
-			$(fn).hide();
-			$(vcardPreview).show();
-		}
-	}
-
-	function doAdd(e) {
-		e.preventDefault();
-		var what = $(this).data('add');
-		var id = $(this).data('id');
-		var element = '#template-form-' + what;
-		var where = '#card_form_' + id;
-
-		$(element + ' .remove-field').attr('data-id', id)
-
-		if(what === 'vcard-adr') {
-			var adrCount = $(where + ' .form-' + what).length;
-			var attrName = 'adr[' + adrCount + '][]';
-			$(element + ' input').attr('name', attrName);
-		}
-
-		if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') {
-			$(where + ' .add-' + what).hide()
-		}
-
-		$(element).clone().removeAttr('id').appendTo(where + ' .form-' + what + '-wrapper');
-	}
-
-	function doRemove() {
-		var what = $(this).data('remove');
-		var element = $(this).parents('div.form-' + what);
-		var where = '#card_form_' + $(this).data('id');
-
-		if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') {
-			$(where + ' .add-' + what).show()
-		}
-
-		$(element).remove();
-	}
-
-});
-</script>
-<div id="template-form-vcard-org" class="form-group form-vcard-org">
-	<div class="form-group form-vcard-org">
-		<input type="text" name="org" value="" placeholder="{{$org_label}}">
-		<i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-	</div>
-</div>
-
-<div id="template-form-vcard-title" class="form-group form-vcard-title">
-	<div class="form-group form-vcard-title">
-		<input type="text" name="title" value="" placeholder="{{$title_label}}">
-		<i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-	</div>
-</div>
-
-<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
-	<select name="tel_type[]">
-		<option value="CELL">{{$mobile}}</option>
-		<option value="HOME">{{$home}}</option>
-		<option value="WORK">{{$work}}</option>
-		<option value="OTHER">{{$other}}</option>
-	</select>
-	<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
-	<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-</div>
-
-<div id="template-form-vcard-email" class="form-group form-vcard-email">
-	<select name="email_type[]">
-		<option value="HOME">{{$home}}</option>
-		<option value="WORK">{{$work}}</option>
-		<option value="OTHER">{{$other}}</option>
-	</select>
-	<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
-	<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-</div>
-
-<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
-	<select name="impp_type[]">
-		<option value="HOME">{{$home}}</option>
-		<option value="WORK">{{$work}}</option>
-		<option value="OTHER">{{$other}}</option>
-	</select>
-	<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
-	<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-</div>
-
-<div id="template-form-vcard-url" class="form-group form-vcard-url">
-	<select name="url_type[]">
-		<option value="HOME">{{$home}}</option>
-		<option value="WORK">{{$work}}</option>
-		<option value="OTHER">{{$other}}</option>
-	</select>
-	<input type="text" name="url[]" value="" placeholder="{{$url_label}}">
-	<i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-</div>
-
-<div id="template-form-vcard-adr" class="form-group form-vcard-adr">
-	<div class="form-group">
-		<select name="adr_type[]">
-			<option value="HOME">{{$home}}</option>
-			<option value="WORK">{{$work}}</option>
-			<option value="OTHER">{{$other}}</option>
-		</select>
-		<label>{{$adr_label}}</label>
-		<i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$po_box}}">
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$extra}}">
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$street}}">
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$locality}}">
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$region}}">
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$zip_code}}">
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$country}}">
-	</div>
-</div>
-
-<div id="template-form-vcard-note" class="form-group form-vcard-note">
-	<label>{{$note_label}}</label>
-	<i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-	<textarea name="note" class="form-control"></textarea>
-</div>
-
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<button type="button" class="btn btn-success btn-sm float-right" onclick="openClose('create_form')"><i class="fa fa-plus-circle"></i> {{$add_card}}</button>
-		<h2>{{$displayname}}</h2>
-	</div>
-	<div id="create_form" class="section-content-tools-wrapper">
-		<form id="card_form_new" method="post" action="">
-			<input type="hidden" name="target" value="{{$id}}">
-			<div class="dropdown pull-right">
-				<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
-				<div class="dropdown-menu dropdown-menu-right">
-					<a class="dropdown-item add-vcard-org add-field" style="display: none" href="#" data-add="vcard-org" data-id="new">{{$org_label}}</a>
-					<a class="dropdown-item add-vcard-title add-field" style="display: none" href="#" data-add="vcard-title" data-id="new">{{$title_label}}</a>
-					<a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="new">{{$tel_label}}</a>
-					<a class="dropdown-item add-vcard-email add-field" href="#" data-add="vcard-email" data-id="new">{{$email_label}}</a>
-					<a class="dropdown-item add-vcard-impp add-field" href="#" data-add="vcard-impp" data-id="new">{{$impp_label}}</a>
-					<a class="dropdown-item add-vcard-url add-field" href="#" data-add="vcard-url" data-id="new">{{$url_label}}</a>
-					<a class="dropdown-item add-vcard-adr add-field" href="#" data-add="vcard-adr" data-id="new">{{$adr_label}}</a>
-					<a class="dropdown-item add-vcard-note add-field" href="#" data-add="vcard-note" data-id="new">{{$note_label}}</a>
-				</div>
-			</div>
-
-			<div class="vcard-fn-create form-group">
-				<div class="form-vcard-fn-wrapper">
-					<div class="form-group form-vcard-fn">
-						<div class="vcard-nophoto"><i class="fa fa-user"></i></div><input type="text" name="fn" value="" placeholder="{{$name_label}}">
-					</div>
-				</div>
-			</div>
-
-			<div class="vcard-org form-group">
-				<div class="form-vcard-org-wrapper">
-					<div class="form-group form-vcard-org">
-						<input type="text" name="org" value="" placeholder="{{$org_label}}">
-						<i data-remove="vcard-org" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-				</div>
-			</div>
-
-			<div class="vcard-title form-group">
-				<div class="form-vcard-title-wrapper">
-					<div class="form-group form-vcard-title">
-						<input type="text" name="title" value="" placeholder="{{$title_label}}">
-						<i data-remove="vcard-title" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-				</div>
-			</div>
-
-			<div class="vcard-tel form-group">
-				<div class="form-vcard-tel-wrapper">
-					<div class="form-group form-vcard-tel">
-						<select name="tel_type[]">
-							<option value="CELL">{{$mobile}}</option>
-							<option value="HOME">{{$home}}</option>
-							<option value="WORK">{{$work}}</option>
-							<option value="OTHER">{{$other}}</option>
-						</select>
-						<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
-						<i data-remove="vcard-tel" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-				</div>
-			</div>
-
-
-			<div class="vcard-email form-group">
-				<div class="form-vcard-email-wrapper">
-					<div class="form-group form-vcard-email">
-						<select name="email_type[]">
-							<option value="HOME">{{$home}}</option>
-							<option value="WORK">{{$work}}</option>
-							<option value="OTHER">{{$other}}</option>
-						</select>
-						<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
-						<i data-remove="vcard-email" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-				</div>
-			</div>
-
-			<div class="vcard-impp form-group">
-				<div class="form-vcard-impp-wrapper">
-				</div>
-			</div>
-
-			<div class="vcard-url form-group">
-				<div class="form-vcard-url-wrapper">
-				</div>
-			</div>
-
-			<div class="vcard-adr form-group">
-				<div class="form-vcard-adr-wrapper">
-				</div>
-			</div>
-
-			<div class="vcard-note form-group">
-				<div class="form-vcard-note-wrapper">
-				</div>
-			</div>
-
-			<button type="submit" name="create" value="create_card" class="btn btn-primary btn-sm pull-right">{{$create}}</button>
-			<button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('create_form')">{{$cancel}}</button>
-			<div class="clear"></div>
-		</form>
-	</div>
-
-	{{foreach $cards as $card}}
-	<form id="card_form_{{$card.id}}" method="post" action="">
-		<input type="hidden" name="target" value="{{$id}}">
-		<input type="hidden" name="uri" value="{{$card.uri}}">
-		<div class="section-content-wrapper-np">
-			<div id="vcard-cancel-{{$card.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
-			<div id="vcard-add-field-{{$card.id}}" class="dropdown pull-right vcard-add-field">
-				<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
-				<div class="dropdown-menu dropdown-menu-right">
-					<a class="dropdown-item add-vcard-org add-field"{{if $card.org}} style="display: none"{{/if}} href="#" data-add="vcard-org" data-id="{{$card.id}}">{{$org_label}}</a>
-					<a class="dropdown-item add-vcard-title add-field"{{if $card.title}} style="display: none"{{/if}} href="#" data-add="vcard-title" data-id="{{$card.id}}">{{$title_label}}</a>
-					<a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="{{$card.id}}">{{$tel_label}}</a>
-					<a class="dropdown-item add-vcard-email add-field" href="#" data-add="vcard-email" data-id="{{$card.id}}">{{$email_label}}</a>
-					<a class="dropdown-item add-vcard-impp add-field" href="#" data-add="vcard-impp" data-id="{{$card.id}}">{{$impp_label}}</a>
-					<a class="dropdown-item add-vcard-url add-field" href="#" data-add="vcard-url" data-id="{{$card.id}}">{{$url_label}}</a>
-					<a class="dropdown-item add-vcard-adr add-field" href="#" data-add="vcard-adr" data-id="{{$card.id}}">{{$adr_label}}</a>
-					<a class="dropdown-item add-vcard-note add-field"{{if $card.note}} style="display: none"{{/if}} href="#" data-add="vcard-note" data-id="{{$card.id}}">{{$note_label}}</a>
-				</div>
-			</div>
-			<div id="vcard-header-{{$card.id}}" class="vcard-header" data-id="{{$card.id}}" data-action="open">
-				{{if $card.photo}}<img class="vcard-photo" src="{{$card.photo}}" width="32px" height="32px">{{else}}<div class="vcard-nophoto"><i class="fa fa-user"></i></div>{{/if}}
-				<span id="vcard-preview-{{$card.id}}" class="vcard-preview">
-					{{if $card.fn}}<span class="vcard-fn-preview">{{$card.fn}}</span>{{/if}}
-					{{if $card.emails.0.address}}<span class="vcard-email-preview hidden-xs">{{$card.emails.0.address}}</span>{{/if}}
-					{{if $card.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$card.tels.0.nr}}</span>{{/if}}
-				</span>
-				<input id="vcard-fn-{{$card.id}}" class="vcard-fn" type="text" name="fn" value="{{$card.fn}}" size="{{$card.fn|count_characters:true}}" placeholder="{{$name_label}}">
-			</div>
-		</div>
-		<div id="vcard-info-{{$card.id}}" class="vcard-info section-content-wrapper">
-
-			<div class="vcard-org form-group">
-				<div class="form-vcard-org-wrapper">
-					{{if $card.org}}
-					<div class="form-group form-vcard-org">
-						<input type="text" name="org" value="{{$card.org}}" size="{{$card.org|count_characters:true}}" placeholder="{{$org_label}}">
-						<i data-remove="vcard-org" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-					{{/if}}
-				</div>
-			</div>
-
-			<div class="vcard-title form-group">
-				<div class="form-vcard-title-wrapper">
-					{{if $card.title}}
-					<div class="form-group form-vcard-title">
-						<input type="text" name="title" value="{{$card.title}}" size="{{$card.title|count_characters:true}}" placeholder="{{$title_label}}">
-						<i data-remove="vcard-title" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-					{{/if}}
-				</div>
-			</div>
-
-
-			<div class="vcard-tel form-group">
-				<div class="form-vcard-tel-wrapper">
-					{{if $card.tels}}
-					{{foreach $card.tels as $tel}}
-					<div class="form-group form-vcard-tel">
-						<select name="tel_type[]">
-							<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
-							<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
-							<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-							<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-							<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-						</select>
-						<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
-						<i data-remove="vcard-tel" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-					{{/foreach}}
-					{{/if}}
-				</div>
-			</div>
-
-
-			<div class="vcard-email form-group">
-				<div class="form-vcard-email-wrapper">
-					{{if $card.emails}}
-					{{foreach $card.emails as $email}}
-					<div class="form-group form-vcard-email">
-						<select name="email_type[]">
-							<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
-							<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-							<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-							<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-						</select>
-						<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
-						<i data-remove="vcard-email" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-					{{/foreach}}
-					{{/if}}
-				</div>
-			</div>
-
-			<div class="vcard-impp form-group">
-				<div class="form-vcard-impp-wrapper">
-					{{if $card.impps}}
-					{{foreach $card.impps as $impp}}
-					<div class="form-group form-vcard-impp">
-						<select name="impp_type[]">
-							<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
-							<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-							<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-							<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-						</select>
-						<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
-						<i data-remove="vcard-impp" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-					{{/foreach}}
-					{{/if}}
-				</div>
-			</div>
-
-			<div class="vcard-url form-group">
-				<div class="form-vcard-url-wrapper">
-					{{if $card.urls}}
-					{{foreach $card.urls as $url}}
-					<div class="form-group form-vcard-url">
-						<select name="url_type[]">
-							<option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option>
-							<option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-							<option value="WORK"{{if $url.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-							<option value="OTHER"{{if $url.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-						</select>
-						<input type="text" name="url[]" value="{{$url.address}}" size="{{$url.address|count_characters:true}}" placeholder="{{$url_label}}">
-						<i data-remove="vcard-url" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-					{{/foreach}}
-					{{/if}}
-				</div>
-			</div>
-
-			<div class="vcard-adr form-group">
-				<div class="form-vcard-adr-wrapper">
-					{{if $card.adrs}}
-					{{foreach $card.adrs as $adr}}
-					<div class="form-group form-vcard-adr">
-						<div class="form-group">
-							<label>{{$adr_label}}</label>
-							<select name="adr_type[]">
-								<option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option>
-								<option value="HOME"{{if $adr.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-								<option value="WORK"{{if $adr.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-								<option value="OTHER"{{if $adr.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-							</select>
-							<i data-remove="vcard-adr" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}">
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}">
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}">
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}">
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}">
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}">
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}">
-						</div>
-					</div>
-					{{/foreach}}
-					{{/if}}
-				</div>
-			</div>
-
-			<div class="vcard-note form-group form-vcard-note">
-				<div class="form-vcard-note-wrapper">
-					{{if $card.note}}
-					<label>{{$note_label}}</label>
-					<i data-remove="vcard-note" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					<textarea name="note" class="form-control">{{$card.note}}</textarea>
-					{{/if}}
-				</div>
-			</div>
-
-
-			<button type="submit" name="update" value="update_card" class="btn btn-primary btn-sm pull-right">{{$update}}</button>
-			<button type="submit" name="delete" value="delete_card" class="btn btn-danger btn-sm">{{$delete}}</button>
-			<button type="button" class="btn btn-outline-secondary btn-sm vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel">{{$cancel}}</button>
-			<div class="clear"></div>
-		</div>
-	</form>
-	{{/foreach}}
-</div>
diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
deleted file mode 100644
index 5d683d751..000000000
--- a/view/tpl/cdav_calendar.tpl
+++ /dev/null
@@ -1,349 +0,0 @@
-<script>
-
-var new_event = [];
-var new_event_id = Math.random().toString(36).substring(7);
-var views = {'month' : '{{$month}}', 'agendaWeek' : '{{$week}}', 'agendaDay' : '{{$day}}', 'listMonth' : '{{$list_month}}', 'listWeek' : '{{$list_week}}', 'listDay' : '{{$list_day}}'};
-
-$(document).ready(function() {
-	$('#calendar').fullCalendar({
-		eventSources: [ {{$sources}} ],
-
-		header: false,
-		eventTextColor: 'white',
-
-		lang: '{{$lang}}',
-		firstDay: {{$first_day}},
-
-		monthNames: aStr['monthNames'],
-		monthNamesShort: aStr['monthNamesShort'],
-		dayNames: aStr['dayNames'],
-		dayNamesShort: aStr['dayNamesShort'],
-		allDayText: aStr['allday'],
-
-		timeFormat: 'HH:mm',
-		timezone: 'local',
-
-		defaultTimedEventDuration: '01:00:00',
-		snapDuration: '00:15:00',
-
-		dayClick: function(date, jsEvent, view) {
-
-			if(new_event.length)
-				$('#calendar').fullCalendar( 'removeEventSource', new_event);
-
-			$('#event_uri').val('');
-			$('#id_title').val('New event');
-			$('#calendar_select').val($("#calendar_select option:first").val()).attr('disabled', false);
-			$('#id_dtstart').val(date.format());
-			$('#id_dtend').val(date.hasTime() ? date.add(1, 'hours').format() : date.add(1, 'days').format());
-			$('#id_description').val('');
-			$('#id_location').val('');
-			$('#event_submit').val('create_event').html('Create');
-			$('#event_delete').hide();
-
-			new_event = [{ id: new_event_id, title  : 'New event', start: $('#id_dtstart').val(), end: $('#id_dtend').val(), editable: true, color: '#bbb' }]
-			$('#calendar').fullCalendar( 'addEventSource', new_event);
-		},
-
-		eventClick: function(event, jsEvent, view) {
-
-			if(event.id == new_event_id) {
-				$(window).scrollTop(0);
-				$('.section-content-tools-wrapper, #event_form_wrapper').show();
-				$('#recurrence_warning').hide();
-				$('#id_title').focus().val('');
-				return false;
-			}
-
-			if($('main').hasClass('fullscreen') && view.type !== 'month' && event.rw)
-				$('#calendar').fullCalendar('option', 'height', 'auto');
-
-			if(new_event.length && event.rw) {
-				$('#calendar').fullCalendar( 'removeEventSource', new_event);
-			}
-
-			if(!event.recurrent && event.rw) {
-				var start_clone = moment(event.start);
-				var noend_allday = start_clone.add(1, 'day').format('YYYY-MM-DD');
-
-				$(window).scrollTop(0);
-				$('.section-content-tools-wrapper, #event_form_wrapper').show();
-				$('#recurrence_warning').hide();
-				$('#id_title').focus();
-
-				$('#event_uri').val(event.uri);
-				$('#id_title').val(event.title);
-				$('#calendar_select').val(event.calendar_id[0] + ':' + event.calendar_id[1]).attr('disabled', true);
-				$('#id_dtstart').val(event.start.format());
-				$('#id_dtend').val(event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday);
-				$('#id_description').val(event.description);
-				$('#id_location').val(event.location);
-				$('#event_submit').val('update_event').html('Update');
-				$('#event_delete').show();
-			}
-			else if(event.recurrent && event.rw) {
-				$('.section-content-tools-wrapper, #recurrence_warning').show();
-				$('#event_form_wrapper').hide();
-				$('#event_uri').val(event.uri);
-				$('#calendar_select').val(event.calendar_id[0] + ':' + event.calendar_id[1]).attr('disabled', true);
-			}
-		},
-
-		eventResize: function(event, delta, revertFunc) {
-
-			$('#id_title').val(event.title);
-			$('#id_dtstart').val(event.start.format());
-			$('#id_dtend').val(event.end.format());
-
-			$.post( 'cdav/calendar', {
-				'update': 'resize',
-				'id[]': event.calendar_id,
-				'uri': event.uri,
-				'dtstart': event.start ? event.start.format() : '',
-				'dtend': event.end ? event.end.format() : ''
-			})
-			.fail(function() {
-				revertFunc();
-			});
-		},
-
-		eventDrop: function(event, delta, revertFunc) {
-
-			var start_clone = moment(event.start);
-			var noend_allday = start_clone.add(1, 'day').format('YYYY-MM-DD');
-
-			$('#id_title').val(event.title);
-			$('#id_dtstart').val(event.start.format());
-			$('#id_dtend').val(event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday);
-
-			$.post( 'cdav/calendar', {
-				'update': 'drop',
-				'id[]': event.calendar_id,
-				'uri': event.uri,
-				'dtstart': event.start ? event.start.format() : '',
-				'dtend': event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday
-			})
-			.fail(function() {
-				revertFunc();
-			});
-		},
-
-		loading: function(isLoading, view) {
-			$('#events-spinner').spin('tiny');
-			$('#events-spinner > i').css('color', 'transparent');
-			if(!isLoading) {
-				$('#events-spinner').spin(false);
-				$('#events-spinner > i').css('color', '');
-			}
-		}
-	});
-
-	// echo the title
-	var view = $('#calendar').fullCalendar('getView');
-
-	$('#title').text(view.title);
-
-	$('#view_selector').html(views[view.name]);
-
-	$('.color-edit').colorpicker({ input: '.color-edit-input' });
-
-	$(document).on('click','#fullscreen-btn', on_fullscreen);
-	$(document).on('click','#inline-btn', on_inline);
-
-	$(document).on('click','#event_submit', on_submit);
-	$(document).on('click','#event_more', on_more);
-	$(document).on('click','#event_cancel, #event_cancel_recurrent', reset_form);
-	$(document).on('click','#event_delete, #event_delete_recurrent', on_delete);
-
-});
-
-function changeView(action, viewName) {
-	$('#calendar').fullCalendar(action, viewName);
-	var view = $('#calendar').fullCalendar('getView');
-
-	if($('main').hasClass('fullscreen'))
-		if(view.name !== 'month')
-			$('.section-content-tools-wrapper').css('display') === 'none' ? on_fullscreen() : on_inline() ;
-		else
-			on_fullscreen();
-	else
-		on_inline();
-
-	$('#title').text(view.title);
-	$('#view_selector').html(views[view.name]);
-}
-
-function add_remove_json_source(source, color, editable, status) {
-
-	if(status === undefined)
-		status = 'fa-calendar-check-o';
-
-	if(status === 'drop') {
-		reset_form();
-		$('#calendar').fullCalendar( 'removeEventSource', source );
-		return;
-	}
-
-	var parts = source.split('/');
-	var id = parts[4];
-
-	var selector = '#calendar-btn-' + id;
-
-	if($(selector).hasClass('fa-calendar-o')) {
-		$('#calendar').fullCalendar( 'addEventSource', { url: source, color: color, editable: editable });
-		$(selector).removeClass('fa-calendar-o');
-		$(selector).addClass(status);
-		$.get('/cdav/calendar/switch/' + id + '/1');
-	}
-	else {
-		$('#calendar').fullCalendar( 'removeEventSource', source );
-		$(selector).removeClass(status);
-		$(selector).addClass('fa-calendar-o');
-		$.get('/cdav/calendar/switch/' + id + '/0');
-	}
-}
-
-function on_fullscreen() {
-	var view = $('#calendar').fullCalendar('getView');
-	if(($('.section-content-tools-wrapper').css('display') === 'none') || ($('.section-content-tools-wrapper').css('display') !== 'none' && view.type === 'month'))
-		$('#calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
-}
-
-function on_inline() {
-	var view = $('#calendar').fullCalendar('getView');
-	((view.type === 'month') ? $('#calendar').fullCalendar('option', 'height', '') : $('#calendar').fullCalendar('option', 'height', 'auto'));
-}
-
-function on_submit() {
-	$.post( 'cdav/calendar', {
-		'submit': $('#event_submit').val(),
-		'target': $('#calendar_select').val(),
-		'uri': $('#event_uri').val(),
-		'title': $('#id_title').val(),
-		'dtstart': $('#id_dtstart').val(),
-		'dtend': $('#id_dtend').val(),
-		'description': $('#id_description').val(),
-		'location': $('#id_location').val()
-	})
-	.done(function() {
-		$('#calendar').fullCalendar( 'refetchEventSources', [ {{$sources}} ] );
-		reset_form();
-	});
-}
-
-function on_delete() {
-	$.post( 'cdav/calendar', {
-		'delete': 'delete',
-		'target': $('#calendar_select').val(),
-		'uri': $('#event_uri').val(),
-	})
-	.done(function() {
-		$('#calendar').fullCalendar( 'refetchEventSources', [ {{$sources}} ] );
-		reset_form();
-	});
-}
-
-function reset_form() {
-	$('.section-content-tools-wrapper, #event_form_wrapper, #recurrence_warning').hide();
-
-	$('#event_submit').val('');
-	$('#calendar_select').val('');
-	$('#event_uri').val('');
-	$('#id_title').val('');
-	$('#id_dtstart').val('');
-	$('#id_dtend').val('');
-
-	if(new_event.length)
-		$('#calendar').fullCalendar( 'removeEventSource', new_event);
-
-	if($('#more_block').hasClass('open'))
-		on_more();
-
-	if($('main').hasClass('fullscreen'))
-		on_fullscreen();
-}
-
-function on_more() {
-	if($('#more_block').hasClass('open')) {
-		$('#event_more').html('<i class="fa fa-caret-down"></i> {{$more}}');
-		$('#more_block').removeClass('open').hide();
-	}
-	else {
-		$('#event_more').html('<i class="fa fa-caret-up"></i> {{$less}}');
-		$('#more_block').addClass('open').show();
-	}
-}
-
-</script>
-
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="float-right">
-			<div class="dropdown">
-				<button id="view_selector" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"></button>
-				<div class="dropdown-menu">
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
-					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listMonth'); return false;">{{$list_month}}</a></li>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listWeek'); return false;">{{$list_week}}</a></li>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listDay'); return false;">{{$list_day}}</a></li>
-				</div>
-				<div class="btn-group">
-					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-					<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
-					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
-				</div>
-				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-				<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
-			</div>
-		</div>
-		<h2 id="title"></h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-tools-wrapper" style="display: none">
-		<div id="recurrence_warning" style="display: none">
-			<div class="section-content-warning-wrapper">
-				{{$recurrence_warning}}
-			</div>
-			<div>
-				<button id="event_delete_recurrent" type="button" class="btn btn-danger btn-sm">{{$delete_all}}</button>
-				<button id="event_cancel_recurrent" type="button" class="btn btn-outline-secondary btn-sm">{{$cancel}}</button>
-			</div>
-		</div>
-		<div id="event_form_wrapper" style="display: none">
-			<form id="event_form" method="post" action="">
-				<input id="event_uri" type="hidden" name="uri" value="">
-				{{include file="field_input.tpl" field=$title}}
-				<label for="calendar_select">{{$calendar_select_label}}</label>
-				<select id="calendar_select" name="target" class="form-control form-group">
-					{{foreach $writable_calendars as $writable_calendar}}
-					<option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}{{if $writable_calendar.sharer}} ({{$writable_calendar.sharer}}){{/if}}</option>
-					{{/foreach}}
-				</select>
-				<div id="more_block" style="display: none;">
-					{{include file="field_input.tpl" field=$dtstart}}
-					{{include file="field_input.tpl" field=$dtend}}
-					{{include file="field_textarea.tpl" field=$description}}
-					{{include file="field_textarea.tpl" field=$location}}
-				</div>
-				<div class="form-group">
-					<div class="pull-right">
-						<button id="event_more" type="button" class="btn btn-outline-secondary btn-sm"><i class="fa fa-caret-down"></i> {{$more}}</button>
-						<button id="event_submit" type="button" value="" class="btn btn-primary btn-sm"></button>
-
-					</div>
-					<div>
-						<button id="event_delete" type="button" class="btn btn-danger btn-sm">{{$delete}}</button>
-						<button id="event_cancel" type="button" class="btn btn-outline-secondary btn-sm">{{$cancel}}</button>
-					</div>
-					<div class="clear"></div>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="section-content-wrapper-np">
-		<div id="calendar"></div>
-	</div>
-</div>
diff --git a/view/tpl/cdav_widget_addressbook.tpl b/view/tpl/cdav_widget_addressbook.tpl
deleted file mode 100644
index c875dc977..000000000
--- a/view/tpl/cdav_widget_addressbook.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<div class="widget">
-	<h3>{{$addressbooks_label}}</h3>
-	{{foreach $addressbooks as $addressbook}}
-	<div id="addressbook-{{$addressbook.id}}" class="ml-3">
-		<div class="form-group">
-			<i class="fa fa-user generic-icons"></i><a href="/cdav/addressbook/{{$addressbook.id}}">{{$addressbook.displayname}}</a>
-			<div class="float-right">
-				<i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-addressbook-{{$addressbook.id}}')"></i>
-				<a href="/cdav/addressbooks/{{$addressbook.ownernick}}/{{$addressbook.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
-				<a href="#" onclick="dropItem('/cdav/addressbook/drop/{{$addressbook.id}}', '#addressbook-{{$addressbook.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-			</div>
-		</div>
-		<div id="edit-addressbook-{{$addressbook.id}}" class="sub-menu" style="display: none;">
-			<form id="edit-addressbook-{{$addressbook.id}}" method="post" action="">
-				<label for="edit-{{$addressbook.id}}">{{$edit_label}}</label>
-				<div id="edit-form-{{$addressbook.id}}" class="form-group">
-					<input id="id-{{$addressbook.id}}" name="id" type="hidden" value="{{$addressbook.id}}">
-					<input id="edit-{{$addressbook.id}}" name="{DAV:}displayname" type="text" value="{{$addressbook.displayname}}" class="form-control">
-				</div>
-				<div class="form-group">
-					<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
-				</div>
-			</form>
-		</div>
-	</div>
-	{{/foreach}}
-</div>
-
-<div class="widget">
-	<h3>{{$tools_label}}</h3>
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item">
-			<a class="nav-link" href="#" onclick="openClose('create-addressbook'); return false;"><i class="fa fa-user-plus generic-icons"></i> {{$create_label}}</a>
-		</li>
-		<div id="create-addressbook" class="sub-menu-wrapper">
-			<div class="sub-menu">
-				<form method="post" action="">
-					<div class="form-group">
-						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control form-group">
-						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
-					</div>
-				</form>
-			</div>
-		</div>
-		<li class="nav-item">
-			<a class="nav-link" href="#" onclick="openClose('upload-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
-		</li>
-		<div id="upload-form" class="sub-menu-wrapper">
-			<div class="sub-menu">
-					<div class="form-group">
-						<select id="import" name="target" class="form-control">
-							<option value="">{{$import_placeholder}}</option>
-							{{foreach $addressbooks as $addressbook}}
-							<option value="{{$addressbook.id}}">{{$addressbook.displayname}}</option>
-							{{/foreach}}
-						</select>
-					</div>
-					<div class="form-group">
-						<input class="form-control-file w-100" id="addressbook-upload-choose" type="file" name="userfile" />
-					</div>
-					<button class="btn btn-primary btn-sm" type="submit" name="a_upload" value="a_upload">{{$upload}}</button>
-				</form>
-			</div>
-		</div>
-	</ul>
-</div>
diff --git a/view/tpl/cdav_widget_calendar.tpl b/view/tpl/cdav_widget_calendar.tpl
deleted file mode 100644
index ec2257a19..000000000
--- a/view/tpl/cdav_widget_calendar.tpl
+++ /dev/null
@@ -1,121 +0,0 @@
-{{if $my_calendars}}
-<div class="widget">
-	<h3>{{$my_calendars_label}}</h3>
-	{{foreach $my_calendars as $calendar}}
-	<div id="calendar-{{$calendar.calendarid}}">
-		<div class="ml-3{{if !$calendar@last}} form-group{{/if}}">
-			<i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}fa-calendar-check-o{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}})" style="color: {{$calendar.color}};"></i>{{$calendar.displayname}}
-			<div class="float-right">
-				<i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-calendar-{{$calendar.calendarid}}')"></i>
-				<a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
-				<i id="share-icon" class="fa fa-share-alt fakelink generic-icons" onclick="openClose('share-calendar-{{$calendar.calendarid}}')"></i>
-				<a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-			</div>
-			<div id="share-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};">
-				{{if $calendar.sharees}}
-				{{foreach $calendar.sharees as $sharee}}
-				<div id="sharee-{{$calendar.calendarid}}" class="form-group">
-					<i class="fa fa-share generic-icons"></i>{{$sharee.name}}&nbsp;{{$sharee.access}}
-					<div class="pull-right">
-						<a href="#" onclick="dropItem('/cdav/calendar/dropsharee/{{$calendar.calendarid}}/{{$calendar.instanceid}}/{{$sharee.hash}}', '#sharee-{{$calendar.calendarid}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-					</div>
-				</div>
-				{{/foreach}}
-				{{/if}}
-				<form method="post" action="">
-					<label for="share-{{$calendar.calendarid}}">{{$share_label}}</label>
-					<input name="calendarid" type="hidden" value="{{$calendar.calendarid}}">
-					<input name="instanceid" type="hidden" value="{{$calendar.instanceid}}">
-					<div class="form-group">
-						<select id="share-{{$calendar.calendarid}}" name="sharee" class="form-control">
-							{{$sharee_options}}
-						</select>
-					</div>
-					<div class="form-group">
-						<select name="access" class="form-control">
-							{{$access_options}}
-						</select>
-					</div>
-					<div class="form-group">
-						<button type="submit" name="share" value="share" class="btn btn-primary btn-sm">{{$share}}</button>
-					</div>
-				</form>
-			</div>
-			<div id="edit-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};">
-				<form id="edit-calendar-{{$calendar.calendarid}}" method="post" action="" class="colorpicker-component color-edit">
-					<input id="id-{{$calendar.calendarid}}" name="id" type="hidden" value="{{$calendar.calendarid}}:{{$calendar.instanceid}}">
-					<input id="color-{{$calendar.calendarid}}" name="color" type="hidden" value="{{$calendar.color}}" class="color-edit-input">
-					<label for="edit-form-{{$calendar.calendarid}}">{{$edit_label}}</label>
-					<div id="edit-form-{{$calendar.calendarid}}" class="input-group form-group">
-						<input id="create-{{$calendar.calendarid}}" name="{DAV:}displayname" type="text" value="{{$calendar.displayname}}" class="form-control">
-						<span class="input-group-addon"><i></i></span>
-					</div>
-					<div class="form-group">
-						<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-	{{/foreach}}
-</div>
-{{/if}}
-
-{{if $shared_calendars}}
-<div class="widget">
-	<h3>{{$shared_calendars_label}}</h3>
-	{{foreach $shared_calendars as $calendar}}
-	<div id="shared-calendar-{{$calendar.calendarid}}" class="ml-3{{if !$calendar@last}} form-group{{/if}}">
-		<i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}{{if $calendar.access == 'read-write'}}fa-calendar-check-o{{else}}fa-calendar-times-o{{/if}}{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, {{if $calendar.access == 'read-write'}}'fa-calendar-check-o'{{else}}'fa-calendar-times-o'{{/if}})"  style="color: {{$calendar.color}};"></i>{{$calendar.displayname}} ({{$calendar.sharer}})
-		<div class="pull-right">
-			<a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
-			<a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#shared-calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-		</div>
-	</div>
-	{{/foreach}}
-</div>
-{{/if}}
-
-<div class="widget">
-	<h3>{{$tools_label}}</h3>
-	<div class="nav nav-pills flex-column">
-		<li class="nav-item">
-			<a class="nav-link" href="#" onclick="openClose('create-calendar'); return false;"><i class="fa fa-calendar-plus-o generic-icons"></i> {{$create_label}}</a>
-		</li>
-		<div id="create-calendar" class="sub-menu-wrapper">
-			<div class="sub-menu">
-				<form method="post" action="" class="colorpicker-component color-edit">
-					<input id="color" name="color" type="hidden" value="#3a87ad" class="color-edit-input">
-					<div id="create-form" class="input-group form-group">
-						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control">
-						<span class="input-group-addon"><i></i></span>
-					</div>
-					<div class="form-group">
-						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
-					</div>
-				</form>
-			</div>
-		</div>
-		<li class="nav-item">
-			<a class="nav-link" href="#" onclick="openClose('upload-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
-		</li>
-		<div id="upload-form" class="sub-menu-wrapper">
-			<div class="sub-menu">
-				<form enctype="multipart/form-data" method="post" action="">
-					<div class="form-group">
-						<select id="import" name="target" class="form-control">
-							<option value="">{{$import_placeholder}}</option>
-							{{foreach $writable_calendars as $writable_calendar}}
-							<option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}</option>
-							{{/foreach}}
-						</select>
-					</div>
-					<div class="form-group">
-						<input class="form-control-file w-100" id="event-upload-choose" type="file" name="userfile" />
-					</div>
-					<button class="btn btn-primary btn-sm" type="submit" name="c_upload" value="c_upload">{{$upload}}</button>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
deleted file mode 100755
index 1a84f1e66..000000000
--- a/view/tpl/channel.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-<div class="section-subtitle-wrapper">
-	<div class="pull-right">
-		{{if $channel.default_links}}
-		{{if $channel.default}}
-		<div>
-			<i class="fa fa-check-square-o"></i>&nbsp;{{$msg_default}}
-		</div>
-		{{else}}
-		<a href="manage/{{$channel.channel_id}}/default" class="make-default-link">
-			<i class="fa fa-square-o"></i>&nbsp;{{$msg_make_default}}
-		</a>
-		{{/if}}
-		{{/if}}
-		{{if $channel.delegate}}
-			{{$delegated_desc}}
-		{{/if}}
-	</div>
-	<h3>
-		{{if $selected == $channel.channel_id}}
-		<i class="selected-channel fa fa-circle" title="{{$msg_selected}}"></i>
-		{{/if}}
-		{{if $channel.delegate}}
-		<i class="fa fa-arrow-circle-right" title="{{$delegated_desc}}"></i>
-		{{/if}}
-		{{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" title="{{$channel.channel_name}}">{{/if}}
-			{{$channel.channel_name}}
-		{{if $selected != $channel.channel_id}}</a>{{/if}}
-	</h3>
-	<div class="clear"></div>
-</div>
-<div class="section-content-wrapper">
-	<div class="channel-photo-wrapper">
-		{{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}">{{/if}}
-			<img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" />
-		{{if $selected != $channel.channel_id}}</a>{{/if}}
-	</div>
-	<div class="channel-notifications-wrapper">
-		{{if !$channel.delegate}}
-		<div class="channel-notification">
-			<i class="fa fa-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i>
-			{{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}}
-		</div>
-		<div class="channel-notification">
-			<i class="fa fa-user{{if $channel.intros != 0}} new-notification{{/if}}"></i>
-			{{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}}
-		</div>
-		{{/if}}
-	</div>
-</div>
diff --git a/view/tpl/channel_id_select.tpl b/view/tpl/channel_id_select.tpl
deleted file mode 100644
index ecebd4bc0..000000000
--- a/view/tpl/channel_id_select.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{if $channels}}
-<select name="dest_channel" id="dest-channel-select"> 
-{{foreach $channels as $c}}
-<option {{if $c.channel_id == $selected}}selected="selected"{{/if}} value="{{$c.channel_id}}">{{$c.channel_name}}</option>
-{{/foreach}}
-</select>
-{{/if}}
\ No newline at end of file
diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
deleted file mode 100755
index baffe9b06..000000000
--- a/view/tpl/channel_import.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<h2>{{$title}}</h2>
-
-<form action="import" method="post" enctype="multipart/form-data" id="import-channel-form">
-	<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-	<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>
-
-	<label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label>
-	<input type="file" name="filename" id="import-filename" class="import-input" value="" />
-	<div id="import-filename-end" class="import-field-end"></div>
-
-	<div id="import-choice" class="descriptive-paragraph">{{$choice}}</div>
-
-	<label for="import-old-address" id="label-import-old-address" class="import-label" >{{$label_old_address}}</label>
-	<input type="text" name="old_address" id="import-old-address" class="import-input" value="" />
-	<div id="import-old-address-end" class="import-field-end"></div>
-
-	<label for="import-old-email" id="label-import-old-email" class="import-label" >{{$label_old_email}}</label>
-	<input type="text" name="email" id="import-old-email" class="import-input" value="{{$email}}" />
-	<div id="import-old-email-end" class="import-field-end"></div>
-
-	<label for="import-old-pass" id="label-import-old-pass" class="import-label" >{{$label_old_pass}}</label>
-	<input type="password" name="password" id="import-old-pass" class="import-input" value="{{$pass}}" />
-	<div id="import-old-pass-end" class="import-field-end"></div>
-
-	<input type="checkbox" name="import_posts" id="import-posts" value="1" />
-	<label for="import-posts" id="label-import-posts">{{$label_import_posts}}</label>
-	<div id="import-posts-end" class="import-field-end"></div>
-
-	<div id="import-common-desc" class="descriptive-paragraph">{{$common}}</div>
-
-	<input type="checkbox" name="make_primary" id="import-make-primary" value="1" />
-	<label for="import-make-primary" id="label-import-make-primary">{{$label_import_primary}}</label>
-	<div id="import-make-primary-end" class="import-field-end"></div>
-
-	<input type="checkbox" name="moving" id="import-moving" value="1" />
-	<label for="import-moving" id="label-import-moving">{{$label_import_moving}}</label>
-	<div id="import-moving-end" class="import-field-end"></div>
-
-	<input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" />
-	<div id="import-submit-end" class="import-field-end"></div>
-
-	<div id="import-common-desc" class="descriptive-paragraph">{{$pleasewait}}</div>
-</form>
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
deleted file mode 100755
index f484b49e5..000000000
--- a/view/tpl/channels.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<a class="btn btn-success btn-sm pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="fa fa-plus-circle"></i>&nbsp;{{$create.2}}</a>
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper-np">
-		{{if $channel_usage_message}}
-		<div id="channel-usage-message" class="section-content-warning-wrapper">
-			{{$channel_usage_message}}
-		</div>
-		{{/if}}
-		<div id="channels-desc" class="section-content-info-wrapper">
-			{{$desc}}
-		</div>
-		{{foreach $all_channels as $chn}}
-			{{include file="channel.tpl" channel=$chn}}
-		{{/foreach}}
-		{{if $delegates}}
-			{{foreach $delegates as $chn}}
-				{{include file="channel.tpl" channel=$chn}}
-			{{/foreach}}
-		{{/if}}
-	</div>
-</div>
diff --git a/view/tpl/chanview.tpl b/view/tpl/chanview.tpl
deleted file mode 100755
index 39fafaf8e..000000000
--- a/view/tpl/chanview.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<a href="{{$url}}">{{$url}}</a>
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
deleted file mode 100644
index 22f3465bf..000000000
--- a/view/tpl/chat.tpl
+++ /dev/null
@@ -1,346 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			{{if $is_owner}}
-			<form id="chat-destroy" method="post" action="chat">
-				<input type="hidden" name="room_name" value="{{$room_name}}" />
-				<input type="hidden" name="action" value="drop" />
-				<button class="btn btn-danger btn-sm" type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$drop}}</button>
-			</form>
-			{{/if}}
-			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
-		</div>
-		<h2>{{$room_name}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div id="chatContainer" class="section-content-wrapper">
-		<div id="chatTopBar">
-			<div id="chatLineHolder"></div>
-		</div>
-		<div class="clear"></div>
-		<div id="chatBottomBar" >
-			<form id="chat-form" method="post" action="#">
-				<input type="hidden" name="room_id" value="{{$room_id}}" />
-				<div class="form-group">
-					<textarea id="chatText" name="chat_text" class="form-control"></textarea>
-				</div>
-				<div id="chat-submit-wrapper">
-					<div id="chat-submit" class="dropup pull-right">
-						<button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="fa fa-cog"></i></button>
-						<button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
-						<div class="dropdown-menu dropdown-menu-right">
-							<a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online"><i class="fa fa-circle online"></i>&nbsp;{{$online}}</a>
-							<a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away"><i class="fa fa-circle away"></i>&nbsp;{{$away}}</a>
-							<a class="dropdown-item" href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave"><i class="fa fa-circle leave"></i>&nbsp;{{$leave}}</a>
-                       					<div class="dropdown-divider"></div>
-                        				<a id="toggle-notifications" class="dropdown-item" href="" onclick="toggleChatNotifications(); return false;"><i id="toggle-notifications-icon" class="fa fa-bell-slash-o"></i>&nbsp;Toggle notifications</a>
-                        				<a id="toggle-notifications-audio" class="dropdown-item disabled" href="" onclick="toggleChatNotificationAudio(); return false;"><i id="toggle-notifications-audio-icon" class="fa fa-volume-off"></i>&nbsp;Toggle sound</a>
-							{{if $bookmark_link}}
-                         				<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="{{$bookmark_link}}" target="_blank" ><i class="fa fa-bookmark"></i>&nbsp;{{$bookmark}}</a>
-							{{/if}}
-						</div>
-					</div>
-					<div id="chat-tools" class="btn-toolbar pull-left">
-						<div class="btn-group mr-2">
-							<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'chatText'); return false;">
-								<i class="fa fa-bold jot-icons"></i>
-							</button>
-							<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'chatText'); return false;">
-								<i class="fa fa-italic jot-icons"></i>
-							</button>
-							<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'chatText'); return false;">
-								<i class="fa fa-underline jot-icons"></i>
-							</button>
-							<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'chatText'); return false;">
-								<i class="fa fa-quote-left jot-icons"></i>
-							</button>
-							<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'chatText'); return false;">
-								<i class="fa fa-terminal jot-icons"></i>
-							</button>
-						</div>
-						<div class="btn-group mr-2 d-none d-md-flex">
-							<button id="chat-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="chatJotGetLink(); return false;" >
-								<i id="chat-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i>
-							</button>
-						</div>
-						{{if $feature_encrypt}}
-						<div class="btn-group mr-2 d-none d-md-flex">
-							<button id="chat-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="red_encrypt('{{$cipher}}', '#chatText', $('#chatText').val()); return false;">
-								<i id="chat-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i>
-							</button>
-						</div>
-						{{/if}}
-						<div class="btn-group dropup d-md-none">
-							<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
-							</button>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" href="#" onclick="chatJotGetLink(); return false;" ><i class="fa fa-link"></i>&nbsp;{{$insert}}</a>
-								{{if $feature_encrypt}}
-								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}', '#chatText' ,$('#chatText').val()); return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
-								{{/if}}
-							</div>
-						</div>
-					</div>
-					<div id="chat-rotator-wrapper" class="pull-left">
-						<div id="chat-rotator"></div>
-					</div>
-					<div class="clear"></div>
-				</div>
-			</form>
-		</div>
-	</div>
-</div>
-
-<script>
-var room_id = {{$room_id}};
-var last_chat = 0;
-var chat_timer = null;
-
-$(document).ready(function() {
-	$('#chatTopBar').spin('small');
-	chat_timer = setTimeout(load_chats,300);
-	$('#chatroom_bookmarks, #vcard').hide();
-	$('#chatroom_list, #chatroom_members').show();
-	adjustInlineTopBarHeight();
-    chatNotificationInit();
-});
-
-$(window).resize(function () {
-	if($('main').hasClass('fullscreen')) {
-		adjustFullscreenTopBarHeight();
-	}
-	else {
-		adjustInlineTopBarHeight();
-	}
-});
-
-$('#chat-form').submit(function(ev) {
-	$('body').css('cursor','wait');
-	$.post("chatsvc", $('#chat-form').serialize(),function(data) {
-			if(chat_timer) clearTimeout(chat_timer);
-			$('#chatText').val('');
-			load_chats();
-			$('body').css('cursor','auto');
-		},'json');
-	ev.preventDefault();
-});
-
-function load_chats() {
-	$.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat + ((stopped) ? '&stopped=1' : ''),function(data) {
-		if(data.success && (! stopped)) {
-			update_inroom(data.inroom);
-			update_chats(data.chats);
-			$('#chatTopBar').spin(false);
-		}
-	});
-	
-	chat_timer = setTimeout(load_chats,10000);
-
-}
-
-var previousChatRoomMembers = null; // initialize chat room member change register
-var currentChatRoomMembers = null; // initialize chat room member change register
-function update_inroom(inroom) {
-	var html = document.createElement('div');
-	var count = inroom.length;
-	$.each( inroom, function(index, item) {
-		var newNode = document.createElement('div');
-		newNode.setAttribute('class', 'member-item');
-		$(newNode).html('<img class="menu-img-2" src="' + item.img + '" alt="' + item.name + '" /> ' + '<span class="contactname">' + item.name + '</span><span class="' + item.status_class + '">' + item.status + '</span>');
-		html.appendChild(newNode);
-	});
-    memberChange = chatRoomMembersChange(inroom); // get list of arrivals and departures
-    if(memberChange.membersArriving.length > 0) {
-      // Issue pop-up notification if anyone enters the room.
-      chat_issue_notification(JSON.stringify(memberChange.membersArriving.pop().name) + ' entered the room', 'Hubzilla Chat');
-    }
-	$('#chatMembers').html(html);
-}
-
-// Determine if the new list of chat room members has any new members or if any have left
-function chatRoomMembersChange(inroom) {
-    previousChatRoomMembers = currentChatRoomMembers;
-    currentChatRoomMembers = inroom;
-      var membersArriving = [];
-      var membersLeaving = [];
-    if(previousChatRoomMembers !== null) {
-      var newMember = false;
-      $.each( currentChatRoomMembers, function(index, currMember) {
-        newMember = true;
-        $.each( previousChatRoomMembers, function(index, prevMember) {
-          if (prevMember.name === currMember.name) {
-              newMember = false;
-          }
-        });
-        if (newMember === true) {
-          membersArriving.push(currMember);
-        }
-      });
-    }
-    return {membersArriving: membersArriving, membersLeaving: membersLeaving};
-}
-
-function update_chats(chats) {
-	var count = chats.length;
-	$.each( chats, function(index, item) {
-		last_chat = item.id;
-		var newNode = document.createElement('div');
-
-		if(item.self) {
-			newNode.setAttribute('class', 'chat-item-self clear');
-			$(newNode).html('<div class="chat-body-self"><div class="chat-item-title-self wall-item-ago"><span class="chat-item-name-self">' + item.name + ' </span><span class="autotime chat-item-time-self" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text-self">' + item.text + '</div></div><img class="chat-item-photo-self" src="' + item.img + '" alt="' + item.name + '" />');
-		}
-		else {
-			newNode.setAttribute('class', 'chat-item clear');
-			$(newNode).html('<img class="chat-item-photo" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body"><div class="chat-item-title wall-item-ago"><span class="chat-item-name">' + item.name + ' </span><span class="autotime chat-item-time" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text">' + item.text + '</div></div>');
-            chat_issue_notification(item.name + ':\n' + item.text, 'Hubzilla Chat');
-		}
-		$('#chatLineHolder').append(newNode);
-		$(".autotime").timeago();
-
-		var elem = document.getElementById('chatTopBar');
-		elem.scrollTop = elem.scrollHeight;
-	});
-}
-
-var chat_notify_granted = false; // Initialize notification permission to denied
-var chat_notify_enabled = false;
-var chat_notify_audio_enabled = false;
-var chat_notify_audio = {};
-// Request notification access from the user
-// TODO: Check Hubzilla member config setting before requesting permission
-function chatNotificationInit() {
-  
-    if (!("Notification" in window)) {
-        window.console.log("This browser does not support system notifications");
-    }
-    // Let's check whether notification permissions have already been granted
-    else if (Notification.permission === "granted") {
-        // If it's okay let's create a notification
-        chat_notify_granted = true; //var notification = new Notification("Hi there!");
-    }
-
-    // Otherwise, we need to ask the user for permission
-    else if (Notification.permission !== 'denied') {
-        Notification.requestPermission(function (permission) {
-            // If the user accepts, let's create a notification
-            if (permission === "granted") {
-                chat_notify_granted = true; //var notification = new Notification("Hi there!");
-            }
-        });
-    }
-    // Encode a wav audio file in base64 and create the audio object for game alerts
-    //var base64string = 'UklGRr4VAABXQVZFZm10IBAAAAABAAEAIlYAACJWAAABAAgAZGF0YZkVAACAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIBxcnJycoGNjY2NjYyMjIyMg3FxcXFxcXJycnJ0jY2NjY2NjIyMjIx1cXFxcXFxcnJycoKNjY2NjY2MjIyMgXFxcXFxcXJycnJ2jY2NjY2NjIyMjIxzcXFxcXFxcnJycoSNjY2NjY2MjIyMgHFxcXFxcXJycnJ4jY2NjY2NjIyMjIxycXFxcXFycnJycoWNjY2NjY2MjIyMf3FxcXFxcXJycnJ5jY2NjY2NjIyMjIxxcXFxcXFycnJycoeNjY2NjY2MjIyMfnFxcXFxcXJycnJ7jY2NjY2NjIyMjIpxcXFxcXFycnJycomNjY2NjYyMjIyMfHFxcXFxcXJycnJ8jY2NjY2NjIyMjIhycnJycoyLi4uLi4uLioqKfHFxcXFxcnJycnJyc4yMjIuLi4uLi4uKin5xcXFxcnJycnJyc3OMjIyMi4uLi4uLi4p/cXFxcnJycnJyc3Nzi4yMjIyLi4uLi4uLgHBwcXFxcXFxcnJycouNjY2NjYyMjIyMjIBwcHFxcXFxcXJycnKLjY2NjY2MjIyMjIyBcHFxcXFxcXJycnJyio2NjY2NjIyMjIyMgnBxcXFxcXFycnJycomNjY2NjY2MjIyMjINwcXFxcXFxcnJycnKIjY2NjY2NjIyMjIyEcHFxcXFxcXJycnJyh42NjY2NjYyMjIyMhXBxcXFxcXFycnJycoaNjY2NjY2MjIyMjIZwcXFxcXFxcnJycnKFjY2NjY2NjIyMjIyHcHFxcXFxcXJycnJyhI2NjY2NjYyMjIyMiHBxcXFxcXFycnJycoONjY2NjY2MjIyMjIlwcXFxcXFxcnJycnKCjY2NjY2NjIyMjIyKcHFxcXFxcXJycnJygY2NjYyMjIyLi4uLi4uLioqKioqKdnBxcXFxcXFycnKAi4uLi4uLioqKioJxcXFxcXFycnJydIyMi4uLi4uLi4qKdXFxcXFycnJycnKBjIyLi4uLi4uLioFxcXFycnJycXFydY2NjYyMjIyMjIyLc3BwcXFxcXFxcnKDjY2NjIyMjIyMjIBwcHFxcXFxcXJyd42NjY2MjIyMjIyMcnBxcXFxcXFycnKFjY2NjYyMjIyMjH9wcXFxcXFxcnJyeY2NjY2NjIyMjIyMcHFxcXFxcXJycnKHjY2NjY2MjIyMjH5xcXFxcXFycnJyeo2NjY2NjIyMjIyKcHFxcXFxcXJycnKIjY2NjY2MjIyMjHxxcXFxcXFycnJyfI2NjY2NjYyMjIyJcXFxcXFxcXJycnKKjY2NjY2MjIyMjHtxcXFxcXFycnJyfo2NjY2NjYyMjIyHcXFxcXFxcnJycnKMjY2NjY2MjIuLi3lycnJycnJzc3Nzf4yMjIyMjIuLi4uFcnJycnJycnNzc3OMjIyMjIyMi4uLi3hycnJycnJzc3NzgIyMjIyMjIuLi4uDcnJycnJycnNzc3SMjIyMjIyMi4uLi3dycnJycnJzc3NzgYyMjIyMjIuLi4uCcnJycnJyc3Nzc3aMjIyMjIyMi4uLi3VycnJycnJzc3Nzg4yMjIyMjIuLi4uAcnJycnJyc3Nzc3eMjIyMjIyMi4uLi3RycnJycnJzc3NzhIyMjIyMjIuLi4uAcnJycnJyc3Nzc3mMjIyMjIyMi4uLi3JycnJycnJzc3NzhoyMjIyMjIuLi4t+cnJycnJyc3Nzc3qMjIyMjIyLi4uLinJycnNzc3N0dHR0h4uLi4uLi4qKiop9c3Nzc3Nzc3R0dHyLi4uLi4uLioqKiHNzc3Nzc3N0dHR0iIuLi4uLi4qKiop8c3Nzc3Nzc3R0dH2Li4uLi4uLioqKhnNzc3Nzc3N0dHR0iYuLi4uLi4qKiop6c3Nzc3Nzc3R0dH+Li4uLi4uLioqKhXNzc3Nzc3N0dHR0i4uLi4uLi4qKiop5c3Nzc3Nzc3R0dICLi4uLi4uLioqKhHNzc3Nzc3N0dHR1i4uLi4uLi4qKiop4c3Nzc3NzdHR0dIGLi4uLi4uLioqKgnNzc3Nzc3N0dHR2i4uLi4uLi4qKiop2c3Nzc3NzdHR0dIKLi4uLi4uLioqKgXNzc3Nzc3N0dHR3i4uLi4uLi4qKiol2dHR0dHR0dHV1dYOKioqKioqKiYmJgHR0dHR0dHR0dXV5ioqKioqKiomJiYl0dHR0dHR0dHV1dYSKioqKioqKiYmJf3R0dHR0dHR0dXV7ioqKioqKiomJiYl0dHR0dHR0dHV1dYaKioqKioqKiYmJfnR0dHR0dHR1dXV8ioqKioqKioqJiYd0dHR0dHR0dHV1dYeKioqKioqKiYmJfHR0dHR0dHR1dXV9ioqKioqKiomJiYZ0dHR0dHR0dHV1dYiKioqKioqKiYmJe3R0dHR0dHR1dXV+ioqKioqKiomJiYV0dHR0dHR0dHV1dYmKioqKioqKiYmJenR0dHR0dHR1dXWAioqKiYmJiYmIiIN1dXV1dXV1dXZ2domJiYmJiYmJiYiIeXV1dXV1dXV1dnaAiYmJiYmJiYmIiIJ1dXV1dXV1dXZ2d4mJiYmJiYmJiYiIeHV1dXV1dXV1dnaBiYmJiYmJiYmIiIF1dXV1dXV1dXZ2eImJiYmJiYmJiYiId3V1dXV1dXV1dnaCiYmJiYmJiYmIiIB1dXV1dXV1dXZ2eYmJiYmJiYmJiIiIdnV1dXV1dXV1dnaDiYmJiYmJiYmIiH91dXV1dXV1dXZ2e4mJiYmJiYmJiIiIdXV1dXV1dXV1dnaFiYmJiYmJiYmIiH51dXV1dXV1dXZ2fImJiYmJiYmJiIiHdXV1dXV1dXV1dnaGiYmJiYmJiYmIiH11dXV1dXV1dXZ2fYiIiIiIiIiIiIiFdnZ2dnZ2dnZ2d3eGiIiIiIiIiIiIh3x2dnZ2dnZ2dnd3foiIiIiIiIiIiIeEdnZ2dnZ2dnZ2d3eHiIiIiIiIiIiIh3t2dnZ2dnZ2dnZ3f4iIiIiIiIiIiIeDdnZ2dnZ2dnZ2d3eIiIiIiIiIiIiIh3p2dnZ2dnZ2dnZ3gIiIiIiIiIiIiIeCdnZ2dnZ2dnZ2d3iIiIiIiIiIiIiIh3l2dnZ2dnZ2dnZ3gIiIiIiIiIiIiIeBdnZ2dnZ2dnZ2d3mIiIiIiIiIiIiHh3h2dnZ2dnZ2dnZ3goiIiIiIiIiIiIeAdnZ2dnZ2dnZ2d3qIiIiIiIiIiIiHh3d2dnZ2dnZ2dnZ3g4iIiIiIh4eHh4eAd3d3d3d3d3d3d3uHh4eHh4eHh4eHhnd3d3d3d3d3d3d3g4eHh4eHh4eHh4d/d3d3d3d3d3d3d3yHh4eHh4eHh4eHhnd3d3d3d3d3d3d4hIeHh4eHh4eHh4d+d3d3d3d3d3d3d32Hh4eHh4eHh4eHhXd3d3d3d3d3d3d4hYeHh4eHh4eHh4d9d3d3d3d3d3d3d36Hh4eHh4eHh4eHhHd3d3d3d3d3d3d4hoeHh4eHh4eHh4d8d3d3d3d3d3d3d3+Hh4eHh4eHh4eHg3d3d3d3d3d3d3d4h4eHh4eHh4eHh4d7d3d3d3d3d3d3d4CHh4eHh4eHh4eHgnd3d3d3d3d3d3d5h4aGhoaGhoaGhoZ7eHh4eHh4eHh4eICGhoaGhoaGhoaGgXh4eHh4eHh4eHh6h4aGhoaGhoaGhoZ6eHh4eHh4eHh4eIGGhoaGhoaGhoaGgHh4eHh4eHh4eHh7hoaGhoaGhoaGhoZ5eHh4eHh4eHh4eIKGhoaGhoaGhoaGgHh4eHh4eHh4eHh7hoaGhoaGhoaGhoZ4eHh4eHh4eHh4eIKGhoaGhoaGhoaGf3h4eHh4eHh4eHh8hoaGhoaGhoaGhoV4eHh4eHh4eHh4eIOGhoaGhoaGhoaGfnh4eHh4eHh4eHh9hoaGhoaGhoaGhoR4eHh4eHh4eHh4eISGhoaGhoaGhoaGfXh4eHh4eHh4eHh+hoaGhoaGhoaGhoR4eHh4eHh5eXl5eYSFhYWFhYWFhYWFfXl5eXl5eXl5eXl/hYWFhYWFhYWFhYJ5eXl5eXl5eXl5eYWFhYWFhYWFhYWFfHl5eXl5eXl5eXmAhYWFhYWFhYWFhYF5eXl5eXl5eXl5eYWFhYWFhYWFhYWFe3l5eXl5eXl5eXmAhYWFhYWFhYWFhYF5eXl5eXl5eXl5eoWFhYWFhYWFhYWFe3l5eXl5eXl5eXmAhYWFhYWFhYWFhYB5eXl5eXl5eXl5e4WFhYWFhYWFhYWFenl5eXl5eXl5eXmBhYWFhYWFhYWFhYB5eXl5eXl5eXl5fIWFhYWFhYWFhYWFeXl5eXl5eXl5eXmChYWFhYWFhYWFhX95enp6f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f4CAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAA';
-    var base64string = 'UklGRvQbAABXQVZFZm10IBAAAAABAAEAIlYAAESsAAACABAAZGF0YdAbAADk/qz+y/5X/pP+Pv53/j/+UP5//p7+nf6j/rf+HP/u/gP/Ff/B/v/+3/63/qz+sf6G/pn+U/6h/hL+ef5o/qz+hf6q/tf+SP/k/i7/7v4b/6f+M//S/hv/uf7Y/nX+3/5k/sz+V/6f/nT+kf6V/uv+4v48/9T+Vf/S/vT++f72/sD+zP7c/uD+k/5t/rv+Tv7G/lX+fv6W/un+/v7//jz/KP8v/z3/E/9g/+H+m//1/kr//P5O/+r+NP/R/g//4P4a/zz/ff+6//n/jP/8/0z/cf8f/xX//f4t/+z+4v6q/gj/qv5y/kv+mP7V/oX+gP7l/gX/+f7f/pH+P/7f/UD+KP5E/hH+RP4H/m7+/v1S/gT+h/4Q/j/+GP4P/tH98P27/ST++v1F/gz+Hv6v/WH+Lf63/hz+UP43/ov+oP5y/jX+TP6C/v3+xP69/l7+nv7t/uH+MP/X/pz+uP6T/ij+V/5B/i3/d/1Q+xH7z/tL+3X7+/0oBFkF2QS1CcILQwrTDmQTChOuEfwTuw4hBaL8/fey+VH9ff20/D79f/3L+eD2bvHQ587gC9t20FnG2cN5xYPFbMV0xuHIUsqUyu3N6NxK7SL0DfqRBIoP7RecHxApjTF4M4Uvqyp6KvUpuybyIjIhPR5PHAcbVxglFf8SDRAADWEIWwNw/Pz3o/Pl8V/1fvsn/Zb9XQBtBuoJkAtaD0YVZBfDFXUUaxSHFNUVmRZDFj4WMBZbFokU1BG0D5APIg/cDZwJAAfSBeEFGAMLAOr+Tf0b+y/6CvrF+hz65fmH+R766fkD/DD9zP26/E/+1gBHAsMC8wPBBRYFlANfBJcFdgWAA68CvgLdArsByQBpAOn/cf7m/X39rfvT+V/4oPcg9QHzW/QW9vv0DPR79cT3/fZ99WL1+/aI96j4Dfkm+sH6oPwe/av98/39/2oBtwFUAa4BIQJ+AnUAZf+5/4cA6v4e/cH89fy++yj7o/lh+Ef3OfcR9xf25/SK9Db0UPPT8eLxUvSI9GvzTvMY9cj13PUh9rL30Pex+Nj58Prc+l77svyJ/sv+JQDGAPMA+f8FAO//JgD0/9z/1P94/yH9Yfte+iX7rvrz+ML3HfeP9sr1K/Ua9ov2PfaJ9un2OfeZ98T3wff8+Tz83v3x/RH/EgBYAXcCiAMyBJEE8AQwBR4FLQbaBvEHegemBrEFTAXEA9sBR/7f/KP8f/yU+oL4Ifjh9vX0XfQT9Gv06/PW853z+vOp9JL1r/aZ+Bn6RPup/Mf9xv80AfsCiwQ5BW0GVQcHCOwIFAo3C44KSAmnBzMHNAfKBg8FDQT3AawBAwE0ALz+4f1K/Xz92Pwk/eL8J/0J/P37qvxM/J77YvxN/WL+xv7D/0UAqAAQAbcBWwMkBbQGVgdIBzsIDgmICXkKJAq6Ci0L1wvrCqkKtApGC2EKWQlsCb8JYghYBzsGaAbeBrkGlQSHAgMB7wCG/wf/pv5l/jP9rvzh+y/8Wvsz+/H7EP2n/tX/NgAgAZMBzgNWBV0GGwcnCBAKIwtKDKEMVA1jDZoNFA2VDAUMggsKC20KQwo8CaEHtAZfBUwEoQK6ATYA1P8//jb9DPt9+lX6xfoB+iT6cPo0++T7yfwe/fX9l/6y/0MAmQHiAvMDCAVyBpAHpQgTCcUJHwoPCxgMdwzZDCUNJg0tDWoMswvbCm8JugimB7UGgAUtBIICUQH0/1n/SP10/Df7SPoO+YH4wPiR+ez5gfpg+k37FPxi/fD9AP8PAEwBTQI1BGQFpQeuCZ8LKg33DgMQ1xABESkR3RCWEMUPkA4wDQoLHQkgB7QF8AOXAe7+fv2X+zf6yvgf9y31KPS285XzLPSp9Rn2IPeO91L50Prk/Eb+bgBPAt0E7AbFCeoL8w2ODx4RARIdE9AS9hJgEs4RDBBsDqQMQQr5B6cFGANwAGn9l/rz9/T0kvKQ8Azv4u1Z7ffsuuyl7S3vG/AX8cvxKPS59S34QfoE/fX/awNbBT0ICwrnDCMOdg9NEO0Q0BCsEMoPHA85DUwL1wieBtoDTQGD/r37cPhT9ZHyefBZ7u7rnupz6Zjox+jU6HzpOOo06/TsYe7F8DXzJPad+Hv7rP4lAtkE2wf7CRQMcw2DDhUPtw84D3IPIQ7QDKkKdAgWBq8D+QAz/nf6b/f0853wzOzq6YznlOUa5FXjTeIo4l7iKeP24/TlNOgy6p/ske/o8uX1F/k+/I7/HgIfBfIG4QgTChsLwwtdC7IKHQlYB8wFkwL5/2H8Z/lF9ejxqu3z6RnlpOFa3u/b8tmI2HbXHNfC1q3Xq9g+2gvcct4P4aHk0eeM677vrPNw9/b6Wv5pAQ4E6gVjB4oIPQnlCKgIuAdABgQExAGM/qz7n/cE9Hzv9Orf5QTinN3V2mrXINXf0pTR1NDo0G3RCtPy1NfXKtqc3bLgMOWq6VTupfIP9wf78f5AAh8FhAetCRELHAz0C8YLZAoFCYAGuwMTADz8a/jd84PvruoY5hfh89zg2HXWctMm0VXPvs51z/3QLNN41STYfdvO3m7joOfY7Dbx9PVk+uH/pQP6B/EKjw2xDyERFRJxEroRzRCYDpAMYAn3BbkBk/0R+Tz0PO/b6ebkMOB+3MrYMtaX037SEdL00tTU0Nd52mrdmOC55EnoVO0r8hj4XP3wAsoHIA3GEF4UKRegGWIbZhyCHEscxRrjGN0V+RIYD84KtQV/AEf7P/Z/8Z7smOfK43Tg/d0e3BzbfNvh3CzffuHI5EvozeuV7xf0m/h1/TMCLggGDt4T/BcgHO8fEyM5JdcmVietJw0n+iWTI6ggnRwyGYwUmg8aCv8E/f7K+X70L/D/69voueU/5NXjsORm5g3oZeoR7mzxSvXG+B39uwG9Bs8LsRB+FskcdCIjJz4r0y1LML0xxDKTMt8xxTBULqormygsJL8fSRofFcAOYgkoA9X9n/j29K3wr+2t6/nrmuy07UbvUfH48lz1Wvhk/XkCcQg7DiQUZxk/HlkjVClLLrcyQDZzOLU6STvJO+86RDlXN1g0oDBuLJsnNyJZHFEW6A9qCkME+f7N+aP19PFX8IHv8e+y75zvi/BY8wb3AvuT/48EWwk4D/4URxuXINIlmyoGMMU0qjhTO0g9oz4tPzw/Lj58PJY5KTbfMfss6ieKIi4cbhbtD+MJDwSM/s75XfZE82rxhfDA8InwzPCU8kT1Ofht/NgA9gXyCgkRlRaJHD4hYCbwKgUwozMMN/44kTo/O2Y7eDrDOBA2EzNXLzAroyU6IJIauRS+Dq0IDwOm/Rn5U/XV8Vbvze2y7Ajtee317cbv6PJ/9hz7hf92BPsIhQ6ME/UYzx3OIt0m2iqkLcowJTIZM9IyEDLwMA0v3iu+KMQkkyBuGwkWCBC0Cu8EIv+q+RP1qvD67JjpK+dm5tflQuav563p8OtQ7oTx7fTI+Or9GALsBpIL5hB9FcoZMR1OIMYhwyM6JPMk8iPXIhkhux4VG4YXmhJLDhsJawQl/zj6v/Tn7y/rjueO49zgtd5y3QPd19yv3XjfceEB5P7m1+oy7mDy6vZr+/X/PQSOCCsMcA/BEc0T1hTuFf8VvhWEFL8ScRCuDfQJvAX6AKn8zPcK89HtT+k65GbgS9xv2QbWodSr05TTYNNe1MrVrNdQ2rvdj+BX5BXodOyl8DT1qPlu/ewAmQP5BaYHwggOCTMJxwisB/kFDQR+Ae39bvqu9m3yLe5y6Zzl/OBJ3WvZ3db602/SKNCnzyjP3s+z0D3SStSz1qnZi91c4DXkY+fP62rvcfPN9sD5+PtF/sv/PQGIAW4BtABj/wn+lfsB+Qb2P/Ly7uPq3+Yv44nf59v01wXVEtL2zxTOxc37zJ7N8c0uz7PQXdM91mDZiNxY4KnjjucA6zPvMfLu9HL3E/pw+zD9V/3V/Xv9L/2e+xL6nvfU9ODxOe/h67PomOQf4aPdMdqf15/UCdIv0BrP8s60z/vPotEb03TVxNc426Xed+ID5qjpYO0D8Zbz+/Yf+bL7Lf3C/lf/LwCa/1D/vf1+/AL6wPdt9efyi+9N7L7ohuZe44fgvd3D287ZcNhB1x7XS9cP2E/ZmdoY3UDfaeLV5Wrpee388CD0Qffp+fz8+P79ADACfAOnAzAEVgOIAscAV//0/Nb6B/iS9ajyoe8W7DTppObQ5JvipuCh3hPett2l3YfdG9+Q4ADjY+UY6OnqGe5n8Rn1kvjS+0j+GwFaAzgF8wbgB6wIjAhvCMQGhQWEA4EBov52/Cn5g/Za847wI+7966fp8+eM5V3k9+O85Nbk6uU15w7qKuyD7+XxQ/Vb+En89P/zAhYGzQktDNgOVxAGEgIS/hEAEQwQ7w6vDFgKrgfqBBQBq/3t+iT4h/Ua87Hwz+6g7UPsneto7Dvtru6T8JXzDvab+YD8VQCtAyIIHQtuD4gSvBXyF60ZThtJHEocNRyvGiUZRBbmE8kQjQ2/CbcFuQEq/nz63fZ18xTxTe887tvtfO5r79rw2PKh9e746fxhAYsFdAo3DwwU5hetG+seGCLHI/4loybuJsolEyT6IUEfFBx9GHMT8w6ECXIFqwA+/NT3j/Ql8QbvPO0M7Tvt5u7T8N3zDfcf+6n/xwQhCuEPOBWUGs4fdSSIKJQrJy6xL+YvkC+QLkEsqynTJXkhWBzwFj8RXAttBXT/vfn49Fzw9O0L62fqWOrO6+LtE/Eo9D74HP0nA9EJHBF3Fy4erSSsKmovxzOjNgc5tjlnOa83lDXmMdwtuChPIhccahUEDpQGVf9K+ePzHO8U63fotuZ95u7n0elT7UHxcfbZ+5QCFwlxEd8YOCAEJ2UtrDJdN0Q6wTxfPSI99DpeOKczti5PKBki/BpsE3ML7gPL+8n0su526XHlHuPP4VHih+QK6NjsHPIl91T9BAVeDZcVvx2yJXoseDLCNg06lzu6PL878zkYN48z3S6iKcwixRt6EyYLkAKy+szyF+3H5+Tjv+DB3+nfbuLV5d7qSfA9953+cAZNDrgWfB4/JtgsrTK5Njo55ToBO6M5GTdiM7ku0CjgIbsarRKDCo4BtPmJ8v3rDObB4brett2F3RHgs+Ph6IHuevW1/KcFCQ4tF88frCjzL8o1YDrRPLU93D0XPAU5KDTCLt4nbiB/FzAOuwNo+gnxH+ht4Gjai9Zg1GHUq9VX2NvcseK+6UHyFPvfBMsOVxnKI1EtFjWFO98/aUKWQudBSj97PK03tTHdKQEhmxZUCxj/lPOf55Ld+9SizlPJUcdnxvvH1Mrwzx7X6+Bj6672BgMrDzwaIibXMGI5Lz9jQ/VFcEZRRQBDmj8jO141yS15JHcZiAww/sjw1+Ou2CPPGce+wVq/yb4EwXHEusrC0qXdaej89CkC5g9rHEMpoDMBPExBjkS1RaNF/UPsQYc+DTpnM+0rKiKEFmQIDPm26ZfbP8/PxIy8wrc4tke2Crkbv7jGVNB62/jnv/W8AwUSVB+pK2Y1Az2JQKZCXELDQbA+zjtcN5Iy9SuVI5gYWQvM+5Lspd3BzwvDcrlQshGvea6lsD21rrz0xdfR4N447RP8gwq7GCQmzTAVOMI7mT1lPX88ljopNwgzoS0zJzQefRO0BWD27+Tl1EvFtLjZrnSouKSjpHWnKK1ttL6+c8oM2VboUPikB4wW1SJKLUMz0DaTN3o30TXVM54wgSzPJugfvBZiC8X8UOzH2rLJ2Lqzrqql2Z+SnfOeDKOYqdayvL28y3baYuqf+k4KoxhPJAMs8DAHM9kzUzI4MBstfClVJGweARZtDNz++O703R7Nx7zzrq+jKJ3zmTqaAZ2Po8KrpLYawyTSMOE98TABqBA1HVsmOiyNLocvNy+aLegq9CbzIVAb2hI0CGP6xeqo2UnJOLqirUqjxJ0em0+c4Z9lpYitbbkQx8XVM+VK9H8DJRJPHZ4lSiqLLK4sUyy8KZYmfCF9G54TAwoW/ljv1N4iz8rAtrQYqrei6J6vnnWhyKbqrTW4g8QU0mbgfe9t/qgLnxgrIsQoviukLAAswSkCJswhJxtmEw0Jdvzf7APerc6pwBi0garDoy+hzqDZo9apArGTuwnIs9Wi5Pvy5gEoD2kbBSQsKpIthi66LN0ppCVpIDwZxg+TBPf2puih2Z/LYr8Qtfetfqljp++oBq04tCC9pMg+1cnid/AN/zIM+RgbIsop2C1/LzQv7SzNKJAj9hs6E3kH//r87E/fD9Jjxru8frbpspmy87TeuX/B78o91jji+u7e/AYK0BUqIHcoPS5WMfAx9TDOLRco/iA0F2IMav8d8t/k/tmBz3XGDcAPvce8R79+w6HKttOr3iDrGPlgBkMTih4PKasv3DQ7N8A2RTQHMEMp2CBvFmkKqfxs7dzettLFx8m+27kFuK25+L2RxMPNc9kb5vf04QPPEpIgsSyqNs084T9mQC8+xjrUNC0taCKPFWgFVfTf4hXTCsXLuvSyMK+4rnWxV7iqwo3OCN0B7Uv+Fw/UH+4uijocQuVG7UfvRqZEmEDKOqoyyShpG3sKpfYO46PQ0cBJtN+r3Kj6qaqud7fnwlXRyOEu9PoG4BrcLMw7xkUwTNtOw0+2TiBMf0d+Qck5xS81IjwRnvw46ELU78Nst+6veaxZrtOzu73uyq/adOyC/yMTuiUvNkdD7UsCUTNT71IzUcBN1EiLQjo6qC9JIjERZf/s7NXcoc/nxvTB/cDtw9/KnNSY4ULvz/7PDSIdWCq6Nm5AO0e9SVdKHUjsRJg/hzhlL+gkjxjxCnb+EvTA6svjfd9Y3irfC+NP6WnxlPpHBIIOoxeFH/Yl4CqVLUMuDS3AKcgkKR7QFaMN6gTa/HT1J/B07Jjruey18Ij0b/qAAdIJQRJnGysjMyk5LWUv7S4iLQMoUiHfGLIPOgW4+i3w6eai3uDZ6dfg13XaqeAu6c3yT/7kClEXoSPTLqs3ST5+QiZEDUKZPQs2LSx9HygSdwKC89/kXdgizkHH9MMaxS3JVtDk2p3nrfWUBUAVsSQFMto95UWjSqpKCklpRPA9hjWoKZgbrwvj+n7rU9wW0HnG/cFcwRnEaMp/1A3hYO5w/ecMHxwIKaE0dTyFQdBCrEFsPkU4jS+oJWgZWQwg/vbx4uZO3jrYjdVt1bfY1d1g5lnv3fk5BKkOexitIPslminMKgcq+SWsILEZixHWCNoAa/nR8u3sH+oI6ojrae7J8uP40/9NB1QOlxSeGcocjB6RHuIbvRdsEQ8L0wMN/eH1TPDa6jvoDuea6LnrTPDj9kj+mwWoDRgV4BomHwIifiKNIfsdGBnvEd0KaALr+kvzeOvg5WXjIuP75FDozu2M9Gr8BwWzDaoVphuDICYjeSOjIQkePhiREQ8JpQAv+ATxHOoj5S7i1OGX443nGeyy8rD6RwM9CzcTHhnhHfofYSCXHlUbchUjDxMIpQBW+fnyDO0v6TXnQufE6PDr/vC99kD9PwT8CngQ4xOVFlMXRhawEzgPSAoqBOD9HPhf8yPvF+yc6hHrZewP8Pn0GPv2ANoHNA3wEm8VjhdjFxcWyxL8DTgIGwK1++z1OvBJ7ALpj+fc5oDoO+xb8RH3vP3RA+kJNw7/EZQUQhViFFgS4Q7PCoAF6QBX+2X2bvLG72vusu3S7v7w0fME90n79v5kA50GTAnGCjEM1QuiCsYI5waeA/cA1v3s+y35GfiU9wr4nPj4+f36Af2P/o8A8AH7AqUDBQT7A6sDiAKYAWEAWv9Q/r/9Wf0f/Vn9zf38/TL+Z/+c/z8AZgBpAJ3/m//S/0L/lP6X/s39Kv6//WX++P5nAOEAIgK/Ar8DrgPHA0QDmAK/AWoA9/5f/Xj7Ovpx+IH3yvZA9//3Lfmi+n38af5FAeMDOQY5CB0JMgp9CoUKPQl2B3MFFQNJALv9qvu5+fb3L/eS9ob3D/hs+WH6lfzq/X0AyQFwA44EugVyBsQGZwZbBmcFGQVjA5UCWQHnAKwAdQAGAEIAGQC5APEArQFDAncCNQL+AYMBRQGsAL3/F/5D/a38FPwV/J38TP24/f7+iAB3AjgDLgTyBA4GkQYnB9sGYQYKBfUDrwGNADr+Gf1d+4v6uPlf+Qz59vl5+tj7Df1+/hsA6wEZA4oE7wS4BXoFQAUlBP4CvQEeAPL9Ivzw+b74gPdV9jX2rPVS9gb3yvic+qD8/f6oAGMCTQQSBbIFdAVsBV4EYAMBAXz/Hf04+3P4Y/cr9aDzvPIy88fzSfQ69YT3cfny+wv+AQGWAp8EBgaaBrsGngbEBdUDOgLW/3j9xPpT+LD2pvQB87HxN/Fd8RXya/NI9UX3Nvk6/HP+YAFTA0UF8gWjBkUGTgZvBWYERwInAK79RPu2+Nf2fvT88pbxFPEC8RXydfJI9Kb13feA+Sn7Hf3F/gYAxgAmAcABMwHfAOn/Lv9V/hH9ePzH+9b6MPpf+Z34WPjg99b3APf99hr3X/eG92n3VPe29zP3svdl9/X3A/gM+X75v/oY+2T88PwI/uf+jP+1/5L/Y/9Z/23+7f1e/DL7/PiQ9xn2S/WA9HLzivKU8hbz9/Nj9VD2Kfih+RL8yf1B/3gAcwFuARYB0gC1AJj/pP5I/bf7+vmw+LX2mPVt9MH0f/QI9VT1WPZ/9yP5BPqC+7P8+P2r/nj/HQC2AGQABgAG/5r+Vf3Q/L/7+/om+nL5Ivne+Gj4DfgL+IL4Afl1+Qf6x/qW+wz8lPzu/I79R/7//or+8f4p/sz9Q/2j/BD8B/x5+/H6Mvps+qf5k/ka+cj5pPn/+Rz6DPtt+1r88PyZ/b79Sv7Q/iX/h/6v/gz+A/5f/dP8ZvwZ/In7+Pqj+p/6jvqK+r36y/p3+4v7L/y3/PH81P1j/s3+DP8g/6L/VP+n/wr/sv9X/xn/SP5P/uv9Nf6t/fH9rP2v/QP+Ff4d/oz+Rf6l/lX+pf6k/qn+Av92/3P/yP/Y/wUACADT/5EAsADZAB4BBgFXAYwBsQHXAS8BAQGYAEgA2v+8/2n/zf9I/4H/w/48/zv/9f8gAHoAGAG7AcIBdQLZAscCmwIBA3sC2QK3AvgCZwJAAqQBfwH8ALUAUAAGABQAfAAiAJMAlgCNAMEAJwFRAa4BcQKxAuwClQKUAosCmAJ8ApcCEAIRAscBrwGSAYcBRQEuAaQA6ABcAOwAxQBYAeUAcQEYAVUBZgELArwBLAJmAugC5wIMA/ICIAO3At0CVQJcAhYC8wHKAacBhQFwAYMBegGOARQBZwGcATwCWgKtAn8C6wIBAyUDKwP9AvsC/AKiArwCNQJtAtEB0QERASMBqgC1AKsAvQCoAMwAuQCuAKEA/gDLAFwBDQFuAVQB/wGPAYUBgwFxARoBKwEXAfwA2wDPAHsAsgBcAP//+v+z/4T/S/9L//r+8P5D/7z/yf+IAPr/dABVAFIAXACcALYA5gDkABIBpgCoAOr/0v9f/2//0f7w/j3+ev4a/hD+7v02/kz+';
-    chat_notify_audio = new Audio("data:audio/wav;base64," + base64string);
-
-}
-
-// Issue a pop-up notification using the web standard Notification API
-// https://developer.mozilla.org/docs/Web/API/notification
-var chat_issue_notification = function (theBody,theTitle) {
-    if ( !chat_notify_granted || !chat_notify_enabled) {
-        return;
-    }
-    var nIcon = "/images/icons/48/group.png";
-    var options = {
-        body: theBody,
-        icon: nIcon,
-        silent: false
-    }
-    var n = new Notification(theTitle,options);
-    n.onclick = function (event) {
-        setTimeout(n.close.bind(n), 300); 
-    } 
-    if(chat_notify_audio_enabled) {
-      chat_notify_audio.play();
-    }
-}
-
-
-function toggleChatNotificationAudio() {
-	if(!chat_notify_audio_enabled) {
-		chat_notify_audio_enabled = true;
-        $('#toggle-notifications-audio-icon').removeClass('fa-volume-off');
-        $('#toggle-notifications-audio-icon').addClass('fa-volume-up');
-	}
-	else {
-		chat_notify_audio_enabled = false;
-        $('#toggle-notifications-audio-icon').removeClass('fa-volume-up');
-        $('#toggle-notifications-audio-icon').addClass('fa-volume-off');
-	}
-}
-
-function toggleChatNotifications() {
-	if(!chat_notify_enabled) {
-		chat_notify_enabled = true;
-        $('#toggle-notifications-icon').addClass('fa-bell');
-        $('#toggle-notifications-icon').removeClass('fa-bell-slash-o');
-        $('#toggle-notifications-audio').removeClass('disabled');
-	}
-	else {
-		chat_notify_enabled = false;
-        $('#toggle-notifications-icon').addClass('fa-bell-slash-o');
-        $('#toggle-notifications-icon').removeClass('fa-bell');
-        $('#toggle-notifications-audio').addClass('disabled');
-	}
-}
-
-function chatJotGetLink() {
-	reply = prompt("{{$linkurl}}");
-	if(reply && reply.length) {
-		$('#chat-rotator').spin('tiny');
-		$.get('linkinfo?f=&url=' + reply, function(data) {
-			addmailtext(data);
-			$('#chat-rotator').spin(false);
-		});
-	}
-}
-
-function addmailtext(data) {
-	var currentText = $("#chatText").val();
-	$("#chatText").val(currentText + data);
-}
-
-function adjustFullscreenTopBarHeight() {
-	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 16);
-	$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
-}
-
-function adjustInlineTopBarHeight() {
-	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23);
-	$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
-}
-
-function isMobile() {
-	if( navigator.userAgent.match(/Android/i)
-		 || navigator.userAgent.match(/webOS/i)
-		 || navigator.userAgent.match(/iPhone/i)
-		 || navigator.userAgent.match(/iPad/i)
-		 || navigator.userAgent.match(/iPod/i)
-		 || navigator.userAgent.match(/BlackBerry/i)
-		 || navigator.userAgent.match(/Windows Phone/i)
-	 ){
-		return true;
-	}
-	else {
-		 return false;
-	}
-}
-
-$(function(){
-	$('#chatText').keypress(function(e){
-		if (e.keyCode == 13 && e.shiftKey||isMobile()) {
-			//do nothing
-		}
-		else if (e.keyCode == 13) {
-			e.preventDefault();
-			$('#chat-form').trigger('submit');
-		}
-	});
-});
-</script>
diff --git a/view/tpl/chatroom_members.tpl b/view/tpl/chatroom_members.tpl
deleted file mode 100644
index ea5fbede8..000000000
--- a/view/tpl/chatroom_members.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="chatroom_members" class="widget">
-	<h3>{{$header}}</h3>
-	<div id="chatMembers"></div>
-</div>
-
diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl
deleted file mode 100644
index 1497939f6..000000000
--- a/view/tpl/chatroom_new.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="chatroom-new" class="section-content-tools-wrapper">
-	<form id="chatroom-new-form" action="chat" method="post" class="acl-form" data-form_id="chatroom-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-		{{include file="field_input.tpl" field=$name}}
-		{{include file="field_input.tpl" field=$chat_expire}}
-		<div class="btn-group pull-right">
-			<button id="dbtn-acl" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button>
-			<button id="dbtn-submit" class="acl-submit btn btn-primary" type="submit" name="submit" value="{{$submit}}" data-formid="chatroom-new-form">{{$submit}}</button>
-		</div>
-		<div class="clear"></div>
-	</form>
-</div>
-{{$acl}}
diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl
deleted file mode 100644
index a81b8ec1e..000000000
--- a/view/tpl/chatroomlist.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="chatroom_list" class="widget">
-	<h3>{{$header}}</h3>
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}">{{$overview}}</a></li>
-		{{foreach $items as $item}}
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$item.cr_id}}"><span class="badge pull-right">{{$item.cr_inroom}}</span>{{$item.cr_name}}</a></li>
-		{{/foreach}}
-	</ul>
-</div>
-
diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl
deleted file mode 100644
index 71a2acada..000000000
--- a/view/tpl/chatrooms.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $is_owner}}
-		<button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$newroom}}</button>
-		{{/if}}
-		<h2>{{$header}}</h2>
-	</div>
-	{{if $is_owner}}
-	{{$chatroom_new}}
-	{{/if}}
-	{{if $rooms}}
-	<div class="section-content-wrapper-np">
-		<table id="chatrooms-index">
-			<tr>
-				<th width="97%">{{$name}}</th>
-				<th width="1%">{{$expire}}</th>
-				<th width="1%" class="chatrooms-index-tool"></th>
-				<th width="1%"></th>
-			</tr>
-			{{foreach $rooms as $room}}
-			<tr class="chatroom-index-row">
-				<td><a href="{{$baseurl}}/chat/{{$nickname}}/{{$room.cr_id}}">{{$room.cr_name}}</a></td>
-				<td>{{$room.cr_expire}}&nbsp;min</td>
-				<td class="chatrooms-index-tool{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} dropdown float-right{{/if}}">
-					{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}}
-					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('chatroom',{{$room.cr_id}});"></i>
-					<ul id="panel-{{$room.cr_id}}" class="lockview-panel dropdown-menu"></ul>
-					{{/if}}
-				</td>
-				<td><span class="badge badge-default">{{$room.cr_inroom}}</span></td>
-			</tr>
-			{{/foreach}}
-		</table>
-
-	</div>
-	{{else}}
-	<div class="section-content-wrapper">
-		{{$norooms}}
-	</div>
-	{{/if}}
-</div>
diff --git a/view/tpl/cloud.tpl b/view/tpl/cloud.tpl
deleted file mode 100644
index d1567af9f..000000000
--- a/view/tpl/cloud.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="generic-content-wrapper">
-{{include file="cloud_header.tpl"}}
-{{include file="cloud_directory.tpl"}}
-</div>
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
deleted file mode 100644
index 0ebecce29..000000000
--- a/view/tpl/cloud_actionspanel.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<div id="files-mkdir-tools" class="section-content-tools-wrapper">
-	<label for="files-mkdir">{{$folder_header}}</label>
-	<form id="mkdir-form" method="post" action="file_upload" class="acl-form" data-form_id="mkdir-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-		<input type="hidden" name="folder" value="{{$folder}}" />
-		<input type="hidden" name="channick" value="{{$channick}}" />
-		<input type="hidden" name="return_url" value="{{$return_url}}" />
-		<input id="files-mkdir" type="text" name="filename" class="form-control form-group">
-		<div class="pull-right btn-group">
-			<div class="btn-group">
-				{{if $lockstate}}
-				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
-					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
-				</button>
-				{{/if}}
-				<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
-			</div>
-		</div>
-	</form>
-	<div class="clear"></div>
-</div>
-<div id="files-upload-tools" class="section-content-tools-wrapper">
-	{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}{{$info}}</div>{{/if}}
-	<form id="ajax-upload-files" method="post" action="file_upload" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-		<input type="hidden" name="directory" value="{{$path}}" />
-		<input type="hidden" name="channick" value="{{$channick}}" />
-		<input type="hidden" name="return_url" value="{{$return_url}}" />
-		<label for="files-upload">{{$upload_header}}</label>
-		<input class="form-group pull-left" id="files-upload" type="file" name="userfile">
-		<div class="pull-right btn-group">
-			<div class="btn-group">
-				{{if $lockstate}}
-				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
-					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
-				</button>
-				{{/if}}
-				<button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
-			</div>
-		</div>
-	</form>
-	<div class="clear"></div>
-</div>
-{{$aclselect}}
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
deleted file mode 100644
index adc8584c3..000000000
--- a/view/tpl/cloud_directory.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<div id="cloud-drag-area" class="section-content-wrapper-np">
-	<table id="cloud-index">
-		<tr>
-			<th width="1%"></th>
-			<th width="92%">{{$name}}</th>
-			<th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th>
-			<th width="1%">{{*{{$type}}*}}</th>
-			<th width="1%" class="d-none d-md-table-cell">{{$size}}</th>
-			<th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th>
-		</tr>
-	{{if $parentpath}}
-		<tr>
-			<td><i class="fa fa-level-up"></i>{{*{{$parentpath.icon}}*}}</td>
-			<td><a href="{{$parentpath.path}}" title="{{$parent}}">..</a></td>
-			<td></td><td></td><td></td><td></td>
-			<td>{{*[{{$parent}}]*}}</td>
-			<td class="d-none d-md-table-cell"></td>
-			<td class="d-none d-md-table-cell"></td>
-		</tr>
-	{{/if}}
-		<tr id="new-upload-progress-bar--1"></tr> {{* this is needed to append the upload files in the right order *}}
-	{{foreach $entries as $item}}
-		<tr id="cloud-index-{{$item.attachId}}">
-			<td><i class="fa {{$item.iconFromType}}" title="{{$item.type}}"></i></td>
-			<td><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td>
-	{{if $item.is_owner}}
-			<td class="cloud-index-tool">{{$item.attachIcon}}</td>
-			<td id="file-edit-{{$item.attachId}}" class="cloud-index-tool"></td>
-			<td class="cloud-index-tool"><i class="fakelink fa fa-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td>
-			<td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
-
-	{{else}}
-			<td></td><td></td><td></td><td></td>
-	{{/if}}
-			<td>{{*{{$item.type}}*}}</td>
-			<td class="d-none d-md-table-cell">{{$item.sizeFormatted}}</td>
-			<td class="d-none d-md-table-cell">{{$item.lastmodified}}</td>
-		</tr>
-		<tr id="cloud-tools-{{$item.attachId}}">
-			<td id="perms-panel-{{$item.attachId}}" colspan="9"></td>
-		</tr>
-
-	{{/foreach}}
-	</table>
-</div>
diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
deleted file mode 100644
index c1e589341..000000000
--- a/view/tpl/cloud_header.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="section-title-wrapper">
-	{{if $actionspanel}}
-	<div class="pull-right">
-		{{if $is_owner}}
-		<a href="/sharedwithme" class="btn btn-sm btn-outline-secondary"><i class="fa fa-cloud-download"></i>&nbsp;{{$shared}}</a>
-		{{/if}}
-		<button id="files-create-btn" class="btn btn-sm btn-primary" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="fa fa-folder-o"></i>&nbsp;{{$create}}</button>
-		<button id="files-upload-btn" class="btn btn-sm btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload}}</button>
-	</div>
-	{{/if}}
-	<h2>{{$header}}</h2>
-	<div class="clear"></div>
-</div>
-{{if $actionspanel}}
-	{{$actionspanel}}
-{{/if}}
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
deleted file mode 100755
index f490483b8..000000000
--- a/view/tpl/comment_item.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-		{{if $threaded}}
-		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
-		{{else}}
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
-		{{/if}}
-			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
-				<input type="hidden" name="type" value="{{$type}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$comment}}</textarea>
-				{{if $qcomment}}
-					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-					<option value=""></option>
-				{{foreach $qcomment as $qc}}
-					<option value="{{$qc}}">{{$qc}}</option>				
-				{{/foreach}}
-					</select>
-				{{/if}}
-				<div id="comment-tools-{{$id}}" class="pt-2 comment-tools">
-					<div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left">
-						<div class="btn-group mr-2">
-							<button class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;">
-								<i class="fa fa-bold comment-icon"></i>
-							</button>
-							<button class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;">
-								<i class="fa fa-italic comment-icon"></i>
-							</button>
-							<button class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;">
-								<i class="fa fa-underline comment-icon"></i>
-							</button>
-							<button class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;">
-								<i class="fa fa-quote-left comment-icon"></i>
-							</button>
-							<button class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;">
-								<i class="fa fa-terminal comment-icon"></i>
-							</button>
-						</div>
-						<div class="btn-group mr-2">
-							<button class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;">
-								<i class="fa fa-link comment-icon"></i>
-							</button>
-						</div>
-						{{if $feature_encrypt}}
-						<div class="btn-group mr-2">
-							<button class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;">
-								<i class="fa fa-key comment-icon"></i>
-							</button>
-						</div>
-						{{/if}}
-						{{$comment_buttons}}
-					</div>
-					<div class="btn-group float-right" id="comment-edit-submit-wrapper-{{$id}}">
-						{{if $preview}}
-						<button id="comment-edit-presubmit-{{$id}}" class="btn btn-outline-secondary btn-sm" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}">
-							<i class="fa fa-eye comment-icon" ></i>
-						</button>
-						{{/if}}
-						<button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-sm" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button>
-					</div>
-				</div>
-				<div class="clear"></div>
-			</form>
-		</div>
-		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview"></div>
diff --git a/view/tpl/common_friends.tpl b/view/tpl/common_friends.tpl
deleted file mode 100755
index 489717e78..000000000
--- a/view/tpl/common_friends.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="{{$url}}">
-			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
-	</div>
-	{{if $note}}
-	<div class="profile-match-note">{{$note}}</div>
-	{{/if}}	
-	<div class="profile-match-end"></div>
-</div>
diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl
deleted file mode 100755
index 29c46369b..000000000
--- a/view/tpl/common_tabs.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="mb-4 d-none d-md-block">
-	<ul class="nav nav-tabs nav-fill">
-		{{foreach $tabs as $tab}}
-		<li class="nav-item"{{if $tab.id}} id="{{$tab.id}}"{{/if}}><a class="nav-link{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
-		{{/foreach}}
-	</ul>
-</div>
-<div class="d-md-none dropdown clearfix" style="position:fixed; right:7px; top:4.5rem; z-index:1020">
-	<button type="button" class="btn btn-outline-secondary btn-sm float-right" data-toggle="dropdown">
-		<i class="fa fa-bars"></i>
-	</button>
-	<div class="dropdown-menu dropdown-menu-right">
-		{{foreach $tabs as $tab}}
-		<a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a>
-		{{/foreach}}
-	</div>
-</div>
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
deleted file mode 100755
index 16915abda..000000000
--- a/view/tpl/connection_template.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-<div id="contact-entry-wrapper-{{$contact.id}}">
-	<div class="section-subtitle-wrapper clearfix">
-		<div class="pull-right">
-			{{if $contact.approve && $contact.ignore}}
-			<form action="connedit/{{$contact.id}}" method="post" >
-			<button type="submit" class="btn btn-success btn-sm" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="fa fa-check"></i> {{$contact.approve}}</button>
-
-			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-sm" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a>
-
-			{{/if}}
-			<a href="#" class="btn btn-danger btn-sm" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
-			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i></a>
-			{{if $contact.approve}}
-			</form>
-			{{/if}}
-		</div>
-		<h3>{{if $contact.public_forum}}<i class="fa fa-comments-o"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a>{{if $contact.phone}}&nbsp;<a class="btn btn-outline-secondary btn-sm" href="tel:{{$contact.phone}}" title="{{$contact.call}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</h3>
-	</div>
-	<div class="section-content-tools-wrapper">
-		<div class="contact-photo-wrapper" >
-			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
-		</div>
-		<div class="contact-info">
-			{{if $contact.status}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.status_label}}:</span> {{$contact.status}}
-			</div>
-			{{/if}}
-			{{if $contact.connected}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.connected_label}}:</span> <span class="autotime" title="{{$contact.connected}}"></span>
-			</div>
-			{{/if}}
-			{{if $contact.webbie}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.webbie_label}}:</span> {{$contact.webbie}}
-			</div>
-			{{/if}}
-			{{if $contact.network}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}">{{$contact.recent_label}}</a>
-			</div>
-			{{/if}}
-		</div>
-
-	</div>
-</div>
-
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
deleted file mode 100755
index 13261965a..000000000
--- a/view/tpl/connections.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper clearfix">
-		<div class="dropdown pull-right">
-			<button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus()">
-				<i class="fa fa-search"></i>&nbsp;{{$label}}
-			</button>
-			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
-				<i class="fa fa-sort"></i>
-			</button>
-			<div class="dropdown-menu dropdown-menu-right">
-				{{foreach $tabs as $menu}}
-				<a class="dropdown-item" href="{{$menu.url}}">{{$menu.label}}</a>
-				{{/foreach}}
-			</div>
-		</div>
-		{{if $finding}}<h2>{{$finding}}</h2>{{else}}<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>{{/if}}
-	</div>
-	<div id="contacts-search-form" class="section-content-tools-wrapper">
-		<form action="{{$cmd}}" method="get" >
-			<div class="input-group form-group">
-				<input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
-				<div class="input-group-btn">
-					<button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-fw fa-search"></i></button>
-				</div>
-			</div>
-		</form>
-	</div>
-	<div id="connections-wrapper clearfix">
-		{{foreach $contacts as $contact}}
-			{{include file="connection_template.tpl"}}
-		{{/foreach}}
-		<div id="page-end"></div>
-	</div>
-</div>
-<script>$(document).ready(function() { loadingPage = false;});</script>
-<div id="page-spinner"></div>
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
deleted file mode 100755
index 580a8a41c..000000000
--- a/view/tpl/contact_block.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div id="contact-block" class="widget">
-	<h3>{{$contacts}}</h3>
-	{{if $micropro}}
-	{{if $viewconnections}}
-	<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
-	{{/if}}
-	<div class='contact-block-content'>
-	{{foreach $micropro as $m}}
-		{{$m}}
-	{{/foreach}}
-	</div>
-	{{/if}}
-</div>
-<div class="clear"></div>
diff --git a/view/tpl/contact_head.tpl b/view/tpl/contact_head.tpl
deleted file mode 100755
index 72e7edbfb..000000000
--- a/view/tpl/contact_head.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<script language="javascript" type="text/javascript"
-          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-          <script language="javascript" type="text/javascript">
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "{{$editselect}}",
-	elements: "contact-edit-info",
-	plugins : "bbcode",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_styles : "blockquote,code",
-	gecko_spellcheck : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	force_p_newlines : false,
-	force_br_newlines : true,
-	forced_root_block : '',
-	content_css: "{{$baseurl}}/view/custom_tinymce.css"
-
-
-});
-
-
-</script>
-
diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl
deleted file mode 100755
index 550abc147..000000000
--- a/view/tpl/contact_slider.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="contact-slider" class="slider form-group"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div>
-<script>
-$(document).ready(function() {
-	// The slider does not render correct if width is given in % and
-	// the slider container is hidden (display: none) during rendering.
-	// So let's unhide it to render and hide again afterwards.
-	if(!$("#affinity-tool-collapse").hasClass("in")) {
-		$("#affinity-tool-collapse").addClass("in");
-		makeContactSlider();
-		$("#affinity-tool-collapse").removeClass("in");
-	}
-	else {
-		makeContactSlider();
-	}
-});
-
-function makeContactSlider() {
-	$("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: [{{$labels}}], width:'98%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); }  });
-}
-</script>
diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl
deleted file mode 100755
index 3d1bfa4a4..000000000
--- a/view/tpl/contact_template.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
-	<div class="contact-entry-photo-wrapper" >
-		<a href="{{$contact.link}}" title="{{$contact.img_hover}}" ><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-	<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/tpl/contactsajax.tpl b/view/tpl/contactsajax.tpl
deleted file mode 100644
index a6b5ad791..000000000
--- a/view/tpl/contactsajax.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{{foreach $contacts as $contact}}
-{{include file="connection_template.tpl"}}
-{{/foreach}}
diff --git a/view/tpl/conv.tpl b/view/tpl/conv.tpl
deleted file mode 100755
index ddb959b84..000000000
--- a/view/tpl/conv.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{foreach $threads as $thread}}
-<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper">
-	{{foreach $thread.items as $item}}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
-			</div>
-			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
-		{{/if}}
-		{{if $item.comment_lastcollapsed}}</div>{{/if}}
-		
-		{{include file="{{$item.template}}"}}
-		
-		
-	{{/foreach}}
-</div>
-{{/foreach}}
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
deleted file mode 100755
index aa7b55e9b..000000000
--- a/view/tpl/conv_frame.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="threads-begin"></div>
-<div id="threads-end"></div>
-<div id="conversation-end"></div>
-<div id="page-spinner"></div>
-
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
deleted file mode 100755
index 2d51af4ff..000000000
--- a/view/tpl/conv_item.tpl
+++ /dev/null
@@ -1,250 +0,0 @@
-{{if $item.comment_firstcollapsed}}
-<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
-	<span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span>&nbsp;<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
-</div>
-<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}">
-		<a name="item_{{$item.id}}" ></a>
-		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
-			<div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
-				{{if $item.photo}}
-				<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
-					{{$item.photo}}
-				</div>
-				{{/if}}
-				{{if $item.event}}
-				<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
-					{{$item.event}}
-				</div>
-				{{/if}}
-				{{if $item.title && !$item.event}}
-				<div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}">
-					{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}
-				</div>
-				{{if ! $item.is_new}}
-				<hr class="m-0">
-				{{/if}}
-				{{/if}}
-				<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
-					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
-						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
-							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
-						</div>
-					</div>
-					{{if $item.lock}}
-					<div class="wall-item-lock dropdown">
-						<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
-						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
-					</div>
-					{{/if}}
-					<div class="wall-item-author">
-						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
-					</div>
-					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-						{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
-					</div>
-				</div>
-
-				{{if $item.body}}
-				<div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}">
-					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
-						{{$item.body}}
-					</div>
-				</div>
-				{{/if}}
-				{{if $item.has_tags}}
-				<div class="p-2 wall-item-tools clearfix">
-
-					<div class="body-tags">
-						<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
-					</div>
-				{{**
-					{{if $item.mentions}}
-					<div class="body-tags" id="item-mentions">
-						<span class="tag">{{$item.mentions}}</span>
-					</div>
-					{{/if}}
-					{{if $item.tags}}
-					<div class="body-tags" id="item-tags">
-						<span class="tag">{{$item.tags}}</span>
-					</div>
-					{{/if}}
-					{{if $item.categories}}
-					<div class="body-tags" id="item-categories">
-						<span class="tag p-category">{{$item.categories}}</span>
-					</div>
-					{{/if}}
-					{{if $item.folders}}
-					<div class="body-tags" id="item-folders">
-						<span class="tag">{{$item.folders}}</span>
-					</div>
-					{{/if}}
-				**}}
-				</div>
-				{{/if}}
-				<div class="p-2 clearfix wall-item-tools">
-					<div class="wall-item-tools-right pull-right">
-						{{if $item.toplevel && $item.emojis && $item.reactions}}
-						<div class="btn-group dropdown">
-							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
-								<i class="fa fa-smile-o"></i>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right">
-							{{foreach $item.reactions as $react}}
-								<a class="dropdown-item clearfix" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="menu-img-2" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a>
-							{{/foreach}}
-							</div>
-						</div>
-						{{/if}}
-						<div class="btn-group dropdown">
-							{{if $item.like}}
-							<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
-								<i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i>
-							</button>
-							{{/if}}
-							{{if $item.dislike}}
-							<button type="button" title="{{$item.dislike.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;">
-								<i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i>
-							</button>
-							{{/if}}
-							{{if $item.isevent}}
-							<div class="btn-group dropdown">
-								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
-									<i class="fa fa-calendar-check-o"></i>
-								</button>
-								<div class="dropdown-menu">
-									<a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
-										<i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}}
-									</a>
-									<a class="dropdown-item" href="#" title="{{$item.attend.1}}" onclick="itemAddToCal({{$item.id}}), dolike({{$item.id}},'attendno'); return false;">
-										<i class="item-act-list fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> {{$item.attend.1}}
-									</a>
-									<a class="dropdown-item" href="#" title="{{$item.attend.2}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;">
-										<i class="item-act-list fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> {{$item.attend.2}}
-									</a>
-								</div>
-							</div>
-							{{/if}}
-							{{if $item.canvote}}
-							<div class="btn-group dropdown">
-								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}">
-									<i class="fa fa-check-square-o"></i>
-								</button>
-								<div class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}">
-									<a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;">
-										<i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}}
-									</a>
-									<a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;">
-										 <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}}
-									</a> 
-									<a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;">
-										<i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}}
-									</a>
-								</div>
-							</div>
-							{{/if}}
-							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
-								<i class="fa fa-cog"></i>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
-								{{if $item.share}}
-								<a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a>
-								{{/if}}
-								{{if $item.plink}}
-								<a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a>
-								{{/if}}
-								{{if $item.edpost}}
-								<a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a>
-								{{/if}}
-								{{if $item.tagger}}
-								<a class="dropdown-item" href="#"  onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a>
-								{{/if}}
-								{{if $item.filer}}
-								<a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a>
-								{{/if}}
-								{{if $item.bookmark}}
-								<a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a>
-								{{/if}}
-								{{if $item.addtocal}}
-								<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
-								{{/if}}
-								{{if $item.star}}
-								<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
-								{{/if}}
-								{{if $item.thread_action_menu}}
-								{{foreach $item.thread_action_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a>
-								{{/foreach}}
-								{{/if}}
-								{{if $item.drop.dropping}}
-								<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
-								{{/if}}
-								{{if $item.thread_author_menu}}
-								<div class="dropdown-divider"></div>
-								{{foreach $item.thread_author_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
-								{{/foreach}}
-								{{/if}}
-								{{if $item.edpost && $item.dreport}}
-								<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
-								{{/if}}
-							</div>
-						</div>
-					</div>
-					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
-
-					{{if $item.responses || $item.attachments}}
-					<div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count &&  $item.attachments)}} btn-group{{/if}}">
-						{{if $item.attachments}}
-						<div class="btn-group">
-							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
-							<div class="dropdown-menu">{{$item.attachments}}</div>
-						</div>
-						{{/if}}
-						{{foreach $item.responses as $verb=>$response}}
-						{{if $response.count}}
-						<div class="btn-group">
-							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
-							{{if $response.modal}}
-							<div class="modal" id="{{$verb}}Modal-{{$item.id}}">
-								<div class="modal-dialog">
-									<div class="modal-content">
-										<div class="modal-header">
-											<h4 class="modal-title">{{$response.count}} {{$response.button}}</h4>
-											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-										</div>
-										<div class="modal-body response-list">
-											<ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul>
-										</div>
-										<div class="modal-footer clear">
-											<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$item.modal_dismiss}}</button>
-										</div>
-									</div><!-- /.modal-content -->
-								</div><!-- /.modal-dialog -->
-							</div><!-- /.modal -->
-							{{else}}
-							<div class="dropdown-menu">{{foreach $response.list as $liker}}{{$liker}}{{/foreach}}</div>
-							{{/if}}
-						</div>
-						{{/if}}
-						{{/foreach}}
-					</div>
-					{{/if}}
-				</div>
-			</div>
-		</div>
-		{{if $item.toplevel}}
-		{{foreach $item.children as $child}}
-			{{include file="{{$child.template}}" item=$child}}
-		{{/foreach}}
-		{{/if}}
-		{{if $item.comment}}
-		<div class="p-2 wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" >
-			{{$item.comment}}
-		</div>
-		{{/if}}
-	</div>
-{{if $item.comment_lastcollapsed}}
-</div>
-{{/if}}
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
deleted file mode 100755
index 59153e41f..000000000
--- a/view/tpl/conv_list.tpl
+++ /dev/null
@@ -1,251 +0,0 @@
-{{if $item.comment_firstcollapsed}}
-<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
-	<span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span>&nbsp;<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
-</div>
-<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}">
-		<a name="item_{{$item.id}}" ></a>
-		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
-			<div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
-				{{if $item.photo}}
-				<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
-					{{$item.photo}}
-				</div>
-				{{/if}}
-				{{if $item.event}}
-				<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
-					{{$item.event}}
-				</div>
-				{{/if}}
-				{{if $item.title && !$item.event}}
-				<div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}">
-					{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}
-				</div>
-				{{if ! $item.is_new}}
-				<hr class="m-0">
-				{{/if}}
-				{{/if}}
-				<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
-					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
-						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
-							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
-						</div>
-					</div>
-					{{if $item.lock}}
-					<div class="wall-item-lock dropdown">
-						<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
-						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
-					</div>
-					{{/if}}
-					<div class="wall-item-author">
-						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
-					</div>
-					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-						{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
-					</div>
-				</div>
-
-				{{if $item.body}}
-				<div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}">
-					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
-						{{$item.body}}
-					</div>
-				</div>
-				{{/if}}
-				{{if $item.has_tags}}
-				<div class="p-2 wall-item-tools clearfix">
-
-					<div class="body-tags">
-						<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
-					</div>
-				{{**
-					{{if $item.mentions}}
-					<div class="body-tags" id="item-mentions">
-						<span class="tag">{{$item.mentions}}</span>
-					</div>
-					{{/if}}
-					{{if $item.tags}}
-					<div class="body-tags" id="item-tags">
-						<span class="tag">{{$item.tags}}</span>
-					</div>
-					{{/if}}
-					{{if $item.categories}}
-					<div class="body-tags" id="item-categories">
-						<span class="tag p-category">{{$item.categories}}</span>
-					</div>
-					{{/if}}
-					{{if $item.folders}}
-					<div class="body-tags" id="item-folders">
-						<span class="tag">{{$item.folders}}</span>
-					</div>
-					{{/if}}
-				**}}
-				</div>
-				{{/if}}
-				<div class="p-2 clearfix wall-item-tools">
-					<div class="wall-item-tools-right pull-right">
-						{{if $item.toplevel && $item.emojis && $item.reactions}}
-						<div class="btn-group dropdown">
-							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
-								<i class="fa fa-smile-o"></i>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right">
-							{{foreach $item.reactions as $react}}
-								<a class="dropdown-item clearfix" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="menu-img-2" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a>
-							{{/foreach}}
-							</div>
-						</div>
-						{{/if}}
-						<div class="btn-group dropdown">
-							{{if $item.like}}
-							<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
-								<i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i>
-							</button>
-							{{/if}}
-							{{if $item.dislike}}
-							<button type="button" title="{{$item.dislike.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;">
-								<i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i>
-							</button>
-							{{/if}}
-							{{if $item.isevent}}
-							<div class="btn-group dropdown">
-								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
-									<i class="fa fa-calendar-check-o"></i>
-								</button>
-								<div class="dropdown-menu">
-									<a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
-										<i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}}
-									</a>
-									<a class="dropdown-item" href="#" title="{{$item.attend.1}}" onclick="itemAddToCal({{$item.id}}), dolike({{$item.id}},'attendno'); return false;">
-										<i class="item-act-list fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> {{$item.attend.1}}
-									</a>
-									<a class="dropdown-item" href="#" title="{{$item.attend.2}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;">
-										<i class="item-act-list fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> {{$item.attend.2}}
-									</a>
-								</div>
-							</div>
-							{{/if}}
-							{{if $item.canvote}}
-							<div class="btn-group dropdown">
-								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}">
-									<i class="fa fa-check-square-o"></i>
-								</button>
-								<div class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}">
-									<a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;">
-										<i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}}
-									</a>
-									<a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;">
-										 <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}}
-									</a> 
-									<a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;">
-										<i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}}
-									</a>
-								</div>
-							</div>
-							{{/if}}
-							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
-								<i class="fa fa-cog"></i>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
-								{{if $item.share}}
-								<a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a>
-								{{/if}}
-								{{if $item.plink}}
-								<a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a>
-								{{/if}}
-								{{if $item.edpost}}
-								<a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a>
-								{{/if}}
-								{{if $item.tagger}}
-								<a class="dropdown-item" href="#"  onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a>
-								{{/if}}
-								{{if $item.filer}}
-								<a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a>
-								{{/if}}
-								{{if $item.bookmark}}
-								<a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a>
-								{{/if}}
-								{{if $item.addtocal}}
-								<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
-								{{/if}}
-								{{if $item.star}}
-								<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
-								{{/if}}
-								{{if $item.thread_action_menu}}
-								{{foreach $item.thread_action_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a>
-								{{/foreach}}
-								{{/if}}
-								{{if $item.drop.dropping}}
-								<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
-								{{/if}}
-								{{if $item.thread_author_menu}}
-								<div class="dropdown-divider"></div>
-								{{foreach $item.thread_author_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
-								{{/foreach}}
-								{{/if}}
-								{{if $item.edpost && $item.dreport}}
-								<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
-								{{/if}}
-							</div>
-						</div>
-					</div>
-					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
-					<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}">
-						{{if $item.attachments}}
-						<div class="btn-group">
-							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
-							<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
-						</div>
-						{{/if}}
-						<div class="wall-item-list-comments btn-group">
-							<a class="btn btn-outline-secondary btn-sm" href="{{$item.viewthread}}">
-								{{$item.comment_count_txt}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}</span>{{/if}}
-							</a>
-						</div>
-						{{if $item.unseen_comments}}
-						<div class="unseen-wall-indicator-{{$item.id}} btn-group">
-							<button class="btn btn-outline-secondary btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;">
-								<i class="fa fa-check-square-o"></i>
-							</button>
-						</div>
-						{{/if}}
-						{{if $item.responses }}
-						{{foreach $item.responses as $verb=>$response}}
-						{{if $response.count}}
-						<div class="btn-group">
-							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
-							{{if $response.modal}}
-							<div class="modal" id="{{$verb}}Modal-{{$item.id}}">
-								<div class="modal-dialog">
-									<div class="modal-content">
-										<div class="modal-header">
-											<h4 class="modal-title">{{$response.count}} {{$response.button}}</h4>
-											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-										</div>
-										<div class="modal-body response-list">
-											<ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul>
-										</div>
-										<div class="modal-footer clear">
-											<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$item.modal_dismiss}}</button>
-										</div>
-									</div><!-- /.modal-content -->
-								</div><!-- /.modal-dialog -->
-							</div><!-- /.modal -->
-							{{else}}
-							<div class="dropdown-menu">{{foreach $response.list as $liker}}{{$liker}}{{/foreach}}</div>
-							{{/if}}
-						</div>
-						{{/if}}
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-{{if $item.comment_lastcollapsed}}
-</div>
-{{/if}}
diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl
deleted file mode 100755
index 82c7be922..000000000
--- a/view/tpl/conversation.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="threads-begin"></div>
-{{foreach $threads as $thread}}
-<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper generic-content-wrapper">
-	{{foreach $thread.items as $item}}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
-			</div>
-			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
-		{{/if}}
-		{{if $item.comment_lastcollapsed}}</div>{{/if}}
-		
-		{{include file="{{$item.template}}"}}
-		
-		
-	{{/foreach}}
-</div>
-{{/foreach}}
-<div id="threads-end"></div>
-<div id="conversation-end"></div>
diff --git a/view/tpl/convobj.tpl b/view/tpl/convobj.tpl
deleted file mode 100755
index d5cee1170..000000000
--- a/view/tpl/convobj.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{foreach $threads as $item}}
-{{include file="{{$item.template}}"}}
-{{/foreach}}
-
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
deleted file mode 100755
index 4352501ae..000000000
--- a/view/tpl/cover_photo.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div id="profile-photo-content" class="generic-content-wrapper">
-    <div class="section-title-wrapper">
-    <h2>{{$title}}</h2>
-    </div>
-    <div class="section-content-wrapper">
-
-		<form enctype="multipart/form-data" action="cover_photo" method="post">
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-		<div id="profile-photo-upload-wrapper">
-
-			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
-			<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
-			<div class="clear"></div>
-			<br />
-			<br />
-			<div id="profile-photo-submit-wrapper">
-				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
-			</div>
-		</div>
-
-		</form>
-		<br />
-		<br />
-		<div id="profile-photo-link-select-wrapper">
-			{{$select}}
-		</div>
-	</div>
-</div>
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
deleted file mode 100755
index a9c384d2f..000000000
--- a/view/tpl/cover_photo_widget.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-<script>
-	var aside_padding_top;
-	var section_padding_top;
-	var coverSlid = false;
-
-	$(document).ready(function() {
-
-		aside_padding_top = parseInt($('aside').css('padding-top'));
-		section_padding_top = parseInt($('section').css('padding-top'));
-
-		$(document).on('click', slideUpCover);
-
-		if($('#cover-photo').length && $(window).width() > 755) {
-			if($(window).scrollTop() < $('#cover-photo').height()) {
-				$('.navbar').removeClass('fixed-top');
-				$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
-				$('main').css('opacity', 0);
-			}
-		}
-		else {
-			$('#cover-photo').remove();
-			coverSlid = true;
-		}
-	});
-
-	$(window).scroll(function () {
-		if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
-			$('.navbar').addClass('fixed-top');
-			$('main').css('margin-top', '');
-			$('main').css('opacity', 1);
-			coverSlid = true;
-		}
-		else if ($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){
-			if(coverSlid) {
-				$(window).scrollTop(Math.ceil($('#cover-photo').height()));
-				setTimeout(function(){ coverSlid = false; }, 1000);
-			}
-			else {
-				if($(window).scrollTop() < $('#cover-photo').height()) {
-					$('.navbar').removeClass('fixed-top');
-					$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
-					$('main').css('opacity', 0);
-				}
-			}
-		}
-		if($('#cover-photo').length && $('main').css('opacity') < 1) {
-			$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
-		}
-	});
-
-	$(window).resize(function () {
-		if($('#cover-photo').length && $(window).width() < 755) {
-			$('#cover-photo').remove();
-			$('.navbar').addClass('fixed-top');
-			$('main').css('opacity', 1);
-			coverSlid = true;
-		}
-
-	});
-
-	function slideUpCover() {
-		if(coverSlid) {
-			return;
-		}
-		$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' });
-		return;
-	}
-</script>
-
-<div id="cover-photo" title="{{$hovertitle}}">
-	{{$photo_html}}
-	<div id="cover-photo-caption">
-		<h1>{{$title}}</h1>
-		<h3>{{$subtitle}}</h3>
-	</div>
-</div>
diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
deleted file mode 100755
index 01d9a24a0..000000000
--- a/view/tpl/cropbody.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<h1>{{$title}}</h1>
-<p id="cropimage-desc">
-{{$desc}}
-</p>
-<div id="cropimage-wrapper">
-<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 300,
-			minHeight: 300,
-			maxWidth: 1024,
-			maxHeight: 1024,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<input type='hidden' name='profile' value='{{$profile}}'>
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="{{$done}}" />
-</div>
-
-</form>
diff --git a/view/tpl/cropcover.tpl b/view/tpl/cropcover.tpl
deleted file mode 100755
index 04b96a603..000000000
--- a/view/tpl/cropcover.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<h1>{{$title}}</h1>
-<p id="cropimage-desc">
-{{$desc}}
-</p>
-<div id="cropimage-wrapper">
-<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 240,
-			minHeight: 87,
-			maxWidth: 320,
-			maxHeight: 116,
-			ratioDim: { x: 100, y:36 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="cover_photo/{{$resource}}" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<input type='hidden' name='profile' value='{{$profile}}'>
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="{{$done}}" />
-</div>
-
-</form>
diff --git a/view/tpl/crophead.tpl b/view/tpl/crophead.tpl
deleted file mode 100755
index 48f375426..000000000
--- a/view/tpl/crophead.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/tpl/delegate.tpl b/view/tpl/delegate.tpl
deleted file mode 100755
index cbaa8da86..000000000
--- a/view/tpl/delegate.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h3>{{$header}}</h3>
-
-<div id="delegate-desc" class="delegate-desc">{{$desc}}</div>
-
-{{if $managers}}
-<h3>{{$head_managers}}</h3>
-
-{{foreach $managers as $x}}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="#" >
-<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
-</a>
-</div>
-
-{{/foreach}}
-<div class="clear"></div>
-<hr />
-{{/if}}
-
-
-<h3>{{$head_delegates}}</h3>
-
-{{if $delegates}}
-{{foreach $delegates as $x}}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="{{$base}}/delegate/remove/{{$x.uid}}" >
-<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
-</a>
-</div>
-
-{{/foreach}}
-<div class="clear"></div>
-{{else}}
-{{$none}}
-{{/if}}
-<hr />
-
-
-<h3>{{$head_potentials}}</h3>
-{{if $potentials}}
-{{foreach $potentials as $x}}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="{{$base}}/delegate/add/{{$x.uid}}" >
-<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
-</a>
-</div>
-
-{{/foreach}}
-<div class="clear"></div>
-{{else}}
-{{$none}}
-{{/if}}
-<hr />
-
diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl
deleted file mode 100644
index bc7d46dc1..000000000
--- a/view/tpl/design_tools.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="design-tools" class="widget design-tools">
-	<h3>{{$title}}</h3>
-	<div class="nav nav-pills flex-column">
-		<a class="nav-link" href="blocks/{{$who}}">{{$blocks}}</a>
-		<a class="nav-link" href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a>
-		<a class="nav-link" href="layouts/{{$who}}">{{$layout}}</a>
-		<a class="nav-link" href="webpages/{{$who}}">{{$pages}}</a>
-	</div>
-</div>
diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl
deleted file mode 100644
index 017eb555c..000000000
--- a/view/tpl/diaspora_vcard.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-<div style="display:none;">
-	<dl class="entity_uid">
- 		<dt>Uid</dt>
- 		<dd>
-			<span class="uid p-uid">{{$diaspora.guid}}</span>
- 		</dd>
-	</dl>
-	<dl class='entity_nickname'>
-		<dt>Nickname</dt>
-		<dd>		
-			<span class="nickname p-nickname">{{$diaspora.nickname}}</span>
-		</dd>
-	</dl>
-	<dl class='entity_full_name'>
-		<dt>Full name</dt>
-		<dd>
-			<span class='fn p-name'>{{$diaspora.fullname}}</span>
-		</dd>
-	</dl>
-
-	<dl class='entity_first_name'>
-		<dt>First name</dt>
-		<dd>
-		<span class='given_name p-given-name'>{{$diaspora.firstname}}</span>
-		</dd>
-	</dl>
-	<dl class='entity_family_name'>
-		<dt>Family name</dt>
-		<dd>
-		<span class='family_name p-family-name'>{{$diaspora.lastname}}</span>
-		</dd>
-	</dl>
-	<dl class="entity_url">
-		<dt>URL</dt>
-		<dd>
-			<a href="{{$diaspora.podloc}}/" id="pod_location" class="url" rel="me" >{{$diaspora.podloc}}/</a>
-		</dd>
-	</dl>
-	<dl class="entity_photo">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}" />
-		</dd>
-	</dl>
-	<dl class="entity_photo_medium">
-		<dt>Photo</dt>
-		<dd> 
-			<img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}" />
-		</dd>
-	</dl>
-	<dl class="entity_photo_small">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}" />
-		</dd>
-	</dl>
-	<dl class="entity_searchable">
-		<dt>Searchable</dt>
-		<dd>
-			<span class="searchable">{{$diaspora.searchable}}</span>
-		</dd>
-	</dl>
-	<dl class="entity_key">
-		<dt>Key</dt>
-		<dd>
-		<pre class="key">{{$diaspora.pubkey}}</pre>
-		</dd>
-	</dl>
-</div>
diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl
deleted file mode 100644
index 9346a7455..000000000
--- a/view/tpl/dir_sort_links.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="widget" id="dir_sort_links">
-<h3>{{$header}}</h3>
-
-{{include file="field_checkbox.tpl" field=$safemode}}
-{{include file="field_checkbox.tpl" field=$globaldir}}
-{{include file="field_checkbox.tpl" field=$pubforums}}
-
-</div>
diff --git a/view/tpl/directajax.tpl b/view/tpl/directajax.tpl
deleted file mode 100644
index 8faec4222..000000000
--- a/view/tpl/directajax.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{foreach $entries as $entry}}
-{{include file="direntry.tpl"}}
-{{/foreach}}
-
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
deleted file mode 100755
index 71e991f3a..000000000
--- a/view/tpl/directory_header.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper clearfix">
-		<div class="btn-group pull-right">
-			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
-				<i class="fa fa-sort"></i>
-			</button>
-			<div class="dropdown-menu dropdown-menu-right">
-				<a class="dropdown-item" href="directory?f=&order=date{{$suggest}}">{{$date}}</a>
-				<a class="dropdown-item" href="directory?f=&order=normal{{$suggest}}">{{$normal}}</a>
-				<a class="dropdown-item" href="directory?f=&order=reversedate{{$suggest}}">{{$reversedate}}</a>
-				<a class="dropdown-item" href="directory?f=&order=reverse{{$suggest}}">{{$reverse}}</a>
-			</div>
-		</div>
-		<h2>{{$dirlbl}}{{if $search}}:&nbsp;{{$safetxt}}{{/if}}</h2>
-	</div>
-	{{foreach $entries as $entry}}
-		{{include file="direntry.tpl"}}
-	{{/foreach}}
-	<div id="page-end"></div>
-</div>
-<script>$(document).ready(function() { loadingPage = false;});</script>
-<div id="page-spinner"></div>
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
deleted file mode 100755
index f7ec7db23..000000000
--- a/view/tpl/direntry.tpl
+++ /dev/null
@@ -1,77 +0,0 @@
-<div class="directory-item{{if $entry.safe}} safe{{/if}}" id="directory-item-{{$entry.hash}}" >
-	<div class="section-subtitle-wrapper clearfix">
-		<div class="pull-right">
-			{{if $entry.viewrate}}
-				{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-outline-secondary btn-sm">{{$entry.total_ratings}}</a>{{/if}}
-			{{/if}}
-			{{if $entry.ignlink}}
-			<a class="directory-ignore btn btn-warning btn-sm" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a>
-			{{/if}}
-			{{if $entry.connect}}
-			<a class="btn btn-success btn-sm" href="{{$entry.connect}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conn_label}}</a>
-			{{/if}}
-			{{if $entry.viewrate}}
-				{{if $entry.canrate}}<button class="btn btn-outline-secondary btn-sm" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="fa fa-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
-			{{/if}}
-		</div>
-		<h3>{{if $entry.public_forum}}<i class="fa fa-comments-o" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="fa fa-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
-	</div>
-	<div class="section-content-tools-wrapper directory-collapse">
-		<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" >
-			<div class="contact-photo" id="directory-photo-{{$entry.hash}}" >
-				<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.hash}}" >
-					<img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" />
-				</a>
-			</div>
-		</div>
-		<div class="contact-info">
-			{{if $entry.common_friends}}
-			<div id="dir-common" class="contact-info-element">
-				<span class="contact-info-label">{{$entry.common_label}}</span> {{$entry.common_count}}
-			</div>
-			{{/if}}
-
-			{{if $entry.pdesc}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.pdesc_label}}</span> {{$entry.pdesc}}
-			</div>
-			{{/if}}
-
-			{{if $entry.age}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.age_label}}</span> {{$entry.age}}
-			</div>
-			{{/if}}
-
-			{{if $entry.location}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.location_label}}</span> {{$entry.location}}
-			</div>
-			{{/if}}
-
-			{{if $entry.hometown}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.hometown_label}}</span> {{$entry.hometown}}
-			</div>
-			{{/if}}
-
-			{{if $entry.homepage}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.homepage}}</span> {{$entry.homepageurl}}
-			</div>
-			{{/if}}
-
-			{{if $entry.kw}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.kw}}</span> {{$entry.keywords}}
-			</div>
-			{{/if}}
-
-			{{if $entry.about}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.about_label}}</span> {{$entry.about}}
-			</div>
-			{{/if}}
-		</div>
-	</div>
-</div>
diff --git a/view/tpl/display-head.tpl b/view/tpl/display-head.tpl
deleted file mode 100755
index 913784d98..000000000
--- a/view/tpl/display-head.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<script>
-$(document).ready(function() {
-	$(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
-	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
-});
-</script>
-
diff --git a/view/tpl/dreport.tpl b/view/tpl/dreport.tpl
deleted file mode 100644
index 1f5915609..000000000
--- a/view/tpl/dreport.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $table == 'item'}}
-		<div class="dropdown pull-right">
-			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$options}}">
-				<i class="fa fa-sort-desc"></i>
-			</button>
-			<ul class="dropdown-menu">
-				<li><a href="dreport/push/{{$mid}}">{{$push}}</a></li>
-			</ul>
-		</div>
-		{{/if}}
-		<h2>{{$title}}</h2>
-	</div>
-
-	<div>
-	<table>
-	{{if $entries}}
-	{{foreach $entries as $e}}
-	<tr>
-		<td width="40%">{{$e.name}}</td>
-		<td width="20%">{{$e.result}}</td>
-		<td width="20%">{{$e.time}}</td>
-	</tr>
-	{{/foreach}}
-	{{/if}}
-	</table>
-</div>
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
deleted file mode 100755
index b2ab5db4e..000000000
--- a/view/tpl/edpost_head.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $delete}}
-		<div class="pull-right">
-			<a  href="item/drop/{{$id}}" id="delete-btn" class="btn btn-sm btn-danger" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$delete}}</a>
-		</div>
-		{{/if}}
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div id="webpage-editor" class="section-content-tools-wrapper">
-		{{$editor}}
-	</div>
-</div>
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
deleted file mode 100755
index 5b4954c8e..000000000
--- a/view/tpl/email_notify_html.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>{{$banner}}</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;">
-	<tbody>
-	<tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src="{{$notify_icon}}"><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
-
-
-	<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
-		<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td></tr>
-	<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
-	<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
-	<tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr>
-	<tr><td style="padding:11px 0;" colspan="2">{{$hitemlink}}</td></tr>
-	<tr><td></td><td>{{$thanks}}</td></tr>
-	<tr><td></td><td>{{$site_admin}}</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
deleted file mode 100755
index 56925c18b..000000000
--- a/view/tpl/email_notify_text.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{$preamble}}
-	
-{{$title}}
-
-{{$textversion}}
-				
-{{$tsitelink}}
-
-{{$titemlink}}
-
-{{$thanks}}
-{{$site_admin}}
-
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
deleted file mode 100755
index cc0bfc1c7..000000000
--- a/view/tpl/event.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{foreach $events as $event}}
-	<div class="event-wrapper">
-		<div class="event">
-			<div class="event-owner">
-				{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}}
-			</div>
-			{{$event.html}}
-			<div class="event-buttons">
-				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="fa fa-external-link btn btn-outline-secondary" ></i></a>{{/if}}
-				{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>{{/if}}
-				{{if $event.drop}}<a href="{{$event.drop.0}}" title="{{$event.drop.1}}" class="drop-event-link"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>{{/if}}
-			</div>
-			<div class="clear"></div>
-		</div>
-	</div>
-{{/foreach}}
diff --git a/view/tpl/event_cal.tpl b/view/tpl/event_cal.tpl
deleted file mode 100755
index d7662786b..000000000
--- a/view/tpl/event_cal.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{foreach $events as $event}}
-	<div class="event-wrapper">
-		<div class="event">
-			<div class="event-owner">
-				{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}}
-			</div>
-			{{$event.html}}
-			<div class="event-buttons">
-				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="fa fa-external-link btn btn-outline-secondary" ></i></a>{{/if}}
-			</div>
-			<div class="clear"></div>
-		</div>
-	</div>
-{{/foreach}}
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
deleted file mode 100755
index d07a06b67..000000000
--- a/view/tpl/event_form.tpl
+++ /dev/null
@@ -1,130 +0,0 @@
-<form id="event-edit-form" action="{{$post}}" method="post" class="acl-form" data-form_id="event-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-
-	<input type="hidden" name="event_id" value="{{$eid}}" />
-	<input type="hidden" name="event_hash" value="{{$event_hash}}" />
-	<input type="hidden" name="xchan" value="{{$xchan}}" />
-	<input type="hidden" name="mid" value="{{$mid}}" />
-	<input type="hidden" name="type" value="{{$type}}" />
-	<input type="hidden" name="preview" id="event-edit-preview" value="0" />
-
-
-	{{include file="field_input.tpl" field=$summary}}
-
-	{{if $tz_choose}}
-	{{include file="field_select_grouped.tpl" field=$timezone}}
-	{{/if}}
-
-	{{$s_dsel}}
-
-	{{$f_dsel}}
-
-	{{include file="field_checkbox.tpl" field=$nofinish}}
-
-	<div id="advanced" style="display:none">
-
-		{{include file="field_checkbox.tpl" field=$adjust}}
-
-		{{if $catsenabled}}
-		<div id="event-category-text"><b>{{$c_text}}</b></div>
-		<div id="events-category-wrap">
-			<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput" />
-		</div>
-		{{/if}}
-
-		<div class="form-group">
-			<div class="form-group">
-				<div id="event-desc-text"><b>{{$d_text}}</b></div>
-				<textarea id="comment-edit-text-desc" class="form-control" name="desc" >{{$d_orig}}</textarea>
-			</div>
-			<div id="comment-tools-desc" class="comment-tools" style="display: block;" >
-				<div id="comment-edit-bb-desc" class="btn-toolbar">
-					<div class='btn-group mr-2'>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'desc');">
-							<i class="fa fa-bold comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'desc');">
-							<i class="fa fa-italic comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'desc');">
-							<i class="fa fa-underline comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('none','quote','desc');">
-							<i class="fa fa-quote-left comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'desc');">
-							<i class="fa fa-terminal comment-icon"></i>
-						</button>
-					</div>
-					<div class='btn-group'>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'desc');">
-							<i class="fa fa-camera comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'desc');">
-							<i class="fa fa-link comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'desc');">
-							<i class="fa fa-video-camera comment-icon"></i>
-						</button>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="form-group">
-			<div class="form-group">
-				<div id="event-location-text"><b>{{$l_text}}</b></div>
-				<textarea id="comment-edit-text-loc" class="form-control" name="location">{{$l_orig}}</textarea>
-			</div>
-			<div id="comment-tools-loc" class="comment-tools" style="display: block;" >
-				<div id="comment-edit-bb-loc" class="btn-toolbar">
-					<div class='btn-group mr-2'>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'loc');">
-							<i class="fa fa-bold comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'loc');">
-							<i class="fa fa-italic comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'loc');">
-							<i class="fa fa-underline comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('none','quote','loc');">
-							<i class="fa fa-quote-left comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'loc');">
-							<i class="fa fa-terminal comment-icon"></i>
-						</button>
-					</div>
-					<div class='btn-group'>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'loc');">
-							<i class="fa fa-camera comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'loc');">
-							<i class="fa fa-link comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'loc');">
-							<i class="fa fa-video-camera comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$mapper}}" onclick="insertbbcomment('none','map','loc');">
-							<i class="fa fa-globe comment-icon"></i>
-						</button>
-					</div>
-
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div class="clear"></div>
-
-	<button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('advanced');">{{$advanced}}</button>
-	<div class="btn-group float-right">
-		<button id="event-edit-preview-btn" class="btn btn-outline-secondary btn-sm" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button>
-		{{if ! $eid}}
-		<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button>
-		{{/if}}
-		<button id="event-submit" class="btn btn-primary btn-sm" type="submit" name="submit">{{$submit}}</button>
-	</div>
-</form>
-
-{{if ! $eid}}
-	{{$acl}}
-{{/if}}
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
deleted file mode 100755
index 3b2cb5041..000000000
--- a/view/tpl/event_head.tpl
+++ /dev/null
@@ -1,160 +0,0 @@
-<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/locale-all.js"></script>
-
-<script>
-	function showEvent(eventid) {
-		$.get(
-			'{{$baseurl}}{{$module_url}}/?id='+eventid,
-			function(data){
-				$.colorbox({ scrolling: false, html: data, onComplete: function() { $.colorbox.resize(); }});
-			}
-		);			
-	}
-	
-	function doEventPreview() {
-		$('#event-edit-preview').val(1);
-		$.post('events',$('#event-edit-form').serialize(), function(data) {
-			$.colorbox({ html: data });
-		});
-		$('#event-edit-preview').val(0);
-	}
-
-	function exportDate() {
-		var moment = $('#events-calendar').fullCalendar('getDate');
-		var sT = 'events/' + moment.year() + '/' + (moment.month() + 1) + '/export';
-		window.location.href=sT;
-	}
-	
-	function changeView(action, viewName) {
-		$('#events-calendar').fullCalendar(action, viewName);
-		var view = $('#events-calendar').fullCalendar('getView');
-
-		if(view.type !== 'month' && !$('main').hasClass('fullscreen')) {
-			$('#events-calendar').fullCalendar('option', 'height', 'auto');
-		}
-		else {
-			$('#events-calendar').fullCalendar('option', 'height', '');
-		}
-
-		if($('main').hasClass('fullscreen')) {
-			$('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
-		}
-
-		$('#title').text(view.title);
-	}
-
-
-	$(document).ready(function() {
-		$('#events-calendar').fullCalendar({
-			events: '{{$baseurl}}{{$module_url}}/json',
-			header: false,
-			eventTextColor: 'white',
-			lang: '{{$lang}}',
-			firstDay: {{$first_day}},
-
-			eventLimit: 3,
-
-			monthNames: aStr['monthNames'],
-			monthNamesShort: aStr['monthNamesShort'],
-			dayNames: aStr['dayNames'],
-			dayNamesShort: aStr['dayNamesShort'],
-
-			allDayText: aStr['allday'],
-			timeFormat: 'HH:mm',
-			eventClick: function(calEvent, jsEvent, view) {
-				showEvent(calEvent.id);
-			},
-			loading: function(isLoading, view) {
-				$('#events-spinner').spin('tiny');
-				$('#events-spinner > i').css('color', 'transparent');
-				if(!isLoading) {
-					$('#events-spinner').spin(false);
-					$('#events-spinner > i').css('color', '');
-					$('td.fc-day').dblclick(function() {
-						openMenu('form');
-						//window.location.href='/events/new?start='+$(this).data('date');
-					});
-				}
-			},
-
-			eventRender: function(event, element, view) {
-
-				//console.log(view.name);
-				if (event.item['author']['xchan_name']==null) return;
-
-				switch(view.name){
-					case "month":
-					element.find(".fc-title").html(
-						"<img src='{0}' style='height:12px;width:12px;' title='{1}'>&nbsp;<span title='{3}{4}'>{2}</span>".format(
-							event.item['author']['xchan_photo_s'],
-							event.item['author']['xchan_name'],
-							event.title,
-							event.item.description ? event.item.description + "\r\n\r\n" : '',
-							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
-					));
-					break;
-					case "agendaWeek":
-					element.find(".fc-title").html(
-						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
-							event.item['author']['xchan_photo_s'],
-							event.item['author']['xchan_name'],
-							event.title,
-							event.item.description ? event.item.description + "\r\n\r\n" : '',
-							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
-					));
-					break;
-					case "agendaDay":
-					element.find(".fc-title").html(
-						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
-							event.item['author']['xchan_photo_s'],
-							event.item['author']['xchan_name'],
-							event.title,
-							event.item.description ? event.item.description + "\r\n\r\n" : '',
-							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
-					));
-					break;
-				}
-			}
-			
-		});
-		
-		// center on date
-		// @fixme does not work for cal/$nick module_url
-		var args=location.href.replace(baseurl,"").split("/");
-		{{if $modparams == 2}}
-		if (args.length>=5) {
-			$("#events-calendar").fullCalendar('gotoDate',args[3] , args[4]-1);
-		}
-		{{else}}
-		if (args.length>=4) {
-			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
-		}
-		{{/if}} 
-		
-		// show event popup
-		var hash = location.hash.split("-")
-		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
-		
-		// echo the title
-		var view = $('#events-calendar').fullCalendar('getView');
-		$('#title').text(view.title);
-
-		// shift the finish time date on start time date change automagically
-		var origsval = $('#id_start_text').val();
-		$('#id_start_text').change(function() {
-			var origfval = $('#id_finish_text').val();
-			if(origfval) {
-				var sval = $('#id_start_text').val();
-				var diff = moment(sval).diff(origsval);
-				var fval = moment(origfval).add(diff, 'millisecond').format("YYYY-MM-DD HH:mm");
-				$('#id_finish_text').val(fval);
-				origsval = sval;
-			}
-		});
-
-	});
-
-</script>
-
diff --git a/view/tpl/event_item_content.tpl b/view/tpl/event_item_content.tpl
deleted file mode 100644
index 76e0f4616..000000000
--- a/view/tpl/event_item_content.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{if $description}}
-<div class="event-item-description">
-	{{$description}}
-</div>
-{{/if}}
-{{if $location}}
-<div class="event-item-location">
-	<span class="event-item-label">{{$location_label}}</span>&nbsp;<span class="event-item-location">{{$location}}</span>
-</div>
-{{/if}}
diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl
deleted file mode 100755
index 6247aaf6f..000000000
--- a/view/tpl/event_item_header.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="event-item-title">
-	<h3><i class="fa fa-calendar"></i>&nbsp;{{$title}}</h3>
-</div>
-<div class="event-item-start">
-	<span class="event-item-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
-</div>
-{{if $finish}}
-<div class="event-item-start">
-	<span class="event-item-label">{{$dtend_label}}</span>&nbsp;<span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
-</div>
-{{/if}}
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
deleted file mode 100755
index 9d32c76be..000000000
--- a/view/tpl/events-js.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			<div class="dropdown">
-				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i>&nbsp;{{$view_label}}</button>
-				<div class="dropdown-menu">
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a>
-				</div>
-				<button class="btn btn-success btn-sm" onclick="openClose('form');">{{$new_event.1}}</button>
-				<div class="btn-group">
-					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-					<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
-					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
-				</div>
-				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-				<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
-			</div>
-		</div>
-		<h2 id="title"></h2>
-		<div class="clear"></div>
-	</div>
-	<div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}>
-		{{$form}}
-	</div>
-	<div class="clear"></div>
-	<div class="section-content-wrapper-np">
-		<div id="events-calendar"></div>
-	</div>
-</div>
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
deleted file mode 100755
index ba9e16dd6..000000000
--- a/view/tpl/events_cal-js.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{$tabs}}
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			<div class="btn-group">
-				<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-				<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
-				<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
-			</div>
-			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
-		</div>
-		<h2 id="title"></h2>
-		<div class="clear"></div>
-	</div>
-	<div class="clear"></div>
-	<div class="section-content-wrapper-np">
-		<div id="events-calendar"></div>
-	</div>
-</div>
diff --git a/view/tpl/events_menu_side.tpl b/view/tpl/events_menu_side.tpl
deleted file mode 100755
index b9a9062b1..000000000
--- a/view/tpl/events_menu_side.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="widget">
-	<h3>{{$title}}</h3>
-	<ul class="nav nav-pills nav-stacked">
-		<li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
-		<li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
-		<li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
-	</ul>
-</div>
diff --git a/view/tpl/events_reminder.tpl b/view/tpl/events_reminder.tpl
deleted file mode 100755
index fd6a1a5c7..000000000
--- a/view/tpl/events_reminder.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{if $count}}
-<div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div>
-<div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title}}</div>
-<div id="event-title-end"></div>
-{{foreach $events as $event}}
-<div class="event-list" id="event-{{$event.id}}"></a> <a href="events/{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
-{{/foreach}}
-</div>
-{{/if}}
-
diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl
deleted file mode 100755
index e22f95c1e..000000000
--- a/view/tpl/events_tools_side.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="widget">
-	<h3>{{$title}}</h3>
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a class="nav-link" href="#" onclick="exportDate(); return false;"><i class="fa fa-arrow-circle-o-down"></i>&nbsp;{{$export}}</a></li>
-		<li class="nav-item"><a class="nav-link" href="#" onclick="openClose('event-upload-form'); return false;"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$import}}</a></li>
-	</ul>
-	<div id="event-upload-form" class="sub-menu-wrapper">
-		<div class="sub-menu">
-			<form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
-				<div class="form-group">
-					<input id="event-upload-choose" class="form-control-file w-100" type="file" name="userfile" />
-				</div>
-				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
-			</form>
-		</div>
-	</div>
-</div>
diff --git a/view/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl
deleted file mode 100755
index f53f1f478..000000000
--- a/view/tpl/failed_updates.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h2>{{$banner}}</h2>
-
-<div id="failed_updates_desc">{{$desc}}</div>
-
-{{if $failed}}
-{{foreach $failed as $f}}
-
-<h4>{{$f}}</h4>
-<ul>
-<li><a href="{{$base}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li>
-<li><a href="{{$base}}/admin/dbsync/{{$f}}">{{$apply}}</a></li>
-</ul>
-
-<hr />
-{{/foreach}}
-{{/if}}
-</div>
diff --git a/view/tpl/field.tpl b/view/tpl/field.tpl
deleted file mode 100755
index 942cfcef5..000000000
--- a/view/tpl/field.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
- {{if $field.0==select}}
- {{include file="field_select.tpl"}}
- {{/if}}
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
deleted file mode 100755
index c87b9ac79..000000000
--- a/view/tpl/field_acheckbox.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<tr class="highlight">
-	<td>
-		<label class="mainlabel" for='me_id_{{$field.0}}'>{{$field.1}}</label><br>
-		<span class='field_abook_help'>{{$field.6}}</span>
-	</td>
-	{{if $notself}}
-	<td class="abook-them">
-		{{if $field.2}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}}
-	</td>
-	{{/if}}
-	<td class="abook-me">
-		{{if $self || !$field.5 || $twocol }}
-		<input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />
-		{{/if}}
-		{{if $notself && $field.5}}
-		<input type="hidden" name='{{$field.0}}' value="{{if $field.7}}1{{else}}0{{/if}}" />
-		{{if $field.3}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}}
-		{{/if}}
-	</td>
-	<td>
-		{{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="fa fa-check-square-o"></i>{{else}} <i class="fa fa-square-o"></i>{{/if}}{{/if}}</span>{{/if}}
-	</td>
-</tr>
diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl
deleted file mode 100755
index f779f937c..000000000
--- a/view/tpl/field_checkbox.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div id="{{$field.0}}_container" class="clearfix form-group checkbox">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<div class="float-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div>
-		<small class="form-text text-muted">{{$field.3}}</small>
-	</div>
diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl
deleted file mode 100644
index 9b6f33462..000000000
--- a/view/tpl/field_colorinput.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	<div class='form-group field input color'>
-		<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
-		<input class='form-control color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
-		<span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span>
-		<div id='end_{{$field.0}}' class='field_end'></div>
-	</div>
diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl
deleted file mode 100755
index 12d00a08d..000000000
--- a/view/tpl/field_combobox.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="form-group">
-	<label class="" for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label>
-	<input class="form-control" id="id_{{$field.0}}" type="text" list="data_{{$field.0}}"{{if $field.5}} {{$field.5}}{{/if}}>
-	<datalist id="data_{{$field.0}}" >
-		{{foreach $field.4 as $opt=>$val}}
-		<option value="{{$val}}">
-		{{/foreach}}
-	</datalist>
-	{{**
-	<input id="id_{{$field.0}}" class="form-control" type="text" value="{{$field.2}}">
-	<select id="select_{{$field.0}}" class="form-control" onChange="$('#id_{{$field.0}}').val($(this).val())">
-		<option value="">{{$field.5}}</option>
-		{{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
-	</select>
-	**}} 
-	<span class='field_help'>{{$field.3}}</span>
-</div>
-
diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl
deleted file mode 100755
index 907b4c50e..000000000
--- a/view/tpl/field_custom.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div class='form-group field custom'>
-		<label for='{{$field.0}}'>{{$field.1}}</label>
-		{{$field.2}}
-		<span class='help-block'>{{$field.3}}</span>
-	</div>
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
deleted file mode 100755
index 65a837e5f..000000000
--- a/view/tpl/field_input.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div id="id_{{$field.0}}_wrapper" class="form-group">
-		<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
-		<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>
-		<small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small>
-	</div>
diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl
deleted file mode 100755
index abfe6e189..000000000
--- a/view/tpl/field_intcheckbox.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div class="clearfix form-group checkbox">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<div class="pull-right"><input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for="id_{{$field.0}}"> <span class="onoffswitch-inner" data-on="{{if $field.5}}{{$field.5.1}}{{/if}}" data-off="{{if $field.5}}{{$field.5.0}}{{/if}}"></span><span class="onoffswitch-switch"></span> </label></div>
-		<small class="form-text text-muted">{{$field.4}}</small>
-	</div>
diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl
deleted file mode 100755
index fa5e14582..000000000
--- a/view/tpl/field_password.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div class="form-group">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<input class="form-control" type="password" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
-		<small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small>
-	</div>
diff --git a/view/tpl/field_radio.tpl b/view/tpl/field_radio.tpl
deleted file mode 100755
index 6b5f52de6..000000000
--- a/view/tpl/field_radio.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-	<div class="form-group field radio">
-		<label for='id_{{$field.0}}_{{$field.2}}'>
-			<input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}>
-			{{$field.1}}
-		</label>
-		<span class='help-block'>{{$field.3}}</span>
-	</div>
-	<div class="clear"></div>
diff --git a/view/tpl/field_richtext.tpl b/view/tpl/field_richtext.tpl
deleted file mode 100755
index 378e02a62..000000000
--- a/view/tpl/field_richtext.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div class='field richtext'>
-		<label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
-		<textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext">{{$field.2}}</textarea>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl
deleted file mode 100755
index cda9a823a..000000000
--- a/view/tpl/field_select.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-	<div class="form-group">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}">
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<small class="form-text text-muted">{{$field.3}}</small>
-	</div>
diff --git a/view/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl
deleted file mode 100644
index ee5e1508f..000000000
--- a/view/tpl/field_select_disabled.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-	<div class='form-group field select'>
-		<label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select class="form-control" disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'>
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<span class='help-block'>{{$field.3}}</span>
-	</div>
diff --git a/view/tpl/field_select_grouped.tpl b/view/tpl/field_select_grouped.tpl
deleted file mode 100644
index e6d1479de..000000000
--- a/view/tpl/field_select_grouped.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-	<div class='form-group field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'>
-			{{foreach $field.4 as $group=>$opts}}
-				<optgroup label='{{$group}}'>
-				{{foreach $opts as $opt=>$val}}
-					<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-				{{/foreach}}
-				</optgroup>
-		</select>
-		<span class='help-block'>{{$field.3}}</span>
-	</div>
diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl
deleted file mode 100755
index 2780df58c..000000000
--- a/view/tpl/field_select_raw.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-	<div class='form-group field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'>
-			{{$field.4}}
-		</select>
-		<span class='help-block'>{{$field.3}}</span>
-	</div>
diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl
deleted file mode 100755
index 437dece93..000000000
--- a/view/tpl/field_textarea.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div class="form-group">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<textarea class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea>
-		<small class="form-text text-muted">{{$field.3}}</small>
-	</div>
diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl
deleted file mode 100755
index 7a529774c..000000000
--- a/view/tpl/field_themeselect.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-	{{if $field.5 == 'preview'}}
-		<script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script>
-	{{/if}}
-	<div class='form-group field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5 == 'preview'}}onchange="previewTheme(this);"{{/if}} >
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<span class='field_help'>{{$field.3}}</span>
-		{{if $field.5=='preview'}}
-			<div id="theme-preview"></div>
-		{{/if}}
-	</div>
diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl
deleted file mode 100755
index 8a4cda55b..000000000
--- a/view/tpl/field_yesno.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-	<div class='clearfix form-group'>
-		<label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
-		<div class='onoff' id="id_{{$field.0}}_onoff">
-			<input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-			<a href="#" class='off'>
-				{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
-			</a>
-			<a href="#" class='on'>
-				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
-			</a>
-		</div>
-		<small class='form-text text-muted'>{{$field.3}}</small>
-	</div>
diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl
deleted file mode 100755
index a6a69b89c..000000000
--- a/view/tpl/fileas_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="fileas-sidebar" class="widget">
-	<h3>{{$title}}</h3>
-	<div id="nets-desc">{{$desc}}</div>
-	
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a class="nav-link{{if $sel_all}} active{{/if}}" href="{{$base}}">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-		<li class="nav-item"><a class="nav-link{{if $term.selected}} active{{/if}}" href="{{$base}}?f=&file={{$term.name}}">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/tpl/filebrowser.tpl b/view/tpl/filebrowser.tpl
deleted file mode 100755
index 787f7c0cd..000000000
--- a/view/tpl/filebrowser.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-	<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
-	<style>
-		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
-		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
-		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
-		.filebrowser ul{ list-style-type: none; padding:0px; }
-		.filebrowser.folders a { display: block; padding: 0.3em }
-		.filebrowser.folders a:hover { background-color: #f0f0ee; }
-		.filebrowser.files.image { overflow: auto; height: auto; }
-		.filebrowser.files.image img { height:50px;}
-		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
-		.filebrowser.files.image span { display: none;}
-		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
-		.filebrowser.files a { display: block;  padding: 0.3em}
-		.filebrowser.files a:hover { background-color: #f0f0ee; }
-		.filebrowser a { text-decoration: none; }
-	</style>
-	<script>
-		var FileBrowserDialogue = {
-			init : function () {
-				// Here goes your code for setting your custom things onLoad.
-			},
-			mySubmit : function (URL) {
-				//var URL = document.my_form.my_field.value;
-				var win = tinyMCEPopup.getWindowArg("window");
-
-				// insert information now
-				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
-
-				// are we an image browser
-				if (typeof(win.ImageDialog) != "undefined") {
-					// we are, so update image dimensions...
-					if (win.ImageDialog.getImageData)
-						win.ImageDialog.getImageData();
-
-					// ... and preview if necessary
-					if (win.ImageDialog.showPreviewImage)
-						win.ImageDialog.showPreviewImage(URL);
-				}
-
-				// close popup window
-				tinyMCEPopup.close();
-			}
-		}
-
-		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
-	</script>
-	</head>
-	<body>
-	
-	<div class="tabs">
-		<ul >
-			<li class="current"><span>FileBrowser</span></li>
-		</ul>
-	</div>
-	<div class="panel_wrapper">
-
-		<div id="general_panel" class="panel current">
-			<div class="filebrowser path">
-				{{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
-			</div>
-			<div class="filebrowser folders">
-				<ul>
-					{{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
-				</ul>
-			</div>
-			<div class="filebrowser files {{$type}}">
-				<ul>
-				{{foreach $files as $f}}
-					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
-				{{/foreach}}
-				</ul>
-			</div>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
-	</div>	
-	</body>
-	
-</html>
diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl
deleted file mode 100755
index 61860d10f..000000000
--- a/view/tpl/filer_dialog.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="modal" id="item-filer-dialog">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{$title}}</h4>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        {{include file="field_combobox.tpl"}}
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">{{$cancel}}</button>
-        <button id="filer_save" type="button" class="btn btn-primary">{{$submit}}</button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
deleted file mode 100755
index 4def1415d..000000000
--- a/view/tpl/follow.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div id="follow-sidebar" class="widget">
-	<h3>{{$connect}}</h3>
-	<form action="follow" method="post" />
-		<div class="input-group">
-			<input class="form-control form-control-sm" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
-			<div class="input-group-btn">
-				<button class="btn btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
-			</div>
-		</div>
-	</form>
-	{{if $abook_usage_message}}
-	<div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div>
-	{{/if}}
-</div>
diff --git a/view/tpl/force_image_reload.tpl b/view/tpl/force_image_reload.tpl
deleted file mode 100644
index 839bd22b5..000000000
--- a/view/tpl/force_image_reload.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-{{* 
-Force the browser to reload an image from the server instead of the cache.
-based on an answer from http://stackoverflow.com/a/22429796/3343347
-
-Usage: Set $imgUrl to the src url you want to be re-fetched from the server
-
-*}}
-
-<script>
-  $(document).ready(
-    function() {
-      forceImgReload("{{$imgUrl}}");
-    }
-  );
-
-  {{* 
-    * find and return any existing img tags with a matching src url, and set them to an intermediate 
-    * src url so they can later be reverted back once the cached version has been updated.
-    *}}
-  function prepareImagesForReload(srcUrl) {
-
-    var result = $("img[src='" + srcUrl + "']").get();
-
-    for (i = 0; i < result.length; i++) {
-      {{* 
-        * Set the image to a reloading image, in this case an animated "reloading" svg 
-        * Ideally this wont be displayed long enough to matter.
-        *}}
-      result[i].src = "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100' preserveAspectRatio='xMidYMid' class='uil-reload'%3E%3Cpath fill='none' class='bk' d='M0 0h100v100H0z'/%3E%3Cg%3E%3Cpath d='M50 15a35 35 0 1 0 24.787 10.213' fill='none' stroke='%23777' stroke-width='12'/%3E%3Cpath d='M50 0v30l16-15L50 0' fill='%23777'/%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 50 50' to='360 50 50' dur='1s' repeatCount='indefinite'/%3E%3C/g%3E%3C/svg%3E";
-    }
-
-    return result;
-  }
-
-  function restoreImages(srcUrl, imgList) {
-
-    for (i = 0; i < imgList.length; i++) {
-      imgList[i].src = srcUrl;
-    }
-  }
-
-  function forceImgReload(srcUrl) {
-    var imgList;
-    var step = 0; 
-    var iframe = window.document.createElement("iframe");   // Hidden iframe, in which to perform the load+reload.
-  
-    {{* Callback function, called after iframe load+reload completes (or fails).
-        Will be called TWICE unless twostage-mode process is cancelled. (Once after load, once after reload). *}}
-    var iframeLoadCallback = function(e) { 
-
-      if (step === 0) { 
-        // initial load just completed.  Note that it doesn't actually matter if this load succeeded or not.
-      
-        step = 1; 
-        imgList = prepareImagesForReload(srcUrl); 
-        iframe.contentWindow.location.reload(true); // initiate forced-reload!
-      
-      } else if (step === 1) {
-        // forced re-load is done 
-
-        restoreImages(srcUrl, imgList);
-        if (iframe.parentNode) iframe.parentNode.removeChild(iframe);
-      }
-    }
-
-    iframe.style.display = "none";
-    window.parent.document.body.appendChild(iframe); {{* NOTE: if this is done AFTER setting src, Firefox MAY fail to fire the load event! *}}
-    iframe.addEventListener("load",  iframeLoadCallback, false);
-    iframe.addEventListener("error", iframeLoadCallback, false);
-    iframe.src = srcUrl;  
-  }
-</script>
diff --git a/view/tpl/generic_addon_settings.tpl b/view/tpl/generic_addon_settings.tpl
deleted file mode 100644
index bf39b2aea..000000000
--- a/view/tpl/generic_addon_settings.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="panel">
-	<div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings">
-		<h3>
-			<a title="{{$addon.2}}" data-toggle="collapse" data-parent="#settings" href="#{{$addon.0}}-settings-content" aria-controls="{{$addon.0}}-settings-content">
-				{{$addon.1}}
-			</a>
-		</h3>
-	</div>
-	<div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings">
-		<div class="section-content-tools-wrapper">
-			{{$content}}
-			{{if $addon.0}}
-			<div class="settings-submit-wrapper" >
-				<button id="{{$addon.0}}-submit" type="submit" name="{{$addon.0}}-submit" class="btn btn-primary" value="{{$addon.3}}">{{$addon.3}}</button>
-			</div>
-			{{/if}}
-		</div>
-	</div>
-</div>
diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl
deleted file mode 100755
index 67801e666..000000000
--- a/view/tpl/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="widget{{if $class}} {{$class}}{{/if}}">
-	{{if $title}}<h3>{{$title}}</h3>{{/if}}
-	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
-	
-	<ul class="nav nav-pills flex-column">
-		{{foreach $items as $item}}
-		<li class="nav-item"><a href="{{$item.url}}" class="nav-link{{if $item.selected}} active{{/if}}">{{$item.label}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/tpl/generic_modal.tpl b/view/tpl/generic_modal.tpl
deleted file mode 100644
index 18279b6f7..000000000
--- a/view/tpl/generic_modal.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="modal" id="generic-modal-{{$id}}" tabindex="-1" role="dialog" aria-labelledby="generic-modal-{{$id}}" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title" id="generic-modal-title-{{$id}}">{{$title}}</h4>
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-      </div>
-      <div class="modal-body" id="generic-modal-body-{{$id}}"></div>
-      <div class="modal-footer">
-        <button id="generic-modal-cancel-{{$id}}" type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$cancel}}</button>
-	{{if $ok}}
-        <button id="generic-modal-ok-{{$id}}" type="button" class="btn btn-primary">{{$ok}}</button>
-	{{/if}}
-      </div>
-    </div><!-- /.modal-content -->
-  </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl
deleted file mode 100755
index 627debc80..000000000
--- a/view/tpl/group_drop.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
-	<a href="group/drop/{{$id}}?t={{$form_security_token}}" 
-		onclick="return confirmDelete();" 
-		id="group-delete-icon-{{$id}}" 
-		class="group-delete-icon btn btn-outline-secondary" title="{{$delete}}" ><i class="fa fa-trash-o drop-icons"></i></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl
deleted file mode 100755
index d9412a6f7..000000000
--- a/view/tpl/group_edit.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h2>{{$title}}</h2>
-
-
-<div id="group-edit-wrapper" >
-	<form action="group/{{$gid}}" id="group-edit-form" method="post" >
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		
-		{{include file="field_input.tpl" field=$gname}}
-		{{include file="field_checkbox.tpl" field=$public}}
-		{{if $drop}}{{$drop}}{{/if}}
-		<div id="group-edit-submit-wrapper" >
-			<input type="submit" name="submit" value="{{$submit}}" >
-		</div>
-		<div id="group-edit-select-end" ></div>
-	</form>
-</div>
-
-
-{{if $groupeditor}}
-	<div id="group-update-wrapper">
-		{{include file="groupeditor.tpl"}}
-	</div>
-{{/if}}
-{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}
-</div>
diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl
deleted file mode 100755
index 270d2aa79..000000000
--- a/view/tpl/group_selection.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="form-group field custom">
-<label for="group-selection" id="group-selection-lbl">{{$label}}</label>
-<select class="form-control" name="group-selection" id="group-selection" >
-{{foreach $groups as $group}}
-<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option>
-{{/foreach}}
-</select>
-</div>
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
deleted file mode 100755
index 14f714ae9..000000000
--- a/view/tpl/group_side.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="widget" id="group-sidebar">
-	<h3>{{$title}}</h3>
-	<div>
-		<ul class="nav nav-pills flex-column">
-			{{foreach $groups as $group}}
-			<li class="nav-item nav-item-hack">
-				{{if $group.cid}}
-				<i id="group-{{$group.id}}" class="widget-nav-pills-checkbox fa fa-fw {{if $group.ismember}}fa-check-square-o{{else}}fa-square-o{{/if}}" onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}'); return true;"></i>
-				{{/if}}
-				{{if $group.edit}}
-				<a href="{{$group.edit.href}}" class="nav-link{{if $group.selected}} active{{/if}} widget-nav-pills-icons" title="{{$edittext}}"><i class="fa fa-fw fa-pencil"></i></a>
-				{{/if}}
-				<a class="nav-link{{if $group.selected}} active{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
-			</li>
-			{{/foreach}}
-			<li class="nav-item">
-				<a class="nav-link" href="group/new" title="{{$createtext}}" ><i class="fa fa-plus-circle"></i> {{$createtext}}</a>
-			</li>
-		</ul>
-
-	</div>
-</div>
-
-
-
-
diff --git a/view/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl
deleted file mode 100755
index c79bb0a2a..000000000
--- a/view/tpl/groupeditor.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div id="group">
-<h3>{{$groupeditor.label_members}}</h3>
-<div id="group-members" class="contact_list">
-{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
-</div>
-<div id="group-members-end"></div>
-<hr id="group-separator" />
-</div>
-
-<div id="contacts">
-<h3>{{$groupeditor.label_contacts}}</h3>
-<div id="group-all-contacts" class="contact_list">
-{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
-</div>
-<div id="group-all-contacts-end"></div>
-</div>
diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl
deleted file mode 100644
index cccee2229..000000000
--- a/view/tpl/hdr.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="nav-notifications-template" rel="template">
-	<a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}"><img class="menu-img-3" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a>
-</div>
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
deleted file mode 100755
index 5f874426c..000000000
--- a/view/tpl/head.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="{{$baseurl}}/" />
-<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" />
-{{$metas}}
-{{$head_css}}
-{{$js_strings}}
-{{$head_js}}
-{{$linkrel}}
-{{$plugins}}
-<script>
-	var updateInterval = {{$update_interval}};
-	var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}};
-	var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
-	var justifiedGalleryActive = false;
-	{{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}}
-	{{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}}
-	var preloadImages = {{$preload_images}};
-</script>
-
-
-
diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl
deleted file mode 100644
index 43b061dcc..000000000
--- a/view/tpl/help.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<div id="help-content" class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}: {{$heading}}</h2>
-	</div>
-	<div class="section-content-wrapper" id="doco-content">
-		<h3 id="doco-top-toc-heading">
-			<span class="fakelink" onclick="docoTocToggle(); return false;">
-				<i class="fa fa-fw fa-caret-right fakelink" id="doco-toc-toggle"></i>
-				{{$tocHeading}}
-			</span>
-		</h3>
-		<ul id="doco-top-toc" style="margin-bottom: 1.5em; display: none;"></ul>
-		{{$content}}
-	</div>
-</div>
-
-<script>
-	// Generate the table of contents in the side nav menu (see view/tpl/help.tpl)
-	$(document).ready(function () {
-		$('#doco-top-toc').toc({content: "#doco-content", headings: "h3,h4,h5,h6"});
-	});
-	
-	function docoTocToggle() {
-		if($('#doco-top-toc').is(':visible')) {
-			$('#doco-toc-toggle').removeClass('fa-cog').addClass('fa-caret-right');
-		} else {
-			$('#doco-toc-toggle').removeClass('fa-caret-right').addClass('fa-caret-down');
-		}
-		$('#doco-top-toc').toggle();
-		
-		return false;
-	}
-</script>
diff --git a/view/tpl/install.tpl b/view/tpl/install.tpl
deleted file mode 100755
index 0e77aa97b..000000000
--- a/view/tpl/install.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-{{$text}}
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
deleted file mode 100755
index ad0aef6a3..000000000
--- a/view/tpl/install_checks.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-<form  action="{{$baseurl}}/index.php?q=setup" method="post">
-<table>
-{{foreach $checks as $check}}
-	<tr><td>{{$check.title}} </td><td><i class="fa {{if $check.status}}fa-check-square-o{{else}}{{if $check.required}}fa-square-o{{else}}fa-exclamation{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr>
-	{{if $check.help}}
-	<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
-	{{/if}}
-{{/foreach}}
-</table>
-
-{{if $phpath}}
-	<input type="hidden" name="phpath" value="{{$phpath}}">
-{{/if}}
-
-{{if $passed}}
-	<input type="hidden" name="pass" value="2">
-	<input type="submit" value="{{$next}}">
-{{else}}
-	<input type="hidden" name="pass" value="1">
-	<input type="submit" value="{{$reload}}">
-{{/if}}
-</form>
diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl
deleted file mode 100755
index 1a58de129..000000000
--- a/view/tpl/install_db.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-<p>
-{{$info_01}}<br>
-{{$info_02}}<br>
-{{$info_03}}
-</p>
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-<form id="install-form" action="{{$baseurl}}/setup" method="post">
-
-<input type="hidden" name="phpath" value="{{$phpath}}" />
-<input type="hidden" name="pass" value="3" />
-
-{{include file="field_input.tpl" field=$dbhost}}
-{{include file="field_input.tpl" field=$dbport}}
-{{include file="field_input.tpl" field=$dbuser}}
-{{include file="field_password.tpl" field=$dbpass}}
-{{include file="field_input.tpl" field=$dbdata}}
-{{include file="field_select.tpl" field=$dbtype}}
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
-
-</form>
-
diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
deleted file mode 100755
index 62dcbb8b3..000000000
--- a/view/tpl/install_settings.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-<form id="install-form" action="{{$baseurl}}/setup" method="post">
-
-<input type="hidden" name="phpath" value="{{$phpath}}" />
-<input type="hidden" name="dbhost" value="{{$dbhost}}" />
-<input type="hidden" name="dbport" value="{{$dbport}}" />
-<input type="hidden" name="dbuser" value="{{$dbuser}}" />
-<input type="hidden" name="dbpass" value="{{$dbpass}}" />
-<input type="hidden" name="dbdata" value="{{$dbdata}}" />
-<input type="hidden" name="dbtype" value="{{$dbtype}}" />
-<input type="hidden" name="pass" value="4" />
-
-{{include file="field_input.tpl" field=$adminmail}}
-{{include file="field_input.tpl" field=$siteurl}}
-
-{{include file="field_select_grouped.tpl" field=$timezone}}
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
-
-</form>
-
diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl
deleted file mode 100755
index 440e1e02b..000000000
--- a/view/tpl/invite.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div id="invite" class="generic-content-wrapper">
-  <div class="section-title-wrapper">
-    <h2>{{$invite}}</h2>
-  </div>
-  <div class="section-content-wrapper">
-
-    <form action="invite" method="post" id="invite-form" >
-
-      <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-      <div id="invite-recipient-textarea" class="form-group field custom">
-        <label for="recipients">{{$addr_text}}</label>
-        <textarea id="invite-recipients" name="recipients" rows="6" class="form-control"></textarea>
-      </div>
-
-      <div id="invite-message-textarea" class="form-group field custom">
-        <label for="message">{{$msg_text}}</label>
-        <textarea id="invite-message" name="message" rows="12" class="form-control">{{$default_message}}</textarea>
-      </div>
-
-      <div id="invite-submit-wrapper" class="form-group">
-        <button class="btn btn-primary btn-sm" type="submit" id="invite-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
-      </div>
-
-    </form>
-
-  </div>
-</div>
diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl
deleted file mode 100644
index 95e38c0bd..000000000
--- a/view/tpl/item_attach.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{if $attaches}}
-{{foreach $attaches as $a}}
-<a class="dropdown-item" href="{{$a.url}}" title="{{$a.title}}"><i class="fa {{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a>
-{{/foreach}}
-{{/if}}
diff --git a/view/tpl/item_binary.tpl b/view/tpl/item_binary.tpl
deleted file mode 100644
index b19f7e7dd..000000000
--- a/view/tpl/item_binary.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>
-<center><a class="zrl" href="{{$url}}"><button class="btn btn-warning fakelink">{{$download}}</button></a></center>
-</p>
diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl
deleted file mode 100644
index e1b183c0d..000000000
--- a/view/tpl/item_categories.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{if $categories}}
-<!--div class="categorytags"-->
-{{foreach $categories as $cat}}
-<span class="item-category badge badge-pill badge-warning"><i class="fa fa-asterisk"></i>&nbsp;{{if $cat.url}}<a class="text-white" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
-{{/foreach}}
-<!--/div-->
-{{/if}}
-
diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl
deleted file mode 100644
index 4eb621f93..000000000
--- a/view/tpl/item_filer.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{if $categories}}
-<!--div class="filesavetags"-->
-{{foreach $categories as $cat}}
-<span class="item-category badge badge-pill badge-danger"><i class="fa fa-folder-o"></i>&nbsp;{{$cat.term}}&nbsp;<a href="{{$cat.removelink}}" class="text-white" title="{{$remove}}"><i class="fa fa-close"></i></a></span>
-{{/foreach}}
-<!--/div-->
-{{/if}}
-
diff --git a/view/tpl/item_import.tpl b/view/tpl/item_import.tpl
deleted file mode 100755
index e976417e1..000000000
--- a/view/tpl/item_import.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<h2>{{$title}}</h2>
-
-<form action="import_items" method="post" enctype="multipart/form-data" id="import-channel-form">
-	<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-	<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>
-
-	<label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label>
-	<input type="file" name="filename" id="import-filename" class="import-input" value="" />
-	<div id="import-filename-end" class="import-field-end"></div>
-
-	<input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" />
-	<div id="import-submit-end" class="import-field-end"></div>
-</form>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
deleted file mode 100755
index 1cc5a898a..000000000
--- a/view/tpl/jot-header.tpl
+++ /dev/null
@@ -1,598 +0,0 @@
-<script language="javascript" type="text/javascript">
-
-var editor = false;
-var plaintext = '{{$editselect}}';
-var pretext = '{{$pretext}}';
-
-function initEditor(cb){
-	if (editor==false){
-		$("#profile-jot-text-loading").spin('small').show();
-		{{$geotag}}
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").spin(false).hide();
-			$("#profile-jot-text").css({ 'height': 200 });
-			{{if $bbco_autocomplete}}
-			$("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode
-			{{/if}}
-			{{if $editor_autocomplete}}
-			if(typeof channelId === 'undefined')
-				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
-			else
-				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections
-			{{/if}}
-			editor = true;
-			  $("a#jot-perms-icon").colorbox({ 
-				  'inline' : true, 
-				  'transition' : 'elastic' 
-			});
-			$(".jothidden").show();
-			$("#profile-jot-text").addClass('jot-expanded');
-			if (typeof cb!="undefined") cb();
-			if(pretext.length)
-				addeditortext(pretext);
-			return;
-		}
-		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: {{$editselect}},
-			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,autoresize, inlinepopups",
-			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-			theme_advanced_buttons2 : "",
-			theme_advanced_buttons3 : "",
-			theme_advanced_toolbar_location : "top",
-			theme_advanced_toolbar_align : "center",
-			theme_advanced_blockformats : "blockquote,code",
-			gecko_spellcheck : true,
-			paste_text_sticky : true,
-			entity_encoding : "raw",
-			add_unload_trigger : false,
-			remove_linebreaks : false,
-			force_p_newlines : false,
-			force_br_newlines : true,
-			forced_root_block : '',
-			convert_urls: false,
-			content_css: "{{$baseurl}}/view/custom_tinymce.css",
-			theme_advanced_path : false,
-			file_browser_callback : "fcFileBrowser",
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-				});
-
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").spin(false).hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
-
-			}
-		});
-
-		editor = true;
-	} else {
-		if (typeof cb!="undefined") cb();
-	}
-}
-
-function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
-	initEditor();
-}
-</script>
-<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>
-<script>
-	$(document).ready(function() {
-		/* enable tinymce on focus and click */
-		$("#profile-jot-text").focus(enableOnUser);
-		$("#profile-jot-text").click(enableOnUser);
-
-		var upload_title = $('#wall-image-upload').attr('title');
-		var attach_title = $('#wall-file-upload').attr('title');
-		try {
-			var uploader = new window.AjaxUpload('wall-image-upload',
-			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
-				name: 'userfile',
-				title: upload_title,
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#jot-media').val($('#jot-media').val() + response);
-					$('#profile-rotator').spin(false);
-				}
-			});
-		} catch (e) {
-		}
-		try {
-			var uploader_sub = new window.AjaxUpload('wall-image-upload-sub',
-			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
-				name: 'userfile',
-				title: upload_title,
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#jot-media').val($('#jot-media').val() + response);
-					$('#profile-rotator').spin(false);
-				}
-			});
-		} catch(e) {
-		}
-		try {
-			var file_uploader = new window.AjaxUpload('wall-file-upload',
-			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
-				name: 'userfile',
-				title: attach_title,
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#jot-media').val($('#jot-media').val() + response);
-					$('#profile-rotator').spin(false);
-				}
-			});
-		} catch(e) {
-		}
-		try {
-			var file_uploader_sub = new window.AjaxUpload('wall-file-upload-sub',
-			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
-				name: 'userfile',
-				title: attach_title,
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#jot-media').val($('#jot-media').val() + response);
-					$('#profile-rotator').spin(false);
-				}
-			});
-		} catch(e) {
-		}
-        
-        
-        // call initialization file
-        if (window.File && window.FileList && window.FileReader) {
-          DragDropUploadInit();
-        }
-	});
-
-	function deleteCheckedItems() {
-		var checkedstr = '';
-
-		$('.item-select').each( function() {
-			if($(this).is(':checked')) {
-				if(checkedstr.length != 0) {
-					checkedstr = checkedstr + ',' + $(this).val();
-				}
-				else {
-					checkedstr = $(this).val();
-				}
-			}
-		});
-		$.post('item', { dropitems: checkedstr }, function(data) {
-			window.location.reload();
-		});
-	}
-
-	function jotGetLink() {
-            textarea = document.getElementById('profile-jot-text');
-            if (textarea.selectionStart || textarea.selectionStart == "0") {
-                    var start = textarea.selectionStart;
-                    var end = textarea.selectionEnd;	
-                    if (end > start) {
-                        reply = prompt("{{$linkurl}}");
-                        if(reply && reply.length) {
-                            textarea.value = textarea.value.substring(0, start) + "[url=" + reply + "]" + textarea.value.substring(start, end) + "[/url]" + textarea.value.substring(end, textarea.value.length);
-                        }
-                    } else {
-                        reply = prompt("{{$linkurl}}");
-                        if(reply && reply.length) {
-                            reply = bin2hex(reply);
-                            $('#profile-rotator').spin('tiny');
-                            $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
-                                    addeditortext(data);
-                                    $('#profile-rotator').spin(false);
-                            });
-                        }
-                    }
-            }
-	}
-
-	function jotGetLocation() {
-		reply = prompt("{{$whereareu}}", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotGetExpiry() {
-		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
-		$('#expiryModal').modal();
-		$('#expiry-modal-OKButton').on('click', function() {
-			reply=$('#expiration-date').val();
-			if(reply && reply.length) {
-				$('#jot-expire').val(reply);
-				$('#expiryModal').modal('hide');
-			}
-		})
-	}
-
-	function jotGetPubDate() {
-		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
-		$('#createdModal').modal();
-		$('#created-modal-OKButton').on('click', function() {
-			reply=$('#created-date').val();
-			if(reply && reply.length) {
-				$('#jot-created').val(reply);
-				$('#createdModal').modal('hide');
-			}
-		})
-	}
-
-
-	function jotShare(id) {
-		if ($('#jot-popup').length != 0) $('#jot-popup').show();
-
-		$('#like-rotator-' + id).spin('tiny');
-		$.get('{{$baseurl}}/share/' + id, function(data) {
-			if (!editor) $("#profile-jot-text").val("");
-			initEditor(function(){
-				addeditortext(data);
-				$('#like-rotator-' + id).spin(false);
-				$(window).scrollTop(0);
-			});
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound) {
-			event.preventDefault();
-			var editwin = '#' + event.target.id;
-			var commentwin = false;
-			if(editwin) {
-				commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
-				if(commentwin) {
-					var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
-					$('#comment-edit-text-' + commentid).addClass('hover');
-				}
-			}
-		}
-	}
-
-	function linkdropexit(event) {
-		var editwin = '#' + event.target.id;
-		var commentwin = false;
-		if(editwin) {
-			commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
-			if(commentwin) {
-				var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
-				$('#comment-edit-text-' + commentid).removeClass('hover');
-			}
-		}
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.preventDefault();
-		var editwin = '#' + event.target.id;
-		var commentwin = false;
-		if(editwin) {
-			commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
-			if(commentwin) {
-				var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
-				commentOpen(document.getElementById(event.target.id),commentid);
-
-			}
-		}
-
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').spin('tiny');
-			$.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
-				if(commentwin) {
-					$(editwin).val( $(editwin).val() + data );
-					$('#profile-rotator').spin(false);
-				}
-				else {
-					if (!editor) $("#profile-jot-text").val("");
-					initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').spin(false);
-					});
-				}
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("{{$term}}");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('{{$baseurl}}/tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-
-	function itemFiler(id) {
-		if($('#item-filer-dialog').length)
-			$('#item-filer-dialog').remove();
-
-		$.get('filer/', function(data){
-			$('body').append(data);
-			$('#item-filer-dialog').modal('show');
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('{{$baseurl}}/filer/' + id + '?term=' + reply, NavUpdate);
-//					if(timer) clearTimeout(timer);
-//					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$('#item-filer-dialog').modal('hide');
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	function itemBookmark(id) {
-		$.get('{{$baseurl}}/bookmarks?f=&item=' + id);
-		if(timer) clearTimeout(timer);
-		timer = setTimeout(NavUpdate,1000);
-	}
-
-	function itemAddToCal(id) {
-		$.get('{{$baseurl}}/events/add/' + id);
-		if(timer) clearTimeout(timer);
-		timer = setTimeout(NavUpdate,1000);
-	}
-
-	function toggleVoting() {
-		if($('#jot-consensus').val() > 0) {
-			$('#jot-consensus').val(0);
-			$('#profile-voting, #profile-voting-sub').removeClass('fa-check-square-o').addClass('fa-square-o');
-		}
-		else {
-			$('#jot-consensus').val(1);
-			$('#profile-voting, #profile-voting-sub').removeClass('fa-square-o').addClass('fa-check-square-o');
-		}
-	}
-
-	function toggleNoComment() {
-		if($('#jot-nocomment').val() > 0) {
-			$('#jot-nocomment').val(0);
-			$('#profile-nocomment, #profile-nocomment-sub').removeClass('fa-comments-o').addClass('fa-comments');
-			$('#profile-nocomment-wrapper').attr('title', '{{$nocomment_enabled}}');
-		}
-		else {
-			$('#jot-nocomment').val(1);
-			$('#profile-nocomment, #profile-nocomment-sub').removeClass('fa-comments').addClass('fa-comments-o');
-			$('#profile-nocomment-wrapper').attr('title', '{{$nocomment_disabled}}');
-		}
-	}
-
-	function jotReact(id,icon) {
-		if(id && icon) {
-			$.get('{{$baseurl}}/react?f=&postid=' + id + '&emoji=' + icon);
-			if(timer) clearTimeout(timer);
-			timer = setTimeout(NavUpdate,1000);
-		}
-	}
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').attr('disabled', true);
-	}
-
-
-    var initializeEmbedPhotoDialog = function () {
-        $('.embed-photo-selected-photo').each(function (index) {
-            $(this).removeClass('embed-photo-selected-photo');
-        });
-        getPhotoAlbumList();
-        $('#embedPhotoModalBodyAlbumDialog').off('click');
-        $('#embedPhotoModal').modal('show');
-    };
-
-    var choosePhotoFromAlbum = function (album) {
-        $.post("embedphotos/album", {name: album},
-            function(data) {
-                if (data['status']) {
-                    $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
-                    $('#embedPhotoModalBodyAlbumDialog').html('\
-                            <div><div class="nav nav-pills flex-column">\n\
-                                <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
-                                    <i class="fa fa-chevron-left"></i>&nbsp\n\
-                                    {{$modaldiffalbum}}\n\
-                                    </a>\n\
-                                </li>\n\
-                            </div><br></div>')
-                    $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
-                    $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
-                        evt.preventDefault();
-                        var image = document.getElementById(evt.target.id);
-                        if (typeof($(image).parent()[0]) !== 'undefined') {
-                            var imageparent = document.getElementById($(image).parent()[0].id);
-                            $(imageparent).toggleClass('embed-photo-selected-photo');
-                        }
-                    });
-                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-                    $('#embed-photo-OKButton').click(function () {
-                        $('.embed-photo-selected-photo').each(function (index) {
-                            var href = $(this).attr('href');
-                            $.post("embedphotos/photolink", {href: href},
-                                function(ddata) {
-                                    if (ddata['status']) {
-                                        addeditortext(ddata['photolink']);
-                                    } else {
-                                        window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
-                                    }
-                                    return false;
-                                },
-                            'json');
-                        });
-                        $('#embedPhotoModalBodyAlbumDialog').html('');
-                        $('#embedPhotoModalBodyAlbumDialog').off('click');
-                        $('#embedPhotoModal').modal('hide');
-                    });
-                } else {
-                    window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
-                }
-                return false;
-            },
-        'json');
-    };
-
-    var getPhotoAlbumList = function () {
-        $.post("embedphotos/albumlist", {},
-            function(data) {
-                if (data['status']) {
-                    var albums = data['albumlist']; //JSON.parse(data['albumlist']);
-                    $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
-                    $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
-                    for(var i=0; i<albums.length; i++) {
-                        var albumName = albums[i].text;
-			var jsAlbumName = albums[i].jstext;
-			var albumLink = '<li class="nav-item">';
-			albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
-                        albumLink += '</li>';
-                        $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
-                    }
-                    $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
-                } else {
-                    window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
-                }
-                return false;
-            },
-        'json');
-    };
-
-    //
-    // initialize
-    function DragDropUploadInit() {
-
-      var filedrag = $("#profile-jot-text");
-
-      // is XHR2 available?
-      var xhr = new XMLHttpRequest();
-      if (xhr.upload) {
-
-        // file drop
-        filedrag.on("dragover", DragDropUploadFileHover);
-        filedrag.on("dragleave", DragDropUploadFileHover);
-        filedrag.on("drop", DragDropUploadFileSelectHandler);
-
-      }
-
-      window.filesToUpload = 0;
-      window.fileUploadsCompleted = 0;
-
-
-    }
-
-    // file drag hover
-    function DragDropUploadFileHover(e) {
-      e.stopPropagation();
-      e.preventDefault();
-      e.target.className = (e.type == "dragover" ? "hover" : "");
-    }
-
-    // file selection
-    function DragDropUploadFileSelectHandler(e) {
-
-      // cancel event and hover styling
-      DragDropUploadFileHover(e);
-	  if (!editor) $("#profile-jot-text").val("");
-
-
-      // fetch FileList object
-      var files = e.target.files || e.originalEvent.dataTransfer.files;
-      // process all File objects
-      for (var i = 0, f; f = files[i]; i++) {
-        DragDropUploadFile(f, i);
-      }
-
-    }
-
-    // upload  files
-    function DragDropUploadFile(file, idx) {
-
-      window.filesToUpload = window.filesToUpload + 1;
-
-      var xhr = new XMLHttpRequest();
-      xhr.withCredentials = true;   // Include the SESSION cookie info for authentication
-      (xhr.upload || xhr).addEventListener('progress', function (e) {
-         $('#profile-rotator').spin('tiny');
-      });
-      xhr.addEventListener('load', function (e) {
-        //console.log('xhr upload complete', e);
-        window.fileUploadsCompleted = window.fileUploadsCompleted + 1;
-
-		initEditor(function() {
-			addeditortext(xhr.responseText);
-		});
-
-		$('#jot-media').val($('#jot-media').val() + xhr.responseText);
-        // When all the uploads have completed, refresh the page
-        if (window.filesToUpload > 0 && window.fileUploadsCompleted === window.filesToUpload) {  
-          $('#profile-rotator').spin(false);
-          window.fileUploadsCompleted = window.filesToUpload = 0;
-        }
-      });
-      // POST to the wall_upload endpoint
-      xhr.open('post', '{{$baseurl}}/wall_attach/{{$nickname}}', true);
-
-      var data = new FormData();
-      data.append('userfile', file);
-      xhr.send(data);
-    }
-
-</script>
-
-<script>
-$( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-delete-link,.block-delete-link", function(e) {
-	var link = $(this).attr("href"); // "get" the intended link in a var
-
-	if (typeof(eval($.fn.modal)) === 'function'){
-		e.preventDefault();
-		bootbox.confirm("<h4>{{$confirmdelete}}</h4>",function(result) {
-			if (result) {
-				document.location.href = link;
-			}
-		});
-	} else {
-		return confirm("{{$confirmdelete}}");
-	}
-});
-</script>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
deleted file mode 100755
index dbbb470c5..000000000
--- a/view/tpl/jot.tpl
+++ /dev/null
@@ -1,303 +0,0 @@
-<form id="profile-jot-form" action="{{$action}}" method="post" class="acl-form" data-form_id="profile-jot-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-	{{$mimeselect}}
-	{{$layoutselect}}
-	{{if $id_select}}
-	<div class="channel-id-select-div">
-		<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
-	</div>
-	{{/if}}
-	<div class="mb-4" id="profile-jot-wrapper">
-		{{if $parent}}
-		<input type="hidden" name="parent" value="{{$parent}}" />
-		{{/if}}
-		<input type="hidden" name="obj_type" value="{{$ptyp}}" />
-		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-		<input type="hidden" name="return" value="{{$return_path}}" />
-		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
-		<input type="hidden" name="expire" id="jot-expire" value="{{$defexpire}}" />
-		<input type="hidden" name="created" id="jot-created" value="{{$defpublish}}" />
-		<input type="hidden" name="media_str" id="jot-media" value="" />
-		<input type="hidden" name="source" id="jot-source" value="{{$source}}" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="webpage" value="{{$webpage}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
-		<input type="hidden" id="jot-nocomment" name="nocomment" value="{{if $nocomment}}{{$nocomment}}{{else}}0{{/if}}" />
-
-		{{if $webpage}}
-		<div id="jot-pagetitle-wrap" class="jothidden">
-			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
-		</div>
-		{{/if}}
-		<div id="jot-title-wrap" class="jothidden">
-			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex="1" value="{{$title}}">
-		</div>
-		{{if $catsenabled}}
-		<div id="jot-category-wrap" class="jothidden">
-			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput">
-		</div>
-		{{/if}}
-		<div id="jot-text-wrap">
-			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$share}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$content}}</textarea>
-		</div>
-		{{if $attachment}}
-		<div id="jot-attachment-wrap">
-			<input class="jot-attachment" name="attachment" id="jot-attachment" type="text" value="{{$attachment}}" readonly="readonly" onclick="this.select();">
-		</div>
-		{{/if}}
-		<div id="profile-jot-submit-wrapper" class="clearfix p-2 jothidden">
-			<div id="profile-jot-submit-left" class="btn-toolbar float-left">
-				{{if $bbcode}}
-				<div class="btn-group mr-2">
-					<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;">
-						<i class="fa fa-bold jot-icons"></i>
-					</button>
-					<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;">
-						<i class="fa fa-italic jot-icons"></i>
-					</button>
-					<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;">
-						<i class="fa fa-underline jot-icons"></i>
-					</button>
-					<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;">
-						<i class="fa fa-quote-left jot-icons"></i>
-					</button>
-					<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;">
-						<i class="fa fa-terminal jot-icons"></i>
-					</button>
-				</div>
-				{{/if}}
-				{{if $visitor}}
-				<div class="btn-group mr-2 d-none d-lg-flex">
-					{{if $writefiles}}
-					<button id="wall-file-upload" class="btn btn-outline-secondary btn-sm" title="{{$attach}}" >
-						<i id="wall-file-upload-icon" class="fa fa-paperclip jot-icons"></i>
-					</button>
-					{{/if}}
-					{{if $weblink}}
-					<button id="profile-link-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
-						<i id="profile-link" class="fa fa-link jot-icons"></i>
-					</button>
-					{{/if}}
-					{{if $embedPhotos}}
-					<button id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
-						<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i>
-					</button>
-					{{/if}}
-				</div>
-				<div class="btn-group mr-2 d-none d-lg-flex">
-					{{if $setloc}}
-					<button id="profile-location-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
-						<i id="profile-location" class="fa fa-globe jot-icons"></i>
-					</button>
-					{{/if}}
-					{{if $clearloc}}
-					<button id="profile-nolocation-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled">
-						<i id="profile-nolocation" class="fa fa-circle-o jot-icons"></i>
-					</button>
-					{{/if}}
-				{{else}}
-				<div class="btn-group d-none d-lg-flex">
-				{{/if}}
-				{{if $feature_expire}}
-					<button id="profile-expire-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
-						<i id="profile-expires" class="fa fa-eraser jot-icons"></i>
-					</button>
-				{{/if}}
-				{{if $feature_future}}
-					<button id="profile-future-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;">
-						<i id="profile-future" class="fa fa-clock-o jot-icons"></i>
-					</button>
-				{{/if}}
-				{{if $feature_encrypt}}
-					<button id="profile-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
-						<i id="profile-encrypt" class="fa fa-key jot-icons"></i>
-					</button>
-				{{/if}}
-				{{if $feature_voting}}
-					<button id="profile-voting-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$voting}}" onclick="toggleVoting();return false;">
-						<i id="profile-voting" class="fa fa-square-o jot-icons"></i>
-					</button>
-				{{/if}}
-				{{if $feature_nocomment}}
-					<button id="profile-nocomment-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$nocommenttitle}}" onclick="toggleNoComment();return false;">
-						<i id="profile-nocomment" class="fa fa-comments jot-icons"></i>
-					</button>
-				{{/if}}
-				</div>
-				{{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}}
-				<div class="btn-group d-lg-none">
-					<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-						<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
-					</button>
-					<div class="dropdown-menu">
-						{{if $visitor}}
-						{{if $writefiles}}
-						<a class="dropdown-item" id="wall-file-upload-sub" href="#" ><i class="fa fa-paperclip"></i>&nbsp;{{$attach}}</a>
-						{{/if}}
-						{{if $weblink}}
-						<a class="dropdown-item" href="#" onclick="jotGetLink(); return false;"><i class="fa fa-link"></i>&nbsp;{{$weblink}}</a>
-						{{/if}}
-						{{if $embedPhotos}}
-						<a class="dropdown-item" href="#" onclick="initializeEmbedPhotoDialog(); return false;"><i class="fa fa-file-image-o jot-icons"></i>&nbsp;{{$embedPhotos}}</a>
-						{{/if}}
-						{{if $setloc}}
-						<a class="dropdown-item" href="#" onclick="jotGetLocation(); return false;"><i class="fa fa-globe"></i>&nbsp;{{$setloc}}</a>
-						{{/if}}
-						{{if $clearloc}}
-						<a class="dropdown-item" href="#" onclick="jotClearLocation(); return false;"><i class="fa fa-circle-o"></i>&nbsp;{{$clearloc}}</a>
-						{{/if}}
-						{{/if}}
-						{{if $feature_expire}}
-						<a class="dropdown-item" href="#" onclick="jotGetExpiry(); return false;"><i class="fa fa-eraser"></i>&nbsp;{{$expires}}</a>
-						{{/if}}
-						{{if $feature_future}}
-						<a class="dropdown-item" href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i>&nbsp;{{$future_txt}}</a>
-						{{/if}}
-						{{if $feature_encrypt}}
-						<a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
-						{{/if}}
-						{{if $feature_voting}}
-						<a class="dropdown-item" href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="fa fa-square-o"></i>&nbsp;{{$voting}}</a>
-						{{/if}}
-						{{if $feature_nocomment}}
-						<a class="dropdown-item" href="#" onclick="toggleNoComment(); return false;"><i id="profile-nocomment-sub" class="fa fa-comments"></i>&nbsp;{{$nocommenttitlesub}}</a>
-						{{/if}}
-					</div>
-				</div>
-				{{/if}}
-			</div>
-			<div id="profile-rotator-wrapper" class="float-left">
-				<div id="profile-rotator"></div>
-			</div>
-			<div id="profile-jot-submit-right" class="btn-group float-right">
-				{{if $preview}}
-				<button class="btn btn-outline-secondary btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
-					<i class="fa fa-eye jot-icons" ></i>
-				</button>
-				{{/if}}
-				{{if $jotnets}}
-				<button id="dbtn-jotnets" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#jotnetsModal" type="button" title="{{$jotnets_label}}" style="{{if $lockstate == 'lock'}}display: none;{{/if}}">
-					<i class="fa fa-share-alt jot-icons"></i>
-				</button>
-				{{/if}}
-				{{if $showacl}}
-				<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form">
-					<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons{{if $bang}} jot-lock-warn{{/if}}"></i>
-				</button>
-				{{/if}}
-				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex="3" name="button-submit">{{$share}}</button>
-			</div>
-			<div class="clear"></div>
-			{{if $jotplugins}}
-			<div id="profile-jot-plugin-wrapper" class="mt-2">
-				{{$jotplugins}}
-			</div>
-			{{/if}}
-			{{if $jotnets}}
-			<div class="modal" id="jotnetsModal" tabindex="-1" role="dialog" aria-labelledby="jotnetsModalLabel" aria-hidden="true">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<h4 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h4>
-							<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-						</div>
-						<div class="modal-body">
-							{{$jotnets}}
-						</div>
-						<div class="modal-footer">
-							<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
-						</div>
-					</div><!-- /.modal-content -->
-				</div><!-- /.modal-dialog -->
-			</div><!-- /.modal -->
-			{{/if}}
-		</div>
-	</div>
-</form>
-
-<div id="jot-preview-content" style="display:none;"></div>
-
-{{$acl}}
-
-{{if $feature_expire}}
-<!-- Modal for item expiry-->
-<div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-			</div>
-			<div class="modal-body form-group" style="width:90%">
-				<div class="date">
-					<input type="text" placeholder="yyyy-mm-dd HH:MM" name="start_text" id="expiration-date" class="form-control" />
-				</div>
-				<script>
-					$(function () {
-						var picker = $('#expiration-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 });
-					});
-				</script>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$expiryModalCANCEL}}</button>
-				<button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button>
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-{{/if}}
-
-{{if $feature_future}}
-<div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-			</div>
-			<div class="modal-body form-group" style="width:90%">
-				<div class="date">
-					<input type="text" placeholder="yyyy-mm-dd HH:MM" name="created_text" id="created-date" class="form-control" />
-				</div>
-				<script>
-					$(function () {
-						var picker = $('#created-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 });
-					});
-				</script>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$expiryModalCANCEL}}</button>
-				<button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button>
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-{{/if}}
-
-{{if $embedPhotos}}
-<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-			</div>
-			<div class="modal-body" id="embedPhotoModalBody" >
-				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
-					<div id="embedPhotoModalBodyAlbumList"></div>
-				</div>
-				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
-				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-{{/if}}
-
-{{if $content || $attachment || $expanded}}
-<script>initEditor();</script>
-{{/if}}
diff --git a/view/tpl/jot_geotag.tpl b/view/tpl/jot_geotag.tpl
deleted file mode 100755
index 60f128850..000000000
--- a/view/tpl/jot_geotag.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
-			$('#profile-nolocation-wrapper').attr('disabled', false);
-		});
-	}
-
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
deleted file mode 100755
index 4243c2ea5..000000000
--- a/view/tpl/js_strings.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<script>
-
-	var aStr = {
-
-		'delitem'     : "{{$delitem}}",
-		'comment'     : "{{$comment}}",
-		'showmore'    : "{{$showmore}}",
-		'showfewer'   : "{{$showfewer}}",
-		'divgrowmore' : "{{$divgrowmore}}",
-		'divgrowless' : "{{$divgrowless}}",
-		'pwshort'     : "{{$pwshort}}",
-		'pwnomatch'   : "{{$pwnomatch}}",
-		'everybody'   : "{{$everybody}}",
-		'passphrase'  : "{{$passphrase}}",
-		'passhint'    : "{{$passhint}}",
-		'permschange' : "{{$permschange}}",
-		'closeAll'    : "{{$closeAll}}",
-		'nothingnew'  : "{{$nothingnew}}",
-		'rating_desc' : "{{$rating_desc}}",
-		'rating_val'  : "{{$rating_val}}",
-		'rating_text' : "{{$rating_text}}",
-		'submit'      : "{{$submit}}",
-		'linkurl'     : "{{$linkurl}}",
-		'leavethispage' : "{{$leavethispage}}",
-		'location'    : "{{$location}}",
-
-		't01' : "{{$t01}}",
-		't02' : "{{$t02}}",
-		't03' : "{{$t03}}",
-		't04' : "{{$t04}}",
-		't05' : "{{$t05}}",
-		't06' : "{{$t06}}",
-		't07' : "{{$t07}}",
-		't08' : "{{$t08}}",
-		't09' : "{{$t09}}",
-		't10' : "{{$t10}}",
-		't11' : "{{$t11}}",
-		't12' : "{{$t12}}",
-		't13' : "{{$t13}}",
-		't14' : "{{$t14}}",
-		't15' : "{{$t15}}",
-		't16' : "{{$t16}}",
-		't17' : "{{$t17}}",
-
-		'monthNames' : [ "{{$January}}","{{$February}}","{{$March}}","{{$April}}","{{$May}}","{{$June}}","{{$July}}","{{$August}}","{{$September}}","{{$October}}","{{$November}}","{{$December}}" ],
-		'monthNamesShort' : [ "{{$Jan}}","{{$Feb}}","{{$Mar}}","{{$Apr}}","{{$MayShort}}","{{$Jun}}","{{$Jul}}","{{$Aug}}","{{$Sep}}","{{$Oct}}","{{$Nov}}","{{$Dec}}" ],
-		'dayNames' : ["{{$Sunday}}","{{$Monday}}","{{$Tuesday}}","{{$Wednesday}}","{{$Thursday}}","{{$Friday}}","{{$Saturday}}"],
-		'dayNamesShort' : ["{{$Sun}}","{{$Mon}}","{{$Tue}}","{{$Wed}}","{{$Thu}}","{{$Fri}}","{{$Sat}}"],
-		'today' : "{{$today}}",
-		'month' : "{{$month}}",
-		'week' : "{{$week}}",
-		'day' : "{{$day}}",
-		'allday' : "{{$allday}}"
-	};
-
-</script>
-		
diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl
deleted file mode 100755
index 1324442f3..000000000
--- a/view/tpl/lang_selector.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
-<br />
-<div id="language-selector" >
-	<form action="#" method="post" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{foreach $langs.0 as $v=>$l}}
-				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
-			{{/foreach}}
-		</select>
-	</form>
-</div>
-</div>
diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl
deleted file mode 100644
index 1bbe14893..000000000
--- a/view/tpl/layoutlist.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $editor}}
-		<div class="pull-right">
-			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('layout-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
-			<a href="{{$help.url}}" target="_blank" class="btn btn-sm btn-warning" title="{{$help.title}}"><i class="fa fa-info"></i>&nbsp;{{$help.text}}</a>
-		</div>
-		{{/if}}
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{if $editor}}
-	<div id="layout-editor" class="section-content-tools-wrapper">
-		{{$editor}}
-	</div>
-	{{/if}}
-
-	{{if $pages}}
-	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
-		<table id="layout-list-table">
-			<tr>
-				<th width="1%">{{$name}}</th>
-				<th width="94%">{{$descr}}</th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%" class="d-none d-md-table-cell">{{$created}}</th>
-				<th width="1%" class="d-none d-md-table-cell">{{$edited}}</th>
-			</tr>
-			{{foreach $pages as $key => $items}}
-			{{foreach $items as $item}}
-			<tr id="layout-list-item-{{$item.url}}">
-				<td>
-					{{if $view}}
-					<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
-					{{else}}
-					{{$item.title}}
-					{{/if}}
-				</td>
-				<td>
-					{{$item.descr}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $edit}}
-					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $item.bb_element}}
-					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $edit}}
-					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-					{{/if}}
-				</td>
-				<td class="d-none d-md-table-cell">
-					{{$item.created}}
-				</td>
-				<td class="d-none d-md-table-cell">
-					{{$item.edited}}
-				</td>
-			</tr>
-			{{/foreach}}
-			{{/foreach}}
-		</table>
-	</div>
-	<div class="clear"></div>
-	{{/if}}
-</div>
diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl
deleted file mode 100755
index e83b885fe..000000000
--- a/view/tpl/like_noshare.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
-	<i class="fa fa-thumbs-o-up item-tool btn btn-outline-secondary" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i>
-	<i class="fa fa-thumbs-o-down item-tool btn btn-outline-secondary" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i>
-	<div id="like-rotator-{{$id}}" class="like-rotator"></div>
-</div>
diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl
deleted file mode 100644
index a8c75b6a8..000000000
--- a/view/tpl/locmanage.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<script>
-			function primehub(id) {
-				$.post(baseurl + '/locs','primary='+id,function(data) { window.location.href=window.location.href; });
-			}
-			function drophub(id) {
-				$.post(baseurl + '/locs','drop='+id,function(data) { window.location.href=window.location.href; });
-			}
-		</script>
-		<button class="btn btn-success btn-sm pull-right" onclick="window.location.href='/locs/f=&sync=1'; return false;"><i class="fa fa-refresh"></i>&nbsp;{{$sync}}</button>
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper-np">
-		<div class="section-content-warning-wrapper">
-			{{$sync_text}}
-		</div>
-		<div class="section-content-info-wrapper">
-			{{$drop_text}}<br>
-			{{$last_resort}}
-		</div>
-		<table id="locs-index">
-			<tr>
-				<th>{{$addr}}</th>
-				<th class="d-none d-md-table-cell">{{$loc}}</th>
-				<th>{{$mkprm}}</th>
-				<th>{{$drop}}</th>
-			</tr>
-			{{foreach $hubs as $hub}}
-			{{if ! $hub.deleted }}
-			<tr class="locs-index-row">
-				<td>{{$hub.hubloc_addr}}</td>
-				<td class="d-none d-md-table-cell">{{$hub.hubloc_url}}</td>
-				<td>{{if $hub.primary}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o primehub" onclick="primehub({{$hub.hubloc_id}}); return false;"></i>{{/if}}</td>
-				<td><i class="fa fa-trash-o drophub" onclick="drophub({{$hub.hubloc_id}}); return false;"></i></td>
-			</tr>
-			{{/if}}
-			{{/foreach}}
-		</table>
-	</div>
-</div>
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
deleted file mode 100755
index 3d3faa41c..000000000
--- a/view/tpl/login.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-	<div id="login-main">
-		<div id="login-input" class="form-group">
-			{{include file="field_input.tpl" field=$lname}}
-			{{include file="field_password.tpl" field=$lpassword}}
-			{{include file="field_checkbox.tpl" field=$remember_me}}
-			<button type="submit" name="submit" class="btn btn-block btn-primary">{{$login}}</button>
-		</div>
-		<div id="login-extra-links">
-			{{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link" class="pull-right">{{$register.desc}}</a>{{/if}}
-			<a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
-		</div>
-	</div>
-	{{foreach $hiddens as $k=>$v}}
-		<input type="hidden" name="{{$k}}" value="{{$v}}" />
-	{{/foreach}}
-</form>
-{{if $login_page}}
-<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
-{{/if}}
diff --git a/view/tpl/logout.tpl b/view/tpl/logout.tpl
deleted file mode 100755
index 7548ed196..000000000
--- a/view/tpl/logout.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<form action="{{$dest_url}}" method="post" >
-<div class="logout-wrapper">
-<input type="hidden" name="auth-params" value="logout" />
-<input type="submit" name="submit" id="logout-button" value="{{$logout}}" />
-</div>
-</form>
diff --git a/view/tpl/lostpass.tpl b/view/tpl/lostpass.tpl
deleted file mode 100755
index 8ecfd215b..000000000
--- a/view/tpl/lostpass.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h3>{{$title}}</h3>
-
-<p id="lostpass-desc">
-{{$desc}}
-</p>
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">{{$name}}</label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-		<input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
-</div>
-<div id="login-extra-end"></div>
-<div id="login-submit-end"></div>
-</form>
-</div>
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
deleted file mode 100755
index 759517b7f..000000000
--- a/view/tpl/mail_conv.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<div id="mail-{{$mail.id}}" class="mb-2 clearfix mail-conv-outside-wrapper">
-	<div class="mb-2 clearfix wall-item-head">
-		<div class="wall-item-info" >
-			<a href="{{$mail.from_url}}"><img class="wall-item-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a>
-		</div>
-		<div class="mail-conv-detail">
-			{{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}}
-			<div class="wall-item-name"><a class="wall-item-name-link" href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
-			<div class="autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div>
-		</div>
-	</div>
-	<div class="clearfix mail-conv-content">
-		<div class="clearfix mail-conv-body">
-			{{$mail.body}}
-		</div>
-		{{if $mail.attachments}}
-		<div class="dropdown float-left">
-			<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-fw fa-paperclip"></i></button>
-			<div class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</div>
-		</div>
-		{{/if}}
-		<div class="float-right dropdown">
-			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}">
-				<i class="fa fa-cog"></i>
-			</button>
-			<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}">
-				{{if $mail.can_recall}}
-				<a class="dropdown-item" href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-fw fa-undo"></i>&nbsp;{{$mail.recall}}</a>
-				{{/if}}
-				<a class="dropdown-item" href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-fw fa-trash-o"></i>&nbsp;{{$mail.delete}}</a>
-				{{if $mail.can_recall}}
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a>
-				{{/if}}
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
deleted file mode 100755
index e8549a49b..000000000
--- a/view/tpl/mail_display.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
-			{{if $mailbox == 'combined'}}
-			<a class="btn btn-sm btn-danger" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$delete}}</a>
-			{{/if}}
-		</div>
-		<h2>{{$prvmsg_header}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-wrapper">
-		{{foreach $mails as $mail}}
-			{{include file="mail_conv.tpl"}}
-		{{/foreach}}
-
-		{{if $canreply}}
-		{{include file="prv_message.tpl"}}
-		{{else}}
-		{{$unknown_text}}
-		{{/if}}
-	</div>
-</div>
diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl
deleted file mode 100755
index aac592a5f..000000000
--- a/view/tpl/mail_head.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="widget">
-	<h3>{{$header}}</h3>
-	<ul class="nav nav-pills flex-column">
-	{{foreach $messages as $message}}
-		{{include file="mail_list.tpl"}}
-	{{/foreach}}
-	</ul>
-</div>
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
deleted file mode 100755
index 827c7628f..000000000
--- a/view/tpl/mail_list.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<li class="nav-item">
-	<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}">
-		<span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br>
-		<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
-		<span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span>
-	</a>
-</li>
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
deleted file mode 100755
index a4e2e1925..000000000
--- a/view/tpl/main_slider.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div>
-<script>
-$(document).ready(function() {
-	var old_cmin = 0;
-	var old_cmax = 99;
-
-	$("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false,  onstatechange: function(v) { 
-		var carr = v.split(",");
-		if(carr[0] != bParam_cmin) {
-			old_cmin = bParam_cmin;
-	 		bParam_cmin = carr[0];
-		}
-		if(carr[1] != bParam_cmax) {
-			old_cmax = bParam_cmax; 
-			bParam_cmax = carr[1];
-		}
-		networkRefresh();
- 	} });
-
-	var slideTimer = null;
-	function networkRefresh() {
-		$("#profile-jot-text-loading").show();
-
-		if((document.readyState !== "complete") || (slideTimer !== null))
-			return;
-		if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax))
-			return;
-		setTimeout(function() { $("#profile-jot-text-loading").spin('small'); }, 1000 );
-		slideTimer = setTimeout(networkTimerRefresh,2000);
-	}
-
-	function networkTimerRefresh() {
-		slideTimer = null;
-		page_load = true;
-		liveUpdate();
-	}
-});
-</script>
diff --git a/view/tpl/match.tpl b/view/tpl/match.tpl
deleted file mode 100755
index a5ebb043c..000000000
--- a/view/tpl/match.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="{{$url}}">
-			<img src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{if $connlnk}}
-	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$conntxt}}</a></div>
-	{{/if}}
-
-</div>
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
deleted file mode 100644
index 84b16dc0b..000000000
--- a/view/tpl/menuedit.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{if $header}}
-<div class="generic-content-wrapper">
-<div class="section-title-wrapper">
-	{{if $menu_edit_link}}
-	<div class="pull-right">
-		<a href="{{$menu_edit_link}}" title="{{$hintedit}}" class="btn btn-sm btn-success"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$editcontents}}</a>
-	</div>
-	{{/if}}
-	<h2>{{$header}}</h2>
-	<div class="clear"></div>
-</div>
-{{/if}}
-<div id="menu-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
-	<form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" >
-		{{if $menu_id}}
-		<input type="hidden" name="menu_id" value="{{$menu_id}}" />
-		{{/if}}
-		{{if $menu_system}}
-		<input type="hidden" name="menu_system" value="{{$menu_system}}" />
-		{{/if}}
-		{{include file="field_input.tpl" field=$menu_name}}
-		{{include file="field_input.tpl" field=$menu_desc}}
-
-		{{include file="field_checkbox.tpl" field=$menu_bookmark}}
-		<div class="menuedit-submit-wrapper form-group pull-right" >
-			<button type="submit" name="submit" class="btn btn-primary">{{$submit}}&nbsp;<i class="fa fa-caret-right"></i></button>
-		</div>
-		<div class="clear"></div>
-	</form>
-</div>
-{{if $header}}
-</div>
-{{/if}}
diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl
deleted file mode 100644
index e23035062..000000000
--- a/view/tpl/menulist.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('menu-creator');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$hintnew}}</button>
-		</div>
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-
-	{{$create}}
-
-	{{if $menus }}
-	<div id="menulist-content-wrapper" class="section-content-wrapper-np">
-		<table id="menu-list-table">
-			<tr>
-				<th width="1%"></th>
-				<th width="1%">{{$nametitle}}</th>
-				<th width="93%">{{$desctitle}}</th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%" class="d-none d-md-table-cell">{{$created}}</th>
-				<th width="1%" class="d-none d-md-table-cell">{{$edited}}</th>
-			</tr>
-			{{foreach $menus as $m }}
-			<tr id="menu-list-item-{{$m.menu_id}}">
-				<td>{{if $m.bookmark}}<i class="fa fa-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td>
-				<td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td>
-				<td>{{$m.menu_desc}}</td>
-				<td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
-				<td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a></td>
-				<td class="menu-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
-				<td class="d-none d-md-table-cell">{{$m.menu_created}}</td>
-				<td class="d-none d-md-table-cell">{{$m.menu_edited}}</td>
-			</tr>
-			{{/foreach}}
-		</table>
-	</div>
-	{{/if}}
-</div>
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
deleted file mode 100755
index 2ac61bf76..000000000
--- a/view/tpl/message_side.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="widget">
-	<h3>{{$title}}</h3>
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a href="{{$combined.url}}" class="nav-link{{if $combined.sel}} active{{/if}}">{{$combined.label}}</a></li>
-		<li class="nav-item"><a href="{{$inbox.url}}" class="nav-link{{if $inbox.sel}} active{{/if}}">{{$inbox.label}}</a></li>
-		<li class="nav-item"><a href="{{$outbox.url}}" class="nav-link{{if $outbox.sel}} active{{/if}}">{{$outbox.label}}</a></li>
-		<li class="nav-item"><a href="{{$new.url}}" class="nav-link{{if $new.sel}} active{{/if}}">{{$new.label}}</a></li>
-	</ul>
-</div>
diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl
deleted file mode 100755
index a7c5973f3..000000000
--- a/view/tpl/micropro_img.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="" /></a></div>
diff --git a/view/tpl/micropro_txt.tpl b/view/tpl/micropro_txt.tpl
deleted file mode 100755
index 295e7940d..000000000
--- a/view/tpl/micropro_txt.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<div class="contact-block-textdiv{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}} title="{{$title}}">{{$name}}</a></div>
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
deleted file mode 100644
index 9f696fc23..000000000
--- a/view/tpl/mitemedit.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-{{if $header}}
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$header}}</h2>
-	</div>
-{{/if}}
-	<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
-		<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" class="acl-form" data-form_id="mitemedit" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-			<input type="hidden" name="menu_id" value="{{$menu_id}}" />
-			{{if $mitem_id}}
-			<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
-			{{/if}}
-			{{include file="field_input.tpl" field=$mitem_desc}}
-			{{include file="field_input.tpl" field=$mitem_link}}
-			{{if $menu_names}}
-			<datalist id="menu-names">
-				{{foreach $menu_names as $menu_name}}
-				<option value="{{$menu_name}}">
-				{{/foreach}}
-			</datalist>
-			{{/if}}
-			{{include file="field_input.tpl" field=$mitem_order}}
-			{{include file="field_checkbox.tpl" field=$usezid}}
-			{{include file="field_checkbox.tpl" field=$newwin}}
-			<div class="pull-right form-group">
-				<div class="btn-group">
-					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-						<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
-					</button>
-					{{if $submit_more}}
-					<button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="fa fa-caret-right"></i></button>
-					{{/if}}
-					<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
-				</div>
-			</div>
-			<div class="clear"></div>
-		</form>
-		{{$aclselect}}
-	</div>
-{{if $header}}
-</div>
-{{/if}}
diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
deleted file mode 100644
index b28cdfc7e..000000000
--- a/view/tpl/mitemlist.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('menu-element-creator');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$hintnew}}</button>
-		</div>
-		<h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
-		<div class="clear"></div>
-	</div>
-
-	{{$create}}
-
-	{{if $mlist }}
-	<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
-		<table id="mitem-list-table">
-			<tr>
-				<th width="1%">{{$nametitle}}</th>
-				<th width="96%">{{$targettitle}}</th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-			</tr>
-			{{foreach $mlist as $m }}
-			<tr id="mitem-list-item-{{$m.mitem_id}}">
-				<td width="1%">{{$m.mitem_desc}}</td>
-				<td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
-				<td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
-				<td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
-				<td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
-			</tr>
-			{{/foreach}}
-		</table>
-	</div>
-	{{/if}}
-</div>
diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl
deleted file mode 100755
index 315ee4c8a..000000000
--- a/view/tpl/mood_content.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<div id="mood-content" class="generic-content-wrapper">
-    <div class="section-title-wrapper">
-    <h2>{{$title}}</h2>
-    </div>
-    <div class="section-content-wrapper">
-
-	    <div id="mood-desc">{{$desc}}</div>
-
-		<br />
-		<br />
-
-
-		<form action="mood" method="get">
-		<br />
-		<br />
-
-		<input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" />
-
-		<div class="form-group field custom">
-			<select name="verb" id="mood-verb-select" class="form-control" >
-			{{foreach $verbs as $v}}
-				<option value="{{$v.0}}">{{$v.1}}</option>
-			{{/foreach}}
-			</select>
-		</div>
-		<br />
-		<br />
-
-		<input type="submit" name="submit" value="{{$submit}}" />
-		</form>
-	</div>
-</div>
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
deleted file mode 100755
index 013e1cfdc..000000000
--- a/view/tpl/msg-header.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-<script type="text/javascript" src="view/js/ajaxupload.js" ></script>
-<script language="javascript" type="text/javascript">
-
-	$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
-
-
-	$(document).ready(function() {
-
-		var file_uploader = new window.AjaxUpload(
-			'prvmail-attach-wrapper',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addmailtext(response);
-					$('#prvmail-rotator').spin(false);
-				}
-			}
-		);
-
-		var file_uploader_sub = new window.AjaxUpload(
-			'prvmail-attach-sub',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addmailtext(response);
-					$('#prvmail-rotator').spin(false);
-				}
-			}
-		);
-
-
-	});
-
-	function prvmailJotGetLink() {
-		reply = prompt("{{$linkurl}}");
-		if(reply && reply.length) {
-			$('#prvmail-rotator').spin('tiny');
-			$.get('linkinfo?f=&url=' + reply, function(data) {
-				addmailtext(data);
-				$('#prvmail-rotator').spin(false);
-			});
-		}
-	}
-
-	function prvmailGetExpiry() {
-		reply = prompt("{{$expireswhen}}", $('#inp-prvmail-expires').val());
-		if(reply && reply.length) {
-			$('#inp-prvmail-expires').val(reply);
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#prvmail-rotator').spin('tiny');
-			$.get('linkinfo?f=&url=' + reply, function(data) {
-				addmailtext(data);
-				$('#prvmail-rotator').spin(false);
-			});
-		}
-	}
-
-	function addmailtext(data) {
-		var currentText = $("#prvmail-text").val();
-		$("#prvmail-text").val(currentText + data);
-	}	
-
-
-
-</script>
-
diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl
deleted file mode 100755
index ccefa4a49..000000000
--- a/view/tpl/myapps.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $authed}}
-		{{if $create}}
-		<a href="appman" class="pull-right btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</a>
-		{{else}}
-		<a href="apps/edit{{if $cat}}/?f=&cat={{$cat}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a>
-		{{/if}}
-		{{/if}}
-		<h2>{{$title}}{{if $cat}} - {{$cat}}{{/if}}</h2>
-	</div>
-	<div class="clearfix section-content-wrapper">
-		{{foreach $apps as $ap}}
-		{{$ap}}
-		{{/foreach}}
-	</div>
-</div>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
deleted file mode 100755
index c5b378b4f..000000000
--- a/view/tpl/nav.tpl
+++ /dev/null
@@ -1,222 +0,0 @@
-{{if $nav.login && !$userinfo}}
-<div class="d-md-none p-1">
-	<a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
-		{{$nav.loginmenu.1.1}}
-	</a>
-	{{if $nav.register}}
-	<a class="btn btn-warning btn-sm text-white" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
-		{{$nav.register.1}}
-	</a>
-	{{/if}}
-</div>
-{{/if}}
-{{if $userinfo}}
-<div class="dropdown usermenu">
-	<div class="fakelink" data-toggle="dropdown">
-		<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
-		<i class="fa fa-caret-down"></i>
-	</div>
-	{{if $localuser}}
-	<div class="dropdown-menu">
-		{{foreach $nav.usermenu as $usermenu}}
-		<a class="dropdown-item"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
-		{{/foreach}}
-		{{if $nav.manage}}
-		<a class="dropdown-item" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
-		{{/if}}	
-		{{if $nav.channels}}
-		{{foreach $nav.channels as $chan}}
-		<a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a>
-		{{/foreach}}
-		{{/if}}
-		{{if $nav.profiles}}
-		<a class="dropdown-item" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a>
-		{{/if}}
-		{{if $nav.settings}}
-		<div class="dropdown-divider"></div>
-		<a class="dropdown-item" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
-		{{/if}}
-		{{if $nav.admin}}
-		<div class="dropdown-divider"></div>
-		<a class="dropdown-item" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
-		{{/if}}
-		{{if $nav.logout}}
-		<div class="dropdown-divider"></div>
-		<a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a>
-		{{/if}}
-	</div>
-	{{else}}
-	{{if $nav.rusermenu}}
-	<div class="dropdown-menu" role="menu" aria-labelledby="avatar">
-		<a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a>
-		<a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a>
-	</div>
-	{{/if}}
-	{{/if}}
-</div>
-{{/if}}
-<div class="navbar-toggler-right">
-	{{if $nav.help.6}}
-	<button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;">
-		<i class="fa fa-question-circle"></i>
-	</button>
-	{{/if}}
-	<button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
-		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
-	</button>
-	{{if $localuser}}
-	<button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1">
-		<i class="fa fa-exclamation-circle"></i>
-	</button>
-	{{/if}}
-	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
-		<i class="fa fa-bars"></i>
-	</button>
-</div>
-<div class="collapse navbar-collapse" id="navbar-collapse-1">
-	<ul class="navbar-nav mr-auto">
-		{{if $nav.network}}
-		<li class="nav-item dropdown net-button" style="display: none;">
-			<a class="nav-link" href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu">
-				<i class="fa fa-fw fa-th"></i>
-				<span class="badge badge-pill badge-default net-update"></span>
-			</a>
-			<div id="nav-network-menu" class="dropdown-menu" rel="network">
-				<a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a>
-				<a class="dropdown-item" id="nav-network-mark-all"href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a>
-				{{$emptynotifications}}
-			</div>
-		</li>
-		{{/if}}
-		{{if $nav.home}}
-		<li class="nav-item dropdown home-button" style="display: none;">
-			<a class="nav-link" href="#" title="{{$nav.home.3}}" id="{{$nav.home.4}}" data-toggle="dropdown" rel="#nav-home-menu">
-				<i class="fa fa-fw fa-home"></i>
-				<span class="badge badge-pill badge-danger home-update"></span>
-			</a>
-			<div id="nav-home-menu" class="dropdown-menu" rel="home">
-				<a class="dropdown-item" id="nav-home-see-all" href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a>
-				<a class="dropdown-item" id="nav-home-mark-all" href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a>
-				{{$emptynotifications}}
-			</div>
-		</li>
-		{{/if}}
-		{{if $nav.messages}}
-		<li class="nav-item dropdown mail-button" style="display: none;">
-			<a class="nav-link" href="#" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}" data-toggle="dropdown" rel="#nav-messages-menu">
-				<i class="fa fa-fw fa-envelope"></i>
-				<span class="badge badge-pill badge-danger mail-update"></span>
-			</a>
-			<div id="nav-messages-menu" class="dropdown-menu" rel="messages">
-				<a class="dropdown-item" id="nav-messages-see-all" href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a>
-				<a class="dropdown-item" id="nav-messages-mark-all" href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a>
-				{{$emptynotifications}}
-			</div>
-		</li>
-		{{/if}}
-		{{if $nav.all_events}}
-		<li class="nav-item dropdown all_events-button" style="display: none;">
-			<a class="nav-link" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu">
-				<i class="fa fa-fw fa-calendar"></i>
-				<span class="badge badge-pill badge-default all_events-update"></span>
-			</a>
-			<div id="nav-all_events-menu" class="dropdown-menu" rel="all_events">
-				<a class="dropdown-item" id="nav-all_events-see-all" href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a>
-				<a class="dropdown-item" id="nav-all_events-mark-all" href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a>
-				{{$emptynotifications}}
-			</div>
-		</li>
-		{{/if}}
-		{{if $nav.intros}}
-		<li class="nav-item dropdown intro-button" style="display: none;">
-			<a class="nav-link" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu">
-				<i class="fa fa-fw fa-users"></i>
-				<span class="badge badge-pill badge-danger intro-update"></span>
-			</a>
-			<div id="nav-intros-menu" class="dropdown-menu" rel="intros">
-				<a class="dropdown-item" id="nav-intros-see-all" href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a>
-				{{$emptynotifications}}
-			</div>
-		</li>
-		{{/if}}
-		{{if $nav.notifications}}
-		<li class="nav-item dropdown notify-button" style="display: none;">
-			<a class="nav-link" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu">
-				<i class="fa fa-fw fa-exclamation"></i>
-				<span class="badge badge-pill badge-danger notify-update"></span>
-			</a>
-			<div id="nav-notify-menu" class="dropdown-menu" rel="notify">
-				<a class="dropdown-item" id="nav-notify-see-all" href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a>
-				<a class="dropdown-item" id="nav-notify-mark-all" href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a>
-				{{$emptynotifications}}
-			</div>
-		</li>
-		{{/if}}
-		{{if $nav.login && !$userinfo}}
-		<li class="nav-item">
-			<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a>
-		</li>
-		{{/if}}
-		{{if $nav.register}}
-		<li class="nav-item {{$nav.register.2}} d-none d-md-flex">
-			<a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a>
-		</li>
-		{{/if}}
-		{{if $nav.alogout}}
-		<li class="nav-item {{$nav.alogout.2}} d-none d-md-flex">
-			<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
-		</li>
-		{{/if}}
-	</ul>
-
-	<div id="banner" class="navbar-text d-none d-md-flex">{{$banner}}</div>
-
-	<ul id="nav-right" class="navbar-nav ml-auto d-none d-md-flex">
-		<li class="nav-item collapse clearfix" id="nav-search">
-			<form class="form-inline" method="get" action="search" role="search">
-				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
-			</form>
-			<div id="nav-search-spinner"></div>
-		</li>
-		<li class="nav-item" id="nav-search-btn">
-			<a class="nav-link" href="#nav-search" title="{{$nav.search.3}}" onclick="openMenu('nav-search'); closeMenu('nav-search-btn'); $('#nav-search-text').focus(); return false;"><i class="fa fa-fw fa-search"></i></a>
-		</li>
-		{{if $nav.help.6}}
-		<li class="nav-item dropdown {{$sel.help}}">
-			<a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-question-circle"></i></a>
-		</li>
-		{{/if}}
-		<li class="nav-item dropdown" id="app-menu">
-			<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
-			<div class="dropdown-menu dropdown-menu-right">
-				{{foreach $navapps as $navapp}}
-				{{$navapp}}
-				{{/foreach}}
-				{{if $localuser}}
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
-				{{/if}}
-			</div>
-		</li>
-	</ul>
-</div>
-<div class="collapse d-md-none" id="navbar-collapse-2">
-	<div class="navbar-nav mr-auto">
-		{{foreach $navapps as $navapp}}
-		{{$navapp|replace:'dropdown-item':'nav-link'}}
-		{{/foreach}}
-		{{if $localuser}}
-		<div class="dropdown-divider"></div>
-		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
-		{{/if}}
-	</div>
-</div>
-{{if $nav.help.6}}
-<div id="contextual-help-content" class="contextual-help-content">
-	{{$nav.help.5}}
-	<div class="float-right">
-		<a class="btn btn-primary btn-sm" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-question"></i>&nbsp;{{$fulldocs}}</a>
-		<a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-times"></i></a>
-	</div>
-</div>
-{{/if}}
diff --git a/view/tpl/nav_login.tpl b/view/tpl/nav_login.tpl
deleted file mode 100644
index b361b1a14..000000000
--- a/view/tpl/nav_login.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{if $nav.login && !$userinfo}}
-<div id="nav-login" class="modal" tabindex="-1" role="dialog">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title">{{$nav.loginmenu.1.1}}</h4>
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-			</div>
-			<div class="modal-body">
-				<div class="form-group">
-					{{$nav.login}}
-					{{$nav.remote_login}}
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-{{/if}}
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
deleted file mode 100755
index cc1983ac4..000000000
--- a/view/tpl/new_channel.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<div class="section-content-wrapper">
-		<div class="section-content-info-wrapper">
-			{{$desc}}
-		</div>
-		{{if $channel_usage_message}}
-		<div class="section-content-warning-wrapper">
-			{{$channel_usage_message}}
-		</div>
-		{{/if}}
-		<form action="new_channel" method="post" id="newchannel-form">
-			{{if $default_role}}
-				<input type="hidden" name="permissions_role" value="{{$default_role}}" />
-			{{else}}
-				{{include file="field_select_grouped.tpl" field=$role}}
-			{{/if}}
-
-			{{include file="field_input.tpl" field=$name}}
-			<div id="name-spinner"></div>
-
-			{{include file="field_input.tpl" field=$nickname}}
-			<div id="nick-spinner"></div>
-
-			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
-			<div id="newchannel-submit-end" class="clear"></div>
-
-			<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
-			<div id="newchannel-import-end" class="clear"></div>
-		</form>
-	</div>
-</div>
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
deleted file mode 100644
index c6d5d8a73..000000000
--- a/view/tpl/notes.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="widget">
-	<h3>{{$banner}}</h3>
-	<textarea name="note_text" id="note-text">{{$text}}</textarea>
-	<script>
-		var noteSaveTimer = null;
-		var noteText = $('#note-text');
-
-		$(document).ready(function(e){
-			noteText.on('change keyup keydown paste cut', function () {
-				noteText.height(0).height(noteText[0].scrollHeight);
-				$(document.body).trigger("sticky_kit:recalc");
-			}).change();
-		});
-
-		$(document).on('focusout',"#note-text",function(e){
-			if(noteSaveTimer)
-				clearTimeout(noteSaveTimer);
-			notePostFinal();
-			noteSaveTimer = null;
-		});
-
-		$(document).on('focusin',"#note-text",function(e){
-			noteSaveTimer = setTimeout(noteSaveChanges,10000);
-		});
-
-		function notePostFinal() {
-			$.post('notes/sync', { 'note_text' : $('#note-text').val() });
-		}
-
-		function noteSaveChanges() {
-			$.post('notes', { 'note_text' : $('#note-text').val() });
-			noteSaveTimer = setTimeout(noteSaveChanges,10000);
-		}
-	</script>
-</div>
diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl
deleted file mode 100755
index 0b24da7c3..000000000
--- a/view/tpl/notifications.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="generic-content-wrapper-styled">
-
-<h1>{{$notif_header}}</h1>
-
-{{if $notifications_available}}
-<a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a>
-{{/if}}
-<div class="notif-network-wrapper">
-	{{$notif_content}}
-</div>
-</div>
diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl
deleted file mode 100755
index d3c79be82..000000000
--- a/view/tpl/notify.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="notif-item">
-	<a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
-</div>
diff --git a/view/tpl/nwiki_page_history.tpl b/view/tpl/nwiki_page_history.tpl
deleted file mode 100644
index b1c6c9284..000000000
--- a/view/tpl/nwiki_page_history.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-<style>
-  .diff {
-    width:100%;
-    word-break: break-all;
-  }
-
-  .diff td{
-    padding:0 0.667em;
-    vertical-align:top;
-    white-space:pre;
-    white-space:pre-wrap;
-    font-family:Consolas,'Courier New',Courier,monospace;
-    font-size:1.0em;
-    line-height:1.333;
-  }
-
-  .diff span{
-    display:block;
-    min-height:1.333em;
-    margin-top:-1px;
-    padding:0 3px;
-  }
-
-  * html .diff span{
-    height:1.333em;
-  }
-
-  .diff span:first-child{
-    margin-top:0;
-  }
-
-  .diffDeleted span{
-    border:1px solid rgb(255,192,192);
-    background:rgb(255,224,224);
-  }
-
-  .diffInserted span{
-    border:1px solid rgb(192,255,192);
-    background:rgb(224,255,224);
-  }
-</style>
-<table class="" style="width: 100%;">
-  {{foreach $pageHistory as $commit}}
-  <tr class="wikis-index-row"><td>
-      <table id="rev-{{$commit.revision}}" onclick="$('#details-{{$commit.revision}}').show()" style="width: 100%;">
-        <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td>
-            <td rowspan="3" width="20%" align="right">
-		{{if $permsWrite}}
-              <button id="revert-{{$commit.revision}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.revision}}')">Revert</button>
-              <br><br>
-		{{/if}}
-              <button id="compare-{{$commit.revision}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.revision}}')">Compare</button>
-            </td></tr>
-        <tr><td>{{$name_lbl}}</td><td>{{$commit.name}}</td></tr>
-        <tr><td>{{$msg_label}}</td><td>{{$commit.title}}</td></tr>
-      </table>
-    </td></tr>
-  {{/foreach}}          
-</table>
diff --git a/view/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
deleted file mode 100755
index 2b7afa80e..000000000
--- a/view/tpl/oauth_authorize.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>{{$title}}</h1>
-
-<div class='oauthapp'>
-	<img src='{{$app.icon}}'>
-	<h4>{{$app.name}}</h4>
-</div>
-<h3>{{$authorize}}</h3>
-<form method="POST">
-<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes}}" /></div>
-</form>
diff --git a/view/tpl/oauth_authorize_done.tpl b/view/tpl/oauth_authorize_done.tpl
deleted file mode 100755
index 2e91e0125..000000000
--- a/view/tpl/oauth_authorize_done.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<h1>{{$title}}</h1>
-
-<p>{{$info}}</p>
-<code>{{$code}}</code>
diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl
deleted file mode 100755
index b0cfed2e5..000000000
--- a/view/tpl/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a href="{{$embedurl}}" onclick="this.innerHTML=Base64.decode('{{$escapedhtml}}'); return false;" style="float:left; margin: 1em; position: relative;">
-	<img width="{{$tw}}" height="{{$th}}" src="{{$turl}}" />
-	<div style="position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;"></div>
-</a>
diff --git a/view/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl
deleted file mode 100755
index e865e07d9..000000000
--- a/view/tpl/oexchange_xrd.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-        
-    <Subject>{{$base}}</Subject>
-
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/vendor">Zotlabs</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/title">Hubzilla</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/name">Hubzilla</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Hubzilla</Property>
-
-    <Link 
-        rel="icon" 
-        href="{{$base}}/images/hz-16.png"
-        type="image/png" 
-        />
-
-    <Link 
-        rel="icon32" 
-        href="{{$base}}/images/hz-32.png"
-        type="image/png" 
-        />
-
-    <Link 
-        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
-        href="{{$base}}/oexchange"
-        type="text/html" 
-        />
-</XRD>
-
diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
deleted file mode 100755
index a320920c7..000000000
--- a/view/tpl/page_display.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="page">
-	<div class="generic-content-wrapper" id="page-content-wrapper" >
-		{{if $title}}
-		<div class="section-title-wrapper">
-			<h2 class="page-title">{{$title}}</h2>
-		</div>
-		{{/if}}
-		<div class="section-content-wrapper">
-			<div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
-			<div class="page-date">{{$date}}</div>
-			<div class="page-body">{{$body}}</div>
-		</div>
-	</div>
-</div>
diff --git a/view/tpl/page_display_empty.tpl b/view/tpl/page_display_empty.tpl
deleted file mode 100644
index 9f000dee8..000000000
--- a/view/tpl/page_display_empty.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{$body}}
\ No newline at end of file
diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl
deleted file mode 100644
index cef93d324..000000000
--- a/view/tpl/pdledit.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$header}}</h1>
-
-<h2>{{$mname}} {{$module}}</h2>
-
-<br />
-<a href="help/comanche" target="hubzilla-help">{{$help}}</a>
-<br />
-<br />
-
-
-
-<form action="pdledit" method="post" >
-<input type="hidden" name="module" value="{{$module}}" />
-<textarea rows="24" cols="80" name="content">{{$content}}</textarea>
-
-<br />
-<input type="submit" name="submit" value="{{$submit}}" />
-
-</form>
-<script>
-	$('textarea').bbco_autocomplete('comanche');
-</script>
-</div>
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
deleted file mode 100755
index 2ecfbaff9..000000000
--- a/view/tpl/peoplefind.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="peoplefind-sidebar" class="widget">
-	<h3>{{$findpeople}}</h3>
-	<form action="directory" method="post" />
-		<div class="input-group form-group">
-			<input class="form-control form-control-sm" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
-			<div class="input-group-btn">
-				<button class="btn btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button>
-			</div>
-		</div>
-	</form>
-	<ul class="nav nav-pills flex-column">
-		{{if $similar}}<li class="nav-item"><a class="nav-link" href="match" >{{$similar}}</a></li>{{/if}}
-		{{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}}
-		<li class="nav-item"><a class="nav-link" href="randprof" >{{$random}}</a></li>
-		{{if $loggedin}}{{if $inv}}<li class="nav-item"><a class="nav-link" href="invite" >{{$inv}}</a></li>{{/if}}{{/if}}
-	</ul>
-</div>
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
deleted file mode 100755
index 8bacb1575..000000000
--- a/view/tpl/photo_album.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="{{if !$no_fullscreen_btn}}generic-content-wrapper{{/if}}">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			{{if $order}}
-			<a class="btn btn-outline-secondary btn-sm" href="{{$order.1}}" title="{{$order.0}}"><i class="fa fa-sort"></i></a>
-			{{/if}}
-			<div class="btn-group btn-group">
-				{{if $album_edit.1}}
-				<i class="fa fa-pencil btn btn-outline-secondary btn-sm" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
-				{{/if}}
-				{{if $can_post}}
-				<button class="btn btn-sm btn-success btn-sm" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
-				{{/if}}
-			</div>
-		</div>
-		<h2>{{$album}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{$upload_form}}
-	{{$album_edit.1}}
-	<div class="section-content-wrapper-np">
-		<div id="photo-album-contents-{{$album_id}}">
-			{{foreach $photos as $photo}}
-				{{include file="photo_top.tpl"}}
-			{{/foreach}}
-			<div id="page-end"></div>
-		</div>
-	</div>
-</div>
-<div class="photos-end"></div>
-<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
-<div id="page-spinner"></div>
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
deleted file mode 100755
index a238e61bc..000000000
--- a/view/tpl/photo_albums.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="side-bar-photos-albums" class="widget">
-	<h3>{{$title}}</h3>
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent}}</a></li>
-		{{if $albums}}
-		{{foreach $albums as $al}}
-		{{if $al.shorttext}}
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li>
-		{{/if}}
-		{{/foreach}}
-		{{/if}}
-	</ul>
-</div>
diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
deleted file mode 100755
index 664e5338c..000000000
--- a/view/tpl/photo_drop.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
-	<a class="btn btn-outline-secondary btn-sm" href="#" onclick="dropItem('item/drop/{{$id}}', '#wall-item-outside-wrapper-{{$id}}'); return false;" title="{{$delete}}" ><i class="fa fa-trash-o"></i></a>
-</div>
diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
deleted file mode 100755
index ec643c4a9..000000000
--- a/view/tpl/photo_item.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="wall-item-outside-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-outside-wrapper-{{$id}}" >
-	<div class="wall-item-content-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;">
-		<div class="wall-item-head">
-			<div class="wall-item-info" id="wall-item-info-{{$id}}" >
-				<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
-					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
-					<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
-				</div>
-			</div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
-				<div class="wall-item-author">
-					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a>
-				</div>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
-			</div>
-		</div>
-		<div class="wall-item-content" id="wall-item-content-{{$id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
-			<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
-
-		</div>
-		{{if $drop}}
-		<div class="wall-item-tools" id="wall-item-tools-{{$id}}" >
-			<div class="wall-item-tools-right pull-right">
-				{{$drop}}
-			</div>
-			<div class="clear"></div>
-		</div>
-		{{/if}}
-		<div class="clear"></div>
-		{{$comment}}
-	</div>
-</div>
-
diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
deleted file mode 100755
index a86aa7f80..000000000
--- a/view/tpl/photo_top.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
-	<img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
-</a>
-
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
deleted file mode 100755
index 2431329ec..000000000
--- a/view/tpl/photo_view.tpl
+++ /dev/null
@@ -1,172 +0,0 @@
-<div id="live-photos"></div>
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			{{if $tools || $map || $edit}}
-			<div class="btn-group">
-				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
-					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
-				</button>
-				<div class="dropdown-menu dropdown-menu-right flex-column">
-					{{if $tools}}
-					<a class="dropdown-item" href="{{$tools.profile.0}}"><i class="fa fa-user"></i>&nbsp;{{$tools.profile.1}}</a>
-					<a class="dropdown-item" href="{{$tools.cover.0}}"><i class="fa fa-picture-o"></i>&nbsp;{{$tools.cover.1}}</a>
-					{{/if}}
-					{{if $map}}
-					<a class="dropdown-item" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="fa fa-globe"></i>&nbsp;{{$map_text}}</a>
-					{{/if}}
-					{{if $edit}}
-					<a class="dropdown-item acl-form-trigger" href="#"  title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i>&nbsp;{{$edit.edit}}</a>
-					{{/if}}
-				</div>
-			</div>
-			{{/if}}
-			{{if $lock}}
-			<div class="btn-group">
-				<button id="lockview" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ><i class="fa fa-lock"></i></button>
-				<ul id="panel-{{$id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
-			</div>
-			{{/if}}
-			{{if $prevlink || $nextlink}}
-			<div class="btn-group">
-				{{if $prevlink}}
-				<a href="{{$prevlink.0}}" class="btn btn-outline-secondary btn-sm" title="{{$prevlink.1}}"><i class="fa fa-backward"></i></a>
-				{{/if}}
-				{{if $nextlink}}
-				<a href="{{$nextlink.0}}" class="btn btn-outline-secondary btn-sm" title="{{$nextlink.1}}"><i class="fa fa-forward"></i></a>
-				{{/if}}
-			</div>
-			{{/if}}
-		</div>
-		<h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div id="photo-map">
-	{{$map}}
-	</div>
-	<div id="photo-edit" class="section-content-tools-wrapper">
-		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" class="acl-form" data-form_id="photo_edit_form" data-allow_cid='{{$edit.allow_cid}}' data-allow_gid='{{$edit.allow_gid}}' data-deny_cid='{{$edit.deny_cid}}' data-deny_gid='{{$edit.deny_gid}}'>
-			<input type="hidden" name="item_id" value="{{$edit.item_id}}" />
-			{{* album renaming is not supported atm.
-			<div class="form-group">
-				<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum_label}}</label>
-				<input id="photo-edit-albumname" class="form-control" type="text" name="albname" value="{{$edit.album}}" placeholder="{{$edit.newalbum_placeholder}}" list="dl-albums" />
-				{{if $edit.albums}}
-				<datalist id="dl-albums">
-				{{foreach $edit.albums as $al}}
-					{{if $al.text}}
-					<option value="{{$al.text}}">
-					{{/if}}
-				{{/foreach}}
-				</datalist>
-				{{/if}}
-			</div>
-			*}}
-			<div class="form-group">
-				<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
-				<input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" />
-			</div>
-			<div class="form-group">
-				<label id="photo-edit-tags-label" for="photo-edit-newtag">{{$edit.tag_label}}</label>
-				<input name="newtag" id="photo-edit-newtag" class="form-control" title="{{$edit.help_tags}}" type="text" />
-			</div>
-			<div class="form-group">
-				{{include file="field_select.tpl" field=$edit.album_select}}
-			</div>
-			<div class="form-group">
-				<label class="radio-inline" id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw"><input id="photo-edit-rotate-cw" type="radio" name="rotate" value="1" />{{$edit.rotatecw}}</label>
-				<label class="radio-inline" id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw"><input id="photo-edit-rotate-ccw" type="radio" name="rotate" value="2" />{{$edit.rotateccw}}</label>
-			</div>
-			{{if $edit.adult_enabled}}
-			<div class="form-group">
-			{{include file="field_checkbox.tpl" field=$edit.adult}}
-			</div>
-			{{/if}}
-
-			<div class="form-group pull-left">
-				<button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button>
-			</div>
-			<div class="form-group btn-group pull-right">
-				{{if $edit.aclselect}}
-				<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-					<i id="jot-perms-icon" class="fa fa-{{$edit.lockstate}}"></i>
-				</button>
-				{{/if}}
-				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
-			</div>
-		</form>
-		{{$edit.aclselect}}
-		<div id="photo-edit-end" class="clear"></div>
-	</div>
-	<div id="photo-view-wrapper">
-		<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
-		<div id="photo-photo-end" class="clear"></div>
-		{{if $tags}}
-		<div class="photo-item-tools-left" id="in-this-photo">
-			<span id="in-this-photo-text">{{$tag_hdr}}</span>
-			{{foreach $tags as $t}}
-				{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}" onclick="return confirmDelete();"><i class="fa fa-times"></i></a>&nbsp;</span>{{/if}}
-			{{/foreach}}
-		</div>
-		{{/if}}
-		<div class="photo-item-tools">
-			{{if $responses.count }}
-			<div class="photo-item-tools-left pull-left">
-				<div class="{{if $responses.count > 1}}btn-group{{/if}}">
-				{{foreach $responses as $verb=>$response}}
-					{{if $response.count}}
-					<div class="btn-group">
-						<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button>
-						{{if $response.list_part}}
-						<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
-						{{else}}
-						<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
-						{{/if}}
-						{{if $response.list_part}}
-						<div class="modal" id="{{$verb}}Modal-{{$id}}">
-							<div class="modal-dialog">
-								<div class="modal-content">
-									<div class="modal-header">
-										<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-										<h4 class="modal-title">{{$response.title}}</h4>
-									</div>
-									<div class="modal-body">
-										<ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
-									</div>
-									<div class="modal-footer clear">
-										<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$modal_dismiss}}</button>
-									</div>
-								</div><!-- /.modal-content -->
-							</div><!-- /.modal-dialog -->
-						</div><!-- /.modal -->
-						{{/if}}
-					</div>
-					{{/if}}
-				{{/foreach}}
-				</div>
-			</div>
-			{{/if}}
-			{{if $likebuttons}}
-			<div class="photo-item-tools-right btn-group pull-right">
-				<button type="button" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$likebuttons.id}},'like'); return false">
-					<i class="fa fa-thumbs-o-up" title="{{$likebuttons.likethis}}"></i>
-				</button>
-				<button type="button" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$likebuttons.id}},'dislike'); return false">
-					<i class="fa fa-thumbs-o-down" title="{{$likebuttons.nolike}}"></i>
-				</button>
-			</div>
-			<div id="like-rotator-{{$likebuttons.id}}" class="photo-like-rotator pull-right"></div>
-			{{/if}}
-			<div class="clear"></div>
-		</div>
-	</div>
-	{{$comments}}
-	{{if $commentbox}}
-	<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
-		{{$commentbox}}
-	</div>
-	{{/if}}
-	<div class="clear"></div>
-</div>
-{{$paginate}}
-
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
deleted file mode 100755
index 8fe631ca6..000000000
--- a/view/tpl/photos_recent.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			{{if $can_post}}
-			<button class="btn btn-sm btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
-			{{/if}}
-		</div>
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{$upload_form}}
-	<div class="section-content-wrapper-np">
-		<div id="photo-album-contents-{{$album_id}}">
-			{{foreach $photos as $photo}}
-				{{include file="photo_top.tpl"}}
-			{{/foreach}}
-			<div id="page-end"></div>
-		</div>
-	</div>
-</div>
-<div class="photos-end"></div>
-<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
-<div id="page-spinner"></div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
deleted file mode 100755
index d52bad5a2..000000000
--- a/view/tpl/photos_upload.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-<div id="photo-upload-form">
-	<div class="section-content-tools-wrapper">
-		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
-
-			<div class="form-group">
-				<label for="photos-upload-album">{{$newalbum_label}}</label>
-				<input type="text" class="form-control" id="photos-upload-album" name="newalbum" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload">
-				<datalist id="dl-photo-upload">
-				{{foreach $albums as $al}}
-					{{if $al.text}}
-					<option value="{{$al.text}}" />
-					{{/if}}
-				{{/foreach}}
-				</datalist>
-			</div>
-			{{if $default}}
-			<div class="form-group">
-				<input id="photos-upload-choose" type="file" name="userfile" />
-			</div>
-			{{include file="field_input.tpl" field=$caption}}
-			{{include file="field_checkbox.tpl" field=$visible}}
-			<div id="body-textarea">
-			{{include file="field_textarea.tpl" field=$body}}
-			</div>
-			<div class="pull-right btn-group">
-				<div class="btn-group">
-					{{if $lockstate}}
-					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-						<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
-					</button>
-					{{/if}}
-					<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
-				</div>
-
-			</div>
-			{{/if}}
-			<div class="clear"></div>
-
-			{{if $uploader}}
-			{{include file="field_input.tpl" field=$caption}}
-			{{include file="field_checkbox.tpl" field=$visible}}
-			<div id="body-textarea">
-			{{include file="field_textarea.tpl" field=$body}}
-			</div>
-			<div id="photos-upload-perms" class="btn-group pull-right">
-				{{if $lockstate}}
-				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-					<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
-				</button>
-				{{/if}}
-				<div class="pull-right">
-					{{$uploader}}
-				</div>
-			</div>
-			{{/if}}
-		</form>
-	</div>
-	{{$aclselect}}
-	<div id="photos-upload-end" class="clear"></div>
-</div>
diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl
deleted file mode 100755
index 45191db85..000000000
--- a/view/tpl/photosajax.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{foreach $photos as $photo}}
-{{include file="photo_top.tpl"}}
-{{/foreach}}
-<script>justifyPhotosAjax('photo-album-contents-{{$album_id}}')</script>
diff --git a/view/tpl/poco_entry_xml.tpl b/view/tpl/poco_entry_xml.tpl
deleted file mode 100755
index 30b6268dc..000000000
--- a/view/tpl/poco_entry_xml.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<entry>
-{{if $entry.id}}<id>{{$entry.id}}</id>{{/if}}
-{{if $entry.displayName}}<displayName>{{$entry.displayName}}</displayName>{{/if}}
-{{if $entry.preferredUsername}}<preferredUsername>{{$entry.preferredUsername}}</preferredUsername>{{/if}}
-{{if $entry.rating}}<rating>{{$entry.rating}}</rating>{{/if}}
-{{if $entry.urls}}{{foreach $entry.urls as $url}}<urls><value>{{$url.value}}</value><type>{{$url.type}}</type></urls>{{/foreach}}{{/if}}
-{{if $entry.photos}}{{foreach $entry.photos as $photo}}<photos><value>{{$photo.value}}</value><type>{{$photo.type}}</type></photos>{{/foreach}}{{/if}}
-</entry>
diff --git a/view/tpl/poco_xml.tpl b/view/tpl/poco_xml.tpl
deleted file mode 100755
index 0e38a692c..000000000
--- a/view/tpl/poco_xml.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<response>
-{{if $response.sorted}}<sorted>{{$response.sorted}}</sorted>{{/if}}
-{{if $response.filtered}}<filtered>{{$response.filtered}}</filtered>{{/if}}
-{{if $response.updatedSince}}<updatedSince>{{$response.updatedSince}}</updatedSince>{{/if}}
-<startIndex>{{$response.startIndex}}</startIndex>
-<itemsPerPage>{{$response.itemsPerPage}}</itemsPerPage>
-<totalResults>{{$response.totalResults}}</totalResults>
-
-
-{{if $response.totalResults}}
-{{foreach $response.entry as $entry}}
-{{include file="poco_entry_xml.tpl"}}
-{{/foreach}}
-{{else}}
-<entry></entry>
-{{/if}}
-</response>
diff --git a/view/tpl/poke_content.tpl b/view/tpl/poke_content.tpl
deleted file mode 100755
index f368cb024..000000000
--- a/view/tpl/poke_content.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-
-<div id="poke-content" class="generic-content-wrapper">
-    <div class="section-title-wrapper">
-    <h2>{{$title}}</h2>
-    </div>
-    <div class="section-content-wrapper">
-
-	<div id="poke-desc">{{$desc}}</div>
-
-<br />
-<br />
-
-
-<form action="poke" method="get">
-
-
-<div class="form-group field input">
-	<label id="poke-recip-label" for="poke-recip">{{$clabel}}</label>
-	<input class="form-control" id="poke-recip" type="text" value="{{$name}}" name="pokename" autocomplete="off" />
-</div>
-
-	<input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
-	<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
-
-
-{{if $poke_basic}}
-<input type="hidden" name="verb" value="poke" />
-{{else}}
-<div class="form-group field custom">
-	<label for="poke-verb-select" id="poke-verb-lbl">{{$choice}}</label>
-	<select class="form-control" name="verb" id="poke-verb-select" >
-	{{foreach $verbs as $v}}
-	<option value="{{$v.0}}">{{$v.1}}</option>
-	{{/foreach}}
-	</select>
-</div>
-{{/if}}
-
-{{if ! $parent}}
-{{include file="field_checkbox.tpl" field=$private}}
-{{/if}}
-
-<input type="submit" name="submit" value="{{$submit}}" />
-</form>
-
-
-    </div>
-</div>
diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
deleted file mode 100755
index fb43c744b..000000000
--- a/view/tpl/posted_date_widget.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<script>
-
-function toggle_posted_date_button() {
-	if($('#posted-date-dropdown').is(':visible')) {
-		$('#posted-date-icon').removeClass('fa-caret-up');
-		$('#posted-date-icon').addClass('fa-cog');
-		$('#posted-date-dropdown').hide();
-	}
-	else {
-		$('#posted-date-icon').addClass('fa-caret-up');
-		$('#posted-date-icon').removeClass('fa-cog');
-		$('#posted-date-dropdown').show();
-	}
-}
-</script>
-		
-
-<div id="datebrowse-sidebar" class="widget">
-	<h3>{{$title}}</h3>
-	<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
-	<ul id="posted-date-selector" class="nav nav-pills flex-column">
-		{{foreach $dates as $y => $arr}}
-		{{if $y == $cutoff_year}}
-		</ul>
-		<div id="posted-date-dropdown" style="display: none;">
-		<ul id="posted-date-selector-drop" class="nav nav-pills flex-column">
-		{{/if}} 
-		<li class="nav-item" id="posted-date-selector-year-{{$y}}">
-			<a class="nav-link" href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a>
-		</li>
-		<div id="posted-date-selector-{{$y}}" style="display: none;">
-			<ul class="posted-date-selector-months nav nav-pills flex-column">
-				{{foreach $arr as $d}}
-				<li class="nav-item">
-					<a class="nav-link" href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}{{if $showend}}&dbegin={{$d.2}}{{/if}}'); return false;">{{$d.0}}</a>
-				</li>
-				{{/foreach}}
-			</ul>
-		</div>
-		{{/foreach}}
-		{{if $cutoff}}
-		</div>
-		<button class="btn btn-outline-secondary btn-sm" onclick="toggle_posted_date_button(); return false;"><i id="posted-date-icon" class="fa fa-cog"></i></button>
-		{{/if}}
-	</ul>
-</div>
diff --git a/view/tpl/prep.tpl b/view/tpl/prep.tpl
deleted file mode 100644
index debba13a8..000000000
--- a/view/tpl/prep.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$header}}</h1>
-
-{{if $site}}
-<h3>{{$website}} {{$site}}</h3>
-{{/if}}
-
-
-{{if $raters}}
-{{foreach $raters as $r}}
-
-<div class="directory-item lframe" id="directory-item-{{$r.xchan_hash}}" >
-
-<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$r.xchan_hash}}" >
-<div class="contact-photo" id="directory-photo-{{$r.xchan_hash}}" >
-<a href="{{$r.xchan_url}}" class="directory-profile-link" id="directory-profile-link-{{$r.xchan_hash}}" ><img class="directory-photo-img" src="{{$r.xchan_photo_m}}" alt="{{$r.xchan_addr}}" title="{{$r.xchan_addr}}" /></a>
-</div>
-</div>
-<div class="prep-details contact-info">
-<a href="{{$r.xchan_url}}" class="directory-profile-link" id="directory-profile-link-{{$r.xchan_hash}}" ><div class="contact-name">{{$r.xchan_name}}</div></a>
-<div class="rating-value">{{$rating_lbl}} <span class="prep-rating-value">{{$r.xlink_rating}}</span></div>
-{{if $r.xlink_rating_text}}
-<div class="rating-text">{{$rating_text_label}} {{$r.xlink_rating_text}}
-</div>
-{{/if}}
-</div>
-<div class="clear"></div>
-</div>
-{{/foreach}}
-{{/if}}
-</div>
diff --git a/view/tpl/profdef_edit.tpl b/view/tpl/profdef_edit.tpl
deleted file mode 100644
index bfe85314d..000000000
--- a/view/tpl/profdef_edit.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h3>{{$header}}</h3>
-
-<form action="admin/profs" method="post" >
-
-{{if $id}}
-<input type="hidden" name="id" value="{{$id}}" />
-{{/if}}
-
-{{include file="field_input.tpl" field=$field_name}}
-{{include file="field_input.tpl" field=$field_type}}
-{{include file="field_input.tpl" field=$field_desc}}
-{{include file="field_input.tpl" field=$field_help}}
-
-<input name="submit" type="submit" value="{{$submit}}" />
-
-</form>
diff --git a/view/tpl/profed_head.tpl b/view/tpl/profed_head.tpl
deleted file mode 100755
index ce774052a..000000000
--- a/view/tpl/profed_head.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script language="javascript" type="text/javascript"></script>
-
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
deleted file mode 100755
index c56062459..000000000
--- a/view/tpl/profile_advanced.tpl
+++ /dev/null
@@ -1,341 +0,0 @@
-<div id="profile-content-wrapper" class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="float-right">
-			{{if $profile.like_count}}
-			<div class="btn-group">
-				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button>
-				{{if $profile.likers}}
-				<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
-				{{/if}}
-			</div>
-			{{/if}}
-			{{if $profile.canlike}}
-			<div class="btn-group">
-				<button type="button" class="btn btn-success btn-sm" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
-					<i class="fa fa-thumbs-o-up" title="{{$profile.likethis}}"></i>
-				</button>
-			</div>
-			{{/if}}
-			{{if $editmenu.multi}}
-			<div class="btn-group">
-				<a class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
-				<div class="dropdown-menu dropdown-menu-right">
-					{{foreach $editmenu.menu.entries as $e}}
-					<a class="dropdown-item" href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'> {{$e.profile_name}}</a>
-					{{/foreach}}
-					<a class="dropdown-item" href="profile_photo" >{{$editmenu.menu.chg_photo}}</a>
-					{{if $editmenu.menu.cr_new}}
-					<a class="dropdown-item" href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a>
-					{{/if}}
-				</div>
-			</div>
-			{{elseif $editmenu}}
-			<div class="btn-group">
-				<a class="btn btn-primary btn-sm" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
-			</div>
-			{{/if}}
-			{{if $exportlink}}
-			<div class="btn-group">
-				<a class="btn btn-outline-secondary btn-sm" href="{{$exportlink}}" ><i class="fa fa-vcard"></i>&nbsp;{{$export}}</a>
-			</div>
-			{{/if}}
-		</div>
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-wrapper">
-
-	{{foreach $fields as $f}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-		{{if $f == 'name'}}
-			<dl id="aprofile-fullname" class="aprofile">
-			 <dt>{{$profile.fullname.0}}</dt>
-			 <dd>{{$profile.fullname.1}}</dd>
-			</dl>
-		{{/if}}
-
-		{{if $f == 'fullname'}}
-			<dl id="aprofile-fullname" class="aprofile">
-			 <dt>{{$profile.fullname.0}}</dt>
-			 <dd>{{$profile.fullname.1}}</dd>
-			</dl>
-		{{/if}}
-
-		{{if $f == 'gender'}}
-		{{if $profile.gender}}
-		<dl id="aprofile-gender" class="aprofile">
-		 <dt>{{$profile.gender.0}}</dt>
-		 <dd>{{$profile.gender.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'birthday'}}
-		{{if $profile.birthday}}
-		<dl id="aprofile-birthday" class="aprofile">
-		 <dt>{{$profile.birthday.0}}</dt>
-		 <dd>{{$profile.birthday.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'age'}}
-		{{if $profile.age}}
-		<dl id="aprofile-age" class="aprofile">
-		 <dt>{{$profile.age.0}}</dt>
-		 <dd>{{$profile.age.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'marital'}}
-		{{if $profile.marital}}
-		<dl id="aprofile-marital" class="aprofile">
-		 <dt><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$profile.marital.0}}</dt>
-		 <dd>{{$profile.marital.1}}{{if in_array('partner',$fields)}}{{if $profile.marital.partner}} ({{$profile.marital.partner}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'sexual'}}
-		{{if $profile.sexual}}
-		<dl id="aprofile-sexual" class="aprofile">
-		 <dt>{{$profile.sexual.0}}</dt>
-		 <dd>{{$profile.sexual.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'keywords'}}
-		{{if $profile.keywords}}
-		<dl id="aprofile-tags" class="aprofile">
-		 <dt>{{$profile.keywords.0}}</dt>
-		 <dd>{{$profile.keywords.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'homepage'}}
-		{{if $profile.homepage}}
-		<dl id="aprofile-homepage" class="aprofile">
-		 <dt>{{$profile.homepage.0}}</dt>
-		 <dd>{{$profile.homepage.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'hometown'}}
-		{{if $profile.hometown}}
-		<dl id="aprofile-hometown" class="aprofile">
-		 <dt>{{$profile.hometown.0}}</dt>
-		 <dd>{{$profile.hometown.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'politic'}}
-		{{if $profile.politic}}
-		<dl id="aprofile-politic" class="aprofile">
-		 <dt>{{$profile.politic.0}}</dt>
-		 <dd>{{$profile.politic.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'religion'}}
-		{{if $profile.religion}}
-		<dl id="aprofile-religion" class="aprofile">
-		 <dt>{{$profile.religion.0}}</dt>
-		 <dd>{{$profile.religion.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'about'}}
-		{{if $profile.about}}
-		<dl id="aprofile-about" class="aprofile">
-		 <dt>{{$profile.about.0}}</dt>
-		 <dd>{{$profile.about.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'interest'}}
-		{{if $profile.interest}}
-		<dl id="aprofile-interest" class="aprofile">
-		 <dt>{{$profile.interest.0}}</dt>
-		 <dd>{{$profile.interest.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'likes'}}
-		{{if $profile.likes}}
-		<dl id="aprofile-likes" class="aprofile">
-		 <dt>{{$profile.likes.0}}</dt>
-		 <dd>{{$profile.likes.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'dislikes'}}
-		{{if $profile.dislikes}}
-		<dl id="aprofile-dislikes" class="aprofile">
-		 <dt>{{$profile.dislikes.0}}</dt>
-		 <dd>{{$profile.dislikes.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'contact'}}
-		{{if $profile.contact}}
-		<dl id="aprofile-contact" class="aprofile">
-		 <dt>{{$profile.contact.0}}</dt>
-		 <dd>{{$profile.contact.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'channels'}}
-		{{if $profile.channels}}
-		<dl id="aprofile-channels" class="aprofile">
-		 <dt>{{$profile.channels.0}}</dt>
-		 <dd>{{$profile.channels.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'music'}}
-		{{if $profile.music}}
-		<dl id="aprofile-music" class="aprofile">
-		 <dt>{{$profile.music.0}}</dt>
-		 <dd>{{$profile.music.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'book'}}
-		{{if $profile.book}}
-		<dl id="aprofile-book" class="aprofile">
-		 <dt>{{$profile.book.0}}</dt>
-		 <dd>{{$profile.book.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'tv'}}
-		{{if $profile.tv}}
-		<dl id="aprofile-tv" class="aprofile">
-		 <dt>{{$profile.tv.0}}</dt>
-		 <dd>{{$profile.tv.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'film'}}
-		{{if $profile.film}}
-		<dl id="aprofile-film" class="aprofile">
-		 <dt>{{$profile.film.0}}</dt>
-		 <dd>{{$profile.film.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'romance'}}
-		{{if $profile.romance}}
-		<dl id="aprofile-romance" class="aprofile">
-		 <dt>{{$profile.romance.0}}</dt>
-		 <dd>{{$profile.romance.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'employment'}}
-		{{if $profile.employment}}
-		<dl id="aprofile-work" class="aprofile">
-		 <dt>{{$profile.employment.0}}</dt>
-		 <dd>{{$profile.employment.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'education'}}
-		{{if $profile.education}}
-		<dl id="aprofile-education" class="aprofile">
-		 <dt>{{$profile.education.0}}</dt>
-		 <dd>{{$profile.education.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{foreach $profile.extra_fields as $fld}}
-		{{if $f == $fld}}
-		{{if $profile.$fld}}
-		<dl id="aprofile-{{$fld}}" class="aprofile">
-		 <dt>{{$profile.$fld.0}}</dt>
-		 <dd>{{$profile.$fld.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-		{{/foreach}}
-	{{/foreach}}
-
-
-		{{if $things}}
-		{{foreach $things as $key => $items}}
-		<b>{{$profile.fullname.1}} {{$key}}</b>
-		<ul class="profile-thing-list">
-		{{foreach $items as $item}}
-		<li>{{if $item.img}}<a href="{{$item.url}}" ><img src="{{$item.img}}" class="profile-thing-img" width="100" height="100" alt="{{$item.term}}" /></a>{{/if}}
-		<a href="{{$item.editurl}}" >{{$item.term}}</a>
-		{{if $profile.canlike}}<br />
-		<button type="button" class="btn btn-outline-secondary btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" >
-		<i class="fa fa-thumbs-o-up" title="{{$likethis}}"></i>
-		</button>
-		{{/if}}
-		{{if $item.like_count}}
-		<div class="btn-group">
-		<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button>
-		{{if $item.likes}}
-		<ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}"><img class="dropdown-menu-img-xs" src="{{$liker.xchan_photo_s}}" alt="{{$liker.name}}" /> {{$liker.xchan_name}}</a></li>{{/foreach}}</ul>
-		{{/if}}
-		</div>
-		{{/if}}
-		</li>
-		{{/foreach}}
-		</ul>
-		<div class="clear"></div>
-		{{/foreach}}
-		{{/if}}
-	</div>
-</div>
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
deleted file mode 100755
index 05137479f..000000000
--- a/view/tpl/profile_edit.tpl
+++ /dev/null
@@ -1,401 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="dropdown float-right" id="profile-edit-links">
-			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
-			</button>
-			<div class="dropdown-menu">
-				<a class="dropdown-item" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="fa fa-fw fa-user"></i>&nbsp;{{$profpic}}</a>
-				{{if $is_default}}
-				<a class="dropdown-item" href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="fa fa-fw fa-picture-o"></i>&nbsp;{{$coverpic}}</a>
-				{{/if}}
-				{{if ! $is_default}}
-				<a class="dropdown-item" href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-fw fa-pencil"></i>&nbsp;{{$editvis}}</a>
-				{{/if}}
-				<a class="dropdown-item" href="thing" id="profile-edit-thing-link" title="{{$addthing}}"><i class="fa fa-fw fa-plus-circle"></i>&nbsp;{{$addthing}}</a>
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a>
-				{{if $profile_clone_link}}
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a>
-				{{/if}}
-				{{if $exportable}}
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="profiles/export/{{$profile_id}}">{{$lbl_export}}</a>
-				<a class="dropdown-item" href="#" onClick="openClose('profile-upload-form'); return false;">{{$lbl_import}}</a>
-				{{/if}}
-				{{if ! $is_default}}
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$del_prof}}</a>
-				{{/if}}
-			</div>
-		</div>
-		<h2>{{$banner}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-tools-wrapper" id="profile-upload-form">
-		<label id="profile-upload-choose-label" for="profile-upload-choose" >{{$lbl_import}}</label>
-		<input id="profile-upload-choose" type="file" name="userfile">
-	</div>
-
-		<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" >
-			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-			{{if $is_default}}
-			<div class="section-content-info-wrapper">{{$default}}</div>
-			{{/if}}
-
-			<div class="panel-group" id="profile-edit-wrapper" role="tablist" aria-multiselectable="true">
-				<div class="panel">
-					<div class="section-subtitle-wrapper" role="tab" id="personal">
-						<h3>
-							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#personal-collapse" aria-expanded="true" aria-controls="personal-collapse">
-								{{$personal}}
-							</a>
-						</h3>
-					</div>
-					<div id="personal-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="personal">
-						<div class="section-content-tools-wrapper">
-							{{include file="field_input.tpl" field=$profile_name}}
-
-							{{include file="field_input.tpl" field=$name}}
-
-							{{if $fields.pdesc}}
-							{{include file="field_input.tpl" field=$pdesc}}
-							{{/if}}
-
-							{{if $fields.gender}}
-							<div id="profile-edit-gender-wrapper" class="form-group field select" >
-							<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}}</label>
-							{{if $advanced}}
-							{{$gender}}
-							{{else}}
-							{{$gender_min}}
-							{{/if}}
-							</div>
-							<div class="clear"></div>
-							{{/if}}
-
-							{{if $fields.dob}}
-							{{$dob}}
-							{{/if}}
-
-							{{include file="field_checkbox.tpl" field=$hide_friends}}
-
-							<div class="form-group" >
-							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-							</div>
-							<div class="clear"></div>
-						</div>
-					</div>
-				</div>
-
-				{{if $fields.comms }}
-
-				<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
-					<select name="tel_type[]">
-						<option value="CELL">{{$mobile}}</option>
-						<option value="HOME">{{$home}}</option>
-						<option value="WORK">{{$work}}</option>
-						<option value="OTHER">{{$other}}</option>
-					</select>
-					<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
-					<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				</div>
-
-				<div id="template-form-vcard-email" class="form-group form-vcard-email">
-					<select name="email_type[]">
-						<option value="HOME">{{$home}}</option>
-						<option value="WORK">{{$work}}</option>
-						<option value="OTHER">{{$other}}</option>
-					</select>
-					<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
-					<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				</div>
-
-				<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
-					<select name="impp_type[]">
-						<option value="HOME">{{$home}}</option>
-						<option value="WORK">{{$work}}</option>
-						<option value="OTHER">{{$other}}</option>
-					</select>
-					<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
-					<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				</div>
-
-				<div class="section-content-wrapper-np">
-					<div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
-					<div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field">
-						<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
-						<ul class="dropdown-menu">
-							<li class="add-vcard-tel"><a href="#" data-add="vcard-tel" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$tel_label}}</a></li>
-							<li class="add-vcard-email"><a href="#" data-add="vcard-email" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$email_label}}</a></li>
-							<li class="add-vcard-impp"><a href="#" data-add="vcard-impp" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$impp_label}}</a></li>
-						</ul>
-					</div>
-					<div id="vcard-header-{{$vcard.id}}" class="vcard-header" data-id="{{$vcard.id}}" data-action="open">
-						<i class="vcard-fn-preview fa fa-address-card-o"></i>
-						<span id="vcard-preview-{{$vcard.id}}" class="vcard-preview">
-							{{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}}
-							{{if $vcard.emails.0.address}}<span class="vcard-email-preview hidden-xs"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}}
-							{{if $vcard.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}}
-						</span>
-						<input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}">
-					</div>
-				</div>
-				<div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper">
-
-					<div class="vcard-tel form-group">
-						<div class="form-vcard-tel-wrapper">
-							{{if $vcard.tels}}
-							{{foreach $vcard.tels as $tel}}
-							<div class="form-group form-vcard-tel">
-								<select name="tel_type[]">
-									<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
-									<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
-									<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-									<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-									<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-								</select>
-								<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
-								<i data-remove="vcard-tel" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-							</div>
-							{{/foreach}}
-							{{/if}}
-						</div>
-					</div>
-
-
-					<div class="vcard-email form-group">
-						<div class="form-vcard-email-wrapper">
-							{{if $vcard.emails}}
-							{{foreach $vcard.emails as $email}}
-							<div class="form-group form-vcard-email">
-								<select name="email_type[]">
-									<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
-									<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-									<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-									<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-								</select>
-								<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
-								<i data-remove="vcard-email" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-							</div>
-							{{/foreach}}
-							{{/if}}
-						</div>
-					</div>
-
-					<div class="vcard-impp form-group">
-						<div class="form-vcard-impp-wrapper">
-							{{if $vcard.impps}}
-							{{foreach $vcard.impps as $impp}}
-							<div class="form-group form-vcard-impp">
-								<select name="impp_type[]">
-									<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
-									<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-									<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-									<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-								</select>
-								<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
-								<i data-remove="vcard-impp" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-							</div>
-							{{/foreach}}
-							{{/if}}
-						</div>
-					</div>
-
-					<div class="settings-submit-wrapper" >
-						<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-					</div>
-				</div>
-				{{/if}}
-
-
-				{{if $fields.address || $fields.locality || $fields.postal_code || $fields.region || $fields.country_name || $fields.hometown}}
-				<div class="panel">
-					<div class="section-subtitle-wrapper" role="tab" id="location">
-						<h3>
-							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#location-collapse" aria-expanded="true" aria-controls="location-collapse">
-								{{$location}}
-							</a>
-						</h3>
-					</div>
-					<div id="location-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="location">
-						<div class="section-content-tools-wrapper">
-							{{if $fields.address}}
-							{{include file="field_input.tpl" field=$address}}
-							{{/if}}
-
-							{{if $fields.locality}}
-							{{include file="field_input.tpl" field=$locality}}
-							{{/if}}
-
-							{{if $fields.postal_code}}
-							{{include file="field_input.tpl" field=$postal_code}}
-							{{/if}}
-
-							{{if $fields.region}}
-							{{include file="field_input.tpl" field=$region}}
-							{{/if}}
-
-							{{if $fields.country_name}}
-							{{include file="field_input.tpl" field=$country_name}}
-							{{/if}}
-
-							{{if $fields.hometown}}
-							{{include file="field_input.tpl" field=$hometown}}
-							{{/if}}
-
-							<div class="form-group" >
-							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-							</div>
-							<div class="clear"></div>
-						</div>
-					</div>
-				</div>
-
-				{{/if}}
-
-				{{if $fields.marital || $fields.sexual}}
-				<div class="panel">
-					<div class="section-subtitle-wrapper" role="tab" id="relation">
-						<h3>
-							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#relation-collapse" aria-expanded="true" aria-controls="relation-collapse">
-								{{$relation}}
-							</a>
-						</h3>
-					</div>
-					<div id="relation-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relation">
-						<div class="section-content-tools-wrapper">
-							{{if $fields.marital }}
-							<div id="profile-edit-marital-wrapper" class="form-group field" >
-							<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$lbl_marital}}</label>
-							{{if $advanced}}
-							{{$marital}}
-							{{else}}
-							{{$marital_min}}
-							{{/if}}
-							</div>
-							<div class="clear"></div>
-
-							{{if $fields.partner}}
-							{{include file="field_input.tpl" field=$with}}
-							{{/if}}
-
-							{{if $fields.howlong}}
-							{{include file="field_input.tpl" field=$howlong}}
-							{{/if}}
-							{{/if}}
-
-							{{if $fields.sexual}}
-							<div id="profile-edit-sexual-wrapper" class="form-group field" >
-							<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}}</label>
-							{{$sexual}}
-							</div>
-							<div class="clear"></div>
-							{{/if}}
-
-							<div class="form-group" >
-							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-							</div>
-							<div class="clear"></div>
-						</div>
-					</div>
-				</div>
-				{{/if}}
-				{{if $fields.keywords || $fields.politic || $fields.religion || $fields.about || $fields.contact || $fields.homepage || $fields.interest || $fields.likes || $fields.dislikes || $fields.channels || $fields.music || $fields.book || $fields.tv || $fields.film || $fields.romance || $fields.employment || $fields.education || $extra_fields}}
-				<div class="panel">
-					<div class="section-subtitle-wrapper" role="tab" id="miscellaneous">
-						<h3>
-							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#miscellaneous-collapse" aria-expanded="true" aria-controls="miscellaneous-collapse">
-								{{$miscellaneous}}
-							</a>
-						</h3>
-					</div>
-					<div id="miscellaneous-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous">
-						<div class="section-content-tools-wrapper">
-							{{if $fields.homepage}}
-							{{include file="field_input.tpl" field=$homepage}}
-							{{/if}}
-
-							{{if $fields.keywords}}
-							{{include file="field_input.tpl" field=$keywords}}
-							{{/if}}
-
-							{{if $fields.politic}}
-							{{include file="field_input.tpl" field=$politic}}
-							{{/if}}
-
-							{{if $fields.religion}}
-							{{include file="field_input.tpl" field=$religion}}
-							{{/if}}
-
-							{{if $fields.about}}
-							{{include file="field_textarea.tpl" field=$about}}
-							{{/if}}
-
-							{{if $fields.contact}}
-							{{include file="field_textarea.tpl" field=$contact}}
-							{{/if}}
-
-							{{if $fields.interest}}
-							{{include file="field_textarea.tpl" field=$interest}}
-							{{/if}}
-
-							{{if $fields.likes}}
-							{{include file="field_textarea.tpl" field=$likes}}
-							{{/if}}
-
-							{{if $fields.dislikes}}
-							{{include file="field_textarea.tpl" field=$dislikes}}
-							{{/if}}
-
-							{{if $fields.channels}}
-							{{include file="field_textarea.tpl" field=$channels}}
-							{{/if}}
-
-							{{if $fields.music}}
-							{{include file="field_textarea.tpl" field=$music}}
-							{{/if}}
-
-							{{if $fields.book}}
-							{{include file="field_textarea.tpl" field=$book}}
-							{{/if}}
-
-							{{if $fields.tv}}
-							{{include file="field_textarea.tpl" field=$tv}}
-							{{/if}}
-
-							{{if $fields.film}}
-							{{include file="field_textarea.tpl" field=$film}}
-							{{/if}}
-
-							{{if $fields.romance}}
-							{{include file="field_textarea.tpl" field=$romance}}
-							{{/if}}
-
-							{{if $fields.employment}}
-							{{include file="field_textarea.tpl" field=$employ}}
-							{{/if}}
-
-							{{if $fields.education}}
-							{{include file="field_textarea.tpl" field=$education}}
-							{{/if}}
-
-							{{if $extra_fields}}
-							{{foreach $extra_fields as $field }}
-							{{include file="field_input.tpl" field=$field}}
-							{{/foreach}}
-							{{/if}}
-							<div class="form-group" >
-							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-							</div>
-							<div class="clear"></div>
-						</div>
-					</div>
-				</div>
-				{{/if}}
-			</div>
-		</form>
-</div>
-
diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl
deleted file mode 100755
index 9ae870738..000000000
--- a/view/tpl/profile_entry.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="profile-listing-row">
-	<div class="profile-listing-cell" >
-		<a href="profiles/{{$id}}"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
-	</div>
-	<div class="profile-listing-cell" id="profile-listing-name-{{$id}}">
-		<a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a>
-	</div>
-	<div class="profile-listing-cell">
-		{{$visible}}
-	</div>
-</div>
diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl
deleted file mode 100755
index 42abf2735..000000000
--- a/view/tpl/profile_listing_header.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<a class="btn btn-success btn-sm pull-right" href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" ><i class="fa fa-plus-circle"></i>&nbsp;{{$cr_new}}</a>
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper">
-		<div class="profile-listing-table">
-			{{$profiles}}
-		</div>
-	</div>
-
-</div>
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
deleted file mode 100755
index ca107bfcc..000000000
--- a/view/tpl/profile_photo.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-<div id="profile-photo-content" class="generic-content-wrapper">
-    <div class="section-title-wrapper">
-    <h2>{{$title}}</h2>
-    </div>
-    <div class="section-content-wrapper">
-
-		<form enctype="multipart/form-data" action="profile_photo" method="post">
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-		<div id="profile-photo-upload-wrapper">
-
-			{{if $importfile}}
-			<input type="hidden" name="importfile" value="{{$importfile}}">
-			{{else}}
-			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
-			<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
-			{{/if}}
-			<div class="clear"></div>
-
-
-			{{if $single}}
-			<input type="hidden" name="profile" value="{{$profile0.id}}" />
-			{{else}}
-
-			<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label>
-			<select name="profile" id="profile-photo-profiles" class="form-control" >
-			{{foreach $profiles as $p}}
-				<option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option>
-			{{/foreach}}
-			</select>
-			<div class="clear"></div>
-			<br />
-			<br />
-			{{/if}}
-
-			<div id="profile-photo-submit-wrapper">
-				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
-			</div>
-		</div>
-
-		</form>
-		<br />
-		<br />
-		<div id="profile-photo-link-select-wrapper">
-		{{$select}}
-		</div>
-	</div>
-</div>
diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl
deleted file mode 100644
index 49b74bb8f..000000000
--- a/view/tpl/profile_tabs.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}:</div>
-{{foreach $tabs as $tab}}
-<a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a>
-{{/foreach}}
-<div class="dropdown-divider"></div>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
deleted file mode 100755
index c17a7878c..000000000
--- a/view/tpl/profile_vcard.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="vcard h-card">
-	{{if ! $zcard}}
-	<div id="profile-photo-wrapper"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}"></div>
-	{{/if}}
-	{{if $connect}}
-	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
-	{{/if}}
-	{{if ! $zcard}}
-	{{if $editmenu.multi}}
-	<div class="dropdown">
-	<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
-	<ul class="dropdown-menu" role="menu">
-		{{foreach $editmenu.menu.entries as $e}}
-		<li>
-			<a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}</a>
-		</li>
-		{{/foreach}}
-		<li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li>
-		{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
-	</ul>
-	</div>
-	{{elseif $editmenu}}
-	<a class="profile-edit-side-link" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
-	{{/if}}
-	{{/if}}
-
-	{{if ! $zcard}}
-	<div class="fn p-name">{{$profile.fullname}}{{if $profile.online}} <i class="fa fa-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
-	{{if $reddress}}<div class="reddress">{{$profile.reddress}}</div>{{/if}}		
-	{{/if}}
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr h-adr">
-			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region p-region">{{$profile.region}}</span>
-				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url">{{$profile.homepage}}</dd></dl>{{/if}}
-
-
-</div>
-<div id="clear"></div>
-
-{{$rating}}
-
-{{$chanmenu}}
-
-{{$contact_block}}
-
-
diff --git a/view/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl
deleted file mode 100755
index 5d87d52c6..000000000
--- a/view/tpl/profile_vcard_short.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{$contact_block}}
-
-	{{if $connect}}
-	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
-	{{/if}}
-
-
-{{$rating}}
-
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}
-
-<div id="clear"></div>
-
-{{$chanmenu}}
-
-
-
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
deleted file mode 100755
index 925447ff2..000000000
--- a/view/tpl/prv_message.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-{{if $new}}
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper">
-{{/if}}
-		<div id="prvmail-wrapper" >
-			<form id="prvmail-form" action="mail" method="post" >
-				<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
-				<input type="hidden" name="media_str" id="jot-media" value="" />
-				<input type="hidden" name="preview" id="mail-preview" value="0" />
-				{{if $new}}
-				<div class="form-group">
-					<label for="recip">{{$to}}</label>
-					<input class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" />
-					<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
-				</div>
-				<div class="form-group">
-					<label for="prvmail-subject">{{$subject}}</label>
-					<input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" />
-				</div>
-				{{/if}}
-				{{if $reply}}
-				<input type="hidden" name="replyto" value="{{$parent}}" />
-				<input type="hidden" name="messageto" value="{{$recphash}}" />
-				<input type="hidden" name="subject" value="{{$subjtxt}}" />
-				{{/if}}
-				<div class="form-group">
-					<label for="prvmail-text">{{$yourmessage}}</label>
-					<textarea class="form-control" id="prvmail-text" name="body"{{if $new}} style="height: 10em;"{{/if}}>{{$text}}</textarea>
-				</div>
-				<div id="prvmail-submit-wrapper" class="form-group">
-					<div id="prvmail-submit" class="float-right btn-group">
-						<button class="btn btn-outline-secondary btn-sm" id="prvmail-preview" title="{{$preview}}" onclick="preview_mail(); return false;"><i class="fa fa-eye"></i></button>
-						<button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
-					</div>
-					<div id="prvmail-tools" class="btn-toolbar float-left">
-						<div class="btn-group mr-2">
-							<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;">
-								<i class="fa fa-bold jot-icons"></i>
-							</button>
-							<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'prvmail-text'); return false;">
-								<i class="fa fa-italic jot-icons"></i>
-							</button>
-							<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'prvmail-text'); return false;">
-								<i class="fa fa-underline jot-icons"></i>
-							</button>
-							<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'prvmail-text'); return false;">
-								<i class="fa fa-quote-left jot-icons"></i>
-							</button>
-							<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'prvmail-text'); return false;">
-								<i class="fa fa-terminal jot-icons"></i>
-							</button>
-						</div>
-						<div class="btn-group d-none d-lg-flex mr-2">
-							<button id="prvmail-attach-wrapper" class="btn btn-outline-secondary btn-sm" >
-								<i id="prvmail-attach" class="fa fa-paperclip jot-icons" title="{{$attach}}"></i>
-							</button>
-							<button id="prvmail-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailJotGetLink(); return false;" >
-								<i id="prvmail-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i>
-							</button>
-						</div>
-						{{if $feature_expire || $feature_encrypt}}
-						<div class="btn-group d-none d-lg-flex mr-2">
-							{{if $feature_expire}}
-							<button id="prvmail-expire-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailGetExpiry();return false;" >
-								<i id="prvmail-expires" class="fa fa-eraser jot-icons" title="{{$expires}}" ></i>
-							</button>
-							{{/if}}
-							{{if $feature_encrypt}}
-							<button id="prvmail-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;">
-								<i id="prvmail-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i>
-							</button>
-							{{/if}}
-						</div>
-						{{/if}}
-						<div class="btn-group d-lg-none">
-							<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right" role="menu">
-								<a class="dropdown-item" href="#" id="prvmail-attach-sub"><i class="fa fa-paperclip"></i>&nbsp;{{$attach}}</a>
-								<a class="dropdown-item" href="#" onclick="prvmailJotGetLink(); return false;" ><i class="fa fa-link"></i>&nbsp;{{$insert}}</a>
-								{{if $feature_expire || $feature_encrypt}}
-								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="fa fa-eraser"></i>&nbsp;{{$expires}}</a>
-								<a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
-								{{/if}}
-							</div>
-						</div>
-					</div>
-					<div id="prvmail-rotator-wrapper" class="float-left">
-						<div id="prvmail-rotator"></div>
-					</div>
-					<div class="clear"></div>
-				</div>
-				<div id="mail-preview-content" style="display: none;"></div>
-			</form>
-		</div>
-{{if $new}}
-	</div>
-</div>
-{{/if}}
diff --git a/view/tpl/pwdreset.tpl b/view/tpl/pwdreset.tpl
deleted file mode 100755
index dc17ed57a..000000000
--- a/view/tpl/pwdreset.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h3>{{$lbl1}}</h3>
-
-<p>
-{{$lbl2}}
-</p>
-<p>
-{{$lbl3}}
-</p>
-<p>{{$newpass}}</p>
-<p>
-{{$lbl4}} {{$lbl5}}
-</p>
-<p>
-{{$lbl6}}
-</p>
-</div>
diff --git a/view/tpl/rating_form.tpl b/view/tpl/rating_form.tpl
deleted file mode 100644
index 4bd826484..000000000
--- a/view/tpl/rating_form.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h3>{{$header}}</h3>
-
-<div class="rating-target-name">{{if $site}}{{$website}} {{$site}}{{else}}{{$tgt_name}}{{/if}}</div>
-
-<h3>{{$lbl_rating}}</h3>
-
-<form action="rate" method="post">
-
-{{$rating}}
-
-<input type="hidden" name="execute" value="1" />
-<input type="hidden" name="target" value="{{$target}}" />
-
-<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
-<br />
-<h3 class="abook-rating-text-desc">{{$lbl_rating_txt}}</h3>
-<textarea name="rating_text" id="rating-text" >{{$rating_txt}}</textarea>
-
-<div class="clear"></div>
-
-<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
-
-</form>
-</div>
diff --git a/view/tpl/rating_slider.tpl b/view/tpl/rating_slider.tpl
deleted file mode 100644
index 4c36504e6..000000000
--- a/view/tpl/rating_slider.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div id="rating-slider" class="slider form-group"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div>
-<script>
-$(document).ready(function() {
-	// The slider does not render correct if width is given in % and
-	// the slider container is hidden (display: none) during rendering.
-	// So let's unhide it to render and hide again afterwards.
-	if(!$("#rating-tool-collapse").hasClass("in")) {
-		$("#rating-tool-collapse").addClass("in");
-		makeRatingSlider();
-		$("#rating-tool-collapse").removeClass("in");
-	}
-	else {
-		makeRatingSlider();
-	}
-});
-function makeRatingSlider() {
-	$("#rating-range").jRange({ from: -10, to: 10, step: 1, width:'98%', showLabels: false, showScale: true, scale : [ '-10','-8','-6','-4','-2','0','2','4','6','8','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); }  });
-}
-</script>
diff --git a/view/tpl/rbmark.tpl b/view/tpl/rbmark.tpl
deleted file mode 100644
index bead1de2f..000000000
--- a/view/tpl/rbmark.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h3>{{$header}}</h3>
-
-
-<form action="rbmark" method="post" >
-
-<input type="hidden" name="private" value="{{$private}}" />
-<input type="hidden" name="ischat" value="{{$ischat}}" />
-
-{{include file="field_input.tpl" field=$url}}
-{{include file="field_input.tpl" field=$title}}
-{{include file="field_select.tpl" field=$menus}}
-{{include file="field_input.tpl" field=$menu_name}}
-
-<input type="submit" name="submit" value="{{$submit}}" />
-
-</form>
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
deleted file mode 100755
index c84934626..000000000
--- a/view/tpl/register.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<div class="section-content-wrapper">
-		<form action="register" method="post" id="register-form">
-			{{if $reg_is}}
-			<div class="section-content-warning-wrapper">
-				<div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div>
-				<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div>
-			</div>
-			{{/if}}
-
-			{{if $registertext}}
-			<div id="register-text" class="descriptive-paragraph">{{$registertext}}</div>
-			{{/if}}
-
-			{{if $invitations}}
-			<div class="section-content-info-wrapper">
-				<div id="register-invite-desc" class="descriptive-paragraph">{{$invite_desc}}</div>
-			</div>
-			{{include file="field_input.tpl" field=$invite_code}}
-			{{/if}}
-
-			{{include file="field_input.tpl" field=$email}}
-
-			{{include file="field_password.tpl" field=$pass1}}
-
-			{{include file="field_password.tpl" field=$pass2}}
-
-			{{if $auto_create}}
-				{{if $default_role}}
-				<input type="hidden" name="permissions_role" value="{{$default_role}}" />
-				{{else}}
-				<div class="section-content-info-wrapper">
-					{{$help_role}}
-				</div>
-				{{include file="field_select_grouped.tpl" field=$role}}
-				{{/if}}
-
-				{{include file="field_input.tpl" field=$name}}
-				<div id="name-spinner"></div>
-
-				{{include file="field_input.tpl" field=$nickname}}
-				<div id="nick-spinner"></div>
-			{{/if}}
-
-			{{if $enable_tos}}
-			{{include file="field_checkbox.tpl" field=$tos}}
-			{{else}}
-			<input type="hidden" name="tos" value="1" />
-			{{/if}}
-
-			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
-			<div id="register-submit-end" class="register-field-end"></div>
-		</form>
-			<br />
-			<div class="descriptive-text">{{$verify_note}}</div>
-
-	</div>
-</div>
diff --git a/view/tpl/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl
deleted file mode 100755
index d6d2fd211..000000000
--- a/view/tpl/remote_friends_common.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="remote-friends-in-common" class="bigwidget">
-	<div id="rfic-desc">{{$desc}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{if $linkmore}}<a href="{{$base}}/common/{{$uid}}">{{$more}}</a>{{/if}}</div>
-	{{if $items}}
-	{{foreach $items as $item}}
-	<div class="profile-match-wrapper">
-		<div class="profile-match-photo">
-			<a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}">
-				<img src="{{$item.xchan_photo_m}}" width="80" height="80" alt="{{$item.xchan_name}}" title="{{$item.xchan_name}}" />
-			</a>
-		</div>
-		<div class="profile-match-break"></div>
-		<div class="profile-match-name">
-			<a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}" title="{{$item.xchan_name}}">{{$item.xchan_name}}</a>
-		</div>
-		<div class="profile-match-end"></div>
-	</div>
-	{{/foreach}}
-	{{/if}}
-	<div id="rfic-end" class="clear"></div>
-</div>
-
diff --git a/view/tpl/remote_login.tpl b/view/tpl/remote_login.tpl
deleted file mode 100644
index e6d387265..000000000
--- a/view/tpl/remote_login.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<a href="rmagic" class="btn btn-block btn-success rmagic-button">{{$title}}</a>
diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl
deleted file mode 100644
index ce6c8ac22..000000000
--- a/view/tpl/removeaccount.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<div class="section-content-danger-wrapper" id="remove-account-desc">
-		<strong>{{$desc.0}}</strong>{{$desc.1}}<strong>{{$desc.2}}</strong>
-	</div>
-	<div class="section-content-tools-wrapper">
-		<form action="{{$basedir}}/removeaccount" autocomplete="off" method="post" >
-			<input type="hidden" name="verify" value="{{$hash}}" />
-			<div class="form-group" id="remove-account-pass-wrapper">
-				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
-				<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password"  value=" " />
-			</div>
-			{{include file="field_checkbox.tpl" field=$global}}
-			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
-		</form>
-	</div>
-</div>
-
diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl
deleted file mode 100755
index 40b9546d2..000000000
--- a/view/tpl/removeme.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<div class="section-content-danger-wrapper" id="remove-account-desc">
-		<strong>{{$desc.0}}</strong>{{$desc.1}}<strong>{{$desc.2}}</strong>
-	</div>
-	<div class="section-content-tools-wrapper">
-		<form action="{{$basedir}}/removeme" autocomplete="off" method="post" >
-			<input type="hidden" name="verify" value="{{$hash}}" />
-			<div class="form-group" id="remove-account-pass-wrapper">
-				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
-				<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " />
-			</div>
-			{{include file="field_checkbox.tpl" field=$global}}
-			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
-		</form>
-	</div>
-</div>
-
diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl
deleted file mode 100755
index 9d84e4a36..000000000
--- a/view/tpl/rmagic.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="generic-content-wrapper-styled">
-	<h3>{{$title}}</h3>
-	<form action="rmagic" method="post" >
-		<div class="form-group">
-			{{include file="field_input.tpl" field=$address}}
-			<input class="btn btn-primary" type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" />
-		</div>
-	</form>
-</div>
diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl
deleted file mode 100644
index 58ce22741..000000000
--- a/view/tpl/safesearch.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div id="directory_safemode" class="widget">
-<h3>{{$safemode}}</h3>
-<ul class="nav nav-pills nav-stacked">
-	<li><a href="toggle_safesearch">{{$toggle}}</a></li>
-</ul>
-</div>
diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl
deleted file mode 100644
index ff2d044ef..000000000
--- a/view/tpl/saved_searches.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="widget saved-search-widget clearfix">
-	<h3 id="search">{{$title}}</h3>
-	{{$searchbox}}
-	<ul id="saved-search-list" class="nav nav-pills flex-column">
-		{{foreach $saved as $search}}
-		<li class="nav-item nav-item-hack" id="search-term-{{$search.id}}">
-			<a class="nav-link widget-nav-pills-icons" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropfa-floppy-od-search-term-{{$search.id}}" class="fa fa-trash-o drop-icons" ></i></a>
-			<a id="saved-search-term-{{$search.id}}" class="nav-link{{if $search.selected}} active{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a>
-		</li>
-		{{/foreach}}
-	</ul>
-</div>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
deleted file mode 100755
index 66618a216..000000000
--- a/view/tpl/search_item.tpl
+++ /dev/null
@@ -1,114 +0,0 @@
-<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 clearfix generic-content-wrapper{{/if}}">
-	<a name="{{$item.id}}" ></a>
-	<div class="clearfix wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
-		<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}">
-			{{if $item.photo}}
-			<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
-				{{$item.photo}}
-			</div>
-			{{/if}}
-			{{if $item.event}}
-			<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
-				{{$item.event}}
-			</div>
-			{{/if}}
-			{{if $item.title && !$item.event}}
-			<div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}">
-				{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}
-			</div>
-			{{if ! $item.is_new}}
-			<hr class="m-0">
-			{{/if}}
-			{{/if}}
-			<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
-				<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
-					<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
-						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
-					</div>
-				</div>
-				{{if $item.lock}}
-				<div class="wall-item-lock dropdown">
-					<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
-				</div>
-				{{/if}}
-				<div class="wall-item-author">
-					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
-				</div>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-					{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
-				</div>
-			</div>
-			{{if $item.body}}
-			<div class="p-2 clrearfix {{if $item.is_photo}} wall-photo-item{{else}} wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}">
-				<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
-					{{$item.body}}
-				</div>
-			</div>
-			{{/if}}
-			{{if $item.has_tags}}
-			<div class="p-2 wall-item-tools clearfix">
-				<div class="body-tags">
-					<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
-				</div>
-			{{**
-				{{if $item.mentions}}
-				<div class="body-tags" id="item-mentions">
-					<span class="tag">{{$item.mentions}}</span>
-				</div>
-				{{/if}}
-				{{if $item.tags}}
-				<div class="body-tags" id="item-tags">
-					<span class="tag">{{$item.tags}}</span>
-				</div>
-				{{/if}}
-				{{if $item.categories}}
-				<div class="body-tags" id="item-categories">
-					<span class="tag">{{$item.categories}}</span>
-				</div>
-				{{/if}}
-				{{if $item.folders}}
-				<div class="body-tags" id="item-folders">
-					<span class="tag">{{$item.folders}}</span>
-				</div>
-				{{/if}}
-			**}}
-			</div>
-			{{/if}}
-			<div class="p-2 clearfix wall-item-tools">
-				<div class="wall-item-tools-right btn-group pull-right">
-					<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
-						<i class="fa fa-cog"></i>
-					</button>
-					<div class="dropdown-menu dropdown-menu-right">
-						{{if $item.thread_action_menu}}
-						{{foreach $item.thread_action_menu as $mitem}}
-						<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-{{$mitem.icon}}"></i> {{$mitem.title}}</a></li>
-						{{/foreach}}
-						{{/if}}
-						{{if $item.drop.dropping}}
-						<a class="dropdown-item" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li>
-						{{/if}}
-						{{if $item.thread_author_menu}}
-						<div class="dropdown-divider"></div>
-						{{foreach $item.thread_author_menu as $mitem}}
-						<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a></li>
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-				{{if $item.attachments}}
-				<div class="wall-item-tools-left btn-group">
-					<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
-					<div class="dropdown-menu">{{$item.attachments}}</div>
-				</div>
-				{{/if}}
-			</div>
-		</div>
-		{{if $item.conv}}
-		<div class="p-2 wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-		</div>
-		{{/if}}
-	</div>
-</div>
-
diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl
deleted file mode 100644
index 8f7ac5162..000000000
--- a/view/tpl/searchbox.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<form action="{{$action_url}}" method="get" >
-	<input type="hidden" name="f" value="" />
-	<div id="{{$id}}" class="input-group">
-		<input class="form-control form-control-sm" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
-		<div class="input-group-btn">
-			<button type="submit" name="submit" class="btn btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button>
-			{{if $savedsearch}}
-			<button type="submit" name="searchsave" class="btn btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button>
-			{{/if}}
-		</div>
-	</div>
-</form>
diff --git a/view/tpl/section_title.tpl b/view/tpl/section_title.tpl
deleted file mode 100644
index 338e57042..000000000
--- a/view/tpl/section_title.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="section-title-wrapper">
-	<h2>{{$title}}</h2>
-	<div class="clear"></div>
-</div>
-
diff --git a/view/tpl/select_timezone.tpl b/view/tpl/select_timezone.tpl
deleted file mode 100644
index 2820a54f4..000000000
--- a/view/tpl/select_timezone.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{* TODO: Make id configurabel *}}
-<select id='timezone_select' name='timezone'>
-{{foreach $continents as $continent => $cities}}
-<optgroup label="{{$continent}}">
-{{foreach $cities as $city => $value}}
-<option value='{{$value}}' {{if $value == $selected}}selected='selected'{{/if}}>{{$city}}</option>
-{{/foreach}}
-</optgroup>
-{{/foreach}}
-</select>
-
diff --git a/view/tpl/sellpage_edit.tpl b/view/tpl/sellpage_edit.tpl
deleted file mode 100644
index 0a4726fb2..000000000
--- a/view/tpl/sellpage_edit.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<h1>{{$header}}</h1>
-<form id="sellpage-edit" action="connect/{{$address}}" method="post">
-
-{{include file="field_checkbox.tpl" field=$premium}}
-
-<div class="descriptive-text">{{$desc}}</div>
-
-<div class="sellpage-editbody">
-<p id="sellpage-bodydesc" >
-{{$lbl_about}}
-</p>
-
-<textarea rows="10" cols="72" id="sellpage-textinp" name="text" >{{$text}}</textarea>
-
-</div>
-<div id="sellpage-editbody-end"></div>
-
-
-<div class="descriptive-text">{{$lbl2}}</div>
-<div class="sellpage-final">{{$desc2}}</div>
-
-<input type="submit" name="submit" value="{{$submit}}" />
-</form>
diff --git a/view/tpl/sellpage_submit.tpl b/view/tpl/sellpage_submit.tpl
deleted file mode 100644
index 2bd735ea4..000000000
--- a/view/tpl/sellpage_submit.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<form id="sellpage-submit" action="connect/{{$address}}" method="post">
-<input type="submit" name="submit" value="{{$continue}}" />
-</form>
\ No newline at end of file
diff --git a/view/tpl/sellpage_view.tpl b/view/tpl/sellpage_view.tpl
deleted file mode 100644
index 20a65ffbe..000000000
--- a/view/tpl/sellpage_view.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="generic-content-wrapper">
-<h1>{{$header}}</h1>
-
-<div class="descriptive-text">{{$desc}}</div>
-
-<div class="sellpage-body">{{$text}}</div>
-
-<div class="sellpage-final">{{$desc2}}</div>
-
-{{$submit}}
-</div>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
deleted file mode 100755
index dd5fecb43..000000000
--- a/view/tpl/settings.tpl
+++ /dev/null
@@ -1,192 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-sm pull-right" href="removeme"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>{{/if}}
-		<h2>{{$ptitle}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{$nickname_block}}
-	<form action="settings" id="settings-form" method="post" autocomplete="off" class="acl-form" data-form_id="settings-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
-		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="basic-settings">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse">
-							{{$h_basic}}
-						</a>
-					</h3>
-				</div>
-				<div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings">
-					<div class="section-content-tools-wrapper">
-						{{include file="field_input.tpl" field=$username}}
-						{{include file="field_select_grouped.tpl" field=$timezone}}
-						{{include file="field_input.tpl" field=$defloc}}
-						{{include file="field_checkbox.tpl" field=$allowloc}}
-						{{include file="field_checkbox.tpl" field=$adult}}
-						{{include file="field_input.tpl" field=$photo_path}}
-						{{include file="field_input.tpl" field=$attach_path}}
-						{{if $basic_addon}}
-						{{$basic_addon}}
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse">
-							{{$h_prv}}
-						</a>
-					</h3>
-				</div>
-				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings">
-					<div class="section-content-tools-wrapper">
-						{{if $server_role != 'basic'}}
-						{{include file="field_select_grouped.tpl" field=$role}}
-						{{/if}}
-						<div id="advanced-perm" style="display:{{if $permissions_set && $server_role != 'basic' }}none{{else}}block{{/if}};">
-
-							{{if $server_role != 'basic'}}
-							<div class="form-group">
-								<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button>
-							</div>
-							<div class="modal" id="apsModal">
-								<div class="modal-dialog">
-									<div class="modal-content">
-										<div class="modal-header">
-											<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-											<h4 class="modal-title">{{$lbl_p2macro}}</h4>
-										</div>
-										<div class="modal-body">
-										{{foreach $permiss_arr as $permit}}
-											{{include file="field_select.tpl" field=$permit}}
-										{{/foreach}}
-										</div>
-										<div class="modal-footer">
-											<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
-										</div>
-									</div><!-- /.modal-content -->
-								</div><!-- /.modal-dialog -->
-							</div><!-- /.modal -->
-							{{/if}}
-							<div id="settings-default-perms" class="form-group" >
-								<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button>
-							</div>
-							{{$group_select}}
-							{{include file="field_checkbox.tpl" field=$hide_presence}}
-							{{$profile_in_dir}}
-						</div>
-						<div class="settings-common-perms">
-							{{$suggestme}}
-							{{include file="field_checkbox.tpl" field=$blocktags}}
-							{{include file="field_input.tpl" field=$expire}}
-						</div>
-						{{if $permcat_enable}}
-						{{include file="field_select.tpl" field=$defpermcat}}
-						{{/if}}
-
-						{{if $sec_addon}}
-						{{$sec_addon}}
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="notification-settings">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse">
-							{{$h_not}}
-						</a>
-					</h3>
-				</div>
-				<div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings">
-					<div class="section-content-tools-wrapper">
-						<div id="settings-notifications">
-							<h3>{{$activity_options}}</h3>
-							<div class="group">
-								{{*not yet implemented *}}
-								{{*include file="field_checkbox.tpl" field=$post_joingroup*}}
-								{{include file="field_checkbox.tpl" field=$post_newfriend}}
-								{{include file="field_checkbox.tpl" field=$post_profilechange}}
-							</div>
-							<h3>{{$lbl_not}}</h3>
-							<div class="group">
-								{{include file="field_intcheckbox.tpl" field=$notify1}}
-								{{include file="field_intcheckbox.tpl" field=$notify2}}
-								{{include file="field_intcheckbox.tpl" field=$notify3}}
-								{{include file="field_intcheckbox.tpl" field=$notify4}}
-								{{*include file="field_intcheckbox.tpl" field=$notify9*}}
-								{{include file="field_intcheckbox.tpl" field=$notify5}}
-								{{include file="field_intcheckbox.tpl" field=$notify6}}
-								{{include file="field_intcheckbox.tpl" field=$notify7}}
-								{{include file="field_intcheckbox.tpl" field=$notify8}}
-							</div>
-							<h3>{{$lbl_vnot}}</h3>
-							<div class="group">
-								{{include file="field_intcheckbox.tpl" field=$vnotify1}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify2}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify3}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify4}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify5}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify6}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify10}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify7}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify8}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify9}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify11}}
-								{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}}
-								{{include file="field_input.tpl" field=$evdays}}
-							</div>
-						</div>
-						{{if $notify_addon}}
-						{{$notify_addon}}
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#miscellaneous-settings-collapse" aria-expanded="true" aria-controls="miscellaneous-settings-collapse">
-							{{$lbl_misc}}
-						</a>
-					</h3>
-				</div>
-				<div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
-					<div class="section-content-tools-wrapper">
-						{{if $menus}}
-						<div class="form-group channel-menu">
-							<label for="channel_menu">{{$menu_desc}}</label>
-							<select name="channel_menu" class="form-control">
-							{{foreach $menus as $menu }}
-								<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option>
-							{{/foreach}}
-							</select>
-						</div>
-						{{/if}}
-						{{include file="field_checkbox.tpl" field=$cal_first_day}}
-
-						{{if $misc_addon}}
-						{{$misc_addon}}
-						{{/if}}
-
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</form>
-	{{$aclselect}}
-</div>
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
deleted file mode 100755
index b7fdfb9a9..000000000
--- a/view/tpl/settings_account.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<a title="{{$removeaccount}}" class="btn btn-danger btn-sm pull-right" href="removeaccount"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	<form action="settings/account" id="settings-account-form" method="post" autocomplete="off" >
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		<div class="section-content-tools-wrapper">
-			{{include file="field_input.tpl" field=$email}}
-			{{include file="field_password.tpl" field=$origpass}}
-			{{include file="field_password.tpl" field=$password1}}
-			{{include file="field_password.tpl" field=$password2}}
-
-			{{if $z_server_role == 'pro' && ! $techlock}}
-			{{include file="field_select.tpl" field=$techlevel}}
-			{{else}}
-			<input type="hidden" name="techlevel" value="{{$techlevel.2}}" />
-			{{/if}}
-
-			<div class="settings-submit-wrapper" >
-				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-			</div>
-			{{$account_settings}}
-		</div>
-	</form>
-</div>
-
diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
deleted file mode 100755
index 52f8d9d3f..000000000
--- a/view/tpl/settings_addons.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<form action="settings/featured" method="post" autocomplete="off">
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		<div class="panel-group" id="settings" role="tablist">
-			{{$settings_addons}}
-		</div>
-	</form>
-</div>
diff --git a/view/tpl/settings_connectors.tpl b/view/tpl/settings_connectors.tpl
deleted file mode 100755
index 8bea9ca63..000000000
--- a/view/tpl/settings_connectors.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
-
-<form action="settings/connectors" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{$settings_connectors}}
-
-</form>
-</div>
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
deleted file mode 100755
index d8c1ac7aa..000000000
--- a/view/tpl/settings_display.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$ptitle}}</h2>
-	</div>
-	<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
-			{{if $theme || $mobile_theme}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content">
-							{{$d_tset}}
-						</a>
-					</h3>
-				</div>
-				<div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings">
-					<div class="section-content-tools-wrapper">
-						{{if $theme}}
-							{{include file="field_themeselect.tpl" field=$theme}}
-						{{/if}}
-						{{if $schema}}
-							{{include file="field_select.tpl" field=$schema}}
-						{{/if}}
-						{{if $mobile_theme}}
-							{{include file="field_themeselect.tpl" field=$mobile_theme}}
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{/if}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content">
-							{{$d_ctset}}
-						</a>
-					</h3>
-				</div>
-				<div id="custom-settings-content" class="collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
-					<div class="section-content-tools-wrapper">
-						{{if $theme_config}}
-							{{$theme_config}}
-						{{/if}}
-					</div>
-				</div>
-			</div>
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content">
-							{{$d_cset}}
-						</a>
-					</h3>
-				</div>
-				<div id="content-settings-content" class="collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
-					<div class="section-content-wrapper">
-						{{include file="field_input.tpl" field=$ajaxint}}
-						{{include file="field_input.tpl" field=$itemspage}}
-						{{include file="field_input.tpl" field=$channel_divmore_height}}
-						{{include file="field_input.tpl" field=$network_divmore_height}}
-						{{include file="field_checkbox.tpl" field=$nosmile}}
-						{{include file="field_checkbox.tpl" field=$title_tosource}}
-						{{include file="field_checkbox.tpl" field=$channel_list_mode}}
-						{{include file="field_checkbox.tpl" field=$network_list_mode}}
-						{{include file="field_checkbox.tpl" field=$user_scalable}}
-						{{include file="field_checkbox.tpl" field=$preload_images}}
-						{{include file="field_checkbox.tpl" field=$manual_update}}
-						{{if $expert}}
-						<div class="form-group">
-							<a class="btn btn-outline-secondary "href="pdledit">{{$layout_editor}}</a>
-						</div>
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</form>
-</div>
diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
deleted file mode 100755
index dfe049a7a..000000000
--- a/view/tpl/settings_features.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<form action="settings/features" method="post" autocomplete="off">
-	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-	<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
-		{{foreach $features as $g => $f}}
-		<div class="panel">
-			<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
-				<h3>
-					<a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
-						{{$f.0}}
-					</a>
-				</h3>
-			</div>
-			<div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
-				<div class="section-content-tools-wrapper">
-					{{foreach $f.1 as $fcat}}
-						{{include file="field_checkbox.tpl" field=$fcat}}
-					{{/foreach}}
-					<div class="settings-submit-wrapper" >
-						<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-					</div>
-				</div>
-			</div>
-		</div>
-		{{/foreach}}
-	</div>
-</div>
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
deleted file mode 100755
index 76fe7cd8d..000000000
--- a/view/tpl/settings_nick_set.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="settings-nick-wrapper" class="section-content-info-wrapper">
-<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong></div>
-{{if $davpath}}
-<br>
-<div id="settings-dav-desc">{{$davdesc}} <strong>'{{$davpath}}'</strong></div>
-{{/if}}
-</div>
-<div id="settings-nick-end" ></div>
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl
deleted file mode 100755
index 811cfcec5..000000000
--- a/view/tpl/settings_oauth.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="generic-content-wrapper">
-<div class="section-title-wrapper">
-	<h2>{{$title}}</h2>
-</div>
-
-<div class="section-content-tools-wrapper">
-<form action="settings/oauth" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-	<div id="profile-edit-links">
-		<ul>
-			<li>
-				<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a>
-			</li>
-		</ul>
-	</div>
-
-	{{foreach $apps as $app}}
-	<div class='oauthapp'>
-		<img src='{{$app.icon}}' class="{{if $app.icon}} {{else}}noicon{{/if}}">
-		{{if $app.clname}}<h4>{{$app.clname}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}}
-		{{if $app.my}}
-			{{if $app.oauth_token}}
-			<div class="settings-submit-wrapper" ><button class="settings-submit"  type="submit" name="remove" value="{{$app.oauth_token}}">{{$remove}}</button></div>
-			{{/if}}
-		{{/if}}
-		{{if $app.my}}
-		<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
-		<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
-		{{/if}}		
-	</div>
-	{{/foreach}}
-
-</form>
-</div>
-</div>
diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl
deleted file mode 100755
index b94dec48a..000000000
--- a/view/tpl/settings_oauth_edit.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-<div class="section-content-tools-wrapper">
-<form method="POST">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{include file="field_input.tpl" field=$name}}
-{{include file="field_input.tpl" field=$key}}
-{{include file="field_input.tpl" field=$secret}}
-{{include file="field_input.tpl" field=$redirect}}
-{{include file="field_input.tpl" field=$icon}}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-<input type="submit" name="cancel" class="settings-submit" value="{{$cancel}}" />
-</div>
-
-</form>
-</div>
-</div>
diff --git a/view/tpl/settings_permcats.tpl b/view/tpl/settings_permcats.tpl
deleted file mode 100644
index f6bb9b036..000000000
--- a/view/tpl/settings_permcats.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-tools-wrapper">
-		<div class="section-content-info-wrapper">
-			{{$desc}}
-		</div>
-
-		<form action="settings/permcats" id="settings-permcats-form" method="post" autocomplete="off" >
-			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-			{{include file="field_input.tpl" field=$name}}
-
-			<div class="settings-submit-wrapper form-group">
-				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-			</div>
-	</div>
-
-	<div class="panel">
-		<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
-			<h3>
-				<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
-				{{$permlbl}}
-				</a>
-			</h3>
-		</div>
-		<div id="perms-tool-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="perms-tool">
-			<div class="section-content-tools-wrapper">
-				<div class="section-content-warning-wrapper">
-				{{$permnote}}
-				</div>
-
-				<table id="perms-tool-table" class=form-group>
-					<tr>
-						<td></td><td colspan="2" class="abook-me">{{$me}}</td>
-					</tr>
-						{{foreach $perms as $prm}}
-						{{include file="field_acheckbox.tpl" field=$prm}}
-						{{/foreach}}
-				</table>
-
-				<div class="settings-submit-wrapper" >
-					<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-				</div>
-			</div>
-		</div>
-		{{if $permcats}}
-		<div class="section-content-wrapper-np">
-			<table id="permcat-index">
-			{{foreach $permcats as $k => $v}}
-			<tr class="permcat-row-{{$k}}">
-				<td width="99%"><a href="settings/permcats/{{$k}}">{{$k}}</a></td>
-				<td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td>
-			</tr>
-			{{/foreach}}
-			</table>
-		</div>
-		{{/if}}
-
-	</div>
-	</form>
-
-</div>
diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
deleted file mode 100644
index 48190c00c..000000000
--- a/view/tpl/settings_tokens.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-tools-wrapper">
-		<div class="section-content-info-wrapper">
-			{{$desc}}
-		</div>
-
-		<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
-			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-			{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
-			{{include file="field_input.tpl" field=$name}}
-			{{include file="field_input.tpl" field=$token}}
-			{{include file="field_input.tpl" field=$expires}}
-			<div class="settings-submit-wrapper form-group">
-				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-			</div>
-	</div>
-
-	<div class="panel">
-		<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
-			<h3>
-				<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
-				{{$permlbl}}
-				</a>
-			</h3>
-		</div>
-		<div id="perms-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="perms-tool">
-			<div class="section-content-tools-wrapper">
-				<div class="section-content-warning-wrapper">
-				{{$permnote}}
-				</div>
-
-				<table id="perms-tool-table" class=form-group>
-					<tr>
-						<td></td><td colspan="2" class="abook-me">{{$me}}</td>
-					</tr>
-						{{foreach $perms as $prm}}
-						{{include file="field_acheckbox.tpl" field=$prm}}
-						{{/foreach}}
-				</table>
-
-				<div class="settings-submit-wrapper" >
-					<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-				</div>
-			</div>
-		</div>
-	</div>
-	</form>
-
-	<div class="descriptive-text">{{$desc2}}</div>
-	<ul>
-		<li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
-		<li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
-	</ul>
-
-	{{if $tokens}}
-	<div class="section-content-wrapper-np">
-		<table id="atoken-index">
-			{{foreach $tokens as $t}}
-			<tr id="atoken-index-{{$t.atoken_id}}" class="atoken-index-row">
-				<td width="99%"><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td>
-				<td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td>
-			</tr>
-			{{/foreach}}
-		</table>
-
-	</div>
-	{{/if}}
-</div>
diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl
deleted file mode 100644
index 68bdd6faa..000000000
--- a/view/tpl/sharedwithme.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-sm btn-outline-secondary pull-right"><i class="fa fa-trash-o"></i>&nbsp;{{$dropall}}</a>
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper-np">
-		<table id="cloud-index">
-			<tr>
-				<th width="1%"></th>
-				<th width="92%">{{$name}}</th>
-				<th width="1%"></th>
-				<th width="1%" class="d-none d-md-table-cell">{{$size}}</th>
-				<th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th>
-			</tr>
-		{{foreach $items as $item}}
-			<tr id="cloud-index-{{$item.id}}">
-				<td><i class="fa {{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td>
-				<td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}}&nbsp;<span class="label label-success">{{$label_new}}</span>{{/if}}</td>
-				<td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
-				<td class="d-none d-md-table-cell">{{$item.objfilesize}}</td>
-				<td class="d-none d-md-table-cell">{{$item.objedited}}</td>
-			</tr>
-		{{/foreach}}
-		</table>
-	</div>
-</div>
diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl
deleted file mode 100644
index d738c9fc9..000000000
--- a/view/tpl/show_thing.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h2>{{$header}}</h2>
-{{if $thing}}
-<div class="thing-show">
-{{if $thing.obj_imgurl}}<a href="{{$thing.obj_url}}" ><img src="{{$thing.obj_imgurl}}" width="175" height="175" alt="{{$thing.obj_term}}" /></a>{{/if}}
-<a href="{{$thing.obj_url}}" >{{$thing.obj_term}}</a>
-</div>
-{{if $canedit}}
-<div class="thing-edit-links">
-<a href="thing/edit/{{$thing.obj_obj}}" title="{{$edit}}" class="btn btn-outline-secondary" ><i class="fa fa-pencil thing-edit-icon"></i></a>
-<a href="thing/drop/{{$thing.obj_obj}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-outline-secondary" ><i class="fa fa-trash-o drop-icons"></i></a>
-</div>
-<div class="thing-edit-links-end"></div>
-{{/if}}
-
-{{/if}}
-
diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
deleted file mode 100755
index a5b99fd83..000000000
--- a/view/tpl/siteinfo.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h2>{{$title}}</h2>
-
-<h3>{{$sitenametxt}}</h3>
-
-<div>{{$sitename}}</div>
-
-<h3>{{$headline}}</h3>
-
-<div>{{if $site_about}}{{$site_about}}{{else}}--{{/if}}</div>
-
-<h3>{{$admin_headline}}</h3>
-
-<div>{{if $admin_about}}{{$admin_about}}{{else}}--{{/if}}</div>
-
-<br><br>
-<div><a href="help/TermsOfService">{{$terms}}</a></div>
-
-<hr>
-
-<h2>{{$prj_header}}</h2>
-
-<div>{{$prj_name}} ({{$z_server_role}})</div>
-
-{{if $prj_version}}
-<div>{{$prj_version}}</div>
-{{/if}}
-
-
-<h3>{{$prj_linktxt}}</h3>
-
-<div>{{$prj_link}}</div>
-
-<h3>{{$prj_srctxt}}</h3>
-
-<div>{{$prj_src}}</div>
-
-<br><br>
-<div>{{$prj_transport}} ({{$transport_link}})</div>
-
-</div>
diff --git a/view/tpl/sitesearch.tpl b/view/tpl/sitesearch.tpl
deleted file mode 100644
index 8dbf8cef5..000000000
--- a/view/tpl/sitesearch.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="widget saved-search-widget">
-	<h3 id="search">{{$title}}</h3>
-	{{$searchbox}}
-	<div class="clear"></div>
-</div>
diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl
deleted file mode 100644
index 61f6e8cb0..000000000
--- a/view/tpl/sources_edit.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
-
-<div class="descriptive-text">{{$desc}}</div>
-
-<form action="sources" method="post">
-<input type="hidden" name="source" value="{{$id}}" />
-<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
-{{include file="field_input.tpl" field=$name}}
-{{include file="field_input.tpl" field=$tags}}
-{{include file="field_textarea.tpl" field=$words}}
-
-<div class="sources-submit-wrapper" >
-<input type="submit" name="submit" class="sources-submit" value="{{$submit}}" />
-</div>
-</form>
-<br />
-<br />
-<a href="sources/{{$id}}/drop">{{$drop}}</a>
-</div>
-
-
-
-
diff --git a/view/tpl/sources_list.tpl b/view/tpl/sources_list.tpl
deleted file mode 100644
index 76be35b1a..000000000
--- a/view/tpl/sources_list.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
-
-<div class="descriptive-text">{{$desc}}</div>
-
-<div class="sources-links">
-<a href="sources/new">{{$new}}</a>
-</div>
-
-{{if $sources}}
-<ul class="sources-list">
-{{foreach $sources as $source}}
-<li><a href="sources/{{$source.src_id}}">{{$source.xchan_name}}</a></li>
-{{/foreach}}
-</ul>
-{{/if}}
-</div>
diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl
deleted file mode 100644
index bbc22df84..000000000
--- a/view/tpl/sources_new.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
-
-<div class="descriptive-text">{{$desc}}</div>
-
-<form action="sources" method="post">
-<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
-{{include file="field_input.tpl" field=$name}}
-{{include file="field_input.tpl" field=$tags}}
-{{include file="field_textarea.tpl" field=$words}}
-
-<div class="sources-submit-wrapper" >
-<input type="submit" name="submit" class="sources-submit" value="{{$submit}}" />
-</div>
-</form>
-</div>
-
diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
deleted file mode 100755
index 95f24cd63..000000000
--- a/view/tpl/suggest_friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="{{$entry.url}}">
-			<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.profile}}]" />
-		</a>
-	</div>
-	<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="fa fa-times drop-icons btn btn-outline-secondary"></i></a>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{if $entry.connlnk}}
-	<div class="profile-match-connect btn btn-outline-secondary"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conntxt}}</a></div>
-	{{/if}}
-</div>
diff --git a/view/tpl/suggest_page.tpl b/view/tpl/suggest_page.tpl
deleted file mode 100755
index 97837c852..000000000
--- a/view/tpl/suggest_page.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<h3>{{$title}}</h3>
-
-{{if $entries}}
-{{foreach $entries as $child}}
-{{include file="suggest_friends.tpl" entry=$child}}
-{{/foreach}}
-{{/if}}
-
-<div class="clear"></div>
diff --git a/view/tpl/suggest_widget.tpl b/view/tpl/suggest_widget.tpl
deleted file mode 100644
index 7b9afa668..000000000
--- a/view/tpl/suggest_widget.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="widget suggestions-widget">
-<h3>{{$title}}</h3>
-{{if $entries}}
-{{foreach $entries as $child}}
-{{include file="suggest_friends.tpl" entry=$child}}
-{{/foreach}}
-{{/if}}
-<div class="clear"></div>
-<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div>
-</div>
diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl
deleted file mode 100644
index 62a7c02c8..000000000
--- a/view/tpl/thing_edit.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<h2>{{$thing_hdr}}</h2>
-<form id="thing-edit-form" action="thing" method="post" class="acl-form" data-form_id="thing-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-<input type="hidden" name="term_hash" value="{{$thing_hash}}" />
-
-{{if $multiprof }}
-<div class="thing-profile-label">{{$profile_lbl}}</div>
-
-<div class="thing-profile">{{$profile_select}}</div>
-<div class="thing-field-end"></div>
-{{/if}}
-
-<div class="thing-verb-label">{{$verb_lbl}}</div>
-
-<div class="thing-verb">{{$verb_select}}</div>
-<div class="thing-field-end"></div>
-
-
-<label class="thing-label" for="thing-term">{{$thing_lbl}}</label>
-<input type="text" class="thing-input" id="thing-term" name="term" value="{{$thething}}" />
-<div class="thing-field-end"></div>
-<label class="thing-label" for="thing-url">{{$url_lbl}}</label>
-<input type="text" class="thing-input" id="thing-url" name="url" value="{{$theurl}}" />
-<div class="thing-field-end"></div>
-<label class="thing-label" for="thing-img">{{$img_lbl}}</label>
-<input type="text" class="thing-input" id="thing-img" name="img" value="{{$imgurl}}" />
-<div class="thing-field-end"></div>
-
-{{include file="field_checkbox.tpl" field=$activity}}
-
-<div class="thing-end"></div> 
-
-{{if $lockstate}}
-	<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-		<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
-	</button>
-{{/if}}
-
-
-<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
-</form>
-{{$aclselect}}
diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl
deleted file mode 100644
index 90fb093e4..000000000
--- a/view/tpl/thing_input.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<h2>{{$thing_hdr}}</h2>
-<form id="thing-new-form" action="thing" method="post" class="acl-form" data-form_id="thing-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-
-{{if $multiprof }}
-<div class="thing-profile-label">{{$profile_lbl}}</div>
-
-<div class="thing-profile">{{$profile_select}}</div>
-<div class="thing-field-end"></div>
-{{/if}}
-
-
-<div class="thing-verb-label">{{$verb_lbl}}</div>
-
-<div class="thing-verb">{{$verb_select}}</div>
-<div class="thing-field-end"></div>
-
-
-<label class="thing-label" for="thing-term">{{$thing_lbl}}</label>
-<input type="text" class="thing-input" id="thing-term" name="term" />
-<div class="thing-field-end"></div>
-<label class="thing-label" for="thing-url">{{$url_lbl}}</label>
-<input type="text" class="thing-input" id="thing-url" name="url" />
-<div class="thing-field-end"></div>
-<label class="thing-label" for="thing-img">{{$img_lbl}}</label>
-<input type="text" class="thing-input" id="thing-img" name="img" />
-<div class="thing-field-end"></div>
-
-{{include file="field_checkbox.tpl" field=$activity}}
-
-<div class="thing-end"></div> 
-
-{{if $lockstate}}
-	<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-		<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
-	</button>
-{{/if}}
-
-
-<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
-</form>
-{{$aclselect}}
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
deleted file mode 100755
index ea5c3c281..000000000
--- a/view/tpl/threaded_conversation.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{if $photo_item}}
-{{$photo_item}}
-{{/if}}
-{{foreach $threads as $thread_item}}
-{{include file="{{$thread_item.template}}" item=$thread_item}}
-{{/foreach}}
-
-<div id="conversation-end"></div>
diff --git a/view/tpl/toggle_mobile_footer.tpl b/view/tpl/toggle_mobile_footer.tpl
deleted file mode 100755
index 82c0197ba..000000000
--- a/view/tpl/toggle_mobile_footer.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a>
-
diff --git a/view/tpl/uexport.tpl b/view/tpl/uexport.tpl
deleted file mode 100644
index 7eafd97a6..000000000
--- a/view/tpl/uexport.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<div class="section-content-wrapper">
-		<b><a href="uexport/basic">{{$basictitle}}</a></b></p>
-		<p>{{$basic}}</p>
-
-		<p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p>
-		<p>{{$full}}</p>
-	
-		<p>{{$extra}}</p>
-		<p>{{$extra2}}</p>
-		<p>{{$extra3}}</p>
-
-		<p>{{$extra4}}</p>
-
-	</div>
-</div>
diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl
deleted file mode 100644
index c51728c34..000000000
--- a/view/tpl/usermenu.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{if $wrap}}
-<div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}">
-{{/if}}
-	{{if $menu.menu_desc}}
-	<h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="fa fa-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3>
-	{{/if}}
-	{{if $items}}
-	<ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills flex-column{{elseif !$wrap || $class}} {{$class}}{{/if}}">
-		{{foreach $items as $mitem }}
-		<li id="pmenu-item-{{$mitem.mitem_id}}" class="nav-item pmenu-item{{if $mitem.submenu}} dropdown{{/if}}">
-			<a href="{{if $mitem.submenu}}#{{else}}{{$mitem.mitem_link}}{{/if}}" class="nav-link {{if $mitem.submenu}} dropdown-toggle{{/if}}"{{if $mitem.submenu}} data-toggle="dropdown"{{/if}}{{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}{{if $mitem.submenu}}<span class="caret"></span>{{/if}}</a>
-			{{if $mitem.submenu}}{{$mitem.submenu}}{{/if}}
-		</li>
-		{{/foreach }}
-	</ul>
-	{{/if}}
-{{if $wrap}}
-	<div class="pmenu-end"></div>
-</div>
-{{/if}}
diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl
deleted file mode 100755
index 2b7144450..000000000
--- a/view/tpl/viewcontact_template.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<div class="section-content-wrapper clearfix">
-		{{foreach $contacts as $contact}}
-		{{include file="contact_template.tpl"}}
-		{{/foreach}}
-		<div id="page-end"></div>
-	</div>
-</div>
-<script>$(document).ready(function() { loadingPage = false;});</script>
-<div id="page-spinner"></div>
diff --git a/view/tpl/viewcontactsajax.tpl b/view/tpl/viewcontactsajax.tpl
deleted file mode 100644
index 68be228be..000000000
--- a/view/tpl/viewcontactsajax.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{{foreach $contacts as $contact}}
-{{include file="contact_template.tpl"}}
-{{/foreach}}
diff --git a/view/tpl/webpage_export_list.tpl b/view/tpl/webpage_export_list.tpl
deleted file mode 100644
index b22b3818a..000000000
--- a/view/tpl/webpage_export_list.tpl
+++ /dev/null
@@ -1,124 +0,0 @@
-<div class="generic-content-wrapper">
-		<form action="" method="post" autocomplete="on" >
-		<input type="hidden" name="action" value="{{$action}}">
-		<div class="section-title-wrapper">
-			<div class="pull-right">				
-					<button class="btn btn-md btn-success" type="submit" name="submit" value="{{$exportbtn}}">{{$exportbtn}}</button>
-			</div>
-			<h2>{{$title}}</h2>
-			<div class="clear"></div>
-		</div>
-		<div id="import-website-content-wrapper" class="section-content-wrapper">
-				<div class="pull-left">
-						<button id="toggle-select-all" class="btn btn-sm btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i>&nbsp;Toggle Select All</button>
-				</div>
-				<div class="clear"></div>
-				<hr>
-				<!--<h4>Pages</h4>-->
-				<div>
-				<table class="table-striped table-responsive table-hover" style="width: 100%;">
-						<thead>
-								<tr><th></th><th>Page Link</th><th>Page Title</th><th>Type</th></tr>
-						</thead>
-						{{foreach $pages as $page}}
-								<tr>
-									<td width="30px" style="padding-right: 20px;">
-										<div class='squaredThree'>
-										<input type="checkbox" id="page_{{$page.mid}}" name="page[]" value="{{$page.mid}}">
-										<label for="page_{{$page.mid}}"></label>
-										</div>
-									</td>
-									<td width="30%">
-										<div class="desc">
-											{{$page.pagetitle}}<br>
-										</div>
-									</td>
-									<td width="55%">
-										<div class='desc'>
-											{{$page.title}}<br>
-										</div>
-									</td>
-									<td width="15%">
-										<div class='desc'>
-											{{$page.mimetype}}<br>
-										</div>
-									</td>
-								</tr>
-						{{/foreach}}
-				</table>
-				</div>
-				<hr>
-				<div class="clear"></div>
-				<!--<h4>Layouts</h4>-->
-				<div>
-				<table class="table-striped table-responsive table-hover" style="width: 100%;">
-						<thead>
-								<tr><th width="20px"></th><th>Layout Name</th><th>Layout Description</th><th>Type</th></tr>
-						</thead>
-						{{foreach $layouts as $layout}}
-								<tr>
-									<td width="30px" style="padding-right: 20px;">
-										<div class='squaredThree'>
-										<input type="checkbox" id="layout_{{$layout.mid}}" name="layout[]" value="{{$layout.mid}}">
-										<label for="layout_{{$layout.mid}}"></label>
-										</div>
-									</td>
-									<td width="30%">
-										<div class="desc">
-											{{$layout.name}}<br>
-										</div>
-									</td>
-									<td width="55%">
-										<div class='desc'>
-											{{$layout.description}}<br>
-										</div>
-									</td>
-									<td width="15%">
-										<div class='desc'>
-											{{$layout.mimetype}}<br>
-										</div>
-									</td>
-								</tr>
-						{{/foreach}}
-				</table>
-				</div>
-				<hr>
-				<div class="clear"></div>
-				<!--<h4>Blocks</h4>-->
-				<div>
-				<table class="table-striped table-responsive table-hover" style="width: 100%;">
-						<thead>
-								<tr><th width="30px"></th><th>Block Name</th><th>Block Title</th><th>Type</th></tr>
-						</thead>
-						{{foreach $blocks as $block}}
-								<tr>
-									<td width="30px" style="padding-right: 20px;">
-										<div class='squaredThree'>
-										<input type="checkbox" id="block_{{$block.mid}}" name="block[]" value="{{$block.mid}}">
-										<label for="block_{{$block.mid}}"></label>
-										</div>
-									</td>
-									<td width="30%">
-										<div class="desc">
-											{{$block.name}}<br>
-										</div>
-									</td>
-									<td width="55%">
-										<div class='desc'>
-											{{$block.title}}<br>
-										</div>
-									</td>
-									<td width=15%">
-										<div class='desc'>
-											{{$block.mimetype}}<br>
-										</div>
-									</td>
-								</tr>
-						{{/foreach}}
-				</table>
-				</div>
-				
-		</div>
-		</form>
-</div>
-
diff --git a/view/tpl/webpage_import.tpl b/view/tpl/webpage_import.tpl
deleted file mode 100644
index 955288c1e..000000000
--- a/view/tpl/webpage_import.tpl
+++ /dev/null
@@ -1,126 +0,0 @@
-<div class="generic-content-wrapper">
-		<form action="" method="post" autocomplete="on" >
-		<input type="hidden" name="action" value="importselected">
-		<div class="section-title-wrapper">
-			<div class="pull-right">				
-					<button class="btn btn-md btn-success" type="submit" name="submit" value="{{$importbtn}}">{{$importbtn}}</button>
-			</div>
-			<h2>{{$title}}</h2>
-			<div class="clear"></div>
-		</div>
-		<div id="import-website-content-wrapper" class="section-content-wrapper">
-						<div class="pull-left">
-								<button id="toggle-select-all" class="btn btn-sm btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i>&nbsp;Toggle Select All</button>
-						</div>
-						<div class="clear"></div>
-						<h4>Scanned Pages</h4>
-						<div>
-						<table class="table-striped table-responsive table-hover" style="width: 100%;">
-							<tr><td>Import?</td><td>Page</td><!--<td>Existing Page</td>--></tr>
-						{{foreach $pages as $page}}
-								<tr>
-									<td>
-										<div class='squaredTwo'>
-										<input type="checkbox" id="page_{{$page.pagelink}}" name="page[]" value="{{$page.pagelink}}">
-										<label for="page_{{$page.pagelink}}"></label>
-										</div>
-									</td>
-									<td>
-										<div class='desc'>
-											Page Link: {{$page.pagelink}}<br>
-											Layout: {{$page.layout}}<br>
-											Title: {{$page.title}}<br>
-											Content File: {{$page.contentfile}}<br>
-											Type: {{$page.type}}<br>
-										</div>
-									</td>
-								<!-- TODO: Retrieve existing element information to avoid accidental overwriting
-									<td>
-										<div class='desc'>
-											Name: {{$page.curpage.pagelink}}<br>
-											Layout: {{$page.curpage.layout}}<br>
-											Title: {{$page.curpage.title}}<br>
-											Last edit: {{$page.curpage.edited}}<br>
-											Type: {{$page.curpage.type}}<br>
-										</div>
-									</td>
-								-->
-								</tr>
-						{{/foreach}}
-						</table>
-						</div>
-
-
-						<h4>Scanned Layouts</h4>
-						<div>
-						<table class="table-striped table-responsive table-hover" style="width: 100%;">
-								<tr><td>Import?</td><td>Layout</td><!--<td>Existing Layout</td>--></tr>
-						{{foreach $layouts as $layout}}
-										<tr>
-												<td>
-														<div class='squaredTwo'>
-														<input type="checkbox" id="layout_{{$layout.name}}" name="layout[]" value="{{$layout.name}}">
-														<label for="layout_{{$layout.name}}"></label>
-														</div>
-												</td>
-												<td>
-														<div class='desc'>
-																Name: {{$layout.name}}<br>
-																Description: {{$layout.description}}<br>
-																Content File: {{$layout.contentfile}}<br>
-														</div>
-												</td>
-												<!-- TODO: Retrieve existing element information to avoid accidental overwriting
-												<td>
-														<div class='desc'>
-																Name: {{$layout.curblock.name}}<br>
-																Title: {{$layout.curblock.description}}<br>
-																Last edit: {{$layout.curblock.edited}}<br>
-														</div>
-												</td>
-												-->
-										</tr>
-						{{/foreach}}
-						</table>
-						</div>
-
-						<h4>Scanned Blocks</h4>
-						<div>
-						<table class="table-striped table-responsive table-hover" style="width: 100%;">
-								<tr><td>Import?</td><td>Block</td><!--<td>Existing Block</td>--></tr>
-						{{foreach $blocks as $block}}
-										<tr>
-												<td>
-														<div class='squaredTwo'>
-														<input type="checkbox" id="block_{{$block.name}}" name="block[]" value="{{$block.name}}">
-														<label for="block_{{$block.name}}"></label>
-														</div>
-												</td>
-												<td>
-														<div class='desc'>
-																Name: {{$block.name}}<br>
-																Title: {{$block.title}}<br>
-																Content File: {{$block.contentfile}}<br>
-																Type: {{$block.type}}<br>
-														</div>
-												</td>
-												<!-- TODO: Retrieve existing element information to avoid accidental overwriting
-												<td>
-														<div class='desc'>
-																Name: {{$block.curblock.name}}<br>
-																Title: {{$block.curblock.title}}<br>
-																Last edit: {{$block.curblock.edited}}<br>
-																Type: {{$block.curblock.type}}<br>
-														</div>
-												</td>
-												-->
-										</tr>
-						{{/foreach}}
-						</table>
-						</div>
-				
-		</div>
-		<div class="clear"></div>
-		</form>
-</div>
-
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
deleted file mode 100644
index fcf9de75a..000000000
--- a/view/tpl/webpagelist.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $editor}}
-		<div class="pull-right">
-			<button id="webpage-create-btn" class="btn btn-sm btn-success acl-form-trigger" onclick="openClose('webpage-editor');" data-form_id="profile-jot-form"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
-		</div>
-		{{/if}}
-		<h2>{{$listtitle}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{if $editor}}
-	<div id="webpage-editor" class="section-content-tools-wrapper">
-		{{$editor}}
-	</div>
-	{{/if}}
-	{{if $pages}}
-	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
-		<table id="webpage-list-table">
-			<tr>
-				<th width="1%">{{$pagelink_txt}}</th>
-				<th width="95%">{{$title_txt}}</th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%" class="d-none d-md-table-cell">{{$created_txt}}</th>
-				<th width="1%" class="d-none d-md-table-cell">{{$edited_txt}}</th>
-			</tr>
-			{{foreach $pages as $key => $items}}
-			{{foreach $items as $item}}
-			<tr id="webpage-list-item-{{$item.url}}">
-				<td>
-					{{if $view}}
-					<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
-					{{else}}
-					{{$item.pagetitle}}
-					{{/if}}
-				</td>
-				<td>
-					{{$item.title}}
-				</td>
-				<td class="webpage-list-tool dropdown">
-					{{if $item.lockstate=='lock'}}
-					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i>
-					<ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $edit}}
-					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $item.bb_element}}
-					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $edit}}
-					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-					{{/if}}
-				</td>
-				<td class="d-none d-md-table-cell">
-					{{$item.created}}
-				</td>
-				<td class="d-none d-md-table-cell">
-					{{$item.edited}}
-				</td>
-			</tr>
-			{{/foreach}}
-			{{/foreach}}
-		</table>
-	</div>
-	{{/if}}
-	<div class="clear"></div>
-</div>
diff --git a/view/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl
deleted file mode 100644
index 0d131cb17..000000000
--- a/view/tpl/website_portation_tools.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div id="website-portation-tools" class="widget">
-	<div class="nav nav-pills flex-column">
-		<a class="nav-link"  href="#" onclick="openClose('import-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
-		<div id="import-form" class="sub-menu-wrapper">
-			<div class="sub-menu">
-				<form enctype="multipart/form-data" method="post" action="">
-					<input type="hidden" name="action" value="scan">
-					<p class="descriptive-text">{{$file_import_text}}</p>
-					<div class="form-group">
-						<input class="form-control" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
-					</div>
-					<div class="form-group">
-						<button class="btn btn-primary btn-sm" type="submit" name="cloudsubmit" value="{{$select}}">Submit</button>
-					</div>
-					<!-- Or upload a zipped file containing the website -->
-					<p class="descriptive-text">{{$file_upload_text}}</p>
-					<div class="form-group">
-						<input class="form-control-file w-100" type="file" name="zip_file" />
-					</div>
-					<div class="form-group">
-						<button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Submit</button>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-	<div class="nav nav-pills flex-column">
-		<a class="nav-link" href="#" onclick="openClose('export-form'); openClose('export-cloud-form'); return false;"><i class="fa fa-share-square-o generic-icons"></i> {{$export_label}}</a>
-		<div id="export-form" class="sub-menu-wrapper">
-			<div class="sub-menu">
-				<form enctype="multipart/form-data" method="post" action="">
-					<input type="hidden" name="action" value="exportzipfile">
-					<!-- Or download a zipped file containing the website -->
-					<p class="descriptive-text">{{$file_download_text}}</p>
-					<div class="form-group">
-						<input class="form-control" type="text" name="zipfilename" title="{{$filename_hint}}" placeholder="{{$filename_desc}}" value="" />
-					</div>
-					<div class="form-group">
-						<button class="btn btn-primary btn-sm" type="submit" name="w_download" value="w_download">Submit</button>
-					</div>
-				</form>
-			</div>
-		</div>
-		<div id="export-cloud-form" class="sub-menu-wrapper">
-			<div class="sub-menu">
-				<form enctype="multipart/form-data" method="post" action="">
-					<input type="hidden" name="action" value="exportcloud">
-					<!-- Or export the website elements to a cloud files folder -->
-					<p style="margin-top: 10px;" class="descriptive-text">{{$cloud_export_text}}</p>
-					<div class="form-group">
-						<input class="form-control" type="text" name="exportcloudpath" title="{{$cloud_export_hint}}" placeholder="{{$cloud_export_desc}}" />
-					</div>
-					<div class="form-group">
-						<button class="btn btn-primary btn-sm" type="submit" name="exportcloudsubmit" value="{{$cloud_export_select}}">Submit</button>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
deleted file mode 100644
index 564db3324..000000000
--- a/view/tpl/wiki.tpl
+++ /dev/null
@@ -1,469 +0,0 @@
-<div class="generic-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			{{if $showPageControls}}
-			<div id="page-tools" class="btn-group" style="display: none;">
-				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
-					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
-				</button>
-				<div class="dropdown-menu dropdown-menu-right">
-					{{if $renamePage}}
-					<a class="dropdown-item rename-page" href="#"><i class="fa fa-fw fa-edit"></i>&nbsp;{{$renamePage}}</a>
-					{{/if}}
-					<a id="embed-image" class="dropdown-item" href="#"><i class="fa fa-fw fa-picture-o"></i>&nbsp;Embed Image</a>
-				</div>
-			</div>	
-			{{/if}}
-			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button>
-		</div>
-		<h2>
-			<span id="wiki-header-name">{{$wikiheaderName}}</span>:
-			<span id="wiki-header-page">{{$wikiheaderPage}}</span>
-		</h2>
-		<div class="clear"></div>
-	</div>
-	<div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
-		<form id="rename-page-form" action="wiki/rename/page" method="post" >
-			{{include file="field_input.tpl" field=$pageRename}}
-			<div class="form-group">
-				<div class="pull-right">
-					<button id="rename-page-submit" class="btn btn-primary" type="submit" name="submit">Submit</button>
-				</div>
-				<div>
-					<button class="btn btn-outline-secondary rename-page" type="button">Cancel</button>
-				</div>
-				<div class="clear"></div>
-			</div>
-		</form>
-	</div>
-	<div id="wiki-content-container" class="section-content-wrapper">
-		<ul class="nav nav-tabs" id="wiki-nav-tabs">
-			<li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li>
-			<li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li>
-			<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
-		</ul>
-		<div class="tab-content" id="wiki-page-tabs">
-			<div id="edit-pane" class="tab-pane">
-				{{if !$mimeType || $mimeType == 'text/markdown'}}
-				<div id="ace-editor"></div>
-				{{else}}
-				<div id="editor-wrapper">
-					<textarea id="editor">{{$content}}</textarea>
-				</div>
-				{{/if}}
-				{{if $showPageControls}}
-				<div>
-					<div id="id_{{$commitMsg.0}}_wrapper" class="field input">
-						<div class="input-group">
-							<input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
-							<div class="input-group-btn">
-								<button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
-							</div>
-						</div>
-					</div>
-				</div>
-				{{/if}}
-			</div>
-			<div id="preview-pane" class="tab-pane active">
-				<div id="wiki-preview">
-					{{$renderedContent}}
-				</div>
-			</div>
-			<div id="page-history-pane" class="tab-pane">
-				<div id="page-history-list"></div>
-			</div>
-		</div>
-	</div>
-</div>
-
-{{$wikiModal}}
-
-<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-			</div>
-			<div class="modal-body" id="embedPhotoModalBody" >
-				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
-					<div id="embedPhotoModalBodyAlbumList"></div>
-				</div>
-				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
-				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-
-<script>
-	window.wiki_resource_id = '{{$resource_id}}';
-	window.wiki_page_name = '{{$page}}';
-	window.wiki_page_content = '{{$content|escape:'javascript'}}';
-	window.wiki_page_commit = '{{$commit}}';
-
-	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
-	$("#generic-modal-ok-{{$wikiModalID}}").addClass('btn-danger');
-
-	$('.rename-page').click(function (ev) {
-		$('#rename-page-form-wrapper').toggle();
-		ev.preventDefault();
-	});
-
-	$( "#rename-page-form" ).submit(function( event ) {
-		$.post("wiki/{{$channel}}/rename/page", 
-		{
-			oldName: window.wiki_page_name, 
-			newName: $('#id_pageRename').val(), 
-			resource_id: window.wiki_resource_id
-		}, 
-		function (data) {
-			if (data.success) {
-				$('#rename-page-form-wrapper').hide();
-				window.console.log('data: ' + JSON.stringify(data));
-				window.wiki_page_name = data.name.urlName;
-				$('#wiki-header-page').html(data.name.htmlName);
-				wiki_refresh_page_list();
-			} else {
-				window.console.log('Error renaming page.');
-			}
-		}, 'json');    
-		event.preventDefault();
-	});
-
-	{{if !$mimeType || $mimeType == 'text/markdown'}}
-	var editor = ace.edit("ace-editor");
-	editor.setOptions({
-		theme: "ace/theme/github",
-		mode: "ace/mode/markdown",
-
-		maxLines: Infinity,
-		minLines: 30,
-
-		wrap: true,
-
-		printMargin: false
-	});
-
-	editor.getSession().setValue(window.wiki_page_content);
-	window.editor = editor; // Store the editor in the window object so the anonymous function can use it.
-	{{else}}
-	window.editor = editor = $('#editor');
-	{{/if}}
-
-	{{if !$showPageControls}}
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		editor.setReadOnly(true); // Disable editing if the viewer lacks edit permission
-		{{else}}
-		editor.prop('readonly', true);
-		{{/if}}
-	{{/if}}
-
-	$('#edit-pane-tab').click(function (ev) {
-		setTimeout(function() {
-			window.editor.focus();
-			if($('main').hasClass('fullscreen')) {
-				adjustFullscreenEditorHeight();
-			}
-			else {
-				adjustInlineEditorHeight();
-			}
-		}, 500); // Return the focus to the editor allowing immediate text entry
-		$('#page-tools').show();
-	});
-
-	$('#wiki-get-preview').click(function (ev) {
-		$.post("wiki/{{$channel}}/preview", {
-			{{if !$mimeType || $mimeType == 'text/markdown'}}
-			content: editor.getValue(),
-			{{else}}
-			content: editor.val(),
-			{{/if}}
-			resource_id: window.wiki_resource_id
-		},
-		function (data) {
-		if (data.success) {
-			$('#wiki-preview').html(data.html);
-			{{if !$mimeType || $mimeType == 'text/markdown'}}
-			$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
-			{{/if}}
-			$('#page-tools').hide();
-		} else {
-			window.console.log('Error previewing page.');
-		}
-		}, 'json');
-		ev.preventDefault();
-	});
-
-	$('#wiki-get-history').click(function (ev) {
-		$.post("wiki/{{$channel}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
-			if (data.success) {
-				$('#page-history-list').html(data.historyHTML);
-				$('#page-tools').hide();
-			} else {
-				window.console.log('Error getting page history.');
-			}
-			}, 'json');
-			ev.preventDefault();
-		});
-
-	function wiki_refresh_page_list() {
-		if (window.wiki_resource_id === '') {
-			return false;
-		}
-		$.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) {
-			if (data.success) {
-				$('#wiki_page_list_container').html(data.pages);
-				$('#wiki_page_list_container').show();
-			} else {
-				alert('Error fetching page list!');
-				window.console.log('Error fetching page list!');
-			}
-		}, 'json');
-		return false;
-	}
-
-	$('#save-page').click(function (ev) {
-		if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
-			window.console.log('You must have a wiki page open in order to edit pages.');
-			ev.preventDefault();
-			return false;
-		}
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		var currentContent = editor.getValue();
-		{{else}}
-		var currentContent = editor.val();
-		{{/if}}
-
-		if (window.wiki_page_content === currentContent) {
-			$('#save-page').addClass('disabled');  // Disable the save button
-			window.console.log('No edits to save.');
-			ev.preventDefault();
-			return false;
-		}
-		$.post("wiki/{{$channel}}/save/page", {
-			content: currentContent, 
-			commitMsg: $('#id_commitMsg').val(),
-			name: window.wiki_page_name, 
-			resource_id: window.wiki_resource_id
-		}, 
-		function (data) {
-			if (data.success) {
-				window.console.log('Page saved successfully.');
-				window.wiki_page_content = currentContent;
-				$('#id_commitMsg').val(''); // Clear the commit message box
-				$('#save-page').addClass('disabled');  // Disable the save button
-				{{if !$mimeType || $mimeType == 'text/markdown'}}
-				window.editor.getSession().getUndoManager().markClean();  // Reset the undo history for the editor
-				{{/if}}
-
-				window.editor.focus();  // Return focus to the editor for continued editing
-				// $('#wiki-get-history').click();
-			} else {
-				alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups 
-				window.console.log('Error saving page.');
-			}
-		}, 'json');
-		ev.preventDefault();
-	});
-
-	function wiki_revert_page(commitHash) {
-		if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
-			window.console.log('You must have a wiki page open in order to revert pages.');
-			return false;
-		}
-		$.post("wiki/{{$channel}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
-		function (data) {
-			if (data.success) {
-			$('button[id^=revert-]').removeClass('btn-success');
-			$('button[id^=revert-]').addClass('btn-danger');
-			$('button[id^=revert-]').html('Revert');
-			$('#revert-'+commitHash).removeClass('btn-danger');
-			$('#revert-'+commitHash).addClass('btn-success');
-			$('#revert-'+commitHash).html('Page reverted<br>but not saved');
-			window.wiki_page_commit = commitHash;
-			// put contents in editor
-			editor.getSession().setValue(data.content);
-			} else {
-			window.console.log('Error reverting page.');
-			}
-		}, 'json');
-	}
-
-	function wiki_compare_page(compareCommit) {
-		if (window.wiki_resource_id === '' || window.wiki_page_name === '' || window.wiki_page_commit === '') {
-			window.console.log('You must have a wiki page open in order to revert pages.');
-			return false;
-		}
-		$.post("wiki/{{$channel}}/compare/page", {
-			compareCommit: compareCommit, 
-			currentCommit: window.wiki_page_commit, 
-			name: window.wiki_page_name, 
-			resource_id: window.wiki_resource_id
-		}, 
-		function (data) {
-			console.log(data);
-			if (data.success) {
-				var modalBody = $('#generic-modal-body-{{$wikiModalID}}');
-				modalBody.html('<div class="descriptive-text">'+data.diff+'</div>');
-				$('.modal-dialog').addClass('modal-lg');
-				$("#generic-modal-ok-{{$wikiModalID}}").off('click');
-				$("#generic-modal-ok-{{$wikiModalID}}").click(function () {
-					wiki_revert_page(compareCommit);
-					$('#generic-modal-{{$wikiModalID}}').modal('hide');
-				});
-				$('#generic-modal-{{$wikiModalID}}').modal();
-			} else {
-				window.console.log('Error comparing page.');
-			}
-		}, 'json');
-	}
-
-	function adjustFullscreenEditorHeight() {
-		$('#editor, #ace-editor').height($(window).height() - $('#id_commitMsg_wrapper').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('#wiki-nav-tabs').outerHeight(true) - 17);
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		editor.setOptions({
-			maxLines: null,
-			minLines: null
-		});
-		editor.resize();
-		{{/if}}
-	}
-
-	function adjustInlineEditorHeight() {
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		editor.setOptions({
-			maxLines: Infinity,
-			minLines: 30
-		});
-		editor.resize();
-		{{else}}
-		editor.height(editor[0].scrollHeight);
-		{{/if}}
-	}
-
-	$('#embed-image').click(function (ev) {
-		initializeEmbedPhotoDialog();
-		ev.preventDefault();
-	});
-
-	var initializeEmbedPhotoDialog = function () {
-		$('.embed-photo-selected-photo').each(function (index) {
-			$(this).removeClass('embed-photo-selected-photo');
-		});
-		getPhotoAlbumList();
-		$('#embedPhotoModalBodyAlbumDialog').off('click');
-		$('#embedPhotoModal').modal();
-	};
-
-	var choosePhotoFromAlbum = function (album) {
-		$.post("embedphotos/album", {name: album},
-			function(data) {
-				if (data['status']) {
-					$('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
-					$('#embedPhotoModalBodyAlbumDialog').html('\
-							<div><ul class="nav nav-pills flex-column">\n\
-								<li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
-									<i class="fa fa-chevron-left"></i>&nbsp;\n\
-									{{$modaldiffalbum}}\n\
-									</a>\n\
-								</li>\n\
-							</ul><br></div>')
-					$('#embedPhotoModalBodyAlbumDialog').append(data['content']);
-					$('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
-						evt.preventDefault();
-						var image = document.getElementById(evt.target.id);
-						if (typeof($(image).parent()[0]) !== 'undefined') {
-							var imageparent = document.getElementById($(image).parent()[0].id);
-							$(imageparent).toggleClass('embed-photo-selected-photo');
-						}
-					});
-					$('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-					$('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-					$('#embed-photo-OKButton').click(function () {
-						$('.embed-photo-selected-photo').each(function (index) {
-							var href = $(this).attr('href');
-							$.post("embedphotos/photolink", {href: href},
-								function(ddata) {
-									if (ddata['status']) {
-										{{if !$mimeType || $mimeType == 'text/markdown'}}
-										var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' )
-										editor.getSession().insert(editor.getCursorPosition(), imgURL)
-										{{else}}
-										var currentContent = $('#editor').val();
-										$('#editor').val(currentContent + ddata['photolink']);
-										{{/if}}
-									} else {
-										window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
-									}
-									return false;
-								},
-							'json');
-						});
-						$('#embedPhotoModalBodyAlbumDialog').html('');
-						$('#embedPhotoModalBodyAlbumDialog').off('click');
-						$('#embedPhotoModal').modal('hide');
-					});
-				} else {
-					window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
-				}
-				return false;
-			},
-		'json');
-	};
-
-	var getPhotoAlbumList = function () {
-		$.post("embedphotos/albumlist", {},
-			function(data) {
-				if (data['status']) {
-					var albums = data['albumlist']; //JSON.parse(data['albumlist']);
-					$('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
-					$('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
-					for(var i = 0; i < albums.length; i++) {
-						var albumName = albums[i].text;
-						var jsAlbumName = albums[i].jstext;
-						var albumLink = '<li class="nav-item">';
-						albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
-						albumLink += '</li>';
-						$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
-					}
-					$('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
-					$('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
-				} else {
-					window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
-				}
-				return false;
-			},
-		'json');
-	};
-
-	$(document).ready(function () {
-		wiki_refresh_page_list();
-
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
-		window.editor.on("input", function() {
-			if(window.editor.getSession().getUndoManager().isClean()) {
-				$('#save-page').addClass('disabled');
-			} else {
-				$('#save-page').removeClass('disabled');
-			}
-		});
-		{{else}}
-		window.editor.on("input", function() {
-			$('#save-page').removeClass('disabled');
-		});
-		window.editor.bbco_autocomplete('bbcode');
-		{{/if}}
-	});
-
-	$(window).resize(function () {
-		if($('main').hasClass('fullscreen')) {
-			adjustFullscreenEditorHeight();
-		}
-	});
-</script>
diff --git a/view/tpl/wiki_page_history.tpl b/view/tpl/wiki_page_history.tpl
deleted file mode 100644
index 9e5ba0f9c..000000000
--- a/view/tpl/wiki_page_history.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-<style>
-  .diff {
-    width:100%;
-    word-break: break-all;
-  }
-
-  .diff td{
-    padding:0 0.667em;
-    vertical-align:top;
-    white-space:pre;
-    white-space:pre-wrap;
-    font-family:Consolas,'Courier New',Courier,monospace;
-    font-size:1.0em;
-    line-height:1.333;
-  }
-
-  .diff span{
-    display:block;
-    min-height:1.333em;
-    margin-top:-1px;
-    padding:0 3px;
-  }
-
-  * html .diff span{
-    height:1.333em;
-  }
-
-  .diff span:first-child{
-    margin-top:0;
-  }
-
-  .diffDeleted span{
-    border:1px solid rgb(255,192,192);
-    background:rgb(255,224,224);
-  }
-
-  .diffInserted span{
-    border:1px solid rgb(192,255,192);
-    background:rgb(224,255,224);
-  }
-</style>
-<table class="table-striped table-responsive table-hover" style="width: 100%;">
-  {{foreach $pageHistory as $commit}}
-  <tr><td>
-      <table id="rev-{{$commit.hash}}" onclick="$('#details-{{$commit.hash}}').show()" width="100%">
-        <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td>
-            <td rowspan="3" width="20%" align="right">
-		{{if $permsWrite}}
-              <button id="revert-{{$commit.hash}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button>
-              <br><br>
-		{{/if}}
-              <button id="compare-{{$commit.hash}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.hash}}')">Compare</button>
-            </td></tr>
-        <tr><td>Name</td><td>{{$commit.name}} &lt;{{$commit.email}}&gt;</td></tr>
-        <tr><td>Message</td><td>{{$commit.title}}</td></tr>
-      </table>
-    </td></tr>
-  {{/foreach}}          
-</table>
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
deleted file mode 100644
index 44fba15cc..000000000
--- a/view/tpl/wiki_page_list.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-{{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}}
-<div id="wiki_page_list" class="widget" >
-	<h3>{{$header}}</h3>
-	<ul class="nav nav-pills flex-column">
-		{{if $pages}}
-		{{foreach $pages as $page}}
-		<li class="nav-item nav-item-hack" id="{{$page.link_id}}">
-			{{if $page.resource_id && $candel}}
-			<i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.url}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i>
-			{{/if}}
-			<a class="nav-link" href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a>
-		</li>
-		{{/foreach}}
-		{{/if}}
-		{{if $canadd}}
-		<li class="nav-item"><a class="nav-link" href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i>&nbsp;{{$addnew}}</a></li>
-		{{/if}}
-	</ul>
-	{{if $canadd}}
-	<div id="new-page-form-wrapper" class="sub-menu" style="display:none;">
-		<form id="new-page-form" action="wiki/{{$channel}}/create/page" method="post" >
-			<input type="hidden" name="resource_id" value="{{$resource_id}}">
-			{{include file="field_input.tpl" field=$pageName}}
-			<button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button>
-		</form>
-	</div>
-	{{/if}}
-</div>
-{{if $not_refresh}}</div>{{/if}}
-
-<script>
-	$('#new-page-submit').click(function (ev) {
-		$.post("wiki/{{$channel}}/create/page", {pageName: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, 
-		function(data) {
-			if(data.success) {
-				window.location = data.url;
-			} else {
-				window.console.log('Error creating page.');
-			}
-		}, 'json');
-		ev.preventDefault();
-	});
-
-	function wiki_delete_page(wiki_page_name, wiki_page_url, wiki_resource_id, wiki_link_id) {
-		if(!confirm('Are you sure you want to delete the page: ' + wiki_page_name)) {
-			return;
-		}
-		$.post("wiki/{{$channel}}/delete/page", {name: wiki_page_url, resource_id: wiki_resource_id},
-		function (data) {
-			if (data.success) {
-				window.console.log('Page deleted successfully.');
-				if(wiki_page_url == window.wiki_page_name) {
-					var url = window.location.href;
-					if(url.substr(-1) == '/')
-						url = url.substr(0, url.length - 2);
-					url = url.split('/');
-					url.pop();
-					window.location = url.join('/');
-				}
-				else {
-					$('#' + wiki_link_id).remove();
-				}
-			} else {
-				alert('Error deleting page.'); // TODO: Replace alerts with auto-timeout popups
-				window.console.log('Error deleting page.');
-			}
-		}, 'json');
-		return false;
-	}
-
-	function wiki_show_new_page_form() {
-		$('#new-page-form-wrapper').toggle();
-		$('#id_pageName').focus();
-		return false;
-	}
-</script>
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
deleted file mode 100644
index 760cf41b9..000000000
--- a/view/tpl/wikilist.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $owner}}
-		<button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$create}}</button>
-		{{/if}}
-		<h2>{{$header}}</h2>
-	</div>
-	{{if $owner}}
-	<div id="new-wiki-form-wrapper" class="section-content-tools-wrapper">
-		<form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-			{{include file="field_input.tpl" field=$wikiName}}
-			{{include file="field_select.tpl" field=$mimeType}}
-			{{include file="field_checkbox.tpl" field=$notify}}
-			<div>
-				<div class="btn-group pull-right">
-					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">
-						<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
-					</button>
-					<button id="new-wiki-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
-				</div>
-			</div>
-		</form>
-		{{$acl}}
-		<div class="clear"></div>
-	</div>
-	{{/if}}
-	<div class="section-content-wrapper-np">
-		<table id="wikis-index">
-			<tr>
-				<th width="96%">{{$name}}</th>
-				<th width="1%">{{$type}}</th>
-				<th width="1%" class="wikis-index-tool"></th>
-				<!-- th width="1%" class="wikis-index-tool"></th -->
-				{{if $owner}}
-				<th width="1%"></th>
-				{{/if}}
-			</tr>
-			{{foreach $wikis as $wiki}}
-			<tr class="wikis-index-row">
-				<td><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a></td>
-				<td>{{$wiki.mimeType}}</td>
-				<td class="wiki-index-tool dropdown">
-					{{if $wiki.lock}}
-					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i></button>
-					<ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
-					{{/if}}
-				</td>
-				<!-- td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td -->
-				{{if $owner}}
-				<td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td>
-				{{/if}}
-			</tr>
-			{{/foreach}}
-		</table>
-	</div>
-</div>
-<script>
-	{{if $owner}}
-	function wiki_delete_wiki(wikiHtmlName, resource_id) {
-		if(!confirm('Are you sure you want to delete the entire wiki: ' + JSON.stringify(wikiHtmlName))) {
-			return;
-		}
-		$.post("wiki/{{$channel}}/delete/wiki", {resource_id: resource_id}, function (data) {
-			if (data.success) {
-				window.console.log('Wiki deleted');
-				// Refresh list and redirect page as necessary
-				window.location = 'wiki/{{$channel}}';
-			} else {
-				alert('Error deleting wiki!');
-				window.console.log('Error deleting wiki.');
-			}
-		}, 'json');
-	}
-	{{/if}}
-	function wiki_download_wiki(resource_id) {
-			window.location = "wiki/{{$channel}}/download/wiki/" + resource_id;
-	}
-</script>
diff --git a/view/tpl/wikilist_widget.tpl b/view/tpl/wikilist_widget.tpl
deleted file mode 100644
index 9853f9850..000000000
--- a/view/tpl/wikilist_widget.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="wiki_list" class="widget">
-	<h3>{{$header}}</h3>
-	<ul class="nav nav-pills flex-column">
-		{{foreach $wikis as $wiki}}
-		<li class="nav-item"><a class="nav-link" href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}">{{$wiki.title}}</a></li> 
-		{{/foreach}}
-	</ul>
-</div>
diff --git a/view/tpl/write_pages.tpl b/view/tpl/write_pages.tpl
deleted file mode 100644
index 53146ee30..000000000
--- a/view/tpl/write_pages.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="write-pages" class="bigwidget">
-<span id="wp-new"><a href="{{$newurl}}">{{$new}}</a></span> <span id="wp-edit"><a href="{{$editurl}}">{{$edit}}</a></span>
-</div>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
deleted file mode 100755
index ac796cd47..000000000
--- a/view/tpl/xchan_vcard.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="vcard" class="vcard h-card">
-<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo u-photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
-{{if $connect}}
-<div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
-{{/if}}
-<div class="fn p-name">{{$name}}</div>
-</div>
-
-
-
diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl
deleted file mode 100644
index aa0d8c740..000000000
--- a/view/tpl/xrd_diaspora.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
-	<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
-	<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />
diff --git a/view/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl
deleted file mode 100755
index 2a40dcf47..000000000
--- a/view/tpl/xrd_host.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
-     xmlns:hm='http://host-meta.net/xrd/1.0'>
- 
-    <hm:Host>{{$zhost}}</hm:Host>
- 
-    <Link rel='lrdd' type="application/xrd+xml" template='{{$zroot}}/xrd/?uri={uri}' />
-	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
-        href="{{$zroot}}/oexchange/xrd" />
-
-</XRD>
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
deleted file mode 100755
index 93fdcb1df..000000000
--- a/view/tpl/xrd_person.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
- 
-    <Subject>{{$accturi}}</Subject>
-	{{if $aliases}}{{foreach $aliases as $a}}
-	<Alias>{{$a}}</Alias>   
-	{{/foreach}}{{/if}}
-
-    <Link rel="http://schemas.google.com/g/2010#updates-from" 
-          type="application/atom+xml" 
-          href="{{$atom}}" />
-    <Link rel="http://webfinger.net/rel/profile-page"
-          type="text/html"
-          href="{{$profile_url}}" />
-    <Link rel="http://portablecontacts.net/spec/1.0"
-          href="{{$poco_url}}" />
-    <Link rel="http://webfinger.net/rel/avatar"
-          type="image/jpeg"
-          href="{{$photo}}" />
-    <Link rel="http://microformats.org/profile/hcard"
-          type="text/html"
-          href="{{$hcard_url}}" />
-    <Link rel="http://ostatus.org/schema/1.0/subscribe"
-          template="{{$subscribe}}" />
-
-   <Link rel="magic-public-key"
-          href="{{$modexp}}" />
-
-	{{$dspr}}
-
-</XRD>
diff --git a/view/tpl/zcard.tpl b/view/tpl/zcard.tpl
deleted file mode 100644
index 908f07631..000000000
--- a/view/tpl/zcard.tpl
+++ /dev/null
@@ -1,144 +0,0 @@
-<style>
-{{if $size == 'hz_large'}}
-.hz_card {
-/*	-moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); 
-	transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */
-	font-family: sans-serif, arial, freesans;
-}
-.hz_cover_photo {
-	max-width: 100%;
-}
-.hz_profile_photo {
-	position: relative;
-	top: -300px;
-	left: 30px;
-	background-color: white;
-	border: 1px solid #ddd;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	padding: 10px;
-	width: 320px;
-	height: 320px;
-}
-
-.hz_name {
-	position: relative;
-	top: -100px;
-	left: 400px;
-	color: #fff;
-	font-size: 48px;
-    text-rendering: optimizelegibility;
-    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
-}
-.hz_addr {
-	position: relative;
-	top: -110px;
-	left: 400px;
-	color: #fff;
-	font-size: 24px;
-    text-rendering: optimizelegibility;
-    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
-}	
-{{elseif $size == 'hz_medium'}}
-.hz_card {
-/*	-moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); 
-	transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */
-	font-family: sans-serif, arial, freesans;
-	width: 100%;
-	overflow: hidden; 
-	height: 390px; 
-}
-.hz_cover_photo img {
-	width: {{$maxwidth}}px;
-/*	max-width: 100%; */
-}
-.hz_profile_photo {
-	position: relative;
-	top: -165px;
-	left: 30px;
-
-	width: 150px;
-	height: 150px;
-}
-.hz_profile_photo img {
-	background-color: white;
-	border: 1px solid #ddd;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	padding: 5px;
-	width: 150px;
-	height: 150px;
-}
-
-.hz_name {
-	position: relative;
-	top: -100px;
-	left: 210px;
-	color: #fff;
-	font-size: 32px;
-    text-rendering: optimizelegibility;
-    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
-}
-.hz_addr {
-	position: relative;
-	top: -100px;
-	left: 210px;
-	color: #fff;
-	font-size: 18px;
-    text-rendering: optimizelegibility;
-    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
-}	
-
-
-{{else}}
-.hz_card {
-/*	-moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); 
-	transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */
-	font-family: sans-serif, arial, freesans;
-}
-.hz_cover_photo {
-	max-width: 100%;
-}
-.hz_profile_photo {
-	position: relative;
-	top: -75px;
-	left: 20px;
-	background-color: white;
-	border: 1px solid #ddd;
-/*	border-radius: 5px;
-	-moz-border-radius: 5px; */
-	padding: 3px;
-	width: 80px;
-	height: 80px;
-}
-
-.hz_name {
-	position: relative;
-	top: -40px;
-	left: 120px;
-	color: #fff;
-	font-size: 18px;
-    text-rendering: optimizelegibility;
-    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
-}
-.hz_addr {
-	position: relative;
-	top: -40px;
-	left: 120px;
-	color: #fff;
-	font-size: 10px;
-    text-rendering: optimizelegibility;
-    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
-}	
-{{/if}}
-
-</style>
-
-<div class="hz_card {{$size}}">
-	<div class="hz_cover_photo"><img src="{{$cover.href}}" alt="{{$zcard.chan.xchan_name}}" />
-		<div class="hz_name">{{$zcard.chan.xchan_name}}</div>
-		<div class="hz_addr">{{$zcard.chan.channel_addr}}</div>
-	</div>
-	<div class="hz_profile_photo"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></div>
-</div>
-
diff --git a/view/tpl/zcard_embed.tpl b/view/tpl/zcard_embed.tpl
deleted file mode 100644
index 5c7a925e3..000000000
--- a/view/tpl/zcard_embed.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="hz_card {{$size}}">
-	<div class="hz_cover_photo" style="max-width: 100;"><a href="{{$zcard.chan.xchan_url}}"><img src="{{$cover.href}}" alt="{{$zcard.chan.xchan_name}}" /></a>
-		<div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 18px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.xchan_name}}</div>
-		<div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 10px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.channel_addr}}</div>
-	</div>
-	<div style="position:relative;top: -75px;left: 20px;background-color: white;border: 1px solid #ddd;padding: 3px;width: 80px;height: 80px;"><a href="{{$zcard.chan.xchan_url}}"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></a></div>
-</div>
-
-- 
cgit v1.2.3


From 80ec92ce8d9f615eeb06d92b67ad1ff840cad0cc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 2 May 2017 12:46:50 -0700
Subject: Revert "move theme specific files to theme dir"

This reverts commit e332d1074f1b663ec66d37b0f575df2e41d5535c.
---
 view/theme/redbasic/tpl/404.tpl                    |   3 -
 view/theme/redbasic/tpl/abook_edit.tpl             | 519 ------------------
 view/theme/redbasic/tpl/achievements.tpl           |   9 -
 view/theme/redbasic/tpl/acl_selector.tpl           |  64 ---
 view/theme/redbasic/tpl/admin_account_edit.tpl     |  23 -
 view/theme/redbasic/tpl/admin_accounts.tpl         |  88 ---
 view/theme/redbasic/tpl/admin_aside.tpl            |  46 --
 view/theme/redbasic/tpl/admin_channels.tpl         |  51 --
 view/theme/redbasic/tpl/admin_hubloc.tpl           |  27 -
 view/theme/redbasic/tpl/admin_logs.tpl             |  19 -
 view/theme/redbasic/tpl/admin_plugins.tpl          | 190 -------
 view/theme/redbasic/tpl/admin_plugins_addrepo.tpl  |   9 -
 view/theme/redbasic/tpl/admin_plugins_details.tpl  |  58 --
 view/theme/redbasic/tpl/admin_profiles.tpl         |  38 --
 view/theme/redbasic/tpl/admin_queue.tpl            |  15 -
 view/theme/redbasic/tpl/admin_security.tpl         |  33 --
 .../theme/redbasic/tpl/admin_settings_features.tpl |  31 --
 view/theme/redbasic/tpl/admin_site.tpl             | 101 ----
 view/theme/redbasic/tpl/admin_summary.tpl          |  43 --
 view/theme/redbasic/tpl/album_edit.tpl             |  22 -
 view/theme/redbasic/tpl/alt_pager.tpl              |   4 -
 view/theme/redbasic/tpl/api_config_xml.tpl         |  66 ---
 view/theme/redbasic/tpl/api_friends_xml.tpl        |   5 -
 view/theme/redbasic/tpl/api_ratelimit_xml.tpl      |   6 -
 view/theme/redbasic/tpl/api_status_xml.tpl         |  46 --
 view/theme/redbasic/tpl/api_test_xml.tpl           |   1 -
 view/theme/redbasic/tpl/api_timeline_atom.tpl      |  90 ----
 view/theme/redbasic/tpl/api_timeline_rss.tpl       |  26 -
 view/theme/redbasic/tpl/api_timeline_xml.tpl       |  20 -
 view/theme/redbasic/tpl/api_user_xml.tpl           |  46 --
 view/theme/redbasic/tpl/app.tpl                    |  30 --
 view/theme/redbasic/tpl/app_create.tpl             |  40 --
 view/theme/redbasic/tpl/atom_feed.tpl              |  30 --
 view/theme/redbasic/tpl/attach_edit.tpl            |  31 --
 view/theme/redbasic/tpl/birthdays_reminder.tpl     |  10 -
 view/theme/redbasic/tpl/blocklist.tpl              |  69 ---
 view/theme/redbasic/tpl/bookmarkedchats.tpl        |  10 -
 view/theme/redbasic/tpl/build_query.tpl            |  65 ---
 view/theme/redbasic/tpl/categories_widget.tpl      |  12 -
 view/theme/redbasic/tpl/cdav_addressbook.tpl       | 462 ----------------
 view/theme/redbasic/tpl/cdav_calendar.tpl          | 349 ------------
 .../theme/redbasic/tpl/cdav_widget_addressbook.tpl |  66 ---
 view/theme/redbasic/tpl/cdav_widget_calendar.tpl   | 121 -----
 view/theme/redbasic/tpl/channel.tpl                |  49 --
 view/theme/redbasic/tpl/channel_id_select.tpl      |   7 -
 view/theme/redbasic/tpl/channel_import.tpl         |  43 --
 view/theme/redbasic/tpl/channels.tpl               |  24 -
 view/theme/redbasic/tpl/chanview.tpl               |   1 -
 view/theme/redbasic/tpl/chat.tpl                   | 346 ------------
 view/theme/redbasic/tpl/chatroom_members.tpl       |   5 -
 view/theme/redbasic/tpl/chatroom_new.tpl           |  12 -
 view/theme/redbasic/tpl/chatroomlist.tpl           |  10 -
 view/theme/redbasic/tpl/chatrooms.tpl              |  41 --
 view/theme/redbasic/tpl/cloud.tpl                  |   4 -
 view/theme/redbasic/tpl/cloud_actionspanel.tpl     |  42 --
 view/theme/redbasic/tpl/cloud_directory.tpl        |  45 --
 view/theme/redbasic/tpl/cloud_header.tpl           |  16 -
 view/theme/redbasic/tpl/comment_item.tpl           |  67 ---
 view/theme/redbasic/tpl/common_friends.tpl         |  15 -
 view/theme/redbasic/tpl/common_tabs.tpl            |  17 -
 view/theme/redbasic/tpl/connection_template.tpl    |  48 --
 view/theme/redbasic/tpl/connections.tpl            |  36 --
 view/theme/redbasic/tpl/contact_block.tpl          |  14 -
 view/theme/redbasic/tpl/contact_head.tpl           |  30 --
 view/theme/redbasic/tpl/contact_slider.tpl         |  20 -
 view/theme/redbasic/tpl/contact_template.tpl       |   8 -
 view/theme/redbasic/tpl/contactsajax.tpl           |   3 -
 view/theme/redbasic/tpl/conv.tpl                   |  17 -
 view/theme/redbasic/tpl/conv_frame.tpl             |   5 -
 view/theme/redbasic/tpl/conv_item.tpl              | 250 ---------
 view/theme/redbasic/tpl/conv_list.tpl              | 251 ---------
 view/theme/redbasic/tpl/conversation.tpl           |  20 -
 view/theme/redbasic/tpl/convobj.tpl                |   4 -
 view/theme/redbasic/tpl/cover_photo.tpl            |  29 -
 view/theme/redbasic/tpl/cover_photo_widget.tpl     |  76 ---
 view/theme/redbasic/tpl/cropbody.tpl               |  58 --
 view/theme/redbasic/tpl/cropcover.tpl              |  58 --
 view/theme/redbasic/tpl/crophead.tpl               |   4 -
 view/theme/redbasic/tpl/delegate.tpl               |  57 --
 view/theme/redbasic/tpl/design_tools.tpl           |   9 -
 view/theme/redbasic/tpl/diaspora_vcard.tpl         |  69 ---
 view/theme/redbasic/tpl/dir_sort_links.tpl         |   8 -
 view/theme/redbasic/tpl/directajax.tpl             |   4 -
 view/theme/redbasic/tpl/directory_header.tpl       |  22 -
 view/theme/redbasic/tpl/direntry.tpl               |  77 ---
 view/theme/redbasic/tpl/display-head.tpl           |   8 -
 view/theme/redbasic/tpl/dreport.tpl                |  28 -
 view/theme/redbasic/tpl/edpost_head.tpl            |  14 -
 view/theme/redbasic/tpl/email_notify_html.tpl      |  27 -
 view/theme/redbasic/tpl/email_notify_text.tpl      |  13 -
 view/theme/redbasic/tpl/event.tpl                  |  16 -
 view/theme/redbasic/tpl/event_cal.tpl              |  14 -
 view/theme/redbasic/tpl/event_form.tpl             | 130 -----
 view/theme/redbasic/tpl/event_head.tpl             | 160 ------
 view/theme/redbasic/tpl/event_item_content.tpl     |  10 -
 view/theme/redbasic/tpl/event_item_header.tpl      |  11 -
 view/theme/redbasic/tpl/events-js.tpl              |  31 --
 view/theme/redbasic/tpl/events_cal-js.tpl          |  20 -
 view/theme/redbasic/tpl/events_menu_side.tpl       |   8 -
 view/theme/redbasic/tpl/events_reminder.tpl        |  10 -
 view/theme/redbasic/tpl/events_tools_side.tpl      |  17 -
 view/theme/redbasic/tpl/failed_updates.tpl         |  18 -
 view/theme/redbasic/tpl/field.tpl                  |   3 -
 view/theme/redbasic/tpl/field_acheckbox.tpl        |  23 -
 view/theme/redbasic/tpl/field_checkbox.tpl         |   5 -
 view/theme/redbasic/tpl/field_colorinput.tpl       |   6 -
 view/theme/redbasic/tpl/field_combobox.tpl         |  18 -
 view/theme/redbasic/tpl/field_custom.tpl           |   5 -
 view/theme/redbasic/tpl/field_input.tpl            |   5 -
 view/theme/redbasic/tpl/field_intcheckbox.tpl      |   5 -
 view/theme/redbasic/tpl/field_password.tpl         |   5 -
 view/theme/redbasic/tpl/field_radio.tpl            |   8 -
 view/theme/redbasic/tpl/field_richtext.tpl         |   5 -
 view/theme/redbasic/tpl/field_select.tpl           |   7 -
 view/theme/redbasic/tpl/field_select_disabled.tpl  |   7 -
 view/theme/redbasic/tpl/field_select_grouped.tpl   |  12 -
 view/theme/redbasic/tpl/field_select_raw.tpl       |   7 -
 view/theme/redbasic/tpl/field_textarea.tpl         |   5 -
 view/theme/redbasic/tpl/field_themeselect.tpl      |  13 -
 view/theme/redbasic/tpl/field_yesno.tpl            |  13 -
 view/theme/redbasic/tpl/fileas_widget.tpl          |  12 -
 view/theme/redbasic/tpl/filebrowser.tpl            |  84 ---
 view/theme/redbasic/tpl/filer_dialog.tpl           |  19 -
 view/theme/redbasic/tpl/follow.tpl                 |  14 -
 view/theme/redbasic/tpl/force_image_reload.tpl     |  72 ---
 view/theme/redbasic/tpl/generic_addon_settings.tpl |  19 -
 view/theme/redbasic/tpl/generic_links_widget.tpl   |  11 -
 view/theme/redbasic/tpl/generic_modal.tpl          |  17 -
 view/theme/redbasic/tpl/group_drop.tpl             |   7 -
 view/theme/redbasic/tpl/group_edit.tpl             |  26 -
 view/theme/redbasic/tpl/group_selection.tpl        |   8 -
 view/theme/redbasic/tpl/group_side.tpl             |  26 -
 view/theme/redbasic/tpl/groupeditor.tpl            |  16 -
 view/theme/redbasic/tpl/hdr.tpl                    |   3 -
 view/theme/redbasic/tpl/head.tpl                   |  21 -
 view/theme/redbasic/tpl/help.tpl                   |  33 --
 view/theme/redbasic/tpl/install.tpl                |   9 -
 view/theme/redbasic/tpl/install_checks.tpl         |  24 -
 view/theme/redbasic/tpl/install_db.tpl             |  30 --
 view/theme/redbasic/tpl/install_settings.tpl       |  28 -
 view/theme/redbasic/tpl/invite.tpl                 |  28 -
 view/theme/redbasic/tpl/item_attach.tpl            |   5 -
 view/theme/redbasic/tpl/item_binary.tpl            |   3 -
 view/theme/redbasic/tpl/item_categories.tpl        |   8 -
 view/theme/redbasic/tpl/item_filer.tpl             |   8 -
 view/theme/redbasic/tpl/item_import.tpl            |  13 -
 view/theme/redbasic/tpl/jot-header.tpl             | 598 ---------------------
 view/theme/redbasic/tpl/jot.tpl                    | 303 -----------
 view/theme/redbasic/tpl/jot_geotag.tpl             |   7 -
 view/theme/redbasic/tpl/js_strings.tpl             |  57 --
 view/theme/redbasic/tpl/lang_selector.tpl          |  13 -
 view/theme/redbasic/tpl/layoutlist.tpl             |  71 ---
 view/theme/redbasic/tpl/like_noshare.tpl           |   5 -
 view/theme/redbasic/tpl/locmanage.tpl              |  41 --
 view/theme/redbasic/tpl/login.tpl                  |  21 -
 view/theme/redbasic/tpl/logout.tpl                 |   6 -
 view/theme/redbasic/tpl/lostpass.tpl               |  17 -
 view/theme/redbasic/tpl/mail_conv.tpl              |  38 --
 view/theme/redbasic/tpl/mail_display.tpl           |  24 -
 view/theme/redbasic/tpl/mail_head.tpl              |   8 -
 view/theme/redbasic/tpl/mail_list.tpl              |   7 -
 view/theme/redbasic/tpl/main_slider.tpl            |  38 --
 view/theme/redbasic/tpl/match.tpl                  |  16 -
 view/theme/redbasic/tpl/menuedit.tpl               |  33 --
 view/theme/redbasic/tpl/menulist.tpl               |  40 --
 view/theme/redbasic/tpl/message_side.tpl           |   9 -
 view/theme/redbasic/tpl/micropro_img.tpl           |   1 -
 view/theme/redbasic/tpl/micropro_txt.tpl           |   1 -
 view/theme/redbasic/tpl/mitemedit.tpl              |  42 --
 view/theme/redbasic/tpl/mitemlist.tpl              |  34 --
 view/theme/redbasic/tpl/mood_content.tpl           |  33 --
 view/theme/redbasic/tpl/msg-header.tpl             |  81 ---
 view/theme/redbasic/tpl/myapps.tpl                 |  17 -
 view/theme/redbasic/tpl/nav.tpl                    | 222 --------
 view/theme/redbasic/tpl/nav_login.tpl              |  18 -
 view/theme/redbasic/tpl/new_channel.tpl            |  34 --
 view/theme/redbasic/tpl/notes.tpl                  |  35 --
 view/theme/redbasic/tpl/notifications.tpl          |  11 -
 view/theme/redbasic/tpl/notify.tpl                 |   3 -
 view/theme/redbasic/tpl/nwiki_page_history.tpl     |  59 --
 view/theme/redbasic/tpl/oauth_authorize.tpl        |  10 -
 view/theme/redbasic/tpl/oauth_authorize_done.tpl   |   4 -
 view/theme/redbasic/tpl/oembed_video.tpl           |   4 -
 view/theme/redbasic/tpl/oexchange_xrd.tpl          |  33 --
 view/theme/redbasic/tpl/page_display.tpl           |  14 -
 view/theme/redbasic/tpl/page_display_empty.tpl     |   1 -
 view/theme/redbasic/tpl/pdledit.tpl                |  24 -
 view/theme/redbasic/tpl/peoplefind.tpl             |  17 -
 view/theme/redbasic/tpl/photo_album.tpl            |  32 --
 view/theme/redbasic/tpl/photo_albums.tpl           |  13 -
 view/theme/redbasic/tpl/photo_drop.tpl             |   3 -
 view/theme/redbasic/tpl/photo_item.tpl             |  34 --
 view/theme/redbasic/tpl/photo_top.tpl              |   4 -
 view/theme/redbasic/tpl/photo_view.tpl             | 172 ------
 view/theme/redbasic/tpl/photos_recent.tpl          |  23 -
 view/theme/redbasic/tpl/photos_upload.tpl          |  61 ---
 view/theme/redbasic/tpl/photosajax.tpl             |   4 -
 view/theme/redbasic/tpl/poco_entry_xml.tpl         |   8 -
 view/theme/redbasic/tpl/poco_xml.tpl               |  18 -
 view/theme/redbasic/tpl/poke_content.tpl           |  48 --
 view/theme/redbasic/tpl/posted_date_widget.tpl     |  46 --
 view/theme/redbasic/tpl/prep.tpl                   |  31 --
 view/theme/redbasic/tpl/profdef_edit.tpl           |  16 -
 view/theme/redbasic/tpl/profed_head.tpl            |   2 -
 view/theme/redbasic/tpl/profile_advanced.tpl       | 341 ------------
 view/theme/redbasic/tpl/profile_edit.tpl           | 401 --------------
 view/theme/redbasic/tpl/profile_entry.tpl          |  11 -
 view/theme/redbasic/tpl/profile_listing_header.tpl |  12 -
 view/theme/redbasic/tpl/profile_photo.tpl          |  48 --
 view/theme/redbasic/tpl/profile_tabs.tpl           |   5 -
 view/theme/redbasic/tpl/profile_vcard.tpl          |  62 ---
 view/theme/redbasic/tpl/profile_vcard_short.tpl    |  38 --
 view/theme/redbasic/tpl/prv_message.tpl            | 104 ----
 view/theme/redbasic/tpl/pwdreset.tpl               |  17 -
 view/theme/redbasic/tpl/rating_form.tpl            |  25 -
 view/theme/redbasic/tpl/rating_slider.tpl          |  19 -
 view/theme/redbasic/tpl/rbmark.tpl                 |  16 -
 view/theme/redbasic/tpl/register.tpl               |  61 ---
 view/theme/redbasic/tpl/remote_friends_common.tpl  |  21 -
 view/theme/redbasic/tpl/remote_login.tpl           |   1 -
 view/theme/redbasic/tpl/removeaccount.tpl          |  20 -
 view/theme/redbasic/tpl/removeme.tpl               |  20 -
 view/theme/redbasic/tpl/rmagic.tpl                 |   9 -
 view/theme/redbasic/tpl/safesearch.tpl             |   6 -
 view/theme/redbasic/tpl/saved_searches.tpl         |  12 -
 view/theme/redbasic/tpl/search_item.tpl            | 114 ----
 view/theme/redbasic/tpl/searchbox.tpl              |  12 -
 view/theme/redbasic/tpl/section_title.tpl          |   5 -
 view/theme/redbasic/tpl/select_timezone.tpl        |  11 -
 view/theme/redbasic/tpl/sellpage_edit.tpl          |  23 -
 view/theme/redbasic/tpl/sellpage_submit.tpl        |   3 -
 view/theme/redbasic/tpl/sellpage_view.tpl          |  11 -
 view/theme/redbasic/tpl/settings.tpl               | 192 -------
 view/theme/redbasic/tpl/settings_account.tpl       |  28 -
 view/theme/redbasic/tpl/settings_addons.tpl        |  11 -
 view/theme/redbasic/tpl/settings_connectors.tpl    |  10 -
 view/theme/redbasic/tpl/settings_display.tpl       |  86 ---
 view/theme/redbasic/tpl/settings_features.tpl      |  30 --
 view/theme/redbasic/tpl/settings_nick_set.tpl      |   8 -
 view/theme/redbasic/tpl/settings_oauth.tpl         |  36 --
 view/theme/redbasic/tpl/settings_oauth_edit.tpl    |  22 -
 view/theme/redbasic/tpl/settings_permcats.tpl      |  64 ---
 view/theme/redbasic/tpl/settings_tokens.tpl        |  72 ---
 view/theme/redbasic/tpl/sharedwithme.tpl           |  26 -
 view/theme/redbasic/tpl/show_thing.tpl             |  16 -
 view/theme/redbasic/tpl/siteinfo.tpl               |  41 --
 view/theme/redbasic/tpl/sitesearch.tpl             |   5 -
 view/theme/redbasic/tpl/sources_edit.tpl           |  24 -
 view/theme/redbasic/tpl/sources_list.tpl           |  17 -
 view/theme/redbasic/tpl/sources_new.tpl            |  17 -
 view/theme/redbasic/tpl/suggest_friends.tpl        |  16 -
 view/theme/redbasic/tpl/suggest_page.tpl           |   9 -
 view/theme/redbasic/tpl/suggest_widget.tpl         |  10 -
 view/theme/redbasic/tpl/thing_edit.tpl             |  41 --
 view/theme/redbasic/tpl/thing_input.tpl            |  41 --
 view/theme/redbasic/tpl/threaded_conversation.tpl  |   8 -
 view/theme/redbasic/tpl/toggle_mobile_footer.tpl   |   2 -
 view/theme/redbasic/tpl/uexport.tpl                |  19 -
 view/theme/redbasic/tpl/usermenu.tpl               |  20 -
 view/theme/redbasic/tpl/viewcontact_template.tpl   |  13 -
 view/theme/redbasic/tpl/viewcontactsajax.tpl       |   3 -
 view/theme/redbasic/tpl/webpage_export_list.tpl    | 124 -----
 view/theme/redbasic/tpl/webpage_import.tpl         | 126 -----
 view/theme/redbasic/tpl/webpagelist.tpl            |  76 ---
 .../theme/redbasic/tpl/website_portation_tools.tpl |  60 ---
 view/theme/redbasic/tpl/wiki.tpl                   | 469 ----------------
 view/theme/redbasic/tpl/wiki_page_history.tpl      |  59 --
 view/theme/redbasic/tpl/wiki_page_list.tpl         |  76 ---
 view/theme/redbasic/tpl/wikilist.tpl               |  78 ---
 view/theme/redbasic/tpl/wikilist_widget.tpl        |   8 -
 view/theme/redbasic/tpl/write_pages.tpl            |   3 -
 view/theme/redbasic/tpl/xchan_vcard.tpl            |  10 -
 view/theme/redbasic/tpl/xrd_diaspora.tpl           |   3 -
 view/theme/redbasic/tpl/xrd_host.tpl               |  11 -
 view/theme/redbasic/tpl/xrd_person.tpl             |  31 --
 view/theme/redbasic/tpl/zcard.tpl                  | 144 -----
 view/theme/redbasic/tpl/zcard_embed.tpl            |   8 -
 view/tpl/404.tpl                                   |   3 +
 view/tpl/abook_edit.tpl                            | 519 ++++++++++++++++++
 view/tpl/achievements.tpl                          |   9 +
 view/tpl/acl_selector.tpl                          |  64 +++
 view/tpl/admin_account_edit.tpl                    |  23 +
 view/tpl/admin_accounts.tpl                        |  88 +++
 view/tpl/admin_aside.tpl                           |  46 ++
 view/tpl/admin_channels.tpl                        |  51 ++
 view/tpl/admin_hubloc.tpl                          |  27 +
 view/tpl/admin_logs.tpl                            |  19 +
 view/tpl/admin_plugins.tpl                         | 190 +++++++
 view/tpl/admin_plugins_addrepo.tpl                 |   9 +
 view/tpl/admin_plugins_details.tpl                 |  58 ++
 view/tpl/admin_profiles.tpl                        |  38 ++
 view/tpl/admin_queue.tpl                           |  15 +
 view/tpl/admin_security.tpl                        |  33 ++
 view/tpl/admin_settings_features.tpl               |  31 ++
 view/tpl/admin_site.tpl                            | 101 ++++
 view/tpl/admin_summary.tpl                         |  43 ++
 view/tpl/album_edit.tpl                            |  22 +
 view/tpl/alt_pager.tpl                             |   4 +
 view/tpl/api_config_xml.tpl                        |  66 +++
 view/tpl/api_friends_xml.tpl                       |   5 +
 view/tpl/api_ratelimit_xml.tpl                     |   6 +
 view/tpl/api_status_xml.tpl                        |  46 ++
 view/tpl/api_test_xml.tpl                          |   1 +
 view/tpl/api_timeline_atom.tpl                     |  90 ++++
 view/tpl/api_timeline_rss.tpl                      |  26 +
 view/tpl/api_timeline_xml.tpl                      |  20 +
 view/tpl/api_user_xml.tpl                          |  46 ++
 view/tpl/app.tpl                                   |  30 ++
 view/tpl/app_create.tpl                            |  40 ++
 view/tpl/atom_feed.tpl                             |  30 ++
 view/tpl/attach_edit.tpl                           |  31 ++
 view/tpl/birthdays_reminder.tpl                    |  10 +
 view/tpl/blocklist.tpl                             |  69 +++
 view/tpl/bookmarkedchats.tpl                       |  10 +
 view/tpl/build_query.tpl                           |  65 +++
 view/tpl/categories_widget.tpl                     |  12 +
 view/tpl/cdav_addressbook.tpl                      | 462 ++++++++++++++++
 view/tpl/cdav_calendar.tpl                         | 349 ++++++++++++
 view/tpl/cdav_widget_addressbook.tpl               |  66 +++
 view/tpl/cdav_widget_calendar.tpl                  | 121 +++++
 view/tpl/channel.tpl                               |  49 ++
 view/tpl/channel_id_select.tpl                     |   7 +
 view/tpl/channel_import.tpl                        |  43 ++
 view/tpl/channels.tpl                              |  24 +
 view/tpl/chanview.tpl                              |   1 +
 view/tpl/chat.tpl                                  | 346 ++++++++++++
 view/tpl/chatroom_members.tpl                      |   5 +
 view/tpl/chatroom_new.tpl                          |  12 +
 view/tpl/chatroomlist.tpl                          |  10 +
 view/tpl/chatrooms.tpl                             |  41 ++
 view/tpl/cloud.tpl                                 |   4 +
 view/tpl/cloud_actionspanel.tpl                    |  42 ++
 view/tpl/cloud_directory.tpl                       |  45 ++
 view/tpl/cloud_header.tpl                          |  16 +
 view/tpl/comment_item.tpl                          |  67 +++
 view/tpl/common_friends.tpl                        |  15 +
 view/tpl/common_tabs.tpl                           |  17 +
 view/tpl/connection_template.tpl                   |  48 ++
 view/tpl/connections.tpl                           |  36 ++
 view/tpl/contact_block.tpl                         |  14 +
 view/tpl/contact_head.tpl                          |  30 ++
 view/tpl/contact_slider.tpl                        |  20 +
 view/tpl/contact_template.tpl                      |   8 +
 view/tpl/contactsajax.tpl                          |   3 +
 view/tpl/conv.tpl                                  |  17 +
 view/tpl/conv_frame.tpl                            |   5 +
 view/tpl/conv_item.tpl                             | 250 +++++++++
 view/tpl/conv_list.tpl                             | 251 +++++++++
 view/tpl/conversation.tpl                          |  20 +
 view/tpl/convobj.tpl                               |   4 +
 view/tpl/cover_photo.tpl                           |  29 +
 view/tpl/cover_photo_widget.tpl                    |  76 +++
 view/tpl/cropbody.tpl                              |  58 ++
 view/tpl/cropcover.tpl                             |  58 ++
 view/tpl/crophead.tpl                              |   4 +
 view/tpl/delegate.tpl                              |  57 ++
 view/tpl/design_tools.tpl                          |   9 +
 view/tpl/diaspora_vcard.tpl                        |  69 +++
 view/tpl/dir_sort_links.tpl                        |   8 +
 view/tpl/directajax.tpl                            |   4 +
 view/tpl/directory_header.tpl                      |  22 +
 view/tpl/direntry.tpl                              |  77 +++
 view/tpl/display-head.tpl                          |   8 +
 view/tpl/dreport.tpl                               |  28 +
 view/tpl/edpost_head.tpl                           |  14 +
 view/tpl/email_notify_html.tpl                     |  27 +
 view/tpl/email_notify_text.tpl                     |  13 +
 view/tpl/event.tpl                                 |  16 +
 view/tpl/event_cal.tpl                             |  14 +
 view/tpl/event_form.tpl                            | 130 +++++
 view/tpl/event_head.tpl                            | 160 ++++++
 view/tpl/event_item_content.tpl                    |  10 +
 view/tpl/event_item_header.tpl                     |  11 +
 view/tpl/events-js.tpl                             |  31 ++
 view/tpl/events_cal-js.tpl                         |  20 +
 view/tpl/events_menu_side.tpl                      |   8 +
 view/tpl/events_reminder.tpl                       |  10 +
 view/tpl/events_tools_side.tpl                     |  17 +
 view/tpl/failed_updates.tpl                        |  18 +
 view/tpl/field.tpl                                 |   3 +
 view/tpl/field_acheckbox.tpl                       |  23 +
 view/tpl/field_checkbox.tpl                        |   5 +
 view/tpl/field_colorinput.tpl                      |   6 +
 view/tpl/field_combobox.tpl                        |  18 +
 view/tpl/field_custom.tpl                          |   5 +
 view/tpl/field_input.tpl                           |   5 +
 view/tpl/field_intcheckbox.tpl                     |   5 +
 view/tpl/field_password.tpl                        |   5 +
 view/tpl/field_radio.tpl                           |   8 +
 view/tpl/field_richtext.tpl                        |   5 +
 view/tpl/field_select.tpl                          |   7 +
 view/tpl/field_select_disabled.tpl                 |   7 +
 view/tpl/field_select_grouped.tpl                  |  12 +
 view/tpl/field_select_raw.tpl                      |   7 +
 view/tpl/field_textarea.tpl                        |   5 +
 view/tpl/field_themeselect.tpl                     |  13 +
 view/tpl/field_yesno.tpl                           |  13 +
 view/tpl/fileas_widget.tpl                         |  12 +
 view/tpl/filebrowser.tpl                           |  84 +++
 view/tpl/filer_dialog.tpl                          |  19 +
 view/tpl/follow.tpl                                |  14 +
 view/tpl/force_image_reload.tpl                    |  72 +++
 view/tpl/generic_addon_settings.tpl                |  19 +
 view/tpl/generic_links_widget.tpl                  |  11 +
 view/tpl/generic_modal.tpl                         |  17 +
 view/tpl/group_drop.tpl                            |   7 +
 view/tpl/group_edit.tpl                            |  26 +
 view/tpl/group_selection.tpl                       |   8 +
 view/tpl/group_side.tpl                            |  26 +
 view/tpl/groupeditor.tpl                           |  16 +
 view/tpl/hdr.tpl                                   |   3 +
 view/tpl/head.tpl                                  |  21 +
 view/tpl/help.tpl                                  |  33 ++
 view/tpl/install.tpl                               |   9 +
 view/tpl/install_checks.tpl                        |  24 +
 view/tpl/install_db.tpl                            |  30 ++
 view/tpl/install_settings.tpl                      |  28 +
 view/tpl/invite.tpl                                |  28 +
 view/tpl/item_attach.tpl                           |   5 +
 view/tpl/item_binary.tpl                           |   3 +
 view/tpl/item_categories.tpl                       |   8 +
 view/tpl/item_filer.tpl                            |   8 +
 view/tpl/item_import.tpl                           |  13 +
 view/tpl/jot-header.tpl                            | 598 +++++++++++++++++++++
 view/tpl/jot.tpl                                   | 303 +++++++++++
 view/tpl/jot_geotag.tpl                            |   7 +
 view/tpl/js_strings.tpl                            |  57 ++
 view/tpl/lang_selector.tpl                         |  13 +
 view/tpl/layoutlist.tpl                            |  71 +++
 view/tpl/like_noshare.tpl                          |   5 +
 view/tpl/locmanage.tpl                             |  41 ++
 view/tpl/login.tpl                                 |  21 +
 view/tpl/logout.tpl                                |   6 +
 view/tpl/lostpass.tpl                              |  17 +
 view/tpl/mail_conv.tpl                             |  38 ++
 view/tpl/mail_display.tpl                          |  24 +
 view/tpl/mail_head.tpl                             |   8 +
 view/tpl/mail_list.tpl                             |   7 +
 view/tpl/main_slider.tpl                           |  38 ++
 view/tpl/match.tpl                                 |  16 +
 view/tpl/menuedit.tpl                              |  33 ++
 view/tpl/menulist.tpl                              |  40 ++
 view/tpl/message_side.tpl                          |   9 +
 view/tpl/micropro_img.tpl                          |   1 +
 view/tpl/micropro_txt.tpl                          |   1 +
 view/tpl/mitemedit.tpl                             |  42 ++
 view/tpl/mitemlist.tpl                             |  34 ++
 view/tpl/mood_content.tpl                          |  33 ++
 view/tpl/msg-header.tpl                            |  81 +++
 view/tpl/myapps.tpl                                |  17 +
 view/tpl/nav.tpl                                   | 222 ++++++++
 view/tpl/nav_login.tpl                             |  18 +
 view/tpl/new_channel.tpl                           |  34 ++
 view/tpl/notes.tpl                                 |  35 ++
 view/tpl/notifications.tpl                         |  11 +
 view/tpl/notify.tpl                                |   3 +
 view/tpl/nwiki_page_history.tpl                    |  59 ++
 view/tpl/oauth_authorize.tpl                       |  10 +
 view/tpl/oauth_authorize_done.tpl                  |   4 +
 view/tpl/oembed_video.tpl                          |   4 +
 view/tpl/oexchange_xrd.tpl                         |  33 ++
 view/tpl/page_display.tpl                          |  14 +
 view/tpl/page_display_empty.tpl                    |   1 +
 view/tpl/pdledit.tpl                               |  24 +
 view/tpl/peoplefind.tpl                            |  17 +
 view/tpl/photo_album.tpl                           |  32 ++
 view/tpl/photo_albums.tpl                          |  13 +
 view/tpl/photo_drop.tpl                            |   3 +
 view/tpl/photo_item.tpl                            |  34 ++
 view/tpl/photo_top.tpl                             |   4 +
 view/tpl/photo_view.tpl                            | 172 ++++++
 view/tpl/photos_recent.tpl                         |  23 +
 view/tpl/photos_upload.tpl                         |  61 +++
 view/tpl/photosajax.tpl                            |   4 +
 view/tpl/poco_entry_xml.tpl                        |   8 +
 view/tpl/poco_xml.tpl                              |  18 +
 view/tpl/poke_content.tpl                          |  48 ++
 view/tpl/posted_date_widget.tpl                    |  46 ++
 view/tpl/prep.tpl                                  |  31 ++
 view/tpl/profdef_edit.tpl                          |  16 +
 view/tpl/profed_head.tpl                           |   2 +
 view/tpl/profile_advanced.tpl                      | 341 ++++++++++++
 view/tpl/profile_edit.tpl                          | 401 ++++++++++++++
 view/tpl/profile_entry.tpl                         |  11 +
 view/tpl/profile_listing_header.tpl                |  12 +
 view/tpl/profile_photo.tpl                         |  48 ++
 view/tpl/profile_tabs.tpl                          |   5 +
 view/tpl/profile_vcard.tpl                         |  62 +++
 view/tpl/profile_vcard_short.tpl                   |  38 ++
 view/tpl/prv_message.tpl                           | 104 ++++
 view/tpl/pwdreset.tpl                              |  17 +
 view/tpl/rating_form.tpl                           |  25 +
 view/tpl/rating_slider.tpl                         |  19 +
 view/tpl/rbmark.tpl                                |  16 +
 view/tpl/register.tpl                              |  61 +++
 view/tpl/remote_friends_common.tpl                 |  21 +
 view/tpl/remote_login.tpl                          |   1 +
 view/tpl/removeaccount.tpl                         |  20 +
 view/tpl/removeme.tpl                              |  20 +
 view/tpl/rmagic.tpl                                |   9 +
 view/tpl/safesearch.tpl                            |   6 +
 view/tpl/saved_searches.tpl                        |  12 +
 view/tpl/search_item.tpl                           | 114 ++++
 view/tpl/searchbox.tpl                             |  12 +
 view/tpl/section_title.tpl                         |   5 +
 view/tpl/select_timezone.tpl                       |  11 +
 view/tpl/sellpage_edit.tpl                         |  23 +
 view/tpl/sellpage_submit.tpl                       |   3 +
 view/tpl/sellpage_view.tpl                         |  11 +
 view/tpl/settings.tpl                              | 192 +++++++
 view/tpl/settings_account.tpl                      |  28 +
 view/tpl/settings_addons.tpl                       |  11 +
 view/tpl/settings_connectors.tpl                   |  10 +
 view/tpl/settings_display.tpl                      |  86 +++
 view/tpl/settings_features.tpl                     |  30 ++
 view/tpl/settings_nick_set.tpl                     |   8 +
 view/tpl/settings_oauth.tpl                        |  36 ++
 view/tpl/settings_oauth_edit.tpl                   |  22 +
 view/tpl/settings_permcats.tpl                     |  64 +++
 view/tpl/settings_tokens.tpl                       |  72 +++
 view/tpl/sharedwithme.tpl                          |  26 +
 view/tpl/show_thing.tpl                            |  16 +
 view/tpl/siteinfo.tpl                              |  41 ++
 view/tpl/sitesearch.tpl                            |   5 +
 view/tpl/sources_edit.tpl                          |  24 +
 view/tpl/sources_list.tpl                          |  17 +
 view/tpl/sources_new.tpl                           |  17 +
 view/tpl/suggest_friends.tpl                       |  16 +
 view/tpl/suggest_page.tpl                          |   9 +
 view/tpl/suggest_widget.tpl                        |  10 +
 view/tpl/thing_edit.tpl                            |  41 ++
 view/tpl/thing_input.tpl                           |  41 ++
 view/tpl/threaded_conversation.tpl                 |   8 +
 view/tpl/toggle_mobile_footer.tpl                  |   2 +
 view/tpl/uexport.tpl                               |  19 +
 view/tpl/usermenu.tpl                              |  20 +
 view/tpl/viewcontact_template.tpl                  |  13 +
 view/tpl/viewcontactsajax.tpl                      |   3 +
 view/tpl/webpage_export_list.tpl                   | 124 +++++
 view/tpl/webpage_import.tpl                        | 126 +++++
 view/tpl/webpagelist.tpl                           |  76 +++
 view/tpl/website_portation_tools.tpl               |  60 +++
 view/tpl/wiki.tpl                                  | 469 ++++++++++++++++
 view/tpl/wiki_page_history.tpl                     |  59 ++
 view/tpl/wiki_page_list.tpl                        |  76 +++
 view/tpl/wikilist.tpl                              |  78 +++
 view/tpl/wikilist_widget.tpl                       |   8 +
 view/tpl/write_pages.tpl                           |   3 +
 view/tpl/xchan_vcard.tpl                           |  10 +
 view/tpl/xrd_diaspora.tpl                          |   3 +
 view/tpl/xrd_host.tpl                              |  11 +
 view/tpl/xrd_person.tpl                            |  31 ++
 view/tpl/zcard.tpl                                 | 144 +++++
 view/tpl/zcard_embed.tpl                           |   8 +
 554 files changed, 12312 insertions(+), 12312 deletions(-)
 delete mode 100755 view/theme/redbasic/tpl/404.tpl
 delete mode 100755 view/theme/redbasic/tpl/abook_edit.tpl
 delete mode 100644 view/theme/redbasic/tpl/achievements.tpl
 delete mode 100755 view/theme/redbasic/tpl/acl_selector.tpl
 delete mode 100644 view/theme/redbasic/tpl/admin_account_edit.tpl
 delete mode 100755 view/theme/redbasic/tpl/admin_accounts.tpl
 delete mode 100755 view/theme/redbasic/tpl/admin_aside.tpl
 delete mode 100755 view/theme/redbasic/tpl/admin_channels.tpl
 delete mode 100755 view/theme/redbasic/tpl/admin_hubloc.tpl
 delete mode 100755 view/theme/redbasic/tpl/admin_logs.tpl
 delete mode 100755 view/theme/redbasic/tpl/admin_plugins.tpl
 delete mode 100644 view/theme/redbasic/tpl/admin_plugins_addrepo.tpl
 delete mode 100755 view/theme/redbasic/tpl/admin_plugins_details.tpl
 delete mode 100644 view/theme/redbasic/tpl/admin_profiles.tpl
 delete mode 100644 view/theme/redbasic/tpl/admin_queue.tpl
 delete mode 100755 view/theme/redbasic/tpl/admin_security.tpl
 delete mode 100644 view/theme/redbasic/tpl/admin_settings_features.tpl
 delete mode 100755 view/theme/redbasic/tpl/admin_site.tpl
 delete mode 100755 view/theme/redbasic/tpl/admin_summary.tpl
 delete mode 100755 view/theme/redbasic/tpl/album_edit.tpl
 delete mode 100644 view/theme/redbasic/tpl/alt_pager.tpl
 delete mode 100755 view/theme/redbasic/tpl/api_config_xml.tpl
 delete mode 100755 view/theme/redbasic/tpl/api_friends_xml.tpl
 delete mode 100755 view/theme/redbasic/tpl/api_ratelimit_xml.tpl
 delete mode 100755 view/theme/redbasic/tpl/api_status_xml.tpl
 delete mode 100755 view/theme/redbasic/tpl/api_test_xml.tpl
 delete mode 100755 view/theme/redbasic/tpl/api_timeline_atom.tpl
 delete mode 100755 view/theme/redbasic/tpl/api_timeline_rss.tpl
 delete mode 100755 view/theme/redbasic/tpl/api_timeline_xml.tpl
 delete mode 100755 view/theme/redbasic/tpl/api_user_xml.tpl
 delete mode 100644 view/theme/redbasic/tpl/app.tpl
 delete mode 100644 view/theme/redbasic/tpl/app_create.tpl
 delete mode 100755 view/theme/redbasic/tpl/atom_feed.tpl
 delete mode 100644 view/theme/redbasic/tpl/attach_edit.tpl
 delete mode 100755 view/theme/redbasic/tpl/birthdays_reminder.tpl
 delete mode 100644 view/theme/redbasic/tpl/blocklist.tpl
 delete mode 100644 view/theme/redbasic/tpl/bookmarkedchats.tpl
 delete mode 100755 view/theme/redbasic/tpl/build_query.tpl
 delete mode 100755 view/theme/redbasic/tpl/categories_widget.tpl
 delete mode 100644 view/theme/redbasic/tpl/cdav_addressbook.tpl
 delete mode 100644 view/theme/redbasic/tpl/cdav_calendar.tpl
 delete mode 100644 view/theme/redbasic/tpl/cdav_widget_addressbook.tpl
 delete mode 100644 view/theme/redbasic/tpl/cdav_widget_calendar.tpl
 delete mode 100755 view/theme/redbasic/tpl/channel.tpl
 delete mode 100644 view/theme/redbasic/tpl/channel_id_select.tpl
 delete mode 100755 view/theme/redbasic/tpl/channel_import.tpl
 delete mode 100755 view/theme/redbasic/tpl/channels.tpl
 delete mode 100755 view/theme/redbasic/tpl/chanview.tpl
 delete mode 100644 view/theme/redbasic/tpl/chat.tpl
 delete mode 100644 view/theme/redbasic/tpl/chatroom_members.tpl
 delete mode 100644 view/theme/redbasic/tpl/chatroom_new.tpl
 delete mode 100644 view/theme/redbasic/tpl/chatroomlist.tpl
 delete mode 100644 view/theme/redbasic/tpl/chatrooms.tpl
 delete mode 100644 view/theme/redbasic/tpl/cloud.tpl
 delete mode 100644 view/theme/redbasic/tpl/cloud_actionspanel.tpl
 delete mode 100644 view/theme/redbasic/tpl/cloud_directory.tpl
 delete mode 100644 view/theme/redbasic/tpl/cloud_header.tpl
 delete mode 100755 view/theme/redbasic/tpl/comment_item.tpl
 delete mode 100755 view/theme/redbasic/tpl/common_friends.tpl
 delete mode 100755 view/theme/redbasic/tpl/common_tabs.tpl
 delete mode 100755 view/theme/redbasic/tpl/connection_template.tpl
 delete mode 100755 view/theme/redbasic/tpl/connections.tpl
 delete mode 100755 view/theme/redbasic/tpl/contact_block.tpl
 delete mode 100755 view/theme/redbasic/tpl/contact_head.tpl
 delete mode 100755 view/theme/redbasic/tpl/contact_slider.tpl
 delete mode 100755 view/theme/redbasic/tpl/contact_template.tpl
 delete mode 100644 view/theme/redbasic/tpl/contactsajax.tpl
 delete mode 100755 view/theme/redbasic/tpl/conv.tpl
 delete mode 100755 view/theme/redbasic/tpl/conv_frame.tpl
 delete mode 100755 view/theme/redbasic/tpl/conv_item.tpl
 delete mode 100755 view/theme/redbasic/tpl/conv_list.tpl
 delete mode 100755 view/theme/redbasic/tpl/conversation.tpl
 delete mode 100755 view/theme/redbasic/tpl/convobj.tpl
 delete mode 100755 view/theme/redbasic/tpl/cover_photo.tpl
 delete mode 100755 view/theme/redbasic/tpl/cover_photo_widget.tpl
 delete mode 100755 view/theme/redbasic/tpl/cropbody.tpl
 delete mode 100755 view/theme/redbasic/tpl/cropcover.tpl
 delete mode 100755 view/theme/redbasic/tpl/crophead.tpl
 delete mode 100755 view/theme/redbasic/tpl/delegate.tpl
 delete mode 100644 view/theme/redbasic/tpl/design_tools.tpl
 delete mode 100644 view/theme/redbasic/tpl/diaspora_vcard.tpl
 delete mode 100644 view/theme/redbasic/tpl/dir_sort_links.tpl
 delete mode 100644 view/theme/redbasic/tpl/directajax.tpl
 delete mode 100755 view/theme/redbasic/tpl/directory_header.tpl
 delete mode 100755 view/theme/redbasic/tpl/direntry.tpl
 delete mode 100755 view/theme/redbasic/tpl/display-head.tpl
 delete mode 100644 view/theme/redbasic/tpl/dreport.tpl
 delete mode 100755 view/theme/redbasic/tpl/edpost_head.tpl
 delete mode 100755 view/theme/redbasic/tpl/email_notify_html.tpl
 delete mode 100755 view/theme/redbasic/tpl/email_notify_text.tpl
 delete mode 100755 view/theme/redbasic/tpl/event.tpl
 delete mode 100755 view/theme/redbasic/tpl/event_cal.tpl
 delete mode 100755 view/theme/redbasic/tpl/event_form.tpl
 delete mode 100755 view/theme/redbasic/tpl/event_head.tpl
 delete mode 100644 view/theme/redbasic/tpl/event_item_content.tpl
 delete mode 100755 view/theme/redbasic/tpl/event_item_header.tpl
 delete mode 100755 view/theme/redbasic/tpl/events-js.tpl
 delete mode 100755 view/theme/redbasic/tpl/events_cal-js.tpl
 delete mode 100755 view/theme/redbasic/tpl/events_menu_side.tpl
 delete mode 100755 view/theme/redbasic/tpl/events_reminder.tpl
 delete mode 100755 view/theme/redbasic/tpl/events_tools_side.tpl
 delete mode 100755 view/theme/redbasic/tpl/failed_updates.tpl
 delete mode 100755 view/theme/redbasic/tpl/field.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_acheckbox.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_checkbox.tpl
 delete mode 100644 view/theme/redbasic/tpl/field_colorinput.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_combobox.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_custom.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_input.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_intcheckbox.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_password.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_radio.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_richtext.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_select.tpl
 delete mode 100644 view/theme/redbasic/tpl/field_select_disabled.tpl
 delete mode 100644 view/theme/redbasic/tpl/field_select_grouped.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_select_raw.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_textarea.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_themeselect.tpl
 delete mode 100755 view/theme/redbasic/tpl/field_yesno.tpl
 delete mode 100755 view/theme/redbasic/tpl/fileas_widget.tpl
 delete mode 100755 view/theme/redbasic/tpl/filebrowser.tpl
 delete mode 100755 view/theme/redbasic/tpl/filer_dialog.tpl
 delete mode 100755 view/theme/redbasic/tpl/follow.tpl
 delete mode 100644 view/theme/redbasic/tpl/force_image_reload.tpl
 delete mode 100644 view/theme/redbasic/tpl/generic_addon_settings.tpl
 delete mode 100755 view/theme/redbasic/tpl/generic_links_widget.tpl
 delete mode 100644 view/theme/redbasic/tpl/generic_modal.tpl
 delete mode 100755 view/theme/redbasic/tpl/group_drop.tpl
 delete mode 100755 view/theme/redbasic/tpl/group_edit.tpl
 delete mode 100755 view/theme/redbasic/tpl/group_selection.tpl
 delete mode 100755 view/theme/redbasic/tpl/group_side.tpl
 delete mode 100755 view/theme/redbasic/tpl/groupeditor.tpl
 delete mode 100644 view/theme/redbasic/tpl/hdr.tpl
 delete mode 100755 view/theme/redbasic/tpl/head.tpl
 delete mode 100644 view/theme/redbasic/tpl/help.tpl
 delete mode 100755 view/theme/redbasic/tpl/install.tpl
 delete mode 100755 view/theme/redbasic/tpl/install_checks.tpl
 delete mode 100755 view/theme/redbasic/tpl/install_db.tpl
 delete mode 100755 view/theme/redbasic/tpl/install_settings.tpl
 delete mode 100755 view/theme/redbasic/tpl/invite.tpl
 delete mode 100644 view/theme/redbasic/tpl/item_attach.tpl
 delete mode 100644 view/theme/redbasic/tpl/item_binary.tpl
 delete mode 100644 view/theme/redbasic/tpl/item_categories.tpl
 delete mode 100644 view/theme/redbasic/tpl/item_filer.tpl
 delete mode 100755 view/theme/redbasic/tpl/item_import.tpl
 delete mode 100755 view/theme/redbasic/tpl/jot-header.tpl
 delete mode 100755 view/theme/redbasic/tpl/jot.tpl
 delete mode 100755 view/theme/redbasic/tpl/jot_geotag.tpl
 delete mode 100755 view/theme/redbasic/tpl/js_strings.tpl
 delete mode 100755 view/theme/redbasic/tpl/lang_selector.tpl
 delete mode 100644 view/theme/redbasic/tpl/layoutlist.tpl
 delete mode 100755 view/theme/redbasic/tpl/like_noshare.tpl
 delete mode 100644 view/theme/redbasic/tpl/locmanage.tpl
 delete mode 100755 view/theme/redbasic/tpl/login.tpl
 delete mode 100755 view/theme/redbasic/tpl/logout.tpl
 delete mode 100755 view/theme/redbasic/tpl/lostpass.tpl
 delete mode 100755 view/theme/redbasic/tpl/mail_conv.tpl
 delete mode 100755 view/theme/redbasic/tpl/mail_display.tpl
 delete mode 100755 view/theme/redbasic/tpl/mail_head.tpl
 delete mode 100755 view/theme/redbasic/tpl/mail_list.tpl
 delete mode 100755 view/theme/redbasic/tpl/main_slider.tpl
 delete mode 100755 view/theme/redbasic/tpl/match.tpl
 delete mode 100644 view/theme/redbasic/tpl/menuedit.tpl
 delete mode 100644 view/theme/redbasic/tpl/menulist.tpl
 delete mode 100755 view/theme/redbasic/tpl/message_side.tpl
 delete mode 100755 view/theme/redbasic/tpl/micropro_img.tpl
 delete mode 100755 view/theme/redbasic/tpl/micropro_txt.tpl
 delete mode 100644 view/theme/redbasic/tpl/mitemedit.tpl
 delete mode 100644 view/theme/redbasic/tpl/mitemlist.tpl
 delete mode 100755 view/theme/redbasic/tpl/mood_content.tpl
 delete mode 100755 view/theme/redbasic/tpl/msg-header.tpl
 delete mode 100755 view/theme/redbasic/tpl/myapps.tpl
 delete mode 100755 view/theme/redbasic/tpl/nav.tpl
 delete mode 100644 view/theme/redbasic/tpl/nav_login.tpl
 delete mode 100755 view/theme/redbasic/tpl/new_channel.tpl
 delete mode 100644 view/theme/redbasic/tpl/notes.tpl
 delete mode 100755 view/theme/redbasic/tpl/notifications.tpl
 delete mode 100755 view/theme/redbasic/tpl/notify.tpl
 delete mode 100644 view/theme/redbasic/tpl/nwiki_page_history.tpl
 delete mode 100755 view/theme/redbasic/tpl/oauth_authorize.tpl
 delete mode 100755 view/theme/redbasic/tpl/oauth_authorize_done.tpl
 delete mode 100755 view/theme/redbasic/tpl/oembed_video.tpl
 delete mode 100755 view/theme/redbasic/tpl/oexchange_xrd.tpl
 delete mode 100755 view/theme/redbasic/tpl/page_display.tpl
 delete mode 100644 view/theme/redbasic/tpl/page_display_empty.tpl
 delete mode 100644 view/theme/redbasic/tpl/pdledit.tpl
 delete mode 100755 view/theme/redbasic/tpl/peoplefind.tpl
 delete mode 100755 view/theme/redbasic/tpl/photo_album.tpl
 delete mode 100755 view/theme/redbasic/tpl/photo_albums.tpl
 delete mode 100755 view/theme/redbasic/tpl/photo_drop.tpl
 delete mode 100755 view/theme/redbasic/tpl/photo_item.tpl
 delete mode 100755 view/theme/redbasic/tpl/photo_top.tpl
 delete mode 100755 view/theme/redbasic/tpl/photo_view.tpl
 delete mode 100755 view/theme/redbasic/tpl/photos_recent.tpl
 delete mode 100755 view/theme/redbasic/tpl/photos_upload.tpl
 delete mode 100755 view/theme/redbasic/tpl/photosajax.tpl
 delete mode 100755 view/theme/redbasic/tpl/poco_entry_xml.tpl
 delete mode 100755 view/theme/redbasic/tpl/poco_xml.tpl
 delete mode 100755 view/theme/redbasic/tpl/poke_content.tpl
 delete mode 100755 view/theme/redbasic/tpl/posted_date_widget.tpl
 delete mode 100644 view/theme/redbasic/tpl/prep.tpl
 delete mode 100644 view/theme/redbasic/tpl/profdef_edit.tpl
 delete mode 100755 view/theme/redbasic/tpl/profed_head.tpl
 delete mode 100755 view/theme/redbasic/tpl/profile_advanced.tpl
 delete mode 100755 view/theme/redbasic/tpl/profile_edit.tpl
 delete mode 100755 view/theme/redbasic/tpl/profile_entry.tpl
 delete mode 100755 view/theme/redbasic/tpl/profile_listing_header.tpl
 delete mode 100755 view/theme/redbasic/tpl/profile_photo.tpl
 delete mode 100644 view/theme/redbasic/tpl/profile_tabs.tpl
 delete mode 100755 view/theme/redbasic/tpl/profile_vcard.tpl
 delete mode 100755 view/theme/redbasic/tpl/profile_vcard_short.tpl
 delete mode 100755 view/theme/redbasic/tpl/prv_message.tpl
 delete mode 100755 view/theme/redbasic/tpl/pwdreset.tpl
 delete mode 100644 view/theme/redbasic/tpl/rating_form.tpl
 delete mode 100644 view/theme/redbasic/tpl/rating_slider.tpl
 delete mode 100644 view/theme/redbasic/tpl/rbmark.tpl
 delete mode 100755 view/theme/redbasic/tpl/register.tpl
 delete mode 100755 view/theme/redbasic/tpl/remote_friends_common.tpl
 delete mode 100644 view/theme/redbasic/tpl/remote_login.tpl
 delete mode 100644 view/theme/redbasic/tpl/removeaccount.tpl
 delete mode 100755 view/theme/redbasic/tpl/removeme.tpl
 delete mode 100755 view/theme/redbasic/tpl/rmagic.tpl
 delete mode 100644 view/theme/redbasic/tpl/safesearch.tpl
 delete mode 100644 view/theme/redbasic/tpl/saved_searches.tpl
 delete mode 100755 view/theme/redbasic/tpl/search_item.tpl
 delete mode 100644 view/theme/redbasic/tpl/searchbox.tpl
 delete mode 100644 view/theme/redbasic/tpl/section_title.tpl
 delete mode 100644 view/theme/redbasic/tpl/select_timezone.tpl
 delete mode 100644 view/theme/redbasic/tpl/sellpage_edit.tpl
 delete mode 100644 view/theme/redbasic/tpl/sellpage_submit.tpl
 delete mode 100644 view/theme/redbasic/tpl/sellpage_view.tpl
 delete mode 100755 view/theme/redbasic/tpl/settings.tpl
 delete mode 100755 view/theme/redbasic/tpl/settings_account.tpl
 delete mode 100755 view/theme/redbasic/tpl/settings_addons.tpl
 delete mode 100755 view/theme/redbasic/tpl/settings_connectors.tpl
 delete mode 100755 view/theme/redbasic/tpl/settings_display.tpl
 delete mode 100755 view/theme/redbasic/tpl/settings_features.tpl
 delete mode 100755 view/theme/redbasic/tpl/settings_nick_set.tpl
 delete mode 100755 view/theme/redbasic/tpl/settings_oauth.tpl
 delete mode 100755 view/theme/redbasic/tpl/settings_oauth_edit.tpl
 delete mode 100644 view/theme/redbasic/tpl/settings_permcats.tpl
 delete mode 100644 view/theme/redbasic/tpl/settings_tokens.tpl
 delete mode 100644 view/theme/redbasic/tpl/sharedwithme.tpl
 delete mode 100644 view/theme/redbasic/tpl/show_thing.tpl
 delete mode 100755 view/theme/redbasic/tpl/siteinfo.tpl
 delete mode 100644 view/theme/redbasic/tpl/sitesearch.tpl
 delete mode 100644 view/theme/redbasic/tpl/sources_edit.tpl
 delete mode 100644 view/theme/redbasic/tpl/sources_list.tpl
 delete mode 100644 view/theme/redbasic/tpl/sources_new.tpl
 delete mode 100755 view/theme/redbasic/tpl/suggest_friends.tpl
 delete mode 100755 view/theme/redbasic/tpl/suggest_page.tpl
 delete mode 100644 view/theme/redbasic/tpl/suggest_widget.tpl
 delete mode 100644 view/theme/redbasic/tpl/thing_edit.tpl
 delete mode 100644 view/theme/redbasic/tpl/thing_input.tpl
 delete mode 100755 view/theme/redbasic/tpl/threaded_conversation.tpl
 delete mode 100755 view/theme/redbasic/tpl/toggle_mobile_footer.tpl
 delete mode 100644 view/theme/redbasic/tpl/uexport.tpl
 delete mode 100644 view/theme/redbasic/tpl/usermenu.tpl
 delete mode 100755 view/theme/redbasic/tpl/viewcontact_template.tpl
 delete mode 100644 view/theme/redbasic/tpl/viewcontactsajax.tpl
 delete mode 100644 view/theme/redbasic/tpl/webpage_export_list.tpl
 delete mode 100644 view/theme/redbasic/tpl/webpage_import.tpl
 delete mode 100644 view/theme/redbasic/tpl/webpagelist.tpl
 delete mode 100644 view/theme/redbasic/tpl/website_portation_tools.tpl
 delete mode 100644 view/theme/redbasic/tpl/wiki.tpl
 delete mode 100644 view/theme/redbasic/tpl/wiki_page_history.tpl
 delete mode 100644 view/theme/redbasic/tpl/wiki_page_list.tpl
 delete mode 100644 view/theme/redbasic/tpl/wikilist.tpl
 delete mode 100644 view/theme/redbasic/tpl/wikilist_widget.tpl
 delete mode 100644 view/theme/redbasic/tpl/write_pages.tpl
 delete mode 100755 view/theme/redbasic/tpl/xchan_vcard.tpl
 delete mode 100644 view/theme/redbasic/tpl/xrd_diaspora.tpl
 delete mode 100755 view/theme/redbasic/tpl/xrd_host.tpl
 delete mode 100755 view/theme/redbasic/tpl/xrd_person.tpl
 delete mode 100644 view/theme/redbasic/tpl/zcard.tpl
 delete mode 100644 view/theme/redbasic/tpl/zcard_embed.tpl
 create mode 100755 view/tpl/404.tpl
 create mode 100755 view/tpl/abook_edit.tpl
 create mode 100644 view/tpl/achievements.tpl
 create mode 100755 view/tpl/acl_selector.tpl
 create mode 100644 view/tpl/admin_account_edit.tpl
 create mode 100755 view/tpl/admin_accounts.tpl
 create mode 100755 view/tpl/admin_aside.tpl
 create mode 100755 view/tpl/admin_channels.tpl
 create mode 100755 view/tpl/admin_hubloc.tpl
 create mode 100755 view/tpl/admin_logs.tpl
 create mode 100755 view/tpl/admin_plugins.tpl
 create mode 100644 view/tpl/admin_plugins_addrepo.tpl
 create mode 100755 view/tpl/admin_plugins_details.tpl
 create mode 100644 view/tpl/admin_profiles.tpl
 create mode 100644 view/tpl/admin_queue.tpl
 create mode 100755 view/tpl/admin_security.tpl
 create mode 100644 view/tpl/admin_settings_features.tpl
 create mode 100755 view/tpl/admin_site.tpl
 create mode 100755 view/tpl/admin_summary.tpl
 create mode 100755 view/tpl/album_edit.tpl
 create mode 100644 view/tpl/alt_pager.tpl
 create mode 100755 view/tpl/api_config_xml.tpl
 create mode 100755 view/tpl/api_friends_xml.tpl
 create mode 100755 view/tpl/api_ratelimit_xml.tpl
 create mode 100755 view/tpl/api_status_xml.tpl
 create mode 100755 view/tpl/api_test_xml.tpl
 create mode 100755 view/tpl/api_timeline_atom.tpl
 create mode 100755 view/tpl/api_timeline_rss.tpl
 create mode 100755 view/tpl/api_timeline_xml.tpl
 create mode 100755 view/tpl/api_user_xml.tpl
 create mode 100644 view/tpl/app.tpl
 create mode 100644 view/tpl/app_create.tpl
 create mode 100755 view/tpl/atom_feed.tpl
 create mode 100644 view/tpl/attach_edit.tpl
 create mode 100755 view/tpl/birthdays_reminder.tpl
 create mode 100644 view/tpl/blocklist.tpl
 create mode 100644 view/tpl/bookmarkedchats.tpl
 create mode 100755 view/tpl/build_query.tpl
 create mode 100755 view/tpl/categories_widget.tpl
 create mode 100644 view/tpl/cdav_addressbook.tpl
 create mode 100644 view/tpl/cdav_calendar.tpl
 create mode 100644 view/tpl/cdav_widget_addressbook.tpl
 create mode 100644 view/tpl/cdav_widget_calendar.tpl
 create mode 100755 view/tpl/channel.tpl
 create mode 100644 view/tpl/channel_id_select.tpl
 create mode 100755 view/tpl/channel_import.tpl
 create mode 100755 view/tpl/channels.tpl
 create mode 100755 view/tpl/chanview.tpl
 create mode 100644 view/tpl/chat.tpl
 create mode 100644 view/tpl/chatroom_members.tpl
 create mode 100644 view/tpl/chatroom_new.tpl
 create mode 100644 view/tpl/chatroomlist.tpl
 create mode 100644 view/tpl/chatrooms.tpl
 create mode 100644 view/tpl/cloud.tpl
 create mode 100644 view/tpl/cloud_actionspanel.tpl
 create mode 100644 view/tpl/cloud_directory.tpl
 create mode 100644 view/tpl/cloud_header.tpl
 create mode 100755 view/tpl/comment_item.tpl
 create mode 100755 view/tpl/common_friends.tpl
 create mode 100755 view/tpl/common_tabs.tpl
 create mode 100755 view/tpl/connection_template.tpl
 create mode 100755 view/tpl/connections.tpl
 create mode 100755 view/tpl/contact_block.tpl
 create mode 100755 view/tpl/contact_head.tpl
 create mode 100755 view/tpl/contact_slider.tpl
 create mode 100755 view/tpl/contact_template.tpl
 create mode 100644 view/tpl/contactsajax.tpl
 create mode 100755 view/tpl/conv.tpl
 create mode 100755 view/tpl/conv_frame.tpl
 create mode 100755 view/tpl/conv_item.tpl
 create mode 100755 view/tpl/conv_list.tpl
 create mode 100755 view/tpl/conversation.tpl
 create mode 100755 view/tpl/convobj.tpl
 create mode 100755 view/tpl/cover_photo.tpl
 create mode 100755 view/tpl/cover_photo_widget.tpl
 create mode 100755 view/tpl/cropbody.tpl
 create mode 100755 view/tpl/cropcover.tpl
 create mode 100755 view/tpl/crophead.tpl
 create mode 100755 view/tpl/delegate.tpl
 create mode 100644 view/tpl/design_tools.tpl
 create mode 100644 view/tpl/diaspora_vcard.tpl
 create mode 100644 view/tpl/dir_sort_links.tpl
 create mode 100644 view/tpl/directajax.tpl
 create mode 100755 view/tpl/directory_header.tpl
 create mode 100755 view/tpl/direntry.tpl
 create mode 100755 view/tpl/display-head.tpl
 create mode 100644 view/tpl/dreport.tpl
 create mode 100755 view/tpl/edpost_head.tpl
 create mode 100755 view/tpl/email_notify_html.tpl
 create mode 100755 view/tpl/email_notify_text.tpl
 create mode 100755 view/tpl/event.tpl
 create mode 100755 view/tpl/event_cal.tpl
 create mode 100755 view/tpl/event_form.tpl
 create mode 100755 view/tpl/event_head.tpl
 create mode 100644 view/tpl/event_item_content.tpl
 create mode 100755 view/tpl/event_item_header.tpl
 create mode 100755 view/tpl/events-js.tpl
 create mode 100755 view/tpl/events_cal-js.tpl
 create mode 100755 view/tpl/events_menu_side.tpl
 create mode 100755 view/tpl/events_reminder.tpl
 create mode 100755 view/tpl/events_tools_side.tpl
 create mode 100755 view/tpl/failed_updates.tpl
 create mode 100755 view/tpl/field.tpl
 create mode 100755 view/tpl/field_acheckbox.tpl
 create mode 100755 view/tpl/field_checkbox.tpl
 create mode 100644 view/tpl/field_colorinput.tpl
 create mode 100755 view/tpl/field_combobox.tpl
 create mode 100755 view/tpl/field_custom.tpl
 create mode 100755 view/tpl/field_input.tpl
 create mode 100755 view/tpl/field_intcheckbox.tpl
 create mode 100755 view/tpl/field_password.tpl
 create mode 100755 view/tpl/field_radio.tpl
 create mode 100755 view/tpl/field_richtext.tpl
 create mode 100755 view/tpl/field_select.tpl
 create mode 100644 view/tpl/field_select_disabled.tpl
 create mode 100644 view/tpl/field_select_grouped.tpl
 create mode 100755 view/tpl/field_select_raw.tpl
 create mode 100755 view/tpl/field_textarea.tpl
 create mode 100755 view/tpl/field_themeselect.tpl
 create mode 100755 view/tpl/field_yesno.tpl
 create mode 100755 view/tpl/fileas_widget.tpl
 create mode 100755 view/tpl/filebrowser.tpl
 create mode 100755 view/tpl/filer_dialog.tpl
 create mode 100755 view/tpl/follow.tpl
 create mode 100644 view/tpl/force_image_reload.tpl
 create mode 100644 view/tpl/generic_addon_settings.tpl
 create mode 100755 view/tpl/generic_links_widget.tpl
 create mode 100644 view/tpl/generic_modal.tpl
 create mode 100755 view/tpl/group_drop.tpl
 create mode 100755 view/tpl/group_edit.tpl
 create mode 100755 view/tpl/group_selection.tpl
 create mode 100755 view/tpl/group_side.tpl
 create mode 100755 view/tpl/groupeditor.tpl
 create mode 100644 view/tpl/hdr.tpl
 create mode 100755 view/tpl/head.tpl
 create mode 100644 view/tpl/help.tpl
 create mode 100755 view/tpl/install.tpl
 create mode 100755 view/tpl/install_checks.tpl
 create mode 100755 view/tpl/install_db.tpl
 create mode 100755 view/tpl/install_settings.tpl
 create mode 100755 view/tpl/invite.tpl
 create mode 100644 view/tpl/item_attach.tpl
 create mode 100644 view/tpl/item_binary.tpl
 create mode 100644 view/tpl/item_categories.tpl
 create mode 100644 view/tpl/item_filer.tpl
 create mode 100755 view/tpl/item_import.tpl
 create mode 100755 view/tpl/jot-header.tpl
 create mode 100755 view/tpl/jot.tpl
 create mode 100755 view/tpl/jot_geotag.tpl
 create mode 100755 view/tpl/js_strings.tpl
 create mode 100755 view/tpl/lang_selector.tpl
 create mode 100644 view/tpl/layoutlist.tpl
 create mode 100755 view/tpl/like_noshare.tpl
 create mode 100644 view/tpl/locmanage.tpl
 create mode 100755 view/tpl/login.tpl
 create mode 100755 view/tpl/logout.tpl
 create mode 100755 view/tpl/lostpass.tpl
 create mode 100755 view/tpl/mail_conv.tpl
 create mode 100755 view/tpl/mail_display.tpl
 create mode 100755 view/tpl/mail_head.tpl
 create mode 100755 view/tpl/mail_list.tpl
 create mode 100755 view/tpl/main_slider.tpl
 create mode 100755 view/tpl/match.tpl
 create mode 100644 view/tpl/menuedit.tpl
 create mode 100644 view/tpl/menulist.tpl
 create mode 100755 view/tpl/message_side.tpl
 create mode 100755 view/tpl/micropro_img.tpl
 create mode 100755 view/tpl/micropro_txt.tpl
 create mode 100644 view/tpl/mitemedit.tpl
 create mode 100644 view/tpl/mitemlist.tpl
 create mode 100755 view/tpl/mood_content.tpl
 create mode 100755 view/tpl/msg-header.tpl
 create mode 100755 view/tpl/myapps.tpl
 create mode 100755 view/tpl/nav.tpl
 create mode 100644 view/tpl/nav_login.tpl
 create mode 100755 view/tpl/new_channel.tpl
 create mode 100644 view/tpl/notes.tpl
 create mode 100755 view/tpl/notifications.tpl
 create mode 100755 view/tpl/notify.tpl
 create mode 100644 view/tpl/nwiki_page_history.tpl
 create mode 100755 view/tpl/oauth_authorize.tpl
 create mode 100755 view/tpl/oauth_authorize_done.tpl
 create mode 100755 view/tpl/oembed_video.tpl
 create mode 100755 view/tpl/oexchange_xrd.tpl
 create mode 100755 view/tpl/page_display.tpl
 create mode 100644 view/tpl/page_display_empty.tpl
 create mode 100644 view/tpl/pdledit.tpl
 create mode 100755 view/tpl/peoplefind.tpl
 create mode 100755 view/tpl/photo_album.tpl
 create mode 100755 view/tpl/photo_albums.tpl
 create mode 100755 view/tpl/photo_drop.tpl
 create mode 100755 view/tpl/photo_item.tpl
 create mode 100755 view/tpl/photo_top.tpl
 create mode 100755 view/tpl/photo_view.tpl
 create mode 100755 view/tpl/photos_recent.tpl
 create mode 100755 view/tpl/photos_upload.tpl
 create mode 100755 view/tpl/photosajax.tpl
 create mode 100755 view/tpl/poco_entry_xml.tpl
 create mode 100755 view/tpl/poco_xml.tpl
 create mode 100755 view/tpl/poke_content.tpl
 create mode 100755 view/tpl/posted_date_widget.tpl
 create mode 100644 view/tpl/prep.tpl
 create mode 100644 view/tpl/profdef_edit.tpl
 create mode 100755 view/tpl/profed_head.tpl
 create mode 100755 view/tpl/profile_advanced.tpl
 create mode 100755 view/tpl/profile_edit.tpl
 create mode 100755 view/tpl/profile_entry.tpl
 create mode 100755 view/tpl/profile_listing_header.tpl
 create mode 100755 view/tpl/profile_photo.tpl
 create mode 100644 view/tpl/profile_tabs.tpl
 create mode 100755 view/tpl/profile_vcard.tpl
 create mode 100755 view/tpl/profile_vcard_short.tpl
 create mode 100755 view/tpl/prv_message.tpl
 create mode 100755 view/tpl/pwdreset.tpl
 create mode 100644 view/tpl/rating_form.tpl
 create mode 100644 view/tpl/rating_slider.tpl
 create mode 100644 view/tpl/rbmark.tpl
 create mode 100755 view/tpl/register.tpl
 create mode 100755 view/tpl/remote_friends_common.tpl
 create mode 100644 view/tpl/remote_login.tpl
 create mode 100644 view/tpl/removeaccount.tpl
 create mode 100755 view/tpl/removeme.tpl
 create mode 100755 view/tpl/rmagic.tpl
 create mode 100644 view/tpl/safesearch.tpl
 create mode 100644 view/tpl/saved_searches.tpl
 create mode 100755 view/tpl/search_item.tpl
 create mode 100644 view/tpl/searchbox.tpl
 create mode 100644 view/tpl/section_title.tpl
 create mode 100644 view/tpl/select_timezone.tpl
 create mode 100644 view/tpl/sellpage_edit.tpl
 create mode 100644 view/tpl/sellpage_submit.tpl
 create mode 100644 view/tpl/sellpage_view.tpl
 create mode 100755 view/tpl/settings.tpl
 create mode 100755 view/tpl/settings_account.tpl
 create mode 100755 view/tpl/settings_addons.tpl
 create mode 100755 view/tpl/settings_connectors.tpl
 create mode 100755 view/tpl/settings_display.tpl
 create mode 100755 view/tpl/settings_features.tpl
 create mode 100755 view/tpl/settings_nick_set.tpl
 create mode 100755 view/tpl/settings_oauth.tpl
 create mode 100755 view/tpl/settings_oauth_edit.tpl
 create mode 100644 view/tpl/settings_permcats.tpl
 create mode 100644 view/tpl/settings_tokens.tpl
 create mode 100644 view/tpl/sharedwithme.tpl
 create mode 100644 view/tpl/show_thing.tpl
 create mode 100755 view/tpl/siteinfo.tpl
 create mode 100644 view/tpl/sitesearch.tpl
 create mode 100644 view/tpl/sources_edit.tpl
 create mode 100644 view/tpl/sources_list.tpl
 create mode 100644 view/tpl/sources_new.tpl
 create mode 100755 view/tpl/suggest_friends.tpl
 create mode 100755 view/tpl/suggest_page.tpl
 create mode 100644 view/tpl/suggest_widget.tpl
 create mode 100644 view/tpl/thing_edit.tpl
 create mode 100644 view/tpl/thing_input.tpl
 create mode 100755 view/tpl/threaded_conversation.tpl
 create mode 100755 view/tpl/toggle_mobile_footer.tpl
 create mode 100644 view/tpl/uexport.tpl
 create mode 100644 view/tpl/usermenu.tpl
 create mode 100755 view/tpl/viewcontact_template.tpl
 create mode 100644 view/tpl/viewcontactsajax.tpl
 create mode 100644 view/tpl/webpage_export_list.tpl
 create mode 100644 view/tpl/webpage_import.tpl
 create mode 100644 view/tpl/webpagelist.tpl
 create mode 100644 view/tpl/website_portation_tools.tpl
 create mode 100644 view/tpl/wiki.tpl
 create mode 100644 view/tpl/wiki_page_history.tpl
 create mode 100644 view/tpl/wiki_page_list.tpl
 create mode 100644 view/tpl/wikilist.tpl
 create mode 100644 view/tpl/wikilist_widget.tpl
 create mode 100644 view/tpl/write_pages.tpl
 create mode 100755 view/tpl/xchan_vcard.tpl
 create mode 100644 view/tpl/xrd_diaspora.tpl
 create mode 100755 view/tpl/xrd_host.tpl
 create mode 100755 view/tpl/xrd_person.tpl
 create mode 100644 view/tpl/zcard.tpl
 create mode 100644 view/tpl/zcard_embed.tpl

(limited to 'view')

diff --git a/view/theme/redbasic/tpl/404.tpl b/view/theme/redbasic/tpl/404.tpl
deleted file mode 100755
index c9b51a63b..000000000
--- a/view/theme/redbasic/tpl/404.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$message}}</h1>
-</div>
diff --git a/view/theme/redbasic/tpl/abook_edit.tpl b/view/theme/redbasic/tpl/abook_edit.tpl
deleted file mode 100755
index 9fb5c4b18..000000000
--- a/view/theme/redbasic/tpl/abook_edit.tpl
+++ /dev/null
@@ -1,519 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $notself}}
-		<div class="pull-right">
-			<div class="btn-group">
-				<button id="connection-dropdown" class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
-				</button>
-				<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
-					<a class="dropdown-item" href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a>
-					<a class="dropdown-item" href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a>
-					{{if $tools.fetchvc}}
-					<a class="dropdown-item" href="{{$tools.fetchvc.url}}" title="{{$tools.fetchvc.title}}">{{$tools.fetchvc.label}}</a>
-					{{/if}}
-					<a class="dropdown-item" href="#" title="{{$tools.refresh.title}}" onclick="window.location.href='{{$tools.refresh.url}}'; return false;">{{$tools.refresh.label}}</a>
-					<a class="dropdown-item" href="#" title="{{$tools.rephoto.title}}" onclick="window.location.href='{{$tools.rephoto.url}}'; return false;">{{$tools.rephoto.label}}</a>
-					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="#" title="{{$tools.block.title}}" onclick="window.location.href='{{$tools.block.url}}'; return false;">{{$tools.block.label}}</a>
-					<a class="dropdown-item" href="#" title="{{$tools.ignore.title}}" onclick="window.location.href='{{$tools.ignore.url}}'; return false;">{{$tools.ignore.label}}</a>
-					<a class="dropdown-item" href="#" title="{{$tools.archive.title}}" onclick="window.location.href='{{$tools.archive.url}}'; return false;">{{$tools.archive.label}}</a>					<a class="dropdown-item" href="#" title="{{$tools.hide.title}}" onclick="window.location.href='{{$tools.hide.url}}'; return false;">{{$tools.hide.label}}</a>
-					<a class="dropdown-item" href="#" title="{{$tools.delete.title}}" onclick="window.location.href='{{$tools.delete.url}}'; return false;">{{$tools.delete.label}}</a>
-				</div>
-			</div>
-			{{if $abook_prev || $abook_next}}
-			<div class="btn-group">
-				<a href="connedit/{{$abook_prev}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a>
-				<div class="btn-group" >
-					<button class="btn btn-outline-secondary btn-sm{{if $is_pending}} disabled{{/if}}" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button>
-					<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
-						{{foreach $sections as $s}}
-						<a class="dropdown-item" href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a>
-						{{/foreach}}
-					</div>
-				</div>
-				<a href="connedit/{{$abook_next}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_next}} disabled{{/if}}" ><i class="fa fa-forward"></i></a>
-			</div>
-			{{/if}}
-		</div>
-		{{/if}}
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper-np">
-		{{if $notself}}
-		{{foreach $tools as $tool}}
-		{{if $tool.info}}
-		<div class="section-content-danger-wrapper">
-			<div>
-				{{$tool.info}}
-			</div>
-		</div>
-		{{/if}}
-		{{/foreach}}
-		<div class="section-content-info-wrapper">
-			<div>
-				{{$addr_text}} <strong>'{{$addr}}'</strong>			
-			</div>
-			{{if $locstr}}
-			<div>
-				{{$loc_text}} {{$locstr}}
-			</div>
-			{{/if}}
-			{{if $last_update}}
-			<div>
-				{{$lastupdtext}} {{$last_update}}
-			</div>
-			{{/if}}
-		</div>
-		{{/if}}
-
-		<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
-
-		<input type="hidden" name="contact_id" value="{{$contact_id}}">
-		<input type="hidden" name="section" value="{{$section}}">
-
-		<div class="panel-group" id="contact-edit-tools" role="tablist" aria-multiselectable="true">
-			{{if $notself}}
-
-			{{if $is_pending}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="pending-tool">
-					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse">
-							{{$pending_label}}
-						</a>
-					</h3>
-				</div>
-				<div id="pending-tool-collapse" class="panel-collapse collapse show" role="tabpanel" aria-labelledby="pending-tool">
-					<div class="section-content-tools-wrapper">
-						{{include file="field_checkbox.tpl" field=$unapproved}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{/if}}
-			{{if ! $is_pending}}
-			<div id="template-form-vcard-org" class="form-group form-vcard-org">
-				<div class="form-group form-vcard-org">
-					<input type="text" name="org" value="" placeholder="{{$org_label}}">
-					<i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				</div>
-			</div>
-
-			<div id="template-form-vcard-title" class="form-group form-vcard-title">
-				<div class="form-group form-vcard-title">
-					<input type="text" name="title" value="" placeholder="{{$title_label}}">
-					<i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				</div>
-			</div>
-
-			<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
-				<select name="tel_type[]">
-					<option value="CELL">{{$mobile}}</option>
-					<option value="HOME">{{$home}}</option>
-					<option value="WORK">{{$work}}</option>
-					<option value="OTHER">{{$other}}</option>
-				</select>
-				<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
-				<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-			</div>
-
-			<div id="template-form-vcard-email" class="form-group form-vcard-email">
-				<select name="email_type[]">
-					<option value="HOME">{{$home}}</option>
-					<option value="WORK">{{$work}}</option>
-					<option value="OTHER">{{$other}}</option>
-				</select>
-				<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
-				<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-			</div>
-
-			<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
-				<select name="impp_type[]">
-					<option value="HOME">{{$home}}</option>
-					<option value="WORK">{{$work}}</option>
-					<option value="OTHER">{{$other}}</option>
-				</select>
-				<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
-				<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-			</div>
-
-			<div id="template-form-vcard-url" class="form-group form-vcard-url">
-				<select name="url_type[]">
-					<option value="HOME">{{$home}}</option>
-					<option value="WORK">{{$work}}</option>
-					<option value="OTHER">{{$other}}</option>
-				</select>
-				<input type="text" name="url[]" value="" placeholder="{{$url_label}}">
-				<i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-			</div>
-
-			<div id="template-form-vcard-adr" class="form-group form-vcard-adr">
-				<div class="form-group">
-					<select name="adr_type[]">
-						<option value="HOME">{{$home}}</option>
-						<option value="WORK">{{$work}}</option>
-						<option value="OTHER">{{$other}}</option>
-					</select>
-					<label>{{$adr_label}}</label>
-					<i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$po_box}}">
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$extra}}">
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$street}}">
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$locality}}">
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$region}}">
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$zip_code}}">
-				</div>
-				<div class="form-group">
-					<input type="text" name="" value="" placeholder="{{$country}}">
-				</div>
-			</div>
-
-			<div id="template-form-vcard-note" class="form-group form-vcard-note">
-				<label>{{$note_label}}</label>
-				<i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				<textarea name="note" class="form-control"></textarea>
-			</div>
-
-			<div class="section-content-wrapper-np">
-				<div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
-				<div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field">
-					<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
-					<ul class="dropdown-menu">
-						<li class="add-vcard-org"{{if $vcard.org}} style="display: none"{{/if}}><a href="#" data-add="vcard-org" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$org_label}}</a></li>
-						<li class="add-vcard-title"{{if $vcard.title}} style="display: none"{{/if}}><a href="#" data-add="vcard-title" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$title_label}}</a></li>
-						<li class="add-vcard-tel"><a href="#" data-add="vcard-tel" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$tel_label}}</a></li>
-						<li class="add-vcard-email"><a href="#" data-add="vcard-email" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$email_label}}</a></li>
-						<li class="add-vcard-impp"><a href="#" data-add="vcard-impp" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$impp_label}}</a></li>
-						<li class="add-vcard-url"><a href="#" data-add="vcard-url" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$url_label}}</a></li>
-						<li class="add-vcard-adr"><a href="#" data-add="vcard-adr" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$adr_label}}</a></li>
-						<li class="add-vcard-note"{{if $vcard.note}} style="display: none"{{/if}}><a href="#" data-add="vcard-note" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$note_label}}</a></li>
-					</ul>
-				</div>
-				<div id="vcard-header-{{$vcard.id}}" class="vcard-header" data-id="{{$vcard.id}}" data-action="open">
-					<i class="vcard-fn-preview fa fa-address-card-o"></i>
-					<span id="vcard-preview-{{$vcard.id}}" class="vcard-preview">
-						{{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}}
-						{{if $vcard.emails.0.address}}<span class="vcard-email-preview d-none d-md-table-cell"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}}
-						{{if $vcard.tels.0}}<span class="vcard-tel-preview d-none d-md-table-cell">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}}
-					</span>
-					<input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}">
-				</div>
-			</div>
-			<div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper">
-
-				<div class="vcard-org form-group">
-					<div class="form-vcard-org-wrapper">
-						{{if $vcard.org}}
-						<div class="form-group form-vcard-org">
-							<input type="text" name="org" value="{{$vcard.org}}" size="{{$vcard.org|count_characters:true}}" placeholder="{{$org_label}}">
-							<i data-remove="vcard-org" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						{{/if}}
-					</div>
-				</div>
-
-				<div class="vcard-title form-group">
-					<div class="form-vcard-title-wrapper">
-						{{if $vcard.title}}
-						<div class="form-group form-vcard-title">
-							<input type="text" name="title" value="{{$vcard.title}}" size="{{$vcard.title|count_characters:true}}" placeholder="{{$title_label}}">
-							<i data-remove="vcard-title" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						{{/if}}
-					</div>
-				</div>
-
-
-				<div class="vcard-tel form-group">
-					<div class="form-vcard-tel-wrapper">
-						{{if $vcard.tels}}
-						{{foreach $vcard.tels as $tel}}
-						<div class="form-group form-vcard-tel">
-							<select name="tel_type[]">
-								<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
-								<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
-								<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-								<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-								<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-							</select>
-							<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
-							<i data-remove="vcard-tel" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-
-
-				<div class="vcard-email form-group">
-					<div class="form-vcard-email-wrapper">
-						{{if $vcard.emails}}
-						{{foreach $vcard.emails as $email}}
-						<div class="form-group form-vcard-email">
-							<select name="email_type[]">
-								<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
-								<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-								<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-								<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-							</select>
-							<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
-							<i data-remove="vcard-email" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-
-				<div class="vcard-impp form-group">
-					<div class="form-vcard-impp-wrapper">
-						{{if $vcard.impps}}
-						{{foreach $vcard.impps as $impp}}
-						<div class="form-group form-vcard-impp">
-							<select name="impp_type[]">
-								<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
-								<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-								<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-								<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-							</select>
-							<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
-							<i data-remove="vcard-impp" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-
-				<div class="vcard-url form-group">
-					<div class="form-vcard-url-wrapper">
-						{{if $vcard.urls}}
-						{{foreach $vcard.urls as $url}}
-						<div class="form-group form-vcard-url">
-							<select name="url_type[]">
-								<option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option>
-								<option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-								<option value="WORK"{{if $url.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-								<option value="OTHER"{{if $url.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-							</select>
-							<input type="text" name="url[]" value="{{$url.address}}" size="{{$url.address|count_characters:true}}" placeholder="{{$url_label}}">
-							<i data-remove="vcard-url" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-
-				<div class="vcard-adr form-group">
-					<div class="form-vcard-adr-wrapper">
-						{{if $vcard.adrs}}
-						{{foreach $vcard.adrs as $adr}}
-						<div class="form-group form-vcard-adr">
-							<div class="form-group">
-								<label>{{$adr_label}}</label>
-								<select name="adr_type[]">
-									<option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option>
-									<option value="HOME"{{if $adr.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-									<option value="WORK"{{if $adr.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-									<option value="OTHER"{{if $adr.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-								</select>
-								<i data-remove="vcard-adr" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}">
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}">
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}">
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}">
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}">
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}">
-							</div>
-							<div class="form-group">
-								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}">
-							</div>
-						</div>
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-
-				<div class="vcard-note form-group form-vcard-note">
-					<div class="form-vcard-note-wrapper">
-						{{if $vcard.note}}
-						<label>{{$note_label}}</label>
-						<i data-remove="vcard-note" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						<textarea name="note" class="form-control">{{$vcard.note}}</textarea>
-						{{/if}}
-					</div>
-				</div>
-
-
-				<div class="settings-submit-wrapper" >
-					<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-				</div>
-
-			</div>
-			{{/if}}
-
-			{{if $affinity}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="affinity-tool">
-					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#affinity-tool-collapse" aria-expanded="true" aria-controls="affinity-tool-collapse">
-							{{$affinity}}
-						</a>
-					</h3>
-				</div>
-				<div id="affinity-tool-collapse" class="panel-collapse collapse{{if $section == 'affinity'}} show{{/if}}" role="tabpanel" aria-labelledby="affinity-tool">
-					<div class="section-content-tools-wrapper">
-						{{if $slide}}
-						<div class="form-group"><strong>{{$lbl_slider}}</strong></div>
-						{{$slide}}
-						<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
-						{{/if}}
-
-						{{if $multiprofs}}
-						<div class="form-group">
-							<strong>{{$lbl_vis2}}</strong>
-							{{$profile_select}}
-						</div>
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{/if}}
-
-			{{if $connfilter}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="fitert-tool">
-					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#fitert-tool-collapse" aria-expanded="true" aria-controls="fitert-tool-collapse">
-							{{$connfilter_label}}
-						</a>
-					</h3>
-				</div>
-				<div id="fitert-tool-collapse" class="panel-collapse collapse{{if $section == 'filter' }} show{{/if}}" role="tabpanel" aria-labelledby="fitert-tool">
-					<div class="section-content-tools-wrapper">
-						{{include file="field_textarea.tpl" field=$incl}}
-						{{include file="field_textarea.tpl" field=$excl}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{else}}
-			<input type="hidden" name="{{$incl.0}}" value="{{$incl.2}}" />
-			<input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" />
-			{{/if}}
-
-			{{if $rating}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="rating-tool">
-					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#rating-tool-collapse" aria-expanded="true" aria-controls="rating-tool-collapse">
-							{{$lbl_rating}}
-						</a>
-					</h3>
-				</div>
-				<div id="rating-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="rating-tool">
-					<div class="section-content-tools-wrapper">
-						<div class="section-content-warning-wrapper">
-							{{$rating_info}}
-						</div>
-						<div class="form-group"><strong>{{$lbl_rating_label}}</strong></div>
-						{{$rating}}
-						{{include file="field_textarea.tpl" field=$rating_text}}
-						<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{/if}}
-
-			{{/if}}
-
-			{{if ! $is_pending}}
-			<div class="panel">
-				{{if $notself}}
-				<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
-					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
-							{{$permlbl}}
-						</a>
-					</h3>
-				</div>
-				{{/if}}
-				<div id="perms-tool-collapse" class="panel-collapse collapse{{if $self || $section === 'perms'}} show{{/if}}" role="tabpanel" aria-labelledby="perms-tool">
-					<div class="section-content-tools-wrapper">
-						<div class="section-content-warning-wrapper">
-						{{if $notself}}{{$permnote}}{{/if}}
-						{{if $self}}{{$permnote_self}}{{/if}}
-						</div>
-
-						{{if $permcat_enable}}
-						<div class="loading-role-rotator"></div>
-						<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
-						{{include file="field_select.tpl" field=$permcat}}
-						{{/if}}
-
-						<table id="perms-tool-table" class=form-group>
-							<tr>
-								<td></td>
-								{{if $notself}}
-								<td class="abook-them">{{$them}}</td>
-								{{/if}}
-								<td colspan="2" class="abook-me">{{$me}}</td>
-							</tr>
-							{{foreach $perms as $prm}}
-							{{include file="field_acheckbox.tpl" field=$prm}}
-							{{/foreach}}
-						</table>
-
-						{{if $self}}
-						<div>
-							<div class="section-content-info-wrapper">
-								{{$autolbl}}
-							</div>
-							{{include file="field_checkbox.tpl" field=$autoperms}}
-						</div>
-						{{/if}}
-
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{/if}}
-		</div>
-		</form>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/achievements.tpl b/view/theme/redbasic/tpl/achievements.tpl
deleted file mode 100644
index 7d503cc53..000000000
--- a/view/theme/redbasic/tpl/achievements.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="generic-content-wrapper">
-<p>{{$newmembertext}}</p>
-
-{{if $profilebadge}}<div id="profile-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
-{{if $contactbadge}}<div id="contact-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
-{{if $keywordsbadge}}<div id="keywords-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
-{{if $channelsbadge}}<div id="channels-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
-
-</div>
diff --git a/view/theme/redbasic/tpl/acl_selector.tpl b/view/theme/redbasic/tpl/acl_selector.tpl
deleted file mode 100755
index f4f851c8a..000000000
--- a/view/theme/redbasic/tpl/acl_selector.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<form>
-<div class="modal" id="aclModal">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title">
-					<i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}
-					{{if $helpUrl}}
-					<a target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-fw fa-question"></i></a>
-					{{/if}}
-				</h4>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-			</div>
-			<div class="section-content-wrapper">
-				{{if $aclModalDesc}}
-				<div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div>
-				{{/if}}
-				<label for="acl-select">{{$select_label}}</label>
-				<select id="acl-select" name="optionsRadios" class="form-control form-group">
-					<option id="acl-showall" value="public" {{$public_selected}}>{{$showall}}</option>
-					{{$groups}}
-					<option id="acl-onlyme" value="onlyme" {{$justme_selected}}>{{$onlyme}}</option>
-					<option id="acl-custom" value="custom" {{$custom_selected}}>{{$custom}}</option>
-				</select>
-
-				{{if $showallOrigin}}
-				<div id="acl-info" class="form-group">
-					<i class="fa fa-info-circle"></i>&nbsp;{{$showallOrigin}}
-				</div>
-				{{/if}}
-
-				<div id="acl-wrapper">
-					<div id="acl-list">
-						<input class="form-control" type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
-						<small class="text-muted">{{$showlimitedDesc}}</small>
-						<div id="acl-list-content"></div>
-					</div>
-				</div>
-
-				<div class="acl-list-item" rel="acl-template" style="display:none">
-					<div class="acl-item-header">
-						<img class="menu-img-1" data-src="{0}"> {1}
-					</div>
-					<button class="acl-button-hide btn btn-sm btn-outline-danger"><i class="fa fa-times"></i> {{$hide}}</button>
-					<button class="acl-button-show btn btn-sm btn-outline-success"><i class="fa fa-check"></i> {{$show}}</button>
-				</div>
-			</div>
-			<div class="modal-footer clear">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$aclModalDismiss}}</button>
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-</form>
-<script>
-	// compatibility issue with bootstrap v4
-	//$('[data-toggle="popover"]').popover(); // Init the popover, if present
-
-	if(typeof acl=="undefined"){
-		acl = new ACL(
-			baseurl+"/acl"
-		);
-	}
-</script>
diff --git a/view/theme/redbasic/tpl/admin_account_edit.tpl b/view/theme/redbasic/tpl/admin_account_edit.tpl
deleted file mode 100644
index 82d137de4..000000000
--- a/view/theme/redbasic/tpl/admin_account_edit.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<h2>{{$title}}</h2>
-
-<h3>{{$account.account_email}}</h3>
-
-
-<form action="admin/account_edit/{{$account.account_id}}" method="post" >
-<input type="hidden" name="aid" value="{{$account.account_id}}" />
-
-{{include file="field_password.tpl" field=$pass1}}
-{{include file="field_password.tpl" field=$pass2}}
-
-{{if $z_server_role == 'pro'}}
-{{include file="field_select.tpl" field=$account_level}}
-{{else}}
-<input type="hidden" name="account_level" value="{{$account_level.2}}" />
-{{/if}}
-{{include file="field_select.tpl" field=$account_language}}
-{{include file="field_input.tpl" field=$service_class}}
-
-
-<input type="submit" name="submit" value="{{$submit}}" />
-
-</form>
diff --git a/view/theme/redbasic/tpl/admin_accounts.tpl b/view/theme/redbasic/tpl/admin_accounts.tpl
deleted file mode 100755
index 3535363a0..000000000
--- a/view/theme/redbasic/tpl/admin_accounts.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("{{$confirm_delete_multi}}");
-	}
-	function toggle_selectall(cls){
-		$("."+cls).prop("checked", !$("."+cls).prop("checked"));
-		return false;
-	}
-</script>
-<div class="generic-content-wrapper-styled" id="adminpage">
-	<h1>{{$title}} - {{$page}}</h1>
-
-	<form action="{{$baseurl}}/admin/accounts" method="post">
-		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-
-		<h3>{{$h_pending}}</h3>
-		{{if $pending}}
-			<table id="pending">
-				<thead>
-				<tr>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{foreach $pending as $u}}
-				<tr>
-					<td class="created">{{$u.account_created}}</td>
-					<td class="email">{{$u.account_email}}</td>
-					<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
-					</td>
-				</tr>
-			{{/foreach}}
-				</tbody>
-			</table>
-			<div class="selectall"><a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"> <input type="submit" name="page_users_approve" value="{{$approve}}"></div>
-		{{else}}
-			<p>{{$no_pending}}</p>
-		{{/if}}
-
-
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id="users">
-				<thead>
-				<tr>
-					{{foreach $th_users as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td class="account_id">{{$u.account_id}}</td>
-						<td class="email">{{if $u.blocked}}
-							<a href="admin/account_edit/{{$u.account_id}}"><i>{{$u.account_email}}</i></a>
-						{{else}}
-							<a href="admin/account_edit/{{$u.account_id}}"><strong>{{$u.account_email}}</strong></a>
-						{{/if}}</td>
-						<td class="channels">{{$u.channels}}</td>
-						<td class="register_date">{{$u.account_created}}</td>
-						<td class="login_date">{{$u.account_lastlog}}</td>
-						<td class="account_expires">{{$u.account_expires}}</td>
-						<td class="service_class">{{$u.account_service_class}}</td>
-						<td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
-						<td class="tools">
-							<a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}"  class="btn btn-outline-secondary btn-sm" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div>
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-</div>
diff --git a/view/theme/redbasic/tpl/admin_aside.tpl b/view/theme/redbasic/tpl/admin_aside.tpl
deleted file mode 100755
index 99f139e57..000000000
--- a/view/theme/redbasic/tpl/admin_aside.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<script>
-	// update pending count //
-	$(function(){
-
-		$("nav").bind('nav-update',  function(e,data){
-			var elm = $('#pending-update');
-			var register = $(data).find('register').text();
-			if (register=="0") { register=""; elm.hide();} else { elm.show(); }
-			elm.html(register);
-		});
-	});
-</script>
-<div class="widget">
-<h3>{{$admtxt}}</h3>
-<ul class="nav nav-pills flex-column">
-	{{foreach $admin as $link}}
-	<li class="nav-item"><a class="nav-link" href='{{$link.0}}'>{{$link.1}}{{if $link.3}}<span id='{{$link.3}}' title='{{$link.4}}'></span>{{/if}}</a></li>
-	{{/foreach}}
-</ul>
-</div>
-
-{{if $admin.update}}
-<ul class="nav nav-pills flex-column">
-	<li class="nav-item"><a class="nav-link" href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
-	<li class="nav-item"><a class="nav-link" href=''>Important Changes</a></li>
-</ul>
-{{/if}}
-
-
-{{if $plugins}}
-<div class="widget">
-<h3>{{$plugadmtxt}}</h3>
-<ul class="nav nav-pills flex-column">
-	{{foreach $plugins as $l}}
-	<li class="nav-item"><a class="nav-link" href='{{$l.0}}'>{{$l.1}}</a></li>
-	{{/foreach}}
-</ul>
-</div>
-{{/if}}
-	
-<div class="widget">	
-<h3>{{$logtxt}}</h3>
-<ul class="nav nav-pills flex-column">
-	<li class="nav-item"><a class="nav-link" href='{{$logs.0}}'>{{$logs.1}}</a></li>
-</ul>
-</div>
diff --git a/view/theme/redbasic/tpl/admin_channels.tpl b/view/theme/redbasic/tpl/admin_channels.tpl
deleted file mode 100755
index 452e0eeec..000000000
--- a/view/theme/redbasic/tpl/admin_channels.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("{{$confirm_delete_multi}}");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div class = "generic-content-wrapper-styled" id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/channels" method="post">
-        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		
-		<h3>{{$h_channels}}</h3>
-		{{if $channels}}
-			<table id='channels'>
-				<thead>
-				<tr>
-					{{foreach $th_channels as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $channels as $c}}
-					<tr>
-						<td class='channel_id'>{{$c.channel_id}}</td>
-						<td class='channel_name'><a href="channel/{{$c.channel_address}}">{{$c.channel_name}}</a></td>
-						<td class='channel_address'>{{$c.channel_address}}</td>
-						<td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
-						<td class="tools">
-							<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
-							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs{{if ($c.allowcode)}} btn-danger{{/if}}" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
-							<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('channels_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_channels_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_channels_code" value="{{$code}}/{{$uncode}}" /> <input type="submit" name="page_channels_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
-		{{else}}
-			NO CHANNELS?!?
-		{{/if}}
-	</form>
-</div>
diff --git a/view/theme/redbasic/tpl/admin_hubloc.tpl b/view/theme/redbasic/tpl/admin_hubloc.tpl
deleted file mode 100755
index 1bd1f0122..000000000
--- a/view/theme/redbasic/tpl/admin_hubloc.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="generic-content-wrapper-styled" id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-
-	<table id='server'>
-		<thead>
-			<tr>
-			{{foreach $th_hubloc as $th}}<th>{{$th}}</th>{{/foreach}}
-			</tr>
-		</thead>
-		<tbody>
-			
-			{{foreach $hubloc as $hub}}<tr>
-			<td>{{$hub.hubloc_id}}</td><td>{{$hub.hubloc_addr}}</td><td>{{$hub.hubloc_host}}</td><td>{{$hub.hubloc_status}}</td>
-			<td>
-			<form action="{{$baseurl}}/admin/hubloc" method="post">
-			<input type="hidden" name="hublocid" value="{{$hub.hubloc_id}}">
-			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-			<input type='hidden' name='url' value='{{$hub.hubloc_host}}'>
-			<input type="submit" name="check" value="check" >
-			<input type="submit" name="repair" value="repair" ></td>
-			</form>
-			</tr>{{/foreach}}
-		</tbody>
-	</table>
-
-
-</div>
diff --git a/view/theme/redbasic/tpl/admin_logs.tpl b/view/theme/redbasic/tpl/admin_logs.tpl
deleted file mode 100755
index 6d2d7834c..000000000
--- a/view/theme/redbasic/tpl/admin_logs.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="generic-content-wrapper-styled" id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/logs" method="post">
-    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-	{{include file="field_checkbox.tpl" field=$debugging}}
-	{{include file="field_input.tpl" field=$logfile}}
-	{{include file="field_select.tpl" field=$loglevel}}
-	
-	<div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>
-	
-	</form>
-	
-	<h3>{{$logname}}</h3>
-	<div style="width:100%; height:400px; overflow: auto; "><pre>{{$data}}</pre></div>
-<!--	<iframe src='{{$baseurl}}/{{$logname}}' style="width:100%; height:400px"></iframe> -->
-	<!-- <div class="submit"><input type="submit" name="page_logs_clear_log" value="{{$clear}}" /></div> -->
-</div>
diff --git a/view/theme/redbasic/tpl/admin_plugins.tpl b/view/theme/redbasic/tpl/admin_plugins.tpl
deleted file mode 100755
index fd5ae7d5e..000000000
--- a/view/theme/redbasic/tpl/admin_plugins.tpl
+++ /dev/null
@@ -1,190 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $allowManageRepos}}
-		<div class="pull-right">
-			<button class="btn btn-success btn-sm" onclick="openClose('form');">{{$managerepos}}</button>
-		</div>
-		{{/if}}
-		<h2 id="title">{{$title}} - {{$page}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}>
-         
-        <div class="clear"></div>
-        <div class="section-title-wrapper" style="margin-top: 20px;">
-          <h2>{{$installedtitle}}</h2>
-          <div class="clear"></div>
-        </div>
-      <div class="table-responsive section-content-tools-wrapper">
-      <table class="table table-responsive table-striped table-hover">
-        {{foreach $addonrepos as $repo}}
-        <tr>
-            <td style="width: 70%;">
-				<span class="pull-left">{{$repo.name}}</span><span id="update-message-{{$repo.name}}" style="margin-left: 20px;"></span>
-            </td>
-            <td style="width: 15%;">
-              <button class="btn btn-sm btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i>&nbsp;{{$repoUpdateButton}}</button>
-            </td>
-            <td style="width: 15%;">
-              <button class="btn btn-sm btn-danger pull-right" style="margin-left: 10px; margin-right: 0px;" onclick="removeAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-trash-o'></i>&nbsp;{{$repoRemoveButton}}</button>
-            </td>
-        <div class="clear"></div>
-        </td></tr>
-        {{/foreach}}
-        </table>
-      </div>
-      <div class="clear"></div>
-         <div class="section-title-wrapper">
-          <h2>{{$addnewrepotitle}}</h2>
-          <div class="clear"></div>
-        </div>
-		{{$form}}
-    </div>
-      <div class="clear"></div>
-    <div id="chat-rotator-wrapper" class="center-block">
-        <div id="chat-rotator"></div>
-    </div>
-    <div class="clear"></div>
-	<div class="section-content-wrapper-np">
-      {{foreach $plugins as $p}}
-      <div class="section-content-tools-wrapper" id="pluginslist">		
-		<div class="contact-info plugin {{$p.1}}">
-            {{if ! $p.2.disabled}}				
-            <a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><i class='fa {{if $p.1==on}}fa-check-square-o{{else}}fa-square-o{{/if}} admin-icons'></i></a>
-            {{else}}
-            <i class='fa fa-stop admin-icons'></i>
-            {{/if}}
-            <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>{{if $p.2.disabled}} {{$disabled}}{{/if}}
-            {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
-
-            <div class='desc'>{{$p.2.description}}</div>
-		</div>
-	</div>
-    {{/foreach}}
-      
-	</div>
-</div>
-{{$newRepoModal}}
-<script>
-  
-  // TODO: Implement a simple interface controller that reconfigures the modal dialog
-  // for each action in a more organized way
-  
-  function adminPluginsAddRepo() {
-      $("#generic-modal-ok-{{$newRepoModalID}}").removeClass('btn-success');
-      $("#generic-modal-ok-{{$newRepoModalID}}").addClass('btn-primary');
-      var repoURL = $('#id_repoURL').val();
-      var repoName = $('#id_repoName').val();
-      $('#chat-rotator').spin('tiny');
-      $.post(
-        "/admin/plugins/addrepo", {repoURL: repoURL, repoName: repoName}, 
-            function(response) {
-                $('#chat-rotator').spin(false);
-                if (response.success) {
-                  var modalBody = $('#generic-modal-body-{{$newRepoModalID}}');
-                  modalBody.html('<div>'+response.repo.readme+'</div>');
-                  modalBody.append('<h2>Repo Info</h2><p>Message: ' + response.message + '</p>');
-                  modalBody.append('<h4>Branches</h4><p>'+JSON.stringify(response.repo.branches)+'</p>');
-                  modalBody.append('<h4>Remotes</h4><p>'+JSON.stringify(response.repo.remote)+'</p>');
-                  $('.modal-dialog').width('80%');
-                  $("#generic-modal-ok-{{$newRepoModalID}}").off('click');
-                  $("#generic-modal-ok-{{$newRepoModalID}}").click(function () {
-                    installAddonRepo();
-                  });
-                  $('#generic-modal-{{$newRepoModalID}}').modal();
-                } else {
-                    window.console.log('Error adding repo :' + response['message']);
-                }
-                return false;
-            },
-        'json');
-  }
-  
-  function installAddonRepo() {
-      var repoURL = $('#id_repoURL').val();
-      var repoName = $('#id_repoName').val();
-      $.post(
-        "/admin/plugins/installrepo", {repoURL: repoURL, repoName: repoName}, 
-            function(response) {
-                if (response.success) {
-                  $('#generic-modal-title-{{$newRepoModalID}}').html('Addon repo installed');
-                  var modalBody = $('#generic-modal-body-{{$newRepoModalID}}');
-                  modalBody.html('<h2>Repo Info</h2><p>Message: ' + response.message + '</p>');
-                  modalBody.append('<h4>Branches</h4><p>'+JSON.stringify(response.repo.branches)+'</p>');
-                  modalBody.append('<h4>Remotes</h4><p>'+JSON.stringify(response.repo.remote)+'</p>');
-                  $('.modal-dialog').width('80%');
-                  //$("#generic-modal-cancel-{{$newRepoModalID}}").hide();
-                  $("#generic-modal-ok-{{$newRepoModalID}}").html('OK');
-                  $("#generic-modal-ok-{{$newRepoModalID}}").removeClass('btn-primary');
-                  $("#generic-modal-ok-{{$newRepoModalID}}").addClass('btn-success');
-                  $("#generic-modal-ok-{{$newRepoModalID}}").off('click');
-                  $("#generic-modal-ok-{{$newRepoModalID}}").click(function () {
-                    $('#generic-modal-{{$newRepoModalID}}').modal('hide');
-                    if(confirm('Repo installed. Click OK to refresh page.')) {
-                      location.reload();
-                    }
-                  });
-                  $('#generic-modal-{{$newRepoModalID}}').modal();
-              
-                } else {
-                    window.console.log('Error installing repo :' + response['message']);
-                    alert('Error installing addon repo!');
-                }
-                return false;
-            },
-        'json');
-  }
-  function updateAddonRepo(repoName) {
-    if(confirm('Are you sure you want to update the addon repo ' + repoName + '?')) {
-      $.post(
-        "/admin/plugins/updaterepo", {repoName: repoName}, 
-            function(response) {
-                if (response.success) {
-                  window.console.log('Addon repo '+repoName+' successfully updated :' + response['message']);
-                  //alert('Addon repo updated.');
-				  $('#update-message-' + repoName).css('background-color', 'yellow');
-				  $('#update-message-' + repoName).html('Repo updated!');
-				  setTimeout(function () {
-					  $('#update-message-' + repoName).html('');
-				  }, 60000);
-                } else {
-                  window.console.log('Error updating repo :' + response['message']);
-                  //alert('Error updating addon repo!');
-				  $('#update-message-' + repoName).css('background-color', 'red');
-				  $('#update-message-' + repoName).html('Error updating repo!');
-				  setTimeout(function () {
-					  $('#update-message-' + repoName).html('');
-				  }, 60000);
-                }
-                return false;
-            },
-        'json');
-    }
-  }
-  function switchAddonRepoBranch(repoName) {
-    window.console.log('switchAddonRepoBranch: ' + repoName);
-    // TODO: Discover the available branches and create an interface to switch between them
-  }
-  
-  function removeAddonRepo(repoName) {
-    // TODO: Unlink the addons
-    if(confirm('Are you sure you want to remove the addon repo ' + repoName + '?')) {
-      $.post(
-        "/admin/plugins/removerepo", {repoName: repoName}, 
-            function(response) {
-                if (response.success) {
-                  window.console.log('Addon repo '+repoName+' successfully removed :' + response['message']);
-                  if(confirm('Repo deleted. Click OK to refresh page.')) {
-                    location.reload();
-                  }
-                } else {
-                  window.console.log('Error removing repo :' + response['message']);
-                  alert('Error removing addon repo!');
-                }
-                return false;
-            },
-        'json');
-    }
-  }  
-  
-</script>
\ No newline at end of file
diff --git a/view/theme/redbasic/tpl/admin_plugins_addrepo.tpl b/view/theme/redbasic/tpl/admin_plugins_addrepo.tpl
deleted file mode 100644
index de7b465bb..000000000
--- a/view/theme/redbasic/tpl/admin_plugins_addrepo.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<form id="add-plugin-repo-form" action="{{$post}}" method="post" >
-
-    <p class="descriptive-text">{{$desc}}</p>
-    {{include file="field_input.tpl" field=$repoURL}}
-    {{include file="field_input.tpl" field=$repoName}}
-    <div class="btn-group pull-right">
-		<button id="add-plugin-repo-submit" class="btn btn-primary" type="submit" name="submit" onclick="adminPluginsAddRepo(); return false;">{{$submit}}</button>
-	</div>
-</form>
diff --git a/view/theme/redbasic/tpl/admin_plugins_details.tpl b/view/theme/redbasic/tpl/admin_plugins_details.tpl
deleted file mode 100755
index 309fc9569..000000000
--- a/view/theme/redbasic/tpl/admin_plugins_details.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class = "generic-content-wrapper-styled" id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-
-	<p>{{if ! $info.disabled}}<i class='toggleplugin fa {{if $status==on}}fa-check-square-o{{else}}fa-square-o{{/if}} admin-icons'></i>{{else}}<i class='fa fa-stop admin-icons'></i>{{/if}} {{$info.name}} - {{$info.version}}{{if ! $info.disabled}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a>{{/if}}</p>
-
-	{{if $info.disabled}}
-	<p>{{$disabled}}</p>
-	{{/if}}
-
-	<p>{{$info.description}}</p>
-	
-	{{foreach $info.author as $a}}
-	<p class="author">{{$str_author}}
-		{{$a.name}}{{if $a.link}} {{$a.link}}{{/if}}
-	</p>
-	{{/foreach}}
-
-	{{if $info.minversion}}
-	<p class="versionlimit">{{$str_minversion}}{{$info.minversion}}</p>
-	{{/if}}
-	{{if $info.maxversion}}
-	<p class="versionlimit">{{$str_maxversion}}{{$info.maxversion}}</p>
-	{{/if}}
-	{{if $info.minphpversion}}
-	<p class="versionlimit">{{$str_minphpversion}}{{$info.minphpversion}}</p>
-	{{/if}}
-	{{if $info.serverroles}}
-	<p class="versionlimit">{{$str_serverroles}}{{$info.serverroles}}</p>
-	{{/if}}
-	{{if $info.requires}}
-	<p class="versionlimit">{{$str_requires}}{{$info.requires}}</p>
-	{{/if}}
-
-
-	{{foreach $info.maintainer as $a}}
-	<p class="maintainer">{{$str_maintainer}}
-		{{$a.name}}{{if $a.link}} {{$a.link}}{{/if}}
-	</p>
-	{{/foreach}}
-	
-	{{if $screenshot}}
-	<a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a>
-	{{/if}}
-
-	{{if $admin_form}}
-	<h3>{{$settings}}</h3>
-	<form method="post" action="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/">
-		{{$admin_form}}
-	</form>
-	{{/if}}
-
-	{{if $readme}}
-	<h3>Readme</h3>
-	<div id="plugin_readme">
-		{{$readme}}
-	</div>
-	{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/admin_profiles.tpl b/view/theme/redbasic/tpl/admin_profiles.tpl
deleted file mode 100644
index e3a08449c..000000000
--- a/view/theme/redbasic/tpl/admin_profiles.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="generic-content-wrapper">
-<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-sm pull-right" href="admin/profs/new"><i class="fa fa-plus-circle"></i>&nbsp;{{$new}}</a><h2>{{$title}}</h2>
-<div class="clear"></div>
-</div>
-
-<div class="section-content-tools-wrapper">
-
-<div class="section-content-info-wrapper">{{$all_desc}}
-<br /><br />
-{{$all}}
-</div>
-
-<form action="admin/profs" method="post">
-
-{{include file="field_textarea.tpl" field=$basic}}
-{{include file="field_textarea.tpl" field=$advanced}}
-
-<input type="submit" name="submit" value="{{$submit}}" />
-
-</form>
-
-
-
-{{if $cust_fields}}
-<br /><br />
-<div><strong>{{$cust_field_desc}}</strong></div>
-<br />
-
-<table width="100%">
-{{foreach $cust_fields as $field}}
-<tr><td>{{$field.field_name}}</td><td>{{$field.field_desc}}</td><td><a class="btn btn-danger btn-sm" href="admin/profs/drop/{{$field.id}}" title="{{$drop}}"><i class="fa fa-trash-o"></i>&nbsp;{{$drop}}</a> <a class="btn btn-sm" title="{{$edit}}" href="admin/profs/{{$field.id}}" ><i class="fa fa-pencil"></i></a></td></tr>
-{{/foreach}}
-</table>
-{{/if}}
-
-</div>
-
-</div>
diff --git a/view/theme/redbasic/tpl/admin_queue.tpl b/view/theme/redbasic/tpl/admin_queue.tpl
deleted file mode 100644
index 9d3d848c9..000000000
--- a/view/theme/redbasic/tpl/admin_queue.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h3>{{$banner}}</h3>
-
-{{if $hasentries}}
-
-<table cellpadding="10" id="admin-queue-table"><tr><td>{{$numentries}}&nbsp;&nbsp;</td><td>{{$desturl}}</td><td>{{$priority}}</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-
-{{foreach $entries as $e}}
-
-<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td><td>{{$e.priority}}</td>{{if $expert}}<td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-outline-secondary"><i class="fa fa-times"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-outline-secondary"><i class="fa fa-trash-o"></i></a></td>{{/if}}</tr>
-{{/foreach}}
-
-</table>
-
-{{/if}}
diff --git a/view/theme/redbasic/tpl/admin_security.tpl b/view/theme/redbasic/tpl/admin_security.tpl
deleted file mode 100755
index 409e9fc7d..000000000
--- a/view/theme/redbasic/tpl/admin_security.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="generic-content-wrapper-styled" id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-
-	<form action="{{$baseurl}}/admin/security" method="post">
-
-	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-
-	{{include file="field_checkbox.tpl" field=$block_public}}
-	{{include file="field_checkbox.tpl" field=$transport_security}}
-	{{include file="field_checkbox.tpl" field=$content_security}}
-	{{include file="field_checkbox.tpl" field=$embed_sslonly}}
-
-	{{include file="field_textarea.tpl" field=$allowed_email}}
-	{{include file="field_textarea.tpl" field=$not_allowed_email}}	
-
-	{{include file="field_textarea.tpl" field=$whitelisted_sites}}
-	{{include file="field_textarea.tpl" field=$blacklisted_sites}}
-
-	{{include file="field_textarea.tpl" field=$whitelisted_channels}}
-	{{include file="field_textarea.tpl" field=$blacklisted_channels}}
-
-	{{include file="field_textarea.tpl" field=$embed_allow}}
-	{{include file="field_textarea.tpl" field=$embed_deny}}
-
-
-	<div class="admin-submit-wrapper" >
-		<input type="submit" name="submit" class="admin-submit" value="{{$submit}}" />
-	</div>
-
-	</form>
-
-</div>
diff --git a/view/theme/redbasic/tpl/admin_settings_features.tpl b/view/theme/redbasic/tpl/admin_settings_features.tpl
deleted file mode 100644
index 2d5cf7e0b..000000000
--- a/view/theme/redbasic/tpl/admin_settings_features.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<form action="admin/features" method="post" autocomplete="off">
-	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-	<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
-		{{foreach $features as $g => $f}}
-		<div class="panel">
-			<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
-				<h3>
-					<a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
-						{{$f.0}}
-					</a>
-				</h3>
-			</div>
-			<div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} in{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
-				<div class="section-content-tools-wrapper">
-					{{foreach $f.1 as $fcat}}
-						{{include file="field_checkbox.tpl" field=$fcat.0}}
-						{{include file="field_checkbox.tpl" field=$fcat.1}}
-					{{/foreach}}
-					<div class="settings-submit-wrapper" >
-						<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-					</div>
-				</div>
-			</div>
-		</div>
-		{{/foreach}}
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/admin_site.tpl b/view/theme/redbasic/tpl/admin_site.tpl
deleted file mode 100755
index 6fd0fd9ce..000000000
--- a/view/theme/redbasic/tpl/admin_site.tpl
+++ /dev/null
@@ -1,101 +0,0 @@
-<script>
-	$(function(){
-		
-		$("#cnftheme").colorbox({
-			width: 800,
-			onLoad: function(){
-				var theme = $("#id_theme :selected").val();
-				$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
-			}, 
-			onComplete: function(){
-				$(this).colorbox.resize(); 
-				$("#colorbox form").submit(function(e){
-					var url = $(this).attr('action');
-					// can't get .serialize() to work...
-					var data={};
-					$(this).find("input").each(function(){
-						data[$(this).attr('name')] = $(this).val();
-					});
-					$(this).find("select").each(function(){
-						data[$(this).attr('name')] = $(this).children(":selected").val();
-					});
-					console.log(":)", url, data);
-					
-					$.post(url, data, function(data) {
-						if(timer) clearTimeout(timer);
-						NavUpdate();
-						$.colorbox.close();
-					})
-					
-					return false;
-				});
-				
-			}
-		});
-	});
-</script>
-<div id="adminpage" class="generic-content-wrapper-styled">
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-	{{include file="field_input.tpl" field=$sitename}}
-	{{include file="field_select.tpl" field=$server_role}}
-
-	{{if $z_server_role == 'pro'}}
-	{{include file="field_select.tpl" field=$techlevel}}
-    {{include file="field_checkbox.tpl" field=$techlock}}
-	{{/if}}
-
-	{{include file="field_textarea.tpl" field=$banner}}
-	{{include file="field_textarea.tpl" field=$siteinfo}}
-	{{include file="field_textarea.tpl" field=$admininfo}}
-
-    {{include file="field_input.tpl" field=$reply_address}}
-    {{include file="field_input.tpl" field=$from_email}}
-    {{include file="field_input.tpl" field=$from_email_name}}
-
-	{{include file="field_select.tpl" field=$language}}
-	{{include file="field_select.tpl" field=$theme}}
-    {{include file="field_select.tpl" field=$theme_mobile}}
-    {{include file="field_input.tpl" field=$frontpage}}
-    {{include file="field_checkbox.tpl" field=$mirror_frontpage}}
-    {{include file="field_checkbox.tpl" field=$login_on_homepage}}
-    {{include file="field_checkbox.tpl" field=$enable_context_help}}
-	{{if $directory_server}}
-		{{include file="field_select.tpl" field=$directory_server}}
-	{{/if}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$registration}}</h3>
-	{{include file="field_input.tpl" field=$register_text}}
-	{{include file="field_select.tpl" field=$register_policy}}
-	{{include file="field_checkbox.tpl" field=$invite_only}}
-	{{include file="field_select.tpl" field=$access_policy}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-
-	<h3>{{$corporate}}</h3>
-	{{include file="field_checkbox.tpl" field=$verify_email}}
-	{{include file="field_checkbox.tpl" field=$feed_contacts}}
-	{{include file="field_checkbox.tpl" field=$force_publish}}
-	{{include file="field_checkbox.tpl" field=$disable_discover_tab}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$advanced}}</h3>
-	{{include file="field_input.tpl" field=$proxy}}
-	{{include file="field_input.tpl" field=$proxyuser}}
-	{{include file="field_input.tpl" field=$timeout}}
-	{{include file="field_input.tpl" field=$delivery_interval}}
-	{{include file="field_input.tpl" field=$delivery_batch_count}}
-	{{include file="field_input.tpl" field=$poll_interval}}
-	{{include file="field_input.tpl" field=$maxloadavg}}
-	{{include file="field_input.tpl" field=$abandon_days}}
-	{{include file="field_input.tpl" field=$default_expire_days}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	</form>
-</div>
diff --git a/view/theme/redbasic/tpl/admin_summary.tpl b/view/theme/redbasic/tpl/admin_summary.tpl
deleted file mode 100755
index ca94b0ef7..000000000
--- a/view/theme/redbasic/tpl/admin_summary.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="generic-content-wrapper-styled" id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-{{if $adminalertmsg}}
-	<p class="alert alert-warning" role="alert">{{$adminalertmsg}}</p>
-{{/if}}
-{{if $upgrade}}
-	<p class="alert alert-warning" role="alert">{{$upgrade}}</p>
-{{/if}}
-	<dl>
-		<dt>{{$queues.label}}</dt>
-		<dd>{{$queues.queue}}</dd>
-	</dl>
-	<dl>
-		<dt>{{$accounts.0}}</dt>
-		<dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd>
-	</dl>
-	<dl>
-		<dt>{{$pending.0}}</dt>
-		<dd>{{$pending.1}}</dt>
-	</dl>
-	<dl>
-		<dt>{{$channels.0}}</dt>
-		<dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd>
-	</dl>
-	<dl>
-		<dt>{{$plugins.0}}</dt>
-		<dd>
-		{{foreach $plugins.1 as $p}} {{$p}} {{/foreach}}
-		</dd>
-	</dl>
-	<dl>
-		<dt>{{$version.0}}</dt>
-		<dd>{{$version.1}} - {{$build}}</dd>
-	</dl>
-	<dl>
-		<dt>{{$vmaster.0}}</dt>
-		<dd>{{$vmaster.1}}</dd>
-	</dl>
-	<dl>
-		<dt>{{$vdev.0}}</dt>
-		<dd>{{$vdev.1}}</dd>
-	</dl>
-</div>
\ No newline at end of file
diff --git a/view/theme/redbasic/tpl/album_edit.tpl b/view/theme/redbasic/tpl/album_edit.tpl
deleted file mode 100755
index f5495f149..000000000
--- a/view/theme/redbasic/tpl/album_edit.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<div id="photo-album-edit-wrapper" class="section-content-tools-wrapper">
-	<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
-		<div class="form-group">
-			<label id="photo-album-edit-name-label" for="photo-album-edit-name">{{$nametext}}</label>
-			<input type="text" name="albumname" placeholder="{{$name_placeholder}}" value="{{$album}}" class="form-control" list="dl-album-edit" />
-			<datalist id="dl-album-edit">
-			{{foreach $albums as $al}}
-				{{if $al.text}}
-				<option value="{{$al.text}}">
-				{{/if}}
-			{{/foreach}}
-			</datalist>
-		</div>
-		<div class="form-group">
-			<button id="photo-album-edit-submit" type="submit" name="submit" class="btn btn-primary btn-sm pull-right" />{{$submit}}</button>
-			<button id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" class="btn btn-danger btn-sm pull-left" onclick="return confirmDelete();" />{{$dropsubmit}}</button>
-		</div>
-	</form>
-	<div id="photo-album-edit-end" class="clear"></div>
-</div>
-
-
diff --git a/view/theme/redbasic/tpl/alt_pager.tpl b/view/theme/redbasic/tpl/alt_pager.tpl
deleted file mode 100644
index b46dc7662..000000000
--- a/view/theme/redbasic/tpl/alt_pager.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="pager">
-{{if $has_less}}<a href="{{$url}}&page={{$prevpage}}" class="pager-prev">{{$less}}</a>{{/if}}
-{{if $has_more}}{{if $has_less}}&nbsp;|&nbsp;{{/if}}<a href="{{$url}}&page={{$nextpage}}" class="pager-next">{{$more}}</a>{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/api_config_xml.tpl b/view/theme/redbasic/tpl/api_config_xml.tpl
deleted file mode 100755
index 8c0766c73..000000000
--- a/view/theme/redbasic/tpl/api_config_xml.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<config>
- <site>
-  <name>{{$config.site.name}}</name>
-  <server>{{$config.site.server}}</server>
-  <theme>default</theme>
-  <path></path>
-  <logo>{{$config.site.logo}}</logo>
-
-  <fancy>true</fancy>
-  <language>en</language>
-  <email>{{$config.site.email}}</email>
-  <broughtby></broughtby>
-  <broughtbyurl></broughtbyurl>
-  <timezone>UTC</timezone>
-  <closed>{{$config.site.closed}}</closed>
-
-  <inviteonly>false</inviteonly>
-  <private>{{$config.site.private}}</private>
-  <textlimit>{{$config.site.textlimit}}</textlimit>
-  <ssl>{{$config.site.ssl}}</ssl>
-  <sslserver>{{$config.site.sslserver}}</sslserver>
-  <shorturllength>30</shorturllength>
-
-</site>
- <license>
-  <type>cc</type>
-  <owner></owner>
-  <url>http://creativecommons.org/licenses/by/3.0/</url>
-  <title>Creative Commons Attribution 3.0</title>
-  <image>http://i.creativecommons.org/l/by/3.0/80x15.png</image>
-
-</license>
- <nickname>
-  <featured></featured>
-</nickname>
- <profile>
-  <biolimit></biolimit>
-</profile>
- <group>
-  <desclimit></desclimit>
-</group>
- <notice>
-
-  <contentlimit></contentlimit>
-</notice>
- <throttle>
-  <enabled>false</enabled>
-  <count>20</count>
-  <timespan>600</timespan>
-</throttle>
- <xmpp>
-
-  <enabled>false</enabled>
-  <server>INVALID SERVER</server>
-  <port>5222</port>
-  <user>update</user>
-</xmpp>
- <integration>
-  <source>StatusNet</source>
-
-</integration>
- <attachments>
-  <uploads>false</uploads>
-  <file_quota>0</file_quota>
-</attachments>
-</config>
diff --git a/view/theme/redbasic/tpl/api_friends_xml.tpl b/view/theme/redbasic/tpl/api_friends_xml.tpl
deleted file mode 100755
index f2a7234d1..000000000
--- a/view/theme/redbasic/tpl/api_friends_xml.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<users type="array">
-	{{foreach $users as $user}}
-	{{include file="api_user_xml.tpl"}}
-	{{/foreach}}
-</users>
diff --git a/view/theme/redbasic/tpl/api_ratelimit_xml.tpl b/view/theme/redbasic/tpl/api_ratelimit_xml.tpl
deleted file mode 100755
index e4b470a25..000000000
--- a/view/theme/redbasic/tpl/api_ratelimit_xml.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<hash>
- <remaining-hits type="integer">{{$hash.remaining_hits}}</remaining-hits>
- <hourly-limit type="integer">{{$hash.hourly_limit}}</hourly-limit>
- <reset-time type="datetime">{{$hash.reset_time}}</reset-time>
- <reset_time_in_seconds type="integer">{{$hash.resettime_in_seconds}}</reset_time_in_seconds>
-</hash>
diff --git a/view/theme/redbasic/tpl/api_status_xml.tpl b/view/theme/redbasic/tpl/api_status_xml.tpl
deleted file mode 100755
index cbb736e22..000000000
--- a/view/theme/redbasic/tpl/api_status_xml.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<status>{{if $status}}
-    <created_at>{{$status.created_at}}</created_at>
-    <id>{{$status.id}}</id>
-    <text>{{$status.text}}</text>
-    <source>{{$status.source}}</source>
-    <truncated>{{$status.truncated}}</truncated>
-    <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id>
-    <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id>
-    <favorited>{{$status.favorited}}</favorited>
-    <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
-    <geo>{{$status.geo}}</geo>
-    <coordinates>{{$status.coordinates}}</coordinates>
-    <place>{{$status.place}}</place>
-    <contributors>{{$status.contributors}}</contributors>
-	<user>
-	  <id>{{$status.user.id}}</id>
-	  <name>{{$status.user.name}}</name>
-	  <screen_name>{{$status.user.screen_name}}</screen_name>
-	  <location>{{$status.user.location}}</location>
-	  <description>{{$status.user.description}}</description>
-	  <profile_image_url>{{$status.user.profile_image_url}}</profile_image_url>
-	  <url>{{$status.user.url}}</url>
-	  <protected>{{$status.user.protected}}</protected>
-	  <followers_count>{{$status.user.followers}}</followers_count>
-	  <profile_background_color>{{$status.user.profile_background_color}}</profile_background_color>
-  	  <profile_text_color>{{$status.user.profile_text_color}}</profile_text_color>
-  	  <profile_link_color>{{$status.user.profile_link_color}}</profile_link_color>
-  	  <profile_sidebar_fill_color>{{$status.user.profile_sidebar_fill_color}}</profile_sidebar_fill_color>
-  	  <profile_sidebar_border_color>{{$status.user.profile_sidebar_border_color}}</profile_sidebar_border_color>
-  	  <friends_count>{{$status.user.friends_count}}</friends_count>
-  	  <created_at>{{$status.user.created_at}}</created_at>
-  	  <favourites_count>{{$status.user.favourites_count}}</favourites_count>
-  	  <utc_offset>{{$status.user.utc_offset}}</utc_offset>
-  	  <time_zone>{{$status.user.time_zone}}</time_zone>
-  	  <profile_background_image_url>{{$status.user.profile_background_image_url}}</profile_background_image_url>
-  	  <profile_background_tile>{{$status.user.profile_background_tile}}</profile_background_tile>
-  	  <profile_use_background_image>{{$status.user.profile_use_background_image}}</profile_use_background_image>
-  	  <notifications></notifications>
-  	  <geo_enabled>{{$status.user.geo_enabled}}</geo_enabled>
-  	  <verified>{{$status.user.verified}}</verified>
-  	  <following></following>
-  	  <statuses_count>{{$status.user.statuses_count}}</statuses_count>
-  	  <lang>{{$status.user.lang}}</lang>
-  	  <contributors_enabled>{{$status.user.contributors_enabled}}</contributors_enabled>
-	  </user>
-{{/if}}</status>
diff --git a/view/theme/redbasic/tpl/api_test_xml.tpl b/view/theme/redbasic/tpl/api_test_xml.tpl
deleted file mode 100755
index 80a541c39..000000000
--- a/view/theme/redbasic/tpl/api_test_xml.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<ok>{{$ok}}</ok>
diff --git a/view/theme/redbasic/tpl/api_timeline_atom.tpl b/view/theme/redbasic/tpl/api_timeline_atom.tpl
deleted file mode 100755
index e8bfb689e..000000000
--- a/view/theme/redbasic/tpl/api_timeline_atom.tpl
+++ /dev/null
@@ -1,90 +0,0 @@
-<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
- <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
- <id>{{$rss.self}}</id>
- <title>Friendika</title>
- <subtitle>Friendika API feed</subtitle>
- <logo>{{$rss.logo}}</logo>
- <updated>{{$rss.atom_updated}}</updated>
- <link type="text/html" rel="alternate" href="{{$rss.alternate}}"/>
- <link type="application/atom+xml" rel="self" href="{{$rss.self}}"/>
- 
- 
- <author>
-	<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
-	<uri>{{$user.url}}</uri>
-	<name>{{$user.name}}</name>
-	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
-	<georss:point></georss:point>
-	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
-	<poco:displayName>{{$user.name}}</poco:displayName>
-	<poco:urls>
-		<poco:type>homepage</poco:type>
-		<poco:value>{{$user.url}}</poco:value>
-		<poco:primary>true</poco:primary>
-	</poco:urls>
-	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
- </author>
-
- <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
- <activity:subject>
-	<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
-	<id>{{$user.contact_url}}</id>
-	<title>{{$user.name}}</title>
-	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
-	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
-	<poco:displayName>{{$user.name}}</poco:displayName>
-	<poco:urls>
-		<poco:type>homepage</poco:type>
-		<poco:value>{{$user.url}}</poco:value>
-		<poco:primary>true</poco:primary>
-	</poco:urls>
-	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
- </activity:subject>
- 
- 
-  	{{foreach $statuses as $status}}
-	<entry>
-		<activity:obj_type>{{$status.objecttype}}</activity:obj_type>
-		<id>{{$status.message_id}}</id>
-		<title>{{$status.text}}</title>
-		<content type="html">{{$status.statusnet_html}}</content>
-		<link rel="alternate" type="text/html" href="{{$status.url}}"/>
-		<activity:verb>{{$status.verb}}</activity:verb>
-		<published>{{$status.published}}</published>
-		<updated>{{$status.updated}}</updated>
-
-		<link rel="self" type="application/atom+xml" href="{{$status.self}}"/>
-		<link rel="edit" type="application/atom+xml" href="{{$status.edit}}"/>
-		<statusnet:notice_info local_id="{{$status.id}}" source="{{$status.source}}" >
-		</statusnet:notice_info>
-
-		<author>
-			<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
-			<uri>{{$status.user.url}}</uri>
-			<name>{{$status.user.name}}</name>
-			<link rel="alternate" type="text/html" href="{{$status.user.url}}"/>
-			<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$status.user.profile_image_url}}"/>
-
-			<georss:point/>
-			<poco:preferredUsername>{{$status.user.screen_name}}</poco:preferredUsername>
-			<poco:displayName>{{$status.user.name}}</poco:displayName>
-			<poco:address/>
-			<poco:urls>
-				<poco:type>homepage</poco:type>
-				<poco:value>{{$status.user.url}}</poco:value>
-				<poco:primary>true</poco:primary>
-			</poco:urls>
-		</author>
-		<link rel="ostatus:conversation" type="text/html" href="{{$status.url}}"/> 
-
-	</entry>    
-    {{/foreach}}
-</feed>
diff --git a/view/theme/redbasic/tpl/api_timeline_rss.tpl b/view/theme/redbasic/tpl/api_timeline_rss.tpl
deleted file mode 100755
index 86c645e99..000000000
--- a/view/theme/redbasic/tpl/api_timeline_rss.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
-  <channel>
-    <title>Friendika</title>
-    <link>{{$rss.alternate}}</link>
-    <atom:link type="application/rss+xml" rel="self" href="{{$rss.self}}"/>
-    <description>Friendika timeline</description>
-    <language>{{$rss.language}}</language>
-    <ttl>40</ttl>
-	<image>
-		<link>{{$user.link}}</link>
-		<title>{{$user.name}}'s items</title>
-		<url>{{$user.profile_image_url}}</url>
-	</image>
-	
-{{foreach $statuses as $status}}
-  <item>
-    <title>{{$status.user.name}}: {{$status.text}}</title>
-    <description>{{$status.text}}</description>
-    <pubDate>{{$status.created_at}}</pubDate>
-    <guid>{{$status.url}}</guid>
-    <link>{{$status.url}}</link>
-    <twitter:source>{{$status.source}}</twitter:source>
-  </item>
-{{/foreach}}
-  </channel>
-</rss>
diff --git a/view/theme/redbasic/tpl/api_timeline_xml.tpl b/view/theme/redbasic/tpl/api_timeline_xml.tpl
deleted file mode 100755
index f14d73e9c..000000000
--- a/view/theme/redbasic/tpl/api_timeline_xml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
-{{foreach $statuses as $status}} <status>
-  <text>{{$status.text}}</text>
-  <truncated>{{$status.truncated}}</truncated>
-  <created_at>{{$status.created_at}}</created_at>
-  <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id>
-  <source>{{$status.source}}</source>
-  <id>{{$status.id}}</id>
-  <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id>
-  <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
-  <geo>{{$status.geo}}</geo>
-  <favorited>{{$status.favorited}}</favorited>
-{{include file="api_user_xml.tpl" user=$status.user}}  <statusnet:html>{{$status.statusnet_html}}</statusnet:html>
-  <statusnet:conversation_id>{{$status.statusnet_conversation_id}}</statusnet:conversation_id>
-  <url>{{$status.url}}</url>
-  <coordinates>{{$status.coordinates}}</coordinates>
-  <place>{{$status.place}}</place>
-  <contributors>{{$status.contributors}}</contributors>
- </status>
-{{/foreach}}</statuses>
diff --git a/view/theme/redbasic/tpl/api_user_xml.tpl b/view/theme/redbasic/tpl/api_user_xml.tpl
deleted file mode 100755
index 3b51992f6..000000000
--- a/view/theme/redbasic/tpl/api_user_xml.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-  <user>
-   <id>{{$user.id}}</id>
-   <name>{{$user.name}}</name>
-   <screen_name>{{$user.screen_name}}</screen_name>
-   <location>{{$user.location}}</location>
-   <description>{{$user.description}}</description>
-   <profile_image_url>{{$user.profile_image_url}}</profile_image_url>
-   <url>{{$user.url}}</url>
-   <protected>{{$user.protected}}</protected>
-   <followers_count>{{$user.followers_count}}</followers_count>
-   <friends_count>{{$user.friends_count}}</friends_count>
-   <created_at>{{$user.created_at}}</created_at>
-   <favourites_count>{{$user.favourites_count}}</favourites_count>
-   <utc_offset>{{$user.utc_offset}}</utc_offset>
-   <time_zone>{{$user.time_zone}}</time_zone>
-   <statuses_count>{{$user.statuses_count}}</statuses_count>
-   <following>{{$user.following}}</following>
-   <profile_background_color>{{$user.profile_background_color}}</profile_background_color>
-   <profile_text_color>{{$user.profile_text_color}}</profile_text_color>
-   <profile_link_color>{{$user.profile_link_color}}</profile_link_color>
-   <profile_sidebar_fill_color>{{$user.profile_sidebar_fill_color}}</profile_sidebar_fill_color>
-   <profile_sidebar_border_color>{{$user.profile_sidebar_border_color}}</profile_sidebar_border_color>
-   <profile_background_image_url>{{$user.profile_background_image_url}}</profile_background_image_url>
-   <profile_background_tile>{{$user.profile_background_tile}}</profile_background_tile>
-   <profile_use_background_image>{{$user.profile_use_background_image}}</profile_use_background_image>
-   <notifications>{{$user.notifications}}</notifications>
-   <geo_enabled>{{$user.geo_enabled}}</geo_enabled>
-   <verified>{{$user.verified}}</verified>
-   <lang>{{$user.lang}}</lang>
-   <contributors_enabled>{{$user.contributors_enabled}}</contributors_enabled>
-   <status>{{if $user.status}}
-    <created_at>{{$user.status.created_at}}</created_at>
-    <id>{{$user.status.id}}</id>
-    <text>{{$user.status.text}}</text>
-    <source>{{$user.status.source}}</source>
-    <truncated>{{$user.status.truncated}}</truncated>
-    <in_reply_to_status_id>{{$user.status.in_reply_to_status_id}}</in_reply_to_status_id>
-    <in_reply_to_user_id>{{$user.status.in_reply_to_user_id}}</in_reply_to_user_id>
-    <favorited>{{$user.status.favorited}}</favorited>
-    <in_reply_to_screen_name>{{$user.status.in_reply_to_screen_name}}</in_reply_to_screen_name>
-    <geo>{{$user.status.geo}}</geo>
-    <coordinates>{{$user.status.coordinates}}</coordinates>
-    <place>{{$user.status.place}}</place>
-    <contributors>{{$user.status.contributors}}</contributors>
-  {{/if}}</status>
-  </user>
diff --git a/view/theme/redbasic/tpl/app.tpl b/view/theme/redbasic/tpl/app.tpl
deleted file mode 100644
index 28f28611e..000000000
--- a/view/theme/redbasic/tpl/app.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{{if !$navapps}}
-<div class="app-container">
-	<div class="app-detail{{if $deleted}} app-deleted{{/if}}">
-		<a href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $app.desc}} title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}}
-			<div class="app-name" style="text-align:center;">{{$app.name}}</div>
-		</a>
-	</div>
-	{{if $app.type !== 'system'}}
-	{{if $purchase}}
-	<div class="app-purchase">
-		<a href="{{$app.page}}" class="btn btn-outline-secondary" title="{{$purchase}}" ><i class="fa fa-external"></i></a>
-	</div>
-	{{/if}}
-	{{if $install || $update || $delete || $feature}}
-	<div class="app-tools">
-		<form action="{{$hosturl}}appman" method="post">
-		<input type="hidden" name="papp" value="{{$app.papp}}" />
-		{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-outline-secondary btn-sm" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}}
-		{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}}
-		{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}}
-		{{if $feature}}<button type="submit" name="feature" value="feature" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-star"{{if $featured}} style="color: gold"{{/if}}></i></button>{{/if}}
-		</form>
-	</div>
-	{{/if}}
-	{{/if}}
-</div>
-{{else}}
-<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
-{{/if}}
-
diff --git a/view/theme/redbasic/tpl/app_create.tpl b/view/theme/redbasic/tpl/app_create.tpl
deleted file mode 100644
index 5075ce5e2..000000000
--- a/view/theme/redbasic/tpl/app_create.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$banner}}</h2>
-	</div>
-
-	<div class="clearfix section-content-wrapper">
-		<form action="appman" method="post">
-		{{if $guid}}
-		<input type="hidden" name="guid" value="{{$guid}}" />
-		{{/if}}
-		{{if $author}}
-		<input type="hidden" name="author" value="{{$author}}" />
-		{{/if}}
-		{{if $addr}}
-		<input type="hidden" name="addr" value="{{$addr}}" />
-		{{/if}}
-
-		<input type="hidden" name="requires" value="{{$requires}}" />
-		<input type="hidden" name="system" value="{{$system}}" />
-		<input type="hidden" name="plugin" value="{{$plugin}}" />
-
-
-		{{include file="field_input.tpl" field=$name}}
-		{{include file="field_input.tpl" field=$categories}}
-		{{include file="field_input.tpl" field=$url}}
-		{{include file="field_textarea.tpl" field=$desc}}
-		{{include file="field_input.tpl" field=$photo}}
-		{{include file="field_input.tpl" field=$version}}
-		{{include file="field_input.tpl" field=$price}}
-		{{include file="field_input.tpl" field=$page}}
-
-		{{if $embed}}
-		{{include file="field_textarea.tpl" field=$embed}}
-		{{/if}}
-
-		<button class="btn btn-primary float-right" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
-
-		</form>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/atom_feed.tpl b/view/theme/redbasic/tpl/atom_feed.tpl
deleted file mode 100755
index ba50867ff..000000000
--- a/view/theme/redbasic/tpl/atom_feed.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<feed xmlns="http://www.w3.org/2005/Atom"
-      xmlns:thr="http://purl.org/syndication/thread/1.0"
-      xmlns:at="http://purl.org/atompub/tombstones/1.0"
-      xmlns:media="http://purl.org/syndication/atommedia"
-      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
-      xmlns:zot="http://purl.org/zot"
-      xmlns:as="http://activitystrea.ms/spec/1.0/"
-      xmlns:georss="http://www.georss.org/georss"
-      xmlns:poco="http://portablecontacts.net/spec/1.0"
-      xmlns:ostatus="http://ostatus.org/schema/1.0"
-      xmlns:statusnet="http://status.net/schema/api/1/" >
-
-  <id>{{$feed_id}}</id>
-  <title>{{$feed_title}}</title>
-  <generator uri="http://hubzilla.org" version="{{$version}}">{{$red}}</generator>
-  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
-  <link rel="alternate" type="text/html" href="{{$profile_page}}" />
-{{if $author}}
-{{$author}}
-{{/if}}
-
-  <updated>{{$feed_updated}}</updated>
-
-  <zot:owner>
-    <name>{{$name}}</name>
-    <uri>{{$profile_page}}</uri>
-    <link rel="photo"  type="{{$mimephoto}}" media:width="175" media:height="175" href="{{$photo}}" />
-    <link rel="avatar" type="{{$mimephoto}}" media:width="175" media:height="175" href="{{$photo}}" />
-  </zot:owner>
diff --git a/view/theme/redbasic/tpl/attach_edit.tpl b/view/theme/redbasic/tpl/attach_edit.tpl
deleted file mode 100644
index 62442ff7a..000000000
--- a/view/theme/redbasic/tpl/attach_edit.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<form id="attach_edit_form_{{$file.id}}" action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" class="acl-form" data-form_id="attach_edit_form_{{$file.id}}" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-	<input type="hidden" name="channelnick" value="{{$channelnick}}" />
-	<input type="hidden" name="filehash" value="{{$file.hash}}" />
-	<input type="hidden" name="uid" value="{{$uid}}" />
-	<input type="hidden" name="fileid" value="{{$file.id}}" />
-	{{if !$isadir}}{{include file="field_checkbox.tpl" field=$notify}}{{/if}}
-	{{if $isadir}}{{include file="field_checkbox.tpl" field=$recurse}}{{/if}}
-	<div id="attach-edit-tools-share" class="btn-group form-group">
-		{{if !$isadir}}
-		<a href="/rpost?attachment=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-outline-secondary btn-sm" title="{{$attach_btn_title}}">
-			<i class="fa fa-share-square-o jot-icons"></i>
-		</a>
-		{{/if}}
-		<button id="link-btn" class="btn btn-outline-secondary btn-sm" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}">
-			<i class="fa fa-link jot-icons"></i>
-		</button>
-	</div>
-	<div id="attach-edit-perms" class="btn-group pull-right">
-		<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button">
-			<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
-		</button>
-		<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit">
-			{{$submit}}
-		</button>
-	</div>
-	<div id="link-code" class="form-group">
-		<label for="">{{$cpldesc}}</label>
-		<input type="text" class="form-control" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/>
-	</div>
-</form>
-
diff --git a/view/theme/redbasic/tpl/birthdays_reminder.tpl b/view/theme/redbasic/tpl/birthdays_reminder.tpl
deleted file mode 100755
index d0500364a..000000000
--- a/view/theme/redbasic/tpl/birthdays_reminder.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{if $count}}
-<div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div>
-<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div>
-<div id="birthday-title-end"></div>
-{{foreach $events as $event}}
-<div class="birthday-list" id="birthday-{{$event.id}}"></a> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
-{{/foreach}}
-</div>
-{{/if}}
-
diff --git a/view/theme/redbasic/tpl/blocklist.tpl b/view/theme/redbasic/tpl/blocklist.tpl
deleted file mode 100644
index 7f400bba2..000000000
--- a/view/theme/redbasic/tpl/blocklist.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $editor}}
-		<div class="pull-right">
-			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('block-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
-		</div>
-		{{/if}}
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{if $editor}}
-	<div id="block-editor" class="section-content-tools-wrapper">
-		{{$editor}}
-	</div>
-	{{/if}}
-	{{if $pages}}
-	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
-		<table id="block-list-table">
-			<tr>
-				<th width="1%">{{$name}}</th>
-				<th width="94%">{{$blocktitle}}</th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%" class="d-none d-md-table-cell">{{$created}}</th>
-				<th width="1%" class="d-none d-md-table-cell">{{$edited}}</th>
-			</tr>
-			{{foreach $pages as $key => $items}}
-			{{foreach $items as $item}}
-			<tr id="block-list-item-{{$item.url}}">
-				<td>
-					{{if $view}}
-					<a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a>
-					{{else}}
-					{{$item.name}}
-					{{/if}}
-				</td>
-				<td>
-					{{$item.title}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $edit}}
-					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $item.bb_element}}
-					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $edit}}
-					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-					{{/if}}
-				</td>
-				<td class="d-none d-md-table-cell">
-					{{$item.created}}
-				</td>
-				<td class="d-none d-md-table-cell">
-					{{$item.edited}}
-				</td>
-			</tr>
-			{{/foreach}}
-			{{/foreach}}
-		</table>
-	</div>
-	<div class="clear"></div>
-	{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/bookmarkedchats.tpl b/view/theme/redbasic/tpl/bookmarkedchats.tpl
deleted file mode 100644
index 3aabf835a..000000000
--- a/view/theme/redbasic/tpl/bookmarkedchats.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{if $rooms}}
-<div id="chatroom_bookmarks" class="widget">
-<h3>{{$header}}</h3>
-<ul class="bookmarkchat nav nav-pills nav-stacked">
-{{foreach $rooms as $room}}
-<li><a href="{{$room.xchat_url}}">{{$room.xchat_desc}}</a></li>
-{{/foreach}}
-</ul>
-</div>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/build_query.tpl b/view/theme/redbasic/tpl/build_query.tpl
deleted file mode 100755
index a76d4e549..000000000
--- a/view/theme/redbasic/tpl/build_query.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-<script> 
-
-	var bParam_cmd = "{{$baseurl}}/update_{{$pgtype}}";
-
-
-	var bParam_uid = {{$uid}};
-	var bParam_gid = {{$gid}};
-	var bParam_cid = {{$cid}};
-	var bParam_cmin = {{$cmin}};
-	var bParam_cmax = {{$cmax}};
-	var bParam_star = {{$star}};
-	var bParam_liked = {{$liked}};
-	var bParam_conv = {{$conv}};
-	var bParam_spam = {{$spam}};
-	var bParam_new = {{$nouveau}};
-	var bParam_page = {{$page}};
-	var bParam_wall = {{$wall}};
-	var bParam_list = {{$list}};
-	var bParam_fh = {{$fh}};
-	var bParam_static = {{$static}};
-
-	var bParam_search = "{{$search}}";
-	var bParam_xchan = "{{$xchan}}";
-	var bParam_order = "{{$order}}";
-	var bParam_file = "{{$file}}";
-	var bParam_cats = "{{$cats}}";
-	var bParam_tags = "{{$tags}}";
-	var bParam_dend = "{{$dend}}";
-	var bParam_dbegin = "{{$dbegin}}";
-	var bParam_mid = "{{$mid}}";
-	var bParam_verb = "{{$verb}}";
-
-	function buildCmd() {
-		var udargs = ((page_load) ? "/load" : "");
-		var bCmd = bParam_cmd + udargs + "?f=" ;
-		if(bParam_uid) bCmd = bCmd + "&p=" + bParam_uid;
-		if(bParam_cmin != 0) bCmd = bCmd + "&cmin=" + bParam_cmin;
-		if(bParam_cmax != 99) bCmd = bCmd + "&cmax=" + bParam_cmax;
-		if(bParam_gid != 0) { bCmd = bCmd + "&gid=" + bParam_gid; } else
-		if(bParam_cid != 0) { bCmd = bCmd + "&cid=" + bParam_cid; }
-		if(bParam_static != 0) { bCmd = bCmd + "&static=" + bParam_static; }
-		if(bParam_star != 0) bCmd = bCmd + "&star=" + bParam_star;
-		if(bParam_liked != 0) bCmd = bCmd + "&liked=" + bParam_liked;
-		if(bParam_conv!= 0) bCmd = bCmd + "&conv=" + bParam_conv;
-		if(bParam_spam != 0) bCmd = bCmd + "&spam=" + bParam_spam;
-		if(bParam_new != 0) bCmd = bCmd + "&new=" + bParam_new;
-		if(bParam_wall != 0) bCmd = bCmd + "&wall=" + bParam_wall;
-		if(bParam_list != 0) bCmd = bCmd + "&list=" + bParam_list;
-		if(bParam_fh != 0) bCmd = bCmd + "&fh=" + bParam_fh;
-		if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search;
-		if(bParam_xchan != "") bCmd = bCmd + "&xchan=" + bParam_xchan;
-		if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order;
-		if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file;
-		if(bParam_cats != "") bCmd = bCmd + "&cat=" + bParam_cats;
-		if(bParam_tags != "") bCmd = bCmd + "&tag=" + bParam_tags;
-		if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
-		if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin;
-		if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid;
-		if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb;
-		if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
-		return(bCmd);
-	}
-
-</script>
-
diff --git a/view/theme/redbasic/tpl/categories_widget.tpl b/view/theme/redbasic/tpl/categories_widget.tpl
deleted file mode 100755
index 72478aa3d..000000000
--- a/view/theme/redbasic/tpl/categories_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="categories-sidebar" class="widget">
-	<h3>{{$title}}</h3>
-	<div id="categories-sidebar-desc">{{$desc}}</div>
-	
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a href="{{$base}}" class="nav-link{{if $sel_all}} active{{/if}}">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-		<li class="nav-item"><a  href="{{$base}}?f=&cat={{$term.name}}" class="nav-link{{if $term.selected}} active{{/if}}">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/theme/redbasic/tpl/cdav_addressbook.tpl b/view/theme/redbasic/tpl/cdav_addressbook.tpl
deleted file mode 100644
index 587a95caa..000000000
--- a/view/theme/redbasic/tpl/cdav_addressbook.tpl
+++ /dev/null
@@ -1,462 +0,0 @@
-<script>
-$(document).ready(function() {
-
-	$(document).on('click', '.vcard-header, .vcard-cancel-btn', updateView);
-	$(document).on('click', '.add-field', doAdd);
-	$(document).on('click', '.remove-field', doRemove);
-
-	function updateView() {
-		var id = $(this).data('id');
-		var action = $(this).data('action');
-		var header = $('#vcard-header-' + id);
-		var cancel = $('#vcard-cancel-' + id);
-		var addField = $('#vcard-add-field-' + id);
-		var info = $('#vcard-info-' + id);
-		var vcardPreview = $('#vcard-preview-' + id);
-		var fn = $('#vcard-fn-' + id);
-
-		if(action === 'open') {
-			$(header).addClass('active');
-			$(cancel).show();
-			$(addField).show();
-			$(info).show();
-			$(fn).show();
-			$(vcardPreview).hide();
-		}
-		else {
-			$(header).removeClass('active');
-			$(cancel).hide();
-			$(addField).hide();
-			$(info).hide();
-			$(fn).hide();
-			$(vcardPreview).show();
-		}
-	}
-
-	function doAdd(e) {
-		e.preventDefault();
-		var what = $(this).data('add');
-		var id = $(this).data('id');
-		var element = '#template-form-' + what;
-		var where = '#card_form_' + id;
-
-		$(element + ' .remove-field').attr('data-id', id)
-
-		if(what === 'vcard-adr') {
-			var adrCount = $(where + ' .form-' + what).length;
-			var attrName = 'adr[' + adrCount + '][]';
-			$(element + ' input').attr('name', attrName);
-		}
-
-		if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') {
-			$(where + ' .add-' + what).hide()
-		}
-
-		$(element).clone().removeAttr('id').appendTo(where + ' .form-' + what + '-wrapper');
-	}
-
-	function doRemove() {
-		var what = $(this).data('remove');
-		var element = $(this).parents('div.form-' + what);
-		var where = '#card_form_' + $(this).data('id');
-
-		if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') {
-			$(where + ' .add-' + what).show()
-		}
-
-		$(element).remove();
-	}
-
-});
-</script>
-<div id="template-form-vcard-org" class="form-group form-vcard-org">
-	<div class="form-group form-vcard-org">
-		<input type="text" name="org" value="" placeholder="{{$org_label}}">
-		<i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-	</div>
-</div>
-
-<div id="template-form-vcard-title" class="form-group form-vcard-title">
-	<div class="form-group form-vcard-title">
-		<input type="text" name="title" value="" placeholder="{{$title_label}}">
-		<i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-	</div>
-</div>
-
-<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
-	<select name="tel_type[]">
-		<option value="CELL">{{$mobile}}</option>
-		<option value="HOME">{{$home}}</option>
-		<option value="WORK">{{$work}}</option>
-		<option value="OTHER">{{$other}}</option>
-	</select>
-	<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
-	<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-</div>
-
-<div id="template-form-vcard-email" class="form-group form-vcard-email">
-	<select name="email_type[]">
-		<option value="HOME">{{$home}}</option>
-		<option value="WORK">{{$work}}</option>
-		<option value="OTHER">{{$other}}</option>
-	</select>
-	<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
-	<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-</div>
-
-<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
-	<select name="impp_type[]">
-		<option value="HOME">{{$home}}</option>
-		<option value="WORK">{{$work}}</option>
-		<option value="OTHER">{{$other}}</option>
-	</select>
-	<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
-	<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-</div>
-
-<div id="template-form-vcard-url" class="form-group form-vcard-url">
-	<select name="url_type[]">
-		<option value="HOME">{{$home}}</option>
-		<option value="WORK">{{$work}}</option>
-		<option value="OTHER">{{$other}}</option>
-	</select>
-	<input type="text" name="url[]" value="" placeholder="{{$url_label}}">
-	<i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-</div>
-
-<div id="template-form-vcard-adr" class="form-group form-vcard-adr">
-	<div class="form-group">
-		<select name="adr_type[]">
-			<option value="HOME">{{$home}}</option>
-			<option value="WORK">{{$work}}</option>
-			<option value="OTHER">{{$other}}</option>
-		</select>
-		<label>{{$adr_label}}</label>
-		<i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$po_box}}">
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$extra}}">
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$street}}">
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$locality}}">
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$region}}">
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$zip_code}}">
-	</div>
-	<div class="form-group">
-		<input type="text" name="" value="" placeholder="{{$country}}">
-	</div>
-</div>
-
-<div id="template-form-vcard-note" class="form-group form-vcard-note">
-	<label>{{$note_label}}</label>
-	<i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-	<textarea name="note" class="form-control"></textarea>
-</div>
-
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<button type="button" class="btn btn-success btn-sm float-right" onclick="openClose('create_form')"><i class="fa fa-plus-circle"></i> {{$add_card}}</button>
-		<h2>{{$displayname}}</h2>
-	</div>
-	<div id="create_form" class="section-content-tools-wrapper">
-		<form id="card_form_new" method="post" action="">
-			<input type="hidden" name="target" value="{{$id}}">
-			<div class="dropdown pull-right">
-				<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
-				<div class="dropdown-menu dropdown-menu-right">
-					<a class="dropdown-item add-vcard-org add-field" style="display: none" href="#" data-add="vcard-org" data-id="new">{{$org_label}}</a>
-					<a class="dropdown-item add-vcard-title add-field" style="display: none" href="#" data-add="vcard-title" data-id="new">{{$title_label}}</a>
-					<a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="new">{{$tel_label}}</a>
-					<a class="dropdown-item add-vcard-email add-field" href="#" data-add="vcard-email" data-id="new">{{$email_label}}</a>
-					<a class="dropdown-item add-vcard-impp add-field" href="#" data-add="vcard-impp" data-id="new">{{$impp_label}}</a>
-					<a class="dropdown-item add-vcard-url add-field" href="#" data-add="vcard-url" data-id="new">{{$url_label}}</a>
-					<a class="dropdown-item add-vcard-adr add-field" href="#" data-add="vcard-adr" data-id="new">{{$adr_label}}</a>
-					<a class="dropdown-item add-vcard-note add-field" href="#" data-add="vcard-note" data-id="new">{{$note_label}}</a>
-				</div>
-			</div>
-
-			<div class="vcard-fn-create form-group">
-				<div class="form-vcard-fn-wrapper">
-					<div class="form-group form-vcard-fn">
-						<div class="vcard-nophoto"><i class="fa fa-user"></i></div><input type="text" name="fn" value="" placeholder="{{$name_label}}">
-					</div>
-				</div>
-			</div>
-
-			<div class="vcard-org form-group">
-				<div class="form-vcard-org-wrapper">
-					<div class="form-group form-vcard-org">
-						<input type="text" name="org" value="" placeholder="{{$org_label}}">
-						<i data-remove="vcard-org" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-				</div>
-			</div>
-
-			<div class="vcard-title form-group">
-				<div class="form-vcard-title-wrapper">
-					<div class="form-group form-vcard-title">
-						<input type="text" name="title" value="" placeholder="{{$title_label}}">
-						<i data-remove="vcard-title" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-				</div>
-			</div>
-
-			<div class="vcard-tel form-group">
-				<div class="form-vcard-tel-wrapper">
-					<div class="form-group form-vcard-tel">
-						<select name="tel_type[]">
-							<option value="CELL">{{$mobile}}</option>
-							<option value="HOME">{{$home}}</option>
-							<option value="WORK">{{$work}}</option>
-							<option value="OTHER">{{$other}}</option>
-						</select>
-						<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
-						<i data-remove="vcard-tel" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-				</div>
-			</div>
-
-
-			<div class="vcard-email form-group">
-				<div class="form-vcard-email-wrapper">
-					<div class="form-group form-vcard-email">
-						<select name="email_type[]">
-							<option value="HOME">{{$home}}</option>
-							<option value="WORK">{{$work}}</option>
-							<option value="OTHER">{{$other}}</option>
-						</select>
-						<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
-						<i data-remove="vcard-email" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-				</div>
-			</div>
-
-			<div class="vcard-impp form-group">
-				<div class="form-vcard-impp-wrapper">
-				</div>
-			</div>
-
-			<div class="vcard-url form-group">
-				<div class="form-vcard-url-wrapper">
-				</div>
-			</div>
-
-			<div class="vcard-adr form-group">
-				<div class="form-vcard-adr-wrapper">
-				</div>
-			</div>
-
-			<div class="vcard-note form-group">
-				<div class="form-vcard-note-wrapper">
-				</div>
-			</div>
-
-			<button type="submit" name="create" value="create_card" class="btn btn-primary btn-sm pull-right">{{$create}}</button>
-			<button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('create_form')">{{$cancel}}</button>
-			<div class="clear"></div>
-		</form>
-	</div>
-
-	{{foreach $cards as $card}}
-	<form id="card_form_{{$card.id}}" method="post" action="">
-		<input type="hidden" name="target" value="{{$id}}">
-		<input type="hidden" name="uri" value="{{$card.uri}}">
-		<div class="section-content-wrapper-np">
-			<div id="vcard-cancel-{{$card.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
-			<div id="vcard-add-field-{{$card.id}}" class="dropdown pull-right vcard-add-field">
-				<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
-				<div class="dropdown-menu dropdown-menu-right">
-					<a class="dropdown-item add-vcard-org add-field"{{if $card.org}} style="display: none"{{/if}} href="#" data-add="vcard-org" data-id="{{$card.id}}">{{$org_label}}</a>
-					<a class="dropdown-item add-vcard-title add-field"{{if $card.title}} style="display: none"{{/if}} href="#" data-add="vcard-title" data-id="{{$card.id}}">{{$title_label}}</a>
-					<a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="{{$card.id}}">{{$tel_label}}</a>
-					<a class="dropdown-item add-vcard-email add-field" href="#" data-add="vcard-email" data-id="{{$card.id}}">{{$email_label}}</a>
-					<a class="dropdown-item add-vcard-impp add-field" href="#" data-add="vcard-impp" data-id="{{$card.id}}">{{$impp_label}}</a>
-					<a class="dropdown-item add-vcard-url add-field" href="#" data-add="vcard-url" data-id="{{$card.id}}">{{$url_label}}</a>
-					<a class="dropdown-item add-vcard-adr add-field" href="#" data-add="vcard-adr" data-id="{{$card.id}}">{{$adr_label}}</a>
-					<a class="dropdown-item add-vcard-note add-field"{{if $card.note}} style="display: none"{{/if}} href="#" data-add="vcard-note" data-id="{{$card.id}}">{{$note_label}}</a>
-				</div>
-			</div>
-			<div id="vcard-header-{{$card.id}}" class="vcard-header" data-id="{{$card.id}}" data-action="open">
-				{{if $card.photo}}<img class="vcard-photo" src="{{$card.photo}}" width="32px" height="32px">{{else}}<div class="vcard-nophoto"><i class="fa fa-user"></i></div>{{/if}}
-				<span id="vcard-preview-{{$card.id}}" class="vcard-preview">
-					{{if $card.fn}}<span class="vcard-fn-preview">{{$card.fn}}</span>{{/if}}
-					{{if $card.emails.0.address}}<span class="vcard-email-preview hidden-xs">{{$card.emails.0.address}}</span>{{/if}}
-					{{if $card.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$card.tels.0.nr}}</span>{{/if}}
-				</span>
-				<input id="vcard-fn-{{$card.id}}" class="vcard-fn" type="text" name="fn" value="{{$card.fn}}" size="{{$card.fn|count_characters:true}}" placeholder="{{$name_label}}">
-			</div>
-		</div>
-		<div id="vcard-info-{{$card.id}}" class="vcard-info section-content-wrapper">
-
-			<div class="vcard-org form-group">
-				<div class="form-vcard-org-wrapper">
-					{{if $card.org}}
-					<div class="form-group form-vcard-org">
-						<input type="text" name="org" value="{{$card.org}}" size="{{$card.org|count_characters:true}}" placeholder="{{$org_label}}">
-						<i data-remove="vcard-org" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-					{{/if}}
-				</div>
-			</div>
-
-			<div class="vcard-title form-group">
-				<div class="form-vcard-title-wrapper">
-					{{if $card.title}}
-					<div class="form-group form-vcard-title">
-						<input type="text" name="title" value="{{$card.title}}" size="{{$card.title|count_characters:true}}" placeholder="{{$title_label}}">
-						<i data-remove="vcard-title" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-					{{/if}}
-				</div>
-			</div>
-
-
-			<div class="vcard-tel form-group">
-				<div class="form-vcard-tel-wrapper">
-					{{if $card.tels}}
-					{{foreach $card.tels as $tel}}
-					<div class="form-group form-vcard-tel">
-						<select name="tel_type[]">
-							<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
-							<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
-							<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-							<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-							<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-						</select>
-						<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
-						<i data-remove="vcard-tel" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-					{{/foreach}}
-					{{/if}}
-				</div>
-			</div>
-
-
-			<div class="vcard-email form-group">
-				<div class="form-vcard-email-wrapper">
-					{{if $card.emails}}
-					{{foreach $card.emails as $email}}
-					<div class="form-group form-vcard-email">
-						<select name="email_type[]">
-							<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
-							<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-							<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-							<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-						</select>
-						<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
-						<i data-remove="vcard-email" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-					{{/foreach}}
-					{{/if}}
-				</div>
-			</div>
-
-			<div class="vcard-impp form-group">
-				<div class="form-vcard-impp-wrapper">
-					{{if $card.impps}}
-					{{foreach $card.impps as $impp}}
-					<div class="form-group form-vcard-impp">
-						<select name="impp_type[]">
-							<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
-							<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-							<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-							<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-						</select>
-						<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
-						<i data-remove="vcard-impp" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-					{{/foreach}}
-					{{/if}}
-				</div>
-			</div>
-
-			<div class="vcard-url form-group">
-				<div class="form-vcard-url-wrapper">
-					{{if $card.urls}}
-					{{foreach $card.urls as $url}}
-					<div class="form-group form-vcard-url">
-						<select name="url_type[]">
-							<option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option>
-							<option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-							<option value="WORK"{{if $url.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-							<option value="OTHER"{{if $url.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-						</select>
-						<input type="text" name="url[]" value="{{$url.address}}" size="{{$url.address|count_characters:true}}" placeholder="{{$url_label}}">
-						<i data-remove="vcard-url" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					</div>
-					{{/foreach}}
-					{{/if}}
-				</div>
-			</div>
-
-			<div class="vcard-adr form-group">
-				<div class="form-vcard-adr-wrapper">
-					{{if $card.adrs}}
-					{{foreach $card.adrs as $adr}}
-					<div class="form-group form-vcard-adr">
-						<div class="form-group">
-							<label>{{$adr_label}}</label>
-							<select name="adr_type[]">
-								<option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option>
-								<option value="HOME"{{if $adr.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-								<option value="WORK"{{if $adr.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-								<option value="OTHER"{{if $adr.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-							</select>
-							<i data-remove="vcard-adr" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}">
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}">
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}">
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}">
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}">
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}">
-						</div>
-						<div class="form-group">
-							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}">
-						</div>
-					</div>
-					{{/foreach}}
-					{{/if}}
-				</div>
-			</div>
-
-			<div class="vcard-note form-group form-vcard-note">
-				<div class="form-vcard-note-wrapper">
-					{{if $card.note}}
-					<label>{{$note_label}}</label>
-					<i data-remove="vcard-note" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-					<textarea name="note" class="form-control">{{$card.note}}</textarea>
-					{{/if}}
-				</div>
-			</div>
-
-
-			<button type="submit" name="update" value="update_card" class="btn btn-primary btn-sm pull-right">{{$update}}</button>
-			<button type="submit" name="delete" value="delete_card" class="btn btn-danger btn-sm">{{$delete}}</button>
-			<button type="button" class="btn btn-outline-secondary btn-sm vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel">{{$cancel}}</button>
-			<div class="clear"></div>
-		</div>
-	</form>
-	{{/foreach}}
-</div>
diff --git a/view/theme/redbasic/tpl/cdav_calendar.tpl b/view/theme/redbasic/tpl/cdav_calendar.tpl
deleted file mode 100644
index 5d683d751..000000000
--- a/view/theme/redbasic/tpl/cdav_calendar.tpl
+++ /dev/null
@@ -1,349 +0,0 @@
-<script>
-
-var new_event = [];
-var new_event_id = Math.random().toString(36).substring(7);
-var views = {'month' : '{{$month}}', 'agendaWeek' : '{{$week}}', 'agendaDay' : '{{$day}}', 'listMonth' : '{{$list_month}}', 'listWeek' : '{{$list_week}}', 'listDay' : '{{$list_day}}'};
-
-$(document).ready(function() {
-	$('#calendar').fullCalendar({
-		eventSources: [ {{$sources}} ],
-
-		header: false,
-		eventTextColor: 'white',
-
-		lang: '{{$lang}}',
-		firstDay: {{$first_day}},
-
-		monthNames: aStr['monthNames'],
-		monthNamesShort: aStr['monthNamesShort'],
-		dayNames: aStr['dayNames'],
-		dayNamesShort: aStr['dayNamesShort'],
-		allDayText: aStr['allday'],
-
-		timeFormat: 'HH:mm',
-		timezone: 'local',
-
-		defaultTimedEventDuration: '01:00:00',
-		snapDuration: '00:15:00',
-
-		dayClick: function(date, jsEvent, view) {
-
-			if(new_event.length)
-				$('#calendar').fullCalendar( 'removeEventSource', new_event);
-
-			$('#event_uri').val('');
-			$('#id_title').val('New event');
-			$('#calendar_select').val($("#calendar_select option:first").val()).attr('disabled', false);
-			$('#id_dtstart').val(date.format());
-			$('#id_dtend').val(date.hasTime() ? date.add(1, 'hours').format() : date.add(1, 'days').format());
-			$('#id_description').val('');
-			$('#id_location').val('');
-			$('#event_submit').val('create_event').html('Create');
-			$('#event_delete').hide();
-
-			new_event = [{ id: new_event_id, title  : 'New event', start: $('#id_dtstart').val(), end: $('#id_dtend').val(), editable: true, color: '#bbb' }]
-			$('#calendar').fullCalendar( 'addEventSource', new_event);
-		},
-
-		eventClick: function(event, jsEvent, view) {
-
-			if(event.id == new_event_id) {
-				$(window).scrollTop(0);
-				$('.section-content-tools-wrapper, #event_form_wrapper').show();
-				$('#recurrence_warning').hide();
-				$('#id_title').focus().val('');
-				return false;
-			}
-
-			if($('main').hasClass('fullscreen') && view.type !== 'month' && event.rw)
-				$('#calendar').fullCalendar('option', 'height', 'auto');
-
-			if(new_event.length && event.rw) {
-				$('#calendar').fullCalendar( 'removeEventSource', new_event);
-			}
-
-			if(!event.recurrent && event.rw) {
-				var start_clone = moment(event.start);
-				var noend_allday = start_clone.add(1, 'day').format('YYYY-MM-DD');
-
-				$(window).scrollTop(0);
-				$('.section-content-tools-wrapper, #event_form_wrapper').show();
-				$('#recurrence_warning').hide();
-				$('#id_title').focus();
-
-				$('#event_uri').val(event.uri);
-				$('#id_title').val(event.title);
-				$('#calendar_select').val(event.calendar_id[0] + ':' + event.calendar_id[1]).attr('disabled', true);
-				$('#id_dtstart').val(event.start.format());
-				$('#id_dtend').val(event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday);
-				$('#id_description').val(event.description);
-				$('#id_location').val(event.location);
-				$('#event_submit').val('update_event').html('Update');
-				$('#event_delete').show();
-			}
-			else if(event.recurrent && event.rw) {
-				$('.section-content-tools-wrapper, #recurrence_warning').show();
-				$('#event_form_wrapper').hide();
-				$('#event_uri').val(event.uri);
-				$('#calendar_select').val(event.calendar_id[0] + ':' + event.calendar_id[1]).attr('disabled', true);
-			}
-		},
-
-		eventResize: function(event, delta, revertFunc) {
-
-			$('#id_title').val(event.title);
-			$('#id_dtstart').val(event.start.format());
-			$('#id_dtend').val(event.end.format());
-
-			$.post( 'cdav/calendar', {
-				'update': 'resize',
-				'id[]': event.calendar_id,
-				'uri': event.uri,
-				'dtstart': event.start ? event.start.format() : '',
-				'dtend': event.end ? event.end.format() : ''
-			})
-			.fail(function() {
-				revertFunc();
-			});
-		},
-
-		eventDrop: function(event, delta, revertFunc) {
-
-			var start_clone = moment(event.start);
-			var noend_allday = start_clone.add(1, 'day').format('YYYY-MM-DD');
-
-			$('#id_title').val(event.title);
-			$('#id_dtstart').val(event.start.format());
-			$('#id_dtend').val(event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday);
-
-			$.post( 'cdav/calendar', {
-				'update': 'drop',
-				'id[]': event.calendar_id,
-				'uri': event.uri,
-				'dtstart': event.start ? event.start.format() : '',
-				'dtend': event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday
-			})
-			.fail(function() {
-				revertFunc();
-			});
-		},
-
-		loading: function(isLoading, view) {
-			$('#events-spinner').spin('tiny');
-			$('#events-spinner > i').css('color', 'transparent');
-			if(!isLoading) {
-				$('#events-spinner').spin(false);
-				$('#events-spinner > i').css('color', '');
-			}
-		}
-	});
-
-	// echo the title
-	var view = $('#calendar').fullCalendar('getView');
-
-	$('#title').text(view.title);
-
-	$('#view_selector').html(views[view.name]);
-
-	$('.color-edit').colorpicker({ input: '.color-edit-input' });
-
-	$(document).on('click','#fullscreen-btn', on_fullscreen);
-	$(document).on('click','#inline-btn', on_inline);
-
-	$(document).on('click','#event_submit', on_submit);
-	$(document).on('click','#event_more', on_more);
-	$(document).on('click','#event_cancel, #event_cancel_recurrent', reset_form);
-	$(document).on('click','#event_delete, #event_delete_recurrent', on_delete);
-
-});
-
-function changeView(action, viewName) {
-	$('#calendar').fullCalendar(action, viewName);
-	var view = $('#calendar').fullCalendar('getView');
-
-	if($('main').hasClass('fullscreen'))
-		if(view.name !== 'month')
-			$('.section-content-tools-wrapper').css('display') === 'none' ? on_fullscreen() : on_inline() ;
-		else
-			on_fullscreen();
-	else
-		on_inline();
-
-	$('#title').text(view.title);
-	$('#view_selector').html(views[view.name]);
-}
-
-function add_remove_json_source(source, color, editable, status) {
-
-	if(status === undefined)
-		status = 'fa-calendar-check-o';
-
-	if(status === 'drop') {
-		reset_form();
-		$('#calendar').fullCalendar( 'removeEventSource', source );
-		return;
-	}
-
-	var parts = source.split('/');
-	var id = parts[4];
-
-	var selector = '#calendar-btn-' + id;
-
-	if($(selector).hasClass('fa-calendar-o')) {
-		$('#calendar').fullCalendar( 'addEventSource', { url: source, color: color, editable: editable });
-		$(selector).removeClass('fa-calendar-o');
-		$(selector).addClass(status);
-		$.get('/cdav/calendar/switch/' + id + '/1');
-	}
-	else {
-		$('#calendar').fullCalendar( 'removeEventSource', source );
-		$(selector).removeClass(status);
-		$(selector).addClass('fa-calendar-o');
-		$.get('/cdav/calendar/switch/' + id + '/0');
-	}
-}
-
-function on_fullscreen() {
-	var view = $('#calendar').fullCalendar('getView');
-	if(($('.section-content-tools-wrapper').css('display') === 'none') || ($('.section-content-tools-wrapper').css('display') !== 'none' && view.type === 'month'))
-		$('#calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
-}
-
-function on_inline() {
-	var view = $('#calendar').fullCalendar('getView');
-	((view.type === 'month') ? $('#calendar').fullCalendar('option', 'height', '') : $('#calendar').fullCalendar('option', 'height', 'auto'));
-}
-
-function on_submit() {
-	$.post( 'cdav/calendar', {
-		'submit': $('#event_submit').val(),
-		'target': $('#calendar_select').val(),
-		'uri': $('#event_uri').val(),
-		'title': $('#id_title').val(),
-		'dtstart': $('#id_dtstart').val(),
-		'dtend': $('#id_dtend').val(),
-		'description': $('#id_description').val(),
-		'location': $('#id_location').val()
-	})
-	.done(function() {
-		$('#calendar').fullCalendar( 'refetchEventSources', [ {{$sources}} ] );
-		reset_form();
-	});
-}
-
-function on_delete() {
-	$.post( 'cdav/calendar', {
-		'delete': 'delete',
-		'target': $('#calendar_select').val(),
-		'uri': $('#event_uri').val(),
-	})
-	.done(function() {
-		$('#calendar').fullCalendar( 'refetchEventSources', [ {{$sources}} ] );
-		reset_form();
-	});
-}
-
-function reset_form() {
-	$('.section-content-tools-wrapper, #event_form_wrapper, #recurrence_warning').hide();
-
-	$('#event_submit').val('');
-	$('#calendar_select').val('');
-	$('#event_uri').val('');
-	$('#id_title').val('');
-	$('#id_dtstart').val('');
-	$('#id_dtend').val('');
-
-	if(new_event.length)
-		$('#calendar').fullCalendar( 'removeEventSource', new_event);
-
-	if($('#more_block').hasClass('open'))
-		on_more();
-
-	if($('main').hasClass('fullscreen'))
-		on_fullscreen();
-}
-
-function on_more() {
-	if($('#more_block').hasClass('open')) {
-		$('#event_more').html('<i class="fa fa-caret-down"></i> {{$more}}');
-		$('#more_block').removeClass('open').hide();
-	}
-	else {
-		$('#event_more').html('<i class="fa fa-caret-up"></i> {{$less}}');
-		$('#more_block').addClass('open').show();
-	}
-}
-
-</script>
-
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="float-right">
-			<div class="dropdown">
-				<button id="view_selector" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"></button>
-				<div class="dropdown-menu">
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
-					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listMonth'); return false;">{{$list_month}}</a></li>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listWeek'); return false;">{{$list_week}}</a></li>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listDay'); return false;">{{$list_day}}</a></li>
-				</div>
-				<div class="btn-group">
-					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-					<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
-					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
-				</div>
-				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-				<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
-			</div>
-		</div>
-		<h2 id="title"></h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-tools-wrapper" style="display: none">
-		<div id="recurrence_warning" style="display: none">
-			<div class="section-content-warning-wrapper">
-				{{$recurrence_warning}}
-			</div>
-			<div>
-				<button id="event_delete_recurrent" type="button" class="btn btn-danger btn-sm">{{$delete_all}}</button>
-				<button id="event_cancel_recurrent" type="button" class="btn btn-outline-secondary btn-sm">{{$cancel}}</button>
-			</div>
-		</div>
-		<div id="event_form_wrapper" style="display: none">
-			<form id="event_form" method="post" action="">
-				<input id="event_uri" type="hidden" name="uri" value="">
-				{{include file="field_input.tpl" field=$title}}
-				<label for="calendar_select">{{$calendar_select_label}}</label>
-				<select id="calendar_select" name="target" class="form-control form-group">
-					{{foreach $writable_calendars as $writable_calendar}}
-					<option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}{{if $writable_calendar.sharer}} ({{$writable_calendar.sharer}}){{/if}}</option>
-					{{/foreach}}
-				</select>
-				<div id="more_block" style="display: none;">
-					{{include file="field_input.tpl" field=$dtstart}}
-					{{include file="field_input.tpl" field=$dtend}}
-					{{include file="field_textarea.tpl" field=$description}}
-					{{include file="field_textarea.tpl" field=$location}}
-				</div>
-				<div class="form-group">
-					<div class="pull-right">
-						<button id="event_more" type="button" class="btn btn-outline-secondary btn-sm"><i class="fa fa-caret-down"></i> {{$more}}</button>
-						<button id="event_submit" type="button" value="" class="btn btn-primary btn-sm"></button>
-
-					</div>
-					<div>
-						<button id="event_delete" type="button" class="btn btn-danger btn-sm">{{$delete}}</button>
-						<button id="event_cancel" type="button" class="btn btn-outline-secondary btn-sm">{{$cancel}}</button>
-					</div>
-					<div class="clear"></div>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="section-content-wrapper-np">
-		<div id="calendar"></div>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/cdav_widget_addressbook.tpl b/view/theme/redbasic/tpl/cdav_widget_addressbook.tpl
deleted file mode 100644
index c875dc977..000000000
--- a/view/theme/redbasic/tpl/cdav_widget_addressbook.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<div class="widget">
-	<h3>{{$addressbooks_label}}</h3>
-	{{foreach $addressbooks as $addressbook}}
-	<div id="addressbook-{{$addressbook.id}}" class="ml-3">
-		<div class="form-group">
-			<i class="fa fa-user generic-icons"></i><a href="/cdav/addressbook/{{$addressbook.id}}">{{$addressbook.displayname}}</a>
-			<div class="float-right">
-				<i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-addressbook-{{$addressbook.id}}')"></i>
-				<a href="/cdav/addressbooks/{{$addressbook.ownernick}}/{{$addressbook.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
-				<a href="#" onclick="dropItem('/cdav/addressbook/drop/{{$addressbook.id}}', '#addressbook-{{$addressbook.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-			</div>
-		</div>
-		<div id="edit-addressbook-{{$addressbook.id}}" class="sub-menu" style="display: none;">
-			<form id="edit-addressbook-{{$addressbook.id}}" method="post" action="">
-				<label for="edit-{{$addressbook.id}}">{{$edit_label}}</label>
-				<div id="edit-form-{{$addressbook.id}}" class="form-group">
-					<input id="id-{{$addressbook.id}}" name="id" type="hidden" value="{{$addressbook.id}}">
-					<input id="edit-{{$addressbook.id}}" name="{DAV:}displayname" type="text" value="{{$addressbook.displayname}}" class="form-control">
-				</div>
-				<div class="form-group">
-					<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
-				</div>
-			</form>
-		</div>
-	</div>
-	{{/foreach}}
-</div>
-
-<div class="widget">
-	<h3>{{$tools_label}}</h3>
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item">
-			<a class="nav-link" href="#" onclick="openClose('create-addressbook'); return false;"><i class="fa fa-user-plus generic-icons"></i> {{$create_label}}</a>
-		</li>
-		<div id="create-addressbook" class="sub-menu-wrapper">
-			<div class="sub-menu">
-				<form method="post" action="">
-					<div class="form-group">
-						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control form-group">
-						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
-					</div>
-				</form>
-			</div>
-		</div>
-		<li class="nav-item">
-			<a class="nav-link" href="#" onclick="openClose('upload-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
-		</li>
-		<div id="upload-form" class="sub-menu-wrapper">
-			<div class="sub-menu">
-					<div class="form-group">
-						<select id="import" name="target" class="form-control">
-							<option value="">{{$import_placeholder}}</option>
-							{{foreach $addressbooks as $addressbook}}
-							<option value="{{$addressbook.id}}">{{$addressbook.displayname}}</option>
-							{{/foreach}}
-						</select>
-					</div>
-					<div class="form-group">
-						<input class="form-control-file w-100" id="addressbook-upload-choose" type="file" name="userfile" />
-					</div>
-					<button class="btn btn-primary btn-sm" type="submit" name="a_upload" value="a_upload">{{$upload}}</button>
-				</form>
-			</div>
-		</div>
-	</ul>
-</div>
diff --git a/view/theme/redbasic/tpl/cdav_widget_calendar.tpl b/view/theme/redbasic/tpl/cdav_widget_calendar.tpl
deleted file mode 100644
index ec2257a19..000000000
--- a/view/theme/redbasic/tpl/cdav_widget_calendar.tpl
+++ /dev/null
@@ -1,121 +0,0 @@
-{{if $my_calendars}}
-<div class="widget">
-	<h3>{{$my_calendars_label}}</h3>
-	{{foreach $my_calendars as $calendar}}
-	<div id="calendar-{{$calendar.calendarid}}">
-		<div class="ml-3{{if !$calendar@last}} form-group{{/if}}">
-			<i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}fa-calendar-check-o{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}})" style="color: {{$calendar.color}};"></i>{{$calendar.displayname}}
-			<div class="float-right">
-				<i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-calendar-{{$calendar.calendarid}}')"></i>
-				<a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
-				<i id="share-icon" class="fa fa-share-alt fakelink generic-icons" onclick="openClose('share-calendar-{{$calendar.calendarid}}')"></i>
-				<a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-			</div>
-			<div id="share-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};">
-				{{if $calendar.sharees}}
-				{{foreach $calendar.sharees as $sharee}}
-				<div id="sharee-{{$calendar.calendarid}}" class="form-group">
-					<i class="fa fa-share generic-icons"></i>{{$sharee.name}}&nbsp;{{$sharee.access}}
-					<div class="pull-right">
-						<a href="#" onclick="dropItem('/cdav/calendar/dropsharee/{{$calendar.calendarid}}/{{$calendar.instanceid}}/{{$sharee.hash}}', '#sharee-{{$calendar.calendarid}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-					</div>
-				</div>
-				{{/foreach}}
-				{{/if}}
-				<form method="post" action="">
-					<label for="share-{{$calendar.calendarid}}">{{$share_label}}</label>
-					<input name="calendarid" type="hidden" value="{{$calendar.calendarid}}">
-					<input name="instanceid" type="hidden" value="{{$calendar.instanceid}}">
-					<div class="form-group">
-						<select id="share-{{$calendar.calendarid}}" name="sharee" class="form-control">
-							{{$sharee_options}}
-						</select>
-					</div>
-					<div class="form-group">
-						<select name="access" class="form-control">
-							{{$access_options}}
-						</select>
-					</div>
-					<div class="form-group">
-						<button type="submit" name="share" value="share" class="btn btn-primary btn-sm">{{$share}}</button>
-					</div>
-				</form>
-			</div>
-			<div id="edit-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};">
-				<form id="edit-calendar-{{$calendar.calendarid}}" method="post" action="" class="colorpicker-component color-edit">
-					<input id="id-{{$calendar.calendarid}}" name="id" type="hidden" value="{{$calendar.calendarid}}:{{$calendar.instanceid}}">
-					<input id="color-{{$calendar.calendarid}}" name="color" type="hidden" value="{{$calendar.color}}" class="color-edit-input">
-					<label for="edit-form-{{$calendar.calendarid}}">{{$edit_label}}</label>
-					<div id="edit-form-{{$calendar.calendarid}}" class="input-group form-group">
-						<input id="create-{{$calendar.calendarid}}" name="{DAV:}displayname" type="text" value="{{$calendar.displayname}}" class="form-control">
-						<span class="input-group-addon"><i></i></span>
-					</div>
-					<div class="form-group">
-						<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-	{{/foreach}}
-</div>
-{{/if}}
-
-{{if $shared_calendars}}
-<div class="widget">
-	<h3>{{$shared_calendars_label}}</h3>
-	{{foreach $shared_calendars as $calendar}}
-	<div id="shared-calendar-{{$calendar.calendarid}}" class="ml-3{{if !$calendar@last}} form-group{{/if}}">
-		<i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}{{if $calendar.access == 'read-write'}}fa-calendar-check-o{{else}}fa-calendar-times-o{{/if}}{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, {{if $calendar.access == 'read-write'}}'fa-calendar-check-o'{{else}}'fa-calendar-times-o'{{/if}})"  style="color: {{$calendar.color}};"></i>{{$calendar.displayname}} ({{$calendar.sharer}})
-		<div class="pull-right">
-			<a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
-			<a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#shared-calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-		</div>
-	</div>
-	{{/foreach}}
-</div>
-{{/if}}
-
-<div class="widget">
-	<h3>{{$tools_label}}</h3>
-	<div class="nav nav-pills flex-column">
-		<li class="nav-item">
-			<a class="nav-link" href="#" onclick="openClose('create-calendar'); return false;"><i class="fa fa-calendar-plus-o generic-icons"></i> {{$create_label}}</a>
-		</li>
-		<div id="create-calendar" class="sub-menu-wrapper">
-			<div class="sub-menu">
-				<form method="post" action="" class="colorpicker-component color-edit">
-					<input id="color" name="color" type="hidden" value="#3a87ad" class="color-edit-input">
-					<div id="create-form" class="input-group form-group">
-						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control">
-						<span class="input-group-addon"><i></i></span>
-					</div>
-					<div class="form-group">
-						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
-					</div>
-				</form>
-			</div>
-		</div>
-		<li class="nav-item">
-			<a class="nav-link" href="#" onclick="openClose('upload-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
-		</li>
-		<div id="upload-form" class="sub-menu-wrapper">
-			<div class="sub-menu">
-				<form enctype="multipart/form-data" method="post" action="">
-					<div class="form-group">
-						<select id="import" name="target" class="form-control">
-							<option value="">{{$import_placeholder}}</option>
-							{{foreach $writable_calendars as $writable_calendar}}
-							<option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}</option>
-							{{/foreach}}
-						</select>
-					</div>
-					<div class="form-group">
-						<input class="form-control-file w-100" id="event-upload-choose" type="file" name="userfile" />
-					</div>
-					<button class="btn btn-primary btn-sm" type="submit" name="c_upload" value="c_upload">{{$upload}}</button>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/channel.tpl b/view/theme/redbasic/tpl/channel.tpl
deleted file mode 100755
index 1a84f1e66..000000000
--- a/view/theme/redbasic/tpl/channel.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-<div class="section-subtitle-wrapper">
-	<div class="pull-right">
-		{{if $channel.default_links}}
-		{{if $channel.default}}
-		<div>
-			<i class="fa fa-check-square-o"></i>&nbsp;{{$msg_default}}
-		</div>
-		{{else}}
-		<a href="manage/{{$channel.channel_id}}/default" class="make-default-link">
-			<i class="fa fa-square-o"></i>&nbsp;{{$msg_make_default}}
-		</a>
-		{{/if}}
-		{{/if}}
-		{{if $channel.delegate}}
-			{{$delegated_desc}}
-		{{/if}}
-	</div>
-	<h3>
-		{{if $selected == $channel.channel_id}}
-		<i class="selected-channel fa fa-circle" title="{{$msg_selected}}"></i>
-		{{/if}}
-		{{if $channel.delegate}}
-		<i class="fa fa-arrow-circle-right" title="{{$delegated_desc}}"></i>
-		{{/if}}
-		{{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" title="{{$channel.channel_name}}">{{/if}}
-			{{$channel.channel_name}}
-		{{if $selected != $channel.channel_id}}</a>{{/if}}
-	</h3>
-	<div class="clear"></div>
-</div>
-<div class="section-content-wrapper">
-	<div class="channel-photo-wrapper">
-		{{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}">{{/if}}
-			<img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" />
-		{{if $selected != $channel.channel_id}}</a>{{/if}}
-	</div>
-	<div class="channel-notifications-wrapper">
-		{{if !$channel.delegate}}
-		<div class="channel-notification">
-			<i class="fa fa-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i>
-			{{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}}
-		</div>
-		<div class="channel-notification">
-			<i class="fa fa-user{{if $channel.intros != 0}} new-notification{{/if}}"></i>
-			{{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}}
-		</div>
-		{{/if}}
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/channel_id_select.tpl b/view/theme/redbasic/tpl/channel_id_select.tpl
deleted file mode 100644
index ecebd4bc0..000000000
--- a/view/theme/redbasic/tpl/channel_id_select.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{if $channels}}
-<select name="dest_channel" id="dest-channel-select"> 
-{{foreach $channels as $c}}
-<option {{if $c.channel_id == $selected}}selected="selected"{{/if}} value="{{$c.channel_id}}">{{$c.channel_name}}</option>
-{{/foreach}}
-</select>
-{{/if}}
\ No newline at end of file
diff --git a/view/theme/redbasic/tpl/channel_import.tpl b/view/theme/redbasic/tpl/channel_import.tpl
deleted file mode 100755
index baffe9b06..000000000
--- a/view/theme/redbasic/tpl/channel_import.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<h2>{{$title}}</h2>
-
-<form action="import" method="post" enctype="multipart/form-data" id="import-channel-form">
-	<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-	<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>
-
-	<label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label>
-	<input type="file" name="filename" id="import-filename" class="import-input" value="" />
-	<div id="import-filename-end" class="import-field-end"></div>
-
-	<div id="import-choice" class="descriptive-paragraph">{{$choice}}</div>
-
-	<label for="import-old-address" id="label-import-old-address" class="import-label" >{{$label_old_address}}</label>
-	<input type="text" name="old_address" id="import-old-address" class="import-input" value="" />
-	<div id="import-old-address-end" class="import-field-end"></div>
-
-	<label for="import-old-email" id="label-import-old-email" class="import-label" >{{$label_old_email}}</label>
-	<input type="text" name="email" id="import-old-email" class="import-input" value="{{$email}}" />
-	<div id="import-old-email-end" class="import-field-end"></div>
-
-	<label for="import-old-pass" id="label-import-old-pass" class="import-label" >{{$label_old_pass}}</label>
-	<input type="password" name="password" id="import-old-pass" class="import-input" value="{{$pass}}" />
-	<div id="import-old-pass-end" class="import-field-end"></div>
-
-	<input type="checkbox" name="import_posts" id="import-posts" value="1" />
-	<label for="import-posts" id="label-import-posts">{{$label_import_posts}}</label>
-	<div id="import-posts-end" class="import-field-end"></div>
-
-	<div id="import-common-desc" class="descriptive-paragraph">{{$common}}</div>
-
-	<input type="checkbox" name="make_primary" id="import-make-primary" value="1" />
-	<label for="import-make-primary" id="label-import-make-primary">{{$label_import_primary}}</label>
-	<div id="import-make-primary-end" class="import-field-end"></div>
-
-	<input type="checkbox" name="moving" id="import-moving" value="1" />
-	<label for="import-moving" id="label-import-moving">{{$label_import_moving}}</label>
-	<div id="import-moving-end" class="import-field-end"></div>
-
-	<input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" />
-	<div id="import-submit-end" class="import-field-end"></div>
-
-	<div id="import-common-desc" class="descriptive-paragraph">{{$pleasewait}}</div>
-</form>
diff --git a/view/theme/redbasic/tpl/channels.tpl b/view/theme/redbasic/tpl/channels.tpl
deleted file mode 100755
index f484b49e5..000000000
--- a/view/theme/redbasic/tpl/channels.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<a class="btn btn-success btn-sm pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="fa fa-plus-circle"></i>&nbsp;{{$create.2}}</a>
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper-np">
-		{{if $channel_usage_message}}
-		<div id="channel-usage-message" class="section-content-warning-wrapper">
-			{{$channel_usage_message}}
-		</div>
-		{{/if}}
-		<div id="channels-desc" class="section-content-info-wrapper">
-			{{$desc}}
-		</div>
-		{{foreach $all_channels as $chn}}
-			{{include file="channel.tpl" channel=$chn}}
-		{{/foreach}}
-		{{if $delegates}}
-			{{foreach $delegates as $chn}}
-				{{include file="channel.tpl" channel=$chn}}
-			{{/foreach}}
-		{{/if}}
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/chanview.tpl b/view/theme/redbasic/tpl/chanview.tpl
deleted file mode 100755
index 39fafaf8e..000000000
--- a/view/theme/redbasic/tpl/chanview.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<a href="{{$url}}">{{$url}}</a>
diff --git a/view/theme/redbasic/tpl/chat.tpl b/view/theme/redbasic/tpl/chat.tpl
deleted file mode 100644
index 22f3465bf..000000000
--- a/view/theme/redbasic/tpl/chat.tpl
+++ /dev/null
@@ -1,346 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			{{if $is_owner}}
-			<form id="chat-destroy" method="post" action="chat">
-				<input type="hidden" name="room_name" value="{{$room_name}}" />
-				<input type="hidden" name="action" value="drop" />
-				<button class="btn btn-danger btn-sm" type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$drop}}</button>
-			</form>
-			{{/if}}
-			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
-		</div>
-		<h2>{{$room_name}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div id="chatContainer" class="section-content-wrapper">
-		<div id="chatTopBar">
-			<div id="chatLineHolder"></div>
-		</div>
-		<div class="clear"></div>
-		<div id="chatBottomBar" >
-			<form id="chat-form" method="post" action="#">
-				<input type="hidden" name="room_id" value="{{$room_id}}" />
-				<div class="form-group">
-					<textarea id="chatText" name="chat_text" class="form-control"></textarea>
-				</div>
-				<div id="chat-submit-wrapper">
-					<div id="chat-submit" class="dropup pull-right">
-						<button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="fa fa-cog"></i></button>
-						<button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
-						<div class="dropdown-menu dropdown-menu-right">
-							<a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online"><i class="fa fa-circle online"></i>&nbsp;{{$online}}</a>
-							<a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away"><i class="fa fa-circle away"></i>&nbsp;{{$away}}</a>
-							<a class="dropdown-item" href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave"><i class="fa fa-circle leave"></i>&nbsp;{{$leave}}</a>
-                       					<div class="dropdown-divider"></div>
-                        				<a id="toggle-notifications" class="dropdown-item" href="" onclick="toggleChatNotifications(); return false;"><i id="toggle-notifications-icon" class="fa fa-bell-slash-o"></i>&nbsp;Toggle notifications</a>
-                        				<a id="toggle-notifications-audio" class="dropdown-item disabled" href="" onclick="toggleChatNotificationAudio(); return false;"><i id="toggle-notifications-audio-icon" class="fa fa-volume-off"></i>&nbsp;Toggle sound</a>
-							{{if $bookmark_link}}
-                         				<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="{{$bookmark_link}}" target="_blank" ><i class="fa fa-bookmark"></i>&nbsp;{{$bookmark}}</a>
-							{{/if}}
-						</div>
-					</div>
-					<div id="chat-tools" class="btn-toolbar pull-left">
-						<div class="btn-group mr-2">
-							<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'chatText'); return false;">
-								<i class="fa fa-bold jot-icons"></i>
-							</button>
-							<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'chatText'); return false;">
-								<i class="fa fa-italic jot-icons"></i>
-							</button>
-							<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'chatText'); return false;">
-								<i class="fa fa-underline jot-icons"></i>
-							</button>
-							<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'chatText'); return false;">
-								<i class="fa fa-quote-left jot-icons"></i>
-							</button>
-							<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'chatText'); return false;">
-								<i class="fa fa-terminal jot-icons"></i>
-							</button>
-						</div>
-						<div class="btn-group mr-2 d-none d-md-flex">
-							<button id="chat-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="chatJotGetLink(); return false;" >
-								<i id="chat-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i>
-							</button>
-						</div>
-						{{if $feature_encrypt}}
-						<div class="btn-group mr-2 d-none d-md-flex">
-							<button id="chat-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="red_encrypt('{{$cipher}}', '#chatText', $('#chatText').val()); return false;">
-								<i id="chat-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i>
-							</button>
-						</div>
-						{{/if}}
-						<div class="btn-group dropup d-md-none">
-							<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
-							</button>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" href="#" onclick="chatJotGetLink(); return false;" ><i class="fa fa-link"></i>&nbsp;{{$insert}}</a>
-								{{if $feature_encrypt}}
-								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}', '#chatText' ,$('#chatText').val()); return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
-								{{/if}}
-							</div>
-						</div>
-					</div>
-					<div id="chat-rotator-wrapper" class="pull-left">
-						<div id="chat-rotator"></div>
-					</div>
-					<div class="clear"></div>
-				</div>
-			</form>
-		</div>
-	</div>
-</div>
-
-<script>
-var room_id = {{$room_id}};
-var last_chat = 0;
-var chat_timer = null;
-
-$(document).ready(function() {
-	$('#chatTopBar').spin('small');
-	chat_timer = setTimeout(load_chats,300);
-	$('#chatroom_bookmarks, #vcard').hide();
-	$('#chatroom_list, #chatroom_members').show();
-	adjustInlineTopBarHeight();
-    chatNotificationInit();
-});
-
-$(window).resize(function () {
-	if($('main').hasClass('fullscreen')) {
-		adjustFullscreenTopBarHeight();
-	}
-	else {
-		adjustInlineTopBarHeight();
-	}
-});
-
-$('#chat-form').submit(function(ev) {
-	$('body').css('cursor','wait');
-	$.post("chatsvc", $('#chat-form').serialize(),function(data) {
-			if(chat_timer) clearTimeout(chat_timer);
-			$('#chatText').val('');
-			load_chats();
-			$('body').css('cursor','auto');
-		},'json');
-	ev.preventDefault();
-});
-
-function load_chats() {
-	$.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat + ((stopped) ? '&stopped=1' : ''),function(data) {
-		if(data.success && (! stopped)) {
-			update_inroom(data.inroom);
-			update_chats(data.chats);
-			$('#chatTopBar').spin(false);
-		}
-	});
-	
-	chat_timer = setTimeout(load_chats,10000);
-
-}
-
-var previousChatRoomMembers = null; // initialize chat room member change register
-var currentChatRoomMembers = null; // initialize chat room member change register
-function update_inroom(inroom) {
-	var html = document.createElement('div');
-	var count = inroom.length;
-	$.each( inroom, function(index, item) {
-		var newNode = document.createElement('div');
-		newNode.setAttribute('class', 'member-item');
-		$(newNode).html('<img class="menu-img-2" src="' + item.img + '" alt="' + item.name + '" /> ' + '<span class="contactname">' + item.name + '</span><span class="' + item.status_class + '">' + item.status + '</span>');
-		html.appendChild(newNode);
-	});
-    memberChange = chatRoomMembersChange(inroom); // get list of arrivals and departures
-    if(memberChange.membersArriving.length > 0) {
-      // Issue pop-up notification if anyone enters the room.
-      chat_issue_notification(JSON.stringify(memberChange.membersArriving.pop().name) + ' entered the room', 'Hubzilla Chat');
-    }
-	$('#chatMembers').html(html);
-}
-
-// Determine if the new list of chat room members has any new members or if any have left
-function chatRoomMembersChange(inroom) {
-    previousChatRoomMembers = currentChatRoomMembers;
-    currentChatRoomMembers = inroom;
-      var membersArriving = [];
-      var membersLeaving = [];
-    if(previousChatRoomMembers !== null) {
-      var newMember = false;
-      $.each( currentChatRoomMembers, function(index, currMember) {
-        newMember = true;
-        $.each( previousChatRoomMembers, function(index, prevMember) {
-          if (prevMember.name === currMember.name) {
-              newMember = false;
-          }
-        });
-        if (newMember === true) {
-          membersArriving.push(currMember);
-        }
-      });
-    }
-    return {membersArriving: membersArriving, membersLeaving: membersLeaving};
-}
-
-function update_chats(chats) {
-	var count = chats.length;
-	$.each( chats, function(index, item) {
-		last_chat = item.id;
-		var newNode = document.createElement('div');
-
-		if(item.self) {
-			newNode.setAttribute('class', 'chat-item-self clear');
-			$(newNode).html('<div class="chat-body-self"><div class="chat-item-title-self wall-item-ago"><span class="chat-item-name-self">' + item.name + ' </span><span class="autotime chat-item-time-self" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text-self">' + item.text + '</div></div><img class="chat-item-photo-self" src="' + item.img + '" alt="' + item.name + '" />');
-		}
-		else {
-			newNode.setAttribute('class', 'chat-item clear');
-			$(newNode).html('<img class="chat-item-photo" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body"><div class="chat-item-title wall-item-ago"><span class="chat-item-name">' + item.name + ' </span><span class="autotime chat-item-time" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text">' + item.text + '</div></div>');
-            chat_issue_notification(item.name + ':\n' + item.text, 'Hubzilla Chat');
-		}
-		$('#chatLineHolder').append(newNode);
-		$(".autotime").timeago();
-
-		var elem = document.getElementById('chatTopBar');
-		elem.scrollTop = elem.scrollHeight;
-	});
-}
-
-var chat_notify_granted = false; // Initialize notification permission to denied
-var chat_notify_enabled = false;
-var chat_notify_audio_enabled = false;
-var chat_notify_audio = {};
-// Request notification access from the user
-// TODO: Check Hubzilla member config setting before requesting permission
-function chatNotificationInit() {
-  
-    if (!("Notification" in window)) {
-        window.console.log("This browser does not support system notifications");
-    }
-    // Let's check whether notification permissions have already been granted
-    else if (Notification.permission === "granted") {
-        // If it's okay let's create a notification
-        chat_notify_granted = true; //var notification = new Notification("Hi there!");
-    }
-
-    // Otherwise, we need to ask the user for permission
-    else if (Notification.permission !== 'denied') {
-        Notification.requestPermission(function (permission) {
-            // If the user accepts, let's create a notification
-            if (permission === "granted") {
-                chat_notify_granted = true; //var notification = new Notification("Hi there!");
-            }
-        });
-    }
-    // Encode a wav audio file in base64 and create the audio object for game alerts
-    //var base64string = 'UklGRr4VAABXQVZFZm10IBAAAAABAAEAIlYAACJWAAABAAgAZGF0YZkVAACAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIBxcnJycoGNjY2NjYyMjIyMg3FxcXFxcXJycnJ0jY2NjY2NjIyMjIx1cXFxcXFxcnJycoKNjY2NjY2MjIyMgXFxcXFxcXJycnJ2jY2NjY2NjIyMjIxzcXFxcXFxcnJycoSNjY2NjY2MjIyMgHFxcXFxcXJycnJ4jY2NjY2NjIyMjIxycXFxcXFycnJycoWNjY2NjY2MjIyMf3FxcXFxcXJycnJ5jY2NjY2NjIyMjIxxcXFxcXFycnJycoeNjY2NjY2MjIyMfnFxcXFxcXJycnJ7jY2NjY2NjIyMjIpxcXFxcXFycnJycomNjY2NjYyMjIyMfHFxcXFxcXJycnJ8jY2NjY2NjIyMjIhycnJycoyLi4uLi4uLioqKfHFxcXFxcnJycnJyc4yMjIuLi4uLi4uKin5xcXFxcnJycnJyc3OMjIyMi4uLi4uLi4p/cXFxcnJycnJyc3Nzi4yMjIyLi4uLi4uLgHBwcXFxcXFxcnJycouNjY2NjYyMjIyMjIBwcHFxcXFxcXJycnKLjY2NjY2MjIyMjIyBcHFxcXFxcXJycnJyio2NjY2NjIyMjIyMgnBxcXFxcXFycnJycomNjY2NjY2MjIyMjINwcXFxcXFxcnJycnKIjY2NjY2NjIyMjIyEcHFxcXFxcXJycnJyh42NjY2NjYyMjIyMhXBxcXFxcXFycnJycoaNjY2NjY2MjIyMjIZwcXFxcXFxcnJycnKFjY2NjY2NjIyMjIyHcHFxcXFxcXJycnJyhI2NjY2NjYyMjIyMiHBxcXFxcXFycnJycoONjY2NjY2MjIyMjIlwcXFxcXFxcnJycnKCjY2NjY2NjIyMjIyKcHFxcXFxcXJycnJygY2NjYyMjIyLi4uLi4uLioqKioqKdnBxcXFxcXFycnKAi4uLi4uLioqKioJxcXFxcXFycnJydIyMi4uLi4uLi4qKdXFxcXFycnJycnKBjIyLi4uLi4uLioFxcXFycnJycXFydY2NjYyMjIyMjIyLc3BwcXFxcXFxcnKDjY2NjIyMjIyMjIBwcHFxcXFxcXJyd42NjY2MjIyMjIyMcnBxcXFxcXFycnKFjY2NjYyMjIyMjH9wcXFxcXFxcnJyeY2NjY2NjIyMjIyMcHFxcXFxcXJycnKHjY2NjY2MjIyMjH5xcXFxcXFycnJyeo2NjY2NjIyMjIyKcHFxcXFxcXJycnKIjY2NjY2MjIyMjHxxcXFxcXFycnJyfI2NjY2NjYyMjIyJcXFxcXFxcXJycnKKjY2NjY2MjIyMjHtxcXFxcXFycnJyfo2NjY2NjYyMjIyHcXFxcXFxcnJycnKMjY2NjY2MjIuLi3lycnJycnJzc3Nzf4yMjIyMjIuLi4uFcnJycnJycnNzc3OMjIyMjIyMi4uLi3hycnJycnJzc3NzgIyMjIyMjIuLi4uDcnJycnJycnNzc3SMjIyMjIyMi4uLi3dycnJycnJzc3NzgYyMjIyMjIuLi4uCcnJycnJyc3Nzc3aMjIyMjIyMi4uLi3VycnJycnJzc3Nzg4yMjIyMjIuLi4uAcnJycnJyc3Nzc3eMjIyMjIyMi4uLi3RycnJycnJzc3NzhIyMjIyMjIuLi4uAcnJycnJyc3Nzc3mMjIyMjIyMi4uLi3JycnJycnJzc3NzhoyMjIyMjIuLi4t+cnJycnJyc3Nzc3qMjIyMjIyLi4uLinJycnNzc3N0dHR0h4uLi4uLi4qKiop9c3Nzc3Nzc3R0dHyLi4uLi4uLioqKiHNzc3Nzc3N0dHR0iIuLi4uLi4qKiop8c3Nzc3Nzc3R0dH2Li4uLi4uLioqKhnNzc3Nzc3N0dHR0iYuLi4uLi4qKiop6c3Nzc3Nzc3R0dH+Li4uLi4uLioqKhXNzc3Nzc3N0dHR0i4uLi4uLi4qKiop5c3Nzc3Nzc3R0dICLi4uLi4uLioqKhHNzc3Nzc3N0dHR1i4uLi4uLi4qKiop4c3Nzc3NzdHR0dIGLi4uLi4uLioqKgnNzc3Nzc3N0dHR2i4uLi4uLi4qKiop2c3Nzc3NzdHR0dIKLi4uLi4uLioqKgXNzc3Nzc3N0dHR3i4uLi4uLi4qKiol2dHR0dHR0dHV1dYOKioqKioqKiYmJgHR0dHR0dHR0dXV5ioqKioqKiomJiYl0dHR0dHR0dHV1dYSKioqKioqKiYmJf3R0dHR0dHR0dXV7ioqKioqKiomJiYl0dHR0dHR0dHV1dYaKioqKioqKiYmJfnR0dHR0dHR1dXV8ioqKioqKioqJiYd0dHR0dHR0dHV1dYeKioqKioqKiYmJfHR0dHR0dHR1dXV9ioqKioqKiomJiYZ0dHR0dHR0dHV1dYiKioqKioqKiYmJe3R0dHR0dHR1dXV+ioqKioqKiomJiYV0dHR0dHR0dHV1dYmKioqKioqKiYmJenR0dHR0dHR1dXWAioqKiYmJiYmIiIN1dXV1dXV1dXZ2domJiYmJiYmJiYiIeXV1dXV1dXV1dnaAiYmJiYmJiYmIiIJ1dXV1dXV1dXZ2d4mJiYmJiYmJiYiIeHV1dXV1dXV1dnaBiYmJiYmJiYmIiIF1dXV1dXV1dXZ2eImJiYmJiYmJiYiId3V1dXV1dXV1dnaCiYmJiYmJiYmIiIB1dXV1dXV1dXZ2eYmJiYmJiYmJiIiIdnV1dXV1dXV1dnaDiYmJiYmJiYmIiH91dXV1dXV1dXZ2e4mJiYmJiYmJiIiIdXV1dXV1dXV1dnaFiYmJiYmJiYmIiH51dXV1dXV1dXZ2fImJiYmJiYmJiIiHdXV1dXV1dXV1dnaGiYmJiYmJiYmIiH11dXV1dXV1dXZ2fYiIiIiIiIiIiIiFdnZ2dnZ2dnZ2d3eGiIiIiIiIiIiIh3x2dnZ2dnZ2dnd3foiIiIiIiIiIiIeEdnZ2dnZ2dnZ2d3eHiIiIiIiIiIiIh3t2dnZ2dnZ2dnZ3f4iIiIiIiIiIiIeDdnZ2dnZ2dnZ2d3eIiIiIiIiIiIiIh3p2dnZ2dnZ2dnZ3gIiIiIiIiIiIiIeCdnZ2dnZ2dnZ2d3iIiIiIiIiIiIiIh3l2dnZ2dnZ2dnZ3gIiIiIiIiIiIiIeBdnZ2dnZ2dnZ2d3mIiIiIiIiIiIiHh3h2dnZ2dnZ2dnZ3goiIiIiIiIiIiIeAdnZ2dnZ2dnZ2d3qIiIiIiIiIiIiHh3d2dnZ2dnZ2dnZ3g4iIiIiIh4eHh4eAd3d3d3d3d3d3d3uHh4eHh4eHh4eHhnd3d3d3d3d3d3d3g4eHh4eHh4eHh4d/d3d3d3d3d3d3d3yHh4eHh4eHh4eHhnd3d3d3d3d3d3d4hIeHh4eHh4eHh4d+d3d3d3d3d3d3d32Hh4eHh4eHh4eHhXd3d3d3d3d3d3d4hYeHh4eHh4eHh4d9d3d3d3d3d3d3d36Hh4eHh4eHh4eHhHd3d3d3d3d3d3d4hoeHh4eHh4eHh4d8d3d3d3d3d3d3d3+Hh4eHh4eHh4eHg3d3d3d3d3d3d3d4h4eHh4eHh4eHh4d7d3d3d3d3d3d3d4CHh4eHh4eHh4eHgnd3d3d3d3d3d3d5h4aGhoaGhoaGhoZ7eHh4eHh4eHh4eICGhoaGhoaGhoaGgXh4eHh4eHh4eHh6h4aGhoaGhoaGhoZ6eHh4eHh4eHh4eIGGhoaGhoaGhoaGgHh4eHh4eHh4eHh7hoaGhoaGhoaGhoZ5eHh4eHh4eHh4eIKGhoaGhoaGhoaGgHh4eHh4eHh4eHh7hoaGhoaGhoaGhoZ4eHh4eHh4eHh4eIKGhoaGhoaGhoaGf3h4eHh4eHh4eHh8hoaGhoaGhoaGhoV4eHh4eHh4eHh4eIOGhoaGhoaGhoaGfnh4eHh4eHh4eHh9hoaGhoaGhoaGhoR4eHh4eHh4eHh4eISGhoaGhoaGhoaGfXh4eHh4eHh4eHh+hoaGhoaGhoaGhoR4eHh4eHh5eXl5eYSFhYWFhYWFhYWFfXl5eXl5eXl5eXl/hYWFhYWFhYWFhYJ5eXl5eXl5eXl5eYWFhYWFhYWFhYWFfHl5eXl5eXl5eXmAhYWFhYWFhYWFhYF5eXl5eXl5eXl5eYWFhYWFhYWFhYWFe3l5eXl5eXl5eXmAhYWFhYWFhYWFhYF5eXl5eXl5eXl5eoWFhYWFhYWFhYWFe3l5eXl5eXl5eXmAhYWFhYWFhYWFhYB5eXl5eXl5eXl5e4WFhYWFhYWFhYWFenl5eXl5eXl5eXmBhYWFhYWFhYWFhYB5eXl5eXl5eXl5fIWFhYWFhYWFhYWFeXl5eXl5eXl5eXmChYWFhYWFhYWFhX95enp6f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f4CAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAA';
-    var base64string = 'UklGRvQbAABXQVZFZm10IBAAAAABAAEAIlYAAESsAAACABAAZGF0YdAbAADk/qz+y/5X/pP+Pv53/j/+UP5//p7+nf6j/rf+HP/u/gP/Ff/B/v/+3/63/qz+sf6G/pn+U/6h/hL+ef5o/qz+hf6q/tf+SP/k/i7/7v4b/6f+M//S/hv/uf7Y/nX+3/5k/sz+V/6f/nT+kf6V/uv+4v48/9T+Vf/S/vT++f72/sD+zP7c/uD+k/5t/rv+Tv7G/lX+fv6W/un+/v7//jz/KP8v/z3/E/9g/+H+m//1/kr//P5O/+r+NP/R/g//4P4a/zz/ff+6//n/jP/8/0z/cf8f/xX//f4t/+z+4v6q/gj/qv5y/kv+mP7V/oX+gP7l/gX/+f7f/pH+P/7f/UD+KP5E/hH+RP4H/m7+/v1S/gT+h/4Q/j/+GP4P/tH98P27/ST++v1F/gz+Hv6v/WH+Lf63/hz+UP43/ov+oP5y/jX+TP6C/v3+xP69/l7+nv7t/uH+MP/X/pz+uP6T/ij+V/5B/i3/d/1Q+xH7z/tL+3X7+/0oBFkF2QS1CcILQwrTDmQTChOuEfwTuw4hBaL8/fey+VH9ff20/D79f/3L+eD2bvHQ587gC9t20FnG2cN5xYPFbMV0xuHIUsqUyu3N6NxK7SL0DfqRBIoP7RecHxApjTF4M4Uvqyp6KvUpuybyIjIhPR5PHAcbVxglFf8SDRAADWEIWwNw/Pz3o/Pl8V/1fvsn/Zb9XQBtBuoJkAtaD0YVZBfDFXUUaxSHFNUVmRZDFj4WMBZbFokU1BG0D5APIg/cDZwJAAfSBeEFGAMLAOr+Tf0b+y/6CvrF+hz65fmH+R766fkD/DD9zP26/E/+1gBHAsMC8wPBBRYFlANfBJcFdgWAA68CvgLdArsByQBpAOn/cf7m/X39rfvT+V/4oPcg9QHzW/QW9vv0DPR79cT3/fZ99WL1+/aI96j4Dfkm+sH6oPwe/av98/39/2oBtwFUAa4BIQJ+AnUAZf+5/4cA6v4e/cH89fy++yj7o/lh+Ef3OfcR9xf25/SK9Db0UPPT8eLxUvSI9GvzTvMY9cj13PUh9rL30Pex+Nj58Prc+l77svyJ/sv+JQDGAPMA+f8FAO//JgD0/9z/1P94/yH9Yfte+iX7rvrz+ML3HfeP9sr1K/Ua9ov2PfaJ9un2OfeZ98T3wff8+Tz83v3x/RH/EgBYAXcCiAMyBJEE8AQwBR4FLQbaBvEHegemBrEFTAXEA9sBR/7f/KP8f/yU+oL4Ifjh9vX0XfQT9Gv06/PW853z+vOp9JL1r/aZ+Bn6RPup/Mf9xv80AfsCiwQ5BW0GVQcHCOwIFAo3C44KSAmnBzMHNAfKBg8FDQT3AawBAwE0ALz+4f1K/Xz92Pwk/eL8J/0J/P37qvxM/J77YvxN/WL+xv7D/0UAqAAQAbcBWwMkBbQGVgdIBzsIDgmICXkKJAq6Ci0L1wvrCqkKtApGC2EKWQlsCb8JYghYBzsGaAbeBrkGlQSHAgMB7wCG/wf/pv5l/jP9rvzh+y/8Wvsz+/H7EP2n/tX/NgAgAZMBzgNWBV0GGwcnCBAKIwtKDKEMVA1jDZoNFA2VDAUMggsKC20KQwo8CaEHtAZfBUwEoQK6ATYA1P8//jb9DPt9+lX6xfoB+iT6cPo0++T7yfwe/fX9l/6y/0MAmQHiAvMDCAVyBpAHpQgTCcUJHwoPCxgMdwzZDCUNJg0tDWoMswvbCm8JugimB7UGgAUtBIICUQH0/1n/SP10/Df7SPoO+YH4wPiR+ez5gfpg+k37FPxi/fD9AP8PAEwBTQI1BGQFpQeuCZ8LKg33DgMQ1xABESkR3RCWEMUPkA4wDQoLHQkgB7QF8AOXAe7+fv2X+zf6yvgf9y31KPS285XzLPSp9Rn2IPeO91L50Prk/Eb+bgBPAt0E7AbFCeoL8w2ODx4RARIdE9AS9hJgEs4RDBBsDqQMQQr5B6cFGANwAGn9l/rz9/T0kvKQ8Azv4u1Z7ffsuuyl7S3vG/AX8cvxKPS59S34QfoE/fX/awNbBT0ICwrnDCMOdg9NEO0Q0BCsEMoPHA85DUwL1wieBtoDTQGD/r37cPhT9ZHyefBZ7u7rnupz6Zjox+jU6HzpOOo06/TsYe7F8DXzJPad+Hv7rP4lAtkE2wf7CRQMcw2DDhUPtw84D3IPIQ7QDKkKdAgWBq8D+QAz/nf6b/f0853wzOzq6YznlOUa5FXjTeIo4l7iKeP24/TlNOgy6p/ske/o8uX1F/k+/I7/HgIfBfIG4QgTChsLwwtdC7IKHQlYB8wFkwL5/2H8Z/lF9ejxqu3z6RnlpOFa3u/b8tmI2HbXHNfC1q3Xq9g+2gvcct4P4aHk0eeM677vrPNw9/b6Wv5pAQ4E6gVjB4oIPQnlCKgIuAdABgQExAGM/qz7n/cE9Hzv9Orf5QTinN3V2mrXINXf0pTR1NDo0G3RCtPy1NfXKtqc3bLgMOWq6VTupfIP9wf78f5AAh8FhAetCRELHAz0C8YLZAoFCYAGuwMTADz8a/jd84PvruoY5hfh89zg2HXWctMm0VXPvs51z/3QLNN41STYfdvO3m7joOfY7Dbx9PVk+uH/pQP6B/EKjw2xDyERFRJxEroRzRCYDpAMYAn3BbkBk/0R+Tz0PO/b6ebkMOB+3MrYMtaX037SEdL00tTU0Nd52mrdmOC55EnoVO0r8hj4XP3wAsoHIA3GEF4UKRegGWIbZhyCHEscxRrjGN0V+RIYD84KtQV/AEf7P/Z/8Z7smOfK43Tg/d0e3BzbfNvh3CzffuHI5EvozeuV7xf0m/h1/TMCLggGDt4T/BcgHO8fEyM5JdcmVietJw0n+iWTI6ggnRwyGYwUmg8aCv8E/f7K+X70L/D/69voueU/5NXjsORm5g3oZeoR7mzxSvXG+B39uwG9Bs8LsRB+FskcdCIjJz4r0y1LML0xxDKTMt8xxTBULqormygsJL8fSRofFcAOYgkoA9X9n/j29K3wr+2t6/nrmuy07UbvUfH48lz1Wvhk/XkCcQg7DiQUZxk/HlkjVClLLrcyQDZzOLU6STvJO+86RDlXN1g0oDBuLJsnNyJZHFEW6A9qCkME+f7N+aP19PFX8IHv8e+y75zvi/BY8wb3AvuT/48EWwk4D/4URxuXINIlmyoGMMU0qjhTO0g9oz4tPzw/Lj58PJY5KTbfMfss6ieKIi4cbhbtD+MJDwSM/s75XfZE82rxhfDA8InwzPCU8kT1Ofht/NgA9gXyCgkRlRaJHD4hYCbwKgUwozMMN/44kTo/O2Y7eDrDOBA2EzNXLzAroyU6IJIauRS+Dq0IDwOm/Rn5U/XV8Vbvze2y7Ajtee317cbv6PJ/9hz7hf92BPsIhQ6ME/UYzx3OIt0m2iqkLcowJTIZM9IyEDLwMA0v3iu+KMQkkyBuGwkWCBC0Cu8EIv+q+RP1qvD67JjpK+dm5tflQuav563p8OtQ7oTx7fTI+Or9GALsBpIL5hB9FcoZMR1OIMYhwyM6JPMk8iPXIhkhux4VG4YXmhJLDhsJawQl/zj6v/Tn7y/rjueO49zgtd5y3QPd19yv3XjfceEB5P7m1+oy7mDy6vZr+/X/PQSOCCsMcA/BEc0T1hTuFf8VvhWEFL8ScRCuDfQJvAX6AKn8zPcK89HtT+k65GbgS9xv2QbWodSr05TTYNNe1MrVrNdQ2rvdj+BX5BXodOyl8DT1qPlu/ewAmQP5BaYHwggOCTMJxwisB/kFDQR+Ae39bvqu9m3yLe5y6Zzl/OBJ3WvZ3db602/SKNCnzyjP3s+z0D3SStSz1qnZi91c4DXkY+fP62rvcfPN9sD5+PtF/sv/PQGIAW4BtABj/wn+lfsB+Qb2P/Ly7uPq3+Yv44nf59v01wXVEtL2zxTOxc37zJ7N8c0uz7PQXdM91mDZiNxY4KnjjucA6zPvMfLu9HL3E/pw+zD9V/3V/Xv9L/2e+xL6nvfU9ODxOe/h67PomOQf4aPdMdqf15/UCdIv0BrP8s60z/vPotEb03TVxNc426Xed+ID5qjpYO0D8Zbz+/Yf+bL7Lf3C/lf/LwCa/1D/vf1+/AL6wPdt9efyi+9N7L7ohuZe44fgvd3D287ZcNhB1x7XS9cP2E/ZmdoY3UDfaeLV5Wrpee388CD0Qffp+fz8+P79ADACfAOnAzAEVgOIAscAV//0/Nb6B/iS9ajyoe8W7DTppObQ5JvipuCh3hPett2l3YfdG9+Q4ADjY+UY6OnqGe5n8Rn1kvjS+0j+GwFaAzgF8wbgB6wIjAhvCMQGhQWEA4EBov52/Cn5g/Za847wI+7966fp8+eM5V3k9+O85Nbk6uU15w7qKuyD7+XxQ/Vb+En89P/zAhYGzQktDNgOVxAGEgIS/hEAEQwQ7w6vDFgKrgfqBBQBq/3t+iT4h/Ua87Hwz+6g7UPsneto7Dvtru6T8JXzDvab+YD8VQCtAyIIHQtuD4gSvBXyF60ZThtJHEocNRyvGiUZRBbmE8kQjQ2/CbcFuQEq/nz63fZ18xTxTe887tvtfO5r79rw2PKh9e746fxhAYsFdAo3DwwU5hetG+seGCLHI/4loybuJsolEyT6IUEfFBx9GHMT8w6ECXIFqwA+/NT3j/Ql8QbvPO0M7Tvt5u7T8N3zDfcf+6n/xwQhCuEPOBWUGs4fdSSIKJQrJy6xL+YvkC+QLkEsqynTJXkhWBzwFj8RXAttBXT/vfn49Fzw9O0L62fqWOrO6+LtE/Eo9D74HP0nA9EJHBF3Fy4erSSsKmovxzOjNgc5tjlnOa83lDXmMdwtuChPIhccahUEDpQGVf9K+ePzHO8U63fotuZ95u7n0elT7UHxcfbZ+5QCFwlxEd8YOCAEJ2UtrDJdN0Q6wTxfPSI99DpeOKczti5PKBki/BpsE3ML7gPL+8n0su526XHlHuPP4VHih+QK6NjsHPIl91T9BAVeDZcVvx2yJXoseDLCNg06lzu6PL878zkYN48z3S6iKcwixRt6EyYLkAKy+szyF+3H5+Tjv+DB3+nfbuLV5d7qSfA9953+cAZNDrgWfB4/JtgsrTK5Njo55ToBO6M5GTdiM7ku0CjgIbsarRKDCo4BtPmJ8v3rDObB4brett2F3RHgs+Ph6IHuevW1/KcFCQ4tF88frCjzL8o1YDrRPLU93D0XPAU5KDTCLt4nbiB/FzAOuwNo+gnxH+ht4Gjai9Zg1GHUq9VX2NvcseK+6UHyFPvfBMsOVxnKI1EtFjWFO98/aUKWQudBSj97PK03tTHdKQEhmxZUCxj/lPOf55Ld+9SizlPJUcdnxvvH1Mrwzx7X6+Bj6672BgMrDzwaIibXMGI5Lz9jQ/VFcEZRRQBDmj8jO141yS15JHcZiAww/sjw1+Ou2CPPGce+wVq/yb4EwXHEusrC0qXdaej89CkC5g9rHEMpoDMBPExBjkS1RaNF/UPsQYc+DTpnM+0rKiKEFmQIDPm26ZfbP8/PxIy8wrc4tke2Crkbv7jGVNB62/jnv/W8AwUSVB+pK2Y1Az2JQKZCXELDQbA+zjtcN5Iy9SuVI5gYWQvM+5Lspd3BzwvDcrlQshGvea6lsD21rrz0xdfR4N447RP8gwq7GCQmzTAVOMI7mT1lPX88ljopNwgzoS0zJzQefRO0BWD27+Tl1EvFtLjZrnSouKSjpHWnKK1ttL6+c8oM2VboUPikB4wW1SJKLUMz0DaTN3o30TXVM54wgSzPJugfvBZiC8X8UOzH2rLJ2Lqzrqql2Z+SnfOeDKOYqdayvL28y3baYuqf+k4KoxhPJAMs8DAHM9kzUzI4MBstfClVJGweARZtDNz++O703R7Nx7zzrq+jKJ3zmTqaAZ2Po8KrpLYawyTSMOE98TABqBA1HVsmOiyNLocvNy+aLegq9CbzIVAb2hI0CGP6xeqo2UnJOLqirUqjxJ0em0+c4Z9lpYitbbkQx8XVM+VK9H8DJRJPHZ4lSiqLLK4sUyy8KZYmfCF9G54TAwoW/ljv1N4iz8rAtrQYqrei6J6vnnWhyKbqrTW4g8QU0mbgfe9t/qgLnxgrIsQoviukLAAswSkCJswhJxtmEw0Jdvzf7APerc6pwBi0garDoy+hzqDZo9apArGTuwnIs9Wi5Pvy5gEoD2kbBSQsKpIthi66LN0ppCVpIDwZxg+TBPf2puih2Z/LYr8Qtfetfqljp++oBq04tCC9pMg+1cnid/AN/zIM+RgbIsop2C1/LzQv7SzNKJAj9hs6E3kH//r87E/fD9Jjxru8frbpspmy87TeuX/B78o91jji+u7e/AYK0BUqIHcoPS5WMfAx9TDOLRco/iA0F2IMav8d8t/k/tmBz3XGDcAPvce8R79+w6HKttOr3iDrGPlgBkMTih4PKasv3DQ7N8A2RTQHMEMp2CBvFmkKqfxs7dzettLFx8m+27kFuK25+L2RxMPNc9kb5vf04QPPEpIgsSyqNs084T9mQC8+xjrUNC0taCKPFWgFVfTf4hXTCsXLuvSyMK+4rnWxV7iqwo3OCN0B7Uv+Fw/UH+4uijocQuVG7UfvRqZEmEDKOqoyyShpG3sKpfYO46PQ0cBJtN+r3Kj6qaqud7fnwlXRyOEu9PoG4BrcLMw7xkUwTNtOw0+2TiBMf0d+Qck5xS81IjwRnvw46ELU78Nst+6veaxZrtOzu73uyq/adOyC/yMTuiUvNkdD7UsCUTNT71IzUcBN1EiLQjo6qC9JIjERZf/s7NXcoc/nxvTB/cDtw9/KnNSY4ULvz/7PDSIdWCq6Nm5AO0e9SVdKHUjsRJg/hzhlL+gkjxjxCnb+EvTA6svjfd9Y3irfC+NP6WnxlPpHBIIOoxeFH/Yl4CqVLUMuDS3AKcgkKR7QFaMN6gTa/HT1J/B07Jjruey18Ij0b/qAAdIJQRJnGysjMyk5LWUv7S4iLQMoUiHfGLIPOgW4+i3w6eai3uDZ6dfg13XaqeAu6c3yT/7kClEXoSPTLqs3ST5+QiZEDUKZPQs2LSx9HygSdwKC89/kXdgizkHH9MMaxS3JVtDk2p3nrfWUBUAVsSQFMto95UWjSqpKCklpRPA9hjWoKZgbrwvj+n7rU9wW0HnG/cFcwRnEaMp/1A3hYO5w/ecMHxwIKaE0dTyFQdBCrEFsPkU4jS+oJWgZWQwg/vbx4uZO3jrYjdVt1bfY1d1g5lnv3fk5BKkOexitIPslminMKgcq+SWsILEZixHWCNoAa/nR8u3sH+oI6ojrae7J8uP40/9NB1QOlxSeGcocjB6RHuIbvRdsEQ8L0wMN/eH1TPDa6jvoDuea6LnrTPDj9kj+mwWoDRgV4BomHwIifiKNIfsdGBnvEd0KaALr+kvzeOvg5WXjIuP75FDozu2M9Gr8BwWzDaoVphuDICYjeSOjIQkePhiREQ8JpQAv+ATxHOoj5S7i1OGX443nGeyy8rD6RwM9CzcTHhnhHfofYSCXHlUbchUjDxMIpQBW+fnyDO0v6TXnQufE6PDr/vC99kD9PwT8CngQ4xOVFlMXRhawEzgPSAoqBOD9HPhf8yPvF+yc6hHrZewP8Pn0GPv2ANoHNA3wEm8VjhdjFxcWyxL8DTgIGwK1++z1OvBJ7ALpj+fc5oDoO+xb8RH3vP3RA+kJNw7/EZQUQhViFFgS4Q7PCoAF6QBX+2X2bvLG72vusu3S7v7w0fME90n79v5kA50GTAnGCjEM1QuiCsYI5waeA/cA1v3s+y35GfiU9wr4nPj4+f36Af2P/o8A8AH7AqUDBQT7A6sDiAKYAWEAWv9Q/r/9Wf0f/Vn9zf38/TL+Z/+c/z8AZgBpAJ3/m//S/0L/lP6X/s39Kv6//WX++P5nAOEAIgK/Ar8DrgPHA0QDmAK/AWoA9/5f/Xj7Ovpx+IH3yvZA9//3Lfmi+n38af5FAeMDOQY5CB0JMgp9CoUKPQl2B3MFFQNJALv9qvu5+fb3L/eS9ob3D/hs+WH6lfzq/X0AyQFwA44EugVyBsQGZwZbBmcFGQVjA5UCWQHnAKwAdQAGAEIAGQC5APEArQFDAncCNQL+AYMBRQGsAL3/F/5D/a38FPwV/J38TP24/f7+iAB3AjgDLgTyBA4GkQYnB9sGYQYKBfUDrwGNADr+Gf1d+4v6uPlf+Qz59vl5+tj7Df1+/hsA6wEZA4oE7wS4BXoFQAUlBP4CvQEeAPL9Ivzw+b74gPdV9jX2rPVS9gb3yvic+qD8/f6oAGMCTQQSBbIFdAVsBV4EYAMBAXz/Hf04+3P4Y/cr9aDzvPIy88fzSfQ69YT3cfny+wv+AQGWAp8EBgaaBrsGngbEBdUDOgLW/3j9xPpT+LD2pvQB87HxN/Fd8RXya/NI9UX3Nvk6/HP+YAFTA0UF8gWjBkUGTgZvBWYERwInAK79RPu2+Nf2fvT88pbxFPEC8RXydfJI9Kb13feA+Sn7Hf3F/gYAxgAmAcABMwHfAOn/Lv9V/hH9ePzH+9b6MPpf+Z34WPjg99b3APf99hr3X/eG92n3VPe29zP3svdl9/X3A/gM+X75v/oY+2T88PwI/uf+jP+1/5L/Y/9Z/23+7f1e/DL7/PiQ9xn2S/WA9HLzivKU8hbz9/Nj9VD2Kfih+RL8yf1B/3gAcwFuARYB0gC1AJj/pP5I/bf7+vmw+LX2mPVt9MH0f/QI9VT1WPZ/9yP5BPqC+7P8+P2r/nj/HQC2AGQABgAG/5r+Vf3Q/L/7+/om+nL5Ivne+Gj4DfgL+IL4Afl1+Qf6x/qW+wz8lPzu/I79R/7//or+8f4p/sz9Q/2j/BD8B/x5+/H6Mvps+qf5k/ka+cj5pPn/+Rz6DPtt+1r88PyZ/b79Sv7Q/iX/h/6v/gz+A/5f/dP8ZvwZ/In7+Pqj+p/6jvqK+r36y/p3+4v7L/y3/PH81P1j/s3+DP8g/6L/VP+n/wr/sv9X/xn/SP5P/uv9Nf6t/fH9rP2v/QP+Ff4d/oz+Rf6l/lX+pf6k/qn+Av92/3P/yP/Y/wUACADT/5EAsADZAB4BBgFXAYwBsQHXAS8BAQGYAEgA2v+8/2n/zf9I/4H/w/48/zv/9f8gAHoAGAG7AcIBdQLZAscCmwIBA3sC2QK3AvgCZwJAAqQBfwH8ALUAUAAGABQAfAAiAJMAlgCNAMEAJwFRAa4BcQKxAuwClQKUAosCmAJ8ApcCEAIRAscBrwGSAYcBRQEuAaQA6ABcAOwAxQBYAeUAcQEYAVUBZgELArwBLAJmAugC5wIMA/ICIAO3At0CVQJcAhYC8wHKAacBhQFwAYMBegGOARQBZwGcATwCWgKtAn8C6wIBAyUDKwP9AvsC/AKiArwCNQJtAtEB0QERASMBqgC1AKsAvQCoAMwAuQCuAKEA/gDLAFwBDQFuAVQB/wGPAYUBgwFxARoBKwEXAfwA2wDPAHsAsgBcAP//+v+z/4T/S/9L//r+8P5D/7z/yf+IAPr/dABVAFIAXACcALYA5gDkABIBpgCoAOr/0v9f/2//0f7w/j3+ev4a/hD+7v02/kz+';
-    chat_notify_audio = new Audio("data:audio/wav;base64," + base64string);
-
-}
-
-// Issue a pop-up notification using the web standard Notification API
-// https://developer.mozilla.org/docs/Web/API/notification
-var chat_issue_notification = function (theBody,theTitle) {
-    if ( !chat_notify_granted || !chat_notify_enabled) {
-        return;
-    }
-    var nIcon = "/images/icons/48/group.png";
-    var options = {
-        body: theBody,
-        icon: nIcon,
-        silent: false
-    }
-    var n = new Notification(theTitle,options);
-    n.onclick = function (event) {
-        setTimeout(n.close.bind(n), 300); 
-    } 
-    if(chat_notify_audio_enabled) {
-      chat_notify_audio.play();
-    }
-}
-
-
-function toggleChatNotificationAudio() {
-	if(!chat_notify_audio_enabled) {
-		chat_notify_audio_enabled = true;
-        $('#toggle-notifications-audio-icon').removeClass('fa-volume-off');
-        $('#toggle-notifications-audio-icon').addClass('fa-volume-up');
-	}
-	else {
-		chat_notify_audio_enabled = false;
-        $('#toggle-notifications-audio-icon').removeClass('fa-volume-up');
-        $('#toggle-notifications-audio-icon').addClass('fa-volume-off');
-	}
-}
-
-function toggleChatNotifications() {
-	if(!chat_notify_enabled) {
-		chat_notify_enabled = true;
-        $('#toggle-notifications-icon').addClass('fa-bell');
-        $('#toggle-notifications-icon').removeClass('fa-bell-slash-o');
-        $('#toggle-notifications-audio').removeClass('disabled');
-	}
-	else {
-		chat_notify_enabled = false;
-        $('#toggle-notifications-icon').addClass('fa-bell-slash-o');
-        $('#toggle-notifications-icon').removeClass('fa-bell');
-        $('#toggle-notifications-audio').addClass('disabled');
-	}
-}
-
-function chatJotGetLink() {
-	reply = prompt("{{$linkurl}}");
-	if(reply && reply.length) {
-		$('#chat-rotator').spin('tiny');
-		$.get('linkinfo?f=&url=' + reply, function(data) {
-			addmailtext(data);
-			$('#chat-rotator').spin(false);
-		});
-	}
-}
-
-function addmailtext(data) {
-	var currentText = $("#chatText").val();
-	$("#chatText").val(currentText + data);
-}
-
-function adjustFullscreenTopBarHeight() {
-	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 16);
-	$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
-}
-
-function adjustInlineTopBarHeight() {
-	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23);
-	$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
-}
-
-function isMobile() {
-	if( navigator.userAgent.match(/Android/i)
-		 || navigator.userAgent.match(/webOS/i)
-		 || navigator.userAgent.match(/iPhone/i)
-		 || navigator.userAgent.match(/iPad/i)
-		 || navigator.userAgent.match(/iPod/i)
-		 || navigator.userAgent.match(/BlackBerry/i)
-		 || navigator.userAgent.match(/Windows Phone/i)
-	 ){
-		return true;
-	}
-	else {
-		 return false;
-	}
-}
-
-$(function(){
-	$('#chatText').keypress(function(e){
-		if (e.keyCode == 13 && e.shiftKey||isMobile()) {
-			//do nothing
-		}
-		else if (e.keyCode == 13) {
-			e.preventDefault();
-			$('#chat-form').trigger('submit');
-		}
-	});
-});
-</script>
diff --git a/view/theme/redbasic/tpl/chatroom_members.tpl b/view/theme/redbasic/tpl/chatroom_members.tpl
deleted file mode 100644
index ea5fbede8..000000000
--- a/view/theme/redbasic/tpl/chatroom_members.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="chatroom_members" class="widget">
-	<h3>{{$header}}</h3>
-	<div id="chatMembers"></div>
-</div>
-
diff --git a/view/theme/redbasic/tpl/chatroom_new.tpl b/view/theme/redbasic/tpl/chatroom_new.tpl
deleted file mode 100644
index 1497939f6..000000000
--- a/view/theme/redbasic/tpl/chatroom_new.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="chatroom-new" class="section-content-tools-wrapper">
-	<form id="chatroom-new-form" action="chat" method="post" class="acl-form" data-form_id="chatroom-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-		{{include file="field_input.tpl" field=$name}}
-		{{include file="field_input.tpl" field=$chat_expire}}
-		<div class="btn-group pull-right">
-			<button id="dbtn-acl" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button>
-			<button id="dbtn-submit" class="acl-submit btn btn-primary" type="submit" name="submit" value="{{$submit}}" data-formid="chatroom-new-form">{{$submit}}</button>
-		</div>
-		<div class="clear"></div>
-	</form>
-</div>
-{{$acl}}
diff --git a/view/theme/redbasic/tpl/chatroomlist.tpl b/view/theme/redbasic/tpl/chatroomlist.tpl
deleted file mode 100644
index a81b8ec1e..000000000
--- a/view/theme/redbasic/tpl/chatroomlist.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="chatroom_list" class="widget">
-	<h3>{{$header}}</h3>
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}">{{$overview}}</a></li>
-		{{foreach $items as $item}}
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$item.cr_id}}"><span class="badge pull-right">{{$item.cr_inroom}}</span>{{$item.cr_name}}</a></li>
-		{{/foreach}}
-	</ul>
-</div>
-
diff --git a/view/theme/redbasic/tpl/chatrooms.tpl b/view/theme/redbasic/tpl/chatrooms.tpl
deleted file mode 100644
index 71a2acada..000000000
--- a/view/theme/redbasic/tpl/chatrooms.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $is_owner}}
-		<button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$newroom}}</button>
-		{{/if}}
-		<h2>{{$header}}</h2>
-	</div>
-	{{if $is_owner}}
-	{{$chatroom_new}}
-	{{/if}}
-	{{if $rooms}}
-	<div class="section-content-wrapper-np">
-		<table id="chatrooms-index">
-			<tr>
-				<th width="97%">{{$name}}</th>
-				<th width="1%">{{$expire}}</th>
-				<th width="1%" class="chatrooms-index-tool"></th>
-				<th width="1%"></th>
-			</tr>
-			{{foreach $rooms as $room}}
-			<tr class="chatroom-index-row">
-				<td><a href="{{$baseurl}}/chat/{{$nickname}}/{{$room.cr_id}}">{{$room.cr_name}}</a></td>
-				<td>{{$room.cr_expire}}&nbsp;min</td>
-				<td class="chatrooms-index-tool{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} dropdown float-right{{/if}}">
-					{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}}
-					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('chatroom',{{$room.cr_id}});"></i>
-					<ul id="panel-{{$room.cr_id}}" class="lockview-panel dropdown-menu"></ul>
-					{{/if}}
-				</td>
-				<td><span class="badge badge-default">{{$room.cr_inroom}}</span></td>
-			</tr>
-			{{/foreach}}
-		</table>
-
-	</div>
-	{{else}}
-	<div class="section-content-wrapper">
-		{{$norooms}}
-	</div>
-	{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/cloud.tpl b/view/theme/redbasic/tpl/cloud.tpl
deleted file mode 100644
index d1567af9f..000000000
--- a/view/theme/redbasic/tpl/cloud.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="generic-content-wrapper">
-{{include file="cloud_header.tpl"}}
-{{include file="cloud_directory.tpl"}}
-</div>
diff --git a/view/theme/redbasic/tpl/cloud_actionspanel.tpl b/view/theme/redbasic/tpl/cloud_actionspanel.tpl
deleted file mode 100644
index 0ebecce29..000000000
--- a/view/theme/redbasic/tpl/cloud_actionspanel.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<div id="files-mkdir-tools" class="section-content-tools-wrapper">
-	<label for="files-mkdir">{{$folder_header}}</label>
-	<form id="mkdir-form" method="post" action="file_upload" class="acl-form" data-form_id="mkdir-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-		<input type="hidden" name="folder" value="{{$folder}}" />
-		<input type="hidden" name="channick" value="{{$channick}}" />
-		<input type="hidden" name="return_url" value="{{$return_url}}" />
-		<input id="files-mkdir" type="text" name="filename" class="form-control form-group">
-		<div class="pull-right btn-group">
-			<div class="btn-group">
-				{{if $lockstate}}
-				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
-					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
-				</button>
-				{{/if}}
-				<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
-			</div>
-		</div>
-	</form>
-	<div class="clear"></div>
-</div>
-<div id="files-upload-tools" class="section-content-tools-wrapper">
-	{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}{{$info}}</div>{{/if}}
-	<form id="ajax-upload-files" method="post" action="file_upload" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-		<input type="hidden" name="directory" value="{{$path}}" />
-		<input type="hidden" name="channick" value="{{$channick}}" />
-		<input type="hidden" name="return_url" value="{{$return_url}}" />
-		<label for="files-upload">{{$upload_header}}</label>
-		<input class="form-group pull-left" id="files-upload" type="file" name="userfile">
-		<div class="pull-right btn-group">
-			<div class="btn-group">
-				{{if $lockstate}}
-				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
-					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
-				</button>
-				{{/if}}
-				<button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
-			</div>
-		</div>
-	</form>
-	<div class="clear"></div>
-</div>
-{{$aclselect}}
diff --git a/view/theme/redbasic/tpl/cloud_directory.tpl b/view/theme/redbasic/tpl/cloud_directory.tpl
deleted file mode 100644
index adc8584c3..000000000
--- a/view/theme/redbasic/tpl/cloud_directory.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<div id="cloud-drag-area" class="section-content-wrapper-np">
-	<table id="cloud-index">
-		<tr>
-			<th width="1%"></th>
-			<th width="92%">{{$name}}</th>
-			<th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th>
-			<th width="1%">{{*{{$type}}*}}</th>
-			<th width="1%" class="d-none d-md-table-cell">{{$size}}</th>
-			<th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th>
-		</tr>
-	{{if $parentpath}}
-		<tr>
-			<td><i class="fa fa-level-up"></i>{{*{{$parentpath.icon}}*}}</td>
-			<td><a href="{{$parentpath.path}}" title="{{$parent}}">..</a></td>
-			<td></td><td></td><td></td><td></td>
-			<td>{{*[{{$parent}}]*}}</td>
-			<td class="d-none d-md-table-cell"></td>
-			<td class="d-none d-md-table-cell"></td>
-		</tr>
-	{{/if}}
-		<tr id="new-upload-progress-bar--1"></tr> {{* this is needed to append the upload files in the right order *}}
-	{{foreach $entries as $item}}
-		<tr id="cloud-index-{{$item.attachId}}">
-			<td><i class="fa {{$item.iconFromType}}" title="{{$item.type}}"></i></td>
-			<td><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td>
-	{{if $item.is_owner}}
-			<td class="cloud-index-tool">{{$item.attachIcon}}</td>
-			<td id="file-edit-{{$item.attachId}}" class="cloud-index-tool"></td>
-			<td class="cloud-index-tool"><i class="fakelink fa fa-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td>
-			<td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
-
-	{{else}}
-			<td></td><td></td><td></td><td></td>
-	{{/if}}
-			<td>{{*{{$item.type}}*}}</td>
-			<td class="d-none d-md-table-cell">{{$item.sizeFormatted}}</td>
-			<td class="d-none d-md-table-cell">{{$item.lastmodified}}</td>
-		</tr>
-		<tr id="cloud-tools-{{$item.attachId}}">
-			<td id="perms-panel-{{$item.attachId}}" colspan="9"></td>
-		</tr>
-
-	{{/foreach}}
-	</table>
-</div>
diff --git a/view/theme/redbasic/tpl/cloud_header.tpl b/view/theme/redbasic/tpl/cloud_header.tpl
deleted file mode 100644
index c1e589341..000000000
--- a/view/theme/redbasic/tpl/cloud_header.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="section-title-wrapper">
-	{{if $actionspanel}}
-	<div class="pull-right">
-		{{if $is_owner}}
-		<a href="/sharedwithme" class="btn btn-sm btn-outline-secondary"><i class="fa fa-cloud-download"></i>&nbsp;{{$shared}}</a>
-		{{/if}}
-		<button id="files-create-btn" class="btn btn-sm btn-primary" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="fa fa-folder-o"></i>&nbsp;{{$create}}</button>
-		<button id="files-upload-btn" class="btn btn-sm btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload}}</button>
-	</div>
-	{{/if}}
-	<h2>{{$header}}</h2>
-	<div class="clear"></div>
-</div>
-{{if $actionspanel}}
-	{{$actionspanel}}
-{{/if}}
diff --git a/view/theme/redbasic/tpl/comment_item.tpl b/view/theme/redbasic/tpl/comment_item.tpl
deleted file mode 100755
index f490483b8..000000000
--- a/view/theme/redbasic/tpl/comment_item.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-		{{if $threaded}}
-		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
-		{{else}}
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
-		{{/if}}
-			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
-				<input type="hidden" name="type" value="{{$type}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$comment}}</textarea>
-				{{if $qcomment}}
-					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-					<option value=""></option>
-				{{foreach $qcomment as $qc}}
-					<option value="{{$qc}}">{{$qc}}</option>				
-				{{/foreach}}
-					</select>
-				{{/if}}
-				<div id="comment-tools-{{$id}}" class="pt-2 comment-tools">
-					<div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left">
-						<div class="btn-group mr-2">
-							<button class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;">
-								<i class="fa fa-bold comment-icon"></i>
-							</button>
-							<button class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;">
-								<i class="fa fa-italic comment-icon"></i>
-							</button>
-							<button class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;">
-								<i class="fa fa-underline comment-icon"></i>
-							</button>
-							<button class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;">
-								<i class="fa fa-quote-left comment-icon"></i>
-							</button>
-							<button class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;">
-								<i class="fa fa-terminal comment-icon"></i>
-							</button>
-						</div>
-						<div class="btn-group mr-2">
-							<button class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;">
-								<i class="fa fa-link comment-icon"></i>
-							</button>
-						</div>
-						{{if $feature_encrypt}}
-						<div class="btn-group mr-2">
-							<button class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;">
-								<i class="fa fa-key comment-icon"></i>
-							</button>
-						</div>
-						{{/if}}
-						{{$comment_buttons}}
-					</div>
-					<div class="btn-group float-right" id="comment-edit-submit-wrapper-{{$id}}">
-						{{if $preview}}
-						<button id="comment-edit-presubmit-{{$id}}" class="btn btn-outline-secondary btn-sm" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}">
-							<i class="fa fa-eye comment-icon" ></i>
-						</button>
-						{{/if}}
-						<button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-sm" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button>
-					</div>
-				</div>
-				<div class="clear"></div>
-			</form>
-		</div>
-		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview"></div>
diff --git a/view/theme/redbasic/tpl/common_friends.tpl b/view/theme/redbasic/tpl/common_friends.tpl
deleted file mode 100755
index 489717e78..000000000
--- a/view/theme/redbasic/tpl/common_friends.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="{{$url}}">
-			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
-	</div>
-	{{if $note}}
-	<div class="profile-match-note">{{$note}}</div>
-	{{/if}}	
-	<div class="profile-match-end"></div>
-</div>
diff --git a/view/theme/redbasic/tpl/common_tabs.tpl b/view/theme/redbasic/tpl/common_tabs.tpl
deleted file mode 100755
index 29c46369b..000000000
--- a/view/theme/redbasic/tpl/common_tabs.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="mb-4 d-none d-md-block">
-	<ul class="nav nav-tabs nav-fill">
-		{{foreach $tabs as $tab}}
-		<li class="nav-item"{{if $tab.id}} id="{{$tab.id}}"{{/if}}><a class="nav-link{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
-		{{/foreach}}
-	</ul>
-</div>
-<div class="d-md-none dropdown clearfix" style="position:fixed; right:7px; top:4.5rem; z-index:1020">
-	<button type="button" class="btn btn-outline-secondary btn-sm float-right" data-toggle="dropdown">
-		<i class="fa fa-bars"></i>
-	</button>
-	<div class="dropdown-menu dropdown-menu-right">
-		{{foreach $tabs as $tab}}
-		<a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a>
-		{{/foreach}}
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/connection_template.tpl b/view/theme/redbasic/tpl/connection_template.tpl
deleted file mode 100755
index 16915abda..000000000
--- a/view/theme/redbasic/tpl/connection_template.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-<div id="contact-entry-wrapper-{{$contact.id}}">
-	<div class="section-subtitle-wrapper clearfix">
-		<div class="pull-right">
-			{{if $contact.approve && $contact.ignore}}
-			<form action="connedit/{{$contact.id}}" method="post" >
-			<button type="submit" class="btn btn-success btn-sm" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="fa fa-check"></i> {{$contact.approve}}</button>
-
-			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-sm" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a>
-
-			{{/if}}
-			<a href="#" class="btn btn-danger btn-sm" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
-			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i></a>
-			{{if $contact.approve}}
-			</form>
-			{{/if}}
-		</div>
-		<h3>{{if $contact.public_forum}}<i class="fa fa-comments-o"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a>{{if $contact.phone}}&nbsp;<a class="btn btn-outline-secondary btn-sm" href="tel:{{$contact.phone}}" title="{{$contact.call}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</h3>
-	</div>
-	<div class="section-content-tools-wrapper">
-		<div class="contact-photo-wrapper" >
-			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
-		</div>
-		<div class="contact-info">
-			{{if $contact.status}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.status_label}}:</span> {{$contact.status}}
-			</div>
-			{{/if}}
-			{{if $contact.connected}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.connected_label}}:</span> <span class="autotime" title="{{$contact.connected}}"></span>
-			</div>
-			{{/if}}
-			{{if $contact.webbie}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.webbie_label}}:</span> {{$contact.webbie}}
-			</div>
-			{{/if}}
-			{{if $contact.network}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}">{{$contact.recent_label}}</a>
-			</div>
-			{{/if}}
-		</div>
-
-	</div>
-</div>
-
diff --git a/view/theme/redbasic/tpl/connections.tpl b/view/theme/redbasic/tpl/connections.tpl
deleted file mode 100755
index 13261965a..000000000
--- a/view/theme/redbasic/tpl/connections.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper clearfix">
-		<div class="dropdown pull-right">
-			<button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus()">
-				<i class="fa fa-search"></i>&nbsp;{{$label}}
-			</button>
-			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
-				<i class="fa fa-sort"></i>
-			</button>
-			<div class="dropdown-menu dropdown-menu-right">
-				{{foreach $tabs as $menu}}
-				<a class="dropdown-item" href="{{$menu.url}}">{{$menu.label}}</a>
-				{{/foreach}}
-			</div>
-		</div>
-		{{if $finding}}<h2>{{$finding}}</h2>{{else}}<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>{{/if}}
-	</div>
-	<div id="contacts-search-form" class="section-content-tools-wrapper">
-		<form action="{{$cmd}}" method="get" >
-			<div class="input-group form-group">
-				<input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
-				<div class="input-group-btn">
-					<button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-fw fa-search"></i></button>
-				</div>
-			</div>
-		</form>
-	</div>
-	<div id="connections-wrapper clearfix">
-		{{foreach $contacts as $contact}}
-			{{include file="connection_template.tpl"}}
-		{{/foreach}}
-		<div id="page-end"></div>
-	</div>
-</div>
-<script>$(document).ready(function() { loadingPage = false;});</script>
-<div id="page-spinner"></div>
diff --git a/view/theme/redbasic/tpl/contact_block.tpl b/view/theme/redbasic/tpl/contact_block.tpl
deleted file mode 100755
index 580a8a41c..000000000
--- a/view/theme/redbasic/tpl/contact_block.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div id="contact-block" class="widget">
-	<h3>{{$contacts}}</h3>
-	{{if $micropro}}
-	{{if $viewconnections}}
-	<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
-	{{/if}}
-	<div class='contact-block-content'>
-	{{foreach $micropro as $m}}
-		{{$m}}
-	{{/foreach}}
-	</div>
-	{{/if}}
-</div>
-<div class="clear"></div>
diff --git a/view/theme/redbasic/tpl/contact_head.tpl b/view/theme/redbasic/tpl/contact_head.tpl
deleted file mode 100755
index 72e7edbfb..000000000
--- a/view/theme/redbasic/tpl/contact_head.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<script language="javascript" type="text/javascript"
-          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-          <script language="javascript" type="text/javascript">
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "{{$editselect}}",
-	elements: "contact-edit-info",
-	plugins : "bbcode",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_styles : "blockquote,code",
-	gecko_spellcheck : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	force_p_newlines : false,
-	force_br_newlines : true,
-	forced_root_block : '',
-	content_css: "{{$baseurl}}/view/custom_tinymce.css"
-
-
-});
-
-
-</script>
-
diff --git a/view/theme/redbasic/tpl/contact_slider.tpl b/view/theme/redbasic/tpl/contact_slider.tpl
deleted file mode 100755
index 550abc147..000000000
--- a/view/theme/redbasic/tpl/contact_slider.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="contact-slider" class="slider form-group"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div>
-<script>
-$(document).ready(function() {
-	// The slider does not render correct if width is given in % and
-	// the slider container is hidden (display: none) during rendering.
-	// So let's unhide it to render and hide again afterwards.
-	if(!$("#affinity-tool-collapse").hasClass("in")) {
-		$("#affinity-tool-collapse").addClass("in");
-		makeContactSlider();
-		$("#affinity-tool-collapse").removeClass("in");
-	}
-	else {
-		makeContactSlider();
-	}
-});
-
-function makeContactSlider() {
-	$("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: [{{$labels}}], width:'98%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); }  });
-}
-</script>
diff --git a/view/theme/redbasic/tpl/contact_template.tpl b/view/theme/redbasic/tpl/contact_template.tpl
deleted file mode 100755
index 3d1bfa4a4..000000000
--- a/view/theme/redbasic/tpl/contact_template.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
-	<div class="contact-entry-photo-wrapper" >
-		<a href="{{$contact.link}}" title="{{$contact.img_hover}}" ><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-	<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/redbasic/tpl/contactsajax.tpl b/view/theme/redbasic/tpl/contactsajax.tpl
deleted file mode 100644
index a6b5ad791..000000000
--- a/view/theme/redbasic/tpl/contactsajax.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{{foreach $contacts as $contact}}
-{{include file="connection_template.tpl"}}
-{{/foreach}}
diff --git a/view/theme/redbasic/tpl/conv.tpl b/view/theme/redbasic/tpl/conv.tpl
deleted file mode 100755
index ddb959b84..000000000
--- a/view/theme/redbasic/tpl/conv.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{foreach $threads as $thread}}
-<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper">
-	{{foreach $thread.items as $item}}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
-			</div>
-			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
-		{{/if}}
-		{{if $item.comment_lastcollapsed}}</div>{{/if}}
-		
-		{{include file="{{$item.template}}"}}
-		
-		
-	{{/foreach}}
-</div>
-{{/foreach}}
diff --git a/view/theme/redbasic/tpl/conv_frame.tpl b/view/theme/redbasic/tpl/conv_frame.tpl
deleted file mode 100755
index aa7b55e9b..000000000
--- a/view/theme/redbasic/tpl/conv_frame.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="threads-begin"></div>
-<div id="threads-end"></div>
-<div id="conversation-end"></div>
-<div id="page-spinner"></div>
-
diff --git a/view/theme/redbasic/tpl/conv_item.tpl b/view/theme/redbasic/tpl/conv_item.tpl
deleted file mode 100755
index 2d51af4ff..000000000
--- a/view/theme/redbasic/tpl/conv_item.tpl
+++ /dev/null
@@ -1,250 +0,0 @@
-{{if $item.comment_firstcollapsed}}
-<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
-	<span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span>&nbsp;<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
-</div>
-<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}">
-		<a name="item_{{$item.id}}" ></a>
-		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
-			<div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
-				{{if $item.photo}}
-				<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
-					{{$item.photo}}
-				</div>
-				{{/if}}
-				{{if $item.event}}
-				<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
-					{{$item.event}}
-				</div>
-				{{/if}}
-				{{if $item.title && !$item.event}}
-				<div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}">
-					{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}
-				</div>
-				{{if ! $item.is_new}}
-				<hr class="m-0">
-				{{/if}}
-				{{/if}}
-				<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
-					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
-						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
-							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
-						</div>
-					</div>
-					{{if $item.lock}}
-					<div class="wall-item-lock dropdown">
-						<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
-						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
-					</div>
-					{{/if}}
-					<div class="wall-item-author">
-						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
-					</div>
-					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-						{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
-					</div>
-				</div>
-
-				{{if $item.body}}
-				<div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}">
-					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
-						{{$item.body}}
-					</div>
-				</div>
-				{{/if}}
-				{{if $item.has_tags}}
-				<div class="p-2 wall-item-tools clearfix">
-
-					<div class="body-tags">
-						<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
-					</div>
-				{{**
-					{{if $item.mentions}}
-					<div class="body-tags" id="item-mentions">
-						<span class="tag">{{$item.mentions}}</span>
-					</div>
-					{{/if}}
-					{{if $item.tags}}
-					<div class="body-tags" id="item-tags">
-						<span class="tag">{{$item.tags}}</span>
-					</div>
-					{{/if}}
-					{{if $item.categories}}
-					<div class="body-tags" id="item-categories">
-						<span class="tag p-category">{{$item.categories}}</span>
-					</div>
-					{{/if}}
-					{{if $item.folders}}
-					<div class="body-tags" id="item-folders">
-						<span class="tag">{{$item.folders}}</span>
-					</div>
-					{{/if}}
-				**}}
-				</div>
-				{{/if}}
-				<div class="p-2 clearfix wall-item-tools">
-					<div class="wall-item-tools-right pull-right">
-						{{if $item.toplevel && $item.emojis && $item.reactions}}
-						<div class="btn-group dropdown">
-							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
-								<i class="fa fa-smile-o"></i>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right">
-							{{foreach $item.reactions as $react}}
-								<a class="dropdown-item clearfix" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="menu-img-2" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a>
-							{{/foreach}}
-							</div>
-						</div>
-						{{/if}}
-						<div class="btn-group dropdown">
-							{{if $item.like}}
-							<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
-								<i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i>
-							</button>
-							{{/if}}
-							{{if $item.dislike}}
-							<button type="button" title="{{$item.dislike.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;">
-								<i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i>
-							</button>
-							{{/if}}
-							{{if $item.isevent}}
-							<div class="btn-group dropdown">
-								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
-									<i class="fa fa-calendar-check-o"></i>
-								</button>
-								<div class="dropdown-menu">
-									<a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
-										<i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}}
-									</a>
-									<a class="dropdown-item" href="#" title="{{$item.attend.1}}" onclick="itemAddToCal({{$item.id}}), dolike({{$item.id}},'attendno'); return false;">
-										<i class="item-act-list fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> {{$item.attend.1}}
-									</a>
-									<a class="dropdown-item" href="#" title="{{$item.attend.2}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;">
-										<i class="item-act-list fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> {{$item.attend.2}}
-									</a>
-								</div>
-							</div>
-							{{/if}}
-							{{if $item.canvote}}
-							<div class="btn-group dropdown">
-								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}">
-									<i class="fa fa-check-square-o"></i>
-								</button>
-								<div class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}">
-									<a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;">
-										<i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}}
-									</a>
-									<a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;">
-										 <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}}
-									</a> 
-									<a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;">
-										<i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}}
-									</a>
-								</div>
-							</div>
-							{{/if}}
-							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
-								<i class="fa fa-cog"></i>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
-								{{if $item.share}}
-								<a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a>
-								{{/if}}
-								{{if $item.plink}}
-								<a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a>
-								{{/if}}
-								{{if $item.edpost}}
-								<a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a>
-								{{/if}}
-								{{if $item.tagger}}
-								<a class="dropdown-item" href="#"  onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a>
-								{{/if}}
-								{{if $item.filer}}
-								<a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a>
-								{{/if}}
-								{{if $item.bookmark}}
-								<a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a>
-								{{/if}}
-								{{if $item.addtocal}}
-								<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
-								{{/if}}
-								{{if $item.star}}
-								<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
-								{{/if}}
-								{{if $item.thread_action_menu}}
-								{{foreach $item.thread_action_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a>
-								{{/foreach}}
-								{{/if}}
-								{{if $item.drop.dropping}}
-								<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
-								{{/if}}
-								{{if $item.thread_author_menu}}
-								<div class="dropdown-divider"></div>
-								{{foreach $item.thread_author_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
-								{{/foreach}}
-								{{/if}}
-								{{if $item.edpost && $item.dreport}}
-								<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
-								{{/if}}
-							</div>
-						</div>
-					</div>
-					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
-
-					{{if $item.responses || $item.attachments}}
-					<div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count &&  $item.attachments)}} btn-group{{/if}}">
-						{{if $item.attachments}}
-						<div class="btn-group">
-							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
-							<div class="dropdown-menu">{{$item.attachments}}</div>
-						</div>
-						{{/if}}
-						{{foreach $item.responses as $verb=>$response}}
-						{{if $response.count}}
-						<div class="btn-group">
-							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
-							{{if $response.modal}}
-							<div class="modal" id="{{$verb}}Modal-{{$item.id}}">
-								<div class="modal-dialog">
-									<div class="modal-content">
-										<div class="modal-header">
-											<h4 class="modal-title">{{$response.count}} {{$response.button}}</h4>
-											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-										</div>
-										<div class="modal-body response-list">
-											<ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul>
-										</div>
-										<div class="modal-footer clear">
-											<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$item.modal_dismiss}}</button>
-										</div>
-									</div><!-- /.modal-content -->
-								</div><!-- /.modal-dialog -->
-							</div><!-- /.modal -->
-							{{else}}
-							<div class="dropdown-menu">{{foreach $response.list as $liker}}{{$liker}}{{/foreach}}</div>
-							{{/if}}
-						</div>
-						{{/if}}
-						{{/foreach}}
-					</div>
-					{{/if}}
-				</div>
-			</div>
-		</div>
-		{{if $item.toplevel}}
-		{{foreach $item.children as $child}}
-			{{include file="{{$child.template}}" item=$child}}
-		{{/foreach}}
-		{{/if}}
-		{{if $item.comment}}
-		<div class="p-2 wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" >
-			{{$item.comment}}
-		</div>
-		{{/if}}
-	</div>
-{{if $item.comment_lastcollapsed}}
-</div>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/conv_list.tpl b/view/theme/redbasic/tpl/conv_list.tpl
deleted file mode 100755
index 59153e41f..000000000
--- a/view/theme/redbasic/tpl/conv_list.tpl
+++ /dev/null
@@ -1,251 +0,0 @@
-{{if $item.comment_firstcollapsed}}
-<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
-	<span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span>&nbsp;<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
-</div>
-<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}">
-		<a name="item_{{$item.id}}" ></a>
-		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
-			<div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
-				{{if $item.photo}}
-				<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
-					{{$item.photo}}
-				</div>
-				{{/if}}
-				{{if $item.event}}
-				<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
-					{{$item.event}}
-				</div>
-				{{/if}}
-				{{if $item.title && !$item.event}}
-				<div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}">
-					{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}
-				</div>
-				{{if ! $item.is_new}}
-				<hr class="m-0">
-				{{/if}}
-				{{/if}}
-				<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
-					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
-						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
-							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
-						</div>
-					</div>
-					{{if $item.lock}}
-					<div class="wall-item-lock dropdown">
-						<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
-						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
-					</div>
-					{{/if}}
-					<div class="wall-item-author">
-						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
-					</div>
-					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-						{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
-					</div>
-				</div>
-
-				{{if $item.body}}
-				<div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}">
-					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
-						{{$item.body}}
-					</div>
-				</div>
-				{{/if}}
-				{{if $item.has_tags}}
-				<div class="p-2 wall-item-tools clearfix">
-
-					<div class="body-tags">
-						<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
-					</div>
-				{{**
-					{{if $item.mentions}}
-					<div class="body-tags" id="item-mentions">
-						<span class="tag">{{$item.mentions}}</span>
-					</div>
-					{{/if}}
-					{{if $item.tags}}
-					<div class="body-tags" id="item-tags">
-						<span class="tag">{{$item.tags}}</span>
-					</div>
-					{{/if}}
-					{{if $item.categories}}
-					<div class="body-tags" id="item-categories">
-						<span class="tag p-category">{{$item.categories}}</span>
-					</div>
-					{{/if}}
-					{{if $item.folders}}
-					<div class="body-tags" id="item-folders">
-						<span class="tag">{{$item.folders}}</span>
-					</div>
-					{{/if}}
-				**}}
-				</div>
-				{{/if}}
-				<div class="p-2 clearfix wall-item-tools">
-					<div class="wall-item-tools-right pull-right">
-						{{if $item.toplevel && $item.emojis && $item.reactions}}
-						<div class="btn-group dropdown">
-							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
-								<i class="fa fa-smile-o"></i>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right">
-							{{foreach $item.reactions as $react}}
-								<a class="dropdown-item clearfix" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="menu-img-2" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a>
-							{{/foreach}}
-							</div>
-						</div>
-						{{/if}}
-						<div class="btn-group dropdown">
-							{{if $item.like}}
-							<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
-								<i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i>
-							</button>
-							{{/if}}
-							{{if $item.dislike}}
-							<button type="button" title="{{$item.dislike.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;">
-								<i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i>
-							</button>
-							{{/if}}
-							{{if $item.isevent}}
-							<div class="btn-group dropdown">
-								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
-									<i class="fa fa-calendar-check-o"></i>
-								</button>
-								<div class="dropdown-menu">
-									<a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
-										<i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}}
-									</a>
-									<a class="dropdown-item" href="#" title="{{$item.attend.1}}" onclick="itemAddToCal({{$item.id}}), dolike({{$item.id}},'attendno'); return false;">
-										<i class="item-act-list fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> {{$item.attend.1}}
-									</a>
-									<a class="dropdown-item" href="#" title="{{$item.attend.2}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;">
-										<i class="item-act-list fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> {{$item.attend.2}}
-									</a>
-								</div>
-							</div>
-							{{/if}}
-							{{if $item.canvote}}
-							<div class="btn-group dropdown">
-								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}">
-									<i class="fa fa-check-square-o"></i>
-								</button>
-								<div class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}">
-									<a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;">
-										<i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}}
-									</a>
-									<a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;">
-										 <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}}
-									</a> 
-									<a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;">
-										<i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}}
-									</a>
-								</div>
-							</div>
-							{{/if}}
-							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
-								<i class="fa fa-cog"></i>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
-								{{if $item.share}}
-								<a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a>
-								{{/if}}
-								{{if $item.plink}}
-								<a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a>
-								{{/if}}
-								{{if $item.edpost}}
-								<a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a>
-								{{/if}}
-								{{if $item.tagger}}
-								<a class="dropdown-item" href="#"  onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a>
-								{{/if}}
-								{{if $item.filer}}
-								<a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a>
-								{{/if}}
-								{{if $item.bookmark}}
-								<a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a>
-								{{/if}}
-								{{if $item.addtocal}}
-								<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
-								{{/if}}
-								{{if $item.star}}
-								<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
-								{{/if}}
-								{{if $item.thread_action_menu}}
-								{{foreach $item.thread_action_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a>
-								{{/foreach}}
-								{{/if}}
-								{{if $item.drop.dropping}}
-								<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
-								{{/if}}
-								{{if $item.thread_author_menu}}
-								<div class="dropdown-divider"></div>
-								{{foreach $item.thread_author_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
-								{{/foreach}}
-								{{/if}}
-								{{if $item.edpost && $item.dreport}}
-								<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
-								{{/if}}
-							</div>
-						</div>
-					</div>
-					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
-					<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}">
-						{{if $item.attachments}}
-						<div class="btn-group">
-							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
-							<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
-						</div>
-						{{/if}}
-						<div class="wall-item-list-comments btn-group">
-							<a class="btn btn-outline-secondary btn-sm" href="{{$item.viewthread}}">
-								{{$item.comment_count_txt}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}</span>{{/if}}
-							</a>
-						</div>
-						{{if $item.unseen_comments}}
-						<div class="unseen-wall-indicator-{{$item.id}} btn-group">
-							<button class="btn btn-outline-secondary btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;">
-								<i class="fa fa-check-square-o"></i>
-							</button>
-						</div>
-						{{/if}}
-						{{if $item.responses }}
-						{{foreach $item.responses as $verb=>$response}}
-						{{if $response.count}}
-						<div class="btn-group">
-							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
-							{{if $response.modal}}
-							<div class="modal" id="{{$verb}}Modal-{{$item.id}}">
-								<div class="modal-dialog">
-									<div class="modal-content">
-										<div class="modal-header">
-											<h4 class="modal-title">{{$response.count}} {{$response.button}}</h4>
-											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-										</div>
-										<div class="modal-body response-list">
-											<ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul>
-										</div>
-										<div class="modal-footer clear">
-											<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$item.modal_dismiss}}</button>
-										</div>
-									</div><!-- /.modal-content -->
-								</div><!-- /.modal-dialog -->
-							</div><!-- /.modal -->
-							{{else}}
-							<div class="dropdown-menu">{{foreach $response.list as $liker}}{{$liker}}{{/foreach}}</div>
-							{{/if}}
-						</div>
-						{{/if}}
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-{{if $item.comment_lastcollapsed}}
-</div>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/conversation.tpl b/view/theme/redbasic/tpl/conversation.tpl
deleted file mode 100755
index 82c7be922..000000000
--- a/view/theme/redbasic/tpl/conversation.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="threads-begin"></div>
-{{foreach $threads as $thread}}
-<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper generic-content-wrapper">
-	{{foreach $thread.items as $item}}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
-			</div>
-			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
-		{{/if}}
-		{{if $item.comment_lastcollapsed}}</div>{{/if}}
-		
-		{{include file="{{$item.template}}"}}
-		
-		
-	{{/foreach}}
-</div>
-{{/foreach}}
-<div id="threads-end"></div>
-<div id="conversation-end"></div>
diff --git a/view/theme/redbasic/tpl/convobj.tpl b/view/theme/redbasic/tpl/convobj.tpl
deleted file mode 100755
index d5cee1170..000000000
--- a/view/theme/redbasic/tpl/convobj.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{foreach $threads as $item}}
-{{include file="{{$item.template}}"}}
-{{/foreach}}
-
diff --git a/view/theme/redbasic/tpl/cover_photo.tpl b/view/theme/redbasic/tpl/cover_photo.tpl
deleted file mode 100755
index 4352501ae..000000000
--- a/view/theme/redbasic/tpl/cover_photo.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div id="profile-photo-content" class="generic-content-wrapper">
-    <div class="section-title-wrapper">
-    <h2>{{$title}}</h2>
-    </div>
-    <div class="section-content-wrapper">
-
-		<form enctype="multipart/form-data" action="cover_photo" method="post">
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-		<div id="profile-photo-upload-wrapper">
-
-			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
-			<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
-			<div class="clear"></div>
-			<br />
-			<br />
-			<div id="profile-photo-submit-wrapper">
-				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
-			</div>
-		</div>
-
-		</form>
-		<br />
-		<br />
-		<div id="profile-photo-link-select-wrapper">
-			{{$select}}
-		</div>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/cover_photo_widget.tpl b/view/theme/redbasic/tpl/cover_photo_widget.tpl
deleted file mode 100755
index a9c384d2f..000000000
--- a/view/theme/redbasic/tpl/cover_photo_widget.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-<script>
-	var aside_padding_top;
-	var section_padding_top;
-	var coverSlid = false;
-
-	$(document).ready(function() {
-
-		aside_padding_top = parseInt($('aside').css('padding-top'));
-		section_padding_top = parseInt($('section').css('padding-top'));
-
-		$(document).on('click', slideUpCover);
-
-		if($('#cover-photo').length && $(window).width() > 755) {
-			if($(window).scrollTop() < $('#cover-photo').height()) {
-				$('.navbar').removeClass('fixed-top');
-				$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
-				$('main').css('opacity', 0);
-			}
-		}
-		else {
-			$('#cover-photo').remove();
-			coverSlid = true;
-		}
-	});
-
-	$(window).scroll(function () {
-		if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
-			$('.navbar').addClass('fixed-top');
-			$('main').css('margin-top', '');
-			$('main').css('opacity', 1);
-			coverSlid = true;
-		}
-		else if ($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){
-			if(coverSlid) {
-				$(window).scrollTop(Math.ceil($('#cover-photo').height()));
-				setTimeout(function(){ coverSlid = false; }, 1000);
-			}
-			else {
-				if($(window).scrollTop() < $('#cover-photo').height()) {
-					$('.navbar').removeClass('fixed-top');
-					$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
-					$('main').css('opacity', 0);
-				}
-			}
-		}
-		if($('#cover-photo').length && $('main').css('opacity') < 1) {
-			$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
-		}
-	});
-
-	$(window).resize(function () {
-		if($('#cover-photo').length && $(window).width() < 755) {
-			$('#cover-photo').remove();
-			$('.navbar').addClass('fixed-top');
-			$('main').css('opacity', 1);
-			coverSlid = true;
-		}
-
-	});
-
-	function slideUpCover() {
-		if(coverSlid) {
-			return;
-		}
-		$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' });
-		return;
-	}
-</script>
-
-<div id="cover-photo" title="{{$hovertitle}}">
-	{{$photo_html}}
-	<div id="cover-photo-caption">
-		<h1>{{$title}}</h1>
-		<h3>{{$subtitle}}</h3>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/cropbody.tpl b/view/theme/redbasic/tpl/cropbody.tpl
deleted file mode 100755
index 01d9a24a0..000000000
--- a/view/theme/redbasic/tpl/cropbody.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<h1>{{$title}}</h1>
-<p id="cropimage-desc">
-{{$desc}}
-</p>
-<div id="cropimage-wrapper">
-<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 300,
-			minHeight: 300,
-			maxWidth: 1024,
-			maxHeight: 1024,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<input type='hidden' name='profile' value='{{$profile}}'>
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="{{$done}}" />
-</div>
-
-</form>
diff --git a/view/theme/redbasic/tpl/cropcover.tpl b/view/theme/redbasic/tpl/cropcover.tpl
deleted file mode 100755
index 04b96a603..000000000
--- a/view/theme/redbasic/tpl/cropcover.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<h1>{{$title}}</h1>
-<p id="cropimage-desc">
-{{$desc}}
-</p>
-<div id="cropimage-wrapper">
-<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 240,
-			minHeight: 87,
-			maxWidth: 320,
-			maxHeight: 116,
-			ratioDim: { x: 100, y:36 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="cover_photo/{{$resource}}" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<input type='hidden' name='profile' value='{{$profile}}'>
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="{{$done}}" />
-</div>
-
-</form>
diff --git a/view/theme/redbasic/tpl/crophead.tpl b/view/theme/redbasic/tpl/crophead.tpl
deleted file mode 100755
index 48f375426..000000000
--- a/view/theme/redbasic/tpl/crophead.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/redbasic/tpl/delegate.tpl b/view/theme/redbasic/tpl/delegate.tpl
deleted file mode 100755
index cbaa8da86..000000000
--- a/view/theme/redbasic/tpl/delegate.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h3>{{$header}}</h3>
-
-<div id="delegate-desc" class="delegate-desc">{{$desc}}</div>
-
-{{if $managers}}
-<h3>{{$head_managers}}</h3>
-
-{{foreach $managers as $x}}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="#" >
-<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
-</a>
-</div>
-
-{{/foreach}}
-<div class="clear"></div>
-<hr />
-{{/if}}
-
-
-<h3>{{$head_delegates}}</h3>
-
-{{if $delegates}}
-{{foreach $delegates as $x}}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="{{$base}}/delegate/remove/{{$x.uid}}" >
-<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
-</a>
-</div>
-
-{{/foreach}}
-<div class="clear"></div>
-{{else}}
-{{$none}}
-{{/if}}
-<hr />
-
-
-<h3>{{$head_potentials}}</h3>
-{{if $potentials}}
-{{foreach $potentials as $x}}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="{{$base}}/delegate/add/{{$x.uid}}" >
-<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
-</a>
-</div>
-
-{{/foreach}}
-<div class="clear"></div>
-{{else}}
-{{$none}}
-{{/if}}
-<hr />
-
diff --git a/view/theme/redbasic/tpl/design_tools.tpl b/view/theme/redbasic/tpl/design_tools.tpl
deleted file mode 100644
index bc7d46dc1..000000000
--- a/view/theme/redbasic/tpl/design_tools.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="design-tools" class="widget design-tools">
-	<h3>{{$title}}</h3>
-	<div class="nav nav-pills flex-column">
-		<a class="nav-link" href="blocks/{{$who}}">{{$blocks}}</a>
-		<a class="nav-link" href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a>
-		<a class="nav-link" href="layouts/{{$who}}">{{$layout}}</a>
-		<a class="nav-link" href="webpages/{{$who}}">{{$pages}}</a>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/diaspora_vcard.tpl b/view/theme/redbasic/tpl/diaspora_vcard.tpl
deleted file mode 100644
index 017eb555c..000000000
--- a/view/theme/redbasic/tpl/diaspora_vcard.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-<div style="display:none;">
-	<dl class="entity_uid">
- 		<dt>Uid</dt>
- 		<dd>
-			<span class="uid p-uid">{{$diaspora.guid}}</span>
- 		</dd>
-	</dl>
-	<dl class='entity_nickname'>
-		<dt>Nickname</dt>
-		<dd>		
-			<span class="nickname p-nickname">{{$diaspora.nickname}}</span>
-		</dd>
-	</dl>
-	<dl class='entity_full_name'>
-		<dt>Full name</dt>
-		<dd>
-			<span class='fn p-name'>{{$diaspora.fullname}}</span>
-		</dd>
-	</dl>
-
-	<dl class='entity_first_name'>
-		<dt>First name</dt>
-		<dd>
-		<span class='given_name p-given-name'>{{$diaspora.firstname}}</span>
-		</dd>
-	</dl>
-	<dl class='entity_family_name'>
-		<dt>Family name</dt>
-		<dd>
-		<span class='family_name p-family-name'>{{$diaspora.lastname}}</span>
-		</dd>
-	</dl>
-	<dl class="entity_url">
-		<dt>URL</dt>
-		<dd>
-			<a href="{{$diaspora.podloc}}/" id="pod_location" class="url" rel="me" >{{$diaspora.podloc}}/</a>
-		</dd>
-	</dl>
-	<dl class="entity_photo">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}" />
-		</dd>
-	</dl>
-	<dl class="entity_photo_medium">
-		<dt>Photo</dt>
-		<dd> 
-			<img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}" />
-		</dd>
-	</dl>
-	<dl class="entity_photo_small">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}" />
-		</dd>
-	</dl>
-	<dl class="entity_searchable">
-		<dt>Searchable</dt>
-		<dd>
-			<span class="searchable">{{$diaspora.searchable}}</span>
-		</dd>
-	</dl>
-	<dl class="entity_key">
-		<dt>Key</dt>
-		<dd>
-		<pre class="key">{{$diaspora.pubkey}}</pre>
-		</dd>
-	</dl>
-</div>
diff --git a/view/theme/redbasic/tpl/dir_sort_links.tpl b/view/theme/redbasic/tpl/dir_sort_links.tpl
deleted file mode 100644
index 9346a7455..000000000
--- a/view/theme/redbasic/tpl/dir_sort_links.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="widget" id="dir_sort_links">
-<h3>{{$header}}</h3>
-
-{{include file="field_checkbox.tpl" field=$safemode}}
-{{include file="field_checkbox.tpl" field=$globaldir}}
-{{include file="field_checkbox.tpl" field=$pubforums}}
-
-</div>
diff --git a/view/theme/redbasic/tpl/directajax.tpl b/view/theme/redbasic/tpl/directajax.tpl
deleted file mode 100644
index 8faec4222..000000000
--- a/view/theme/redbasic/tpl/directajax.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{foreach $entries as $entry}}
-{{include file="direntry.tpl"}}
-{{/foreach}}
-
diff --git a/view/theme/redbasic/tpl/directory_header.tpl b/view/theme/redbasic/tpl/directory_header.tpl
deleted file mode 100755
index 71e991f3a..000000000
--- a/view/theme/redbasic/tpl/directory_header.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper clearfix">
-		<div class="btn-group pull-right">
-			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
-				<i class="fa fa-sort"></i>
-			</button>
-			<div class="dropdown-menu dropdown-menu-right">
-				<a class="dropdown-item" href="directory?f=&order=date{{$suggest}}">{{$date}}</a>
-				<a class="dropdown-item" href="directory?f=&order=normal{{$suggest}}">{{$normal}}</a>
-				<a class="dropdown-item" href="directory?f=&order=reversedate{{$suggest}}">{{$reversedate}}</a>
-				<a class="dropdown-item" href="directory?f=&order=reverse{{$suggest}}">{{$reverse}}</a>
-			</div>
-		</div>
-		<h2>{{$dirlbl}}{{if $search}}:&nbsp;{{$safetxt}}{{/if}}</h2>
-	</div>
-	{{foreach $entries as $entry}}
-		{{include file="direntry.tpl"}}
-	{{/foreach}}
-	<div id="page-end"></div>
-</div>
-<script>$(document).ready(function() { loadingPage = false;});</script>
-<div id="page-spinner"></div>
diff --git a/view/theme/redbasic/tpl/direntry.tpl b/view/theme/redbasic/tpl/direntry.tpl
deleted file mode 100755
index f7ec7db23..000000000
--- a/view/theme/redbasic/tpl/direntry.tpl
+++ /dev/null
@@ -1,77 +0,0 @@
-<div class="directory-item{{if $entry.safe}} safe{{/if}}" id="directory-item-{{$entry.hash}}" >
-	<div class="section-subtitle-wrapper clearfix">
-		<div class="pull-right">
-			{{if $entry.viewrate}}
-				{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-outline-secondary btn-sm">{{$entry.total_ratings}}</a>{{/if}}
-			{{/if}}
-			{{if $entry.ignlink}}
-			<a class="directory-ignore btn btn-warning btn-sm" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a>
-			{{/if}}
-			{{if $entry.connect}}
-			<a class="btn btn-success btn-sm" href="{{$entry.connect}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conn_label}}</a>
-			{{/if}}
-			{{if $entry.viewrate}}
-				{{if $entry.canrate}}<button class="btn btn-outline-secondary btn-sm" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="fa fa-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
-			{{/if}}
-		</div>
-		<h3>{{if $entry.public_forum}}<i class="fa fa-comments-o" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="fa fa-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
-	</div>
-	<div class="section-content-tools-wrapper directory-collapse">
-		<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" >
-			<div class="contact-photo" id="directory-photo-{{$entry.hash}}" >
-				<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.hash}}" >
-					<img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" />
-				</a>
-			</div>
-		</div>
-		<div class="contact-info">
-			{{if $entry.common_friends}}
-			<div id="dir-common" class="contact-info-element">
-				<span class="contact-info-label">{{$entry.common_label}}</span> {{$entry.common_count}}
-			</div>
-			{{/if}}
-
-			{{if $entry.pdesc}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.pdesc_label}}</span> {{$entry.pdesc}}
-			</div>
-			{{/if}}
-
-			{{if $entry.age}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.age_label}}</span> {{$entry.age}}
-			</div>
-			{{/if}}
-
-			{{if $entry.location}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.location_label}}</span> {{$entry.location}}
-			</div>
-			{{/if}}
-
-			{{if $entry.hometown}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.hometown_label}}</span> {{$entry.hometown}}
-			</div>
-			{{/if}}
-
-			{{if $entry.homepage}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.homepage}}</span> {{$entry.homepageurl}}
-			</div>
-			{{/if}}
-
-			{{if $entry.kw}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.kw}}</span> {{$entry.keywords}}
-			</div>
-			{{/if}}
-
-			{{if $entry.about}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.about_label}}</span> {{$entry.about}}
-			</div>
-			{{/if}}
-		</div>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/display-head.tpl b/view/theme/redbasic/tpl/display-head.tpl
deleted file mode 100755
index 913784d98..000000000
--- a/view/theme/redbasic/tpl/display-head.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<script>
-$(document).ready(function() {
-	$(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
-	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
-});
-</script>
-
diff --git a/view/theme/redbasic/tpl/dreport.tpl b/view/theme/redbasic/tpl/dreport.tpl
deleted file mode 100644
index 1f5915609..000000000
--- a/view/theme/redbasic/tpl/dreport.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $table == 'item'}}
-		<div class="dropdown pull-right">
-			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$options}}">
-				<i class="fa fa-sort-desc"></i>
-			</button>
-			<ul class="dropdown-menu">
-				<li><a href="dreport/push/{{$mid}}">{{$push}}</a></li>
-			</ul>
-		</div>
-		{{/if}}
-		<h2>{{$title}}</h2>
-	</div>
-
-	<div>
-	<table>
-	{{if $entries}}
-	{{foreach $entries as $e}}
-	<tr>
-		<td width="40%">{{$e.name}}</td>
-		<td width="20%">{{$e.result}}</td>
-		<td width="20%">{{$e.time}}</td>
-	</tr>
-	{{/foreach}}
-	{{/if}}
-	</table>
-</div>
diff --git a/view/theme/redbasic/tpl/edpost_head.tpl b/view/theme/redbasic/tpl/edpost_head.tpl
deleted file mode 100755
index b2ab5db4e..000000000
--- a/view/theme/redbasic/tpl/edpost_head.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $delete}}
-		<div class="pull-right">
-			<a  href="item/drop/{{$id}}" id="delete-btn" class="btn btn-sm btn-danger" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$delete}}</a>
-		</div>
-		{{/if}}
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div id="webpage-editor" class="section-content-tools-wrapper">
-		{{$editor}}
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/email_notify_html.tpl b/view/theme/redbasic/tpl/email_notify_html.tpl
deleted file mode 100755
index 5b4954c8e..000000000
--- a/view/theme/redbasic/tpl/email_notify_html.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>{{$banner}}</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;">
-	<tbody>
-	<tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src="{{$notify_icon}}"><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
-
-
-	<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
-		<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td></tr>
-	<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
-	<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
-	<tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr>
-	<tr><td style="padding:11px 0;" colspan="2">{{$hitemlink}}</td></tr>
-	<tr><td></td><td>{{$thanks}}</td></tr>
-	<tr><td></td><td>{{$site_admin}}</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
diff --git a/view/theme/redbasic/tpl/email_notify_text.tpl b/view/theme/redbasic/tpl/email_notify_text.tpl
deleted file mode 100755
index 56925c18b..000000000
--- a/view/theme/redbasic/tpl/email_notify_text.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{$preamble}}
-	
-{{$title}}
-
-{{$textversion}}
-				
-{{$tsitelink}}
-
-{{$titemlink}}
-
-{{$thanks}}
-{{$site_admin}}
-
diff --git a/view/theme/redbasic/tpl/event.tpl b/view/theme/redbasic/tpl/event.tpl
deleted file mode 100755
index cc0bfc1c7..000000000
--- a/view/theme/redbasic/tpl/event.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{foreach $events as $event}}
-	<div class="event-wrapper">
-		<div class="event">
-			<div class="event-owner">
-				{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}}
-			</div>
-			{{$event.html}}
-			<div class="event-buttons">
-				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="fa fa-external-link btn btn-outline-secondary" ></i></a>{{/if}}
-				{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>{{/if}}
-				{{if $event.drop}}<a href="{{$event.drop.0}}" title="{{$event.drop.1}}" class="drop-event-link"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>{{/if}}
-			</div>
-			<div class="clear"></div>
-		</div>
-	</div>
-{{/foreach}}
diff --git a/view/theme/redbasic/tpl/event_cal.tpl b/view/theme/redbasic/tpl/event_cal.tpl
deleted file mode 100755
index d7662786b..000000000
--- a/view/theme/redbasic/tpl/event_cal.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{foreach $events as $event}}
-	<div class="event-wrapper">
-		<div class="event">
-			<div class="event-owner">
-				{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}}
-			</div>
-			{{$event.html}}
-			<div class="event-buttons">
-				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="fa fa-external-link btn btn-outline-secondary" ></i></a>{{/if}}
-			</div>
-			<div class="clear"></div>
-		</div>
-	</div>
-{{/foreach}}
diff --git a/view/theme/redbasic/tpl/event_form.tpl b/view/theme/redbasic/tpl/event_form.tpl
deleted file mode 100755
index d07a06b67..000000000
--- a/view/theme/redbasic/tpl/event_form.tpl
+++ /dev/null
@@ -1,130 +0,0 @@
-<form id="event-edit-form" action="{{$post}}" method="post" class="acl-form" data-form_id="event-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-
-	<input type="hidden" name="event_id" value="{{$eid}}" />
-	<input type="hidden" name="event_hash" value="{{$event_hash}}" />
-	<input type="hidden" name="xchan" value="{{$xchan}}" />
-	<input type="hidden" name="mid" value="{{$mid}}" />
-	<input type="hidden" name="type" value="{{$type}}" />
-	<input type="hidden" name="preview" id="event-edit-preview" value="0" />
-
-
-	{{include file="field_input.tpl" field=$summary}}
-
-	{{if $tz_choose}}
-	{{include file="field_select_grouped.tpl" field=$timezone}}
-	{{/if}}
-
-	{{$s_dsel}}
-
-	{{$f_dsel}}
-
-	{{include file="field_checkbox.tpl" field=$nofinish}}
-
-	<div id="advanced" style="display:none">
-
-		{{include file="field_checkbox.tpl" field=$adjust}}
-
-		{{if $catsenabled}}
-		<div id="event-category-text"><b>{{$c_text}}</b></div>
-		<div id="events-category-wrap">
-			<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput" />
-		</div>
-		{{/if}}
-
-		<div class="form-group">
-			<div class="form-group">
-				<div id="event-desc-text"><b>{{$d_text}}</b></div>
-				<textarea id="comment-edit-text-desc" class="form-control" name="desc" >{{$d_orig}}</textarea>
-			</div>
-			<div id="comment-tools-desc" class="comment-tools" style="display: block;" >
-				<div id="comment-edit-bb-desc" class="btn-toolbar">
-					<div class='btn-group mr-2'>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'desc');">
-							<i class="fa fa-bold comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'desc');">
-							<i class="fa fa-italic comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'desc');">
-							<i class="fa fa-underline comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('none','quote','desc');">
-							<i class="fa fa-quote-left comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'desc');">
-							<i class="fa fa-terminal comment-icon"></i>
-						</button>
-					</div>
-					<div class='btn-group'>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'desc');">
-							<i class="fa fa-camera comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'desc');">
-							<i class="fa fa-link comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'desc');">
-							<i class="fa fa-video-camera comment-icon"></i>
-						</button>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="form-group">
-			<div class="form-group">
-				<div id="event-location-text"><b>{{$l_text}}</b></div>
-				<textarea id="comment-edit-text-loc" class="form-control" name="location">{{$l_orig}}</textarea>
-			</div>
-			<div id="comment-tools-loc" class="comment-tools" style="display: block;" >
-				<div id="comment-edit-bb-loc" class="btn-toolbar">
-					<div class='btn-group mr-2'>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'loc');">
-							<i class="fa fa-bold comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'loc');">
-							<i class="fa fa-italic comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'loc');">
-							<i class="fa fa-underline comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('none','quote','loc');">
-							<i class="fa fa-quote-left comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'loc');">
-							<i class="fa fa-terminal comment-icon"></i>
-						</button>
-					</div>
-					<div class='btn-group'>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'loc');">
-							<i class="fa fa-camera comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'loc');">
-							<i class="fa fa-link comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'loc');">
-							<i class="fa fa-video-camera comment-icon"></i>
-						</button>
-						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$mapper}}" onclick="insertbbcomment('none','map','loc');">
-							<i class="fa fa-globe comment-icon"></i>
-						</button>
-					</div>
-
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div class="clear"></div>
-
-	<button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('advanced');">{{$advanced}}</button>
-	<div class="btn-group float-right">
-		<button id="event-edit-preview-btn" class="btn btn-outline-secondary btn-sm" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button>
-		{{if ! $eid}}
-		<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button>
-		{{/if}}
-		<button id="event-submit" class="btn btn-primary btn-sm" type="submit" name="submit">{{$submit}}</button>
-	</div>
-</form>
-
-{{if ! $eid}}
-	{{$acl}}
-{{/if}}
diff --git a/view/theme/redbasic/tpl/event_head.tpl b/view/theme/redbasic/tpl/event_head.tpl
deleted file mode 100755
index 3b2cb5041..000000000
--- a/view/theme/redbasic/tpl/event_head.tpl
+++ /dev/null
@@ -1,160 +0,0 @@
-<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/locale-all.js"></script>
-
-<script>
-	function showEvent(eventid) {
-		$.get(
-			'{{$baseurl}}{{$module_url}}/?id='+eventid,
-			function(data){
-				$.colorbox({ scrolling: false, html: data, onComplete: function() { $.colorbox.resize(); }});
-			}
-		);			
-	}
-	
-	function doEventPreview() {
-		$('#event-edit-preview').val(1);
-		$.post('events',$('#event-edit-form').serialize(), function(data) {
-			$.colorbox({ html: data });
-		});
-		$('#event-edit-preview').val(0);
-	}
-
-	function exportDate() {
-		var moment = $('#events-calendar').fullCalendar('getDate');
-		var sT = 'events/' + moment.year() + '/' + (moment.month() + 1) + '/export';
-		window.location.href=sT;
-	}
-	
-	function changeView(action, viewName) {
-		$('#events-calendar').fullCalendar(action, viewName);
-		var view = $('#events-calendar').fullCalendar('getView');
-
-		if(view.type !== 'month' && !$('main').hasClass('fullscreen')) {
-			$('#events-calendar').fullCalendar('option', 'height', 'auto');
-		}
-		else {
-			$('#events-calendar').fullCalendar('option', 'height', '');
-		}
-
-		if($('main').hasClass('fullscreen')) {
-			$('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
-		}
-
-		$('#title').text(view.title);
-	}
-
-
-	$(document).ready(function() {
-		$('#events-calendar').fullCalendar({
-			events: '{{$baseurl}}{{$module_url}}/json',
-			header: false,
-			eventTextColor: 'white',
-			lang: '{{$lang}}',
-			firstDay: {{$first_day}},
-
-			eventLimit: 3,
-
-			monthNames: aStr['monthNames'],
-			monthNamesShort: aStr['monthNamesShort'],
-			dayNames: aStr['dayNames'],
-			dayNamesShort: aStr['dayNamesShort'],
-
-			allDayText: aStr['allday'],
-			timeFormat: 'HH:mm',
-			eventClick: function(calEvent, jsEvent, view) {
-				showEvent(calEvent.id);
-			},
-			loading: function(isLoading, view) {
-				$('#events-spinner').spin('tiny');
-				$('#events-spinner > i').css('color', 'transparent');
-				if(!isLoading) {
-					$('#events-spinner').spin(false);
-					$('#events-spinner > i').css('color', '');
-					$('td.fc-day').dblclick(function() {
-						openMenu('form');
-						//window.location.href='/events/new?start='+$(this).data('date');
-					});
-				}
-			},
-
-			eventRender: function(event, element, view) {
-
-				//console.log(view.name);
-				if (event.item['author']['xchan_name']==null) return;
-
-				switch(view.name){
-					case "month":
-					element.find(".fc-title").html(
-						"<img src='{0}' style='height:12px;width:12px;' title='{1}'>&nbsp;<span title='{3}{4}'>{2}</span>".format(
-							event.item['author']['xchan_photo_s'],
-							event.item['author']['xchan_name'],
-							event.title,
-							event.item.description ? event.item.description + "\r\n\r\n" : '',
-							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
-					));
-					break;
-					case "agendaWeek":
-					element.find(".fc-title").html(
-						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
-							event.item['author']['xchan_photo_s'],
-							event.item['author']['xchan_name'],
-							event.title,
-							event.item.description ? event.item.description + "\r\n\r\n" : '',
-							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
-					));
-					break;
-					case "agendaDay":
-					element.find(".fc-title").html(
-						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
-							event.item['author']['xchan_photo_s'],
-							event.item['author']['xchan_name'],
-							event.title,
-							event.item.description ? event.item.description + "\r\n\r\n" : '',
-							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
-					));
-					break;
-				}
-			}
-			
-		});
-		
-		// center on date
-		// @fixme does not work for cal/$nick module_url
-		var args=location.href.replace(baseurl,"").split("/");
-		{{if $modparams == 2}}
-		if (args.length>=5) {
-			$("#events-calendar").fullCalendar('gotoDate',args[3] , args[4]-1);
-		}
-		{{else}}
-		if (args.length>=4) {
-			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
-		}
-		{{/if}} 
-		
-		// show event popup
-		var hash = location.hash.split("-")
-		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
-		
-		// echo the title
-		var view = $('#events-calendar').fullCalendar('getView');
-		$('#title').text(view.title);
-
-		// shift the finish time date on start time date change automagically
-		var origsval = $('#id_start_text').val();
-		$('#id_start_text').change(function() {
-			var origfval = $('#id_finish_text').val();
-			if(origfval) {
-				var sval = $('#id_start_text').val();
-				var diff = moment(sval).diff(origsval);
-				var fval = moment(origfval).add(diff, 'millisecond').format("YYYY-MM-DD HH:mm");
-				$('#id_finish_text').val(fval);
-				origsval = sval;
-			}
-		});
-
-	});
-
-</script>
-
diff --git a/view/theme/redbasic/tpl/event_item_content.tpl b/view/theme/redbasic/tpl/event_item_content.tpl
deleted file mode 100644
index 76e0f4616..000000000
--- a/view/theme/redbasic/tpl/event_item_content.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{if $description}}
-<div class="event-item-description">
-	{{$description}}
-</div>
-{{/if}}
-{{if $location}}
-<div class="event-item-location">
-	<span class="event-item-label">{{$location_label}}</span>&nbsp;<span class="event-item-location">{{$location}}</span>
-</div>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/event_item_header.tpl b/view/theme/redbasic/tpl/event_item_header.tpl
deleted file mode 100755
index 6247aaf6f..000000000
--- a/view/theme/redbasic/tpl/event_item_header.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="event-item-title">
-	<h3><i class="fa fa-calendar"></i>&nbsp;{{$title}}</h3>
-</div>
-<div class="event-item-start">
-	<span class="event-item-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
-</div>
-{{if $finish}}
-<div class="event-item-start">
-	<span class="event-item-label">{{$dtend_label}}</span>&nbsp;<span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
-</div>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/events-js.tpl b/view/theme/redbasic/tpl/events-js.tpl
deleted file mode 100755
index 9d32c76be..000000000
--- a/view/theme/redbasic/tpl/events-js.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			<div class="dropdown">
-				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i>&nbsp;{{$view_label}}</button>
-				<div class="dropdown-menu">
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a>
-					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a>
-				</div>
-				<button class="btn btn-success btn-sm" onclick="openClose('form');">{{$new_event.1}}</button>
-				<div class="btn-group">
-					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-					<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
-					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
-				</div>
-				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-				<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
-			</div>
-		</div>
-		<h2 id="title"></h2>
-		<div class="clear"></div>
-	</div>
-	<div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}>
-		{{$form}}
-	</div>
-	<div class="clear"></div>
-	<div class="section-content-wrapper-np">
-		<div id="events-calendar"></div>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/events_cal-js.tpl b/view/theme/redbasic/tpl/events_cal-js.tpl
deleted file mode 100755
index ba9e16dd6..000000000
--- a/view/theme/redbasic/tpl/events_cal-js.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{$tabs}}
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			<div class="btn-group">
-				<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-				<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
-				<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
-			</div>
-			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
-		</div>
-		<h2 id="title"></h2>
-		<div class="clear"></div>
-	</div>
-	<div class="clear"></div>
-	<div class="section-content-wrapper-np">
-		<div id="events-calendar"></div>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/events_menu_side.tpl b/view/theme/redbasic/tpl/events_menu_side.tpl
deleted file mode 100755
index b9a9062b1..000000000
--- a/view/theme/redbasic/tpl/events_menu_side.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="widget">
-	<h3>{{$title}}</h3>
-	<ul class="nav nav-pills nav-stacked">
-		<li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
-		<li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
-		<li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
-	</ul>
-</div>
diff --git a/view/theme/redbasic/tpl/events_reminder.tpl b/view/theme/redbasic/tpl/events_reminder.tpl
deleted file mode 100755
index fd6a1a5c7..000000000
--- a/view/theme/redbasic/tpl/events_reminder.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{if $count}}
-<div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div>
-<div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title}}</div>
-<div id="event-title-end"></div>
-{{foreach $events as $event}}
-<div class="event-list" id="event-{{$event.id}}"></a> <a href="events/{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
-{{/foreach}}
-</div>
-{{/if}}
-
diff --git a/view/theme/redbasic/tpl/events_tools_side.tpl b/view/theme/redbasic/tpl/events_tools_side.tpl
deleted file mode 100755
index e22f95c1e..000000000
--- a/view/theme/redbasic/tpl/events_tools_side.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="widget">
-	<h3>{{$title}}</h3>
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a class="nav-link" href="#" onclick="exportDate(); return false;"><i class="fa fa-arrow-circle-o-down"></i>&nbsp;{{$export}}</a></li>
-		<li class="nav-item"><a class="nav-link" href="#" onclick="openClose('event-upload-form'); return false;"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$import}}</a></li>
-	</ul>
-	<div id="event-upload-form" class="sub-menu-wrapper">
-		<div class="sub-menu">
-			<form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
-				<div class="form-group">
-					<input id="event-upload-choose" class="form-control-file w-100" type="file" name="userfile" />
-				</div>
-				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
-			</form>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/failed_updates.tpl b/view/theme/redbasic/tpl/failed_updates.tpl
deleted file mode 100755
index f53f1f478..000000000
--- a/view/theme/redbasic/tpl/failed_updates.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h2>{{$banner}}</h2>
-
-<div id="failed_updates_desc">{{$desc}}</div>
-
-{{if $failed}}
-{{foreach $failed as $f}}
-
-<h4>{{$f}}</h4>
-<ul>
-<li><a href="{{$base}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li>
-<li><a href="{{$base}}/admin/dbsync/{{$f}}">{{$apply}}</a></li>
-</ul>
-
-<hr />
-{{/foreach}}
-{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/field.tpl b/view/theme/redbasic/tpl/field.tpl
deleted file mode 100755
index 942cfcef5..000000000
--- a/view/theme/redbasic/tpl/field.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
- {{if $field.0==select}}
- {{include file="field_select.tpl"}}
- {{/if}}
diff --git a/view/theme/redbasic/tpl/field_acheckbox.tpl b/view/theme/redbasic/tpl/field_acheckbox.tpl
deleted file mode 100755
index c87b9ac79..000000000
--- a/view/theme/redbasic/tpl/field_acheckbox.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<tr class="highlight">
-	<td>
-		<label class="mainlabel" for='me_id_{{$field.0}}'>{{$field.1}}</label><br>
-		<span class='field_abook_help'>{{$field.6}}</span>
-	</td>
-	{{if $notself}}
-	<td class="abook-them">
-		{{if $field.2}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}}
-	</td>
-	{{/if}}
-	<td class="abook-me">
-		{{if $self || !$field.5 || $twocol }}
-		<input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />
-		{{/if}}
-		{{if $notself && $field.5}}
-		<input type="hidden" name='{{$field.0}}' value="{{if $field.7}}1{{else}}0{{/if}}" />
-		{{if $field.3}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}}
-		{{/if}}
-	</td>
-	<td>
-		{{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="fa fa-check-square-o"></i>{{else}} <i class="fa fa-square-o"></i>{{/if}}{{/if}}</span>{{/if}}
-	</td>
-</tr>
diff --git a/view/theme/redbasic/tpl/field_checkbox.tpl b/view/theme/redbasic/tpl/field_checkbox.tpl
deleted file mode 100755
index f779f937c..000000000
--- a/view/theme/redbasic/tpl/field_checkbox.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div id="{{$field.0}}_container" class="clearfix form-group checkbox">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<div class="float-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div>
-		<small class="form-text text-muted">{{$field.3}}</small>
-	</div>
diff --git a/view/theme/redbasic/tpl/field_colorinput.tpl b/view/theme/redbasic/tpl/field_colorinput.tpl
deleted file mode 100644
index 9b6f33462..000000000
--- a/view/theme/redbasic/tpl/field_colorinput.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	<div class='form-group field input color'>
-		<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
-		<input class='form-control color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
-		<span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span>
-		<div id='end_{{$field.0}}' class='field_end'></div>
-	</div>
diff --git a/view/theme/redbasic/tpl/field_combobox.tpl b/view/theme/redbasic/tpl/field_combobox.tpl
deleted file mode 100755
index 12d00a08d..000000000
--- a/view/theme/redbasic/tpl/field_combobox.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="form-group">
-	<label class="" for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label>
-	<input class="form-control" id="id_{{$field.0}}" type="text" list="data_{{$field.0}}"{{if $field.5}} {{$field.5}}{{/if}}>
-	<datalist id="data_{{$field.0}}" >
-		{{foreach $field.4 as $opt=>$val}}
-		<option value="{{$val}}">
-		{{/foreach}}
-	</datalist>
-	{{**
-	<input id="id_{{$field.0}}" class="form-control" type="text" value="{{$field.2}}">
-	<select id="select_{{$field.0}}" class="form-control" onChange="$('#id_{{$field.0}}').val($(this).val())">
-		<option value="">{{$field.5}}</option>
-		{{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
-	</select>
-	**}} 
-	<span class='field_help'>{{$field.3}}</span>
-</div>
-
diff --git a/view/theme/redbasic/tpl/field_custom.tpl b/view/theme/redbasic/tpl/field_custom.tpl
deleted file mode 100755
index 907b4c50e..000000000
--- a/view/theme/redbasic/tpl/field_custom.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div class='form-group field custom'>
-		<label for='{{$field.0}}'>{{$field.1}}</label>
-		{{$field.2}}
-		<span class='help-block'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/redbasic/tpl/field_input.tpl b/view/theme/redbasic/tpl/field_input.tpl
deleted file mode 100755
index 65a837e5f..000000000
--- a/view/theme/redbasic/tpl/field_input.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div id="id_{{$field.0}}_wrapper" class="form-group">
-		<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
-		<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>
-		<small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small>
-	</div>
diff --git a/view/theme/redbasic/tpl/field_intcheckbox.tpl b/view/theme/redbasic/tpl/field_intcheckbox.tpl
deleted file mode 100755
index abfe6e189..000000000
--- a/view/theme/redbasic/tpl/field_intcheckbox.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div class="clearfix form-group checkbox">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<div class="pull-right"><input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for="id_{{$field.0}}"> <span class="onoffswitch-inner" data-on="{{if $field.5}}{{$field.5.1}}{{/if}}" data-off="{{if $field.5}}{{$field.5.0}}{{/if}}"></span><span class="onoffswitch-switch"></span> </label></div>
-		<small class="form-text text-muted">{{$field.4}}</small>
-	</div>
diff --git a/view/theme/redbasic/tpl/field_password.tpl b/view/theme/redbasic/tpl/field_password.tpl
deleted file mode 100755
index fa5e14582..000000000
--- a/view/theme/redbasic/tpl/field_password.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div class="form-group">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<input class="form-control" type="password" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
-		<small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small>
-	</div>
diff --git a/view/theme/redbasic/tpl/field_radio.tpl b/view/theme/redbasic/tpl/field_radio.tpl
deleted file mode 100755
index 6b5f52de6..000000000
--- a/view/theme/redbasic/tpl/field_radio.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-	<div class="form-group field radio">
-		<label for='id_{{$field.0}}_{{$field.2}}'>
-			<input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}>
-			{{$field.1}}
-		</label>
-		<span class='help-block'>{{$field.3}}</span>
-	</div>
-	<div class="clear"></div>
diff --git a/view/theme/redbasic/tpl/field_richtext.tpl b/view/theme/redbasic/tpl/field_richtext.tpl
deleted file mode 100755
index 378e02a62..000000000
--- a/view/theme/redbasic/tpl/field_richtext.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div class='field richtext'>
-		<label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
-		<textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext">{{$field.2}}</textarea>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/redbasic/tpl/field_select.tpl b/view/theme/redbasic/tpl/field_select.tpl
deleted file mode 100755
index cda9a823a..000000000
--- a/view/theme/redbasic/tpl/field_select.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-	<div class="form-group">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}">
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<small class="form-text text-muted">{{$field.3}}</small>
-	</div>
diff --git a/view/theme/redbasic/tpl/field_select_disabled.tpl b/view/theme/redbasic/tpl/field_select_disabled.tpl
deleted file mode 100644
index ee5e1508f..000000000
--- a/view/theme/redbasic/tpl/field_select_disabled.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-	<div class='form-group field select'>
-		<label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select class="form-control" disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'>
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<span class='help-block'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/redbasic/tpl/field_select_grouped.tpl b/view/theme/redbasic/tpl/field_select_grouped.tpl
deleted file mode 100644
index e6d1479de..000000000
--- a/view/theme/redbasic/tpl/field_select_grouped.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-	<div class='form-group field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'>
-			{{foreach $field.4 as $group=>$opts}}
-				<optgroup label='{{$group}}'>
-				{{foreach $opts as $opt=>$val}}
-					<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-				{{/foreach}}
-				</optgroup>
-		</select>
-		<span class='help-block'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/redbasic/tpl/field_select_raw.tpl b/view/theme/redbasic/tpl/field_select_raw.tpl
deleted file mode 100755
index 2780df58c..000000000
--- a/view/theme/redbasic/tpl/field_select_raw.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-	<div class='form-group field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'>
-			{{$field.4}}
-		</select>
-		<span class='help-block'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/redbasic/tpl/field_textarea.tpl b/view/theme/redbasic/tpl/field_textarea.tpl
deleted file mode 100755
index 437dece93..000000000
--- a/view/theme/redbasic/tpl/field_textarea.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div class="form-group">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<textarea class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea>
-		<small class="form-text text-muted">{{$field.3}}</small>
-	</div>
diff --git a/view/theme/redbasic/tpl/field_themeselect.tpl b/view/theme/redbasic/tpl/field_themeselect.tpl
deleted file mode 100755
index 7a529774c..000000000
--- a/view/theme/redbasic/tpl/field_themeselect.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-	{{if $field.5 == 'preview'}}
-		<script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script>
-	{{/if}}
-	<div class='form-group field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5 == 'preview'}}onchange="previewTheme(this);"{{/if}} >
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<span class='field_help'>{{$field.3}}</span>
-		{{if $field.5=='preview'}}
-			<div id="theme-preview"></div>
-		{{/if}}
-	</div>
diff --git a/view/theme/redbasic/tpl/field_yesno.tpl b/view/theme/redbasic/tpl/field_yesno.tpl
deleted file mode 100755
index 8a4cda55b..000000000
--- a/view/theme/redbasic/tpl/field_yesno.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-	<div class='clearfix form-group'>
-		<label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
-		<div class='onoff' id="id_{{$field.0}}_onoff">
-			<input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-			<a href="#" class='off'>
-				{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
-			</a>
-			<a href="#" class='on'>
-				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
-			</a>
-		</div>
-		<small class='form-text text-muted'>{{$field.3}}</small>
-	</div>
diff --git a/view/theme/redbasic/tpl/fileas_widget.tpl b/view/theme/redbasic/tpl/fileas_widget.tpl
deleted file mode 100755
index a6a69b89c..000000000
--- a/view/theme/redbasic/tpl/fileas_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="fileas-sidebar" class="widget">
-	<h3>{{$title}}</h3>
-	<div id="nets-desc">{{$desc}}</div>
-	
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a class="nav-link{{if $sel_all}} active{{/if}}" href="{{$base}}">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-		<li class="nav-item"><a class="nav-link{{if $term.selected}} active{{/if}}" href="{{$base}}?f=&file={{$term.name}}">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/theme/redbasic/tpl/filebrowser.tpl b/view/theme/redbasic/tpl/filebrowser.tpl
deleted file mode 100755
index 787f7c0cd..000000000
--- a/view/theme/redbasic/tpl/filebrowser.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-	<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
-	<style>
-		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
-		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
-		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
-		.filebrowser ul{ list-style-type: none; padding:0px; }
-		.filebrowser.folders a { display: block; padding: 0.3em }
-		.filebrowser.folders a:hover { background-color: #f0f0ee; }
-		.filebrowser.files.image { overflow: auto; height: auto; }
-		.filebrowser.files.image img { height:50px;}
-		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
-		.filebrowser.files.image span { display: none;}
-		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
-		.filebrowser.files a { display: block;  padding: 0.3em}
-		.filebrowser.files a:hover { background-color: #f0f0ee; }
-		.filebrowser a { text-decoration: none; }
-	</style>
-	<script>
-		var FileBrowserDialogue = {
-			init : function () {
-				// Here goes your code for setting your custom things onLoad.
-			},
-			mySubmit : function (URL) {
-				//var URL = document.my_form.my_field.value;
-				var win = tinyMCEPopup.getWindowArg("window");
-
-				// insert information now
-				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
-
-				// are we an image browser
-				if (typeof(win.ImageDialog) != "undefined") {
-					// we are, so update image dimensions...
-					if (win.ImageDialog.getImageData)
-						win.ImageDialog.getImageData();
-
-					// ... and preview if necessary
-					if (win.ImageDialog.showPreviewImage)
-						win.ImageDialog.showPreviewImage(URL);
-				}
-
-				// close popup window
-				tinyMCEPopup.close();
-			}
-		}
-
-		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
-	</script>
-	</head>
-	<body>
-	
-	<div class="tabs">
-		<ul >
-			<li class="current"><span>FileBrowser</span></li>
-		</ul>
-	</div>
-	<div class="panel_wrapper">
-
-		<div id="general_panel" class="panel current">
-			<div class="filebrowser path">
-				{{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
-			</div>
-			<div class="filebrowser folders">
-				<ul>
-					{{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
-				</ul>
-			</div>
-			<div class="filebrowser files {{$type}}">
-				<ul>
-				{{foreach $files as $f}}
-					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
-				{{/foreach}}
-				</ul>
-			</div>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
-	</div>	
-	</body>
-	
-</html>
diff --git a/view/theme/redbasic/tpl/filer_dialog.tpl b/view/theme/redbasic/tpl/filer_dialog.tpl
deleted file mode 100755
index 61860d10f..000000000
--- a/view/theme/redbasic/tpl/filer_dialog.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="modal" id="item-filer-dialog">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">{{$title}}</h4>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        {{include file="field_combobox.tpl"}}
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">{{$cancel}}</button>
-        <button id="filer_save" type="button" class="btn btn-primary">{{$submit}}</button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/view/theme/redbasic/tpl/follow.tpl b/view/theme/redbasic/tpl/follow.tpl
deleted file mode 100755
index 4def1415d..000000000
--- a/view/theme/redbasic/tpl/follow.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div id="follow-sidebar" class="widget">
-	<h3>{{$connect}}</h3>
-	<form action="follow" method="post" />
-		<div class="input-group">
-			<input class="form-control form-control-sm" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
-			<div class="input-group-btn">
-				<button class="btn btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
-			</div>
-		</div>
-	</form>
-	{{if $abook_usage_message}}
-	<div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div>
-	{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/force_image_reload.tpl b/view/theme/redbasic/tpl/force_image_reload.tpl
deleted file mode 100644
index 839bd22b5..000000000
--- a/view/theme/redbasic/tpl/force_image_reload.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-{{* 
-Force the browser to reload an image from the server instead of the cache.
-based on an answer from http://stackoverflow.com/a/22429796/3343347
-
-Usage: Set $imgUrl to the src url you want to be re-fetched from the server
-
-*}}
-
-<script>
-  $(document).ready(
-    function() {
-      forceImgReload("{{$imgUrl}}");
-    }
-  );
-
-  {{* 
-    * find and return any existing img tags with a matching src url, and set them to an intermediate 
-    * src url so they can later be reverted back once the cached version has been updated.
-    *}}
-  function prepareImagesForReload(srcUrl) {
-
-    var result = $("img[src='" + srcUrl + "']").get();
-
-    for (i = 0; i < result.length; i++) {
-      {{* 
-        * Set the image to a reloading image, in this case an animated "reloading" svg 
-        * Ideally this wont be displayed long enough to matter.
-        *}}
-      result[i].src = "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100' preserveAspectRatio='xMidYMid' class='uil-reload'%3E%3Cpath fill='none' class='bk' d='M0 0h100v100H0z'/%3E%3Cg%3E%3Cpath d='M50 15a35 35 0 1 0 24.787 10.213' fill='none' stroke='%23777' stroke-width='12'/%3E%3Cpath d='M50 0v30l16-15L50 0' fill='%23777'/%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 50 50' to='360 50 50' dur='1s' repeatCount='indefinite'/%3E%3C/g%3E%3C/svg%3E";
-    }
-
-    return result;
-  }
-
-  function restoreImages(srcUrl, imgList) {
-
-    for (i = 0; i < imgList.length; i++) {
-      imgList[i].src = srcUrl;
-    }
-  }
-
-  function forceImgReload(srcUrl) {
-    var imgList;
-    var step = 0; 
-    var iframe = window.document.createElement("iframe");   // Hidden iframe, in which to perform the load+reload.
-  
-    {{* Callback function, called after iframe load+reload completes (or fails).
-        Will be called TWICE unless twostage-mode process is cancelled. (Once after load, once after reload). *}}
-    var iframeLoadCallback = function(e) { 
-
-      if (step === 0) { 
-        // initial load just completed.  Note that it doesn't actually matter if this load succeeded or not.
-      
-        step = 1; 
-        imgList = prepareImagesForReload(srcUrl); 
-        iframe.contentWindow.location.reload(true); // initiate forced-reload!
-      
-      } else if (step === 1) {
-        // forced re-load is done 
-
-        restoreImages(srcUrl, imgList);
-        if (iframe.parentNode) iframe.parentNode.removeChild(iframe);
-      }
-    }
-
-    iframe.style.display = "none";
-    window.parent.document.body.appendChild(iframe); {{* NOTE: if this is done AFTER setting src, Firefox MAY fail to fire the load event! *}}
-    iframe.addEventListener("load",  iframeLoadCallback, false);
-    iframe.addEventListener("error", iframeLoadCallback, false);
-    iframe.src = srcUrl;  
-  }
-</script>
diff --git a/view/theme/redbasic/tpl/generic_addon_settings.tpl b/view/theme/redbasic/tpl/generic_addon_settings.tpl
deleted file mode 100644
index bf39b2aea..000000000
--- a/view/theme/redbasic/tpl/generic_addon_settings.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="panel">
-	<div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings">
-		<h3>
-			<a title="{{$addon.2}}" data-toggle="collapse" data-parent="#settings" href="#{{$addon.0}}-settings-content" aria-controls="{{$addon.0}}-settings-content">
-				{{$addon.1}}
-			</a>
-		</h3>
-	</div>
-	<div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings">
-		<div class="section-content-tools-wrapper">
-			{{$content}}
-			{{if $addon.0}}
-			<div class="settings-submit-wrapper" >
-				<button id="{{$addon.0}}-submit" type="submit" name="{{$addon.0}}-submit" class="btn btn-primary" value="{{$addon.3}}">{{$addon.3}}</button>
-			</div>
-			{{/if}}
-		</div>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/generic_links_widget.tpl b/view/theme/redbasic/tpl/generic_links_widget.tpl
deleted file mode 100755
index 67801e666..000000000
--- a/view/theme/redbasic/tpl/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="widget{{if $class}} {{$class}}{{/if}}">
-	{{if $title}}<h3>{{$title}}</h3>{{/if}}
-	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
-	
-	<ul class="nav nav-pills flex-column">
-		{{foreach $items as $item}}
-		<li class="nav-item"><a href="{{$item.url}}" class="nav-link{{if $item.selected}} active{{/if}}">{{$item.label}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/theme/redbasic/tpl/generic_modal.tpl b/view/theme/redbasic/tpl/generic_modal.tpl
deleted file mode 100644
index 18279b6f7..000000000
--- a/view/theme/redbasic/tpl/generic_modal.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="modal" id="generic-modal-{{$id}}" tabindex="-1" role="dialog" aria-labelledby="generic-modal-{{$id}}" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title" id="generic-modal-title-{{$id}}">{{$title}}</h4>
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-      </div>
-      <div class="modal-body" id="generic-modal-body-{{$id}}"></div>
-      <div class="modal-footer">
-        <button id="generic-modal-cancel-{{$id}}" type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$cancel}}</button>
-	{{if $ok}}
-        <button id="generic-modal-ok-{{$id}}" type="button" class="btn btn-primary">{{$ok}}</button>
-	{{/if}}
-      </div>
-    </div><!-- /.modal-content -->
-  </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
diff --git a/view/theme/redbasic/tpl/group_drop.tpl b/view/theme/redbasic/tpl/group_drop.tpl
deleted file mode 100755
index 627debc80..000000000
--- a/view/theme/redbasic/tpl/group_drop.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
-	<a href="group/drop/{{$id}}?t={{$form_security_token}}" 
-		onclick="return confirmDelete();" 
-		id="group-delete-icon-{{$id}}" 
-		class="group-delete-icon btn btn-outline-secondary" title="{{$delete}}" ><i class="fa fa-trash-o drop-icons"></i></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/redbasic/tpl/group_edit.tpl b/view/theme/redbasic/tpl/group_edit.tpl
deleted file mode 100755
index d9412a6f7..000000000
--- a/view/theme/redbasic/tpl/group_edit.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h2>{{$title}}</h2>
-
-
-<div id="group-edit-wrapper" >
-	<form action="group/{{$gid}}" id="group-edit-form" method="post" >
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		
-		{{include file="field_input.tpl" field=$gname}}
-		{{include file="field_checkbox.tpl" field=$public}}
-		{{if $drop}}{{$drop}}{{/if}}
-		<div id="group-edit-submit-wrapper" >
-			<input type="submit" name="submit" value="{{$submit}}" >
-		</div>
-		<div id="group-edit-select-end" ></div>
-	</form>
-</div>
-
-
-{{if $groupeditor}}
-	<div id="group-update-wrapper">
-		{{include file="groupeditor.tpl"}}
-	</div>
-{{/if}}
-{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/group_selection.tpl b/view/theme/redbasic/tpl/group_selection.tpl
deleted file mode 100755
index 270d2aa79..000000000
--- a/view/theme/redbasic/tpl/group_selection.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="form-group field custom">
-<label for="group-selection" id="group-selection-lbl">{{$label}}</label>
-<select class="form-control" name="group-selection" id="group-selection" >
-{{foreach $groups as $group}}
-<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option>
-{{/foreach}}
-</select>
-</div>
diff --git a/view/theme/redbasic/tpl/group_side.tpl b/view/theme/redbasic/tpl/group_side.tpl
deleted file mode 100755
index 14f714ae9..000000000
--- a/view/theme/redbasic/tpl/group_side.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="widget" id="group-sidebar">
-	<h3>{{$title}}</h3>
-	<div>
-		<ul class="nav nav-pills flex-column">
-			{{foreach $groups as $group}}
-			<li class="nav-item nav-item-hack">
-				{{if $group.cid}}
-				<i id="group-{{$group.id}}" class="widget-nav-pills-checkbox fa fa-fw {{if $group.ismember}}fa-check-square-o{{else}}fa-square-o{{/if}}" onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}'); return true;"></i>
-				{{/if}}
-				{{if $group.edit}}
-				<a href="{{$group.edit.href}}" class="nav-link{{if $group.selected}} active{{/if}} widget-nav-pills-icons" title="{{$edittext}}"><i class="fa fa-fw fa-pencil"></i></a>
-				{{/if}}
-				<a class="nav-link{{if $group.selected}} active{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
-			</li>
-			{{/foreach}}
-			<li class="nav-item">
-				<a class="nav-link" href="group/new" title="{{$createtext}}" ><i class="fa fa-plus-circle"></i> {{$createtext}}</a>
-			</li>
-		</ul>
-
-	</div>
-</div>
-
-
-
-
diff --git a/view/theme/redbasic/tpl/groupeditor.tpl b/view/theme/redbasic/tpl/groupeditor.tpl
deleted file mode 100755
index c79bb0a2a..000000000
--- a/view/theme/redbasic/tpl/groupeditor.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div id="group">
-<h3>{{$groupeditor.label_members}}</h3>
-<div id="group-members" class="contact_list">
-{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
-</div>
-<div id="group-members-end"></div>
-<hr id="group-separator" />
-</div>
-
-<div id="contacts">
-<h3>{{$groupeditor.label_contacts}}</h3>
-<div id="group-all-contacts" class="contact_list">
-{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
-</div>
-<div id="group-all-contacts-end"></div>
-</div>
diff --git a/view/theme/redbasic/tpl/hdr.tpl b/view/theme/redbasic/tpl/hdr.tpl
deleted file mode 100644
index cccee2229..000000000
--- a/view/theme/redbasic/tpl/hdr.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="nav-notifications-template" rel="template">
-	<a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}"><img class="menu-img-3" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a>
-</div>
diff --git a/view/theme/redbasic/tpl/head.tpl b/view/theme/redbasic/tpl/head.tpl
deleted file mode 100755
index 5f874426c..000000000
--- a/view/theme/redbasic/tpl/head.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="{{$baseurl}}/" />
-<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" />
-{{$metas}}
-{{$head_css}}
-{{$js_strings}}
-{{$head_js}}
-{{$linkrel}}
-{{$plugins}}
-<script>
-	var updateInterval = {{$update_interval}};
-	var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}};
-	var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
-	var justifiedGalleryActive = false;
-	{{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}}
-	{{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}}
-	var preloadImages = {{$preload_images}};
-</script>
-
-
-
diff --git a/view/theme/redbasic/tpl/help.tpl b/view/theme/redbasic/tpl/help.tpl
deleted file mode 100644
index 43b061dcc..000000000
--- a/view/theme/redbasic/tpl/help.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<div id="help-content" class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}: {{$heading}}</h2>
-	</div>
-	<div class="section-content-wrapper" id="doco-content">
-		<h3 id="doco-top-toc-heading">
-			<span class="fakelink" onclick="docoTocToggle(); return false;">
-				<i class="fa fa-fw fa-caret-right fakelink" id="doco-toc-toggle"></i>
-				{{$tocHeading}}
-			</span>
-		</h3>
-		<ul id="doco-top-toc" style="margin-bottom: 1.5em; display: none;"></ul>
-		{{$content}}
-	</div>
-</div>
-
-<script>
-	// Generate the table of contents in the side nav menu (see view/tpl/help.tpl)
-	$(document).ready(function () {
-		$('#doco-top-toc').toc({content: "#doco-content", headings: "h3,h4,h5,h6"});
-	});
-	
-	function docoTocToggle() {
-		if($('#doco-top-toc').is(':visible')) {
-			$('#doco-toc-toggle').removeClass('fa-cog').addClass('fa-caret-right');
-		} else {
-			$('#doco-toc-toggle').removeClass('fa-caret-right').addClass('fa-caret-down');
-		}
-		$('#doco-top-toc').toggle();
-		
-		return false;
-	}
-</script>
diff --git a/view/theme/redbasic/tpl/install.tpl b/view/theme/redbasic/tpl/install.tpl
deleted file mode 100755
index 0e77aa97b..000000000
--- a/view/theme/redbasic/tpl/install.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-{{$text}}
diff --git a/view/theme/redbasic/tpl/install_checks.tpl b/view/theme/redbasic/tpl/install_checks.tpl
deleted file mode 100755
index ad0aef6a3..000000000
--- a/view/theme/redbasic/tpl/install_checks.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-<form  action="{{$baseurl}}/index.php?q=setup" method="post">
-<table>
-{{foreach $checks as $check}}
-	<tr><td>{{$check.title}} </td><td><i class="fa {{if $check.status}}fa-check-square-o{{else}}{{if $check.required}}fa-square-o{{else}}fa-exclamation{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr>
-	{{if $check.help}}
-	<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
-	{{/if}}
-{{/foreach}}
-</table>
-
-{{if $phpath}}
-	<input type="hidden" name="phpath" value="{{$phpath}}">
-{{/if}}
-
-{{if $passed}}
-	<input type="hidden" name="pass" value="2">
-	<input type="submit" value="{{$next}}">
-{{else}}
-	<input type="hidden" name="pass" value="1">
-	<input type="submit" value="{{$reload}}">
-{{/if}}
-</form>
diff --git a/view/theme/redbasic/tpl/install_db.tpl b/view/theme/redbasic/tpl/install_db.tpl
deleted file mode 100755
index 1a58de129..000000000
--- a/view/theme/redbasic/tpl/install_db.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-<p>
-{{$info_01}}<br>
-{{$info_02}}<br>
-{{$info_03}}
-</p>
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-<form id="install-form" action="{{$baseurl}}/setup" method="post">
-
-<input type="hidden" name="phpath" value="{{$phpath}}" />
-<input type="hidden" name="pass" value="3" />
-
-{{include file="field_input.tpl" field=$dbhost}}
-{{include file="field_input.tpl" field=$dbport}}
-{{include file="field_input.tpl" field=$dbuser}}
-{{include file="field_password.tpl" field=$dbpass}}
-{{include file="field_input.tpl" field=$dbdata}}
-{{include file="field_select.tpl" field=$dbtype}}
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
-
-</form>
-
diff --git a/view/theme/redbasic/tpl/install_settings.tpl b/view/theme/redbasic/tpl/install_settings.tpl
deleted file mode 100755
index 62dcbb8b3..000000000
--- a/view/theme/redbasic/tpl/install_settings.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-<form id="install-form" action="{{$baseurl}}/setup" method="post">
-
-<input type="hidden" name="phpath" value="{{$phpath}}" />
-<input type="hidden" name="dbhost" value="{{$dbhost}}" />
-<input type="hidden" name="dbport" value="{{$dbport}}" />
-<input type="hidden" name="dbuser" value="{{$dbuser}}" />
-<input type="hidden" name="dbpass" value="{{$dbpass}}" />
-<input type="hidden" name="dbdata" value="{{$dbdata}}" />
-<input type="hidden" name="dbtype" value="{{$dbtype}}" />
-<input type="hidden" name="pass" value="4" />
-
-{{include file="field_input.tpl" field=$adminmail}}
-{{include file="field_input.tpl" field=$siteurl}}
-
-{{include file="field_select_grouped.tpl" field=$timezone}}
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
-
-</form>
-
diff --git a/view/theme/redbasic/tpl/invite.tpl b/view/theme/redbasic/tpl/invite.tpl
deleted file mode 100755
index 440e1e02b..000000000
--- a/view/theme/redbasic/tpl/invite.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div id="invite" class="generic-content-wrapper">
-  <div class="section-title-wrapper">
-    <h2>{{$invite}}</h2>
-  </div>
-  <div class="section-content-wrapper">
-
-    <form action="invite" method="post" id="invite-form" >
-
-      <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-      <div id="invite-recipient-textarea" class="form-group field custom">
-        <label for="recipients">{{$addr_text}}</label>
-        <textarea id="invite-recipients" name="recipients" rows="6" class="form-control"></textarea>
-      </div>
-
-      <div id="invite-message-textarea" class="form-group field custom">
-        <label for="message">{{$msg_text}}</label>
-        <textarea id="invite-message" name="message" rows="12" class="form-control">{{$default_message}}</textarea>
-      </div>
-
-      <div id="invite-submit-wrapper" class="form-group">
-        <button class="btn btn-primary btn-sm" type="submit" id="invite-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
-      </div>
-
-    </form>
-
-  </div>
-</div>
diff --git a/view/theme/redbasic/tpl/item_attach.tpl b/view/theme/redbasic/tpl/item_attach.tpl
deleted file mode 100644
index 95e38c0bd..000000000
--- a/view/theme/redbasic/tpl/item_attach.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{if $attaches}}
-{{foreach $attaches as $a}}
-<a class="dropdown-item" href="{{$a.url}}" title="{{$a.title}}"><i class="fa {{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a>
-{{/foreach}}
-{{/if}}
diff --git a/view/theme/redbasic/tpl/item_binary.tpl b/view/theme/redbasic/tpl/item_binary.tpl
deleted file mode 100644
index b19f7e7dd..000000000
--- a/view/theme/redbasic/tpl/item_binary.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>
-<center><a class="zrl" href="{{$url}}"><button class="btn btn-warning fakelink">{{$download}}</button></a></center>
-</p>
diff --git a/view/theme/redbasic/tpl/item_categories.tpl b/view/theme/redbasic/tpl/item_categories.tpl
deleted file mode 100644
index e1b183c0d..000000000
--- a/view/theme/redbasic/tpl/item_categories.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{if $categories}}
-<!--div class="categorytags"-->
-{{foreach $categories as $cat}}
-<span class="item-category badge badge-pill badge-warning"><i class="fa fa-asterisk"></i>&nbsp;{{if $cat.url}}<a class="text-white" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
-{{/foreach}}
-<!--/div-->
-{{/if}}
-
diff --git a/view/theme/redbasic/tpl/item_filer.tpl b/view/theme/redbasic/tpl/item_filer.tpl
deleted file mode 100644
index 4eb621f93..000000000
--- a/view/theme/redbasic/tpl/item_filer.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{if $categories}}
-<!--div class="filesavetags"-->
-{{foreach $categories as $cat}}
-<span class="item-category badge badge-pill badge-danger"><i class="fa fa-folder-o"></i>&nbsp;{{$cat.term}}&nbsp;<a href="{{$cat.removelink}}" class="text-white" title="{{$remove}}"><i class="fa fa-close"></i></a></span>
-{{/foreach}}
-<!--/div-->
-{{/if}}
-
diff --git a/view/theme/redbasic/tpl/item_import.tpl b/view/theme/redbasic/tpl/item_import.tpl
deleted file mode 100755
index e976417e1..000000000
--- a/view/theme/redbasic/tpl/item_import.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<h2>{{$title}}</h2>
-
-<form action="import_items" method="post" enctype="multipart/form-data" id="import-channel-form">
-	<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-	<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>
-
-	<label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label>
-	<input type="file" name="filename" id="import-filename" class="import-input" value="" />
-	<div id="import-filename-end" class="import-field-end"></div>
-
-	<input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" />
-	<div id="import-submit-end" class="import-field-end"></div>
-</form>
diff --git a/view/theme/redbasic/tpl/jot-header.tpl b/view/theme/redbasic/tpl/jot-header.tpl
deleted file mode 100755
index 1cc5a898a..000000000
--- a/view/theme/redbasic/tpl/jot-header.tpl
+++ /dev/null
@@ -1,598 +0,0 @@
-<script language="javascript" type="text/javascript">
-
-var editor = false;
-var plaintext = '{{$editselect}}';
-var pretext = '{{$pretext}}';
-
-function initEditor(cb){
-	if (editor==false){
-		$("#profile-jot-text-loading").spin('small').show();
-		{{$geotag}}
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").spin(false).hide();
-			$("#profile-jot-text").css({ 'height': 200 });
-			{{if $bbco_autocomplete}}
-			$("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode
-			{{/if}}
-			{{if $editor_autocomplete}}
-			if(typeof channelId === 'undefined')
-				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
-			else
-				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections
-			{{/if}}
-			editor = true;
-			  $("a#jot-perms-icon").colorbox({ 
-				  'inline' : true, 
-				  'transition' : 'elastic' 
-			});
-			$(".jothidden").show();
-			$("#profile-jot-text").addClass('jot-expanded');
-			if (typeof cb!="undefined") cb();
-			if(pretext.length)
-				addeditortext(pretext);
-			return;
-		}
-		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: {{$editselect}},
-			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,autoresize, inlinepopups",
-			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-			theme_advanced_buttons2 : "",
-			theme_advanced_buttons3 : "",
-			theme_advanced_toolbar_location : "top",
-			theme_advanced_toolbar_align : "center",
-			theme_advanced_blockformats : "blockquote,code",
-			gecko_spellcheck : true,
-			paste_text_sticky : true,
-			entity_encoding : "raw",
-			add_unload_trigger : false,
-			remove_linebreaks : false,
-			force_p_newlines : false,
-			force_br_newlines : true,
-			forced_root_block : '',
-			convert_urls: false,
-			content_css: "{{$baseurl}}/view/custom_tinymce.css",
-			theme_advanced_path : false,
-			file_browser_callback : "fcFileBrowser",
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-				});
-
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").spin(false).hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
-
-			}
-		});
-
-		editor = true;
-	} else {
-		if (typeof cb!="undefined") cb();
-	}
-}
-
-function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
-	initEditor();
-}
-</script>
-<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>
-<script>
-	$(document).ready(function() {
-		/* enable tinymce on focus and click */
-		$("#profile-jot-text").focus(enableOnUser);
-		$("#profile-jot-text").click(enableOnUser);
-
-		var upload_title = $('#wall-image-upload').attr('title');
-		var attach_title = $('#wall-file-upload').attr('title');
-		try {
-			var uploader = new window.AjaxUpload('wall-image-upload',
-			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
-				name: 'userfile',
-				title: upload_title,
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#jot-media').val($('#jot-media').val() + response);
-					$('#profile-rotator').spin(false);
-				}
-			});
-		} catch (e) {
-		}
-		try {
-			var uploader_sub = new window.AjaxUpload('wall-image-upload-sub',
-			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
-				name: 'userfile',
-				title: upload_title,
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#jot-media').val($('#jot-media').val() + response);
-					$('#profile-rotator').spin(false);
-				}
-			});
-		} catch(e) {
-		}
-		try {
-			var file_uploader = new window.AjaxUpload('wall-file-upload',
-			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
-				name: 'userfile',
-				title: attach_title,
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#jot-media').val($('#jot-media').val() + response);
-					$('#profile-rotator').spin(false);
-				}
-			});
-		} catch(e) {
-		}
-		try {
-			var file_uploader_sub = new window.AjaxUpload('wall-file-upload-sub',
-			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
-				name: 'userfile',
-				title: attach_title,
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#jot-media').val($('#jot-media').val() + response);
-					$('#profile-rotator').spin(false);
-				}
-			});
-		} catch(e) {
-		}
-        
-        
-        // call initialization file
-        if (window.File && window.FileList && window.FileReader) {
-          DragDropUploadInit();
-        }
-	});
-
-	function deleteCheckedItems() {
-		var checkedstr = '';
-
-		$('.item-select').each( function() {
-			if($(this).is(':checked')) {
-				if(checkedstr.length != 0) {
-					checkedstr = checkedstr + ',' + $(this).val();
-				}
-				else {
-					checkedstr = $(this).val();
-				}
-			}
-		});
-		$.post('item', { dropitems: checkedstr }, function(data) {
-			window.location.reload();
-		});
-	}
-
-	function jotGetLink() {
-            textarea = document.getElementById('profile-jot-text');
-            if (textarea.selectionStart || textarea.selectionStart == "0") {
-                    var start = textarea.selectionStart;
-                    var end = textarea.selectionEnd;	
-                    if (end > start) {
-                        reply = prompt("{{$linkurl}}");
-                        if(reply && reply.length) {
-                            textarea.value = textarea.value.substring(0, start) + "[url=" + reply + "]" + textarea.value.substring(start, end) + "[/url]" + textarea.value.substring(end, textarea.value.length);
-                        }
-                    } else {
-                        reply = prompt("{{$linkurl}}");
-                        if(reply && reply.length) {
-                            reply = bin2hex(reply);
-                            $('#profile-rotator').spin('tiny');
-                            $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
-                                    addeditortext(data);
-                                    $('#profile-rotator').spin(false);
-                            });
-                        }
-                    }
-            }
-	}
-
-	function jotGetLocation() {
-		reply = prompt("{{$whereareu}}", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotGetExpiry() {
-		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
-		$('#expiryModal').modal();
-		$('#expiry-modal-OKButton').on('click', function() {
-			reply=$('#expiration-date').val();
-			if(reply && reply.length) {
-				$('#jot-expire').val(reply);
-				$('#expiryModal').modal('hide');
-			}
-		})
-	}
-
-	function jotGetPubDate() {
-		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
-		$('#createdModal').modal();
-		$('#created-modal-OKButton').on('click', function() {
-			reply=$('#created-date').val();
-			if(reply && reply.length) {
-				$('#jot-created').val(reply);
-				$('#createdModal').modal('hide');
-			}
-		})
-	}
-
-
-	function jotShare(id) {
-		if ($('#jot-popup').length != 0) $('#jot-popup').show();
-
-		$('#like-rotator-' + id).spin('tiny');
-		$.get('{{$baseurl}}/share/' + id, function(data) {
-			if (!editor) $("#profile-jot-text").val("");
-			initEditor(function(){
-				addeditortext(data);
-				$('#like-rotator-' + id).spin(false);
-				$(window).scrollTop(0);
-			});
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound) {
-			event.preventDefault();
-			var editwin = '#' + event.target.id;
-			var commentwin = false;
-			if(editwin) {
-				commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
-				if(commentwin) {
-					var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
-					$('#comment-edit-text-' + commentid).addClass('hover');
-				}
-			}
-		}
-	}
-
-	function linkdropexit(event) {
-		var editwin = '#' + event.target.id;
-		var commentwin = false;
-		if(editwin) {
-			commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
-			if(commentwin) {
-				var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
-				$('#comment-edit-text-' + commentid).removeClass('hover');
-			}
-		}
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.preventDefault();
-		var editwin = '#' + event.target.id;
-		var commentwin = false;
-		if(editwin) {
-			commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
-			if(commentwin) {
-				var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
-				commentOpen(document.getElementById(event.target.id),commentid);
-
-			}
-		}
-
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').spin('tiny');
-			$.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
-				if(commentwin) {
-					$(editwin).val( $(editwin).val() + data );
-					$('#profile-rotator').spin(false);
-				}
-				else {
-					if (!editor) $("#profile-jot-text").val("");
-					initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').spin(false);
-					});
-				}
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("{{$term}}");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('{{$baseurl}}/tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-
-	function itemFiler(id) {
-		if($('#item-filer-dialog').length)
-			$('#item-filer-dialog').remove();
-
-		$.get('filer/', function(data){
-			$('body').append(data);
-			$('#item-filer-dialog').modal('show');
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('{{$baseurl}}/filer/' + id + '?term=' + reply, NavUpdate);
-//					if(timer) clearTimeout(timer);
-//					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$('#item-filer-dialog').modal('hide');
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	function itemBookmark(id) {
-		$.get('{{$baseurl}}/bookmarks?f=&item=' + id);
-		if(timer) clearTimeout(timer);
-		timer = setTimeout(NavUpdate,1000);
-	}
-
-	function itemAddToCal(id) {
-		$.get('{{$baseurl}}/events/add/' + id);
-		if(timer) clearTimeout(timer);
-		timer = setTimeout(NavUpdate,1000);
-	}
-
-	function toggleVoting() {
-		if($('#jot-consensus').val() > 0) {
-			$('#jot-consensus').val(0);
-			$('#profile-voting, #profile-voting-sub').removeClass('fa-check-square-o').addClass('fa-square-o');
-		}
-		else {
-			$('#jot-consensus').val(1);
-			$('#profile-voting, #profile-voting-sub').removeClass('fa-square-o').addClass('fa-check-square-o');
-		}
-	}
-
-	function toggleNoComment() {
-		if($('#jot-nocomment').val() > 0) {
-			$('#jot-nocomment').val(0);
-			$('#profile-nocomment, #profile-nocomment-sub').removeClass('fa-comments-o').addClass('fa-comments');
-			$('#profile-nocomment-wrapper').attr('title', '{{$nocomment_enabled}}');
-		}
-		else {
-			$('#jot-nocomment').val(1);
-			$('#profile-nocomment, #profile-nocomment-sub').removeClass('fa-comments').addClass('fa-comments-o');
-			$('#profile-nocomment-wrapper').attr('title', '{{$nocomment_disabled}}');
-		}
-	}
-
-	function jotReact(id,icon) {
-		if(id && icon) {
-			$.get('{{$baseurl}}/react?f=&postid=' + id + '&emoji=' + icon);
-			if(timer) clearTimeout(timer);
-			timer = setTimeout(NavUpdate,1000);
-		}
-	}
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').attr('disabled', true);
-	}
-
-
-    var initializeEmbedPhotoDialog = function () {
-        $('.embed-photo-selected-photo').each(function (index) {
-            $(this).removeClass('embed-photo-selected-photo');
-        });
-        getPhotoAlbumList();
-        $('#embedPhotoModalBodyAlbumDialog').off('click');
-        $('#embedPhotoModal').modal('show');
-    };
-
-    var choosePhotoFromAlbum = function (album) {
-        $.post("embedphotos/album", {name: album},
-            function(data) {
-                if (data['status']) {
-                    $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
-                    $('#embedPhotoModalBodyAlbumDialog').html('\
-                            <div><div class="nav nav-pills flex-column">\n\
-                                <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
-                                    <i class="fa fa-chevron-left"></i>&nbsp\n\
-                                    {{$modaldiffalbum}}\n\
-                                    </a>\n\
-                                </li>\n\
-                            </div><br></div>')
-                    $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
-                    $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
-                        evt.preventDefault();
-                        var image = document.getElementById(evt.target.id);
-                        if (typeof($(image).parent()[0]) !== 'undefined') {
-                            var imageparent = document.getElementById($(image).parent()[0].id);
-                            $(imageparent).toggleClass('embed-photo-selected-photo');
-                        }
-                    });
-                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-                    $('#embed-photo-OKButton').click(function () {
-                        $('.embed-photo-selected-photo').each(function (index) {
-                            var href = $(this).attr('href');
-                            $.post("embedphotos/photolink", {href: href},
-                                function(ddata) {
-                                    if (ddata['status']) {
-                                        addeditortext(ddata['photolink']);
-                                    } else {
-                                        window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
-                                    }
-                                    return false;
-                                },
-                            'json');
-                        });
-                        $('#embedPhotoModalBodyAlbumDialog').html('');
-                        $('#embedPhotoModalBodyAlbumDialog').off('click');
-                        $('#embedPhotoModal').modal('hide');
-                    });
-                } else {
-                    window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
-                }
-                return false;
-            },
-        'json');
-    };
-
-    var getPhotoAlbumList = function () {
-        $.post("embedphotos/albumlist", {},
-            function(data) {
-                if (data['status']) {
-                    var albums = data['albumlist']; //JSON.parse(data['albumlist']);
-                    $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
-                    $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
-                    for(var i=0; i<albums.length; i++) {
-                        var albumName = albums[i].text;
-			var jsAlbumName = albums[i].jstext;
-			var albumLink = '<li class="nav-item">';
-			albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
-                        albumLink += '</li>';
-                        $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
-                    }
-                    $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
-                } else {
-                    window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
-                }
-                return false;
-            },
-        'json');
-    };
-
-    //
-    // initialize
-    function DragDropUploadInit() {
-
-      var filedrag = $("#profile-jot-text");
-
-      // is XHR2 available?
-      var xhr = new XMLHttpRequest();
-      if (xhr.upload) {
-
-        // file drop
-        filedrag.on("dragover", DragDropUploadFileHover);
-        filedrag.on("dragleave", DragDropUploadFileHover);
-        filedrag.on("drop", DragDropUploadFileSelectHandler);
-
-      }
-
-      window.filesToUpload = 0;
-      window.fileUploadsCompleted = 0;
-
-
-    }
-
-    // file drag hover
-    function DragDropUploadFileHover(e) {
-      e.stopPropagation();
-      e.preventDefault();
-      e.target.className = (e.type == "dragover" ? "hover" : "");
-    }
-
-    // file selection
-    function DragDropUploadFileSelectHandler(e) {
-
-      // cancel event and hover styling
-      DragDropUploadFileHover(e);
-	  if (!editor) $("#profile-jot-text").val("");
-
-
-      // fetch FileList object
-      var files = e.target.files || e.originalEvent.dataTransfer.files;
-      // process all File objects
-      for (var i = 0, f; f = files[i]; i++) {
-        DragDropUploadFile(f, i);
-      }
-
-    }
-
-    // upload  files
-    function DragDropUploadFile(file, idx) {
-
-      window.filesToUpload = window.filesToUpload + 1;
-
-      var xhr = new XMLHttpRequest();
-      xhr.withCredentials = true;   // Include the SESSION cookie info for authentication
-      (xhr.upload || xhr).addEventListener('progress', function (e) {
-         $('#profile-rotator').spin('tiny');
-      });
-      xhr.addEventListener('load', function (e) {
-        //console.log('xhr upload complete', e);
-        window.fileUploadsCompleted = window.fileUploadsCompleted + 1;
-
-		initEditor(function() {
-			addeditortext(xhr.responseText);
-		});
-
-		$('#jot-media').val($('#jot-media').val() + xhr.responseText);
-        // When all the uploads have completed, refresh the page
-        if (window.filesToUpload > 0 && window.fileUploadsCompleted === window.filesToUpload) {  
-          $('#profile-rotator').spin(false);
-          window.fileUploadsCompleted = window.filesToUpload = 0;
-        }
-      });
-      // POST to the wall_upload endpoint
-      xhr.open('post', '{{$baseurl}}/wall_attach/{{$nickname}}', true);
-
-      var data = new FormData();
-      data.append('userfile', file);
-      xhr.send(data);
-    }
-
-</script>
-
-<script>
-$( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-delete-link,.block-delete-link", function(e) {
-	var link = $(this).attr("href"); // "get" the intended link in a var
-
-	if (typeof(eval($.fn.modal)) === 'function'){
-		e.preventDefault();
-		bootbox.confirm("<h4>{{$confirmdelete}}</h4>",function(result) {
-			if (result) {
-				document.location.href = link;
-			}
-		});
-	} else {
-		return confirm("{{$confirmdelete}}");
-	}
-});
-</script>
diff --git a/view/theme/redbasic/tpl/jot.tpl b/view/theme/redbasic/tpl/jot.tpl
deleted file mode 100755
index dbbb470c5..000000000
--- a/view/theme/redbasic/tpl/jot.tpl
+++ /dev/null
@@ -1,303 +0,0 @@
-<form id="profile-jot-form" action="{{$action}}" method="post" class="acl-form" data-form_id="profile-jot-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-	{{$mimeselect}}
-	{{$layoutselect}}
-	{{if $id_select}}
-	<div class="channel-id-select-div">
-		<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
-	</div>
-	{{/if}}
-	<div class="mb-4" id="profile-jot-wrapper">
-		{{if $parent}}
-		<input type="hidden" name="parent" value="{{$parent}}" />
-		{{/if}}
-		<input type="hidden" name="obj_type" value="{{$ptyp}}" />
-		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-		<input type="hidden" name="return" value="{{$return_path}}" />
-		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
-		<input type="hidden" name="expire" id="jot-expire" value="{{$defexpire}}" />
-		<input type="hidden" name="created" id="jot-created" value="{{$defpublish}}" />
-		<input type="hidden" name="media_str" id="jot-media" value="" />
-		<input type="hidden" name="source" id="jot-source" value="{{$source}}" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="webpage" value="{{$webpage}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
-		<input type="hidden" id="jot-nocomment" name="nocomment" value="{{if $nocomment}}{{$nocomment}}{{else}}0{{/if}}" />
-
-		{{if $webpage}}
-		<div id="jot-pagetitle-wrap" class="jothidden">
-			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
-		</div>
-		{{/if}}
-		<div id="jot-title-wrap" class="jothidden">
-			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex="1" value="{{$title}}">
-		</div>
-		{{if $catsenabled}}
-		<div id="jot-category-wrap" class="jothidden">
-			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput">
-		</div>
-		{{/if}}
-		<div id="jot-text-wrap">
-			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$share}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$content}}</textarea>
-		</div>
-		{{if $attachment}}
-		<div id="jot-attachment-wrap">
-			<input class="jot-attachment" name="attachment" id="jot-attachment" type="text" value="{{$attachment}}" readonly="readonly" onclick="this.select();">
-		</div>
-		{{/if}}
-		<div id="profile-jot-submit-wrapper" class="clearfix p-2 jothidden">
-			<div id="profile-jot-submit-left" class="btn-toolbar float-left">
-				{{if $bbcode}}
-				<div class="btn-group mr-2">
-					<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;">
-						<i class="fa fa-bold jot-icons"></i>
-					</button>
-					<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;">
-						<i class="fa fa-italic jot-icons"></i>
-					</button>
-					<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;">
-						<i class="fa fa-underline jot-icons"></i>
-					</button>
-					<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;">
-						<i class="fa fa-quote-left jot-icons"></i>
-					</button>
-					<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;">
-						<i class="fa fa-terminal jot-icons"></i>
-					</button>
-				</div>
-				{{/if}}
-				{{if $visitor}}
-				<div class="btn-group mr-2 d-none d-lg-flex">
-					{{if $writefiles}}
-					<button id="wall-file-upload" class="btn btn-outline-secondary btn-sm" title="{{$attach}}" >
-						<i id="wall-file-upload-icon" class="fa fa-paperclip jot-icons"></i>
-					</button>
-					{{/if}}
-					{{if $weblink}}
-					<button id="profile-link-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
-						<i id="profile-link" class="fa fa-link jot-icons"></i>
-					</button>
-					{{/if}}
-					{{if $embedPhotos}}
-					<button id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
-						<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i>
-					</button>
-					{{/if}}
-				</div>
-				<div class="btn-group mr-2 d-none d-lg-flex">
-					{{if $setloc}}
-					<button id="profile-location-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
-						<i id="profile-location" class="fa fa-globe jot-icons"></i>
-					</button>
-					{{/if}}
-					{{if $clearloc}}
-					<button id="profile-nolocation-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled">
-						<i id="profile-nolocation" class="fa fa-circle-o jot-icons"></i>
-					</button>
-					{{/if}}
-				{{else}}
-				<div class="btn-group d-none d-lg-flex">
-				{{/if}}
-				{{if $feature_expire}}
-					<button id="profile-expire-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
-						<i id="profile-expires" class="fa fa-eraser jot-icons"></i>
-					</button>
-				{{/if}}
-				{{if $feature_future}}
-					<button id="profile-future-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;">
-						<i id="profile-future" class="fa fa-clock-o jot-icons"></i>
-					</button>
-				{{/if}}
-				{{if $feature_encrypt}}
-					<button id="profile-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
-						<i id="profile-encrypt" class="fa fa-key jot-icons"></i>
-					</button>
-				{{/if}}
-				{{if $feature_voting}}
-					<button id="profile-voting-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$voting}}" onclick="toggleVoting();return false;">
-						<i id="profile-voting" class="fa fa-square-o jot-icons"></i>
-					</button>
-				{{/if}}
-				{{if $feature_nocomment}}
-					<button id="profile-nocomment-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$nocommenttitle}}" onclick="toggleNoComment();return false;">
-						<i id="profile-nocomment" class="fa fa-comments jot-icons"></i>
-					</button>
-				{{/if}}
-				</div>
-				{{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}}
-				<div class="btn-group d-lg-none">
-					<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-						<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
-					</button>
-					<div class="dropdown-menu">
-						{{if $visitor}}
-						{{if $writefiles}}
-						<a class="dropdown-item" id="wall-file-upload-sub" href="#" ><i class="fa fa-paperclip"></i>&nbsp;{{$attach}}</a>
-						{{/if}}
-						{{if $weblink}}
-						<a class="dropdown-item" href="#" onclick="jotGetLink(); return false;"><i class="fa fa-link"></i>&nbsp;{{$weblink}}</a>
-						{{/if}}
-						{{if $embedPhotos}}
-						<a class="dropdown-item" href="#" onclick="initializeEmbedPhotoDialog(); return false;"><i class="fa fa-file-image-o jot-icons"></i>&nbsp;{{$embedPhotos}}</a>
-						{{/if}}
-						{{if $setloc}}
-						<a class="dropdown-item" href="#" onclick="jotGetLocation(); return false;"><i class="fa fa-globe"></i>&nbsp;{{$setloc}}</a>
-						{{/if}}
-						{{if $clearloc}}
-						<a class="dropdown-item" href="#" onclick="jotClearLocation(); return false;"><i class="fa fa-circle-o"></i>&nbsp;{{$clearloc}}</a>
-						{{/if}}
-						{{/if}}
-						{{if $feature_expire}}
-						<a class="dropdown-item" href="#" onclick="jotGetExpiry(); return false;"><i class="fa fa-eraser"></i>&nbsp;{{$expires}}</a>
-						{{/if}}
-						{{if $feature_future}}
-						<a class="dropdown-item" href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i>&nbsp;{{$future_txt}}</a>
-						{{/if}}
-						{{if $feature_encrypt}}
-						<a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
-						{{/if}}
-						{{if $feature_voting}}
-						<a class="dropdown-item" href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="fa fa-square-o"></i>&nbsp;{{$voting}}</a>
-						{{/if}}
-						{{if $feature_nocomment}}
-						<a class="dropdown-item" href="#" onclick="toggleNoComment(); return false;"><i id="profile-nocomment-sub" class="fa fa-comments"></i>&nbsp;{{$nocommenttitlesub}}</a>
-						{{/if}}
-					</div>
-				</div>
-				{{/if}}
-			</div>
-			<div id="profile-rotator-wrapper" class="float-left">
-				<div id="profile-rotator"></div>
-			</div>
-			<div id="profile-jot-submit-right" class="btn-group float-right">
-				{{if $preview}}
-				<button class="btn btn-outline-secondary btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
-					<i class="fa fa-eye jot-icons" ></i>
-				</button>
-				{{/if}}
-				{{if $jotnets}}
-				<button id="dbtn-jotnets" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#jotnetsModal" type="button" title="{{$jotnets_label}}" style="{{if $lockstate == 'lock'}}display: none;{{/if}}">
-					<i class="fa fa-share-alt jot-icons"></i>
-				</button>
-				{{/if}}
-				{{if $showacl}}
-				<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form">
-					<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons{{if $bang}} jot-lock-warn{{/if}}"></i>
-				</button>
-				{{/if}}
-				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex="3" name="button-submit">{{$share}}</button>
-			</div>
-			<div class="clear"></div>
-			{{if $jotplugins}}
-			<div id="profile-jot-plugin-wrapper" class="mt-2">
-				{{$jotplugins}}
-			</div>
-			{{/if}}
-			{{if $jotnets}}
-			<div class="modal" id="jotnetsModal" tabindex="-1" role="dialog" aria-labelledby="jotnetsModalLabel" aria-hidden="true">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<h4 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h4>
-							<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-						</div>
-						<div class="modal-body">
-							{{$jotnets}}
-						</div>
-						<div class="modal-footer">
-							<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
-						</div>
-					</div><!-- /.modal-content -->
-				</div><!-- /.modal-dialog -->
-			</div><!-- /.modal -->
-			{{/if}}
-		</div>
-	</div>
-</form>
-
-<div id="jot-preview-content" style="display:none;"></div>
-
-{{$acl}}
-
-{{if $feature_expire}}
-<!-- Modal for item expiry-->
-<div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-			</div>
-			<div class="modal-body form-group" style="width:90%">
-				<div class="date">
-					<input type="text" placeholder="yyyy-mm-dd HH:MM" name="start_text" id="expiration-date" class="form-control" />
-				</div>
-				<script>
-					$(function () {
-						var picker = $('#expiration-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 });
-					});
-				</script>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$expiryModalCANCEL}}</button>
-				<button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button>
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-{{/if}}
-
-{{if $feature_future}}
-<div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-			</div>
-			<div class="modal-body form-group" style="width:90%">
-				<div class="date">
-					<input type="text" placeholder="yyyy-mm-dd HH:MM" name="created_text" id="created-date" class="form-control" />
-				</div>
-				<script>
-					$(function () {
-						var picker = $('#created-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 });
-					});
-				</script>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$expiryModalCANCEL}}</button>
-				<button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button>
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-{{/if}}
-
-{{if $embedPhotos}}
-<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-			</div>
-			<div class="modal-body" id="embedPhotoModalBody" >
-				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
-					<div id="embedPhotoModalBodyAlbumList"></div>
-				</div>
-				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
-				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-{{/if}}
-
-{{if $content || $attachment || $expanded}}
-<script>initEditor();</script>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/jot_geotag.tpl b/view/theme/redbasic/tpl/jot_geotag.tpl
deleted file mode 100755
index 60f128850..000000000
--- a/view/theme/redbasic/tpl/jot_geotag.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
-			$('#profile-nolocation-wrapper').attr('disabled', false);
-		});
-	}
-
diff --git a/view/theme/redbasic/tpl/js_strings.tpl b/view/theme/redbasic/tpl/js_strings.tpl
deleted file mode 100755
index 4243c2ea5..000000000
--- a/view/theme/redbasic/tpl/js_strings.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<script>
-
-	var aStr = {
-
-		'delitem'     : "{{$delitem}}",
-		'comment'     : "{{$comment}}",
-		'showmore'    : "{{$showmore}}",
-		'showfewer'   : "{{$showfewer}}",
-		'divgrowmore' : "{{$divgrowmore}}",
-		'divgrowless' : "{{$divgrowless}}",
-		'pwshort'     : "{{$pwshort}}",
-		'pwnomatch'   : "{{$pwnomatch}}",
-		'everybody'   : "{{$everybody}}",
-		'passphrase'  : "{{$passphrase}}",
-		'passhint'    : "{{$passhint}}",
-		'permschange' : "{{$permschange}}",
-		'closeAll'    : "{{$closeAll}}",
-		'nothingnew'  : "{{$nothingnew}}",
-		'rating_desc' : "{{$rating_desc}}",
-		'rating_val'  : "{{$rating_val}}",
-		'rating_text' : "{{$rating_text}}",
-		'submit'      : "{{$submit}}",
-		'linkurl'     : "{{$linkurl}}",
-		'leavethispage' : "{{$leavethispage}}",
-		'location'    : "{{$location}}",
-
-		't01' : "{{$t01}}",
-		't02' : "{{$t02}}",
-		't03' : "{{$t03}}",
-		't04' : "{{$t04}}",
-		't05' : "{{$t05}}",
-		't06' : "{{$t06}}",
-		't07' : "{{$t07}}",
-		't08' : "{{$t08}}",
-		't09' : "{{$t09}}",
-		't10' : "{{$t10}}",
-		't11' : "{{$t11}}",
-		't12' : "{{$t12}}",
-		't13' : "{{$t13}}",
-		't14' : "{{$t14}}",
-		't15' : "{{$t15}}",
-		't16' : "{{$t16}}",
-		't17' : "{{$t17}}",
-
-		'monthNames' : [ "{{$January}}","{{$February}}","{{$March}}","{{$April}}","{{$May}}","{{$June}}","{{$July}}","{{$August}}","{{$September}}","{{$October}}","{{$November}}","{{$December}}" ],
-		'monthNamesShort' : [ "{{$Jan}}","{{$Feb}}","{{$Mar}}","{{$Apr}}","{{$MayShort}}","{{$Jun}}","{{$Jul}}","{{$Aug}}","{{$Sep}}","{{$Oct}}","{{$Nov}}","{{$Dec}}" ],
-		'dayNames' : ["{{$Sunday}}","{{$Monday}}","{{$Tuesday}}","{{$Wednesday}}","{{$Thursday}}","{{$Friday}}","{{$Saturday}}"],
-		'dayNamesShort' : ["{{$Sun}}","{{$Mon}}","{{$Tue}}","{{$Wed}}","{{$Thu}}","{{$Fri}}","{{$Sat}}"],
-		'today' : "{{$today}}",
-		'month' : "{{$month}}",
-		'week' : "{{$week}}",
-		'day' : "{{$day}}",
-		'allday' : "{{$allday}}"
-	};
-
-</script>
-		
diff --git a/view/theme/redbasic/tpl/lang_selector.tpl b/view/theme/redbasic/tpl/lang_selector.tpl
deleted file mode 100755
index 1324442f3..000000000
--- a/view/theme/redbasic/tpl/lang_selector.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
-<br />
-<div id="language-selector" >
-	<form action="#" method="post" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{foreach $langs.0 as $v=>$l}}
-				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
-			{{/foreach}}
-		</select>
-	</form>
-</div>
-</div>
diff --git a/view/theme/redbasic/tpl/layoutlist.tpl b/view/theme/redbasic/tpl/layoutlist.tpl
deleted file mode 100644
index 1bbe14893..000000000
--- a/view/theme/redbasic/tpl/layoutlist.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $editor}}
-		<div class="pull-right">
-			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('layout-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
-			<a href="{{$help.url}}" target="_blank" class="btn btn-sm btn-warning" title="{{$help.title}}"><i class="fa fa-info"></i>&nbsp;{{$help.text}}</a>
-		</div>
-		{{/if}}
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{if $editor}}
-	<div id="layout-editor" class="section-content-tools-wrapper">
-		{{$editor}}
-	</div>
-	{{/if}}
-
-	{{if $pages}}
-	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
-		<table id="layout-list-table">
-			<tr>
-				<th width="1%">{{$name}}</th>
-				<th width="94%">{{$descr}}</th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%" class="d-none d-md-table-cell">{{$created}}</th>
-				<th width="1%" class="d-none d-md-table-cell">{{$edited}}</th>
-			</tr>
-			{{foreach $pages as $key => $items}}
-			{{foreach $items as $item}}
-			<tr id="layout-list-item-{{$item.url}}">
-				<td>
-					{{if $view}}
-					<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
-					{{else}}
-					{{$item.title}}
-					{{/if}}
-				</td>
-				<td>
-					{{$item.descr}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $edit}}
-					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $item.bb_element}}
-					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $edit}}
-					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-					{{/if}}
-				</td>
-				<td class="d-none d-md-table-cell">
-					{{$item.created}}
-				</td>
-				<td class="d-none d-md-table-cell">
-					{{$item.edited}}
-				</td>
-			</tr>
-			{{/foreach}}
-			{{/foreach}}
-		</table>
-	</div>
-	<div class="clear"></div>
-	{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/like_noshare.tpl b/view/theme/redbasic/tpl/like_noshare.tpl
deleted file mode 100755
index e83b885fe..000000000
--- a/view/theme/redbasic/tpl/like_noshare.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
-	<i class="fa fa-thumbs-o-up item-tool btn btn-outline-secondary" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i>
-	<i class="fa fa-thumbs-o-down item-tool btn btn-outline-secondary" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i>
-	<div id="like-rotator-{{$id}}" class="like-rotator"></div>
-</div>
diff --git a/view/theme/redbasic/tpl/locmanage.tpl b/view/theme/redbasic/tpl/locmanage.tpl
deleted file mode 100644
index a8c75b6a8..000000000
--- a/view/theme/redbasic/tpl/locmanage.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<script>
-			function primehub(id) {
-				$.post(baseurl + '/locs','primary='+id,function(data) { window.location.href=window.location.href; });
-			}
-			function drophub(id) {
-				$.post(baseurl + '/locs','drop='+id,function(data) { window.location.href=window.location.href; });
-			}
-		</script>
-		<button class="btn btn-success btn-sm pull-right" onclick="window.location.href='/locs/f=&sync=1'; return false;"><i class="fa fa-refresh"></i>&nbsp;{{$sync}}</button>
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper-np">
-		<div class="section-content-warning-wrapper">
-			{{$sync_text}}
-		</div>
-		<div class="section-content-info-wrapper">
-			{{$drop_text}}<br>
-			{{$last_resort}}
-		</div>
-		<table id="locs-index">
-			<tr>
-				<th>{{$addr}}</th>
-				<th class="d-none d-md-table-cell">{{$loc}}</th>
-				<th>{{$mkprm}}</th>
-				<th>{{$drop}}</th>
-			</tr>
-			{{foreach $hubs as $hub}}
-			{{if ! $hub.deleted }}
-			<tr class="locs-index-row">
-				<td>{{$hub.hubloc_addr}}</td>
-				<td class="d-none d-md-table-cell">{{$hub.hubloc_url}}</td>
-				<td>{{if $hub.primary}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o primehub" onclick="primehub({{$hub.hubloc_id}}); return false;"></i>{{/if}}</td>
-				<td><i class="fa fa-trash-o drophub" onclick="drophub({{$hub.hubloc_id}}); return false;"></i></td>
-			</tr>
-			{{/if}}
-			{{/foreach}}
-		</table>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/login.tpl b/view/theme/redbasic/tpl/login.tpl
deleted file mode 100755
index 3d3faa41c..000000000
--- a/view/theme/redbasic/tpl/login.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-	<div id="login-main">
-		<div id="login-input" class="form-group">
-			{{include file="field_input.tpl" field=$lname}}
-			{{include file="field_password.tpl" field=$lpassword}}
-			{{include file="field_checkbox.tpl" field=$remember_me}}
-			<button type="submit" name="submit" class="btn btn-block btn-primary">{{$login}}</button>
-		</div>
-		<div id="login-extra-links">
-			{{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link" class="pull-right">{{$register.desc}}</a>{{/if}}
-			<a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
-		</div>
-	</div>
-	{{foreach $hiddens as $k=>$v}}
-		<input type="hidden" name="{{$k}}" value="{{$v}}" />
-	{{/foreach}}
-</form>
-{{if $login_page}}
-<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/logout.tpl b/view/theme/redbasic/tpl/logout.tpl
deleted file mode 100755
index 7548ed196..000000000
--- a/view/theme/redbasic/tpl/logout.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<form action="{{$dest_url}}" method="post" >
-<div class="logout-wrapper">
-<input type="hidden" name="auth-params" value="logout" />
-<input type="submit" name="submit" id="logout-button" value="{{$logout}}" />
-</div>
-</form>
diff --git a/view/theme/redbasic/tpl/lostpass.tpl b/view/theme/redbasic/tpl/lostpass.tpl
deleted file mode 100755
index 8ecfd215b..000000000
--- a/view/theme/redbasic/tpl/lostpass.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h3>{{$title}}</h3>
-
-<p id="lostpass-desc">
-{{$desc}}
-</p>
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">{{$name}}</label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-		<input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
-</div>
-<div id="login-extra-end"></div>
-<div id="login-submit-end"></div>
-</form>
-</div>
diff --git a/view/theme/redbasic/tpl/mail_conv.tpl b/view/theme/redbasic/tpl/mail_conv.tpl
deleted file mode 100755
index 759517b7f..000000000
--- a/view/theme/redbasic/tpl/mail_conv.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<div id="mail-{{$mail.id}}" class="mb-2 clearfix mail-conv-outside-wrapper">
-	<div class="mb-2 clearfix wall-item-head">
-		<div class="wall-item-info" >
-			<a href="{{$mail.from_url}}"><img class="wall-item-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a>
-		</div>
-		<div class="mail-conv-detail">
-			{{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}}
-			<div class="wall-item-name"><a class="wall-item-name-link" href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
-			<div class="autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div>
-		</div>
-	</div>
-	<div class="clearfix mail-conv-content">
-		<div class="clearfix mail-conv-body">
-			{{$mail.body}}
-		</div>
-		{{if $mail.attachments}}
-		<div class="dropdown float-left">
-			<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-fw fa-paperclip"></i></button>
-			<div class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</div>
-		</div>
-		{{/if}}
-		<div class="float-right dropdown">
-			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}">
-				<i class="fa fa-cog"></i>
-			</button>
-			<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}">
-				{{if $mail.can_recall}}
-				<a class="dropdown-item" href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-fw fa-undo"></i>&nbsp;{{$mail.recall}}</a>
-				{{/if}}
-				<a class="dropdown-item" href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-fw fa-trash-o"></i>&nbsp;{{$mail.delete}}</a>
-				{{if $mail.can_recall}}
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a>
-				{{/if}}
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/mail_display.tpl b/view/theme/redbasic/tpl/mail_display.tpl
deleted file mode 100755
index e8549a49b..000000000
--- a/view/theme/redbasic/tpl/mail_display.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
-			{{if $mailbox == 'combined'}}
-			<a class="btn btn-sm btn-danger" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$delete}}</a>
-			{{/if}}
-		</div>
-		<h2>{{$prvmsg_header}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-wrapper">
-		{{foreach $mails as $mail}}
-			{{include file="mail_conv.tpl"}}
-		{{/foreach}}
-
-		{{if $canreply}}
-		{{include file="prv_message.tpl"}}
-		{{else}}
-		{{$unknown_text}}
-		{{/if}}
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/mail_head.tpl b/view/theme/redbasic/tpl/mail_head.tpl
deleted file mode 100755
index aac592a5f..000000000
--- a/view/theme/redbasic/tpl/mail_head.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="widget">
-	<h3>{{$header}}</h3>
-	<ul class="nav nav-pills flex-column">
-	{{foreach $messages as $message}}
-		{{include file="mail_list.tpl"}}
-	{{/foreach}}
-	</ul>
-</div>
diff --git a/view/theme/redbasic/tpl/mail_list.tpl b/view/theme/redbasic/tpl/mail_list.tpl
deleted file mode 100755
index 827c7628f..000000000
--- a/view/theme/redbasic/tpl/mail_list.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<li class="nav-item">
-	<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}">
-		<span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br>
-		<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
-		<span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span>
-	</a>
-</li>
diff --git a/view/theme/redbasic/tpl/main_slider.tpl b/view/theme/redbasic/tpl/main_slider.tpl
deleted file mode 100755
index a4e2e1925..000000000
--- a/view/theme/redbasic/tpl/main_slider.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div>
-<script>
-$(document).ready(function() {
-	var old_cmin = 0;
-	var old_cmax = 99;
-
-	$("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false,  onstatechange: function(v) { 
-		var carr = v.split(",");
-		if(carr[0] != bParam_cmin) {
-			old_cmin = bParam_cmin;
-	 		bParam_cmin = carr[0];
-		}
-		if(carr[1] != bParam_cmax) {
-			old_cmax = bParam_cmax; 
-			bParam_cmax = carr[1];
-		}
-		networkRefresh();
- 	} });
-
-	var slideTimer = null;
-	function networkRefresh() {
-		$("#profile-jot-text-loading").show();
-
-		if((document.readyState !== "complete") || (slideTimer !== null))
-			return;
-		if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax))
-			return;
-		setTimeout(function() { $("#profile-jot-text-loading").spin('small'); }, 1000 );
-		slideTimer = setTimeout(networkTimerRefresh,2000);
-	}
-
-	function networkTimerRefresh() {
-		slideTimer = null;
-		page_load = true;
-		liveUpdate();
-	}
-});
-</script>
diff --git a/view/theme/redbasic/tpl/match.tpl b/view/theme/redbasic/tpl/match.tpl
deleted file mode 100755
index a5ebb043c..000000000
--- a/view/theme/redbasic/tpl/match.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="{{$url}}">
-			<img src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{if $connlnk}}
-	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$conntxt}}</a></div>
-	{{/if}}
-
-</div>
diff --git a/view/theme/redbasic/tpl/menuedit.tpl b/view/theme/redbasic/tpl/menuedit.tpl
deleted file mode 100644
index 84b16dc0b..000000000
--- a/view/theme/redbasic/tpl/menuedit.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{if $header}}
-<div class="generic-content-wrapper">
-<div class="section-title-wrapper">
-	{{if $menu_edit_link}}
-	<div class="pull-right">
-		<a href="{{$menu_edit_link}}" title="{{$hintedit}}" class="btn btn-sm btn-success"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$editcontents}}</a>
-	</div>
-	{{/if}}
-	<h2>{{$header}}</h2>
-	<div class="clear"></div>
-</div>
-{{/if}}
-<div id="menu-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
-	<form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" >
-		{{if $menu_id}}
-		<input type="hidden" name="menu_id" value="{{$menu_id}}" />
-		{{/if}}
-		{{if $menu_system}}
-		<input type="hidden" name="menu_system" value="{{$menu_system}}" />
-		{{/if}}
-		{{include file="field_input.tpl" field=$menu_name}}
-		{{include file="field_input.tpl" field=$menu_desc}}
-
-		{{include file="field_checkbox.tpl" field=$menu_bookmark}}
-		<div class="menuedit-submit-wrapper form-group pull-right" >
-			<button type="submit" name="submit" class="btn btn-primary">{{$submit}}&nbsp;<i class="fa fa-caret-right"></i></button>
-		</div>
-		<div class="clear"></div>
-	</form>
-</div>
-{{if $header}}
-</div>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/menulist.tpl b/view/theme/redbasic/tpl/menulist.tpl
deleted file mode 100644
index e23035062..000000000
--- a/view/theme/redbasic/tpl/menulist.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('menu-creator');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$hintnew}}</button>
-		</div>
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-
-	{{$create}}
-
-	{{if $menus }}
-	<div id="menulist-content-wrapper" class="section-content-wrapper-np">
-		<table id="menu-list-table">
-			<tr>
-				<th width="1%"></th>
-				<th width="1%">{{$nametitle}}</th>
-				<th width="93%">{{$desctitle}}</th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%" class="d-none d-md-table-cell">{{$created}}</th>
-				<th width="1%" class="d-none d-md-table-cell">{{$edited}}</th>
-			</tr>
-			{{foreach $menus as $m }}
-			<tr id="menu-list-item-{{$m.menu_id}}">
-				<td>{{if $m.bookmark}}<i class="fa fa-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td>
-				<td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td>
-				<td>{{$m.menu_desc}}</td>
-				<td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
-				<td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a></td>
-				<td class="menu-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
-				<td class="d-none d-md-table-cell">{{$m.menu_created}}</td>
-				<td class="d-none d-md-table-cell">{{$m.menu_edited}}</td>
-			</tr>
-			{{/foreach}}
-		</table>
-	</div>
-	{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/message_side.tpl b/view/theme/redbasic/tpl/message_side.tpl
deleted file mode 100755
index 2ac61bf76..000000000
--- a/view/theme/redbasic/tpl/message_side.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="widget">
-	<h3>{{$title}}</h3>
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a href="{{$combined.url}}" class="nav-link{{if $combined.sel}} active{{/if}}">{{$combined.label}}</a></li>
-		<li class="nav-item"><a href="{{$inbox.url}}" class="nav-link{{if $inbox.sel}} active{{/if}}">{{$inbox.label}}</a></li>
-		<li class="nav-item"><a href="{{$outbox.url}}" class="nav-link{{if $outbox.sel}} active{{/if}}">{{$outbox.label}}</a></li>
-		<li class="nav-item"><a href="{{$new.url}}" class="nav-link{{if $new.sel}} active{{/if}}">{{$new.label}}</a></li>
-	</ul>
-</div>
diff --git a/view/theme/redbasic/tpl/micropro_img.tpl b/view/theme/redbasic/tpl/micropro_img.tpl
deleted file mode 100755
index a7c5973f3..000000000
--- a/view/theme/redbasic/tpl/micropro_img.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="" /></a></div>
diff --git a/view/theme/redbasic/tpl/micropro_txt.tpl b/view/theme/redbasic/tpl/micropro_txt.tpl
deleted file mode 100755
index 295e7940d..000000000
--- a/view/theme/redbasic/tpl/micropro_txt.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<div class="contact-block-textdiv{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}} title="{{$title}}">{{$name}}</a></div>
diff --git a/view/theme/redbasic/tpl/mitemedit.tpl b/view/theme/redbasic/tpl/mitemedit.tpl
deleted file mode 100644
index 9f696fc23..000000000
--- a/view/theme/redbasic/tpl/mitemedit.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-{{if $header}}
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$header}}</h2>
-	</div>
-{{/if}}
-	<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
-		<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" class="acl-form" data-form_id="mitemedit" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-			<input type="hidden" name="menu_id" value="{{$menu_id}}" />
-			{{if $mitem_id}}
-			<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
-			{{/if}}
-			{{include file="field_input.tpl" field=$mitem_desc}}
-			{{include file="field_input.tpl" field=$mitem_link}}
-			{{if $menu_names}}
-			<datalist id="menu-names">
-				{{foreach $menu_names as $menu_name}}
-				<option value="{{$menu_name}}">
-				{{/foreach}}
-			</datalist>
-			{{/if}}
-			{{include file="field_input.tpl" field=$mitem_order}}
-			{{include file="field_checkbox.tpl" field=$usezid}}
-			{{include file="field_checkbox.tpl" field=$newwin}}
-			<div class="pull-right form-group">
-				<div class="btn-group">
-					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-						<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
-					</button>
-					{{if $submit_more}}
-					<button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="fa fa-caret-right"></i></button>
-					{{/if}}
-					<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
-				</div>
-			</div>
-			<div class="clear"></div>
-		</form>
-		{{$aclselect}}
-	</div>
-{{if $header}}
-</div>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/mitemlist.tpl b/view/theme/redbasic/tpl/mitemlist.tpl
deleted file mode 100644
index b28cdfc7e..000000000
--- a/view/theme/redbasic/tpl/mitemlist.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('menu-element-creator');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$hintnew}}</button>
-		</div>
-		<h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
-		<div class="clear"></div>
-	</div>
-
-	{{$create}}
-
-	{{if $mlist }}
-	<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
-		<table id="mitem-list-table">
-			<tr>
-				<th width="1%">{{$nametitle}}</th>
-				<th width="96%">{{$targettitle}}</th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-			</tr>
-			{{foreach $mlist as $m }}
-			<tr id="mitem-list-item-{{$m.mitem_id}}">
-				<td width="1%">{{$m.mitem_desc}}</td>
-				<td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
-				<td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
-				<td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
-				<td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
-			</tr>
-			{{/foreach}}
-		</table>
-	</div>
-	{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/mood_content.tpl b/view/theme/redbasic/tpl/mood_content.tpl
deleted file mode 100755
index 315ee4c8a..000000000
--- a/view/theme/redbasic/tpl/mood_content.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<div id="mood-content" class="generic-content-wrapper">
-    <div class="section-title-wrapper">
-    <h2>{{$title}}</h2>
-    </div>
-    <div class="section-content-wrapper">
-
-	    <div id="mood-desc">{{$desc}}</div>
-
-		<br />
-		<br />
-
-
-		<form action="mood" method="get">
-		<br />
-		<br />
-
-		<input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" />
-
-		<div class="form-group field custom">
-			<select name="verb" id="mood-verb-select" class="form-control" >
-			{{foreach $verbs as $v}}
-				<option value="{{$v.0}}">{{$v.1}}</option>
-			{{/foreach}}
-			</select>
-		</div>
-		<br />
-		<br />
-
-		<input type="submit" name="submit" value="{{$submit}}" />
-		</form>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/msg-header.tpl b/view/theme/redbasic/tpl/msg-header.tpl
deleted file mode 100755
index 013e1cfdc..000000000
--- a/view/theme/redbasic/tpl/msg-header.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-<script type="text/javascript" src="view/js/ajaxupload.js" ></script>
-<script language="javascript" type="text/javascript">
-
-	$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
-
-
-	$(document).ready(function() {
-
-		var file_uploader = new window.AjaxUpload(
-			'prvmail-attach-wrapper',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addmailtext(response);
-					$('#prvmail-rotator').spin(false);
-				}
-			}
-		);
-
-		var file_uploader_sub = new window.AjaxUpload(
-			'prvmail-attach-sub',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addmailtext(response);
-					$('#prvmail-rotator').spin(false);
-				}
-			}
-		);
-
-
-	});
-
-	function prvmailJotGetLink() {
-		reply = prompt("{{$linkurl}}");
-		if(reply && reply.length) {
-			$('#prvmail-rotator').spin('tiny');
-			$.get('linkinfo?f=&url=' + reply, function(data) {
-				addmailtext(data);
-				$('#prvmail-rotator').spin(false);
-			});
-		}
-	}
-
-	function prvmailGetExpiry() {
-		reply = prompt("{{$expireswhen}}", $('#inp-prvmail-expires').val());
-		if(reply && reply.length) {
-			$('#inp-prvmail-expires').val(reply);
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#prvmail-rotator').spin('tiny');
-			$.get('linkinfo?f=&url=' + reply, function(data) {
-				addmailtext(data);
-				$('#prvmail-rotator').spin(false);
-			});
-		}
-	}
-
-	function addmailtext(data) {
-		var currentText = $("#prvmail-text").val();
-		$("#prvmail-text").val(currentText + data);
-	}	
-
-
-
-</script>
-
diff --git a/view/theme/redbasic/tpl/myapps.tpl b/view/theme/redbasic/tpl/myapps.tpl
deleted file mode 100755
index ccefa4a49..000000000
--- a/view/theme/redbasic/tpl/myapps.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $authed}}
-		{{if $create}}
-		<a href="appman" class="pull-right btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</a>
-		{{else}}
-		<a href="apps/edit{{if $cat}}/?f=&cat={{$cat}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a>
-		{{/if}}
-		{{/if}}
-		<h2>{{$title}}{{if $cat}} - {{$cat}}{{/if}}</h2>
-	</div>
-	<div class="clearfix section-content-wrapper">
-		{{foreach $apps as $ap}}
-		{{$ap}}
-		{{/foreach}}
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/nav.tpl b/view/theme/redbasic/tpl/nav.tpl
deleted file mode 100755
index c5b378b4f..000000000
--- a/view/theme/redbasic/tpl/nav.tpl
+++ /dev/null
@@ -1,222 +0,0 @@
-{{if $nav.login && !$userinfo}}
-<div class="d-md-none p-1">
-	<a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
-		{{$nav.loginmenu.1.1}}
-	</a>
-	{{if $nav.register}}
-	<a class="btn btn-warning btn-sm text-white" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
-		{{$nav.register.1}}
-	</a>
-	{{/if}}
-</div>
-{{/if}}
-{{if $userinfo}}
-<div class="dropdown usermenu">
-	<div class="fakelink" data-toggle="dropdown">
-		<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
-		<i class="fa fa-caret-down"></i>
-	</div>
-	{{if $localuser}}
-	<div class="dropdown-menu">
-		{{foreach $nav.usermenu as $usermenu}}
-		<a class="dropdown-item"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
-		{{/foreach}}
-		{{if $nav.manage}}
-		<a class="dropdown-item" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
-		{{/if}}	
-		{{if $nav.channels}}
-		{{foreach $nav.channels as $chan}}
-		<a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a>
-		{{/foreach}}
-		{{/if}}
-		{{if $nav.profiles}}
-		<a class="dropdown-item" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a>
-		{{/if}}
-		{{if $nav.settings}}
-		<div class="dropdown-divider"></div>
-		<a class="dropdown-item" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
-		{{/if}}
-		{{if $nav.admin}}
-		<div class="dropdown-divider"></div>
-		<a class="dropdown-item" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
-		{{/if}}
-		{{if $nav.logout}}
-		<div class="dropdown-divider"></div>
-		<a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a>
-		{{/if}}
-	</div>
-	{{else}}
-	{{if $nav.rusermenu}}
-	<div class="dropdown-menu" role="menu" aria-labelledby="avatar">
-		<a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a>
-		<a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a>
-	</div>
-	{{/if}}
-	{{/if}}
-</div>
-{{/if}}
-<div class="navbar-toggler-right">
-	{{if $nav.help.6}}
-	<button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;">
-		<i class="fa fa-question-circle"></i>
-	</button>
-	{{/if}}
-	<button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
-		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
-	</button>
-	{{if $localuser}}
-	<button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1">
-		<i class="fa fa-exclamation-circle"></i>
-	</button>
-	{{/if}}
-	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
-		<i class="fa fa-bars"></i>
-	</button>
-</div>
-<div class="collapse navbar-collapse" id="navbar-collapse-1">
-	<ul class="navbar-nav mr-auto">
-		{{if $nav.network}}
-		<li class="nav-item dropdown net-button" style="display: none;">
-			<a class="nav-link" href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu">
-				<i class="fa fa-fw fa-th"></i>
-				<span class="badge badge-pill badge-default net-update"></span>
-			</a>
-			<div id="nav-network-menu" class="dropdown-menu" rel="network">
-				<a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a>
-				<a class="dropdown-item" id="nav-network-mark-all"href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a>
-				{{$emptynotifications}}
-			</div>
-		</li>
-		{{/if}}
-		{{if $nav.home}}
-		<li class="nav-item dropdown home-button" style="display: none;">
-			<a class="nav-link" href="#" title="{{$nav.home.3}}" id="{{$nav.home.4}}" data-toggle="dropdown" rel="#nav-home-menu">
-				<i class="fa fa-fw fa-home"></i>
-				<span class="badge badge-pill badge-danger home-update"></span>
-			</a>
-			<div id="nav-home-menu" class="dropdown-menu" rel="home">
-				<a class="dropdown-item" id="nav-home-see-all" href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a>
-				<a class="dropdown-item" id="nav-home-mark-all" href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a>
-				{{$emptynotifications}}
-			</div>
-		</li>
-		{{/if}}
-		{{if $nav.messages}}
-		<li class="nav-item dropdown mail-button" style="display: none;">
-			<a class="nav-link" href="#" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}" data-toggle="dropdown" rel="#nav-messages-menu">
-				<i class="fa fa-fw fa-envelope"></i>
-				<span class="badge badge-pill badge-danger mail-update"></span>
-			</a>
-			<div id="nav-messages-menu" class="dropdown-menu" rel="messages">
-				<a class="dropdown-item" id="nav-messages-see-all" href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a>
-				<a class="dropdown-item" id="nav-messages-mark-all" href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a>
-				{{$emptynotifications}}
-			</div>
-		</li>
-		{{/if}}
-		{{if $nav.all_events}}
-		<li class="nav-item dropdown all_events-button" style="display: none;">
-			<a class="nav-link" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu">
-				<i class="fa fa-fw fa-calendar"></i>
-				<span class="badge badge-pill badge-default all_events-update"></span>
-			</a>
-			<div id="nav-all_events-menu" class="dropdown-menu" rel="all_events">
-				<a class="dropdown-item" id="nav-all_events-see-all" href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a>
-				<a class="dropdown-item" id="nav-all_events-mark-all" href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a>
-				{{$emptynotifications}}
-			</div>
-		</li>
-		{{/if}}
-		{{if $nav.intros}}
-		<li class="nav-item dropdown intro-button" style="display: none;">
-			<a class="nav-link" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu">
-				<i class="fa fa-fw fa-users"></i>
-				<span class="badge badge-pill badge-danger intro-update"></span>
-			</a>
-			<div id="nav-intros-menu" class="dropdown-menu" rel="intros">
-				<a class="dropdown-item" id="nav-intros-see-all" href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a>
-				{{$emptynotifications}}
-			</div>
-		</li>
-		{{/if}}
-		{{if $nav.notifications}}
-		<li class="nav-item dropdown notify-button" style="display: none;">
-			<a class="nav-link" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu">
-				<i class="fa fa-fw fa-exclamation"></i>
-				<span class="badge badge-pill badge-danger notify-update"></span>
-			</a>
-			<div id="nav-notify-menu" class="dropdown-menu" rel="notify">
-				<a class="dropdown-item" id="nav-notify-see-all" href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a>
-				<a class="dropdown-item" id="nav-notify-mark-all" href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a>
-				{{$emptynotifications}}
-			</div>
-		</li>
-		{{/if}}
-		{{if $nav.login && !$userinfo}}
-		<li class="nav-item">
-			<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a>
-		</li>
-		{{/if}}
-		{{if $nav.register}}
-		<li class="nav-item {{$nav.register.2}} d-none d-md-flex">
-			<a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a>
-		</li>
-		{{/if}}
-		{{if $nav.alogout}}
-		<li class="nav-item {{$nav.alogout.2}} d-none d-md-flex">
-			<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
-		</li>
-		{{/if}}
-	</ul>
-
-	<div id="banner" class="navbar-text d-none d-md-flex">{{$banner}}</div>
-
-	<ul id="nav-right" class="navbar-nav ml-auto d-none d-md-flex">
-		<li class="nav-item collapse clearfix" id="nav-search">
-			<form class="form-inline" method="get" action="search" role="search">
-				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
-			</form>
-			<div id="nav-search-spinner"></div>
-		</li>
-		<li class="nav-item" id="nav-search-btn">
-			<a class="nav-link" href="#nav-search" title="{{$nav.search.3}}" onclick="openMenu('nav-search'); closeMenu('nav-search-btn'); $('#nav-search-text').focus(); return false;"><i class="fa fa-fw fa-search"></i></a>
-		</li>
-		{{if $nav.help.6}}
-		<li class="nav-item dropdown {{$sel.help}}">
-			<a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-question-circle"></i></a>
-		</li>
-		{{/if}}
-		<li class="nav-item dropdown" id="app-menu">
-			<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
-			<div class="dropdown-menu dropdown-menu-right">
-				{{foreach $navapps as $navapp}}
-				{{$navapp}}
-				{{/foreach}}
-				{{if $localuser}}
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
-				{{/if}}
-			</div>
-		</li>
-	</ul>
-</div>
-<div class="collapse d-md-none" id="navbar-collapse-2">
-	<div class="navbar-nav mr-auto">
-		{{foreach $navapps as $navapp}}
-		{{$navapp|replace:'dropdown-item':'nav-link'}}
-		{{/foreach}}
-		{{if $localuser}}
-		<div class="dropdown-divider"></div>
-		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
-		{{/if}}
-	</div>
-</div>
-{{if $nav.help.6}}
-<div id="contextual-help-content" class="contextual-help-content">
-	{{$nav.help.5}}
-	<div class="float-right">
-		<a class="btn btn-primary btn-sm" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-question"></i>&nbsp;{{$fulldocs}}</a>
-		<a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-times"></i></a>
-	</div>
-</div>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/nav_login.tpl b/view/theme/redbasic/tpl/nav_login.tpl
deleted file mode 100644
index b361b1a14..000000000
--- a/view/theme/redbasic/tpl/nav_login.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{if $nav.login && !$userinfo}}
-<div id="nav-login" class="modal" tabindex="-1" role="dialog">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title">{{$nav.loginmenu.1.1}}</h4>
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-			</div>
-			<div class="modal-body">
-				<div class="form-group">
-					{{$nav.login}}
-					{{$nav.remote_login}}
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/new_channel.tpl b/view/theme/redbasic/tpl/new_channel.tpl
deleted file mode 100755
index cc1983ac4..000000000
--- a/view/theme/redbasic/tpl/new_channel.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<div class="section-content-wrapper">
-		<div class="section-content-info-wrapper">
-			{{$desc}}
-		</div>
-		{{if $channel_usage_message}}
-		<div class="section-content-warning-wrapper">
-			{{$channel_usage_message}}
-		</div>
-		{{/if}}
-		<form action="new_channel" method="post" id="newchannel-form">
-			{{if $default_role}}
-				<input type="hidden" name="permissions_role" value="{{$default_role}}" />
-			{{else}}
-				{{include file="field_select_grouped.tpl" field=$role}}
-			{{/if}}
-
-			{{include file="field_input.tpl" field=$name}}
-			<div id="name-spinner"></div>
-
-			{{include file="field_input.tpl" field=$nickname}}
-			<div id="nick-spinner"></div>
-
-			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
-			<div id="newchannel-submit-end" class="clear"></div>
-
-			<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
-			<div id="newchannel-import-end" class="clear"></div>
-		</form>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/notes.tpl b/view/theme/redbasic/tpl/notes.tpl
deleted file mode 100644
index c6d5d8a73..000000000
--- a/view/theme/redbasic/tpl/notes.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="widget">
-	<h3>{{$banner}}</h3>
-	<textarea name="note_text" id="note-text">{{$text}}</textarea>
-	<script>
-		var noteSaveTimer = null;
-		var noteText = $('#note-text');
-
-		$(document).ready(function(e){
-			noteText.on('change keyup keydown paste cut', function () {
-				noteText.height(0).height(noteText[0].scrollHeight);
-				$(document.body).trigger("sticky_kit:recalc");
-			}).change();
-		});
-
-		$(document).on('focusout',"#note-text",function(e){
-			if(noteSaveTimer)
-				clearTimeout(noteSaveTimer);
-			notePostFinal();
-			noteSaveTimer = null;
-		});
-
-		$(document).on('focusin',"#note-text",function(e){
-			noteSaveTimer = setTimeout(noteSaveChanges,10000);
-		});
-
-		function notePostFinal() {
-			$.post('notes/sync', { 'note_text' : $('#note-text').val() });
-		}
-
-		function noteSaveChanges() {
-			$.post('notes', { 'note_text' : $('#note-text').val() });
-			noteSaveTimer = setTimeout(noteSaveChanges,10000);
-		}
-	</script>
-</div>
diff --git a/view/theme/redbasic/tpl/notifications.tpl b/view/theme/redbasic/tpl/notifications.tpl
deleted file mode 100755
index 0b24da7c3..000000000
--- a/view/theme/redbasic/tpl/notifications.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="generic-content-wrapper-styled">
-
-<h1>{{$notif_header}}</h1>
-
-{{if $notifications_available}}
-<a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a>
-{{/if}}
-<div class="notif-network-wrapper">
-	{{$notif_content}}
-</div>
-</div>
diff --git a/view/theme/redbasic/tpl/notify.tpl b/view/theme/redbasic/tpl/notify.tpl
deleted file mode 100755
index d3c79be82..000000000
--- a/view/theme/redbasic/tpl/notify.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="notif-item">
-	<a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
-</div>
diff --git a/view/theme/redbasic/tpl/nwiki_page_history.tpl b/view/theme/redbasic/tpl/nwiki_page_history.tpl
deleted file mode 100644
index b1c6c9284..000000000
--- a/view/theme/redbasic/tpl/nwiki_page_history.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-<style>
-  .diff {
-    width:100%;
-    word-break: break-all;
-  }
-
-  .diff td{
-    padding:0 0.667em;
-    vertical-align:top;
-    white-space:pre;
-    white-space:pre-wrap;
-    font-family:Consolas,'Courier New',Courier,monospace;
-    font-size:1.0em;
-    line-height:1.333;
-  }
-
-  .diff span{
-    display:block;
-    min-height:1.333em;
-    margin-top:-1px;
-    padding:0 3px;
-  }
-
-  * html .diff span{
-    height:1.333em;
-  }
-
-  .diff span:first-child{
-    margin-top:0;
-  }
-
-  .diffDeleted span{
-    border:1px solid rgb(255,192,192);
-    background:rgb(255,224,224);
-  }
-
-  .diffInserted span{
-    border:1px solid rgb(192,255,192);
-    background:rgb(224,255,224);
-  }
-</style>
-<table class="" style="width: 100%;">
-  {{foreach $pageHistory as $commit}}
-  <tr class="wikis-index-row"><td>
-      <table id="rev-{{$commit.revision}}" onclick="$('#details-{{$commit.revision}}').show()" style="width: 100%;">
-        <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td>
-            <td rowspan="3" width="20%" align="right">
-		{{if $permsWrite}}
-              <button id="revert-{{$commit.revision}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.revision}}')">Revert</button>
-              <br><br>
-		{{/if}}
-              <button id="compare-{{$commit.revision}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.revision}}')">Compare</button>
-            </td></tr>
-        <tr><td>{{$name_lbl}}</td><td>{{$commit.name}}</td></tr>
-        <tr><td>{{$msg_label}}</td><td>{{$commit.title}}</td></tr>
-      </table>
-    </td></tr>
-  {{/foreach}}          
-</table>
diff --git a/view/theme/redbasic/tpl/oauth_authorize.tpl b/view/theme/redbasic/tpl/oauth_authorize.tpl
deleted file mode 100755
index 2b7afa80e..000000000
--- a/view/theme/redbasic/tpl/oauth_authorize.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>{{$title}}</h1>
-
-<div class='oauthapp'>
-	<img src='{{$app.icon}}'>
-	<h4>{{$app.name}}</h4>
-</div>
-<h3>{{$authorize}}</h3>
-<form method="POST">
-<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes}}" /></div>
-</form>
diff --git a/view/theme/redbasic/tpl/oauth_authorize_done.tpl b/view/theme/redbasic/tpl/oauth_authorize_done.tpl
deleted file mode 100755
index 2e91e0125..000000000
--- a/view/theme/redbasic/tpl/oauth_authorize_done.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<h1>{{$title}}</h1>
-
-<p>{{$info}}</p>
-<code>{{$code}}</code>
diff --git a/view/theme/redbasic/tpl/oembed_video.tpl b/view/theme/redbasic/tpl/oembed_video.tpl
deleted file mode 100755
index b0cfed2e5..000000000
--- a/view/theme/redbasic/tpl/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a href="{{$embedurl}}" onclick="this.innerHTML=Base64.decode('{{$escapedhtml}}'); return false;" style="float:left; margin: 1em; position: relative;">
-	<img width="{{$tw}}" height="{{$th}}" src="{{$turl}}" />
-	<div style="position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;"></div>
-</a>
diff --git a/view/theme/redbasic/tpl/oexchange_xrd.tpl b/view/theme/redbasic/tpl/oexchange_xrd.tpl
deleted file mode 100755
index e865e07d9..000000000
--- a/view/theme/redbasic/tpl/oexchange_xrd.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-        
-    <Subject>{{$base}}</Subject>
-
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/vendor">Zotlabs</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/title">Hubzilla</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/name">Hubzilla</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Hubzilla</Property>
-
-    <Link 
-        rel="icon" 
-        href="{{$base}}/images/hz-16.png"
-        type="image/png" 
-        />
-
-    <Link 
-        rel="icon32" 
-        href="{{$base}}/images/hz-32.png"
-        type="image/png" 
-        />
-
-    <Link 
-        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
-        href="{{$base}}/oexchange"
-        type="text/html" 
-        />
-</XRD>
-
diff --git a/view/theme/redbasic/tpl/page_display.tpl b/view/theme/redbasic/tpl/page_display.tpl
deleted file mode 100755
index a320920c7..000000000
--- a/view/theme/redbasic/tpl/page_display.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="page">
-	<div class="generic-content-wrapper" id="page-content-wrapper" >
-		{{if $title}}
-		<div class="section-title-wrapper">
-			<h2 class="page-title">{{$title}}</h2>
-		</div>
-		{{/if}}
-		<div class="section-content-wrapper">
-			<div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
-			<div class="page-date">{{$date}}</div>
-			<div class="page-body">{{$body}}</div>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/page_display_empty.tpl b/view/theme/redbasic/tpl/page_display_empty.tpl
deleted file mode 100644
index 9f000dee8..000000000
--- a/view/theme/redbasic/tpl/page_display_empty.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{$body}}
\ No newline at end of file
diff --git a/view/theme/redbasic/tpl/pdledit.tpl b/view/theme/redbasic/tpl/pdledit.tpl
deleted file mode 100644
index cef93d324..000000000
--- a/view/theme/redbasic/tpl/pdledit.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$header}}</h1>
-
-<h2>{{$mname}} {{$module}}</h2>
-
-<br />
-<a href="help/comanche" target="hubzilla-help">{{$help}}</a>
-<br />
-<br />
-
-
-
-<form action="pdledit" method="post" >
-<input type="hidden" name="module" value="{{$module}}" />
-<textarea rows="24" cols="80" name="content">{{$content}}</textarea>
-
-<br />
-<input type="submit" name="submit" value="{{$submit}}" />
-
-</form>
-<script>
-	$('textarea').bbco_autocomplete('comanche');
-</script>
-</div>
diff --git a/view/theme/redbasic/tpl/peoplefind.tpl b/view/theme/redbasic/tpl/peoplefind.tpl
deleted file mode 100755
index 2ecfbaff9..000000000
--- a/view/theme/redbasic/tpl/peoplefind.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="peoplefind-sidebar" class="widget">
-	<h3>{{$findpeople}}</h3>
-	<form action="directory" method="post" />
-		<div class="input-group form-group">
-			<input class="form-control form-control-sm" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
-			<div class="input-group-btn">
-				<button class="btn btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button>
-			</div>
-		</div>
-	</form>
-	<ul class="nav nav-pills flex-column">
-		{{if $similar}}<li class="nav-item"><a class="nav-link" href="match" >{{$similar}}</a></li>{{/if}}
-		{{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}}
-		<li class="nav-item"><a class="nav-link" href="randprof" >{{$random}}</a></li>
-		{{if $loggedin}}{{if $inv}}<li class="nav-item"><a class="nav-link" href="invite" >{{$inv}}</a></li>{{/if}}{{/if}}
-	</ul>
-</div>
diff --git a/view/theme/redbasic/tpl/photo_album.tpl b/view/theme/redbasic/tpl/photo_album.tpl
deleted file mode 100755
index 8bacb1575..000000000
--- a/view/theme/redbasic/tpl/photo_album.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="{{if !$no_fullscreen_btn}}generic-content-wrapper{{/if}}">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			{{if $order}}
-			<a class="btn btn-outline-secondary btn-sm" href="{{$order.1}}" title="{{$order.0}}"><i class="fa fa-sort"></i></a>
-			{{/if}}
-			<div class="btn-group btn-group">
-				{{if $album_edit.1}}
-				<i class="fa fa-pencil btn btn-outline-secondary btn-sm" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
-				{{/if}}
-				{{if $can_post}}
-				<button class="btn btn-sm btn-success btn-sm" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
-				{{/if}}
-			</div>
-		</div>
-		<h2>{{$album}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{$upload_form}}
-	{{$album_edit.1}}
-	<div class="section-content-wrapper-np">
-		<div id="photo-album-contents-{{$album_id}}">
-			{{foreach $photos as $photo}}
-				{{include file="photo_top.tpl"}}
-			{{/foreach}}
-			<div id="page-end"></div>
-		</div>
-	</div>
-</div>
-<div class="photos-end"></div>
-<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
-<div id="page-spinner"></div>
diff --git a/view/theme/redbasic/tpl/photo_albums.tpl b/view/theme/redbasic/tpl/photo_albums.tpl
deleted file mode 100755
index a238e61bc..000000000
--- a/view/theme/redbasic/tpl/photo_albums.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="side-bar-photos-albums" class="widget">
-	<h3>{{$title}}</h3>
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent}}</a></li>
-		{{if $albums}}
-		{{foreach $albums as $al}}
-		{{if $al.shorttext}}
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li>
-		{{/if}}
-		{{/foreach}}
-		{{/if}}
-	</ul>
-</div>
diff --git a/view/theme/redbasic/tpl/photo_drop.tpl b/view/theme/redbasic/tpl/photo_drop.tpl
deleted file mode 100755
index 664e5338c..000000000
--- a/view/theme/redbasic/tpl/photo_drop.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
-	<a class="btn btn-outline-secondary btn-sm" href="#" onclick="dropItem('item/drop/{{$id}}', '#wall-item-outside-wrapper-{{$id}}'); return false;" title="{{$delete}}" ><i class="fa fa-trash-o"></i></a>
-</div>
diff --git a/view/theme/redbasic/tpl/photo_item.tpl b/view/theme/redbasic/tpl/photo_item.tpl
deleted file mode 100755
index ec643c4a9..000000000
--- a/view/theme/redbasic/tpl/photo_item.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="wall-item-outside-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-outside-wrapper-{{$id}}" >
-	<div class="wall-item-content-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;">
-		<div class="wall-item-head">
-			<div class="wall-item-info" id="wall-item-info-{{$id}}" >
-				<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
-					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
-					<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
-				</div>
-			</div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
-				<div class="wall-item-author">
-					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a>
-				</div>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
-			</div>
-		</div>
-		<div class="wall-item-content" id="wall-item-content-{{$id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
-			<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
-
-		</div>
-		{{if $drop}}
-		<div class="wall-item-tools" id="wall-item-tools-{{$id}}" >
-			<div class="wall-item-tools-right pull-right">
-				{{$drop}}
-			</div>
-			<div class="clear"></div>
-		</div>
-		{{/if}}
-		<div class="clear"></div>
-		{{$comment}}
-	</div>
-</div>
-
diff --git a/view/theme/redbasic/tpl/photo_top.tpl b/view/theme/redbasic/tpl/photo_top.tpl
deleted file mode 100755
index a86aa7f80..000000000
--- a/view/theme/redbasic/tpl/photo_top.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
-	<img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
-</a>
-
diff --git a/view/theme/redbasic/tpl/photo_view.tpl b/view/theme/redbasic/tpl/photo_view.tpl
deleted file mode 100755
index 2431329ec..000000000
--- a/view/theme/redbasic/tpl/photo_view.tpl
+++ /dev/null
@@ -1,172 +0,0 @@
-<div id="live-photos"></div>
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			{{if $tools || $map || $edit}}
-			<div class="btn-group">
-				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
-					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
-				</button>
-				<div class="dropdown-menu dropdown-menu-right flex-column">
-					{{if $tools}}
-					<a class="dropdown-item" href="{{$tools.profile.0}}"><i class="fa fa-user"></i>&nbsp;{{$tools.profile.1}}</a>
-					<a class="dropdown-item" href="{{$tools.cover.0}}"><i class="fa fa-picture-o"></i>&nbsp;{{$tools.cover.1}}</a>
-					{{/if}}
-					{{if $map}}
-					<a class="dropdown-item" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="fa fa-globe"></i>&nbsp;{{$map_text}}</a>
-					{{/if}}
-					{{if $edit}}
-					<a class="dropdown-item acl-form-trigger" href="#"  title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i>&nbsp;{{$edit.edit}}</a>
-					{{/if}}
-				</div>
-			</div>
-			{{/if}}
-			{{if $lock}}
-			<div class="btn-group">
-				<button id="lockview" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ><i class="fa fa-lock"></i></button>
-				<ul id="panel-{{$id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
-			</div>
-			{{/if}}
-			{{if $prevlink || $nextlink}}
-			<div class="btn-group">
-				{{if $prevlink}}
-				<a href="{{$prevlink.0}}" class="btn btn-outline-secondary btn-sm" title="{{$prevlink.1}}"><i class="fa fa-backward"></i></a>
-				{{/if}}
-				{{if $nextlink}}
-				<a href="{{$nextlink.0}}" class="btn btn-outline-secondary btn-sm" title="{{$nextlink.1}}"><i class="fa fa-forward"></i></a>
-				{{/if}}
-			</div>
-			{{/if}}
-		</div>
-		<h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div id="photo-map">
-	{{$map}}
-	</div>
-	<div id="photo-edit" class="section-content-tools-wrapper">
-		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" class="acl-form" data-form_id="photo_edit_form" data-allow_cid='{{$edit.allow_cid}}' data-allow_gid='{{$edit.allow_gid}}' data-deny_cid='{{$edit.deny_cid}}' data-deny_gid='{{$edit.deny_gid}}'>
-			<input type="hidden" name="item_id" value="{{$edit.item_id}}" />
-			{{* album renaming is not supported atm.
-			<div class="form-group">
-				<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum_label}}</label>
-				<input id="photo-edit-albumname" class="form-control" type="text" name="albname" value="{{$edit.album}}" placeholder="{{$edit.newalbum_placeholder}}" list="dl-albums" />
-				{{if $edit.albums}}
-				<datalist id="dl-albums">
-				{{foreach $edit.albums as $al}}
-					{{if $al.text}}
-					<option value="{{$al.text}}">
-					{{/if}}
-				{{/foreach}}
-				</datalist>
-				{{/if}}
-			</div>
-			*}}
-			<div class="form-group">
-				<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
-				<input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" />
-			</div>
-			<div class="form-group">
-				<label id="photo-edit-tags-label" for="photo-edit-newtag">{{$edit.tag_label}}</label>
-				<input name="newtag" id="photo-edit-newtag" class="form-control" title="{{$edit.help_tags}}" type="text" />
-			</div>
-			<div class="form-group">
-				{{include file="field_select.tpl" field=$edit.album_select}}
-			</div>
-			<div class="form-group">
-				<label class="radio-inline" id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw"><input id="photo-edit-rotate-cw" type="radio" name="rotate" value="1" />{{$edit.rotatecw}}</label>
-				<label class="radio-inline" id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw"><input id="photo-edit-rotate-ccw" type="radio" name="rotate" value="2" />{{$edit.rotateccw}}</label>
-			</div>
-			{{if $edit.adult_enabled}}
-			<div class="form-group">
-			{{include file="field_checkbox.tpl" field=$edit.adult}}
-			</div>
-			{{/if}}
-
-			<div class="form-group pull-left">
-				<button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button>
-			</div>
-			<div class="form-group btn-group pull-right">
-				{{if $edit.aclselect}}
-				<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-					<i id="jot-perms-icon" class="fa fa-{{$edit.lockstate}}"></i>
-				</button>
-				{{/if}}
-				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
-			</div>
-		</form>
-		{{$edit.aclselect}}
-		<div id="photo-edit-end" class="clear"></div>
-	</div>
-	<div id="photo-view-wrapper">
-		<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
-		<div id="photo-photo-end" class="clear"></div>
-		{{if $tags}}
-		<div class="photo-item-tools-left" id="in-this-photo">
-			<span id="in-this-photo-text">{{$tag_hdr}}</span>
-			{{foreach $tags as $t}}
-				{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}" onclick="return confirmDelete();"><i class="fa fa-times"></i></a>&nbsp;</span>{{/if}}
-			{{/foreach}}
-		</div>
-		{{/if}}
-		<div class="photo-item-tools">
-			{{if $responses.count }}
-			<div class="photo-item-tools-left pull-left">
-				<div class="{{if $responses.count > 1}}btn-group{{/if}}">
-				{{foreach $responses as $verb=>$response}}
-					{{if $response.count}}
-					<div class="btn-group">
-						<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button>
-						{{if $response.list_part}}
-						<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
-						{{else}}
-						<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
-						{{/if}}
-						{{if $response.list_part}}
-						<div class="modal" id="{{$verb}}Modal-{{$id}}">
-							<div class="modal-dialog">
-								<div class="modal-content">
-									<div class="modal-header">
-										<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-										<h4 class="modal-title">{{$response.title}}</h4>
-									</div>
-									<div class="modal-body">
-										<ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
-									</div>
-									<div class="modal-footer clear">
-										<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$modal_dismiss}}</button>
-									</div>
-								</div><!-- /.modal-content -->
-							</div><!-- /.modal-dialog -->
-						</div><!-- /.modal -->
-						{{/if}}
-					</div>
-					{{/if}}
-				{{/foreach}}
-				</div>
-			</div>
-			{{/if}}
-			{{if $likebuttons}}
-			<div class="photo-item-tools-right btn-group pull-right">
-				<button type="button" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$likebuttons.id}},'like'); return false">
-					<i class="fa fa-thumbs-o-up" title="{{$likebuttons.likethis}}"></i>
-				</button>
-				<button type="button" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$likebuttons.id}},'dislike'); return false">
-					<i class="fa fa-thumbs-o-down" title="{{$likebuttons.nolike}}"></i>
-				</button>
-			</div>
-			<div id="like-rotator-{{$likebuttons.id}}" class="photo-like-rotator pull-right"></div>
-			{{/if}}
-			<div class="clear"></div>
-		</div>
-	</div>
-	{{$comments}}
-	{{if $commentbox}}
-	<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
-		{{$commentbox}}
-	</div>
-	{{/if}}
-	<div class="clear"></div>
-</div>
-{{$paginate}}
-
diff --git a/view/theme/redbasic/tpl/photos_recent.tpl b/view/theme/redbasic/tpl/photos_recent.tpl
deleted file mode 100755
index 8fe631ca6..000000000
--- a/view/theme/redbasic/tpl/photos_recent.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			{{if $can_post}}
-			<button class="btn btn-sm btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
-			{{/if}}
-		</div>
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{$upload_form}}
-	<div class="section-content-wrapper-np">
-		<div id="photo-album-contents-{{$album_id}}">
-			{{foreach $photos as $photo}}
-				{{include file="photo_top.tpl"}}
-			{{/foreach}}
-			<div id="page-end"></div>
-		</div>
-	</div>
-</div>
-<div class="photos-end"></div>
-<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
-<div id="page-spinner"></div>
diff --git a/view/theme/redbasic/tpl/photos_upload.tpl b/view/theme/redbasic/tpl/photos_upload.tpl
deleted file mode 100755
index d52bad5a2..000000000
--- a/view/theme/redbasic/tpl/photos_upload.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-<div id="photo-upload-form">
-	<div class="section-content-tools-wrapper">
-		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
-
-			<div class="form-group">
-				<label for="photos-upload-album">{{$newalbum_label}}</label>
-				<input type="text" class="form-control" id="photos-upload-album" name="newalbum" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload">
-				<datalist id="dl-photo-upload">
-				{{foreach $albums as $al}}
-					{{if $al.text}}
-					<option value="{{$al.text}}" />
-					{{/if}}
-				{{/foreach}}
-				</datalist>
-			</div>
-			{{if $default}}
-			<div class="form-group">
-				<input id="photos-upload-choose" type="file" name="userfile" />
-			</div>
-			{{include file="field_input.tpl" field=$caption}}
-			{{include file="field_checkbox.tpl" field=$visible}}
-			<div id="body-textarea">
-			{{include file="field_textarea.tpl" field=$body}}
-			</div>
-			<div class="pull-right btn-group">
-				<div class="btn-group">
-					{{if $lockstate}}
-					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-						<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
-					</button>
-					{{/if}}
-					<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
-				</div>
-
-			</div>
-			{{/if}}
-			<div class="clear"></div>
-
-			{{if $uploader}}
-			{{include file="field_input.tpl" field=$caption}}
-			{{include file="field_checkbox.tpl" field=$visible}}
-			<div id="body-textarea">
-			{{include file="field_textarea.tpl" field=$body}}
-			</div>
-			<div id="photos-upload-perms" class="btn-group pull-right">
-				{{if $lockstate}}
-				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-					<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
-				</button>
-				{{/if}}
-				<div class="pull-right">
-					{{$uploader}}
-				</div>
-			</div>
-			{{/if}}
-		</form>
-	</div>
-	{{$aclselect}}
-	<div id="photos-upload-end" class="clear"></div>
-</div>
diff --git a/view/theme/redbasic/tpl/photosajax.tpl b/view/theme/redbasic/tpl/photosajax.tpl
deleted file mode 100755
index 45191db85..000000000
--- a/view/theme/redbasic/tpl/photosajax.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{foreach $photos as $photo}}
-{{include file="photo_top.tpl"}}
-{{/foreach}}
-<script>justifyPhotosAjax('photo-album-contents-{{$album_id}}')</script>
diff --git a/view/theme/redbasic/tpl/poco_entry_xml.tpl b/view/theme/redbasic/tpl/poco_entry_xml.tpl
deleted file mode 100755
index 30b6268dc..000000000
--- a/view/theme/redbasic/tpl/poco_entry_xml.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<entry>
-{{if $entry.id}}<id>{{$entry.id}}</id>{{/if}}
-{{if $entry.displayName}}<displayName>{{$entry.displayName}}</displayName>{{/if}}
-{{if $entry.preferredUsername}}<preferredUsername>{{$entry.preferredUsername}}</preferredUsername>{{/if}}
-{{if $entry.rating}}<rating>{{$entry.rating}}</rating>{{/if}}
-{{if $entry.urls}}{{foreach $entry.urls as $url}}<urls><value>{{$url.value}}</value><type>{{$url.type}}</type></urls>{{/foreach}}{{/if}}
-{{if $entry.photos}}{{foreach $entry.photos as $photo}}<photos><value>{{$photo.value}}</value><type>{{$photo.type}}</type></photos>{{/foreach}}{{/if}}
-</entry>
diff --git a/view/theme/redbasic/tpl/poco_xml.tpl b/view/theme/redbasic/tpl/poco_xml.tpl
deleted file mode 100755
index 0e38a692c..000000000
--- a/view/theme/redbasic/tpl/poco_xml.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<response>
-{{if $response.sorted}}<sorted>{{$response.sorted}}</sorted>{{/if}}
-{{if $response.filtered}}<filtered>{{$response.filtered}}</filtered>{{/if}}
-{{if $response.updatedSince}}<updatedSince>{{$response.updatedSince}}</updatedSince>{{/if}}
-<startIndex>{{$response.startIndex}}</startIndex>
-<itemsPerPage>{{$response.itemsPerPage}}</itemsPerPage>
-<totalResults>{{$response.totalResults}}</totalResults>
-
-
-{{if $response.totalResults}}
-{{foreach $response.entry as $entry}}
-{{include file="poco_entry_xml.tpl"}}
-{{/foreach}}
-{{else}}
-<entry></entry>
-{{/if}}
-</response>
diff --git a/view/theme/redbasic/tpl/poke_content.tpl b/view/theme/redbasic/tpl/poke_content.tpl
deleted file mode 100755
index f368cb024..000000000
--- a/view/theme/redbasic/tpl/poke_content.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-
-<div id="poke-content" class="generic-content-wrapper">
-    <div class="section-title-wrapper">
-    <h2>{{$title}}</h2>
-    </div>
-    <div class="section-content-wrapper">
-
-	<div id="poke-desc">{{$desc}}</div>
-
-<br />
-<br />
-
-
-<form action="poke" method="get">
-
-
-<div class="form-group field input">
-	<label id="poke-recip-label" for="poke-recip">{{$clabel}}</label>
-	<input class="form-control" id="poke-recip" type="text" value="{{$name}}" name="pokename" autocomplete="off" />
-</div>
-
-	<input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
-	<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
-
-
-{{if $poke_basic}}
-<input type="hidden" name="verb" value="poke" />
-{{else}}
-<div class="form-group field custom">
-	<label for="poke-verb-select" id="poke-verb-lbl">{{$choice}}</label>
-	<select class="form-control" name="verb" id="poke-verb-select" >
-	{{foreach $verbs as $v}}
-	<option value="{{$v.0}}">{{$v.1}}</option>
-	{{/foreach}}
-	</select>
-</div>
-{{/if}}
-
-{{if ! $parent}}
-{{include file="field_checkbox.tpl" field=$private}}
-{{/if}}
-
-<input type="submit" name="submit" value="{{$submit}}" />
-</form>
-
-
-    </div>
-</div>
diff --git a/view/theme/redbasic/tpl/posted_date_widget.tpl b/view/theme/redbasic/tpl/posted_date_widget.tpl
deleted file mode 100755
index fb43c744b..000000000
--- a/view/theme/redbasic/tpl/posted_date_widget.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<script>
-
-function toggle_posted_date_button() {
-	if($('#posted-date-dropdown').is(':visible')) {
-		$('#posted-date-icon').removeClass('fa-caret-up');
-		$('#posted-date-icon').addClass('fa-cog');
-		$('#posted-date-dropdown').hide();
-	}
-	else {
-		$('#posted-date-icon').addClass('fa-caret-up');
-		$('#posted-date-icon').removeClass('fa-cog');
-		$('#posted-date-dropdown').show();
-	}
-}
-</script>
-		
-
-<div id="datebrowse-sidebar" class="widget">
-	<h3>{{$title}}</h3>
-	<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
-	<ul id="posted-date-selector" class="nav nav-pills flex-column">
-		{{foreach $dates as $y => $arr}}
-		{{if $y == $cutoff_year}}
-		</ul>
-		<div id="posted-date-dropdown" style="display: none;">
-		<ul id="posted-date-selector-drop" class="nav nav-pills flex-column">
-		{{/if}} 
-		<li class="nav-item" id="posted-date-selector-year-{{$y}}">
-			<a class="nav-link" href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a>
-		</li>
-		<div id="posted-date-selector-{{$y}}" style="display: none;">
-			<ul class="posted-date-selector-months nav nav-pills flex-column">
-				{{foreach $arr as $d}}
-				<li class="nav-item">
-					<a class="nav-link" href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}{{if $showend}}&dbegin={{$d.2}}{{/if}}'); return false;">{{$d.0}}</a>
-				</li>
-				{{/foreach}}
-			</ul>
-		</div>
-		{{/foreach}}
-		{{if $cutoff}}
-		</div>
-		<button class="btn btn-outline-secondary btn-sm" onclick="toggle_posted_date_button(); return false;"><i id="posted-date-icon" class="fa fa-cog"></i></button>
-		{{/if}}
-	</ul>
-</div>
diff --git a/view/theme/redbasic/tpl/prep.tpl b/view/theme/redbasic/tpl/prep.tpl
deleted file mode 100644
index debba13a8..000000000
--- a/view/theme/redbasic/tpl/prep.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$header}}</h1>
-
-{{if $site}}
-<h3>{{$website}} {{$site}}</h3>
-{{/if}}
-
-
-{{if $raters}}
-{{foreach $raters as $r}}
-
-<div class="directory-item lframe" id="directory-item-{{$r.xchan_hash}}" >
-
-<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$r.xchan_hash}}" >
-<div class="contact-photo" id="directory-photo-{{$r.xchan_hash}}" >
-<a href="{{$r.xchan_url}}" class="directory-profile-link" id="directory-profile-link-{{$r.xchan_hash}}" ><img class="directory-photo-img" src="{{$r.xchan_photo_m}}" alt="{{$r.xchan_addr}}" title="{{$r.xchan_addr}}" /></a>
-</div>
-</div>
-<div class="prep-details contact-info">
-<a href="{{$r.xchan_url}}" class="directory-profile-link" id="directory-profile-link-{{$r.xchan_hash}}" ><div class="contact-name">{{$r.xchan_name}}</div></a>
-<div class="rating-value">{{$rating_lbl}} <span class="prep-rating-value">{{$r.xlink_rating}}</span></div>
-{{if $r.xlink_rating_text}}
-<div class="rating-text">{{$rating_text_label}} {{$r.xlink_rating_text}}
-</div>
-{{/if}}
-</div>
-<div class="clear"></div>
-</div>
-{{/foreach}}
-{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/profdef_edit.tpl b/view/theme/redbasic/tpl/profdef_edit.tpl
deleted file mode 100644
index bfe85314d..000000000
--- a/view/theme/redbasic/tpl/profdef_edit.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h3>{{$header}}</h3>
-
-<form action="admin/profs" method="post" >
-
-{{if $id}}
-<input type="hidden" name="id" value="{{$id}}" />
-{{/if}}
-
-{{include file="field_input.tpl" field=$field_name}}
-{{include file="field_input.tpl" field=$field_type}}
-{{include file="field_input.tpl" field=$field_desc}}
-{{include file="field_input.tpl" field=$field_help}}
-
-<input name="submit" type="submit" value="{{$submit}}" />
-
-</form>
diff --git a/view/theme/redbasic/tpl/profed_head.tpl b/view/theme/redbasic/tpl/profed_head.tpl
deleted file mode 100755
index ce774052a..000000000
--- a/view/theme/redbasic/tpl/profed_head.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script language="javascript" type="text/javascript"></script>
-
diff --git a/view/theme/redbasic/tpl/profile_advanced.tpl b/view/theme/redbasic/tpl/profile_advanced.tpl
deleted file mode 100755
index c56062459..000000000
--- a/view/theme/redbasic/tpl/profile_advanced.tpl
+++ /dev/null
@@ -1,341 +0,0 @@
-<div id="profile-content-wrapper" class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="float-right">
-			{{if $profile.like_count}}
-			<div class="btn-group">
-				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button>
-				{{if $profile.likers}}
-				<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
-				{{/if}}
-			</div>
-			{{/if}}
-			{{if $profile.canlike}}
-			<div class="btn-group">
-				<button type="button" class="btn btn-success btn-sm" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
-					<i class="fa fa-thumbs-o-up" title="{{$profile.likethis}}"></i>
-				</button>
-			</div>
-			{{/if}}
-			{{if $editmenu.multi}}
-			<div class="btn-group">
-				<a class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
-				<div class="dropdown-menu dropdown-menu-right">
-					{{foreach $editmenu.menu.entries as $e}}
-					<a class="dropdown-item" href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'> {{$e.profile_name}}</a>
-					{{/foreach}}
-					<a class="dropdown-item" href="profile_photo" >{{$editmenu.menu.chg_photo}}</a>
-					{{if $editmenu.menu.cr_new}}
-					<a class="dropdown-item" href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a>
-					{{/if}}
-				</div>
-			</div>
-			{{elseif $editmenu}}
-			<div class="btn-group">
-				<a class="btn btn-primary btn-sm" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
-			</div>
-			{{/if}}
-			{{if $exportlink}}
-			<div class="btn-group">
-				<a class="btn btn-outline-secondary btn-sm" href="{{$exportlink}}" ><i class="fa fa-vcard"></i>&nbsp;{{$export}}</a>
-			</div>
-			{{/if}}
-		</div>
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-wrapper">
-
-	{{foreach $fields as $f}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-		{{if $f == 'name'}}
-			<dl id="aprofile-fullname" class="aprofile">
-			 <dt>{{$profile.fullname.0}}</dt>
-			 <dd>{{$profile.fullname.1}}</dd>
-			</dl>
-		{{/if}}
-
-		{{if $f == 'fullname'}}
-			<dl id="aprofile-fullname" class="aprofile">
-			 <dt>{{$profile.fullname.0}}</dt>
-			 <dd>{{$profile.fullname.1}}</dd>
-			</dl>
-		{{/if}}
-
-		{{if $f == 'gender'}}
-		{{if $profile.gender}}
-		<dl id="aprofile-gender" class="aprofile">
-		 <dt>{{$profile.gender.0}}</dt>
-		 <dd>{{$profile.gender.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'birthday'}}
-		{{if $profile.birthday}}
-		<dl id="aprofile-birthday" class="aprofile">
-		 <dt>{{$profile.birthday.0}}</dt>
-		 <dd>{{$profile.birthday.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'age'}}
-		{{if $profile.age}}
-		<dl id="aprofile-age" class="aprofile">
-		 <dt>{{$profile.age.0}}</dt>
-		 <dd>{{$profile.age.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'marital'}}
-		{{if $profile.marital}}
-		<dl id="aprofile-marital" class="aprofile">
-		 <dt><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$profile.marital.0}}</dt>
-		 <dd>{{$profile.marital.1}}{{if in_array('partner',$fields)}}{{if $profile.marital.partner}} ({{$profile.marital.partner}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'sexual'}}
-		{{if $profile.sexual}}
-		<dl id="aprofile-sexual" class="aprofile">
-		 <dt>{{$profile.sexual.0}}</dt>
-		 <dd>{{$profile.sexual.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'keywords'}}
-		{{if $profile.keywords}}
-		<dl id="aprofile-tags" class="aprofile">
-		 <dt>{{$profile.keywords.0}}</dt>
-		 <dd>{{$profile.keywords.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'homepage'}}
-		{{if $profile.homepage}}
-		<dl id="aprofile-homepage" class="aprofile">
-		 <dt>{{$profile.homepage.0}}</dt>
-		 <dd>{{$profile.homepage.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'hometown'}}
-		{{if $profile.hometown}}
-		<dl id="aprofile-hometown" class="aprofile">
-		 <dt>{{$profile.hometown.0}}</dt>
-		 <dd>{{$profile.hometown.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'politic'}}
-		{{if $profile.politic}}
-		<dl id="aprofile-politic" class="aprofile">
-		 <dt>{{$profile.politic.0}}</dt>
-		 <dd>{{$profile.politic.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'religion'}}
-		{{if $profile.religion}}
-		<dl id="aprofile-religion" class="aprofile">
-		 <dt>{{$profile.religion.0}}</dt>
-		 <dd>{{$profile.religion.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'about'}}
-		{{if $profile.about}}
-		<dl id="aprofile-about" class="aprofile">
-		 <dt>{{$profile.about.0}}</dt>
-		 <dd>{{$profile.about.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'interest'}}
-		{{if $profile.interest}}
-		<dl id="aprofile-interest" class="aprofile">
-		 <dt>{{$profile.interest.0}}</dt>
-		 <dd>{{$profile.interest.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'likes'}}
-		{{if $profile.likes}}
-		<dl id="aprofile-likes" class="aprofile">
-		 <dt>{{$profile.likes.0}}</dt>
-		 <dd>{{$profile.likes.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'dislikes'}}
-		{{if $profile.dislikes}}
-		<dl id="aprofile-dislikes" class="aprofile">
-		 <dt>{{$profile.dislikes.0}}</dt>
-		 <dd>{{$profile.dislikes.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'contact'}}
-		{{if $profile.contact}}
-		<dl id="aprofile-contact" class="aprofile">
-		 <dt>{{$profile.contact.0}}</dt>
-		 <dd>{{$profile.contact.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'channels'}}
-		{{if $profile.channels}}
-		<dl id="aprofile-channels" class="aprofile">
-		 <dt>{{$profile.channels.0}}</dt>
-		 <dd>{{$profile.channels.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'music'}}
-		{{if $profile.music}}
-		<dl id="aprofile-music" class="aprofile">
-		 <dt>{{$profile.music.0}}</dt>
-		 <dd>{{$profile.music.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'book'}}
-		{{if $profile.book}}
-		<dl id="aprofile-book" class="aprofile">
-		 <dt>{{$profile.book.0}}</dt>
-		 <dd>{{$profile.book.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'tv'}}
-		{{if $profile.tv}}
-		<dl id="aprofile-tv" class="aprofile">
-		 <dt>{{$profile.tv.0}}</dt>
-		 <dd>{{$profile.tv.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'film'}}
-		{{if $profile.film}}
-		<dl id="aprofile-film" class="aprofile">
-		 <dt>{{$profile.film.0}}</dt>
-		 <dd>{{$profile.film.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'romance'}}
-		{{if $profile.romance}}
-		<dl id="aprofile-romance" class="aprofile">
-		 <dt>{{$profile.romance.0}}</dt>
-		 <dd>{{$profile.romance.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-
-		{{if $f == 'employment'}}
-		{{if $profile.employment}}
-		<dl id="aprofile-work" class="aprofile">
-		 <dt>{{$profile.employment.0}}</dt>
-		 <dd>{{$profile.employment.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{if $f == 'education'}}
-		{{if $profile.education}}
-		<dl id="aprofile-education" class="aprofile">
-		 <dt>{{$profile.education.0}}</dt>
-		 <dd>{{$profile.education.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-
-		{{foreach $profile.extra_fields as $fld}}
-		{{if $f == $fld}}
-		{{if $profile.$fld}}
-		<dl id="aprofile-{{$fld}}" class="aprofile">
-		 <dt>{{$profile.$fld.0}}</dt>
-		 <dd>{{$profile.$fld.1}}</dd>
-		</dl>
-		{{/if}}
-		{{/if}}
-		{{/foreach}}
-	{{/foreach}}
-
-
-		{{if $things}}
-		{{foreach $things as $key => $items}}
-		<b>{{$profile.fullname.1}} {{$key}}</b>
-		<ul class="profile-thing-list">
-		{{foreach $items as $item}}
-		<li>{{if $item.img}}<a href="{{$item.url}}" ><img src="{{$item.img}}" class="profile-thing-img" width="100" height="100" alt="{{$item.term}}" /></a>{{/if}}
-		<a href="{{$item.editurl}}" >{{$item.term}}</a>
-		{{if $profile.canlike}}<br />
-		<button type="button" class="btn btn-outline-secondary btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" >
-		<i class="fa fa-thumbs-o-up" title="{{$likethis}}"></i>
-		</button>
-		{{/if}}
-		{{if $item.like_count}}
-		<div class="btn-group">
-		<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button>
-		{{if $item.likes}}
-		<ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}"><img class="dropdown-menu-img-xs" src="{{$liker.xchan_photo_s}}" alt="{{$liker.name}}" /> {{$liker.xchan_name}}</a></li>{{/foreach}}</ul>
-		{{/if}}
-		</div>
-		{{/if}}
-		</li>
-		{{/foreach}}
-		</ul>
-		<div class="clear"></div>
-		{{/foreach}}
-		{{/if}}
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/profile_edit.tpl b/view/theme/redbasic/tpl/profile_edit.tpl
deleted file mode 100755
index 05137479f..000000000
--- a/view/theme/redbasic/tpl/profile_edit.tpl
+++ /dev/null
@@ -1,401 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="dropdown float-right" id="profile-edit-links">
-			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
-			</button>
-			<div class="dropdown-menu">
-				<a class="dropdown-item" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="fa fa-fw fa-user"></i>&nbsp;{{$profpic}}</a>
-				{{if $is_default}}
-				<a class="dropdown-item" href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="fa fa-fw fa-picture-o"></i>&nbsp;{{$coverpic}}</a>
-				{{/if}}
-				{{if ! $is_default}}
-				<a class="dropdown-item" href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-fw fa-pencil"></i>&nbsp;{{$editvis}}</a>
-				{{/if}}
-				<a class="dropdown-item" href="thing" id="profile-edit-thing-link" title="{{$addthing}}"><i class="fa fa-fw fa-plus-circle"></i>&nbsp;{{$addthing}}</a>
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a>
-				{{if $profile_clone_link}}
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a>
-				{{/if}}
-				{{if $exportable}}
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="profiles/export/{{$profile_id}}">{{$lbl_export}}</a>
-				<a class="dropdown-item" href="#" onClick="openClose('profile-upload-form'); return false;">{{$lbl_import}}</a>
-				{{/if}}
-				{{if ! $is_default}}
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$del_prof}}</a>
-				{{/if}}
-			</div>
-		</div>
-		<h2>{{$banner}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-tools-wrapper" id="profile-upload-form">
-		<label id="profile-upload-choose-label" for="profile-upload-choose" >{{$lbl_import}}</label>
-		<input id="profile-upload-choose" type="file" name="userfile">
-	</div>
-
-		<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" >
-			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-			{{if $is_default}}
-			<div class="section-content-info-wrapper">{{$default}}</div>
-			{{/if}}
-
-			<div class="panel-group" id="profile-edit-wrapper" role="tablist" aria-multiselectable="true">
-				<div class="panel">
-					<div class="section-subtitle-wrapper" role="tab" id="personal">
-						<h3>
-							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#personal-collapse" aria-expanded="true" aria-controls="personal-collapse">
-								{{$personal}}
-							</a>
-						</h3>
-					</div>
-					<div id="personal-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="personal">
-						<div class="section-content-tools-wrapper">
-							{{include file="field_input.tpl" field=$profile_name}}
-
-							{{include file="field_input.tpl" field=$name}}
-
-							{{if $fields.pdesc}}
-							{{include file="field_input.tpl" field=$pdesc}}
-							{{/if}}
-
-							{{if $fields.gender}}
-							<div id="profile-edit-gender-wrapper" class="form-group field select" >
-							<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}}</label>
-							{{if $advanced}}
-							{{$gender}}
-							{{else}}
-							{{$gender_min}}
-							{{/if}}
-							</div>
-							<div class="clear"></div>
-							{{/if}}
-
-							{{if $fields.dob}}
-							{{$dob}}
-							{{/if}}
-
-							{{include file="field_checkbox.tpl" field=$hide_friends}}
-
-							<div class="form-group" >
-							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-							</div>
-							<div class="clear"></div>
-						</div>
-					</div>
-				</div>
-
-				{{if $fields.comms }}
-
-				<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
-					<select name="tel_type[]">
-						<option value="CELL">{{$mobile}}</option>
-						<option value="HOME">{{$home}}</option>
-						<option value="WORK">{{$work}}</option>
-						<option value="OTHER">{{$other}}</option>
-					</select>
-					<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
-					<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				</div>
-
-				<div id="template-form-vcard-email" class="form-group form-vcard-email">
-					<select name="email_type[]">
-						<option value="HOME">{{$home}}</option>
-						<option value="WORK">{{$work}}</option>
-						<option value="OTHER">{{$other}}</option>
-					</select>
-					<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
-					<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				</div>
-
-				<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
-					<select name="impp_type[]">
-						<option value="HOME">{{$home}}</option>
-						<option value="WORK">{{$work}}</option>
-						<option value="OTHER">{{$other}}</option>
-					</select>
-					<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
-					<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-				</div>
-
-				<div class="section-content-wrapper-np">
-					<div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
-					<div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field">
-						<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
-						<ul class="dropdown-menu">
-							<li class="add-vcard-tel"><a href="#" data-add="vcard-tel" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$tel_label}}</a></li>
-							<li class="add-vcard-email"><a href="#" data-add="vcard-email" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$email_label}}</a></li>
-							<li class="add-vcard-impp"><a href="#" data-add="vcard-impp" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$impp_label}}</a></li>
-						</ul>
-					</div>
-					<div id="vcard-header-{{$vcard.id}}" class="vcard-header" data-id="{{$vcard.id}}" data-action="open">
-						<i class="vcard-fn-preview fa fa-address-card-o"></i>
-						<span id="vcard-preview-{{$vcard.id}}" class="vcard-preview">
-							{{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}}
-							{{if $vcard.emails.0.address}}<span class="vcard-email-preview hidden-xs"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}}
-							{{if $vcard.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}}
-						</span>
-						<input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}">
-					</div>
-				</div>
-				<div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper">
-
-					<div class="vcard-tel form-group">
-						<div class="form-vcard-tel-wrapper">
-							{{if $vcard.tels}}
-							{{foreach $vcard.tels as $tel}}
-							<div class="form-group form-vcard-tel">
-								<select name="tel_type[]">
-									<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
-									<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
-									<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-									<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-									<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-								</select>
-								<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
-								<i data-remove="vcard-tel" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-							</div>
-							{{/foreach}}
-							{{/if}}
-						</div>
-					</div>
-
-
-					<div class="vcard-email form-group">
-						<div class="form-vcard-email-wrapper">
-							{{if $vcard.emails}}
-							{{foreach $vcard.emails as $email}}
-							<div class="form-group form-vcard-email">
-								<select name="email_type[]">
-									<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
-									<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-									<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-									<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-								</select>
-								<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
-								<i data-remove="vcard-email" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-							</div>
-							{{/foreach}}
-							{{/if}}
-						</div>
-					</div>
-
-					<div class="vcard-impp form-group">
-						<div class="form-vcard-impp-wrapper">
-							{{if $vcard.impps}}
-							{{foreach $vcard.impps as $impp}}
-							<div class="form-group form-vcard-impp">
-								<select name="impp_type[]">
-									<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
-									<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
-									<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
-									<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
-								</select>
-								<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
-								<i data-remove="vcard-impp" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
-							</div>
-							{{/foreach}}
-							{{/if}}
-						</div>
-					</div>
-
-					<div class="settings-submit-wrapper" >
-						<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-					</div>
-				</div>
-				{{/if}}
-
-
-				{{if $fields.address || $fields.locality || $fields.postal_code || $fields.region || $fields.country_name || $fields.hometown}}
-				<div class="panel">
-					<div class="section-subtitle-wrapper" role="tab" id="location">
-						<h3>
-							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#location-collapse" aria-expanded="true" aria-controls="location-collapse">
-								{{$location}}
-							</a>
-						</h3>
-					</div>
-					<div id="location-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="location">
-						<div class="section-content-tools-wrapper">
-							{{if $fields.address}}
-							{{include file="field_input.tpl" field=$address}}
-							{{/if}}
-
-							{{if $fields.locality}}
-							{{include file="field_input.tpl" field=$locality}}
-							{{/if}}
-
-							{{if $fields.postal_code}}
-							{{include file="field_input.tpl" field=$postal_code}}
-							{{/if}}
-
-							{{if $fields.region}}
-							{{include file="field_input.tpl" field=$region}}
-							{{/if}}
-
-							{{if $fields.country_name}}
-							{{include file="field_input.tpl" field=$country_name}}
-							{{/if}}
-
-							{{if $fields.hometown}}
-							{{include file="field_input.tpl" field=$hometown}}
-							{{/if}}
-
-							<div class="form-group" >
-							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-							</div>
-							<div class="clear"></div>
-						</div>
-					</div>
-				</div>
-
-				{{/if}}
-
-				{{if $fields.marital || $fields.sexual}}
-				<div class="panel">
-					<div class="section-subtitle-wrapper" role="tab" id="relation">
-						<h3>
-							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#relation-collapse" aria-expanded="true" aria-controls="relation-collapse">
-								{{$relation}}
-							</a>
-						</h3>
-					</div>
-					<div id="relation-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relation">
-						<div class="section-content-tools-wrapper">
-							{{if $fields.marital }}
-							<div id="profile-edit-marital-wrapper" class="form-group field" >
-							<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$lbl_marital}}</label>
-							{{if $advanced}}
-							{{$marital}}
-							{{else}}
-							{{$marital_min}}
-							{{/if}}
-							</div>
-							<div class="clear"></div>
-
-							{{if $fields.partner}}
-							{{include file="field_input.tpl" field=$with}}
-							{{/if}}
-
-							{{if $fields.howlong}}
-							{{include file="field_input.tpl" field=$howlong}}
-							{{/if}}
-							{{/if}}
-
-							{{if $fields.sexual}}
-							<div id="profile-edit-sexual-wrapper" class="form-group field" >
-							<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}}</label>
-							{{$sexual}}
-							</div>
-							<div class="clear"></div>
-							{{/if}}
-
-							<div class="form-group" >
-							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-							</div>
-							<div class="clear"></div>
-						</div>
-					</div>
-				</div>
-				{{/if}}
-				{{if $fields.keywords || $fields.politic || $fields.religion || $fields.about || $fields.contact || $fields.homepage || $fields.interest || $fields.likes || $fields.dislikes || $fields.channels || $fields.music || $fields.book || $fields.tv || $fields.film || $fields.romance || $fields.employment || $fields.education || $extra_fields}}
-				<div class="panel">
-					<div class="section-subtitle-wrapper" role="tab" id="miscellaneous">
-						<h3>
-							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#miscellaneous-collapse" aria-expanded="true" aria-controls="miscellaneous-collapse">
-								{{$miscellaneous}}
-							</a>
-						</h3>
-					</div>
-					<div id="miscellaneous-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous">
-						<div class="section-content-tools-wrapper">
-							{{if $fields.homepage}}
-							{{include file="field_input.tpl" field=$homepage}}
-							{{/if}}
-
-							{{if $fields.keywords}}
-							{{include file="field_input.tpl" field=$keywords}}
-							{{/if}}
-
-							{{if $fields.politic}}
-							{{include file="field_input.tpl" field=$politic}}
-							{{/if}}
-
-							{{if $fields.religion}}
-							{{include file="field_input.tpl" field=$religion}}
-							{{/if}}
-
-							{{if $fields.about}}
-							{{include file="field_textarea.tpl" field=$about}}
-							{{/if}}
-
-							{{if $fields.contact}}
-							{{include file="field_textarea.tpl" field=$contact}}
-							{{/if}}
-
-							{{if $fields.interest}}
-							{{include file="field_textarea.tpl" field=$interest}}
-							{{/if}}
-
-							{{if $fields.likes}}
-							{{include file="field_textarea.tpl" field=$likes}}
-							{{/if}}
-
-							{{if $fields.dislikes}}
-							{{include file="field_textarea.tpl" field=$dislikes}}
-							{{/if}}
-
-							{{if $fields.channels}}
-							{{include file="field_textarea.tpl" field=$channels}}
-							{{/if}}
-
-							{{if $fields.music}}
-							{{include file="field_textarea.tpl" field=$music}}
-							{{/if}}
-
-							{{if $fields.book}}
-							{{include file="field_textarea.tpl" field=$book}}
-							{{/if}}
-
-							{{if $fields.tv}}
-							{{include file="field_textarea.tpl" field=$tv}}
-							{{/if}}
-
-							{{if $fields.film}}
-							{{include file="field_textarea.tpl" field=$film}}
-							{{/if}}
-
-							{{if $fields.romance}}
-							{{include file="field_textarea.tpl" field=$romance}}
-							{{/if}}
-
-							{{if $fields.employment}}
-							{{include file="field_textarea.tpl" field=$employ}}
-							{{/if}}
-
-							{{if $fields.education}}
-							{{include file="field_textarea.tpl" field=$education}}
-							{{/if}}
-
-							{{if $extra_fields}}
-							{{foreach $extra_fields as $field }}
-							{{include file="field_input.tpl" field=$field}}
-							{{/foreach}}
-							{{/if}}
-							<div class="form-group" >
-							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-							</div>
-							<div class="clear"></div>
-						</div>
-					</div>
-				</div>
-				{{/if}}
-			</div>
-		</form>
-</div>
-
diff --git a/view/theme/redbasic/tpl/profile_entry.tpl b/view/theme/redbasic/tpl/profile_entry.tpl
deleted file mode 100755
index 9ae870738..000000000
--- a/view/theme/redbasic/tpl/profile_entry.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="profile-listing-row">
-	<div class="profile-listing-cell" >
-		<a href="profiles/{{$id}}"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
-	</div>
-	<div class="profile-listing-cell" id="profile-listing-name-{{$id}}">
-		<a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a>
-	</div>
-	<div class="profile-listing-cell">
-		{{$visible}}
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/profile_listing_header.tpl b/view/theme/redbasic/tpl/profile_listing_header.tpl
deleted file mode 100755
index 42abf2735..000000000
--- a/view/theme/redbasic/tpl/profile_listing_header.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<a class="btn btn-success btn-sm pull-right" href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" ><i class="fa fa-plus-circle"></i>&nbsp;{{$cr_new}}</a>
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper">
-		<div class="profile-listing-table">
-			{{$profiles}}
-		</div>
-	</div>
-
-</div>
diff --git a/view/theme/redbasic/tpl/profile_photo.tpl b/view/theme/redbasic/tpl/profile_photo.tpl
deleted file mode 100755
index ca107bfcc..000000000
--- a/view/theme/redbasic/tpl/profile_photo.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-<div id="profile-photo-content" class="generic-content-wrapper">
-    <div class="section-title-wrapper">
-    <h2>{{$title}}</h2>
-    </div>
-    <div class="section-content-wrapper">
-
-		<form enctype="multipart/form-data" action="profile_photo" method="post">
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-		<div id="profile-photo-upload-wrapper">
-
-			{{if $importfile}}
-			<input type="hidden" name="importfile" value="{{$importfile}}">
-			{{else}}
-			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
-			<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
-			{{/if}}
-			<div class="clear"></div>
-
-
-			{{if $single}}
-			<input type="hidden" name="profile" value="{{$profile0.id}}" />
-			{{else}}
-
-			<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label>
-			<select name="profile" id="profile-photo-profiles" class="form-control" >
-			{{foreach $profiles as $p}}
-				<option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option>
-			{{/foreach}}
-			</select>
-			<div class="clear"></div>
-			<br />
-			<br />
-			{{/if}}
-
-			<div id="profile-photo-submit-wrapper">
-				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
-			</div>
-		</div>
-
-		</form>
-		<br />
-		<br />
-		<div id="profile-photo-link-select-wrapper">
-		{{$select}}
-		</div>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/profile_tabs.tpl b/view/theme/redbasic/tpl/profile_tabs.tpl
deleted file mode 100644
index 49b74bb8f..000000000
--- a/view/theme/redbasic/tpl/profile_tabs.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}:</div>
-{{foreach $tabs as $tab}}
-<a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a>
-{{/foreach}}
-<div class="dropdown-divider"></div>
diff --git a/view/theme/redbasic/tpl/profile_vcard.tpl b/view/theme/redbasic/tpl/profile_vcard.tpl
deleted file mode 100755
index c17a7878c..000000000
--- a/view/theme/redbasic/tpl/profile_vcard.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="vcard h-card">
-	{{if ! $zcard}}
-	<div id="profile-photo-wrapper"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}"></div>
-	{{/if}}
-	{{if $connect}}
-	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
-	{{/if}}
-	{{if ! $zcard}}
-	{{if $editmenu.multi}}
-	<div class="dropdown">
-	<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
-	<ul class="dropdown-menu" role="menu">
-		{{foreach $editmenu.menu.entries as $e}}
-		<li>
-			<a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}</a>
-		</li>
-		{{/foreach}}
-		<li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li>
-		{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
-	</ul>
-	</div>
-	{{elseif $editmenu}}
-	<a class="profile-edit-side-link" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
-	{{/if}}
-	{{/if}}
-
-	{{if ! $zcard}}
-	<div class="fn p-name">{{$profile.fullname}}{{if $profile.online}} <i class="fa fa-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
-	{{if $reddress}}<div class="reddress">{{$profile.reddress}}</div>{{/if}}		
-	{{/if}}
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr h-adr">
-			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region p-region">{{$profile.region}}</span>
-				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url">{{$profile.homepage}}</dd></dl>{{/if}}
-
-
-</div>
-<div id="clear"></div>
-
-{{$rating}}
-
-{{$chanmenu}}
-
-{{$contact_block}}
-
-
diff --git a/view/theme/redbasic/tpl/profile_vcard_short.tpl b/view/theme/redbasic/tpl/profile_vcard_short.tpl
deleted file mode 100755
index 5d87d52c6..000000000
--- a/view/theme/redbasic/tpl/profile_vcard_short.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{$contact_block}}
-
-	{{if $connect}}
-	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
-	{{/if}}
-
-
-{{$rating}}
-
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}
-
-<div id="clear"></div>
-
-{{$chanmenu}}
-
-
-
diff --git a/view/theme/redbasic/tpl/prv_message.tpl b/view/theme/redbasic/tpl/prv_message.tpl
deleted file mode 100755
index 925447ff2..000000000
--- a/view/theme/redbasic/tpl/prv_message.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-{{if $new}}
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper">
-{{/if}}
-		<div id="prvmail-wrapper" >
-			<form id="prvmail-form" action="mail" method="post" >
-				<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
-				<input type="hidden" name="media_str" id="jot-media" value="" />
-				<input type="hidden" name="preview" id="mail-preview" value="0" />
-				{{if $new}}
-				<div class="form-group">
-					<label for="recip">{{$to}}</label>
-					<input class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" />
-					<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
-				</div>
-				<div class="form-group">
-					<label for="prvmail-subject">{{$subject}}</label>
-					<input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" />
-				</div>
-				{{/if}}
-				{{if $reply}}
-				<input type="hidden" name="replyto" value="{{$parent}}" />
-				<input type="hidden" name="messageto" value="{{$recphash}}" />
-				<input type="hidden" name="subject" value="{{$subjtxt}}" />
-				{{/if}}
-				<div class="form-group">
-					<label for="prvmail-text">{{$yourmessage}}</label>
-					<textarea class="form-control" id="prvmail-text" name="body"{{if $new}} style="height: 10em;"{{/if}}>{{$text}}</textarea>
-				</div>
-				<div id="prvmail-submit-wrapper" class="form-group">
-					<div id="prvmail-submit" class="float-right btn-group">
-						<button class="btn btn-outline-secondary btn-sm" id="prvmail-preview" title="{{$preview}}" onclick="preview_mail(); return false;"><i class="fa fa-eye"></i></button>
-						<button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
-					</div>
-					<div id="prvmail-tools" class="btn-toolbar float-left">
-						<div class="btn-group mr-2">
-							<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;">
-								<i class="fa fa-bold jot-icons"></i>
-							</button>
-							<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'prvmail-text'); return false;">
-								<i class="fa fa-italic jot-icons"></i>
-							</button>
-							<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'prvmail-text'); return false;">
-								<i class="fa fa-underline jot-icons"></i>
-							</button>
-							<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'prvmail-text'); return false;">
-								<i class="fa fa-quote-left jot-icons"></i>
-							</button>
-							<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'prvmail-text'); return false;">
-								<i class="fa fa-terminal jot-icons"></i>
-							</button>
-						</div>
-						<div class="btn-group d-none d-lg-flex mr-2">
-							<button id="prvmail-attach-wrapper" class="btn btn-outline-secondary btn-sm" >
-								<i id="prvmail-attach" class="fa fa-paperclip jot-icons" title="{{$attach}}"></i>
-							</button>
-							<button id="prvmail-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailJotGetLink(); return false;" >
-								<i id="prvmail-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i>
-							</button>
-						</div>
-						{{if $feature_expire || $feature_encrypt}}
-						<div class="btn-group d-none d-lg-flex mr-2">
-							{{if $feature_expire}}
-							<button id="prvmail-expire-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailGetExpiry();return false;" >
-								<i id="prvmail-expires" class="fa fa-eraser jot-icons" title="{{$expires}}" ></i>
-							</button>
-							{{/if}}
-							{{if $feature_encrypt}}
-							<button id="prvmail-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;">
-								<i id="prvmail-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i>
-							</button>
-							{{/if}}
-						</div>
-						{{/if}}
-						<div class="btn-group d-lg-none">
-							<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-								<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right" role="menu">
-								<a class="dropdown-item" href="#" id="prvmail-attach-sub"><i class="fa fa-paperclip"></i>&nbsp;{{$attach}}</a>
-								<a class="dropdown-item" href="#" onclick="prvmailJotGetLink(); return false;" ><i class="fa fa-link"></i>&nbsp;{{$insert}}</a>
-								{{if $feature_expire || $feature_encrypt}}
-								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="fa fa-eraser"></i>&nbsp;{{$expires}}</a>
-								<a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
-								{{/if}}
-							</div>
-						</div>
-					</div>
-					<div id="prvmail-rotator-wrapper" class="float-left">
-						<div id="prvmail-rotator"></div>
-					</div>
-					<div class="clear"></div>
-				</div>
-				<div id="mail-preview-content" style="display: none;"></div>
-			</form>
-		</div>
-{{if $new}}
-	</div>
-</div>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/pwdreset.tpl b/view/theme/redbasic/tpl/pwdreset.tpl
deleted file mode 100755
index dc17ed57a..000000000
--- a/view/theme/redbasic/tpl/pwdreset.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h3>{{$lbl1}}</h3>
-
-<p>
-{{$lbl2}}
-</p>
-<p>
-{{$lbl3}}
-</p>
-<p>{{$newpass}}</p>
-<p>
-{{$lbl4}} {{$lbl5}}
-</p>
-<p>
-{{$lbl6}}
-</p>
-</div>
diff --git a/view/theme/redbasic/tpl/rating_form.tpl b/view/theme/redbasic/tpl/rating_form.tpl
deleted file mode 100644
index 4bd826484..000000000
--- a/view/theme/redbasic/tpl/rating_form.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h3>{{$header}}</h3>
-
-<div class="rating-target-name">{{if $site}}{{$website}} {{$site}}{{else}}{{$tgt_name}}{{/if}}</div>
-
-<h3>{{$lbl_rating}}</h3>
-
-<form action="rate" method="post">
-
-{{$rating}}
-
-<input type="hidden" name="execute" value="1" />
-<input type="hidden" name="target" value="{{$target}}" />
-
-<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
-<br />
-<h3 class="abook-rating-text-desc">{{$lbl_rating_txt}}</h3>
-<textarea name="rating_text" id="rating-text" >{{$rating_txt}}</textarea>
-
-<div class="clear"></div>
-
-<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
-
-</form>
-</div>
diff --git a/view/theme/redbasic/tpl/rating_slider.tpl b/view/theme/redbasic/tpl/rating_slider.tpl
deleted file mode 100644
index 4c36504e6..000000000
--- a/view/theme/redbasic/tpl/rating_slider.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div id="rating-slider" class="slider form-group"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div>
-<script>
-$(document).ready(function() {
-	// The slider does not render correct if width is given in % and
-	// the slider container is hidden (display: none) during rendering.
-	// So let's unhide it to render and hide again afterwards.
-	if(!$("#rating-tool-collapse").hasClass("in")) {
-		$("#rating-tool-collapse").addClass("in");
-		makeRatingSlider();
-		$("#rating-tool-collapse").removeClass("in");
-	}
-	else {
-		makeRatingSlider();
-	}
-});
-function makeRatingSlider() {
-	$("#rating-range").jRange({ from: -10, to: 10, step: 1, width:'98%', showLabels: false, showScale: true, scale : [ '-10','-8','-6','-4','-2','0','2','4','6','8','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); }  });
-}
-</script>
diff --git a/view/theme/redbasic/tpl/rbmark.tpl b/view/theme/redbasic/tpl/rbmark.tpl
deleted file mode 100644
index bead1de2f..000000000
--- a/view/theme/redbasic/tpl/rbmark.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h3>{{$header}}</h3>
-
-
-<form action="rbmark" method="post" >
-
-<input type="hidden" name="private" value="{{$private}}" />
-<input type="hidden" name="ischat" value="{{$ischat}}" />
-
-{{include file="field_input.tpl" field=$url}}
-{{include file="field_input.tpl" field=$title}}
-{{include file="field_select.tpl" field=$menus}}
-{{include file="field_input.tpl" field=$menu_name}}
-
-<input type="submit" name="submit" value="{{$submit}}" />
-
-</form>
diff --git a/view/theme/redbasic/tpl/register.tpl b/view/theme/redbasic/tpl/register.tpl
deleted file mode 100755
index c84934626..000000000
--- a/view/theme/redbasic/tpl/register.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<div class="section-content-wrapper">
-		<form action="register" method="post" id="register-form">
-			{{if $reg_is}}
-			<div class="section-content-warning-wrapper">
-				<div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div>
-				<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div>
-			</div>
-			{{/if}}
-
-			{{if $registertext}}
-			<div id="register-text" class="descriptive-paragraph">{{$registertext}}</div>
-			{{/if}}
-
-			{{if $invitations}}
-			<div class="section-content-info-wrapper">
-				<div id="register-invite-desc" class="descriptive-paragraph">{{$invite_desc}}</div>
-			</div>
-			{{include file="field_input.tpl" field=$invite_code}}
-			{{/if}}
-
-			{{include file="field_input.tpl" field=$email}}
-
-			{{include file="field_password.tpl" field=$pass1}}
-
-			{{include file="field_password.tpl" field=$pass2}}
-
-			{{if $auto_create}}
-				{{if $default_role}}
-				<input type="hidden" name="permissions_role" value="{{$default_role}}" />
-				{{else}}
-				<div class="section-content-info-wrapper">
-					{{$help_role}}
-				</div>
-				{{include file="field_select_grouped.tpl" field=$role}}
-				{{/if}}
-
-				{{include file="field_input.tpl" field=$name}}
-				<div id="name-spinner"></div>
-
-				{{include file="field_input.tpl" field=$nickname}}
-				<div id="nick-spinner"></div>
-			{{/if}}
-
-			{{if $enable_tos}}
-			{{include file="field_checkbox.tpl" field=$tos}}
-			{{else}}
-			<input type="hidden" name="tos" value="1" />
-			{{/if}}
-
-			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
-			<div id="register-submit-end" class="register-field-end"></div>
-		</form>
-			<br />
-			<div class="descriptive-text">{{$verify_note}}</div>
-
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/remote_friends_common.tpl b/view/theme/redbasic/tpl/remote_friends_common.tpl
deleted file mode 100755
index d6d2fd211..000000000
--- a/view/theme/redbasic/tpl/remote_friends_common.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="remote-friends-in-common" class="bigwidget">
-	<div id="rfic-desc">{{$desc}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{if $linkmore}}<a href="{{$base}}/common/{{$uid}}">{{$more}}</a>{{/if}}</div>
-	{{if $items}}
-	{{foreach $items as $item}}
-	<div class="profile-match-wrapper">
-		<div class="profile-match-photo">
-			<a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}">
-				<img src="{{$item.xchan_photo_m}}" width="80" height="80" alt="{{$item.xchan_name}}" title="{{$item.xchan_name}}" />
-			</a>
-		</div>
-		<div class="profile-match-break"></div>
-		<div class="profile-match-name">
-			<a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}" title="{{$item.xchan_name}}">{{$item.xchan_name}}</a>
-		</div>
-		<div class="profile-match-end"></div>
-	</div>
-	{{/foreach}}
-	{{/if}}
-	<div id="rfic-end" class="clear"></div>
-</div>
-
diff --git a/view/theme/redbasic/tpl/remote_login.tpl b/view/theme/redbasic/tpl/remote_login.tpl
deleted file mode 100644
index e6d387265..000000000
--- a/view/theme/redbasic/tpl/remote_login.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<a href="rmagic" class="btn btn-block btn-success rmagic-button">{{$title}}</a>
diff --git a/view/theme/redbasic/tpl/removeaccount.tpl b/view/theme/redbasic/tpl/removeaccount.tpl
deleted file mode 100644
index ce6c8ac22..000000000
--- a/view/theme/redbasic/tpl/removeaccount.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<div class="section-content-danger-wrapper" id="remove-account-desc">
-		<strong>{{$desc.0}}</strong>{{$desc.1}}<strong>{{$desc.2}}</strong>
-	</div>
-	<div class="section-content-tools-wrapper">
-		<form action="{{$basedir}}/removeaccount" autocomplete="off" method="post" >
-			<input type="hidden" name="verify" value="{{$hash}}" />
-			<div class="form-group" id="remove-account-pass-wrapper">
-				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
-				<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password"  value=" " />
-			</div>
-			{{include file="field_checkbox.tpl" field=$global}}
-			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
-		</form>
-	</div>
-</div>
-
diff --git a/view/theme/redbasic/tpl/removeme.tpl b/view/theme/redbasic/tpl/removeme.tpl
deleted file mode 100755
index 40b9546d2..000000000
--- a/view/theme/redbasic/tpl/removeme.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<div class="section-content-danger-wrapper" id="remove-account-desc">
-		<strong>{{$desc.0}}</strong>{{$desc.1}}<strong>{{$desc.2}}</strong>
-	</div>
-	<div class="section-content-tools-wrapper">
-		<form action="{{$basedir}}/removeme" autocomplete="off" method="post" >
-			<input type="hidden" name="verify" value="{{$hash}}" />
-			<div class="form-group" id="remove-account-pass-wrapper">
-				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
-				<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " />
-			</div>
-			{{include file="field_checkbox.tpl" field=$global}}
-			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
-		</form>
-	</div>
-</div>
-
diff --git a/view/theme/redbasic/tpl/rmagic.tpl b/view/theme/redbasic/tpl/rmagic.tpl
deleted file mode 100755
index 9d84e4a36..000000000
--- a/view/theme/redbasic/tpl/rmagic.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="generic-content-wrapper-styled">
-	<h3>{{$title}}</h3>
-	<form action="rmagic" method="post" >
-		<div class="form-group">
-			{{include file="field_input.tpl" field=$address}}
-			<input class="btn btn-primary" type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" />
-		</div>
-	</form>
-</div>
diff --git a/view/theme/redbasic/tpl/safesearch.tpl b/view/theme/redbasic/tpl/safesearch.tpl
deleted file mode 100644
index 58ce22741..000000000
--- a/view/theme/redbasic/tpl/safesearch.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div id="directory_safemode" class="widget">
-<h3>{{$safemode}}</h3>
-<ul class="nav nav-pills nav-stacked">
-	<li><a href="toggle_safesearch">{{$toggle}}</a></li>
-</ul>
-</div>
diff --git a/view/theme/redbasic/tpl/saved_searches.tpl b/view/theme/redbasic/tpl/saved_searches.tpl
deleted file mode 100644
index ff2d044ef..000000000
--- a/view/theme/redbasic/tpl/saved_searches.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="widget saved-search-widget clearfix">
-	<h3 id="search">{{$title}}</h3>
-	{{$searchbox}}
-	<ul id="saved-search-list" class="nav nav-pills flex-column">
-		{{foreach $saved as $search}}
-		<li class="nav-item nav-item-hack" id="search-term-{{$search.id}}">
-			<a class="nav-link widget-nav-pills-icons" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropfa-floppy-od-search-term-{{$search.id}}" class="fa fa-trash-o drop-icons" ></i></a>
-			<a id="saved-search-term-{{$search.id}}" class="nav-link{{if $search.selected}} active{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a>
-		</li>
-		{{/foreach}}
-	</ul>
-</div>
diff --git a/view/theme/redbasic/tpl/search_item.tpl b/view/theme/redbasic/tpl/search_item.tpl
deleted file mode 100755
index 66618a216..000000000
--- a/view/theme/redbasic/tpl/search_item.tpl
+++ /dev/null
@@ -1,114 +0,0 @@
-<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 clearfix generic-content-wrapper{{/if}}">
-	<a name="{{$item.id}}" ></a>
-	<div class="clearfix wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
-		<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}">
-			{{if $item.photo}}
-			<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
-				{{$item.photo}}
-			</div>
-			{{/if}}
-			{{if $item.event}}
-			<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
-				{{$item.event}}
-			</div>
-			{{/if}}
-			{{if $item.title && !$item.event}}
-			<div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}">
-				{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}
-			</div>
-			{{if ! $item.is_new}}
-			<hr class="m-0">
-			{{/if}}
-			{{/if}}
-			<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
-				<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
-					<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
-						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
-					</div>
-				</div>
-				{{if $item.lock}}
-				<div class="wall-item-lock dropdown">
-					<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
-				</div>
-				{{/if}}
-				<div class="wall-item-author">
-					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
-				</div>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-					{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
-				</div>
-			</div>
-			{{if $item.body}}
-			<div class="p-2 clrearfix {{if $item.is_photo}} wall-photo-item{{else}} wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}">
-				<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
-					{{$item.body}}
-				</div>
-			</div>
-			{{/if}}
-			{{if $item.has_tags}}
-			<div class="p-2 wall-item-tools clearfix">
-				<div class="body-tags">
-					<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
-				</div>
-			{{**
-				{{if $item.mentions}}
-				<div class="body-tags" id="item-mentions">
-					<span class="tag">{{$item.mentions}}</span>
-				</div>
-				{{/if}}
-				{{if $item.tags}}
-				<div class="body-tags" id="item-tags">
-					<span class="tag">{{$item.tags}}</span>
-				</div>
-				{{/if}}
-				{{if $item.categories}}
-				<div class="body-tags" id="item-categories">
-					<span class="tag">{{$item.categories}}</span>
-				</div>
-				{{/if}}
-				{{if $item.folders}}
-				<div class="body-tags" id="item-folders">
-					<span class="tag">{{$item.folders}}</span>
-				</div>
-				{{/if}}
-			**}}
-			</div>
-			{{/if}}
-			<div class="p-2 clearfix wall-item-tools">
-				<div class="wall-item-tools-right btn-group pull-right">
-					<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
-						<i class="fa fa-cog"></i>
-					</button>
-					<div class="dropdown-menu dropdown-menu-right">
-						{{if $item.thread_action_menu}}
-						{{foreach $item.thread_action_menu as $mitem}}
-						<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-{{$mitem.icon}}"></i> {{$mitem.title}}</a></li>
-						{{/foreach}}
-						{{/if}}
-						{{if $item.drop.dropping}}
-						<a class="dropdown-item" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li>
-						{{/if}}
-						{{if $item.thread_author_menu}}
-						<div class="dropdown-divider"></div>
-						{{foreach $item.thread_author_menu as $mitem}}
-						<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a></li>
-						{{/foreach}}
-						{{/if}}
-					</div>
-				</div>
-				{{if $item.attachments}}
-				<div class="wall-item-tools-left btn-group">
-					<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
-					<div class="dropdown-menu">{{$item.attachments}}</div>
-				</div>
-				{{/if}}
-			</div>
-		</div>
-		{{if $item.conv}}
-		<div class="p-2 wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-		</div>
-		{{/if}}
-	</div>
-</div>
-
diff --git a/view/theme/redbasic/tpl/searchbox.tpl b/view/theme/redbasic/tpl/searchbox.tpl
deleted file mode 100644
index 8f7ac5162..000000000
--- a/view/theme/redbasic/tpl/searchbox.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<form action="{{$action_url}}" method="get" >
-	<input type="hidden" name="f" value="" />
-	<div id="{{$id}}" class="input-group">
-		<input class="form-control form-control-sm" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
-		<div class="input-group-btn">
-			<button type="submit" name="submit" class="btn btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button>
-			{{if $savedsearch}}
-			<button type="submit" name="searchsave" class="btn btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button>
-			{{/if}}
-		</div>
-	</div>
-</form>
diff --git a/view/theme/redbasic/tpl/section_title.tpl b/view/theme/redbasic/tpl/section_title.tpl
deleted file mode 100644
index 338e57042..000000000
--- a/view/theme/redbasic/tpl/section_title.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="section-title-wrapper">
-	<h2>{{$title}}</h2>
-	<div class="clear"></div>
-</div>
-
diff --git a/view/theme/redbasic/tpl/select_timezone.tpl b/view/theme/redbasic/tpl/select_timezone.tpl
deleted file mode 100644
index 2820a54f4..000000000
--- a/view/theme/redbasic/tpl/select_timezone.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{* TODO: Make id configurabel *}}
-<select id='timezone_select' name='timezone'>
-{{foreach $continents as $continent => $cities}}
-<optgroup label="{{$continent}}">
-{{foreach $cities as $city => $value}}
-<option value='{{$value}}' {{if $value == $selected}}selected='selected'{{/if}}>{{$city}}</option>
-{{/foreach}}
-</optgroup>
-{{/foreach}}
-</select>
-
diff --git a/view/theme/redbasic/tpl/sellpage_edit.tpl b/view/theme/redbasic/tpl/sellpage_edit.tpl
deleted file mode 100644
index 0a4726fb2..000000000
--- a/view/theme/redbasic/tpl/sellpage_edit.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<h1>{{$header}}</h1>
-<form id="sellpage-edit" action="connect/{{$address}}" method="post">
-
-{{include file="field_checkbox.tpl" field=$premium}}
-
-<div class="descriptive-text">{{$desc}}</div>
-
-<div class="sellpage-editbody">
-<p id="sellpage-bodydesc" >
-{{$lbl_about}}
-</p>
-
-<textarea rows="10" cols="72" id="sellpage-textinp" name="text" >{{$text}}</textarea>
-
-</div>
-<div id="sellpage-editbody-end"></div>
-
-
-<div class="descriptive-text">{{$lbl2}}</div>
-<div class="sellpage-final">{{$desc2}}</div>
-
-<input type="submit" name="submit" value="{{$submit}}" />
-</form>
diff --git a/view/theme/redbasic/tpl/sellpage_submit.tpl b/view/theme/redbasic/tpl/sellpage_submit.tpl
deleted file mode 100644
index 2bd735ea4..000000000
--- a/view/theme/redbasic/tpl/sellpage_submit.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<form id="sellpage-submit" action="connect/{{$address}}" method="post">
-<input type="submit" name="submit" value="{{$continue}}" />
-</form>
\ No newline at end of file
diff --git a/view/theme/redbasic/tpl/sellpage_view.tpl b/view/theme/redbasic/tpl/sellpage_view.tpl
deleted file mode 100644
index 20a65ffbe..000000000
--- a/view/theme/redbasic/tpl/sellpage_view.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="generic-content-wrapper">
-<h1>{{$header}}</h1>
-
-<div class="descriptive-text">{{$desc}}</div>
-
-<div class="sellpage-body">{{$text}}</div>
-
-<div class="sellpage-final">{{$desc2}}</div>
-
-{{$submit}}
-</div>
diff --git a/view/theme/redbasic/tpl/settings.tpl b/view/theme/redbasic/tpl/settings.tpl
deleted file mode 100755
index dd5fecb43..000000000
--- a/view/theme/redbasic/tpl/settings.tpl
+++ /dev/null
@@ -1,192 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-sm pull-right" href="removeme"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>{{/if}}
-		<h2>{{$ptitle}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{$nickname_block}}
-	<form action="settings" id="settings-form" method="post" autocomplete="off" class="acl-form" data-form_id="settings-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
-		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="basic-settings">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse">
-							{{$h_basic}}
-						</a>
-					</h3>
-				</div>
-				<div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings">
-					<div class="section-content-tools-wrapper">
-						{{include file="field_input.tpl" field=$username}}
-						{{include file="field_select_grouped.tpl" field=$timezone}}
-						{{include file="field_input.tpl" field=$defloc}}
-						{{include file="field_checkbox.tpl" field=$allowloc}}
-						{{include file="field_checkbox.tpl" field=$adult}}
-						{{include file="field_input.tpl" field=$photo_path}}
-						{{include file="field_input.tpl" field=$attach_path}}
-						{{if $basic_addon}}
-						{{$basic_addon}}
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse">
-							{{$h_prv}}
-						</a>
-					</h3>
-				</div>
-				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings">
-					<div class="section-content-tools-wrapper">
-						{{if $server_role != 'basic'}}
-						{{include file="field_select_grouped.tpl" field=$role}}
-						{{/if}}
-						<div id="advanced-perm" style="display:{{if $permissions_set && $server_role != 'basic' }}none{{else}}block{{/if}};">
-
-							{{if $server_role != 'basic'}}
-							<div class="form-group">
-								<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button>
-							</div>
-							<div class="modal" id="apsModal">
-								<div class="modal-dialog">
-									<div class="modal-content">
-										<div class="modal-header">
-											<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-											<h4 class="modal-title">{{$lbl_p2macro}}</h4>
-										</div>
-										<div class="modal-body">
-										{{foreach $permiss_arr as $permit}}
-											{{include file="field_select.tpl" field=$permit}}
-										{{/foreach}}
-										</div>
-										<div class="modal-footer">
-											<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
-										</div>
-									</div><!-- /.modal-content -->
-								</div><!-- /.modal-dialog -->
-							</div><!-- /.modal -->
-							{{/if}}
-							<div id="settings-default-perms" class="form-group" >
-								<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button>
-							</div>
-							{{$group_select}}
-							{{include file="field_checkbox.tpl" field=$hide_presence}}
-							{{$profile_in_dir}}
-						</div>
-						<div class="settings-common-perms">
-							{{$suggestme}}
-							{{include file="field_checkbox.tpl" field=$blocktags}}
-							{{include file="field_input.tpl" field=$expire}}
-						</div>
-						{{if $permcat_enable}}
-						{{include file="field_select.tpl" field=$defpermcat}}
-						{{/if}}
-
-						{{if $sec_addon}}
-						{{$sec_addon}}
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="notification-settings">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse">
-							{{$h_not}}
-						</a>
-					</h3>
-				</div>
-				<div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings">
-					<div class="section-content-tools-wrapper">
-						<div id="settings-notifications">
-							<h3>{{$activity_options}}</h3>
-							<div class="group">
-								{{*not yet implemented *}}
-								{{*include file="field_checkbox.tpl" field=$post_joingroup*}}
-								{{include file="field_checkbox.tpl" field=$post_newfriend}}
-								{{include file="field_checkbox.tpl" field=$post_profilechange}}
-							</div>
-							<h3>{{$lbl_not}}</h3>
-							<div class="group">
-								{{include file="field_intcheckbox.tpl" field=$notify1}}
-								{{include file="field_intcheckbox.tpl" field=$notify2}}
-								{{include file="field_intcheckbox.tpl" field=$notify3}}
-								{{include file="field_intcheckbox.tpl" field=$notify4}}
-								{{*include file="field_intcheckbox.tpl" field=$notify9*}}
-								{{include file="field_intcheckbox.tpl" field=$notify5}}
-								{{include file="field_intcheckbox.tpl" field=$notify6}}
-								{{include file="field_intcheckbox.tpl" field=$notify7}}
-								{{include file="field_intcheckbox.tpl" field=$notify8}}
-							</div>
-							<h3>{{$lbl_vnot}}</h3>
-							<div class="group">
-								{{include file="field_intcheckbox.tpl" field=$vnotify1}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify2}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify3}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify4}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify5}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify6}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify10}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify7}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify8}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify9}}
-								{{include file="field_intcheckbox.tpl" field=$vnotify11}}
-								{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}}
-								{{include file="field_input.tpl" field=$evdays}}
-							</div>
-						</div>
-						{{if $notify_addon}}
-						{{$notify_addon}}
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#miscellaneous-settings-collapse" aria-expanded="true" aria-controls="miscellaneous-settings-collapse">
-							{{$lbl_misc}}
-						</a>
-					</h3>
-				</div>
-				<div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
-					<div class="section-content-tools-wrapper">
-						{{if $menus}}
-						<div class="form-group channel-menu">
-							<label for="channel_menu">{{$menu_desc}}</label>
-							<select name="channel_menu" class="form-control">
-							{{foreach $menus as $menu }}
-								<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option>
-							{{/foreach}}
-							</select>
-						</div>
-						{{/if}}
-						{{include file="field_checkbox.tpl" field=$cal_first_day}}
-
-						{{if $misc_addon}}
-						{{$misc_addon}}
-						{{/if}}
-
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</form>
-	{{$aclselect}}
-</div>
diff --git a/view/theme/redbasic/tpl/settings_account.tpl b/view/theme/redbasic/tpl/settings_account.tpl
deleted file mode 100755
index b7fdfb9a9..000000000
--- a/view/theme/redbasic/tpl/settings_account.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<a title="{{$removeaccount}}" class="btn btn-danger btn-sm pull-right" href="removeaccount"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	<form action="settings/account" id="settings-account-form" method="post" autocomplete="off" >
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		<div class="section-content-tools-wrapper">
-			{{include file="field_input.tpl" field=$email}}
-			{{include file="field_password.tpl" field=$origpass}}
-			{{include file="field_password.tpl" field=$password1}}
-			{{include file="field_password.tpl" field=$password2}}
-
-			{{if $z_server_role == 'pro' && ! $techlock}}
-			{{include file="field_select.tpl" field=$techlevel}}
-			{{else}}
-			<input type="hidden" name="techlevel" value="{{$techlevel.2}}" />
-			{{/if}}
-
-			<div class="settings-submit-wrapper" >
-				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-			</div>
-			{{$account_settings}}
-		</div>
-	</form>
-</div>
-
diff --git a/view/theme/redbasic/tpl/settings_addons.tpl b/view/theme/redbasic/tpl/settings_addons.tpl
deleted file mode 100755
index 52f8d9d3f..000000000
--- a/view/theme/redbasic/tpl/settings_addons.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<form action="settings/featured" method="post" autocomplete="off">
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		<div class="panel-group" id="settings" role="tablist">
-			{{$settings_addons}}
-		</div>
-	</form>
-</div>
diff --git a/view/theme/redbasic/tpl/settings_connectors.tpl b/view/theme/redbasic/tpl/settings_connectors.tpl
deleted file mode 100755
index 8bea9ca63..000000000
--- a/view/theme/redbasic/tpl/settings_connectors.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
-
-<form action="settings/connectors" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{$settings_connectors}}
-
-</form>
-</div>
diff --git a/view/theme/redbasic/tpl/settings_display.tpl b/view/theme/redbasic/tpl/settings_display.tpl
deleted file mode 100755
index d8c1ac7aa..000000000
--- a/view/theme/redbasic/tpl/settings_display.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$ptitle}}</h2>
-	</div>
-	<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
-			{{if $theme || $mobile_theme}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content">
-							{{$d_tset}}
-						</a>
-					</h3>
-				</div>
-				<div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings">
-					<div class="section-content-tools-wrapper">
-						{{if $theme}}
-							{{include file="field_themeselect.tpl" field=$theme}}
-						{{/if}}
-						{{if $schema}}
-							{{include file="field_select.tpl" field=$schema}}
-						{{/if}}
-						{{if $mobile_theme}}
-							{{include file="field_themeselect.tpl" field=$mobile_theme}}
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{/if}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content">
-							{{$d_ctset}}
-						</a>
-					</h3>
-				</div>
-				<div id="custom-settings-content" class="collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
-					<div class="section-content-tools-wrapper">
-						{{if $theme_config}}
-							{{$theme_config}}
-						{{/if}}
-					</div>
-				</div>
-			</div>
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
-					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content">
-							{{$d_cset}}
-						</a>
-					</h3>
-				</div>
-				<div id="content-settings-content" class="collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
-					<div class="section-content-wrapper">
-						{{include file="field_input.tpl" field=$ajaxint}}
-						{{include file="field_input.tpl" field=$itemspage}}
-						{{include file="field_input.tpl" field=$channel_divmore_height}}
-						{{include file="field_input.tpl" field=$network_divmore_height}}
-						{{include file="field_checkbox.tpl" field=$nosmile}}
-						{{include file="field_checkbox.tpl" field=$title_tosource}}
-						{{include file="field_checkbox.tpl" field=$channel_list_mode}}
-						{{include file="field_checkbox.tpl" field=$network_list_mode}}
-						{{include file="field_checkbox.tpl" field=$user_scalable}}
-						{{include file="field_checkbox.tpl" field=$preload_images}}
-						{{include file="field_checkbox.tpl" field=$manual_update}}
-						{{if $expert}}
-						<div class="form-group">
-							<a class="btn btn-outline-secondary "href="pdledit">{{$layout_editor}}</a>
-						</div>
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</form>
-</div>
diff --git a/view/theme/redbasic/tpl/settings_features.tpl b/view/theme/redbasic/tpl/settings_features.tpl
deleted file mode 100755
index dfe049a7a..000000000
--- a/view/theme/redbasic/tpl/settings_features.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<form action="settings/features" method="post" autocomplete="off">
-	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-	<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
-		{{foreach $features as $g => $f}}
-		<div class="panel">
-			<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
-				<h3>
-					<a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
-						{{$f.0}}
-					</a>
-				</h3>
-			</div>
-			<div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
-				<div class="section-content-tools-wrapper">
-					{{foreach $f.1 as $fcat}}
-						{{include file="field_checkbox.tpl" field=$fcat}}
-					{{/foreach}}
-					<div class="settings-submit-wrapper" >
-						<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-					</div>
-				</div>
-			</div>
-		</div>
-		{{/foreach}}
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/settings_nick_set.tpl b/view/theme/redbasic/tpl/settings_nick_set.tpl
deleted file mode 100755
index 76fe7cd8d..000000000
--- a/view/theme/redbasic/tpl/settings_nick_set.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="settings-nick-wrapper" class="section-content-info-wrapper">
-<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong></div>
-{{if $davpath}}
-<br>
-<div id="settings-dav-desc">{{$davdesc}} <strong>'{{$davpath}}'</strong></div>
-{{/if}}
-</div>
-<div id="settings-nick-end" ></div>
diff --git a/view/theme/redbasic/tpl/settings_oauth.tpl b/view/theme/redbasic/tpl/settings_oauth.tpl
deleted file mode 100755
index 811cfcec5..000000000
--- a/view/theme/redbasic/tpl/settings_oauth.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="generic-content-wrapper">
-<div class="section-title-wrapper">
-	<h2>{{$title}}</h2>
-</div>
-
-<div class="section-content-tools-wrapper">
-<form action="settings/oauth" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-	<div id="profile-edit-links">
-		<ul>
-			<li>
-				<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a>
-			</li>
-		</ul>
-	</div>
-
-	{{foreach $apps as $app}}
-	<div class='oauthapp'>
-		<img src='{{$app.icon}}' class="{{if $app.icon}} {{else}}noicon{{/if}}">
-		{{if $app.clname}}<h4>{{$app.clname}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}}
-		{{if $app.my}}
-			{{if $app.oauth_token}}
-			<div class="settings-submit-wrapper" ><button class="settings-submit"  type="submit" name="remove" value="{{$app.oauth_token}}">{{$remove}}</button></div>
-			{{/if}}
-		{{/if}}
-		{{if $app.my}}
-		<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
-		<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
-		{{/if}}		
-	</div>
-	{{/foreach}}
-
-</form>
-</div>
-</div>
diff --git a/view/theme/redbasic/tpl/settings_oauth_edit.tpl b/view/theme/redbasic/tpl/settings_oauth_edit.tpl
deleted file mode 100755
index b94dec48a..000000000
--- a/view/theme/redbasic/tpl/settings_oauth_edit.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-<div class="section-content-tools-wrapper">
-<form method="POST">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{include file="field_input.tpl" field=$name}}
-{{include file="field_input.tpl" field=$key}}
-{{include file="field_input.tpl" field=$secret}}
-{{include file="field_input.tpl" field=$redirect}}
-{{include file="field_input.tpl" field=$icon}}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-<input type="submit" name="cancel" class="settings-submit" value="{{$cancel}}" />
-</div>
-
-</form>
-</div>
-</div>
diff --git a/view/theme/redbasic/tpl/settings_permcats.tpl b/view/theme/redbasic/tpl/settings_permcats.tpl
deleted file mode 100644
index f6bb9b036..000000000
--- a/view/theme/redbasic/tpl/settings_permcats.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-tools-wrapper">
-		<div class="section-content-info-wrapper">
-			{{$desc}}
-		</div>
-
-		<form action="settings/permcats" id="settings-permcats-form" method="post" autocomplete="off" >
-			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-			{{include file="field_input.tpl" field=$name}}
-
-			<div class="settings-submit-wrapper form-group">
-				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-			</div>
-	</div>
-
-	<div class="panel">
-		<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
-			<h3>
-				<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
-				{{$permlbl}}
-				</a>
-			</h3>
-		</div>
-		<div id="perms-tool-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="perms-tool">
-			<div class="section-content-tools-wrapper">
-				<div class="section-content-warning-wrapper">
-				{{$permnote}}
-				</div>
-
-				<table id="perms-tool-table" class=form-group>
-					<tr>
-						<td></td><td colspan="2" class="abook-me">{{$me}}</td>
-					</tr>
-						{{foreach $perms as $prm}}
-						{{include file="field_acheckbox.tpl" field=$prm}}
-						{{/foreach}}
-				</table>
-
-				<div class="settings-submit-wrapper" >
-					<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-				</div>
-			</div>
-		</div>
-		{{if $permcats}}
-		<div class="section-content-wrapper-np">
-			<table id="permcat-index">
-			{{foreach $permcats as $k => $v}}
-			<tr class="permcat-row-{{$k}}">
-				<td width="99%"><a href="settings/permcats/{{$k}}">{{$k}}</a></td>
-				<td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td>
-			</tr>
-			{{/foreach}}
-			</table>
-		</div>
-		{{/if}}
-
-	</div>
-	</form>
-
-</div>
diff --git a/view/theme/redbasic/tpl/settings_tokens.tpl b/view/theme/redbasic/tpl/settings_tokens.tpl
deleted file mode 100644
index 48190c00c..000000000
--- a/view/theme/redbasic/tpl/settings_tokens.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-tools-wrapper">
-		<div class="section-content-info-wrapper">
-			{{$desc}}
-		</div>
-
-		<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
-			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-			{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
-			{{include file="field_input.tpl" field=$name}}
-			{{include file="field_input.tpl" field=$token}}
-			{{include file="field_input.tpl" field=$expires}}
-			<div class="settings-submit-wrapper form-group">
-				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-			</div>
-	</div>
-
-	<div class="panel">
-		<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
-			<h3>
-				<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
-				{{$permlbl}}
-				</a>
-			</h3>
-		</div>
-		<div id="perms-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="perms-tool">
-			<div class="section-content-tools-wrapper">
-				<div class="section-content-warning-wrapper">
-				{{$permnote}}
-				</div>
-
-				<table id="perms-tool-table" class=form-group>
-					<tr>
-						<td></td><td colspan="2" class="abook-me">{{$me}}</td>
-					</tr>
-						{{foreach $perms as $prm}}
-						{{include file="field_acheckbox.tpl" field=$prm}}
-						{{/foreach}}
-				</table>
-
-				<div class="settings-submit-wrapper" >
-					<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-				</div>
-			</div>
-		</div>
-	</div>
-	</form>
-
-	<div class="descriptive-text">{{$desc2}}</div>
-	<ul>
-		<li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
-		<li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
-	</ul>
-
-	{{if $tokens}}
-	<div class="section-content-wrapper-np">
-		<table id="atoken-index">
-			{{foreach $tokens as $t}}
-			<tr id="atoken-index-{{$t.atoken_id}}" class="atoken-index-row">
-				<td width="99%"><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td>
-				<td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td>
-			</tr>
-			{{/foreach}}
-		</table>
-
-	</div>
-	{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/sharedwithme.tpl b/view/theme/redbasic/tpl/sharedwithme.tpl
deleted file mode 100644
index 68bdd6faa..000000000
--- a/view/theme/redbasic/tpl/sharedwithme.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-sm btn-outline-secondary pull-right"><i class="fa fa-trash-o"></i>&nbsp;{{$dropall}}</a>
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper-np">
-		<table id="cloud-index">
-			<tr>
-				<th width="1%"></th>
-				<th width="92%">{{$name}}</th>
-				<th width="1%"></th>
-				<th width="1%" class="d-none d-md-table-cell">{{$size}}</th>
-				<th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th>
-			</tr>
-		{{foreach $items as $item}}
-			<tr id="cloud-index-{{$item.id}}">
-				<td><i class="fa {{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td>
-				<td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}}&nbsp;<span class="label label-success">{{$label_new}}</span>{{/if}}</td>
-				<td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
-				<td class="d-none d-md-table-cell">{{$item.objfilesize}}</td>
-				<td class="d-none d-md-table-cell">{{$item.objedited}}</td>
-			</tr>
-		{{/foreach}}
-		</table>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/show_thing.tpl b/view/theme/redbasic/tpl/show_thing.tpl
deleted file mode 100644
index d738c9fc9..000000000
--- a/view/theme/redbasic/tpl/show_thing.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h2>{{$header}}</h2>
-{{if $thing}}
-<div class="thing-show">
-{{if $thing.obj_imgurl}}<a href="{{$thing.obj_url}}" ><img src="{{$thing.obj_imgurl}}" width="175" height="175" alt="{{$thing.obj_term}}" /></a>{{/if}}
-<a href="{{$thing.obj_url}}" >{{$thing.obj_term}}</a>
-</div>
-{{if $canedit}}
-<div class="thing-edit-links">
-<a href="thing/edit/{{$thing.obj_obj}}" title="{{$edit}}" class="btn btn-outline-secondary" ><i class="fa fa-pencil thing-edit-icon"></i></a>
-<a href="thing/drop/{{$thing.obj_obj}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-outline-secondary" ><i class="fa fa-trash-o drop-icons"></i></a>
-</div>
-<div class="thing-edit-links-end"></div>
-{{/if}}
-
-{{/if}}
-
diff --git a/view/theme/redbasic/tpl/siteinfo.tpl b/view/theme/redbasic/tpl/siteinfo.tpl
deleted file mode 100755
index a5b99fd83..000000000
--- a/view/theme/redbasic/tpl/siteinfo.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h2>{{$title}}</h2>
-
-<h3>{{$sitenametxt}}</h3>
-
-<div>{{$sitename}}</div>
-
-<h3>{{$headline}}</h3>
-
-<div>{{if $site_about}}{{$site_about}}{{else}}--{{/if}}</div>
-
-<h3>{{$admin_headline}}</h3>
-
-<div>{{if $admin_about}}{{$admin_about}}{{else}}--{{/if}}</div>
-
-<br><br>
-<div><a href="help/TermsOfService">{{$terms}}</a></div>
-
-<hr>
-
-<h2>{{$prj_header}}</h2>
-
-<div>{{$prj_name}} ({{$z_server_role}})</div>
-
-{{if $prj_version}}
-<div>{{$prj_version}}</div>
-{{/if}}
-
-
-<h3>{{$prj_linktxt}}</h3>
-
-<div>{{$prj_link}}</div>
-
-<h3>{{$prj_srctxt}}</h3>
-
-<div>{{$prj_src}}</div>
-
-<br><br>
-<div>{{$prj_transport}} ({{$transport_link}})</div>
-
-</div>
diff --git a/view/theme/redbasic/tpl/sitesearch.tpl b/view/theme/redbasic/tpl/sitesearch.tpl
deleted file mode 100644
index 8dbf8cef5..000000000
--- a/view/theme/redbasic/tpl/sitesearch.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="widget saved-search-widget">
-	<h3 id="search">{{$title}}</h3>
-	{{$searchbox}}
-	<div class="clear"></div>
-</div>
diff --git a/view/theme/redbasic/tpl/sources_edit.tpl b/view/theme/redbasic/tpl/sources_edit.tpl
deleted file mode 100644
index 61f6e8cb0..000000000
--- a/view/theme/redbasic/tpl/sources_edit.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
-
-<div class="descriptive-text">{{$desc}}</div>
-
-<form action="sources" method="post">
-<input type="hidden" name="source" value="{{$id}}" />
-<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
-{{include file="field_input.tpl" field=$name}}
-{{include file="field_input.tpl" field=$tags}}
-{{include file="field_textarea.tpl" field=$words}}
-
-<div class="sources-submit-wrapper" >
-<input type="submit" name="submit" class="sources-submit" value="{{$submit}}" />
-</div>
-</form>
-<br />
-<br />
-<a href="sources/{{$id}}/drop">{{$drop}}</a>
-</div>
-
-
-
-
diff --git a/view/theme/redbasic/tpl/sources_list.tpl b/view/theme/redbasic/tpl/sources_list.tpl
deleted file mode 100644
index 76be35b1a..000000000
--- a/view/theme/redbasic/tpl/sources_list.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
-
-<div class="descriptive-text">{{$desc}}</div>
-
-<div class="sources-links">
-<a href="sources/new">{{$new}}</a>
-</div>
-
-{{if $sources}}
-<ul class="sources-list">
-{{foreach $sources as $source}}
-<li><a href="sources/{{$source.src_id}}">{{$source.xchan_name}}</a></li>
-{{/foreach}}
-</ul>
-{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/sources_new.tpl b/view/theme/redbasic/tpl/sources_new.tpl
deleted file mode 100644
index bbc22df84..000000000
--- a/view/theme/redbasic/tpl/sources_new.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
-
-<div class="descriptive-text">{{$desc}}</div>
-
-<form action="sources" method="post">
-<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
-{{include file="field_input.tpl" field=$name}}
-{{include file="field_input.tpl" field=$tags}}
-{{include file="field_textarea.tpl" field=$words}}
-
-<div class="sources-submit-wrapper" >
-<input type="submit" name="submit" class="sources-submit" value="{{$submit}}" />
-</div>
-</form>
-</div>
-
diff --git a/view/theme/redbasic/tpl/suggest_friends.tpl b/view/theme/redbasic/tpl/suggest_friends.tpl
deleted file mode 100755
index 95f24cd63..000000000
--- a/view/theme/redbasic/tpl/suggest_friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="{{$entry.url}}">
-			<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.profile}}]" />
-		</a>
-	</div>
-	<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="fa fa-times drop-icons btn btn-outline-secondary"></i></a>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{if $entry.connlnk}}
-	<div class="profile-match-connect btn btn-outline-secondary"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conntxt}}</a></div>
-	{{/if}}
-</div>
diff --git a/view/theme/redbasic/tpl/suggest_page.tpl b/view/theme/redbasic/tpl/suggest_page.tpl
deleted file mode 100755
index 97837c852..000000000
--- a/view/theme/redbasic/tpl/suggest_page.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<h3>{{$title}}</h3>
-
-{{if $entries}}
-{{foreach $entries as $child}}
-{{include file="suggest_friends.tpl" entry=$child}}
-{{/foreach}}
-{{/if}}
-
-<div class="clear"></div>
diff --git a/view/theme/redbasic/tpl/suggest_widget.tpl b/view/theme/redbasic/tpl/suggest_widget.tpl
deleted file mode 100644
index 7b9afa668..000000000
--- a/view/theme/redbasic/tpl/suggest_widget.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="widget suggestions-widget">
-<h3>{{$title}}</h3>
-{{if $entries}}
-{{foreach $entries as $child}}
-{{include file="suggest_friends.tpl" entry=$child}}
-{{/foreach}}
-{{/if}}
-<div class="clear"></div>
-<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div>
-</div>
diff --git a/view/theme/redbasic/tpl/thing_edit.tpl b/view/theme/redbasic/tpl/thing_edit.tpl
deleted file mode 100644
index 62a7c02c8..000000000
--- a/view/theme/redbasic/tpl/thing_edit.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<h2>{{$thing_hdr}}</h2>
-<form id="thing-edit-form" action="thing" method="post" class="acl-form" data-form_id="thing-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-<input type="hidden" name="term_hash" value="{{$thing_hash}}" />
-
-{{if $multiprof }}
-<div class="thing-profile-label">{{$profile_lbl}}</div>
-
-<div class="thing-profile">{{$profile_select}}</div>
-<div class="thing-field-end"></div>
-{{/if}}
-
-<div class="thing-verb-label">{{$verb_lbl}}</div>
-
-<div class="thing-verb">{{$verb_select}}</div>
-<div class="thing-field-end"></div>
-
-
-<label class="thing-label" for="thing-term">{{$thing_lbl}}</label>
-<input type="text" class="thing-input" id="thing-term" name="term" value="{{$thething}}" />
-<div class="thing-field-end"></div>
-<label class="thing-label" for="thing-url">{{$url_lbl}}</label>
-<input type="text" class="thing-input" id="thing-url" name="url" value="{{$theurl}}" />
-<div class="thing-field-end"></div>
-<label class="thing-label" for="thing-img">{{$img_lbl}}</label>
-<input type="text" class="thing-input" id="thing-img" name="img" value="{{$imgurl}}" />
-<div class="thing-field-end"></div>
-
-{{include file="field_checkbox.tpl" field=$activity}}
-
-<div class="thing-end"></div> 
-
-{{if $lockstate}}
-	<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-		<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
-	</button>
-{{/if}}
-
-
-<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
-</form>
-{{$aclselect}}
diff --git a/view/theme/redbasic/tpl/thing_input.tpl b/view/theme/redbasic/tpl/thing_input.tpl
deleted file mode 100644
index 90fb093e4..000000000
--- a/view/theme/redbasic/tpl/thing_input.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<h2>{{$thing_hdr}}</h2>
-<form id="thing-new-form" action="thing" method="post" class="acl-form" data-form_id="thing-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-
-{{if $multiprof }}
-<div class="thing-profile-label">{{$profile_lbl}}</div>
-
-<div class="thing-profile">{{$profile_select}}</div>
-<div class="thing-field-end"></div>
-{{/if}}
-
-
-<div class="thing-verb-label">{{$verb_lbl}}</div>
-
-<div class="thing-verb">{{$verb_select}}</div>
-<div class="thing-field-end"></div>
-
-
-<label class="thing-label" for="thing-term">{{$thing_lbl}}</label>
-<input type="text" class="thing-input" id="thing-term" name="term" />
-<div class="thing-field-end"></div>
-<label class="thing-label" for="thing-url">{{$url_lbl}}</label>
-<input type="text" class="thing-input" id="thing-url" name="url" />
-<div class="thing-field-end"></div>
-<label class="thing-label" for="thing-img">{{$img_lbl}}</label>
-<input type="text" class="thing-input" id="thing-img" name="img" />
-<div class="thing-field-end"></div>
-
-{{include file="field_checkbox.tpl" field=$activity}}
-
-<div class="thing-end"></div> 
-
-{{if $lockstate}}
-	<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-		<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
-	</button>
-{{/if}}
-
-
-<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
-</form>
-{{$aclselect}}
diff --git a/view/theme/redbasic/tpl/threaded_conversation.tpl b/view/theme/redbasic/tpl/threaded_conversation.tpl
deleted file mode 100755
index ea5c3c281..000000000
--- a/view/theme/redbasic/tpl/threaded_conversation.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{if $photo_item}}
-{{$photo_item}}
-{{/if}}
-{{foreach $threads as $thread_item}}
-{{include file="{{$thread_item.template}}" item=$thread_item}}
-{{/foreach}}
-
-<div id="conversation-end"></div>
diff --git a/view/theme/redbasic/tpl/toggle_mobile_footer.tpl b/view/theme/redbasic/tpl/toggle_mobile_footer.tpl
deleted file mode 100755
index 82c0197ba..000000000
--- a/view/theme/redbasic/tpl/toggle_mobile_footer.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a>
-
diff --git a/view/theme/redbasic/tpl/uexport.tpl b/view/theme/redbasic/tpl/uexport.tpl
deleted file mode 100644
index 7eafd97a6..000000000
--- a/view/theme/redbasic/tpl/uexport.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<div class="section-content-wrapper">
-		<b><a href="uexport/basic">{{$basictitle}}</a></b></p>
-		<p>{{$basic}}</p>
-
-		<p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p>
-		<p>{{$full}}</p>
-	
-		<p>{{$extra}}</p>
-		<p>{{$extra2}}</p>
-		<p>{{$extra3}}</p>
-
-		<p>{{$extra4}}</p>
-
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/usermenu.tpl b/view/theme/redbasic/tpl/usermenu.tpl
deleted file mode 100644
index c51728c34..000000000
--- a/view/theme/redbasic/tpl/usermenu.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{if $wrap}}
-<div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}">
-{{/if}}
-	{{if $menu.menu_desc}}
-	<h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="fa fa-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3>
-	{{/if}}
-	{{if $items}}
-	<ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills flex-column{{elseif !$wrap || $class}} {{$class}}{{/if}}">
-		{{foreach $items as $mitem }}
-		<li id="pmenu-item-{{$mitem.mitem_id}}" class="nav-item pmenu-item{{if $mitem.submenu}} dropdown{{/if}}">
-			<a href="{{if $mitem.submenu}}#{{else}}{{$mitem.mitem_link}}{{/if}}" class="nav-link {{if $mitem.submenu}} dropdown-toggle{{/if}}"{{if $mitem.submenu}} data-toggle="dropdown"{{/if}}{{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}{{if $mitem.submenu}}<span class="caret"></span>{{/if}}</a>
-			{{if $mitem.submenu}}{{$mitem.submenu}}{{/if}}
-		</li>
-		{{/foreach }}
-	</ul>
-	{{/if}}
-{{if $wrap}}
-	<div class="pmenu-end"></div>
-</div>
-{{/if}}
diff --git a/view/theme/redbasic/tpl/viewcontact_template.tpl b/view/theme/redbasic/tpl/viewcontact_template.tpl
deleted file mode 100755
index 2b7144450..000000000
--- a/view/theme/redbasic/tpl/viewcontact_template.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$title}}</h2>
-	</div>
-	<div class="section-content-wrapper clearfix">
-		{{foreach $contacts as $contact}}
-		{{include file="contact_template.tpl"}}
-		{{/foreach}}
-		<div id="page-end"></div>
-	</div>
-</div>
-<script>$(document).ready(function() { loadingPage = false;});</script>
-<div id="page-spinner"></div>
diff --git a/view/theme/redbasic/tpl/viewcontactsajax.tpl b/view/theme/redbasic/tpl/viewcontactsajax.tpl
deleted file mode 100644
index 68be228be..000000000
--- a/view/theme/redbasic/tpl/viewcontactsajax.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{{foreach $contacts as $contact}}
-{{include file="contact_template.tpl"}}
-{{/foreach}}
diff --git a/view/theme/redbasic/tpl/webpage_export_list.tpl b/view/theme/redbasic/tpl/webpage_export_list.tpl
deleted file mode 100644
index b22b3818a..000000000
--- a/view/theme/redbasic/tpl/webpage_export_list.tpl
+++ /dev/null
@@ -1,124 +0,0 @@
-<div class="generic-content-wrapper">
-		<form action="" method="post" autocomplete="on" >
-		<input type="hidden" name="action" value="{{$action}}">
-		<div class="section-title-wrapper">
-			<div class="pull-right">				
-					<button class="btn btn-md btn-success" type="submit" name="submit" value="{{$exportbtn}}">{{$exportbtn}}</button>
-			</div>
-			<h2>{{$title}}</h2>
-			<div class="clear"></div>
-		</div>
-		<div id="import-website-content-wrapper" class="section-content-wrapper">
-				<div class="pull-left">
-						<button id="toggle-select-all" class="btn btn-sm btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i>&nbsp;Toggle Select All</button>
-				</div>
-				<div class="clear"></div>
-				<hr>
-				<!--<h4>Pages</h4>-->
-				<div>
-				<table class="table-striped table-responsive table-hover" style="width: 100%;">
-						<thead>
-								<tr><th></th><th>Page Link</th><th>Page Title</th><th>Type</th></tr>
-						</thead>
-						{{foreach $pages as $page}}
-								<tr>
-									<td width="30px" style="padding-right: 20px;">
-										<div class='squaredThree'>
-										<input type="checkbox" id="page_{{$page.mid}}" name="page[]" value="{{$page.mid}}">
-										<label for="page_{{$page.mid}}"></label>
-										</div>
-									</td>
-									<td width="30%">
-										<div class="desc">
-											{{$page.pagetitle}}<br>
-										</div>
-									</td>
-									<td width="55%">
-										<div class='desc'>
-											{{$page.title}}<br>
-										</div>
-									</td>
-									<td width="15%">
-										<div class='desc'>
-											{{$page.mimetype}}<br>
-										</div>
-									</td>
-								</tr>
-						{{/foreach}}
-				</table>
-				</div>
-				<hr>
-				<div class="clear"></div>
-				<!--<h4>Layouts</h4>-->
-				<div>
-				<table class="table-striped table-responsive table-hover" style="width: 100%;">
-						<thead>
-								<tr><th width="20px"></th><th>Layout Name</th><th>Layout Description</th><th>Type</th></tr>
-						</thead>
-						{{foreach $layouts as $layout}}
-								<tr>
-									<td width="30px" style="padding-right: 20px;">
-										<div class='squaredThree'>
-										<input type="checkbox" id="layout_{{$layout.mid}}" name="layout[]" value="{{$layout.mid}}">
-										<label for="layout_{{$layout.mid}}"></label>
-										</div>
-									</td>
-									<td width="30%">
-										<div class="desc">
-											{{$layout.name}}<br>
-										</div>
-									</td>
-									<td width="55%">
-										<div class='desc'>
-											{{$layout.description}}<br>
-										</div>
-									</td>
-									<td width="15%">
-										<div class='desc'>
-											{{$layout.mimetype}}<br>
-										</div>
-									</td>
-								</tr>
-						{{/foreach}}
-				</table>
-				</div>
-				<hr>
-				<div class="clear"></div>
-				<!--<h4>Blocks</h4>-->
-				<div>
-				<table class="table-striped table-responsive table-hover" style="width: 100%;">
-						<thead>
-								<tr><th width="30px"></th><th>Block Name</th><th>Block Title</th><th>Type</th></tr>
-						</thead>
-						{{foreach $blocks as $block}}
-								<tr>
-									<td width="30px" style="padding-right: 20px;">
-										<div class='squaredThree'>
-										<input type="checkbox" id="block_{{$block.mid}}" name="block[]" value="{{$block.mid}}">
-										<label for="block_{{$block.mid}}"></label>
-										</div>
-									</td>
-									<td width="30%">
-										<div class="desc">
-											{{$block.name}}<br>
-										</div>
-									</td>
-									<td width="55%">
-										<div class='desc'>
-											{{$block.title}}<br>
-										</div>
-									</td>
-									<td width=15%">
-										<div class='desc'>
-											{{$block.mimetype}}<br>
-										</div>
-									</td>
-								</tr>
-						{{/foreach}}
-				</table>
-				</div>
-				
-		</div>
-		</form>
-</div>
-
diff --git a/view/theme/redbasic/tpl/webpage_import.tpl b/view/theme/redbasic/tpl/webpage_import.tpl
deleted file mode 100644
index 955288c1e..000000000
--- a/view/theme/redbasic/tpl/webpage_import.tpl
+++ /dev/null
@@ -1,126 +0,0 @@
-<div class="generic-content-wrapper">
-		<form action="" method="post" autocomplete="on" >
-		<input type="hidden" name="action" value="importselected">
-		<div class="section-title-wrapper">
-			<div class="pull-right">				
-					<button class="btn btn-md btn-success" type="submit" name="submit" value="{{$importbtn}}">{{$importbtn}}</button>
-			</div>
-			<h2>{{$title}}</h2>
-			<div class="clear"></div>
-		</div>
-		<div id="import-website-content-wrapper" class="section-content-wrapper">
-						<div class="pull-left">
-								<button id="toggle-select-all" class="btn btn-sm btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i>&nbsp;Toggle Select All</button>
-						</div>
-						<div class="clear"></div>
-						<h4>Scanned Pages</h4>
-						<div>
-						<table class="table-striped table-responsive table-hover" style="width: 100%;">
-							<tr><td>Import?</td><td>Page</td><!--<td>Existing Page</td>--></tr>
-						{{foreach $pages as $page}}
-								<tr>
-									<td>
-										<div class='squaredTwo'>
-										<input type="checkbox" id="page_{{$page.pagelink}}" name="page[]" value="{{$page.pagelink}}">
-										<label for="page_{{$page.pagelink}}"></label>
-										</div>
-									</td>
-									<td>
-										<div class='desc'>
-											Page Link: {{$page.pagelink}}<br>
-											Layout: {{$page.layout}}<br>
-											Title: {{$page.title}}<br>
-											Content File: {{$page.contentfile}}<br>
-											Type: {{$page.type}}<br>
-										</div>
-									</td>
-								<!-- TODO: Retrieve existing element information to avoid accidental overwriting
-									<td>
-										<div class='desc'>
-											Name: {{$page.curpage.pagelink}}<br>
-											Layout: {{$page.curpage.layout}}<br>
-											Title: {{$page.curpage.title}}<br>
-											Last edit: {{$page.curpage.edited}}<br>
-											Type: {{$page.curpage.type}}<br>
-										</div>
-									</td>
-								-->
-								</tr>
-						{{/foreach}}
-						</table>
-						</div>
-
-
-						<h4>Scanned Layouts</h4>
-						<div>
-						<table class="table-striped table-responsive table-hover" style="width: 100%;">
-								<tr><td>Import?</td><td>Layout</td><!--<td>Existing Layout</td>--></tr>
-						{{foreach $layouts as $layout}}
-										<tr>
-												<td>
-														<div class='squaredTwo'>
-														<input type="checkbox" id="layout_{{$layout.name}}" name="layout[]" value="{{$layout.name}}">
-														<label for="layout_{{$layout.name}}"></label>
-														</div>
-												</td>
-												<td>
-														<div class='desc'>
-																Name: {{$layout.name}}<br>
-																Description: {{$layout.description}}<br>
-																Content File: {{$layout.contentfile}}<br>
-														</div>
-												</td>
-												<!-- TODO: Retrieve existing element information to avoid accidental overwriting
-												<td>
-														<div class='desc'>
-																Name: {{$layout.curblock.name}}<br>
-																Title: {{$layout.curblock.description}}<br>
-																Last edit: {{$layout.curblock.edited}}<br>
-														</div>
-												</td>
-												-->
-										</tr>
-						{{/foreach}}
-						</table>
-						</div>
-
-						<h4>Scanned Blocks</h4>
-						<div>
-						<table class="table-striped table-responsive table-hover" style="width: 100%;">
-								<tr><td>Import?</td><td>Block</td><!--<td>Existing Block</td>--></tr>
-						{{foreach $blocks as $block}}
-										<tr>
-												<td>
-														<div class='squaredTwo'>
-														<input type="checkbox" id="block_{{$block.name}}" name="block[]" value="{{$block.name}}">
-														<label for="block_{{$block.name}}"></label>
-														</div>
-												</td>
-												<td>
-														<div class='desc'>
-																Name: {{$block.name}}<br>
-																Title: {{$block.title}}<br>
-																Content File: {{$block.contentfile}}<br>
-																Type: {{$block.type}}<br>
-														</div>
-												</td>
-												<!-- TODO: Retrieve existing element information to avoid accidental overwriting
-												<td>
-														<div class='desc'>
-																Name: {{$block.curblock.name}}<br>
-																Title: {{$block.curblock.title}}<br>
-																Last edit: {{$block.curblock.edited}}<br>
-																Type: {{$block.curblock.type}}<br>
-														</div>
-												</td>
-												-->
-										</tr>
-						{{/foreach}}
-						</table>
-						</div>
-				
-		</div>
-		<div class="clear"></div>
-		</form>
-</div>
-
diff --git a/view/theme/redbasic/tpl/webpagelist.tpl b/view/theme/redbasic/tpl/webpagelist.tpl
deleted file mode 100644
index fcf9de75a..000000000
--- a/view/theme/redbasic/tpl/webpagelist.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $editor}}
-		<div class="pull-right">
-			<button id="webpage-create-btn" class="btn btn-sm btn-success acl-form-trigger" onclick="openClose('webpage-editor');" data-form_id="profile-jot-form"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
-		</div>
-		{{/if}}
-		<h2>{{$listtitle}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{if $editor}}
-	<div id="webpage-editor" class="section-content-tools-wrapper">
-		{{$editor}}
-	</div>
-	{{/if}}
-	{{if $pages}}
-	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
-		<table id="webpage-list-table">
-			<tr>
-				<th width="1%">{{$pagelink_txt}}</th>
-				<th width="95%">{{$title_txt}}</th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%"></th>
-				<th width="1%" class="d-none d-md-table-cell">{{$created_txt}}</th>
-				<th width="1%" class="d-none d-md-table-cell">{{$edited_txt}}</th>
-			</tr>
-			{{foreach $pages as $key => $items}}
-			{{foreach $items as $item}}
-			<tr id="webpage-list-item-{{$item.url}}">
-				<td>
-					{{if $view}}
-					<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
-					{{else}}
-					{{$item.pagetitle}}
-					{{/if}}
-				</td>
-				<td>
-					{{$item.title}}
-				</td>
-				<td class="webpage-list-tool dropdown">
-					{{if $item.lockstate=='lock'}}
-					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i>
-					<ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $edit}}
-					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $item.bb_element}}
-					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
-					{{/if}}
-				</td>
-				<td class="webpage-list-tool">
-					{{if $edit}}
-					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
-					{{/if}}
-				</td>
-				<td class="d-none d-md-table-cell">
-					{{$item.created}}
-				</td>
-				<td class="d-none d-md-table-cell">
-					{{$item.edited}}
-				</td>
-			</tr>
-			{{/foreach}}
-			{{/foreach}}
-		</table>
-	</div>
-	{{/if}}
-	<div class="clear"></div>
-</div>
diff --git a/view/theme/redbasic/tpl/website_portation_tools.tpl b/view/theme/redbasic/tpl/website_portation_tools.tpl
deleted file mode 100644
index 0d131cb17..000000000
--- a/view/theme/redbasic/tpl/website_portation_tools.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div id="website-portation-tools" class="widget">
-	<div class="nav nav-pills flex-column">
-		<a class="nav-link"  href="#" onclick="openClose('import-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
-		<div id="import-form" class="sub-menu-wrapper">
-			<div class="sub-menu">
-				<form enctype="multipart/form-data" method="post" action="">
-					<input type="hidden" name="action" value="scan">
-					<p class="descriptive-text">{{$file_import_text}}</p>
-					<div class="form-group">
-						<input class="form-control" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
-					</div>
-					<div class="form-group">
-						<button class="btn btn-primary btn-sm" type="submit" name="cloudsubmit" value="{{$select}}">Submit</button>
-					</div>
-					<!-- Or upload a zipped file containing the website -->
-					<p class="descriptive-text">{{$file_upload_text}}</p>
-					<div class="form-group">
-						<input class="form-control-file w-100" type="file" name="zip_file" />
-					</div>
-					<div class="form-group">
-						<button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Submit</button>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-	<div class="nav nav-pills flex-column">
-		<a class="nav-link" href="#" onclick="openClose('export-form'); openClose('export-cloud-form'); return false;"><i class="fa fa-share-square-o generic-icons"></i> {{$export_label}}</a>
-		<div id="export-form" class="sub-menu-wrapper">
-			<div class="sub-menu">
-				<form enctype="multipart/form-data" method="post" action="">
-					<input type="hidden" name="action" value="exportzipfile">
-					<!-- Or download a zipped file containing the website -->
-					<p class="descriptive-text">{{$file_download_text}}</p>
-					<div class="form-group">
-						<input class="form-control" type="text" name="zipfilename" title="{{$filename_hint}}" placeholder="{{$filename_desc}}" value="" />
-					</div>
-					<div class="form-group">
-						<button class="btn btn-primary btn-sm" type="submit" name="w_download" value="w_download">Submit</button>
-					</div>
-				</form>
-			</div>
-		</div>
-		<div id="export-cloud-form" class="sub-menu-wrapper">
-			<div class="sub-menu">
-				<form enctype="multipart/form-data" method="post" action="">
-					<input type="hidden" name="action" value="exportcloud">
-					<!-- Or export the website elements to a cloud files folder -->
-					<p style="margin-top: 10px;" class="descriptive-text">{{$cloud_export_text}}</p>
-					<div class="form-group">
-						<input class="form-control" type="text" name="exportcloudpath" title="{{$cloud_export_hint}}" placeholder="{{$cloud_export_desc}}" />
-					</div>
-					<div class="form-group">
-						<button class="btn btn-primary btn-sm" type="submit" name="exportcloudsubmit" value="{{$cloud_export_select}}">Submit</button>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/redbasic/tpl/wiki.tpl b/view/theme/redbasic/tpl/wiki.tpl
deleted file mode 100644
index 564db3324..000000000
--- a/view/theme/redbasic/tpl/wiki.tpl
+++ /dev/null
@@ -1,469 +0,0 @@
-<div class="generic-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			{{if $showPageControls}}
-			<div id="page-tools" class="btn-group" style="display: none;">
-				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
-					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
-				</button>
-				<div class="dropdown-menu dropdown-menu-right">
-					{{if $renamePage}}
-					<a class="dropdown-item rename-page" href="#"><i class="fa fa-fw fa-edit"></i>&nbsp;{{$renamePage}}</a>
-					{{/if}}
-					<a id="embed-image" class="dropdown-item" href="#"><i class="fa fa-fw fa-picture-o"></i>&nbsp;Embed Image</a>
-				</div>
-			</div>	
-			{{/if}}
-			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button>
-		</div>
-		<h2>
-			<span id="wiki-header-name">{{$wikiheaderName}}</span>:
-			<span id="wiki-header-page">{{$wikiheaderPage}}</span>
-		</h2>
-		<div class="clear"></div>
-	</div>
-	<div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
-		<form id="rename-page-form" action="wiki/rename/page" method="post" >
-			{{include file="field_input.tpl" field=$pageRename}}
-			<div class="form-group">
-				<div class="pull-right">
-					<button id="rename-page-submit" class="btn btn-primary" type="submit" name="submit">Submit</button>
-				</div>
-				<div>
-					<button class="btn btn-outline-secondary rename-page" type="button">Cancel</button>
-				</div>
-				<div class="clear"></div>
-			</div>
-		</form>
-	</div>
-	<div id="wiki-content-container" class="section-content-wrapper">
-		<ul class="nav nav-tabs" id="wiki-nav-tabs">
-			<li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li>
-			<li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li>
-			<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
-		</ul>
-		<div class="tab-content" id="wiki-page-tabs">
-			<div id="edit-pane" class="tab-pane">
-				{{if !$mimeType || $mimeType == 'text/markdown'}}
-				<div id="ace-editor"></div>
-				{{else}}
-				<div id="editor-wrapper">
-					<textarea id="editor">{{$content}}</textarea>
-				</div>
-				{{/if}}
-				{{if $showPageControls}}
-				<div>
-					<div id="id_{{$commitMsg.0}}_wrapper" class="field input">
-						<div class="input-group">
-							<input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
-							<div class="input-group-btn">
-								<button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
-							</div>
-						</div>
-					</div>
-				</div>
-				{{/if}}
-			</div>
-			<div id="preview-pane" class="tab-pane active">
-				<div id="wiki-preview">
-					{{$renderedContent}}
-				</div>
-			</div>
-			<div id="page-history-pane" class="tab-pane">
-				<div id="page-history-list"></div>
-			</div>
-		</div>
-	</div>
-</div>
-
-{{$wikiModal}}
-
-<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-			</div>
-			<div class="modal-body" id="embedPhotoModalBody" >
-				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
-					<div id="embedPhotoModalBodyAlbumList"></div>
-				</div>
-				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
-				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-
-<script>
-	window.wiki_resource_id = '{{$resource_id}}';
-	window.wiki_page_name = '{{$page}}';
-	window.wiki_page_content = '{{$content|escape:'javascript'}}';
-	window.wiki_page_commit = '{{$commit}}';
-
-	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
-	$("#generic-modal-ok-{{$wikiModalID}}").addClass('btn-danger');
-
-	$('.rename-page').click(function (ev) {
-		$('#rename-page-form-wrapper').toggle();
-		ev.preventDefault();
-	});
-
-	$( "#rename-page-form" ).submit(function( event ) {
-		$.post("wiki/{{$channel}}/rename/page", 
-		{
-			oldName: window.wiki_page_name, 
-			newName: $('#id_pageRename').val(), 
-			resource_id: window.wiki_resource_id
-		}, 
-		function (data) {
-			if (data.success) {
-				$('#rename-page-form-wrapper').hide();
-				window.console.log('data: ' + JSON.stringify(data));
-				window.wiki_page_name = data.name.urlName;
-				$('#wiki-header-page').html(data.name.htmlName);
-				wiki_refresh_page_list();
-			} else {
-				window.console.log('Error renaming page.');
-			}
-		}, 'json');    
-		event.preventDefault();
-	});
-
-	{{if !$mimeType || $mimeType == 'text/markdown'}}
-	var editor = ace.edit("ace-editor");
-	editor.setOptions({
-		theme: "ace/theme/github",
-		mode: "ace/mode/markdown",
-
-		maxLines: Infinity,
-		minLines: 30,
-
-		wrap: true,
-
-		printMargin: false
-	});
-
-	editor.getSession().setValue(window.wiki_page_content);
-	window.editor = editor; // Store the editor in the window object so the anonymous function can use it.
-	{{else}}
-	window.editor = editor = $('#editor');
-	{{/if}}
-
-	{{if !$showPageControls}}
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		editor.setReadOnly(true); // Disable editing if the viewer lacks edit permission
-		{{else}}
-		editor.prop('readonly', true);
-		{{/if}}
-	{{/if}}
-
-	$('#edit-pane-tab').click(function (ev) {
-		setTimeout(function() {
-			window.editor.focus();
-			if($('main').hasClass('fullscreen')) {
-				adjustFullscreenEditorHeight();
-			}
-			else {
-				adjustInlineEditorHeight();
-			}
-		}, 500); // Return the focus to the editor allowing immediate text entry
-		$('#page-tools').show();
-	});
-
-	$('#wiki-get-preview').click(function (ev) {
-		$.post("wiki/{{$channel}}/preview", {
-			{{if !$mimeType || $mimeType == 'text/markdown'}}
-			content: editor.getValue(),
-			{{else}}
-			content: editor.val(),
-			{{/if}}
-			resource_id: window.wiki_resource_id
-		},
-		function (data) {
-		if (data.success) {
-			$('#wiki-preview').html(data.html);
-			{{if !$mimeType || $mimeType == 'text/markdown'}}
-			$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
-			{{/if}}
-			$('#page-tools').hide();
-		} else {
-			window.console.log('Error previewing page.');
-		}
-		}, 'json');
-		ev.preventDefault();
-	});
-
-	$('#wiki-get-history').click(function (ev) {
-		$.post("wiki/{{$channel}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
-			if (data.success) {
-				$('#page-history-list').html(data.historyHTML);
-				$('#page-tools').hide();
-			} else {
-				window.console.log('Error getting page history.');
-			}
-			}, 'json');
-			ev.preventDefault();
-		});
-
-	function wiki_refresh_page_list() {
-		if (window.wiki_resource_id === '') {
-			return false;
-		}
-		$.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) {
-			if (data.success) {
-				$('#wiki_page_list_container').html(data.pages);
-				$('#wiki_page_list_container').show();
-			} else {
-				alert('Error fetching page list!');
-				window.console.log('Error fetching page list!');
-			}
-		}, 'json');
-		return false;
-	}
-
-	$('#save-page').click(function (ev) {
-		if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
-			window.console.log('You must have a wiki page open in order to edit pages.');
-			ev.preventDefault();
-			return false;
-		}
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		var currentContent = editor.getValue();
-		{{else}}
-		var currentContent = editor.val();
-		{{/if}}
-
-		if (window.wiki_page_content === currentContent) {
-			$('#save-page').addClass('disabled');  // Disable the save button
-			window.console.log('No edits to save.');
-			ev.preventDefault();
-			return false;
-		}
-		$.post("wiki/{{$channel}}/save/page", {
-			content: currentContent, 
-			commitMsg: $('#id_commitMsg').val(),
-			name: window.wiki_page_name, 
-			resource_id: window.wiki_resource_id
-		}, 
-		function (data) {
-			if (data.success) {
-				window.console.log('Page saved successfully.');
-				window.wiki_page_content = currentContent;
-				$('#id_commitMsg').val(''); // Clear the commit message box
-				$('#save-page').addClass('disabled');  // Disable the save button
-				{{if !$mimeType || $mimeType == 'text/markdown'}}
-				window.editor.getSession().getUndoManager().markClean();  // Reset the undo history for the editor
-				{{/if}}
-
-				window.editor.focus();  // Return focus to the editor for continued editing
-				// $('#wiki-get-history').click();
-			} else {
-				alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups 
-				window.console.log('Error saving page.');
-			}
-		}, 'json');
-		ev.preventDefault();
-	});
-
-	function wiki_revert_page(commitHash) {
-		if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
-			window.console.log('You must have a wiki page open in order to revert pages.');
-			return false;
-		}
-		$.post("wiki/{{$channel}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
-		function (data) {
-			if (data.success) {
-			$('button[id^=revert-]').removeClass('btn-success');
-			$('button[id^=revert-]').addClass('btn-danger');
-			$('button[id^=revert-]').html('Revert');
-			$('#revert-'+commitHash).removeClass('btn-danger');
-			$('#revert-'+commitHash).addClass('btn-success');
-			$('#revert-'+commitHash).html('Page reverted<br>but not saved');
-			window.wiki_page_commit = commitHash;
-			// put contents in editor
-			editor.getSession().setValue(data.content);
-			} else {
-			window.console.log('Error reverting page.');
-			}
-		}, 'json');
-	}
-
-	function wiki_compare_page(compareCommit) {
-		if (window.wiki_resource_id === '' || window.wiki_page_name === '' || window.wiki_page_commit === '') {
-			window.console.log('You must have a wiki page open in order to revert pages.');
-			return false;
-		}
-		$.post("wiki/{{$channel}}/compare/page", {
-			compareCommit: compareCommit, 
-			currentCommit: window.wiki_page_commit, 
-			name: window.wiki_page_name, 
-			resource_id: window.wiki_resource_id
-		}, 
-		function (data) {
-			console.log(data);
-			if (data.success) {
-				var modalBody = $('#generic-modal-body-{{$wikiModalID}}');
-				modalBody.html('<div class="descriptive-text">'+data.diff+'</div>');
-				$('.modal-dialog').addClass('modal-lg');
-				$("#generic-modal-ok-{{$wikiModalID}}").off('click');
-				$("#generic-modal-ok-{{$wikiModalID}}").click(function () {
-					wiki_revert_page(compareCommit);
-					$('#generic-modal-{{$wikiModalID}}').modal('hide');
-				});
-				$('#generic-modal-{{$wikiModalID}}').modal();
-			} else {
-				window.console.log('Error comparing page.');
-			}
-		}, 'json');
-	}
-
-	function adjustFullscreenEditorHeight() {
-		$('#editor, #ace-editor').height($(window).height() - $('#id_commitMsg_wrapper').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('#wiki-nav-tabs').outerHeight(true) - 17);
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		editor.setOptions({
-			maxLines: null,
-			minLines: null
-		});
-		editor.resize();
-		{{/if}}
-	}
-
-	function adjustInlineEditorHeight() {
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		editor.setOptions({
-			maxLines: Infinity,
-			minLines: 30
-		});
-		editor.resize();
-		{{else}}
-		editor.height(editor[0].scrollHeight);
-		{{/if}}
-	}
-
-	$('#embed-image').click(function (ev) {
-		initializeEmbedPhotoDialog();
-		ev.preventDefault();
-	});
-
-	var initializeEmbedPhotoDialog = function () {
-		$('.embed-photo-selected-photo').each(function (index) {
-			$(this).removeClass('embed-photo-selected-photo');
-		});
-		getPhotoAlbumList();
-		$('#embedPhotoModalBodyAlbumDialog').off('click');
-		$('#embedPhotoModal').modal();
-	};
-
-	var choosePhotoFromAlbum = function (album) {
-		$.post("embedphotos/album", {name: album},
-			function(data) {
-				if (data['status']) {
-					$('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
-					$('#embedPhotoModalBodyAlbumDialog').html('\
-							<div><ul class="nav nav-pills flex-column">\n\
-								<li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
-									<i class="fa fa-chevron-left"></i>&nbsp;\n\
-									{{$modaldiffalbum}}\n\
-									</a>\n\
-								</li>\n\
-							</ul><br></div>')
-					$('#embedPhotoModalBodyAlbumDialog').append(data['content']);
-					$('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
-						evt.preventDefault();
-						var image = document.getElementById(evt.target.id);
-						if (typeof($(image).parent()[0]) !== 'undefined') {
-							var imageparent = document.getElementById($(image).parent()[0].id);
-							$(imageparent).toggleClass('embed-photo-selected-photo');
-						}
-					});
-					$('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-					$('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-					$('#embed-photo-OKButton').click(function () {
-						$('.embed-photo-selected-photo').each(function (index) {
-							var href = $(this).attr('href');
-							$.post("embedphotos/photolink", {href: href},
-								function(ddata) {
-									if (ddata['status']) {
-										{{if !$mimeType || $mimeType == 'text/markdown'}}
-										var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' )
-										editor.getSession().insert(editor.getCursorPosition(), imgURL)
-										{{else}}
-										var currentContent = $('#editor').val();
-										$('#editor').val(currentContent + ddata['photolink']);
-										{{/if}}
-									} else {
-										window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
-									}
-									return false;
-								},
-							'json');
-						});
-						$('#embedPhotoModalBodyAlbumDialog').html('');
-						$('#embedPhotoModalBodyAlbumDialog').off('click');
-						$('#embedPhotoModal').modal('hide');
-					});
-				} else {
-					window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
-				}
-				return false;
-			},
-		'json');
-	};
-
-	var getPhotoAlbumList = function () {
-		$.post("embedphotos/albumlist", {},
-			function(data) {
-				if (data['status']) {
-					var albums = data['albumlist']; //JSON.parse(data['albumlist']);
-					$('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
-					$('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
-					for(var i = 0; i < albums.length; i++) {
-						var albumName = albums[i].text;
-						var jsAlbumName = albums[i].jstext;
-						var albumLink = '<li class="nav-item">';
-						albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
-						albumLink += '</li>';
-						$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
-					}
-					$('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
-					$('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
-				} else {
-					window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
-				}
-				return false;
-			},
-		'json');
-	};
-
-	$(document).ready(function () {
-		wiki_refresh_page_list();
-
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
-		window.editor.on("input", function() {
-			if(window.editor.getSession().getUndoManager().isClean()) {
-				$('#save-page').addClass('disabled');
-			} else {
-				$('#save-page').removeClass('disabled');
-			}
-		});
-		{{else}}
-		window.editor.on("input", function() {
-			$('#save-page').removeClass('disabled');
-		});
-		window.editor.bbco_autocomplete('bbcode');
-		{{/if}}
-	});
-
-	$(window).resize(function () {
-		if($('main').hasClass('fullscreen')) {
-			adjustFullscreenEditorHeight();
-		}
-	});
-</script>
diff --git a/view/theme/redbasic/tpl/wiki_page_history.tpl b/view/theme/redbasic/tpl/wiki_page_history.tpl
deleted file mode 100644
index 9e5ba0f9c..000000000
--- a/view/theme/redbasic/tpl/wiki_page_history.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-<style>
-  .diff {
-    width:100%;
-    word-break: break-all;
-  }
-
-  .diff td{
-    padding:0 0.667em;
-    vertical-align:top;
-    white-space:pre;
-    white-space:pre-wrap;
-    font-family:Consolas,'Courier New',Courier,monospace;
-    font-size:1.0em;
-    line-height:1.333;
-  }
-
-  .diff span{
-    display:block;
-    min-height:1.333em;
-    margin-top:-1px;
-    padding:0 3px;
-  }
-
-  * html .diff span{
-    height:1.333em;
-  }
-
-  .diff span:first-child{
-    margin-top:0;
-  }
-
-  .diffDeleted span{
-    border:1px solid rgb(255,192,192);
-    background:rgb(255,224,224);
-  }
-
-  .diffInserted span{
-    border:1px solid rgb(192,255,192);
-    background:rgb(224,255,224);
-  }
-</style>
-<table class="table-striped table-responsive table-hover" style="width: 100%;">
-  {{foreach $pageHistory as $commit}}
-  <tr><td>
-      <table id="rev-{{$commit.hash}}" onclick="$('#details-{{$commit.hash}}').show()" width="100%">
-        <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td>
-            <td rowspan="3" width="20%" align="right">
-		{{if $permsWrite}}
-              <button id="revert-{{$commit.hash}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button>
-              <br><br>
-		{{/if}}
-              <button id="compare-{{$commit.hash}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.hash}}')">Compare</button>
-            </td></tr>
-        <tr><td>Name</td><td>{{$commit.name}} &lt;{{$commit.email}}&gt;</td></tr>
-        <tr><td>Message</td><td>{{$commit.title}}</td></tr>
-      </table>
-    </td></tr>
-  {{/foreach}}          
-</table>
diff --git a/view/theme/redbasic/tpl/wiki_page_list.tpl b/view/theme/redbasic/tpl/wiki_page_list.tpl
deleted file mode 100644
index 44fba15cc..000000000
--- a/view/theme/redbasic/tpl/wiki_page_list.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-{{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}}
-<div id="wiki_page_list" class="widget" >
-	<h3>{{$header}}</h3>
-	<ul class="nav nav-pills flex-column">
-		{{if $pages}}
-		{{foreach $pages as $page}}
-		<li class="nav-item nav-item-hack" id="{{$page.link_id}}">
-			{{if $page.resource_id && $candel}}
-			<i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.url}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i>
-			{{/if}}
-			<a class="nav-link" href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a>
-		</li>
-		{{/foreach}}
-		{{/if}}
-		{{if $canadd}}
-		<li class="nav-item"><a class="nav-link" href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i>&nbsp;{{$addnew}}</a></li>
-		{{/if}}
-	</ul>
-	{{if $canadd}}
-	<div id="new-page-form-wrapper" class="sub-menu" style="display:none;">
-		<form id="new-page-form" action="wiki/{{$channel}}/create/page" method="post" >
-			<input type="hidden" name="resource_id" value="{{$resource_id}}">
-			{{include file="field_input.tpl" field=$pageName}}
-			<button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button>
-		</form>
-	</div>
-	{{/if}}
-</div>
-{{if $not_refresh}}</div>{{/if}}
-
-<script>
-	$('#new-page-submit').click(function (ev) {
-		$.post("wiki/{{$channel}}/create/page", {pageName: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, 
-		function(data) {
-			if(data.success) {
-				window.location = data.url;
-			} else {
-				window.console.log('Error creating page.');
-			}
-		}, 'json');
-		ev.preventDefault();
-	});
-
-	function wiki_delete_page(wiki_page_name, wiki_page_url, wiki_resource_id, wiki_link_id) {
-		if(!confirm('Are you sure you want to delete the page: ' + wiki_page_name)) {
-			return;
-		}
-		$.post("wiki/{{$channel}}/delete/page", {name: wiki_page_url, resource_id: wiki_resource_id},
-		function (data) {
-			if (data.success) {
-				window.console.log('Page deleted successfully.');
-				if(wiki_page_url == window.wiki_page_name) {
-					var url = window.location.href;
-					if(url.substr(-1) == '/')
-						url = url.substr(0, url.length - 2);
-					url = url.split('/');
-					url.pop();
-					window.location = url.join('/');
-				}
-				else {
-					$('#' + wiki_link_id).remove();
-				}
-			} else {
-				alert('Error deleting page.'); // TODO: Replace alerts with auto-timeout popups
-				window.console.log('Error deleting page.');
-			}
-		}, 'json');
-		return false;
-	}
-
-	function wiki_show_new_page_form() {
-		$('#new-page-form-wrapper').toggle();
-		$('#id_pageName').focus();
-		return false;
-	}
-</script>
diff --git a/view/theme/redbasic/tpl/wikilist.tpl b/view/theme/redbasic/tpl/wikilist.tpl
deleted file mode 100644
index 760cf41b9..000000000
--- a/view/theme/redbasic/tpl/wikilist.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		{{if $owner}}
-		<button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$create}}</button>
-		{{/if}}
-		<h2>{{$header}}</h2>
-	</div>
-	{{if $owner}}
-	<div id="new-wiki-form-wrapper" class="section-content-tools-wrapper">
-		<form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-			{{include file="field_input.tpl" field=$wikiName}}
-			{{include file="field_select.tpl" field=$mimeType}}
-			{{include file="field_checkbox.tpl" field=$notify}}
-			<div>
-				<div class="btn-group pull-right">
-					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">
-						<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
-					</button>
-					<button id="new-wiki-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
-				</div>
-			</div>
-		</form>
-		{{$acl}}
-		<div class="clear"></div>
-	</div>
-	{{/if}}
-	<div class="section-content-wrapper-np">
-		<table id="wikis-index">
-			<tr>
-				<th width="96%">{{$name}}</th>
-				<th width="1%">{{$type}}</th>
-				<th width="1%" class="wikis-index-tool"></th>
-				<!-- th width="1%" class="wikis-index-tool"></th -->
-				{{if $owner}}
-				<th width="1%"></th>
-				{{/if}}
-			</tr>
-			{{foreach $wikis as $wiki}}
-			<tr class="wikis-index-row">
-				<td><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a></td>
-				<td>{{$wiki.mimeType}}</td>
-				<td class="wiki-index-tool dropdown">
-					{{if $wiki.lock}}
-					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i></button>
-					<ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
-					{{/if}}
-				</td>
-				<!-- td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td -->
-				{{if $owner}}
-				<td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td>
-				{{/if}}
-			</tr>
-			{{/foreach}}
-		</table>
-	</div>
-</div>
-<script>
-	{{if $owner}}
-	function wiki_delete_wiki(wikiHtmlName, resource_id) {
-		if(!confirm('Are you sure you want to delete the entire wiki: ' + JSON.stringify(wikiHtmlName))) {
-			return;
-		}
-		$.post("wiki/{{$channel}}/delete/wiki", {resource_id: resource_id}, function (data) {
-			if (data.success) {
-				window.console.log('Wiki deleted');
-				// Refresh list and redirect page as necessary
-				window.location = 'wiki/{{$channel}}';
-			} else {
-				alert('Error deleting wiki!');
-				window.console.log('Error deleting wiki.');
-			}
-		}, 'json');
-	}
-	{{/if}}
-	function wiki_download_wiki(resource_id) {
-			window.location = "wiki/{{$channel}}/download/wiki/" + resource_id;
-	}
-</script>
diff --git a/view/theme/redbasic/tpl/wikilist_widget.tpl b/view/theme/redbasic/tpl/wikilist_widget.tpl
deleted file mode 100644
index 9853f9850..000000000
--- a/view/theme/redbasic/tpl/wikilist_widget.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="wiki_list" class="widget">
-	<h3>{{$header}}</h3>
-	<ul class="nav nav-pills flex-column">
-		{{foreach $wikis as $wiki}}
-		<li class="nav-item"><a class="nav-link" href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}">{{$wiki.title}}</a></li> 
-		{{/foreach}}
-	</ul>
-</div>
diff --git a/view/theme/redbasic/tpl/write_pages.tpl b/view/theme/redbasic/tpl/write_pages.tpl
deleted file mode 100644
index 53146ee30..000000000
--- a/view/theme/redbasic/tpl/write_pages.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="write-pages" class="bigwidget">
-<span id="wp-new"><a href="{{$newurl}}">{{$new}}</a></span> <span id="wp-edit"><a href="{{$editurl}}">{{$edit}}</a></span>
-</div>
diff --git a/view/theme/redbasic/tpl/xchan_vcard.tpl b/view/theme/redbasic/tpl/xchan_vcard.tpl
deleted file mode 100755
index ac796cd47..000000000
--- a/view/theme/redbasic/tpl/xchan_vcard.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="vcard" class="vcard h-card">
-<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo u-photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
-{{if $connect}}
-<div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
-{{/if}}
-<div class="fn p-name">{{$name}}</div>
-</div>
-
-
-
diff --git a/view/theme/redbasic/tpl/xrd_diaspora.tpl b/view/theme/redbasic/tpl/xrd_diaspora.tpl
deleted file mode 100644
index aa0d8c740..000000000
--- a/view/theme/redbasic/tpl/xrd_diaspora.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
-	<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
-	<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />
diff --git a/view/theme/redbasic/tpl/xrd_host.tpl b/view/theme/redbasic/tpl/xrd_host.tpl
deleted file mode 100755
index 2a40dcf47..000000000
--- a/view/theme/redbasic/tpl/xrd_host.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
-     xmlns:hm='http://host-meta.net/xrd/1.0'>
- 
-    <hm:Host>{{$zhost}}</hm:Host>
- 
-    <Link rel='lrdd' type="application/xrd+xml" template='{{$zroot}}/xrd/?uri={uri}' />
-	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
-        href="{{$zroot}}/oexchange/xrd" />
-
-</XRD>
diff --git a/view/theme/redbasic/tpl/xrd_person.tpl b/view/theme/redbasic/tpl/xrd_person.tpl
deleted file mode 100755
index 93fdcb1df..000000000
--- a/view/theme/redbasic/tpl/xrd_person.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
- 
-    <Subject>{{$accturi}}</Subject>
-	{{if $aliases}}{{foreach $aliases as $a}}
-	<Alias>{{$a}}</Alias>   
-	{{/foreach}}{{/if}}
-
-    <Link rel="http://schemas.google.com/g/2010#updates-from" 
-          type="application/atom+xml" 
-          href="{{$atom}}" />
-    <Link rel="http://webfinger.net/rel/profile-page"
-          type="text/html"
-          href="{{$profile_url}}" />
-    <Link rel="http://portablecontacts.net/spec/1.0"
-          href="{{$poco_url}}" />
-    <Link rel="http://webfinger.net/rel/avatar"
-          type="image/jpeg"
-          href="{{$photo}}" />
-    <Link rel="http://microformats.org/profile/hcard"
-          type="text/html"
-          href="{{$hcard_url}}" />
-    <Link rel="http://ostatus.org/schema/1.0/subscribe"
-          template="{{$subscribe}}" />
-
-   <Link rel="magic-public-key"
-          href="{{$modexp}}" />
-
-	{{$dspr}}
-
-</XRD>
diff --git a/view/theme/redbasic/tpl/zcard.tpl b/view/theme/redbasic/tpl/zcard.tpl
deleted file mode 100644
index 908f07631..000000000
--- a/view/theme/redbasic/tpl/zcard.tpl
+++ /dev/null
@@ -1,144 +0,0 @@
-<style>
-{{if $size == 'hz_large'}}
-.hz_card {
-/*	-moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); 
-	transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */
-	font-family: sans-serif, arial, freesans;
-}
-.hz_cover_photo {
-	max-width: 100%;
-}
-.hz_profile_photo {
-	position: relative;
-	top: -300px;
-	left: 30px;
-	background-color: white;
-	border: 1px solid #ddd;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	padding: 10px;
-	width: 320px;
-	height: 320px;
-}
-
-.hz_name {
-	position: relative;
-	top: -100px;
-	left: 400px;
-	color: #fff;
-	font-size: 48px;
-    text-rendering: optimizelegibility;
-    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
-}
-.hz_addr {
-	position: relative;
-	top: -110px;
-	left: 400px;
-	color: #fff;
-	font-size: 24px;
-    text-rendering: optimizelegibility;
-    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
-}	
-{{elseif $size == 'hz_medium'}}
-.hz_card {
-/*	-moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); 
-	transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */
-	font-family: sans-serif, arial, freesans;
-	width: 100%;
-	overflow: hidden; 
-	height: 390px; 
-}
-.hz_cover_photo img {
-	width: {{$maxwidth}}px;
-/*	max-width: 100%; */
-}
-.hz_profile_photo {
-	position: relative;
-	top: -165px;
-	left: 30px;
-
-	width: 150px;
-	height: 150px;
-}
-.hz_profile_photo img {
-	background-color: white;
-	border: 1px solid #ddd;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	padding: 5px;
-	width: 150px;
-	height: 150px;
-}
-
-.hz_name {
-	position: relative;
-	top: -100px;
-	left: 210px;
-	color: #fff;
-	font-size: 32px;
-    text-rendering: optimizelegibility;
-    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
-}
-.hz_addr {
-	position: relative;
-	top: -100px;
-	left: 210px;
-	color: #fff;
-	font-size: 18px;
-    text-rendering: optimizelegibility;
-    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
-}	
-
-
-{{else}}
-.hz_card {
-/*	-moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); 
-	transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */
-	font-family: sans-serif, arial, freesans;
-}
-.hz_cover_photo {
-	max-width: 100%;
-}
-.hz_profile_photo {
-	position: relative;
-	top: -75px;
-	left: 20px;
-	background-color: white;
-	border: 1px solid #ddd;
-/*	border-radius: 5px;
-	-moz-border-radius: 5px; */
-	padding: 3px;
-	width: 80px;
-	height: 80px;
-}
-
-.hz_name {
-	position: relative;
-	top: -40px;
-	left: 120px;
-	color: #fff;
-	font-size: 18px;
-    text-rendering: optimizelegibility;
-    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
-}
-.hz_addr {
-	position: relative;
-	top: -40px;
-	left: 120px;
-	color: #fff;
-	font-size: 10px;
-    text-rendering: optimizelegibility;
-    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
-}	
-{{/if}}
-
-</style>
-
-<div class="hz_card {{$size}}">
-	<div class="hz_cover_photo"><img src="{{$cover.href}}" alt="{{$zcard.chan.xchan_name}}" />
-		<div class="hz_name">{{$zcard.chan.xchan_name}}</div>
-		<div class="hz_addr">{{$zcard.chan.channel_addr}}</div>
-	</div>
-	<div class="hz_profile_photo"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></div>
-</div>
-
diff --git a/view/theme/redbasic/tpl/zcard_embed.tpl b/view/theme/redbasic/tpl/zcard_embed.tpl
deleted file mode 100644
index 5c7a925e3..000000000
--- a/view/theme/redbasic/tpl/zcard_embed.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="hz_card {{$size}}">
-	<div class="hz_cover_photo" style="max-width: 100;"><a href="{{$zcard.chan.xchan_url}}"><img src="{{$cover.href}}" alt="{{$zcard.chan.xchan_name}}" /></a>
-		<div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 18px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.xchan_name}}</div>
-		<div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 10px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.channel_addr}}</div>
-	</div>
-	<div style="position:relative;top: -75px;left: 20px;background-color: white;border: 1px solid #ddd;padding: 3px;width: 80px;height: 80px;"><a href="{{$zcard.chan.xchan_url}}"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></a></div>
-</div>
-
diff --git a/view/tpl/404.tpl b/view/tpl/404.tpl
new file mode 100755
index 000000000..c9b51a63b
--- /dev/null
+++ b/view/tpl/404.tpl
@@ -0,0 +1,3 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$message}}</h1>
+</div>
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
new file mode 100755
index 000000000..9fb5c4b18
--- /dev/null
+++ b/view/tpl/abook_edit.tpl
@@ -0,0 +1,519 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $notself}}
+		<div class="pull-right">
+			<div class="btn-group">
+				<button id="connection-dropdown" class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
+				</button>
+				<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
+					<a class="dropdown-item" href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a>
+					<a class="dropdown-item" href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a>
+					{{if $tools.fetchvc}}
+					<a class="dropdown-item" href="{{$tools.fetchvc.url}}" title="{{$tools.fetchvc.title}}">{{$tools.fetchvc.label}}</a>
+					{{/if}}
+					<a class="dropdown-item" href="#" title="{{$tools.refresh.title}}" onclick="window.location.href='{{$tools.refresh.url}}'; return false;">{{$tools.refresh.label}}</a>
+					<a class="dropdown-item" href="#" title="{{$tools.rephoto.title}}" onclick="window.location.href='{{$tools.rephoto.url}}'; return false;">{{$tools.rephoto.label}}</a>
+					<div class="dropdown-divider"></div>
+					<a class="dropdown-item" href="#" title="{{$tools.block.title}}" onclick="window.location.href='{{$tools.block.url}}'; return false;">{{$tools.block.label}}</a>
+					<a class="dropdown-item" href="#" title="{{$tools.ignore.title}}" onclick="window.location.href='{{$tools.ignore.url}}'; return false;">{{$tools.ignore.label}}</a>
+					<a class="dropdown-item" href="#" title="{{$tools.archive.title}}" onclick="window.location.href='{{$tools.archive.url}}'; return false;">{{$tools.archive.label}}</a>					<a class="dropdown-item" href="#" title="{{$tools.hide.title}}" onclick="window.location.href='{{$tools.hide.url}}'; return false;">{{$tools.hide.label}}</a>
+					<a class="dropdown-item" href="#" title="{{$tools.delete.title}}" onclick="window.location.href='{{$tools.delete.url}}'; return false;">{{$tools.delete.label}}</a>
+				</div>
+			</div>
+			{{if $abook_prev || $abook_next}}
+			<div class="btn-group">
+				<a href="connedit/{{$abook_prev}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a>
+				<div class="btn-group" >
+					<button class="btn btn-outline-secondary btn-sm{{if $is_pending}} disabled{{/if}}" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button>
+					<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
+						{{foreach $sections as $s}}
+						<a class="dropdown-item" href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a>
+						{{/foreach}}
+					</div>
+				</div>
+				<a href="connedit/{{$abook_next}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_next}} disabled{{/if}}" ><i class="fa fa-forward"></i></a>
+			</div>
+			{{/if}}
+		</div>
+		{{/if}}
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper-np">
+		{{if $notself}}
+		{{foreach $tools as $tool}}
+		{{if $tool.info}}
+		<div class="section-content-danger-wrapper">
+			<div>
+				{{$tool.info}}
+			</div>
+		</div>
+		{{/if}}
+		{{/foreach}}
+		<div class="section-content-info-wrapper">
+			<div>
+				{{$addr_text}} <strong>'{{$addr}}'</strong>			
+			</div>
+			{{if $locstr}}
+			<div>
+				{{$loc_text}} {{$locstr}}
+			</div>
+			{{/if}}
+			{{if $last_update}}
+			<div>
+				{{$lastupdtext}} {{$last_update}}
+			</div>
+			{{/if}}
+		</div>
+		{{/if}}
+
+		<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
+
+		<input type="hidden" name="contact_id" value="{{$contact_id}}">
+		<input type="hidden" name="section" value="{{$section}}">
+
+		<div class="panel-group" id="contact-edit-tools" role="tablist" aria-multiselectable="true">
+			{{if $notself}}
+
+			{{if $is_pending}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="pending-tool">
+					<h3>
+						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse">
+							{{$pending_label}}
+						</a>
+					</h3>
+				</div>
+				<div id="pending-tool-collapse" class="panel-collapse collapse show" role="tabpanel" aria-labelledby="pending-tool">
+					<div class="section-content-tools-wrapper">
+						{{include file="field_checkbox.tpl" field=$unapproved}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			{{/if}}
+			{{if ! $is_pending}}
+			<div id="template-form-vcard-org" class="form-group form-vcard-org">
+				<div class="form-group form-vcard-org">
+					<input type="text" name="org" value="" placeholder="{{$org_label}}">
+					<i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				</div>
+			</div>
+
+			<div id="template-form-vcard-title" class="form-group form-vcard-title">
+				<div class="form-group form-vcard-title">
+					<input type="text" name="title" value="" placeholder="{{$title_label}}">
+					<i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				</div>
+			</div>
+
+			<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
+				<select name="tel_type[]">
+					<option value="CELL">{{$mobile}}</option>
+					<option value="HOME">{{$home}}</option>
+					<option value="WORK">{{$work}}</option>
+					<option value="OTHER">{{$other}}</option>
+				</select>
+				<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
+				<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+			</div>
+
+			<div id="template-form-vcard-email" class="form-group form-vcard-email">
+				<select name="email_type[]">
+					<option value="HOME">{{$home}}</option>
+					<option value="WORK">{{$work}}</option>
+					<option value="OTHER">{{$other}}</option>
+				</select>
+				<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
+				<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+			</div>
+
+			<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
+				<select name="impp_type[]">
+					<option value="HOME">{{$home}}</option>
+					<option value="WORK">{{$work}}</option>
+					<option value="OTHER">{{$other}}</option>
+				</select>
+				<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
+				<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+			</div>
+
+			<div id="template-form-vcard-url" class="form-group form-vcard-url">
+				<select name="url_type[]">
+					<option value="HOME">{{$home}}</option>
+					<option value="WORK">{{$work}}</option>
+					<option value="OTHER">{{$other}}</option>
+				</select>
+				<input type="text" name="url[]" value="" placeholder="{{$url_label}}">
+				<i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+			</div>
+
+			<div id="template-form-vcard-adr" class="form-group form-vcard-adr">
+				<div class="form-group">
+					<select name="adr_type[]">
+						<option value="HOME">{{$home}}</option>
+						<option value="WORK">{{$work}}</option>
+						<option value="OTHER">{{$other}}</option>
+					</select>
+					<label>{{$adr_label}}</label>
+					<i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$po_box}}">
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$extra}}">
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$street}}">
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$locality}}">
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$region}}">
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$zip_code}}">
+				</div>
+				<div class="form-group">
+					<input type="text" name="" value="" placeholder="{{$country}}">
+				</div>
+			</div>
+
+			<div id="template-form-vcard-note" class="form-group form-vcard-note">
+				<label>{{$note_label}}</label>
+				<i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				<textarea name="note" class="form-control"></textarea>
+			</div>
+
+			<div class="section-content-wrapper-np">
+				<div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
+				<div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field">
+					<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+					<ul class="dropdown-menu">
+						<li class="add-vcard-org"{{if $vcard.org}} style="display: none"{{/if}}><a href="#" data-add="vcard-org" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$org_label}}</a></li>
+						<li class="add-vcard-title"{{if $vcard.title}} style="display: none"{{/if}}><a href="#" data-add="vcard-title" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$title_label}}</a></li>
+						<li class="add-vcard-tel"><a href="#" data-add="vcard-tel" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$tel_label}}</a></li>
+						<li class="add-vcard-email"><a href="#" data-add="vcard-email" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$email_label}}</a></li>
+						<li class="add-vcard-impp"><a href="#" data-add="vcard-impp" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$impp_label}}</a></li>
+						<li class="add-vcard-url"><a href="#" data-add="vcard-url" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$url_label}}</a></li>
+						<li class="add-vcard-adr"><a href="#" data-add="vcard-adr" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$adr_label}}</a></li>
+						<li class="add-vcard-note"{{if $vcard.note}} style="display: none"{{/if}}><a href="#" data-add="vcard-note" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$note_label}}</a></li>
+					</ul>
+				</div>
+				<div id="vcard-header-{{$vcard.id}}" class="vcard-header" data-id="{{$vcard.id}}" data-action="open">
+					<i class="vcard-fn-preview fa fa-address-card-o"></i>
+					<span id="vcard-preview-{{$vcard.id}}" class="vcard-preview">
+						{{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}}
+						{{if $vcard.emails.0.address}}<span class="vcard-email-preview d-none d-md-table-cell"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}}
+						{{if $vcard.tels.0}}<span class="vcard-tel-preview d-none d-md-table-cell">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}}
+					</span>
+					<input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}">
+				</div>
+			</div>
+			<div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper">
+
+				<div class="vcard-org form-group">
+					<div class="form-vcard-org-wrapper">
+						{{if $vcard.org}}
+						<div class="form-group form-vcard-org">
+							<input type="text" name="org" value="{{$vcard.org}}" size="{{$vcard.org|count_characters:true}}" placeholder="{{$org_label}}">
+							<i data-remove="vcard-org" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						{{/if}}
+					</div>
+				</div>
+
+				<div class="vcard-title form-group">
+					<div class="form-vcard-title-wrapper">
+						{{if $vcard.title}}
+						<div class="form-group form-vcard-title">
+							<input type="text" name="title" value="{{$vcard.title}}" size="{{$vcard.title|count_characters:true}}" placeholder="{{$title_label}}">
+							<i data-remove="vcard-title" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						{{/if}}
+					</div>
+				</div>
+
+
+				<div class="vcard-tel form-group">
+					<div class="form-vcard-tel-wrapper">
+						{{if $vcard.tels}}
+						{{foreach $vcard.tels as $tel}}
+						<div class="form-group form-vcard-tel">
+							<select name="tel_type[]">
+								<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
+								<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
+								<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+								<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+								<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+							</select>
+							<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
+							<i data-remove="vcard-tel" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+
+
+				<div class="vcard-email form-group">
+					<div class="form-vcard-email-wrapper">
+						{{if $vcard.emails}}
+						{{foreach $vcard.emails as $email}}
+						<div class="form-group form-vcard-email">
+							<select name="email_type[]">
+								<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
+								<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+								<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+								<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+							</select>
+							<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
+							<i data-remove="vcard-email" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+
+				<div class="vcard-impp form-group">
+					<div class="form-vcard-impp-wrapper">
+						{{if $vcard.impps}}
+						{{foreach $vcard.impps as $impp}}
+						<div class="form-group form-vcard-impp">
+							<select name="impp_type[]">
+								<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
+								<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+								<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+								<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+							</select>
+							<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
+							<i data-remove="vcard-impp" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+
+				<div class="vcard-url form-group">
+					<div class="form-vcard-url-wrapper">
+						{{if $vcard.urls}}
+						{{foreach $vcard.urls as $url}}
+						<div class="form-group form-vcard-url">
+							<select name="url_type[]">
+								<option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option>
+								<option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+								<option value="WORK"{{if $url.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+								<option value="OTHER"{{if $url.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+							</select>
+							<input type="text" name="url[]" value="{{$url.address}}" size="{{$url.address|count_characters:true}}" placeholder="{{$url_label}}">
+							<i data-remove="vcard-url" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+
+				<div class="vcard-adr form-group">
+					<div class="form-vcard-adr-wrapper">
+						{{if $vcard.adrs}}
+						{{foreach $vcard.adrs as $adr}}
+						<div class="form-group form-vcard-adr">
+							<div class="form-group">
+								<label>{{$adr_label}}</label>
+								<select name="adr_type[]">
+									<option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option>
+									<option value="HOME"{{if $adr.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+									<option value="WORK"{{if $adr.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+									<option value="OTHER"{{if $adr.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+								</select>
+								<i data-remove="vcard-adr" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}">
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}">
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}">
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}">
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}">
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}">
+							</div>
+							<div class="form-group">
+								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}">
+							</div>
+						</div>
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+
+				<div class="vcard-note form-group form-vcard-note">
+					<div class="form-vcard-note-wrapper">
+						{{if $vcard.note}}
+						<label>{{$note_label}}</label>
+						<i data-remove="vcard-note" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						<textarea name="note" class="form-control">{{$vcard.note}}</textarea>
+						{{/if}}
+					</div>
+				</div>
+
+
+				<div class="settings-submit-wrapper" >
+					<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+				</div>
+
+			</div>
+			{{/if}}
+
+			{{if $affinity}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="affinity-tool">
+					<h3>
+						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#affinity-tool-collapse" aria-expanded="true" aria-controls="affinity-tool-collapse">
+							{{$affinity}}
+						</a>
+					</h3>
+				</div>
+				<div id="affinity-tool-collapse" class="panel-collapse collapse{{if $section == 'affinity'}} show{{/if}}" role="tabpanel" aria-labelledby="affinity-tool">
+					<div class="section-content-tools-wrapper">
+						{{if $slide}}
+						<div class="form-group"><strong>{{$lbl_slider}}</strong></div>
+						{{$slide}}
+						<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
+						{{/if}}
+
+						{{if $multiprofs}}
+						<div class="form-group">
+							<strong>{{$lbl_vis2}}</strong>
+							{{$profile_select}}
+						</div>
+						{{/if}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			{{/if}}
+
+			{{if $connfilter}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="fitert-tool">
+					<h3>
+						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#fitert-tool-collapse" aria-expanded="true" aria-controls="fitert-tool-collapse">
+							{{$connfilter_label}}
+						</a>
+					</h3>
+				</div>
+				<div id="fitert-tool-collapse" class="panel-collapse collapse{{if $section == 'filter' }} show{{/if}}" role="tabpanel" aria-labelledby="fitert-tool">
+					<div class="section-content-tools-wrapper">
+						{{include file="field_textarea.tpl" field=$incl}}
+						{{include file="field_textarea.tpl" field=$excl}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			{{else}}
+			<input type="hidden" name="{{$incl.0}}" value="{{$incl.2}}" />
+			<input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" />
+			{{/if}}
+
+			{{if $rating}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="rating-tool">
+					<h3>
+						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#rating-tool-collapse" aria-expanded="true" aria-controls="rating-tool-collapse">
+							{{$lbl_rating}}
+						</a>
+					</h3>
+				</div>
+				<div id="rating-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="rating-tool">
+					<div class="section-content-tools-wrapper">
+						<div class="section-content-warning-wrapper">
+							{{$rating_info}}
+						</div>
+						<div class="form-group"><strong>{{$lbl_rating_label}}</strong></div>
+						{{$rating}}
+						{{include file="field_textarea.tpl" field=$rating_text}}
+						<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			{{/if}}
+
+			{{/if}}
+
+			{{if ! $is_pending}}
+			<div class="panel">
+				{{if $notself}}
+				<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
+					<h3>
+						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
+							{{$permlbl}}
+						</a>
+					</h3>
+				</div>
+				{{/if}}
+				<div id="perms-tool-collapse" class="panel-collapse collapse{{if $self || $section === 'perms'}} show{{/if}}" role="tabpanel" aria-labelledby="perms-tool">
+					<div class="section-content-tools-wrapper">
+						<div class="section-content-warning-wrapper">
+						{{if $notself}}{{$permnote}}{{/if}}
+						{{if $self}}{{$permnote_self}}{{/if}}
+						</div>
+
+						{{if $permcat_enable}}
+						<div class="loading-role-rotator"></div>
+						<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
+						{{include file="field_select.tpl" field=$permcat}}
+						{{/if}}
+
+						<table id="perms-tool-table" class=form-group>
+							<tr>
+								<td></td>
+								{{if $notself}}
+								<td class="abook-them">{{$them}}</td>
+								{{/if}}
+								<td colspan="2" class="abook-me">{{$me}}</td>
+							</tr>
+							{{foreach $perms as $prm}}
+							{{include file="field_acheckbox.tpl" field=$prm}}
+							{{/foreach}}
+						</table>
+
+						{{if $self}}
+						<div>
+							<div class="section-content-info-wrapper">
+								{{$autolbl}}
+							</div>
+							{{include file="field_checkbox.tpl" field=$autoperms}}
+						</div>
+						{{/if}}
+
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			{{/if}}
+		</div>
+		</form>
+	</div>
+</div>
diff --git a/view/tpl/achievements.tpl b/view/tpl/achievements.tpl
new file mode 100644
index 000000000..7d503cc53
--- /dev/null
+++ b/view/tpl/achievements.tpl
@@ -0,0 +1,9 @@
+<div class="generic-content-wrapper">
+<p>{{$newmembertext}}</p>
+
+{{if $profilebadge}}<div id="profile-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
+{{if $contactbadge}}<div id="contact-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
+{{if $keywordsbadge}}<div id="keywords-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
+{{if $channelsbadge}}<div id="channels-badge" class="badges"><img src="images/emoticons/smiley-thumbsup.gif"></div>{{/if}}
+
+</div>
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
new file mode 100755
index 000000000..f4f851c8a
--- /dev/null
+++ b/view/tpl/acl_selector.tpl
@@ -0,0 +1,64 @@
+<form>
+<div class="modal" id="aclModal">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title">
+					<i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}
+					{{if $helpUrl}}
+					<a target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-fw fa-question"></i></a>
+					{{/if}}
+				</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="section-content-wrapper">
+				{{if $aclModalDesc}}
+				<div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div>
+				{{/if}}
+				<label for="acl-select">{{$select_label}}</label>
+				<select id="acl-select" name="optionsRadios" class="form-control form-group">
+					<option id="acl-showall" value="public" {{$public_selected}}>{{$showall}}</option>
+					{{$groups}}
+					<option id="acl-onlyme" value="onlyme" {{$justme_selected}}>{{$onlyme}}</option>
+					<option id="acl-custom" value="custom" {{$custom_selected}}>{{$custom}}</option>
+				</select>
+
+				{{if $showallOrigin}}
+				<div id="acl-info" class="form-group">
+					<i class="fa fa-info-circle"></i>&nbsp;{{$showallOrigin}}
+				</div>
+				{{/if}}
+
+				<div id="acl-wrapper">
+					<div id="acl-list">
+						<input class="form-control" type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
+						<small class="text-muted">{{$showlimitedDesc}}</small>
+						<div id="acl-list-content"></div>
+					</div>
+				</div>
+
+				<div class="acl-list-item" rel="acl-template" style="display:none">
+					<div class="acl-item-header">
+						<img class="menu-img-1" data-src="{0}"> {1}
+					</div>
+					<button class="acl-button-hide btn btn-sm btn-outline-danger"><i class="fa fa-times"></i> {{$hide}}</button>
+					<button class="acl-button-show btn btn-sm btn-outline-success"><i class="fa fa-check"></i> {{$show}}</button>
+				</div>
+			</div>
+			<div class="modal-footer clear">
+				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$aclModalDismiss}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+</form>
+<script>
+	// compatibility issue with bootstrap v4
+	//$('[data-toggle="popover"]').popover(); // Init the popover, if present
+
+	if(typeof acl=="undefined"){
+		acl = new ACL(
+			baseurl+"/acl"
+		);
+	}
+</script>
diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl
new file mode 100644
index 000000000..82d137de4
--- /dev/null
+++ b/view/tpl/admin_account_edit.tpl
@@ -0,0 +1,23 @@
+<h2>{{$title}}</h2>
+
+<h3>{{$account.account_email}}</h3>
+
+
+<form action="admin/account_edit/{{$account.account_id}}" method="post" >
+<input type="hidden" name="aid" value="{{$account.account_id}}" />
+
+{{include file="field_password.tpl" field=$pass1}}
+{{include file="field_password.tpl" field=$pass2}}
+
+{{if $z_server_role == 'pro'}}
+{{include file="field_select.tpl" field=$account_level}}
+{{else}}
+<input type="hidden" name="account_level" value="{{$account_level.2}}" />
+{{/if}}
+{{include file="field_select.tpl" field=$account_language}}
+{{include file="field_input.tpl" field=$service_class}}
+
+
+<input type="submit" name="submit" value="{{$submit}}" />
+
+</form>
diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl
new file mode 100755
index 000000000..3535363a0
--- /dev/null
+++ b/view/tpl/admin_accounts.tpl
@@ -0,0 +1,88 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function toggle_selectall(cls){
+		$("."+cls).prop("checked", !$("."+cls).prop("checked"));
+		return false;
+	}
+</script>
+<div class="generic-content-wrapper-styled" id="adminpage">
+	<h1>{{$title}} - {{$page}}</h1>
+
+	<form action="{{$baseurl}}/admin/accounts" method="post">
+		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id="pending">
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.account_created}}</td>
+					<td class="email">{{$u.account_email}}</td>
+					<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			<div class="selectall"><a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"> <input type="submit" name="page_users_approve" value="{{$approve}}"></div>
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+
+
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id="users">
+				<thead>
+				<tr>
+					{{foreach $th_users as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td class="account_id">{{$u.account_id}}</td>
+						<td class="email">{{if $u.blocked}}
+							<a href="admin/account_edit/{{$u.account_id}}"><i>{{$u.account_email}}</i></a>
+						{{else}}
+							<a href="admin/account_edit/{{$u.account_id}}"><strong>{{$u.account_email}}</strong></a>
+						{{/if}}</td>
+						<td class="channels">{{$u.channels}}</td>
+						<td class="register_date">{{$u.account_created}}</td>
+						<td class="login_date">{{$u.account_lastlog}}</td>
+						<td class="account_expires">{{$u.account_expires}}</td>
+						<td class="service_class">{{$u.account_service_class}}</td>
+						<td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
+						<td class="tools">
+							<a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}"  class="btn btn-outline-secondary btn-sm" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div>
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
new file mode 100755
index 000000000..99f139e57
--- /dev/null
+++ b/view/tpl/admin_aside.tpl
@@ -0,0 +1,46 @@
+<script>
+	// update pending count //
+	$(function(){
+
+		$("nav").bind('nav-update',  function(e,data){
+			var elm = $('#pending-update');
+			var register = $(data).find('register').text();
+			if (register=="0") { register=""; elm.hide();} else { elm.show(); }
+			elm.html(register);
+		});
+	});
+</script>
+<div class="widget">
+<h3>{{$admtxt}}</h3>
+<ul class="nav nav-pills flex-column">
+	{{foreach $admin as $link}}
+	<li class="nav-item"><a class="nav-link" href='{{$link.0}}'>{{$link.1}}{{if $link.3}}<span id='{{$link.3}}' title='{{$link.4}}'></span>{{/if}}</a></li>
+	{{/foreach}}
+</ul>
+</div>
+
+{{if $admin.update}}
+<ul class="nav nav-pills flex-column">
+	<li class="nav-item"><a class="nav-link" href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+	<li class="nav-item"><a class="nav-link" href=''>Important Changes</a></li>
+</ul>
+{{/if}}
+
+
+{{if $plugins}}
+<div class="widget">
+<h3>{{$plugadmtxt}}</h3>
+<ul class="nav nav-pills flex-column">
+	{{foreach $plugins as $l}}
+	<li class="nav-item"><a class="nav-link" href='{{$l.0}}'>{{$l.1}}</a></li>
+	{{/foreach}}
+</ul>
+</div>
+{{/if}}
+	
+<div class="widget">	
+<h3>{{$logtxt}}</h3>
+<ul class="nav nav-pills flex-column">
+	<li class="nav-item"><a class="nav-link" href='{{$logs.0}}'>{{$logs.1}}</a></li>
+</ul>
+</div>
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
new file mode 100755
index 000000000..452e0eeec
--- /dev/null
+++ b/view/tpl/admin_channels.tpl
@@ -0,0 +1,51 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div class = "generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/channels" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_channels}}</h3>
+		{{if $channels}}
+			<table id='channels'>
+				<thead>
+				<tr>
+					{{foreach $th_channels as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $channels as $c}}
+					<tr>
+						<td class='channel_id'>{{$c.channel_id}}</td>
+						<td class='channel_name'><a href="channel/{{$c.channel_address}}">{{$c.channel_name}}</a></td>
+						<td class='channel_address'>{{$c.channel_address}}</td>
+						<td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
+						<td class="tools">
+							<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs{{if ($c.allowcode)}} btn-danger{{/if}}" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('channels_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_channels_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_channels_code" value="{{$code}}/{{$uncode}}" /> <input type="submit" name="page_channels_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO CHANNELS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl
new file mode 100755
index 000000000..1bd1f0122
--- /dev/null
+++ b/view/tpl/admin_hubloc.tpl
@@ -0,0 +1,27 @@
+<div class="generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+
+	<table id='server'>
+		<thead>
+			<tr>
+			{{foreach $th_hubloc as $th}}<th>{{$th}}</th>{{/foreach}}
+			</tr>
+		</thead>
+		<tbody>
+			
+			{{foreach $hubloc as $hub}}<tr>
+			<td>{{$hub.hubloc_id}}</td><td>{{$hub.hubloc_addr}}</td><td>{{$hub.hubloc_host}}</td><td>{{$hub.hubloc_status}}</td>
+			<td>
+			<form action="{{$baseurl}}/admin/hubloc" method="post">
+			<input type="hidden" name="hublocid" value="{{$hub.hubloc_id}}">
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			<input type='hidden' name='url' value='{{$hub.hubloc_host}}'>
+			<input type="submit" name="check" value="check" >
+			<input type="submit" name="repair" value="repair" ></td>
+			</form>
+			</tr>{{/foreach}}
+		</tbody>
+	</table>
+
+
+</div>
diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
new file mode 100755
index 000000000..6d2d7834c
--- /dev/null
+++ b/view/tpl/admin_logs.tpl
@@ -0,0 +1,19 @@
+<div class="generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/logs" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_checkbox.tpl" field=$debugging}}
+	{{include file="field_input.tpl" field=$logfile}}
+	{{include file="field_select.tpl" field=$loglevel}}
+	
+	<div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>
+	
+	</form>
+	
+	<h3>{{$logname}}</h3>
+	<div style="width:100%; height:400px; overflow: auto; "><pre>{{$data}}</pre></div>
+<!--	<iframe src='{{$baseurl}}/{{$logname}}' style="width:100%; height:400px"></iframe> -->
+	<!-- <div class="submit"><input type="submit" name="page_logs_clear_log" value="{{$clear}}" /></div> -->
+</div>
diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
new file mode 100755
index 000000000..fd5ae7d5e
--- /dev/null
+++ b/view/tpl/admin_plugins.tpl
@@ -0,0 +1,190 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $allowManageRepos}}
+		<div class="pull-right">
+			<button class="btn btn-success btn-sm" onclick="openClose('form');">{{$managerepos}}</button>
+		</div>
+		{{/if}}
+		<h2 id="title">{{$title}} - {{$page}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}>
+         
+        <div class="clear"></div>
+        <div class="section-title-wrapper" style="margin-top: 20px;">
+          <h2>{{$installedtitle}}</h2>
+          <div class="clear"></div>
+        </div>
+      <div class="table-responsive section-content-tools-wrapper">
+      <table class="table table-responsive table-striped table-hover">
+        {{foreach $addonrepos as $repo}}
+        <tr>
+            <td style="width: 70%;">
+				<span class="pull-left">{{$repo.name}}</span><span id="update-message-{{$repo.name}}" style="margin-left: 20px;"></span>
+            </td>
+            <td style="width: 15%;">
+              <button class="btn btn-sm btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i>&nbsp;{{$repoUpdateButton}}</button>
+            </td>
+            <td style="width: 15%;">
+              <button class="btn btn-sm btn-danger pull-right" style="margin-left: 10px; margin-right: 0px;" onclick="removeAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-trash-o'></i>&nbsp;{{$repoRemoveButton}}</button>
+            </td>
+        <div class="clear"></div>
+        </td></tr>
+        {{/foreach}}
+        </table>
+      </div>
+      <div class="clear"></div>
+         <div class="section-title-wrapper">
+          <h2>{{$addnewrepotitle}}</h2>
+          <div class="clear"></div>
+        </div>
+		{{$form}}
+    </div>
+      <div class="clear"></div>
+    <div id="chat-rotator-wrapper" class="center-block">
+        <div id="chat-rotator"></div>
+    </div>
+    <div class="clear"></div>
+	<div class="section-content-wrapper-np">
+      {{foreach $plugins as $p}}
+      <div class="section-content-tools-wrapper" id="pluginslist">		
+		<div class="contact-info plugin {{$p.1}}">
+            {{if ! $p.2.disabled}}				
+            <a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><i class='fa {{if $p.1==on}}fa-check-square-o{{else}}fa-square-o{{/if}} admin-icons'></i></a>
+            {{else}}
+            <i class='fa fa-stop admin-icons'></i>
+            {{/if}}
+            <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>{{if $p.2.disabled}} {{$disabled}}{{/if}}
+            {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
+
+            <div class='desc'>{{$p.2.description}}</div>
+		</div>
+	</div>
+    {{/foreach}}
+      
+	</div>
+</div>
+{{$newRepoModal}}
+<script>
+  
+  // TODO: Implement a simple interface controller that reconfigures the modal dialog
+  // for each action in a more organized way
+  
+  function adminPluginsAddRepo() {
+      $("#generic-modal-ok-{{$newRepoModalID}}").removeClass('btn-success');
+      $("#generic-modal-ok-{{$newRepoModalID}}").addClass('btn-primary');
+      var repoURL = $('#id_repoURL').val();
+      var repoName = $('#id_repoName').val();
+      $('#chat-rotator').spin('tiny');
+      $.post(
+        "/admin/plugins/addrepo", {repoURL: repoURL, repoName: repoName}, 
+            function(response) {
+                $('#chat-rotator').spin(false);
+                if (response.success) {
+                  var modalBody = $('#generic-modal-body-{{$newRepoModalID}}');
+                  modalBody.html('<div>'+response.repo.readme+'</div>');
+                  modalBody.append('<h2>Repo Info</h2><p>Message: ' + response.message + '</p>');
+                  modalBody.append('<h4>Branches</h4><p>'+JSON.stringify(response.repo.branches)+'</p>');
+                  modalBody.append('<h4>Remotes</h4><p>'+JSON.stringify(response.repo.remote)+'</p>');
+                  $('.modal-dialog').width('80%');
+                  $("#generic-modal-ok-{{$newRepoModalID}}").off('click');
+                  $("#generic-modal-ok-{{$newRepoModalID}}").click(function () {
+                    installAddonRepo();
+                  });
+                  $('#generic-modal-{{$newRepoModalID}}').modal();
+                } else {
+                    window.console.log('Error adding repo :' + response['message']);
+                }
+                return false;
+            },
+        'json');
+  }
+  
+  function installAddonRepo() {
+      var repoURL = $('#id_repoURL').val();
+      var repoName = $('#id_repoName').val();
+      $.post(
+        "/admin/plugins/installrepo", {repoURL: repoURL, repoName: repoName}, 
+            function(response) {
+                if (response.success) {
+                  $('#generic-modal-title-{{$newRepoModalID}}').html('Addon repo installed');
+                  var modalBody = $('#generic-modal-body-{{$newRepoModalID}}');
+                  modalBody.html('<h2>Repo Info</h2><p>Message: ' + response.message + '</p>');
+                  modalBody.append('<h4>Branches</h4><p>'+JSON.stringify(response.repo.branches)+'</p>');
+                  modalBody.append('<h4>Remotes</h4><p>'+JSON.stringify(response.repo.remote)+'</p>');
+                  $('.modal-dialog').width('80%');
+                  //$("#generic-modal-cancel-{{$newRepoModalID}}").hide();
+                  $("#generic-modal-ok-{{$newRepoModalID}}").html('OK');
+                  $("#generic-modal-ok-{{$newRepoModalID}}").removeClass('btn-primary');
+                  $("#generic-modal-ok-{{$newRepoModalID}}").addClass('btn-success');
+                  $("#generic-modal-ok-{{$newRepoModalID}}").off('click');
+                  $("#generic-modal-ok-{{$newRepoModalID}}").click(function () {
+                    $('#generic-modal-{{$newRepoModalID}}').modal('hide');
+                    if(confirm('Repo installed. Click OK to refresh page.')) {
+                      location.reload();
+                    }
+                  });
+                  $('#generic-modal-{{$newRepoModalID}}').modal();
+              
+                } else {
+                    window.console.log('Error installing repo :' + response['message']);
+                    alert('Error installing addon repo!');
+                }
+                return false;
+            },
+        'json');
+  }
+  function updateAddonRepo(repoName) {
+    if(confirm('Are you sure you want to update the addon repo ' + repoName + '?')) {
+      $.post(
+        "/admin/plugins/updaterepo", {repoName: repoName}, 
+            function(response) {
+                if (response.success) {
+                  window.console.log('Addon repo '+repoName+' successfully updated :' + response['message']);
+                  //alert('Addon repo updated.');
+				  $('#update-message-' + repoName).css('background-color', 'yellow');
+				  $('#update-message-' + repoName).html('Repo updated!');
+				  setTimeout(function () {
+					  $('#update-message-' + repoName).html('');
+				  }, 60000);
+                } else {
+                  window.console.log('Error updating repo :' + response['message']);
+                  //alert('Error updating addon repo!');
+				  $('#update-message-' + repoName).css('background-color', 'red');
+				  $('#update-message-' + repoName).html('Error updating repo!');
+				  setTimeout(function () {
+					  $('#update-message-' + repoName).html('');
+				  }, 60000);
+                }
+                return false;
+            },
+        'json');
+    }
+  }
+  function switchAddonRepoBranch(repoName) {
+    window.console.log('switchAddonRepoBranch: ' + repoName);
+    // TODO: Discover the available branches and create an interface to switch between them
+  }
+  
+  function removeAddonRepo(repoName) {
+    // TODO: Unlink the addons
+    if(confirm('Are you sure you want to remove the addon repo ' + repoName + '?')) {
+      $.post(
+        "/admin/plugins/removerepo", {repoName: repoName}, 
+            function(response) {
+                if (response.success) {
+                  window.console.log('Addon repo '+repoName+' successfully removed :' + response['message']);
+                  if(confirm('Repo deleted. Click OK to refresh page.')) {
+                    location.reload();
+                  }
+                } else {
+                  window.console.log('Error removing repo :' + response['message']);
+                  alert('Error removing addon repo!');
+                }
+                return false;
+            },
+        'json');
+    }
+  }  
+  
+</script>
\ No newline at end of file
diff --git a/view/tpl/admin_plugins_addrepo.tpl b/view/tpl/admin_plugins_addrepo.tpl
new file mode 100644
index 000000000..de7b465bb
--- /dev/null
+++ b/view/tpl/admin_plugins_addrepo.tpl
@@ -0,0 +1,9 @@
+<form id="add-plugin-repo-form" action="{{$post}}" method="post" >
+
+    <p class="descriptive-text">{{$desc}}</p>
+    {{include file="field_input.tpl" field=$repoURL}}
+    {{include file="field_input.tpl" field=$repoName}}
+    <div class="btn-group pull-right">
+		<button id="add-plugin-repo-submit" class="btn btn-primary" type="submit" name="submit" onclick="adminPluginsAddRepo(); return false;">{{$submit}}</button>
+	</div>
+</form>
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
new file mode 100755
index 000000000..309fc9569
--- /dev/null
+++ b/view/tpl/admin_plugins_details.tpl
@@ -0,0 +1,58 @@
+<div class = "generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+
+	<p>{{if ! $info.disabled}}<i class='toggleplugin fa {{if $status==on}}fa-check-square-o{{else}}fa-square-o{{/if}} admin-icons'></i>{{else}}<i class='fa fa-stop admin-icons'></i>{{/if}} {{$info.name}} - {{$info.version}}{{if ! $info.disabled}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a>{{/if}}</p>
+
+	{{if $info.disabled}}
+	<p>{{$disabled}}</p>
+	{{/if}}
+
+	<p>{{$info.description}}</p>
+	
+	{{foreach $info.author as $a}}
+	<p class="author">{{$str_author}}
+		{{$a.name}}{{if $a.link}} {{$a.link}}{{/if}}
+	</p>
+	{{/foreach}}
+
+	{{if $info.minversion}}
+	<p class="versionlimit">{{$str_minversion}}{{$info.minversion}}</p>
+	{{/if}}
+	{{if $info.maxversion}}
+	<p class="versionlimit">{{$str_maxversion}}{{$info.maxversion}}</p>
+	{{/if}}
+	{{if $info.minphpversion}}
+	<p class="versionlimit">{{$str_minphpversion}}{{$info.minphpversion}}</p>
+	{{/if}}
+	{{if $info.serverroles}}
+	<p class="versionlimit">{{$str_serverroles}}{{$info.serverroles}}</p>
+	{{/if}}
+	{{if $info.requires}}
+	<p class="versionlimit">{{$str_requires}}{{$info.requires}}</p>
+	{{/if}}
+
+
+	{{foreach $info.maintainer as $a}}
+	<p class="maintainer">{{$str_maintainer}}
+		{{$a.name}}{{if $a.link}} {{$a.link}}{{/if}}
+	</p>
+	{{/foreach}}
+	
+	{{if $screenshot}}
+	<a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a>
+	{{/if}}
+
+	{{if $admin_form}}
+	<h3>{{$settings}}</h3>
+	<form method="post" action="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/">
+		{{$admin_form}}
+	</form>
+	{{/if}}
+
+	{{if $readme}}
+	<h3>Readme</h3>
+	<div id="plugin_readme">
+		{{$readme}}
+	</div>
+	{{/if}}
+</div>
diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl
new file mode 100644
index 000000000..e3a08449c
--- /dev/null
+++ b/view/tpl/admin_profiles.tpl
@@ -0,0 +1,38 @@
+<div class="generic-content-wrapper">
+<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-sm pull-right" href="admin/profs/new"><i class="fa fa-plus-circle"></i>&nbsp;{{$new}}</a><h2>{{$title}}</h2>
+<div class="clear"></div>
+</div>
+
+<div class="section-content-tools-wrapper">
+
+<div class="section-content-info-wrapper">{{$all_desc}}
+<br /><br />
+{{$all}}
+</div>
+
+<form action="admin/profs" method="post">
+
+{{include file="field_textarea.tpl" field=$basic}}
+{{include file="field_textarea.tpl" field=$advanced}}
+
+<input type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+
+
+
+{{if $cust_fields}}
+<br /><br />
+<div><strong>{{$cust_field_desc}}</strong></div>
+<br />
+
+<table width="100%">
+{{foreach $cust_fields as $field}}
+<tr><td>{{$field.field_name}}</td><td>{{$field.field_desc}}</td><td><a class="btn btn-danger btn-sm" href="admin/profs/drop/{{$field.id}}" title="{{$drop}}"><i class="fa fa-trash-o"></i>&nbsp;{{$drop}}</a> <a class="btn btn-sm" title="{{$edit}}" href="admin/profs/{{$field.id}}" ><i class="fa fa-pencil"></i></a></td></tr>
+{{/foreach}}
+</table>
+{{/if}}
+
+</div>
+
+</div>
diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl
new file mode 100644
index 000000000..9d3d848c9
--- /dev/null
+++ b/view/tpl/admin_queue.tpl
@@ -0,0 +1,15 @@
+<div class="generic-content-wrapper-styled">
+<h3>{{$banner}}</h3>
+
+{{if $hasentries}}
+
+<table cellpadding="10" id="admin-queue-table"><tr><td>{{$numentries}}&nbsp;&nbsp;</td><td>{{$desturl}}</td><td>{{$priority}}</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+
+{{foreach $entries as $e}}
+
+<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td><td>{{$e.priority}}</td>{{if $expert}}<td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-outline-secondary"><i class="fa fa-times"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-outline-secondary"><i class="fa fa-trash-o"></i></a></td>{{/if}}</tr>
+{{/foreach}}
+
+</table>
+
+{{/if}}
diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
new file mode 100755
index 000000000..409e9fc7d
--- /dev/null
+++ b/view/tpl/admin_security.tpl
@@ -0,0 +1,33 @@
+<div class="generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+
+	<form action="{{$baseurl}}/admin/security" method="post">
+
+	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$transport_security}}
+	{{include file="field_checkbox.tpl" field=$content_security}}
+	{{include file="field_checkbox.tpl" field=$embed_sslonly}}
+
+	{{include file="field_textarea.tpl" field=$allowed_email}}
+	{{include file="field_textarea.tpl" field=$not_allowed_email}}	
+
+	{{include file="field_textarea.tpl" field=$whitelisted_sites}}
+	{{include file="field_textarea.tpl" field=$blacklisted_sites}}
+
+	{{include file="field_textarea.tpl" field=$whitelisted_channels}}
+	{{include file="field_textarea.tpl" field=$blacklisted_channels}}
+
+	{{include file="field_textarea.tpl" field=$embed_allow}}
+	{{include file="field_textarea.tpl" field=$embed_deny}}
+
+
+	<div class="admin-submit-wrapper" >
+		<input type="submit" name="submit" class="admin-submit" value="{{$submit}}" />
+	</div>
+
+	</form>
+
+</div>
diff --git a/view/tpl/admin_settings_features.tpl b/view/tpl/admin_settings_features.tpl
new file mode 100644
index 000000000..2d5cf7e0b
--- /dev/null
+++ b/view/tpl/admin_settings_features.tpl
@@ -0,0 +1,31 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<form action="admin/features" method="post" autocomplete="off">
+	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+	<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
+		{{foreach $features as $g => $f}}
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
+				<h3>
+					<a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
+						{{$f.0}}
+					</a>
+				</h3>
+			</div>
+			<div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} in{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
+				<div class="section-content-tools-wrapper">
+					{{foreach $f.1 as $fcat}}
+						{{include file="field_checkbox.tpl" field=$fcat.0}}
+						{{include file="field_checkbox.tpl" field=$fcat.1}}
+					{{/foreach}}
+					<div class="settings-submit-wrapper" >
+						<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		{{/foreach}}
+	</div>
+</div>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
new file mode 100755
index 000000000..6fd0fd9ce
--- /dev/null
+++ b/view/tpl/admin_site.tpl
@@ -0,0 +1,101 @@
+<script>
+	$(function(){
+		
+		$("#cnftheme").colorbox({
+			width: 800,
+			onLoad: function(){
+				var theme = $("#id_theme :selected").val();
+				$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
+			}, 
+			onComplete: function(){
+				$(this).colorbox.resize(); 
+				$("#colorbox form").submit(function(e){
+					var url = $(this).attr('action');
+					// can't get .serialize() to work...
+					var data={};
+					$(this).find("input").each(function(){
+						data[$(this).attr('name')] = $(this).val();
+					});
+					$(this).find("select").each(function(){
+						data[$(this).attr('name')] = $(this).children(":selected").val();
+					});
+					console.log(":)", url, data);
+					
+					$.post(url, data, function(data) {
+						if(timer) clearTimeout(timer);
+						NavUpdate();
+						$.colorbox.close();
+					})
+					
+					return false;
+				});
+				
+			}
+		});
+	});
+</script>
+<div id="adminpage" class="generic-content-wrapper-styled">
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_select.tpl" field=$server_role}}
+
+	{{if $z_server_role == 'pro'}}
+	{{include file="field_select.tpl" field=$techlevel}}
+    {{include file="field_checkbox.tpl" field=$techlock}}
+	{{/if}}
+
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_textarea.tpl" field=$siteinfo}}
+	{{include file="field_textarea.tpl" field=$admininfo}}
+
+    {{include file="field_input.tpl" field=$reply_address}}
+    {{include file="field_input.tpl" field=$from_email}}
+    {{include file="field_input.tpl" field=$from_email_name}}
+
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+    {{include file="field_select.tpl" field=$theme_mobile}}
+    {{include file="field_input.tpl" field=$frontpage}}
+    {{include file="field_checkbox.tpl" field=$mirror_frontpage}}
+    {{include file="field_checkbox.tpl" field=$login_on_homepage}}
+    {{include file="field_checkbox.tpl" field=$enable_context_help}}
+	{{if $directory_server}}
+		{{include file="field_select.tpl" field=$directory_server}}
+	{{/if}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$registration}}</h3>
+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	{{include file="field_checkbox.tpl" field=$invite_only}}
+	{{include file="field_select.tpl" field=$access_policy}}
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+
+	<h3>{{$corporate}}</h3>
+	{{include file="field_checkbox.tpl" field=$verify_email}}
+	{{include file="field_checkbox.tpl" field=$feed_contacts}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$disable_discover_tab}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$advanced}}</h3>
+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$delivery_batch_count}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	{{include file="field_input.tpl" field=$default_expire_days}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	</form>
+</div>
diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
new file mode 100755
index 000000000..ca94b0ef7
--- /dev/null
+++ b/view/tpl/admin_summary.tpl
@@ -0,0 +1,43 @@
+<div class="generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+{{if $adminalertmsg}}
+	<p class="alert alert-warning" role="alert">{{$adminalertmsg}}</p>
+{{/if}}
+{{if $upgrade}}
+	<p class="alert alert-warning" role="alert">{{$upgrade}}</p>
+{{/if}}
+	<dl>
+		<dt>{{$queues.label}}</dt>
+		<dd>{{$queues.queue}}</dd>
+	</dl>
+	<dl>
+		<dt>{{$accounts.0}}</dt>
+		<dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd>
+	</dl>
+	<dl>
+		<dt>{{$pending.0}}</dt>
+		<dd>{{$pending.1}}</dt>
+	</dl>
+	<dl>
+		<dt>{{$channels.0}}</dt>
+		<dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd>
+	</dl>
+	<dl>
+		<dt>{{$plugins.0}}</dt>
+		<dd>
+		{{foreach $plugins.1 as $p}} {{$p}} {{/foreach}}
+		</dd>
+	</dl>
+	<dl>
+		<dt>{{$version.0}}</dt>
+		<dd>{{$version.1}} - {{$build}}</dd>
+	</dl>
+	<dl>
+		<dt>{{$vmaster.0}}</dt>
+		<dd>{{$vmaster.1}}</dd>
+	</dl>
+	<dl>
+		<dt>{{$vdev.0}}</dt>
+		<dd>{{$vdev.1}}</dd>
+	</dl>
+</div>
\ No newline at end of file
diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
new file mode 100755
index 000000000..f5495f149
--- /dev/null
+++ b/view/tpl/album_edit.tpl
@@ -0,0 +1,22 @@
+<div id="photo-album-edit-wrapper" class="section-content-tools-wrapper">
+	<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
+		<div class="form-group">
+			<label id="photo-album-edit-name-label" for="photo-album-edit-name">{{$nametext}}</label>
+			<input type="text" name="albumname" placeholder="{{$name_placeholder}}" value="{{$album}}" class="form-control" list="dl-album-edit" />
+			<datalist id="dl-album-edit">
+			{{foreach $albums as $al}}
+				{{if $al.text}}
+				<option value="{{$al.text}}">
+				{{/if}}
+			{{/foreach}}
+			</datalist>
+		</div>
+		<div class="form-group">
+			<button id="photo-album-edit-submit" type="submit" name="submit" class="btn btn-primary btn-sm pull-right" />{{$submit}}</button>
+			<button id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" class="btn btn-danger btn-sm pull-left" onclick="return confirmDelete();" />{{$dropsubmit}}</button>
+		</div>
+	</form>
+	<div id="photo-album-edit-end" class="clear"></div>
+</div>
+
+
diff --git a/view/tpl/alt_pager.tpl b/view/tpl/alt_pager.tpl
new file mode 100644
index 000000000..b46dc7662
--- /dev/null
+++ b/view/tpl/alt_pager.tpl
@@ -0,0 +1,4 @@
+<div class="pager">
+{{if $has_less}}<a href="{{$url}}&page={{$prevpage}}" class="pager-prev">{{$less}}</a>{{/if}}
+{{if $has_more}}{{if $has_less}}&nbsp;|&nbsp;{{/if}}<a href="{{$url}}&page={{$nextpage}}" class="pager-next">{{$more}}</a>{{/if}}
+</div>
diff --git a/view/tpl/api_config_xml.tpl b/view/tpl/api_config_xml.tpl
new file mode 100755
index 000000000..8c0766c73
--- /dev/null
+++ b/view/tpl/api_config_xml.tpl
@@ -0,0 +1,66 @@
+<config>
+ <site>
+  <name>{{$config.site.name}}</name>
+  <server>{{$config.site.server}}</server>
+  <theme>default</theme>
+  <path></path>
+  <logo>{{$config.site.logo}}</logo>
+
+  <fancy>true</fancy>
+  <language>en</language>
+  <email>{{$config.site.email}}</email>
+  <broughtby></broughtby>
+  <broughtbyurl></broughtbyurl>
+  <timezone>UTC</timezone>
+  <closed>{{$config.site.closed}}</closed>
+
+  <inviteonly>false</inviteonly>
+  <private>{{$config.site.private}}</private>
+  <textlimit>{{$config.site.textlimit}}</textlimit>
+  <ssl>{{$config.site.ssl}}</ssl>
+  <sslserver>{{$config.site.sslserver}}</sslserver>
+  <shorturllength>30</shorturllength>
+
+</site>
+ <license>
+  <type>cc</type>
+  <owner></owner>
+  <url>http://creativecommons.org/licenses/by/3.0/</url>
+  <title>Creative Commons Attribution 3.0</title>
+  <image>http://i.creativecommons.org/l/by/3.0/80x15.png</image>
+
+</license>
+ <nickname>
+  <featured></featured>
+</nickname>
+ <profile>
+  <biolimit></biolimit>
+</profile>
+ <group>
+  <desclimit></desclimit>
+</group>
+ <notice>
+
+  <contentlimit></contentlimit>
+</notice>
+ <throttle>
+  <enabled>false</enabled>
+  <count>20</count>
+  <timespan>600</timespan>
+</throttle>
+ <xmpp>
+
+  <enabled>false</enabled>
+  <server>INVALID SERVER</server>
+  <port>5222</port>
+  <user>update</user>
+</xmpp>
+ <integration>
+  <source>StatusNet</source>
+
+</integration>
+ <attachments>
+  <uploads>false</uploads>
+  <file_quota>0</file_quota>
+</attachments>
+</config>
diff --git a/view/tpl/api_friends_xml.tpl b/view/tpl/api_friends_xml.tpl
new file mode 100755
index 000000000..f2a7234d1
--- /dev/null
+++ b/view/tpl/api_friends_xml.tpl
@@ -0,0 +1,5 @@
+<users type="array">
+	{{foreach $users as $user}}
+	{{include file="api_user_xml.tpl"}}
+	{{/foreach}}
+</users>
diff --git a/view/tpl/api_ratelimit_xml.tpl b/view/tpl/api_ratelimit_xml.tpl
new file mode 100755
index 000000000..e4b470a25
--- /dev/null
+++ b/view/tpl/api_ratelimit_xml.tpl
@@ -0,0 +1,6 @@
+<hash>
+ <remaining-hits type="integer">{{$hash.remaining_hits}}</remaining-hits>
+ <hourly-limit type="integer">{{$hash.hourly_limit}}</hourly-limit>
+ <reset-time type="datetime">{{$hash.reset_time}}</reset-time>
+ <reset_time_in_seconds type="integer">{{$hash.resettime_in_seconds}}</reset_time_in_seconds>
+</hash>
diff --git a/view/tpl/api_status_xml.tpl b/view/tpl/api_status_xml.tpl
new file mode 100755
index 000000000..cbb736e22
--- /dev/null
+++ b/view/tpl/api_status_xml.tpl
@@ -0,0 +1,46 @@
+<status>{{if $status}}
+    <created_at>{{$status.created_at}}</created_at>
+    <id>{{$status.id}}</id>
+    <text>{{$status.text}}</text>
+    <source>{{$status.source}}</source>
+    <truncated>{{$status.truncated}}</truncated>
+    <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id>
+    <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id>
+    <favorited>{{$status.favorited}}</favorited>
+    <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
+    <geo>{{$status.geo}}</geo>
+    <coordinates>{{$status.coordinates}}</coordinates>
+    <place>{{$status.place}}</place>
+    <contributors>{{$status.contributors}}</contributors>
+	<user>
+	  <id>{{$status.user.id}}</id>
+	  <name>{{$status.user.name}}</name>
+	  <screen_name>{{$status.user.screen_name}}</screen_name>
+	  <location>{{$status.user.location}}</location>
+	  <description>{{$status.user.description}}</description>
+	  <profile_image_url>{{$status.user.profile_image_url}}</profile_image_url>
+	  <url>{{$status.user.url}}</url>
+	  <protected>{{$status.user.protected}}</protected>
+	  <followers_count>{{$status.user.followers}}</followers_count>
+	  <profile_background_color>{{$status.user.profile_background_color}}</profile_background_color>
+  	  <profile_text_color>{{$status.user.profile_text_color}}</profile_text_color>
+  	  <profile_link_color>{{$status.user.profile_link_color}}</profile_link_color>
+  	  <profile_sidebar_fill_color>{{$status.user.profile_sidebar_fill_color}}</profile_sidebar_fill_color>
+  	  <profile_sidebar_border_color>{{$status.user.profile_sidebar_border_color}}</profile_sidebar_border_color>
+  	  <friends_count>{{$status.user.friends_count}}</friends_count>
+  	  <created_at>{{$status.user.created_at}}</created_at>
+  	  <favourites_count>{{$status.user.favourites_count}}</favourites_count>
+  	  <utc_offset>{{$status.user.utc_offset}}</utc_offset>
+  	  <time_zone>{{$status.user.time_zone}}</time_zone>
+  	  <profile_background_image_url>{{$status.user.profile_background_image_url}}</profile_background_image_url>
+  	  <profile_background_tile>{{$status.user.profile_background_tile}}</profile_background_tile>
+  	  <profile_use_background_image>{{$status.user.profile_use_background_image}}</profile_use_background_image>
+  	  <notifications></notifications>
+  	  <geo_enabled>{{$status.user.geo_enabled}}</geo_enabled>
+  	  <verified>{{$status.user.verified}}</verified>
+  	  <following></following>
+  	  <statuses_count>{{$status.user.statuses_count}}</statuses_count>
+  	  <lang>{{$status.user.lang}}</lang>
+  	  <contributors_enabled>{{$status.user.contributors_enabled}}</contributors_enabled>
+	  </user>
+{{/if}}</status>
diff --git a/view/tpl/api_test_xml.tpl b/view/tpl/api_test_xml.tpl
new file mode 100755
index 000000000..80a541c39
--- /dev/null
+++ b/view/tpl/api_test_xml.tpl
@@ -0,0 +1 @@
+<ok>{{$ok}}</ok>
diff --git a/view/tpl/api_timeline_atom.tpl b/view/tpl/api_timeline_atom.tpl
new file mode 100755
index 000000000..e8bfb689e
--- /dev/null
+++ b/view/tpl/api_timeline_atom.tpl
@@ -0,0 +1,90 @@
+<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
+ <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
+ <id>{{$rss.self}}</id>
+ <title>Friendika</title>
+ <subtitle>Friendika API feed</subtitle>
+ <logo>{{$rss.logo}}</logo>
+ <updated>{{$rss.atom_updated}}</updated>
+ <link type="text/html" rel="alternate" href="{{$rss.alternate}}"/>
+ <link type="application/atom+xml" rel="self" href="{{$rss.self}}"/>
+ 
+ 
+ <author>
+	<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
+	<uri>{{$user.url}}</uri>
+	<name>{{$user.name}}</name>
+	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
+	<georss:point></georss:point>
+	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
+	<poco:displayName>{{$user.name}}</poco:displayName>
+	<poco:urls>
+		<poco:type>homepage</poco:type>
+		<poco:value>{{$user.url}}</poco:value>
+		<poco:primary>true</poco:primary>
+	</poco:urls>
+	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
+ </author>
+
+ <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
+ <activity:subject>
+	<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
+	<id>{{$user.contact_url}}</id>
+	<title>{{$user.name}}</title>
+	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
+	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
+	<poco:displayName>{{$user.name}}</poco:displayName>
+	<poco:urls>
+		<poco:type>homepage</poco:type>
+		<poco:value>{{$user.url}}</poco:value>
+		<poco:primary>true</poco:primary>
+	</poco:urls>
+	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
+ </activity:subject>
+ 
+ 
+  	{{foreach $statuses as $status}}
+	<entry>
+		<activity:obj_type>{{$status.objecttype}}</activity:obj_type>
+		<id>{{$status.message_id}}</id>
+		<title>{{$status.text}}</title>
+		<content type="html">{{$status.statusnet_html}}</content>
+		<link rel="alternate" type="text/html" href="{{$status.url}}"/>
+		<activity:verb>{{$status.verb}}</activity:verb>
+		<published>{{$status.published}}</published>
+		<updated>{{$status.updated}}</updated>
+
+		<link rel="self" type="application/atom+xml" href="{{$status.self}}"/>
+		<link rel="edit" type="application/atom+xml" href="{{$status.edit}}"/>
+		<statusnet:notice_info local_id="{{$status.id}}" source="{{$status.source}}" >
+		</statusnet:notice_info>
+
+		<author>
+			<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
+			<uri>{{$status.user.url}}</uri>
+			<name>{{$status.user.name}}</name>
+			<link rel="alternate" type="text/html" href="{{$status.user.url}}"/>
+			<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$status.user.profile_image_url}}"/>
+
+			<georss:point/>
+			<poco:preferredUsername>{{$status.user.screen_name}}</poco:preferredUsername>
+			<poco:displayName>{{$status.user.name}}</poco:displayName>
+			<poco:address/>
+			<poco:urls>
+				<poco:type>homepage</poco:type>
+				<poco:value>{{$status.user.url}}</poco:value>
+				<poco:primary>true</poco:primary>
+			</poco:urls>
+		</author>
+		<link rel="ostatus:conversation" type="text/html" href="{{$status.url}}"/> 
+
+	</entry>    
+    {{/foreach}}
+</feed>
diff --git a/view/tpl/api_timeline_rss.tpl b/view/tpl/api_timeline_rss.tpl
new file mode 100755
index 000000000..86c645e99
--- /dev/null
+++ b/view/tpl/api_timeline_rss.tpl
@@ -0,0 +1,26 @@
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
+  <channel>
+    <title>Friendika</title>
+    <link>{{$rss.alternate}}</link>
+    <atom:link type="application/rss+xml" rel="self" href="{{$rss.self}}"/>
+    <description>Friendika timeline</description>
+    <language>{{$rss.language}}</language>
+    <ttl>40</ttl>
+	<image>
+		<link>{{$user.link}}</link>
+		<title>{{$user.name}}'s items</title>
+		<url>{{$user.profile_image_url}}</url>
+	</image>
+	
+{{foreach $statuses as $status}}
+  <item>
+    <title>{{$status.user.name}}: {{$status.text}}</title>
+    <description>{{$status.text}}</description>
+    <pubDate>{{$status.created_at}}</pubDate>
+    <guid>{{$status.url}}</guid>
+    <link>{{$status.url}}</link>
+    <twitter:source>{{$status.source}}</twitter:source>
+  </item>
+{{/foreach}}
+  </channel>
+</rss>
diff --git a/view/tpl/api_timeline_xml.tpl b/view/tpl/api_timeline_xml.tpl
new file mode 100755
index 000000000..f14d73e9c
--- /dev/null
+++ b/view/tpl/api_timeline_xml.tpl
@@ -0,0 +1,20 @@
+<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
+{{foreach $statuses as $status}} <status>
+  <text>{{$status.text}}</text>
+  <truncated>{{$status.truncated}}</truncated>
+  <created_at>{{$status.created_at}}</created_at>
+  <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id>
+  <source>{{$status.source}}</source>
+  <id>{{$status.id}}</id>
+  <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id>
+  <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
+  <geo>{{$status.geo}}</geo>
+  <favorited>{{$status.favorited}}</favorited>
+{{include file="api_user_xml.tpl" user=$status.user}}  <statusnet:html>{{$status.statusnet_html}}</statusnet:html>
+  <statusnet:conversation_id>{{$status.statusnet_conversation_id}}</statusnet:conversation_id>
+  <url>{{$status.url}}</url>
+  <coordinates>{{$status.coordinates}}</coordinates>
+  <place>{{$status.place}}</place>
+  <contributors>{{$status.contributors}}</contributors>
+ </status>
+{{/foreach}}</statuses>
diff --git a/view/tpl/api_user_xml.tpl b/view/tpl/api_user_xml.tpl
new file mode 100755
index 000000000..3b51992f6
--- /dev/null
+++ b/view/tpl/api_user_xml.tpl
@@ -0,0 +1,46 @@
+  <user>
+   <id>{{$user.id}}</id>
+   <name>{{$user.name}}</name>
+   <screen_name>{{$user.screen_name}}</screen_name>
+   <location>{{$user.location}}</location>
+   <description>{{$user.description}}</description>
+   <profile_image_url>{{$user.profile_image_url}}</profile_image_url>
+   <url>{{$user.url}}</url>
+   <protected>{{$user.protected}}</protected>
+   <followers_count>{{$user.followers_count}}</followers_count>
+   <friends_count>{{$user.friends_count}}</friends_count>
+   <created_at>{{$user.created_at}}</created_at>
+   <favourites_count>{{$user.favourites_count}}</favourites_count>
+   <utc_offset>{{$user.utc_offset}}</utc_offset>
+   <time_zone>{{$user.time_zone}}</time_zone>
+   <statuses_count>{{$user.statuses_count}}</statuses_count>
+   <following>{{$user.following}}</following>
+   <profile_background_color>{{$user.profile_background_color}}</profile_background_color>
+   <profile_text_color>{{$user.profile_text_color}}</profile_text_color>
+   <profile_link_color>{{$user.profile_link_color}}</profile_link_color>
+   <profile_sidebar_fill_color>{{$user.profile_sidebar_fill_color}}</profile_sidebar_fill_color>
+   <profile_sidebar_border_color>{{$user.profile_sidebar_border_color}}</profile_sidebar_border_color>
+   <profile_background_image_url>{{$user.profile_background_image_url}}</profile_background_image_url>
+   <profile_background_tile>{{$user.profile_background_tile}}</profile_background_tile>
+   <profile_use_background_image>{{$user.profile_use_background_image}}</profile_use_background_image>
+   <notifications>{{$user.notifications}}</notifications>
+   <geo_enabled>{{$user.geo_enabled}}</geo_enabled>
+   <verified>{{$user.verified}}</verified>
+   <lang>{{$user.lang}}</lang>
+   <contributors_enabled>{{$user.contributors_enabled}}</contributors_enabled>
+   <status>{{if $user.status}}
+    <created_at>{{$user.status.created_at}}</created_at>
+    <id>{{$user.status.id}}</id>
+    <text>{{$user.status.text}}</text>
+    <source>{{$user.status.source}}</source>
+    <truncated>{{$user.status.truncated}}</truncated>
+    <in_reply_to_status_id>{{$user.status.in_reply_to_status_id}}</in_reply_to_status_id>
+    <in_reply_to_user_id>{{$user.status.in_reply_to_user_id}}</in_reply_to_user_id>
+    <favorited>{{$user.status.favorited}}</favorited>
+    <in_reply_to_screen_name>{{$user.status.in_reply_to_screen_name}}</in_reply_to_screen_name>
+    <geo>{{$user.status.geo}}</geo>
+    <coordinates>{{$user.status.coordinates}}</coordinates>
+    <place>{{$user.status.place}}</place>
+    <contributors>{{$user.status.contributors}}</contributors>
+  {{/if}}</status>
+  </user>
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
new file mode 100644
index 000000000..28f28611e
--- /dev/null
+++ b/view/tpl/app.tpl
@@ -0,0 +1,30 @@
+{{if !$navapps}}
+<div class="app-container">
+	<div class="app-detail{{if $deleted}} app-deleted{{/if}}">
+		<a href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $app.desc}} title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}}
+			<div class="app-name" style="text-align:center;">{{$app.name}}</div>
+		</a>
+	</div>
+	{{if $app.type !== 'system'}}
+	{{if $purchase}}
+	<div class="app-purchase">
+		<a href="{{$app.page}}" class="btn btn-outline-secondary" title="{{$purchase}}" ><i class="fa fa-external"></i></a>
+	</div>
+	{{/if}}
+	{{if $install || $update || $delete || $feature}}
+	<div class="app-tools">
+		<form action="{{$hosturl}}appman" method="post">
+		<input type="hidden" name="papp" value="{{$app.papp}}" />
+		{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-outline-secondary btn-sm" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}}
+		{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}}
+		{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}}
+		{{if $feature}}<button type="submit" name="feature" value="feature" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-star"{{if $featured}} style="color: gold"{{/if}}></i></button>{{/if}}
+		</form>
+	</div>
+	{{/if}}
+	{{/if}}
+</div>
+{{else}}
+<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
+{{/if}}
+
diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl
new file mode 100644
index 000000000..5075ce5e2
--- /dev/null
+++ b/view/tpl/app_create.tpl
@@ -0,0 +1,40 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$banner}}</h2>
+	</div>
+
+	<div class="clearfix section-content-wrapper">
+		<form action="appman" method="post">
+		{{if $guid}}
+		<input type="hidden" name="guid" value="{{$guid}}" />
+		{{/if}}
+		{{if $author}}
+		<input type="hidden" name="author" value="{{$author}}" />
+		{{/if}}
+		{{if $addr}}
+		<input type="hidden" name="addr" value="{{$addr}}" />
+		{{/if}}
+
+		<input type="hidden" name="requires" value="{{$requires}}" />
+		<input type="hidden" name="system" value="{{$system}}" />
+		<input type="hidden" name="plugin" value="{{$plugin}}" />
+
+
+		{{include file="field_input.tpl" field=$name}}
+		{{include file="field_input.tpl" field=$categories}}
+		{{include file="field_input.tpl" field=$url}}
+		{{include file="field_textarea.tpl" field=$desc}}
+		{{include file="field_input.tpl" field=$photo}}
+		{{include file="field_input.tpl" field=$version}}
+		{{include file="field_input.tpl" field=$price}}
+		{{include file="field_input.tpl" field=$page}}
+
+		{{if $embed}}
+		{{include file="field_textarea.tpl" field=$embed}}
+		{{/if}}
+
+		<button class="btn btn-primary float-right" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+
+		</form>
+	</div>
+</div>
diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
new file mode 100755
index 000000000..ba50867ff
--- /dev/null
+++ b/view/tpl/atom_feed.tpl
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<feed xmlns="http://www.w3.org/2005/Atom"
+      xmlns:thr="http://purl.org/syndication/thread/1.0"
+      xmlns:at="http://purl.org/atompub/tombstones/1.0"
+      xmlns:media="http://purl.org/syndication/atommedia"
+      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
+      xmlns:zot="http://purl.org/zot"
+      xmlns:as="http://activitystrea.ms/spec/1.0/"
+      xmlns:georss="http://www.georss.org/georss"
+      xmlns:poco="http://portablecontacts.net/spec/1.0"
+      xmlns:ostatus="http://ostatus.org/schema/1.0"
+      xmlns:statusnet="http://status.net/schema/api/1/" >
+
+  <id>{{$feed_id}}</id>
+  <title>{{$feed_title}}</title>
+  <generator uri="http://hubzilla.org" version="{{$version}}">{{$red}}</generator>
+  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
+  <link rel="alternate" type="text/html" href="{{$profile_page}}" />
+{{if $author}}
+{{$author}}
+{{/if}}
+
+  <updated>{{$feed_updated}}</updated>
+
+  <zot:owner>
+    <name>{{$name}}</name>
+    <uri>{{$profile_page}}</uri>
+    <link rel="photo"  type="{{$mimephoto}}" media:width="175" media:height="175" href="{{$photo}}" />
+    <link rel="avatar" type="{{$mimephoto}}" media:width="175" media:height="175" href="{{$photo}}" />
+  </zot:owner>
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
new file mode 100644
index 000000000..62442ff7a
--- /dev/null
+++ b/view/tpl/attach_edit.tpl
@@ -0,0 +1,31 @@
+<form id="attach_edit_form_{{$file.id}}" action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" class="acl-form" data-form_id="attach_edit_form_{{$file.id}}" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+	<input type="hidden" name="channelnick" value="{{$channelnick}}" />
+	<input type="hidden" name="filehash" value="{{$file.hash}}" />
+	<input type="hidden" name="uid" value="{{$uid}}" />
+	<input type="hidden" name="fileid" value="{{$file.id}}" />
+	{{if !$isadir}}{{include file="field_checkbox.tpl" field=$notify}}{{/if}}
+	{{if $isadir}}{{include file="field_checkbox.tpl" field=$recurse}}{{/if}}
+	<div id="attach-edit-tools-share" class="btn-group form-group">
+		{{if !$isadir}}
+		<a href="/rpost?attachment=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-outline-secondary btn-sm" title="{{$attach_btn_title}}">
+			<i class="fa fa-share-square-o jot-icons"></i>
+		</a>
+		{{/if}}
+		<button id="link-btn" class="btn btn-outline-secondary btn-sm" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}">
+			<i class="fa fa-link jot-icons"></i>
+		</button>
+	</div>
+	<div id="attach-edit-perms" class="btn-group pull-right">
+		<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button">
+			<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
+		</button>
+		<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit">
+			{{$submit}}
+		</button>
+	</div>
+	<div id="link-code" class="form-group">
+		<label for="">{{$cpldesc}}</label>
+		<input type="text" class="form-control" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/>
+	</div>
+</form>
+
diff --git a/view/tpl/birthdays_reminder.tpl b/view/tpl/birthdays_reminder.tpl
new file mode 100755
index 000000000..d0500364a
--- /dev/null
+++ b/view/tpl/birthdays_reminder.tpl
@@ -0,0 +1,10 @@
+{{if $count}}
+<div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div>
+<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div>
+<div id="birthday-title-end"></div>
+{{foreach $events as $event}}
+<div class="birthday-list" id="birthday-{{$event.id}}"></a> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
+{{/foreach}}
+</div>
+{{/if}}
+
diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl
new file mode 100644
index 000000000..7f400bba2
--- /dev/null
+++ b/view/tpl/blocklist.tpl
@@ -0,0 +1,69 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $editor}}
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('block-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{if $editor}}
+	<div id="block-editor" class="section-content-tools-wrapper">
+		{{$editor}}
+	</div>
+	{{/if}}
+	{{if $pages}}
+	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+		<table id="block-list-table">
+			<tr>
+				<th width="1%">{{$name}}</th>
+				<th width="94%">{{$blocktitle}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%" class="d-none d-md-table-cell">{{$created}}</th>
+				<th width="1%" class="d-none d-md-table-cell">{{$edited}}</th>
+			</tr>
+			{{foreach $pages as $key => $items}}
+			{{foreach $items as $item}}
+			<tr id="block-list-item-{{$item.url}}">
+				<td>
+					{{if $view}}
+					<a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a>
+					{{else}}
+					{{$item.name}}
+					{{/if}}
+				</td>
+				<td>
+					{{$item.title}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $item.bb_element}}
+					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+					{{/if}}
+				</td>
+				<td class="d-none d-md-table-cell">
+					{{$item.created}}
+				</td>
+				<td class="d-none d-md-table-cell">
+					{{$item.edited}}
+				</td>
+			</tr>
+			{{/foreach}}
+			{{/foreach}}
+		</table>
+	</div>
+	<div class="clear"></div>
+	{{/if}}
+</div>
diff --git a/view/tpl/bookmarkedchats.tpl b/view/tpl/bookmarkedchats.tpl
new file mode 100644
index 000000000..3aabf835a
--- /dev/null
+++ b/view/tpl/bookmarkedchats.tpl
@@ -0,0 +1,10 @@
+{{if $rooms}}
+<div id="chatroom_bookmarks" class="widget">
+<h3>{{$header}}</h3>
+<ul class="bookmarkchat nav nav-pills nav-stacked">
+{{foreach $rooms as $room}}
+<li><a href="{{$room.xchat_url}}">{{$room.xchat_desc}}</a></li>
+{{/foreach}}
+</ul>
+</div>
+{{/if}}
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
new file mode 100755
index 000000000..a76d4e549
--- /dev/null
+++ b/view/tpl/build_query.tpl
@@ -0,0 +1,65 @@
+<script> 
+
+	var bParam_cmd = "{{$baseurl}}/update_{{$pgtype}}";
+
+
+	var bParam_uid = {{$uid}};
+	var bParam_gid = {{$gid}};
+	var bParam_cid = {{$cid}};
+	var bParam_cmin = {{$cmin}};
+	var bParam_cmax = {{$cmax}};
+	var bParam_star = {{$star}};
+	var bParam_liked = {{$liked}};
+	var bParam_conv = {{$conv}};
+	var bParam_spam = {{$spam}};
+	var bParam_new = {{$nouveau}};
+	var bParam_page = {{$page}};
+	var bParam_wall = {{$wall}};
+	var bParam_list = {{$list}};
+	var bParam_fh = {{$fh}};
+	var bParam_static = {{$static}};
+
+	var bParam_search = "{{$search}}";
+	var bParam_xchan = "{{$xchan}}";
+	var bParam_order = "{{$order}}";
+	var bParam_file = "{{$file}}";
+	var bParam_cats = "{{$cats}}";
+	var bParam_tags = "{{$tags}}";
+	var bParam_dend = "{{$dend}}";
+	var bParam_dbegin = "{{$dbegin}}";
+	var bParam_mid = "{{$mid}}";
+	var bParam_verb = "{{$verb}}";
+
+	function buildCmd() {
+		var udargs = ((page_load) ? "/load" : "");
+		var bCmd = bParam_cmd + udargs + "?f=" ;
+		if(bParam_uid) bCmd = bCmd + "&p=" + bParam_uid;
+		if(bParam_cmin != 0) bCmd = bCmd + "&cmin=" + bParam_cmin;
+		if(bParam_cmax != 99) bCmd = bCmd + "&cmax=" + bParam_cmax;
+		if(bParam_gid != 0) { bCmd = bCmd + "&gid=" + bParam_gid; } else
+		if(bParam_cid != 0) { bCmd = bCmd + "&cid=" + bParam_cid; }
+		if(bParam_static != 0) { bCmd = bCmd + "&static=" + bParam_static; }
+		if(bParam_star != 0) bCmd = bCmd + "&star=" + bParam_star;
+		if(bParam_liked != 0) bCmd = bCmd + "&liked=" + bParam_liked;
+		if(bParam_conv!= 0) bCmd = bCmd + "&conv=" + bParam_conv;
+		if(bParam_spam != 0) bCmd = bCmd + "&spam=" + bParam_spam;
+		if(bParam_new != 0) bCmd = bCmd + "&new=" + bParam_new;
+		if(bParam_wall != 0) bCmd = bCmd + "&wall=" + bParam_wall;
+		if(bParam_list != 0) bCmd = bCmd + "&list=" + bParam_list;
+		if(bParam_fh != 0) bCmd = bCmd + "&fh=" + bParam_fh;
+		if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search;
+		if(bParam_xchan != "") bCmd = bCmd + "&xchan=" + bParam_xchan;
+		if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order;
+		if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file;
+		if(bParam_cats != "") bCmd = bCmd + "&cat=" + bParam_cats;
+		if(bParam_tags != "") bCmd = bCmd + "&tag=" + bParam_tags;
+		if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
+		if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin;
+		if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid;
+		if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb;
+		if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
+		return(bCmd);
+	}
+
+</script>
+
diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl
new file mode 100755
index 000000000..72478aa3d
--- /dev/null
+++ b/view/tpl/categories_widget.tpl
@@ -0,0 +1,12 @@
+<div id="categories-sidebar" class="widget">
+	<h3>{{$title}}</h3>
+	<div id="categories-sidebar-desc">{{$desc}}</div>
+	
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item"><a href="{{$base}}" class="nav-link{{if $sel_all}} active{{/if}}">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+		<li class="nav-item"><a  href="{{$base}}?f=&cat={{$term.name}}" class="nav-link{{if $term.selected}} active{{/if}}">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/tpl/cdav_addressbook.tpl b/view/tpl/cdav_addressbook.tpl
new file mode 100644
index 000000000..587a95caa
--- /dev/null
+++ b/view/tpl/cdav_addressbook.tpl
@@ -0,0 +1,462 @@
+<script>
+$(document).ready(function() {
+
+	$(document).on('click', '.vcard-header, .vcard-cancel-btn', updateView);
+	$(document).on('click', '.add-field', doAdd);
+	$(document).on('click', '.remove-field', doRemove);
+
+	function updateView() {
+		var id = $(this).data('id');
+		var action = $(this).data('action');
+		var header = $('#vcard-header-' + id);
+		var cancel = $('#vcard-cancel-' + id);
+		var addField = $('#vcard-add-field-' + id);
+		var info = $('#vcard-info-' + id);
+		var vcardPreview = $('#vcard-preview-' + id);
+		var fn = $('#vcard-fn-' + id);
+
+		if(action === 'open') {
+			$(header).addClass('active');
+			$(cancel).show();
+			$(addField).show();
+			$(info).show();
+			$(fn).show();
+			$(vcardPreview).hide();
+		}
+		else {
+			$(header).removeClass('active');
+			$(cancel).hide();
+			$(addField).hide();
+			$(info).hide();
+			$(fn).hide();
+			$(vcardPreview).show();
+		}
+	}
+
+	function doAdd(e) {
+		e.preventDefault();
+		var what = $(this).data('add');
+		var id = $(this).data('id');
+		var element = '#template-form-' + what;
+		var where = '#card_form_' + id;
+
+		$(element + ' .remove-field').attr('data-id', id)
+
+		if(what === 'vcard-adr') {
+			var adrCount = $(where + ' .form-' + what).length;
+			var attrName = 'adr[' + adrCount + '][]';
+			$(element + ' input').attr('name', attrName);
+		}
+
+		if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') {
+			$(where + ' .add-' + what).hide()
+		}
+
+		$(element).clone().removeAttr('id').appendTo(where + ' .form-' + what + '-wrapper');
+	}
+
+	function doRemove() {
+		var what = $(this).data('remove');
+		var element = $(this).parents('div.form-' + what);
+		var where = '#card_form_' + $(this).data('id');
+
+		if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') {
+			$(where + ' .add-' + what).show()
+		}
+
+		$(element).remove();
+	}
+
+});
+</script>
+<div id="template-form-vcard-org" class="form-group form-vcard-org">
+	<div class="form-group form-vcard-org">
+		<input type="text" name="org" value="" placeholder="{{$org_label}}">
+		<i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	</div>
+</div>
+
+<div id="template-form-vcard-title" class="form-group form-vcard-title">
+	<div class="form-group form-vcard-title">
+		<input type="text" name="title" value="" placeholder="{{$title_label}}">
+		<i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	</div>
+</div>
+
+<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
+	<select name="tel_type[]">
+		<option value="CELL">{{$mobile}}</option>
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
+	<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-email" class="form-group form-vcard-email">
+	<select name="email_type[]">
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
+	<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
+	<select name="impp_type[]">
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
+	<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-url" class="form-group form-vcard-url">
+	<select name="url_type[]">
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="url[]" value="" placeholder="{{$url_label}}">
+	<i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-adr" class="form-group form-vcard-adr">
+	<div class="form-group">
+		<select name="adr_type[]">
+			<option value="HOME">{{$home}}</option>
+			<option value="WORK">{{$work}}</option>
+			<option value="OTHER">{{$other}}</option>
+		</select>
+		<label>{{$adr_label}}</label>
+		<i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$po_box}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$extra}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$street}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$locality}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$region}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$zip_code}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$country}}">
+	</div>
+</div>
+
+<div id="template-form-vcard-note" class="form-group form-vcard-note">
+	<label>{{$note_label}}</label>
+	<i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	<textarea name="note" class="form-control"></textarea>
+</div>
+
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<button type="button" class="btn btn-success btn-sm float-right" onclick="openClose('create_form')"><i class="fa fa-plus-circle"></i> {{$add_card}}</button>
+		<h2>{{$displayname}}</h2>
+	</div>
+	<div id="create_form" class="section-content-tools-wrapper">
+		<form id="card_form_new" method="post" action="">
+			<input type="hidden" name="target" value="{{$id}}">
+			<div class="dropdown pull-right">
+				<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+				<div class="dropdown-menu dropdown-menu-right">
+					<a class="dropdown-item add-vcard-org add-field" style="display: none" href="#" data-add="vcard-org" data-id="new">{{$org_label}}</a>
+					<a class="dropdown-item add-vcard-title add-field" style="display: none" href="#" data-add="vcard-title" data-id="new">{{$title_label}}</a>
+					<a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="new">{{$tel_label}}</a>
+					<a class="dropdown-item add-vcard-email add-field" href="#" data-add="vcard-email" data-id="new">{{$email_label}}</a>
+					<a class="dropdown-item add-vcard-impp add-field" href="#" data-add="vcard-impp" data-id="new">{{$impp_label}}</a>
+					<a class="dropdown-item add-vcard-url add-field" href="#" data-add="vcard-url" data-id="new">{{$url_label}}</a>
+					<a class="dropdown-item add-vcard-adr add-field" href="#" data-add="vcard-adr" data-id="new">{{$adr_label}}</a>
+					<a class="dropdown-item add-vcard-note add-field" href="#" data-add="vcard-note" data-id="new">{{$note_label}}</a>
+				</div>
+			</div>
+
+			<div class="vcard-fn-create form-group">
+				<div class="form-vcard-fn-wrapper">
+					<div class="form-group form-vcard-fn">
+						<div class="vcard-nophoto"><i class="fa fa-user"></i></div><input type="text" name="fn" value="" placeholder="{{$name_label}}">
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-org form-group">
+				<div class="form-vcard-org-wrapper">
+					<div class="form-group form-vcard-org">
+						<input type="text" name="org" value="" placeholder="{{$org_label}}">
+						<i data-remove="vcard-org" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-title form-group">
+				<div class="form-vcard-title-wrapper">
+					<div class="form-group form-vcard-title">
+						<input type="text" name="title" value="" placeholder="{{$title_label}}">
+						<i data-remove="vcard-title" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-tel form-group">
+				<div class="form-vcard-tel-wrapper">
+					<div class="form-group form-vcard-tel">
+						<select name="tel_type[]">
+							<option value="CELL">{{$mobile}}</option>
+							<option value="HOME">{{$home}}</option>
+							<option value="WORK">{{$work}}</option>
+							<option value="OTHER">{{$other}}</option>
+						</select>
+						<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
+						<i data-remove="vcard-tel" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+
+			<div class="vcard-email form-group">
+				<div class="form-vcard-email-wrapper">
+					<div class="form-group form-vcard-email">
+						<select name="email_type[]">
+							<option value="HOME">{{$home}}</option>
+							<option value="WORK">{{$work}}</option>
+							<option value="OTHER">{{$other}}</option>
+						</select>
+						<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
+						<i data-remove="vcard-email" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-impp form-group">
+				<div class="form-vcard-impp-wrapper">
+				</div>
+			</div>
+
+			<div class="vcard-url form-group">
+				<div class="form-vcard-url-wrapper">
+				</div>
+			</div>
+
+			<div class="vcard-adr form-group">
+				<div class="form-vcard-adr-wrapper">
+				</div>
+			</div>
+
+			<div class="vcard-note form-group">
+				<div class="form-vcard-note-wrapper">
+				</div>
+			</div>
+
+			<button type="submit" name="create" value="create_card" class="btn btn-primary btn-sm pull-right">{{$create}}</button>
+			<button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('create_form')">{{$cancel}}</button>
+			<div class="clear"></div>
+		</form>
+	</div>
+
+	{{foreach $cards as $card}}
+	<form id="card_form_{{$card.id}}" method="post" action="">
+		<input type="hidden" name="target" value="{{$id}}">
+		<input type="hidden" name="uri" value="{{$card.uri}}">
+		<div class="section-content-wrapper-np">
+			<div id="vcard-cancel-{{$card.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
+			<div id="vcard-add-field-{{$card.id}}" class="dropdown pull-right vcard-add-field">
+				<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+				<div class="dropdown-menu dropdown-menu-right">
+					<a class="dropdown-item add-vcard-org add-field"{{if $card.org}} style="display: none"{{/if}} href="#" data-add="vcard-org" data-id="{{$card.id}}">{{$org_label}}</a>
+					<a class="dropdown-item add-vcard-title add-field"{{if $card.title}} style="display: none"{{/if}} href="#" data-add="vcard-title" data-id="{{$card.id}}">{{$title_label}}</a>
+					<a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="{{$card.id}}">{{$tel_label}}</a>
+					<a class="dropdown-item add-vcard-email add-field" href="#" data-add="vcard-email" data-id="{{$card.id}}">{{$email_label}}</a>
+					<a class="dropdown-item add-vcard-impp add-field" href="#" data-add="vcard-impp" data-id="{{$card.id}}">{{$impp_label}}</a>
+					<a class="dropdown-item add-vcard-url add-field" href="#" data-add="vcard-url" data-id="{{$card.id}}">{{$url_label}}</a>
+					<a class="dropdown-item add-vcard-adr add-field" href="#" data-add="vcard-adr" data-id="{{$card.id}}">{{$adr_label}}</a>
+					<a class="dropdown-item add-vcard-note add-field"{{if $card.note}} style="display: none"{{/if}} href="#" data-add="vcard-note" data-id="{{$card.id}}">{{$note_label}}</a>
+				</div>
+			</div>
+			<div id="vcard-header-{{$card.id}}" class="vcard-header" data-id="{{$card.id}}" data-action="open">
+				{{if $card.photo}}<img class="vcard-photo" src="{{$card.photo}}" width="32px" height="32px">{{else}}<div class="vcard-nophoto"><i class="fa fa-user"></i></div>{{/if}}
+				<span id="vcard-preview-{{$card.id}}" class="vcard-preview">
+					{{if $card.fn}}<span class="vcard-fn-preview">{{$card.fn}}</span>{{/if}}
+					{{if $card.emails.0.address}}<span class="vcard-email-preview hidden-xs">{{$card.emails.0.address}}</span>{{/if}}
+					{{if $card.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$card.tels.0.nr}}</span>{{/if}}
+				</span>
+				<input id="vcard-fn-{{$card.id}}" class="vcard-fn" type="text" name="fn" value="{{$card.fn}}" size="{{$card.fn|count_characters:true}}" placeholder="{{$name_label}}">
+			</div>
+		</div>
+		<div id="vcard-info-{{$card.id}}" class="vcard-info section-content-wrapper">
+
+			<div class="vcard-org form-group">
+				<div class="form-vcard-org-wrapper">
+					{{if $card.org}}
+					<div class="form-group form-vcard-org">
+						<input type="text" name="org" value="{{$card.org}}" size="{{$card.org|count_characters:true}}" placeholder="{{$org_label}}">
+						<i data-remove="vcard-org" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-title form-group">
+				<div class="form-vcard-title-wrapper">
+					{{if $card.title}}
+					<div class="form-group form-vcard-title">
+						<input type="text" name="title" value="{{$card.title}}" size="{{$card.title|count_characters:true}}" placeholder="{{$title_label}}">
+						<i data-remove="vcard-title" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/if}}
+				</div>
+			</div>
+
+
+			<div class="vcard-tel form-group">
+				<div class="form-vcard-tel-wrapper">
+					{{if $card.tels}}
+					{{foreach $card.tels as $tel}}
+					<div class="form-group form-vcard-tel">
+						<select name="tel_type[]">
+							<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
+							<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
+							<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
+						<i data-remove="vcard-tel" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+
+			<div class="vcard-email form-group">
+				<div class="form-vcard-email-wrapper">
+					{{if $card.emails}}
+					{{foreach $card.emails as $email}}
+					<div class="form-group form-vcard-email">
+						<select name="email_type[]">
+							<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
+							<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
+						<i data-remove="vcard-email" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-impp form-group">
+				<div class="form-vcard-impp-wrapper">
+					{{if $card.impps}}
+					{{foreach $card.impps as $impp}}
+					<div class="form-group form-vcard-impp">
+						<select name="impp_type[]">
+							<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
+							<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
+						<i data-remove="vcard-impp" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-url form-group">
+				<div class="form-vcard-url-wrapper">
+					{{if $card.urls}}
+					{{foreach $card.urls as $url}}
+					<div class="form-group form-vcard-url">
+						<select name="url_type[]">
+							<option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option>
+							<option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $url.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $url.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="url[]" value="{{$url.address}}" size="{{$url.address|count_characters:true}}" placeholder="{{$url_label}}">
+						<i data-remove="vcard-url" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-adr form-group">
+				<div class="form-vcard-adr-wrapper">
+					{{if $card.adrs}}
+					{{foreach $card.adrs as $adr}}
+					<div class="form-group form-vcard-adr">
+						<div class="form-group">
+							<label>{{$adr_label}}</label>
+							<select name="adr_type[]">
+								<option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option>
+								<option value="HOME"{{if $adr.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+								<option value="WORK"{{if $adr.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+								<option value="OTHER"{{if $adr.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+							</select>
+							<i data-remove="vcard-adr" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}">
+						</div>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-note form-group form-vcard-note">
+				<div class="form-vcard-note-wrapper">
+					{{if $card.note}}
+					<label>{{$note_label}}</label>
+					<i data-remove="vcard-note" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					<textarea name="note" class="form-control">{{$card.note}}</textarea>
+					{{/if}}
+				</div>
+			</div>
+
+
+			<button type="submit" name="update" value="update_card" class="btn btn-primary btn-sm pull-right">{{$update}}</button>
+			<button type="submit" name="delete" value="delete_card" class="btn btn-danger btn-sm">{{$delete}}</button>
+			<button type="button" class="btn btn-outline-secondary btn-sm vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel">{{$cancel}}</button>
+			<div class="clear"></div>
+		</div>
+	</form>
+	{{/foreach}}
+</div>
diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
new file mode 100644
index 000000000..5d683d751
--- /dev/null
+++ b/view/tpl/cdav_calendar.tpl
@@ -0,0 +1,349 @@
+<script>
+
+var new_event = [];
+var new_event_id = Math.random().toString(36).substring(7);
+var views = {'month' : '{{$month}}', 'agendaWeek' : '{{$week}}', 'agendaDay' : '{{$day}}', 'listMonth' : '{{$list_month}}', 'listWeek' : '{{$list_week}}', 'listDay' : '{{$list_day}}'};
+
+$(document).ready(function() {
+	$('#calendar').fullCalendar({
+		eventSources: [ {{$sources}} ],
+
+		header: false,
+		eventTextColor: 'white',
+
+		lang: '{{$lang}}',
+		firstDay: {{$first_day}},
+
+		monthNames: aStr['monthNames'],
+		monthNamesShort: aStr['monthNamesShort'],
+		dayNames: aStr['dayNames'],
+		dayNamesShort: aStr['dayNamesShort'],
+		allDayText: aStr['allday'],
+
+		timeFormat: 'HH:mm',
+		timezone: 'local',
+
+		defaultTimedEventDuration: '01:00:00',
+		snapDuration: '00:15:00',
+
+		dayClick: function(date, jsEvent, view) {
+
+			if(new_event.length)
+				$('#calendar').fullCalendar( 'removeEventSource', new_event);
+
+			$('#event_uri').val('');
+			$('#id_title').val('New event');
+			$('#calendar_select').val($("#calendar_select option:first").val()).attr('disabled', false);
+			$('#id_dtstart').val(date.format());
+			$('#id_dtend').val(date.hasTime() ? date.add(1, 'hours').format() : date.add(1, 'days').format());
+			$('#id_description').val('');
+			$('#id_location').val('');
+			$('#event_submit').val('create_event').html('Create');
+			$('#event_delete').hide();
+
+			new_event = [{ id: new_event_id, title  : 'New event', start: $('#id_dtstart').val(), end: $('#id_dtend').val(), editable: true, color: '#bbb' }]
+			$('#calendar').fullCalendar( 'addEventSource', new_event);
+		},
+
+		eventClick: function(event, jsEvent, view) {
+
+			if(event.id == new_event_id) {
+				$(window).scrollTop(0);
+				$('.section-content-tools-wrapper, #event_form_wrapper').show();
+				$('#recurrence_warning').hide();
+				$('#id_title').focus().val('');
+				return false;
+			}
+
+			if($('main').hasClass('fullscreen') && view.type !== 'month' && event.rw)
+				$('#calendar').fullCalendar('option', 'height', 'auto');
+
+			if(new_event.length && event.rw) {
+				$('#calendar').fullCalendar( 'removeEventSource', new_event);
+			}
+
+			if(!event.recurrent && event.rw) {
+				var start_clone = moment(event.start);
+				var noend_allday = start_clone.add(1, 'day').format('YYYY-MM-DD');
+
+				$(window).scrollTop(0);
+				$('.section-content-tools-wrapper, #event_form_wrapper').show();
+				$('#recurrence_warning').hide();
+				$('#id_title').focus();
+
+				$('#event_uri').val(event.uri);
+				$('#id_title').val(event.title);
+				$('#calendar_select').val(event.calendar_id[0] + ':' + event.calendar_id[1]).attr('disabled', true);
+				$('#id_dtstart').val(event.start.format());
+				$('#id_dtend').val(event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday);
+				$('#id_description').val(event.description);
+				$('#id_location').val(event.location);
+				$('#event_submit').val('update_event').html('Update');
+				$('#event_delete').show();
+			}
+			else if(event.recurrent && event.rw) {
+				$('.section-content-tools-wrapper, #recurrence_warning').show();
+				$('#event_form_wrapper').hide();
+				$('#event_uri').val(event.uri);
+				$('#calendar_select').val(event.calendar_id[0] + ':' + event.calendar_id[1]).attr('disabled', true);
+			}
+		},
+
+		eventResize: function(event, delta, revertFunc) {
+
+			$('#id_title').val(event.title);
+			$('#id_dtstart').val(event.start.format());
+			$('#id_dtend').val(event.end.format());
+
+			$.post( 'cdav/calendar', {
+				'update': 'resize',
+				'id[]': event.calendar_id,
+				'uri': event.uri,
+				'dtstart': event.start ? event.start.format() : '',
+				'dtend': event.end ? event.end.format() : ''
+			})
+			.fail(function() {
+				revertFunc();
+			});
+		},
+
+		eventDrop: function(event, delta, revertFunc) {
+
+			var start_clone = moment(event.start);
+			var noend_allday = start_clone.add(1, 'day').format('YYYY-MM-DD');
+
+			$('#id_title').val(event.title);
+			$('#id_dtstart').val(event.start.format());
+			$('#id_dtend').val(event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday);
+
+			$.post( 'cdav/calendar', {
+				'update': 'drop',
+				'id[]': event.calendar_id,
+				'uri': event.uri,
+				'dtstart': event.start ? event.start.format() : '',
+				'dtend': event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday
+			})
+			.fail(function() {
+				revertFunc();
+			});
+		},
+
+		loading: function(isLoading, view) {
+			$('#events-spinner').spin('tiny');
+			$('#events-spinner > i').css('color', 'transparent');
+			if(!isLoading) {
+				$('#events-spinner').spin(false);
+				$('#events-spinner > i').css('color', '');
+			}
+		}
+	});
+
+	// echo the title
+	var view = $('#calendar').fullCalendar('getView');
+
+	$('#title').text(view.title);
+
+	$('#view_selector').html(views[view.name]);
+
+	$('.color-edit').colorpicker({ input: '.color-edit-input' });
+
+	$(document).on('click','#fullscreen-btn', on_fullscreen);
+	$(document).on('click','#inline-btn', on_inline);
+
+	$(document).on('click','#event_submit', on_submit);
+	$(document).on('click','#event_more', on_more);
+	$(document).on('click','#event_cancel, #event_cancel_recurrent', reset_form);
+	$(document).on('click','#event_delete, #event_delete_recurrent', on_delete);
+
+});
+
+function changeView(action, viewName) {
+	$('#calendar').fullCalendar(action, viewName);
+	var view = $('#calendar').fullCalendar('getView');
+
+	if($('main').hasClass('fullscreen'))
+		if(view.name !== 'month')
+			$('.section-content-tools-wrapper').css('display') === 'none' ? on_fullscreen() : on_inline() ;
+		else
+			on_fullscreen();
+	else
+		on_inline();
+
+	$('#title').text(view.title);
+	$('#view_selector').html(views[view.name]);
+}
+
+function add_remove_json_source(source, color, editable, status) {
+
+	if(status === undefined)
+		status = 'fa-calendar-check-o';
+
+	if(status === 'drop') {
+		reset_form();
+		$('#calendar').fullCalendar( 'removeEventSource', source );
+		return;
+	}
+
+	var parts = source.split('/');
+	var id = parts[4];
+
+	var selector = '#calendar-btn-' + id;
+
+	if($(selector).hasClass('fa-calendar-o')) {
+		$('#calendar').fullCalendar( 'addEventSource', { url: source, color: color, editable: editable });
+		$(selector).removeClass('fa-calendar-o');
+		$(selector).addClass(status);
+		$.get('/cdav/calendar/switch/' + id + '/1');
+	}
+	else {
+		$('#calendar').fullCalendar( 'removeEventSource', source );
+		$(selector).removeClass(status);
+		$(selector).addClass('fa-calendar-o');
+		$.get('/cdav/calendar/switch/' + id + '/0');
+	}
+}
+
+function on_fullscreen() {
+	var view = $('#calendar').fullCalendar('getView');
+	if(($('.section-content-tools-wrapper').css('display') === 'none') || ($('.section-content-tools-wrapper').css('display') !== 'none' && view.type === 'month'))
+		$('#calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
+}
+
+function on_inline() {
+	var view = $('#calendar').fullCalendar('getView');
+	((view.type === 'month') ? $('#calendar').fullCalendar('option', 'height', '') : $('#calendar').fullCalendar('option', 'height', 'auto'));
+}
+
+function on_submit() {
+	$.post( 'cdav/calendar', {
+		'submit': $('#event_submit').val(),
+		'target': $('#calendar_select').val(),
+		'uri': $('#event_uri').val(),
+		'title': $('#id_title').val(),
+		'dtstart': $('#id_dtstart').val(),
+		'dtend': $('#id_dtend').val(),
+		'description': $('#id_description').val(),
+		'location': $('#id_location').val()
+	})
+	.done(function() {
+		$('#calendar').fullCalendar( 'refetchEventSources', [ {{$sources}} ] );
+		reset_form();
+	});
+}
+
+function on_delete() {
+	$.post( 'cdav/calendar', {
+		'delete': 'delete',
+		'target': $('#calendar_select').val(),
+		'uri': $('#event_uri').val(),
+	})
+	.done(function() {
+		$('#calendar').fullCalendar( 'refetchEventSources', [ {{$sources}} ] );
+		reset_form();
+	});
+}
+
+function reset_form() {
+	$('.section-content-tools-wrapper, #event_form_wrapper, #recurrence_warning').hide();
+
+	$('#event_submit').val('');
+	$('#calendar_select').val('');
+	$('#event_uri').val('');
+	$('#id_title').val('');
+	$('#id_dtstart').val('');
+	$('#id_dtend').val('');
+
+	if(new_event.length)
+		$('#calendar').fullCalendar( 'removeEventSource', new_event);
+
+	if($('#more_block').hasClass('open'))
+		on_more();
+
+	if($('main').hasClass('fullscreen'))
+		on_fullscreen();
+}
+
+function on_more() {
+	if($('#more_block').hasClass('open')) {
+		$('#event_more').html('<i class="fa fa-caret-down"></i> {{$more}}');
+		$('#more_block').removeClass('open').hide();
+	}
+	else {
+		$('#event_more').html('<i class="fa fa-caret-up"></i> {{$less}}');
+		$('#more_block').addClass('open').show();
+	}
+}
+
+</script>
+
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="float-right">
+			<div class="dropdown">
+				<button id="view_selector" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"></button>
+				<div class="dropdown-menu">
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
+					<div class="dropdown-divider"></div>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listMonth'); return false;">{{$list_month}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listWeek'); return false;">{{$list_week}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listDay'); return false;">{{$list_day}}</a></li>
+				</div>
+				<div class="btn-group">
+					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
+					<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
+				</div>
+				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+				<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+			</div>
+		</div>
+		<h2 id="title"></h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-tools-wrapper" style="display: none">
+		<div id="recurrence_warning" style="display: none">
+			<div class="section-content-warning-wrapper">
+				{{$recurrence_warning}}
+			</div>
+			<div>
+				<button id="event_delete_recurrent" type="button" class="btn btn-danger btn-sm">{{$delete_all}}</button>
+				<button id="event_cancel_recurrent" type="button" class="btn btn-outline-secondary btn-sm">{{$cancel}}</button>
+			</div>
+		</div>
+		<div id="event_form_wrapper" style="display: none">
+			<form id="event_form" method="post" action="">
+				<input id="event_uri" type="hidden" name="uri" value="">
+				{{include file="field_input.tpl" field=$title}}
+				<label for="calendar_select">{{$calendar_select_label}}</label>
+				<select id="calendar_select" name="target" class="form-control form-group">
+					{{foreach $writable_calendars as $writable_calendar}}
+					<option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}{{if $writable_calendar.sharer}} ({{$writable_calendar.sharer}}){{/if}}</option>
+					{{/foreach}}
+				</select>
+				<div id="more_block" style="display: none;">
+					{{include file="field_input.tpl" field=$dtstart}}
+					{{include file="field_input.tpl" field=$dtend}}
+					{{include file="field_textarea.tpl" field=$description}}
+					{{include file="field_textarea.tpl" field=$location}}
+				</div>
+				<div class="form-group">
+					<div class="pull-right">
+						<button id="event_more" type="button" class="btn btn-outline-secondary btn-sm"><i class="fa fa-caret-down"></i> {{$more}}</button>
+						<button id="event_submit" type="button" value="" class="btn btn-primary btn-sm"></button>
+
+					</div>
+					<div>
+						<button id="event_delete" type="button" class="btn btn-danger btn-sm">{{$delete}}</button>
+						<button id="event_cancel" type="button" class="btn btn-outline-secondary btn-sm">{{$cancel}}</button>
+					</div>
+					<div class="clear"></div>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="section-content-wrapper-np">
+		<div id="calendar"></div>
+	</div>
+</div>
diff --git a/view/tpl/cdav_widget_addressbook.tpl b/view/tpl/cdav_widget_addressbook.tpl
new file mode 100644
index 000000000..c875dc977
--- /dev/null
+++ b/view/tpl/cdav_widget_addressbook.tpl
@@ -0,0 +1,66 @@
+<div class="widget">
+	<h3>{{$addressbooks_label}}</h3>
+	{{foreach $addressbooks as $addressbook}}
+	<div id="addressbook-{{$addressbook.id}}" class="ml-3">
+		<div class="form-group">
+			<i class="fa fa-user generic-icons"></i><a href="/cdav/addressbook/{{$addressbook.id}}">{{$addressbook.displayname}}</a>
+			<div class="float-right">
+				<i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-addressbook-{{$addressbook.id}}')"></i>
+				<a href="/cdav/addressbooks/{{$addressbook.ownernick}}/{{$addressbook.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
+				<a href="#" onclick="dropItem('/cdav/addressbook/drop/{{$addressbook.id}}', '#addressbook-{{$addressbook.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+			</div>
+		</div>
+		<div id="edit-addressbook-{{$addressbook.id}}" class="sub-menu" style="display: none;">
+			<form id="edit-addressbook-{{$addressbook.id}}" method="post" action="">
+				<label for="edit-{{$addressbook.id}}">{{$edit_label}}</label>
+				<div id="edit-form-{{$addressbook.id}}" class="form-group">
+					<input id="id-{{$addressbook.id}}" name="id" type="hidden" value="{{$addressbook.id}}">
+					<input id="edit-{{$addressbook.id}}" name="{DAV:}displayname" type="text" value="{{$addressbook.displayname}}" class="form-control">
+				</div>
+				<div class="form-group">
+					<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
+				</div>
+			</form>
+		</div>
+	</div>
+	{{/foreach}}
+</div>
+
+<div class="widget">
+	<h3>{{$tools_label}}</h3>
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('create-addressbook'); return false;"><i class="fa fa-user-plus generic-icons"></i> {{$create_label}}</a>
+		</li>
+		<div id="create-addressbook" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form method="post" action="">
+					<div class="form-group">
+						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control form-group">
+						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('upload-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+		</li>
+		<div id="upload-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+					<div class="form-group">
+						<select id="import" name="target" class="form-control">
+							<option value="">{{$import_placeholder}}</option>
+							{{foreach $addressbooks as $addressbook}}
+							<option value="{{$addressbook.id}}">{{$addressbook.displayname}}</option>
+							{{/foreach}}
+						</select>
+					</div>
+					<div class="form-group">
+						<input class="form-control-file w-100" id="addressbook-upload-choose" type="file" name="userfile" />
+					</div>
+					<button class="btn btn-primary btn-sm" type="submit" name="a_upload" value="a_upload">{{$upload}}</button>
+				</form>
+			</div>
+		</div>
+	</ul>
+</div>
diff --git a/view/tpl/cdav_widget_calendar.tpl b/view/tpl/cdav_widget_calendar.tpl
new file mode 100644
index 000000000..ec2257a19
--- /dev/null
+++ b/view/tpl/cdav_widget_calendar.tpl
@@ -0,0 +1,121 @@
+{{if $my_calendars}}
+<div class="widget">
+	<h3>{{$my_calendars_label}}</h3>
+	{{foreach $my_calendars as $calendar}}
+	<div id="calendar-{{$calendar.calendarid}}">
+		<div class="ml-3{{if !$calendar@last}} form-group{{/if}}">
+			<i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}fa-calendar-check-o{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}})" style="color: {{$calendar.color}};"></i>{{$calendar.displayname}}
+			<div class="float-right">
+				<i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-calendar-{{$calendar.calendarid}}')"></i>
+				<a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
+				<i id="share-icon" class="fa fa-share-alt fakelink generic-icons" onclick="openClose('share-calendar-{{$calendar.calendarid}}')"></i>
+				<a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+			</div>
+			<div id="share-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};">
+				{{if $calendar.sharees}}
+				{{foreach $calendar.sharees as $sharee}}
+				<div id="sharee-{{$calendar.calendarid}}" class="form-group">
+					<i class="fa fa-share generic-icons"></i>{{$sharee.name}}&nbsp;{{$sharee.access}}
+					<div class="pull-right">
+						<a href="#" onclick="dropItem('/cdav/calendar/dropsharee/{{$calendar.calendarid}}/{{$calendar.instanceid}}/{{$sharee.hash}}', '#sharee-{{$calendar.calendarid}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+					</div>
+				</div>
+				{{/foreach}}
+				{{/if}}
+				<form method="post" action="">
+					<label for="share-{{$calendar.calendarid}}">{{$share_label}}</label>
+					<input name="calendarid" type="hidden" value="{{$calendar.calendarid}}">
+					<input name="instanceid" type="hidden" value="{{$calendar.instanceid}}">
+					<div class="form-group">
+						<select id="share-{{$calendar.calendarid}}" name="sharee" class="form-control">
+							{{$sharee_options}}
+						</select>
+					</div>
+					<div class="form-group">
+						<select name="access" class="form-control">
+							{{$access_options}}
+						</select>
+					</div>
+					<div class="form-group">
+						<button type="submit" name="share" value="share" class="btn btn-primary btn-sm">{{$share}}</button>
+					</div>
+				</form>
+			</div>
+			<div id="edit-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};">
+				<form id="edit-calendar-{{$calendar.calendarid}}" method="post" action="" class="colorpicker-component color-edit">
+					<input id="id-{{$calendar.calendarid}}" name="id" type="hidden" value="{{$calendar.calendarid}}:{{$calendar.instanceid}}">
+					<input id="color-{{$calendar.calendarid}}" name="color" type="hidden" value="{{$calendar.color}}" class="color-edit-input">
+					<label for="edit-form-{{$calendar.calendarid}}">{{$edit_label}}</label>
+					<div id="edit-form-{{$calendar.calendarid}}" class="input-group form-group">
+						<input id="create-{{$calendar.calendarid}}" name="{DAV:}displayname" type="text" value="{{$calendar.displayname}}" class="form-control">
+						<span class="input-group-addon"><i></i></span>
+					</div>
+					<div class="form-group">
+						<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+	{{/foreach}}
+</div>
+{{/if}}
+
+{{if $shared_calendars}}
+<div class="widget">
+	<h3>{{$shared_calendars_label}}</h3>
+	{{foreach $shared_calendars as $calendar}}
+	<div id="shared-calendar-{{$calendar.calendarid}}" class="ml-3{{if !$calendar@last}} form-group{{/if}}">
+		<i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}{{if $calendar.access == 'read-write'}}fa-calendar-check-o{{else}}fa-calendar-times-o{{/if}}{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, {{if $calendar.access == 'read-write'}}'fa-calendar-check-o'{{else}}'fa-calendar-times-o'{{/if}})"  style="color: {{$calendar.color}};"></i>{{$calendar.displayname}} ({{$calendar.sharer}})
+		<div class="pull-right">
+			<a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
+			<a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#shared-calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+		</div>
+	</div>
+	{{/foreach}}
+</div>
+{{/if}}
+
+<div class="widget">
+	<h3>{{$tools_label}}</h3>
+	<div class="nav nav-pills flex-column">
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('create-calendar'); return false;"><i class="fa fa-calendar-plus-o generic-icons"></i> {{$create_label}}</a>
+		</li>
+		<div id="create-calendar" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form method="post" action="" class="colorpicker-component color-edit">
+					<input id="color" name="color" type="hidden" value="#3a87ad" class="color-edit-input">
+					<div id="create-form" class="input-group form-group">
+						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control">
+						<span class="input-group-addon"><i></i></span>
+					</div>
+					<div class="form-group">
+						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('upload-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+		</li>
+		<div id="upload-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<div class="form-group">
+						<select id="import" name="target" class="form-control">
+							<option value="">{{$import_placeholder}}</option>
+							{{foreach $writable_calendars as $writable_calendar}}
+							<option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}</option>
+							{{/foreach}}
+						</select>
+					</div>
+					<div class="form-group">
+						<input class="form-control-file w-100" id="event-upload-choose" type="file" name="userfile" />
+					</div>
+					<button class="btn btn-primary btn-sm" type="submit" name="c_upload" value="c_upload">{{$upload}}</button>
+				</form>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
new file mode 100755
index 000000000..1a84f1e66
--- /dev/null
+++ b/view/tpl/channel.tpl
@@ -0,0 +1,49 @@
+<div class="section-subtitle-wrapper">
+	<div class="pull-right">
+		{{if $channel.default_links}}
+		{{if $channel.default}}
+		<div>
+			<i class="fa fa-check-square-o"></i>&nbsp;{{$msg_default}}
+		</div>
+		{{else}}
+		<a href="manage/{{$channel.channel_id}}/default" class="make-default-link">
+			<i class="fa fa-square-o"></i>&nbsp;{{$msg_make_default}}
+		</a>
+		{{/if}}
+		{{/if}}
+		{{if $channel.delegate}}
+			{{$delegated_desc}}
+		{{/if}}
+	</div>
+	<h3>
+		{{if $selected == $channel.channel_id}}
+		<i class="selected-channel fa fa-circle" title="{{$msg_selected}}"></i>
+		{{/if}}
+		{{if $channel.delegate}}
+		<i class="fa fa-arrow-circle-right" title="{{$delegated_desc}}"></i>
+		{{/if}}
+		{{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" title="{{$channel.channel_name}}">{{/if}}
+			{{$channel.channel_name}}
+		{{if $selected != $channel.channel_id}}</a>{{/if}}
+	</h3>
+	<div class="clear"></div>
+</div>
+<div class="section-content-wrapper">
+	<div class="channel-photo-wrapper">
+		{{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}">{{/if}}
+			<img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" />
+		{{if $selected != $channel.channel_id}}</a>{{/if}}
+	</div>
+	<div class="channel-notifications-wrapper">
+		{{if !$channel.delegate}}
+		<div class="channel-notification">
+			<i class="fa fa-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i>
+			{{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}}
+		</div>
+		<div class="channel-notification">
+			<i class="fa fa-user{{if $channel.intros != 0}} new-notification{{/if}}"></i>
+			{{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}}
+		</div>
+		{{/if}}
+	</div>
+</div>
diff --git a/view/tpl/channel_id_select.tpl b/view/tpl/channel_id_select.tpl
new file mode 100644
index 000000000..ecebd4bc0
--- /dev/null
+++ b/view/tpl/channel_id_select.tpl
@@ -0,0 +1,7 @@
+{{if $channels}}
+<select name="dest_channel" id="dest-channel-select"> 
+{{foreach $channels as $c}}
+<option {{if $c.channel_id == $selected}}selected="selected"{{/if}} value="{{$c.channel_id}}">{{$c.channel_name}}</option>
+{{/foreach}}
+</select>
+{{/if}}
\ No newline at end of file
diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
new file mode 100755
index 000000000..baffe9b06
--- /dev/null
+++ b/view/tpl/channel_import.tpl
@@ -0,0 +1,43 @@
+<h2>{{$title}}</h2>
+
+<form action="import" method="post" enctype="multipart/form-data" id="import-channel-form">
+	<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+	<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>
+
+	<label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label>
+	<input type="file" name="filename" id="import-filename" class="import-input" value="" />
+	<div id="import-filename-end" class="import-field-end"></div>
+
+	<div id="import-choice" class="descriptive-paragraph">{{$choice}}</div>
+
+	<label for="import-old-address" id="label-import-old-address" class="import-label" >{{$label_old_address}}</label>
+	<input type="text" name="old_address" id="import-old-address" class="import-input" value="" />
+	<div id="import-old-address-end" class="import-field-end"></div>
+
+	<label for="import-old-email" id="label-import-old-email" class="import-label" >{{$label_old_email}}</label>
+	<input type="text" name="email" id="import-old-email" class="import-input" value="{{$email}}" />
+	<div id="import-old-email-end" class="import-field-end"></div>
+
+	<label for="import-old-pass" id="label-import-old-pass" class="import-label" >{{$label_old_pass}}</label>
+	<input type="password" name="password" id="import-old-pass" class="import-input" value="{{$pass}}" />
+	<div id="import-old-pass-end" class="import-field-end"></div>
+
+	<input type="checkbox" name="import_posts" id="import-posts" value="1" />
+	<label for="import-posts" id="label-import-posts">{{$label_import_posts}}</label>
+	<div id="import-posts-end" class="import-field-end"></div>
+
+	<div id="import-common-desc" class="descriptive-paragraph">{{$common}}</div>
+
+	<input type="checkbox" name="make_primary" id="import-make-primary" value="1" />
+	<label for="import-make-primary" id="label-import-make-primary">{{$label_import_primary}}</label>
+	<div id="import-make-primary-end" class="import-field-end"></div>
+
+	<input type="checkbox" name="moving" id="import-moving" value="1" />
+	<label for="import-moving" id="label-import-moving">{{$label_import_moving}}</label>
+	<div id="import-moving-end" class="import-field-end"></div>
+
+	<input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" />
+	<div id="import-submit-end" class="import-field-end"></div>
+
+	<div id="import-common-desc" class="descriptive-paragraph">{{$pleasewait}}</div>
+</form>
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
new file mode 100755
index 000000000..f484b49e5
--- /dev/null
+++ b/view/tpl/channels.tpl
@@ -0,0 +1,24 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<a class="btn btn-success btn-sm pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="fa fa-plus-circle"></i>&nbsp;{{$create.2}}</a>
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper-np">
+		{{if $channel_usage_message}}
+		<div id="channel-usage-message" class="section-content-warning-wrapper">
+			{{$channel_usage_message}}
+		</div>
+		{{/if}}
+		<div id="channels-desc" class="section-content-info-wrapper">
+			{{$desc}}
+		</div>
+		{{foreach $all_channels as $chn}}
+			{{include file="channel.tpl" channel=$chn}}
+		{{/foreach}}
+		{{if $delegates}}
+			{{foreach $delegates as $chn}}
+				{{include file="channel.tpl" channel=$chn}}
+			{{/foreach}}
+		{{/if}}
+	</div>
+</div>
diff --git a/view/tpl/chanview.tpl b/view/tpl/chanview.tpl
new file mode 100755
index 000000000..39fafaf8e
--- /dev/null
+++ b/view/tpl/chanview.tpl
@@ -0,0 +1 @@
+<a href="{{$url}}">{{$url}}</a>
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
new file mode 100644
index 000000000..22f3465bf
--- /dev/null
+++ b/view/tpl/chat.tpl
@@ -0,0 +1,346 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			{{if $is_owner}}
+			<form id="chat-destroy" method="post" action="chat">
+				<input type="hidden" name="room_name" value="{{$room_name}}" />
+				<input type="hidden" name="action" value="drop" />
+				<button class="btn btn-danger btn-sm" type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$drop}}</button>
+			</form>
+			{{/if}}
+			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
+		</div>
+		<h2>{{$room_name}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="chatContainer" class="section-content-wrapper">
+		<div id="chatTopBar">
+			<div id="chatLineHolder"></div>
+		</div>
+		<div class="clear"></div>
+		<div id="chatBottomBar" >
+			<form id="chat-form" method="post" action="#">
+				<input type="hidden" name="room_id" value="{{$room_id}}" />
+				<div class="form-group">
+					<textarea id="chatText" name="chat_text" class="form-control"></textarea>
+				</div>
+				<div id="chat-submit-wrapper">
+					<div id="chat-submit" class="dropup pull-right">
+						<button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="fa fa-cog"></i></button>
+						<button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+						<div class="dropdown-menu dropdown-menu-right">
+							<a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online"><i class="fa fa-circle online"></i>&nbsp;{{$online}}</a>
+							<a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away"><i class="fa fa-circle away"></i>&nbsp;{{$away}}</a>
+							<a class="dropdown-item" href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave"><i class="fa fa-circle leave"></i>&nbsp;{{$leave}}</a>
+                       					<div class="dropdown-divider"></div>
+                        				<a id="toggle-notifications" class="dropdown-item" href="" onclick="toggleChatNotifications(); return false;"><i id="toggle-notifications-icon" class="fa fa-bell-slash-o"></i>&nbsp;Toggle notifications</a>
+                        				<a id="toggle-notifications-audio" class="dropdown-item disabled" href="" onclick="toggleChatNotificationAudio(); return false;"><i id="toggle-notifications-audio-icon" class="fa fa-volume-off"></i>&nbsp;Toggle sound</a>
+							{{if $bookmark_link}}
+                         				<div class="dropdown-divider"></div>
+							<a class="dropdown-item" href="{{$bookmark_link}}" target="_blank" ><i class="fa fa-bookmark"></i>&nbsp;{{$bookmark}}</a>
+							{{/if}}
+						</div>
+					</div>
+					<div id="chat-tools" class="btn-toolbar pull-left">
+						<div class="btn-group mr-2">
+							<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'chatText'); return false;">
+								<i class="fa fa-bold jot-icons"></i>
+							</button>
+							<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'chatText'); return false;">
+								<i class="fa fa-italic jot-icons"></i>
+							</button>
+							<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'chatText'); return false;">
+								<i class="fa fa-underline jot-icons"></i>
+							</button>
+							<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'chatText'); return false;">
+								<i class="fa fa-quote-left jot-icons"></i>
+							</button>
+							<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'chatText'); return false;">
+								<i class="fa fa-terminal jot-icons"></i>
+							</button>
+						</div>
+						<div class="btn-group mr-2 d-none d-md-flex">
+							<button id="chat-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="chatJotGetLink(); return false;" >
+								<i id="chat-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i>
+							</button>
+						</div>
+						{{if $feature_encrypt}}
+						<div class="btn-group mr-2 d-none d-md-flex">
+							<button id="chat-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="red_encrypt('{{$cipher}}', '#chatText', $('#chatText').val()); return false;">
+								<i id="chat-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i>
+							</button>
+						</div>
+						{{/if}}
+						<div class="btn-group dropup d-md-none">
+							<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+								<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
+							</button>
+							<div class="dropdown-menu">
+								<a class="dropdown-item" href="#" onclick="chatJotGetLink(); return false;" ><i class="fa fa-link"></i>&nbsp;{{$insert}}</a>
+								{{if $feature_encrypt}}
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}', '#chatText' ,$('#chatText').val()); return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
+								{{/if}}
+							</div>
+						</div>
+					</div>
+					<div id="chat-rotator-wrapper" class="pull-left">
+						<div id="chat-rotator"></div>
+					</div>
+					<div class="clear"></div>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+
+<script>
+var room_id = {{$room_id}};
+var last_chat = 0;
+var chat_timer = null;
+
+$(document).ready(function() {
+	$('#chatTopBar').spin('small');
+	chat_timer = setTimeout(load_chats,300);
+	$('#chatroom_bookmarks, #vcard').hide();
+	$('#chatroom_list, #chatroom_members').show();
+	adjustInlineTopBarHeight();
+    chatNotificationInit();
+});
+
+$(window).resize(function () {
+	if($('main').hasClass('fullscreen')) {
+		adjustFullscreenTopBarHeight();
+	}
+	else {
+		adjustInlineTopBarHeight();
+	}
+});
+
+$('#chat-form').submit(function(ev) {
+	$('body').css('cursor','wait');
+	$.post("chatsvc", $('#chat-form').serialize(),function(data) {
+			if(chat_timer) clearTimeout(chat_timer);
+			$('#chatText').val('');
+			load_chats();
+			$('body').css('cursor','auto');
+		},'json');
+	ev.preventDefault();
+});
+
+function load_chats() {
+	$.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat + ((stopped) ? '&stopped=1' : ''),function(data) {
+		if(data.success && (! stopped)) {
+			update_inroom(data.inroom);
+			update_chats(data.chats);
+			$('#chatTopBar').spin(false);
+		}
+	});
+	
+	chat_timer = setTimeout(load_chats,10000);
+
+}
+
+var previousChatRoomMembers = null; // initialize chat room member change register
+var currentChatRoomMembers = null; // initialize chat room member change register
+function update_inroom(inroom) {
+	var html = document.createElement('div');
+	var count = inroom.length;
+	$.each( inroom, function(index, item) {
+		var newNode = document.createElement('div');
+		newNode.setAttribute('class', 'member-item');
+		$(newNode).html('<img class="menu-img-2" src="' + item.img + '" alt="' + item.name + '" /> ' + '<span class="contactname">' + item.name + '</span><span class="' + item.status_class + '">' + item.status + '</span>');
+		html.appendChild(newNode);
+	});
+    memberChange = chatRoomMembersChange(inroom); // get list of arrivals and departures
+    if(memberChange.membersArriving.length > 0) {
+      // Issue pop-up notification if anyone enters the room.
+      chat_issue_notification(JSON.stringify(memberChange.membersArriving.pop().name) + ' entered the room', 'Hubzilla Chat');
+    }
+	$('#chatMembers').html(html);
+}
+
+// Determine if the new list of chat room members has any new members or if any have left
+function chatRoomMembersChange(inroom) {
+    previousChatRoomMembers = currentChatRoomMembers;
+    currentChatRoomMembers = inroom;
+      var membersArriving = [];
+      var membersLeaving = [];
+    if(previousChatRoomMembers !== null) {
+      var newMember = false;
+      $.each( currentChatRoomMembers, function(index, currMember) {
+        newMember = true;
+        $.each( previousChatRoomMembers, function(index, prevMember) {
+          if (prevMember.name === currMember.name) {
+              newMember = false;
+          }
+        });
+        if (newMember === true) {
+          membersArriving.push(currMember);
+        }
+      });
+    }
+    return {membersArriving: membersArriving, membersLeaving: membersLeaving};
+}
+
+function update_chats(chats) {
+	var count = chats.length;
+	$.each( chats, function(index, item) {
+		last_chat = item.id;
+		var newNode = document.createElement('div');
+
+		if(item.self) {
+			newNode.setAttribute('class', 'chat-item-self clear');
+			$(newNode).html('<div class="chat-body-self"><div class="chat-item-title-self wall-item-ago"><span class="chat-item-name-self">' + item.name + ' </span><span class="autotime chat-item-time-self" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text-self">' + item.text + '</div></div><img class="chat-item-photo-self" src="' + item.img + '" alt="' + item.name + '" />');
+		}
+		else {
+			newNode.setAttribute('class', 'chat-item clear');
+			$(newNode).html('<img class="chat-item-photo" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body"><div class="chat-item-title wall-item-ago"><span class="chat-item-name">' + item.name + ' </span><span class="autotime chat-item-time" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text">' + item.text + '</div></div>');
+            chat_issue_notification(item.name + ':\n' + item.text, 'Hubzilla Chat');
+		}
+		$('#chatLineHolder').append(newNode);
+		$(".autotime").timeago();
+
+		var elem = document.getElementById('chatTopBar');
+		elem.scrollTop = elem.scrollHeight;
+	});
+}
+
+var chat_notify_granted = false; // Initialize notification permission to denied
+var chat_notify_enabled = false;
+var chat_notify_audio_enabled = false;
+var chat_notify_audio = {};
+// Request notification access from the user
+// TODO: Check Hubzilla member config setting before requesting permission
+function chatNotificationInit() {
+  
+    if (!("Notification" in window)) {
+        window.console.log("This browser does not support system notifications");
+    }
+    // Let's check whether notification permissions have already been granted
+    else if (Notification.permission === "granted") {
+        // If it's okay let's create a notification
+        chat_notify_granted = true; //var notification = new Notification("Hi there!");
+    }
+
+    // Otherwise, we need to ask the user for permission
+    else if (Notification.permission !== 'denied') {
+        Notification.requestPermission(function (permission) {
+            // If the user accepts, let's create a notification
+            if (permission === "granted") {
+                chat_notify_granted = true; //var notification = new Notification("Hi there!");
+            }
+        });
+    }
+    // Encode a wav audio file in base64 and create the audio object for game alerts
+    //var base64string = 'UklGRr4VAABXQVZFZm10IBAAAAABAAEAIlYAACJWAAABAAgAZGF0YZkVAACAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIBxcnJycoGNjY2NjYyMjIyMg3FxcXFxcXJycnJ0jY2NjY2NjIyMjIx1cXFxcXFxcnJycoKNjY2NjY2MjIyMgXFxcXFxcXJycnJ2jY2NjY2NjIyMjIxzcXFxcXFxcnJycoSNjY2NjY2MjIyMgHFxcXFxcXJycnJ4jY2NjY2NjIyMjIxycXFxcXFycnJycoWNjY2NjY2MjIyMf3FxcXFxcXJycnJ5jY2NjY2NjIyMjIxxcXFxcXFycnJycoeNjY2NjY2MjIyMfnFxcXFxcXJycnJ7jY2NjY2NjIyMjIpxcXFxcXFycnJycomNjY2NjYyMjIyMfHFxcXFxcXJycnJ8jY2NjY2NjIyMjIhycnJycoyLi4uLi4uLioqKfHFxcXFxcnJycnJyc4yMjIuLi4uLi4uKin5xcXFxcnJycnJyc3OMjIyMi4uLi4uLi4p/cXFxcnJycnJyc3Nzi4yMjIyLi4uLi4uLgHBwcXFxcXFxcnJycouNjY2NjYyMjIyMjIBwcHFxcXFxcXJycnKLjY2NjY2MjIyMjIyBcHFxcXFxcXJycnJyio2NjY2NjIyMjIyMgnBxcXFxcXFycnJycomNjY2NjY2MjIyMjINwcXFxcXFxcnJycnKIjY2NjY2NjIyMjIyEcHFxcXFxcXJycnJyh42NjY2NjYyMjIyMhXBxcXFxcXFycnJycoaNjY2NjY2MjIyMjIZwcXFxcXFxcnJycnKFjY2NjY2NjIyMjIyHcHFxcXFxcXJycnJyhI2NjY2NjYyMjIyMiHBxcXFxcXFycnJycoONjY2NjY2MjIyMjIlwcXFxcXFxcnJycnKCjY2NjY2NjIyMjIyKcHFxcXFxcXJycnJygY2NjYyMjIyLi4uLi4uLioqKioqKdnBxcXFxcXFycnKAi4uLi4uLioqKioJxcXFxcXFycnJydIyMi4uLi4uLi4qKdXFxcXFycnJycnKBjIyLi4uLi4uLioFxcXFycnJycXFydY2NjYyMjIyMjIyLc3BwcXFxcXFxcnKDjY2NjIyMjIyMjIBwcHFxcXFxcXJyd42NjY2MjIyMjIyMcnBxcXFxcXFycnKFjY2NjYyMjIyMjH9wcXFxcXFxcnJyeY2NjY2NjIyMjIyMcHFxcXFxcXJycnKHjY2NjY2MjIyMjH5xcXFxcXFycnJyeo2NjY2NjIyMjIyKcHFxcXFxcXJycnKIjY2NjY2MjIyMjHxxcXFxcXFycnJyfI2NjY2NjYyMjIyJcXFxcXFxcXJycnKKjY2NjY2MjIyMjHtxcXFxcXFycnJyfo2NjY2NjYyMjIyHcXFxcXFxcnJycnKMjY2NjY2MjIuLi3lycnJycnJzc3Nzf4yMjIyMjIuLi4uFcnJycnJycnNzc3OMjIyMjIyMi4uLi3hycnJycnJzc3NzgIyMjIyMjIuLi4uDcnJycnJycnNzc3SMjIyMjIyMi4uLi3dycnJycnJzc3NzgYyMjIyMjIuLi4uCcnJycnJyc3Nzc3aMjIyMjIyMi4uLi3VycnJycnJzc3Nzg4yMjIyMjIuLi4uAcnJycnJyc3Nzc3eMjIyMjIyMi4uLi3RycnJycnJzc3NzhIyMjIyMjIuLi4uAcnJycnJyc3Nzc3mMjIyMjIyMi4uLi3JycnJycnJzc3NzhoyMjIyMjIuLi4t+cnJycnJyc3Nzc3qMjIyMjIyLi4uLinJycnNzc3N0dHR0h4uLi4uLi4qKiop9c3Nzc3Nzc3R0dHyLi4uLi4uLioqKiHNzc3Nzc3N0dHR0iIuLi4uLi4qKiop8c3Nzc3Nzc3R0dH2Li4uLi4uLioqKhnNzc3Nzc3N0dHR0iYuLi4uLi4qKiop6c3Nzc3Nzc3R0dH+Li4uLi4uLioqKhXNzc3Nzc3N0dHR0i4uLi4uLi4qKiop5c3Nzc3Nzc3R0dICLi4uLi4uLioqKhHNzc3Nzc3N0dHR1i4uLi4uLi4qKiop4c3Nzc3NzdHR0dIGLi4uLi4uLioqKgnNzc3Nzc3N0dHR2i4uLi4uLi4qKiop2c3Nzc3NzdHR0dIKLi4uLi4uLioqKgXNzc3Nzc3N0dHR3i4uLi4uLi4qKiol2dHR0dHR0dHV1dYOKioqKioqKiYmJgHR0dHR0dHR0dXV5ioqKioqKiomJiYl0dHR0dHR0dHV1dYSKioqKioqKiYmJf3R0dHR0dHR0dXV7ioqKioqKiomJiYl0dHR0dHR0dHV1dYaKioqKioqKiYmJfnR0dHR0dHR1dXV8ioqKioqKioqJiYd0dHR0dHR0dHV1dYeKioqKioqKiYmJfHR0dHR0dHR1dXV9ioqKioqKiomJiYZ0dHR0dHR0dHV1dYiKioqKioqKiYmJe3R0dHR0dHR1dXV+ioqKioqKiomJiYV0dHR0dHR0dHV1dYmKioqKioqKiYmJenR0dHR0dHR1dXWAioqKiYmJiYmIiIN1dXV1dXV1dXZ2domJiYmJiYmJiYiIeXV1dXV1dXV1dnaAiYmJiYmJiYmIiIJ1dXV1dXV1dXZ2d4mJiYmJiYmJiYiIeHV1dXV1dXV1dnaBiYmJiYmJiYmIiIF1dXV1dXV1dXZ2eImJiYmJiYmJiYiId3V1dXV1dXV1dnaCiYmJiYmJiYmIiIB1dXV1dXV1dXZ2eYmJiYmJiYmJiIiIdnV1dXV1dXV1dnaDiYmJiYmJiYmIiH91dXV1dXV1dXZ2e4mJiYmJiYmJiIiIdXV1dXV1dXV1dnaFiYmJiYmJiYmIiH51dXV1dXV1dXZ2fImJiYmJiYmJiIiHdXV1dXV1dXV1dnaGiYmJiYmJiYmIiH11dXV1dXV1dXZ2fYiIiIiIiIiIiIiFdnZ2dnZ2dnZ2d3eGiIiIiIiIiIiIh3x2dnZ2dnZ2dnd3foiIiIiIiIiIiIeEdnZ2dnZ2dnZ2d3eHiIiIiIiIiIiIh3t2dnZ2dnZ2dnZ3f4iIiIiIiIiIiIeDdnZ2dnZ2dnZ2d3eIiIiIiIiIiIiIh3p2dnZ2dnZ2dnZ3gIiIiIiIiIiIiIeCdnZ2dnZ2dnZ2d3iIiIiIiIiIiIiIh3l2dnZ2dnZ2dnZ3gIiIiIiIiIiIiIeBdnZ2dnZ2dnZ2d3mIiIiIiIiIiIiHh3h2dnZ2dnZ2dnZ3goiIiIiIiIiIiIeAdnZ2dnZ2dnZ2d3qIiIiIiIiIiIiHh3d2dnZ2dnZ2dnZ3g4iIiIiIh4eHh4eAd3d3d3d3d3d3d3uHh4eHh4eHh4eHhnd3d3d3d3d3d3d3g4eHh4eHh4eHh4d/d3d3d3d3d3d3d3yHh4eHh4eHh4eHhnd3d3d3d3d3d3d4hIeHh4eHh4eHh4d+d3d3d3d3d3d3d32Hh4eHh4eHh4eHhXd3d3d3d3d3d3d4hYeHh4eHh4eHh4d9d3d3d3d3d3d3d36Hh4eHh4eHh4eHhHd3d3d3d3d3d3d4hoeHh4eHh4eHh4d8d3d3d3d3d3d3d3+Hh4eHh4eHh4eHg3d3d3d3d3d3d3d4h4eHh4eHh4eHh4d7d3d3d3d3d3d3d4CHh4eHh4eHh4eHgnd3d3d3d3d3d3d5h4aGhoaGhoaGhoZ7eHh4eHh4eHh4eICGhoaGhoaGhoaGgXh4eHh4eHh4eHh6h4aGhoaGhoaGhoZ6eHh4eHh4eHh4eIGGhoaGhoaGhoaGgHh4eHh4eHh4eHh7hoaGhoaGhoaGhoZ5eHh4eHh4eHh4eIKGhoaGhoaGhoaGgHh4eHh4eHh4eHh7hoaGhoaGhoaGhoZ4eHh4eHh4eHh4eIKGhoaGhoaGhoaGf3h4eHh4eHh4eHh8hoaGhoaGhoaGhoV4eHh4eHh4eHh4eIOGhoaGhoaGhoaGfnh4eHh4eHh4eHh9hoaGhoaGhoaGhoR4eHh4eHh4eHh4eISGhoaGhoaGhoaGfXh4eHh4eHh4eHh+hoaGhoaGhoaGhoR4eHh4eHh5eXl5eYSFhYWFhYWFhYWFfXl5eXl5eXl5eXl/hYWFhYWFhYWFhYJ5eXl5eXl5eXl5eYWFhYWFhYWFhYWFfHl5eXl5eXl5eXmAhYWFhYWFhYWFhYF5eXl5eXl5eXl5eYWFhYWFhYWFhYWFe3l5eXl5eXl5eXmAhYWFhYWFhYWFhYF5eXl5eXl5eXl5eoWFhYWFhYWFhYWFe3l5eXl5eXl5eXmAhYWFhYWFhYWFhYB5eXl5eXl5eXl5e4WFhYWFhYWFhYWFenl5eXl5eXl5eXmBhYWFhYWFhYWFhYB5eXl5eXl5eXl5fIWFhYWFhYWFhYWFeXl5eXl5eXl5eXmChYWFhYWFhYWFhX95enp6f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f4CAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAA';
+    var base64string = 'UklGRvQbAABXQVZFZm10IBAAAAABAAEAIlYAAESsAAACABAAZGF0YdAbAADk/qz+y/5X/pP+Pv53/j/+UP5//p7+nf6j/rf+HP/u/gP/Ff/B/v/+3/63/qz+sf6G/pn+U/6h/hL+ef5o/qz+hf6q/tf+SP/k/i7/7v4b/6f+M//S/hv/uf7Y/nX+3/5k/sz+V/6f/nT+kf6V/uv+4v48/9T+Vf/S/vT++f72/sD+zP7c/uD+k/5t/rv+Tv7G/lX+fv6W/un+/v7//jz/KP8v/z3/E/9g/+H+m//1/kr//P5O/+r+NP/R/g//4P4a/zz/ff+6//n/jP/8/0z/cf8f/xX//f4t/+z+4v6q/gj/qv5y/kv+mP7V/oX+gP7l/gX/+f7f/pH+P/7f/UD+KP5E/hH+RP4H/m7+/v1S/gT+h/4Q/j/+GP4P/tH98P27/ST++v1F/gz+Hv6v/WH+Lf63/hz+UP43/ov+oP5y/jX+TP6C/v3+xP69/l7+nv7t/uH+MP/X/pz+uP6T/ij+V/5B/i3/d/1Q+xH7z/tL+3X7+/0oBFkF2QS1CcILQwrTDmQTChOuEfwTuw4hBaL8/fey+VH9ff20/D79f/3L+eD2bvHQ587gC9t20FnG2cN5xYPFbMV0xuHIUsqUyu3N6NxK7SL0DfqRBIoP7RecHxApjTF4M4Uvqyp6KvUpuybyIjIhPR5PHAcbVxglFf8SDRAADWEIWwNw/Pz3o/Pl8V/1fvsn/Zb9XQBtBuoJkAtaD0YVZBfDFXUUaxSHFNUVmRZDFj4WMBZbFokU1BG0D5APIg/cDZwJAAfSBeEFGAMLAOr+Tf0b+y/6CvrF+hz65fmH+R766fkD/DD9zP26/E/+1gBHAsMC8wPBBRYFlANfBJcFdgWAA68CvgLdArsByQBpAOn/cf7m/X39rfvT+V/4oPcg9QHzW/QW9vv0DPR79cT3/fZ99WL1+/aI96j4Dfkm+sH6oPwe/av98/39/2oBtwFUAa4BIQJ+AnUAZf+5/4cA6v4e/cH89fy++yj7o/lh+Ef3OfcR9xf25/SK9Db0UPPT8eLxUvSI9GvzTvMY9cj13PUh9rL30Pex+Nj58Prc+l77svyJ/sv+JQDGAPMA+f8FAO//JgD0/9z/1P94/yH9Yfte+iX7rvrz+ML3HfeP9sr1K/Ua9ov2PfaJ9un2OfeZ98T3wff8+Tz83v3x/RH/EgBYAXcCiAMyBJEE8AQwBR4FLQbaBvEHegemBrEFTAXEA9sBR/7f/KP8f/yU+oL4Ifjh9vX0XfQT9Gv06/PW853z+vOp9JL1r/aZ+Bn6RPup/Mf9xv80AfsCiwQ5BW0GVQcHCOwIFAo3C44KSAmnBzMHNAfKBg8FDQT3AawBAwE0ALz+4f1K/Xz92Pwk/eL8J/0J/P37qvxM/J77YvxN/WL+xv7D/0UAqAAQAbcBWwMkBbQGVgdIBzsIDgmICXkKJAq6Ci0L1wvrCqkKtApGC2EKWQlsCb8JYghYBzsGaAbeBrkGlQSHAgMB7wCG/wf/pv5l/jP9rvzh+y/8Wvsz+/H7EP2n/tX/NgAgAZMBzgNWBV0GGwcnCBAKIwtKDKEMVA1jDZoNFA2VDAUMggsKC20KQwo8CaEHtAZfBUwEoQK6ATYA1P8//jb9DPt9+lX6xfoB+iT6cPo0++T7yfwe/fX9l/6y/0MAmQHiAvMDCAVyBpAHpQgTCcUJHwoPCxgMdwzZDCUNJg0tDWoMswvbCm8JugimB7UGgAUtBIICUQH0/1n/SP10/Df7SPoO+YH4wPiR+ez5gfpg+k37FPxi/fD9AP8PAEwBTQI1BGQFpQeuCZ8LKg33DgMQ1xABESkR3RCWEMUPkA4wDQoLHQkgB7QF8AOXAe7+fv2X+zf6yvgf9y31KPS285XzLPSp9Rn2IPeO91L50Prk/Eb+bgBPAt0E7AbFCeoL8w2ODx4RARIdE9AS9hJgEs4RDBBsDqQMQQr5B6cFGANwAGn9l/rz9/T0kvKQ8Azv4u1Z7ffsuuyl7S3vG/AX8cvxKPS59S34QfoE/fX/awNbBT0ICwrnDCMOdg9NEO0Q0BCsEMoPHA85DUwL1wieBtoDTQGD/r37cPhT9ZHyefBZ7u7rnupz6Zjox+jU6HzpOOo06/TsYe7F8DXzJPad+Hv7rP4lAtkE2wf7CRQMcw2DDhUPtw84D3IPIQ7QDKkKdAgWBq8D+QAz/nf6b/f0853wzOzq6YznlOUa5FXjTeIo4l7iKeP24/TlNOgy6p/ske/o8uX1F/k+/I7/HgIfBfIG4QgTChsLwwtdC7IKHQlYB8wFkwL5/2H8Z/lF9ejxqu3z6RnlpOFa3u/b8tmI2HbXHNfC1q3Xq9g+2gvcct4P4aHk0eeM677vrPNw9/b6Wv5pAQ4E6gVjB4oIPQnlCKgIuAdABgQExAGM/qz7n/cE9Hzv9Orf5QTinN3V2mrXINXf0pTR1NDo0G3RCtPy1NfXKtqc3bLgMOWq6VTupfIP9wf78f5AAh8FhAetCRELHAz0C8YLZAoFCYAGuwMTADz8a/jd84PvruoY5hfh89zg2HXWctMm0VXPvs51z/3QLNN41STYfdvO3m7joOfY7Dbx9PVk+uH/pQP6B/EKjw2xDyERFRJxEroRzRCYDpAMYAn3BbkBk/0R+Tz0PO/b6ebkMOB+3MrYMtaX037SEdL00tTU0Nd52mrdmOC55EnoVO0r8hj4XP3wAsoHIA3GEF4UKRegGWIbZhyCHEscxRrjGN0V+RIYD84KtQV/AEf7P/Z/8Z7smOfK43Tg/d0e3BzbfNvh3CzffuHI5EvozeuV7xf0m/h1/TMCLggGDt4T/BcgHO8fEyM5JdcmVietJw0n+iWTI6ggnRwyGYwUmg8aCv8E/f7K+X70L/D/69voueU/5NXjsORm5g3oZeoR7mzxSvXG+B39uwG9Bs8LsRB+FskcdCIjJz4r0y1LML0xxDKTMt8xxTBULqormygsJL8fSRofFcAOYgkoA9X9n/j29K3wr+2t6/nrmuy07UbvUfH48lz1Wvhk/XkCcQg7DiQUZxk/HlkjVClLLrcyQDZzOLU6STvJO+86RDlXN1g0oDBuLJsnNyJZHFEW6A9qCkME+f7N+aP19PFX8IHv8e+y75zvi/BY8wb3AvuT/48EWwk4D/4URxuXINIlmyoGMMU0qjhTO0g9oz4tPzw/Lj58PJY5KTbfMfss6ieKIi4cbhbtD+MJDwSM/s75XfZE82rxhfDA8InwzPCU8kT1Ofht/NgA9gXyCgkRlRaJHD4hYCbwKgUwozMMN/44kTo/O2Y7eDrDOBA2EzNXLzAroyU6IJIauRS+Dq0IDwOm/Rn5U/XV8Vbvze2y7Ajtee317cbv6PJ/9hz7hf92BPsIhQ6ME/UYzx3OIt0m2iqkLcowJTIZM9IyEDLwMA0v3iu+KMQkkyBuGwkWCBC0Cu8EIv+q+RP1qvD67JjpK+dm5tflQuav563p8OtQ7oTx7fTI+Or9GALsBpIL5hB9FcoZMR1OIMYhwyM6JPMk8iPXIhkhux4VG4YXmhJLDhsJawQl/zj6v/Tn7y/rjueO49zgtd5y3QPd19yv3XjfceEB5P7m1+oy7mDy6vZr+/X/PQSOCCsMcA/BEc0T1hTuFf8VvhWEFL8ScRCuDfQJvAX6AKn8zPcK89HtT+k65GbgS9xv2QbWodSr05TTYNNe1MrVrNdQ2rvdj+BX5BXodOyl8DT1qPlu/ewAmQP5BaYHwggOCTMJxwisB/kFDQR+Ae39bvqu9m3yLe5y6Zzl/OBJ3WvZ3db602/SKNCnzyjP3s+z0D3SStSz1qnZi91c4DXkY+fP62rvcfPN9sD5+PtF/sv/PQGIAW4BtABj/wn+lfsB+Qb2P/Ly7uPq3+Yv44nf59v01wXVEtL2zxTOxc37zJ7N8c0uz7PQXdM91mDZiNxY4KnjjucA6zPvMfLu9HL3E/pw+zD9V/3V/Xv9L/2e+xL6nvfU9ODxOe/h67PomOQf4aPdMdqf15/UCdIv0BrP8s60z/vPotEb03TVxNc426Xed+ID5qjpYO0D8Zbz+/Yf+bL7Lf3C/lf/LwCa/1D/vf1+/AL6wPdt9efyi+9N7L7ohuZe44fgvd3D287ZcNhB1x7XS9cP2E/ZmdoY3UDfaeLV5Wrpee388CD0Qffp+fz8+P79ADACfAOnAzAEVgOIAscAV//0/Nb6B/iS9ajyoe8W7DTppObQ5JvipuCh3hPett2l3YfdG9+Q4ADjY+UY6OnqGe5n8Rn1kvjS+0j+GwFaAzgF8wbgB6wIjAhvCMQGhQWEA4EBov52/Cn5g/Za847wI+7966fp8+eM5V3k9+O85Nbk6uU15w7qKuyD7+XxQ/Vb+En89P/zAhYGzQktDNgOVxAGEgIS/hEAEQwQ7w6vDFgKrgfqBBQBq/3t+iT4h/Ua87Hwz+6g7UPsneto7Dvtru6T8JXzDvab+YD8VQCtAyIIHQtuD4gSvBXyF60ZThtJHEocNRyvGiUZRBbmE8kQjQ2/CbcFuQEq/nz63fZ18xTxTe887tvtfO5r79rw2PKh9e746fxhAYsFdAo3DwwU5hetG+seGCLHI/4loybuJsolEyT6IUEfFBx9GHMT8w6ECXIFqwA+/NT3j/Ql8QbvPO0M7Tvt5u7T8N3zDfcf+6n/xwQhCuEPOBWUGs4fdSSIKJQrJy6xL+YvkC+QLkEsqynTJXkhWBzwFj8RXAttBXT/vfn49Fzw9O0L62fqWOrO6+LtE/Eo9D74HP0nA9EJHBF3Fy4erSSsKmovxzOjNgc5tjlnOa83lDXmMdwtuChPIhccahUEDpQGVf9K+ePzHO8U63fotuZ95u7n0elT7UHxcfbZ+5QCFwlxEd8YOCAEJ2UtrDJdN0Q6wTxfPSI99DpeOKczti5PKBki/BpsE3ML7gPL+8n0su526XHlHuPP4VHih+QK6NjsHPIl91T9BAVeDZcVvx2yJXoseDLCNg06lzu6PL878zkYN48z3S6iKcwixRt6EyYLkAKy+szyF+3H5+Tjv+DB3+nfbuLV5d7qSfA9953+cAZNDrgWfB4/JtgsrTK5Njo55ToBO6M5GTdiM7ku0CjgIbsarRKDCo4BtPmJ8v3rDObB4brett2F3RHgs+Ph6IHuevW1/KcFCQ4tF88frCjzL8o1YDrRPLU93D0XPAU5KDTCLt4nbiB/FzAOuwNo+gnxH+ht4Gjai9Zg1GHUq9VX2NvcseK+6UHyFPvfBMsOVxnKI1EtFjWFO98/aUKWQudBSj97PK03tTHdKQEhmxZUCxj/lPOf55Ld+9SizlPJUcdnxvvH1Mrwzx7X6+Bj6672BgMrDzwaIibXMGI5Lz9jQ/VFcEZRRQBDmj8jO141yS15JHcZiAww/sjw1+Ou2CPPGce+wVq/yb4EwXHEusrC0qXdaej89CkC5g9rHEMpoDMBPExBjkS1RaNF/UPsQYc+DTpnM+0rKiKEFmQIDPm26ZfbP8/PxIy8wrc4tke2Crkbv7jGVNB62/jnv/W8AwUSVB+pK2Y1Az2JQKZCXELDQbA+zjtcN5Iy9SuVI5gYWQvM+5Lspd3BzwvDcrlQshGvea6lsD21rrz0xdfR4N447RP8gwq7GCQmzTAVOMI7mT1lPX88ljopNwgzoS0zJzQefRO0BWD27+Tl1EvFtLjZrnSouKSjpHWnKK1ttL6+c8oM2VboUPikB4wW1SJKLUMz0DaTN3o30TXVM54wgSzPJugfvBZiC8X8UOzH2rLJ2Lqzrqql2Z+SnfOeDKOYqdayvL28y3baYuqf+k4KoxhPJAMs8DAHM9kzUzI4MBstfClVJGweARZtDNz++O703R7Nx7zzrq+jKJ3zmTqaAZ2Po8KrpLYawyTSMOE98TABqBA1HVsmOiyNLocvNy+aLegq9CbzIVAb2hI0CGP6xeqo2UnJOLqirUqjxJ0em0+c4Z9lpYitbbkQx8XVM+VK9H8DJRJPHZ4lSiqLLK4sUyy8KZYmfCF9G54TAwoW/ljv1N4iz8rAtrQYqrei6J6vnnWhyKbqrTW4g8QU0mbgfe9t/qgLnxgrIsQoviukLAAswSkCJswhJxtmEw0Jdvzf7APerc6pwBi0garDoy+hzqDZo9apArGTuwnIs9Wi5Pvy5gEoD2kbBSQsKpIthi66LN0ppCVpIDwZxg+TBPf2puih2Z/LYr8Qtfetfqljp++oBq04tCC9pMg+1cnid/AN/zIM+RgbIsop2C1/LzQv7SzNKJAj9hs6E3kH//r87E/fD9Jjxru8frbpspmy87TeuX/B78o91jji+u7e/AYK0BUqIHcoPS5WMfAx9TDOLRco/iA0F2IMav8d8t/k/tmBz3XGDcAPvce8R79+w6HKttOr3iDrGPlgBkMTih4PKasv3DQ7N8A2RTQHMEMp2CBvFmkKqfxs7dzettLFx8m+27kFuK25+L2RxMPNc9kb5vf04QPPEpIgsSyqNs084T9mQC8+xjrUNC0taCKPFWgFVfTf4hXTCsXLuvSyMK+4rnWxV7iqwo3OCN0B7Uv+Fw/UH+4uijocQuVG7UfvRqZEmEDKOqoyyShpG3sKpfYO46PQ0cBJtN+r3Kj6qaqud7fnwlXRyOEu9PoG4BrcLMw7xkUwTNtOw0+2TiBMf0d+Qck5xS81IjwRnvw46ELU78Nst+6veaxZrtOzu73uyq/adOyC/yMTuiUvNkdD7UsCUTNT71IzUcBN1EiLQjo6qC9JIjERZf/s7NXcoc/nxvTB/cDtw9/KnNSY4ULvz/7PDSIdWCq6Nm5AO0e9SVdKHUjsRJg/hzhlL+gkjxjxCnb+EvTA6svjfd9Y3irfC+NP6WnxlPpHBIIOoxeFH/Yl4CqVLUMuDS3AKcgkKR7QFaMN6gTa/HT1J/B07Jjruey18Ij0b/qAAdIJQRJnGysjMyk5LWUv7S4iLQMoUiHfGLIPOgW4+i3w6eai3uDZ6dfg13XaqeAu6c3yT/7kClEXoSPTLqs3ST5+QiZEDUKZPQs2LSx9HygSdwKC89/kXdgizkHH9MMaxS3JVtDk2p3nrfWUBUAVsSQFMto95UWjSqpKCklpRPA9hjWoKZgbrwvj+n7rU9wW0HnG/cFcwRnEaMp/1A3hYO5w/ecMHxwIKaE0dTyFQdBCrEFsPkU4jS+oJWgZWQwg/vbx4uZO3jrYjdVt1bfY1d1g5lnv3fk5BKkOexitIPslminMKgcq+SWsILEZixHWCNoAa/nR8u3sH+oI6ojrae7J8uP40/9NB1QOlxSeGcocjB6RHuIbvRdsEQ8L0wMN/eH1TPDa6jvoDuea6LnrTPDj9kj+mwWoDRgV4BomHwIifiKNIfsdGBnvEd0KaALr+kvzeOvg5WXjIuP75FDozu2M9Gr8BwWzDaoVphuDICYjeSOjIQkePhiREQ8JpQAv+ATxHOoj5S7i1OGX443nGeyy8rD6RwM9CzcTHhnhHfofYSCXHlUbchUjDxMIpQBW+fnyDO0v6TXnQufE6PDr/vC99kD9PwT8CngQ4xOVFlMXRhawEzgPSAoqBOD9HPhf8yPvF+yc6hHrZewP8Pn0GPv2ANoHNA3wEm8VjhdjFxcWyxL8DTgIGwK1++z1OvBJ7ALpj+fc5oDoO+xb8RH3vP3RA+kJNw7/EZQUQhViFFgS4Q7PCoAF6QBX+2X2bvLG72vusu3S7v7w0fME90n79v5kA50GTAnGCjEM1QuiCsYI5waeA/cA1v3s+y35GfiU9wr4nPj4+f36Af2P/o8A8AH7AqUDBQT7A6sDiAKYAWEAWv9Q/r/9Wf0f/Vn9zf38/TL+Z/+c/z8AZgBpAJ3/m//S/0L/lP6X/s39Kv6//WX++P5nAOEAIgK/Ar8DrgPHA0QDmAK/AWoA9/5f/Xj7Ovpx+IH3yvZA9//3Lfmi+n38af5FAeMDOQY5CB0JMgp9CoUKPQl2B3MFFQNJALv9qvu5+fb3L/eS9ob3D/hs+WH6lfzq/X0AyQFwA44EugVyBsQGZwZbBmcFGQVjA5UCWQHnAKwAdQAGAEIAGQC5APEArQFDAncCNQL+AYMBRQGsAL3/F/5D/a38FPwV/J38TP24/f7+iAB3AjgDLgTyBA4GkQYnB9sGYQYKBfUDrwGNADr+Gf1d+4v6uPlf+Qz59vl5+tj7Df1+/hsA6wEZA4oE7wS4BXoFQAUlBP4CvQEeAPL9Ivzw+b74gPdV9jX2rPVS9gb3yvic+qD8/f6oAGMCTQQSBbIFdAVsBV4EYAMBAXz/Hf04+3P4Y/cr9aDzvPIy88fzSfQ69YT3cfny+wv+AQGWAp8EBgaaBrsGngbEBdUDOgLW/3j9xPpT+LD2pvQB87HxN/Fd8RXya/NI9UX3Nvk6/HP+YAFTA0UF8gWjBkUGTgZvBWYERwInAK79RPu2+Nf2fvT88pbxFPEC8RXydfJI9Kb13feA+Sn7Hf3F/gYAxgAmAcABMwHfAOn/Lv9V/hH9ePzH+9b6MPpf+Z34WPjg99b3APf99hr3X/eG92n3VPe29zP3svdl9/X3A/gM+X75v/oY+2T88PwI/uf+jP+1/5L/Y/9Z/23+7f1e/DL7/PiQ9xn2S/WA9HLzivKU8hbz9/Nj9VD2Kfih+RL8yf1B/3gAcwFuARYB0gC1AJj/pP5I/bf7+vmw+LX2mPVt9MH0f/QI9VT1WPZ/9yP5BPqC+7P8+P2r/nj/HQC2AGQABgAG/5r+Vf3Q/L/7+/om+nL5Ivne+Gj4DfgL+IL4Afl1+Qf6x/qW+wz8lPzu/I79R/7//or+8f4p/sz9Q/2j/BD8B/x5+/H6Mvps+qf5k/ka+cj5pPn/+Rz6DPtt+1r88PyZ/b79Sv7Q/iX/h/6v/gz+A/5f/dP8ZvwZ/In7+Pqj+p/6jvqK+r36y/p3+4v7L/y3/PH81P1j/s3+DP8g/6L/VP+n/wr/sv9X/xn/SP5P/uv9Nf6t/fH9rP2v/QP+Ff4d/oz+Rf6l/lX+pf6k/qn+Av92/3P/yP/Y/wUACADT/5EAsADZAB4BBgFXAYwBsQHXAS8BAQGYAEgA2v+8/2n/zf9I/4H/w/48/zv/9f8gAHoAGAG7AcIBdQLZAscCmwIBA3sC2QK3AvgCZwJAAqQBfwH8ALUAUAAGABQAfAAiAJMAlgCNAMEAJwFRAa4BcQKxAuwClQKUAosCmAJ8ApcCEAIRAscBrwGSAYcBRQEuAaQA6ABcAOwAxQBYAeUAcQEYAVUBZgELArwBLAJmAugC5wIMA/ICIAO3At0CVQJcAhYC8wHKAacBhQFwAYMBegGOARQBZwGcATwCWgKtAn8C6wIBAyUDKwP9AvsC/AKiArwCNQJtAtEB0QERASMBqgC1AKsAvQCoAMwAuQCuAKEA/gDLAFwBDQFuAVQB/wGPAYUBgwFxARoBKwEXAfwA2wDPAHsAsgBcAP//+v+z/4T/S/9L//r+8P5D/7z/yf+IAPr/dABVAFIAXACcALYA5gDkABIBpgCoAOr/0v9f/2//0f7w/j3+ev4a/hD+7v02/kz+';
+    chat_notify_audio = new Audio("data:audio/wav;base64," + base64string);
+
+}
+
+// Issue a pop-up notification using the web standard Notification API
+// https://developer.mozilla.org/docs/Web/API/notification
+var chat_issue_notification = function (theBody,theTitle) {
+    if ( !chat_notify_granted || !chat_notify_enabled) {
+        return;
+    }
+    var nIcon = "/images/icons/48/group.png";
+    var options = {
+        body: theBody,
+        icon: nIcon,
+        silent: false
+    }
+    var n = new Notification(theTitle,options);
+    n.onclick = function (event) {
+        setTimeout(n.close.bind(n), 300); 
+    } 
+    if(chat_notify_audio_enabled) {
+      chat_notify_audio.play();
+    }
+}
+
+
+function toggleChatNotificationAudio() {
+	if(!chat_notify_audio_enabled) {
+		chat_notify_audio_enabled = true;
+        $('#toggle-notifications-audio-icon').removeClass('fa-volume-off');
+        $('#toggle-notifications-audio-icon').addClass('fa-volume-up');
+	}
+	else {
+		chat_notify_audio_enabled = false;
+        $('#toggle-notifications-audio-icon').removeClass('fa-volume-up');
+        $('#toggle-notifications-audio-icon').addClass('fa-volume-off');
+	}
+}
+
+function toggleChatNotifications() {
+	if(!chat_notify_enabled) {
+		chat_notify_enabled = true;
+        $('#toggle-notifications-icon').addClass('fa-bell');
+        $('#toggle-notifications-icon').removeClass('fa-bell-slash-o');
+        $('#toggle-notifications-audio').removeClass('disabled');
+	}
+	else {
+		chat_notify_enabled = false;
+        $('#toggle-notifications-icon').addClass('fa-bell-slash-o');
+        $('#toggle-notifications-icon').removeClass('fa-bell');
+        $('#toggle-notifications-audio').addClass('disabled');
+	}
+}
+
+function chatJotGetLink() {
+	reply = prompt("{{$linkurl}}");
+	if(reply && reply.length) {
+		$('#chat-rotator').spin('tiny');
+		$.get('linkinfo?f=&url=' + reply, function(data) {
+			addmailtext(data);
+			$('#chat-rotator').spin(false);
+		});
+	}
+}
+
+function addmailtext(data) {
+	var currentText = $("#chatText").val();
+	$("#chatText").val(currentText + data);
+}
+
+function adjustFullscreenTopBarHeight() {
+	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 16);
+	$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
+}
+
+function adjustInlineTopBarHeight() {
+	$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23);
+	$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
+}
+
+function isMobile() {
+	if( navigator.userAgent.match(/Android/i)
+		 || navigator.userAgent.match(/webOS/i)
+		 || navigator.userAgent.match(/iPhone/i)
+		 || navigator.userAgent.match(/iPad/i)
+		 || navigator.userAgent.match(/iPod/i)
+		 || navigator.userAgent.match(/BlackBerry/i)
+		 || navigator.userAgent.match(/Windows Phone/i)
+	 ){
+		return true;
+	}
+	else {
+		 return false;
+	}
+}
+
+$(function(){
+	$('#chatText').keypress(function(e){
+		if (e.keyCode == 13 && e.shiftKey||isMobile()) {
+			//do nothing
+		}
+		else if (e.keyCode == 13) {
+			e.preventDefault();
+			$('#chat-form').trigger('submit');
+		}
+	});
+});
+</script>
diff --git a/view/tpl/chatroom_members.tpl b/view/tpl/chatroom_members.tpl
new file mode 100644
index 000000000..ea5fbede8
--- /dev/null
+++ b/view/tpl/chatroom_members.tpl
@@ -0,0 +1,5 @@
+<div id="chatroom_members" class="widget">
+	<h3>{{$header}}</h3>
+	<div id="chatMembers"></div>
+</div>
+
diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl
new file mode 100644
index 000000000..1497939f6
--- /dev/null
+++ b/view/tpl/chatroom_new.tpl
@@ -0,0 +1,12 @@
+<div id="chatroom-new" class="section-content-tools-wrapper">
+	<form id="chatroom-new-form" action="chat" method="post" class="acl-form" data-form_id="chatroom-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+		{{include file="field_input.tpl" field=$name}}
+		{{include file="field_input.tpl" field=$chat_expire}}
+		<div class="btn-group pull-right">
+			<button id="dbtn-acl" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button>
+			<button id="dbtn-submit" class="acl-submit btn btn-primary" type="submit" name="submit" value="{{$submit}}" data-formid="chatroom-new-form">{{$submit}}</button>
+		</div>
+		<div class="clear"></div>
+	</form>
+</div>
+{{$acl}}
diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl
new file mode 100644
index 000000000..a81b8ec1e
--- /dev/null
+++ b/view/tpl/chatroomlist.tpl
@@ -0,0 +1,10 @@
+<div id="chatroom_list" class="widget">
+	<h3>{{$header}}</h3>
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}">{{$overview}}</a></li>
+		{{foreach $items as $item}}
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$item.cr_id}}"><span class="badge pull-right">{{$item.cr_inroom}}</span>{{$item.cr_name}}</a></li>
+		{{/foreach}}
+	</ul>
+</div>
+
diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl
new file mode 100644
index 000000000..71a2acada
--- /dev/null
+++ b/view/tpl/chatrooms.tpl
@@ -0,0 +1,41 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $is_owner}}
+		<button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$newroom}}</button>
+		{{/if}}
+		<h2>{{$header}}</h2>
+	</div>
+	{{if $is_owner}}
+	{{$chatroom_new}}
+	{{/if}}
+	{{if $rooms}}
+	<div class="section-content-wrapper-np">
+		<table id="chatrooms-index">
+			<tr>
+				<th width="97%">{{$name}}</th>
+				<th width="1%">{{$expire}}</th>
+				<th width="1%" class="chatrooms-index-tool"></th>
+				<th width="1%"></th>
+			</tr>
+			{{foreach $rooms as $room}}
+			<tr class="chatroom-index-row">
+				<td><a href="{{$baseurl}}/chat/{{$nickname}}/{{$room.cr_id}}">{{$room.cr_name}}</a></td>
+				<td>{{$room.cr_expire}}&nbsp;min</td>
+				<td class="chatrooms-index-tool{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} dropdown float-right{{/if}}">
+					{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}}
+					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('chatroom',{{$room.cr_id}});"></i>
+					<ul id="panel-{{$room.cr_id}}" class="lockview-panel dropdown-menu"></ul>
+					{{/if}}
+				</td>
+				<td><span class="badge badge-default">{{$room.cr_inroom}}</span></td>
+			</tr>
+			{{/foreach}}
+		</table>
+
+	</div>
+	{{else}}
+	<div class="section-content-wrapper">
+		{{$norooms}}
+	</div>
+	{{/if}}
+</div>
diff --git a/view/tpl/cloud.tpl b/view/tpl/cloud.tpl
new file mode 100644
index 000000000..d1567af9f
--- /dev/null
+++ b/view/tpl/cloud.tpl
@@ -0,0 +1,4 @@
+<div class="generic-content-wrapper">
+{{include file="cloud_header.tpl"}}
+{{include file="cloud_directory.tpl"}}
+</div>
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
new file mode 100644
index 000000000..0ebecce29
--- /dev/null
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -0,0 +1,42 @@
+<div id="files-mkdir-tools" class="section-content-tools-wrapper">
+	<label for="files-mkdir">{{$folder_header}}</label>
+	<form id="mkdir-form" method="post" action="file_upload" class="acl-form" data-form_id="mkdir-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+		<input type="hidden" name="folder" value="{{$folder}}" />
+		<input type="hidden" name="channick" value="{{$channick}}" />
+		<input type="hidden" name="return_url" value="{{$return_url}}" />
+		<input id="files-mkdir" type="text" name="filename" class="form-control form-group">
+		<div class="pull-right btn-group">
+			<div class="btn-group">
+				{{if $lockstate}}
+				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
+					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
+				</button>
+				{{/if}}
+				<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
+			</div>
+		</div>
+	</form>
+	<div class="clear"></div>
+</div>
+<div id="files-upload-tools" class="section-content-tools-wrapper">
+	{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}{{$info}}</div>{{/if}}
+	<form id="ajax-upload-files" method="post" action="file_upload" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+		<input type="hidden" name="directory" value="{{$path}}" />
+		<input type="hidden" name="channick" value="{{$channick}}" />
+		<input type="hidden" name="return_url" value="{{$return_url}}" />
+		<label for="files-upload">{{$upload_header}}</label>
+		<input class="form-group pull-left" id="files-upload" type="file" name="userfile">
+		<div class="pull-right btn-group">
+			<div class="btn-group">
+				{{if $lockstate}}
+				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
+					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
+				</button>
+				{{/if}}
+				<button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
+			</div>
+		</div>
+	</form>
+	<div class="clear"></div>
+</div>
+{{$aclselect}}
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
new file mode 100644
index 000000000..adc8584c3
--- /dev/null
+++ b/view/tpl/cloud_directory.tpl
@@ -0,0 +1,45 @@
+<div id="cloud-drag-area" class="section-content-wrapper-np">
+	<table id="cloud-index">
+		<tr>
+			<th width="1%"></th>
+			<th width="92%">{{$name}}</th>
+			<th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th>
+			<th width="1%">{{*{{$type}}*}}</th>
+			<th width="1%" class="d-none d-md-table-cell">{{$size}}</th>
+			<th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th>
+		</tr>
+	{{if $parentpath}}
+		<tr>
+			<td><i class="fa fa-level-up"></i>{{*{{$parentpath.icon}}*}}</td>
+			<td><a href="{{$parentpath.path}}" title="{{$parent}}">..</a></td>
+			<td></td><td></td><td></td><td></td>
+			<td>{{*[{{$parent}}]*}}</td>
+			<td class="d-none d-md-table-cell"></td>
+			<td class="d-none d-md-table-cell"></td>
+		</tr>
+	{{/if}}
+		<tr id="new-upload-progress-bar--1"></tr> {{* this is needed to append the upload files in the right order *}}
+	{{foreach $entries as $item}}
+		<tr id="cloud-index-{{$item.attachId}}">
+			<td><i class="fa {{$item.iconFromType}}" title="{{$item.type}}"></i></td>
+			<td><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td>
+	{{if $item.is_owner}}
+			<td class="cloud-index-tool">{{$item.attachIcon}}</td>
+			<td id="file-edit-{{$item.attachId}}" class="cloud-index-tool"></td>
+			<td class="cloud-index-tool"><i class="fakelink fa fa-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td>
+			<td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
+
+	{{else}}
+			<td></td><td></td><td></td><td></td>
+	{{/if}}
+			<td>{{*{{$item.type}}*}}</td>
+			<td class="d-none d-md-table-cell">{{$item.sizeFormatted}}</td>
+			<td class="d-none d-md-table-cell">{{$item.lastmodified}}</td>
+		</tr>
+		<tr id="cloud-tools-{{$item.attachId}}">
+			<td id="perms-panel-{{$item.attachId}}" colspan="9"></td>
+		</tr>
+
+	{{/foreach}}
+	</table>
+</div>
diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
new file mode 100644
index 000000000..c1e589341
--- /dev/null
+++ b/view/tpl/cloud_header.tpl
@@ -0,0 +1,16 @@
+<div class="section-title-wrapper">
+	{{if $actionspanel}}
+	<div class="pull-right">
+		{{if $is_owner}}
+		<a href="/sharedwithme" class="btn btn-sm btn-outline-secondary"><i class="fa fa-cloud-download"></i>&nbsp;{{$shared}}</a>
+		{{/if}}
+		<button id="files-create-btn" class="btn btn-sm btn-primary" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="fa fa-folder-o"></i>&nbsp;{{$create}}</button>
+		<button id="files-upload-btn" class="btn btn-sm btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload}}</button>
+	</div>
+	{{/if}}
+	<h2>{{$header}}</h2>
+	<div class="clear"></div>
+</div>
+{{if $actionspanel}}
+	{{$actionspanel}}
+{{/if}}
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
new file mode 100755
index 000000000..f490483b8
--- /dev/null
+++ b/view/tpl/comment_item.tpl
@@ -0,0 +1,67 @@
+		{{if $threaded}}
+		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+		{{else}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+		{{/if}}
+			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$comment}}</textarea>
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
+					</select>
+				{{/if}}
+				<div id="comment-tools-{{$id}}" class="pt-2 comment-tools">
+					<div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left">
+						<div class="btn-group mr-2">
+							<button class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;">
+								<i class="fa fa-bold comment-icon"></i>
+							</button>
+							<button class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;">
+								<i class="fa fa-italic comment-icon"></i>
+							</button>
+							<button class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;">
+								<i class="fa fa-underline comment-icon"></i>
+							</button>
+							<button class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;">
+								<i class="fa fa-quote-left comment-icon"></i>
+							</button>
+							<button class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;">
+								<i class="fa fa-terminal comment-icon"></i>
+							</button>
+						</div>
+						<div class="btn-group mr-2">
+							<button class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;">
+								<i class="fa fa-link comment-icon"></i>
+							</button>
+						</div>
+						{{if $feature_encrypt}}
+						<div class="btn-group mr-2">
+							<button class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;">
+								<i class="fa fa-key comment-icon"></i>
+							</button>
+						</div>
+						{{/if}}
+						{{$comment_buttons}}
+					</div>
+					<div class="btn-group float-right" id="comment-edit-submit-wrapper-{{$id}}">
+						{{if $preview}}
+						<button id="comment-edit-presubmit-{{$id}}" class="btn btn-outline-secondary btn-sm" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}">
+							<i class="fa fa-eye comment-icon" ></i>
+						</button>
+						{{/if}}
+						<button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-sm" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button>
+					</div>
+				</div>
+				<div class="clear"></div>
+			</form>
+		</div>
+		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview"></div>
diff --git a/view/tpl/common_friends.tpl b/view/tpl/common_friends.tpl
new file mode 100755
index 000000000..489717e78
--- /dev/null
+++ b/view/tpl/common_friends.tpl
@@ -0,0 +1,15 @@
+<div class="profile-match-wrapper">
+	<div class="profile-match-photo">
+		<a href="{{$url}}">
+			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
+	</div>
+	{{if $note}}
+	<div class="profile-match-note">{{$note}}</div>
+	{{/if}}	
+	<div class="profile-match-end"></div>
+</div>
diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl
new file mode 100755
index 000000000..29c46369b
--- /dev/null
+++ b/view/tpl/common_tabs.tpl
@@ -0,0 +1,17 @@
+<div class="mb-4 d-none d-md-block">
+	<ul class="nav nav-tabs nav-fill">
+		{{foreach $tabs as $tab}}
+		<li class="nav-item"{{if $tab.id}} id="{{$tab.id}}"{{/if}}><a class="nav-link{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+		{{/foreach}}
+	</ul>
+</div>
+<div class="d-md-none dropdown clearfix" style="position:fixed; right:7px; top:4.5rem; z-index:1020">
+	<button type="button" class="btn btn-outline-secondary btn-sm float-right" data-toggle="dropdown">
+		<i class="fa fa-bars"></i>
+	</button>
+	<div class="dropdown-menu dropdown-menu-right">
+		{{foreach $tabs as $tab}}
+		<a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a>
+		{{/foreach}}
+	</div>
+</div>
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
new file mode 100755
index 000000000..16915abda
--- /dev/null
+++ b/view/tpl/connection_template.tpl
@@ -0,0 +1,48 @@
+<div id="contact-entry-wrapper-{{$contact.id}}">
+	<div class="section-subtitle-wrapper clearfix">
+		<div class="pull-right">
+			{{if $contact.approve && $contact.ignore}}
+			<form action="connedit/{{$contact.id}}" method="post" >
+			<button type="submit" class="btn btn-success btn-sm" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="fa fa-check"></i> {{$contact.approve}}</button>
+
+			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-sm" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a>
+
+			{{/if}}
+			<a href="#" class="btn btn-danger btn-sm" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
+			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i></a>
+			{{if $contact.approve}}
+			</form>
+			{{/if}}
+		</div>
+		<h3>{{if $contact.public_forum}}<i class="fa fa-comments-o"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a>{{if $contact.phone}}&nbsp;<a class="btn btn-outline-secondary btn-sm" href="tel:{{$contact.phone}}" title="{{$contact.call}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</h3>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<div class="contact-photo-wrapper" >
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
+		</div>
+		<div class="contact-info">
+			{{if $contact.status}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.status_label}}:</span> {{$contact.status}}
+			</div>
+			{{/if}}
+			{{if $contact.connected}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.connected_label}}:</span> <span class="autotime" title="{{$contact.connected}}"></span>
+			</div>
+			{{/if}}
+			{{if $contact.webbie}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.webbie_label}}:</span> {{$contact.webbie}}
+			</div>
+			{{/if}}
+			{{if $contact.network}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}">{{$contact.recent_label}}</a>
+			</div>
+			{{/if}}
+		</div>
+
+	</div>
+</div>
+
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
new file mode 100755
index 000000000..13261965a
--- /dev/null
+++ b/view/tpl/connections.tpl
@@ -0,0 +1,36 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper clearfix">
+		<div class="dropdown pull-right">
+			<button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus()">
+				<i class="fa fa-search"></i>&nbsp;{{$label}}
+			</button>
+			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
+				<i class="fa fa-sort"></i>
+			</button>
+			<div class="dropdown-menu dropdown-menu-right">
+				{{foreach $tabs as $menu}}
+				<a class="dropdown-item" href="{{$menu.url}}">{{$menu.label}}</a>
+				{{/foreach}}
+			</div>
+		</div>
+		{{if $finding}}<h2>{{$finding}}</h2>{{else}}<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>{{/if}}
+	</div>
+	<div id="contacts-search-form" class="section-content-tools-wrapper">
+		<form action="{{$cmd}}" method="get" >
+			<div class="input-group form-group">
+				<input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
+				<div class="input-group-btn">
+					<button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-fw fa-search"></i></button>
+				</div>
+			</div>
+		</form>
+	</div>
+	<div id="connections-wrapper clearfix">
+		{{foreach $contacts as $contact}}
+			{{include file="connection_template.tpl"}}
+		{{/foreach}}
+		<div id="page-end"></div>
+	</div>
+</div>
+<script>$(document).ready(function() { loadingPage = false;});</script>
+<div id="page-spinner"></div>
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
new file mode 100755
index 000000000..580a8a41c
--- /dev/null
+++ b/view/tpl/contact_block.tpl
@@ -0,0 +1,14 @@
+<div id="contact-block" class="widget">
+	<h3>{{$contacts}}</h3>
+	{{if $micropro}}
+	{{if $viewconnections}}
+	<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
+	{{/if}}
+	<div class='contact-block-content'>
+	{{foreach $micropro as $m}}
+		{{$m}}
+	{{/foreach}}
+	</div>
+	{{/if}}
+</div>
+<div class="clear"></div>
diff --git a/view/tpl/contact_head.tpl b/view/tpl/contact_head.tpl
new file mode 100755
index 000000000..72e7edbfb
--- /dev/null
+++ b/view/tpl/contact_head.tpl
@@ -0,0 +1,30 @@
+<script language="javascript" type="text/javascript"
+          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          <script language="javascript" type="text/javascript">
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "{{$editselect}}",
+	elements: "contact-edit-info",
+	plugins : "bbcode",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_styles : "blockquote,code",
+	gecko_spellcheck : true,
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	force_p_newlines : false,
+	force_br_newlines : true,
+	forced_root_block : '',
+	content_css: "{{$baseurl}}/view/custom_tinymce.css"
+
+
+});
+
+
+</script>
+
diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl
new file mode 100755
index 000000000..550abc147
--- /dev/null
+++ b/view/tpl/contact_slider.tpl
@@ -0,0 +1,20 @@
+<div id="contact-slider" class="slider form-group"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div>
+<script>
+$(document).ready(function() {
+	// The slider does not render correct if width is given in % and
+	// the slider container is hidden (display: none) during rendering.
+	// So let's unhide it to render and hide again afterwards.
+	if(!$("#affinity-tool-collapse").hasClass("in")) {
+		$("#affinity-tool-collapse").addClass("in");
+		makeContactSlider();
+		$("#affinity-tool-collapse").removeClass("in");
+	}
+	else {
+		makeContactSlider();
+	}
+});
+
+function makeContactSlider() {
+	$("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: [{{$labels}}], width:'98%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); }  });
+}
+</script>
diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl
new file mode 100755
index 000000000..3d1bfa4a4
--- /dev/null
+++ b/view/tpl/contact_template.tpl
@@ -0,0 +1,8 @@
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
+	<div class="contact-entry-photo-wrapper" >
+		<a href="{{$contact.link}}" title="{{$contact.img_hover}}" ><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+	<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/tpl/contactsajax.tpl b/view/tpl/contactsajax.tpl
new file mode 100644
index 000000000..a6b5ad791
--- /dev/null
+++ b/view/tpl/contactsajax.tpl
@@ -0,0 +1,3 @@
+{{foreach $contacts as $contact}}
+{{include file="connection_template.tpl"}}
+{{/foreach}}
diff --git a/view/tpl/conv.tpl b/view/tpl/conv.tpl
new file mode 100755
index 000000000..ddb959b84
--- /dev/null
+++ b/view/tpl/conv.tpl
@@ -0,0 +1,17 @@
+{{foreach $threads as $thread}}
+<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper">
+	{{foreach $thread.items as $item}}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
+			</div>
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
+		
+		{{include file="{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+</div>
+{{/foreach}}
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
new file mode 100755
index 000000000..aa7b55e9b
--- /dev/null
+++ b/view/tpl/conv_frame.tpl
@@ -0,0 +1,5 @@
+<div id="threads-begin"></div>
+<div id="threads-end"></div>
+<div id="conversation-end"></div>
+<div id="page-spinner"></div>
+
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
new file mode 100755
index 000000000..2d51af4ff
--- /dev/null
+++ b/view/tpl/conv_item.tpl
@@ -0,0 +1,250 @@
+{{if $item.comment_firstcollapsed}}
+<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+	<span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span>&nbsp;<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
+</div>
+<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}">
+		<a name="item_{{$item.id}}" ></a>
+		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+			<div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
+				{{if $item.photo}}
+				<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
+					{{$item.photo}}
+				</div>
+				{{/if}}
+				{{if $item.event}}
+				<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
+					{{$item.event}}
+				</div>
+				{{/if}}
+				{{if $item.title && !$item.event}}
+				<div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}">
+					{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}
+				</div>
+				{{if ! $item.is_new}}
+				<hr class="m-0">
+				{{/if}}
+				{{/if}}
+				<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
+					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
+							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+						</div>
+					</div>
+					{{if $item.lock}}
+					<div class="wall-item-lock dropdown">
+						<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
+						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
+					</div>
+					{{/if}}
+					<div class="wall-item-author">
+						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
+					</div>
+					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
+						{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+					</div>
+				</div>
+
+				{{if $item.body}}
+				<div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}">
+					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
+						{{$item.body}}
+					</div>
+				</div>
+				{{/if}}
+				{{if $item.has_tags}}
+				<div class="p-2 wall-item-tools clearfix">
+
+					<div class="body-tags">
+						<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
+					</div>
+				{{**
+					{{if $item.mentions}}
+					<div class="body-tags" id="item-mentions">
+						<span class="tag">{{$item.mentions}}</span>
+					</div>
+					{{/if}}
+					{{if $item.tags}}
+					<div class="body-tags" id="item-tags">
+						<span class="tag">{{$item.tags}}</span>
+					</div>
+					{{/if}}
+					{{if $item.categories}}
+					<div class="body-tags" id="item-categories">
+						<span class="tag p-category">{{$item.categories}}</span>
+					</div>
+					{{/if}}
+					{{if $item.folders}}
+					<div class="body-tags" id="item-folders">
+						<span class="tag">{{$item.folders}}</span>
+					</div>
+					{{/if}}
+				**}}
+				</div>
+				{{/if}}
+				<div class="p-2 clearfix wall-item-tools">
+					<div class="wall-item-tools-right pull-right">
+						{{if $item.toplevel && $item.emojis && $item.reactions}}
+						<div class="btn-group dropdown">
+							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
+								<i class="fa fa-smile-o"></i>
+							</button>
+							<div class="dropdown-menu dropdown-menu-right">
+							{{foreach $item.reactions as $react}}
+								<a class="dropdown-item clearfix" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="menu-img-2" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a>
+							{{/foreach}}
+							</div>
+						</div>
+						{{/if}}
+						<div class="btn-group dropdown">
+							{{if $item.like}}
+							<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
+								<i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i>
+							</button>
+							{{/if}}
+							{{if $item.dislike}}
+							<button type="button" title="{{$item.dislike.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;">
+								<i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i>
+							</button>
+							{{/if}}
+							{{if $item.isevent}}
+							<div class="btn-group dropdown">
+								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
+									<i class="fa fa-calendar-check-o"></i>
+								</button>
+								<div class="dropdown-menu">
+									<a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
+										<i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}}
+									</a>
+									<a class="dropdown-item" href="#" title="{{$item.attend.1}}" onclick="itemAddToCal({{$item.id}}), dolike({{$item.id}},'attendno'); return false;">
+										<i class="item-act-list fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> {{$item.attend.1}}
+									</a>
+									<a class="dropdown-item" href="#" title="{{$item.attend.2}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;">
+										<i class="item-act-list fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> {{$item.attend.2}}
+									</a>
+								</div>
+							</div>
+							{{/if}}
+							{{if $item.canvote}}
+							<div class="btn-group dropdown">
+								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}">
+									<i class="fa fa-check-square-o"></i>
+								</button>
+								<div class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}">
+									<a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;">
+										<i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}}
+									</a>
+									<a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;">
+										 <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}}
+									</a> 
+									<a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;">
+										<i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}}
+									</a>
+								</div>
+							</div>
+							{{/if}}
+							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
+								<i class="fa fa-cog"></i>
+							</button>
+							<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
+								{{if $item.share}}
+								<a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a>
+								{{/if}}
+								{{if $item.plink}}
+								<a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a>
+								{{/if}}
+								{{if $item.edpost}}
+								<a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a>
+								{{/if}}
+								{{if $item.tagger}}
+								<a class="dropdown-item" href="#"  onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a>
+								{{/if}}
+								{{if $item.filer}}
+								<a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a>
+								{{/if}}
+								{{if $item.bookmark}}
+								<a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a>
+								{{/if}}
+								{{if $item.addtocal}}
+								<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
+								{{/if}}
+								{{if $item.star}}
+								<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
+								{{/if}}
+								{{if $item.thread_action_menu}}
+								{{foreach $item.thread_action_menu as $mitem}}
+								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a>
+								{{/foreach}}
+								{{/if}}
+								{{if $item.drop.dropping}}
+								<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
+								{{/if}}
+								{{if $item.thread_author_menu}}
+								<div class="dropdown-divider"></div>
+								{{foreach $item.thread_author_menu as $mitem}}
+								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
+								{{/foreach}}
+								{{/if}}
+								{{if $item.edpost && $item.dreport}}
+								<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
+								{{/if}}
+							</div>
+						</div>
+					</div>
+					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
+
+					{{if $item.responses || $item.attachments}}
+					<div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count &&  $item.attachments)}} btn-group{{/if}}">
+						{{if $item.attachments}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
+							<div class="dropdown-menu">{{$item.attachments}}</div>
+						</div>
+						{{/if}}
+						{{foreach $item.responses as $verb=>$response}}
+						{{if $response.count}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
+							{{if $response.modal}}
+							<div class="modal" id="{{$verb}}Modal-{{$item.id}}">
+								<div class="modal-dialog">
+									<div class="modal-content">
+										<div class="modal-header">
+											<h4 class="modal-title">{{$response.count}} {{$response.button}}</h4>
+											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+										</div>
+										<div class="modal-body response-list">
+											<ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul>
+										</div>
+										<div class="modal-footer clear">
+											<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$item.modal_dismiss}}</button>
+										</div>
+									</div><!-- /.modal-content -->
+								</div><!-- /.modal-dialog -->
+							</div><!-- /.modal -->
+							{{else}}
+							<div class="dropdown-menu">{{foreach $response.list as $liker}}{{$liker}}{{/foreach}}</div>
+							{{/if}}
+						</div>
+						{{/if}}
+						{{/foreach}}
+					</div>
+					{{/if}}
+				</div>
+			</div>
+		</div>
+		{{if $item.toplevel}}
+		{{foreach $item.children as $child}}
+			{{include file="{{$child.template}}" item=$child}}
+		{{/foreach}}
+		{{/if}}
+		{{if $item.comment}}
+		<div class="p-2 wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" >
+			{{$item.comment}}
+		</div>
+		{{/if}}
+	</div>
+{{if $item.comment_lastcollapsed}}
+</div>
+{{/if}}
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
new file mode 100755
index 000000000..59153e41f
--- /dev/null
+++ b/view/tpl/conv_list.tpl
@@ -0,0 +1,251 @@
+{{if $item.comment_firstcollapsed}}
+<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+	<span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span>&nbsp;<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
+</div>
+<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}">
+		<a name="item_{{$item.id}}" ></a>
+		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+			<div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
+				{{if $item.photo}}
+				<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
+					{{$item.photo}}
+				</div>
+				{{/if}}
+				{{if $item.event}}
+				<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
+					{{$item.event}}
+				</div>
+				{{/if}}
+				{{if $item.title && !$item.event}}
+				<div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}">
+					{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}
+				</div>
+				{{if ! $item.is_new}}
+				<hr class="m-0">
+				{{/if}}
+				{{/if}}
+				<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
+					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
+							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+						</div>
+					</div>
+					{{if $item.lock}}
+					<div class="wall-item-lock dropdown">
+						<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
+						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
+					</div>
+					{{/if}}
+					<div class="wall-item-author">
+						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
+					</div>
+					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
+						{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+					</div>
+				</div>
+
+				{{if $item.body}}
+				<div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}">
+					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
+						{{$item.body}}
+					</div>
+				</div>
+				{{/if}}
+				{{if $item.has_tags}}
+				<div class="p-2 wall-item-tools clearfix">
+
+					<div class="body-tags">
+						<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
+					</div>
+				{{**
+					{{if $item.mentions}}
+					<div class="body-tags" id="item-mentions">
+						<span class="tag">{{$item.mentions}}</span>
+					</div>
+					{{/if}}
+					{{if $item.tags}}
+					<div class="body-tags" id="item-tags">
+						<span class="tag">{{$item.tags}}</span>
+					</div>
+					{{/if}}
+					{{if $item.categories}}
+					<div class="body-tags" id="item-categories">
+						<span class="tag p-category">{{$item.categories}}</span>
+					</div>
+					{{/if}}
+					{{if $item.folders}}
+					<div class="body-tags" id="item-folders">
+						<span class="tag">{{$item.folders}}</span>
+					</div>
+					{{/if}}
+				**}}
+				</div>
+				{{/if}}
+				<div class="p-2 clearfix wall-item-tools">
+					<div class="wall-item-tools-right pull-right">
+						{{if $item.toplevel && $item.emojis && $item.reactions}}
+						<div class="btn-group dropdown">
+							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
+								<i class="fa fa-smile-o"></i>
+							</button>
+							<div class="dropdown-menu dropdown-menu-right">
+							{{foreach $item.reactions as $react}}
+								<a class="dropdown-item clearfix" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="menu-img-2" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a>
+							{{/foreach}}
+							</div>
+						</div>
+						{{/if}}
+						<div class="btn-group dropdown">
+							{{if $item.like}}
+							<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
+								<i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i>
+							</button>
+							{{/if}}
+							{{if $item.dislike}}
+							<button type="button" title="{{$item.dislike.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;">
+								<i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i>
+							</button>
+							{{/if}}
+							{{if $item.isevent}}
+							<div class="btn-group dropdown">
+								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
+									<i class="fa fa-calendar-check-o"></i>
+								</button>
+								<div class="dropdown-menu">
+									<a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
+										<i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}}
+									</a>
+									<a class="dropdown-item" href="#" title="{{$item.attend.1}}" onclick="itemAddToCal({{$item.id}}), dolike({{$item.id}},'attendno'); return false;">
+										<i class="item-act-list fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> {{$item.attend.1}}
+									</a>
+									<a class="dropdown-item" href="#" title="{{$item.attend.2}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;">
+										<i class="item-act-list fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> {{$item.attend.2}}
+									</a>
+								</div>
+							</div>
+							{{/if}}
+							{{if $item.canvote}}
+							<div class="btn-group dropdown">
+								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}">
+									<i class="fa fa-check-square-o"></i>
+								</button>
+								<div class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}">
+									<a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;">
+										<i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}}
+									</a>
+									<a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;">
+										 <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}}
+									</a> 
+									<a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;">
+										<i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}}
+									</a>
+								</div>
+							</div>
+							{{/if}}
+							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
+								<i class="fa fa-cog"></i>
+							</button>
+							<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
+								{{if $item.share}}
+								<a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a>
+								{{/if}}
+								{{if $item.plink}}
+								<a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a>
+								{{/if}}
+								{{if $item.edpost}}
+								<a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a>
+								{{/if}}
+								{{if $item.tagger}}
+								<a class="dropdown-item" href="#"  onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a>
+								{{/if}}
+								{{if $item.filer}}
+								<a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a>
+								{{/if}}
+								{{if $item.bookmark}}
+								<a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a>
+								{{/if}}
+								{{if $item.addtocal}}
+								<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
+								{{/if}}
+								{{if $item.star}}
+								<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
+								{{/if}}
+								{{if $item.thread_action_menu}}
+								{{foreach $item.thread_action_menu as $mitem}}
+								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a>
+								{{/foreach}}
+								{{/if}}
+								{{if $item.drop.dropping}}
+								<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
+								{{/if}}
+								{{if $item.thread_author_menu}}
+								<div class="dropdown-divider"></div>
+								{{foreach $item.thread_author_menu as $mitem}}
+								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
+								{{/foreach}}
+								{{/if}}
+								{{if $item.edpost && $item.dreport}}
+								<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
+								{{/if}}
+							</div>
+						</div>
+					</div>
+					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
+					<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}">
+						{{if $item.attachments}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
+							<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
+						</div>
+						{{/if}}
+						<div class="wall-item-list-comments btn-group">
+							<a class="btn btn-outline-secondary btn-sm" href="{{$item.viewthread}}">
+								{{$item.comment_count_txt}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}</span>{{/if}}
+							</a>
+						</div>
+						{{if $item.unseen_comments}}
+						<div class="unseen-wall-indicator-{{$item.id}} btn-group">
+							<button class="btn btn-outline-secondary btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;">
+								<i class="fa fa-check-square-o"></i>
+							</button>
+						</div>
+						{{/if}}
+						{{if $item.responses }}
+						{{foreach $item.responses as $verb=>$response}}
+						{{if $response.count}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
+							{{if $response.modal}}
+							<div class="modal" id="{{$verb}}Modal-{{$item.id}}">
+								<div class="modal-dialog">
+									<div class="modal-content">
+										<div class="modal-header">
+											<h4 class="modal-title">{{$response.count}} {{$response.button}}</h4>
+											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+										</div>
+										<div class="modal-body response-list">
+											<ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul>
+										</div>
+										<div class="modal-footer clear">
+											<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$item.modal_dismiss}}</button>
+										</div>
+									</div><!-- /.modal-content -->
+								</div><!-- /.modal-dialog -->
+							</div><!-- /.modal -->
+							{{else}}
+							<div class="dropdown-menu">{{foreach $response.list as $liker}}{{$liker}}{{/foreach}}</div>
+							{{/if}}
+						</div>
+						{{/if}}
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+{{if $item.comment_lastcollapsed}}
+</div>
+{{/if}}
diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl
new file mode 100755
index 000000000..82c7be922
--- /dev/null
+++ b/view/tpl/conversation.tpl
@@ -0,0 +1,20 @@
+<div id="threads-begin"></div>
+{{foreach $threads as $thread}}
+<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper generic-content-wrapper">
+	{{foreach $thread.items as $item}}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
+			</div>
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
+		
+		{{include file="{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+</div>
+{{/foreach}}
+<div id="threads-end"></div>
+<div id="conversation-end"></div>
diff --git a/view/tpl/convobj.tpl b/view/tpl/convobj.tpl
new file mode 100755
index 000000000..d5cee1170
--- /dev/null
+++ b/view/tpl/convobj.tpl
@@ -0,0 +1,4 @@
+{{foreach $threads as $item}}
+{{include file="{{$item.template}}"}}
+{{/foreach}}
+
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
new file mode 100755
index 000000000..4352501ae
--- /dev/null
+++ b/view/tpl/cover_photo.tpl
@@ -0,0 +1,29 @@
+<div id="profile-photo-content" class="generic-content-wrapper">
+    <div class="section-title-wrapper">
+    <h2>{{$title}}</h2>
+    </div>
+    <div class="section-content-wrapper">
+
+		<form enctype="multipart/form-data" action="cover_photo" method="post">
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+		<div id="profile-photo-upload-wrapper">
+
+			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
+			<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
+			<div class="clear"></div>
+			<br />
+			<br />
+			<div id="profile-photo-submit-wrapper">
+				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+			</div>
+		</div>
+
+		</form>
+		<br />
+		<br />
+		<div id="profile-photo-link-select-wrapper">
+			{{$select}}
+		</div>
+	</div>
+</div>
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
new file mode 100755
index 000000000..a9c384d2f
--- /dev/null
+++ b/view/tpl/cover_photo_widget.tpl
@@ -0,0 +1,76 @@
+<script>
+	var aside_padding_top;
+	var section_padding_top;
+	var coverSlid = false;
+
+	$(document).ready(function() {
+
+		aside_padding_top = parseInt($('aside').css('padding-top'));
+		section_padding_top = parseInt($('section').css('padding-top'));
+
+		$(document).on('click', slideUpCover);
+
+		if($('#cover-photo').length && $(window).width() > 755) {
+			if($(window).scrollTop() < $('#cover-photo').height()) {
+				$('.navbar').removeClass('fixed-top');
+				$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
+				$('main').css('opacity', 0);
+			}
+		}
+		else {
+			$('#cover-photo').remove();
+			coverSlid = true;
+		}
+	});
+
+	$(window).scroll(function () {
+		if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
+			$('.navbar').addClass('fixed-top');
+			$('main').css('margin-top', '');
+			$('main').css('opacity', 1);
+			coverSlid = true;
+		}
+		else if ($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){
+			if(coverSlid) {
+				$(window).scrollTop(Math.ceil($('#cover-photo').height()));
+				setTimeout(function(){ coverSlid = false; }, 1000);
+			}
+			else {
+				if($(window).scrollTop() < $('#cover-photo').height()) {
+					$('.navbar').removeClass('fixed-top');
+					$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
+					$('main').css('opacity', 0);
+				}
+			}
+		}
+		if($('#cover-photo').length && $('main').css('opacity') < 1) {
+			$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
+		}
+	});
+
+	$(window).resize(function () {
+		if($('#cover-photo').length && $(window).width() < 755) {
+			$('#cover-photo').remove();
+			$('.navbar').addClass('fixed-top');
+			$('main').css('opacity', 1);
+			coverSlid = true;
+		}
+
+	});
+
+	function slideUpCover() {
+		if(coverSlid) {
+			return;
+		}
+		$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' });
+		return;
+	}
+</script>
+
+<div id="cover-photo" title="{{$hovertitle}}">
+	{{$photo_html}}
+	<div id="cover-photo-caption">
+		<h1>{{$title}}</h1>
+		<h3>{{$subtitle}}</h3>
+	</div>
+</div>
diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
new file mode 100755
index 000000000..01d9a24a0
--- /dev/null
+++ b/view/tpl/cropbody.tpl
@@ -0,0 +1,58 @@
+<h1>{{$title}}</h1>
+<p id="cropimage-desc">
+{{$desc}}
+</p>
+<div id="cropimage-wrapper">
+<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<script type="text/javascript" language="javascript">
+
+	function onEndCrop( coords, dimensions ) {
+		$( 'x1' ).value = coords.x1;
+		$( 'y1' ).value = coords.y1;
+		$( 'x2' ).value = coords.x2;
+		$( 'y2' ).value = coords.y2;
+		$( 'width' ).value = dimensions.width;
+		$( 'height' ).value = dimensions.height;
+	}
+
+	Event.observe( window, 'load', function() {
+		new Cropper.ImgWithPreview(
+		'croppa',
+		{
+			previewWrap: 'previewWrap',
+			minWidth: 300,
+			minHeight: 300,
+			maxWidth: 1024,
+			maxHeight: 1024,
+			ratioDim: { x: 100, y:100 },
+			displayOnInit: true,
+			onEndCrop: onEndCrop
+		}
+		);
+	}
+	);
+
+</script>
+
+<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<input type='hidden' name='profile' value='{{$profile}}'>
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="{{$done}}" />
+</div>
+
+</form>
diff --git a/view/tpl/cropcover.tpl b/view/tpl/cropcover.tpl
new file mode 100755
index 000000000..04b96a603
--- /dev/null
+++ b/view/tpl/cropcover.tpl
@@ -0,0 +1,58 @@
+<h1>{{$title}}</h1>
+<p id="cropimage-desc">
+{{$desc}}
+</p>
+<div id="cropimage-wrapper">
+<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<script type="text/javascript" language="javascript">
+
+	function onEndCrop( coords, dimensions ) {
+		$( 'x1' ).value = coords.x1;
+		$( 'y1' ).value = coords.y1;
+		$( 'x2' ).value = coords.x2;
+		$( 'y2' ).value = coords.y2;
+		$( 'width' ).value = dimensions.width;
+		$( 'height' ).value = dimensions.height;
+	}
+
+	Event.observe( window, 'load', function() {
+		new Cropper.ImgWithPreview(
+		'croppa',
+		{
+			previewWrap: 'previewWrap',
+			minWidth: 240,
+			minHeight: 87,
+			maxWidth: 320,
+			maxHeight: 116,
+			ratioDim: { x: 100, y:36 },
+			displayOnInit: true,
+			onEndCrop: onEndCrop
+		}
+		);
+	}
+	);
+
+</script>
+
+<form action="cover_photo/{{$resource}}" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<input type='hidden' name='profile' value='{{$profile}}'>
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="{{$done}}" />
+</div>
+
+</form>
diff --git a/view/tpl/crophead.tpl b/view/tpl/crophead.tpl
new file mode 100755
index 000000000..48f375426
--- /dev/null
+++ b/view/tpl/crophead.tpl
@@ -0,0 +1,4 @@
+      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
+      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/tpl/delegate.tpl b/view/tpl/delegate.tpl
new file mode 100755
index 000000000..cbaa8da86
--- /dev/null
+++ b/view/tpl/delegate.tpl
@@ -0,0 +1,57 @@
+<h3>{{$header}}</h3>
+
+<div id="delegate-desc" class="delegate-desc">{{$desc}}</div>
+
+{{if $managers}}
+<h3>{{$head_managers}}</h3>
+
+{{foreach $managers as $x}}
+
+<div class="contact-block-div">
+<a class="contact-block-link" href="#" >
+<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
+</a>
+</div>
+
+{{/foreach}}
+<div class="clear"></div>
+<hr />
+{{/if}}
+
+
+<h3>{{$head_delegates}}</h3>
+
+{{if $delegates}}
+{{foreach $delegates as $x}}
+
+<div class="contact-block-div">
+<a class="contact-block-link" href="{{$base}}/delegate/remove/{{$x.uid}}" >
+<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
+</a>
+</div>
+
+{{/foreach}}
+<div class="clear"></div>
+{{else}}
+{{$none}}
+{{/if}}
+<hr />
+
+
+<h3>{{$head_potentials}}</h3>
+{{if $potentials}}
+{{foreach $potentials as $x}}
+
+<div class="contact-block-div">
+<a class="contact-block-link" href="{{$base}}/delegate/add/{{$x.uid}}" >
+<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
+</a>
+</div>
+
+{{/foreach}}
+<div class="clear"></div>
+{{else}}
+{{$none}}
+{{/if}}
+<hr />
+
diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl
new file mode 100644
index 000000000..bc7d46dc1
--- /dev/null
+++ b/view/tpl/design_tools.tpl
@@ -0,0 +1,9 @@
+<div id="design-tools" class="widget design-tools">
+	<h3>{{$title}}</h3>
+	<div class="nav nav-pills flex-column">
+		<a class="nav-link" href="blocks/{{$who}}">{{$blocks}}</a>
+		<a class="nav-link" href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a>
+		<a class="nav-link" href="layouts/{{$who}}">{{$layout}}</a>
+		<a class="nav-link" href="webpages/{{$who}}">{{$pages}}</a>
+	</div>
+</div>
diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl
new file mode 100644
index 000000000..017eb555c
--- /dev/null
+++ b/view/tpl/diaspora_vcard.tpl
@@ -0,0 +1,69 @@
+<div style="display:none;">
+	<dl class="entity_uid">
+ 		<dt>Uid</dt>
+ 		<dd>
+			<span class="uid p-uid">{{$diaspora.guid}}</span>
+ 		</dd>
+	</dl>
+	<dl class='entity_nickname'>
+		<dt>Nickname</dt>
+		<dd>		
+			<span class="nickname p-nickname">{{$diaspora.nickname}}</span>
+		</dd>
+	</dl>
+	<dl class='entity_full_name'>
+		<dt>Full name</dt>
+		<dd>
+			<span class='fn p-name'>{{$diaspora.fullname}}</span>
+		</dd>
+	</dl>
+
+	<dl class='entity_first_name'>
+		<dt>First name</dt>
+		<dd>
+		<span class='given_name p-given-name'>{{$diaspora.firstname}}</span>
+		</dd>
+	</dl>
+	<dl class='entity_family_name'>
+		<dt>Family name</dt>
+		<dd>
+		<span class='family_name p-family-name'>{{$diaspora.lastname}}</span>
+		</dd>
+	</dl>
+	<dl class="entity_url">
+		<dt>URL</dt>
+		<dd>
+			<a href="{{$diaspora.podloc}}/" id="pod_location" class="url" rel="me" >{{$diaspora.podloc}}/</a>
+		</dd>
+	</dl>
+	<dl class="entity_photo">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}" />
+		</dd>
+	</dl>
+	<dl class="entity_photo_medium">
+		<dt>Photo</dt>
+		<dd> 
+			<img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}" />
+		</dd>
+	</dl>
+	<dl class="entity_photo_small">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}" />
+		</dd>
+	</dl>
+	<dl class="entity_searchable">
+		<dt>Searchable</dt>
+		<dd>
+			<span class="searchable">{{$diaspora.searchable}}</span>
+		</dd>
+	</dl>
+	<dl class="entity_key">
+		<dt>Key</dt>
+		<dd>
+		<pre class="key">{{$diaspora.pubkey}}</pre>
+		</dd>
+	</dl>
+</div>
diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl
new file mode 100644
index 000000000..9346a7455
--- /dev/null
+++ b/view/tpl/dir_sort_links.tpl
@@ -0,0 +1,8 @@
+<div class="widget" id="dir_sort_links">
+<h3>{{$header}}</h3>
+
+{{include file="field_checkbox.tpl" field=$safemode}}
+{{include file="field_checkbox.tpl" field=$globaldir}}
+{{include file="field_checkbox.tpl" field=$pubforums}}
+
+</div>
diff --git a/view/tpl/directajax.tpl b/view/tpl/directajax.tpl
new file mode 100644
index 000000000..8faec4222
--- /dev/null
+++ b/view/tpl/directajax.tpl
@@ -0,0 +1,4 @@
+{{foreach $entries as $entry}}
+{{include file="direntry.tpl"}}
+{{/foreach}}
+
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
new file mode 100755
index 000000000..71e991f3a
--- /dev/null
+++ b/view/tpl/directory_header.tpl
@@ -0,0 +1,22 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper clearfix">
+		<div class="btn-group pull-right">
+			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
+				<i class="fa fa-sort"></i>
+			</button>
+			<div class="dropdown-menu dropdown-menu-right">
+				<a class="dropdown-item" href="directory?f=&order=date{{$suggest}}">{{$date}}</a>
+				<a class="dropdown-item" href="directory?f=&order=normal{{$suggest}}">{{$normal}}</a>
+				<a class="dropdown-item" href="directory?f=&order=reversedate{{$suggest}}">{{$reversedate}}</a>
+				<a class="dropdown-item" href="directory?f=&order=reverse{{$suggest}}">{{$reverse}}</a>
+			</div>
+		</div>
+		<h2>{{$dirlbl}}{{if $search}}:&nbsp;{{$safetxt}}{{/if}}</h2>
+	</div>
+	{{foreach $entries as $entry}}
+		{{include file="direntry.tpl"}}
+	{{/foreach}}
+	<div id="page-end"></div>
+</div>
+<script>$(document).ready(function() { loadingPage = false;});</script>
+<div id="page-spinner"></div>
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
new file mode 100755
index 000000000..f7ec7db23
--- /dev/null
+++ b/view/tpl/direntry.tpl
@@ -0,0 +1,77 @@
+<div class="directory-item{{if $entry.safe}} safe{{/if}}" id="directory-item-{{$entry.hash}}" >
+	<div class="section-subtitle-wrapper clearfix">
+		<div class="pull-right">
+			{{if $entry.viewrate}}
+				{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-outline-secondary btn-sm">{{$entry.total_ratings}}</a>{{/if}}
+			{{/if}}
+			{{if $entry.ignlink}}
+			<a class="directory-ignore btn btn-warning btn-sm" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a>
+			{{/if}}
+			{{if $entry.connect}}
+			<a class="btn btn-success btn-sm" href="{{$entry.connect}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conn_label}}</a>
+			{{/if}}
+			{{if $entry.viewrate}}
+				{{if $entry.canrate}}<button class="btn btn-outline-secondary btn-sm" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="fa fa-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
+			{{/if}}
+		</div>
+		<h3>{{if $entry.public_forum}}<i class="fa fa-comments-o" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="fa fa-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
+	</div>
+	<div class="section-content-tools-wrapper directory-collapse">
+		<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" >
+			<div class="contact-photo" id="directory-photo-{{$entry.hash}}" >
+				<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.hash}}" >
+					<img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" />
+				</a>
+			</div>
+		</div>
+		<div class="contact-info">
+			{{if $entry.common_friends}}
+			<div id="dir-common" class="contact-info-element">
+				<span class="contact-info-label">{{$entry.common_label}}</span> {{$entry.common_count}}
+			</div>
+			{{/if}}
+
+			{{if $entry.pdesc}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.pdesc_label}}</span> {{$entry.pdesc}}
+			</div>
+			{{/if}}
+
+			{{if $entry.age}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.age_label}}</span> {{$entry.age}}
+			</div>
+			{{/if}}
+
+			{{if $entry.location}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.location_label}}</span> {{$entry.location}}
+			</div>
+			{{/if}}
+
+			{{if $entry.hometown}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.hometown_label}}</span> {{$entry.hometown}}
+			</div>
+			{{/if}}
+
+			{{if $entry.homepage}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.homepage}}</span> {{$entry.homepageurl}}
+			</div>
+			{{/if}}
+
+			{{if $entry.kw}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.kw}}</span> {{$entry.keywords}}
+			</div>
+			{{/if}}
+
+			{{if $entry.about}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.about_label}}</span> {{$entry.about}}
+			</div>
+			{{/if}}
+		</div>
+	</div>
+</div>
diff --git a/view/tpl/display-head.tpl b/view/tpl/display-head.tpl
new file mode 100755
index 000000000..913784d98
--- /dev/null
+++ b/view/tpl/display-head.tpl
@@ -0,0 +1,8 @@
+<script>
+$(document).ready(function() {
+	$(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
+	// make auto-complete work in more places
+	$(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
+});
+</script>
+
diff --git a/view/tpl/dreport.tpl b/view/tpl/dreport.tpl
new file mode 100644
index 000000000..1f5915609
--- /dev/null
+++ b/view/tpl/dreport.tpl
@@ -0,0 +1,28 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $table == 'item'}}
+		<div class="dropdown pull-right">
+			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$options}}">
+				<i class="fa fa-sort-desc"></i>
+			</button>
+			<ul class="dropdown-menu">
+				<li><a href="dreport/push/{{$mid}}">{{$push}}</a></li>
+			</ul>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+	</div>
+
+	<div>
+	<table>
+	{{if $entries}}
+	{{foreach $entries as $e}}
+	<tr>
+		<td width="40%">{{$e.name}}</td>
+		<td width="20%">{{$e.result}}</td>
+		<td width="20%">{{$e.time}}</td>
+	</tr>
+	{{/foreach}}
+	{{/if}}
+	</table>
+</div>
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
new file mode 100755
index 000000000..b2ab5db4e
--- /dev/null
+++ b/view/tpl/edpost_head.tpl
@@ -0,0 +1,14 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $delete}}
+		<div class="pull-right">
+			<a  href="item/drop/{{$id}}" id="delete-btn" class="btn btn-sm btn-danger" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$delete}}</a>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="webpage-editor" class="section-content-tools-wrapper">
+		{{$editor}}
+	</div>
+</div>
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
new file mode 100755
index 000000000..5b4954c8e
--- /dev/null
+++ b/view/tpl/email_notify_html.tpl
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>{{$banner}}</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;">
+	<tbody>
+	<tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src="{{$notify_icon}}"><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
+
+
+	<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
+
+
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
+		<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
+	<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
+	<tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr>
+	<tr><td style="padding:11px 0;" colspan="2">{{$hitemlink}}</td></tr>
+	<tr><td></td><td>{{$thanks}}</td></tr>
+	<tr><td></td><td>{{$site_admin}}</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
new file mode 100755
index 000000000..56925c18b
--- /dev/null
+++ b/view/tpl/email_notify_text.tpl
@@ -0,0 +1,13 @@
+{{$preamble}}
+	
+{{$title}}
+
+{{$textversion}}
+				
+{{$tsitelink}}
+
+{{$titemlink}}
+
+{{$thanks}}
+{{$site_admin}}
+
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
new file mode 100755
index 000000000..cc0bfc1c7
--- /dev/null
+++ b/view/tpl/event.tpl
@@ -0,0 +1,16 @@
+{{foreach $events as $event}}
+	<div class="event-wrapper">
+		<div class="event">
+			<div class="event-owner">
+				{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}}
+			</div>
+			{{$event.html}}
+			<div class="event-buttons">
+				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="fa fa-external-link btn btn-outline-secondary" ></i></a>{{/if}}
+				{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>{{/if}}
+				{{if $event.drop}}<a href="{{$event.drop.0}}" title="{{$event.drop.1}}" class="drop-event-link"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>{{/if}}
+			</div>
+			<div class="clear"></div>
+		</div>
+	</div>
+{{/foreach}}
diff --git a/view/tpl/event_cal.tpl b/view/tpl/event_cal.tpl
new file mode 100755
index 000000000..d7662786b
--- /dev/null
+++ b/view/tpl/event_cal.tpl
@@ -0,0 +1,14 @@
+{{foreach $events as $event}}
+	<div class="event-wrapper">
+		<div class="event">
+			<div class="event-owner">
+				{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}}
+			</div>
+			{{$event.html}}
+			<div class="event-buttons">
+				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="fa fa-external-link btn btn-outline-secondary" ></i></a>{{/if}}
+			</div>
+			<div class="clear"></div>
+		</div>
+	</div>
+{{/foreach}}
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
new file mode 100755
index 000000000..d07a06b67
--- /dev/null
+++ b/view/tpl/event_form.tpl
@@ -0,0 +1,130 @@
+<form id="event-edit-form" action="{{$post}}" method="post" class="acl-form" data-form_id="event-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+
+	<input type="hidden" name="event_id" value="{{$eid}}" />
+	<input type="hidden" name="event_hash" value="{{$event_hash}}" />
+	<input type="hidden" name="xchan" value="{{$xchan}}" />
+	<input type="hidden" name="mid" value="{{$mid}}" />
+	<input type="hidden" name="type" value="{{$type}}" />
+	<input type="hidden" name="preview" id="event-edit-preview" value="0" />
+
+
+	{{include file="field_input.tpl" field=$summary}}
+
+	{{if $tz_choose}}
+	{{include file="field_select_grouped.tpl" field=$timezone}}
+	{{/if}}
+
+	{{$s_dsel}}
+
+	{{$f_dsel}}
+
+	{{include file="field_checkbox.tpl" field=$nofinish}}
+
+	<div id="advanced" style="display:none">
+
+		{{include file="field_checkbox.tpl" field=$adjust}}
+
+		{{if $catsenabled}}
+		<div id="event-category-text"><b>{{$c_text}}</b></div>
+		<div id="events-category-wrap">
+			<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput" />
+		</div>
+		{{/if}}
+
+		<div class="form-group">
+			<div class="form-group">
+				<div id="event-desc-text"><b>{{$d_text}}</b></div>
+				<textarea id="comment-edit-text-desc" class="form-control" name="desc" >{{$d_orig}}</textarea>
+			</div>
+			<div id="comment-tools-desc" class="comment-tools" style="display: block;" >
+				<div id="comment-edit-bb-desc" class="btn-toolbar">
+					<div class='btn-group mr-2'>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'desc');">
+							<i class="fa fa-bold comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'desc');">
+							<i class="fa fa-italic comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'desc');">
+							<i class="fa fa-underline comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('none','quote','desc');">
+							<i class="fa fa-quote-left comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'desc');">
+							<i class="fa fa-terminal comment-icon"></i>
+						</button>
+					</div>
+					<div class='btn-group'>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'desc');">
+							<i class="fa fa-camera comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'desc');">
+							<i class="fa fa-link comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'desc');">
+							<i class="fa fa-video-camera comment-icon"></i>
+						</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="form-group">
+				<div id="event-location-text"><b>{{$l_text}}</b></div>
+				<textarea id="comment-edit-text-loc" class="form-control" name="location">{{$l_orig}}</textarea>
+			</div>
+			<div id="comment-tools-loc" class="comment-tools" style="display: block;" >
+				<div id="comment-edit-bb-loc" class="btn-toolbar">
+					<div class='btn-group mr-2'>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'loc');">
+							<i class="fa fa-bold comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'loc');">
+							<i class="fa fa-italic comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'loc');">
+							<i class="fa fa-underline comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('none','quote','loc');">
+							<i class="fa fa-quote-left comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'loc');">
+							<i class="fa fa-terminal comment-icon"></i>
+						</button>
+					</div>
+					<div class='btn-group'>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'loc');">
+							<i class="fa fa-camera comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'loc');">
+							<i class="fa fa-link comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'loc');">
+							<i class="fa fa-video-camera comment-icon"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$mapper}}" onclick="insertbbcomment('none','map','loc');">
+							<i class="fa fa-globe comment-icon"></i>
+						</button>
+					</div>
+
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="clear"></div>
+
+	<button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('advanced');">{{$advanced}}</button>
+	<div class="btn-group float-right">
+		<button id="event-edit-preview-btn" class="btn btn-outline-secondary btn-sm" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button>
+		{{if ! $eid}}
+		<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button>
+		{{/if}}
+		<button id="event-submit" class="btn btn-primary btn-sm" type="submit" name="submit">{{$submit}}</button>
+	</div>
+</form>
+
+{{if ! $eid}}
+	{{$acl}}
+{{/if}}
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
new file mode 100755
index 000000000..3b2cb5041
--- /dev/null
+++ b/view/tpl/event_head.tpl
@@ -0,0 +1,160 @@
+<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
+<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
+<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/locale-all.js"></script>
+
+<script>
+	function showEvent(eventid) {
+		$.get(
+			'{{$baseurl}}{{$module_url}}/?id='+eventid,
+			function(data){
+				$.colorbox({ scrolling: false, html: data, onComplete: function() { $.colorbox.resize(); }});
+			}
+		);			
+	}
+	
+	function doEventPreview() {
+		$('#event-edit-preview').val(1);
+		$.post('events',$('#event-edit-form').serialize(), function(data) {
+			$.colorbox({ html: data });
+		});
+		$('#event-edit-preview').val(0);
+	}
+
+	function exportDate() {
+		var moment = $('#events-calendar').fullCalendar('getDate');
+		var sT = 'events/' + moment.year() + '/' + (moment.month() + 1) + '/export';
+		window.location.href=sT;
+	}
+	
+	function changeView(action, viewName) {
+		$('#events-calendar').fullCalendar(action, viewName);
+		var view = $('#events-calendar').fullCalendar('getView');
+
+		if(view.type !== 'month' && !$('main').hasClass('fullscreen')) {
+			$('#events-calendar').fullCalendar('option', 'height', 'auto');
+		}
+		else {
+			$('#events-calendar').fullCalendar('option', 'height', '');
+		}
+
+		if($('main').hasClass('fullscreen')) {
+			$('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
+		}
+
+		$('#title').text(view.title);
+	}
+
+
+	$(document).ready(function() {
+		$('#events-calendar').fullCalendar({
+			events: '{{$baseurl}}{{$module_url}}/json',
+			header: false,
+			eventTextColor: 'white',
+			lang: '{{$lang}}',
+			firstDay: {{$first_day}},
+
+			eventLimit: 3,
+
+			monthNames: aStr['monthNames'],
+			monthNamesShort: aStr['monthNamesShort'],
+			dayNames: aStr['dayNames'],
+			dayNamesShort: aStr['dayNamesShort'],
+
+			allDayText: aStr['allday'],
+			timeFormat: 'HH:mm',
+			eventClick: function(calEvent, jsEvent, view) {
+				showEvent(calEvent.id);
+			},
+			loading: function(isLoading, view) {
+				$('#events-spinner').spin('tiny');
+				$('#events-spinner > i').css('color', 'transparent');
+				if(!isLoading) {
+					$('#events-spinner').spin(false);
+					$('#events-spinner > i').css('color', '');
+					$('td.fc-day').dblclick(function() {
+						openMenu('form');
+						//window.location.href='/events/new?start='+$(this).data('date');
+					});
+				}
+			},
+
+			eventRender: function(event, element, view) {
+
+				//console.log(view.name);
+				if (event.item['author']['xchan_name']==null) return;
+
+				switch(view.name){
+					case "month":
+					element.find(".fc-title").html(
+						"<img src='{0}' style='height:12px;width:12px;' title='{1}'>&nbsp;<span title='{3}{4}'>{2}</span>".format(
+							event.item['author']['xchan_photo_s'],
+							event.item['author']['xchan_name'],
+							event.title,
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
+					));
+					break;
+					case "agendaWeek":
+					element.find(".fc-title").html(
+						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
+							event.item['author']['xchan_photo_s'],
+							event.item['author']['xchan_name'],
+							event.title,
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
+					));
+					break;
+					case "agendaDay":
+					element.find(".fc-title").html(
+						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
+							event.item['author']['xchan_photo_s'],
+							event.item['author']['xchan_name'],
+							event.title,
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
+					));
+					break;
+				}
+			}
+			
+		});
+		
+		// center on date
+		// @fixme does not work for cal/$nick module_url
+		var args=location.href.replace(baseurl,"").split("/");
+		{{if $modparams == 2}}
+		if (args.length>=5) {
+			$("#events-calendar").fullCalendar('gotoDate',args[3] , args[4]-1);
+		}
+		{{else}}
+		if (args.length>=4) {
+			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
+		}
+		{{/if}} 
+		
+		// show event popup
+		var hash = location.hash.split("-")
+		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
+		
+		// echo the title
+		var view = $('#events-calendar').fullCalendar('getView');
+		$('#title').text(view.title);
+
+		// shift the finish time date on start time date change automagically
+		var origsval = $('#id_start_text').val();
+		$('#id_start_text').change(function() {
+			var origfval = $('#id_finish_text').val();
+			if(origfval) {
+				var sval = $('#id_start_text').val();
+				var diff = moment(sval).diff(origsval);
+				var fval = moment(origfval).add(diff, 'millisecond').format("YYYY-MM-DD HH:mm");
+				$('#id_finish_text').val(fval);
+				origsval = sval;
+			}
+		});
+
+	});
+
+</script>
+
diff --git a/view/tpl/event_item_content.tpl b/view/tpl/event_item_content.tpl
new file mode 100644
index 000000000..76e0f4616
--- /dev/null
+++ b/view/tpl/event_item_content.tpl
@@ -0,0 +1,10 @@
+{{if $description}}
+<div class="event-item-description">
+	{{$description}}
+</div>
+{{/if}}
+{{if $location}}
+<div class="event-item-location">
+	<span class="event-item-label">{{$location_label}}</span>&nbsp;<span class="event-item-location">{{$location}}</span>
+</div>
+{{/if}}
diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl
new file mode 100755
index 000000000..6247aaf6f
--- /dev/null
+++ b/view/tpl/event_item_header.tpl
@@ -0,0 +1,11 @@
+<div class="event-item-title">
+	<h3><i class="fa fa-calendar"></i>&nbsp;{{$title}}</h3>
+</div>
+<div class="event-item-start">
+	<span class="event-item-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
+</div>
+{{if $finish}}
+<div class="event-item-start">
+	<span class="event-item-label">{{$dtend_label}}</span>&nbsp;<span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
+</div>
+{{/if}}
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
new file mode 100755
index 000000000..9d32c76be
--- /dev/null
+++ b/view/tpl/events-js.tpl
@@ -0,0 +1,31 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<div class="dropdown">
+				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i>&nbsp;{{$view_label}}</button>
+				<div class="dropdown-menu">
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a>
+				</div>
+				<button class="btn btn-success btn-sm" onclick="openClose('form');">{{$new_event.1}}</button>
+				<div class="btn-group">
+					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
+					<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
+				</div>
+				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+				<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+			</div>
+		</div>
+		<h2 id="title"></h2>
+		<div class="clear"></div>
+	</div>
+	<div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}>
+		{{$form}}
+	</div>
+	<div class="clear"></div>
+	<div class="section-content-wrapper-np">
+		<div id="events-calendar"></div>
+	</div>
+</div>
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
new file mode 100755
index 000000000..ba9e16dd6
--- /dev/null
+++ b/view/tpl/events_cal-js.tpl
@@ -0,0 +1,20 @@
+{{$tabs}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<div class="btn-group">
+				<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
+				<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+				<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
+			</div>
+			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+		</div>
+		<h2 id="title"></h2>
+		<div class="clear"></div>
+	</div>
+	<div class="clear"></div>
+	<div class="section-content-wrapper-np">
+		<div id="events-calendar"></div>
+	</div>
+</div>
diff --git a/view/tpl/events_menu_side.tpl b/view/tpl/events_menu_side.tpl
new file mode 100755
index 000000000..b9a9062b1
--- /dev/null
+++ b/view/tpl/events_menu_side.tpl
@@ -0,0 +1,8 @@
+<div class="widget">
+	<h3>{{$title}}</h3>
+	<ul class="nav nav-pills nav-stacked">
+		<li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
+		<li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
+		<li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
+	</ul>
+</div>
diff --git a/view/tpl/events_reminder.tpl b/view/tpl/events_reminder.tpl
new file mode 100755
index 000000000..fd6a1a5c7
--- /dev/null
+++ b/view/tpl/events_reminder.tpl
@@ -0,0 +1,10 @@
+{{if $count}}
+<div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div>
+<div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title}}</div>
+<div id="event-title-end"></div>
+{{foreach $events as $event}}
+<div class="event-list" id="event-{{$event.id}}"></a> <a href="events/{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
+{{/foreach}}
+</div>
+{{/if}}
+
diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl
new file mode 100755
index 000000000..e22f95c1e
--- /dev/null
+++ b/view/tpl/events_tools_side.tpl
@@ -0,0 +1,17 @@
+<div class="widget">
+	<h3>{{$title}}</h3>
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item"><a class="nav-link" href="#" onclick="exportDate(); return false;"><i class="fa fa-arrow-circle-o-down"></i>&nbsp;{{$export}}</a></li>
+		<li class="nav-item"><a class="nav-link" href="#" onclick="openClose('event-upload-form'); return false;"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$import}}</a></li>
+	</ul>
+	<div id="event-upload-form" class="sub-menu-wrapper">
+		<div class="sub-menu">
+			<form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
+				<div class="form-group">
+					<input id="event-upload-choose" class="form-control-file w-100" type="file" name="userfile" />
+				</div>
+				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
+			</form>
+		</div>
+	</div>
+</div>
diff --git a/view/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl
new file mode 100755
index 000000000..f53f1f478
--- /dev/null
+++ b/view/tpl/failed_updates.tpl
@@ -0,0 +1,18 @@
+<div class="generic-content-wrapper-styled">
+<h2>{{$banner}}</h2>
+
+<div id="failed_updates_desc">{{$desc}}</div>
+
+{{if $failed}}
+{{foreach $failed as $f}}
+
+<h4>{{$f}}</h4>
+<ul>
+<li><a href="{{$base}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li>
+<li><a href="{{$base}}/admin/dbsync/{{$f}}">{{$apply}}</a></li>
+</ul>
+
+<hr />
+{{/foreach}}
+{{/if}}
+</div>
diff --git a/view/tpl/field.tpl b/view/tpl/field.tpl
new file mode 100755
index 000000000..942cfcef5
--- /dev/null
+++ b/view/tpl/field.tpl
@@ -0,0 +1,3 @@
+ {{if $field.0==select}}
+ {{include file="field_select.tpl"}}
+ {{/if}}
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
new file mode 100755
index 000000000..c87b9ac79
--- /dev/null
+++ b/view/tpl/field_acheckbox.tpl
@@ -0,0 +1,23 @@
+<tr class="highlight">
+	<td>
+		<label class="mainlabel" for='me_id_{{$field.0}}'>{{$field.1}}</label><br>
+		<span class='field_abook_help'>{{$field.6}}</span>
+	</td>
+	{{if $notself}}
+	<td class="abook-them">
+		{{if $field.2}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}}
+	</td>
+	{{/if}}
+	<td class="abook-me">
+		{{if $self || !$field.5 || $twocol }}
+		<input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />
+		{{/if}}
+		{{if $notself && $field.5}}
+		<input type="hidden" name='{{$field.0}}' value="{{if $field.7}}1{{else}}0{{/if}}" />
+		{{if $field.3}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}}
+		{{/if}}
+	</td>
+	<td>
+		{{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="fa fa-check-square-o"></i>{{else}} <i class="fa fa-square-o"></i>{{/if}}{{/if}}</span>{{/if}}
+	</td>
+</tr>
diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl
new file mode 100755
index 000000000..f779f937c
--- /dev/null
+++ b/view/tpl/field_checkbox.tpl
@@ -0,0 +1,5 @@
+	<div id="{{$field.0}}_container" class="clearfix form-group checkbox">
+		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<div class="float-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div>
+		<small class="form-text text-muted">{{$field.3}}</small>
+	</div>
diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl
new file mode 100644
index 000000000..9b6f33462
--- /dev/null
+++ b/view/tpl/field_colorinput.tpl
@@ -0,0 +1,6 @@
+	<div class='form-group field input color'>
+		<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
+		<input class='form-control color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
+		<span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span>
+		<div id='end_{{$field.0}}' class='field_end'></div>
+	</div>
diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl
new file mode 100755
index 000000000..12d00a08d
--- /dev/null
+++ b/view/tpl/field_combobox.tpl
@@ -0,0 +1,18 @@
+<div class="form-group">
+	<label class="" for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label>
+	<input class="form-control" id="id_{{$field.0}}" type="text" list="data_{{$field.0}}"{{if $field.5}} {{$field.5}}{{/if}}>
+	<datalist id="data_{{$field.0}}" >
+		{{foreach $field.4 as $opt=>$val}}
+		<option value="{{$val}}">
+		{{/foreach}}
+	</datalist>
+	{{**
+	<input id="id_{{$field.0}}" class="form-control" type="text" value="{{$field.2}}">
+	<select id="select_{{$field.0}}" class="form-control" onChange="$('#id_{{$field.0}}').val($(this).val())">
+		<option value="">{{$field.5}}</option>
+		{{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
+	</select>
+	**}} 
+	<span class='field_help'>{{$field.3}}</span>
+</div>
+
diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl
new file mode 100755
index 000000000..907b4c50e
--- /dev/null
+++ b/view/tpl/field_custom.tpl
@@ -0,0 +1,5 @@
+	<div class='form-group field custom'>
+		<label for='{{$field.0}}'>{{$field.1}}</label>
+		{{$field.2}}
+		<span class='help-block'>{{$field.3}}</span>
+	</div>
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
new file mode 100755
index 000000000..65a837e5f
--- /dev/null
+++ b/view/tpl/field_input.tpl
@@ -0,0 +1,5 @@
+	<div id="id_{{$field.0}}_wrapper" class="form-group">
+		<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
+		<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>
+		<small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small>
+	</div>
diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl
new file mode 100755
index 000000000..abfe6e189
--- /dev/null
+++ b/view/tpl/field_intcheckbox.tpl
@@ -0,0 +1,5 @@
+	<div class="clearfix form-group checkbox">
+		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<div class="pull-right"><input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for="id_{{$field.0}}"> <span class="onoffswitch-inner" data-on="{{if $field.5}}{{$field.5.1}}{{/if}}" data-off="{{if $field.5}}{{$field.5.0}}{{/if}}"></span><span class="onoffswitch-switch"></span> </label></div>
+		<small class="form-text text-muted">{{$field.4}}</small>
+	</div>
diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl
new file mode 100755
index 000000000..fa5e14582
--- /dev/null
+++ b/view/tpl/field_password.tpl
@@ -0,0 +1,5 @@
+	<div class="form-group">
+		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<input class="form-control" type="password" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
+		<small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small>
+	</div>
diff --git a/view/tpl/field_radio.tpl b/view/tpl/field_radio.tpl
new file mode 100755
index 000000000..6b5f52de6
--- /dev/null
+++ b/view/tpl/field_radio.tpl
@@ -0,0 +1,8 @@
+	<div class="form-group field radio">
+		<label for='id_{{$field.0}}_{{$field.2}}'>
+			<input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}>
+			{{$field.1}}
+		</label>
+		<span class='help-block'>{{$field.3}}</span>
+	</div>
+	<div class="clear"></div>
diff --git a/view/tpl/field_richtext.tpl b/view/tpl/field_richtext.tpl
new file mode 100755
index 000000000..378e02a62
--- /dev/null
+++ b/view/tpl/field_richtext.tpl
@@ -0,0 +1,5 @@
+	<div class='field richtext'>
+		<label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
+		<textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext">{{$field.2}}</textarea>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl
new file mode 100755
index 000000000..cda9a823a
--- /dev/null
+++ b/view/tpl/field_select.tpl
@@ -0,0 +1,7 @@
+	<div class="form-group">
+		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}">
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<small class="form-text text-muted">{{$field.3}}</small>
+	</div>
diff --git a/view/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl
new file mode 100644
index 000000000..ee5e1508f
--- /dev/null
+++ b/view/tpl/field_select_disabled.tpl
@@ -0,0 +1,7 @@
+	<div class='form-group field select'>
+		<label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select class="form-control" disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'>
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<span class='help-block'>{{$field.3}}</span>
+	</div>
diff --git a/view/tpl/field_select_grouped.tpl b/view/tpl/field_select_grouped.tpl
new file mode 100644
index 000000000..e6d1479de
--- /dev/null
+++ b/view/tpl/field_select_grouped.tpl
@@ -0,0 +1,12 @@
+	<div class='form-group field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'>
+			{{foreach $field.4 as $group=>$opts}}
+				<optgroup label='{{$group}}'>
+				{{foreach $opts as $opt=>$val}}
+					<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+				{{/foreach}}
+				</optgroup>
+		</select>
+		<span class='help-block'>{{$field.3}}</span>
+	</div>
diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl
new file mode 100755
index 000000000..2780df58c
--- /dev/null
+++ b/view/tpl/field_select_raw.tpl
@@ -0,0 +1,7 @@
+	<div class='form-group field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'>
+			{{$field.4}}
+		</select>
+		<span class='help-block'>{{$field.3}}</span>
+	</div>
diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl
new file mode 100755
index 000000000..437dece93
--- /dev/null
+++ b/view/tpl/field_textarea.tpl
@@ -0,0 +1,5 @@
+	<div class="form-group">
+		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<textarea class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea>
+		<small class="form-text text-muted">{{$field.3}}</small>
+	</div>
diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl
new file mode 100755
index 000000000..7a529774c
--- /dev/null
+++ b/view/tpl/field_themeselect.tpl
@@ -0,0 +1,13 @@
+	{{if $field.5 == 'preview'}}
+		<script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script>
+	{{/if}}
+	<div class='form-group field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5 == 'preview'}}onchange="previewTheme(this);"{{/if}} >
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<span class='field_help'>{{$field.3}}</span>
+		{{if $field.5=='preview'}}
+			<div id="theme-preview"></div>
+		{{/if}}
+	</div>
diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl
new file mode 100755
index 000000000..8a4cda55b
--- /dev/null
+++ b/view/tpl/field_yesno.tpl
@@ -0,0 +1,13 @@
+	<div class='clearfix form-group'>
+		<label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
+		<div class='onoff' id="id_{{$field.0}}_onoff">
+			<input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+			<a href="#" class='off'>
+				{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
+			</a>
+			<a href="#" class='on'>
+				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
+			</a>
+		</div>
+		<small class='form-text text-muted'>{{$field.3}}</small>
+	</div>
diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl
new file mode 100755
index 000000000..a6a69b89c
--- /dev/null
+++ b/view/tpl/fileas_widget.tpl
@@ -0,0 +1,12 @@
+<div id="fileas-sidebar" class="widget">
+	<h3>{{$title}}</h3>
+	<div id="nets-desc">{{$desc}}</div>
+	
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item"><a class="nav-link{{if $sel_all}} active{{/if}}" href="{{$base}}">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+		<li class="nav-item"><a class="nav-link{{if $term.selected}} active{{/if}}" href="{{$base}}?f=&file={{$term.name}}">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/tpl/filebrowser.tpl b/view/tpl/filebrowser.tpl
new file mode 100755
index 000000000..787f7c0cd
--- /dev/null
+++ b/view/tpl/filebrowser.tpl
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html>
+	<head>
+	<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
+	<style>
+		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
+		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
+		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
+		.filebrowser ul{ list-style-type: none; padding:0px; }
+		.filebrowser.folders a { display: block; padding: 0.3em }
+		.filebrowser.folders a:hover { background-color: #f0f0ee; }
+		.filebrowser.files.image { overflow: auto; height: auto; }
+		.filebrowser.files.image img { height:50px;}
+		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
+		.filebrowser.files.image span { display: none;}
+		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
+		.filebrowser.files a { display: block;  padding: 0.3em}
+		.filebrowser.files a:hover { background-color: #f0f0ee; }
+		.filebrowser a { text-decoration: none; }
+	</style>
+	<script>
+		var FileBrowserDialogue = {
+			init : function () {
+				// Here goes your code for setting your custom things onLoad.
+			},
+			mySubmit : function (URL) {
+				//var URL = document.my_form.my_field.value;
+				var win = tinyMCEPopup.getWindowArg("window");
+
+				// insert information now
+				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
+
+				// are we an image browser
+				if (typeof(win.ImageDialog) != "undefined") {
+					// we are, so update image dimensions...
+					if (win.ImageDialog.getImageData)
+						win.ImageDialog.getImageData();
+
+					// ... and preview if necessary
+					if (win.ImageDialog.showPreviewImage)
+						win.ImageDialog.showPreviewImage(URL);
+				}
+
+				// close popup window
+				tinyMCEPopup.close();
+			}
+		}
+
+		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
+	</script>
+	</head>
+	<body>
+	
+	<div class="tabs">
+		<ul >
+			<li class="current"><span>FileBrowser</span></li>
+		</ul>
+	</div>
+	<div class="panel_wrapper">
+
+		<div id="general_panel" class="panel current">
+			<div class="filebrowser path">
+				{{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
+			</div>
+			<div class="filebrowser folders">
+				<ul>
+					{{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
+				</ul>
+			</div>
+			<div class="filebrowser files {{$type}}">
+				<ul>
+				{{foreach $files as $f}}
+					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
+				{{/foreach}}
+				</ul>
+			</div>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
+	</div>	
+	</body>
+	
+</html>
diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl
new file mode 100755
index 000000000..61860d10f
--- /dev/null
+++ b/view/tpl/filer_dialog.tpl
@@ -0,0 +1,19 @@
+<div class="modal" id="item-filer-dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">{{$title}}</h4>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        {{include file="field_combobox.tpl"}}
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">{{$cancel}}</button>
+        <button id="filer_save" type="button" class="btn btn-primary">{{$submit}}</button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
new file mode 100755
index 000000000..4def1415d
--- /dev/null
+++ b/view/tpl/follow.tpl
@@ -0,0 +1,14 @@
+<div id="follow-sidebar" class="widget">
+	<h3>{{$connect}}</h3>
+	<form action="follow" method="post" />
+		<div class="input-group">
+			<input class="form-control form-control-sm" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
+			<div class="input-group-btn">
+				<button class="btn btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
+			</div>
+		</div>
+	</form>
+	{{if $abook_usage_message}}
+	<div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div>
+	{{/if}}
+</div>
diff --git a/view/tpl/force_image_reload.tpl b/view/tpl/force_image_reload.tpl
new file mode 100644
index 000000000..839bd22b5
--- /dev/null
+++ b/view/tpl/force_image_reload.tpl
@@ -0,0 +1,72 @@
+{{* 
+Force the browser to reload an image from the server instead of the cache.
+based on an answer from http://stackoverflow.com/a/22429796/3343347
+
+Usage: Set $imgUrl to the src url you want to be re-fetched from the server
+
+*}}
+
+<script>
+  $(document).ready(
+    function() {
+      forceImgReload("{{$imgUrl}}");
+    }
+  );
+
+  {{* 
+    * find and return any existing img tags with a matching src url, and set them to an intermediate 
+    * src url so they can later be reverted back once the cached version has been updated.
+    *}}
+  function prepareImagesForReload(srcUrl) {
+
+    var result = $("img[src='" + srcUrl + "']").get();
+
+    for (i = 0; i < result.length; i++) {
+      {{* 
+        * Set the image to a reloading image, in this case an animated "reloading" svg 
+        * Ideally this wont be displayed long enough to matter.
+        *}}
+      result[i].src = "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100' preserveAspectRatio='xMidYMid' class='uil-reload'%3E%3Cpath fill='none' class='bk' d='M0 0h100v100H0z'/%3E%3Cg%3E%3Cpath d='M50 15a35 35 0 1 0 24.787 10.213' fill='none' stroke='%23777' stroke-width='12'/%3E%3Cpath d='M50 0v30l16-15L50 0' fill='%23777'/%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 50 50' to='360 50 50' dur='1s' repeatCount='indefinite'/%3E%3C/g%3E%3C/svg%3E";
+    }
+
+    return result;
+  }
+
+  function restoreImages(srcUrl, imgList) {
+
+    for (i = 0; i < imgList.length; i++) {
+      imgList[i].src = srcUrl;
+    }
+  }
+
+  function forceImgReload(srcUrl) {
+    var imgList;
+    var step = 0; 
+    var iframe = window.document.createElement("iframe");   // Hidden iframe, in which to perform the load+reload.
+  
+    {{* Callback function, called after iframe load+reload completes (or fails).
+        Will be called TWICE unless twostage-mode process is cancelled. (Once after load, once after reload). *}}
+    var iframeLoadCallback = function(e) { 
+
+      if (step === 0) { 
+        // initial load just completed.  Note that it doesn't actually matter if this load succeeded or not.
+      
+        step = 1; 
+        imgList = prepareImagesForReload(srcUrl); 
+        iframe.contentWindow.location.reload(true); // initiate forced-reload!
+      
+      } else if (step === 1) {
+        // forced re-load is done 
+
+        restoreImages(srcUrl, imgList);
+        if (iframe.parentNode) iframe.parentNode.removeChild(iframe);
+      }
+    }
+
+    iframe.style.display = "none";
+    window.parent.document.body.appendChild(iframe); {{* NOTE: if this is done AFTER setting src, Firefox MAY fail to fire the load event! *}}
+    iframe.addEventListener("load",  iframeLoadCallback, false);
+    iframe.addEventListener("error", iframeLoadCallback, false);
+    iframe.src = srcUrl;  
+  }
+</script>
diff --git a/view/tpl/generic_addon_settings.tpl b/view/tpl/generic_addon_settings.tpl
new file mode 100644
index 000000000..bf39b2aea
--- /dev/null
+++ b/view/tpl/generic_addon_settings.tpl
@@ -0,0 +1,19 @@
+<div class="panel">
+	<div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings">
+		<h3>
+			<a title="{{$addon.2}}" data-toggle="collapse" data-parent="#settings" href="#{{$addon.0}}-settings-content" aria-controls="{{$addon.0}}-settings-content">
+				{{$addon.1}}
+			</a>
+		</h3>
+	</div>
+	<div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings">
+		<div class="section-content-tools-wrapper">
+			{{$content}}
+			{{if $addon.0}}
+			<div class="settings-submit-wrapper" >
+				<button id="{{$addon.0}}-submit" type="submit" name="{{$addon.0}}-submit" class="btn btn-primary" value="{{$addon.3}}">{{$addon.3}}</button>
+			</div>
+			{{/if}}
+		</div>
+	</div>
+</div>
diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl
new file mode 100755
index 000000000..67801e666
--- /dev/null
+++ b/view/tpl/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div class="widget{{if $class}} {{$class}}{{/if}}">
+	{{if $title}}<h3>{{$title}}</h3>{{/if}}
+	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
+	
+	<ul class="nav nav-pills flex-column">
+		{{foreach $items as $item}}
+		<li class="nav-item"><a href="{{$item.url}}" class="nav-link{{if $item.selected}} active{{/if}}">{{$item.label}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/tpl/generic_modal.tpl b/view/tpl/generic_modal.tpl
new file mode 100644
index 000000000..18279b6f7
--- /dev/null
+++ b/view/tpl/generic_modal.tpl
@@ -0,0 +1,17 @@
+<div class="modal" id="generic-modal-{{$id}}" tabindex="-1" role="dialog" aria-labelledby="generic-modal-{{$id}}" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title" id="generic-modal-title-{{$id}}">{{$title}}</h4>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+      </div>
+      <div class="modal-body" id="generic-modal-body-{{$id}}"></div>
+      <div class="modal-footer">
+        <button id="generic-modal-cancel-{{$id}}" type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$cancel}}</button>
+	{{if $ok}}
+        <button id="generic-modal-ok-{{$id}}" type="button" class="btn btn-primary">{{$ok}}</button>
+	{{/if}}
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl
new file mode 100755
index 000000000..627debc80
--- /dev/null
+++ b/view/tpl/group_drop.tpl
@@ -0,0 +1,7 @@
+<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
+	<a href="group/drop/{{$id}}?t={{$form_security_token}}" 
+		onclick="return confirmDelete();" 
+		id="group-delete-icon-{{$id}}" 
+		class="group-delete-icon btn btn-outline-secondary" title="{{$delete}}" ><i class="fa fa-trash-o drop-icons"></i></a>
+</div>
+<div class="group-delete-end"></div>
diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl
new file mode 100755
index 000000000..d9412a6f7
--- /dev/null
+++ b/view/tpl/group_edit.tpl
@@ -0,0 +1,26 @@
+<div class="generic-content-wrapper-styled">
+<h2>{{$title}}</h2>
+
+
+<div id="group-edit-wrapper" >
+	<form action="group/{{$gid}}" id="group-edit-form" method="post" >
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		{{include file="field_input.tpl" field=$gname}}
+		{{include file="field_checkbox.tpl" field=$public}}
+		{{if $drop}}{{$drop}}{{/if}}
+		<div id="group-edit-submit-wrapper" >
+			<input type="submit" name="submit" value="{{$submit}}" >
+		</div>
+		<div id="group-edit-select-end" ></div>
+	</form>
+</div>
+
+
+{{if $groupeditor}}
+	<div id="group-update-wrapper">
+		{{include file="groupeditor.tpl"}}
+	</div>
+{{/if}}
+{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}
+</div>
diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl
new file mode 100755
index 000000000..270d2aa79
--- /dev/null
+++ b/view/tpl/group_selection.tpl
@@ -0,0 +1,8 @@
+<div class="form-group field custom">
+<label for="group-selection" id="group-selection-lbl">{{$label}}</label>
+<select class="form-control" name="group-selection" id="group-selection" >
+{{foreach $groups as $group}}
+<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option>
+{{/foreach}}
+</select>
+</div>
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
new file mode 100755
index 000000000..14f714ae9
--- /dev/null
+++ b/view/tpl/group_side.tpl
@@ -0,0 +1,26 @@
+<div class="widget" id="group-sidebar">
+	<h3>{{$title}}</h3>
+	<div>
+		<ul class="nav nav-pills flex-column">
+			{{foreach $groups as $group}}
+			<li class="nav-item nav-item-hack">
+				{{if $group.cid}}
+				<i id="group-{{$group.id}}" class="widget-nav-pills-checkbox fa fa-fw {{if $group.ismember}}fa-check-square-o{{else}}fa-square-o{{/if}}" onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}'); return true;"></i>
+				{{/if}}
+				{{if $group.edit}}
+				<a href="{{$group.edit.href}}" class="nav-link{{if $group.selected}} active{{/if}} widget-nav-pills-icons" title="{{$edittext}}"><i class="fa fa-fw fa-pencil"></i></a>
+				{{/if}}
+				<a class="nav-link{{if $group.selected}} active{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
+			</li>
+			{{/foreach}}
+			<li class="nav-item">
+				<a class="nav-link" href="group/new" title="{{$createtext}}" ><i class="fa fa-plus-circle"></i> {{$createtext}}</a>
+			</li>
+		</ul>
+
+	</div>
+</div>
+
+
+
+
diff --git a/view/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl
new file mode 100755
index 000000000..c79bb0a2a
--- /dev/null
+++ b/view/tpl/groupeditor.tpl
@@ -0,0 +1,16 @@
+<div id="group">
+<h3>{{$groupeditor.label_members}}</h3>
+<div id="group-members" class="contact_list">
+{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
+</div>
+<div id="group-members-end"></div>
+<hr id="group-separator" />
+</div>
+
+<div id="contacts">
+<h3>{{$groupeditor.label_contacts}}</h3>
+<div id="group-all-contacts" class="contact_list">
+{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
+</div>
+<div id="group-all-contacts-end"></div>
+</div>
diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl
new file mode 100644
index 000000000..cccee2229
--- /dev/null
+++ b/view/tpl/hdr.tpl
@@ -0,0 +1,3 @@
+<div id="nav-notifications-template" rel="template">
+	<a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}"><img class="menu-img-3" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a>
+</div>
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
new file mode 100755
index 000000000..5f874426c
--- /dev/null
+++ b/view/tpl/head.tpl
@@ -0,0 +1,21 @@
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<base href="{{$baseurl}}/" />
+<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" />
+{{$metas}}
+{{$head_css}}
+{{$js_strings}}
+{{$head_js}}
+{{$linkrel}}
+{{$plugins}}
+<script>
+	var updateInterval = {{$update_interval}};
+	var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}};
+	var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
+	var justifiedGalleryActive = false;
+	{{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}}
+	{{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}}
+	var preloadImages = {{$preload_images}};
+</script>
+
+
+
diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl
new file mode 100644
index 000000000..43b061dcc
--- /dev/null
+++ b/view/tpl/help.tpl
@@ -0,0 +1,33 @@
+<div id="help-content" class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}: {{$heading}}</h2>
+	</div>
+	<div class="section-content-wrapper" id="doco-content">
+		<h3 id="doco-top-toc-heading">
+			<span class="fakelink" onclick="docoTocToggle(); return false;">
+				<i class="fa fa-fw fa-caret-right fakelink" id="doco-toc-toggle"></i>
+				{{$tocHeading}}
+			</span>
+		</h3>
+		<ul id="doco-top-toc" style="margin-bottom: 1.5em; display: none;"></ul>
+		{{$content}}
+	</div>
+</div>
+
+<script>
+	// Generate the table of contents in the side nav menu (see view/tpl/help.tpl)
+	$(document).ready(function () {
+		$('#doco-top-toc').toc({content: "#doco-content", headings: "h3,h4,h5,h6"});
+	});
+	
+	function docoTocToggle() {
+		if($('#doco-top-toc').is(':visible')) {
+			$('#doco-toc-toggle').removeClass('fa-cog').addClass('fa-caret-right');
+		} else {
+			$('#doco-toc-toggle').removeClass('fa-caret-right').addClass('fa-caret-down');
+		}
+		$('#doco-top-toc').toggle();
+		
+		return false;
+	}
+</script>
diff --git a/view/tpl/install.tpl b/view/tpl/install.tpl
new file mode 100755
index 000000000..0e77aa97b
--- /dev/null
+++ b/view/tpl/install.tpl
@@ -0,0 +1,9 @@
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+
+{{if $status}}
+<h3 class="error-message">{{$status}}</h3>
+{{/if}}
+
+{{$text}}
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
new file mode 100755
index 000000000..ad0aef6a3
--- /dev/null
+++ b/view/tpl/install_checks.tpl
@@ -0,0 +1,24 @@
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+<form  action="{{$baseurl}}/index.php?q=setup" method="post">
+<table>
+{{foreach $checks as $check}}
+	<tr><td>{{$check.title}} </td><td><i class="fa {{if $check.status}}fa-check-square-o{{else}}{{if $check.required}}fa-square-o{{else}}fa-exclamation{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr>
+	{{if $check.help}}
+	<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
+	{{/if}}
+{{/foreach}}
+</table>
+
+{{if $phpath}}
+	<input type="hidden" name="phpath" value="{{$phpath}}">
+{{/if}}
+
+{{if $passed}}
+	<input type="hidden" name="pass" value="2">
+	<input type="submit" value="{{$next}}">
+{{else}}
+	<input type="hidden" name="pass" value="1">
+	<input type="submit" value="{{$reload}}">
+{{/if}}
+</form>
diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl
new file mode 100755
index 000000000..1a58de129
--- /dev/null
+++ b/view/tpl/install_db.tpl
@@ -0,0 +1,30 @@
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+
+<p>
+{{$info_01}}<br>
+{{$info_02}}<br>
+{{$info_03}}
+</p>
+
+{{if $status}}
+<h3 class="error-message">{{$status}}</h3>
+{{/if}}
+
+<form id="install-form" action="{{$baseurl}}/setup" method="post">
+
+<input type="hidden" name="phpath" value="{{$phpath}}" />
+<input type="hidden" name="pass" value="3" />
+
+{{include file="field_input.tpl" field=$dbhost}}
+{{include file="field_input.tpl" field=$dbport}}
+{{include file="field_input.tpl" field=$dbuser}}
+{{include file="field_password.tpl" field=$dbpass}}
+{{include file="field_input.tpl" field=$dbdata}}
+{{include file="field_select.tpl" field=$dbtype}}
+
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
+
+</form>
+
diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
new file mode 100755
index 000000000..62dcbb8b3
--- /dev/null
+++ b/view/tpl/install_settings.tpl
@@ -0,0 +1,28 @@
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+
+{{if $status}}
+<h3 class="error-message">{{$status}}</h3>
+{{/if}}
+
+<form id="install-form" action="{{$baseurl}}/setup" method="post">
+
+<input type="hidden" name="phpath" value="{{$phpath}}" />
+<input type="hidden" name="dbhost" value="{{$dbhost}}" />
+<input type="hidden" name="dbport" value="{{$dbport}}" />
+<input type="hidden" name="dbuser" value="{{$dbuser}}" />
+<input type="hidden" name="dbpass" value="{{$dbpass}}" />
+<input type="hidden" name="dbdata" value="{{$dbdata}}" />
+<input type="hidden" name="dbtype" value="{{$dbtype}}" />
+<input type="hidden" name="pass" value="4" />
+
+{{include file="field_input.tpl" field=$adminmail}}
+{{include file="field_input.tpl" field=$siteurl}}
+
+{{include file="field_select_grouped.tpl" field=$timezone}}
+
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
+
+</form>
+
diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl
new file mode 100755
index 000000000..440e1e02b
--- /dev/null
+++ b/view/tpl/invite.tpl
@@ -0,0 +1,28 @@
+<div id="invite" class="generic-content-wrapper">
+  <div class="section-title-wrapper">
+    <h2>{{$invite}}</h2>
+  </div>
+  <div class="section-content-wrapper">
+
+    <form action="invite" method="post" id="invite-form" >
+
+      <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+      <div id="invite-recipient-textarea" class="form-group field custom">
+        <label for="recipients">{{$addr_text}}</label>
+        <textarea id="invite-recipients" name="recipients" rows="6" class="form-control"></textarea>
+      </div>
+
+      <div id="invite-message-textarea" class="form-group field custom">
+        <label for="message">{{$msg_text}}</label>
+        <textarea id="invite-message" name="message" rows="12" class="form-control">{{$default_message}}</textarea>
+      </div>
+
+      <div id="invite-submit-wrapper" class="form-group">
+        <button class="btn btn-primary btn-sm" type="submit" id="invite-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+      </div>
+
+    </form>
+
+  </div>
+</div>
diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl
new file mode 100644
index 000000000..95e38c0bd
--- /dev/null
+++ b/view/tpl/item_attach.tpl
@@ -0,0 +1,5 @@
+{{if $attaches}}
+{{foreach $attaches as $a}}
+<a class="dropdown-item" href="{{$a.url}}" title="{{$a.title}}"><i class="fa {{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a>
+{{/foreach}}
+{{/if}}
diff --git a/view/tpl/item_binary.tpl b/view/tpl/item_binary.tpl
new file mode 100644
index 000000000..b19f7e7dd
--- /dev/null
+++ b/view/tpl/item_binary.tpl
@@ -0,0 +1,3 @@
+<p>
+<center><a class="zrl" href="{{$url}}"><button class="btn btn-warning fakelink">{{$download}}</button></a></center>
+</p>
diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl
new file mode 100644
index 000000000..e1b183c0d
--- /dev/null
+++ b/view/tpl/item_categories.tpl
@@ -0,0 +1,8 @@
+{{if $categories}}
+<!--div class="categorytags"-->
+{{foreach $categories as $cat}}
+<span class="item-category badge badge-pill badge-warning"><i class="fa fa-asterisk"></i>&nbsp;{{if $cat.url}}<a class="text-white" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
+{{/foreach}}
+<!--/div-->
+{{/if}}
+
diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl
new file mode 100644
index 000000000..4eb621f93
--- /dev/null
+++ b/view/tpl/item_filer.tpl
@@ -0,0 +1,8 @@
+{{if $categories}}
+<!--div class="filesavetags"-->
+{{foreach $categories as $cat}}
+<span class="item-category badge badge-pill badge-danger"><i class="fa fa-folder-o"></i>&nbsp;{{$cat.term}}&nbsp;<a href="{{$cat.removelink}}" class="text-white" title="{{$remove}}"><i class="fa fa-close"></i></a></span>
+{{/foreach}}
+<!--/div-->
+{{/if}}
+
diff --git a/view/tpl/item_import.tpl b/view/tpl/item_import.tpl
new file mode 100755
index 000000000..e976417e1
--- /dev/null
+++ b/view/tpl/item_import.tpl
@@ -0,0 +1,13 @@
+<h2>{{$title}}</h2>
+
+<form action="import_items" method="post" enctype="multipart/form-data" id="import-channel-form">
+	<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+	<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>
+
+	<label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label>
+	<input type="file" name="filename" id="import-filename" class="import-input" value="" />
+	<div id="import-filename-end" class="import-field-end"></div>
+
+	<input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" />
+	<div id="import-submit-end" class="import-field-end"></div>
+</form>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
new file mode 100755
index 000000000..1cc5a898a
--- /dev/null
+++ b/view/tpl/jot-header.tpl
@@ -0,0 +1,598 @@
+<script language="javascript" type="text/javascript">
+
+var editor = false;
+var plaintext = '{{$editselect}}';
+var pretext = '{{$pretext}}';
+
+function initEditor(cb){
+	if (editor==false){
+		$("#profile-jot-text-loading").spin('small').show();
+		{{$geotag}}
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").spin(false).hide();
+			$("#profile-jot-text").css({ 'height': 200 });
+			{{if $bbco_autocomplete}}
+			$("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode
+			{{/if}}
+			{{if $editor_autocomplete}}
+			if(typeof channelId === 'undefined')
+				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
+			else
+				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections
+			{{/if}}
+			editor = true;
+			  $("a#jot-perms-icon").colorbox({ 
+				  'inline' : true, 
+				  'transition' : 'elastic' 
+			});
+			$(".jothidden").show();
+			$("#profile-jot-text").addClass('jot-expanded');
+			if (typeof cb!="undefined") cb();
+			if(pretext.length)
+				addeditortext(pretext);
+			return;
+		}
+		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: {{$editselect}},
+			auto_focus: "profile-jot-text",
+			plugins : "bbcode,paste,autoresize, inlinepopups",
+			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+			theme_advanced_buttons2 : "",
+			theme_advanced_buttons3 : "",
+			theme_advanced_toolbar_location : "top",
+			theme_advanced_toolbar_align : "center",
+			theme_advanced_blockformats : "blockquote,code",
+			gecko_spellcheck : true,
+			paste_text_sticky : true,
+			entity_encoding : "raw",
+			add_unload_trigger : false,
+			remove_linebreaks : false,
+			force_p_newlines : false,
+			force_br_newlines : true,
+			forced_root_block : '',
+			convert_urls: false,
+			content_css: "{{$baseurl}}/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			file_browser_callback : "fcFileBrowser",
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null)
+						cPopup.onkey(e);
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) cPopup = null;
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$("#profile-jot-text-loading").spin(false).hide();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+
+			}
+		});
+
+		editor = true;
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+</script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>
+<script>
+	$(document).ready(function() {
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+
+		var upload_title = $('#wall-image-upload').attr('title');
+		var attach_title = $('#wall-file-upload').attr('title');
+		try {
+			var uploader = new window.AjaxUpload('wall-image-upload',
+			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
+				name: 'userfile',
+				title: upload_title,
+				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#jot-media').val($('#jot-media').val() + response);
+					$('#profile-rotator').spin(false);
+				}
+			});
+		} catch (e) {
+		}
+		try {
+			var uploader_sub = new window.AjaxUpload('wall-image-upload-sub',
+			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
+				name: 'userfile',
+				title: upload_title,
+				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#jot-media').val($('#jot-media').val() + response);
+					$('#profile-rotator').spin(false);
+				}
+			});
+		} catch(e) {
+		}
+		try {
+			var file_uploader = new window.AjaxUpload('wall-file-upload',
+			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
+				name: 'userfile',
+				title: attach_title,
+				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#jot-media').val($('#jot-media').val() + response);
+					$('#profile-rotator').spin(false);
+				}
+			});
+		} catch(e) {
+		}
+		try {
+			var file_uploader_sub = new window.AjaxUpload('wall-file-upload-sub',
+			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
+				name: 'userfile',
+				title: attach_title,
+				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#jot-media').val($('#jot-media').val() + response);
+					$('#profile-rotator').spin(false);
+				}
+			});
+		} catch(e) {
+		}
+        
+        
+        // call initialization file
+        if (window.File && window.FileList && window.FileReader) {
+          DragDropUploadInit();
+        }
+	});
+
+	function deleteCheckedItems() {
+		var checkedstr = '';
+
+		$('.item-select').each( function() {
+			if($(this).is(':checked')) {
+				if(checkedstr.length != 0) {
+					checkedstr = checkedstr + ',' + $(this).val();
+				}
+				else {
+					checkedstr = $(this).val();
+				}
+			}
+		});
+		$.post('item', { dropitems: checkedstr }, function(data) {
+			window.location.reload();
+		});
+	}
+
+	function jotGetLink() {
+            textarea = document.getElementById('profile-jot-text');
+            if (textarea.selectionStart || textarea.selectionStart == "0") {
+                    var start = textarea.selectionStart;
+                    var end = textarea.selectionEnd;	
+                    if (end > start) {
+                        reply = prompt("{{$linkurl}}");
+                        if(reply && reply.length) {
+                            textarea.value = textarea.value.substring(0, start) + "[url=" + reply + "]" + textarea.value.substring(start, end) + "[/url]" + textarea.value.substring(end, textarea.value.length);
+                        }
+                    } else {
+                        reply = prompt("{{$linkurl}}");
+                        if(reply && reply.length) {
+                            reply = bin2hex(reply);
+                            $('#profile-rotator').spin('tiny');
+                            $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
+                                    addeditortext(data);
+                                    $('#profile-rotator').spin(false);
+                            });
+                        }
+                    }
+            }
+	}
+
+	function jotGetLocation() {
+		reply = prompt("{{$whereareu}}", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotGetExpiry() {
+		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+		$('#expiryModal').modal();
+		$('#expiry-modal-OKButton').on('click', function() {
+			reply=$('#expiration-date').val();
+			if(reply && reply.length) {
+				$('#jot-expire').val(reply);
+				$('#expiryModal').modal('hide');
+			}
+		})
+	}
+
+	function jotGetPubDate() {
+		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+		$('#createdModal').modal();
+		$('#created-modal-OKButton').on('click', function() {
+			reply=$('#created-date').val();
+			if(reply && reply.length) {
+				$('#jot-created').val(reply);
+				$('#createdModal').modal('hide');
+			}
+		})
+	}
+
+
+	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
+		$('#like-rotator-' + id).spin('tiny');
+		$.get('{{$baseurl}}/share/' + id, function(data) {
+			if (!editor) $("#profile-jot-text").val("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).spin(false);
+				$(window).scrollTop(0);
+			});
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound) {
+			event.preventDefault();
+			var editwin = '#' + event.target.id;
+			var commentwin = false;
+			if(editwin) {
+				commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
+				if(commentwin) {
+					var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
+					$('#comment-edit-text-' + commentid).addClass('hover');
+				}
+			}
+		}
+	}
+
+	function linkdropexit(event) {
+		var editwin = '#' + event.target.id;
+		var commentwin = false;
+		if(editwin) {
+			commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
+			if(commentwin) {
+				var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
+				$('#comment-edit-text-' + commentid).removeClass('hover');
+			}
+		}
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.preventDefault();
+		var editwin = '#' + event.target.id;
+		var commentwin = false;
+		if(editwin) {
+			commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
+			if(commentwin) {
+				var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
+				commentOpen(document.getElementById(event.target.id),commentid);
+
+			}
+		}
+
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').spin('tiny');
+			$.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
+				if(commentwin) {
+					$(editwin).val( $(editwin).val() + data );
+					$('#profile-rotator').spin(false);
+				}
+				else {
+					if (!editor) $("#profile-jot-text").val("");
+					initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').spin(false);
+					});
+				}
+			});
+		}
+	}
+
+	function itemTag(id) {
+		reply = prompt("{{$term}}");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('{{$baseurl}}/tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
+	function itemFiler(id) {
+		if($('#item-filer-dialog').length)
+			$('#item-filer-dialog').remove();
+
+		$.get('filer/', function(data){
+			$('body').append(data);
+			$('#item-filer-dialog').modal('show');
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('{{$baseurl}}/filer/' + id + '?term=' + reply, NavUpdate);
+//					if(timer) clearTimeout(timer);
+//					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$('#item-filer-dialog').modal('hide');
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	function itemBookmark(id) {
+		$.get('{{$baseurl}}/bookmarks?f=&item=' + id);
+		if(timer) clearTimeout(timer);
+		timer = setTimeout(NavUpdate,1000);
+	}
+
+	function itemAddToCal(id) {
+		$.get('{{$baseurl}}/events/add/' + id);
+		if(timer) clearTimeout(timer);
+		timer = setTimeout(NavUpdate,1000);
+	}
+
+	function toggleVoting() {
+		if($('#jot-consensus').val() > 0) {
+			$('#jot-consensus').val(0);
+			$('#profile-voting, #profile-voting-sub').removeClass('fa-check-square-o').addClass('fa-square-o');
+		}
+		else {
+			$('#jot-consensus').val(1);
+			$('#profile-voting, #profile-voting-sub').removeClass('fa-square-o').addClass('fa-check-square-o');
+		}
+	}
+
+	function toggleNoComment() {
+		if($('#jot-nocomment').val() > 0) {
+			$('#jot-nocomment').val(0);
+			$('#profile-nocomment, #profile-nocomment-sub').removeClass('fa-comments-o').addClass('fa-comments');
+			$('#profile-nocomment-wrapper').attr('title', '{{$nocomment_enabled}}');
+		}
+		else {
+			$('#jot-nocomment').val(1);
+			$('#profile-nocomment, #profile-nocomment-sub').removeClass('fa-comments').addClass('fa-comments-o');
+			$('#profile-nocomment-wrapper').attr('title', '{{$nocomment_disabled}}');
+		}
+	}
+
+	function jotReact(id,icon) {
+		if(id && icon) {
+			$.get('{{$baseurl}}/react?f=&postid=' + id + '&emoji=' + icon);
+			if(timer) clearTimeout(timer);
+			timer = setTimeout(NavUpdate,1000);
+		}
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').attr('disabled', true);
+	}
+
+
+    var initializeEmbedPhotoDialog = function () {
+        $('.embed-photo-selected-photo').each(function (index) {
+            $(this).removeClass('embed-photo-selected-photo');
+        });
+        getPhotoAlbumList();
+        $('#embedPhotoModalBodyAlbumDialog').off('click');
+        $('#embedPhotoModal').modal('show');
+    };
+
+    var choosePhotoFromAlbum = function (album) {
+        $.post("embedphotos/album", {name: album},
+            function(data) {
+                if (data['status']) {
+                    $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
+                    $('#embedPhotoModalBodyAlbumDialog').html('\
+                            <div><div class="nav nav-pills flex-column">\n\
+                                <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
+                                    <i class="fa fa-chevron-left"></i>&nbsp\n\
+                                    {{$modaldiffalbum}}\n\
+                                    </a>\n\
+                                </li>\n\
+                            </div><br></div>')
+                    $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
+                    $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
+                        evt.preventDefault();
+                        var image = document.getElementById(evt.target.id);
+                        if (typeof($(image).parent()[0]) !== 'undefined') {
+                            var imageparent = document.getElementById($(image).parent()[0].id);
+                            $(imageparent).toggleClass('embed-photo-selected-photo');
+                        }
+                    });
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
+                    $('#embed-photo-OKButton').click(function () {
+                        $('.embed-photo-selected-photo').each(function (index) {
+                            var href = $(this).attr('href');
+                            $.post("embedphotos/photolink", {href: href},
+                                function(ddata) {
+                                    if (ddata['status']) {
+                                        addeditortext(ddata['photolink']);
+                                    } else {
+                                        window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
+                                    }
+                                    return false;
+                                },
+                            'json');
+                        });
+                        $('#embedPhotoModalBodyAlbumDialog').html('');
+                        $('#embedPhotoModalBodyAlbumDialog').off('click');
+                        $('#embedPhotoModal').modal('hide');
+                    });
+                } else {
+                    window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+
+    var getPhotoAlbumList = function () {
+        $.post("embedphotos/albumlist", {},
+            function(data) {
+                if (data['status']) {
+                    var albums = data['albumlist']; //JSON.parse(data['albumlist']);
+                    $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
+                    $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
+                    for(var i=0; i<albums.length; i++) {
+                        var albumName = albums[i].text;
+			var jsAlbumName = albums[i].jstext;
+			var albumLink = '<li class="nav-item">';
+			albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
+                        albumLink += '</li>';
+                        $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+                    }
+                    $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
+                } else {
+                    window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+
+    //
+    // initialize
+    function DragDropUploadInit() {
+
+      var filedrag = $("#profile-jot-text");
+
+      // is XHR2 available?
+      var xhr = new XMLHttpRequest();
+      if (xhr.upload) {
+
+        // file drop
+        filedrag.on("dragover", DragDropUploadFileHover);
+        filedrag.on("dragleave", DragDropUploadFileHover);
+        filedrag.on("drop", DragDropUploadFileSelectHandler);
+
+      }
+
+      window.filesToUpload = 0;
+      window.fileUploadsCompleted = 0;
+
+
+    }
+
+    // file drag hover
+    function DragDropUploadFileHover(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      e.target.className = (e.type == "dragover" ? "hover" : "");
+    }
+
+    // file selection
+    function DragDropUploadFileSelectHandler(e) {
+
+      // cancel event and hover styling
+      DragDropUploadFileHover(e);
+	  if (!editor) $("#profile-jot-text").val("");
+
+
+      // fetch FileList object
+      var files = e.target.files || e.originalEvent.dataTransfer.files;
+      // process all File objects
+      for (var i = 0, f; f = files[i]; i++) {
+        DragDropUploadFile(f, i);
+      }
+
+    }
+
+    // upload  files
+    function DragDropUploadFile(file, idx) {
+
+      window.filesToUpload = window.filesToUpload + 1;
+
+      var xhr = new XMLHttpRequest();
+      xhr.withCredentials = true;   // Include the SESSION cookie info for authentication
+      (xhr.upload || xhr).addEventListener('progress', function (e) {
+         $('#profile-rotator').spin('tiny');
+      });
+      xhr.addEventListener('load', function (e) {
+        //console.log('xhr upload complete', e);
+        window.fileUploadsCompleted = window.fileUploadsCompleted + 1;
+
+		initEditor(function() {
+			addeditortext(xhr.responseText);
+		});
+
+		$('#jot-media').val($('#jot-media').val() + xhr.responseText);
+        // When all the uploads have completed, refresh the page
+        if (window.filesToUpload > 0 && window.fileUploadsCompleted === window.filesToUpload) {  
+          $('#profile-rotator').spin(false);
+          window.fileUploadsCompleted = window.filesToUpload = 0;
+        }
+      });
+      // POST to the wall_upload endpoint
+      xhr.open('post', '{{$baseurl}}/wall_attach/{{$nickname}}', true);
+
+      var data = new FormData();
+      data.append('userfile', file);
+      xhr.send(data);
+    }
+
+</script>
+
+<script>
+$( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-delete-link,.block-delete-link", function(e) {
+	var link = $(this).attr("href"); // "get" the intended link in a var
+
+	if (typeof(eval($.fn.modal)) === 'function'){
+		e.preventDefault();
+		bootbox.confirm("<h4>{{$confirmdelete}}</h4>",function(result) {
+			if (result) {
+				document.location.href = link;
+			}
+		});
+	} else {
+		return confirm("{{$confirmdelete}}");
+	}
+});
+</script>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
new file mode 100755
index 000000000..dbbb470c5
--- /dev/null
+++ b/view/tpl/jot.tpl
@@ -0,0 +1,303 @@
+<form id="profile-jot-form" action="{{$action}}" method="post" class="acl-form" data-form_id="profile-jot-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+	{{$mimeselect}}
+	{{$layoutselect}}
+	{{if $id_select}}
+	<div class="channel-id-select-div">
+		<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
+	</div>
+	{{/if}}
+	<div class="mb-4" id="profile-jot-wrapper">
+		{{if $parent}}
+		<input type="hidden" name="parent" value="{{$parent}}" />
+		{{/if}}
+		<input type="hidden" name="obj_type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="expire" id="jot-expire" value="{{$defexpire}}" />
+		<input type="hidden" name="created" id="jot-created" value="{{$defpublish}}" />
+		<input type="hidden" name="media_str" id="jot-media" value="" />
+		<input type="hidden" name="source" id="jot-source" value="{{$source}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="webpage" value="{{$webpage}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
+		<input type="hidden" id="jot-nocomment" name="nocomment" value="{{if $nocomment}}{{$nocomment}}{{else}}0{{/if}}" />
+
+		{{if $webpage}}
+		<div id="jot-pagetitle-wrap" class="jothidden">
+			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
+		</div>
+		{{/if}}
+		<div id="jot-title-wrap" class="jothidden">
+			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex="1" value="{{$title}}">
+		</div>
+		{{if $catsenabled}}
+		<div id="jot-category-wrap" class="jothidden">
+			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput">
+		</div>
+		{{/if}}
+		<div id="jot-text-wrap">
+			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$share}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$content}}</textarea>
+		</div>
+		{{if $attachment}}
+		<div id="jot-attachment-wrap">
+			<input class="jot-attachment" name="attachment" id="jot-attachment" type="text" value="{{$attachment}}" readonly="readonly" onclick="this.select();">
+		</div>
+		{{/if}}
+		<div id="profile-jot-submit-wrapper" class="clearfix p-2 jothidden">
+			<div id="profile-jot-submit-left" class="btn-toolbar float-left">
+				{{if $bbcode}}
+				<div class="btn-group mr-2">
+					<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;">
+						<i class="fa fa-bold jot-icons"></i>
+					</button>
+					<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;">
+						<i class="fa fa-italic jot-icons"></i>
+					</button>
+					<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;">
+						<i class="fa fa-underline jot-icons"></i>
+					</button>
+					<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;">
+						<i class="fa fa-quote-left jot-icons"></i>
+					</button>
+					<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;">
+						<i class="fa fa-terminal jot-icons"></i>
+					</button>
+				</div>
+				{{/if}}
+				{{if $visitor}}
+				<div class="btn-group mr-2 d-none d-lg-flex">
+					{{if $writefiles}}
+					<button id="wall-file-upload" class="btn btn-outline-secondary btn-sm" title="{{$attach}}" >
+						<i id="wall-file-upload-icon" class="fa fa-paperclip jot-icons"></i>
+					</button>
+					{{/if}}
+					{{if $weblink}}
+					<button id="profile-link-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
+						<i id="profile-link" class="fa fa-link jot-icons"></i>
+					</button>
+					{{/if}}
+					{{if $embedPhotos}}
+					<button id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
+						<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i>
+					</button>
+					{{/if}}
+				</div>
+				<div class="btn-group mr-2 d-none d-lg-flex">
+					{{if $setloc}}
+					<button id="profile-location-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
+						<i id="profile-location" class="fa fa-globe jot-icons"></i>
+					</button>
+					{{/if}}
+					{{if $clearloc}}
+					<button id="profile-nolocation-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled">
+						<i id="profile-nolocation" class="fa fa-circle-o jot-icons"></i>
+					</button>
+					{{/if}}
+				{{else}}
+				<div class="btn-group d-none d-lg-flex">
+				{{/if}}
+				{{if $feature_expire}}
+					<button id="profile-expire-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
+						<i id="profile-expires" class="fa fa-eraser jot-icons"></i>
+					</button>
+				{{/if}}
+				{{if $feature_future}}
+					<button id="profile-future-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;">
+						<i id="profile-future" class="fa fa-clock-o jot-icons"></i>
+					</button>
+				{{/if}}
+				{{if $feature_encrypt}}
+					<button id="profile-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
+						<i id="profile-encrypt" class="fa fa-key jot-icons"></i>
+					</button>
+				{{/if}}
+				{{if $feature_voting}}
+					<button id="profile-voting-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$voting}}" onclick="toggleVoting();return false;">
+						<i id="profile-voting" class="fa fa-square-o jot-icons"></i>
+					</button>
+				{{/if}}
+				{{if $feature_nocomment}}
+					<button id="profile-nocomment-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$nocommenttitle}}" onclick="toggleNoComment();return false;">
+						<i id="profile-nocomment" class="fa fa-comments jot-icons"></i>
+					</button>
+				{{/if}}
+				</div>
+				{{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}}
+				<div class="btn-group d-lg-none">
+					<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+						<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
+					</button>
+					<div class="dropdown-menu">
+						{{if $visitor}}
+						{{if $writefiles}}
+						<a class="dropdown-item" id="wall-file-upload-sub" href="#" ><i class="fa fa-paperclip"></i>&nbsp;{{$attach}}</a>
+						{{/if}}
+						{{if $weblink}}
+						<a class="dropdown-item" href="#" onclick="jotGetLink(); return false;"><i class="fa fa-link"></i>&nbsp;{{$weblink}}</a>
+						{{/if}}
+						{{if $embedPhotos}}
+						<a class="dropdown-item" href="#" onclick="initializeEmbedPhotoDialog(); return false;"><i class="fa fa-file-image-o jot-icons"></i>&nbsp;{{$embedPhotos}}</a>
+						{{/if}}
+						{{if $setloc}}
+						<a class="dropdown-item" href="#" onclick="jotGetLocation(); return false;"><i class="fa fa-globe"></i>&nbsp;{{$setloc}}</a>
+						{{/if}}
+						{{if $clearloc}}
+						<a class="dropdown-item" href="#" onclick="jotClearLocation(); return false;"><i class="fa fa-circle-o"></i>&nbsp;{{$clearloc}}</a>
+						{{/if}}
+						{{/if}}
+						{{if $feature_expire}}
+						<a class="dropdown-item" href="#" onclick="jotGetExpiry(); return false;"><i class="fa fa-eraser"></i>&nbsp;{{$expires}}</a>
+						{{/if}}
+						{{if $feature_future}}
+						<a class="dropdown-item" href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i>&nbsp;{{$future_txt}}</a>
+						{{/if}}
+						{{if $feature_encrypt}}
+						<a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
+						{{/if}}
+						{{if $feature_voting}}
+						<a class="dropdown-item" href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="fa fa-square-o"></i>&nbsp;{{$voting}}</a>
+						{{/if}}
+						{{if $feature_nocomment}}
+						<a class="dropdown-item" href="#" onclick="toggleNoComment(); return false;"><i id="profile-nocomment-sub" class="fa fa-comments"></i>&nbsp;{{$nocommenttitlesub}}</a>
+						{{/if}}
+					</div>
+				</div>
+				{{/if}}
+			</div>
+			<div id="profile-rotator-wrapper" class="float-left">
+				<div id="profile-rotator"></div>
+			</div>
+			<div id="profile-jot-submit-right" class="btn-group float-right">
+				{{if $preview}}
+				<button class="btn btn-outline-secondary btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
+					<i class="fa fa-eye jot-icons" ></i>
+				</button>
+				{{/if}}
+				{{if $jotnets}}
+				<button id="dbtn-jotnets" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#jotnetsModal" type="button" title="{{$jotnets_label}}" style="{{if $lockstate == 'lock'}}display: none;{{/if}}">
+					<i class="fa fa-share-alt jot-icons"></i>
+				</button>
+				{{/if}}
+				{{if $showacl}}
+				<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form">
+					<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons{{if $bang}} jot-lock-warn{{/if}}"></i>
+				</button>
+				{{/if}}
+				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex="3" name="button-submit">{{$share}}</button>
+			</div>
+			<div class="clear"></div>
+			{{if $jotplugins}}
+			<div id="profile-jot-plugin-wrapper" class="mt-2">
+				{{$jotplugins}}
+			</div>
+			{{/if}}
+			{{if $jotnets}}
+			<div class="modal" id="jotnetsModal" tabindex="-1" role="dialog" aria-labelledby="jotnetsModalLabel" aria-hidden="true">
+				<div class="modal-dialog">
+					<div class="modal-content">
+						<div class="modal-header">
+							<h4 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h4>
+							<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+						</div>
+						<div class="modal-body">
+							{{$jotnets}}
+						</div>
+						<div class="modal-footer">
+							<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
+						</div>
+					</div><!-- /.modal-content -->
+				</div><!-- /.modal-dialog -->
+			</div><!-- /.modal -->
+			{{/if}}
+		</div>
+	</div>
+</form>
+
+<div id="jot-preview-content" style="display:none;"></div>
+
+{{$acl}}
+
+{{if $feature_expire}}
+<!-- Modal for item expiry-->
+<div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="modal-body form-group" style="width:90%">
+				<div class="date">
+					<input type="text" placeholder="yyyy-mm-dd HH:MM" name="start_text" id="expiration-date" class="form-control" />
+				</div>
+				<script>
+					$(function () {
+						var picker = $('#expiration-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 });
+					});
+				</script>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$expiryModalCANCEL}}</button>
+				<button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+{{/if}}
+
+{{if $feature_future}}
+<div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="modal-body form-group" style="width:90%">
+				<div class="date">
+					<input type="text" placeholder="yyyy-mm-dd HH:MM" name="created_text" id="created-date" class="form-control" />
+				</div>
+				<script>
+					$(function () {
+						var picker = $('#created-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 });
+					});
+				</script>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$expiryModalCANCEL}}</button>
+				<button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+{{/if}}
+
+{{if $embedPhotos}}
+<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="modal-body" id="embedPhotoModalBody" >
+				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
+					<div id="embedPhotoModalBodyAlbumList"></div>
+				</div>
+				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
+				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+{{/if}}
+
+{{if $content || $attachment || $expanded}}
+<script>initEditor();</script>
+{{/if}}
diff --git a/view/tpl/jot_geotag.tpl b/view/tpl/jot_geotag.tpl
new file mode 100755
index 000000000..60f128850
--- /dev/null
+++ b/view/tpl/jot_geotag.tpl
@@ -0,0 +1,7 @@
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
+			$('#profile-nolocation-wrapper').attr('disabled', false);
+		});
+	}
+
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
new file mode 100755
index 000000000..4243c2ea5
--- /dev/null
+++ b/view/tpl/js_strings.tpl
@@ -0,0 +1,57 @@
+<script>
+
+	var aStr = {
+
+		'delitem'     : "{{$delitem}}",
+		'comment'     : "{{$comment}}",
+		'showmore'    : "{{$showmore}}",
+		'showfewer'   : "{{$showfewer}}",
+		'divgrowmore' : "{{$divgrowmore}}",
+		'divgrowless' : "{{$divgrowless}}",
+		'pwshort'     : "{{$pwshort}}",
+		'pwnomatch'   : "{{$pwnomatch}}",
+		'everybody'   : "{{$everybody}}",
+		'passphrase'  : "{{$passphrase}}",
+		'passhint'    : "{{$passhint}}",
+		'permschange' : "{{$permschange}}",
+		'closeAll'    : "{{$closeAll}}",
+		'nothingnew'  : "{{$nothingnew}}",
+		'rating_desc' : "{{$rating_desc}}",
+		'rating_val'  : "{{$rating_val}}",
+		'rating_text' : "{{$rating_text}}",
+		'submit'      : "{{$submit}}",
+		'linkurl'     : "{{$linkurl}}",
+		'leavethispage' : "{{$leavethispage}}",
+		'location'    : "{{$location}}",
+
+		't01' : "{{$t01}}",
+		't02' : "{{$t02}}",
+		't03' : "{{$t03}}",
+		't04' : "{{$t04}}",
+		't05' : "{{$t05}}",
+		't06' : "{{$t06}}",
+		't07' : "{{$t07}}",
+		't08' : "{{$t08}}",
+		't09' : "{{$t09}}",
+		't10' : "{{$t10}}",
+		't11' : "{{$t11}}",
+		't12' : "{{$t12}}",
+		't13' : "{{$t13}}",
+		't14' : "{{$t14}}",
+		't15' : "{{$t15}}",
+		't16' : "{{$t16}}",
+		't17' : "{{$t17}}",
+
+		'monthNames' : [ "{{$January}}","{{$February}}","{{$March}}","{{$April}}","{{$May}}","{{$June}}","{{$July}}","{{$August}}","{{$September}}","{{$October}}","{{$November}}","{{$December}}" ],
+		'monthNamesShort' : [ "{{$Jan}}","{{$Feb}}","{{$Mar}}","{{$Apr}}","{{$MayShort}}","{{$Jun}}","{{$Jul}}","{{$Aug}}","{{$Sep}}","{{$Oct}}","{{$Nov}}","{{$Dec}}" ],
+		'dayNames' : ["{{$Sunday}}","{{$Monday}}","{{$Tuesday}}","{{$Wednesday}}","{{$Thursday}}","{{$Friday}}","{{$Saturday}}"],
+		'dayNamesShort' : ["{{$Sun}}","{{$Mon}}","{{$Tue}}","{{$Wed}}","{{$Thu}}","{{$Fri}}","{{$Sat}}"],
+		'today' : "{{$today}}",
+		'month' : "{{$month}}",
+		'week' : "{{$week}}",
+		'day' : "{{$day}}",
+		'allday' : "{{$allday}}"
+	};
+
+</script>
+		
diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl
new file mode 100755
index 000000000..1324442f3
--- /dev/null
+++ b/view/tpl/lang_selector.tpl
@@ -0,0 +1,13 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$title}}</h1>
+<br />
+<div id="language-selector" >
+	<form action="#" method="post" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{foreach $langs.0 as $v=>$l}}
+				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
+			{{/foreach}}
+		</select>
+	</form>
+</div>
+</div>
diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl
new file mode 100644
index 000000000..1bbe14893
--- /dev/null
+++ b/view/tpl/layoutlist.tpl
@@ -0,0 +1,71 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $editor}}
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('layout-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
+			<a href="{{$help.url}}" target="_blank" class="btn btn-sm btn-warning" title="{{$help.title}}"><i class="fa fa-info"></i>&nbsp;{{$help.text}}</a>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{if $editor}}
+	<div id="layout-editor" class="section-content-tools-wrapper">
+		{{$editor}}
+	</div>
+	{{/if}}
+
+	{{if $pages}}
+	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+		<table id="layout-list-table">
+			<tr>
+				<th width="1%">{{$name}}</th>
+				<th width="94%">{{$descr}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%" class="d-none d-md-table-cell">{{$created}}</th>
+				<th width="1%" class="d-none d-md-table-cell">{{$edited}}</th>
+			</tr>
+			{{foreach $pages as $key => $items}}
+			{{foreach $items as $item}}
+			<tr id="layout-list-item-{{$item.url}}">
+				<td>
+					{{if $view}}
+					<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
+					{{else}}
+					{{$item.title}}
+					{{/if}}
+				</td>
+				<td>
+					{{$item.descr}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $item.bb_element}}
+					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+					{{/if}}
+				</td>
+				<td class="d-none d-md-table-cell">
+					{{$item.created}}
+				</td>
+				<td class="d-none d-md-table-cell">
+					{{$item.edited}}
+				</td>
+			</tr>
+			{{/foreach}}
+			{{/foreach}}
+		</table>
+	</div>
+	<div class="clear"></div>
+	{{/if}}
+</div>
diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl
new file mode 100755
index 000000000..e83b885fe
--- /dev/null
+++ b/view/tpl/like_noshare.tpl
@@ -0,0 +1,5 @@
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
+	<i class="fa fa-thumbs-o-up item-tool btn btn-outline-secondary" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i>
+	<i class="fa fa-thumbs-o-down item-tool btn btn-outline-secondary" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i>
+	<div id="like-rotator-{{$id}}" class="like-rotator"></div>
+</div>
diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl
new file mode 100644
index 000000000..a8c75b6a8
--- /dev/null
+++ b/view/tpl/locmanage.tpl
@@ -0,0 +1,41 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<script>
+			function primehub(id) {
+				$.post(baseurl + '/locs','primary='+id,function(data) { window.location.href=window.location.href; });
+			}
+			function drophub(id) {
+				$.post(baseurl + '/locs','drop='+id,function(data) { window.location.href=window.location.href; });
+			}
+		</script>
+		<button class="btn btn-success btn-sm pull-right" onclick="window.location.href='/locs/f=&sync=1'; return false;"><i class="fa fa-refresh"></i>&nbsp;{{$sync}}</button>
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper-np">
+		<div class="section-content-warning-wrapper">
+			{{$sync_text}}
+		</div>
+		<div class="section-content-info-wrapper">
+			{{$drop_text}}<br>
+			{{$last_resort}}
+		</div>
+		<table id="locs-index">
+			<tr>
+				<th>{{$addr}}</th>
+				<th class="d-none d-md-table-cell">{{$loc}}</th>
+				<th>{{$mkprm}}</th>
+				<th>{{$drop}}</th>
+			</tr>
+			{{foreach $hubs as $hub}}
+			{{if ! $hub.deleted }}
+			<tr class="locs-index-row">
+				<td>{{$hub.hubloc_addr}}</td>
+				<td class="d-none d-md-table-cell">{{$hub.hubloc_url}}</td>
+				<td>{{if $hub.primary}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o primehub" onclick="primehub({{$hub.hubloc_id}}); return false;"></i>{{/if}}</td>
+				<td><i class="fa fa-trash-o drophub" onclick="drophub({{$hub.hubloc_id}}); return false;"></i></td>
+			</tr>
+			{{/if}}
+			{{/foreach}}
+		</table>
+	</div>
+</div>
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
new file mode 100755
index 000000000..3d3faa41c
--- /dev/null
+++ b/view/tpl/login.tpl
@@ -0,0 +1,21 @@
+<form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+	<div id="login-main">
+		<div id="login-input" class="form-group">
+			{{include file="field_input.tpl" field=$lname}}
+			{{include file="field_password.tpl" field=$lpassword}}
+			{{include file="field_checkbox.tpl" field=$remember_me}}
+			<button type="submit" name="submit" class="btn btn-block btn-primary">{{$login}}</button>
+		</div>
+		<div id="login-extra-links">
+			{{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link" class="pull-right">{{$register.desc}}</a>{{/if}}
+			<a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+		</div>
+	</div>
+	{{foreach $hiddens as $k=>$v}}
+		<input type="hidden" name="{{$k}}" value="{{$v}}" />
+	{{/foreach}}
+</form>
+{{if $login_page}}
+<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
+{{/if}}
diff --git a/view/tpl/logout.tpl b/view/tpl/logout.tpl
new file mode 100755
index 000000000..7548ed196
--- /dev/null
+++ b/view/tpl/logout.tpl
@@ -0,0 +1,6 @@
+<form action="{{$dest_url}}" method="post" >
+<div class="logout-wrapper">
+<input type="hidden" name="auth-params" value="logout" />
+<input type="submit" name="submit" id="logout-button" value="{{$logout}}" />
+</div>
+</form>
diff --git a/view/tpl/lostpass.tpl b/view/tpl/lostpass.tpl
new file mode 100755
index 000000000..8ecfd215b
--- /dev/null
+++ b/view/tpl/lostpass.tpl
@@ -0,0 +1,17 @@
+<div class="generic-content-wrapper-styled">
+<h3>{{$title}}</h3>
+
+<p id="lostpass-desc">
+{{$desc}}
+</p>
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper">
+        <label for="login-name" id="label-login-name">{{$name}}</label>
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+		<input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
+</div>
+<div id="login-extra-end"></div>
+<div id="login-submit-end"></div>
+</form>
+</div>
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
new file mode 100755
index 000000000..759517b7f
--- /dev/null
+++ b/view/tpl/mail_conv.tpl
@@ -0,0 +1,38 @@
+<div id="mail-{{$mail.id}}" class="mb-2 clearfix mail-conv-outside-wrapper">
+	<div class="mb-2 clearfix wall-item-head">
+		<div class="wall-item-info" >
+			<a href="{{$mail.from_url}}"><img class="wall-item-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a>
+		</div>
+		<div class="mail-conv-detail">
+			{{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}}
+			<div class="wall-item-name"><a class="wall-item-name-link" href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
+			<div class="autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div>
+		</div>
+	</div>
+	<div class="clearfix mail-conv-content">
+		<div class="clearfix mail-conv-body">
+			{{$mail.body}}
+		</div>
+		{{if $mail.attachments}}
+		<div class="dropdown float-left">
+			<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-fw fa-paperclip"></i></button>
+			<div class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</div>
+		</div>
+		{{/if}}
+		<div class="float-right dropdown">
+			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}">
+				<i class="fa fa-cog"></i>
+			</button>
+			<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}">
+				{{if $mail.can_recall}}
+				<a class="dropdown-item" href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-fw fa-undo"></i>&nbsp;{{$mail.recall}}</a>
+				{{/if}}
+				<a class="dropdown-item" href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-fw fa-trash-o"></i>&nbsp;{{$mail.delete}}</a>
+				{{if $mail.can_recall}}
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a>
+				{{/if}}
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
new file mode 100755
index 000000000..e8549a49b
--- /dev/null
+++ b/view/tpl/mail_display.tpl
@@ -0,0 +1,24 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+			{{if $mailbox == 'combined'}}
+			<a class="btn btn-sm btn-danger" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$delete}}</a>
+			{{/if}}
+		</div>
+		<h2>{{$prvmsg_header}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-wrapper">
+		{{foreach $mails as $mail}}
+			{{include file="mail_conv.tpl"}}
+		{{/foreach}}
+
+		{{if $canreply}}
+		{{include file="prv_message.tpl"}}
+		{{else}}
+		{{$unknown_text}}
+		{{/if}}
+	</div>
+</div>
diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl
new file mode 100755
index 000000000..aac592a5f
--- /dev/null
+++ b/view/tpl/mail_head.tpl
@@ -0,0 +1,8 @@
+<div class="widget">
+	<h3>{{$header}}</h3>
+	<ul class="nav nav-pills flex-column">
+	{{foreach $messages as $message}}
+		{{include file="mail_list.tpl"}}
+	{{/foreach}}
+	</ul>
+</div>
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
new file mode 100755
index 000000000..827c7628f
--- /dev/null
+++ b/view/tpl/mail_list.tpl
@@ -0,0 +1,7 @@
+<li class="nav-item">
+	<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}">
+		<span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br>
+		<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
+		<span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span>
+	</a>
+</li>
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
new file mode 100755
index 000000000..a4e2e1925
--- /dev/null
+++ b/view/tpl/main_slider.tpl
@@ -0,0 +1,38 @@
+<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div>
+<script>
+$(document).ready(function() {
+	var old_cmin = 0;
+	var old_cmax = 99;
+
+	$("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false,  onstatechange: function(v) { 
+		var carr = v.split(",");
+		if(carr[0] != bParam_cmin) {
+			old_cmin = bParam_cmin;
+	 		bParam_cmin = carr[0];
+		}
+		if(carr[1] != bParam_cmax) {
+			old_cmax = bParam_cmax; 
+			bParam_cmax = carr[1];
+		}
+		networkRefresh();
+ 	} });
+
+	var slideTimer = null;
+	function networkRefresh() {
+		$("#profile-jot-text-loading").show();
+
+		if((document.readyState !== "complete") || (slideTimer !== null))
+			return;
+		if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax))
+			return;
+		setTimeout(function() { $("#profile-jot-text-loading").spin('small'); }, 1000 );
+		slideTimer = setTimeout(networkTimerRefresh,2000);
+	}
+
+	function networkTimerRefresh() {
+		slideTimer = null;
+		page_load = true;
+		liveUpdate();
+	}
+});
+</script>
diff --git a/view/tpl/match.tpl b/view/tpl/match.tpl
new file mode 100755
index 000000000..a5ebb043c
--- /dev/null
+++ b/view/tpl/match.tpl
@@ -0,0 +1,16 @@
+<div class="profile-match-wrapper">
+	<div class="profile-match-photo">
+		<a href="{{$url}}">
+			<img src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$conntxt}}</a></div>
+	{{/if}}
+
+</div>
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
new file mode 100644
index 000000000..84b16dc0b
--- /dev/null
+++ b/view/tpl/menuedit.tpl
@@ -0,0 +1,33 @@
+{{if $header}}
+<div class="generic-content-wrapper">
+<div class="section-title-wrapper">
+	{{if $menu_edit_link}}
+	<div class="pull-right">
+		<a href="{{$menu_edit_link}}" title="{{$hintedit}}" class="btn btn-sm btn-success"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$editcontents}}</a>
+	</div>
+	{{/if}}
+	<h2>{{$header}}</h2>
+	<div class="clear"></div>
+</div>
+{{/if}}
+<div id="menu-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
+	<form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" >
+		{{if $menu_id}}
+		<input type="hidden" name="menu_id" value="{{$menu_id}}" />
+		{{/if}}
+		{{if $menu_system}}
+		<input type="hidden" name="menu_system" value="{{$menu_system}}" />
+		{{/if}}
+		{{include file="field_input.tpl" field=$menu_name}}
+		{{include file="field_input.tpl" field=$menu_desc}}
+
+		{{include file="field_checkbox.tpl" field=$menu_bookmark}}
+		<div class="menuedit-submit-wrapper form-group pull-right" >
+			<button type="submit" name="submit" class="btn btn-primary">{{$submit}}&nbsp;<i class="fa fa-caret-right"></i></button>
+		</div>
+		<div class="clear"></div>
+	</form>
+</div>
+{{if $header}}
+</div>
+{{/if}}
diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl
new file mode 100644
index 000000000..e23035062
--- /dev/null
+++ b/view/tpl/menulist.tpl
@@ -0,0 +1,40 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('menu-creator');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$hintnew}}</button>
+		</div>
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+
+	{{$create}}
+
+	{{if $menus }}
+	<div id="menulist-content-wrapper" class="section-content-wrapper-np">
+		<table id="menu-list-table">
+			<tr>
+				<th width="1%"></th>
+				<th width="1%">{{$nametitle}}</th>
+				<th width="93%">{{$desctitle}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%" class="d-none d-md-table-cell">{{$created}}</th>
+				<th width="1%" class="d-none d-md-table-cell">{{$edited}}</th>
+			</tr>
+			{{foreach $menus as $m }}
+			<tr id="menu-list-item-{{$m.menu_id}}">
+				<td>{{if $m.bookmark}}<i class="fa fa-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td>
+				<td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td>
+				<td>{{$m.menu_desc}}</td>
+				<td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
+				<td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a></td>
+				<td class="menu-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
+				<td class="d-none d-md-table-cell">{{$m.menu_created}}</td>
+				<td class="d-none d-md-table-cell">{{$m.menu_edited}}</td>
+			</tr>
+			{{/foreach}}
+		</table>
+	</div>
+	{{/if}}
+</div>
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
new file mode 100755
index 000000000..2ac61bf76
--- /dev/null
+++ b/view/tpl/message_side.tpl
@@ -0,0 +1,9 @@
+<div class="widget">
+	<h3>{{$title}}</h3>
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item"><a href="{{$combined.url}}" class="nav-link{{if $combined.sel}} active{{/if}}">{{$combined.label}}</a></li>
+		<li class="nav-item"><a href="{{$inbox.url}}" class="nav-link{{if $inbox.sel}} active{{/if}}">{{$inbox.label}}</a></li>
+		<li class="nav-item"><a href="{{$outbox.url}}" class="nav-link{{if $outbox.sel}} active{{/if}}">{{$outbox.label}}</a></li>
+		<li class="nav-item"><a href="{{$new.url}}" class="nav-link{{if $new.sel}} active{{/if}}">{{$new.label}}</a></li>
+	</ul>
+</div>
diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl
new file mode 100755
index 000000000..a7c5973f3
--- /dev/null
+++ b/view/tpl/micropro_img.tpl
@@ -0,0 +1 @@
+<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="" /></a></div>
diff --git a/view/tpl/micropro_txt.tpl b/view/tpl/micropro_txt.tpl
new file mode 100755
index 000000000..295e7940d
--- /dev/null
+++ b/view/tpl/micropro_txt.tpl
@@ -0,0 +1 @@
+<div class="contact-block-textdiv{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}} title="{{$title}}">{{$name}}</a></div>
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
new file mode 100644
index 000000000..9f696fc23
--- /dev/null
+++ b/view/tpl/mitemedit.tpl
@@ -0,0 +1,42 @@
+{{if $header}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$header}}</h2>
+	</div>
+{{/if}}
+	<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
+		<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" class="acl-form" data-form_id="mitemedit" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+			<input type="hidden" name="menu_id" value="{{$menu_id}}" />
+			{{if $mitem_id}}
+			<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
+			{{/if}}
+			{{include file="field_input.tpl" field=$mitem_desc}}
+			{{include file="field_input.tpl" field=$mitem_link}}
+			{{if $menu_names}}
+			<datalist id="menu-names">
+				{{foreach $menu_names as $menu_name}}
+				<option value="{{$menu_name}}">
+				{{/foreach}}
+			</datalist>
+			{{/if}}
+			{{include file="field_input.tpl" field=$mitem_order}}
+			{{include file="field_checkbox.tpl" field=$usezid}}
+			{{include file="field_checkbox.tpl" field=$newwin}}
+			<div class="pull-right form-group">
+				<div class="btn-group">
+					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+						<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
+					</button>
+					{{if $submit_more}}
+					<button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="fa fa-caret-right"></i></button>
+					{{/if}}
+					<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+				</div>
+			</div>
+			<div class="clear"></div>
+		</form>
+		{{$aclselect}}
+	</div>
+{{if $header}}
+</div>
+{{/if}}
diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
new file mode 100644
index 000000000..b28cdfc7e
--- /dev/null
+++ b/view/tpl/mitemlist.tpl
@@ -0,0 +1,34 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('menu-element-creator');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$hintnew}}</button>
+		</div>
+		<h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
+		<div class="clear"></div>
+	</div>
+
+	{{$create}}
+
+	{{if $mlist }}
+	<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
+		<table id="mitem-list-table">
+			<tr>
+				<th width="1%">{{$nametitle}}</th>
+				<th width="96%">{{$targettitle}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+			</tr>
+			{{foreach $mlist as $m }}
+			<tr id="mitem-list-item-{{$m.mitem_id}}">
+				<td width="1%">{{$m.mitem_desc}}</td>
+				<td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
+				<td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
+				<td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
+				<td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
+			</tr>
+			{{/foreach}}
+		</table>
+	</div>
+	{{/if}}
+</div>
diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl
new file mode 100755
index 000000000..315ee4c8a
--- /dev/null
+++ b/view/tpl/mood_content.tpl
@@ -0,0 +1,33 @@
+
+<div id="mood-content" class="generic-content-wrapper">
+    <div class="section-title-wrapper">
+    <h2>{{$title}}</h2>
+    </div>
+    <div class="section-content-wrapper">
+
+	    <div id="mood-desc">{{$desc}}</div>
+
+		<br />
+		<br />
+
+
+		<form action="mood" method="get">
+		<br />
+		<br />
+
+		<input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" />
+
+		<div class="form-group field custom">
+			<select name="verb" id="mood-verb-select" class="form-control" >
+			{{foreach $verbs as $v}}
+				<option value="{{$v.0}}">{{$v.1}}</option>
+			{{/foreach}}
+			</select>
+		</div>
+		<br />
+		<br />
+
+		<input type="submit" name="submit" value="{{$submit}}" />
+		</form>
+	</div>
+</div>
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
new file mode 100755
index 000000000..013e1cfdc
--- /dev/null
+++ b/view/tpl/msg-header.tpl
@@ -0,0 +1,81 @@
+<script type="text/javascript" src="view/js/ajaxupload.js" ></script>
+<script language="javascript" type="text/javascript">
+
+	$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
+
+
+	$(document).ready(function() {
+
+		var file_uploader = new window.AjaxUpload(
+			'prvmail-attach-wrapper',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addmailtext(response);
+					$('#prvmail-rotator').spin(false);
+				}
+			}
+		);
+
+		var file_uploader_sub = new window.AjaxUpload(
+			'prvmail-attach-sub',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addmailtext(response);
+					$('#prvmail-rotator').spin(false);
+				}
+			}
+		);
+
+
+	});
+
+	function prvmailJotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			$('#prvmail-rotator').spin('tiny');
+			$.get('linkinfo?f=&url=' + reply, function(data) {
+				addmailtext(data);
+				$('#prvmail-rotator').spin(false);
+			});
+		}
+	}
+
+	function prvmailGetExpiry() {
+		reply = prompt("{{$expireswhen}}", $('#inp-prvmail-expires').val());
+		if(reply && reply.length) {
+			$('#inp-prvmail-expires').val(reply);
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#prvmail-rotator').spin('tiny');
+			$.get('linkinfo?f=&url=' + reply, function(data) {
+				addmailtext(data);
+				$('#prvmail-rotator').spin(false);
+			});
+		}
+	}
+
+	function addmailtext(data) {
+		var currentText = $("#prvmail-text").val();
+		$("#prvmail-text").val(currentText + data);
+	}	
+
+
+
+</script>
+
diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl
new file mode 100755
index 000000000..ccefa4a49
--- /dev/null
+++ b/view/tpl/myapps.tpl
@@ -0,0 +1,17 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $authed}}
+		{{if $create}}
+		<a href="appman" class="pull-right btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</a>
+		{{else}}
+		<a href="apps/edit{{if $cat}}/?f=&cat={{$cat}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a>
+		{{/if}}
+		{{/if}}
+		<h2>{{$title}}{{if $cat}} - {{$cat}}{{/if}}</h2>
+	</div>
+	<div class="clearfix section-content-wrapper">
+		{{foreach $apps as $ap}}
+		{{$ap}}
+		{{/foreach}}
+	</div>
+</div>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
new file mode 100755
index 000000000..c5b378b4f
--- /dev/null
+++ b/view/tpl/nav.tpl
@@ -0,0 +1,222 @@
+{{if $nav.login && !$userinfo}}
+<div class="d-md-none p-1">
+	<a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
+		{{$nav.loginmenu.1.1}}
+	</a>
+	{{if $nav.register}}
+	<a class="btn btn-warning btn-sm text-white" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
+		{{$nav.register.1}}
+	</a>
+	{{/if}}
+</div>
+{{/if}}
+{{if $userinfo}}
+<div class="dropdown usermenu">
+	<div class="fakelink" data-toggle="dropdown">
+		<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
+		<i class="fa fa-caret-down"></i>
+	</div>
+	{{if $localuser}}
+	<div class="dropdown-menu">
+		{{foreach $nav.usermenu as $usermenu}}
+		<a class="dropdown-item"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
+		{{/foreach}}
+		{{if $nav.manage}}
+		<a class="dropdown-item" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
+		{{/if}}	
+		{{if $nav.channels}}
+		{{foreach $nav.channels as $chan}}
+		<a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a>
+		{{/foreach}}
+		{{/if}}
+		{{if $nav.profiles}}
+		<a class="dropdown-item" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a>
+		{{/if}}
+		{{if $nav.settings}}
+		<div class="dropdown-divider"></div>
+		<a class="dropdown-item" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
+		{{/if}}
+		{{if $nav.admin}}
+		<div class="dropdown-divider"></div>
+		<a class="dropdown-item" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
+		{{/if}}
+		{{if $nav.logout}}
+		<div class="dropdown-divider"></div>
+		<a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a>
+		{{/if}}
+	</div>
+	{{else}}
+	{{if $nav.rusermenu}}
+	<div class="dropdown-menu" role="menu" aria-labelledby="avatar">
+		<a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a>
+		<a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a>
+	</div>
+	{{/if}}
+	{{/if}}
+</div>
+{{/if}}
+<div class="navbar-toggler-right">
+	{{if $nav.help.6}}
+	<button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;">
+		<i class="fa fa-question-circle"></i>
+	</button>
+	{{/if}}
+	<button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
+		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
+	</button>
+	{{if $localuser}}
+	<button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1">
+		<i class="fa fa-exclamation-circle"></i>
+	</button>
+	{{/if}}
+	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
+		<i class="fa fa-bars"></i>
+	</button>
+</div>
+<div class="collapse navbar-collapse" id="navbar-collapse-1">
+	<ul class="navbar-nav mr-auto">
+		{{if $nav.network}}
+		<li class="nav-item dropdown net-button" style="display: none;">
+			<a class="nav-link" href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu">
+				<i class="fa fa-fw fa-th"></i>
+				<span class="badge badge-pill badge-default net-update"></span>
+			</a>
+			<div id="nav-network-menu" class="dropdown-menu" rel="network">
+				<a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a>
+				<a class="dropdown-item" id="nav-network-mark-all"href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.home}}
+		<li class="nav-item dropdown home-button" style="display: none;">
+			<a class="nav-link" href="#" title="{{$nav.home.3}}" id="{{$nav.home.4}}" data-toggle="dropdown" rel="#nav-home-menu">
+				<i class="fa fa-fw fa-home"></i>
+				<span class="badge badge-pill badge-danger home-update"></span>
+			</a>
+			<div id="nav-home-menu" class="dropdown-menu" rel="home">
+				<a class="dropdown-item" id="nav-home-see-all" href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a>
+				<a class="dropdown-item" id="nav-home-mark-all" href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.messages}}
+		<li class="nav-item dropdown mail-button" style="display: none;">
+			<a class="nav-link" href="#" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}" data-toggle="dropdown" rel="#nav-messages-menu">
+				<i class="fa fa-fw fa-envelope"></i>
+				<span class="badge badge-pill badge-danger mail-update"></span>
+			</a>
+			<div id="nav-messages-menu" class="dropdown-menu" rel="messages">
+				<a class="dropdown-item" id="nav-messages-see-all" href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a>
+				<a class="dropdown-item" id="nav-messages-mark-all" href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.all_events}}
+		<li class="nav-item dropdown all_events-button" style="display: none;">
+			<a class="nav-link" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu">
+				<i class="fa fa-fw fa-calendar"></i>
+				<span class="badge badge-pill badge-default all_events-update"></span>
+			</a>
+			<div id="nav-all_events-menu" class="dropdown-menu" rel="all_events">
+				<a class="dropdown-item" id="nav-all_events-see-all" href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a>
+				<a class="dropdown-item" id="nav-all_events-mark-all" href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.intros}}
+		<li class="nav-item dropdown intro-button" style="display: none;">
+			<a class="nav-link" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu">
+				<i class="fa fa-fw fa-users"></i>
+				<span class="badge badge-pill badge-danger intro-update"></span>
+			</a>
+			<div id="nav-intros-menu" class="dropdown-menu" rel="intros">
+				<a class="dropdown-item" id="nav-intros-see-all" href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.notifications}}
+		<li class="nav-item dropdown notify-button" style="display: none;">
+			<a class="nav-link" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu">
+				<i class="fa fa-fw fa-exclamation"></i>
+				<span class="badge badge-pill badge-danger notify-update"></span>
+			</a>
+			<div id="nav-notify-menu" class="dropdown-menu" rel="notify">
+				<a class="dropdown-item" id="nav-notify-see-all" href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a>
+				<a class="dropdown-item" id="nav-notify-mark-all" href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.login && !$userinfo}}
+		<li class="nav-item">
+			<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a>
+		</li>
+		{{/if}}
+		{{if $nav.register}}
+		<li class="nav-item {{$nav.register.2}} d-none d-md-flex">
+			<a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a>
+		</li>
+		{{/if}}
+		{{if $nav.alogout}}
+		<li class="nav-item {{$nav.alogout.2}} d-none d-md-flex">
+			<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+
+	<div id="banner" class="navbar-text d-none d-md-flex">{{$banner}}</div>
+
+	<ul id="nav-right" class="navbar-nav ml-auto d-none d-md-flex">
+		<li class="nav-item collapse clearfix" id="nav-search">
+			<form class="form-inline" method="get" action="search" role="search">
+				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
+			</form>
+			<div id="nav-search-spinner"></div>
+		</li>
+		<li class="nav-item" id="nav-search-btn">
+			<a class="nav-link" href="#nav-search" title="{{$nav.search.3}}" onclick="openMenu('nav-search'); closeMenu('nav-search-btn'); $('#nav-search-text').focus(); return false;"><i class="fa fa-fw fa-search"></i></a>
+		</li>
+		{{if $nav.help.6}}
+		<li class="nav-item dropdown {{$sel.help}}">
+			<a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-question-circle"></i></a>
+		</li>
+		{{/if}}
+		<li class="nav-item dropdown" id="app-menu">
+			<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
+			<div class="dropdown-menu dropdown-menu-right">
+				{{foreach $navapps as $navapp}}
+				{{$navapp}}
+				{{/foreach}}
+				{{if $localuser}}
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+				{{/if}}
+			</div>
+		</li>
+	</ul>
+</div>
+<div class="collapse d-md-none" id="navbar-collapse-2">
+	<div class="navbar-nav mr-auto">
+		{{foreach $navapps as $navapp}}
+		{{$navapp|replace:'dropdown-item':'nav-link'}}
+		{{/foreach}}
+		{{if $localuser}}
+		<div class="dropdown-divider"></div>
+		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+		{{/if}}
+	</div>
+</div>
+{{if $nav.help.6}}
+<div id="contextual-help-content" class="contextual-help-content">
+	{{$nav.help.5}}
+	<div class="float-right">
+		<a class="btn btn-primary btn-sm" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-question"></i>&nbsp;{{$fulldocs}}</a>
+		<a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-times"></i></a>
+	</div>
+</div>
+{{/if}}
diff --git a/view/tpl/nav_login.tpl b/view/tpl/nav_login.tpl
new file mode 100644
index 000000000..b361b1a14
--- /dev/null
+++ b/view/tpl/nav_login.tpl
@@ -0,0 +1,18 @@
+{{if $nav.login && !$userinfo}}
+<div id="nav-login" class="modal" tabindex="-1" role="dialog">
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title">{{$nav.loginmenu.1.1}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+			</div>
+			<div class="modal-body">
+				<div class="form-group">
+					{{$nav.login}}
+					{{$nav.remote_login}}
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+{{/if}}
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
new file mode 100755
index 000000000..cc1983ac4
--- /dev/null
+++ b/view/tpl/new_channel.tpl
@@ -0,0 +1,34 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		<div class="section-content-info-wrapper">
+			{{$desc}}
+		</div>
+		{{if $channel_usage_message}}
+		<div class="section-content-warning-wrapper">
+			{{$channel_usage_message}}
+		</div>
+		{{/if}}
+		<form action="new_channel" method="post" id="newchannel-form">
+			{{if $default_role}}
+				<input type="hidden" name="permissions_role" value="{{$default_role}}" />
+			{{else}}
+				{{include file="field_select_grouped.tpl" field=$role}}
+			{{/if}}
+
+			{{include file="field_input.tpl" field=$name}}
+			<div id="name-spinner"></div>
+
+			{{include file="field_input.tpl" field=$nickname}}
+			<div id="nick-spinner"></div>
+
+			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
+			<div id="newchannel-submit-end" class="clear"></div>
+
+			<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
+			<div id="newchannel-import-end" class="clear"></div>
+		</form>
+	</div>
+</div>
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
new file mode 100644
index 000000000..c6d5d8a73
--- /dev/null
+++ b/view/tpl/notes.tpl
@@ -0,0 +1,35 @@
+<div class="widget">
+	<h3>{{$banner}}</h3>
+	<textarea name="note_text" id="note-text">{{$text}}</textarea>
+	<script>
+		var noteSaveTimer = null;
+		var noteText = $('#note-text');
+
+		$(document).ready(function(e){
+			noteText.on('change keyup keydown paste cut', function () {
+				noteText.height(0).height(noteText[0].scrollHeight);
+				$(document.body).trigger("sticky_kit:recalc");
+			}).change();
+		});
+
+		$(document).on('focusout',"#note-text",function(e){
+			if(noteSaveTimer)
+				clearTimeout(noteSaveTimer);
+			notePostFinal();
+			noteSaveTimer = null;
+		});
+
+		$(document).on('focusin',"#note-text",function(e){
+			noteSaveTimer = setTimeout(noteSaveChanges,10000);
+		});
+
+		function notePostFinal() {
+			$.post('notes/sync', { 'note_text' : $('#note-text').val() });
+		}
+
+		function noteSaveChanges() {
+			$.post('notes', { 'note_text' : $('#note-text').val() });
+			noteSaveTimer = setTimeout(noteSaveChanges,10000);
+		}
+	</script>
+</div>
diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl
new file mode 100755
index 000000000..0b24da7c3
--- /dev/null
+++ b/view/tpl/notifications.tpl
@@ -0,0 +1,11 @@
+<div class="generic-content-wrapper-styled">
+
+<h1>{{$notif_header}}</h1>
+
+{{if $notifications_available}}
+<a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a>
+{{/if}}
+<div class="notif-network-wrapper">
+	{{$notif_content}}
+</div>
+</div>
diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl
new file mode 100755
index 000000000..d3c79be82
--- /dev/null
+++ b/view/tpl/notify.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+</div>
diff --git a/view/tpl/nwiki_page_history.tpl b/view/tpl/nwiki_page_history.tpl
new file mode 100644
index 000000000..b1c6c9284
--- /dev/null
+++ b/view/tpl/nwiki_page_history.tpl
@@ -0,0 +1,59 @@
+<style>
+  .diff {
+    width:100%;
+    word-break: break-all;
+  }
+
+  .diff td{
+    padding:0 0.667em;
+    vertical-align:top;
+    white-space:pre;
+    white-space:pre-wrap;
+    font-family:Consolas,'Courier New',Courier,monospace;
+    font-size:1.0em;
+    line-height:1.333;
+  }
+
+  .diff span{
+    display:block;
+    min-height:1.333em;
+    margin-top:-1px;
+    padding:0 3px;
+  }
+
+  * html .diff span{
+    height:1.333em;
+  }
+
+  .diff span:first-child{
+    margin-top:0;
+  }
+
+  .diffDeleted span{
+    border:1px solid rgb(255,192,192);
+    background:rgb(255,224,224);
+  }
+
+  .diffInserted span{
+    border:1px solid rgb(192,255,192);
+    background:rgb(224,255,224);
+  }
+</style>
+<table class="" style="width: 100%;">
+  {{foreach $pageHistory as $commit}}
+  <tr class="wikis-index-row"><td>
+      <table id="rev-{{$commit.revision}}" onclick="$('#details-{{$commit.revision}}').show()" style="width: 100%;">
+        <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td>
+            <td rowspan="3" width="20%" align="right">
+		{{if $permsWrite}}
+              <button id="revert-{{$commit.revision}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.revision}}')">Revert</button>
+              <br><br>
+		{{/if}}
+              <button id="compare-{{$commit.revision}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.revision}}')">Compare</button>
+            </td></tr>
+        <tr><td>{{$name_lbl}}</td><td>{{$commit.name}}</td></tr>
+        <tr><td>{{$msg_label}}</td><td>{{$commit.title}}</td></tr>
+      </table>
+    </td></tr>
+  {{/foreach}}          
+</table>
diff --git a/view/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
new file mode 100755
index 000000000..2b7afa80e
--- /dev/null
+++ b/view/tpl/oauth_authorize.tpl
@@ -0,0 +1,10 @@
+<h1>{{$title}}</h1>
+
+<div class='oauthapp'>
+	<img src='{{$app.icon}}'>
+	<h4>{{$app.name}}</h4>
+</div>
+<h3>{{$authorize}}</h3>
+<form method="POST">
+<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes}}" /></div>
+</form>
diff --git a/view/tpl/oauth_authorize_done.tpl b/view/tpl/oauth_authorize_done.tpl
new file mode 100755
index 000000000..2e91e0125
--- /dev/null
+++ b/view/tpl/oauth_authorize_done.tpl
@@ -0,0 +1,4 @@
+<h1>{{$title}}</h1>
+
+<p>{{$info}}</p>
+<code>{{$code}}</code>
diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl
new file mode 100755
index 000000000..b0cfed2e5
--- /dev/null
+++ b/view/tpl/oembed_video.tpl
@@ -0,0 +1,4 @@
+<a href="{{$embedurl}}" onclick="this.innerHTML=Base64.decode('{{$escapedhtml}}'); return false;" style="float:left; margin: 1em; position: relative;">
+	<img width="{{$tw}}" height="{{$th}}" src="{{$turl}}" />
+	<div style="position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;"></div>
+</a>
diff --git a/view/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl
new file mode 100755
index 000000000..e865e07d9
--- /dev/null
+++ b/view/tpl/oexchange_xrd.tpl
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+        
+    <Subject>{{$base}}</Subject>
+
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/vendor">Zotlabs</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/title">Hubzilla</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/name">Hubzilla</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Hubzilla</Property>
+
+    <Link 
+        rel="icon" 
+        href="{{$base}}/images/hz-16.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel="icon32" 
+        href="{{$base}}/images/hz-32.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
+        href="{{$base}}/oexchange"
+        type="text/html" 
+        />
+</XRD>
+
diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
new file mode 100755
index 000000000..a320920c7
--- /dev/null
+++ b/view/tpl/page_display.tpl
@@ -0,0 +1,14 @@
+<div class="page">
+	<div class="generic-content-wrapper" id="page-content-wrapper" >
+		{{if $title}}
+		<div class="section-title-wrapper">
+			<h2 class="page-title">{{$title}}</h2>
+		</div>
+		{{/if}}
+		<div class="section-content-wrapper">
+			<div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
+			<div class="page-date">{{$date}}</div>
+			<div class="page-body">{{$body}}</div>
+		</div>
+	</div>
+</div>
diff --git a/view/tpl/page_display_empty.tpl b/view/tpl/page_display_empty.tpl
new file mode 100644
index 000000000..9f000dee8
--- /dev/null
+++ b/view/tpl/page_display_empty.tpl
@@ -0,0 +1 @@
+{{$body}}
\ No newline at end of file
diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl
new file mode 100644
index 000000000..cef93d324
--- /dev/null
+++ b/view/tpl/pdledit.tpl
@@ -0,0 +1,24 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$header}}</h1>
+
+<h2>{{$mname}} {{$module}}</h2>
+
+<br />
+<a href="help/comanche" target="hubzilla-help">{{$help}}</a>
+<br />
+<br />
+
+
+
+<form action="pdledit" method="post" >
+<input type="hidden" name="module" value="{{$module}}" />
+<textarea rows="24" cols="80" name="content">{{$content}}</textarea>
+
+<br />
+<input type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+<script>
+	$('textarea').bbco_autocomplete('comanche');
+</script>
+</div>
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
new file mode 100755
index 000000000..2ecfbaff9
--- /dev/null
+++ b/view/tpl/peoplefind.tpl
@@ -0,0 +1,17 @@
+<div id="peoplefind-sidebar" class="widget">
+	<h3>{{$findpeople}}</h3>
+	<form action="directory" method="post" />
+		<div class="input-group form-group">
+			<input class="form-control form-control-sm" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
+			<div class="input-group-btn">
+				<button class="btn btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button>
+			</div>
+		</div>
+	</form>
+	<ul class="nav nav-pills flex-column">
+		{{if $similar}}<li class="nav-item"><a class="nav-link" href="match" >{{$similar}}</a></li>{{/if}}
+		{{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}}
+		<li class="nav-item"><a class="nav-link" href="randprof" >{{$random}}</a></li>
+		{{if $loggedin}}{{if $inv}}<li class="nav-item"><a class="nav-link" href="invite" >{{$inv}}</a></li>{{/if}}{{/if}}
+	</ul>
+</div>
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
new file mode 100755
index 000000000..8bacb1575
--- /dev/null
+++ b/view/tpl/photo_album.tpl
@@ -0,0 +1,32 @@
+<div class="{{if !$no_fullscreen_btn}}generic-content-wrapper{{/if}}">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			{{if $order}}
+			<a class="btn btn-outline-secondary btn-sm" href="{{$order.1}}" title="{{$order.0}}"><i class="fa fa-sort"></i></a>
+			{{/if}}
+			<div class="btn-group btn-group">
+				{{if $album_edit.1}}
+				<i class="fa fa-pencil btn btn-outline-secondary btn-sm" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
+				{{/if}}
+				{{if $can_post}}
+				<button class="btn btn-sm btn-success btn-sm" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
+				{{/if}}
+			</div>
+		</div>
+		<h2>{{$album}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{$upload_form}}
+	{{$album_edit.1}}
+	<div class="section-content-wrapper-np">
+		<div id="photo-album-contents-{{$album_id}}">
+			{{foreach $photos as $photo}}
+				{{include file="photo_top.tpl"}}
+			{{/foreach}}
+			<div id="page-end"></div>
+		</div>
+	</div>
+</div>
+<div class="photos-end"></div>
+<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
+<div id="page-spinner"></div>
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
new file mode 100755
index 000000000..a238e61bc
--- /dev/null
+++ b/view/tpl/photo_albums.tpl
@@ -0,0 +1,13 @@
+<div id="side-bar-photos-albums" class="widget">
+	<h3>{{$title}}</h3>
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent}}</a></li>
+		{{if $albums}}
+		{{foreach $albums as $al}}
+		{{if $al.shorttext}}
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li>
+		{{/if}}
+		{{/foreach}}
+		{{/if}}
+	</ul>
+</div>
diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
new file mode 100755
index 000000000..664e5338c
--- /dev/null
+++ b/view/tpl/photo_drop.tpl
@@ -0,0 +1,3 @@
+<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
+	<a class="btn btn-outline-secondary btn-sm" href="#" onclick="dropItem('item/drop/{{$id}}', '#wall-item-outside-wrapper-{{$id}}'); return false;" title="{{$delete}}" ><i class="fa fa-trash-o"></i></a>
+</div>
diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
new file mode 100755
index 000000000..ec643c4a9
--- /dev/null
+++ b/view/tpl/photo_item.tpl
@@ -0,0 +1,34 @@
+<div class="wall-item-outside-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-outside-wrapper-{{$id}}" >
+	<div class="wall-item-content-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;">
+		<div class="wall-item-head">
+			<div class="wall-item-info" id="wall-item-info-{{$id}}" >
+				<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
+					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
+					<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
+				</div>
+			</div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
+				<div class="wall-item-author">
+					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a>
+				</div>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
+			</div>
+		</div>
+		<div class="wall-item-content" id="wall-item-content-{{$id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
+			<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
+
+		</div>
+		{{if $drop}}
+		<div class="wall-item-tools" id="wall-item-tools-{{$id}}" >
+			<div class="wall-item-tools-right pull-right">
+				{{$drop}}
+			</div>
+			<div class="clear"></div>
+		</div>
+		{{/if}}
+		<div class="clear"></div>
+		{{$comment}}
+	</div>
+</div>
+
diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
new file mode 100755
index 000000000..a86aa7f80
--- /dev/null
+++ b/view/tpl/photo_top.tpl
@@ -0,0 +1,4 @@
+<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
+	<img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
+</a>
+
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
new file mode 100755
index 000000000..2431329ec
--- /dev/null
+++ b/view/tpl/photo_view.tpl
@@ -0,0 +1,172 @@
+<div id="live-photos"></div>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			{{if $tools || $map || $edit}}
+			<div class="btn-group">
+				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
+					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
+				</button>
+				<div class="dropdown-menu dropdown-menu-right flex-column">
+					{{if $tools}}
+					<a class="dropdown-item" href="{{$tools.profile.0}}"><i class="fa fa-user"></i>&nbsp;{{$tools.profile.1}}</a>
+					<a class="dropdown-item" href="{{$tools.cover.0}}"><i class="fa fa-picture-o"></i>&nbsp;{{$tools.cover.1}}</a>
+					{{/if}}
+					{{if $map}}
+					<a class="dropdown-item" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="fa fa-globe"></i>&nbsp;{{$map_text}}</a>
+					{{/if}}
+					{{if $edit}}
+					<a class="dropdown-item acl-form-trigger" href="#"  title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i>&nbsp;{{$edit.edit}}</a>
+					{{/if}}
+				</div>
+			</div>
+			{{/if}}
+			{{if $lock}}
+			<div class="btn-group">
+				<button id="lockview" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ><i class="fa fa-lock"></i></button>
+				<ul id="panel-{{$id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
+			</div>
+			{{/if}}
+			{{if $prevlink || $nextlink}}
+			<div class="btn-group">
+				{{if $prevlink}}
+				<a href="{{$prevlink.0}}" class="btn btn-outline-secondary btn-sm" title="{{$prevlink.1}}"><i class="fa fa-backward"></i></a>
+				{{/if}}
+				{{if $nextlink}}
+				<a href="{{$nextlink.0}}" class="btn btn-outline-secondary btn-sm" title="{{$nextlink.1}}"><i class="fa fa-forward"></i></a>
+				{{/if}}
+			</div>
+			{{/if}}
+		</div>
+		<h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="photo-map">
+	{{$map}}
+	</div>
+	<div id="photo-edit" class="section-content-tools-wrapper">
+		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" class="acl-form" data-form_id="photo_edit_form" data-allow_cid='{{$edit.allow_cid}}' data-allow_gid='{{$edit.allow_gid}}' data-deny_cid='{{$edit.deny_cid}}' data-deny_gid='{{$edit.deny_gid}}'>
+			<input type="hidden" name="item_id" value="{{$edit.item_id}}" />
+			{{* album renaming is not supported atm.
+			<div class="form-group">
+				<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum_label}}</label>
+				<input id="photo-edit-albumname" class="form-control" type="text" name="albname" value="{{$edit.album}}" placeholder="{{$edit.newalbum_placeholder}}" list="dl-albums" />
+				{{if $edit.albums}}
+				<datalist id="dl-albums">
+				{{foreach $edit.albums as $al}}
+					{{if $al.text}}
+					<option value="{{$al.text}}">
+					{{/if}}
+				{{/foreach}}
+				</datalist>
+				{{/if}}
+			</div>
+			*}}
+			<div class="form-group">
+				<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
+				<input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" />
+			</div>
+			<div class="form-group">
+				<label id="photo-edit-tags-label" for="photo-edit-newtag">{{$edit.tag_label}}</label>
+				<input name="newtag" id="photo-edit-newtag" class="form-control" title="{{$edit.help_tags}}" type="text" />
+			</div>
+			<div class="form-group">
+				{{include file="field_select.tpl" field=$edit.album_select}}
+			</div>
+			<div class="form-group">
+				<label class="radio-inline" id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw"><input id="photo-edit-rotate-cw" type="radio" name="rotate" value="1" />{{$edit.rotatecw}}</label>
+				<label class="radio-inline" id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw"><input id="photo-edit-rotate-ccw" type="radio" name="rotate" value="2" />{{$edit.rotateccw}}</label>
+			</div>
+			{{if $edit.adult_enabled}}
+			<div class="form-group">
+			{{include file="field_checkbox.tpl" field=$edit.adult}}
+			</div>
+			{{/if}}
+
+			<div class="form-group pull-left">
+				<button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button>
+			</div>
+			<div class="form-group btn-group pull-right">
+				{{if $edit.aclselect}}
+				<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+					<i id="jot-perms-icon" class="fa fa-{{$edit.lockstate}}"></i>
+				</button>
+				{{/if}}
+				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
+			</div>
+		</form>
+		{{$edit.aclselect}}
+		<div id="photo-edit-end" class="clear"></div>
+	</div>
+	<div id="photo-view-wrapper">
+		<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
+		<div id="photo-photo-end" class="clear"></div>
+		{{if $tags}}
+		<div class="photo-item-tools-left" id="in-this-photo">
+			<span id="in-this-photo-text">{{$tag_hdr}}</span>
+			{{foreach $tags as $t}}
+				{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}" onclick="return confirmDelete();"><i class="fa fa-times"></i></a>&nbsp;</span>{{/if}}
+			{{/foreach}}
+		</div>
+		{{/if}}
+		<div class="photo-item-tools">
+			{{if $responses.count }}
+			<div class="photo-item-tools-left pull-left">
+				<div class="{{if $responses.count > 1}}btn-group{{/if}}">
+				{{foreach $responses as $verb=>$response}}
+					{{if $response.count}}
+					<div class="btn-group">
+						<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button>
+						{{if $response.list_part}}
+						<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+						{{else}}
+						<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+						{{/if}}
+						{{if $response.list_part}}
+						<div class="modal" id="{{$verb}}Modal-{{$id}}">
+							<div class="modal-dialog">
+								<div class="modal-content">
+									<div class="modal-header">
+										<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+										<h4 class="modal-title">{{$response.title}}</h4>
+									</div>
+									<div class="modal-body">
+										<ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+									</div>
+									<div class="modal-footer clear">
+										<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$modal_dismiss}}</button>
+									</div>
+								</div><!-- /.modal-content -->
+							</div><!-- /.modal-dialog -->
+						</div><!-- /.modal -->
+						{{/if}}
+					</div>
+					{{/if}}
+				{{/foreach}}
+				</div>
+			</div>
+			{{/if}}
+			{{if $likebuttons}}
+			<div class="photo-item-tools-right btn-group pull-right">
+				<button type="button" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$likebuttons.id}},'like'); return false">
+					<i class="fa fa-thumbs-o-up" title="{{$likebuttons.likethis}}"></i>
+				</button>
+				<button type="button" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$likebuttons.id}},'dislike'); return false">
+					<i class="fa fa-thumbs-o-down" title="{{$likebuttons.nolike}}"></i>
+				</button>
+			</div>
+			<div id="like-rotator-{{$likebuttons.id}}" class="photo-like-rotator pull-right"></div>
+			{{/if}}
+			<div class="clear"></div>
+		</div>
+	</div>
+	{{$comments}}
+	{{if $commentbox}}
+	<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
+		{{$commentbox}}
+	</div>
+	{{/if}}
+	<div class="clear"></div>
+</div>
+{{$paginate}}
+
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
new file mode 100755
index 000000000..8fe631ca6
--- /dev/null
+++ b/view/tpl/photos_recent.tpl
@@ -0,0 +1,23 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			{{if $can_post}}
+			<button class="btn btn-sm btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
+			{{/if}}
+		</div>
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{$upload_form}}
+	<div class="section-content-wrapper-np">
+		<div id="photo-album-contents-{{$album_id}}">
+			{{foreach $photos as $photo}}
+				{{include file="photo_top.tpl"}}
+			{{/foreach}}
+			<div id="page-end"></div>
+		</div>
+	</div>
+</div>
+<div class="photos-end"></div>
+<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
+<div id="page-spinner"></div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
new file mode 100755
index 000000000..d52bad5a2
--- /dev/null
+++ b/view/tpl/photos_upload.tpl
@@ -0,0 +1,61 @@
+<div id="photo-upload-form">
+	<div class="section-content-tools-wrapper">
+		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
+
+			<div class="form-group">
+				<label for="photos-upload-album">{{$newalbum_label}}</label>
+				<input type="text" class="form-control" id="photos-upload-album" name="newalbum" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload">
+				<datalist id="dl-photo-upload">
+				{{foreach $albums as $al}}
+					{{if $al.text}}
+					<option value="{{$al.text}}" />
+					{{/if}}
+				{{/foreach}}
+				</datalist>
+			</div>
+			{{if $default}}
+			<div class="form-group">
+				<input id="photos-upload-choose" type="file" name="userfile" />
+			</div>
+			{{include file="field_input.tpl" field=$caption}}
+			{{include file="field_checkbox.tpl" field=$visible}}
+			<div id="body-textarea">
+			{{include file="field_textarea.tpl" field=$body}}
+			</div>
+			<div class="pull-right btn-group">
+				<div class="btn-group">
+					{{if $lockstate}}
+					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+						<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
+					</button>
+					{{/if}}
+					<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
+				</div>
+
+			</div>
+			{{/if}}
+			<div class="clear"></div>
+
+			{{if $uploader}}
+			{{include file="field_input.tpl" field=$caption}}
+			{{include file="field_checkbox.tpl" field=$visible}}
+			<div id="body-textarea">
+			{{include file="field_textarea.tpl" field=$body}}
+			</div>
+			<div id="photos-upload-perms" class="btn-group pull-right">
+				{{if $lockstate}}
+				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+					<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
+				</button>
+				{{/if}}
+				<div class="pull-right">
+					{{$uploader}}
+				</div>
+			</div>
+			{{/if}}
+		</form>
+	</div>
+	{{$aclselect}}
+	<div id="photos-upload-end" class="clear"></div>
+</div>
diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl
new file mode 100755
index 000000000..45191db85
--- /dev/null
+++ b/view/tpl/photosajax.tpl
@@ -0,0 +1,4 @@
+{{foreach $photos as $photo}}
+{{include file="photo_top.tpl"}}
+{{/foreach}}
+<script>justifyPhotosAjax('photo-album-contents-{{$album_id}}')</script>
diff --git a/view/tpl/poco_entry_xml.tpl b/view/tpl/poco_entry_xml.tpl
new file mode 100755
index 000000000..30b6268dc
--- /dev/null
+++ b/view/tpl/poco_entry_xml.tpl
@@ -0,0 +1,8 @@
+<entry>
+{{if $entry.id}}<id>{{$entry.id}}</id>{{/if}}
+{{if $entry.displayName}}<displayName>{{$entry.displayName}}</displayName>{{/if}}
+{{if $entry.preferredUsername}}<preferredUsername>{{$entry.preferredUsername}}</preferredUsername>{{/if}}
+{{if $entry.rating}}<rating>{{$entry.rating}}</rating>{{/if}}
+{{if $entry.urls}}{{foreach $entry.urls as $url}}<urls><value>{{$url.value}}</value><type>{{$url.type}}</type></urls>{{/foreach}}{{/if}}
+{{if $entry.photos}}{{foreach $entry.photos as $photo}}<photos><value>{{$photo.value}}</value><type>{{$photo.type}}</type></photos>{{/foreach}}{{/if}}
+</entry>
diff --git a/view/tpl/poco_xml.tpl b/view/tpl/poco_xml.tpl
new file mode 100755
index 000000000..0e38a692c
--- /dev/null
+++ b/view/tpl/poco_xml.tpl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<response>
+{{if $response.sorted}}<sorted>{{$response.sorted}}</sorted>{{/if}}
+{{if $response.filtered}}<filtered>{{$response.filtered}}</filtered>{{/if}}
+{{if $response.updatedSince}}<updatedSince>{{$response.updatedSince}}</updatedSince>{{/if}}
+<startIndex>{{$response.startIndex}}</startIndex>
+<itemsPerPage>{{$response.itemsPerPage}}</itemsPerPage>
+<totalResults>{{$response.totalResults}}</totalResults>
+
+
+{{if $response.totalResults}}
+{{foreach $response.entry as $entry}}
+{{include file="poco_entry_xml.tpl"}}
+{{/foreach}}
+{{else}}
+<entry></entry>
+{{/if}}
+</response>
diff --git a/view/tpl/poke_content.tpl b/view/tpl/poke_content.tpl
new file mode 100755
index 000000000..f368cb024
--- /dev/null
+++ b/view/tpl/poke_content.tpl
@@ -0,0 +1,48 @@
+
+<div id="poke-content" class="generic-content-wrapper">
+    <div class="section-title-wrapper">
+    <h2>{{$title}}</h2>
+    </div>
+    <div class="section-content-wrapper">
+
+	<div id="poke-desc">{{$desc}}</div>
+
+<br />
+<br />
+
+
+<form action="poke" method="get">
+
+
+<div class="form-group field input">
+	<label id="poke-recip-label" for="poke-recip">{{$clabel}}</label>
+	<input class="form-control" id="poke-recip" type="text" value="{{$name}}" name="pokename" autocomplete="off" />
+</div>
+
+	<input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
+	<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
+
+
+{{if $poke_basic}}
+<input type="hidden" name="verb" value="poke" />
+{{else}}
+<div class="form-group field custom">
+	<label for="poke-verb-select" id="poke-verb-lbl">{{$choice}}</label>
+	<select class="form-control" name="verb" id="poke-verb-select" >
+	{{foreach $verbs as $v}}
+	<option value="{{$v.0}}">{{$v.1}}</option>
+	{{/foreach}}
+	</select>
+</div>
+{{/if}}
+
+{{if ! $parent}}
+{{include file="field_checkbox.tpl" field=$private}}
+{{/if}}
+
+<input type="submit" name="submit" value="{{$submit}}" />
+</form>
+
+
+    </div>
+</div>
diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
new file mode 100755
index 000000000..fb43c744b
--- /dev/null
+++ b/view/tpl/posted_date_widget.tpl
@@ -0,0 +1,46 @@
+<script>
+
+function toggle_posted_date_button() {
+	if($('#posted-date-dropdown').is(':visible')) {
+		$('#posted-date-icon').removeClass('fa-caret-up');
+		$('#posted-date-icon').addClass('fa-cog');
+		$('#posted-date-dropdown').hide();
+	}
+	else {
+		$('#posted-date-icon').addClass('fa-caret-up');
+		$('#posted-date-icon').removeClass('fa-cog');
+		$('#posted-date-dropdown').show();
+	}
+}
+</script>
+		
+
+<div id="datebrowse-sidebar" class="widget">
+	<h3>{{$title}}</h3>
+	<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
+	<ul id="posted-date-selector" class="nav nav-pills flex-column">
+		{{foreach $dates as $y => $arr}}
+		{{if $y == $cutoff_year}}
+		</ul>
+		<div id="posted-date-dropdown" style="display: none;">
+		<ul id="posted-date-selector-drop" class="nav nav-pills flex-column">
+		{{/if}} 
+		<li class="nav-item" id="posted-date-selector-year-{{$y}}">
+			<a class="nav-link" href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a>
+		</li>
+		<div id="posted-date-selector-{{$y}}" style="display: none;">
+			<ul class="posted-date-selector-months nav nav-pills flex-column">
+				{{foreach $arr as $d}}
+				<li class="nav-item">
+					<a class="nav-link" href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}{{if $showend}}&dbegin={{$d.2}}{{/if}}'); return false;">{{$d.0}}</a>
+				</li>
+				{{/foreach}}
+			</ul>
+		</div>
+		{{/foreach}}
+		{{if $cutoff}}
+		</div>
+		<button class="btn btn-outline-secondary btn-sm" onclick="toggle_posted_date_button(); return false;"><i id="posted-date-icon" class="fa fa-cog"></i></button>
+		{{/if}}
+	</ul>
+</div>
diff --git a/view/tpl/prep.tpl b/view/tpl/prep.tpl
new file mode 100644
index 000000000..debba13a8
--- /dev/null
+++ b/view/tpl/prep.tpl
@@ -0,0 +1,31 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$header}}</h1>
+
+{{if $site}}
+<h3>{{$website}} {{$site}}</h3>
+{{/if}}
+
+
+{{if $raters}}
+{{foreach $raters as $r}}
+
+<div class="directory-item lframe" id="directory-item-{{$r.xchan_hash}}" >
+
+<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$r.xchan_hash}}" >
+<div class="contact-photo" id="directory-photo-{{$r.xchan_hash}}" >
+<a href="{{$r.xchan_url}}" class="directory-profile-link" id="directory-profile-link-{{$r.xchan_hash}}" ><img class="directory-photo-img" src="{{$r.xchan_photo_m}}" alt="{{$r.xchan_addr}}" title="{{$r.xchan_addr}}" /></a>
+</div>
+</div>
+<div class="prep-details contact-info">
+<a href="{{$r.xchan_url}}" class="directory-profile-link" id="directory-profile-link-{{$r.xchan_hash}}" ><div class="contact-name">{{$r.xchan_name}}</div></a>
+<div class="rating-value">{{$rating_lbl}} <span class="prep-rating-value">{{$r.xlink_rating}}</span></div>
+{{if $r.xlink_rating_text}}
+<div class="rating-text">{{$rating_text_label}} {{$r.xlink_rating_text}}
+</div>
+{{/if}}
+</div>
+<div class="clear"></div>
+</div>
+{{/foreach}}
+{{/if}}
+</div>
diff --git a/view/tpl/profdef_edit.tpl b/view/tpl/profdef_edit.tpl
new file mode 100644
index 000000000..bfe85314d
--- /dev/null
+++ b/view/tpl/profdef_edit.tpl
@@ -0,0 +1,16 @@
+<h3>{{$header}}</h3>
+
+<form action="admin/profs" method="post" >
+
+{{if $id}}
+<input type="hidden" name="id" value="{{$id}}" />
+{{/if}}
+
+{{include file="field_input.tpl" field=$field_name}}
+{{include file="field_input.tpl" field=$field_type}}
+{{include file="field_input.tpl" field=$field_desc}}
+{{include file="field_input.tpl" field=$field_help}}
+
+<input name="submit" type="submit" value="{{$submit}}" />
+
+</form>
diff --git a/view/tpl/profed_head.tpl b/view/tpl/profed_head.tpl
new file mode 100755
index 000000000..ce774052a
--- /dev/null
+++ b/view/tpl/profed_head.tpl
@@ -0,0 +1,2 @@
+<script language="javascript" type="text/javascript"></script>
+
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
new file mode 100755
index 000000000..c56062459
--- /dev/null
+++ b/view/tpl/profile_advanced.tpl
@@ -0,0 +1,341 @@
+<div id="profile-content-wrapper" class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="float-right">
+			{{if $profile.like_count}}
+			<div class="btn-group">
+				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button>
+				{{if $profile.likers}}
+				<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
+				{{/if}}
+			</div>
+			{{/if}}
+			{{if $profile.canlike}}
+			<div class="btn-group">
+				<button type="button" class="btn btn-success btn-sm" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
+					<i class="fa fa-thumbs-o-up" title="{{$profile.likethis}}"></i>
+				</button>
+			</div>
+			{{/if}}
+			{{if $editmenu.multi}}
+			<div class="btn-group">
+				<a class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
+				<div class="dropdown-menu dropdown-menu-right">
+					{{foreach $editmenu.menu.entries as $e}}
+					<a class="dropdown-item" href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'> {{$e.profile_name}}</a>
+					{{/foreach}}
+					<a class="dropdown-item" href="profile_photo" >{{$editmenu.menu.chg_photo}}</a>
+					{{if $editmenu.menu.cr_new}}
+					<a class="dropdown-item" href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a>
+					{{/if}}
+				</div>
+			</div>
+			{{elseif $editmenu}}
+			<div class="btn-group">
+				<a class="btn btn-primary btn-sm" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
+			</div>
+			{{/if}}
+			{{if $exportlink}}
+			<div class="btn-group">
+				<a class="btn btn-outline-secondary btn-sm" href="{{$exportlink}}" ><i class="fa fa-vcard"></i>&nbsp;{{$export}}</a>
+			</div>
+			{{/if}}
+		</div>
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-wrapper">
+
+	{{foreach $fields as $f}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		{{if $f == 'name'}}
+			<dl id="aprofile-fullname" class="aprofile">
+			 <dt>{{$profile.fullname.0}}</dt>
+			 <dd>{{$profile.fullname.1}}</dd>
+			</dl>
+		{{/if}}
+
+		{{if $f == 'fullname'}}
+			<dl id="aprofile-fullname" class="aprofile">
+			 <dt>{{$profile.fullname.0}}</dt>
+			 <dd>{{$profile.fullname.1}}</dd>
+			</dl>
+		{{/if}}
+
+		{{if $f == 'gender'}}
+		{{if $profile.gender}}
+		<dl id="aprofile-gender" class="aprofile">
+		 <dt>{{$profile.gender.0}}</dt>
+		 <dd>{{$profile.gender.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'birthday'}}
+		{{if $profile.birthday}}
+		<dl id="aprofile-birthday" class="aprofile">
+		 <dt>{{$profile.birthday.0}}</dt>
+		 <dd>{{$profile.birthday.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'age'}}
+		{{if $profile.age}}
+		<dl id="aprofile-age" class="aprofile">
+		 <dt>{{$profile.age.0}}</dt>
+		 <dd>{{$profile.age.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'marital'}}
+		{{if $profile.marital}}
+		<dl id="aprofile-marital" class="aprofile">
+		 <dt><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$profile.marital.0}}</dt>
+		 <dd>{{$profile.marital.1}}{{if in_array('partner',$fields)}}{{if $profile.marital.partner}} ({{$profile.marital.partner}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'sexual'}}
+		{{if $profile.sexual}}
+		<dl id="aprofile-sexual" class="aprofile">
+		 <dt>{{$profile.sexual.0}}</dt>
+		 <dd>{{$profile.sexual.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'keywords'}}
+		{{if $profile.keywords}}
+		<dl id="aprofile-tags" class="aprofile">
+		 <dt>{{$profile.keywords.0}}</dt>
+		 <dd>{{$profile.keywords.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'homepage'}}
+		{{if $profile.homepage}}
+		<dl id="aprofile-homepage" class="aprofile">
+		 <dt>{{$profile.homepage.0}}</dt>
+		 <dd>{{$profile.homepage.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'hometown'}}
+		{{if $profile.hometown}}
+		<dl id="aprofile-hometown" class="aprofile">
+		 <dt>{{$profile.hometown.0}}</dt>
+		 <dd>{{$profile.hometown.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'politic'}}
+		{{if $profile.politic}}
+		<dl id="aprofile-politic" class="aprofile">
+		 <dt>{{$profile.politic.0}}</dt>
+		 <dd>{{$profile.politic.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'religion'}}
+		{{if $profile.religion}}
+		<dl id="aprofile-religion" class="aprofile">
+		 <dt>{{$profile.religion.0}}</dt>
+		 <dd>{{$profile.religion.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'about'}}
+		{{if $profile.about}}
+		<dl id="aprofile-about" class="aprofile">
+		 <dt>{{$profile.about.0}}</dt>
+		 <dd>{{$profile.about.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'interest'}}
+		{{if $profile.interest}}
+		<dl id="aprofile-interest" class="aprofile">
+		 <dt>{{$profile.interest.0}}</dt>
+		 <dd>{{$profile.interest.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'likes'}}
+		{{if $profile.likes}}
+		<dl id="aprofile-likes" class="aprofile">
+		 <dt>{{$profile.likes.0}}</dt>
+		 <dd>{{$profile.likes.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'dislikes'}}
+		{{if $profile.dislikes}}
+		<dl id="aprofile-dislikes" class="aprofile">
+		 <dt>{{$profile.dislikes.0}}</dt>
+		 <dd>{{$profile.dislikes.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'contact'}}
+		{{if $profile.contact}}
+		<dl id="aprofile-contact" class="aprofile">
+		 <dt>{{$profile.contact.0}}</dt>
+		 <dd>{{$profile.contact.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'channels'}}
+		{{if $profile.channels}}
+		<dl id="aprofile-channels" class="aprofile">
+		 <dt>{{$profile.channels.0}}</dt>
+		 <dd>{{$profile.channels.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'music'}}
+		{{if $profile.music}}
+		<dl id="aprofile-music" class="aprofile">
+		 <dt>{{$profile.music.0}}</dt>
+		 <dd>{{$profile.music.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'book'}}
+		{{if $profile.book}}
+		<dl id="aprofile-book" class="aprofile">
+		 <dt>{{$profile.book.0}}</dt>
+		 <dd>{{$profile.book.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'tv'}}
+		{{if $profile.tv}}
+		<dl id="aprofile-tv" class="aprofile">
+		 <dt>{{$profile.tv.0}}</dt>
+		 <dd>{{$profile.tv.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'film'}}
+		{{if $profile.film}}
+		<dl id="aprofile-film" class="aprofile">
+		 <dt>{{$profile.film.0}}</dt>
+		 <dd>{{$profile.film.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'romance'}}
+		{{if $profile.romance}}
+		<dl id="aprofile-romance" class="aprofile">
+		 <dt>{{$profile.romance.0}}</dt>
+		 <dd>{{$profile.romance.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+
+		{{if $f == 'employment'}}
+		{{if $profile.employment}}
+		<dl id="aprofile-work" class="aprofile">
+		 <dt>{{$profile.employment.0}}</dt>
+		 <dd>{{$profile.employment.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{if $f == 'education'}}
+		{{if $profile.education}}
+		<dl id="aprofile-education" class="aprofile">
+		 <dt>{{$profile.education.0}}</dt>
+		 <dd>{{$profile.education.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+
+		{{foreach $profile.extra_fields as $fld}}
+		{{if $f == $fld}}
+		{{if $profile.$fld}}
+		<dl id="aprofile-{{$fld}}" class="aprofile">
+		 <dt>{{$profile.$fld.0}}</dt>
+		 <dd>{{$profile.$fld.1}}</dd>
+		</dl>
+		{{/if}}
+		{{/if}}
+		{{/foreach}}
+	{{/foreach}}
+
+
+		{{if $things}}
+		{{foreach $things as $key => $items}}
+		<b>{{$profile.fullname.1}} {{$key}}</b>
+		<ul class="profile-thing-list">
+		{{foreach $items as $item}}
+		<li>{{if $item.img}}<a href="{{$item.url}}" ><img src="{{$item.img}}" class="profile-thing-img" width="100" height="100" alt="{{$item.term}}" /></a>{{/if}}
+		<a href="{{$item.editurl}}" >{{$item.term}}</a>
+		{{if $profile.canlike}}<br />
+		<button type="button" class="btn btn-outline-secondary btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" >
+		<i class="fa fa-thumbs-o-up" title="{{$likethis}}"></i>
+		</button>
+		{{/if}}
+		{{if $item.like_count}}
+		<div class="btn-group">
+		<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button>
+		{{if $item.likes}}
+		<ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}"><img class="dropdown-menu-img-xs" src="{{$liker.xchan_photo_s}}" alt="{{$liker.name}}" /> {{$liker.xchan_name}}</a></li>{{/foreach}}</ul>
+		{{/if}}
+		</div>
+		{{/if}}
+		</li>
+		{{/foreach}}
+		</ul>
+		<div class="clear"></div>
+		{{/foreach}}
+		{{/if}}
+	</div>
+</div>
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
new file mode 100755
index 000000000..05137479f
--- /dev/null
+++ b/view/tpl/profile_edit.tpl
@@ -0,0 +1,401 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="dropdown float-right" id="profile-edit-links">
+			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+				<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
+			</button>
+			<div class="dropdown-menu">
+				<a class="dropdown-item" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="fa fa-fw fa-user"></i>&nbsp;{{$profpic}}</a>
+				{{if $is_default}}
+				<a class="dropdown-item" href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="fa fa-fw fa-picture-o"></i>&nbsp;{{$coverpic}}</a>
+				{{/if}}
+				{{if ! $is_default}}
+				<a class="dropdown-item" href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-fw fa-pencil"></i>&nbsp;{{$editvis}}</a>
+				{{/if}}
+				<a class="dropdown-item" href="thing" id="profile-edit-thing-link" title="{{$addthing}}"><i class="fa fa-fw fa-plus-circle"></i>&nbsp;{{$addthing}}</a>
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a>
+				{{if $profile_clone_link}}
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a>
+				{{/if}}
+				{{if $exportable}}
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="profiles/export/{{$profile_id}}">{{$lbl_export}}</a>
+				<a class="dropdown-item" href="#" onClick="openClose('profile-upload-form'); return false;">{{$lbl_import}}</a>
+				{{/if}}
+				{{if ! $is_default}}
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$del_prof}}</a>
+				{{/if}}
+			</div>
+		</div>
+		<h2>{{$banner}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-tools-wrapper" id="profile-upload-form">
+		<label id="profile-upload-choose-label" for="profile-upload-choose" >{{$lbl_import}}</label>
+		<input id="profile-upload-choose" type="file" name="userfile">
+	</div>
+
+		<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" >
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+			{{if $is_default}}
+			<div class="section-content-info-wrapper">{{$default}}</div>
+			{{/if}}
+
+			<div class="panel-group" id="profile-edit-wrapper" role="tablist" aria-multiselectable="true">
+				<div class="panel">
+					<div class="section-subtitle-wrapper" role="tab" id="personal">
+						<h3>
+							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#personal-collapse" aria-expanded="true" aria-controls="personal-collapse">
+								{{$personal}}
+							</a>
+						</h3>
+					</div>
+					<div id="personal-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="personal">
+						<div class="section-content-tools-wrapper">
+							{{include file="field_input.tpl" field=$profile_name}}
+
+							{{include file="field_input.tpl" field=$name}}
+
+							{{if $fields.pdesc}}
+							{{include file="field_input.tpl" field=$pdesc}}
+							{{/if}}
+
+							{{if $fields.gender}}
+							<div id="profile-edit-gender-wrapper" class="form-group field select" >
+							<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}}</label>
+							{{if $advanced}}
+							{{$gender}}
+							{{else}}
+							{{$gender_min}}
+							{{/if}}
+							</div>
+							<div class="clear"></div>
+							{{/if}}
+
+							{{if $fields.dob}}
+							{{$dob}}
+							{{/if}}
+
+							{{include file="field_checkbox.tpl" field=$hide_friends}}
+
+							<div class="form-group" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+							</div>
+							<div class="clear"></div>
+						</div>
+					</div>
+				</div>
+
+				{{if $fields.comms }}
+
+				<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
+					<select name="tel_type[]">
+						<option value="CELL">{{$mobile}}</option>
+						<option value="HOME">{{$home}}</option>
+						<option value="WORK">{{$work}}</option>
+						<option value="OTHER">{{$other}}</option>
+					</select>
+					<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
+					<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				</div>
+
+				<div id="template-form-vcard-email" class="form-group form-vcard-email">
+					<select name="email_type[]">
+						<option value="HOME">{{$home}}</option>
+						<option value="WORK">{{$work}}</option>
+						<option value="OTHER">{{$other}}</option>
+					</select>
+					<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
+					<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				</div>
+
+				<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
+					<select name="impp_type[]">
+						<option value="HOME">{{$home}}</option>
+						<option value="WORK">{{$work}}</option>
+						<option value="OTHER">{{$other}}</option>
+					</select>
+					<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
+					<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+				</div>
+
+				<div class="section-content-wrapper-np">
+					<div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
+					<div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field">
+						<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+						<ul class="dropdown-menu">
+							<li class="add-vcard-tel"><a href="#" data-add="vcard-tel" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$tel_label}}</a></li>
+							<li class="add-vcard-email"><a href="#" data-add="vcard-email" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$email_label}}</a></li>
+							<li class="add-vcard-impp"><a href="#" data-add="vcard-impp" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$impp_label}}</a></li>
+						</ul>
+					</div>
+					<div id="vcard-header-{{$vcard.id}}" class="vcard-header" data-id="{{$vcard.id}}" data-action="open">
+						<i class="vcard-fn-preview fa fa-address-card-o"></i>
+						<span id="vcard-preview-{{$vcard.id}}" class="vcard-preview">
+							{{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}}
+							{{if $vcard.emails.0.address}}<span class="vcard-email-preview hidden-xs"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}}
+							{{if $vcard.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}}
+						</span>
+						<input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}">
+					</div>
+				</div>
+				<div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper">
+
+					<div class="vcard-tel form-group">
+						<div class="form-vcard-tel-wrapper">
+							{{if $vcard.tels}}
+							{{foreach $vcard.tels as $tel}}
+							<div class="form-group form-vcard-tel">
+								<select name="tel_type[]">
+									<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
+									<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
+									<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+									<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+									<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+								</select>
+								<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
+								<i data-remove="vcard-tel" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+							</div>
+							{{/foreach}}
+							{{/if}}
+						</div>
+					</div>
+
+
+					<div class="vcard-email form-group">
+						<div class="form-vcard-email-wrapper">
+							{{if $vcard.emails}}
+							{{foreach $vcard.emails as $email}}
+							<div class="form-group form-vcard-email">
+								<select name="email_type[]">
+									<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
+									<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+									<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+									<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+								</select>
+								<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
+								<i data-remove="vcard-email" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+							</div>
+							{{/foreach}}
+							{{/if}}
+						</div>
+					</div>
+
+					<div class="vcard-impp form-group">
+						<div class="form-vcard-impp-wrapper">
+							{{if $vcard.impps}}
+							{{foreach $vcard.impps as $impp}}
+							<div class="form-group form-vcard-impp">
+								<select name="impp_type[]">
+									<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
+									<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+									<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+									<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+								</select>
+								<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
+								<i data-remove="vcard-impp" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+							</div>
+							{{/foreach}}
+							{{/if}}
+						</div>
+					</div>
+
+					<div class="settings-submit-wrapper" >
+						<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+					</div>
+				</div>
+				{{/if}}
+
+
+				{{if $fields.address || $fields.locality || $fields.postal_code || $fields.region || $fields.country_name || $fields.hometown}}
+				<div class="panel">
+					<div class="section-subtitle-wrapper" role="tab" id="location">
+						<h3>
+							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#location-collapse" aria-expanded="true" aria-controls="location-collapse">
+								{{$location}}
+							</a>
+						</h3>
+					</div>
+					<div id="location-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="location">
+						<div class="section-content-tools-wrapper">
+							{{if $fields.address}}
+							{{include file="field_input.tpl" field=$address}}
+							{{/if}}
+
+							{{if $fields.locality}}
+							{{include file="field_input.tpl" field=$locality}}
+							{{/if}}
+
+							{{if $fields.postal_code}}
+							{{include file="field_input.tpl" field=$postal_code}}
+							{{/if}}
+
+							{{if $fields.region}}
+							{{include file="field_input.tpl" field=$region}}
+							{{/if}}
+
+							{{if $fields.country_name}}
+							{{include file="field_input.tpl" field=$country_name}}
+							{{/if}}
+
+							{{if $fields.hometown}}
+							{{include file="field_input.tpl" field=$hometown}}
+							{{/if}}
+
+							<div class="form-group" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+							</div>
+							<div class="clear"></div>
+						</div>
+					</div>
+				</div>
+
+				{{/if}}
+
+				{{if $fields.marital || $fields.sexual}}
+				<div class="panel">
+					<div class="section-subtitle-wrapper" role="tab" id="relation">
+						<h3>
+							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#relation-collapse" aria-expanded="true" aria-controls="relation-collapse">
+								{{$relation}}
+							</a>
+						</h3>
+					</div>
+					<div id="relation-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relation">
+						<div class="section-content-tools-wrapper">
+							{{if $fields.marital }}
+							<div id="profile-edit-marital-wrapper" class="form-group field" >
+							<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$lbl_marital}}</label>
+							{{if $advanced}}
+							{{$marital}}
+							{{else}}
+							{{$marital_min}}
+							{{/if}}
+							</div>
+							<div class="clear"></div>
+
+							{{if $fields.partner}}
+							{{include file="field_input.tpl" field=$with}}
+							{{/if}}
+
+							{{if $fields.howlong}}
+							{{include file="field_input.tpl" field=$howlong}}
+							{{/if}}
+							{{/if}}
+
+							{{if $fields.sexual}}
+							<div id="profile-edit-sexual-wrapper" class="form-group field" >
+							<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}}</label>
+							{{$sexual}}
+							</div>
+							<div class="clear"></div>
+							{{/if}}
+
+							<div class="form-group" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+							</div>
+							<div class="clear"></div>
+						</div>
+					</div>
+				</div>
+				{{/if}}
+				{{if $fields.keywords || $fields.politic || $fields.religion || $fields.about || $fields.contact || $fields.homepage || $fields.interest || $fields.likes || $fields.dislikes || $fields.channels || $fields.music || $fields.book || $fields.tv || $fields.film || $fields.romance || $fields.employment || $fields.education || $extra_fields}}
+				<div class="panel">
+					<div class="section-subtitle-wrapper" role="tab" id="miscellaneous">
+						<h3>
+							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#miscellaneous-collapse" aria-expanded="true" aria-controls="miscellaneous-collapse">
+								{{$miscellaneous}}
+							</a>
+						</h3>
+					</div>
+					<div id="miscellaneous-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous">
+						<div class="section-content-tools-wrapper">
+							{{if $fields.homepage}}
+							{{include file="field_input.tpl" field=$homepage}}
+							{{/if}}
+
+							{{if $fields.keywords}}
+							{{include file="field_input.tpl" field=$keywords}}
+							{{/if}}
+
+							{{if $fields.politic}}
+							{{include file="field_input.tpl" field=$politic}}
+							{{/if}}
+
+							{{if $fields.religion}}
+							{{include file="field_input.tpl" field=$religion}}
+							{{/if}}
+
+							{{if $fields.about}}
+							{{include file="field_textarea.tpl" field=$about}}
+							{{/if}}
+
+							{{if $fields.contact}}
+							{{include file="field_textarea.tpl" field=$contact}}
+							{{/if}}
+
+							{{if $fields.interest}}
+							{{include file="field_textarea.tpl" field=$interest}}
+							{{/if}}
+
+							{{if $fields.likes}}
+							{{include file="field_textarea.tpl" field=$likes}}
+							{{/if}}
+
+							{{if $fields.dislikes}}
+							{{include file="field_textarea.tpl" field=$dislikes}}
+							{{/if}}
+
+							{{if $fields.channels}}
+							{{include file="field_textarea.tpl" field=$channels}}
+							{{/if}}
+
+							{{if $fields.music}}
+							{{include file="field_textarea.tpl" field=$music}}
+							{{/if}}
+
+							{{if $fields.book}}
+							{{include file="field_textarea.tpl" field=$book}}
+							{{/if}}
+
+							{{if $fields.tv}}
+							{{include file="field_textarea.tpl" field=$tv}}
+							{{/if}}
+
+							{{if $fields.film}}
+							{{include file="field_textarea.tpl" field=$film}}
+							{{/if}}
+
+							{{if $fields.romance}}
+							{{include file="field_textarea.tpl" field=$romance}}
+							{{/if}}
+
+							{{if $fields.employment}}
+							{{include file="field_textarea.tpl" field=$employ}}
+							{{/if}}
+
+							{{if $fields.education}}
+							{{include file="field_textarea.tpl" field=$education}}
+							{{/if}}
+
+							{{if $extra_fields}}
+							{{foreach $extra_fields as $field }}
+							{{include file="field_input.tpl" field=$field}}
+							{{/foreach}}
+							{{/if}}
+							<div class="form-group" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+							</div>
+							<div class="clear"></div>
+						</div>
+					</div>
+				</div>
+				{{/if}}
+			</div>
+		</form>
+</div>
+
diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl
new file mode 100755
index 000000000..9ae870738
--- /dev/null
+++ b/view/tpl/profile_entry.tpl
@@ -0,0 +1,11 @@
+<div class="profile-listing-row">
+	<div class="profile-listing-cell" >
+		<a href="profiles/{{$id}}"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
+	</div>
+	<div class="profile-listing-cell" id="profile-listing-name-{{$id}}">
+		<a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a>
+	</div>
+	<div class="profile-listing-cell">
+		{{$visible}}
+	</div>
+</div>
diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl
new file mode 100755
index 000000000..42abf2735
--- /dev/null
+++ b/view/tpl/profile_listing_header.tpl
@@ -0,0 +1,12 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<a class="btn btn-success btn-sm pull-right" href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" ><i class="fa fa-plus-circle"></i>&nbsp;{{$cr_new}}</a>
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		<div class="profile-listing-table">
+			{{$profiles}}
+		</div>
+	</div>
+
+</div>
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
new file mode 100755
index 000000000..ca107bfcc
--- /dev/null
+++ b/view/tpl/profile_photo.tpl
@@ -0,0 +1,48 @@
+<div id="profile-photo-content" class="generic-content-wrapper">
+    <div class="section-title-wrapper">
+    <h2>{{$title}}</h2>
+    </div>
+    <div class="section-content-wrapper">
+
+		<form enctype="multipart/form-data" action="profile_photo" method="post">
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+		<div id="profile-photo-upload-wrapper">
+
+			{{if $importfile}}
+			<input type="hidden" name="importfile" value="{{$importfile}}">
+			{{else}}
+			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
+			<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
+			{{/if}}
+			<div class="clear"></div>
+
+
+			{{if $single}}
+			<input type="hidden" name="profile" value="{{$profile0.id}}" />
+			{{else}}
+
+			<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label>
+			<select name="profile" id="profile-photo-profiles" class="form-control" >
+			{{foreach $profiles as $p}}
+				<option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option>
+			{{/foreach}}
+			</select>
+			<div class="clear"></div>
+			<br />
+			<br />
+			{{/if}}
+
+			<div id="profile-photo-submit-wrapper">
+				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+			</div>
+		</div>
+
+		</form>
+		<br />
+		<br />
+		<div id="profile-photo-link-select-wrapper">
+		{{$select}}
+		</div>
+	</div>
+</div>
diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl
new file mode 100644
index 000000000..49b74bb8f
--- /dev/null
+++ b/view/tpl/profile_tabs.tpl
@@ -0,0 +1,5 @@
+<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}:</div>
+{{foreach $tabs as $tab}}
+<a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a>
+{{/foreach}}
+<div class="dropdown-divider"></div>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
new file mode 100755
index 000000000..c17a7878c
--- /dev/null
+++ b/view/tpl/profile_vcard.tpl
@@ -0,0 +1,62 @@
+<div class="vcard h-card">
+	{{if ! $zcard}}
+	<div id="profile-photo-wrapper"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}"></div>
+	{{/if}}
+	{{if $connect}}
+	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
+	{{/if}}
+	{{if ! $zcard}}
+	{{if $editmenu.multi}}
+	<div class="dropdown">
+	<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
+	<ul class="dropdown-menu" role="menu">
+		{{foreach $editmenu.menu.entries as $e}}
+		<li>
+			<a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}</a>
+		</li>
+		{{/foreach}}
+		<li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li>
+		{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
+	</ul>
+	</div>
+	{{elseif $editmenu}}
+	<a class="profile-edit-side-link" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
+	{{/if}}
+	{{/if}}
+
+	{{if ! $zcard}}
+	<div class="fn p-name">{{$profile.fullname}}{{if $profile.online}} <i class="fa fa-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
+	{{if $reddress}}<div class="reddress">{{$profile.reddress}}</div>{{/if}}		
+	{{/if}}
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr h-adr">
+			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region p-region">{{$profile.region}}</span>
+				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url">{{$profile.homepage}}</dd></dl>{{/if}}
+
+
+</div>
+<div id="clear"></div>
+
+{{$rating}}
+
+{{$chanmenu}}
+
+{{$contact_block}}
+
+
diff --git a/view/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl
new file mode 100755
index 000000000..5d87d52c6
--- /dev/null
+++ b/view/tpl/profile_vcard_short.tpl
@@ -0,0 +1,38 @@
+{{$contact_block}}
+
+	{{if $connect}}
+	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
+	{{/if}}
+
+
+{{$rating}}
+
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}
+
+<div id="clear"></div>
+
+{{$chanmenu}}
+
+
+
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
new file mode 100755
index 000000000..925447ff2
--- /dev/null
+++ b/view/tpl/prv_message.tpl
@@ -0,0 +1,104 @@
+{{if $new}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+{{/if}}
+		<div id="prvmail-wrapper" >
+			<form id="prvmail-form" action="mail" method="post" >
+				<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
+				<input type="hidden" name="media_str" id="jot-media" value="" />
+				<input type="hidden" name="preview" id="mail-preview" value="0" />
+				{{if $new}}
+				<div class="form-group">
+					<label for="recip">{{$to}}</label>
+					<input class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" />
+					<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+				</div>
+				<div class="form-group">
+					<label for="prvmail-subject">{{$subject}}</label>
+					<input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" />
+				</div>
+				{{/if}}
+				{{if $reply}}
+				<input type="hidden" name="replyto" value="{{$parent}}" />
+				<input type="hidden" name="messageto" value="{{$recphash}}" />
+				<input type="hidden" name="subject" value="{{$subjtxt}}" />
+				{{/if}}
+				<div class="form-group">
+					<label for="prvmail-text">{{$yourmessage}}</label>
+					<textarea class="form-control" id="prvmail-text" name="body"{{if $new}} style="height: 10em;"{{/if}}>{{$text}}</textarea>
+				</div>
+				<div id="prvmail-submit-wrapper" class="form-group">
+					<div id="prvmail-submit" class="float-right btn-group">
+						<button class="btn btn-outline-secondary btn-sm" id="prvmail-preview" title="{{$preview}}" onclick="preview_mail(); return false;"><i class="fa fa-eye"></i></button>
+						<button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+					</div>
+					<div id="prvmail-tools" class="btn-toolbar float-left">
+						<div class="btn-group mr-2">
+							<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;">
+								<i class="fa fa-bold jot-icons"></i>
+							</button>
+							<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'prvmail-text'); return false;">
+								<i class="fa fa-italic jot-icons"></i>
+							</button>
+							<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'prvmail-text'); return false;">
+								<i class="fa fa-underline jot-icons"></i>
+							</button>
+							<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'prvmail-text'); return false;">
+								<i class="fa fa-quote-left jot-icons"></i>
+							</button>
+							<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'prvmail-text'); return false;">
+								<i class="fa fa-terminal jot-icons"></i>
+							</button>
+						</div>
+						<div class="btn-group d-none d-lg-flex mr-2">
+							<button id="prvmail-attach-wrapper" class="btn btn-outline-secondary btn-sm" >
+								<i id="prvmail-attach" class="fa fa-paperclip jot-icons" title="{{$attach}}"></i>
+							</button>
+							<button id="prvmail-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailJotGetLink(); return false;" >
+								<i id="prvmail-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i>
+							</button>
+						</div>
+						{{if $feature_expire || $feature_encrypt}}
+						<div class="btn-group d-none d-lg-flex mr-2">
+							{{if $feature_expire}}
+							<button id="prvmail-expire-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailGetExpiry();return false;" >
+								<i id="prvmail-expires" class="fa fa-eraser jot-icons" title="{{$expires}}" ></i>
+							</button>
+							{{/if}}
+							{{if $feature_encrypt}}
+							<button id="prvmail-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;">
+								<i id="prvmail-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i>
+							</button>
+							{{/if}}
+						</div>
+						{{/if}}
+						<div class="btn-group d-lg-none">
+							<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+								<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
+							</button>
+							<div class="dropdown-menu dropdown-menu-right" role="menu">
+								<a class="dropdown-item" href="#" id="prvmail-attach-sub"><i class="fa fa-paperclip"></i>&nbsp;{{$attach}}</a>
+								<a class="dropdown-item" href="#" onclick="prvmailJotGetLink(); return false;" ><i class="fa fa-link"></i>&nbsp;{{$insert}}</a>
+								{{if $feature_expire || $feature_encrypt}}
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item" href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="fa fa-eraser"></i>&nbsp;{{$expires}}</a>
+								<a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
+								{{/if}}
+							</div>
+						</div>
+					</div>
+					<div id="prvmail-rotator-wrapper" class="float-left">
+						<div id="prvmail-rotator"></div>
+					</div>
+					<div class="clear"></div>
+				</div>
+				<div id="mail-preview-content" style="display: none;"></div>
+			</form>
+		</div>
+{{if $new}}
+	</div>
+</div>
+{{/if}}
diff --git a/view/tpl/pwdreset.tpl b/view/tpl/pwdreset.tpl
new file mode 100755
index 000000000..dc17ed57a
--- /dev/null
+++ b/view/tpl/pwdreset.tpl
@@ -0,0 +1,17 @@
+<div class="generic-content-wrapper-styled">
+<h3>{{$lbl1}}</h3>
+
+<p>
+{{$lbl2}}
+</p>
+<p>
+{{$lbl3}}
+</p>
+<p>{{$newpass}}</p>
+<p>
+{{$lbl4}} {{$lbl5}}
+</p>
+<p>
+{{$lbl6}}
+</p>
+</div>
diff --git a/view/tpl/rating_form.tpl b/view/tpl/rating_form.tpl
new file mode 100644
index 000000000..4bd826484
--- /dev/null
+++ b/view/tpl/rating_form.tpl
@@ -0,0 +1,25 @@
+<div class="generic-content-wrapper-styled">
+<h3>{{$header}}</h3>
+
+<div class="rating-target-name">{{if $site}}{{$website}} {{$site}}{{else}}{{$tgt_name}}{{/if}}</div>
+
+<h3>{{$lbl_rating}}</h3>
+
+<form action="rate" method="post">
+
+{{$rating}}
+
+<input type="hidden" name="execute" value="1" />
+<input type="hidden" name="target" value="{{$target}}" />
+
+<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
+<br />
+<h3 class="abook-rating-text-desc">{{$lbl_rating_txt}}</h3>
+<textarea name="rating_text" id="rating-text" >{{$rating_txt}}</textarea>
+
+<div class="clear"></div>
+
+<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
+
+</form>
+</div>
diff --git a/view/tpl/rating_slider.tpl b/view/tpl/rating_slider.tpl
new file mode 100644
index 000000000..4c36504e6
--- /dev/null
+++ b/view/tpl/rating_slider.tpl
@@ -0,0 +1,19 @@
+<div id="rating-slider" class="slider form-group"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div>
+<script>
+$(document).ready(function() {
+	// The slider does not render correct if width is given in % and
+	// the slider container is hidden (display: none) during rendering.
+	// So let's unhide it to render and hide again afterwards.
+	if(!$("#rating-tool-collapse").hasClass("in")) {
+		$("#rating-tool-collapse").addClass("in");
+		makeRatingSlider();
+		$("#rating-tool-collapse").removeClass("in");
+	}
+	else {
+		makeRatingSlider();
+	}
+});
+function makeRatingSlider() {
+	$("#rating-range").jRange({ from: -10, to: 10, step: 1, width:'98%', showLabels: false, showScale: true, scale : [ '-10','-8','-6','-4','-2','0','2','4','6','8','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); }  });
+}
+</script>
diff --git a/view/tpl/rbmark.tpl b/view/tpl/rbmark.tpl
new file mode 100644
index 000000000..bead1de2f
--- /dev/null
+++ b/view/tpl/rbmark.tpl
@@ -0,0 +1,16 @@
+<h3>{{$header}}</h3>
+
+
+<form action="rbmark" method="post" >
+
+<input type="hidden" name="private" value="{{$private}}" />
+<input type="hidden" name="ischat" value="{{$ischat}}" />
+
+{{include file="field_input.tpl" field=$url}}
+{{include file="field_input.tpl" field=$title}}
+{{include file="field_select.tpl" field=$menus}}
+{{include file="field_input.tpl" field=$menu_name}}
+
+<input type="submit" name="submit" value="{{$submit}}" />
+
+</form>
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
new file mode 100755
index 000000000..c84934626
--- /dev/null
+++ b/view/tpl/register.tpl
@@ -0,0 +1,61 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		<form action="register" method="post" id="register-form">
+			{{if $reg_is}}
+			<div class="section-content-warning-wrapper">
+				<div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div>
+				<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div>
+			</div>
+			{{/if}}
+
+			{{if $registertext}}
+			<div id="register-text" class="descriptive-paragraph">{{$registertext}}</div>
+			{{/if}}
+
+			{{if $invitations}}
+			<div class="section-content-info-wrapper">
+				<div id="register-invite-desc" class="descriptive-paragraph">{{$invite_desc}}</div>
+			</div>
+			{{include file="field_input.tpl" field=$invite_code}}
+			{{/if}}
+
+			{{include file="field_input.tpl" field=$email}}
+
+			{{include file="field_password.tpl" field=$pass1}}
+
+			{{include file="field_password.tpl" field=$pass2}}
+
+			{{if $auto_create}}
+				{{if $default_role}}
+				<input type="hidden" name="permissions_role" value="{{$default_role}}" />
+				{{else}}
+				<div class="section-content-info-wrapper">
+					{{$help_role}}
+				</div>
+				{{include file="field_select_grouped.tpl" field=$role}}
+				{{/if}}
+
+				{{include file="field_input.tpl" field=$name}}
+				<div id="name-spinner"></div>
+
+				{{include file="field_input.tpl" field=$nickname}}
+				<div id="nick-spinner"></div>
+			{{/if}}
+
+			{{if $enable_tos}}
+			{{include file="field_checkbox.tpl" field=$tos}}
+			{{else}}
+			<input type="hidden" name="tos" value="1" />
+			{{/if}}
+
+			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
+			<div id="register-submit-end" class="register-field-end"></div>
+		</form>
+			<br />
+			<div class="descriptive-text">{{$verify_note}}</div>
+
+	</div>
+</div>
diff --git a/view/tpl/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl
new file mode 100755
index 000000000..d6d2fd211
--- /dev/null
+++ b/view/tpl/remote_friends_common.tpl
@@ -0,0 +1,21 @@
+<div id="remote-friends-in-common" class="bigwidget">
+	<div id="rfic-desc">{{$desc}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{if $linkmore}}<a href="{{$base}}/common/{{$uid}}">{{$more}}</a>{{/if}}</div>
+	{{if $items}}
+	{{foreach $items as $item}}
+	<div class="profile-match-wrapper">
+		<div class="profile-match-photo">
+			<a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}">
+				<img src="{{$item.xchan_photo_m}}" width="80" height="80" alt="{{$item.xchan_name}}" title="{{$item.xchan_name}}" />
+			</a>
+		</div>
+		<div class="profile-match-break"></div>
+		<div class="profile-match-name">
+			<a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}" title="{{$item.xchan_name}}">{{$item.xchan_name}}</a>
+		</div>
+		<div class="profile-match-end"></div>
+	</div>
+	{{/foreach}}
+	{{/if}}
+	<div id="rfic-end" class="clear"></div>
+</div>
+
diff --git a/view/tpl/remote_login.tpl b/view/tpl/remote_login.tpl
new file mode 100644
index 000000000..e6d387265
--- /dev/null
+++ b/view/tpl/remote_login.tpl
@@ -0,0 +1 @@
+<a href="rmagic" class="btn btn-block btn-success rmagic-button">{{$title}}</a>
diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl
new file mode 100644
index 000000000..ce6c8ac22
--- /dev/null
+++ b/view/tpl/removeaccount.tpl
@@ -0,0 +1,20 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-danger-wrapper" id="remove-account-desc">
+		<strong>{{$desc.0}}</strong>{{$desc.1}}<strong>{{$desc.2}}</strong>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<form action="{{$basedir}}/removeaccount" autocomplete="off" method="post" >
+			<input type="hidden" name="verify" value="{{$hash}}" />
+			<div class="form-group" id="remove-account-pass-wrapper">
+				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
+				<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password"  value=" " />
+			</div>
+			{{include file="field_checkbox.tpl" field=$global}}
+			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
+		</form>
+	</div>
+</div>
+
diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl
new file mode 100755
index 000000000..40b9546d2
--- /dev/null
+++ b/view/tpl/removeme.tpl
@@ -0,0 +1,20 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-danger-wrapper" id="remove-account-desc">
+		<strong>{{$desc.0}}</strong>{{$desc.1}}<strong>{{$desc.2}}</strong>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<form action="{{$basedir}}/removeme" autocomplete="off" method="post" >
+			<input type="hidden" name="verify" value="{{$hash}}" />
+			<div class="form-group" id="remove-account-pass-wrapper">
+				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
+				<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " />
+			</div>
+			{{include file="field_checkbox.tpl" field=$global}}
+			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
+		</form>
+	</div>
+</div>
+
diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl
new file mode 100755
index 000000000..9d84e4a36
--- /dev/null
+++ b/view/tpl/rmagic.tpl
@@ -0,0 +1,9 @@
+<div class="generic-content-wrapper-styled">
+	<h3>{{$title}}</h3>
+	<form action="rmagic" method="post" >
+		<div class="form-group">
+			{{include file="field_input.tpl" field=$address}}
+			<input class="btn btn-primary" type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" />
+		</div>
+	</form>
+</div>
diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl
new file mode 100644
index 000000000..58ce22741
--- /dev/null
+++ b/view/tpl/safesearch.tpl
@@ -0,0 +1,6 @@
+<div id="directory_safemode" class="widget">
+<h3>{{$safemode}}</h3>
+<ul class="nav nav-pills nav-stacked">
+	<li><a href="toggle_safesearch">{{$toggle}}</a></li>
+</ul>
+</div>
diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl
new file mode 100644
index 000000000..ff2d044ef
--- /dev/null
+++ b/view/tpl/saved_searches.tpl
@@ -0,0 +1,12 @@
+<div class="widget saved-search-widget clearfix">
+	<h3 id="search">{{$title}}</h3>
+	{{$searchbox}}
+	<ul id="saved-search-list" class="nav nav-pills flex-column">
+		{{foreach $saved as $search}}
+		<li class="nav-item nav-item-hack" id="search-term-{{$search.id}}">
+			<a class="nav-link widget-nav-pills-icons" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropfa-floppy-od-search-term-{{$search.id}}" class="fa fa-trash-o drop-icons" ></i></a>
+			<a id="saved-search-term-{{$search.id}}" class="nav-link{{if $search.selected}} active{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a>
+		</li>
+		{{/foreach}}
+	</ul>
+</div>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
new file mode 100755
index 000000000..66618a216
--- /dev/null
+++ b/view/tpl/search_item.tpl
@@ -0,0 +1,114 @@
+<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 clearfix generic-content-wrapper{{/if}}">
+	<a name="{{$item.id}}" ></a>
+	<div class="clearfix wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+		<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}">
+			{{if $item.photo}}
+			<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
+				{{$item.photo}}
+			</div>
+			{{/if}}
+			{{if $item.event}}
+			<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
+				{{$item.event}}
+			</div>
+			{{/if}}
+			{{if $item.title && !$item.event}}
+			<div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}">
+				{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}
+			</div>
+			{{if ! $item.is_new}}
+			<hr class="m-0">
+			{{/if}}
+			{{/if}}
+			<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
+				<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+					<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
+						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+					</div>
+				</div>
+				{{if $item.lock}}
+				<div class="wall-item-lock dropdown">
+					<i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+				</div>
+				{{/if}}
+				<div class="wall-item-author">
+					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
+				</div>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
+					{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+				</div>
+			</div>
+			{{if $item.body}}
+			<div class="p-2 clrearfix {{if $item.is_photo}} wall-photo-item{{else}} wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}">
+				<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
+					{{$item.body}}
+				</div>
+			</div>
+			{{/if}}
+			{{if $item.has_tags}}
+			<div class="p-2 wall-item-tools clearfix">
+				<div class="body-tags">
+					<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
+				</div>
+			{{**
+				{{if $item.mentions}}
+				<div class="body-tags" id="item-mentions">
+					<span class="tag">{{$item.mentions}}</span>
+				</div>
+				{{/if}}
+				{{if $item.tags}}
+				<div class="body-tags" id="item-tags">
+					<span class="tag">{{$item.tags}}</span>
+				</div>
+				{{/if}}
+				{{if $item.categories}}
+				<div class="body-tags" id="item-categories">
+					<span class="tag">{{$item.categories}}</span>
+				</div>
+				{{/if}}
+				{{if $item.folders}}
+				<div class="body-tags" id="item-folders">
+					<span class="tag">{{$item.folders}}</span>
+				</div>
+				{{/if}}
+			**}}
+			</div>
+			{{/if}}
+			<div class="p-2 clearfix wall-item-tools">
+				<div class="wall-item-tools-right btn-group pull-right">
+					<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
+						<i class="fa fa-cog"></i>
+					</button>
+					<div class="dropdown-menu dropdown-menu-right">
+						{{if $item.thread_action_menu}}
+						{{foreach $item.thread_action_menu as $mitem}}
+						<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-{{$mitem.icon}}"></i> {{$mitem.title}}</a></li>
+						{{/foreach}}
+						{{/if}}
+						{{if $item.drop.dropping}}
+						<a class="dropdown-item" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li>
+						{{/if}}
+						{{if $item.thread_author_menu}}
+						<div class="dropdown-divider"></div>
+						{{foreach $item.thread_author_menu as $mitem}}
+						<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a></li>
+						{{/foreach}}
+						{{/if}}
+					</div>
+				</div>
+				{{if $item.attachments}}
+				<div class="wall-item-tools-left btn-group">
+					<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
+					<div class="dropdown-menu">{{$item.attachments}}</div>
+				</div>
+				{{/if}}
+			</div>
+		</div>
+		{{if $item.conv}}
+		<div class="p-2 wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+		</div>
+		{{/if}}
+	</div>
+</div>
+
diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl
new file mode 100644
index 000000000..8f7ac5162
--- /dev/null
+++ b/view/tpl/searchbox.tpl
@@ -0,0 +1,12 @@
+<form action="{{$action_url}}" method="get" >
+	<input type="hidden" name="f" value="" />
+	<div id="{{$id}}" class="input-group">
+		<input class="form-control form-control-sm" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
+		<div class="input-group-btn">
+			<button type="submit" name="submit" class="btn btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button>
+			{{if $savedsearch}}
+			<button type="submit" name="searchsave" class="btn btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button>
+			{{/if}}
+		</div>
+	</div>
+</form>
diff --git a/view/tpl/section_title.tpl b/view/tpl/section_title.tpl
new file mode 100644
index 000000000..338e57042
--- /dev/null
+++ b/view/tpl/section_title.tpl
@@ -0,0 +1,5 @@
+<div class="section-title-wrapper">
+	<h2>{{$title}}</h2>
+	<div class="clear"></div>
+</div>
+
diff --git a/view/tpl/select_timezone.tpl b/view/tpl/select_timezone.tpl
new file mode 100644
index 000000000..2820a54f4
--- /dev/null
+++ b/view/tpl/select_timezone.tpl
@@ -0,0 +1,11 @@
+{{* TODO: Make id configurabel *}}
+<select id='timezone_select' name='timezone'>
+{{foreach $continents as $continent => $cities}}
+<optgroup label="{{$continent}}">
+{{foreach $cities as $city => $value}}
+<option value='{{$value}}' {{if $value == $selected}}selected='selected'{{/if}}>{{$city}}</option>
+{{/foreach}}
+</optgroup>
+{{/foreach}}
+</select>
+
diff --git a/view/tpl/sellpage_edit.tpl b/view/tpl/sellpage_edit.tpl
new file mode 100644
index 000000000..0a4726fb2
--- /dev/null
+++ b/view/tpl/sellpage_edit.tpl
@@ -0,0 +1,23 @@
+<h1>{{$header}}</h1>
+<form id="sellpage-edit" action="connect/{{$address}}" method="post">
+
+{{include file="field_checkbox.tpl" field=$premium}}
+
+<div class="descriptive-text">{{$desc}}</div>
+
+<div class="sellpage-editbody">
+<p id="sellpage-bodydesc" >
+{{$lbl_about}}
+</p>
+
+<textarea rows="10" cols="72" id="sellpage-textinp" name="text" >{{$text}}</textarea>
+
+</div>
+<div id="sellpage-editbody-end"></div>
+
+
+<div class="descriptive-text">{{$lbl2}}</div>
+<div class="sellpage-final">{{$desc2}}</div>
+
+<input type="submit" name="submit" value="{{$submit}}" />
+</form>
diff --git a/view/tpl/sellpage_submit.tpl b/view/tpl/sellpage_submit.tpl
new file mode 100644
index 000000000..2bd735ea4
--- /dev/null
+++ b/view/tpl/sellpage_submit.tpl
@@ -0,0 +1,3 @@
+<form id="sellpage-submit" action="connect/{{$address}}" method="post">
+<input type="submit" name="submit" value="{{$continue}}" />
+</form>
\ No newline at end of file
diff --git a/view/tpl/sellpage_view.tpl b/view/tpl/sellpage_view.tpl
new file mode 100644
index 000000000..20a65ffbe
--- /dev/null
+++ b/view/tpl/sellpage_view.tpl
@@ -0,0 +1,11 @@
+<div class="generic-content-wrapper">
+<h1>{{$header}}</h1>
+
+<div class="descriptive-text">{{$desc}}</div>
+
+<div class="sellpage-body">{{$text}}</div>
+
+<div class="sellpage-final">{{$desc2}}</div>
+
+{{$submit}}
+</div>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
new file mode 100755
index 000000000..dd5fecb43
--- /dev/null
+++ b/view/tpl/settings.tpl
@@ -0,0 +1,192 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-sm pull-right" href="removeme"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>{{/if}}
+		<h2>{{$ptitle}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{$nickname_block}}
+	<form action="settings" id="settings-form" method="post" autocomplete="off" class="acl-form" data-form_id="settings-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
+		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="basic-settings">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse">
+							{{$h_basic}}
+						</a>
+					</h3>
+				</div>
+				<div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings">
+					<div class="section-content-tools-wrapper">
+						{{include file="field_input.tpl" field=$username}}
+						{{include file="field_select_grouped.tpl" field=$timezone}}
+						{{include file="field_input.tpl" field=$defloc}}
+						{{include file="field_checkbox.tpl" field=$allowloc}}
+						{{include file="field_checkbox.tpl" field=$adult}}
+						{{include file="field_input.tpl" field=$photo_path}}
+						{{include file="field_input.tpl" field=$attach_path}}
+						{{if $basic_addon}}
+						{{$basic_addon}}
+						{{/if}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse">
+							{{$h_prv}}
+						</a>
+					</h3>
+				</div>
+				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings">
+					<div class="section-content-tools-wrapper">
+						{{if $server_role != 'basic'}}
+						{{include file="field_select_grouped.tpl" field=$role}}
+						{{/if}}
+						<div id="advanced-perm" style="display:{{if $permissions_set && $server_role != 'basic' }}none{{else}}block{{/if}};">
+
+							{{if $server_role != 'basic'}}
+							<div class="form-group">
+								<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button>
+							</div>
+							<div class="modal" id="apsModal">
+								<div class="modal-dialog">
+									<div class="modal-content">
+										<div class="modal-header">
+											<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+											<h4 class="modal-title">{{$lbl_p2macro}}</h4>
+										</div>
+										<div class="modal-body">
+										{{foreach $permiss_arr as $permit}}
+											{{include file="field_select.tpl" field=$permit}}
+										{{/foreach}}
+										</div>
+										<div class="modal-footer">
+											<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
+										</div>
+									</div><!-- /.modal-content -->
+								</div><!-- /.modal-dialog -->
+							</div><!-- /.modal -->
+							{{/if}}
+							<div id="settings-default-perms" class="form-group" >
+								<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button>
+							</div>
+							{{$group_select}}
+							{{include file="field_checkbox.tpl" field=$hide_presence}}
+							{{$profile_in_dir}}
+						</div>
+						<div class="settings-common-perms">
+							{{$suggestme}}
+							{{include file="field_checkbox.tpl" field=$blocktags}}
+							{{include file="field_input.tpl" field=$expire}}
+						</div>
+						{{if $permcat_enable}}
+						{{include file="field_select.tpl" field=$defpermcat}}
+						{{/if}}
+
+						{{if $sec_addon}}
+						{{$sec_addon}}
+						{{/if}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="notification-settings">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse">
+							{{$h_not}}
+						</a>
+					</h3>
+				</div>
+				<div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings">
+					<div class="section-content-tools-wrapper">
+						<div id="settings-notifications">
+							<h3>{{$activity_options}}</h3>
+							<div class="group">
+								{{*not yet implemented *}}
+								{{*include file="field_checkbox.tpl" field=$post_joingroup*}}
+								{{include file="field_checkbox.tpl" field=$post_newfriend}}
+								{{include file="field_checkbox.tpl" field=$post_profilechange}}
+							</div>
+							<h3>{{$lbl_not}}</h3>
+							<div class="group">
+								{{include file="field_intcheckbox.tpl" field=$notify1}}
+								{{include file="field_intcheckbox.tpl" field=$notify2}}
+								{{include file="field_intcheckbox.tpl" field=$notify3}}
+								{{include file="field_intcheckbox.tpl" field=$notify4}}
+								{{*include file="field_intcheckbox.tpl" field=$notify9*}}
+								{{include file="field_intcheckbox.tpl" field=$notify5}}
+								{{include file="field_intcheckbox.tpl" field=$notify6}}
+								{{include file="field_intcheckbox.tpl" field=$notify7}}
+								{{include file="field_intcheckbox.tpl" field=$notify8}}
+							</div>
+							<h3>{{$lbl_vnot}}</h3>
+							<div class="group">
+								{{include file="field_intcheckbox.tpl" field=$vnotify1}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify2}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify3}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify4}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify5}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify6}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify10}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify7}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify8}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify9}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify11}}
+								{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}}
+								{{include file="field_input.tpl" field=$evdays}}
+							</div>
+						</div>
+						{{if $notify_addon}}
+						{{$notify_addon}}
+						{{/if}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#miscellaneous-settings-collapse" aria-expanded="true" aria-controls="miscellaneous-settings-collapse">
+							{{$lbl_misc}}
+						</a>
+					</h3>
+				</div>
+				<div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
+					<div class="section-content-tools-wrapper">
+						{{if $menus}}
+						<div class="form-group channel-menu">
+							<label for="channel_menu">{{$menu_desc}}</label>
+							<select name="channel_menu" class="form-control">
+							{{foreach $menus as $menu }}
+								<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option>
+							{{/foreach}}
+							</select>
+						</div>
+						{{/if}}
+						{{include file="field_checkbox.tpl" field=$cal_first_day}}
+
+						{{if $misc_addon}}
+						{{$misc_addon}}
+						{{/if}}
+
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</form>
+	{{$aclselect}}
+</div>
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
new file mode 100755
index 000000000..b7fdfb9a9
--- /dev/null
+++ b/view/tpl/settings_account.tpl
@@ -0,0 +1,28 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<a title="{{$removeaccount}}" class="btn btn-danger btn-sm pull-right" href="removeaccount"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<form action="settings/account" id="settings-account-form" method="post" autocomplete="off" >
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		<div class="section-content-tools-wrapper">
+			{{include file="field_input.tpl" field=$email}}
+			{{include file="field_password.tpl" field=$origpass}}
+			{{include file="field_password.tpl" field=$password1}}
+			{{include file="field_password.tpl" field=$password2}}
+
+			{{if $z_server_role == 'pro' && ! $techlock}}
+			{{include file="field_select.tpl" field=$techlevel}}
+			{{else}}
+			<input type="hidden" name="techlevel" value="{{$techlevel.2}}" />
+			{{/if}}
+
+			<div class="settings-submit-wrapper" >
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+			{{$account_settings}}
+		</div>
+	</form>
+</div>
+
diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
new file mode 100755
index 000000000..52f8d9d3f
--- /dev/null
+++ b/view/tpl/settings_addons.tpl
@@ -0,0 +1,11 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<form action="settings/featured" method="post" autocomplete="off">
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		<div class="panel-group" id="settings" role="tablist">
+			{{$settings_addons}}
+		</div>
+	</form>
+</div>
diff --git a/view/tpl/settings_connectors.tpl b/view/tpl/settings_connectors.tpl
new file mode 100755
index 000000000..8bea9ca63
--- /dev/null
+++ b/view/tpl/settings_connectors.tpl
@@ -0,0 +1,10 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$title}}</h1>
+
+<form action="settings/connectors" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+{{$settings_connectors}}
+
+</form>
+</div>
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
new file mode 100755
index 000000000..d8c1ac7aa
--- /dev/null
+++ b/view/tpl/settings_display.tpl
@@ -0,0 +1,86 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$ptitle}}</h2>
+	</div>
+	<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
+			{{if $theme || $mobile_theme}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content">
+							{{$d_tset}}
+						</a>
+					</h3>
+				</div>
+				<div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings">
+					<div class="section-content-tools-wrapper">
+						{{if $theme}}
+							{{include file="field_themeselect.tpl" field=$theme}}
+						{{/if}}
+						{{if $schema}}
+							{{include file="field_select.tpl" field=$schema}}
+						{{/if}}
+						{{if $mobile_theme}}
+							{{include file="field_themeselect.tpl" field=$mobile_theme}}
+						{{/if}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			{{/if}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content">
+							{{$d_ctset}}
+						</a>
+					</h3>
+				</div>
+				<div id="custom-settings-content" class="collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
+					<div class="section-content-tools-wrapper">
+						{{if $theme_config}}
+							{{$theme_config}}
+						{{/if}}
+					</div>
+				</div>
+			</div>
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content">
+							{{$d_cset}}
+						</a>
+					</h3>
+				</div>
+				<div id="content-settings-content" class="collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
+					<div class="section-content-wrapper">
+						{{include file="field_input.tpl" field=$ajaxint}}
+						{{include file="field_input.tpl" field=$itemspage}}
+						{{include file="field_input.tpl" field=$channel_divmore_height}}
+						{{include file="field_input.tpl" field=$network_divmore_height}}
+						{{include file="field_checkbox.tpl" field=$nosmile}}
+						{{include file="field_checkbox.tpl" field=$title_tosource}}
+						{{include file="field_checkbox.tpl" field=$channel_list_mode}}
+						{{include file="field_checkbox.tpl" field=$network_list_mode}}
+						{{include file="field_checkbox.tpl" field=$user_scalable}}
+						{{include file="field_checkbox.tpl" field=$preload_images}}
+						{{include file="field_checkbox.tpl" field=$manual_update}}
+						{{if $expert}}
+						<div class="form-group">
+							<a class="btn btn-outline-secondary "href="pdledit">{{$layout_editor}}</a>
+						</div>
+						{{/if}}
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</form>
+</div>
diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
new file mode 100755
index 000000000..dfe049a7a
--- /dev/null
+++ b/view/tpl/settings_features.tpl
@@ -0,0 +1,30 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<form action="settings/features" method="post" autocomplete="off">
+	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+	<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
+		{{foreach $features as $g => $f}}
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
+				<h3>
+					<a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
+						{{$f.0}}
+					</a>
+				</h3>
+			</div>
+			<div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
+				<div class="section-content-tools-wrapper">
+					{{foreach $f.1 as $fcat}}
+						{{include file="field_checkbox.tpl" field=$fcat}}
+					{{/foreach}}
+					<div class="settings-submit-wrapper" >
+						<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		{{/foreach}}
+	</div>
+</div>
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
new file mode 100755
index 000000000..76fe7cd8d
--- /dev/null
+++ b/view/tpl/settings_nick_set.tpl
@@ -0,0 +1,8 @@
+<div id="settings-nick-wrapper" class="section-content-info-wrapper">
+<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong></div>
+{{if $davpath}}
+<br>
+<div id="settings-dav-desc">{{$davdesc}} <strong>'{{$davpath}}'</strong></div>
+{{/if}}
+</div>
+<div id="settings-nick-end" ></div>
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl
new file mode 100755
index 000000000..811cfcec5
--- /dev/null
+++ b/view/tpl/settings_oauth.tpl
@@ -0,0 +1,36 @@
+<div class="generic-content-wrapper">
+<div class="section-title-wrapper">
+	<h2>{{$title}}</h2>
+</div>
+
+<div class="section-content-tools-wrapper">
+<form action="settings/oauth" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	<div id="profile-edit-links">
+		<ul>
+			<li>
+				<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a>
+			</li>
+		</ul>
+	</div>
+
+	{{foreach $apps as $app}}
+	<div class='oauthapp'>
+		<img src='{{$app.icon}}' class="{{if $app.icon}} {{else}}noicon{{/if}}">
+		{{if $app.clname}}<h4>{{$app.clname}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}}
+		{{if $app.my}}
+			{{if $app.oauth_token}}
+			<div class="settings-submit-wrapper" ><button class="settings-submit"  type="submit" name="remove" value="{{$app.oauth_token}}">{{$remove}}</button></div>
+			{{/if}}
+		{{/if}}
+		{{if $app.my}}
+		<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
+		<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
+		{{/if}}		
+	</div>
+	{{/foreach}}
+
+</form>
+</div>
+</div>
diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl
new file mode 100755
index 000000000..b94dec48a
--- /dev/null
+++ b/view/tpl/settings_oauth_edit.tpl
@@ -0,0 +1,22 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+<div class="section-content-tools-wrapper">
+<form method="POST">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$key}}
+{{include file="field_input.tpl" field=$secret}}
+{{include file="field_input.tpl" field=$redirect}}
+{{include file="field_input.tpl" field=$icon}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+<input type="submit" name="cancel" class="settings-submit" value="{{$cancel}}" />
+</div>
+
+</form>
+</div>
+</div>
diff --git a/view/tpl/settings_permcats.tpl b/view/tpl/settings_permcats.tpl
new file mode 100644
index 000000000..f6bb9b036
--- /dev/null
+++ b/view/tpl/settings_permcats.tpl
@@ -0,0 +1,64 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<div class="section-content-info-wrapper">
+			{{$desc}}
+		</div>
+
+		<form action="settings/permcats" id="settings-permcats-form" method="post" autocomplete="off" >
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			{{include file="field_input.tpl" field=$name}}
+
+			<div class="settings-submit-wrapper form-group">
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+	</div>
+
+	<div class="panel">
+		<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
+			<h3>
+				<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
+				{{$permlbl}}
+				</a>
+			</h3>
+		</div>
+		<div id="perms-tool-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="perms-tool">
+			<div class="section-content-tools-wrapper">
+				<div class="section-content-warning-wrapper">
+				{{$permnote}}
+				</div>
+
+				<table id="perms-tool-table" class=form-group>
+					<tr>
+						<td></td><td colspan="2" class="abook-me">{{$me}}</td>
+					</tr>
+						{{foreach $perms as $prm}}
+						{{include file="field_acheckbox.tpl" field=$prm}}
+						{{/foreach}}
+				</table>
+
+				<div class="settings-submit-wrapper" >
+					<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+				</div>
+			</div>
+		</div>
+		{{if $permcats}}
+		<div class="section-content-wrapper-np">
+			<table id="permcat-index">
+			{{foreach $permcats as $k => $v}}
+			<tr class="permcat-row-{{$k}}">
+				<td width="99%"><a href="settings/permcats/{{$k}}">{{$k}}</a></td>
+				<td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td>
+			</tr>
+			{{/foreach}}
+			</table>
+		</div>
+		{{/if}}
+
+	</div>
+	</form>
+
+</div>
diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
new file mode 100644
index 000000000..48190c00c
--- /dev/null
+++ b/view/tpl/settings_tokens.tpl
@@ -0,0 +1,72 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<div class="section-content-info-wrapper">
+			{{$desc}}
+		</div>
+
+		<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
+			{{include file="field_input.tpl" field=$name}}
+			{{include file="field_input.tpl" field=$token}}
+			{{include file="field_input.tpl" field=$expires}}
+			<div class="settings-submit-wrapper form-group">
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+	</div>
+
+	<div class="panel">
+		<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
+			<h3>
+				<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
+				{{$permlbl}}
+				</a>
+			</h3>
+		</div>
+		<div id="perms-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="perms-tool">
+			<div class="section-content-tools-wrapper">
+				<div class="section-content-warning-wrapper">
+				{{$permnote}}
+				</div>
+
+				<table id="perms-tool-table" class=form-group>
+					<tr>
+						<td></td><td colspan="2" class="abook-me">{{$me}}</td>
+					</tr>
+						{{foreach $perms as $prm}}
+						{{include file="field_acheckbox.tpl" field=$prm}}
+						{{/foreach}}
+				</table>
+
+				<div class="settings-submit-wrapper" >
+					<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	</form>
+
+	<div class="descriptive-text">{{$desc2}}</div>
+	<ul>
+		<li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
+		<li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
+	</ul>
+
+	{{if $tokens}}
+	<div class="section-content-wrapper-np">
+		<table id="atoken-index">
+			{{foreach $tokens as $t}}
+			<tr id="atoken-index-{{$t.atoken_id}}" class="atoken-index-row">
+				<td width="99%"><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td>
+				<td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td>
+			</tr>
+			{{/foreach}}
+		</table>
+
+	</div>
+	{{/if}}
+</div>
diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl
new file mode 100644
index 000000000..68bdd6faa
--- /dev/null
+++ b/view/tpl/sharedwithme.tpl
@@ -0,0 +1,26 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-sm btn-outline-secondary pull-right"><i class="fa fa-trash-o"></i>&nbsp;{{$dropall}}</a>
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper-np">
+		<table id="cloud-index">
+			<tr>
+				<th width="1%"></th>
+				<th width="92%">{{$name}}</th>
+				<th width="1%"></th>
+				<th width="1%" class="d-none d-md-table-cell">{{$size}}</th>
+				<th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th>
+			</tr>
+		{{foreach $items as $item}}
+			<tr id="cloud-index-{{$item.id}}">
+				<td><i class="fa {{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td>
+				<td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}}&nbsp;<span class="label label-success">{{$label_new}}</span>{{/if}}</td>
+				<td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
+				<td class="d-none d-md-table-cell">{{$item.objfilesize}}</td>
+				<td class="d-none d-md-table-cell">{{$item.objedited}}</td>
+			</tr>
+		{{/foreach}}
+		</table>
+	</div>
+</div>
diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl
new file mode 100644
index 000000000..d738c9fc9
--- /dev/null
+++ b/view/tpl/show_thing.tpl
@@ -0,0 +1,16 @@
+<h2>{{$header}}</h2>
+{{if $thing}}
+<div class="thing-show">
+{{if $thing.obj_imgurl}}<a href="{{$thing.obj_url}}" ><img src="{{$thing.obj_imgurl}}" width="175" height="175" alt="{{$thing.obj_term}}" /></a>{{/if}}
+<a href="{{$thing.obj_url}}" >{{$thing.obj_term}}</a>
+</div>
+{{if $canedit}}
+<div class="thing-edit-links">
+<a href="thing/edit/{{$thing.obj_obj}}" title="{{$edit}}" class="btn btn-outline-secondary" ><i class="fa fa-pencil thing-edit-icon"></i></a>
+<a href="thing/drop/{{$thing.obj_obj}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-outline-secondary" ><i class="fa fa-trash-o drop-icons"></i></a>
+</div>
+<div class="thing-edit-links-end"></div>
+{{/if}}
+
+{{/if}}
+
diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
new file mode 100755
index 000000000..a5b99fd83
--- /dev/null
+++ b/view/tpl/siteinfo.tpl
@@ -0,0 +1,41 @@
+<div class="generic-content-wrapper-styled">
+<h2>{{$title}}</h2>
+
+<h3>{{$sitenametxt}}</h3>
+
+<div>{{$sitename}}</div>
+
+<h3>{{$headline}}</h3>
+
+<div>{{if $site_about}}{{$site_about}}{{else}}--{{/if}}</div>
+
+<h3>{{$admin_headline}}</h3>
+
+<div>{{if $admin_about}}{{$admin_about}}{{else}}--{{/if}}</div>
+
+<br><br>
+<div><a href="help/TermsOfService">{{$terms}}</a></div>
+
+<hr>
+
+<h2>{{$prj_header}}</h2>
+
+<div>{{$prj_name}} ({{$z_server_role}})</div>
+
+{{if $prj_version}}
+<div>{{$prj_version}}</div>
+{{/if}}
+
+
+<h3>{{$prj_linktxt}}</h3>
+
+<div>{{$prj_link}}</div>
+
+<h3>{{$prj_srctxt}}</h3>
+
+<div>{{$prj_src}}</div>
+
+<br><br>
+<div>{{$prj_transport}} ({{$transport_link}})</div>
+
+</div>
diff --git a/view/tpl/sitesearch.tpl b/view/tpl/sitesearch.tpl
new file mode 100644
index 000000000..8dbf8cef5
--- /dev/null
+++ b/view/tpl/sitesearch.tpl
@@ -0,0 +1,5 @@
+<div class="widget saved-search-widget">
+	<h3 id="search">{{$title}}</h3>
+	{{$searchbox}}
+	<div class="clear"></div>
+</div>
diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl
new file mode 100644
index 000000000..61f6e8cb0
--- /dev/null
+++ b/view/tpl/sources_edit.tpl
@@ -0,0 +1,24 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$title}}</h1>
+
+<div class="descriptive-text">{{$desc}}</div>
+
+<form action="sources" method="post">
+<input type="hidden" name="source" value="{{$id}}" />
+<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
+{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$tags}}
+{{include file="field_textarea.tpl" field=$words}}
+
+<div class="sources-submit-wrapper" >
+<input type="submit" name="submit" class="sources-submit" value="{{$submit}}" />
+</div>
+</form>
+<br />
+<br />
+<a href="sources/{{$id}}/drop">{{$drop}}</a>
+</div>
+
+
+
+
diff --git a/view/tpl/sources_list.tpl b/view/tpl/sources_list.tpl
new file mode 100644
index 000000000..76be35b1a
--- /dev/null
+++ b/view/tpl/sources_list.tpl
@@ -0,0 +1,17 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$title}}</h1>
+
+<div class="descriptive-text">{{$desc}}</div>
+
+<div class="sources-links">
+<a href="sources/new">{{$new}}</a>
+</div>
+
+{{if $sources}}
+<ul class="sources-list">
+{{foreach $sources as $source}}
+<li><a href="sources/{{$source.src_id}}">{{$source.xchan_name}}</a></li>
+{{/foreach}}
+</ul>
+{{/if}}
+</div>
diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl
new file mode 100644
index 000000000..bbc22df84
--- /dev/null
+++ b/view/tpl/sources_new.tpl
@@ -0,0 +1,17 @@
+<div class="generic-content-wrapper-styled">
+<h1>{{$title}}</h1>
+
+<div class="descriptive-text">{{$desc}}</div>
+
+<form action="sources" method="post">
+<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
+{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$tags}}
+{{include file="field_textarea.tpl" field=$words}}
+
+<div class="sources-submit-wrapper" >
+<input type="submit" name="submit" class="sources-submit" value="{{$submit}}" />
+</div>
+</form>
+</div>
+
diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
new file mode 100755
index 000000000..95f24cd63
--- /dev/null
+++ b/view/tpl/suggest_friends.tpl
@@ -0,0 +1,16 @@
+<div class="profile-match-wrapper">
+	<div class="profile-match-photo">
+		<a href="{{$entry.url}}">
+			<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.profile}}]" />
+		</a>
+	</div>
+	<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="fa fa-times drop-icons btn btn-outline-secondary"></i></a>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $entry.connlnk}}
+	<div class="profile-match-connect btn btn-outline-secondary"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conntxt}}</a></div>
+	{{/if}}
+</div>
diff --git a/view/tpl/suggest_page.tpl b/view/tpl/suggest_page.tpl
new file mode 100755
index 000000000..97837c852
--- /dev/null
+++ b/view/tpl/suggest_page.tpl
@@ -0,0 +1,9 @@
+<h3>{{$title}}</h3>
+
+{{if $entries}}
+{{foreach $entries as $child}}
+{{include file="suggest_friends.tpl" entry=$child}}
+{{/foreach}}
+{{/if}}
+
+<div class="clear"></div>
diff --git a/view/tpl/suggest_widget.tpl b/view/tpl/suggest_widget.tpl
new file mode 100644
index 000000000..7b9afa668
--- /dev/null
+++ b/view/tpl/suggest_widget.tpl
@@ -0,0 +1,10 @@
+<div class="widget suggestions-widget">
+<h3>{{$title}}</h3>
+{{if $entries}}
+{{foreach $entries as $child}}
+{{include file="suggest_friends.tpl" entry=$child}}
+{{/foreach}}
+{{/if}}
+<div class="clear"></div>
+<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div>
+</div>
diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl
new file mode 100644
index 000000000..62a7c02c8
--- /dev/null
+++ b/view/tpl/thing_edit.tpl
@@ -0,0 +1,41 @@
+<h2>{{$thing_hdr}}</h2>
+<form id="thing-edit-form" action="thing" method="post" class="acl-form" data-form_id="thing-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+<input type="hidden" name="term_hash" value="{{$thing_hash}}" />
+
+{{if $multiprof }}
+<div class="thing-profile-label">{{$profile_lbl}}</div>
+
+<div class="thing-profile">{{$profile_select}}</div>
+<div class="thing-field-end"></div>
+{{/if}}
+
+<div class="thing-verb-label">{{$verb_lbl}}</div>
+
+<div class="thing-verb">{{$verb_select}}</div>
+<div class="thing-field-end"></div>
+
+
+<label class="thing-label" for="thing-term">{{$thing_lbl}}</label>
+<input type="text" class="thing-input" id="thing-term" name="term" value="{{$thething}}" />
+<div class="thing-field-end"></div>
+<label class="thing-label" for="thing-url">{{$url_lbl}}</label>
+<input type="text" class="thing-input" id="thing-url" name="url" value="{{$theurl}}" />
+<div class="thing-field-end"></div>
+<label class="thing-label" for="thing-img">{{$img_lbl}}</label>
+<input type="text" class="thing-input" id="thing-img" name="img" value="{{$imgurl}}" />
+<div class="thing-field-end"></div>
+
+{{include file="field_checkbox.tpl" field=$activity}}
+
+<div class="thing-end"></div> 
+
+{{if $lockstate}}
+	<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+		<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
+	</button>
+{{/if}}
+
+
+<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
+</form>
+{{$aclselect}}
diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl
new file mode 100644
index 000000000..90fb093e4
--- /dev/null
+++ b/view/tpl/thing_input.tpl
@@ -0,0 +1,41 @@
+<h2>{{$thing_hdr}}</h2>
+<form id="thing-new-form" action="thing" method="post" class="acl-form" data-form_id="thing-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+
+{{if $multiprof }}
+<div class="thing-profile-label">{{$profile_lbl}}</div>
+
+<div class="thing-profile">{{$profile_select}}</div>
+<div class="thing-field-end"></div>
+{{/if}}
+
+
+<div class="thing-verb-label">{{$verb_lbl}}</div>
+
+<div class="thing-verb">{{$verb_select}}</div>
+<div class="thing-field-end"></div>
+
+
+<label class="thing-label" for="thing-term">{{$thing_lbl}}</label>
+<input type="text" class="thing-input" id="thing-term" name="term" />
+<div class="thing-field-end"></div>
+<label class="thing-label" for="thing-url">{{$url_lbl}}</label>
+<input type="text" class="thing-input" id="thing-url" name="url" />
+<div class="thing-field-end"></div>
+<label class="thing-label" for="thing-img">{{$img_lbl}}</label>
+<input type="text" class="thing-input" id="thing-img" name="img" />
+<div class="thing-field-end"></div>
+
+{{include file="field_checkbox.tpl" field=$activity}}
+
+<div class="thing-end"></div> 
+
+{{if $lockstate}}
+	<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+		<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
+	</button>
+{{/if}}
+
+
+<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
+</form>
+{{$aclselect}}
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
new file mode 100755
index 000000000..ea5c3c281
--- /dev/null
+++ b/view/tpl/threaded_conversation.tpl
@@ -0,0 +1,8 @@
+{{if $photo_item}}
+{{$photo_item}}
+{{/if}}
+{{foreach $threads as $thread_item}}
+{{include file="{{$thread_item.template}}" item=$thread_item}}
+{{/foreach}}
+
+<div id="conversation-end"></div>
diff --git a/view/tpl/toggle_mobile_footer.tpl b/view/tpl/toggle_mobile_footer.tpl
new file mode 100755
index 000000000..82c0197ba
--- /dev/null
+++ b/view/tpl/toggle_mobile_footer.tpl
@@ -0,0 +1,2 @@
+<a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a>
+
diff --git a/view/tpl/uexport.tpl b/view/tpl/uexport.tpl
new file mode 100644
index 000000000..7eafd97a6
--- /dev/null
+++ b/view/tpl/uexport.tpl
@@ -0,0 +1,19 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		<b><a href="uexport/basic">{{$basictitle}}</a></b></p>
+		<p>{{$basic}}</p>
+
+		<p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p>
+		<p>{{$full}}</p>
+	
+		<p>{{$extra}}</p>
+		<p>{{$extra2}}</p>
+		<p>{{$extra3}}</p>
+
+		<p>{{$extra4}}</p>
+
+	</div>
+</div>
diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl
new file mode 100644
index 000000000..c51728c34
--- /dev/null
+++ b/view/tpl/usermenu.tpl
@@ -0,0 +1,20 @@
+{{if $wrap}}
+<div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}">
+{{/if}}
+	{{if $menu.menu_desc}}
+	<h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="fa fa-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3>
+	{{/if}}
+	{{if $items}}
+	<ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills flex-column{{elseif !$wrap || $class}} {{$class}}{{/if}}">
+		{{foreach $items as $mitem }}
+		<li id="pmenu-item-{{$mitem.mitem_id}}" class="nav-item pmenu-item{{if $mitem.submenu}} dropdown{{/if}}">
+			<a href="{{if $mitem.submenu}}#{{else}}{{$mitem.mitem_link}}{{/if}}" class="nav-link {{if $mitem.submenu}} dropdown-toggle{{/if}}"{{if $mitem.submenu}} data-toggle="dropdown"{{/if}}{{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}{{if $mitem.submenu}}<span class="caret"></span>{{/if}}</a>
+			{{if $mitem.submenu}}{{$mitem.submenu}}{{/if}}
+		</li>
+		{{/foreach }}
+	</ul>
+	{{/if}}
+{{if $wrap}}
+	<div class="pmenu-end"></div>
+</div>
+{{/if}}
diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl
new file mode 100755
index 000000000..2b7144450
--- /dev/null
+++ b/view/tpl/viewcontact_template.tpl
@@ -0,0 +1,13 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper clearfix">
+		{{foreach $contacts as $contact}}
+		{{include file="contact_template.tpl"}}
+		{{/foreach}}
+		<div id="page-end"></div>
+	</div>
+</div>
+<script>$(document).ready(function() { loadingPage = false;});</script>
+<div id="page-spinner"></div>
diff --git a/view/tpl/viewcontactsajax.tpl b/view/tpl/viewcontactsajax.tpl
new file mode 100644
index 000000000..68be228be
--- /dev/null
+++ b/view/tpl/viewcontactsajax.tpl
@@ -0,0 +1,3 @@
+{{foreach $contacts as $contact}}
+{{include file="contact_template.tpl"}}
+{{/foreach}}
diff --git a/view/tpl/webpage_export_list.tpl b/view/tpl/webpage_export_list.tpl
new file mode 100644
index 000000000..b22b3818a
--- /dev/null
+++ b/view/tpl/webpage_export_list.tpl
@@ -0,0 +1,124 @@
+<div class="generic-content-wrapper">
+		<form action="" method="post" autocomplete="on" >
+		<input type="hidden" name="action" value="{{$action}}">
+		<div class="section-title-wrapper">
+			<div class="pull-right">				
+					<button class="btn btn-md btn-success" type="submit" name="submit" value="{{$exportbtn}}">{{$exportbtn}}</button>
+			</div>
+			<h2>{{$title}}</h2>
+			<div class="clear"></div>
+		</div>
+		<div id="import-website-content-wrapper" class="section-content-wrapper">
+				<div class="pull-left">
+						<button id="toggle-select-all" class="btn btn-sm btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i>&nbsp;Toggle Select All</button>
+				</div>
+				<div class="clear"></div>
+				<hr>
+				<!--<h4>Pages</h4>-->
+				<div>
+				<table class="table-striped table-responsive table-hover" style="width: 100%;">
+						<thead>
+								<tr><th></th><th>Page Link</th><th>Page Title</th><th>Type</th></tr>
+						</thead>
+						{{foreach $pages as $page}}
+								<tr>
+									<td width="30px" style="padding-right: 20px;">
+										<div class='squaredThree'>
+										<input type="checkbox" id="page_{{$page.mid}}" name="page[]" value="{{$page.mid}}">
+										<label for="page_{{$page.mid}}"></label>
+										</div>
+									</td>
+									<td width="30%">
+										<div class="desc">
+											{{$page.pagetitle}}<br>
+										</div>
+									</td>
+									<td width="55%">
+										<div class='desc'>
+											{{$page.title}}<br>
+										</div>
+									</td>
+									<td width="15%">
+										<div class='desc'>
+											{{$page.mimetype}}<br>
+										</div>
+									</td>
+								</tr>
+						{{/foreach}}
+				</table>
+				</div>
+				<hr>
+				<div class="clear"></div>
+				<!--<h4>Layouts</h4>-->
+				<div>
+				<table class="table-striped table-responsive table-hover" style="width: 100%;">
+						<thead>
+								<tr><th width="20px"></th><th>Layout Name</th><th>Layout Description</th><th>Type</th></tr>
+						</thead>
+						{{foreach $layouts as $layout}}
+								<tr>
+									<td width="30px" style="padding-right: 20px;">
+										<div class='squaredThree'>
+										<input type="checkbox" id="layout_{{$layout.mid}}" name="layout[]" value="{{$layout.mid}}">
+										<label for="layout_{{$layout.mid}}"></label>
+										</div>
+									</td>
+									<td width="30%">
+										<div class="desc">
+											{{$layout.name}}<br>
+										</div>
+									</td>
+									<td width="55%">
+										<div class='desc'>
+											{{$layout.description}}<br>
+										</div>
+									</td>
+									<td width="15%">
+										<div class='desc'>
+											{{$layout.mimetype}}<br>
+										</div>
+									</td>
+								</tr>
+						{{/foreach}}
+				</table>
+				</div>
+				<hr>
+				<div class="clear"></div>
+				<!--<h4>Blocks</h4>-->
+				<div>
+				<table class="table-striped table-responsive table-hover" style="width: 100%;">
+						<thead>
+								<tr><th width="30px"></th><th>Block Name</th><th>Block Title</th><th>Type</th></tr>
+						</thead>
+						{{foreach $blocks as $block}}
+								<tr>
+									<td width="30px" style="padding-right: 20px;">
+										<div class='squaredThree'>
+										<input type="checkbox" id="block_{{$block.mid}}" name="block[]" value="{{$block.mid}}">
+										<label for="block_{{$block.mid}}"></label>
+										</div>
+									</td>
+									<td width="30%">
+										<div class="desc">
+											{{$block.name}}<br>
+										</div>
+									</td>
+									<td width="55%">
+										<div class='desc'>
+											{{$block.title}}<br>
+										</div>
+									</td>
+									<td width=15%">
+										<div class='desc'>
+											{{$block.mimetype}}<br>
+										</div>
+									</td>
+								</tr>
+						{{/foreach}}
+				</table>
+				</div>
+				
+		</div>
+		</form>
+</div>
+
diff --git a/view/tpl/webpage_import.tpl b/view/tpl/webpage_import.tpl
new file mode 100644
index 000000000..955288c1e
--- /dev/null
+++ b/view/tpl/webpage_import.tpl
@@ -0,0 +1,126 @@
+<div class="generic-content-wrapper">
+		<form action="" method="post" autocomplete="on" >
+		<input type="hidden" name="action" value="importselected">
+		<div class="section-title-wrapper">
+			<div class="pull-right">				
+					<button class="btn btn-md btn-success" type="submit" name="submit" value="{{$importbtn}}">{{$importbtn}}</button>
+			</div>
+			<h2>{{$title}}</h2>
+			<div class="clear"></div>
+		</div>
+		<div id="import-website-content-wrapper" class="section-content-wrapper">
+						<div class="pull-left">
+								<button id="toggle-select-all" class="btn btn-sm btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i>&nbsp;Toggle Select All</button>
+						</div>
+						<div class="clear"></div>
+						<h4>Scanned Pages</h4>
+						<div>
+						<table class="table-striped table-responsive table-hover" style="width: 100%;">
+							<tr><td>Import?</td><td>Page</td><!--<td>Existing Page</td>--></tr>
+						{{foreach $pages as $page}}
+								<tr>
+									<td>
+										<div class='squaredTwo'>
+										<input type="checkbox" id="page_{{$page.pagelink}}" name="page[]" value="{{$page.pagelink}}">
+										<label for="page_{{$page.pagelink}}"></label>
+										</div>
+									</td>
+									<td>
+										<div class='desc'>
+											Page Link: {{$page.pagelink}}<br>
+											Layout: {{$page.layout}}<br>
+											Title: {{$page.title}}<br>
+											Content File: {{$page.contentfile}}<br>
+											Type: {{$page.type}}<br>
+										</div>
+									</td>
+								<!-- TODO: Retrieve existing element information to avoid accidental overwriting
+									<td>
+										<div class='desc'>
+											Name: {{$page.curpage.pagelink}}<br>
+											Layout: {{$page.curpage.layout}}<br>
+											Title: {{$page.curpage.title}}<br>
+											Last edit: {{$page.curpage.edited}}<br>
+											Type: {{$page.curpage.type}}<br>
+										</div>
+									</td>
+								-->
+								</tr>
+						{{/foreach}}
+						</table>
+						</div>
+
+
+						<h4>Scanned Layouts</h4>
+						<div>
+						<table class="table-striped table-responsive table-hover" style="width: 100%;">
+								<tr><td>Import?</td><td>Layout</td><!--<td>Existing Layout</td>--></tr>
+						{{foreach $layouts as $layout}}
+										<tr>
+												<td>
+														<div class='squaredTwo'>
+														<input type="checkbox" id="layout_{{$layout.name}}" name="layout[]" value="{{$layout.name}}">
+														<label for="layout_{{$layout.name}}"></label>
+														</div>
+												</td>
+												<td>
+														<div class='desc'>
+																Name: {{$layout.name}}<br>
+																Description: {{$layout.description}}<br>
+																Content File: {{$layout.contentfile}}<br>
+														</div>
+												</td>
+												<!-- TODO: Retrieve existing element information to avoid accidental overwriting
+												<td>
+														<div class='desc'>
+																Name: {{$layout.curblock.name}}<br>
+																Title: {{$layout.curblock.description}}<br>
+																Last edit: {{$layout.curblock.edited}}<br>
+														</div>
+												</td>
+												-->
+										</tr>
+						{{/foreach}}
+						</table>
+						</div>
+
+						<h4>Scanned Blocks</h4>
+						<div>
+						<table class="table-striped table-responsive table-hover" style="width: 100%;">
+								<tr><td>Import?</td><td>Block</td><!--<td>Existing Block</td>--></tr>
+						{{foreach $blocks as $block}}
+										<tr>
+												<td>
+														<div class='squaredTwo'>
+														<input type="checkbox" id="block_{{$block.name}}" name="block[]" value="{{$block.name}}">
+														<label for="block_{{$block.name}}"></label>
+														</div>
+												</td>
+												<td>
+														<div class='desc'>
+																Name: {{$block.name}}<br>
+																Title: {{$block.title}}<br>
+																Content File: {{$block.contentfile}}<br>
+																Type: {{$block.type}}<br>
+														</div>
+												</td>
+												<!-- TODO: Retrieve existing element information to avoid accidental overwriting
+												<td>
+														<div class='desc'>
+																Name: {{$block.curblock.name}}<br>
+																Title: {{$block.curblock.title}}<br>
+																Last edit: {{$block.curblock.edited}}<br>
+																Type: {{$block.curblock.type}}<br>
+														</div>
+												</td>
+												-->
+										</tr>
+						{{/foreach}}
+						</table>
+						</div>
+				
+		</div>
+		<div class="clear"></div>
+		</form>
+</div>
+
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
new file mode 100644
index 000000000..fcf9de75a
--- /dev/null
+++ b/view/tpl/webpagelist.tpl
@@ -0,0 +1,76 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $editor}}
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-sm btn-success acl-form-trigger" onclick="openClose('webpage-editor');" data-form_id="profile-jot-form"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
+		</div>
+		{{/if}}
+		<h2>{{$listtitle}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{if $editor}}
+	<div id="webpage-editor" class="section-content-tools-wrapper">
+		{{$editor}}
+	</div>
+	{{/if}}
+	{{if $pages}}
+	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+		<table id="webpage-list-table">
+			<tr>
+				<th width="1%">{{$pagelink_txt}}</th>
+				<th width="95%">{{$title_txt}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%" class="d-none d-md-table-cell">{{$created_txt}}</th>
+				<th width="1%" class="d-none d-md-table-cell">{{$edited_txt}}</th>
+			</tr>
+			{{foreach $pages as $key => $items}}
+			{{foreach $items as $item}}
+			<tr id="webpage-list-item-{{$item.url}}">
+				<td>
+					{{if $view}}
+					<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
+					{{else}}
+					{{$item.pagetitle}}
+					{{/if}}
+				</td>
+				<td>
+					{{$item.title}}
+				</td>
+				<td class="webpage-list-tool dropdown">
+					{{if $item.lockstate=='lock'}}
+					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i>
+					<ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $item.bb_element}}
+					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+					{{/if}}
+				</td>
+				<td class="d-none d-md-table-cell">
+					{{$item.created}}
+				</td>
+				<td class="d-none d-md-table-cell">
+					{{$item.edited}}
+				</td>
+			</tr>
+			{{/foreach}}
+			{{/foreach}}
+		</table>
+	</div>
+	{{/if}}
+	<div class="clear"></div>
+</div>
diff --git a/view/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl
new file mode 100644
index 000000000..0d131cb17
--- /dev/null
+++ b/view/tpl/website_portation_tools.tpl
@@ -0,0 +1,60 @@
+<div id="website-portation-tools" class="widget">
+	<div class="nav nav-pills flex-column">
+		<a class="nav-link"  href="#" onclick="openClose('import-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+		<div id="import-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<input type="hidden" name="action" value="scan">
+					<p class="descriptive-text">{{$file_import_text}}</p>
+					<div class="form-group">
+						<input class="form-control" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
+					</div>
+					<div class="form-group">
+						<button class="btn btn-primary btn-sm" type="submit" name="cloudsubmit" value="{{$select}}">Submit</button>
+					</div>
+					<!-- Or upload a zipped file containing the website -->
+					<p class="descriptive-text">{{$file_upload_text}}</p>
+					<div class="form-group">
+						<input class="form-control-file w-100" type="file" name="zip_file" />
+					</div>
+					<div class="form-group">
+						<button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Submit</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+	<div class="nav nav-pills flex-column">
+		<a class="nav-link" href="#" onclick="openClose('export-form'); openClose('export-cloud-form'); return false;"><i class="fa fa-share-square-o generic-icons"></i> {{$export_label}}</a>
+		<div id="export-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<input type="hidden" name="action" value="exportzipfile">
+					<!-- Or download a zipped file containing the website -->
+					<p class="descriptive-text">{{$file_download_text}}</p>
+					<div class="form-group">
+						<input class="form-control" type="text" name="zipfilename" title="{{$filename_hint}}" placeholder="{{$filename_desc}}" value="" />
+					</div>
+					<div class="form-group">
+						<button class="btn btn-primary btn-sm" type="submit" name="w_download" value="w_download">Submit</button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<div id="export-cloud-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<input type="hidden" name="action" value="exportcloud">
+					<!-- Or export the website elements to a cloud files folder -->
+					<p style="margin-top: 10px;" class="descriptive-text">{{$cloud_export_text}}</p>
+					<div class="form-group">
+						<input class="form-control" type="text" name="exportcloudpath" title="{{$cloud_export_hint}}" placeholder="{{$cloud_export_desc}}" />
+					</div>
+					<div class="form-group">
+						<button class="btn btn-primary btn-sm" type="submit" name="exportcloudsubmit" value="{{$cloud_export_select}}">Submit</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
new file mode 100644
index 000000000..564db3324
--- /dev/null
+++ b/view/tpl/wiki.tpl
@@ -0,0 +1,469 @@
+<div class="generic-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			{{if $showPageControls}}
+			<div id="page-tools" class="btn-group" style="display: none;">
+				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
+					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
+				</button>
+				<div class="dropdown-menu dropdown-menu-right">
+					{{if $renamePage}}
+					<a class="dropdown-item rename-page" href="#"><i class="fa fa-fw fa-edit"></i>&nbsp;{{$renamePage}}</a>
+					{{/if}}
+					<a id="embed-image" class="dropdown-item" href="#"><i class="fa fa-fw fa-picture-o"></i>&nbsp;Embed Image</a>
+				</div>
+			</div>	
+			{{/if}}
+			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button>
+		</div>
+		<h2>
+			<span id="wiki-header-name">{{$wikiheaderName}}</span>:
+			<span id="wiki-header-page">{{$wikiheaderPage}}</span>
+		</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
+		<form id="rename-page-form" action="wiki/rename/page" method="post" >
+			{{include file="field_input.tpl" field=$pageRename}}
+			<div class="form-group">
+				<div class="pull-right">
+					<button id="rename-page-submit" class="btn btn-primary" type="submit" name="submit">Submit</button>
+				</div>
+				<div>
+					<button class="btn btn-outline-secondary rename-page" type="button">Cancel</button>
+				</div>
+				<div class="clear"></div>
+			</div>
+		</form>
+	</div>
+	<div id="wiki-content-container" class="section-content-wrapper">
+		<ul class="nav nav-tabs" id="wiki-nav-tabs">
+			<li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li>
+			<li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li>
+			<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
+		</ul>
+		<div class="tab-content" id="wiki-page-tabs">
+			<div id="edit-pane" class="tab-pane">
+				{{if !$mimeType || $mimeType == 'text/markdown'}}
+				<div id="ace-editor"></div>
+				{{else}}
+				<div id="editor-wrapper">
+					<textarea id="editor">{{$content}}</textarea>
+				</div>
+				{{/if}}
+				{{if $showPageControls}}
+				<div>
+					<div id="id_{{$commitMsg.0}}_wrapper" class="field input">
+						<div class="input-group">
+							<input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
+							<div class="input-group-btn">
+								<button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
+							</div>
+						</div>
+					</div>
+				</div>
+				{{/if}}
+			</div>
+			<div id="preview-pane" class="tab-pane active">
+				<div id="wiki-preview">
+					{{$renderedContent}}
+				</div>
+			</div>
+			<div id="page-history-pane" class="tab-pane">
+				<div id="page-history-list"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+{{$wikiModal}}
+
+<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="modal-body" id="embedPhotoModalBody" >
+				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
+					<div id="embedPhotoModalBodyAlbumList"></div>
+				</div>
+				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
+				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+<script>
+	window.wiki_resource_id = '{{$resource_id}}';
+	window.wiki_page_name = '{{$page}}';
+	window.wiki_page_content = '{{$content|escape:'javascript'}}';
+	window.wiki_page_commit = '{{$commit}}';
+
+	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
+	$("#generic-modal-ok-{{$wikiModalID}}").addClass('btn-danger');
+
+	$('.rename-page').click(function (ev) {
+		$('#rename-page-form-wrapper').toggle();
+		ev.preventDefault();
+	});
+
+	$( "#rename-page-form" ).submit(function( event ) {
+		$.post("wiki/{{$channel}}/rename/page", 
+		{
+			oldName: window.wiki_page_name, 
+			newName: $('#id_pageRename').val(), 
+			resource_id: window.wiki_resource_id
+		}, 
+		function (data) {
+			if (data.success) {
+				$('#rename-page-form-wrapper').hide();
+				window.console.log('data: ' + JSON.stringify(data));
+				window.wiki_page_name = data.name.urlName;
+				$('#wiki-header-page').html(data.name.htmlName);
+				wiki_refresh_page_list();
+			} else {
+				window.console.log('Error renaming page.');
+			}
+		}, 'json');    
+		event.preventDefault();
+	});
+
+	{{if !$mimeType || $mimeType == 'text/markdown'}}
+	var editor = ace.edit("ace-editor");
+	editor.setOptions({
+		theme: "ace/theme/github",
+		mode: "ace/mode/markdown",
+
+		maxLines: Infinity,
+		minLines: 30,
+
+		wrap: true,
+
+		printMargin: false
+	});
+
+	editor.getSession().setValue(window.wiki_page_content);
+	window.editor = editor; // Store the editor in the window object so the anonymous function can use it.
+	{{else}}
+	window.editor = editor = $('#editor');
+	{{/if}}
+
+	{{if !$showPageControls}}
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		editor.setReadOnly(true); // Disable editing if the viewer lacks edit permission
+		{{else}}
+		editor.prop('readonly', true);
+		{{/if}}
+	{{/if}}
+
+	$('#edit-pane-tab').click(function (ev) {
+		setTimeout(function() {
+			window.editor.focus();
+			if($('main').hasClass('fullscreen')) {
+				adjustFullscreenEditorHeight();
+			}
+			else {
+				adjustInlineEditorHeight();
+			}
+		}, 500); // Return the focus to the editor allowing immediate text entry
+		$('#page-tools').show();
+	});
+
+	$('#wiki-get-preview').click(function (ev) {
+		$.post("wiki/{{$channel}}/preview", {
+			{{if !$mimeType || $mimeType == 'text/markdown'}}
+			content: editor.getValue(),
+			{{else}}
+			content: editor.val(),
+			{{/if}}
+			resource_id: window.wiki_resource_id
+		},
+		function (data) {
+		if (data.success) {
+			$('#wiki-preview').html(data.html);
+			{{if !$mimeType || $mimeType == 'text/markdown'}}
+			$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
+			{{/if}}
+			$('#page-tools').hide();
+		} else {
+			window.console.log('Error previewing page.');
+		}
+		}, 'json');
+		ev.preventDefault();
+	});
+
+	$('#wiki-get-history').click(function (ev) {
+		$.post("wiki/{{$channel}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
+			if (data.success) {
+				$('#page-history-list').html(data.historyHTML);
+				$('#page-tools').hide();
+			} else {
+				window.console.log('Error getting page history.');
+			}
+			}, 'json');
+			ev.preventDefault();
+		});
+
+	function wiki_refresh_page_list() {
+		if (window.wiki_resource_id === '') {
+			return false;
+		}
+		$.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) {
+			if (data.success) {
+				$('#wiki_page_list_container').html(data.pages);
+				$('#wiki_page_list_container').show();
+			} else {
+				alert('Error fetching page list!');
+				window.console.log('Error fetching page list!');
+			}
+		}, 'json');
+		return false;
+	}
+
+	$('#save-page').click(function (ev) {
+		if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
+			window.console.log('You must have a wiki page open in order to edit pages.');
+			ev.preventDefault();
+			return false;
+		}
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		var currentContent = editor.getValue();
+		{{else}}
+		var currentContent = editor.val();
+		{{/if}}
+
+		if (window.wiki_page_content === currentContent) {
+			$('#save-page').addClass('disabled');  // Disable the save button
+			window.console.log('No edits to save.');
+			ev.preventDefault();
+			return false;
+		}
+		$.post("wiki/{{$channel}}/save/page", {
+			content: currentContent, 
+			commitMsg: $('#id_commitMsg').val(),
+			name: window.wiki_page_name, 
+			resource_id: window.wiki_resource_id
+		}, 
+		function (data) {
+			if (data.success) {
+				window.console.log('Page saved successfully.');
+				window.wiki_page_content = currentContent;
+				$('#id_commitMsg').val(''); // Clear the commit message box
+				$('#save-page').addClass('disabled');  // Disable the save button
+				{{if !$mimeType || $mimeType == 'text/markdown'}}
+				window.editor.getSession().getUndoManager().markClean();  // Reset the undo history for the editor
+				{{/if}}
+
+				window.editor.focus();  // Return focus to the editor for continued editing
+				// $('#wiki-get-history').click();
+			} else {
+				alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups 
+				window.console.log('Error saving page.');
+			}
+		}, 'json');
+		ev.preventDefault();
+	});
+
+	function wiki_revert_page(commitHash) {
+		if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
+			window.console.log('You must have a wiki page open in order to revert pages.');
+			return false;
+		}
+		$.post("wiki/{{$channel}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
+		function (data) {
+			if (data.success) {
+			$('button[id^=revert-]').removeClass('btn-success');
+			$('button[id^=revert-]').addClass('btn-danger');
+			$('button[id^=revert-]').html('Revert');
+			$('#revert-'+commitHash).removeClass('btn-danger');
+			$('#revert-'+commitHash).addClass('btn-success');
+			$('#revert-'+commitHash).html('Page reverted<br>but not saved');
+			window.wiki_page_commit = commitHash;
+			// put contents in editor
+			editor.getSession().setValue(data.content);
+			} else {
+			window.console.log('Error reverting page.');
+			}
+		}, 'json');
+	}
+
+	function wiki_compare_page(compareCommit) {
+		if (window.wiki_resource_id === '' || window.wiki_page_name === '' || window.wiki_page_commit === '') {
+			window.console.log('You must have a wiki page open in order to revert pages.');
+			return false;
+		}
+		$.post("wiki/{{$channel}}/compare/page", {
+			compareCommit: compareCommit, 
+			currentCommit: window.wiki_page_commit, 
+			name: window.wiki_page_name, 
+			resource_id: window.wiki_resource_id
+		}, 
+		function (data) {
+			console.log(data);
+			if (data.success) {
+				var modalBody = $('#generic-modal-body-{{$wikiModalID}}');
+				modalBody.html('<div class="descriptive-text">'+data.diff+'</div>');
+				$('.modal-dialog').addClass('modal-lg');
+				$("#generic-modal-ok-{{$wikiModalID}}").off('click');
+				$("#generic-modal-ok-{{$wikiModalID}}").click(function () {
+					wiki_revert_page(compareCommit);
+					$('#generic-modal-{{$wikiModalID}}').modal('hide');
+				});
+				$('#generic-modal-{{$wikiModalID}}').modal();
+			} else {
+				window.console.log('Error comparing page.');
+			}
+		}, 'json');
+	}
+
+	function adjustFullscreenEditorHeight() {
+		$('#editor, #ace-editor').height($(window).height() - $('#id_commitMsg_wrapper').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('#wiki-nav-tabs').outerHeight(true) - 17);
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		editor.setOptions({
+			maxLines: null,
+			minLines: null
+		});
+		editor.resize();
+		{{/if}}
+	}
+
+	function adjustInlineEditorHeight() {
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		editor.setOptions({
+			maxLines: Infinity,
+			minLines: 30
+		});
+		editor.resize();
+		{{else}}
+		editor.height(editor[0].scrollHeight);
+		{{/if}}
+	}
+
+	$('#embed-image').click(function (ev) {
+		initializeEmbedPhotoDialog();
+		ev.preventDefault();
+	});
+
+	var initializeEmbedPhotoDialog = function () {
+		$('.embed-photo-selected-photo').each(function (index) {
+			$(this).removeClass('embed-photo-selected-photo');
+		});
+		getPhotoAlbumList();
+		$('#embedPhotoModalBodyAlbumDialog').off('click');
+		$('#embedPhotoModal').modal();
+	};
+
+	var choosePhotoFromAlbum = function (album) {
+		$.post("embedphotos/album", {name: album},
+			function(data) {
+				if (data['status']) {
+					$('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
+					$('#embedPhotoModalBodyAlbumDialog').html('\
+							<div><ul class="nav nav-pills flex-column">\n\
+								<li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
+									<i class="fa fa-chevron-left"></i>&nbsp;\n\
+									{{$modaldiffalbum}}\n\
+									</a>\n\
+								</li>\n\
+							</ul><br></div>')
+					$('#embedPhotoModalBodyAlbumDialog').append(data['content']);
+					$('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
+						evt.preventDefault();
+						var image = document.getElementById(evt.target.id);
+						if (typeof($(image).parent()[0]) !== 'undefined') {
+							var imageparent = document.getElementById($(image).parent()[0].id);
+							$(imageparent).toggleClass('embed-photo-selected-photo');
+						}
+					});
+					$('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+					$('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
+					$('#embed-photo-OKButton').click(function () {
+						$('.embed-photo-selected-photo').each(function (index) {
+							var href = $(this).attr('href');
+							$.post("embedphotos/photolink", {href: href},
+								function(ddata) {
+									if (ddata['status']) {
+										{{if !$mimeType || $mimeType == 'text/markdown'}}
+										var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' )
+										editor.getSession().insert(editor.getCursorPosition(), imgURL)
+										{{else}}
+										var currentContent = $('#editor').val();
+										$('#editor').val(currentContent + ddata['photolink']);
+										{{/if}}
+									} else {
+										window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
+									}
+									return false;
+								},
+							'json');
+						});
+						$('#embedPhotoModalBodyAlbumDialog').html('');
+						$('#embedPhotoModalBodyAlbumDialog').off('click');
+						$('#embedPhotoModal').modal('hide');
+					});
+				} else {
+					window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
+				}
+				return false;
+			},
+		'json');
+	};
+
+	var getPhotoAlbumList = function () {
+		$.post("embedphotos/albumlist", {},
+			function(data) {
+				if (data['status']) {
+					var albums = data['albumlist']; //JSON.parse(data['albumlist']);
+					$('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
+					$('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
+					for(var i = 0; i < albums.length; i++) {
+						var albumName = albums[i].text;
+						var jsAlbumName = albums[i].jstext;
+						var albumLink = '<li class="nav-item">';
+						albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
+						albumLink += '</li>';
+						$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+					}
+					$('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
+					$('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
+				} else {
+					window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
+				}
+				return false;
+			},
+		'json');
+	};
+
+	$(document).ready(function () {
+		wiki_refresh_page_list();
+
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
+		window.editor.on("input", function() {
+			if(window.editor.getSession().getUndoManager().isClean()) {
+				$('#save-page').addClass('disabled');
+			} else {
+				$('#save-page').removeClass('disabled');
+			}
+		});
+		{{else}}
+		window.editor.on("input", function() {
+			$('#save-page').removeClass('disabled');
+		});
+		window.editor.bbco_autocomplete('bbcode');
+		{{/if}}
+	});
+
+	$(window).resize(function () {
+		if($('main').hasClass('fullscreen')) {
+			adjustFullscreenEditorHeight();
+		}
+	});
+</script>
diff --git a/view/tpl/wiki_page_history.tpl b/view/tpl/wiki_page_history.tpl
new file mode 100644
index 000000000..9e5ba0f9c
--- /dev/null
+++ b/view/tpl/wiki_page_history.tpl
@@ -0,0 +1,59 @@
+<style>
+  .diff {
+    width:100%;
+    word-break: break-all;
+  }
+
+  .diff td{
+    padding:0 0.667em;
+    vertical-align:top;
+    white-space:pre;
+    white-space:pre-wrap;
+    font-family:Consolas,'Courier New',Courier,monospace;
+    font-size:1.0em;
+    line-height:1.333;
+  }
+
+  .diff span{
+    display:block;
+    min-height:1.333em;
+    margin-top:-1px;
+    padding:0 3px;
+  }
+
+  * html .diff span{
+    height:1.333em;
+  }
+
+  .diff span:first-child{
+    margin-top:0;
+  }
+
+  .diffDeleted span{
+    border:1px solid rgb(255,192,192);
+    background:rgb(255,224,224);
+  }
+
+  .diffInserted span{
+    border:1px solid rgb(192,255,192);
+    background:rgb(224,255,224);
+  }
+</style>
+<table class="table-striped table-responsive table-hover" style="width: 100%;">
+  {{foreach $pageHistory as $commit}}
+  <tr><td>
+      <table id="rev-{{$commit.hash}}" onclick="$('#details-{{$commit.hash}}').show()" width="100%">
+        <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td>
+            <td rowspan="3" width="20%" align="right">
+		{{if $permsWrite}}
+              <button id="revert-{{$commit.hash}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button>
+              <br><br>
+		{{/if}}
+              <button id="compare-{{$commit.hash}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.hash}}')">Compare</button>
+            </td></tr>
+        <tr><td>Name</td><td>{{$commit.name}} &lt;{{$commit.email}}&gt;</td></tr>
+        <tr><td>Message</td><td>{{$commit.title}}</td></tr>
+      </table>
+    </td></tr>
+  {{/foreach}}          
+</table>
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
new file mode 100644
index 000000000..44fba15cc
--- /dev/null
+++ b/view/tpl/wiki_page_list.tpl
@@ -0,0 +1,76 @@
+{{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}}
+<div id="wiki_page_list" class="widget" >
+	<h3>{{$header}}</h3>
+	<ul class="nav nav-pills flex-column">
+		{{if $pages}}
+		{{foreach $pages as $page}}
+		<li class="nav-item nav-item-hack" id="{{$page.link_id}}">
+			{{if $page.resource_id && $candel}}
+			<i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.url}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i>
+			{{/if}}
+			<a class="nav-link" href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a>
+		</li>
+		{{/foreach}}
+		{{/if}}
+		{{if $canadd}}
+		<li class="nav-item"><a class="nav-link" href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i>&nbsp;{{$addnew}}</a></li>
+		{{/if}}
+	</ul>
+	{{if $canadd}}
+	<div id="new-page-form-wrapper" class="sub-menu" style="display:none;">
+		<form id="new-page-form" action="wiki/{{$channel}}/create/page" method="post" >
+			<input type="hidden" name="resource_id" value="{{$resource_id}}">
+			{{include file="field_input.tpl" field=$pageName}}
+			<button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button>
+		</form>
+	</div>
+	{{/if}}
+</div>
+{{if $not_refresh}}</div>{{/if}}
+
+<script>
+	$('#new-page-submit').click(function (ev) {
+		$.post("wiki/{{$channel}}/create/page", {pageName: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, 
+		function(data) {
+			if(data.success) {
+				window.location = data.url;
+			} else {
+				window.console.log('Error creating page.');
+			}
+		}, 'json');
+		ev.preventDefault();
+	});
+
+	function wiki_delete_page(wiki_page_name, wiki_page_url, wiki_resource_id, wiki_link_id) {
+		if(!confirm('Are you sure you want to delete the page: ' + wiki_page_name)) {
+			return;
+		}
+		$.post("wiki/{{$channel}}/delete/page", {name: wiki_page_url, resource_id: wiki_resource_id},
+		function (data) {
+			if (data.success) {
+				window.console.log('Page deleted successfully.');
+				if(wiki_page_url == window.wiki_page_name) {
+					var url = window.location.href;
+					if(url.substr(-1) == '/')
+						url = url.substr(0, url.length - 2);
+					url = url.split('/');
+					url.pop();
+					window.location = url.join('/');
+				}
+				else {
+					$('#' + wiki_link_id).remove();
+				}
+			} else {
+				alert('Error deleting page.'); // TODO: Replace alerts with auto-timeout popups
+				window.console.log('Error deleting page.');
+			}
+		}, 'json');
+		return false;
+	}
+
+	function wiki_show_new_page_form() {
+		$('#new-page-form-wrapper').toggle();
+		$('#id_pageName').focus();
+		return false;
+	}
+</script>
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
new file mode 100644
index 000000000..760cf41b9
--- /dev/null
+++ b/view/tpl/wikilist.tpl
@@ -0,0 +1,78 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $owner}}
+		<button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$create}}</button>
+		{{/if}}
+		<h2>{{$header}}</h2>
+	</div>
+	{{if $owner}}
+	<div id="new-wiki-form-wrapper" class="section-content-tools-wrapper">
+		<form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+			{{include file="field_input.tpl" field=$wikiName}}
+			{{include file="field_select.tpl" field=$mimeType}}
+			{{include file="field_checkbox.tpl" field=$notify}}
+			<div>
+				<div class="btn-group pull-right">
+					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">
+						<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
+					</button>
+					<button id="new-wiki-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
+				</div>
+			</div>
+		</form>
+		{{$acl}}
+		<div class="clear"></div>
+	</div>
+	{{/if}}
+	<div class="section-content-wrapper-np">
+		<table id="wikis-index">
+			<tr>
+				<th width="96%">{{$name}}</th>
+				<th width="1%">{{$type}}</th>
+				<th width="1%" class="wikis-index-tool"></th>
+				<!-- th width="1%" class="wikis-index-tool"></th -->
+				{{if $owner}}
+				<th width="1%"></th>
+				{{/if}}
+			</tr>
+			{{foreach $wikis as $wiki}}
+			<tr class="wikis-index-row">
+				<td><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a></td>
+				<td>{{$wiki.mimeType}}</td>
+				<td class="wiki-index-tool dropdown">
+					{{if $wiki.lock}}
+					<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i></button>
+					<ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
+					{{/if}}
+				</td>
+				<!-- td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td -->
+				{{if $owner}}
+				<td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td>
+				{{/if}}
+			</tr>
+			{{/foreach}}
+		</table>
+	</div>
+</div>
+<script>
+	{{if $owner}}
+	function wiki_delete_wiki(wikiHtmlName, resource_id) {
+		if(!confirm('Are you sure you want to delete the entire wiki: ' + JSON.stringify(wikiHtmlName))) {
+			return;
+		}
+		$.post("wiki/{{$channel}}/delete/wiki", {resource_id: resource_id}, function (data) {
+			if (data.success) {
+				window.console.log('Wiki deleted');
+				// Refresh list and redirect page as necessary
+				window.location = 'wiki/{{$channel}}';
+			} else {
+				alert('Error deleting wiki!');
+				window.console.log('Error deleting wiki.');
+			}
+		}, 'json');
+	}
+	{{/if}}
+	function wiki_download_wiki(resource_id) {
+			window.location = "wiki/{{$channel}}/download/wiki/" + resource_id;
+	}
+</script>
diff --git a/view/tpl/wikilist_widget.tpl b/view/tpl/wikilist_widget.tpl
new file mode 100644
index 000000000..9853f9850
--- /dev/null
+++ b/view/tpl/wikilist_widget.tpl
@@ -0,0 +1,8 @@
+<div id="wiki_list" class="widget">
+	<h3>{{$header}}</h3>
+	<ul class="nav nav-pills flex-column">
+		{{foreach $wikis as $wiki}}
+		<li class="nav-item"><a class="nav-link" href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}">{{$wiki.title}}</a></li> 
+		{{/foreach}}
+	</ul>
+</div>
diff --git a/view/tpl/write_pages.tpl b/view/tpl/write_pages.tpl
new file mode 100644
index 000000000..53146ee30
--- /dev/null
+++ b/view/tpl/write_pages.tpl
@@ -0,0 +1,3 @@
+<div id="write-pages" class="bigwidget">
+<span id="wp-new"><a href="{{$newurl}}">{{$new}}</a></span> <span id="wp-edit"><a href="{{$editurl}}">{{$edit}}</a></span>
+</div>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
new file mode 100755
index 000000000..ac796cd47
--- /dev/null
+++ b/view/tpl/xchan_vcard.tpl
@@ -0,0 +1,10 @@
+<div id="vcard" class="vcard h-card">
+<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo u-photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
+{{if $connect}}
+<div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
+{{/if}}
+<div class="fn p-name">{{$name}}</div>
+</div>
+
+
+
diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl
new file mode 100644
index 000000000..aa0d8c740
--- /dev/null
+++ b/view/tpl/xrd_diaspora.tpl
@@ -0,0 +1,3 @@
+	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
+	<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
+	<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />
diff --git a/view/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl
new file mode 100755
index 000000000..2a40dcf47
--- /dev/null
+++ b/view/tpl/xrd_host.tpl
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
+     xmlns:hm='http://host-meta.net/xrd/1.0'>
+ 
+    <hm:Host>{{$zhost}}</hm:Host>
+ 
+    <Link rel='lrdd' type="application/xrd+xml" template='{{$zroot}}/xrd/?uri={uri}' />
+	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
+        href="{{$zroot}}/oexchange/xrd" />
+
+</XRD>
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
new file mode 100755
index 000000000..93fdcb1df
--- /dev/null
+++ b/view/tpl/xrd_person.tpl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+ 
+    <Subject>{{$accturi}}</Subject>
+	{{if $aliases}}{{foreach $aliases as $a}}
+	<Alias>{{$a}}</Alias>   
+	{{/foreach}}{{/if}}
+
+    <Link rel="http://schemas.google.com/g/2010#updates-from" 
+          type="application/atom+xml" 
+          href="{{$atom}}" />
+    <Link rel="http://webfinger.net/rel/profile-page"
+          type="text/html"
+          href="{{$profile_url}}" />
+    <Link rel="http://portablecontacts.net/spec/1.0"
+          href="{{$poco_url}}" />
+    <Link rel="http://webfinger.net/rel/avatar"
+          type="image/jpeg"
+          href="{{$photo}}" />
+    <Link rel="http://microformats.org/profile/hcard"
+          type="text/html"
+          href="{{$hcard_url}}" />
+    <Link rel="http://ostatus.org/schema/1.0/subscribe"
+          template="{{$subscribe}}" />
+
+   <Link rel="magic-public-key"
+          href="{{$modexp}}" />
+
+	{{$dspr}}
+
+</XRD>
diff --git a/view/tpl/zcard.tpl b/view/tpl/zcard.tpl
new file mode 100644
index 000000000..908f07631
--- /dev/null
+++ b/view/tpl/zcard.tpl
@@ -0,0 +1,144 @@
+<style>
+{{if $size == 'hz_large'}}
+.hz_card {
+/*	-moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); 
+	transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */
+	font-family: sans-serif, arial, freesans;
+}
+.hz_cover_photo {
+	max-width: 100%;
+}
+.hz_profile_photo {
+	position: relative;
+	top: -300px;
+	left: 30px;
+	background-color: white;
+	border: 1px solid #ddd;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	padding: 10px;
+	width: 320px;
+	height: 320px;
+}
+
+.hz_name {
+	position: relative;
+	top: -100px;
+	left: 400px;
+	color: #fff;
+	font-size: 48px;
+    text-rendering: optimizelegibility;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
+}
+.hz_addr {
+	position: relative;
+	top: -110px;
+	left: 400px;
+	color: #fff;
+	font-size: 24px;
+    text-rendering: optimizelegibility;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
+}	
+{{elseif $size == 'hz_medium'}}
+.hz_card {
+/*	-moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); 
+	transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */
+	font-family: sans-serif, arial, freesans;
+	width: 100%;
+	overflow: hidden; 
+	height: 390px; 
+}
+.hz_cover_photo img {
+	width: {{$maxwidth}}px;
+/*	max-width: 100%; */
+}
+.hz_profile_photo {
+	position: relative;
+	top: -165px;
+	left: 30px;
+
+	width: 150px;
+	height: 150px;
+}
+.hz_profile_photo img {
+	background-color: white;
+	border: 1px solid #ddd;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	padding: 5px;
+	width: 150px;
+	height: 150px;
+}
+
+.hz_name {
+	position: relative;
+	top: -100px;
+	left: 210px;
+	color: #fff;
+	font-size: 32px;
+    text-rendering: optimizelegibility;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
+}
+.hz_addr {
+	position: relative;
+	top: -100px;
+	left: 210px;
+	color: #fff;
+	font-size: 18px;
+    text-rendering: optimizelegibility;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
+}	
+
+
+{{else}}
+.hz_card {
+/*	-moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); 
+	transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */
+	font-family: sans-serif, arial, freesans;
+}
+.hz_cover_photo {
+	max-width: 100%;
+}
+.hz_profile_photo {
+	position: relative;
+	top: -75px;
+	left: 20px;
+	background-color: white;
+	border: 1px solid #ddd;
+/*	border-radius: 5px;
+	-moz-border-radius: 5px; */
+	padding: 3px;
+	width: 80px;
+	height: 80px;
+}
+
+.hz_name {
+	position: relative;
+	top: -40px;
+	left: 120px;
+	color: #fff;
+	font-size: 18px;
+    text-rendering: optimizelegibility;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
+}
+.hz_addr {
+	position: relative;
+	top: -40px;
+	left: 120px;
+	color: #fff;
+	font-size: 10px;
+    text-rendering: optimizelegibility;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);
+}	
+{{/if}}
+
+</style>
+
+<div class="hz_card {{$size}}">
+	<div class="hz_cover_photo"><img src="{{$cover.href}}" alt="{{$zcard.chan.xchan_name}}" />
+		<div class="hz_name">{{$zcard.chan.xchan_name}}</div>
+		<div class="hz_addr">{{$zcard.chan.channel_addr}}</div>
+	</div>
+	<div class="hz_profile_photo"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></div>
+</div>
+
diff --git a/view/tpl/zcard_embed.tpl b/view/tpl/zcard_embed.tpl
new file mode 100644
index 000000000..5c7a925e3
--- /dev/null
+++ b/view/tpl/zcard_embed.tpl
@@ -0,0 +1,8 @@
+<div class="hz_card {{$size}}">
+	<div class="hz_cover_photo" style="max-width: 100;"><a href="{{$zcard.chan.xchan_url}}"><img src="{{$cover.href}}" alt="{{$zcard.chan.xchan_name}}" /></a>
+		<div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 18px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.xchan_name}}</div>
+		<div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 10px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.channel_addr}}</div>
+	</div>
+	<div style="position:relative;top: -75px;left: 20px;background-color: white;border: 1px solid #ddd;padding: 3px;width: 80px;height: 80px;"><a href="{{$zcard.chan.xchan_url}}"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></a></div>
+</div>
+
-- 
cgit v1.2.3


From 7acb0685904bd66cd89ef15e181148d31c6813dc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 2 May 2017 18:24:18 -0700
Subject: profile_sidebar hook ignored the updated html content

---
 view/tpl/diaspora_vcard.tpl | 69 ---------------------------------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 view/tpl/diaspora_vcard.tpl

(limited to 'view')

diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl
deleted file mode 100644
index 017eb555c..000000000
--- a/view/tpl/diaspora_vcard.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-<div style="display:none;">
-	<dl class="entity_uid">
- 		<dt>Uid</dt>
- 		<dd>
-			<span class="uid p-uid">{{$diaspora.guid}}</span>
- 		</dd>
-	</dl>
-	<dl class='entity_nickname'>
-		<dt>Nickname</dt>
-		<dd>		
-			<span class="nickname p-nickname">{{$diaspora.nickname}}</span>
-		</dd>
-	</dl>
-	<dl class='entity_full_name'>
-		<dt>Full name</dt>
-		<dd>
-			<span class='fn p-name'>{{$diaspora.fullname}}</span>
-		</dd>
-	</dl>
-
-	<dl class='entity_first_name'>
-		<dt>First name</dt>
-		<dd>
-		<span class='given_name p-given-name'>{{$diaspora.firstname}}</span>
-		</dd>
-	</dl>
-	<dl class='entity_family_name'>
-		<dt>Family name</dt>
-		<dd>
-		<span class='family_name p-family-name'>{{$diaspora.lastname}}</span>
-		</dd>
-	</dl>
-	<dl class="entity_url">
-		<dt>URL</dt>
-		<dd>
-			<a href="{{$diaspora.podloc}}/" id="pod_location" class="url" rel="me" >{{$diaspora.podloc}}/</a>
-		</dd>
-	</dl>
-	<dl class="entity_photo">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}" />
-		</dd>
-	</dl>
-	<dl class="entity_photo_medium">
-		<dt>Photo</dt>
-		<dd> 
-			<img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}" />
-		</dd>
-	</dl>
-	<dl class="entity_photo_small">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}" />
-		</dd>
-	</dl>
-	<dl class="entity_searchable">
-		<dt>Searchable</dt>
-		<dd>
-			<span class="searchable">{{$diaspora.searchable}}</span>
-		</dd>
-	</dl>
-	<dl class="entity_key">
-		<dt>Key</dt>
-		<dd>
-		<pre class="key">{{$diaspora.pubkey}}</pre>
-		</dd>
-	</dl>
-</div>
-- 
cgit v1.2.3


From 4933aef543dbdec66f50f27599d6eb68b4a8432a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 2 May 2017 22:40:31 -0700
Subject: more cleanup

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

(limited to 'view')

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


From 394352d882064ce1b6d36a725eb6051a777566e2 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Wed, 3 May 2017 20:45:34 -0400
Subject: German translations for demohub

---
 view/de/hmessages.po | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'view')

diff --git a/view/de/hmessages.po b/view/de/hmessages.po
index 62f7fe602..e8c16faaa 100644
--- a/view/de/hmessages.po
+++ b/view/de/hmessages.po
@@ -13751,3 +13751,19 @@ msgstr "Cron-Aufgaben laufen nicht."
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron-Aufgaben für %s laufen nicht"
+
+#: ../../addon/demohub/demohub.php:41
+msgid "Welcome to the Hubzilla demo hub!"
+msgstr "Willkommen auf dem Hubzilla demo Hub!"
+
+#: ../../addon/demohub/demohub.php:42
+msgid "This demo hub is designed to give you a chance to explore some of the features offered by the Hubzilla platform. The activities of the fictional characters illustrate only a few of the ways communities can use Hubzilla to collaborate and connect."
+msgstr "Dieser demo Hub (Hubzilla-Knoten) ist konzipiert, um Ihnen eine Chance zu geben, einige Features der Hubzilla-Platform kennenzulernen. Die fiktive Aktivitäten illustrieren nur einige von vielen Möglichkeiten, die den Communities für die Kommunikation und Zusammenarbeit im Hubzilla-Netzwerk zur Verfügung stehen."
+
+#: ../../addon/demohub/demohub.php:45
+msgid "To really grasp what Hubzilla is offering in terms of nomadic identity and decentralized access control, you have to try it for yourself. Run your own hub or register on an open hub. You can always clone your channels and migrate to another hub later. With Hubzilla, <i>you</i> not only own your <b>data</b>, but your <b>identity</b> as well!</p><p>The demo resets every ten minutes, which may interrupt your session. Simply reload the page as necessary. You can return to this dialog using the blue info button in the navbar."
+msgstr "Sie können selbst in der Praxis testen, welche Möglichkeiten Ihnen im Hubzilla-Netzwerk mit Nomadic Identity und mit dem dezentralen Zugang. Richten Sie einen eigenen Hubzilla-Knoten ein oder registrieren Sie sich auf einem offenen Hub. Sie können dann Ihren Kanal klonen oder mit diesem Kanal auf einen anderen Hub umziehen. Mit Hubzilla kontrollieren Sie Ihre Daten, aber auch Ihre Identität!</p><p>Die Demoinstanz wird im 10-Minuten-Takt zurückgesetzt, wobei Ihre Hubzilla-Sitzung evtl. unterbrochen wird. Laden Sie die Website #^https://demo.hubzilla.org/ einfach neu, um fortzufahren. Sie können dieses Dialog-Fenster mit einem Klick auf das blaue [i]-Symbol rechts oben in der Navigationsleiste."
+
+#: ../../addon/demohub/demohub.php:52
+msgid "Explore"
+msgstr "Erforschen"
\ No newline at end of file
-- 
cgit v1.2.3


From 5dd501e0ea0c6d1021bb1fd5a1c1a61bcb44d168 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 5 May 2017 12:57:41 +0200
Subject: css fix

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

(limited to 'view')

diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index f490483b8..bd5176c83 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -64,4 +64,4 @@
 				<div class="clear"></div>
 			</form>
 		</div>
-		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview"></div>
+		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview mt-4"></div>
-- 
cgit v1.2.3


From dcc8a94d07cb60b0bc814a30ccdae41a49133649 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 5 May 2017 14:40:35 +0200
Subject: css hack to make remote channel menu header look in line with the
 rest if in collapsed state

---
 view/css/bootstrap-red.css | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 2f570a058..08154ca2c 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -55,6 +55,12 @@ nav .dropdown-menu {
 	overflow: auto;
 }
 
+
+#navbar-collapse-2.collapsing .dropdown-header,
+#navbar-collapse-2.show .dropdown-header {
+	padding: 0.5rem 0.1rem;
+}
+
 .navbar-inverse .navbar-toggler {
 	color: rgba(255,255,255,1);
 }
-- 
cgit v1.2.3


From 3ccefa20e8b10d0a507c6b002237664e721ca389 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 5 May 2017 16:32:20 +0200
Subject: collapse sysapps if viewing a remote channel

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

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 4ab2634ef..faa292fe5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -886,7 +886,8 @@ a .drop-icons:hover {
 	color: #FF0000;
 }
 
-.lockview {
+.lockview,
+.sys-apps-toggle {
 	cursor: pointer;
 }
 
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index c5b378b4f..5c301b4d2 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -188,10 +188,22 @@
 		{{/if}}
 		<li class="nav-item dropdown" id="app-menu">
 			<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
-			<div class="dropdown-menu dropdown-menu-right">
-				{{foreach $navapps as $navapp}}
-				{{$navapp}}
+			<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+				{{if $channel_apps.0}}
+				{{foreach $channel_apps as $channel_app}}
+				{{$channel_app}}
 				{{/foreach}}
+				<div class="dropdown-header sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
+					{{$sysapps_toggle}}
+				</div>
+				<div id="sys_apps" style="display:none;">
+				{{/if}}
+				{{foreach $nav_apps as $nav_app}}
+				{{$nav_app}}
+				{{/foreach}}
+				{{if $channel_apps.0}}
+				</div>
+				{{/if}}
 				{{if $localuser}}
 				<div class="dropdown-divider"></div>
 				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
@@ -202,9 +214,21 @@
 </div>
 <div class="collapse d-md-none" id="navbar-collapse-2">
 	<div class="navbar-nav mr-auto">
-		{{foreach $navapps as $navapp}}
-		{{$navapp|replace:'dropdown-item':'nav-link'}}
+		{{if $channel_apps.0}}
+		{{foreach $channel_apps as $channel_app}}
+		{{$channel_app|replace:'dropdown-item':'nav-link'}}
 		{{/foreach}}
+		<div class="dropdown-header sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
+			{{$sysapps_toggle}}
+		</div>
+		<div id="sys-apps-collapsed" style="display:none;">
+		{{/if}}
+		{{foreach $nav_apps as $nav_app}}
+		{{$nav_app|replace:'dropdown-item':'nav-link'}}
+		{{/foreach}}
+		{{if $channel_apps.0}}
+		</div>
+		{{/if}}
 		{{if $localuser}}
 		<div class="dropdown-divider"></div>
 		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
-- 
cgit v1.2.3


From 6fe6e1596f4cddd8a9bb404a37ba025cd5102b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= <mjfriaza@openmailbox.org>
Date: Mon, 8 May 2017 13:12:26 +0200
Subject: Updated the Spanish translation

---
 view/es-es/hmessages.po | 1101 ++++++++++++++++++++++++-----------------------
 view/es-es/hstrings.php |    7 +-
 2 files changed, 564 insertions(+), 544 deletions(-)

(limited to 'view')

diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index c0d5e0870..f67a524d5 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-31 10:53+0200\n"
-"PO-Revision-Date: 2017-04-10 10:38+0000\n"
+"POT-Creation-Date: 2017-05-01 15:36+0200\n"
+"PO-Revision-Date: 2017-05-04 10:22+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -96,90 +96,90 @@ msgid "Can administer my channel"
 msgstr "Se puede administrar mi canal"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:248
-#: ../../include/permissions.php:945
+#: ../../include/permissions.php:946
 msgid "Social Networking"
 msgstr "Redes sociales"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:249
-#: ../../include/permissions.php:945
+#: ../../include/permissions.php:946
 msgid "Social - Mostly Public"
 msgstr "Social - Público en su mayor parte"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:250
-#: ../../include/permissions.php:945
+#: ../../include/permissions.php:946
 msgid "Social - Restricted"
 msgstr "Social - Restringido"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:251
-#: ../../include/permissions.php:945
+#: ../../include/permissions.php:946
 msgid "Social - Private"
 msgstr "Social - Privado"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:254
-#: ../../include/permissions.php:946
+#: ../../include/permissions.php:947
 msgid "Community Forum"
 msgstr "Foro de discusión"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:255
-#: ../../include/permissions.php:946
+#: ../../include/permissions.php:947
 msgid "Forum - Mostly Public"
 msgstr "Foro - Público en su mayor parte"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:256
-#: ../../include/permissions.php:946
+#: ../../include/permissions.php:947
 msgid "Forum - Restricted"
 msgstr "Foro - Restringido"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:257
-#: ../../include/permissions.php:946
+#: ../../include/permissions.php:947
 msgid "Forum - Private"
 msgstr "Foro - Privado"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:260
-#: ../../include/permissions.php:947
+#: ../../include/permissions.php:948
 msgid "Feed Republish"
 msgstr "Republicar un \"feed\""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:261
-#: ../../include/permissions.php:947
+#: ../../include/permissions.php:948
 msgid "Feed - Mostly Public"
 msgstr "Feed - Público en su mayor parte"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:262
-#: ../../include/permissions.php:947
+#: ../../include/permissions.php:948
 msgid "Feed - Restricted"
 msgstr "Feed - Restringido"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:265
-#: ../../include/permissions.php:948
+#: ../../include/permissions.php:949
 msgid "Special Purpose"
 msgstr "Propósito especial"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:266
-#: ../../include/permissions.php:948
+#: ../../include/permissions.php:949
 msgid "Special - Celebrity/Soapbox"
 msgstr "Especial - Celebridad / Tribuna improvisada"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:267
-#: ../../include/permissions.php:948
+#: ../../include/permissions.php:949
 msgid "Special - Group Repository"
 msgstr "Especial - Repositorio de grupo"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:270
 #: ../../Zotlabs/Module/New_channel.php:132
 #: ../../Zotlabs/Module/Settings/Channel.php:463
-#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:798
+#: ../../Zotlabs/Module/Connedit.php:914 ../../Zotlabs/Module/Profiles.php:798
 #: ../../Zotlabs/Module/Register.php:213 ../../addon/cdav/Mod_Cdav.php:1148
 #: ../../addon/cdav/cdav.php:277 ../../addon/cdav/cdav.php:284
 #: ../../include/selectors.php:49 ../../include/selectors.php:66
 #: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:949 ../../include/connections.php:675
+#: ../../include/permissions.php:950 ../../include/connections.php:675
 #: ../../include/connections.php:682
 msgid "Other"
 msgstr "Otro"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:271
-#: ../../include/permissions.php:949
+#: ../../include/permissions.php:950
 msgid "Custom/Expert Mode"
 msgstr "Modo personalizado/experto"
 
@@ -189,7 +189,7 @@ msgstr "Modo personalizado/experto"
 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32
 #: ../../Zotlabs/Module/Webpages.php:33
-#: ../../Zotlabs/Module/Filestorage.php:59 ../../include/channel.php:943
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../include/channel.php:945
 msgid "Requested profile is not available."
 msgstr "El perfil solicitado no está disponible."
 
@@ -209,14 +209,14 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67
 #: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100
 #: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Bookmarks.php:61
+#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:61
 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
 #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:315
 #: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:137
 #: ../../Zotlabs/Module/Profile_photo.php:280
 #: ../../Zotlabs/Module/Profile_photo.php:293
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:220
-#: ../../Zotlabs/Module/Item.php:230 ../../Zotlabs/Module/Item.php:1037
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:221
+#: ../../Zotlabs/Module/Item.php:231 ../../Zotlabs/Module/Item.php:1038
 #: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
 #: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Chat.php:98
 #: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Menu.php:78
@@ -225,8 +225,8 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
 #: ../../Zotlabs/Module/Editwebpage.php:68
 #: ../../Zotlabs/Module/Editwebpage.php:89
-#: ../../Zotlabs/Module/Editwebpage.php:104
-#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Manage.php:10
+#: ../../Zotlabs/Module/Editwebpage.php:107
+#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10
 #: ../../Zotlabs/Module/Webpages.php:116 ../../Zotlabs/Module/Block.php:26
 #: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Editpost.php:17
 #: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Like.php:181
@@ -253,7 +253,7 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../include/attach.php:344 ../../include/attach.php:358
 #: ../../include/attach.php:365 ../../include/attach.php:442
 #: ../../include/attach.php:909 ../../include/attach.php:983
-#: ../../include/attach.php:1148 ../../include/items.php:3457
+#: ../../include/attach.php:1148 ../../include/items.php:3470
 #: ../../include/photos.php:27
 msgid "Permission denied."
 msgstr "Acceso denegado."
@@ -263,7 +263,7 @@ msgstr "Acceso denegado."
 msgid "Block Name"
 msgstr "Nombre del bloque"
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2275
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2267
 msgid "Blocks"
 msgstr "Bloques"
 
@@ -285,7 +285,7 @@ msgstr "Editado"
 
 #: ../../Zotlabs/Module/Blocks.php:159
 #: ../../Zotlabs/Module/New_channel.php:147
-#: ../../Zotlabs/Module/Connedit.php:925 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Menu.php:118
 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801
 #: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Storage/Browser.php:228
 #: ../../Zotlabs/Storage/Browser.php:332 ../../addon/cdav/Mod_Cdav.php:1151
@@ -302,15 +302,15 @@ msgstr "Crear"
 #: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Wiki.php:165
 #: ../../Zotlabs/Module/Wiki.php:275 ../../Zotlabs/Module/Menu.php:112
 #: ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Editwebpage.php:147
-#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Editpost.php:85
-#: ../../Zotlabs/Lib/Apps.php:357 ../../Zotlabs/Lib/ThreadItem.php:107
+#: ../../Zotlabs/Module/Editwebpage.php:142
+#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Editpost.php:80
+#: ../../Zotlabs/Lib/Apps.php:367 ../../Zotlabs/Lib/ThreadItem.php:107
 #: ../../Zotlabs/Storage/Browser.php:238
 #: ../../addon/cdav/include/widgets.php:125
 #: ../../addon/cdav/include/widgets.php:161
 #: ../../addon/gitwiki/Mod_Gitwiki.php:151
-#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1042
-#: ../../include/channel.php:1046 ../../include/menu.php:113
+#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1044
+#: ../../include/channel.php:1048 ../../include/menu.php:113
 #: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
 msgid "Edit"
 msgstr "Editar"
@@ -329,11 +329,11 @@ msgstr "Compartir"
 #: ../../Zotlabs/Module/Settings/Oauth.php:150
 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:139
 #: ../../Zotlabs/Module/Connections.php:267
-#: ../../Zotlabs/Module/Photos.php:1143 ../../Zotlabs/Module/Connedit.php:658
-#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Photos.php:1143 ../../Zotlabs/Module/Connedit.php:650
+#: ../../Zotlabs/Module/Connedit.php:919 ../../Zotlabs/Module/Group.php:177
 #: ../../Zotlabs/Module/Profiles.php:803
-#: ../../Zotlabs/Module/Editwebpage.php:172
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/Apps.php:358
+#: ../../Zotlabs/Module/Editwebpage.php:167
+#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/Apps.php:368
 #: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:239
 #: ../../addon/cdav/Mod_Cdav.php:864 ../../addon/cdav/Mod_Cdav.php:1153
 #: ../../include/conversation.php:654
@@ -388,7 +388,7 @@ msgstr "Enviar invitaciones"
 msgid "Enter email addresses, one per line:"
 msgstr "Introduzca las direcciones de correo electrónico, una por línea:"
 
-#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284
+#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:303
 msgid "Your message:"
 msgstr "Su mensaje:"
 
@@ -420,7 +420,7 @@ msgstr "3. Pulse [conectar]"
 #: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Locs.php:121
 #: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493
 #: ../../Zotlabs/Module/Appman.php:134
-#: ../../Zotlabs/Module/Import_items.php:126
+#: ../../Zotlabs/Module/Import_items.php:129
 #: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:357
 #: ../../Zotlabs/Module/Connect.php:98
 #: ../../Zotlabs/Module/Admin/Features.php:66
@@ -442,21 +442,21 @@ msgstr "3. Pulse [conectar]"
 #: ../../Zotlabs/Module/Settings/Display.php:203
 #: ../../Zotlabs/Module/Settings/Oauth.php:87
 #: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Import.php:511 ../../Zotlabs/Module/Cal.php:343
+#: ../../Zotlabs/Module/Import.php:514 ../../Zotlabs/Module/Cal.php:343
 #: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:657
 #: ../../Zotlabs/Module/Photos.php:1022 ../../Zotlabs/Module/Photos.php:1062
 #: ../../Zotlabs/Module/Photos.php:1180 ../../Zotlabs/Module/Wiki.php:169
 #: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Connedit.php:890 ../../Zotlabs/Module/Chat.php:194
+#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Chat.php:194
 #: ../../Zotlabs/Module/Chat.php:240 ../../Zotlabs/Module/Pconfig.php:107
 #: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Profiles.php:726
 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
-#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:425
+#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:449
 #: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Rate.php:166
 #: ../../Zotlabs/Lib/ThreadItem.php:732
 #: ../../Zotlabs/Widget/Eventstools.php:16
 #: ../../view/theme/redbasic/php/config.php:84
-#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:133
+#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:134
 #: ../../addon/cdav/cdav.php:246 ../../addon/planets/planets.php:157
 #: ../../addon/openclipatar/openclipatar.php:53
 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92
@@ -465,7 +465,7 @@ msgstr "3. Pulse [conectar]"
 #: ../../addon/likebanner/likebanner.php:57
 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53
 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113
-#: ../../addon/diaspora/diaspora.php:714
+#: ../../addon/diaspora/diaspora.php:712
 #: ../../addon/gitwiki/Mod_Gitwiki.php:155
 #: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/visage/visage.php:170
 #: ../../addon/nsabait/nsabait.php:161 ../../addon/mailtest/mailtest.php:100
@@ -511,7 +511,7 @@ msgid "Edit Layout"
 msgstr "Modificar la plantilla"
 
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
-#: ../../Zotlabs/Module/Import_items.php:118 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:72
 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
 #: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Web/WebServer.php:130
 #: ../../addon/redphotos/redphotos.php:119
@@ -528,7 +528,7 @@ msgstr "Identificador del perfil no válido"
 msgid "Profile Visibility Editor"
 msgstr "Editor de visibilidad del perfil"
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1360
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1362
 msgid "Profile"
 msgstr "Perfil"
 
@@ -636,7 +636,7 @@ msgstr "Acceso público denegado."
 #: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:312
 #: ../../Zotlabs/Lib/Apps.php:237 ../../Zotlabs/Widget/Sitesearch.php:31
 #: ../../include/text.php:1027 ../../include/text.php:1039
-#: ../../include/acl_selectors.php:213 ../../include/nav.php:160
+#: ../../include/acl_selectors.php:213 ../../include/nav.php:164
 msgid "Search"
 msgstr "Buscar"
 
@@ -685,7 +685,7 @@ msgstr "Ubicación"
 
 #: ../../Zotlabs/Module/Locs.php:118
 #: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Profiles.php:502
+#: ../../Zotlabs/Module/Connedit.php:909 ../../Zotlabs/Module/Profiles.php:502
 #: ../../Zotlabs/Module/Profiles.php:793 ../../addon/cdav/Mod_Cdav.php:1143
 msgid "Address"
 msgstr "Dirección"
@@ -770,11 +770,11 @@ msgstr "Usar la autenticación mágica si está disponible"
 #: ../../Zotlabs/Module/Settings/Channel.php:294
 #: ../../Zotlabs/Module/Settings/Display.php:103
 #: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:642
-#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:399
-#: ../../Zotlabs/Module/Connedit.php:783 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:392
+#: ../../Zotlabs/Module/Connedit.php:775 ../../Zotlabs/Module/Menu.php:100
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Profiles.php:681
 #: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1635
+#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1633
 #: ../../view/theme/redbasic/php/config.php:89
 #: ../../view/theme/redbasic/php/config.php:104 ../../addon/cdav/cdav.php:234
 #: ../../addon/planets/planets.php:153 ../../addon/wppost/wppost.php:82
@@ -817,11 +817,11 @@ msgstr "No"
 #: ../../Zotlabs/Module/Settings/Channel.php:294
 #: ../../Zotlabs/Module/Settings/Display.php:103
 #: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:642
-#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:399
+#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:392
 #: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
 #: ../../Zotlabs/Module/Profiles.php:681
 #: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1635
+#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1633
 #: ../../view/theme/redbasic/php/config.php:89
 #: ../../view/theme/redbasic/php/config.php:104 ../../addon/cdav/cdav.php:234
 #: ../../addon/planets/planets.php:153 ../../addon/wppost/wppost.php:82
@@ -963,7 +963,7 @@ msgstr "Evento no encontrado."
 
 #: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:51
 #: ../../Zotlabs/Module/Like.php:372 ../../include/conversation.php:119
-#: ../../include/text.php:1948 ../../include/event.php:1141
+#: ../../include/text.php:1940 ../../include/event.php:1141
 msgid "event"
 msgstr "evento"
 
@@ -1069,7 +1069,7 @@ msgid "Delete event"
 msgstr "Borrar evento"
 
 #: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:313
-#: ../../include/text.php:1767
+#: ../../include/text.php:1759
 msgid "Link to Source"
 msgstr "Enlazar con la entrada en su ubicación original"
 
@@ -1099,7 +1099,7 @@ msgid "Next"
 msgstr "Siguiente"
 
 #: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:339
-#: ../../include/channel.php:1363
+#: ../../include/channel.php:1365
 msgid "Export"
 msgstr "Exportar"
 
@@ -1190,15 +1190,15 @@ msgstr "Servidor no encontrado"
 
 #: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Tagger.php:47
 #: ../../Zotlabs/Module/Like.php:370
-#: ../../addon/redphotos/redphotohelper.php:74
-#: ../../addon/diaspora/inbound.php:1794 ../../include/conversation.php:116
-#: ../../include/text.php:1945
+#: ../../addon/redphotos/redphotohelper.php:71
+#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:116
+#: ../../include/text.php:1937
 msgid "photo"
 msgstr "foto"
 
 #: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Like.php:370
-#: ../../addon/diaspora/inbound.php:1794 ../../include/conversation.php:144
-#: ../../include/text.php:1951
+#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:144
+#: ../../include/text.php:1943
 msgid "status"
 msgstr "el mensaje de estado"
 
@@ -1212,41 +1212,41 @@ msgstr "%1$s está siguiendo %3$s de %2$s"
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr "%1$s ha dejado de seguir %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Import_items.php:46 ../../Zotlabs/Module/Import.php:64
+#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64
 msgid "Nothing to import."
 msgstr "No hay nada para importar."
 
-#: ../../Zotlabs/Module/Import_items.php:70 ../../Zotlabs/Module/Import.php:79
+#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79
 #: ../../Zotlabs/Module/Import.php:95
 msgid "Unable to download data from old server"
 msgstr "No se han podido descargar datos de su antiguo servidor"
 
-#: ../../Zotlabs/Module/Import_items.php:75
+#: ../../Zotlabs/Module/Import_items.php:77
 #: ../../Zotlabs/Module/Import.php:102
 msgid "Imported file is empty."
 msgstr "El fichero importado está vacío."
 
-#: ../../Zotlabs/Module/Import_items.php:91
+#: ../../Zotlabs/Module/Import_items.php:93
 #: ../../Zotlabs/Module/Import.php:121
 #, php-format
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr "Atención: Las versiones de la base de datos difieren en %1$d actualizaciones."
 
-#: ../../Zotlabs/Module/Import_items.php:106
+#: ../../Zotlabs/Module/Import_items.php:108
 msgid "Import completed"
 msgstr "Importación completada"
 
-#: ../../Zotlabs/Module/Import_items.php:123
+#: ../../Zotlabs/Module/Import_items.php:125
 msgid "Import Items"
 msgstr "Importar elementos"
 
-#: ../../Zotlabs/Module/Import_items.php:124
+#: ../../Zotlabs/Module/Import_items.php:126
 msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr "Utilice este formulario para importar entradas existentes y contenido desde un archivo de exportación."
 
-#: ../../Zotlabs/Module/Import_items.php:125
-#: ../../Zotlabs/Module/Import.php:499
+#: ../../Zotlabs/Module/Import_items.php:127
+#: ../../Zotlabs/Module/Import.php:501
 msgid "File to Upload"
 msgstr "Fichero para subir"
 
@@ -1362,8 +1362,8 @@ msgstr "Ficheros: compartidos conmigo"
 #: ../../Zotlabs/Module/Admin/Channels.php:159
 #: ../../Zotlabs/Module/Settings/Oauth.php:89
 #: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Wiki.php:172 ../../Zotlabs/Module/Connedit.php:910
-#: ../../Zotlabs/Module/Chat.php:249 ../../Zotlabs/Lib/NativeWikiPage.php:528
+#: ../../Zotlabs/Module/Wiki.php:172 ../../Zotlabs/Module/Connedit.php:902
+#: ../../Zotlabs/Module/Chat.php:249 ../../Zotlabs/Lib/NativeWikiPage.php:539
 #: ../../Zotlabs/Storage/Browser.php:233
 #: ../../Zotlabs/Widget/Wiki_page_history.php:22
 #: ../../addon/rendezvous/rendezvous.php:172
@@ -1376,7 +1376,7 @@ msgid "NEW"
 msgstr "NUEVO"
 
 #: ../../Zotlabs/Module/Sharedwithme.php:102
-#: ../../Zotlabs/Storage/Browser.php:235 ../../include/text.php:1417
+#: ../../Zotlabs/Storage/Browser.php:235 ../../include/text.php:1409
 msgid "Size"
 msgstr "Tamaño"
 
@@ -1977,9 +1977,9 @@ msgstr "Intentar ejecutar este paso de actualización automáticamente"
 
 #: ../../Zotlabs/Module/Admin/Plugins.php:259
 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../Zotlabs/Module/Display.php:35
+#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:35
 #: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Admin.php:60
-#: ../../include/items.php:3378
+#: ../../include/items.php:3391
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
@@ -2029,7 +2029,7 @@ msgstr "Cambiar"
 
 #: ../../Zotlabs/Module/Admin/Plugins.php:344
 #: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223
-#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:203
+#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:207
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -2092,7 +2092,7 @@ msgstr "Descargar el repositorio"
 msgid "Install new repo"
 msgstr "Instalar un nuevo repositorio"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:348
+#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:358
 msgid "Install"
 msgstr "Instalar"
 
@@ -2100,7 +2100,7 @@ msgstr "Instalar"
 #: ../../Zotlabs/Module/Settings/Oauth.php:88
 #: ../../Zotlabs/Module/Settings/Oauth.php:114
 #: ../../Zotlabs/Module/Wiki.php:265 ../../Zotlabs/Module/Wiki.php:290
-#: ../../Zotlabs/Module/Connedit.php:928 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Connedit.php:920 ../../Zotlabs/Module/Fbrowser.php:66
 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804
 #: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15
 #: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/cdav/Mod_Cdav.php:866
@@ -2126,8 +2126,8 @@ msgstr "Instalar un nuevo repositorio de plugins"
 #: ../../Zotlabs/Module/Admin/Plugins.php:453
 #: ../../Zotlabs/Module/Settings/Oauth.php:42
 #: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Connedit.php:926 ../../Zotlabs/Module/Profiles.php:802
-#: ../../Zotlabs/Lib/Apps.php:348 ../../addon/cdav/Mod_Cdav.php:1152
+#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Lib/Apps.php:358 ../../addon/cdav/Mod_Cdav.php:1152
 msgid "Update"
 msgstr "Actualizar"
 
@@ -2195,10 +2195,10 @@ msgstr "Fecha de solicitud"
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:169
 #: ../../Zotlabs/Module/Admin/Accounts.php:181
-#: ../../Zotlabs/Module/Connedit.php:914 ../../Zotlabs/Module/Profiles.php:790
+#: ../../Zotlabs/Module/Connedit.php:906 ../../Zotlabs/Module/Profiles.php:790
 #: ../../addon/cdav/Mod_Cdav.php:1140 ../../addon/openid/MysqlProvider.php:56
 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
-#: ../../addon/redred/redred.php:107 ../../include/network.php:2270
+#: ../../addon/redred/redred.php:107 ../../include/network.php:2315
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -2216,12 +2216,12 @@ msgid "Deny"
 msgstr "Rechazar"
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:174
-#: ../../Zotlabs/Module/Connedit.php:626
+#: ../../Zotlabs/Module/Connedit.php:618
 msgid "Block"
 msgstr "Bloquear"
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:175
-#: ../../Zotlabs/Module/Connedit.php:626
+#: ../../Zotlabs/Module/Connedit.php:618
 msgid "Unblock"
 msgstr "Desbloquear"
 
@@ -2364,7 +2364,7 @@ msgid "Disallow Code"
 msgstr "No permitir código"
 
 #: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1751
+#: ../../include/conversation.php:1760 ../../include/nav.php:369
 msgid "Channel"
 msgstr "Canal"
 
@@ -2413,7 +2413,7 @@ msgstr "[No soportado]"
 msgid "Site settings updated."
 msgstr "Ajustes del sitio actualizados."
 
-#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2923
+#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2915
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -3054,25 +3054,25 @@ msgstr "Nombre de la autorización"
 
 #: ../../Zotlabs/Module/Settings/Permcats.php:103
 #: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Connedit.php:894
+#: ../../Zotlabs/Module/Connedit.php:886
 msgid "My Settings"
 msgstr "Mis ajustes"
 
 #: ../../Zotlabs/Module/Settings/Permcats.php:105
 #: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Connedit.php:889
+#: ../../Zotlabs/Module/Connedit.php:881
 msgid "inherited"
 msgstr "heredado"
 
 #: ../../Zotlabs/Module/Settings/Permcats.php:108
 #: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Connedit.php:896
+#: ../../Zotlabs/Module/Connedit.php:888
 msgid "Individual Permissions"
 msgstr "Permisos individuales"
 
 #: ../../Zotlabs/Module/Settings/Permcats.php:109
 #: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Connedit.php:897
+#: ../../Zotlabs/Module/Connedit.php:889
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -3085,7 +3085,7 @@ msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><stron
 #: ../../Zotlabs/Module/Settings/Channel.php:67
 #: ../../Zotlabs/Module/Settings/Channel.php:70
 #: ../../Zotlabs/Module/Settings/Channel.php:81
-#: ../../Zotlabs/Module/Connedit.php:715 ../../Zotlabs/Widget/Affinity.php:28
+#: ../../Zotlabs/Module/Connedit.php:707 ../../Zotlabs/Widget/Affinity.php:28
 #: ../../include/selectors.php:123 ../../include/channel.php:406
 #: ../../include/channel.php:407 ../../include/channel.php:414
 msgid "Friends"
@@ -3163,7 +3163,7 @@ msgid "Basic Settings"
 msgstr "Configuración básica"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:482
-#: ../../include/channel.php:1248
+#: ../../include/channel.php:1250
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
@@ -3526,7 +3526,7 @@ msgid "Expires (yyyy-mm-dd)"
 msgstr "Expira (aaaa-mm-dd)"
 
 #: ../../Zotlabs/Module/Settings/Tokens.php:160
-#: ../../Zotlabs/Module/Connedit.php:893
+#: ../../Zotlabs/Module/Connedit.php:885
 msgid "Their Settings"
 msgstr "Sus ajustes"
 
@@ -3816,27 +3816,27 @@ msgstr "Sin nombre"
 msgid "Remove authorization"
 msgstr "Eliminar autorización"
 
-#: ../../Zotlabs/Module/Embedphotos.php:139
+#: ../../Zotlabs/Module/Embedphotos.php:140
 #: ../../Zotlabs/Module/Photos.php:751 ../../Zotlabs/Module/Photos.php:1290
 #: ../../Zotlabs/Widget/Album.php:78
 msgid "View Photo"
 msgstr "Ver foto"
 
-#: ../../Zotlabs/Module/Embedphotos.php:145
+#: ../../Zotlabs/Module/Embedphotos.php:146
 #: ../../Zotlabs/Module/Photos.php:757 ../../Zotlabs/Module/Photos.php:1213
-#: ../../Zotlabs/Lib/Apps.php:561 ../../Zotlabs/Lib/Apps.php:639
+#: ../../Zotlabs/Lib/Apps.php:571 ../../Zotlabs/Lib/Apps.php:649
 #: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Widget/Album.php:84
 #: ../../addon/cdav/Mod_Cdav.php:745 ../../addon/cdav/Mod_Cdav.php:746
 #: ../../addon/cdav/Mod_Cdav.php:753 ../../include/conversation.php:1110
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../../Zotlabs/Module/Embedphotos.php:155
+#: ../../Zotlabs/Module/Embedphotos.php:156
 #: ../../Zotlabs/Module/Photos.php:782 ../../Zotlabs/Widget/Album.php:95
 msgid "Edit Album"
 msgstr "Editar álbum"
 
-#: ../../Zotlabs/Module/Embedphotos.php:157
+#: ../../Zotlabs/Module/Embedphotos.php:158
 #: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1321
 #: ../../Zotlabs/Module/Profile_photo.php:423
 #: ../../Zotlabs/Module/Cover_photo.php:361
@@ -3905,7 +3905,7 @@ msgstr "Dirección para la foto o elemento (opcional)"
 
 #: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363
 #: ../../Zotlabs/Module/Photos.php:647 ../../Zotlabs/Module/Photos.php:1011
-#: ../../Zotlabs/Module/Connedit.php:680 ../../Zotlabs/Module/Chat.php:233
+#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:233
 #: ../../Zotlabs/Module/Filestorage.php:152
 #: ../../include/acl_selectors.php:218
 msgid "Permissions"
@@ -3943,38 +3943,38 @@ msgstr "No hay canal. La importación ha fallado"
 msgid "Import completed."
 msgstr "Importación completada."
 
-#: ../../Zotlabs/Module/Import.php:492
+#: ../../Zotlabs/Module/Import.php:494
 msgid "You must be logged in to use this feature."
 msgstr "Debe estar registrado para poder usar esta funcionalidad."
 
-#: ../../Zotlabs/Module/Import.php:497
+#: ../../Zotlabs/Module/Import.php:499
 msgid "Import Channel"
 msgstr "Importar canal"
 
-#: ../../Zotlabs/Module/Import.php:498
+#: ../../Zotlabs/Module/Import.php:500
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación."
 
-#: ../../Zotlabs/Module/Import.php:500
+#: ../../Zotlabs/Module/Import.php:502
 msgid "Or provide the old server/hub details"
 msgstr "O proporcione los detalles de su antiguo servidor/hub"
 
-#: ../../Zotlabs/Module/Import.php:501
+#: ../../Zotlabs/Module/Import.php:503
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Su identidad en el antiguo servidor  (canal@ejemplo.com)"
 
-#: ../../Zotlabs/Module/Import.php:502
+#: ../../Zotlabs/Module/Import.php:504
 msgid "Your old login email address"
 msgstr "Su antigua dirección de correo electrónico"
 
-#: ../../Zotlabs/Module/Import.php:503
+#: ../../Zotlabs/Module/Import.php:505
 msgid "Your old login password"
 msgstr "Su antigua contraseña"
 
-#: ../../Zotlabs/Module/Import.php:504
+#: ../../Zotlabs/Module/Import.php:506
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -3982,19 +3982,19 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua dirección debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos."
 
-#: ../../Zotlabs/Module/Import.php:505
+#: ../../Zotlabs/Module/Import.php:507
 msgid "Make this hub my primary location"
 msgstr "Convertir este servidor en mi ubicación primaria"
 
-#: ../../Zotlabs/Module/Import.php:506
+#: ../../Zotlabs/Module/Import.php:508
 msgid "Move this channel (disable all previous locations)"
 msgstr "Mover este canal (desactivar todas las ubicaciones anteriores)"
 
-#: ../../Zotlabs/Module/Import.php:507
+#: ../../Zotlabs/Module/Import.php:509
 msgid "Import a few months of posts if possible (limited by available memory"
 msgstr "Importar unos meses de mensajes si es posible (limitado por la memoria disponible"
 
-#: ../../Zotlabs/Module/Import.php:508
+#: ../../Zotlabs/Module/Import.php:510
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -4004,15 +4004,15 @@ msgstr "Este proceso puede tardar varios minutos en completarse. Por favor enví
 msgid "Authentication failed."
 msgstr "Falló la autenticación."
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1982
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1984
 msgid "Remote Authentication"
 msgstr "Acceso desde su servidor"
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1983
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1985
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)"
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1984
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1986
 msgid "Authenticate"
 msgstr "Acceder"
 
@@ -4026,7 +4026,7 @@ msgstr "Canal no encontrado."
 msgid "Permissions denied."
 msgstr "Permisos denegados."
 
-#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2299
+#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2291
 msgid "Import"
 msgstr "Importar"
 
@@ -4053,8 +4053,8 @@ msgid "Item not available."
 msgstr "Elemento no disponible"
 
 #: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:205
-#: ../../Zotlabs/Module/Editwebpage.php:148 ../../Zotlabs/Module/Mail.php:287
-#: ../../Zotlabs/Module/Mail.php:424 ../../include/conversation.php:1228
+#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:306
+#: ../../Zotlabs/Module/Mail.php:448 ../../include/conversation.php:1228
 msgid "Insert web link"
 msgstr "Insertar enlace web"
 
@@ -4122,13 +4122,13 @@ msgstr "Archivadas"
 
 #: ../../Zotlabs/Module/Connections.php:72
 #: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1657
+#: ../../include/conversation.php:1666
 msgid "New"
 msgstr "Nuevas"
 
 #: ../../Zotlabs/Module/Connections.php:88
 #: ../../Zotlabs/Module/Connections.php:103
-#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Widget/Affinity.php:30
+#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30
 msgid "All"
 msgstr "Todos/as"
 
@@ -4206,7 +4206,7 @@ msgid "Ignore connection"
 msgstr "Ignorar esta conexión"
 
 #: ../../Zotlabs/Module/Connections.php:283
-#: ../../Zotlabs/Module/Connedit.php:634
+#: ../../Zotlabs/Module/Connedit.php:626
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -4215,7 +4215,7 @@ msgid "Recent activity"
 msgstr "Actividad reciente"
 
 #: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/text.php:957 ../../include/nav.php:181
+#: ../../include/text.php:957 ../../include/nav.php:185
 msgid "Connections"
 msgstr "Conexiones"
 
@@ -4233,7 +4233,11 @@ msgstr "Buscar conexiones"
 msgid "Find"
 msgstr "Encontrar"
 
-#: ../../Zotlabs/Module/Viewsrc.php:46
+#: ../../Zotlabs/Module/Viewsrc.php:43
+msgid "item"
+msgstr "elemento"
+
+#: ../../Zotlabs/Module/Viewsrc.php:55
 msgid "Source of Item"
 msgstr "Origen del elemento"
 
@@ -4476,7 +4480,7 @@ msgid "View all"
 msgstr "Ver todo"
 
 #: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:191
-#: ../../include/conversation.php:1898 ../../include/channel.php:1266
+#: ../../include/conversation.php:1907 ../../include/channel.php:1268
 #: ../../include/taxonomy.php:403
 msgctxt "noun"
 msgid "Like"
@@ -4485,7 +4489,7 @@ msgstr[0] "Me gusta"
 msgstr[1] "Me gusta"
 
 #: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:196
-#: ../../include/conversation.php:1901
+#: ../../include/conversation.php:1910
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -4520,7 +4524,7 @@ msgid "Close"
 msgstr "Cerrar"
 
 #: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318
-#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:528
+#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:529
 msgid "Recent Photos"
 msgstr "Fotos recientes"
 
@@ -4537,7 +4541,7 @@ msgid "Invalid channel"
 msgstr "Canal no válido"
 
 #: ../../Zotlabs/Module/Wiki.php:160 ../../addon/gitwiki/Mod_Gitwiki.php:146
-#: ../../include/conversation.php:1845
+#: ../../include/conversation.php:1854 ../../include/nav.php:462
 msgid "Wikis"
 msgstr "Wikis"
 
@@ -4756,7 +4760,7 @@ msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. "
 
 #: ../../Zotlabs/Module/Profile_photo.php:115
 #: ../../Zotlabs/Module/Profile_photo.php:226
-#: ../../include/photo/photo_driver.php:646
+#: ../../include/photo/photo_driver.php:647
 msgid "Profile Photos"
 msgstr "Fotos del perfil"
 
@@ -4851,32 +4855,32 @@ msgstr "Ausente"
 msgid "Online"
 msgstr "Conectado/a"
 
-#: ../../Zotlabs/Module/Item.php:184
+#: ../../Zotlabs/Module/Item.php:185
 msgid "Unable to locate original post."
 msgstr "No ha sido posible encontrar la entrada original."
 
-#: ../../Zotlabs/Module/Item.php:450
+#: ../../Zotlabs/Module/Item.php:451
 msgid "Empty post discarded."
 msgstr "La entrada vacía ha sido desechada."
 
-#: ../../Zotlabs/Module/Item.php:824
+#: ../../Zotlabs/Module/Item.php:825
 msgid "Duplicate post suppressed."
 msgstr "Se ha suprimido la entrada duplicada."
 
-#: ../../Zotlabs/Module/Item.php:954
+#: ../../Zotlabs/Module/Item.php:955
 msgid "System error. Post not saved."
 msgstr "Error del sistema. La entrada no se ha podido salvar."
 
-#: ../../Zotlabs/Module/Item.php:1084
+#: ../../Zotlabs/Module/Item.php:1085
 msgid "Unable to obtain post information from database."
 msgstr "No ha sido posible obtener información de la entrada en la base de datos."
 
-#: ../../Zotlabs/Module/Item.php:1091
+#: ../../Zotlabs/Module/Item.php:1092
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
 
-#: ../../Zotlabs/Module/Item.php:1098
+#: ../../Zotlabs/Module/Item.php:1099
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Ha alcanzado su límite de %1$.0f páginas web."
@@ -4907,7 +4911,7 @@ msgstr "Elemento no válido."
 
 #: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79
 #: ../../Zotlabs/Module/Display.php:122
-#: ../../Zotlabs/Lib/NativeWikiPage.php:489 ../../Zotlabs/Web/Router.php:146
+#: ../../Zotlabs/Lib/NativeWikiPage.php:500 ../../Zotlabs/Web/Router.php:146
 #: ../../include/help.php:68
 msgid "Page not found."
 msgstr "Página no encontrada."
@@ -4942,275 +4946,275 @@ msgstr "Error al actualizar el registro de la conexión."
 msgid "is now connected to"
 msgstr "ahora está conectado/a"
 
-#: ../../Zotlabs/Module/Connedit.php:431
+#: ../../Zotlabs/Module/Connedit.php:423
 msgid "Could not access address book record."
 msgstr "No se pudo acceder al registro en su libreta de direcciones."
 
-#: ../../Zotlabs/Module/Connedit.php:479
+#: ../../Zotlabs/Module/Connedit.php:471
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Recarga fallida - no se puede encontrar el canal en este momento."
 
-#: ../../Zotlabs/Module/Connedit.php:494 ../../Zotlabs/Module/Connedit.php:503
-#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521
-#: ../../Zotlabs/Module/Connedit.php:534
+#: ../../Zotlabs/Module/Connedit.php:486 ../../Zotlabs/Module/Connedit.php:495
+#: ../../Zotlabs/Module/Connedit.php:504 ../../Zotlabs/Module/Connedit.php:513
+#: ../../Zotlabs/Module/Connedit.php:526
 msgid "Unable to set address book parameters."
 msgstr "No ha sido posible establecer los parámetros de la libreta de direcciones."
 
-#: ../../Zotlabs/Module/Connedit.php:558
+#: ../../Zotlabs/Module/Connedit.php:550
 msgid "Connection has been removed."
 msgstr "La conexión ha sido eliminada."
 
-#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Lib/Apps.php:228
+#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:228
 #: ../../addon/openclipatar/openclipatar.php:57
-#: ../../include/conversation.php:982 ../../include/nav.php:102
+#: ../../include/conversation.php:982 ../../include/nav.php:106
 msgid "View Profile"
 msgstr "Ver el perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:601
+#: ../../Zotlabs/Module/Connedit.php:593
 #, php-format
 msgid "View %s's profile"
 msgstr "Ver el perfil de %s"
 
-#: ../../Zotlabs/Module/Connedit.php:605
+#: ../../Zotlabs/Module/Connedit.php:597
 msgid "Refresh Permissions"
 msgstr "Recargar los permisos"
 
-#: ../../Zotlabs/Module/Connedit.php:608
+#: ../../Zotlabs/Module/Connedit.php:600
 msgid "Fetch updated permissions"
 msgstr "Obtener los permisos actualizados"
 
-#: ../../Zotlabs/Module/Connedit.php:612
+#: ../../Zotlabs/Module/Connedit.php:604
 msgid "Refresh Photo"
 msgstr "Actualizar la foto"
 
-#: ../../Zotlabs/Module/Connedit.php:615
+#: ../../Zotlabs/Module/Connedit.php:607
 msgid "Fetch updated photo"
 msgstr "Obtener una foto actualizada"
 
-#: ../../Zotlabs/Module/Connedit.php:619
+#: ../../Zotlabs/Module/Connedit.php:611
 msgid "Recent Activity"
 msgstr "Actividad reciente"
 
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Zotlabs/Module/Connedit.php:614
 msgid "View recent posts and comments"
 msgstr "Ver publicaciones y comentarios recientes"
 
-#: ../../Zotlabs/Module/Connedit.php:629
+#: ../../Zotlabs/Module/Connedit.php:621
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Zotlabs/Module/Connedit.php:622
 msgid "This connection is blocked!"
 msgstr "¡Esta conexión está bloqueada!"
 
-#: ../../Zotlabs/Module/Connedit.php:634
+#: ../../Zotlabs/Module/Connedit.php:626
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
-#: ../../Zotlabs/Module/Connedit.php:637
+#: ../../Zotlabs/Module/Connedit.php:629
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Zotlabs/Module/Connedit.php:630
 msgid "This connection is ignored!"
 msgstr "¡Esta conexión es ignorada!"
 
-#: ../../Zotlabs/Module/Connedit.php:642
+#: ../../Zotlabs/Module/Connedit.php:634
 msgid "Unarchive"
 msgstr "Desarchivar"
 
-#: ../../Zotlabs/Module/Connedit.php:642
+#: ../../Zotlabs/Module/Connedit.php:634
 msgid "Archive"
 msgstr "Archivar"
 
-#: ../../Zotlabs/Module/Connedit.php:645
+#: ../../Zotlabs/Module/Connedit.php:637
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos"
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Zotlabs/Module/Connedit.php:638
 msgid "This connection is archived!"
 msgstr "¡Esta conexión esta archivada!"
 
-#: ../../Zotlabs/Module/Connedit.php:650
+#: ../../Zotlabs/Module/Connedit.php:642
 msgid "Unhide"
 msgstr "Mostrar"
 
-#: ../../Zotlabs/Module/Connedit.php:650
+#: ../../Zotlabs/Module/Connedit.php:642
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../../Zotlabs/Module/Connedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:645
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Ocultar o mostrar esta conexión a sus otras conexiones"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:646
 msgid "This connection is hidden!"
 msgstr "¡Esta conexión está oculta!"
 
-#: ../../Zotlabs/Module/Connedit.php:661
+#: ../../Zotlabs/Module/Connedit.php:653
 msgid "Delete this connection"
 msgstr "Eliminar esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:669
+#: ../../Zotlabs/Module/Connedit.php:661
 msgid "Fetch Vcard"
 msgstr "Obtener una vcard"
 
-#: ../../Zotlabs/Module/Connedit.php:672
+#: ../../Zotlabs/Module/Connedit.php:664
 msgid "Fetch electronic calling card for this connection"
 msgstr "Obtener una tarjeta de llamada electrónica para esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:683
+#: ../../Zotlabs/Module/Connedit.php:675
 msgid "Open Individual Permissions section by default"
 msgstr "Abrir la sección de permisos individuales por defecto"
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Zotlabs/Module/Connedit.php:698
 msgid "Affinity"
 msgstr "Afinidad"
 
-#: ../../Zotlabs/Module/Connedit.php:709
+#: ../../Zotlabs/Module/Connedit.php:701
 msgid "Open Set Affinity section by default"
 msgstr "Abrir por defecto la sección para definir la afinidad"
 
-#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26
+#: ../../Zotlabs/Module/Connedit.php:705 ../../Zotlabs/Widget/Affinity.php:26
 msgid "Me"
 msgstr "Yo"
 
-#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Widget/Affinity.php:27
+#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Widget/Affinity.php:27
 msgid "Family"
 msgstr "Familia"
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Widget/Affinity.php:29
+#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:29
 msgid "Acquaintances"
 msgstr "Conocidos/as"
 
-#: ../../Zotlabs/Module/Connedit.php:743
+#: ../../Zotlabs/Module/Connedit.php:735
 msgid "Filter"
 msgstr "Filtrar"
 
-#: ../../Zotlabs/Module/Connedit.php:746
+#: ../../Zotlabs/Module/Connedit.php:738
 msgid "Open Custom Filter section by default"
 msgstr "Abrir por defecto la sección de  personalización de filtros"
 
-#: ../../Zotlabs/Module/Connedit.php:783
+#: ../../Zotlabs/Module/Connedit.php:775
 msgid "Approve this connection"
 msgstr "Aprobar esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:783
+#: ../../Zotlabs/Module/Connedit.php:775
 msgid "Accept connection to allow communication"
 msgstr "Aceptar la conexión para permitir la comunicación"
 
-#: ../../Zotlabs/Module/Connedit.php:788
+#: ../../Zotlabs/Module/Connedit.php:780
 msgid "Set Affinity"
 msgstr "Ajustar la afinidad"
 
-#: ../../Zotlabs/Module/Connedit.php:791
+#: ../../Zotlabs/Module/Connedit.php:783
 msgid "Set Profile"
 msgstr "Ajustar el perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:794
+#: ../../Zotlabs/Module/Connedit.php:786
 msgid "Set Affinity & Profile"
 msgstr "Ajustar la afinidad y el perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:852
+#: ../../Zotlabs/Module/Connedit.php:844
 msgid "none"
 msgstr "-"
 
-#: ../../Zotlabs/Module/Connedit.php:855
+#: ../../Zotlabs/Module/Connedit.php:847
 #: ../../Zotlabs/Widget/Settings_menu.php:107
 msgid "Connection Default Permissions"
 msgstr "Permisos predeterminados de conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:855 ../../include/items.php:3942
+#: ../../Zotlabs/Module/Connedit.php:847 ../../include/items.php:3955
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:856
+#: ../../Zotlabs/Module/Connedit.php:848
 msgid "Apply these permissions automatically"
 msgstr "Aplicar estos permisos automaticamente"
 
-#: ../../Zotlabs/Module/Connedit.php:856
+#: ../../Zotlabs/Module/Connedit.php:848
 msgid "Connection requests will be approved without your interaction"
 msgstr "Las solicitudes de conexión serán aprobadas sin su intervención"
 
-#: ../../Zotlabs/Module/Connedit.php:857
+#: ../../Zotlabs/Module/Connedit.php:849
 msgid "Permission role"
 msgstr "Rol de acceso"
 
-#: ../../Zotlabs/Module/Connedit.php:858
+#: ../../Zotlabs/Module/Connedit.php:850
 msgid "Add permission role"
 msgstr "Añadir un rol de acceso"
 
-#: ../../Zotlabs/Module/Connedit.php:864
+#: ../../Zotlabs/Module/Connedit.php:856
 msgid "This connection's primary address is"
 msgstr "La dirección primaria de esta conexión es"
 
-#: ../../Zotlabs/Module/Connedit.php:865
+#: ../../Zotlabs/Module/Connedit.php:857
 msgid "Available locations:"
 msgstr "Ubicaciones disponibles:"
 
-#: ../../Zotlabs/Module/Connedit.php:869
+#: ../../Zotlabs/Module/Connedit.php:861
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."
 
-#: ../../Zotlabs/Module/Connedit.php:870
+#: ../../Zotlabs/Module/Connedit.php:862
 msgid "Connection Tools"
 msgstr "Gestión de las conexiones"
 
-#: ../../Zotlabs/Module/Connedit.php:872
+#: ../../Zotlabs/Module/Connedit.php:864
 msgid "Slide to adjust your degree of friendship"
 msgstr "Deslizar para ajustar el grado de amistad"
 
-#: ../../Zotlabs/Module/Connedit.php:873 ../../Zotlabs/Module/Rate.php:155
+#: ../../Zotlabs/Module/Connedit.php:865 ../../Zotlabs/Module/Rate.php:155
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Valoración"
 
-#: ../../Zotlabs/Module/Connedit.php:874
+#: ../../Zotlabs/Module/Connedit.php:866
 msgid "Slide to adjust your rating"
 msgstr "Deslizar para ajustar su valoración"
 
-#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:880
+#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Connedit.php:872
 msgid "Optionally explain your rating"
 msgstr "Opcionalmente, puede explicar su valoración"
 
-#: ../../Zotlabs/Module/Connedit.php:877
+#: ../../Zotlabs/Module/Connedit.php:869
 msgid "Custom Filter"
 msgstr "Filtro personalizado"
 
-#: ../../Zotlabs/Module/Connedit.php:878
+#: ../../Zotlabs/Module/Connedit.php:870
 msgid "Only import posts with this text"
 msgstr "Importar solo entradas que contengan este texto"
 
-#: ../../Zotlabs/Module/Connedit.php:878 ../../Zotlabs/Module/Connedit.php:879
+#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Connedit.php:871
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "Una sola opción por línea: palabras, #etiquetas,  /patrones/ o lang=xx. Dejar en blanco para importarlo todo"
 
-#: ../../Zotlabs/Module/Connedit.php:879
+#: ../../Zotlabs/Module/Connedit.php:871
 msgid "Do not import posts with this text"
 msgstr "No importar entradas que contengan este texto"
 
-#: ../../Zotlabs/Module/Connedit.php:881
+#: ../../Zotlabs/Module/Connedit.php:873
 msgid "This information is public!"
 msgstr "¡Esta información es pública!"
 
-#: ../../Zotlabs/Module/Connedit.php:886
+#: ../../Zotlabs/Module/Connedit.php:878
 msgid "Connection Pending Approval"
 msgstr "Conexión pendiente de aprobación"
 
-#: ../../Zotlabs/Module/Connedit.php:891
+#: ../../Zotlabs/Module/Connedit.php:883
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura."
 
-#: ../../Zotlabs/Module/Connedit.php:898
+#: ../../Zotlabs/Module/Connedit.php:890
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -5218,97 +5222,97 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."
 
-#: ../../Zotlabs/Module/Connedit.php:899
+#: ../../Zotlabs/Module/Connedit.php:891
 msgid "Last update:"
 msgstr "Última actualización:"
 
-#: ../../Zotlabs/Module/Connedit.php:908
+#: ../../Zotlabs/Module/Connedit.php:900
 msgid "Details"
 msgstr "Detalles"
 
-#: ../../Zotlabs/Module/Connedit.php:911 ../../addon/cdav/Mod_Cdav.php:1137
+#: ../../Zotlabs/Module/Connedit.php:903 ../../addon/cdav/Mod_Cdav.php:1137
 msgid "Organisation"
 msgstr "Organización"
 
-#: ../../Zotlabs/Module/Connedit.php:912 ../../addon/cdav/Mod_Cdav.php:1138
+#: ../../Zotlabs/Module/Connedit.php:904 ../../addon/cdav/Mod_Cdav.php:1138
 #: ../../include/page_widgets.php:46
 msgid "Title"
 msgstr "Título"
 
-#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:789
+#: ../../Zotlabs/Module/Connedit.php:905 ../../Zotlabs/Module/Profiles.php:789
 #: ../../addon/cdav/Mod_Cdav.php:1139
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../../Zotlabs/Module/Connedit.php:915 ../../Zotlabs/Module/Profiles.php:791
+#: ../../Zotlabs/Module/Connedit.php:907 ../../Zotlabs/Module/Profiles.php:791
 #: ../../addon/cdav/Mod_Cdav.php:1141
 msgid "Instant messenger"
 msgstr "Mensajería instantánea"
 
-#: ../../Zotlabs/Module/Connedit.php:916 ../../Zotlabs/Module/Profiles.php:792
+#: ../../Zotlabs/Module/Connedit.php:908 ../../Zotlabs/Module/Profiles.php:792
 #: ../../addon/cdav/Mod_Cdav.php:1142
 msgid "Website"
 msgstr "Sitio web"
 
-#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:794
+#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:794
 #: ../../addon/cdav/Mod_Cdav.php:1144
 msgid "Note"
 msgstr "Nota"
 
-#: ../../Zotlabs/Module/Connedit.php:919 ../../Zotlabs/Module/Profiles.php:795
+#: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:795
 #: ../../addon/cdav/Mod_Cdav.php:1145 ../../addon/cdav/cdav.php:270
 #: ../../include/connections.php:668
 msgid "Mobile"
 msgstr "Móvil"
 
-#: ../../Zotlabs/Module/Connedit.php:920 ../../Zotlabs/Module/Profiles.php:796
+#: ../../Zotlabs/Module/Connedit.php:912 ../../Zotlabs/Module/Profiles.php:796
 #: ../../addon/cdav/Mod_Cdav.php:1146 ../../addon/cdav/cdav.php:271
 #: ../../include/connections.php:669
 msgid "Home"
 msgstr "Inicio"
 
-#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Profiles.php:797
+#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:797
 #: ../../addon/cdav/Mod_Cdav.php:1147 ../../addon/cdav/cdav.php:274
 #: ../../include/connections.php:672
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Profiles.php:799
+#: ../../Zotlabs/Module/Connedit.php:915 ../../Zotlabs/Module/Profiles.php:799
 #: ../../addon/cdav/Mod_Cdav.php:1149
 #: ../../addon/jappixmini/jappixmini.php:368
 msgid "Add Contact"
 msgstr "Añadir un contacto"
 
-#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Profiles.php:800
+#: ../../Zotlabs/Module/Connedit.php:916 ../../Zotlabs/Module/Profiles.php:800
 #: ../../addon/cdav/Mod_Cdav.php:1150
 msgid "Add Field"
 msgstr "Añadir un campo"
 
-#: ../../Zotlabs/Module/Connedit.php:929 ../../addon/cdav/Mod_Cdav.php:1155
+#: ../../Zotlabs/Module/Connedit.php:921 ../../addon/cdav/Mod_Cdav.php:1155
 msgid "P.O. Box"
 msgstr "Buzón de correos"
 
-#: ../../Zotlabs/Module/Connedit.php:930 ../../addon/cdav/Mod_Cdav.php:1156
+#: ../../Zotlabs/Module/Connedit.php:922 ../../addon/cdav/Mod_Cdav.php:1156
 msgid "Additional"
 msgstr "Adicional"
 
-#: ../../Zotlabs/Module/Connedit.php:931 ../../addon/cdav/Mod_Cdav.php:1157
+#: ../../Zotlabs/Module/Connedit.php:923 ../../addon/cdav/Mod_Cdav.php:1157
 msgid "Street"
 msgstr "Calle"
 
-#: ../../Zotlabs/Module/Connedit.php:932 ../../addon/cdav/Mod_Cdav.php:1158
+#: ../../Zotlabs/Module/Connedit.php:924 ../../addon/cdav/Mod_Cdav.php:1158
 msgid "Locality"
 msgstr "Localidad"
 
-#: ../../Zotlabs/Module/Connedit.php:933 ../../addon/cdav/Mod_Cdav.php:1159
+#: ../../Zotlabs/Module/Connedit.php:925 ../../addon/cdav/Mod_Cdav.php:1159
 msgid "Region"
 msgstr "Provincia, región o estado"
 
-#: ../../Zotlabs/Module/Connedit.php:934 ../../addon/cdav/Mod_Cdav.php:1160
+#: ../../Zotlabs/Module/Connedit.php:926 ../../addon/cdav/Mod_Cdav.php:1160
 msgid "ZIP Code"
 msgstr "Código postal"
 
-#: ../../Zotlabs/Module/Connedit.php:935 ../../Zotlabs/Module/Profiles.php:760
+#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:760
 #: ../../addon/cdav/Mod_Cdav.php:1161
 msgid "Country"
 msgstr "País"
@@ -5337,13 +5341,13 @@ msgstr "Estoy conectado/a"
 msgid "Bookmark this room"
 msgstr "Añadir esta sala a Marcadores"
 
-#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:240
-#: ../../Zotlabs/Module/Mail.php:361 ../../include/conversation.php:1263
+#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:259
+#: ../../Zotlabs/Module/Mail.php:380 ../../include/conversation.php:1263
 msgid "Please enter a link URL:"
 msgstr "Por favor, introduzca la dirección del enlace:"
 
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:293
-#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Lib/ThreadItem.php:744
+#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:312
+#: ../../Zotlabs/Module/Mail.php:454 ../../Zotlabs/Lib/ThreadItem.php:744
 #: ../../include/conversation.php:1373
 msgid "Encrypt text"
 msgstr "Cifrar texto"
@@ -5378,12 +5382,13 @@ msgid "min"
 msgstr "min"
 
 #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
-#: ../../include/conversation.php:1774
+#: ../../include/conversation.php:1783 ../../include/nav.php:392
 msgid "Photos"
 msgstr "Fotos"
 
 #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:224
-#: ../../Zotlabs/Storage/Browser.php:224 ../../include/conversation.php:1782
+#: ../../Zotlabs/Storage/Browser.php:224 ../../include/conversation.php:1791
+#: ../../include/nav.php:400
 msgid "Files"
 msgstr "Ficheros"
 
@@ -5423,7 +5428,7 @@ msgstr "El menú se puede usar para guardar marcadores"
 msgid "Submit and proceed"
 msgstr "Enviar y proceder"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2276
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2268
 msgid "Menus"
 msgstr "Menús"
 
@@ -5475,12 +5480,12 @@ msgstr "El título del menú tal como será visto por los demás"
 msgid "Allow bookmarks"
 msgstr "Permitir marcadores"
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2277
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2269
 msgid "Layouts"
 msgstr "Plantillas"
 
 #: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232
-#: ../../include/nav.php:157 ../../include/nav.php:264
+#: ../../include/nav.php:161 ../../include/nav.php:268
 #: ../../include/help.php:55 ../../include/help.php:61
 msgid "Help"
 msgstr "Ayuda"
@@ -5502,7 +5507,7 @@ msgid "post"
 msgstr "la entrada"
 
 #: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146
-#: ../../include/text.php:1953
+#: ../../include/text.php:1945
 msgid "comment"
 msgstr "el comentario"
 
@@ -5535,7 +5540,7 @@ msgid "Could not create privacy group."
 msgstr "No se puede crear el grupo de canales"
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3909
+#: ../../include/items.php:3922
 msgid "Privacy group not found."
 msgstr "Grupo de canales no encontrado."
 
@@ -5670,7 +5675,7 @@ msgid "View this profile"
 msgstr "Ver este perfil"
 
 #: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
-#: ../../include/channel.php:1064
+#: ../../include/channel.php:1066
 msgid "Edit visibility"
 msgstr "Editar visibilidad"
 
@@ -5682,7 +5687,7 @@ msgstr "Gestión del perfil"
 msgid "Change cover photo"
 msgstr "Cambiar la imagen de portada del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1035
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
 msgid "Change profile photo"
 msgstr "Cambiar la foto del perfil"
 
@@ -5702,7 +5707,7 @@ msgstr "Eliminar este perfil"
 msgid "Add profile things"
 msgstr "Añadir cosas al perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1648
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1657
 msgid "Personal"
 msgstr "Personales"
 
@@ -5847,20 +5852,20 @@ msgstr "Mis otros canales"
 msgid "Communications"
 msgstr "Comunicaciones"
 
-#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1060
+#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
 msgid "Profile Image"
 msgstr "Imagen del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1042
-#: ../../include/nav.php:105
+#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1044
+#: ../../include/nav.php:109
 msgid "Edit Profiles"
 msgstr "Editar perfiles"
 
-#: ../../Zotlabs/Module/Editwebpage.php:144
+#: ../../Zotlabs/Module/Editwebpage.php:139
 msgid "Page link"
 msgstr "Enlace de la página"
 
-#: ../../Zotlabs/Module/Editwebpage.php:171
+#: ../../Zotlabs/Module/Editwebpage.php:166
 msgid "Edit Webpage"
 msgstr "Editar la página web"
 
@@ -5868,38 +5873,38 @@ msgstr "Editar la página web"
 msgid "Create a new channel"
 msgstr "Crear un nuevo canal"
 
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:221
-#: ../../include/nav.php:201
+#: ../../Zotlabs/Module/Manage.php:168 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:205
 msgid "Channel Manager"
 msgstr "Administración de canales"
 
-#: ../../Zotlabs/Module/Manage.php:165
+#: ../../Zotlabs/Module/Manage.php:169
 msgid "Current Channel"
 msgstr "Canal actual"
 
-#: ../../Zotlabs/Module/Manage.php:167
+#: ../../Zotlabs/Module/Manage.php:171
 msgid "Switch to one of your channels by selecting it."
 msgstr "Cambiar a uno de sus canales seleccionándolo."
 
-#: ../../Zotlabs/Module/Manage.php:168
+#: ../../Zotlabs/Module/Manage.php:172
 msgid "Default Channel"
 msgstr "Canal principal"
 
-#: ../../Zotlabs/Module/Manage.php:169
+#: ../../Zotlabs/Module/Manage.php:173
 msgid "Make Default"
 msgstr "Convertir en predeterminado"
 
-#: ../../Zotlabs/Module/Manage.php:172
+#: ../../Zotlabs/Module/Manage.php:176
 #, php-format
 msgid "%d new messages"
 msgstr "%d mensajes nuevos"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Zotlabs/Module/Manage.php:177
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nuevas solicitudes de conexión"
 
-#: ../../Zotlabs/Module/Manage.php:175
+#: ../../Zotlabs/Module/Manage.php:179
 msgid "Delegated Channel"
 msgstr "Canal delegado"
 
@@ -5915,7 +5920,7 @@ msgstr "Acerca de este sitio"
 msgid "Site Name"
 msgstr "Nombre del sitio"
 
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1995
+#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:2025
 msgid "Administrator"
 msgstr "Administrador"
 
@@ -5987,7 +5992,7 @@ msgid "Export selected"
 msgstr "Exportar los elementos seleccionados"
 
 #: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/conversation.php:1832
+#: ../../include/conversation.php:1841 ../../include/nav.php:449
 msgid "Webpages"
 msgstr "Páginas web"
 
@@ -6023,11 +6028,11 @@ msgstr "No se han detectado elementos de ninguna página web."
 msgid "Import complete."
 msgstr "Importación completada."
 
-#: ../../Zotlabs/Module/Editpost.php:35
+#: ../../Zotlabs/Module/Editpost.php:38
 msgid "Item is not editable"
 msgstr "El elemento no es editable"
 
-#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:138
+#: ../../Zotlabs/Module/Editpost.php:103 ../../Zotlabs/Module/Rpost.php:138
 msgid "Edit post"
 msgstr "Editar la entrada"
 
@@ -6204,7 +6209,7 @@ msgstr "Canal no disponible."
 msgid "Previous action reversed."
 msgstr "Acción anterior revocada."
 
-#: ../../Zotlabs/Module/Like.php:419 ../../addon/diaspora/inbound.php:1823
+#: ../../Zotlabs/Module/Like.php:419 ../../addon/diaspora/inbound.php:1812
 #: ../../include/conversation.php:160
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -6272,12 +6277,12 @@ msgstr "Estado:"
 msgid "Homepage: "
 msgstr "Página personal:"
 
-#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1291
+#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1293
 msgid "Age:"
 msgstr "Edad:"
 
 #: ../../Zotlabs/Module/Directory.php:314 ../../include/markdown.php:560
-#: ../../include/channel.php:1132 ../../include/event.php:52
+#: ../../include/channel.php:1134 ../../include/event.php:52
 #: ../../include/event.php:84
 msgid "Location:"
 msgstr "Ubicación:"
@@ -6286,17 +6291,17 @@ msgstr "Ubicación:"
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1307
+#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1309
 msgid "Hometown:"
 msgstr "Lugar de nacimiento:"
 
-#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1315
+#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1317
 msgid "About:"
 msgstr "Sobre mí:"
 
 #: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54
 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
-#: ../../include/conversation.php:1002 ../../include/channel.php:1117
+#: ../../include/conversation.php:1002 ../../include/channel.php:1119
 #: ../../include/connections.php:110
 msgid "Connect"
 msgstr "Conectar"
@@ -6412,79 +6417,83 @@ msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. E
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../../Zotlabs/Module/Mail.php:213
+#: ../../Zotlabs/Module/Mail.php:191
+msgid "message"
+msgstr "mensaje"
+
+#: ../../Zotlabs/Module/Mail.php:232
 msgid "Message recalled."
 msgstr "Mensaje revocado."
 
-#: ../../Zotlabs/Module/Mail.php:226
+#: ../../Zotlabs/Module/Mail.php:245
 msgid "Conversation removed."
 msgstr "Conversación eliminada."
 
-#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:362
+#: ../../Zotlabs/Module/Mail.php:260 ../../Zotlabs/Module/Mail.php:381
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Caduca YYYY-MM-DD HH:MM"
 
-#: ../../Zotlabs/Module/Mail.php:269
+#: ../../Zotlabs/Module/Mail.php:288
 msgid "Requested channel is not in this network"
 msgstr "El canal solicitado no existe en esta red"
 
-#: ../../Zotlabs/Module/Mail.php:277
+#: ../../Zotlabs/Module/Mail.php:296
 msgid "Send Private Message"
 msgstr "Enviar un mensaje privado"
 
-#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:415
+#: ../../Zotlabs/Module/Mail.php:297 ../../Zotlabs/Module/Mail.php:439
 msgid "To:"
 msgstr "Para:"
 
-#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:417
+#: ../../Zotlabs/Module/Mail.php:300 ../../Zotlabs/Module/Mail.php:441
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:423
+#: ../../Zotlabs/Module/Mail.php:305 ../../Zotlabs/Module/Mail.php:447
 #: ../../include/conversation.php:1323
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
-#: ../../Zotlabs/Module/Mail.php:288
+#: ../../Zotlabs/Module/Mail.php:307
 msgid "Send"
 msgstr "Enviar"
 
-#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:428
+#: ../../Zotlabs/Module/Mail.php:310 ../../Zotlabs/Module/Mail.php:452
 #: ../../include/conversation.php:1368
 msgid "Set expiration date"
 msgstr "Configurar fecha de caducidad"
 
-#: ../../Zotlabs/Module/Mail.php:387
+#: ../../Zotlabs/Module/Mail.php:411
 msgid "Delete message"
 msgstr "Borrar mensaje"
 
-#: ../../Zotlabs/Module/Mail.php:388
+#: ../../Zotlabs/Module/Mail.php:412
 msgid "Delivery report"
 msgstr "Informe de transmisión"
 
-#: ../../Zotlabs/Module/Mail.php:389
+#: ../../Zotlabs/Module/Mail.php:413
 msgid "Recall message"
 msgstr "Revocar el mensaje"
 
-#: ../../Zotlabs/Module/Mail.php:391
+#: ../../Zotlabs/Module/Mail.php:415
 msgid "Message has been recalled."
 msgstr "El mensaje ha sido revocado."
 
-#: ../../Zotlabs/Module/Mail.php:408
+#: ../../Zotlabs/Module/Mail.php:432
 msgid "Delete Conversation"
 msgstr "Eliminar conversación"
 
-#: ../../Zotlabs/Module/Mail.php:410
+#: ../../Zotlabs/Module/Mail.php:434
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
 
-#: ../../Zotlabs/Module/Mail.php:414
+#: ../../Zotlabs/Module/Mail.php:438
 msgid "Send Reply"
 msgstr "Responder"
 
-#: ../../Zotlabs/Module/Mail.php:419
+#: ../../Zotlabs/Module/Mail.php:443
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Su mensaje para %s (%s):"
@@ -6668,8 +6677,8 @@ msgstr "sí"
 msgid "Membership on this site is by invitation only."
 msgstr "Para registrarse en este sitio es necesaria una invitación."
 
-#: ../../Zotlabs/Module/Register.php:270 ../../boot.php:1612
-#: ../../include/nav.php:145
+#: ../../Zotlabs/Module/Register.php:270 ../../boot.php:1610
+#: ../../include/nav.php:149
 msgid "Register"
 msgstr "Registrarse"
 
@@ -6684,30 +6693,30 @@ msgstr "Este sitio puede requerir una verificación de correo electrónico despu
 msgid "Cover Photos"
 msgstr "Imágenes de portada del perfil"
 
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4286
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4303
 msgid "female"
 msgstr "mujer"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4287
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4304
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4288
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4305
 msgid "male"
 msgstr "hombre"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4289
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4306
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4291
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4308
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1757
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1759
 msgid "cover photo"
 msgstr "Imagen de portada del perfil"
 
@@ -6719,7 +6728,8 @@ msgstr "Subir imagen de portada del perfil"
 msgid "Documentation Search"
 msgstr "Búsqueda de Documentación"
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1764
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1773
+#: ../../include/nav.php:382
 msgid "About"
 msgstr "Mi perfil"
 
@@ -6987,7 +6997,7 @@ msgid ""
 "Password reset failed."
 msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1639
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1637
 msgid "Password Reset"
 msgstr "Restablecer la contraseña"
 
@@ -7036,7 +7046,7 @@ msgstr "Dirección de correo electrónico"
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:186
+#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:190
 msgid "Mark all system notifications seen"
 msgstr "Marcar todas las notificaciones del sistema como leídas"
 
@@ -7068,26 +7078,27 @@ msgstr "Diagnóstico remoto"
 msgid "Suggest Channels"
 msgstr "Sugerir canales"
 
-#: ../../Zotlabs/Lib/Apps.php:220 ../../boot.php:1631
-#: ../../include/nav.php:113
+#: ../../Zotlabs/Lib/Apps.php:220 ../../boot.php:1629
+#: ../../include/nav.php:117
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:172
-msgid "Grid"
-msgstr "Red"
+#: ../../Zotlabs/Lib/Apps.php:222
+msgid "Activity"
+msgstr "Actividad"
 
-#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1848
-#: ../../include/features.php:99
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1857
+#: ../../include/features.php:99 ../../include/nav.php:465
 msgid "Wiki"
 msgstr "Wiki"
 
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:176
+#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:180
 msgid "Channel Home"
 msgstr "Mi canal"
 
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1793
-#: ../../include/conversation.php:1796 ../../include/nav.php:196
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1802
+#: ../../include/conversation.php:1805 ../../include/nav.php:200
+#: ../../include/nav.php:411 ../../include/nav.php:414
 msgid "Events"
 msgstr "Eventos"
 
@@ -7095,7 +7106,7 @@ msgstr "Eventos"
 msgid "Directory"
 msgstr "Directorio"
 
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:188
+#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:192
 msgid "Mail"
 msgstr "Correo"
 
@@ -7137,19 +7148,19 @@ msgstr "Publicación"
 msgid "Profile Photo"
 msgstr "Foto del perfil"
 
-#: ../../Zotlabs/Lib/Apps.php:355
+#: ../../Zotlabs/Lib/Apps.php:365
 msgid "Purchase"
 msgstr "Comprar"
 
-#: ../../Zotlabs/Lib/Apps.php:359
+#: ../../Zotlabs/Lib/Apps.php:369
 msgid "Undelete"
 msgstr "Recuperar"
 
-#: ../../Zotlabs/Lib/Apps.php:364
+#: ../../Zotlabs/Lib/Apps.php:374
 msgid "Add to app-tray"
 msgstr "Añadir a la bandeja de aplicaciones"
 
-#: ../../Zotlabs/Lib/Apps.php:365
+#: ../../Zotlabs/Lib/Apps.php:375
 msgid "Remove from app-tray"
 msgstr "Quitar de la bandeja de aplicaciones"
 
@@ -7173,70 +7184,70 @@ msgctxt "permcat"
 msgid "publisher"
 msgstr "editor"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:31
-#: ../../Zotlabs/Lib/NativeWikiPage.php:72
+#: ../../Zotlabs/Lib/NativeWikiPage.php:42
+#: ../../Zotlabs/Lib/NativeWikiPage.php:83
 msgid "(No Title)"
 msgstr "(Sin título)"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:86
+#: ../../Zotlabs/Lib/NativeWikiPage.php:97
 msgid "Wiki page create failed."
 msgstr "Se ha producido un error en la creación de la página wiki."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:99
+#: ../../Zotlabs/Lib/NativeWikiPage.php:110
 msgid "Wiki not found."
 msgstr "No se ha encontrado el wiki."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:110
+#: ../../Zotlabs/Lib/NativeWikiPage.php:121
 msgid "Destination name already exists"
 msgstr "El nombre de destino ya existe"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:136
-#: ../../Zotlabs/Lib/NativeWikiPage.php:331
+#: ../../Zotlabs/Lib/NativeWikiPage.php:147
+#: ../../Zotlabs/Lib/NativeWikiPage.php:342
 msgid "Page not found"
 msgstr "No se ha encontrado la página"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:166
+#: ../../Zotlabs/Lib/NativeWikiPage.php:177
 msgid "Error reading page content"
 msgstr "Se ha producido un error al leer el contenido de la página"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:322
-#: ../../Zotlabs/Lib/NativeWikiPage.php:370
-#: ../../Zotlabs/Lib/NativeWikiPage.php:437
-#: ../../Zotlabs/Lib/NativeWikiPage.php:478
+#: ../../Zotlabs/Lib/NativeWikiPage.php:333
+#: ../../Zotlabs/Lib/NativeWikiPage.php:381
+#: ../../Zotlabs/Lib/NativeWikiPage.php:448
+#: ../../Zotlabs/Lib/NativeWikiPage.php:489
 msgid "Error reading wiki"
 msgstr "Se ha producido un error al leer el wiki"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:358
+#: ../../Zotlabs/Lib/NativeWikiPage.php:369
 msgid "Page update failed."
 msgstr "Se ha producido un error al actualizar la página."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:392
+#: ../../Zotlabs/Lib/NativeWikiPage.php:403
 msgid "Nothing deleted"
 msgstr "No se ha eliminado nada"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:458
+#: ../../Zotlabs/Lib/NativeWikiPage.php:469
 msgid "Compare: object not found."
 msgstr "No se ha encontrado un objeto para comparar."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:464
+#: ../../Zotlabs/Lib/NativeWikiPage.php:475
 msgid "Page updated"
 msgstr "Se ha actualizado la página"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:467
+#: ../../Zotlabs/Lib/NativeWikiPage.php:478
 msgid "Untitled"
 msgstr "Sin título"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:473
+#: ../../Zotlabs/Lib/NativeWikiPage.php:484
 msgid "Wiki resource_id required for git commit"
 msgstr "Se necesita Wiki resource_id para el git commit"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:529
+#: ../../Zotlabs/Lib/NativeWikiPage.php:540
 #: ../../Zotlabs/Widget/Wiki_page_history.php:23
 msgctxt "wiki_history"
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:567
+#: ../../Zotlabs/Lib/NativeWikiPage.php:578
 #: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:610
 #: ../../include/bbcode.php:756
 msgid "Different viewers will see this text differently"
@@ -7325,21 +7336,21 @@ msgstr "Sala no encontrada."
 msgid "Room is full"
 msgstr "La sala está llena."
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1947
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1977
 msgid "$Projectname Notification"
 msgstr "Notificación de $Projectname"
 
 #: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:218
 #: ../../addon/diaspora/util.php:231 ../../addon/diaspora/p.php:46
-#: ../../include/network.php:1948
+#: ../../include/network.php:1978
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1950
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1980
 msgid "Thank You,"
 msgstr "Gracias,"
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1952
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1982
 #, php-format
 msgid "%s Administrator"
 msgstr "%s Administrador"
@@ -7534,15 +7545,15 @@ msgstr "Foto:"
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
 
-#: ../../Zotlabs/Lib/Enotify.php:619
+#: ../../Zotlabs/Lib/Enotify.php:620
 msgid "[$Projectname:Notify]"
 msgstr "[$Projectname:Aviso]"
 
-#: ../../Zotlabs/Lib/Enotify.php:779
+#: ../../Zotlabs/Lib/Enotify.php:780
 msgid "created a new post"
 msgstr "ha creado una nueva entrada"
 
-#: ../../Zotlabs/Lib/Enotify.php:780
+#: ../../Zotlabs/Lib/Enotify.php:781
 #, php-format
 msgid "commented on %s's post"
 msgstr "ha comentado la entrada de %s"
@@ -7766,7 +7777,7 @@ msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo
 msgid "parent"
 msgstr "padre"
 
-#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2687
+#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2679
 msgid "Collection"
 msgstr "Colección"
 
@@ -7870,20 +7881,21 @@ msgstr "Menú de correo privado"
 msgid "Combined View"
 msgstr "Vista combinada"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:191
+#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:195
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:192
+#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:196
 msgid "Outbox"
 msgstr "Bandeja de salida"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:193
+#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:197
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #: ../../Zotlabs/Widget/Chatroom_list.php:16
-#: ../../include/conversation.php:1807 ../../include/conversation.php:1810
+#: ../../include/conversation.php:1816 ../../include/conversation.php:1819
+#: ../../include/nav.php:425 ../../include/nav.php:428
 msgid "Chatrooms"
 msgstr "Salas de chat"
 
@@ -8027,7 +8039,7 @@ msgstr "Examinar la cola"
 msgid "DB updates"
 msgstr "Actualizaciones de la base de datos"
 
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:211
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:215
 msgid "Admin"
 msgstr "Administrador"
 
@@ -8083,64 +8095,64 @@ msgstr "Salas de chat preferidas"
 msgid "Source channel not found."
 msgstr "No se ha encontrado el canal de origen."
 
-#: ../../boot.php:1164 ../../addon/opensearch/opensearch.php:26
+#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:26
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr "Buscar %1$s (%2$s)"
 
-#: ../../boot.php:1164 ../../addon/opensearch/opensearch.php:28
+#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:28
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../boot.php:1611
+#: ../../boot.php:1609
 msgid "Create an account to access services and applications"
 msgstr "Crear una cuenta para acceder a los servicios y aplicaciones"
 
-#: ../../boot.php:1630 ../../include/nav.php:99 ../../include/nav.php:123
+#: ../../boot.php:1628 ../../include/nav.php:103 ../../include/nav.php:127
 msgid "Logout"
 msgstr "Finalizar sesión"
 
-#: ../../boot.php:1633
+#: ../../boot.php:1631
 msgid "Login/Email"
 msgstr "Inicio de sesión / Correo electrónico"
 
-#: ../../boot.php:1634
+#: ../../boot.php:1632
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../../boot.php:1635
+#: ../../boot.php:1633
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../../boot.php:1638
+#: ../../boot.php:1636
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:2176
+#: ../../boot.php:2174
 msgid "toggle mobile"
 msgstr "cambiar a modo móvil"
 
-#: ../../boot.php:2329
+#: ../../boot.php:2327
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr "[$Projectname] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2334
+#: ../../boot.php:2332
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
 
-#: ../../boot.php:2452
+#: ../../boot.php:2450
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr "[$Projectname] Las tareas de Cron no están funcionando en %s"
 
-#: ../../boot.php:2457
+#: ../../boot.php:2455
 msgid "Cron/Scheduled tasks not running."
 msgstr "Las tareas del Planificador/Cron no están funcionando."
 
-#: ../../boot.php:2458 ../../include/datetime.php:286
+#: ../../boot.php:2456 ../../include/datetime.php:286
 msgid "never"
 msgstr "nunca"
 
@@ -8197,8 +8209,8 @@ msgid "Set font-size for the entire application"
 msgstr "Ajustar el tamaño de letra para toda la aplicación"
 
 #: ../../view/theme/redbasic/php/config.php:99
-msgid "Examples: 87.5%, 14px"
-msgstr "Ejemploss: 87.5%, 14px"
+msgid "Examples: 1rem, 100%, 16px"
+msgstr "Ejemplos: 1rem, 100%, 16px"
 
 #: ../../view/theme/redbasic/php/config.php:100
 msgid "Set font-color for posts and comments"
@@ -8374,23 +8386,23 @@ msgstr "Un ajuste"
 msgid "Skeleton Settings"
 msgstr "Ajustes de Skeleton"
 
-#: ../../addon/gnusoc/gnusoc.php:118
+#: ../../addon/gnusoc/gnusoc.php:119
 msgid "GNU-Social Protocol Settings updated."
 msgstr "Se han actualizado los ajustes del protocolo de GNU-Social."
 
-#: ../../addon/gnusoc/gnusoc.php:129
+#: ../../addon/gnusoc/gnusoc.php:130
 msgid "Enable the GNU-Social protocol for this channel"
 msgstr "Activar el protocolo de GNU-Social para este canal"
 
-#: ../../addon/gnusoc/gnusoc.php:133
+#: ../../addon/gnusoc/gnusoc.php:134
 msgid "GNU-Social Protocol Settings"
 msgstr "Ajustes del protocolo de GNU-Social"
 
-#: ../../addon/gnusoc/gnusoc.php:323
+#: ../../addon/gnusoc/gnusoc.php:324
 msgid "Follow"
 msgstr "Seguir"
 
-#: ../../addon/gnusoc/gnusoc.php:326
+#: ../../addon/gnusoc/gnusoc.php:327
 #, php-format
 msgid "%1$s is now following %2$s"
 msgstr "%1$s está siguiendo ahora a %2$s"
@@ -8632,8 +8644,8 @@ msgstr "Regresar después"
 msgid "Page to load after image selection."
 msgstr "Página para cargar después de la selección de imágenes."
 
-#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1046
-#: ../../include/nav.php:107
+#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1048
+#: ../../include/nav.php:111
 msgid "Edit Profile"
 msgstr "Editar el perfil"
 
@@ -9364,27 +9376,27 @@ msgstr "una declaración de amor eterno"
 msgid "declared undying love for"
 msgstr "ha declarado amor eterno a"
 
-#: ../../addon/diaspora/diaspora.php:677
+#: ../../addon/diaspora/diaspora.php:675
 msgid "Diaspora Protocol Settings updated."
 msgstr "Los ajustes del protocolo de Diaspora se han actualizado."
 
-#: ../../addon/diaspora/diaspora.php:696
+#: ../../addon/diaspora/diaspora.php:694
 msgid "Enable the Diaspora protocol for this channel"
 msgstr "Activar el protocolo de Diaspora para este canal"
 
-#: ../../addon/diaspora/diaspora.php:700
+#: ../../addon/diaspora/diaspora.php:698
 msgid "Allow any Diaspora member to comment on your public posts"
 msgstr "Permitir a cualquier miembro de Diaspora comentar sus entradas públicas"
 
-#: ../../addon/diaspora/diaspora.php:704
+#: ../../addon/diaspora/diaspora.php:702
 msgid "Prevent your hashtags from being redirected to other sites"
 msgstr "Impedir que sus \"hashtags\" sean redirigidos a otros sitios "
 
-#: ../../addon/diaspora/diaspora.php:709
+#: ../../addon/diaspora/diaspora.php:707
 msgid "Followed hashtags (comma separated, do not include the #)"
 msgstr "\"Hashtags\" seguidos (separados por comas, sin incluir #)"
 
-#: ../../addon/diaspora/diaspora.php:714
+#: ../../addon/diaspora/diaspora.php:712
 msgid "Diaspora Protocol Settings"
 msgstr "Ajustes del protocolo de Diaspora"
 
@@ -9614,8 +9626,8 @@ msgstr "Contraseña de Friendica"
 msgid "Hubzilla to Friendica Post Settings"
 msgstr "Ajustes de publicación de Hubzilla a Friendica"
 
-#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1137
-#: ../../include/channel.php:1294
+#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1139
+#: ../../include/channel.php:1296
 msgid "Status:"
 msgstr "Estado:"
 
@@ -10170,7 +10182,7 @@ msgstr "Debe elegir blancas o negras."
 msgid "Error creating new game."
 msgstr "Error al crear un nuevo juego."
 
-#: ../../addon/chess/chess.php:381 ../../include/channel.php:897
+#: ../../addon/chess/chess.php:381 ../../include/channel.php:899
 msgid "Requested channel is not available."
 msgstr "El canal solicitado no está disponible."
 
@@ -10741,7 +10753,7 @@ msgstr "Importar repositorio de ficheros de Redmatrix"
 msgid "This will import all your Redmatrix cloud files to this channel."
 msgstr "Esto importará todos sus ficheros de la nube de Redmatrix a este canal."
 
-#: ../../addon/redfiles/redfilehelper.php:67
+#: ../../addon/redfiles/redfilehelper.php:64
 msgid "file"
 msgstr "fichero"
 
@@ -11047,7 +11059,7 @@ msgstr "Mostrar en su contexto"
 msgid "remove"
 msgstr "eliminar"
 
-#: ../../include/conversation.php:838 ../../include/nav.php:268
+#: ../../include/conversation.php:838 ../../include/nav.php:272
 msgid "Loading..."
 msgstr "Cargando..."
 
@@ -11184,118 +11196,119 @@ msgstr "Otras redes y servicios de publicación"
 msgid "Set publish date"
 msgstr "Establecer la fecha de publicación"
 
-#: ../../include/conversation.php:1625
+#: ../../include/conversation.php:1634
 msgid "Discover"
 msgstr "Descubrir"
 
-#: ../../include/conversation.php:1628
+#: ../../include/conversation.php:1637
 msgid "Imported public streams"
 msgstr "Contenidos públicos importados"
 
-#: ../../include/conversation.php:1633
+#: ../../include/conversation.php:1642
 msgid "Commented Order"
 msgstr "Comentarios recientes"
 
-#: ../../include/conversation.php:1636
+#: ../../include/conversation.php:1645
 msgid "Sort by Comment Date"
 msgstr "Ordenar por fecha de comentario"
 
-#: ../../include/conversation.php:1640
+#: ../../include/conversation.php:1649
 msgid "Posted Order"
 msgstr "Publicaciones recientes"
 
-#: ../../include/conversation.php:1643
+#: ../../include/conversation.php:1652
 msgid "Sort by Post Date"
 msgstr "Ordenar por fecha de publicación"
 
-#: ../../include/conversation.php:1651
+#: ../../include/conversation.php:1660
 msgid "Posts that mention or involve you"
 msgstr "Publicaciones que le mencionan o involucran"
 
-#: ../../include/conversation.php:1660
+#: ../../include/conversation.php:1669
 msgid "Activity Stream - by date"
 msgstr "Contenido - por fecha"
 
-#: ../../include/conversation.php:1666
+#: ../../include/conversation.php:1675
 msgid "Starred"
 msgstr "Preferidas"
 
-#: ../../include/conversation.php:1669
+#: ../../include/conversation.php:1678
 msgid "Favourite Posts"
 msgstr "Publicaciones favoritas"
 
-#: ../../include/conversation.php:1676
+#: ../../include/conversation.php:1685
 msgid "Spam"
 msgstr "Correo basura"
 
-#: ../../include/conversation.php:1679
+#: ../../include/conversation.php:1688
 msgid "Posts flagged as SPAM"
 msgstr "Publicaciones marcadas como basura"
 
-#: ../../include/conversation.php:1754
+#: ../../include/conversation.php:1763 ../../include/nav.php:372
 msgid "Status Messages and Posts"
 msgstr "Mensajes de estado y publicaciones"
 
-#: ../../include/conversation.php:1767
+#: ../../include/conversation.php:1776 ../../include/nav.php:385
 msgid "Profile Details"
 msgstr "Detalles del perfil"
 
-#: ../../include/conversation.php:1777 ../../include/photos.php:527
+#: ../../include/conversation.php:1786 ../../include/nav.php:395
+#: ../../include/photos.php:528
 msgid "Photo Albums"
 msgstr "Álbumes de fotos"
 
-#: ../../include/conversation.php:1785
+#: ../../include/conversation.php:1794 ../../include/nav.php:403
 msgid "Files and Storage"
 msgstr "Ficheros y repositorio"
 
-#: ../../include/conversation.php:1821
+#: ../../include/conversation.php:1830 ../../include/nav.php:438
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../../include/conversation.php:1824
+#: ../../include/conversation.php:1833 ../../include/nav.php:441
 msgid "Saved Bookmarks"
 msgstr "Marcadores guardados"
 
-#: ../../include/conversation.php:1835
+#: ../../include/conversation.php:1844 ../../include/nav.php:452
 msgid "View Webpages"
 msgstr "Ver páginas web"
 
-#: ../../include/conversation.php:1904
+#: ../../include/conversation.php:1913
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Participaré"
 msgstr[1] "Participaré"
 
-#: ../../include/conversation.php:1907
+#: ../../include/conversation.php:1916
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "No participaré"
 msgstr[1] "No participaré"
 
-#: ../../include/conversation.php:1910
+#: ../../include/conversation.php:1919
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Indeciso/a"
 msgstr[1] "Indecisos/as"
 
-#: ../../include/conversation.php:1913
+#: ../../include/conversation.php:1922
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "De acuerdo"
 msgstr[1] "De acuerdo"
 
-#: ../../include/conversation.php:1916
+#: ../../include/conversation.php:1925
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "En desacuerdo"
 msgstr[1] "En desacuerdo"
 
-#: ../../include/conversation.php:1919
+#: ../../include/conversation.php:1928
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
@@ -11546,183 +11559,183 @@ msgstr "relajado/a"
 msgid "surprised"
 msgstr "sorprendido/a"
 
-#: ../../include/text.php:1330 ../../include/js_strings.php:70
+#: ../../include/text.php:1335 ../../include/js_strings.php:70
 msgid "Monday"
 msgstr "lunes"
 
-#: ../../include/text.php:1330 ../../include/js_strings.php:71
+#: ../../include/text.php:1335 ../../include/js_strings.php:71
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../../include/text.php:1330 ../../include/js_strings.php:72
+#: ../../include/text.php:1335 ../../include/js_strings.php:72
 msgid "Wednesday"
 msgstr "miércoles"
 
-#: ../../include/text.php:1330 ../../include/js_strings.php:73
+#: ../../include/text.php:1335 ../../include/js_strings.php:73
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../../include/text.php:1330 ../../include/js_strings.php:74
+#: ../../include/text.php:1335 ../../include/js_strings.php:74
 msgid "Friday"
 msgstr "viernes"
 
-#: ../../include/text.php:1330 ../../include/js_strings.php:75
+#: ../../include/text.php:1335 ../../include/js_strings.php:75
 msgid "Saturday"
 msgstr "sábado"
 
-#: ../../include/text.php:1330 ../../include/js_strings.php:69
+#: ../../include/text.php:1335 ../../include/js_strings.php:69
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../../include/text.php:1334 ../../include/js_strings.php:45
+#: ../../include/text.php:1339 ../../include/js_strings.php:45
 msgid "January"
 msgstr "enero"
 
-#: ../../include/text.php:1334 ../../include/js_strings.php:46
+#: ../../include/text.php:1339 ../../include/js_strings.php:46
 msgid "February"
 msgstr "febrero"
 
-#: ../../include/text.php:1334 ../../include/js_strings.php:47
+#: ../../include/text.php:1339 ../../include/js_strings.php:47
 msgid "March"
 msgstr "marzo"
 
-#: ../../include/text.php:1334 ../../include/js_strings.php:48
+#: ../../include/text.php:1339 ../../include/js_strings.php:48
 msgid "April"
 msgstr "abril"
 
-#: ../../include/text.php:1334
+#: ../../include/text.php:1339
 msgid "May"
 msgstr "mayo"
 
-#: ../../include/text.php:1334 ../../include/js_strings.php:50
+#: ../../include/text.php:1339 ../../include/js_strings.php:50
 msgid "June"
 msgstr "junio"
 
-#: ../../include/text.php:1334 ../../include/js_strings.php:51
+#: ../../include/text.php:1339 ../../include/js_strings.php:51
 msgid "July"
 msgstr "julio"
 
-#: ../../include/text.php:1334 ../../include/js_strings.php:52
+#: ../../include/text.php:1339 ../../include/js_strings.php:52
 msgid "August"
 msgstr "agosto"
 
-#: ../../include/text.php:1334 ../../include/js_strings.php:53
+#: ../../include/text.php:1339 ../../include/js_strings.php:53
 msgid "September"
 msgstr "septiembre"
 
-#: ../../include/text.php:1334 ../../include/js_strings.php:54
+#: ../../include/text.php:1339 ../../include/js_strings.php:54
 msgid "October"
 msgstr "octubre"
 
-#: ../../include/text.php:1334 ../../include/js_strings.php:55
+#: ../../include/text.php:1339 ../../include/js_strings.php:55
 msgid "November"
 msgstr "noviembre"
 
-#: ../../include/text.php:1334 ../../include/js_strings.php:56
+#: ../../include/text.php:1339 ../../include/js_strings.php:56
 msgid "December"
 msgstr "diciembre"
 
-#: ../../include/text.php:1411 ../../include/text.php:1415
+#: ../../include/text.php:1403 ../../include/text.php:1407
 msgid "Unknown Attachment"
 msgstr "Adjunto no reconocido"
 
-#: ../../include/text.php:1417
+#: ../../include/text.php:1409
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../../include/text.php:1453
+#: ../../include/text.php:1445
 msgid "remove category"
 msgstr "eliminar el tema"
 
-#: ../../include/text.php:1527
+#: ../../include/text.php:1519
 msgid "remove from file"
 msgstr "eliminar del fichero"
 
-#: ../../include/text.php:1789 ../../include/language.php:367
+#: ../../include/text.php:1781 ../../include/language.php:367
 msgid "default"
 msgstr "por defecto"
 
-#: ../../include/text.php:1797
+#: ../../include/text.php:1789
 msgid "Page layout"
 msgstr "Plantilla de la página"
 
-#: ../../include/text.php:1797
+#: ../../include/text.php:1789
 msgid "You can create your own with the layouts tool"
 msgstr "Puede crear su propia disposición gráfica con la herramienta de plantillas"
 
-#: ../../include/text.php:1825
+#: ../../include/text.php:1817
 msgid "Page content type"
 msgstr "Tipo de contenido de la página"
 
-#: ../../include/text.php:1958
+#: ../../include/text.php:1950
 msgid "activity"
 msgstr "la actividad"
 
-#: ../../include/text.php:2272
+#: ../../include/text.php:2264
 msgid "Design Tools"
 msgstr "Herramientas de diseño web"
 
-#: ../../include/text.php:2278
+#: ../../include/text.php:2270
 msgid "Pages"
 msgstr "Páginas"
 
-#: ../../include/text.php:2300
+#: ../../include/text.php:2292
 msgid "Import website..."
 msgstr "Importar un sitio web..."
 
-#: ../../include/text.php:2301
+#: ../../include/text.php:2293
 msgid "Select folder to import"
 msgstr "Seleccionar la carpeta que se va a importar"
 
-#: ../../include/text.php:2302
+#: ../../include/text.php:2294
 msgid "Import from a zipped folder:"
 msgstr "Importar desde una carpeta comprimida: "
 
-#: ../../include/text.php:2303
+#: ../../include/text.php:2295
 msgid "Import from cloud files:"
 msgstr "Importar desde los ficheros en la nube: "
 
-#: ../../include/text.php:2304
+#: ../../include/text.php:2296
 msgid "/cloud/channel/path/to/folder"
 msgstr "/cloud/canal/ruta/a la/carpeta"
 
-#: ../../include/text.php:2305
+#: ../../include/text.php:2297
 msgid "Enter path to website files"
 msgstr "Ruta a los ficheros del sitio web"
 
-#: ../../include/text.php:2306
+#: ../../include/text.php:2298
 msgid "Select folder"
 msgstr "Seleccionar la carpeta"
 
-#: ../../include/text.php:2307
+#: ../../include/text.php:2299
 msgid "Export website..."
 msgstr "Exportar un sitio web..."
 
-#: ../../include/text.php:2308
+#: ../../include/text.php:2300
 msgid "Export to a zip file"
 msgstr "Exportar a un fichero comprimido .zip"
 
-#: ../../include/text.php:2309
+#: ../../include/text.php:2301
 msgid "website.zip"
 msgstr "sitio_web.zip"
 
-#: ../../include/text.php:2310
+#: ../../include/text.php:2302
 msgid "Enter a name for the zip file."
 msgstr "Escriba un nombre para el fichero zip."
 
-#: ../../include/text.php:2311
+#: ../../include/text.php:2303
 msgid "Export to cloud files"
 msgstr "Exportar a la nube de ficheros"
 
-#: ../../include/text.php:2312
+#: ../../include/text.php:2304
 msgid "/path/to/export/folder"
 msgstr "/ruta/para/exportar/carpeta"
 
-#: ../../include/text.php:2313
+#: ../../include/text.php:2305
 msgid "Enter a path to a cloud files destination."
 msgstr "Escriba una ruta de destino a la nube de ficheros."
 
-#: ../../include/text.php:2314
+#: ../../include/text.php:2306
 msgid "Specify folder"
 msgstr "Especificar una carpeta"
 
@@ -12074,15 +12087,15 @@ msgstr "Todos los días"
 msgid "Unable to determine sender."
 msgstr "No ha sido posible determinar el remitente. "
 
-#: ../../include/message.php:67
+#: ../../include/message.php:69
 msgid "No recipient provided."
 msgstr "No se ha especificado ningún destinatario."
 
-#: ../../include/message.php:72
+#: ../../include/message.php:74
 msgid "[no subject]"
 msgstr "[sin asunto]"
 
-#: ../../include/message.php:223
+#: ../../include/message.php:227
 msgid "Stored post could not be verified."
 msgstr "No se han podido verificar las publicaciones guardadas."
 
@@ -12181,71 +12194,71 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado"
 
-#: ../../include/items.php:846 ../../include/items.php:893
+#: ../../include/items.php:869 ../../include/items.php:916
 msgid "(Unknown)"
 msgstr "(Desconocido)"
 
-#: ../../include/items.php:1094
+#: ../../include/items.php:1110
 msgid "Visible to anybody on the internet."
 msgstr "Visible para cualquiera en internet."
 
-#: ../../include/items.php:1096
+#: ../../include/items.php:1112
 msgid "Visible to you only."
 msgstr "Visible sólo para usted."
 
-#: ../../include/items.php:1098
+#: ../../include/items.php:1114
 msgid "Visible to anybody in this network."
 msgstr "Visible para cualquiera en esta red."
 
-#: ../../include/items.php:1100
+#: ../../include/items.php:1116
 msgid "Visible to anybody authenticated."
 msgstr "Visible para cualquiera que esté autenticado."
 
-#: ../../include/items.php:1102
+#: ../../include/items.php:1118
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Visible para cualquiera en %s."
 
-#: ../../include/items.php:1104
+#: ../../include/items.php:1120
 msgid "Visible to all connections."
 msgstr "Visible para todas las conexiones."
 
-#: ../../include/items.php:1106
+#: ../../include/items.php:1122
 msgid "Visible to approved connections."
 msgstr "Visible para las conexiones permitidas."
 
-#: ../../include/items.php:1108
+#: ../../include/items.php:1124
 msgid "Visible to specific connections."
 msgstr "Visible para conexiones específicas."
 
-#: ../../include/items.php:3925
+#: ../../include/items.php:3938
 msgid "Privacy group is empty."
 msgstr "El grupo de canales está vacío."
 
-#: ../../include/items.php:3932
+#: ../../include/items.php:3945
 #, php-format
 msgid "Privacy group: %s"
 msgstr "Grupo de canales: %s"
 
-#: ../../include/items.php:3944
+#: ../../include/items.php:3957
 msgid "Connection not found."
 msgstr "Conexión no encontrada"
 
-#: ../../include/items.php:4293
+#: ../../include/items.php:4310
 msgid "profile photo"
 msgstr "foto del perfil"
 
-#: ../../include/items.php:4489
+#: ../../include/items.php:4506
 #, php-format
 msgid "[Edited %s]"
 msgstr "[se ha editado %s]"
 
-#: ../../include/items.php:4489
+#: ../../include/items.php:4506
 msgctxt "edit_activity"
 msgid "Post"
 msgstr "Publicar"
 
-#: ../../include/items.php:4489
+#: ../../include/items.php:4506
 msgctxt "edit_activity"
 msgid "Comment"
 msgstr "Comentar"
@@ -12287,116 +12300,116 @@ msgstr "No ha sido posible recuperar la identidad creada"
 msgid "Default Profile"
 msgstr "Perfil principal"
 
-#: ../../include/channel.php:1043
+#: ../../include/channel.php:1045
 msgid "Create New Profile"
 msgstr "Crear un nuevo perfil"
 
-#: ../../include/channel.php:1063
+#: ../../include/channel.php:1065
 msgid "Visible to everybody"
 msgstr "Visible para todos"
 
-#: ../../include/channel.php:1136 ../../include/channel.php:1250
+#: ../../include/channel.php:1138 ../../include/channel.php:1252
 msgid "Gender:"
 msgstr "Género:"
 
-#: ../../include/channel.php:1138 ../../include/channel.php:1305
+#: ../../include/channel.php:1140 ../../include/channel.php:1307
 msgid "Homepage:"
 msgstr "Página personal:"
 
-#: ../../include/channel.php:1139
+#: ../../include/channel.php:1141
 msgid "Online Now"
 msgstr "Ahora en línea"
 
-#: ../../include/channel.php:1255
+#: ../../include/channel.php:1257
 msgid "Like this channel"
 msgstr "Me gusta este canal"
 
-#: ../../include/channel.php:1279
+#: ../../include/channel.php:1281
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/channel.php:1280
+#: ../../include/channel.php:1282
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/channel.php:1287
+#: ../../include/channel.php:1289
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../../include/channel.php:1300
+#: ../../include/channel.php:1302
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "por %1$d %2$s"
 
-#: ../../include/channel.php:1303
+#: ../../include/channel.php:1305
 msgid "Sexual Preference:"
 msgstr "Orientación sexual:"
 
-#: ../../include/channel.php:1309
+#: ../../include/channel.php:1311
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: ../../include/channel.php:1311
+#: ../../include/channel.php:1313
 msgid "Political Views:"
 msgstr "Posición política:"
 
-#: ../../include/channel.php:1313
+#: ../../include/channel.php:1315
 msgid "Religion:"
 msgstr "Religión:"
 
-#: ../../include/channel.php:1317
+#: ../../include/channel.php:1319
 msgid "Hobbies/Interests:"
 msgstr "Aficciones o intereses:"
 
-#: ../../include/channel.php:1319
+#: ../../include/channel.php:1321
 msgid "Likes:"
 msgstr "Me gusta:"
 
-#: ../../include/channel.php:1321
+#: ../../include/channel.php:1323
 msgid "Dislikes:"
 msgstr "No me gusta:"
 
-#: ../../include/channel.php:1323
+#: ../../include/channel.php:1325
 msgid "Contact information and Social Networks:"
 msgstr "Información de contacto y redes sociales:"
 
-#: ../../include/channel.php:1325
+#: ../../include/channel.php:1327
 msgid "My other channels:"
 msgstr "Mis otros canales:"
 
-#: ../../include/channel.php:1327
+#: ../../include/channel.php:1329
 msgid "Musical interests:"
 msgstr "Preferencias musicales:"
 
-#: ../../include/channel.php:1329
+#: ../../include/channel.php:1331
 msgid "Books, literature:"
 msgstr "Libros, literatura:"
 
-#: ../../include/channel.php:1331
+#: ../../include/channel.php:1333
 msgid "Television:"
 msgstr "Televisión:"
 
-#: ../../include/channel.php:1333
+#: ../../include/channel.php:1335
 msgid "Film/dance/culture/entertainment:"
 msgstr "Cine, danza, cultura, entretenimiento:"
 
-#: ../../include/channel.php:1335
+#: ../../include/channel.php:1337
 msgid "Love/Romance:"
 msgstr "Vida sentimental o amorosa:"
 
-#: ../../include/channel.php:1337
+#: ../../include/channel.php:1339
 msgid "Work/employment:"
 msgstr "Trabajo:"
 
-#: ../../include/channel.php:1339
+#: ../../include/channel.php:1341
 msgid "School/education:"
 msgstr "Estudios:"
 
-#: ../../include/channel.php:1362
+#: ../../include/channel.php:1364
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
-#: ../../include/channel.php:2135
+#: ../../include/channel.php:2139
 #, php-format
 msgid "User '%s' deleted"
 msgstr "El usuario '%s' ha sido eliminado"
@@ -12425,51 +12438,51 @@ msgstr "En proceso"
 msgid "Cancelled"
 msgstr "Cancelado/a"
 
-#: ../../include/network.php:756
+#: ../../include/network.php:776
 msgid "view full size"
 msgstr "Ver en el tamaño original"
 
-#: ../../include/network.php:2011
+#: ../../include/network.php:2042
 msgid "No Subject"
 msgstr "Sin asunto"
 
-#: ../../include/network.php:2265 ../../include/network.php:2266
+#: ../../include/network.php:2310 ../../include/network.php:2311
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../include/network.php:2267
+#: ../../include/network.php:2312
 msgid "OStatus"
 msgstr "OStatus"
 
-#: ../../include/network.php:2268
+#: ../../include/network.php:2313
 msgid "GNU-Social"
 msgstr "GNU Social"
 
-#: ../../include/network.php:2269
+#: ../../include/network.php:2314
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/network.php:2271
+#: ../../include/network.php:2316
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../include/network.php:2272
+#: ../../include/network.php:2317
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../../include/network.php:2273
+#: ../../include/network.php:2318
 msgid "Zot"
 msgstr "Zot"
 
-#: ../../include/network.php:2274
+#: ../../include/network.php:2319
 msgid "LinkedIn"
 msgstr "LinkedIn"
 
-#: ../../include/network.php:2275
+#: ../../include/network.php:2320
 msgid "XMPP/IM"
 msgstr "XMPP/IM"
 
-#: ../../include/network.php:2276
+#: ../../include/network.php:2321
 msgid "MySpace"
 msgstr "MySpace"
 
@@ -12558,19 +12571,19 @@ msgstr "spoiler"
 msgid "$1 wrote:"
 msgstr "$1 escribió:"
 
-#: ../../include/oembed.php:308
+#: ../../include/oembed.php:315
 msgid " by "
 msgstr "por"
 
-#: ../../include/oembed.php:309
+#: ../../include/oembed.php:316
 msgid " on "
 msgstr "en"
 
-#: ../../include/oembed.php:338
+#: ../../include/oembed.php:345
 msgid "Embedded content"
 msgstr "Contenido incorporado"
 
-#: ../../include/oembed.php:347
+#: ../../include/oembed.php:354
 msgid "Embedding disabled"
 msgstr "Incrustación deshabilitada"
 
@@ -13060,135 +13073,139 @@ msgstr "Cumpleaños de %1$s"
 msgid "Happy Birthday %1$s"
 msgstr "Feliz cumpleaños %1$s"
 
-#: ../../include/nav.php:88
+#: ../../include/nav.php:92
 msgid "Remote authentication"
 msgstr "Acceder desde su servidor"
 
-#: ../../include/nav.php:88
+#: ../../include/nav.php:92
 msgid "Click to authenticate to your home hub"
 msgstr "Pulsar para identificarse en su servidor de inicio"
 
-#: ../../include/nav.php:99 ../../include/nav.php:123
+#: ../../include/nav.php:103 ../../include/nav.php:127
 msgid "End this session"
 msgstr "Finalizar esta sesión"
 
-#: ../../include/nav.php:102
+#: ../../include/nav.php:106
 msgid "Your profile page"
 msgstr "Su página del perfil"
 
-#: ../../include/nav.php:105
+#: ../../include/nav.php:109
 msgid "Manage/Edit profiles"
 msgstr "Administrar/editar perfiles"
 
-#: ../../include/nav.php:107
+#: ../../include/nav.php:111
 msgid "Edit your profile"
 msgstr "Editar su perfil"
 
-#: ../../include/nav.php:113
+#: ../../include/nav.php:117
 msgid "Sign in"
 msgstr "Acceder"
 
-#: ../../include/nav.php:138
+#: ../../include/nav.php:142
 msgid "Take me home"
 msgstr "Volver a la página principal"
 
-#: ../../include/nav.php:140
+#: ../../include/nav.php:144
 msgid "Log me out of this site"
 msgstr "Salir de este sitio"
 
-#: ../../include/nav.php:145
+#: ../../include/nav.php:149
 msgid "Create an account"
 msgstr "Crear una cuenta"
 
-#: ../../include/nav.php:157
+#: ../../include/nav.php:161
 msgid "Help and documentation"
 msgstr "Ayuda y documentación"
 
-#: ../../include/nav.php:160
+#: ../../include/nav.php:164
 msgid "Search site @name, #tag, ?docs, content"
 msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido"
 
-#: ../../include/nav.php:172
+#: ../../include/nav.php:176
+msgid "Grid"
+msgstr "Red"
+
+#: ../../include/nav.php:176
 msgid "Your grid"
 msgstr "Mi red"
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:177
 msgid "View your network/grid"
 msgstr "Ver su red"
 
-#: ../../include/nav.php:174
+#: ../../include/nav.php:178
 msgid "Mark all grid notifications seen"
 msgstr "Marcar todas las notificaciones de la red como vistas"
 
-#: ../../include/nav.php:176
+#: ../../include/nav.php:180
 msgid "Channel home"
 msgstr "Mi canal"
 
-#: ../../include/nav.php:177
+#: ../../include/nav.php:181
 msgid "View your channel home"
 msgstr "Ver su página principal del canal"
 
-#: ../../include/nav.php:178
+#: ../../include/nav.php:182
 msgid "Mark all channel notifications seen"
 msgstr "Marcar todas las notificaciones del canal como leídas"
 
-#: ../../include/nav.php:184
+#: ../../include/nav.php:188
 msgid "Notices"
 msgstr "Avisos"
 
-#: ../../include/nav.php:184
+#: ../../include/nav.php:188
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../../include/nav.php:185
+#: ../../include/nav.php:189
 msgid "View all notifications"
 msgstr "Ver todas las notificaciones"
 
-#: ../../include/nav.php:188
+#: ../../include/nav.php:192
 msgid "Private mail"
 msgstr "Correo privado"
 
-#: ../../include/nav.php:189
+#: ../../include/nav.php:193
 msgid "View your private messages"
 msgstr "Ver sus mensajes privados"
 
-#: ../../include/nav.php:190
+#: ../../include/nav.php:194
 msgid "Mark all private messages seen"
 msgstr "Marcar todos los mensajes privados como leídos"
 
-#: ../../include/nav.php:196
+#: ../../include/nav.php:200
 msgid "Event Calendar"
 msgstr "Calendario de eventos"
 
-#: ../../include/nav.php:197
+#: ../../include/nav.php:201
 msgid "View events"
 msgstr "Ver los eventos"
 
-#: ../../include/nav.php:198
+#: ../../include/nav.php:202
 msgid "Mark all events seen"
 msgstr "Marcar todos los eventos como leidos"
 
-#: ../../include/nav.php:201
+#: ../../include/nav.php:205
 msgid "Manage Your Channels"
 msgstr "Gestionar sus canales"
 
-#: ../../include/nav.php:203
+#: ../../include/nav.php:207
 msgid "Account/Channel Settings"
 msgstr "Ajustes de cuenta/canales"
 
-#: ../../include/nav.php:211
+#: ../../include/nav.php:215
 msgid "Site Setup and Configuration"
 msgstr "Ajustes y configuración del sitio"
 
-#: ../../include/nav.php:273
+#: ../../include/nav.php:277
 msgid "@name, #tag, ?doc, content"
 msgstr "@nombre, #etiqueta, ?ayuda, contenido"
 
-#: ../../include/nav.php:274
+#: ../../include/nav.php:278
 msgid "Please wait..."
 msgstr "Espere por favor…"
 
-#: ../../include/nav.php:276
+#: ../../include/nav.php:280
 msgid "Add Apps"
 msgstr "Añadir aplicaciones"
 
@@ -13215,24 +13232,24 @@ msgctxt "photo_upload"
 msgid "%1$s posted %2$s to %3$s"
 msgstr "%1$s ha publicado %2$s en %3$s"
 
-#: ../../include/photos.php:532
+#: ../../include/photos.php:533
 msgid "Upload New Photos"
 msgstr "Subir nuevas fotos"
 
-#: ../../include/zot.php:649
+#: ../../include/zot.php:646
 msgid "Invalid data packet"
 msgstr "Paquete de datos no válido"
 
-#: ../../include/zot.php:665
+#: ../../include/zot.php:662
 msgid "Unable to verify channel signature"
 msgstr "No ha sido posible de verificar la firma del canal"
 
-#: ../../include/zot.php:2316
+#: ../../include/zot.php:2313
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "No ha sido posible de verificar la firma del sitio para %s"
 
-#: ../../include/zot.php:3722
+#: ../../include/zot.php:3764
 msgid "invalid target signature"
 msgstr "La firma recibida no es válida"
 
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 506df7618..ae1164cdb 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -871,6 +871,7 @@ App::$strings["Connections"] = "Conexiones";
 App::$strings["Search your connections"] = "Buscar sus conexiones";
 App::$strings["Connections search"] = "Buscar conexiones";
 App::$strings["Find"] = "Encontrar";
+App::$strings["item"] = "elemento";
 App::$strings["Source of Item"] = "Origen del elemento";
 App::$strings["Bookmark added"] = "Marcador añadido";
 App::$strings["My Bookmarks"] = "Mis marcadores";
@@ -1382,6 +1383,7 @@ App::$strings["Unable to communicate with requested channel."] = "No se puede es
 App::$strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
 App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
 App::$strings["Messages"] = "Mensajes";
+App::$strings["message"] = "mensaje";
 App::$strings["Message recalled."] = "Mensaje revocado.";
 App::$strings["Conversation removed."] = "Conversación eliminada.";
 App::$strings["Expires YYYY-MM-DD HH:MM"] = "Caduca YYYY-MM-DD HH:MM";
@@ -1537,7 +1539,7 @@ App::$strings["Firefox Share"] = "Servicio de compartición de Firefox";
 App::$strings["Remote Diagnostics"] = "Diagnóstico remoto";
 App::$strings["Suggest Channels"] = "Sugerir canales";
 App::$strings["Login"] = "Iniciar sesión";
-App::$strings["Grid"] = "Red";
+App::$strings["Activity"] = "Actividad";
 App::$strings["Wiki"] = "Wiki";
 App::$strings["Channel Home"] = "Mi canal";
 App::$strings["Events"] = "Eventos";
@@ -1796,7 +1798,7 @@ App::$strings["Set the background image"] = "Ajustar la imagen de fondo";
 App::$strings["Set the background color of items"] = "Ajustar el color de los elementos de fondo";
 App::$strings["Set the background color of comments"] = "Ajustar el color de fondo de los comentarios";
 App::$strings["Set font-size for the entire application"] = "Ajustar el tamaño de letra para toda la aplicación";
-App::$strings["Examples: 87.5%, 14px"] = "Ejemploss: 87.5%, 14px";
+App::$strings["Examples: 1rem, 100%, 16px"] = "Ejemplos: 1rem, 100%, 16px";
 App::$strings["Set font-color for posts and comments"] = "Establecer el color de la letra para publicaciones y comentarios";
 App::$strings["Set radius of corners"] = "Establecer el radio de curvatura de las esquinas";
 App::$strings["Example: 4px"] = "Ejemplo: 4px";
@@ -3003,6 +3005,7 @@ App::$strings["Log me out of this site"] = "Salir de este sitio";
 App::$strings["Create an account"] = "Crear una cuenta";
 App::$strings["Help and documentation"] = "Ayuda y documentación";
 App::$strings["Search site @name, #tag, ?docs, content"] = "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido";
+App::$strings["Grid"] = "Red";
 App::$strings["Your grid"] = "Mi red";
 App::$strings["View your network/grid"] = "Ver su red";
 App::$strings["Mark all grid notifications seen"] = "Marcar todas las notificaciones de la red como vistas";
-- 
cgit v1.2.3


From 6c0e0b3eaeead84686148f0fa43cd441357a8b8c Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 9 May 2017 10:23:51 +0200
Subject: make all label bold

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

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 08154ca2c..1bb82f11c 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -78,7 +78,7 @@ code {
 	white-space: normal;
 }
 
-.form-group label {
+label {
 	font-weight: bold;
 }
 
-- 
cgit v1.2.3


From 96cc6a916d6e8468dbef5174bb8f9d2d85002f2e Mon Sep 17 00:00:00 2001
From: phellmes <development@suschka.de>
Date: Tue, 9 May 2017 16:00:02 +0200
Subject: Update DE translation strings

---
 view/de/hmessages.po | 20182 ++++++++++++++++++++++++-------------------------
 view/de/hstrings.php |  4729 ++++++------
 2 files changed, 12197 insertions(+), 12714 deletions(-)

(limited to 'view')

diff --git a/view/de/hmessages.po b/view/de/hmessages.po
index e8c16faaa..9c24dcbbd 100644
--- a/view/de/hmessages.po
+++ b/view/de/hmessages.po
@@ -18,16 +18,16 @@
 # sasiflo <transiflex@sasiflo.de>, 2014
 # Steff <steff@digitalesecho.de>, 2015-2016
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016-2017
 # zottel <transifex@zottel.net>, 2015
 # sasiflo <transiflex@sasiflo.de>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-17 00:05-0800\n"
-"PO-Revision-Date: 2017-02-22 13:47+0000\n"
-"Last-Translator: Phellmes <forum@suschka.de>\n"
+"POT-Creation-Date: 2017-05-01 15:36+0200\n"
+"PO-Revision-Date: 2017-05-07 00:56+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/Friendica/red-matrix/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,94 +35,6 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:248
-#: ../../include/permissions.php:945
-msgid "Social Networking"
-msgstr "Soziales Netzwerk"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:249
-#: ../../include/permissions.php:945
-msgid "Social - Mostly Public"
-msgstr "Soziales Netzwerk - Weitgehend öffentlich"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:250
-#: ../../include/permissions.php:945
-msgid "Social - Restricted"
-msgstr "Soziales Netzwerk - Beschränkt"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:251
-#: ../../include/permissions.php:945
-msgid "Social - Private"
-msgstr "Soziales Netzwerk - Privat"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:254
-#: ../../include/permissions.php:946
-msgid "Community Forum"
-msgstr "Forum"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:255
-#: ../../include/permissions.php:946
-msgid "Forum - Mostly Public"
-msgstr "Forum - Weitgehend öffentlich"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:256
-#: ../../include/permissions.php:946
-msgid "Forum - Restricted"
-msgstr "Forum - Beschränkt"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:257
-#: ../../include/permissions.php:946
-msgid "Forum - Private"
-msgstr "Forum - Privat"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:260
-#: ../../include/permissions.php:947
-msgid "Feed Republish"
-msgstr "Teilen von Feeds"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:261
-#: ../../include/permissions.php:947
-msgid "Feed - Mostly Public"
-msgstr "Feeds - Weitgehend öffentlich"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:262
-#: ../../include/permissions.php:947
-msgid "Feed - Restricted"
-msgstr "Feeds - Beschränkt"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:265
-#: ../../include/permissions.php:948
-msgid "Special Purpose"
-msgstr "Für besondere Zwecke"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:266
-#: ../../include/permissions.php:948
-msgid "Special - Celebrity/Soapbox"
-msgstr "Speziell - Mitteilungs-Kanal (keine Kommentare)"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:267
-#: ../../include/permissions.php:948
-msgid "Special - Group Repository"
-msgstr "Speziell - Gruppenarchiv"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:270
-#: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Connedit.php:879
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Settings/Channel.php:463
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1148
-#: ../../extend/addon/addon/cdav/cdav.php:277
-#: ../../extend/addon/addon/cdav/cdav.php:284 ../../include/selectors.php:49
-#: ../../include/selectors.php:66 ../../include/selectors.php:104
-#: ../../include/selectors.php:140 ../../include/connections.php:901
-#: ../../include/connections.php:908 ../../include/permissions.php:949
-msgid "Other"
-msgstr "Andere"
-
-#: ../../Zotlabs/Access/PermissionRoles.php:271
-#: ../../include/permissions.php:949
-msgid "Custom/Expert Mode"
-msgstr "Benutzerdefiniert/Expertenmodus"
-
 #: ../../Zotlabs/Access/Permissions.php:46
 msgid "Can view my channel stream and posts"
 msgstr "Kann meinen Kanal-Stream und meine Beiträge sehen"
@@ -195,6834 +107,6307 @@ msgstr "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden"
 msgid "Can administer my channel"
 msgstr "Kann meinen Kanal administrieren"
 
-#: ../../Zotlabs/Storage/Browser.php:106 ../../Zotlabs/Storage/Browser.php:237
-msgid "parent"
-msgstr "Übergeordnetes Verzeichnis"
+#: ../../Zotlabs/Access/PermissionRoles.php:248
+#: ../../include/permissions.php:946
+msgid "Social Networking"
+msgstr "Soziales Netzwerk"
 
-#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2695
-msgid "Collection"
-msgstr "Sammlung"
+#: ../../Zotlabs/Access/PermissionRoles.php:249
+#: ../../include/permissions.php:946
+msgid "Social - Mostly Public"
+msgstr "Soziales Netzwerk - Weitgehend öffentlich"
 
-#: ../../Zotlabs/Storage/Browser.php:133
-msgid "Principal"
-msgstr "Prinzipal"
+#: ../../Zotlabs/Access/PermissionRoles.php:250
+#: ../../include/permissions.php:946
+msgid "Social - Restricted"
+msgstr "Soziales Netzwerk - Beschränkt"
 
-#: ../../Zotlabs/Storage/Browser.php:136
-msgid "Addressbook"
-msgstr "Adressbuch"
+#: ../../Zotlabs/Access/PermissionRoles.php:251
+#: ../../include/permissions.php:946
+msgid "Social - Private"
+msgstr "Soziales Netzwerk - Privat"
 
-#: ../../Zotlabs/Storage/Browser.php:139
-msgid "Calendar"
-msgstr "Kalender"
+#: ../../Zotlabs/Access/PermissionRoles.php:254
+#: ../../include/permissions.php:947
+msgid "Community Forum"
+msgstr "Forum"
 
-#: ../../Zotlabs/Storage/Browser.php:142
-msgid "Schedule Inbox"
-msgstr "Posteingang für überwachte Kalender"
+#: ../../Zotlabs/Access/PermissionRoles.php:255
+#: ../../include/permissions.php:947
+msgid "Forum - Mostly Public"
+msgstr "Forum - Weitgehend öffentlich"
 
-#: ../../Zotlabs/Storage/Browser.php:145
-msgid "Schedule Outbox"
-msgstr "Postausgang für überwachte Kalender"
+#: ../../Zotlabs/Access/PermissionRoles.php:256
+#: ../../include/permissions.php:947
+msgid "Forum - Restricted"
+msgstr "Forum - Beschränkt"
 
-#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:784
-#: ../../Zotlabs/Module/Photos.php:1244
-#: ../../Zotlabs/Module/Embedphotos.php:145 ../../Zotlabs/Lib/Apps.php:559
-#: ../../Zotlabs/Lib/Apps.php:637
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:745
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:746
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:753
-#: ../../include/conversation.php:1177 ../../include/widgets.php:1714
-msgid "Unknown"
-msgstr "Unbekannt"
+#: ../../Zotlabs/Access/PermissionRoles.php:257
+#: ../../include/permissions.php:947
+msgid "Forum - Private"
+msgstr "Forum - Privat"
 
-#: ../../Zotlabs/Storage/Browser.php:224 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:224 ../../include/conversation.php:1843
-msgid "Files"
-msgstr "Dateien"
+#: ../../Zotlabs/Access/PermissionRoles.php:260
+#: ../../include/permissions.php:948
+msgid "Feed Republish"
+msgstr "Teilen von Feeds"
 
-#: ../../Zotlabs/Storage/Browser.php:225
-msgid "Total"
-msgstr "Summe"
+#: ../../Zotlabs/Access/PermissionRoles.php:261
+#: ../../include/permissions.php:948
+msgid "Feed - Mostly Public"
+msgstr "Feeds - Weitgehend öffentlich"
 
-#: ../../Zotlabs/Storage/Browser.php:227
-msgid "Shared"
-msgstr "Geteilt"
+#: ../../Zotlabs/Access/PermissionRoles.php:262
+#: ../../include/permissions.php:948
+msgid "Feed - Restricted"
+msgstr "Feeds - Beschränkt"
 
-#: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:321
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Connedit.php:882
-#: ../../Zotlabs/Module/New_channel.php:147
-#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184
-#: ../../Zotlabs/Module/Webpages.php:243
-#: ../../extend/addon/addon/cdav/include/widgets.php:127
-#: ../../extend/addon/addon/cdav/include/widgets.php:164
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1151
-msgid "Create"
-msgstr "Erstelle"
+#: ../../Zotlabs/Access/PermissionRoles.php:265
+#: ../../include/permissions.php:949
+msgid "Special Purpose"
+msgstr "Für besondere Zwecke"
 
-#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:323
-#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1368
-#: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Profile_photo.php:412
-#: ../../Zotlabs/Module/Embedphotos.php:157
-#: ../../extend/addon/addon/cdav/include/widgets.php:132
-#: ../../extend/addon/addon/cdav/include/widgets.php:168
-#: ../../include/widgets.php:1727
-msgid "Upload"
-msgstr "Hochladen"
+#: ../../Zotlabs/Access/PermissionRoles.php:266
+#: ../../include/permissions.php:949
+msgid "Special - Celebrity/Soapbox"
+msgstr "Speziell - Mitteilungs-Kanal (keine Kommentare)"
 
-#: ../../Zotlabs/Storage/Browser.php:233
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Connedit.php:867
-#: ../../Zotlabs/Module/Sharedwithme.php:99 ../../Zotlabs/Module/Wiki.php:170
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-#: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Chat.php:250
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1136
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:172
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156
-#: ../../include/widgets.php:990
-msgid "Name"
-msgstr "Name"
+#: ../../Zotlabs/Access/PermissionRoles.php:267
+#: ../../include/permissions.php:949
+msgid "Special - Group Repository"
+msgstr "Speziell - Gruppenarchiv"
 
-#: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:171
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157
-msgid "Type"
-msgstr "Typ"
+#: ../../Zotlabs/Access/PermissionRoles.php:270
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Settings/Channel.php:463
+#: ../../Zotlabs/Module/Connedit.php:914 ../../Zotlabs/Module/Profiles.php:798
+#: ../../Zotlabs/Module/Register.php:213 ../../addon/cdav/Mod_Cdav.php:1148
+#: ../../addon/cdav/cdav.php:277 ../../addon/cdav/cdav.php:284
+#: ../../include/selectors.php:49 ../../include/selectors.php:66
+#: ../../include/selectors.php:104 ../../include/selectors.php:140
+#: ../../include/permissions.php:950 ../../include/connections.php:675
+#: ../../include/connections.php:682
+msgid "Other"
+msgstr "Andere"
 
-#: ../../Zotlabs/Storage/Browser.php:235
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1408
-msgid "Size"
-msgstr "Größe"
+#: ../../Zotlabs/Access/PermissionRoles.php:271
+#: ../../include/permissions.php:950
+msgid "Custom/Expert Mode"
+msgstr "Benutzerdefiniert/Expertenmodus"
 
-#: ../../Zotlabs/Storage/Browser.php:236
-#: ../../Zotlabs/Module/Sharedwithme.php:102
-msgid "Last Modified"
-msgstr "Zuletzt geändert"
+#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Connect.php:17
+#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
+#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32
+#: ../../Zotlabs/Module/Webpages.php:33
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../include/channel.php:945
+msgid "Requested profile is not available."
+msgstr "Das angefragte Profil ist nicht verfügbar."
+
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
+#: ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:115
+#: ../../Zotlabs/Module/Channel.php:245 ../../Zotlabs/Module/Channel.php:285
+#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87
+#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271
+#: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/New_channel.php:77
+#: ../../Zotlabs/Module/New_channel.php:104
+#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Setup.php:212
+#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:274
+#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335
+#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67
+#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100
+#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29
+#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:61
+#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
+#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:315
+#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Profile_photo.php:280
+#: ../../Zotlabs/Module/Profile_photo.php:293
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:221
+#: ../../Zotlabs/Module/Item.php:231 ../../Zotlabs/Module/Item.php:1038
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Chat.php:98
+#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
+#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:107
+#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10
+#: ../../Zotlabs/Module/Webpages.php:116 ../../Zotlabs/Module/Block.php:26
+#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Suggest.php:28 ../../Zotlabs/Module/Message.php:18
+#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Cover_photo.php:281
+#: ../../Zotlabs/Module/Cover_photo.php:294
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Filestorage.php:78
+#: ../../Zotlabs/Module/Filestorage.php:93
+#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Common.php:39
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
+#: ../../Zotlabs/Module/Service_limits.php:11
+#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Notifications.php:11
+#: ../../Zotlabs/Lib/Chatroom.php:137 ../../Zotlabs/Web/WebServer.php:131
+#: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53
+#: ../../addon/gitwiki/Mod_Gitwiki.php:196
+#: ../../addon/gitwiki/Mod_Gitwiki.php:292
+#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:58
+#: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:144
+#: ../../include/attach.php:191 ../../include/attach.php:255
+#: ../../include/attach.php:269 ../../include/attach.php:276
+#: ../../include/attach.php:344 ../../include/attach.php:358
+#: ../../include/attach.php:365 ../../include/attach.php:442
+#: ../../include/attach.php:909 ../../include/attach.php:983
+#: ../../include/attach.php:1148 ../../include/items.php:3470
+#: ../../include/photos.php:27
+msgid "Permission denied."
+msgstr "Berechtigung verweigert."
+
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Editblock.php:113
+msgid "Block Name"
+msgstr "Block-Name"
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2267
+msgid "Blocks"
+msgstr "Blöcke"
+
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr "Titel des Blocks"
+
+#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:256
+#: ../../include/page_widgets.php:47
+msgid "Created"
+msgstr "Erstellt"
+
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:257
+#: ../../include/page_widgets.php:48
+msgid "Edited"
+msgstr "Geändert"
+
+#: ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Module/New_channel.php:147
+#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801
+#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Storage/Browser.php:228
+#: ../../Zotlabs/Storage/Browser.php:332 ../../addon/cdav/Mod_Cdav.php:1151
+#: ../../addon/cdav/include/widgets.php:127
+#: ../../addon/cdav/include/widgets.php:164
+msgid "Create"
+msgstr "Erstelle"
 
-#: ../../Zotlabs/Storage/Browser.php:238 ../../Zotlabs/Module/Editpost.php:85
-#: ../../Zotlabs/Module/Editblock.php:109
-#: ../../Zotlabs/Module/Connections.php:300
-#: ../../Zotlabs/Module/Connections.php:320
+#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114
 #: ../../Zotlabs/Module/Admin/Profs.php:154
-#: ../../Zotlabs/Module/Editlayout.php:114
-#: ../../Zotlabs/Module/Editwebpage.php:145 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:192
-#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Module/Wiki.php:163
-#: ../../Zotlabs/Module/Wiki.php:273
 #: ../../Zotlabs/Module/Settings/Oauth.php:149
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:106
-#: ../../Zotlabs/Lib/Apps.php:357
-#: ../../extend/addon/addon/cdav/include/widgets.php:125
-#: ../../extend/addon/addon/cdav/include/widgets.php:161
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:149
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251
-#: ../../include/menu.php:113 ../../include/channel.php:1044
-#: ../../include/channel.php:1048 ../../include/page_widgets.php:9
-#: ../../include/page_widgets.php:39
+#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Editblock.php:114
+#: ../../Zotlabs/Module/Connections.php:296
+#: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Wiki.php:165
+#: ../../Zotlabs/Module/Wiki.php:275 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Layouts.php:193
+#: ../../Zotlabs/Module/Editwebpage.php:142
+#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Editpost.php:80
+#: ../../Zotlabs/Lib/Apps.php:367 ../../Zotlabs/Lib/ThreadItem.php:107
+#: ../../Zotlabs/Storage/Browser.php:238
+#: ../../addon/cdav/include/widgets.php:125
+#: ../../addon/cdav/include/widgets.php:161
+#: ../../addon/gitwiki/Mod_Gitwiki.php:151
+#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1044
+#: ../../include/channel.php:1048 ../../include/menu.php:113
+#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Photos.php:1174
-#: ../../Zotlabs/Module/Editblock.php:134
-#: ../../Zotlabs/Module/Connections.php:271
-#: ../../Zotlabs/Module/Admin/Profs.php:155
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1042
+#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:246
+#: ../../addon/cdav/include/widgets.php:123
+#: ../../include/conversation.php:1311
+msgid "Share"
+msgstr "Teilen"
+
+#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
 #: ../../Zotlabs/Module/Admin/Accounts.php:173
 #: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Editlayout.php:137
-#: ../../Zotlabs/Module/Editwebpage.php:170
-#: ../../Zotlabs/Module/Connedit.php:626 ../../Zotlabs/Module/Connedit.php:884
-#: ../../Zotlabs/Module/Group.php:177 ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Webpages.php:246
+#: ../../Zotlabs/Module/Admin/Profs.php:155
 #: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/ThreadItem.php:126
-#: ../../Zotlabs/Lib/Apps.php:358
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:864
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1153
-#: ../../include/conversation.php:656
+#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:139
+#: ../../Zotlabs/Module/Connections.php:267
+#: ../../Zotlabs/Module/Photos.php:1143 ../../Zotlabs/Module/Connedit.php:650
+#: ../../Zotlabs/Module/Connedit.php:919 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Profiles.php:803
+#: ../../Zotlabs/Module/Editwebpage.php:167
+#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/Apps.php:368
+#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:239
+#: ../../addon/cdav/Mod_Cdav.php:864 ../../addon/cdav/Mod_Cdav.php:1153
+#: ../../include/conversation.php:654
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../../Zotlabs/Storage/Browser.php:299
-#, php-format
-msgid "You are using %1$s of your available file storage."
-msgstr "Sie verwenden %1$s von Ihrem verfügbaren Dateispeicher."
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
+#: ../../Zotlabs/Module/Wiki.php:167 ../../Zotlabs/Module/Layouts.php:198
+#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Pubsites.php:59
+#: ../../addon/gitwiki/Mod_Gitwiki.php:153 ../../include/page_widgets.php:42
+msgid "View"
+msgstr "Ansicht"
 
-#: ../../Zotlabs/Storage/Browser.php:304
-#, php-format
-msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
-msgstr "Sie verwenden %1$s von %2$s verfügbarem Dateispeicher. (%3$s&#37;)"
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
+msgstr "Einladungslimit überschritten."
 
-#: ../../Zotlabs/Storage/Browser.php:315
-msgid "WARNING:"
-msgstr "WARNUNG:"
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : Keine gültige Email Adresse."
 
-#: ../../Zotlabs/Storage/Browser.php:320
-msgid "Create new folder"
-msgstr "Neuen Ordner anlegen"
-
-#: ../../Zotlabs/Storage/Browser.php:322
-msgid "Upload file"
-msgstr "Datei hochladen"
-
-#: ../../Zotlabs/Storage/Browser.php:335
-msgid "Drop files here to immediately upload"
-msgstr "Dateien zum sofortigen Hochladen hier fallen lassen"
-
-#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Like.php:283
-#: ../../Zotlabs/Module/Group.php:72 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:68
-#: ../../Zotlabs/Module/Import_items.php:114
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
-#: ../../extend/addon/addon/frphotos/frphotos.php:81
-#: ../../extend/addon/addon/redfiles/redfiles.php:109
-#: ../../extend/addon/addon/redphotos/redphotos.php:119
-#: ../../include/items.php:327
-msgid "Permission denied"
-msgstr "Keine Berechtigung"
-
-#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:67
-#: ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Photos.php:73
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Authtest.php:16
-#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
-#: ../../Zotlabs/Module/Connections.php:33
-#: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:68
-#: ../../Zotlabs/Module/Editwebpage.php:89
-#: ../../Zotlabs/Module/Editwebpage.php:104
-#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Like.php:181
-#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Menu.php:78
-#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Connedit.php:388
-#: ../../Zotlabs/Module/Filestorage.php:23
-#: ../../Zotlabs/Module/Filestorage.php:78
-#: ../../Zotlabs/Module/Filestorage.php:93
-#: ../../Zotlabs/Module/Filestorage.php:120
-#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
-#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Mitem.php:115
-#: ../../Zotlabs/Module/Appman.php:81 ../../Zotlabs/Module/Mood.php:116
-#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:636
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/New_channel.php:77
-#: ../../Zotlabs/Module/New_channel.php:104 ../../Zotlabs/Module/Setup.php:212
-#: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137
-#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230
-#: ../../Zotlabs/Module/Item.php:1067 ../../Zotlabs/Module/Profile.php:70
-#: ../../Zotlabs/Module/Profile.php:87 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Layouts.php:71
-#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
-#: ../../Zotlabs/Module/Rate.php:113
-#: ../../Zotlabs/Module/Profile_photo.php:274
-#: ../../Zotlabs/Module/Profile_photo.php:287
-#: ../../Zotlabs/Module/Events.php:271 ../../Zotlabs/Module/Common.php:39
-#: ../../Zotlabs/Module/Channel.php:107 ../../Zotlabs/Module/Channel.php:237
-#: ../../Zotlabs/Module/Channel.php:277 ../../Zotlabs/Module/Regmod.php:21
-#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Webpages.php:116
-#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Wiki.php:49
-#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Wiki.php:313
-#: ../../Zotlabs/Module/Wiki.php:318 ../../Zotlabs/Module/Sources.php:74
-#: ../../Zotlabs/Module/Suggest.php:30 ../../Zotlabs/Module/Thing.php:274
-#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335
-#: ../../Zotlabs/Module/Mail.php:164
-#: ../../Zotlabs/Module/Viewconnections.php:28
-#: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Chat.php:100
-#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Lib/Chatroom.php:137
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:55
-#: ../../extend/addon/addon/keepout/keepout.php:36
-#: ../../extend/addon/addon/pumpio/pumpio.php:40
-#: ../../extend/addon/addon/openid/Mod_Id.php:53
-#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:58
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:194
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:291
-#: ../../include/attach.php:144 ../../include/attach.php:191
-#: ../../include/attach.php:255 ../../include/attach.php:269
-#: ../../include/attach.php:276 ../../include/attach.php:343
-#: ../../include/attach.php:357 ../../include/attach.php:364
-#: ../../include/attach.php:441 ../../include/attach.php:908
-#: ../../include/attach.php:979 ../../include/attach.php:1137
-#: ../../include/photos.php:27 ../../include/items.php:3445
-msgid "Permission denied."
-msgstr "Berechtigung verweigert."
-
-#: ../../Zotlabs/Web/Router.php:152 ../../Zotlabs/Module/Display.php:124
-#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Lib/NativeWikiPage.php:502 ../../include/help.php:66
-msgid "Page not found."
-msgstr "Seite nicht gefunden."
-
-#: ../../Zotlabs/Zot/Auth.php:138
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."
-
-#: ../../Zotlabs/Zot/Auth.php:250
-#: ../../extend/addon/addon/openid/Mod_Openid.php:76
-#: ../../extend/addon/addon/openid/Mod_Openid.php:178
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
-
-#: ../../Zotlabs/Module/Achievements.php:15
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Webpages.php:33
-#: ../../include/channel.php:945
-msgid "Requested profile is not available."
-msgstr "Das angefragte Profil ist nicht verfügbar."
-
-#: ../../Zotlabs/Module/Achievements.php:38
-msgid "Some blurb about what to do when you're new here"
-msgstr "Ein Hinweis, was man tun kann, wenn man neu hier ist"
-
-#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Photos.php:508
-#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Ratings.php:83
-#: ../../Zotlabs/Module/Directory.php:64
-#: ../../Zotlabs/Module/Viewconnections.php:23
-#: ../../extend/addon/addon/friendica/dfrn_request.php:794
-msgid "Public access denied."
-msgstr "Öffentlichen Zugriff verweigert."
-
-#: ../../Zotlabs/Module/Display.php:38 ../../Zotlabs/Module/Admin.php:60
-#: ../../Zotlabs/Module/Admin/Themes.php:69
-#: ../../Zotlabs/Module/Admin/Plugins.php:254
-#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3366
-msgid "Item not found."
-msgstr "Element nicht gefunden."
-
-#: ../../Zotlabs/Module/Register.php:49
-msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
-msgstr "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."
-
-#: ../../Zotlabs/Module/Register.php:55
-msgid ""
-"Please indicate acceptance of the Terms of Service. Registration failed."
-msgstr "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen."
-
-#: ../../Zotlabs/Module/Register.php:89
-msgid "Passwords do not match."
-msgstr "Passwörter stimmen nicht überein."
-
-#: ../../Zotlabs/Module/Register.php:131
-msgid ""
-"Registration successful. Please check your email for validation "
-"instructions."
-msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
-
-#: ../../Zotlabs/Module/Register.php:137
-msgid "Your registration is pending approval by the site owner."
-msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
-
-#: ../../Zotlabs/Module/Register.php:140
-msgid "Your registration can not be processed."
-msgstr "Deine Registrierung konnte nicht verarbeitet werden."
-
-#: ../../Zotlabs/Module/Register.php:184
-msgid "Registration on this hub is disabled."
-msgstr "Die Registrierung auf diesem Hub ist nicht möglich."
-
-#: ../../Zotlabs/Module/Register.php:193
-msgid "Registration on this hub is by approval only."
-msgstr "Eine Registrierung auf diesem Hub erfordert die Zustimmung durch den Administrator."
-
-#: ../../Zotlabs/Module/Register.php:194
-msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>"
-msgstr "<a href=\"pubsites\">Registriere Dich auf einem der anderen verbundenen Hubs.</a>"
-
-#: ../../Zotlabs/Module/Register.php:204
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal."
-
-#: ../../Zotlabs/Module/Register.php:221 ../../Zotlabs/Module/Siteinfo.php:27
-msgid "Terms of Service"
-msgstr "Nutzungsbedingungen"
+#: ../../Zotlabs/Module/Invite.php:67
+msgid "Please join us on $Projectname"
+msgstr "Schließe Dich uns auf $Projectname an!"
 
-#: ../../Zotlabs/Module/Register.php:227
-#, php-format
-msgid "I accept the %s for this website"
-msgstr "Ich akzeptiere die %s für diese Webseite"
+#: ../../Zotlabs/Module/Invite.php:77
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines $Projectname-Servers."
 
-#: ../../Zotlabs/Module/Register.php:229
+#: ../../Zotlabs/Module/Invite.php:82
 #, php-format
-msgid "I am over 13 years of age and accept the %s for this website"
-msgstr "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite"
-
-#: ../../Zotlabs/Module/Register.php:233
-msgid "Your email address"
-msgstr "Ihre E-Mail Adresse"
-
-#: ../../Zotlabs/Module/Register.php:234
-msgid "Choose a password"
-msgstr "Passwort"
-
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Please re-enter your password"
-msgstr "Bitte gib Dein Passwort noch einmal ein"
-
-#: ../../Zotlabs/Module/Register.php:236
-msgid "Please enter your invitation code"
-msgstr "Bitte trage Deinen Einladungs-Code ein"
-
-#: ../../Zotlabs/Module/Register.php:237
-#: ../../Zotlabs/Module/New_channel.php:134
-msgid "Name or caption"
-msgstr "Name oder Titel"
-
-#: ../../Zotlabs/Module/Register.php:237
-#: ../../Zotlabs/Module/New_channel.php:134
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
-msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "
-
-#: ../../Zotlabs/Module/Register.php:239
-#: ../../Zotlabs/Module/New_channel.php:136
-msgid "Choose a short nickname"
-msgstr "Wähle einen kurzen Spitznamen"
+msgid "%s : Message delivery failed."
+msgstr "%s : Nachricht konnte nicht zugestellt werden."
 
-#: ../../Zotlabs/Module/Register.php:239
-#: ../../Zotlabs/Module/New_channel.php:136
+#: ../../Zotlabs/Module/Invite.php:86
 #, php-format
-msgid ""
-"Your nickname will be used to create an easy to remember channel address "
-"e.g. nickname%s"
-msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst, z.B. nickname%s"
-
-#: ../../Zotlabs/Module/Register.php:240
-#: ../../Zotlabs/Module/New_channel.php:137
-msgid "Channel role and privacy"
-msgstr "Kanaltyp und Privatspäre-Einstellungen"
-
-#: ../../Zotlabs/Module/Register.php:240
-#: ../../Zotlabs/Module/New_channel.php:137
-msgid "Select a channel role with your privacy requirements."
-msgstr "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre."
-
-#: ../../Zotlabs/Module/Register.php:240
-#: ../../Zotlabs/Module/New_channel.php:137
-msgid "Read more about roles"
-msgstr "Mehr Informationen über Rollen"
-
-#: ../../Zotlabs/Module/Register.php:241
-msgid "no"
-msgstr "nein"
-
-#: ../../Zotlabs/Module/Register.php:241
-msgid "yes"
-msgstr "ja"
-
-#: ../../Zotlabs/Module/Register.php:253
-#: ../../Zotlabs/Module/Admin/Site.php:261
-msgid "Registration"
-msgstr "Registrierung"
-
-#: ../../Zotlabs/Module/Register.php:258
-msgid "Membership on this site is by invitation only."
-msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
-
-#: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:162
-#: ../../boot.php:1713
-msgid "Register"
-msgstr "Registrieren"
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d Nachricht gesendet."
+msgstr[1] "%d Nachrichten gesendet."
 
-#: ../../Zotlabs/Module/Register.php:271
-msgid ""
-"This site may require email verification after submitting this form. If you "
-"are returned to a login page, please check your email for instructions."
-msgstr "Diese Seite verlangt möglicherweise eine Emailbestätigung nach dem Absenden des Formulars. Wenn Du auf eine Login-Seite zurückgeleitet wirst, prüfe bitte Deinen Posteingang auf neue Mails mit entsprechenden Hinweisen."
+#: ../../Zotlabs/Module/Invite.php:105
+msgid "You have no more invitations available"
+msgstr "Du hast keine weiteren verfügbare Einladungen"
 
-#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
-#, php-format
-msgid "Fetching URL returns error: %1$s"
-msgstr "Abrufen der URL gab einen Fehler zurück: %1$s"
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Send invitations"
+msgstr "Einladungen senden"
 
-#: ../../Zotlabs/Module/Photos.php:82
-msgid "Page owner information could not be retrieved."
-msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden."
+#: ../../Zotlabs/Module/Invite.php:137
+msgid "Enter email addresses, one per line:"
+msgstr "Email-Adressen eintragen, eine pro Zeile:"
 
-#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:729
-#: ../../Zotlabs/Module/Profile_photo.php:115
-#: ../../Zotlabs/Module/Profile_photo.php:220
-#: ../../include/photo/photo_driver.php:730
-msgid "Profile Photos"
-msgstr "Profilfotos"
+#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:303
+msgid "Your message:"
+msgstr "Deine Nachricht:"
 
-#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:129
-msgid "Album not found."
-msgstr "Album nicht gefunden."
+#: ../../Zotlabs/Module/Invite.php:139
+msgid "Please join my community on $Projectname."
+msgstr "Schließe Dich uns auf $Projectname an!"
 
-#: ../../Zotlabs/Module/Photos.php:112
-msgid "Delete Album"
-msgstr "Album löschen"
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "You will need to supply this invitation code:"
+msgstr "Bitte verwende bei der Registrierung den folgenden Einladungscode:"
 
-#: ../../Zotlabs/Module/Photos.php:133
+#: ../../Zotlabs/Module/Invite.php:142
 msgid ""
-"Multiple storage folders exist with this album name, but within different "
-"directories. Please remove the desired folder or folders using the Files "
-"manager"
-msgstr "Mehrere Speicherordner mit diesem Albumnamen sind bereits vorhanden, aber in verschiedenen Verzeichnissen. Bitte entfernen Sie den oder die gewünschten Ordner mit dem Dateimanager"
-
-#: ../../Zotlabs/Module/Photos.php:190 ../../Zotlabs/Module/Photos.php:1054
-msgid "Delete Photo"
-msgstr "Foto löschen"
-
-#: ../../Zotlabs/Module/Photos.php:519
-msgid "No photos selected"
-msgstr "Keine Fotos ausgewählt"
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Registriere Dich auf einem beliebigen $Projectname-Hub (sie sind alle miteinander verbunden)"
 
-#: ../../Zotlabs/Module/Photos.php:568
-msgid "Access to this item is restricted."
-msgstr "Der Zugriff auf dieses Foto ist eingeschränkt."
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Gib meine $Projectname-Adresse im Suchfeld ein."
 
-#: ../../Zotlabs/Module/Photos.php:607
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "%1$.2f MB von %2$.2f MB Foto-Speicher belegt."
+#: ../../Zotlabs/Module/Invite.php:145
+msgid "or visit"
+msgstr "oder besuche"
 
-#: ../../Zotlabs/Module/Photos.php:610
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB Foto-Speicher belegt."
+#: ../../Zotlabs/Module/Invite.php:147
+msgid "3. Click [Connect]"
+msgstr "3. Klicke auf [Verbinden]"
 
-#: ../../Zotlabs/Module/Photos.php:646
-msgid "Upload Photos"
-msgstr "Fotos hochladen"
-
-#: ../../Zotlabs/Module/Photos.php:650
-msgid "Enter an album name"
-msgstr "Namen für ein neues Album eingeben"
-
-#: ../../Zotlabs/Module/Photos.php:651
-msgid "or select an existing album (doubleclick)"
-msgstr "oder ein bereits vorhandenes auswählen (Doppelklick)"
-
-#: ../../Zotlabs/Module/Photos.php:652
-msgid "Create a status post for this upload"
-msgstr "Einen Statusbeitrag für diesen Upload erzeugen"
-
-#: ../../Zotlabs/Module/Photos.php:652 ../../Zotlabs/Module/Admin/Site.php:218
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-#: ../../Zotlabs/Module/Connedit.php:402 ../../Zotlabs/Module/Connedit.php:740
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Profiles.php:682
-#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Events.php:470
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Wiki.php:178
-#: ../../Zotlabs/Module/Settings/Channel.php:294
-#: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../extend/addon/addon/dwpost/dwpost.php:73
-#: ../../extend/addon/addon/dwpost/dwpost.php:85
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
-#: ../../extend/addon/addon/friendica/dfrn_request.php:865
-#: ../../extend/addon/addon/ijpost/ijpost.php:73
-#: ../../extend/addon/addon/ijpost/ijpost.php:85
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
-#: ../../extend/addon/addon/libertree/libertree.php:69
-#: ../../extend/addon/addon/libertree/libertree.php:81
-#: ../../extend/addon/addon/ljpost/ljpost.php:70
-#: ../../extend/addon/addon/ljpost/ljpost.php:82
-#: ../../extend/addon/addon/nofed/nofed.php:72
-#: ../../extend/addon/addon/nofed/nofed.php:76
-#: ../../extend/addon/addon/nsabait/nsabait.php:157
-#: ../../extend/addon/addon/nsfw/nsfw.php:84
-#: ../../extend/addon/addon/planets/planets.php:153
-#: ../../extend/addon/addon/pumpio/pumpio.php:219
-#: ../../extend/addon/addon/pumpio/pumpio.php:223
-#: ../../extend/addon/addon/pumpio/pumpio.php:227
-#: ../../extend/addon/addon/pumpio/pumpio.php:231
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
-#: ../../extend/addon/addon/redred/redred.php:95
-#: ../../extend/addon/addon/redred/redred.php:99
-#: ../../extend/addon/addon/rtof/rtof.php:81
-#: ../../extend/addon/addon/rtof/rtof.php:85
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
-#: ../../extend/addon/addon/statusnet/statusnet.php:389
-#: ../../extend/addon/addon/statusnet/statusnet.php:411
-#: ../../extend/addon/addon/statusnet/statusnet.php:415
-#: ../../extend/addon/addon/statusnet/statusnet.php:424
-#: ../../extend/addon/addon/twitter/twitter.php:242
-#: ../../extend/addon/addon/twitter/twitter.php:246
-#: ../../extend/addon/addon/twitter/twitter.php:255
-#: ../../extend/addon/addon/visage/visage.php:166
-#: ../../extend/addon/addon/wppost/wppost.php:82
-#: ../../extend/addon/addon/wppost/wppost.php:105
-#: ../../extend/addon/addon/wppost/wppost.php:109
-#: ../../extend/addon/addon/xmpp/xmpp.php:53
-#: ../../extend/addon/addon/cdav/cdav.php:234
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
-#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1736
-msgid "No"
-msgstr "Nein"
-
-#: ../../Zotlabs/Module/Photos.php:652 ../../Zotlabs/Module/Admin/Site.php:220
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-#: ../../Zotlabs/Module/Connedit.php:402
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Profiles.php:682
-#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Events.php:470
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Wiki.php:178
-#: ../../Zotlabs/Module/Settings/Channel.php:294
-#: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../extend/addon/addon/dwpost/dwpost.php:73
-#: ../../extend/addon/addon/dwpost/dwpost.php:85
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
-#: ../../extend/addon/addon/friendica/dfrn_request.php:865
-#: ../../extend/addon/addon/ijpost/ijpost.php:73
-#: ../../extend/addon/addon/ijpost/ijpost.php:85
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
-#: ../../extend/addon/addon/libertree/libertree.php:69
-#: ../../extend/addon/addon/libertree/libertree.php:81
-#: ../../extend/addon/addon/ljpost/ljpost.php:70
-#: ../../extend/addon/addon/ljpost/ljpost.php:82
-#: ../../extend/addon/addon/nofed/nofed.php:72
-#: ../../extend/addon/addon/nofed/nofed.php:76
-#: ../../extend/addon/addon/nsabait/nsabait.php:157
-#: ../../extend/addon/addon/nsfw/nsfw.php:84
-#: ../../extend/addon/addon/planets/planets.php:153
-#: ../../extend/addon/addon/pumpio/pumpio.php:219
-#: ../../extend/addon/addon/pumpio/pumpio.php:223
-#: ../../extend/addon/addon/pumpio/pumpio.php:227
-#: ../../extend/addon/addon/pumpio/pumpio.php:231
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
-#: ../../extend/addon/addon/redred/redred.php:95
-#: ../../extend/addon/addon/redred/redred.php:99
-#: ../../extend/addon/addon/rtof/rtof.php:81
-#: ../../extend/addon/addon/rtof/rtof.php:85
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
-#: ../../extend/addon/addon/statusnet/statusnet.php:389
-#: ../../extend/addon/addon/statusnet/statusnet.php:411
-#: ../../extend/addon/addon/statusnet/statusnet.php:415
-#: ../../extend/addon/addon/statusnet/statusnet.php:424
-#: ../../extend/addon/addon/twitter/twitter.php:242
-#: ../../extend/addon/addon/twitter/twitter.php:246
-#: ../../extend/addon/addon/twitter/twitter.php:255
-#: ../../extend/addon/addon/visage/visage.php:166
-#: ../../extend/addon/addon/wppost/wppost.php:82
-#: ../../extend/addon/addon/wppost/wppost.php:105
-#: ../../extend/addon/addon/wppost/wppost.php:109
-#: ../../extend/addon/addon/xmpp/xmpp.php:53
-#: ../../extend/addon/addon/cdav/cdav.php:234
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
-#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1736
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../Zotlabs/Module/Photos.php:653
-msgid "Caption (optional):"
-msgstr "Beschriftung (optional):"
-
-#: ../../Zotlabs/Module/Photos.php:654
-msgid "Description (optional):"
-msgstr "Beschreibung (optional):"
-
-#: ../../Zotlabs/Module/Photos.php:657 ../../Zotlabs/Module/Photos.php:1042
-#: ../../Zotlabs/Module/Connedit.php:637
-#: ../../Zotlabs/Module/Filestorage.php:152 ../../Zotlabs/Module/Thing.php:313
-#: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Chat.php:234
-#: ../../include/acl_selectors.php:218
-msgid "Permissions"
-msgstr "Berechtigungen"
-
-#: ../../Zotlabs/Module/Photos.php:667 ../../Zotlabs/Module/Photos.php:1053
-#: ../../Zotlabs/Module/Photos.php:1093 ../../Zotlabs/Module/Photos.php:1211
+#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493
+#: ../../Zotlabs/Module/Appman.php:134
+#: ../../Zotlabs/Module/Import_items.php:129
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:357
 #: ../../Zotlabs/Module/Connect.php:98
 #: ../../Zotlabs/Module/Admin/Features.php:66
+#: ../../Zotlabs/Module/Admin/Plugins.php:438
+#: ../../Zotlabs/Module/Admin/Accounts.php:166
 #: ../../Zotlabs/Module/Admin/Logs.php:84
+#: ../../Zotlabs/Module/Admin/Channels.php:147
+#: ../../Zotlabs/Module/Admin/Themes.php:158
+#: ../../Zotlabs/Module/Admin/Site.php:279
 #: ../../Zotlabs/Module/Admin/Profs.php:157
-#: ../../Zotlabs/Module/Admin/Security.php:104
-#: ../../Zotlabs/Module/Admin/Themes.php:156
 #: ../../Zotlabs/Module/Admin/Account_edit.php:74
-#: ../../Zotlabs/Module/Admin/Accounts.php:166
-#: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Site.php:260
-#: ../../Zotlabs/Module/Admin/Plugins.php:433
-#: ../../Zotlabs/Module/Locs.php:121 ../../Zotlabs/Module/Connedit.php:847
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Cal.php:342
-#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Import_items.php:122
-#: ../../Zotlabs/Module/Import.php:507 ../../Zotlabs/Module/Mitem.php:243
-#: ../../Zotlabs/Module/Appman.php:133 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Profiles.php:722 ../../Zotlabs/Module/Invite.php:149
-#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:357
-#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Wiki.php:167
-#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
-#: ../../Zotlabs/Module/Settings/Features.php:47
-#: ../../Zotlabs/Module/Settings/Oauth.php:87
-#: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Tokens.php:168
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Zotlabs/Module/Admin/Security.php:104
+#: ../../Zotlabs/Module/Settings/Permcats.php:110
 #: ../../Zotlabs/Module/Settings/Channel.php:476
-#: ../../Zotlabs/Module/Settings/Display.php:196
-#: ../../Zotlabs/Module/Settings/Permcats.php:112
-#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Mail.php:413 ../../Zotlabs/Module/Chat.php:196
-#: ../../Zotlabs/Module/Chat.php:241 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:731
-#: ../../extend/addon/addon/chords/Mod_Chords.php:60
-#: ../../extend/addon/addon/diaspora/diaspora.php:714
-#: ../../extend/addon/addon/dwpost/dwpost.php:89
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124
-#: ../../extend/addon/addon/friendica/friendica.php:128
-#: ../../extend/addon/addon/frphotos/frphotos.php:96
-#: ../../extend/addon/addon/hubwall/hubwall.php:95
-#: ../../extend/addon/addon/ijpost/ijpost.php:89
-#: ../../extend/addon/addon/irc/irc.php:53
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:371
-#: ../../extend/addon/addon/libertree/libertree.php:85
-#: ../../extend/addon/addon/ljpost/ljpost.php:86
-#: ../../extend/addon/addon/logrot/logrot.php:35
-#: ../../extend/addon/addon/mailhost/mailhost.php:40
-#: ../../extend/addon/addon/nofed/nofed.php:80
-#: ../../extend/addon/addon/nsabait/nsabait.php:161
-#: ../../extend/addon/addon/nsfw/nsfw.php:92
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:53
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:168
-#: ../../extend/addon/addon/pageheader/pageheader.php:48
-#: ../../extend/addon/addon/piwik/piwik.php:95
-#: ../../extend/addon/addon/planets/planets.php:157
-#: ../../extend/addon/addon/pumpio/pumpio.php:237
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85
-#: ../../extend/addon/addon/redfiles/redfiles.php:124
-#: ../../extend/addon/addon/redphotos/redphotos.php:136
-#: ../../extend/addon/addon/redred/redred.php:119
-#: ../../extend/addon/addon/rtof/rtof.php:101
-#: ../../extend/addon/addon/skeleton/skeleton.php:65
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:281
-#: ../../extend/addon/addon/startpage/startpage.php:113
-#: ../../extend/addon/addon/statusnet/statusnet.php:322
-#: ../../extend/addon/addon/statusnet/statusnet.php:380
-#: ../../extend/addon/addon/statusnet/statusnet.php:432
-#: ../../extend/addon/addon/statusnet/statusnet.php:899
-#: ../../extend/addon/addon/superblock/superblock.php:118
-#: ../../extend/addon/addon/twitter/twitter.php:217
-#: ../../extend/addon/addon/twitter/twitter.php:259
-#: ../../extend/addon/addon/visage/visage.php:170
-#: ../../extend/addon/addon/wppost/wppost.php:113
-#: ../../extend/addon/addon/xmpp/xmpp.php:69
-#: ../../extend/addon/addon/cdav/cdav.php:246
-#: ../../extend/addon/addon/likebanner/likebanner.php:57
-#: ../../extend/addon/addon/mailtest/mailtest.php:100
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:133
-#: ../../include/widgets.php:815 ../../include/js_strings.php:22
-#: ../../view/theme/redbasic/php/config.php:106
-msgid "Submit"
-msgstr "Absenden"
-
-#: ../../Zotlabs/Module/Photos.php:685
-msgid "Album name could not be decoded"
-msgstr "Albumname konnte nicht dekodiert werden"
-
-#: ../../Zotlabs/Module/Photos.php:729
-msgid "Contact Photos"
-msgstr "Kontakt-Bilder"
-
-#: ../../Zotlabs/Module/Photos.php:752
-msgid "Show Newest First"
-msgstr "Neueste zuerst anzeigen"
-
-#: ../../Zotlabs/Module/Photos.php:754
-msgid "Show Oldest First"
-msgstr "Älteste zuerst anzeigen"
-
-#: ../../Zotlabs/Module/Photos.php:778 ../../Zotlabs/Module/Photos.php:1335
-#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1708
-msgid "View Photo"
-msgstr "Foto ansehen"
-
-#: ../../Zotlabs/Module/Photos.php:809
-#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1725
-msgid "Edit Album"
-msgstr "Album bearbeiten"
-
-#: ../../Zotlabs/Module/Photos.php:856
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
-
-#: ../../Zotlabs/Module/Photos.php:858
-msgid "Photo not available"
-msgstr "Foto nicht verfügbar"
-
-#: ../../Zotlabs/Module/Photos.php:916
-msgid "Use as profile photo"
-msgstr "Als Profilfoto verwenden"
-
-#: ../../Zotlabs/Module/Photos.php:917
-msgid "Use as cover photo"
-msgstr "Als Titelbild verwenden"
-
-#: ../../Zotlabs/Module/Photos.php:924
-msgid "Private Photo"
-msgstr "Privates Foto"
-
-#: ../../Zotlabs/Module/Photos.php:935 ../../Zotlabs/Module/Cal.php:336
-#: ../../Zotlabs/Module/Cal.php:343 ../../Zotlabs/Module/Events.php:689
-#: ../../Zotlabs/Module/Events.php:698
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
-msgid "Previous"
-msgstr "Voriges"
-
-#: ../../Zotlabs/Module/Photos.php:939
-msgid "View Full Size"
-msgstr "In voller Größe anzeigen"
-
-#: ../../Zotlabs/Module/Photos.php:944 ../../Zotlabs/Module/Cal.php:337
-#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Setup.php:264
-#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Events.php:699
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
-msgid "Next"
-msgstr "Nächste"
-
-#: ../../Zotlabs/Module/Photos.php:984
-#: ../../Zotlabs/Module/Admin/Plugins.php:450
-#: ../../Zotlabs/Module/Tagrm.php:137
-#: ../../extend/addon/addon/superblock/superblock.php:114
-msgid "Remove"
-msgstr "Entfernen"
-
-#: ../../Zotlabs/Module/Photos.php:1028
-msgid "Edit photo"
-msgstr "Foto bearbeiten"
-
-#: ../../Zotlabs/Module/Photos.php:1030
-msgid "Rotate CW (right)"
-msgstr "Drehen im UZS (rechts)"
-
-#: ../../Zotlabs/Module/Photos.php:1031
-msgid "Rotate CCW (left)"
-msgstr "Drehen gegen UZS (links)"
-
-#: ../../Zotlabs/Module/Photos.php:1034
-msgid "Move photo to album"
-msgstr "Foto in Album verschieben"
-
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Enter a new album name"
-msgstr "Gib einen Namen für ein neues Album ein"
-
-#: ../../Zotlabs/Module/Photos.php:1036
-msgid "or select an existing one (doubleclick)"
-msgstr "oder wähle ein bereits vorhandenes aus (Doppelklick)"
-
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "Caption"
-msgstr "Bildunterschrift"
-
-#: ../../Zotlabs/Module/Photos.php:1041
-msgid "Add a Tag"
-msgstr "Schlagwort hinzufügen"
-
-#: ../../Zotlabs/Module/Photos.php:1049
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Beispiele: @ben, @Karl_Prester, @lieschen@example.com"
-
-#: ../../Zotlabs/Module/Photos.php:1052
-msgid "Flag as adult in album view"
-msgstr "In der Albumansicht als nicht jugendfrei markieren"
-
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:268
-msgid "I like this (toggle)"
-msgstr "Mir gefällt das (Umschalter)"
-
-#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Lib/ThreadItem.php:269
-msgid "I don't like this (toggle)"
-msgstr "Mir gefällt das nicht (Umschalter)"
-
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Blocks.php:161
-#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Webpages.php:245
-#: ../../extend/addon/addon/cdav/include/widgets.php:123
-#: ../../include/conversation.php:1378
-msgid "Share"
-msgstr "Teilen"
-
-#: ../../Zotlabs/Module/Photos.php:1074 ../../Zotlabs/Lib/ThreadItem.php:411
-#: ../../include/conversation.php:738
-msgid "Please wait"
-msgstr "Bitte warten"
-
-#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
-#: ../../Zotlabs/Lib/ThreadItem.php:728
-msgid "This is you"
-msgstr "Das bist Du"
-
-#: ../../Zotlabs/Module/Photos.php:1092 ../../Zotlabs/Module/Photos.php:1210
-#: ../../Zotlabs/Lib/ThreadItem.php:730 ../../include/js_strings.php:6
-msgid "Comment"
-msgstr "Kommentar"
-
-#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Module/Events.php:478
-#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/ThreadItem.php:740
-#: ../../include/conversation.php:1347 ../../include/page_widgets.php:43
-msgid "Preview"
-msgstr "Vorschau"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Likes"
-msgstr "Gefällt mir"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Dislikes"
-msgstr "Gefällt mir nicht"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Agree"
-msgstr "Zustimmungen"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Disagree"
-msgstr "Ablehnungen"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Abstain"
-msgstr "Enthaltungen"
-
-#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Attending"
-msgstr "Zusagen"
-
-#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Not attending"
-msgstr "Absagen"
-
-#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Might attend"
-msgstr "Vielleicht"
-
-#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1139
-#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
-#: ../../include/conversation.php:1928
-msgid "View all"
-msgstr "Alles anzeigen"
-
-#: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1952
-#: ../../include/channel.php:1273
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Gefällt mir"
-msgstr[1] "Gefällt mir"
-
-#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:195
-#: ../../include/conversation.php:1955
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "Gefällt nicht"
-msgstr[1] "Gefällt nicht"
-
-#: ../../Zotlabs/Module/Photos.php:1236
-msgid "Photo Tools"
-msgstr "Fotowerkzeuge"
-
-#: ../../Zotlabs/Module/Photos.php:1245
-msgid "In This Photo:"
-msgstr "Auf diesem Foto:"
-
-#: ../../Zotlabs/Module/Photos.php:1250
-msgid "Map"
-msgstr "Karte"
-
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:400
-msgctxt "noun"
-msgid "Likes"
-msgstr "Gefällt mir"
-
-#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/ThreadItem.php:401
-msgctxt "noun"
-msgid "Dislikes"
-msgstr "Gefällt nicht"
-
-#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:406
-#: ../../include/acl_selectors.php:220
-msgid "Close"
-msgstr "Schließen"
-
-#: ../../Zotlabs/Module/Photos.php:1341
-msgid "View Album"
-msgstr "Album ansehen"
-
-#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Module/Photos.php:1365
-#: ../../Zotlabs/Module/Photos.php:1366
-msgid "Recent Photos"
-msgstr "Neueste Fotos"
-
-#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editblock.php:79
-#: ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:80
-msgid "Item not found"
-msgstr "Element nicht gefunden"
-
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
-msgstr "Element kann nicht bearbeitet werden."
-
-#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:138
-msgid "Edit post"
-msgstr "Bearbeite Beitrag"
-
-#: ../../Zotlabs/Module/Acl.php:117 ../../Zotlabs/Module/Lockview.php:117
-#: ../../Zotlabs/Module/Lockview.php:153 ../../include/acl_selectors.php:183
-msgctxt "acl"
-msgid "Profile"
-msgstr "Profil"
-
-#: ../../Zotlabs/Module/Acl.php:344
-msgid "network"
-msgstr "Netzwerk"
-
-#: ../../Zotlabs/Module/Acl.php:354
-msgid "RSS"
-msgstr "RSS"
-
-#: ../../Zotlabs/Module/Help.php:23
-msgid "Documentation Search"
-msgstr "Suche in der Dokumentation"
-
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1827
-msgid "About"
-msgstr "Über"
-
-#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:197
-msgid "Members"
-msgstr "Mitglieder"
-
-#: ../../Zotlabs/Module/Help.php:82
-msgid "Administrators"
-msgstr "Administratoren"
-
-#: ../../Zotlabs/Module/Help.php:83
-msgid "Developers"
-msgstr "Entwickler"
-
-#: ../../Zotlabs/Module/Help.php:84
-msgid "Tutorials"
-msgstr "Tutorials"
-
-#: ../../Zotlabs/Module/Help.php:93
-msgid "$Projectname Documentation"
-msgstr "$Projectname-Dokumentation"
-
-#: ../../Zotlabs/Module/Help.php:94
-msgid "Contents"
-msgstr "Inhalt"
-
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
-msgstr "Lesezeichen hinzugefügt"
-
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
-msgstr "Meine Lesezeichen"
-
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
-msgstr "Lesezeichen meiner Kontakte"
-
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
-msgstr "Fortfahren"
-
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
-msgstr "Premium-Kanal-Einrichtung"
-
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
-msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
-
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."
-
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
-
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
-
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite."
-
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
-
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
-msgstr "Eingeschränkter oder Premium-Kanal"
-
-#: ../../Zotlabs/Module/Admin.php:94
-msgid "# Accounts"
-msgstr "Anzahl der Konten"
-
-#: ../../Zotlabs/Module/Admin.php:95
-msgid "# blocked accounts"
-msgstr "Anzahl der blockierten Konten"
+#: ../../Zotlabs/Module/Settings/Features.php:47
+#: ../../Zotlabs/Module/Settings/Tokens.php:168
+#: ../../Zotlabs/Module/Settings/Account.php:118
+#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Zotlabs/Module/Settings/Oauth.php:87
+#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
+#: ../../Zotlabs/Module/Import.php:514 ../../Zotlabs/Module/Cal.php:343
+#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:657
+#: ../../Zotlabs/Module/Photos.php:1022 ../../Zotlabs/Module/Photos.php:1062
+#: ../../Zotlabs/Module/Photos.php:1180 ../../Zotlabs/Module/Wiki.php:169
+#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:186
+#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Chat.php:194
+#: ../../Zotlabs/Module/Chat.php:240 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Profiles.php:726
+#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
+#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:449
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Rate.php:166
+#: ../../Zotlabs/Lib/ThreadItem.php:732
+#: ../../Zotlabs/Widget/Eventstools.php:16
+#: ../../view/theme/redbasic/php/config.php:84
+#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:134
+#: ../../addon/cdav/cdav.php:246 ../../addon/planets/planets.php:157
+#: ../../addon/openclipatar/openclipatar.php:53
+#: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92
+#: ../../addon/ijpost/ijpost.php:89 ../../addon/dwpost/dwpost.php:89
+#: ../../addon/mailhost/mailhost.php:40
+#: ../../addon/likebanner/likebanner.php:57
+#: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53
+#: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113
+#: ../../addon/diaspora/diaspora.php:712
+#: ../../addon/gitwiki/Mod_Gitwiki.php:155
+#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/visage/visage.php:170
+#: ../../addon/nsabait/nsabait.php:161 ../../addon/mailtest/mailtest.php:100
+#: ../../addon/openstreetmap/openstreetmap.php:168
+#: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371
+#: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80
+#: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35
+#: ../../addon/frphotos/frphotos.php:96 ../../addon/chords/Mod_Chords.php:60
+#: ../../addon/libertree/libertree.php:85
+#: ../../addon/flattrwidget/flattrwidget.php:124
+#: ../../addon/statusnet/statusnet.php:322
+#: ../../addon/statusnet/statusnet.php:380
+#: ../../addon/statusnet/statusnet.php:432
+#: ../../addon/statusnet/statusnet.php:899 ../../addon/twitter/twitter.php:217
+#: ../../addon/twitter/twitter.php:259
+#: ../../addon/smileybutton/smileybutton.php:281
+#: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48
+#: ../../addon/xmpp/xmpp.php:69 ../../addon/pumpio/pumpio.php:237
+#: ../../addon/redfiles/redfiles.php:124 ../../addon/hubwall/hubwall.php:95
+#: ../../include/js_strings.php:22
+msgid "Submit"
+msgstr "Absenden"
 
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "# expired accounts"
-msgstr "Anzahl der abgelaufenen Konten"
+#: ../../Zotlabs/Module/Editlayout.php:79
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editpost.php:24
+msgid "Item not found"
+msgstr "Element nicht gefunden"
 
-#: ../../Zotlabs/Module/Admin.php:97
-msgid "# expiring accounts"
-msgstr "Anzahl der ablaufenden Konten"
+#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
+msgid "Layout Name"
+msgstr "Layout-Name"
 
-#: ../../Zotlabs/Module/Admin.php:108
-msgid "# Channels"
-msgstr "Anzahl der Kanäle"
+#: ../../Zotlabs/Module/Editlayout.php:129
+#: ../../Zotlabs/Module/Layouts.php:132
+msgid "Layout Description (Optional)"
+msgstr "Layout-Beschreibung (optional)"
 
-#: ../../Zotlabs/Module/Admin.php:109
-msgid "# primary"
-msgstr "Anzahl der primären Kanäle"
+#: ../../Zotlabs/Module/Editlayout.php:137
+msgid "Edit Layout"
+msgstr "Layout bearbeiten"
 
-#: ../../Zotlabs/Module/Admin.php:110
-msgid "# clones"
-msgstr "Anzahl der Klone"
+#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
+#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
+#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Web/WebServer.php:130
+#: ../../addon/redphotos/redphotos.php:119
+#: ../../addon/frphotos/frphotos.php:81 ../../addon/redfiles/redfiles.php:109
+#: ../../include/items.php:327
+msgid "Permission denied"
+msgstr "Keine Berechtigung"
 
-#: ../../Zotlabs/Module/Admin.php:116
-msgid "Message queues"
-msgstr "Nachrichten-Warteschlangen"
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr "Ungültiger Profil-Identifikator"
 
-#: ../../Zotlabs/Module/Admin.php:133
-msgid "Your software should be updated"
-msgstr "Die installierte Software sollte aktualisiert werden"
+#: ../../Zotlabs/Module/Profperm.php:111
+msgid "Profile Visibility Editor"
+msgstr "Profil-Sichtbarkeits-Editor"
 
-#: ../../Zotlabs/Module/Admin.php:137 ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Security.php:86
-#: ../../Zotlabs/Module/Admin/Themes.php:120
-#: ../../Zotlabs/Module/Admin/Themes.php:154
-#: ../../Zotlabs/Module/Admin/Accounts.php:164
-#: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Site.php:258
-#: ../../Zotlabs/Module/Admin/Plugins.php:336
-#: ../../Zotlabs/Module/Admin/Plugins.php:431
-msgid "Administration"
-msgstr "Administration"
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1362
+msgid "Profile"
+msgstr "Profil"
 
-#: ../../Zotlabs/Module/Admin.php:138
-msgid "Summary"
-msgstr "Zusammenfassung"
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Click on a contact to add or remove."
+msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
 
-#: ../../Zotlabs/Module/Admin.php:141
-msgid "Registered accounts"
-msgstr "Registrierte Konten"
+#: ../../Zotlabs/Module/Profperm.php:124
+msgid "Visible To"
+msgstr "Sichtbar für"
 
-#: ../../Zotlabs/Module/Admin.php:142
-msgid "Pending registrations"
-msgstr "Ausstehende Registrierungen"
+#: ../../Zotlabs/Module/Profperm.php:140
+#: ../../Zotlabs/Module/Connections.php:141
+msgid "All Connections"
+msgstr "Alle Verbindungen"
 
-#: ../../Zotlabs/Module/Admin.php:143
-msgid "Registered channels"
-msgstr "Registrierte Kanäle"
+#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25
+msgid "This site is not a directory server"
+msgstr "Diese Webseite ist kein Verzeichnisserver"
 
-#: ../../Zotlabs/Module/Admin.php:144
-msgid "Active plugins"
-msgstr "Aktive Plug-Ins"
+#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25
+#: ../../addon/gitwiki/Mod_Gitwiki.php:28 ../../addon/chess/chess.php:403
+msgid "You must be logged in to see this page."
+msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
 
-#: ../../Zotlabs/Module/Admin.php:145
-msgid "Version"
-msgstr "Version"
+#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:35
+#: ../../Zotlabs/Module/Profile.php:43
+msgid "Posts and comments"
+msgstr "Beiträge und Kommentare"
 
-#: ../../Zotlabs/Module/Admin.php:146
-msgid "Repository version (master)"
-msgstr "Repository-Version (master)"
+#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:42
+#: ../../Zotlabs/Module/Profile.php:50
+msgid "Only posts"
+msgstr "Nur Beiträge"
 
-#: ../../Zotlabs/Module/Admin.php:147
-msgid "Repository version (dev)"
-msgstr "Repository-Version (dev)"
+#: ../../Zotlabs/Module/Channel.php:112
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
 
-#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97
-#: ../../Zotlabs/Module/Blocks.php:155
-msgid "Block Name"
-msgstr "Block-Name"
+#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Channel"
+msgstr "Kanal exportieren"
 
-#: ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:287
-#: ../../Zotlabs/Module/Mail.php:412 ../../Zotlabs/Module/Chat.php:207
-#: ../../include/conversation.php:1295
-msgid "Insert web link"
-msgstr "Link einfügen"
+#: ../../Zotlabs/Module/Uexport.php:59
+msgid ""
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält."
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1406
-msgid "Title (optional)"
-msgstr "Titel (optional)"
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export Content"
+msgstr "Kanal und Inhalte exportieren"
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
-msgstr "Block bearbeiten"
+#: ../../Zotlabs/Module/Uexport.php:61
+msgid ""
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet."
 
-#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
-msgid "Invalid item."
-msgstr "Ungültiges Element."
+#: ../../Zotlabs/Module/Uexport.php:63
+msgid "Export your posts from a given year."
+msgstr "Exportiert die Beiträge des angegebenen Jahres."
 
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
-#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Chanview.php:96
-#: ../../Zotlabs/Module/Wall_upload.php:31
-msgid "Channel not found."
-msgstr "Kanal nicht gefunden."
+#: ../../Zotlabs/Module/Uexport.php:65
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne."
 
-#: ../../Zotlabs/Module/Page.php:131
+#: ../../Zotlabs/Module/Uexport.php:66
+#, php-format
 msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
-" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+"To select all posts for a given year, such as this year, visit <a "
+"href=\"%1$s\">%2$s</a>"
+msgstr "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1$s\">%2$s</a>."
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
-msgstr "Speichern in Ordner:"
+#: ../../Zotlabs/Module/Uexport.php:67
+#, php-format
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1$s\">%2$s</a>."
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
-msgstr "– auswählen –"
+#: ../../Zotlabs/Module/Uexport.php:68
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a "
+"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
+" please import or restore these in date order (oldest first)."
+msgstr "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1$s\">%2$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst."
 
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin/Profs.php:74
-#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:202
-#: ../../include/text.php:1005 ../../include/text.php:1017
-msgid "Save"
-msgstr "Speichern"
+#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:490
+#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63
+#: ../../Zotlabs/Module/Display.php:22
+#: ../../Zotlabs/Module/Viewconnections.php:23
+msgid "Public access denied."
+msgstr "Öffentlichen Zugriff verweigert."
 
-#: ../../Zotlabs/Module/Ping.php:254
-msgid "sent you a private message"
-msgstr "hat Dir eine private Nachricht geschickt"
+#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:312
+#: ../../Zotlabs/Lib/Apps.php:237 ../../Zotlabs/Widget/Sitesearch.php:31
+#: ../../include/text.php:1027 ../../include/text.php:1039
+#: ../../include/acl_selectors.php:213 ../../include/nav.php:164
+msgid "Search"
+msgstr "Suche"
 
-#: ../../Zotlabs/Module/Ping.php:302
-msgid "added your channel"
-msgstr "hat deinen Kanal hinzugefügt"
+#: ../../Zotlabs/Module/Search.php:224
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Beiträge mit Schlagwort: %s"
 
-#: ../../Zotlabs/Module/Ping.php:312
-msgid "g A l F d"
-msgstr "l, d. F, G:i \\U\\h\\r"
+#: ../../Zotlabs/Module/Search.php:226
+#, php-format
+msgid "Search results for: %s"
+msgstr "Suchergebnisse für: %s"
 
-#: ../../Zotlabs/Module/Ping.php:330
-msgid "[today]"
-msgstr "[Heute]"
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
+msgstr "Klon nicht gefunden."
 
-#: ../../Zotlabs/Module/Ping.php:339
-msgid "posted an event"
-msgstr "hat einen Termin veröffentlicht"
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
+msgstr "Nachschlagen des Kanal-Ortes fehlgeschlagen"
 
-#: ../../Zotlabs/Module/Connections.php:56
-#: ../../Zotlabs/Module/Connections.php:161
-#: ../../Zotlabs/Module/Connections.php:250
-msgid "Blocked"
-msgstr "Blockiert"
+#: ../../Zotlabs/Module/Locs.php:66
+msgid ""
+"Please select another location to become primary before removing the primary"
+" location."
+msgstr "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst."
 
-#: ../../Zotlabs/Module/Connections.php:61
-#: ../../Zotlabs/Module/Connections.php:168
-#: ../../Zotlabs/Module/Connections.php:249
-msgid "Ignored"
-msgstr "Ignoriert"
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
+msgstr "Synchronisiere Klone"
 
-#: ../../Zotlabs/Module/Connections.php:66
-#: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Connections.php:248
-msgid "Hidden"
-msgstr "Versteckt"
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
+msgstr "Keine Klon-Adressen gefunden."
 
-#: ../../Zotlabs/Module/Connections.php:71
-#: ../../Zotlabs/Module/Connections.php:175
-#: ../../Zotlabs/Module/Connections.php:247
-msgid "Archived"
-msgstr "Archiviert"
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
+msgstr "Klon-Adressen verwalten"
 
-#: ../../Zotlabs/Module/Connections.php:76
-#: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1724
-msgid "New"
-msgstr "Neu"
+#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:475
+#: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Pubsites.php:51 ../../addon/cdav/Mod_Cdav.php:839
+#: ../../include/js_strings.php:25
+msgid "Location"
+msgstr "Ort"
 
-#: ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Connections.php:107
-#: ../../Zotlabs/Module/Connedit.php:674 ../../include/widgets.php:544
-msgid "All"
-msgstr "Alle"
+#: ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Connedit.php:909 ../../Zotlabs/Module/Profiles.php:502
+#: ../../Zotlabs/Module/Profiles.php:793 ../../addon/cdav/Mod_Cdav.php:1143
+msgid "Address"
+msgstr "Adresse"
 
-#: ../../Zotlabs/Module/Connections.php:138
-msgid "New Connections"
-msgstr "Neue Verbindungen"
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
+msgstr "Primär"
 
-#: ../../Zotlabs/Module/Connections.php:141
-msgid "Show pending (new) connections"
-msgstr "Ausstehende (neue) Verbindungsanfragen anzeigen"
+#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
+msgid "Drop"
+msgstr "Löschen"
 
-#: ../../Zotlabs/Module/Connections.php:145
-#: ../../Zotlabs/Module/Profperm.php:140
-msgid "All Connections"
-msgstr "Alle Verbindungen"
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
+msgstr "Jetzt synchronisieren"
 
-#: ../../Zotlabs/Module/Connections.php:148
-msgid "Show all connections"
-msgstr "Alle Verbindungen anzeigen"
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
+msgstr "Bitte warte mehrere Minuten zwischen dem Ausführen zweier Operationen!"
 
-#: ../../Zotlabs/Module/Connections.php:164
-msgid "Only show blocked connections"
-msgstr "Nur blockierte Verbindungen anzeigen"
+#: ../../Zotlabs/Module/Locs.php:124
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing"
+" your channel."
+msgstr "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub einloggst und den Kanal dort löschst."
 
-#: ../../Zotlabs/Module/Connections.php:171
-msgid "Only show ignored connections"
-msgstr "Nur ignorierte Verbindungen anzeigen"
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt."
 
-#: ../../Zotlabs/Module/Connections.php:178
-msgid "Only show archived connections"
-msgstr "Nur archivierte Verbindungen anzeigen"
+#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144
+msgid "Menu not found."
+msgstr "Menü nicht gefunden"
 
-#: ../../Zotlabs/Module/Connections.php:185
-msgid "Only show hidden connections"
-msgstr "Nur versteckte Verbindungen anzeigen"
+#: ../../Zotlabs/Module/Mitem.php:52
+msgid "Unable to create element."
+msgstr "Element konnte nicht erstellt werden."
 
-#: ../../Zotlabs/Module/Connections.php:246
-msgid "Pending approval"
-msgstr "Wartet auf Genehmigung"
+#: ../../Zotlabs/Module/Mitem.php:76
+msgid "Unable to update menu element."
+msgstr "Kann Menü-Element nicht aktualisieren."
 
-#: ../../Zotlabs/Module/Connections.php:262
-#, php-format
-msgid "%1$s [%2$s]"
-msgstr "%1$s [%2$s]"
+#: ../../Zotlabs/Module/Mitem.php:92
+msgid "Unable to add menu element."
+msgstr "Kann Menü-Bestandteil nicht hinzufügen."
 
-#: ../../Zotlabs/Module/Connections.php:263
-msgid "Edit connection"
-msgstr "Verbindung bearbeiten"
+#: ../../Zotlabs/Module/Mitem.php:120 ../../Zotlabs/Module/Menu.php:166
+#: ../../Zotlabs/Module/Xchan.php:41
+msgid "Not found."
+msgstr "Nicht gefunden."
 
-#: ../../Zotlabs/Module/Connections.php:264
-msgid "Delete connection"
-msgstr "Verbindung löschen"
+#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
+msgid "Menu Item Permissions"
+msgstr "Zugriffsrechte des Menü-Elements"
 
-#: ../../Zotlabs/Module/Connections.php:273
-msgid "Channel address"
-msgstr "Kanaladresse"
+#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
+#: ../../Zotlabs/Module/Settings/Channel.php:510
+msgid "(click to open/close)"
+msgstr "(zum öffnen/schließen anklicken)"
 
-#: ../../Zotlabs/Module/Connections.php:275
-msgid "Network"
-msgstr "Netzwerk"
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
+msgid "Link Name"
+msgstr "Name des Links"
 
-#: ../../Zotlabs/Module/Connections.php:278
-msgid "Call"
-msgstr "Anruf"
+#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
+msgid "Link or Submenu Target"
+msgstr "Ziel des Links oder Untermenüs"
 
-#: ../../Zotlabs/Module/Connections.php:280
-msgid "Status"
-msgstr "Status"
+#: ../../Zotlabs/Module/Mitem.php:161
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen."
 
-#: ../../Zotlabs/Module/Connections.php:282
-msgid "Connected"
-msgstr "Verbunden"
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
+msgid "Use magic-auth if available"
+msgstr "Magic-Auth verwenden, falls verfügbar"
 
-#: ../../Zotlabs/Module/Connections.php:284
-msgid "Approve connection"
-msgstr "Verbindung genehmigen"
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
+#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
+#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
+#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Admin/Site.php:237
+#: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Settings/Display.php:103
+#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:642
+#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:392
+#: ../../Zotlabs/Module/Connedit.php:775 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Profiles.php:681
+#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1633
+#: ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:104 ../../addon/cdav/cdav.php:234
+#: ../../addon/planets/planets.php:153 ../../addon/wppost/wppost.php:82
+#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109
+#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
+#: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73
+#: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70
+#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166
+#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166
+#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81
+#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309
+#: ../../addon/jappixmini/jappixmini.php:313
+#: ../../addon/jappixmini/jappixmini.php:343
+#: ../../addon/jappixmini/jappixmini.php:351
+#: ../../addon/jappixmini/jappixmini.php:355
+#: ../../addon/jappixmini/jappixmini.php:359 ../../addon/nofed/nofed.php:72
+#: ../../addon/nofed/nofed.php:76 ../../addon/redred/redred.php:95
+#: ../../addon/redred/redred.php:99 ../../addon/libertree/libertree.php:69
+#: ../../addon/libertree/libertree.php:81
+#: ../../addon/flattrwidget/flattrwidget.php:120
+#: ../../addon/statusnet/statusnet.php:389
+#: ../../addon/statusnet/statusnet.php:411
+#: ../../addon/statusnet/statusnet.php:415
+#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242
+#: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255
+#: ../../addon/smileybutton/smileybutton.php:273
+#: ../../addon/smileybutton/smileybutton.php:277 ../../addon/xmpp/xmpp.php:53
+#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223
+#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145
+msgid "No"
+msgstr "Nein"
 
-#: ../../Zotlabs/Module/Connections.php:285
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-msgid "Approve"
-msgstr "Genehmigen"
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
+#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
+#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
+#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Admin/Site.php:239
+#: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Settings/Display.php:103
+#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:642
+#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:392
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Zotlabs/Module/Profiles.php:681
+#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1633
+#: ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:104 ../../addon/cdav/cdav.php:234
+#: ../../addon/planets/planets.php:153 ../../addon/wppost/wppost.php:82
+#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109
+#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
+#: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73
+#: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70
+#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166
+#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166
+#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81
+#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309
+#: ../../addon/jappixmini/jappixmini.php:313
+#: ../../addon/jappixmini/jappixmini.php:343
+#: ../../addon/jappixmini/jappixmini.php:351
+#: ../../addon/jappixmini/jappixmini.php:355
+#: ../../addon/jappixmini/jappixmini.php:359 ../../addon/nofed/nofed.php:72
+#: ../../addon/nofed/nofed.php:76 ../../addon/redred/redred.php:95
+#: ../../addon/redred/redred.php:99 ../../addon/libertree/libertree.php:69
+#: ../../addon/libertree/libertree.php:81
+#: ../../addon/flattrwidget/flattrwidget.php:120
+#: ../../addon/statusnet/statusnet.php:389
+#: ../../addon/statusnet/statusnet.php:411
+#: ../../addon/statusnet/statusnet.php:415
+#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242
+#: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255
+#: ../../addon/smileybutton/smileybutton.php:273
+#: ../../addon/smileybutton/smileybutton.php:277 ../../addon/xmpp/xmpp.php:53
+#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223
+#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145
+msgid "Yes"
+msgstr "Ja"
 
-#: ../../Zotlabs/Module/Connections.php:286
-msgid "Ignore connection"
-msgstr "Verbindung ignorieren"
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
+msgid "Open link in new window"
+msgstr "Öffne Link in neuem Fenster"
 
-#: ../../Zotlabs/Module/Connections.php:287
-#: ../../Zotlabs/Module/Connedit.php:602
-msgid "Ignore"
-msgstr "Ignorieren"
+#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+msgid "Order in list"
+msgstr "Reihenfolge in der Liste"
 
-#: ../../Zotlabs/Module/Connections.php:288
-msgid "Recent activity"
-msgstr "Kürzliche Aktivitäten"
+#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
 
-#: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/text.php:934 ../../include/nav.php:203
-msgid "Connections"
-msgstr "Verbindungen"
+#: ../../Zotlabs/Module/Mitem.php:165
+msgid "Submit and finish"
+msgstr "Absenden und fertigstellen"
 
-#: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:237 ../../include/acl_selectors.php:213
-#: ../../include/widgets.php:316 ../../include/text.php:1004
-#: ../../include/text.php:1016 ../../include/nav.php:180
-msgid "Search"
-msgstr "Suche"
+#: ../../Zotlabs/Module/Mitem.php:166
+msgid "Submit and continue"
+msgstr "Absenden und fortfahren"
 
-#: ../../Zotlabs/Module/Connections.php:317
-msgid "Search your connections"
-msgstr "Verbindungen durchsuchen"
+#: ../../Zotlabs/Module/Mitem.php:174
+msgid "Menu:"
+msgstr "Menü:"
 
-#: ../../Zotlabs/Module/Connections.php:318
-msgid "Connections search"
-msgstr "Verbindung suchen"
+#: ../../Zotlabs/Module/Mitem.php:177
+msgid "Link Target"
+msgstr "Ziel des Links"
 
-#: ../../Zotlabs/Module/Connections.php:319
-#: ../../Zotlabs/Module/Directory.php:392
-#: ../../Zotlabs/Module/Directory.php:397 ../../include/contact_widgets.php:23
-msgid "Find"
-msgstr "Finde"
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Edit menu"
+msgstr "Menü bearbeiten"
 
-#: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:61
-msgid "Image uploaded but image cropping failed."
-msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."
+#: ../../Zotlabs/Module/Mitem.php:183
+msgid "Edit element"
+msgstr "Bestandteil bearbeiten"
 
-#: ../../Zotlabs/Module/Cover_photo.php:134
-#: ../../Zotlabs/Module/Cover_photo.php:181
-msgid "Cover Photos"
-msgstr "Cover Foto"
+#: ../../Zotlabs/Module/Mitem.php:184
+msgid "Drop element"
+msgstr "Bestandteil löschen"
 
-#: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:135
-msgid "Image resize failed."
-msgstr "Bild-Anpassung fehlgeschlagen."
+#: ../../Zotlabs/Module/Mitem.php:185
+msgid "New element"
+msgstr "Neues Bestandteil"
 
-#: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:197 ../../include/photos.php:149
-msgid "Unable to process image"
-msgstr "Kann Bild nicht verarbeiten"
+#: ../../Zotlabs/Module/Mitem.php:186
+msgid "Edit this menu container"
+msgstr "Diesen Menü-Container bearbeiten"
 
-#: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:232
-msgid "Image upload failed."
-msgstr "Hochladen des Bilds fehlgeschlagen."
+#: ../../Zotlabs/Module/Mitem.php:187
+msgid "Add menu element"
+msgstr "Menüelement hinzufügen"
 
-#: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:251
-msgid "Unable to process image."
-msgstr "Kann Bild nicht verarbeiten."
+#: ../../Zotlabs/Module/Mitem.php:188
+msgid "Delete this menu item"
+msgstr "Lösche dieses Menü-Bestandteil"
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4276
-msgid "female"
-msgstr "weiblich"
+#: ../../Zotlabs/Module/Mitem.php:189
+msgid "Edit this menu item"
+msgstr "Bearbeite dieses Menü-Bestandteil"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4277
-#, php-format
-msgid "%1$s updated her %2$s"
-msgstr "%1$s hat ihr %2$s aktualisiert"
+#: ../../Zotlabs/Module/Mitem.php:206
+msgid "Menu item not found."
+msgstr "Menü-Bestandteil nicht gefunden."
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4278
-msgid "male"
-msgstr "männlich"
+#: ../../Zotlabs/Module/Mitem.php:219
+msgid "Menu item deleted."
+msgstr "Menü-Bestandteil gelöscht."
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4279
-#, php-format
-msgid "%1$s updated his %2$s"
-msgstr "%1$s hat sein %2$s aktualisiert"
+#: ../../Zotlabs/Module/Mitem.php:221
+msgid "Menu item could not be deleted."
+msgstr "Menü-Bestandteil kann nicht gelöscht werden."
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4281
-#, php-format
-msgid "%1$s updated their %2$s"
-msgstr "%1$s hat sein/ihr %2$s aktualisiert"
+#: ../../Zotlabs/Module/Mitem.php:228
+msgid "Edit Menu Element"
+msgstr "Bearbeite Menü-Bestandteil"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1764
-msgid "cover photo"
-msgstr "Cover Foto"
+#: ../../Zotlabs/Module/Mitem.php:238
+msgid "Link text"
+msgstr "Link Text"
 
-#: ../../Zotlabs/Module/Cover_photo.php:303
-#: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:312
-#: ../../Zotlabs/Module/Profile_photo.php:354
-msgid "Photo not available."
-msgstr "Foto nicht verfügbar."
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
+msgstr "Kalendereinträge wurden importiert."
 
-#: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:409
-msgid "Upload File:"
-msgstr "Datei hochladen:"
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
+msgstr "Keine Kalendereinträge gefunden."
 
-#: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:410
-msgid "Select a profile:"
-msgstr "Wähle ein Profil:"
+#: ../../Zotlabs/Module/Events.php:110
+msgid "Event can not end before it has started."
+msgstr "Termin-Ende liegt vor dem Beginn."
 
-#: ../../Zotlabs/Module/Cover_photo.php:356
-msgid "Upload Cover Photo"
-msgstr "Cover Foto hochladen"
+#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
+#: ../../Zotlabs/Module/Events.php:143
+msgid "Unable to generate preview."
+msgstr "Vorschau konnte nicht erzeugt werden."
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:418
-#: ../../Zotlabs/Module/Settings/Channel.php:404
-msgid "or"
-msgstr "oder"
+#: ../../Zotlabs/Module/Events.php:119
+msgid "Event title and start time are required."
+msgstr "Titel und Startzeit des Termins sind erforderlich."
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:418
-msgid "skip this step"
-msgstr "diesen Schritt überspringen"
+#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
+msgid "Event not found."
+msgstr "Termin nicht gefunden."
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:418
-msgid "select a photo from your photo albums"
-msgstr "ein Foto aus meinen Fotoalben"
+#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:51
+#: ../../Zotlabs/Module/Like.php:372 ../../include/conversation.php:119
+#: ../../include/text.php:1940 ../../include/event.php:1141
+msgid "event"
+msgstr "Termin"
 
-#: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:437
-msgid "Crop Image"
-msgstr "Bild zuschneiden"
+#: ../../Zotlabs/Module/Events.php:460
+msgid "Edit event title"
+msgstr "Termintitel bearbeiten"
 
-#: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:438
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu."
+#: ../../Zotlabs/Module/Events.php:460 ../../addon/cdav/Mod_Cdav.php:835
+msgid "Event title"
+msgstr "Termintitel"
 
-#: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:440
-msgid "Done Editing"
-msgstr "Bearbeitung fertigstellen"
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
+#: ../../Zotlabs/Module/Appman.php:122 ../../Zotlabs/Module/Appman.php:123
+#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752
+#: ../../include/datetime.php:259
+msgid "Required"
+msgstr "Benötigt"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38
-msgid "Off"
-msgstr "Aus"
+#: ../../Zotlabs/Module/Events.php:462
+msgid "Categories (comma-separated list)"
+msgstr "Kategorien (Kommagetrennte Liste)"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38
-msgid "On"
-msgstr "An"
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Category"
+msgstr "Kategorie bearbeiten"
 
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#, php-format
-msgid "Lock feature %s"
-msgstr "Blockiere die Funktion %s"
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Category"
+msgstr "Kategorie"
 
-#: ../../Zotlabs/Module/Admin/Features.php:64
-msgid "Manage Additional Features"
-msgstr "Zusätzliche Funktionen verwalten"
+#: ../../Zotlabs/Module/Events.php:466
+msgid "Edit start date and time"
+msgstr "Startdatum und -zeit bearbeiten"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:28
-msgid "Log settings updated."
-msgstr "Protokoll-Einstellungen aktualisiert."
+#: ../../Zotlabs/Module/Events.php:466 ../../addon/cdav/Mod_Cdav.php:836
+msgid "Start date and time"
+msgstr "Startdatum und -zeit"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../include/widgets.php:1618
-#: ../../include/widgets.php:1628
-msgid "Logs"
-msgstr "Protokolle"
+#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
+msgid "Finish date and time are not known or not relevant"
+msgstr "Enddatum und -zeit sind unbekannt oder irrelevant"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:85
-msgid "Clear"
-msgstr "Leeren"
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Edit finish date and time"
+msgstr "Enddatum und -zeit bearbeiten"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:91
-msgid "Debugging"
-msgstr "Debugging"
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Finish date and time"
+msgstr "Enddatum und -zeit"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid "Log file"
-msgstr "Protokolldatei"
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
+msgid "Adjust for viewer timezone"
+msgstr "An die Zeitzone des Betrachters anpassen"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Zotlabs/Module/Events.php:471
 msgid ""
-"Must be writable by web server. Relative to your top-level webserver "
-"directory."
-msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Hubzilla-Stammverzeichnis."
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
+msgstr "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:93
-msgid "Log level"
-msgstr "Protokollstufe"
+#: ../../Zotlabs/Module/Events.php:473
+msgid "Edit Description"
+msgstr "Beschreibung bearbeiten"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:69
-msgid "New Profile Field"
-msgstr "Neues Profilfeld"
+#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Appman.php:124
+#: ../../Zotlabs/Module/Rbmark.php:101
+#: ../../addon/rendezvous/rendezvous.php:173 ../../addon/cdav/Mod_Cdav.php:838
+msgid "Description"
+msgstr "Beschreibung"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:70
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-msgid "Field nickname"
-msgstr "Kurzname für das Feld"
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Edit Location"
+msgstr "Ort bearbeiten"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:70
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-msgid "System name of field"
-msgstr "Systemname des Feldes"
+#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1063
+#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/ThreadItem.php:741
+#: ../../include/conversation.php:1280 ../../include/page_widgets.php:43
+msgid "Preview"
+msgstr "Vorschau"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:71
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-msgid "Input type"
-msgstr "Art des Inhalts"
+#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1343
+msgid "Permission settings"
+msgstr "Berechtigungs-Einstellungen"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:72
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-msgid "Field Name"
-msgstr "Feldname"
+#: ../../Zotlabs/Module/Events.php:489
+msgid "Timezone:"
+msgstr "Zeitzone:"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:72
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-msgid "Label on profile pages"
-msgstr "Bezeichnung auf Profilseiten"
+#: ../../Zotlabs/Module/Events.php:494
+msgid "Advanced Options"
+msgstr "Weitere Optionen"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:73
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-msgid "Help text"
-msgstr "Hilfetext"
+#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:264
+msgid "l, F j"
+msgstr "l, j. F"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:73
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-msgid "Additional info (optional)"
-msgstr "Zusätzliche Informationen (optional)"
+#: ../../Zotlabs/Module/Events.php:633
+msgid "Edit event"
+msgstr "Termin bearbeiten"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:83
-msgid "Field definition not found"
-msgstr "Feld-Definition nicht gefunden"
+#: ../../Zotlabs/Module/Events.php:635
+msgid "Delete event"
+msgstr "Termin löschen"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:89
-msgid "Edit Profile Field"
-msgstr "Profilfeld bearbeiten"
+#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:313
+#: ../../include/text.php:1759
+msgid "Link to Source"
+msgstr "Link zur Quelle"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../include/widgets.php:1599
-msgid "Profile Fields"
-msgstr "Profil Felder"
+#: ../../Zotlabs/Module/Events.php:669
+msgid "calendar"
+msgstr "Kalender"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:148
-msgid "Basic Profile Fields"
-msgstr "Notwendige Profil Felder"
+#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:336
+msgid "Edit Event"
+msgstr "Termin bearbeiten"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:149
-msgid "Advanced Profile Fields"
-msgstr "Erweiterte Profil Felder"
+#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:336
+msgid "Create Event"
+msgstr "Termin anlegen"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:149
-msgid "(In addition to basic fields)"
-msgstr "(zusätzlich zu notwendige Felder)"
+#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698
+#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Cal.php:344
+#: ../../Zotlabs/Module/Photos.php:911 ../../addon/cdav/Mod_Cdav.php:846
+msgid "Previous"
+msgstr "Voriges"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:151
-msgid "All available fields"
-msgstr "Alle verfügbaren Felder"
+#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Events.php:699
+#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Photos.php:920
+#: ../../addon/cdav/Mod_Cdav.php:847
+msgid "Next"
+msgstr "Nächste"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:152
-msgid "Custom Fields"
-msgstr "Benutzerdefinierte Felder"
+#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:339
+#: ../../include/channel.php:1365
+msgid "Export"
+msgstr "Exportieren"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:156
-msgid "Create Custom Field"
-msgstr "Erstelle benutzerdefiniertes Feld"
+#: ../../Zotlabs/Module/Events.php:695 ../../addon/cdav/Mod_Cdav.php:849
+msgid "Month"
+msgstr "Monat"
 
-#: ../../Zotlabs/Module/Admin/Security.php:77
-msgid ""
-"By default, unfiltered HTML is allowed in embedded media. This is inherently"
-" insecure."
-msgstr "Standardmäßig wird ungefiltertes HTML in eingebetteten Inhalten zugelassen. Das ist prinzipiell unsicher."
+#: ../../Zotlabs/Module/Events.php:696 ../../addon/cdav/Mod_Cdav.php:850
+msgid "Week"
+msgstr "Woche"
 
-#: ../../Zotlabs/Module/Admin/Security.php:80
-msgid ""
-"The recommended setting is to only allow unfiltered HTML from the following "
-"sites:"
-msgstr "Die empfohlene Einstellung ist, ungefiltertes HTML nur von den nachfolgenden Webseiten zu erlauben:"
+#: ../../Zotlabs/Module/Events.php:697 ../../addon/cdav/Mod_Cdav.php:851
+msgid "Day"
+msgstr "Tag"
 
-#: ../../Zotlabs/Module/Admin/Security.php:81
-msgid ""
-"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br"
-" />https://vimeo.com/<br />https://soundcloud.com/<br />"
-msgstr "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Cal.php:346
+#: ../../addon/cdav/Mod_Cdav.php:848
+msgid "Today"
+msgstr "Heute"
 
-#: ../../Zotlabs/Module/Admin/Security.php:82
-msgid ""
-"All other embedded content will be filtered, <strong>unless</strong> "
-"embedded content from that site is explicitly blocked."
-msgstr "Alle anderen eingebetteten Inhalte werden gefiltert, <strong>es sei denn</strong>, eingebettete Inhalte von einer bestimmten Seite sind explizit blockiert."
+#: ../../Zotlabs/Module/Events.php:731
+msgid "Event removed"
+msgstr "Termin gelöscht"
 
-#: ../../Zotlabs/Module/Admin/Security.php:87 ../../include/widgets.php:1594
-msgid "Security"
-msgstr "Sicherheit"
+#: ../../Zotlabs/Module/Events.php:734
+msgid "Failed to remove event"
+msgstr "Termin konnte nicht gelöscht werden"
 
-#: ../../Zotlabs/Module/Admin/Security.php:89
-msgid "Block public"
-msgstr "Öffentlichen Zugriff blockieren"
+#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55
+msgid "App installed."
+msgstr "App installiert."
 
-#: ../../Zotlabs/Module/Admin/Security.php:89
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently authenticated."
-msgstr "Blockiere den öffentlichen Zugriff auf alle ansonsten öffentlichen persönlichen Seiten dieser Website, sofern ein Besucher nicht angemeldet ist."
+#: ../../Zotlabs/Module/Appman.php:48
+msgid "Malformed app."
+msgstr "Fehlerhafte App."
 
-#: ../../Zotlabs/Module/Admin/Security.php:90
-msgid "Set \"Transport Security\" HTTP header"
-msgstr "Setze den \"Transport Security\" HTTP Header"
+#: ../../Zotlabs/Module/Appman.php:111
+msgid "Embed code"
+msgstr "Code einbetten"
 
-#: ../../Zotlabs/Module/Admin/Security.php:91
-msgid "Set \"Content Security Policy\" HTTP header"
-msgstr "Setze den \"Content Security Policy\" HTTP Header"
+#: ../../Zotlabs/Module/Appman.php:117
+msgid "Edit App"
+msgstr "App bearbeiten"
 
-#: ../../Zotlabs/Module/Admin/Security.php:92
-msgid "Allowed email domains"
-msgstr "Erlaubte Domains für E-Mails"
+#: ../../Zotlabs/Module/Appman.php:117
+msgid "Create App"
+msgstr "App erstellen"
 
-#: ../../Zotlabs/Module/Admin/Security.php:92
-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."
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Name of app"
+msgstr "Name der App"
 
-#: ../../Zotlabs/Module/Admin/Security.php:93
-msgid "Not allowed email domains"
-msgstr "Nicht erlaubte Domains für E-Mails"
+#: ../../Zotlabs/Module/Appman.php:123
+msgid "Location (URL) of app"
+msgstr "Ort (URL) der App"
+
+#: ../../Zotlabs/Module/Appman.php:125
+msgid "Photo icon URL"
+msgstr "URL zum Icon"
 
-#: ../../Zotlabs/Module/Admin/Security.php:93
-msgid ""
-"Comma separated list of domains which are not allowed in email addresses for"
-" registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains, unless allowed domains have been defined."
-msgstr "Domains in E-Mail-Adressen, die keine Erlaubnis erhalten, sich auf Deinem Hub zu registrieren. Mehrere Domains können durch Kommas getrennt werden. Platzhalter (*/?) sind möglich. Keine Eingabe bedeutet keine Einschränkung, unabhängig davon, ob unter erlaubte Domains etwas eingegeben wurde."
+#: ../../Zotlabs/Module/Appman.php:125
+msgid "80 x 80 pixels - optional"
+msgstr "80 x 80 Pixel – optional"
 
-#: ../../Zotlabs/Module/Admin/Security.php:94
-msgid "Allow communications only from these sites"
-msgstr "Kommunikation nur von diesen Servern/Domains erlauben"
+#: ../../Zotlabs/Module/Appman.php:126
+msgid "Categories (optional, comma separated list)"
+msgstr "Kategorien (optional, kommagetrennte Liste)"
 
-#: ../../Zotlabs/Module/Admin/Security.php:94
-msgid ""
-"One site per line. Leave empty to allow communication from anywhere by "
-"default"
-msgstr "Ein Eintrag pro Zeile. Lasse das Feld leer, um Kommunikation grundlegend von überall her zu erlauben."
+#: ../../Zotlabs/Module/Appman.php:127
+msgid "Version ID"
+msgstr "Versions-ID"
 
-#: ../../Zotlabs/Module/Admin/Security.php:95
-msgid "Block communications from these sites"
-msgstr "Kommunikation von diesen Servern/Domains blockieren"
+#: ../../Zotlabs/Module/Appman.php:128
+msgid "Price of app"
+msgstr "Preis der App"
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
-msgid "Allow communications only from these channels"
-msgstr "Kommunikation nur von diesen Kanälen erlauben"
+#: ../../Zotlabs/Module/Appman.php:129
+msgid "Location (URL) to purchase app"
+msgstr "Ort (URL), um die App zu kaufen"
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
-msgid ""
-"One channel (hash) per line. Leave empty to allow from any channel by "
-"default"
-msgstr "Ein Kanal (hash) pro Zeile. Leerlassen um jeden Kanal zuzulassen. "
+#: ../../Zotlabs/Module/Regmod.php:15
+msgid "Please login."
+msgstr "Bitte melde dich an."
 
-#: ../../Zotlabs/Module/Admin/Security.php:97
-msgid "Block communications from these channels"
-msgstr "Kommunikation von folgenden Kanälen blockieren"
+#: ../../Zotlabs/Module/Magic.php:71
+msgid "Hub not found."
+msgstr "Server nicht gefunden."
 
-#: ../../Zotlabs/Module/Admin/Security.php:98
-msgid "Only allow embeds from secure (SSL) websites and links."
-msgstr "Erlaube Einbettungen nur von sicheren (SSL) Webseiten und Links."
+#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Tagger.php:47
+#: ../../Zotlabs/Module/Like.php:370
+#: ../../addon/redphotos/redphotohelper.php:71
+#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:116
+#: ../../include/text.php:1937
+msgid "photo"
+msgstr "Foto"
 
-#: ../../Zotlabs/Module/Admin/Security.php:99
-msgid "Allow unfiltered embedded HTML content only from these domains"
-msgstr "Erlaube Einbettung von Inhalten mit ungefiltertem HTML nur von diesen Domains"
+#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Like.php:370
+#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:144
+#: ../../include/text.php:1943
+msgid "status"
+msgstr "Status"
 
-#: ../../Zotlabs/Module/Admin/Security.php:99
-msgid "One site per line. By default embedded content is filtered."
-msgstr "Eine Website/Domain pro Zeile. Standardmäßig wird eingebetteter Inhalt gefiltert."
+#: ../../Zotlabs/Module/Subthread.php:118
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s folgt nun %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Admin/Security.php:100
-msgid "Block embedded HTML from these domains"
-msgstr "Eingebettete HTML Inhalte von diesen Servern/Domains blockieren"
+#: ../../Zotlabs/Module/Subthread.php:120
+#, php-format
+msgid "%1$s stopped following %2$s's %3$s"
+msgstr "%1$s folgt %2$ss %3$s nicht mehr"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:18
-msgid "Theme settings updated."
-msgstr "Theme-Einstellungen aktualisiert."
+#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64
+msgid "Nothing to import."
+msgstr "Nichts zu importieren."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:58
-msgid "No themes found."
-msgstr "Keine Theme gefunden."
+#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79
+#: ../../Zotlabs/Module/Import.php:95
+msgid "Unable to download data from old server"
+msgstr "Daten können vom alten Server nicht heruntergeladen werden"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:93
-#: ../../Zotlabs/Module/Admin/Plugins.php:305
-msgid "Disable"
-msgstr "Deaktivieren"
+#: ../../Zotlabs/Module/Import_items.php:77
+#: ../../Zotlabs/Module/Import.php:102
+msgid "Imported file is empty."
+msgstr "Die importierte Datei ist leer."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:95
-#: ../../Zotlabs/Module/Admin/Plugins.php:308
-msgid "Enable"
-msgstr "Aktivieren"
+#: ../../Zotlabs/Module/Import_items.php:93
+#: ../../Zotlabs/Module/Import.php:121
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Achtung: Datenbankversionen unterscheiden sich um %1$d Aktualisierungen."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:114
-msgid "Screenshot"
-msgstr "Bildschirmfoto"
+#: ../../Zotlabs/Module/Import_items.php:108
+msgid "Import completed"
+msgstr "Import abgeschlossen"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:121
-#: ../../Zotlabs/Module/Admin/Themes.php:155 ../../include/widgets.php:1597
-msgid "Themes"
-msgstr "Themes"
+#: ../../Zotlabs/Module/Import_items.php:125
+msgid "Import Items"
+msgstr "Beiträge importieren"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:122
-#: ../../Zotlabs/Module/Admin/Plugins.php:338
-msgid "Toggle"
-msgstr "Umschalten"
+#: ../../Zotlabs/Module/Import_items.php:126
+msgid ""
+"Use this form to import existing posts and content from an export file."
+msgstr "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:123
-#: ../../Zotlabs/Module/Admin/Plugins.php:339 ../../Zotlabs/Lib/Apps.php:223
-#: ../../include/widgets.php:699 ../../include/nav.php:225
-msgid "Settings"
-msgstr "Einstellungen"
+#: ../../Zotlabs/Module/Import_items.php:127
+#: ../../Zotlabs/Module/Import.php:501
+msgid "File to Upload"
+msgstr "Hochzuladende Datei:"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:132
-#: ../../Zotlabs/Module/Admin/Plugins.php:346
-msgid "Author: "
-msgstr "Autor: "
+#: ../../Zotlabs/Module/New_channel.php:121
+#: ../../Zotlabs/Module/Manage.php:136
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:133
-#: ../../Zotlabs/Module/Admin/Plugins.php:347
-msgid "Maintainer: "
-msgstr "Betreuer:"
+#: ../../Zotlabs/Module/New_channel.php:134
+#: ../../Zotlabs/Module/Register.php:237
+msgid "Name or caption"
+msgstr "Name oder Titel"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:160
-msgid "[Experimental]"
-msgstr "[Experimentell]"
+#: ../../Zotlabs/Module/New_channel.php:134
+#: ../../Zotlabs/Module/Register.php:237
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
+msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "
 
-#: ../../Zotlabs/Module/Admin/Themes.php:161
-msgid "[Unsupported]"
-msgstr "[Nicht unterstützt]"
+#: ../../Zotlabs/Module/New_channel.php:136
+#: ../../Zotlabs/Module/Register.php:239
+msgid "Choose a short nickname"
+msgstr "Wähle einen kurzen Spitznamen"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#: ../../Zotlabs/Module/New_channel.php:136
+#: ../../Zotlabs/Module/Register.php:239
 #, php-format
-msgid "Password changed for account %d."
-msgstr "Passwort für Konto %d geändert."
+msgid ""
+"Your nickname will be used to create an easy to remember channel address "
+"e.g. nickname%s"
+msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst, z.B. nickname%s"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:46
-msgid "Account settings updated."
-msgstr "Kontoeinstellungen aktualisiert."
+#: ../../Zotlabs/Module/New_channel.php:137
+#: ../../Zotlabs/Module/Register.php:240
+msgid "Channel role and privacy"
+msgstr "Kanaltyp und Privatspäre-Einstellungen"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:61
-msgid "Account not found."
-msgstr "Konto nicht gefunden."
+#: ../../Zotlabs/Module/New_channel.php:137
+#: ../../Zotlabs/Module/Register.php:240
+msgid "Select a channel role with your privacy requirements."
+msgstr "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
-msgid "Account Edit"
-msgstr "Kontobearbeitung"
+#: ../../Zotlabs/Module/New_channel.php:137
+#: ../../Zotlabs/Module/Register.php:240
+msgid "Read more about roles"
+msgstr "Mehr Informationen über Rollen"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
-msgid "New Password"
-msgstr "Neues Passwort"
+#: ../../Zotlabs/Module/New_channel.php:140
+msgid "Create Channel"
+msgstr "Einen neuen Kanal anlegen"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
-msgid "New Password again"
-msgstr "Neues Passwort wiederholen"
+#: ../../Zotlabs/Module/New_channel.php:141
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
+msgstr "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:71
-msgid "Technical skill level"
-msgstr "Technische Qualifikationsstufe"
+#: ../../Zotlabs/Module/New_channel.php:142
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
+msgstr "oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
-msgid "Account language (for emails)"
-msgstr "Kontosprache (für E-Mails)"
+#: ../../Zotlabs/Module/Removeme.php:35
+msgid ""
+"Channel removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:73
-msgid "Service class"
-msgstr "Dienstklasse"
+#: ../../Zotlabs/Module/Removeme.php:60
+msgid "Remove This Channel"
+msgstr "Diesen Kanal löschen"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:36
-#, php-format
-msgid "%s account blocked/unblocked"
-msgid_plural "%s account blocked/unblocked"
-msgstr[0] "%s Konto blockiert/freigegeben"
-msgstr[1] "%s Konten blockiert/freigegeben"
+#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeaccount.php:58
+msgid "WARNING: "
+msgstr "WARNUNG: "
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:43
-#, php-format
-msgid "%s account deleted"
-msgid_plural "%s accounts deleted"
-msgstr[0] "%s Konto gelöscht"
-msgstr[1] "%s Konten gelöscht"
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "This channel will be completely removed from the network. "
+msgstr "Dieser Kanal wird vollständig aus dem Netzwerk gelöscht."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:79
-msgid "Account not found"
-msgstr "Konto nicht gefunden"
+#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeaccount.php:58
+msgid "This action is permanent and can not be undone!"
+msgstr "Dieser Schritt ist endgültig und kann nicht rückgängig gemacht werden!"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:90
-#, php-format
-msgid "Account '%s' deleted"
-msgstr "Konto '%s' gelöscht"
+#: ../../Zotlabs/Module/Removeme.php:62
+#: ../../Zotlabs/Module/Removeaccount.php:59
+msgid "Please enter your password for verification:"
+msgstr "Bitte gib zur Bestätigung Dein Passwort ein:"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:98
-#, php-format
-msgid "Account '%s' blocked"
-msgstr "Konto '%s' blockiert"
+#: ../../Zotlabs/Module/Removeme.php:63
+msgid "Remove this channel and all its clones from the network"
+msgstr "Lösche diesen Kanal und all seine Klone aus dem Netzwerk"
+
+#: ../../Zotlabs/Module/Removeme.php:63
+msgid ""
+"By default only the instance of the channel located on this hub will be "
+"removed from the network"
+msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"
+
+#: ../../Zotlabs/Module/Removeme.php:64
+#: ../../Zotlabs/Module/Settings/Channel.php:575
+msgid "Remove Channel"
+msgstr "Kanal löschen"
+
+#: ../../Zotlabs/Module/Sharedwithme.php:99
+msgid "Files: shared with me"
+msgstr "Dateien, die mit mir geteilt wurden"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:106
-#, php-format
-msgid "Account '%s' unblocked"
-msgstr "Konto '%s' freigegeben"
+#: ../../Zotlabs/Module/Sharedwithme.php:100
+#: ../../Zotlabs/Module/Admin/Channels.php:159
+#: ../../Zotlabs/Module/Settings/Oauth.php:89
+#: ../../Zotlabs/Module/Settings/Oauth.php:115
+#: ../../Zotlabs/Module/Wiki.php:172 ../../Zotlabs/Module/Connedit.php:902
+#: ../../Zotlabs/Module/Chat.php:249 ../../Zotlabs/Lib/NativeWikiPage.php:539
+#: ../../Zotlabs/Storage/Browser.php:233
+#: ../../Zotlabs/Widget/Wiki_page_history.php:22
+#: ../../addon/rendezvous/rendezvous.php:172
+#: ../../addon/cdav/Mod_Cdav.php:1136 ../../addon/gitwiki/Mod_Gitwiki.php:158
+msgid "Name"
+msgstr "Name"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:165
-#: ../../Zotlabs/Module/Admin/Accounts.php:178 ../../include/widgets.php:1592
-msgid "Accounts"
-msgstr "Konten"
+#: ../../Zotlabs/Module/Sharedwithme.php:101
+msgid "NEW"
+msgstr "NEU"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:167
-#: ../../Zotlabs/Module/Admin/Channels.php:148
-msgid "select all"
-msgstr "Alle auswählen"
+#: ../../Zotlabs/Module/Sharedwithme.php:102
+#: ../../Zotlabs/Storage/Browser.php:235 ../../include/text.php:1409
+msgid "Size"
+msgstr "Größe"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:168
-msgid "Registrations waiting for confirm"
-msgstr "Registrierungen warten auf Bestätigung"
+#: ../../Zotlabs/Module/Sharedwithme.php:103
+#: ../../Zotlabs/Storage/Browser.php:236
+msgid "Last Modified"
+msgstr "Zuletzt geändert"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-msgid "Request date"
-msgstr "Antragsdatum"
+#: ../../Zotlabs/Module/Sharedwithme.php:104
+msgid "Remove all files"
+msgstr "Alle Dateien löschen"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-#: ../../Zotlabs/Module/Admin/Accounts.php:181
-#: ../../Zotlabs/Module/Connedit.php:871
-#: ../../extend/addon/addon/redred/redred.php:107
-#: ../../extend/addon/addon/rtof/rtof.php:93
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1140
-#: ../../extend/addon/addon/openid/MysqlProvider.php:56
-#: ../../extend/addon/addon/openid/MysqlProvider.php:57
-#: ../../include/network.php:2247
-msgid "Email"
-msgstr "E-Mail"
+#: ../../Zotlabs/Module/Sharedwithme.php:105
+msgid "Remove this file"
+msgstr "Diese Datei löschen"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:170
-msgid "No registrations."
-msgstr "Keine Registrierungen."
+#: ../../Zotlabs/Module/Setup.php:176
+msgid "$Projectname Server - Setup"
+msgstr "$Projectname Server-Einrichtung"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:172
-msgid "Deny"
-msgstr "Verweigern"
+#: ../../Zotlabs/Module/Setup.php:180
+msgid "Could not connect to database."
+msgstr "Kann nicht mit der Datenbank verbinden."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
-#: ../../Zotlabs/Module/Connedit.php:594
-msgid "Block"
-msgstr "Blockieren"
+#: ../../Zotlabs/Module/Setup.php:184
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:175
-#: ../../Zotlabs/Module/Connedit.php:594
-msgid "Unblock"
-msgstr "Freigeben"
+#: ../../Zotlabs/Module/Setup.php:191
+msgid "Could not create table."
+msgstr "Konnte Tabelle nicht erstellen."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:180
-msgid "ID"
-msgstr "ID"
+#: ../../Zotlabs/Module/Setup.php:196
+msgid "Your site database has been installed."
+msgstr "Die Datenbank Deines Hubs wurde installiert."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287
-msgid "All Channels"
-msgstr "Alle Kanäle"
+#: ../../Zotlabs/Module/Setup.php:200
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
+msgstr "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:183
-msgid "Register date"
-msgstr "Registrierungs-Datum"
+#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
+#: ../../Zotlabs/Module/Setup.php:748
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Lies die Datei \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:184
-msgid "Last login"
-msgstr "Letzte Anmeldung"
+#: ../../Zotlabs/Module/Setup.php:260
+msgid "System check"
+msgstr "Systemprüfung"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:185
-msgid "Expires"
-msgstr "Verfällt"
+#: ../../Zotlabs/Module/Setup.php:265
+msgid "Check again"
+msgstr "Nochmal prüfen"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:186
-msgid "Service Class"
-msgstr "Service-Klasse"
+#: ../../Zotlabs/Module/Setup.php:287
+msgid "Database connection"
+msgstr "Datenbankverbindung"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:188
+#: ../../Zotlabs/Module/Setup.php:288
 msgid ""
-"Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
-" on this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Die ausgewählten Konten werden gelöscht!\\n\\nAlles, was diese Konten auf diesem Hub veröffentlicht haben, wird endgültig gelöscht werden!\\n\\nBist du dir sicher?"
+"In order to install $Projectname we need to know how to connect to your "
+"database."
+msgstr "Um $Projectname zu installieren, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:189
+#: ../../Zotlabs/Module/Setup.php:289
 msgid ""
-"The account {0} will be deleted!\\n\\nEverything this account has posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Das Konto {0} wird gelöscht!\\n\\nAlles, was dieses Konto auf diesem Hub veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?"
-
-#: ../../Zotlabs/Module/Admin/Channels.php:31
-#, php-format
-msgid "%s channel censored/uncensored"
-msgid_plural "%s channels censored/uncensored"
-msgstr[0] "%s Kanal gesperrt/freigegeben"
-msgstr[1] "%s Kanäle gesperrt/freigegeben"
-
-#: ../../Zotlabs/Module/Admin/Channels.php:40
-#, php-format
-msgid "%s channel code allowed/disallowed"
-msgid_plural "%s channels code allowed/disallowed"
-msgstr[0] "Code für %s Kanal gesperrt/freigegeben"
-msgstr[1] "Code für %s Kanäle gesperrt/freigegeben"
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast."
 
-#: ../../Zotlabs/Module/Admin/Channels.php:46
-#, php-format
-msgid "%s channel deleted"
-msgid_plural "%s channels deleted"
-msgstr[0] "%s Kanal gelöscht"
-msgstr[1] "%s Kanäle gelöscht"
+#: ../../Zotlabs/Module/Setup.php:290
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst."
 
-#: ../../Zotlabs/Module/Admin/Channels.php:65
-msgid "Channel not found"
-msgstr "Kanal nicht gefunden"
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Database Server Name"
+msgstr "Datenbankservername"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:75
-#, php-format
-msgid "Channel '%s' deleted"
-msgstr "Kanal '%s' gelöscht"
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Default is 127.0.0.1"
+msgstr "Standard ist 127.0.0.1"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
-#, php-format
-msgid "Channel '%s' censored"
-msgstr "Kanal '%s' gesperrt"
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Database Port"
+msgstr "Datenbankport"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
-#, php-format
-msgid "Channel '%s' uncensored"
-msgstr "Kanal '%s' freigegeben"
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Communication port number - use 0 for default"
+msgstr "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
-#, php-format
-msgid "Channel '%s' code allowed"
-msgstr "Code für Kanal '%s' freigegeben"
+#: ../../Zotlabs/Module/Setup.php:296
+msgid "Database Login Name"
+msgstr "Datenbank-Benutzername"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
-#, php-format
-msgid "Channel '%s' code disallowed"
-msgstr "Code für Kanal '%s' gesperrt"
+#: ../../Zotlabs/Module/Setup.php:297
+msgid "Database Login Password"
+msgstr "Datenbank-Passwort"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:146 ../../include/widgets.php:1593
-msgid "Channels"
-msgstr "Kanäle"
+#: ../../Zotlabs/Module/Setup.php:298
+msgid "Database Name"
+msgstr "Datenbankname"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:150
-msgid "Censor"
-msgstr "Sperren"
+#: ../../Zotlabs/Module/Setup.php:299
+msgid "Database Type"
+msgstr "Datenbanktyp"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:151
-msgid "Uncensor"
-msgstr "Freigeben"
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
+msgid "Site administrator email address"
+msgstr "E-Mail Adresse des Seiten-Administrators"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:152
-msgid "Allow Code"
-msgstr "Code erlauben"
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst."
 
-#: ../../Zotlabs/Module/Admin/Channels.php:153
-msgid "Disallow Code"
-msgstr "Code sperren"
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
+msgid "Website URL"
+msgstr "Webseiten-URL"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1815
-msgid "Channel"
-msgstr "Kanal"
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
+msgid "Please use SSL (https) URL if available."
+msgstr "Nutze wenn möglich eine SSL-URL (https)."
 
-#: ../../Zotlabs/Module/Admin/Channels.php:158
-msgid "UID"
-msgstr "UID"
+#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:353
+msgid "Please select a default timezone for your website"
+msgstr "Standard-Zeitzone für Deinen Server"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:874
-#: ../../Zotlabs/Module/Profiles.php:503
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143
-msgid "Address"
-msgstr "Adresse"
+#: ../../Zotlabs/Module/Setup.php:328 ../../Zotlabs/Module/Admin/Site.php:258
+msgid "Basic/Minimal Social Networking"
+msgstr "Einfaches/minimales soziales Netzwerken"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:162
-msgid ""
-"Selected channels will be deleted!\\n\\nEverything that was posted in these "
-"channels on this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?"
+#: ../../Zotlabs/Module/Setup.php:329 ../../Zotlabs/Module/Admin/Site.php:259
+msgid "Standard Configuration (default)"
+msgstr "Standardkonfiguration (Standard)"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:163
-msgid ""
-"The channel {0} will be deleted!\\n\\nEverything that was posted in this "
-"channel on this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?"
+#: ../../Zotlabs/Module/Setup.php:330 ../../Zotlabs/Module/Admin/Site.php:260
+msgid "Professional"
+msgstr "Professionell"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
-msgid "Update has been marked successful"
-msgstr "Update wurde als erfolgreich markiert"
+#: ../../Zotlabs/Module/Setup.php:336
+msgid "Site settings"
+msgstr "Seiteneinstellungen"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:29
-#, php-format
-msgid "Executing %s failed. Check system logs."
-msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."
+#: ../../Zotlabs/Module/Setup.php:351 ../../Zotlabs/Module/Admin/Site.php:289
+msgid "Server Configuration/Role"
+msgstr "Serverkonfiguration/Rolle"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:32
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "Update %s wurde erfolgreich ausgeführt."
+#: ../../Zotlabs/Module/Setup.php:392
+msgid "PHP version 5.5 or greater is required."
+msgstr "PHP-Version 5.5 oder höher ist erforderlich."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:36
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."
+#: ../../Zotlabs/Module/Setup.php:393
+msgid "PHP version"
+msgstr "PHP-Version"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:39
-#, php-format
-msgid "Update function %s could not be found."
-msgstr "Update-Funktion %s konnte nicht gefunden werden."
+#: ../../Zotlabs/Module/Setup.php:409
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:55
-msgid "No failed updates."
-msgstr "Keine fehlgeschlagenen Aktualisierungen."
+#: ../../Zotlabs/Module/Setup.php:410
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
-msgid "Failed Updates"
-msgstr "Fehlgeschlagene Aktualisierungen"
+#: ../../Zotlabs/Module/Setup.php:414
+msgid "PHP executable path"
+msgstr "PHP-Pfad zu ausführbarer Datei"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:61
-msgid "Mark success (if update was manually applied)"
-msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"
+#: ../../Zotlabs/Module/Setup.php:414
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:62
-msgid "Attempt to execute this update step automatically"
-msgstr "Versuche, diesen Updateschritt automatisch auszuführen"
+#: ../../Zotlabs/Module/Setup.php:419
+msgid "Command line PHP"
+msgstr "PHP-Befehlszeile"
 
-#: ../../Zotlabs/Module/Admin/Site.php:133
-msgid "Site settings updated."
-msgstr "Site-Einstellungen aktualisiert."
+#: ../../Zotlabs/Module/Setup.php:429
+msgid ""
+"Unable to check command line PHP, as shell_exec() is disabled. This is "
+"required."
+msgstr "Prüfung auf Kommandozeilen-PHP fehlgeschlagen, da shell_exec() deaktiviert ist. Dies wird aber benötigt."
 
-#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2931
-msgid "Default"
-msgstr "Standard"
+#: ../../Zotlabs/Module/Setup.php:432
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:169
-#: ../../Zotlabs/Module/Settings/Display.php:143
-msgid "mobile"
-msgstr "mobil"
+#: ../../Zotlabs/Module/Setup.php:433
+msgid "This is required for message delivery to work."
+msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:171
-msgid "experimental"
-msgstr "experimentell"
+#: ../../Zotlabs/Module/Setup.php:436
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Admin/Site.php:173
-msgid "unsupported"
-msgstr "nicht unterstützt"
+#: ../../Zotlabs/Module/Setup.php:454
+#, php-format
+msgid ""
+"Your max allowed total upload size is set to %s. Maximum size of one file to"
+" upload is set to %s. You are allowed to upload up to %d files at once."
+msgstr "Die Maximalgröße für Uploads insgesamt liegt bei %s. Die Maximalgröße für eine Datei liegt bei %s. Es können maximal %d Dateien gleichzeitig hochgeladen werden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:219
-msgid "Yes - with approval"
-msgstr "Ja - mit Zustimmung"
+#: ../../Zotlabs/Module/Setup.php:459
+msgid "You can adjust these settings in the server php.ini file."
+msgstr "Du kannst diese Einstellungen in der php.ini - Datei des Servers anpassen."
 
-#: ../../Zotlabs/Module/Admin/Site.php:225
-msgid "My site is not a public server"
-msgstr "Mein Server ist kein öffentlicher Server"
+#: ../../Zotlabs/Module/Setup.php:461
+msgid "PHP upload limits"
+msgstr "PHP-Hochladebeschränkungen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:226
-msgid "My site has paid access only"
-msgstr "Meine Seite hat nur bezahlten Zugriff"
+#: ../../Zotlabs/Module/Setup.php:484
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen."
 
-#: ../../Zotlabs/Module/Admin/Site.php:227
-msgid "My site has free access only"
-msgstr "Meine Seite hat nur freien Zugriff"
+#: ../../Zotlabs/Module/Setup.php:485
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung."
 
-#: ../../Zotlabs/Module/Admin/Site.php:228
-msgid "My site offers free accounts with optional paid upgrades"
-msgstr "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades"
+#: ../../Zotlabs/Module/Setup.php:488
+msgid "Generate encryption keys"
+msgstr "Verschlüsselungsschlüssel erzeugen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:239 ../../Zotlabs/Module/Setup.php:328
-msgid "Basic/Minimal Social Networking"
-msgstr "Einfaches/minimales soziales Netzwerken"
+#: ../../Zotlabs/Module/Setup.php:505
+msgid "libCurl PHP module"
+msgstr "libCurl-PHP-Modul"
 
-#: ../../Zotlabs/Module/Admin/Site.php:240 ../../Zotlabs/Module/Setup.php:329
-msgid "Standard Configuration (default)"
-msgstr "Standardkonfiguration (Standard)"
+#: ../../Zotlabs/Module/Setup.php:506
+msgid "GD graphics PHP module"
+msgstr "GD-Grafik-PHP-Modul"
 
-#: ../../Zotlabs/Module/Admin/Site.php:241 ../../Zotlabs/Module/Setup.php:330
-msgid "Professional"
-msgstr "Professionell"
+#: ../../Zotlabs/Module/Setup.php:507
+msgid "OpenSSL PHP module"
+msgstr "OpenSSL-PHP-Modul"
 
-#: ../../Zotlabs/Module/Admin/Site.php:245 ../../Zotlabs/Lib/Techlevels.php:10
-msgid "Beginner/Basic"
-msgstr "Anfänger/Basis"
+#: ../../Zotlabs/Module/Setup.php:508
+msgid "PDO database PHP module"
+msgstr "PDO-Datenbank-PHP-Modul"
 
-#: ../../Zotlabs/Module/Admin/Site.php:246 ../../Zotlabs/Lib/Techlevels.php:11
-msgid "Novice - not skilled but willing to learn"
-msgstr "Anfänger - unerfahren, aber bereit zu lernen"
+#: ../../Zotlabs/Module/Setup.php:509
+msgid "mb_string PHP module"
+msgstr "mb_string-PHP-Modul"
 
-#: ../../Zotlabs/Module/Admin/Site.php:247 ../../Zotlabs/Lib/Techlevels.php:12
-msgid "Intermediate - somewhat comfortable"
-msgstr "Fortgeschritten - relativ komfortabel"
+#: ../../Zotlabs/Module/Setup.php:510
+msgid "xml PHP module"
+msgstr "xml-PHP-Modul"
 
-#: ../../Zotlabs/Module/Admin/Site.php:248 ../../Zotlabs/Lib/Techlevels.php:13
-msgid "Advanced - very comfortable"
-msgstr "Fortgeschritten - sehr komfortabel"
+#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:516
+msgid "Apache mod_rewrite module"
+msgstr "Apache-mod_rewrite-Modul"
 
-#: ../../Zotlabs/Module/Admin/Site.php:249 ../../Zotlabs/Lib/Techlevels.php:14
-msgid "Expert - I can write computer code"
-msgstr "Experte - Ich kann Computercode schreiben"
+#: ../../Zotlabs/Module/Setup.php:514
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:250 ../../Zotlabs/Lib/Techlevels.php:15
-msgid "Wizard - I probably know more than you do"
-msgstr "Zauberer - ich kann wahrscheinlich mehr als Du"
+#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:523
+msgid "exec"
+msgstr "exec"
 
-#: ../../Zotlabs/Module/Admin/Site.php:259 ../../include/widgets.php:1591
-msgid "Site"
-msgstr "Seite"
+#: ../../Zotlabs/Module/Setup.php:520
+msgid ""
+"Error: exec is required but is either not installed or has been disabled in "
+"php.ini"
+msgstr "Fehler: exec ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:262
-msgid "File upload"
-msgstr "Dateiupload"
+#: ../../Zotlabs/Module/Setup.php:526 ../../Zotlabs/Module/Setup.php:529
+msgid "shell_exec"
+msgstr "shell_exec"
 
-#: ../../Zotlabs/Module/Admin/Site.php:263
-msgid "Policies"
-msgstr "Richtlinien"
+#: ../../Zotlabs/Module/Setup.php:526
+msgid ""
+"Error: shell_exec is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Fehler: shell_exec ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:264
-#: ../../include/contact_widgets.php:16
-msgid "Advanced"
-msgstr "Fortgeschritten"
+#: ../../Zotlabs/Module/Setup.php:534
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:268
-#: ../../extend/addon/addon/statusnet/statusnet.php:890
-msgid "Site name"
-msgstr "Seitenname"
+#: ../../Zotlabs/Module/Setup.php:538
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:270 ../../Zotlabs/Module/Setup.php:351
-msgid "Server Configuration/Role"
-msgstr "Serverkonfiguration/Rolle"
+#: ../../Zotlabs/Module/Setup.php:542
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:272
-msgid "Site default technical skill level"
-msgstr "Standard-Qualifikationsstufe der Website"
+#: ../../Zotlabs/Module/Setup.php:546
+msgid "Error: PDO database PHP module required but not installed."
+msgstr "Fehler: PDO-Datenbank-PHP-Modul ist erforderlich, aber nicht installiert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:272
-msgid "Used to provide a member experience matched to technical comfort level"
-msgstr "Dies wird verwendet, um eine Benutzererfahrung  passend zur technischen Qualifikationsstufe zu bieten."
+#: ../../Zotlabs/Module/Setup.php:550
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:274
-msgid "Lock the technical skill level setting"
-msgstr "Sperre die technische Qualifikationsstufe"
+#: ../../Zotlabs/Module/Setup.php:554
+msgid "Error: xml PHP module required for DAV but not installed."
+msgstr "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:274
-msgid "Members can set their own technical comfort level by default"
-msgstr "Benutzer können standardmäßig ihre eigene technische Qualifikationsstufe einstellen"
+#: ../../Zotlabs/Module/Setup.php:572
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht."
 
-#: ../../Zotlabs/Module/Admin/Site.php:276
-msgid "Banner/Logo"
-msgstr "Banner/Logo"
+#: ../../Zotlabs/Module/Setup.php:573
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst."
 
-#: ../../Zotlabs/Module/Admin/Site.php:277
-msgid "Administrator Information"
-msgstr "Administrator-Informationen"
+#: ../../Zotlabs/Module/Setup.php:574
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Hubzilla-Installation speichern musst."
 
-#: ../../Zotlabs/Module/Admin/Site.php:277
+#: ../../Zotlabs/Module/Setup.php:575
 msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
-msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
 
-#: ../../Zotlabs/Module/Admin/Site.php:278
-#: ../../Zotlabs/Module/Siteinfo.php:23
-msgid "Site Information"
-msgstr "Seiteninformationen"
+#: ../../Zotlabs/Module/Setup.php:578
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php ist beschreibbar"
+
+#: ../../Zotlabs/Module/Setup.php:592
+msgid ""
+"This software uses the Smarty3 template engine to render its web views. "
+"Smarty3 compiles templates to PHP to speed up rendering."
+msgstr "Diese Software verwendet die Smarty3 Template Engine, um Vorlagen für die Webdarstellung zu verarbeiten. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen."
 
-#: ../../Zotlabs/Module/Admin/Site.php:278
+#: ../../Zotlabs/Module/Setup.php:593
+#, php-format
 msgid ""
-"Publicly visible description of this site.  Displayed on siteinfo page.  "
-"BBCode can be used here"
-msgstr "Öffentlich sichtbare Beschreibung dieses Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann hier verwendet werden."
-
-#: ../../Zotlabs/Module/Admin/Site.php:279
-msgid "System language"
-msgstr "System-Sprache"
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the top level web folder."
+msgstr "Um diese kompilierten Vorlagen speichern zu können, braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Hubzilla-Stammverzeichnisses."
 
-#: ../../Zotlabs/Module/Admin/Site.php:280
-msgid "System theme"
-msgstr "System-Theme"
+#: ../../Zotlabs/Module/Setup.php:594 ../../Zotlabs/Module/Setup.php:615
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat."
 
-#: ../../Zotlabs/Module/Admin/Site.php:280
+#: ../../Zotlabs/Module/Setup.php:595
+#, php-format
 msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
+msgstr "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält."
 
-#: ../../Zotlabs/Module/Admin/Site.php:281
-msgid "Mobile system theme"
-msgstr "Mobile System-Theme:"
+#: ../../Zotlabs/Module/Setup.php:598
+#, php-format
+msgid "%s is writable"
+msgstr "%s ist beschreibbar"
 
-#: ../../Zotlabs/Module/Admin/Site.php:281
-msgid "Theme for mobile devices"
-msgstr "Theme für mobile Geräte"
+#: ../../Zotlabs/Module/Setup.php:614
+msgid ""
+"This software uses the store directory to save uploaded files. The web "
+"server needs to have write access to the store directory under the top level"
+" web folder"
+msgstr "Diese Software benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Webserver benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Web-Stammverzeichnisses."
 
-#: ../../Zotlabs/Module/Admin/Site.php:283
-msgid "Allow Feeds as Connections"
-msgstr "Feeds als Verbindungen erlauben"
+#: ../../Zotlabs/Module/Setup.php:618
+msgid "store is writable"
+msgstr "store ist schreibbar"
 
-#: ../../Zotlabs/Module/Admin/Site.php:283
-msgid "(Heavy system resource usage)"
-msgstr "(führt zu hoher Systemlast)"
+#: ../../Zotlabs/Module/Setup.php:650
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server."
 
-#: ../../Zotlabs/Module/Admin/Site.php:284
-msgid "Maximum image size"
-msgstr "Maximale Bildgröße"
+#: ../../Zotlabs/Module/Setup.php:651
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
+msgstr "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich."
 
-#: ../../Zotlabs/Module/Admin/Site.php:284
+#: ../../Zotlabs/Module/Setup.php:652
 msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können."
 
-#: ../../Zotlabs/Module/Admin/Site.php:285
-msgid "Does this site allow new member registration?"
-msgstr "Erlaubt dieser Server die Registrierung neuer Nutzer?"
+#: ../../Zotlabs/Module/Setup.php:653
+msgid ""
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
+msgstr "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer $Projectname-Hubs (die mit korrekten Zertifikaten ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:286
-msgid "Invitation only"
-msgstr "Nur mit Einladung"
+#: ../../Zotlabs/Module/Setup.php:654
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen."
 
-#: ../../Zotlabs/Module/Admin/Site.php:286
+#: ../../Zotlabs/Module/Setup.php:655
 msgid ""
-"Only allow new member registrations with an invitation code. Above register "
-"policy must be set to Yes."
-msgstr "Erlaube die Neuregistrierung von Mitglieder nur mit einem Einladungscode. Die Registrierungs-Politik muss oben auf Ja gesetzt werden."
+"Providers are available that issue free certificates which are browser-"
+"valid."
+msgstr "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind."
 
-#: ../../Zotlabs/Module/Admin/Site.php:287
-msgid "Which best describes the types of account offered by this hub?"
-msgstr "Was ist die passendste Beschreibung der Konten auf diesem Hub?"
+#: ../../Zotlabs/Module/Setup.php:657
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr "Wenn Du sicher bist, dass das Zertifikat gültig und von einer vertrauenswürdigen Zertifizierungsstelle signiert ist, prüfe auf ggf. noch zu installierende Zwischenzertifikate (intermediate). Diese werden nicht unbedingt von Browsern benötigt, aber sehr wohl für die Kommunikation zwischen Servern."
 
-#: ../../Zotlabs/Module/Admin/Site.php:288
-msgid "Register text"
-msgstr "Registrierungstext"
+#: ../../Zotlabs/Module/Setup.php:659
+msgid "SSL certificate validation"
+msgstr "SSL Zertifikatverifizierung"
 
-#: ../../Zotlabs/Module/Admin/Site.php:288
-msgid "Will be displayed prominently on the registration page."
-msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
+#: ../../Zotlabs/Module/Setup.php:665
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server "
+"configuration.Test: "
+msgstr "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:289
-msgid "Site homepage to show visitors (default: login box)"
-msgstr "Homepage des Hubs, die Besuchern angezeigt wird (Voreinstellung: Anmeldemaske)"
+#: ../../Zotlabs/Module/Setup.php:668
+msgid "Url rewrite is working"
+msgstr "Url rewrite funktioniert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:289
+#: ../../Zotlabs/Module/Setup.php:682
 msgid ""
-"example: 'public' to show public stream, 'page/sys/home' to show a system "
-"webpage called 'home' or 'include:home.html' to include a file."
-msgstr "Beispiele: 'public', um den Stream aller öffentlichen Beiträge anzuzeigen, 'page/sys/home', um eine System-Webseite namens 'home' anzuzeigen, 'include:home.html', um eine Datei einzufügen."
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
 
-#: ../../Zotlabs/Module/Admin/Site.php:290
-msgid "Preserve site homepage URL"
-msgstr "Homepage-URL schützen"
+#: ../../Zotlabs/Module/Setup.php:706
+#: ../../addon/rendezvous/rendezvous.php:401 ../../addon/cdav/cdav.php:41
+msgid "Errors encountered creating database tables."
+msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
+
+#: ../../Zotlabs/Module/Setup.php:746
+msgid "<h1>What next</h1>"
+msgstr "<h1>Was als Nächstes</h1>"
 
-#: ../../Zotlabs/Module/Admin/Site.php:290
+#: ../../Zotlabs/Module/Setup.php:747
 msgid ""
-"Present the site homepage in a frame at the original location instead of "
-"redirecting"
-msgstr "Zeigt die Homepage an der Original-URL in einem Frame an, statt auf die eigentliche Adresse der Seite umzuleiten."
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten."
 
-#: ../../Zotlabs/Module/Admin/Site.php:291
-msgid "Accounts abandoned after x days"
-msgstr "Konten gelten nach X Tagen als unbenutzt"
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
+msgstr "Fortfahren"
 
-#: ../../Zotlabs/Module/Admin/Site.php:291
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
+msgstr "Premium-Kanal-Einrichtung"
 
-#: ../../Zotlabs/Module/Admin/Site.php:292
-msgid "Allowed friend domains"
-msgstr "Erlaubte Domains für Kontakte"
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
+msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
 
-#: ../../Zotlabs/Module/Admin/Site.php:292
+#: ../../Zotlabs/Module/Connect.php:93
 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."
-
-#: ../../Zotlabs/Module/Admin/Site.php:293
-msgid "Verify Email Addresses"
-msgstr "E-Mail-Adressen überprüfen"
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."
 
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
 msgid ""
-"Check to verify email addresses used in account registration (recommended)."
-msgstr "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)."
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
 
-#: ../../Zotlabs/Module/Admin/Site.php:294
-msgid "Force publish"
-msgstr "Veröffentlichung erzwingen"
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:294
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
 msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite."
 
-#: ../../Zotlabs/Module/Admin/Site.php:295
-msgid "Import Public Streams"
-msgstr "Öffentliche Beiträge importieren"
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:295
-msgid ""
-"Import and allow access to public content pulled from other sites. Warning: "
-"this content is unmoderated."
-msgstr "Öffentliche Beiträge von anderen Servern importieren und zur Verfügung stellen. Warnung: Diese Inhalte sind nicht moderiert."
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
+msgstr "Eingeschränkter oder Premium-Kanal"
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
-msgid "Login on Homepage"
-msgstr "Log-in auf der Startseite"
+#: ../../Zotlabs/Module/Admin/Queue.php:35
+msgid "Queue Statistics"
+msgstr "Warteschlangenstatistiken"
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
-msgid ""
-"Present a login box to visitors on the home page if no other content has "
-"been configured."
-msgstr "Zeigt Besuchern der Homepage eine Anmeldemaske, falls keine anderen Inhalte konfiguriert wurden."
+#: ../../Zotlabs/Module/Admin/Queue.php:36
+msgid "Total Entries"
+msgstr "Einträge insgesamt"
 
-#: ../../Zotlabs/Module/Admin/Site.php:297
-msgid "Enable context help"
-msgstr "Kontext-Hilfe aktivieren"
+#: ../../Zotlabs/Module/Admin/Queue.php:37
+msgid "Priority"
+msgstr "Priorität"
 
-#: ../../Zotlabs/Module/Admin/Site.php:297
-msgid ""
-"Display contextual help for the current page when the help button is "
-"pressed."
-msgstr "Zeigt Kontext-sensitive Hilfe für die aktuelle Seite an, wenn der Hilfe-Knopf geklickt wird."
+#: ../../Zotlabs/Module/Admin/Queue.php:38
+msgid "Destination URL"
+msgstr "Ziel-URL"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
-msgid "Directory Server URL"
-msgstr "Verzeichnisserver-URL"
+#: ../../Zotlabs/Module/Admin/Queue.php:39
+msgid "Mark hub permanently offline"
+msgstr "Hub als permanent offline markieren"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
-msgid "Default directory server"
-msgstr "Standard-Verzeichnisserver"
+#: ../../Zotlabs/Module/Admin/Queue.php:40
+msgid "Empty queue for this hub"
+msgstr "Warteschlange für diesen Hub leeren"
 
-#: ../../Zotlabs/Module/Admin/Site.php:301
-msgid "Proxy user"
-msgstr "Proxy Benutzer"
+#: ../../Zotlabs/Module/Admin/Queue.php:41
+msgid "Last known contact"
+msgstr "Letzter Kontakt"
 
-#: ../../Zotlabs/Module/Admin/Site.php:302
-msgid "Proxy URL"
-msgstr "Proxy URL"
+#: ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Settings/Features.php:38
+msgid "Off"
+msgstr "Aus"
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
-msgid "Network timeout"
-msgstr "Netzwerk-Timeout"
+#: ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Settings/Features.php:38
+msgid "On"
+msgstr "An"
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#, php-format
+msgid "Lock feature %s"
+msgstr "Blockiere die Funktion %s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
-msgid "Delivery interval"
-msgstr "Auslieferung Intervall"
+#: ../../Zotlabs/Module/Admin/Features.php:64
+msgid "Manage Additional Features"
+msgstr "Zusätzliche Funktionen verwalten"
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
-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 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."
+#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+msgid "Update has been marked successful"
+msgstr "Update wurde als erfolgreich markiert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
-msgid "Deliveries per process"
-msgstr "Zustellungen pro Prozess"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:29
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
-msgid ""
-"Number of deliveries to attempt in a single operating system process. Adjust"
-" if necessary to tune system performance. Recommend: 1-5."
-msgstr "Anzahl der Zustellungen, die innerhalb eines einzelnen Betriebssystemprozesses versucht werden. Anpassen, falls nötig, um die System-Performance zu verbessern. Empfehlung: 1-5."
+#: ../../Zotlabs/Module/Admin/Dbsync.php:32
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "Update %s wurde erfolgreich ausgeführt."
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
-msgid "Poll interval"
-msgstr "Abfrageintervall"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:36
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
-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 Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."
+#: ../../Zotlabs/Module/Admin/Dbsync.php:39
+#, php-format
+msgid "Update function %s could not be found."
+msgstr "Update-Funktion %s konnte nicht gefunden werden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:307
-msgid "Maximum Load Average"
-msgstr "Maximales Load Average"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:55
+msgid "No failed updates."
+msgstr "Keine fehlgeschlagenen Aktualisierungen."
 
-#: ../../Zotlabs/Module/Admin/Site.php:307
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+msgid "Failed Updates"
+msgstr "Fehlgeschlagene Aktualisierungen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
-msgid "Expiration period in days for imported (grid/network) content"
-msgstr "Setze den Zeitraum (in Tagen), ab wann importierte (aus dem Netzwerk) Inhalte ablaufen sollen"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:61
+msgid "Mark success (if update was manually applied)"
+msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
-msgid "0 for no expiration of imported content"
-msgstr "0 = keine Löschung importierter Inhalte"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:62
+msgid "Attempt to execute this update step automatically"
+msgstr "Versuche, diesen Updateschritt automatisch auszuführen"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:284
+#: ../../Zotlabs/Module/Admin/Plugins.php:259
+#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:35
+#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Admin.php:60
+#: ../../include/items.php:3391
+msgid "Item not found."
+msgstr "Element nicht gefunden."
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:289
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plug-In %s deaktiviert."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:289
+#: ../../Zotlabs/Module/Admin/Plugins.php:294
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plug-In %s aktiviert."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:337
-#: ../../Zotlabs/Module/Admin/Plugins.php:432 ../../include/widgets.php:1596
+#: ../../Zotlabs/Module/Admin/Plugins.php:310
+#: ../../Zotlabs/Module/Admin/Themes.php:95
+msgid "Disable"
+msgstr "Deaktivieren"
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:313
+#: ../../Zotlabs/Module/Admin/Themes.php:97
+msgid "Enable"
+msgstr "Aktivieren"
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:341
+#: ../../Zotlabs/Module/Admin/Plugins.php:436
+#: ../../Zotlabs/Module/Admin/Accounts.php:164
+#: ../../Zotlabs/Module/Admin/Logs.php:82
+#: ../../Zotlabs/Module/Admin/Channels.php:145
+#: ../../Zotlabs/Module/Admin/Themes.php:122
+#: ../../Zotlabs/Module/Admin/Themes.php:156
+#: ../../Zotlabs/Module/Admin/Site.php:277
+#: ../../Zotlabs/Module/Admin/Security.php:86
+#: ../../Zotlabs/Module/Admin.php:137
+msgid "Administration"
+msgstr "Administration"
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:342
+#: ../../Zotlabs/Module/Admin/Plugins.php:437
+#: ../../Zotlabs/Widget/Admin.php:27
 msgid "Plugins"
 msgstr "Plug-Ins"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:348
+#: ../../Zotlabs/Module/Admin/Plugins.php:343
+#: ../../Zotlabs/Module/Admin/Themes.php:124
+msgid "Toggle"
+msgstr "Umschalten"
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:344
+#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223
+#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:207
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:351
+#: ../../Zotlabs/Module/Admin/Themes.php:134
+msgid "Author: "
+msgstr "Autor: "
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:352
+#: ../../Zotlabs/Module/Admin/Themes.php:135
+msgid "Maintainer: "
+msgstr "Betreuer:"
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:353
 msgid "Minimum project version: "
 msgstr "Minimale Version des Projekts:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:349
+#: ../../Zotlabs/Module/Admin/Plugins.php:354
 msgid "Maximum project version: "
 msgstr "Maximale Version des Projekts:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:350
+#: ../../Zotlabs/Module/Admin/Plugins.php:355
 msgid "Minimum PHP version: "
 msgstr "Minimale PHP Version:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:351
+#: ../../Zotlabs/Module/Admin/Plugins.php:356
 msgid "Compatible Server Roles: "
 msgstr "Kompatible Serverrollen: "
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:352
+#: ../../Zotlabs/Module/Admin/Plugins.php:357
 msgid "Requires: "
 msgstr "Benötigt:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:353
-#: ../../Zotlabs/Module/Admin/Plugins.php:437
+#: ../../Zotlabs/Module/Admin/Plugins.php:358
+#: ../../Zotlabs/Module/Admin/Plugins.php:442
 msgid "Disabled - version incompatibility"
 msgstr "Abgeschaltet - Versionsinkompatibilität"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:406
+#: ../../Zotlabs/Module/Admin/Plugins.php:411
 msgid "Enter the public git repository URL of the plugin repo."
 msgstr "Gib die öffentliche Git-Repository-URL des Plugin-Repository an."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:407
+#: ../../Zotlabs/Module/Admin/Plugins.php:412
 msgid "Plugin repo git URL"
 msgstr "Plugin-Repository Git URL"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:408
+#: ../../Zotlabs/Module/Admin/Plugins.php:413
 msgid "Custom repo name"
 msgstr "Benutzerdefinierter Repository-Name"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:408
+#: ../../Zotlabs/Module/Admin/Plugins.php:413
 msgid "(optional)"
 msgstr "(optional)"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:409
+#: ../../Zotlabs/Module/Admin/Plugins.php:414
 msgid "Download Plugin Repo"
 msgstr "Plugin-Repository herunterladen"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:416
+#: ../../Zotlabs/Module/Admin/Plugins.php:421
 msgid "Install new repo"
 msgstr "Neues Repository installieren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:417 ../../Zotlabs/Lib/Apps.php:348
+#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:358
 msgid "Install"
 msgstr "Installieren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:418
-#: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Wiki.php:263
-#: ../../Zotlabs/Module/Wiki.php:288
+#: ../../Zotlabs/Module/Admin/Plugins.php:423
 #: ../../Zotlabs/Module/Settings/Oauth.php:88
 #: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../extend/addon/addon/friendica/dfrn_request.php:879
-#: ../../extend/addon/addon/js_upload/js_upload.php:46
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:866
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
-#: ../../include/conversation.php:1394 ../../include/conversation.php:1443
+#: ../../Zotlabs/Module/Wiki.php:265 ../../Zotlabs/Module/Wiki.php:290
+#: ../../Zotlabs/Module/Connedit.php:920 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/cdav/Mod_Cdav.php:866
+#: ../../addon/cdav/Mod_Cdav.php:1154 ../../addon/js_upload/js_upload.php:46
+#: ../../addon/gitwiki/Mod_Gitwiki.php:244
+#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1327
+#: ../../include/conversation.php:1376
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:440
+#: ../../Zotlabs/Module/Admin/Plugins.php:445
 msgid "Manage Repos"
 msgstr "Repositorien verwalten"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:441
+#: ../../Zotlabs/Module/Admin/Plugins.php:446
 msgid "Installed Plugin Repositories"
 msgstr "Installierte Plugin-Repositorien"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:442
+#: ../../Zotlabs/Module/Admin/Plugins.php:447
 msgid "Install a New Plugin Repository"
 msgstr "Ein neues Plugin-Repository installieren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:448
-#: ../../Zotlabs/Module/Connedit.php:883
+#: ../../Zotlabs/Module/Admin/Plugins.php:453
 #: ../../Zotlabs/Module/Settings/Oauth.php:42
-#: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:348
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152
+#: ../../Zotlabs/Module/Settings/Oauth.php:113
+#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Lib/Apps.php:358 ../../addon/cdav/Mod_Cdav.php:1152
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:449
+#: ../../Zotlabs/Module/Admin/Plugins.php:454
 msgid "Switch branch"
 msgstr "Zweig/Branch wechseln"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:35
-msgid "Queue Statistics"
-msgstr "Warteschlangenstatistiken"
-
-#: ../../Zotlabs/Module/Admin/Queue.php:36
-msgid "Total Entries"
-msgstr "Einträge insgesamt"
-
-#: ../../Zotlabs/Module/Admin/Queue.php:37
-msgid "Priority"
-msgstr "Priorität"
+#: ../../Zotlabs/Module/Admin/Plugins.php:455
+#: ../../Zotlabs/Module/Photos.php:960 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../addon/superblock/superblock.php:116
+msgid "Remove"
+msgstr "Entfernen"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:38
-msgid "Destination URL"
-msgstr "Ziel-URL"
+#: ../../Zotlabs/Module/Admin/Accounts.php:36
+#, php-format
+msgid "%s account blocked/unblocked"
+msgid_plural "%s account blocked/unblocked"
+msgstr[0] "%s Konto blockiert/freigegeben"
+msgstr[1] "%s Konten blockiert/freigegeben"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:39
-msgid "Mark hub permanently offline"
-msgstr "Hub als permanent offline markieren"
+#: ../../Zotlabs/Module/Admin/Accounts.php:43
+#, php-format
+msgid "%s account deleted"
+msgid_plural "%s accounts deleted"
+msgstr[0] "%s Konto gelöscht"
+msgstr[1] "%s Konten gelöscht"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:40
-msgid "Empty queue for this hub"
-msgstr "Warteschlange für diesen Hub leeren"
+#: ../../Zotlabs/Module/Admin/Accounts.php:79
+msgid "Account not found"
+msgstr "Konto nicht gefunden"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:41
-msgid "Last known contact"
-msgstr "Letzter Kontakt"
+#: ../../Zotlabs/Module/Admin/Accounts.php:90
+#, php-format
+msgid "Account '%s' deleted"
+msgstr "Konto '%s' gelöscht"
 
-#: ../../Zotlabs/Module/Search.php:223
+#: ../../Zotlabs/Module/Admin/Accounts.php:98
 #, php-format
-msgid "Items tagged with: %s"
-msgstr "Beiträge mit Schlagwort: %s"
+msgid "Account '%s' blocked"
+msgstr "Konto '%s' blockiert"
 
-#: ../../Zotlabs/Module/Search.php:225
+#: ../../Zotlabs/Module/Admin/Accounts.php:106
 #, php-format
-msgid "Search results for: %s"
-msgstr "Suchergebnisse für: %s"
+msgid "Account '%s' unblocked"
+msgstr "Konto '%s' freigegeben"
 
-#: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
-msgid "Layout Name"
-msgstr "Layout-Name"
+#: ../../Zotlabs/Module/Admin/Accounts.php:165
+#: ../../Zotlabs/Module/Admin/Accounts.php:178
+#: ../../Zotlabs/Widget/Admin.php:23
+msgid "Accounts"
+msgstr "Konten"
 
-#: ../../Zotlabs/Module/Editlayout.php:128
-#: ../../Zotlabs/Module/Layouts.php:131
-msgid "Layout Description (Optional)"
-msgstr "Layout-Beschreibung (optional)"
+#: ../../Zotlabs/Module/Admin/Accounts.php:167
+#: ../../Zotlabs/Module/Admin/Channels.php:148
+msgid "select all"
+msgstr "Alle auswählen"
 
-#: ../../Zotlabs/Module/Editlayout.php:136
-msgid "Edit Layout"
-msgstr "Layout bearbeiten"
+#: ../../Zotlabs/Module/Admin/Accounts.php:168
+msgid "Registrations waiting for confirm"
+msgstr "Registrierungen warten auf Bestätigung"
 
-#: ../../Zotlabs/Module/Editwebpage.php:142
-msgid "Page link"
-msgstr "Seiten-Link"
+#: ../../Zotlabs/Module/Admin/Accounts.php:169
+msgid "Request date"
+msgstr "Antragsdatum"
 
-#: ../../Zotlabs/Module/Editwebpage.php:169
-msgid "Edit Webpage"
-msgstr "Webseite bearbeiten"
+#: ../../Zotlabs/Module/Admin/Accounts.php:169
+#: ../../Zotlabs/Module/Admin/Accounts.php:181
+#: ../../Zotlabs/Module/Connedit.php:906 ../../Zotlabs/Module/Profiles.php:790
+#: ../../addon/cdav/Mod_Cdav.php:1140 ../../addon/openid/MysqlProvider.php:56
+#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
+#: ../../addon/redred/redred.php:107 ../../include/network.php:2315
+msgid "Email"
+msgstr "E-Mail"
 
-#: ../../Zotlabs/Module/Like.php:19
-msgid "Like/Dislike"
-msgstr "Mögen/Nicht mögen"
+#: ../../Zotlabs/Module/Admin/Accounts.php:170
+msgid "No registrations."
+msgstr "Keine Registrierungen."
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:171
+#: ../../Zotlabs/Module/Connections.php:281
+msgid "Approve"
+msgstr "Genehmigen"
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:172
+msgid "Deny"
+msgstr "Verweigern"
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:174
+#: ../../Zotlabs/Module/Connedit.php:618
+msgid "Block"
+msgstr "Blockieren"
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:175
+#: ../../Zotlabs/Module/Connedit.php:618
+msgid "Unblock"
+msgstr "Freigeben"
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:180
+msgid "ID"
+msgstr "ID"
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287
+msgid "All Channels"
+msgstr "Alle Kanäle"
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:183
+msgid "Register date"
+msgstr "Registrierungs-Datum"
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:184
+msgid "Last login"
+msgstr "Letzte Anmeldung"
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:185
+msgid "Expires"
+msgstr "Verfällt"
 
-#: ../../Zotlabs/Module/Like.php:24
-msgid "This action is restricted to members."
-msgstr "Diese Aktion kann nur von Mitgliedern ausgeführt werden."
+#: ../../Zotlabs/Module/Admin/Accounts.php:186
+msgid "Service Class"
+msgstr "Service-Klasse"
 
-#: ../../Zotlabs/Module/Like.php:25
+#: ../../Zotlabs/Module/Admin/Accounts.php:188
 msgid ""
-"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a "
-"href=\"register\">register as a new $Projectname member</a> to continue."
-msgstr "Um fortzufahren <a href=\"rmagic\">melde Dich bitte mit Deiner $Projectname-ID an</a> oder <a href=\"register\">registriere Dich als neues $Projectname-Mitglied</a>."
+"Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
+" on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Die ausgewählten Konten werden gelöscht!\\n\\nAlles, was diese Konten auf diesem Hub veröffentlicht haben, wird endgültig gelöscht werden!\\n\\nBist du dir sicher?"
 
-#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
-#: ../../Zotlabs/Module/Like.php:169
-msgid "Invalid request."
-msgstr "Ungültige Anfrage."
+#: ../../Zotlabs/Module/Admin/Accounts.php:189
+msgid ""
+"The account {0} will be deleted!\\n\\nEverything this account has posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Das Konto {0} wird gelöscht!\\n\\nAlles, was dieses Konto auf diesem Hub veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?"
 
-#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
-msgid "channel"
-msgstr "Kanal"
+#: ../../Zotlabs/Module/Admin/Logs.php:28
+msgid "Log settings updated."
+msgstr "Protokoll-Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Like.php:146
-msgid "thing"
-msgstr "Sache"
+#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48
+#: ../../Zotlabs/Widget/Admin.php:58
+msgid "Logs"
+msgstr "Protokolle"
 
-#: ../../Zotlabs/Module/Like.php:192
-msgid "Channel unavailable."
-msgstr "Kanal nicht vorhanden."
+#: ../../Zotlabs/Module/Admin/Logs.php:85
+msgid "Clear"
+msgstr "Leeren"
 
-#: ../../Zotlabs/Module/Like.php:240
-msgid "Previous action reversed."
-msgstr "Die vorherige Aktion wurde rückgängig gemacht."
+#: ../../Zotlabs/Module/Admin/Logs.php:91
+msgid "Debugging"
+msgstr "Debugging"
 
-#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47
-#: ../../extend/addon/addon/diaspora/inbound.php:1794
-#: ../../extend/addon/addon/redphotos/redphotohelper.php:74
-#: ../../include/conversation.php:120 ../../include/text.php:1953
-msgid "photo"
-msgstr "Foto"
+#: ../../Zotlabs/Module/Admin/Logs.php:92
+msgid "Log file"
+msgstr "Protokolldatei"
 
-#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../extend/addon/addon/diaspora/inbound.php:1794
-#: ../../include/conversation.php:148 ../../include/text.php:1959
-msgid "status"
-msgstr "Status"
+#: ../../Zotlabs/Module/Admin/Logs.php:92
+msgid ""
+"Must be writable by web server. Relative to your top-level webserver "
+"directory."
+msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Hubzilla-Stammverzeichnis."
 
-#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
-#: ../../include/text.php:1956 ../../include/event.php:1000
-msgid "event"
-msgstr "Termin"
+#: ../../Zotlabs/Module/Admin/Logs.php:93
+msgid "Log level"
+msgstr "Protokollstufe"
 
-#: ../../Zotlabs/Module/Like.php:419
-#: ../../extend/addon/addon/diaspora/inbound.php:1823
-#: ../../include/conversation.php:164
+#: ../../Zotlabs/Module/Admin/Channels.php:31
 #, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s gefällt %2$ss %3$s"
+msgid "%s channel censored/uncensored"
+msgid_plural "%s channels censored/uncensored"
+msgstr[0] "%s Kanal gesperrt/freigegeben"
+msgstr[1] "%s Kanäle gesperrt/freigegeben"
 
-#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
+#: ../../Zotlabs/Module/Admin/Channels.php:40
 #, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s gefällt %2$ss %3$s nicht"
+msgid "%s channel code allowed/disallowed"
+msgid_plural "%s channels code allowed/disallowed"
+msgstr[0] "Code für %s Kanal gesperrt/freigegeben"
+msgstr[1] "Code für %s Kanäle gesperrt/freigegeben"
 
-#: ../../Zotlabs/Module/Like.php:423
+#: ../../Zotlabs/Module/Admin/Channels.php:46
 #, php-format
-msgid "%1$s agrees with %2$s's %3$s"
-msgstr "%1$s stimmt %2$ss %3$s zu"
+msgid "%s channel deleted"
+msgid_plural "%s channels deleted"
+msgstr[0] "%s Kanal gelöscht"
+msgstr[1] "%s Kanäle gelöscht"
 
-#: ../../Zotlabs/Module/Like.php:425
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
-msgstr "%1$s lehnt %2$ss %3$s ab"
+#: ../../Zotlabs/Module/Admin/Channels.php:65
+msgid "Channel not found"
+msgstr "Kanal nicht gefunden"
 
-#: ../../Zotlabs/Module/Like.php:427
+#: ../../Zotlabs/Module/Admin/Channels.php:75
 #, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
-msgstr "%1$s enthält sich zu %2$ss %3$s"
+msgid "Channel '%s' deleted"
+msgstr "Kanal '%s' gelöscht"
 
-#: ../../Zotlabs/Module/Like.php:429
+#: ../../Zotlabs/Module/Admin/Channels.php:87
 #, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s nimmt an %2$ss %3$s teil"
+msgid "Channel '%s' censored"
+msgstr "Kanal '%s' gesperrt"
 
-#: ../../Zotlabs/Module/Like.php:431
+#: ../../Zotlabs/Module/Admin/Channels.php:87
 #, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s nimmt an %2$ss %3$s nicht teil"
+msgid "Channel '%s' uncensored"
+msgstr "Kanal '%s' freigegeben"
 
-#: ../../Zotlabs/Module/Like.php:433
+#: ../../Zotlabs/Module/Admin/Channels.php:98
 #, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s nimmt vielleicht an %2$ss %3$s teil"
-
-#: ../../Zotlabs/Module/Like.php:538
-msgid "Action completed."
-msgstr "Aktion durchgeführt."
-
-#: ../../Zotlabs/Module/Like.php:539
-msgid "Thank you."
-msgstr "Vielen Dank."
-
-#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
-msgid "This site is not a directory server"
-msgstr "Diese Webseite ist kein Verzeichnisserver"
-
-#: ../../Zotlabs/Module/Dirsearch.php:33
-msgid "This directory server requires an access token"
-msgstr "Dieser Verzeichnisserver benötigt einen Zugriffstoken"
-
-#: ../../Zotlabs/Module/Network.php:96
-msgid "No such group"
-msgstr "Gruppe nicht gefunden"
-
-#: ../../Zotlabs/Module/Network.php:136
-msgid "No such channel"
-msgstr "Kanal nicht gefunden"
-
-#: ../../Zotlabs/Module/Network.php:141
-msgid "forum"
-msgstr "Forum"
-
-#: ../../Zotlabs/Module/Network.php:153
-msgid "Search Results For:"
-msgstr "Suchergebnisse für:"
-
-#: ../../Zotlabs/Module/Network.php:221
-msgid "Privacy group is empty"
-msgstr "Gruppe ist leer"
-
-#: ../../Zotlabs/Module/Network.php:230
-msgid "Privacy group: "
-msgstr "Gruppe:"
+msgid "Channel '%s' code allowed"
+msgstr "Code für Kanal '%s' freigegeben"
 
-#: ../../Zotlabs/Module/Network.php:256
-msgid "Invalid connection."
-msgstr "Ungültige Verbindung."
+#: ../../Zotlabs/Module/Admin/Channels.php:98
+#, php-format
+msgid "Channel '%s' code disallowed"
+msgstr "Code für Kanal '%s' gesperrt"
 
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
-msgstr "Kann Menü nicht aktualisieren."
+#: ../../Zotlabs/Module/Admin/Channels.php:146
+#: ../../Zotlabs/Widget/Admin.php:24
+msgid "Channels"
+msgstr "Kanäle"
 
-#: ../../Zotlabs/Module/Menu.php:60
-msgid "Unable to create menu."
-msgstr "Kann Menü nicht erstellen."
+#: ../../Zotlabs/Module/Admin/Channels.php:150
+msgid "Censor"
+msgstr "Sperren"
 
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
-msgstr "Name des Menüs"
+#: ../../Zotlabs/Module/Admin/Channels.php:151
+msgid "Uncensor"
+msgstr "Freigeben"
 
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich"
+#: ../../Zotlabs/Module/Admin/Channels.php:152
+msgid "Allow Code"
+msgstr "Code erlauben"
 
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
-msgstr "Menütitel"
+#: ../../Zotlabs/Module/Admin/Channels.php:153
+msgid "Disallow Code"
+msgstr "Code sperren"
 
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Sichtbar auf der Webseite – für keinen Titel leer lassen"
+#: ../../Zotlabs/Module/Admin/Channels.php:154
+#: ../../include/conversation.php:1760 ../../include/nav.php:369
+msgid "Channel"
+msgstr "Kanal"
 
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
-msgstr "Lesezeichen erlauben"
+#: ../../Zotlabs/Module/Admin/Channels.php:158
+msgid "UID"
+msgstr "UID"
 
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
-msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
+#: ../../Zotlabs/Module/Admin/Channels.php:162
+msgid ""
+"Selected channels will be deleted!\\n\\nEverything that was posted in these "
+"channels on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?"
 
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
-msgstr "Absenden und fortfahren"
+#: ../../Zotlabs/Module/Admin/Channels.php:163
+msgid ""
+"The channel {0} will be deleted!\\n\\nEverything that was posted in this "
+"channel on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2284
-msgid "Menus"
-msgstr "Menüs"
+#: ../../Zotlabs/Module/Admin/Themes.php:26
+msgid "Theme settings updated."
+msgstr "Theme-Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120
-msgid "Drop"
-msgstr "Löschen"
+#: ../../Zotlabs/Module/Admin/Themes.php:61
+msgid "No themes found."
+msgstr "Keine Theme gefunden."
 
-#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Webpages.php:255
-#: ../../include/page_widgets.php:47
-msgid "Created"
-msgstr "Erstellt"
+#: ../../Zotlabs/Module/Admin/Themes.php:116
+msgid "Screenshot"
+msgstr "Bildschirmfoto"
 
-#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Blocks.php:158
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:256
-#: ../../include/page_widgets.php:48
-msgid "Edited"
-msgstr "Geändert"
+#: ../../Zotlabs/Module/Admin/Themes.php:123
+#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
+msgid "Themes"
+msgstr "Themes"
 
-#: ../../Zotlabs/Module/Menu.php:117
-msgid "Bookmarks allowed"
-msgstr "Lesezeichen erlaubt"
+#: ../../Zotlabs/Module/Admin/Themes.php:162
+msgid "[Experimental]"
+msgstr "[Experimentell]"
 
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
-msgstr "Lösche dieses Menü"
+#: ../../Zotlabs/Module/Admin/Themes.php:163
+msgid "[Unsupported]"
+msgstr "[Nicht unterstützt]"
 
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
-msgstr "Bearbeite Menü Inhalte"
+#: ../../Zotlabs/Module/Admin/Site.php:144
+msgid "Site settings updated."
+msgstr "Site-Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Menu.php:121
-msgid "Edit this menu"
-msgstr "Dieses Menü bearbeiten"
+#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2915
+msgid "Default"
+msgstr "Standard"
 
-#: ../../Zotlabs/Module/Menu.php:136
-msgid "Menu could not be deleted."
-msgstr "Menü konnte nicht gelöscht werden."
+#: ../../Zotlabs/Module/Admin/Site.php:181
+#: ../../Zotlabs/Module/Settings/Display.php:137
+#, php-format
+msgid "%s - (Incompatible)"
+msgstr "%s - (Inkompatibel)"
 
-#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
-msgid "Menu not found."
-msgstr "Menü nicht gefunden"
+#: ../../Zotlabs/Module/Admin/Site.php:188
+#: ../../Zotlabs/Module/Settings/Display.php:151
+msgid "mobile"
+msgstr "mobil"
 
-#: ../../Zotlabs/Module/Menu.php:149
-msgid "Edit Menu"
-msgstr "Menü bearbeiten"
+#: ../../Zotlabs/Module/Admin/Site.php:190
+msgid "experimental"
+msgstr "experimentell"
 
-#: ../../Zotlabs/Module/Menu.php:153
-msgid "Add or remove entries to this menu"
-msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
+#: ../../Zotlabs/Module/Admin/Site.php:192
+msgid "unsupported"
+msgstr "nicht unterstützt"
 
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Menu name"
-msgstr "Menü Name"
+#: ../../Zotlabs/Module/Admin/Site.php:238
+msgid "Yes - with approval"
+msgstr "Ja - mit Zustimmung"
 
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Must be unique, only seen by you"
-msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar"
+#: ../../Zotlabs/Module/Admin/Site.php:244
+msgid "My site is not a public server"
+msgstr "Mein Server ist kein öffentlicher Server"
 
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title"
-msgstr "Menü Titel"
+#: ../../Zotlabs/Module/Admin/Site.php:245
+msgid "My site has paid access only"
+msgstr "Meine Seite hat nur bezahlten Zugriff"
 
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title as seen by others"
-msgstr "Menü Titel wie er von anderen gesehen wird"
+#: ../../Zotlabs/Module/Admin/Site.php:246
+msgid "My site has free access only"
+msgstr "Meine Seite hat nur freien Zugriff"
 
-#: ../../Zotlabs/Module/Menu.php:157
-msgid "Allow bookmarks"
-msgstr "Erlaube Lesezeichen"
+#: ../../Zotlabs/Module/Admin/Site.php:247
+msgid "My site offers free accounts with optional paid upgrades"
+msgstr "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades"
 
-#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
-#: ../../Zotlabs/Module/Xchan.php:41
-msgid "Not found."
-msgstr "Nicht gefunden."
+#: ../../Zotlabs/Module/Admin/Site.php:264 ../../Zotlabs/Lib/Techlevels.php:10
+msgid "Beginner/Basic"
+msgstr "Anfänger/Basis"
 
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
-msgstr "Klon nicht gefunden."
+#: ../../Zotlabs/Module/Admin/Site.php:265 ../../Zotlabs/Lib/Techlevels.php:11
+msgid "Novice - not skilled but willing to learn"
+msgstr "Anfänger - unerfahren, aber bereit zu lernen"
 
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
-msgstr "Nachschlagen des Kanal-Ortes fehlgeschlagen"
+#: ../../Zotlabs/Module/Admin/Site.php:266 ../../Zotlabs/Lib/Techlevels.php:12
+msgid "Intermediate - somewhat comfortable"
+msgstr "Fortgeschritten - relativ komfortabel"
 
-#: ../../Zotlabs/Module/Locs.php:66
-msgid ""
-"Please select another location to become primary before removing the primary"
-" location."
-msgstr "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst."
+#: ../../Zotlabs/Module/Admin/Site.php:267 ../../Zotlabs/Lib/Techlevels.php:13
+msgid "Advanced - very comfortable"
+msgstr "Fortgeschritten - sehr komfortabel"
 
-#: ../../Zotlabs/Module/Locs.php:95
-msgid "Syncing locations"
-msgstr "Synchronisiere Klone"
+#: ../../Zotlabs/Module/Admin/Site.php:268 ../../Zotlabs/Lib/Techlevels.php:14
+msgid "Expert - I can write computer code"
+msgstr "Experte - Ich kann Computercode schreiben"
 
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
-msgstr "Keine Klon-Adressen gefunden."
+#: ../../Zotlabs/Module/Admin/Site.php:269 ../../Zotlabs/Lib/Techlevels.php:15
+msgid "Wizard - I probably know more than you do"
+msgstr "Zauberer - ich kann wahrscheinlich mehr als Du"
 
-#: ../../Zotlabs/Module/Locs.php:116
-msgid "Manage Channel Locations"
-msgstr "Klon-Adressen verwalten"
+#: ../../Zotlabs/Module/Admin/Site.php:278 ../../Zotlabs/Widget/Admin.php:22
+msgid "Site"
+msgstr "Seite"
 
-#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51
-#: ../../Zotlabs/Module/Profiles.php:510 ../../Zotlabs/Module/Profiles.php:733
-#: ../../Zotlabs/Module/Events.php:475
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839
-#: ../../include/js_strings.php:25
-msgid "Location"
-msgstr "Ort"
+#: ../../Zotlabs/Module/Admin/Site.php:280
+#: ../../Zotlabs/Module/Register.php:253
+msgid "Registration"
+msgstr "Registrierung"
 
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
-msgstr "Primär"
+#: ../../Zotlabs/Module/Admin/Site.php:281
+msgid "File upload"
+msgstr "Dateiupload"
 
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
-msgstr "Jetzt synchronisieren"
+#: ../../Zotlabs/Module/Admin/Site.php:282
+msgid "Policies"
+msgstr "Richtlinien"
 
-#: ../../Zotlabs/Module/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
-msgstr "Bitte warte mehrere Minuten zwischen dem Ausführen zweier Operationen!"
+#: ../../Zotlabs/Module/Admin/Site.php:283
+#: ../../include/contact_widgets.php:16
+msgid "Advanced"
+msgstr "Fortgeschritten"
 
-#: ../../Zotlabs/Module/Locs.php:124
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing"
-" your channel."
-msgstr "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub einloggst und den Kanal dort löschst."
+#: ../../Zotlabs/Module/Admin/Site.php:287
+#: ../../addon/statusnet/statusnet.php:890
+msgid "Site name"
+msgstr "Seitenname"
 
-#: ../../Zotlabs/Module/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
-msgstr "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt."
+#: ../../Zotlabs/Module/Admin/Site.php:291
+msgid "Site default technical skill level"
+msgstr "Standard-Qualifikationsstufe der Website"
 
-#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1415
-msgid "Public Hubs"
-msgstr "Öffentliche Hubs"
+#: ../../Zotlabs/Module/Admin/Site.php:291
+msgid "Used to provide a member experience matched to technical comfort level"
+msgstr "Dies wird verwendet, um eine Benutzererfahrung  passend zur technischen Qualifikationsstufe zu bieten."
 
-#: ../../Zotlabs/Module/Pubsites.php:27
-msgid ""
-"The listed hubs allow public registration for the $Projectname network. All "
-"hubs in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some hubs may require subscription or "
-"provide tiered service plans. The hub itself <strong>may</strong> provide "
-"additional details."
-msgstr "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung im $Projectname Netzwerk. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen Seiten und Kanälen auf anderen Hubs ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den Seiten der einzelnen Hubs <strong>könnten</strong> jeweils nähere Informationen dazu stehen."
+#: ../../Zotlabs/Module/Admin/Site.php:293
+msgid "Lock the technical skill level setting"
+msgstr "Sperre die technische Qualifikationsstufe"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Hub URL"
-msgstr "Hub-URL"
+#: ../../Zotlabs/Module/Admin/Site.php:293
+msgid "Members can set their own technical comfort level by default"
+msgstr "Benutzer können standardmäßig ihre eigene technische Qualifikationsstufe einstellen"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Access Type"
-msgstr "Zugriffstyp"
+#: ../../Zotlabs/Module/Admin/Site.php:295
+msgid "Banner/Logo"
+msgstr "Banner/Logo"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Registration Policy"
-msgstr "Registrierungsrichtlinien"
+#: ../../Zotlabs/Module/Admin/Site.php:296
+msgid "Administrator Information"
+msgstr "Administrator-Informationen"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Stats"
-msgstr "Statistiken"
+#: ../../Zotlabs/Module/Admin/Site.php:296
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Software"
-msgstr "Software"
+#: ../../Zotlabs/Module/Admin/Site.php:297
+#: ../../Zotlabs/Module/Siteinfo.php:23
+msgid "Site Information"
+msgstr "Seiteninformationen"
 
-#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
-#: ../../include/conversation.php:941 ../../include/conversation.php:1099
-msgid "Ratings"
-msgstr "Bewertungen"
+#: ../../Zotlabs/Module/Admin/Site.php:297
+msgid ""
+"Publicly visible description of this site.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr "Öffentlich sichtbare Beschreibung dieses Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann hier verwendet werden."
 
-#: ../../Zotlabs/Module/Pubsites.php:48
-msgid "Rate"
-msgstr "Bewerten"
+#: ../../Zotlabs/Module/Admin/Site.php:298
+msgid "System language"
+msgstr "System-Sprache"
 
-#: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Blocks.php:166
-#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Events.php:694
-#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Wiki.php:165
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151
-#: ../../include/page_widgets.php:42
-msgid "View"
-msgstr "Ansicht"
+#: ../../Zotlabs/Module/Admin/Site.php:299
+msgid "System theme"
+msgstr "System-Theme"
 
-#: ../../Zotlabs/Module/Connedit.php:82
-msgid "Could not access contact record."
-msgstr "Konnte nicht auf den Kontakteintrag zugreifen."
+#: ../../Zotlabs/Module/Admin/Site.php:299
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
 
-#: ../../Zotlabs/Module/Connedit.php:112
-msgid "Could not locate selected profile."
-msgstr "Gewähltes Profil nicht gefunden."
+#: ../../Zotlabs/Module/Admin/Site.php:300
+msgid "Mobile system theme"
+msgstr "Mobile System-Theme:"
 
-#: ../../Zotlabs/Module/Connedit.php:249
-msgid "Connection updated."
-msgstr "Verbindung aktualisiert."
+#: ../../Zotlabs/Module/Admin/Site.php:300
+msgid "Theme for mobile devices"
+msgstr "Theme für mobile Geräte"
 
-#: ../../Zotlabs/Module/Connedit.php:251
-msgid "Failed to update connection record."
-msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
+#: ../../Zotlabs/Module/Admin/Site.php:302
+msgid "Allow Feeds as Connections"
+msgstr "Feeds als Verbindungen erlauben"
 
-#: ../../Zotlabs/Module/Connedit.php:301
-msgid "is now connected to"
-msgstr "ist jetzt verbunden mit"
+#: ../../Zotlabs/Module/Admin/Site.php:302
+msgid "(Heavy system resource usage)"
+msgstr "(führt zu hoher Systemlast)"
 
-#: ../../Zotlabs/Module/Connedit.php:434
-msgid "Could not access address book record."
-msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen."
+#: ../../Zotlabs/Module/Admin/Site.php:303
+msgid "Maximum image size"
+msgstr "Maximale Bildgröße"
 
-#: ../../Zotlabs/Module/Connedit.php:454
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
+#: ../../Zotlabs/Module/Admin/Site.php:303
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."
 
-#: ../../Zotlabs/Module/Connedit.php:469 ../../Zotlabs/Module/Connedit.php:478
-#: ../../Zotlabs/Module/Connedit.php:487 ../../Zotlabs/Module/Connedit.php:496
-#: ../../Zotlabs/Module/Connedit.php:509
-msgid "Unable to set address book parameters."
-msgstr "Konnte die Adressbuch-Parameter nicht setzen."
+#: ../../Zotlabs/Module/Admin/Site.php:304
+msgid "Does this site allow new member registration?"
+msgstr "Erlaubt dieser Server die Registrierung neuer Nutzer?"
 
-#: ../../Zotlabs/Module/Connedit.php:533
-msgid "Connection has been removed."
-msgstr "Verbindung wurde gelöscht."
+#: ../../Zotlabs/Module/Admin/Site.php:305
+msgid "Invitation only"
+msgstr "Nur mit Einladung"
 
-#: ../../Zotlabs/Module/Connedit.php:573 ../../Zotlabs/Lib/Apps.php:228
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:57
-#: ../../include/conversation.php:936 ../../include/conversation.php:1049
-#: ../../include/nav.php:103
-msgid "View Profile"
-msgstr "Profil ansehen"
+#: ../../Zotlabs/Module/Admin/Site.php:305
+msgid ""
+"Only allow new member registrations with an invitation code. Above register "
+"policy must be set to Yes."
+msgstr "Erlaube die Neuregistrierung von Mitglieder nur mit einem Einladungscode. Die Registrierungs-Politik muss oben auf Ja gesetzt werden."
 
-#: ../../Zotlabs/Module/Connedit.php:576
-#, php-format
-msgid "View %s's profile"
-msgstr "%ss Profil ansehen"
+#: ../../Zotlabs/Module/Admin/Site.php:306
+msgid "Which best describes the types of account offered by this hub?"
+msgstr "Was ist die passendste Beschreibung der Konten auf diesem Hub?"
+
+#: ../../Zotlabs/Module/Admin/Site.php:307
+msgid "Register text"
+msgstr "Registrierungstext"
 
-#: ../../Zotlabs/Module/Connedit.php:580
-msgid "Refresh Permissions"
-msgstr "Zugriffsrechte neu laden"
+#: ../../Zotlabs/Module/Admin/Site.php:307
+msgid "Will be displayed prominently on the registration page."
+msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
 
-#: ../../Zotlabs/Module/Connedit.php:583
-msgid "Fetch updated permissions"
-msgstr "Aktualisierte Zugriffsrechte abfragen"
+#: ../../Zotlabs/Module/Admin/Site.php:308
+msgid "Site homepage to show visitors (default: login box)"
+msgstr "Homepage des Hubs, die Besuchern angezeigt wird (Voreinstellung: Anmeldemaske)"
 
-#: ../../Zotlabs/Module/Connedit.php:587
-msgid "Recent Activity"
-msgstr "Kürzliche Aktivitäten"
+#: ../../Zotlabs/Module/Admin/Site.php:308
+msgid ""
+"example: 'public' to show public stream, 'page/sys/home' to show a system "
+"webpage called 'home' or 'include:home.html' to include a file."
+msgstr "Beispiele: 'public', um den Stream aller öffentlichen Beiträge anzuzeigen, 'page/sys/home', um eine System-Webseite namens 'home' anzuzeigen, 'include:home.html', um eine Datei einzufügen."
 
-#: ../../Zotlabs/Module/Connedit.php:590
-msgid "View recent posts and comments"
-msgstr "Betrachte die neuesten Beiträge und Kommentare"
+#: ../../Zotlabs/Module/Admin/Site.php:309
+msgid "Preserve site homepage URL"
+msgstr "Homepage-URL schützen"
 
-#: ../../Zotlabs/Module/Connedit.php:597
-msgid "Block (or Unblock) all communications with this connection"
-msgstr "Jegliche Kommunikation mit dieser Verbindung blockieren/zulassen"
+#: ../../Zotlabs/Module/Admin/Site.php:309
+msgid ""
+"Present the site homepage in a frame at the original location instead of "
+"redirecting"
+msgstr "Zeigt die Homepage an der Original-URL in einem Frame an, statt auf die eigentliche Adresse der Seite umzuleiten."
 
-#: ../../Zotlabs/Module/Connedit.php:598
-msgid "This connection is blocked!"
-msgstr "Die Verbindung ist geblockt!"
+#: ../../Zotlabs/Module/Admin/Site.php:310
+msgid "Accounts abandoned after x days"
+msgstr "Konten gelten nach X Tagen als unbenutzt"
 
-#: ../../Zotlabs/Module/Connedit.php:602
-msgid "Unignore"
-msgstr "Nicht ignorieren"
+#: ../../Zotlabs/Module/Admin/Site.php:310
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
 
-#: ../../Zotlabs/Module/Connedit.php:605
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr "Jegliche eingehende Kommunikation von dieser Verbindung ignorieren/zulassen"
+#: ../../Zotlabs/Module/Admin/Site.php:311
+msgid "Allowed friend domains"
+msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../Zotlabs/Module/Connedit.php:606
-msgid "This connection is ignored!"
-msgstr "Die Verbindung wird ignoriert!"
+#: ../../Zotlabs/Module/Admin/Site.php:311
+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."
 
-#: ../../Zotlabs/Module/Connedit.php:610
-msgid "Unarchive"
-msgstr "Aus Archiv zurückholen"
+#: ../../Zotlabs/Module/Admin/Site.php:312
+msgid "Verify Email Addresses"
+msgstr "E-Mail-Adressen überprüfen"
 
-#: ../../Zotlabs/Module/Connedit.php:610
-msgid "Archive"
-msgstr "Archivieren"
+#: ../../Zotlabs/Module/Admin/Site.php:312
+msgid ""
+"Check to verify email addresses used in account registration (recommended)."
+msgstr "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)."
 
-#: ../../Zotlabs/Module/Connedit.php:613
+#: ../../Zotlabs/Module/Admin/Site.php:313
+msgid "Force publish"
+msgstr "Veröffentlichung erzwingen"
+
+#: ../../Zotlabs/Module/Admin/Site.php:313
 msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr "Verbindung archivieren/aus dem Archiv zurückholen (Archiv = Kanal als erloschen markieren, aber die Beiträge behalten)"
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."
 
-#: ../../Zotlabs/Module/Connedit.php:614
-msgid "This connection is archived!"
-msgstr "Die Verbindung ist archiviert!"
+#: ../../Zotlabs/Module/Admin/Site.php:314
+msgid "Import Public Streams"
+msgstr "Öffentliche Beiträge importieren"
 
-#: ../../Zotlabs/Module/Connedit.php:618
-msgid "Unhide"
-msgstr "Wieder sichtbar machen"
+#: ../../Zotlabs/Module/Admin/Site.php:314
+msgid ""
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
+msgstr "Öffentliche Beiträge von anderen Servern importieren und zur Verfügung stellen. Warnung: Diese Inhalte sind nicht moderiert."
 
-#: ../../Zotlabs/Module/Connedit.php:618
-msgid "Hide"
-msgstr "Verstecken"
+#: ../../Zotlabs/Module/Admin/Site.php:315
+msgid "Login on Homepage"
+msgstr "Log-in auf der Startseite"
 
-#: ../../Zotlabs/Module/Connedit.php:621
-msgid "Hide or Unhide this connection from your other connections"
-msgstr "Diese Verbindung vor anderen Verbindungen verstecken/zeigen"
+#: ../../Zotlabs/Module/Admin/Site.php:315
+msgid ""
+"Present a login box to visitors on the home page if no other content has "
+"been configured."
+msgstr "Zeigt Besuchern der Homepage eine Anmeldemaske, falls keine anderen Inhalte konfiguriert wurden."
 
-#: ../../Zotlabs/Module/Connedit.php:622
-msgid "This connection is hidden!"
-msgstr "Die Verbindung ist versteckt!"
+#: ../../Zotlabs/Module/Admin/Site.php:316
+msgid "Enable context help"
+msgstr "Kontext-Hilfe aktivieren"
 
-#: ../../Zotlabs/Module/Connedit.php:629
-msgid "Delete this connection"
-msgstr "Verbindung löschen"
+#: ../../Zotlabs/Module/Admin/Site.php:316
+msgid ""
+"Display contextual help for the current page when the help button is "
+"pressed."
+msgstr "Zeigt Kontext-sensitive Hilfe für die aktuelle Seite an, wenn der Hilfe-Knopf geklickt wird."
 
-#: ../../Zotlabs/Module/Connedit.php:640
-msgid "Open Individual Permissions section by default"
-msgstr "Öffne standardmäßig den Bereich für individuelle Berechtigungen"
+#: ../../Zotlabs/Module/Admin/Site.php:318
+msgid "Reply-to email address for system generated email."
+msgstr "Antwortadresse (reply-to) für Emails, die vom System generiert wurden."
 
-#: ../../Zotlabs/Module/Connedit.php:663
-msgid "Affinity"
-msgstr "Beziehung"
+#: ../../Zotlabs/Module/Admin/Site.php:319
+msgid "Sender (From) email address for system generated email."
+msgstr "Absenderadresse (from) für Emails, die vom System generiert wurden."
 
-#: ../../Zotlabs/Module/Connedit.php:666
-msgid "Open Set Affinity section by default"
-msgstr "Öffne standardmäßig den Bereich für Beziehungsgrad-Einstellungen"
+#: ../../Zotlabs/Module/Admin/Site.php:320
+msgid "Name of email sender for system generated email."
+msgstr "Name des Versenders von Emails, die vom System generiert wurden."
 
-#: ../../Zotlabs/Module/Connedit.php:670 ../../include/widgets.php:540
-msgid "Me"
-msgstr "Ich"
+#: ../../Zotlabs/Module/Admin/Site.php:322
+msgid "Directory Server URL"
+msgstr "Verzeichnisserver-URL"
 
-#: ../../Zotlabs/Module/Connedit.php:671 ../../include/widgets.php:541
-msgid "Family"
-msgstr "Familie"
+#: ../../Zotlabs/Module/Admin/Site.php:322
+msgid "Default directory server"
+msgstr "Standard-Verzeichnisserver"
 
-#: ../../Zotlabs/Module/Connedit.php:672
-#: ../../Zotlabs/Module/Settings/Channel.php:62
-#: ../../Zotlabs/Module/Settings/Channel.php:66
-#: ../../Zotlabs/Module/Settings/Channel.php:67
-#: ../../Zotlabs/Module/Settings/Channel.php:70
-#: ../../Zotlabs/Module/Settings/Channel.php:81
-#: ../../include/selectors.php:123 ../../include/widgets.php:542
-#: ../../include/channel.php:408 ../../include/channel.php:409
-#: ../../include/channel.php:416
-msgid "Friends"
-msgstr "Freunde"
+#: ../../Zotlabs/Module/Admin/Site.php:324
+msgid "Proxy user"
+msgstr "Proxy Benutzer"
 
-#: ../../Zotlabs/Module/Connedit.php:673 ../../include/widgets.php:543
-msgid "Acquaintances"
-msgstr "Bekannte"
+#: ../../Zotlabs/Module/Admin/Site.php:325
+msgid "Proxy URL"
+msgstr "Proxy URL"
 
-#: ../../Zotlabs/Module/Connedit.php:700
-msgid "Filter"
-msgstr "Filter"
+#: ../../Zotlabs/Module/Admin/Site.php:326
+msgid "Network timeout"
+msgstr "Netzwerk-Timeout"
 
-#: ../../Zotlabs/Module/Connedit.php:703
-msgid "Open Custom Filter section by default"
-msgstr "Öffne standardmäßig den Bereich für benutzerdefinierte Filter"
+#: ../../Zotlabs/Module/Admin/Site.php:326
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."
 
-#: ../../Zotlabs/Module/Connedit.php:740
-msgid "Approve this connection"
-msgstr "Verbindung genehmigen"
+#: ../../Zotlabs/Module/Admin/Site.php:327
+msgid "Delivery interval"
+msgstr "Auslieferung Intervall"
 
-#: ../../Zotlabs/Module/Connedit.php:740
-msgid "Accept connection to allow communication"
-msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen"
+#: ../../Zotlabs/Module/Admin/Site.php:327
+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 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."
 
-#: ../../Zotlabs/Module/Connedit.php:745
-msgid "Set Affinity"
-msgstr "Beziehung festlegen"
+#: ../../Zotlabs/Module/Admin/Site.php:328
+msgid "Deliveries per process"
+msgstr "Zustellungen pro Prozess"
 
-#: ../../Zotlabs/Module/Connedit.php:748
-msgid "Set Profile"
-msgstr "Profil festlegen"
+#: ../../Zotlabs/Module/Admin/Site.php:328
+msgid ""
+"Number of deliveries to attempt in a single operating system process. Adjust"
+" if necessary to tune system performance. Recommend: 1-5."
+msgstr "Anzahl der Zustellungen, die innerhalb eines einzelnen Betriebssystemprozesses versucht werden. Anpassen, falls nötig, um die System-Performance zu verbessern. Empfehlung: 1-5."
 
-#: ../../Zotlabs/Module/Connedit.php:751
-msgid "Set Affinity & Profile"
-msgstr "Beziehung und Profile festlegen"
+#: ../../Zotlabs/Module/Admin/Site.php:329
+msgid "Poll interval"
+msgstr "Abfrageintervall"
 
-#: ../../Zotlabs/Module/Connedit.php:809
-msgid "none"
-msgstr "Keine"
+#: ../../Zotlabs/Module/Admin/Site.php:329
+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 Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."
 
-#: ../../Zotlabs/Module/Connedit.php:812 ../../include/widgets.php:675
-msgid "Connection Default Permissions"
-msgstr "Standardzugriffsrechte für neue Verbindungen:"
+#: ../../Zotlabs/Module/Admin/Site.php:330
+msgid "Maximum Load Average"
+msgstr "Maximales Load Average"
 
-#: ../../Zotlabs/Module/Connedit.php:812 ../../include/items.php:3932
-#, php-format
-msgid "Connection: %s"
-msgstr "Verbindung: %s"
+#: ../../Zotlabs/Module/Admin/Site.php:330
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"
 
-#: ../../Zotlabs/Module/Connedit.php:813
-msgid "Apply these permissions automatically"
-msgstr "Diese Berechtigungen automatisch anwenden"
+#: ../../Zotlabs/Module/Admin/Site.php:331
+msgid "Expiration period in days for imported (grid/network) content"
+msgstr "Setze den Zeitraum (in Tagen), ab wann importierte (aus dem Netzwerk) Inhalte ablaufen sollen"
 
-#: ../../Zotlabs/Module/Connedit.php:813
-msgid "Connection requests will be approved without your interaction"
-msgstr "Verbindungsanfragen werden sofort bestätigt, ohne dass Deine aktive Zustimmung erforderlich ist."
+#: ../../Zotlabs/Module/Admin/Site.php:331
+msgid "0 for no expiration of imported content"
+msgstr "0 = keine Löschung importierter Inhalte"
 
-#: ../../Zotlabs/Module/Connedit.php:814
-msgid "Permission role"
-msgstr "Berechtigungsrolle"
+#: ../../Zotlabs/Module/Admin/Profs.php:69
+msgid "New Profile Field"
+msgstr "Neues Profilfeld"
 
-#: ../../Zotlabs/Module/Connedit.php:815
-msgid "Add permission role"
-msgstr "Berechtigungsrolle hinzufügen"
+#: ../../Zotlabs/Module/Admin/Profs.php:70
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+msgid "Field nickname"
+msgstr "Kurzname für das Feld"
 
-#: ../../Zotlabs/Module/Connedit.php:821
-msgid "This connection's primary address is"
-msgstr "Die Hauptadresse der Verbindung ist"
+#: ../../Zotlabs/Module/Admin/Profs.php:70
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+msgid "System name of field"
+msgstr "Systemname des Feldes"
 
-#: ../../Zotlabs/Module/Connedit.php:822
-msgid "Available locations:"
-msgstr "Verfügbare Klone:"
+#: ../../Zotlabs/Module/Admin/Profs.php:71
+#: ../../Zotlabs/Module/Admin/Profs.php:91
+msgid "Input type"
+msgstr "Art des Inhalts"
 
-#: ../../Zotlabs/Module/Connedit.php:826
-msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr "Die auf dieser Seite angegebenen Berechtigungen werden auf alle neuen Verbindungen angewendet."
+#: ../../Zotlabs/Module/Admin/Profs.php:72
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+msgid "Field Name"
+msgstr "Feldname"
 
-#: ../../Zotlabs/Module/Connedit.php:827
-msgid "Connection Tools"
-msgstr "Verbindungswerkzeuge"
+#: ../../Zotlabs/Module/Admin/Profs.php:72
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+msgid "Label on profile pages"
+msgstr "Bezeichnung auf Profilseiten"
 
-#: ../../Zotlabs/Module/Connedit.php:829
-msgid "Slide to adjust your degree of friendship"
-msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
+#: ../../Zotlabs/Module/Admin/Profs.php:73
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+msgid "Help text"
+msgstr "Hilfetext"
 
-#: ../../Zotlabs/Module/Connedit.php:830 ../../Zotlabs/Module/Rate.php:155
-#: ../../include/js_strings.php:20
-msgid "Rating"
-msgstr "Bewertung"
+#: ../../Zotlabs/Module/Admin/Profs.php:73
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+msgid "Additional info (optional)"
+msgstr "Zusätzliche Informationen (optional)"
 
-#: ../../Zotlabs/Module/Connedit.php:831
-msgid "Slide to adjust your rating"
-msgstr "Verschieben, um Deine Bewertung einzustellen"
+#: ../../Zotlabs/Module/Admin/Profs.php:74
+#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
+#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1028
+#: ../../include/text.php:1040
+msgid "Save"
+msgstr "Speichern"
 
-#: ../../Zotlabs/Module/Connedit.php:832 ../../Zotlabs/Module/Connedit.php:837
-msgid "Optionally explain your rating"
-msgstr "Optional kannst Du Deine Bewertung begründen"
+#: ../../Zotlabs/Module/Admin/Profs.php:83
+msgid "Field definition not found"
+msgstr "Feld-Definition nicht gefunden"
 
-#: ../../Zotlabs/Module/Connedit.php:834
-msgid "Custom Filter"
-msgstr "Benutzerdefinierter Filter"
+#: ../../Zotlabs/Module/Admin/Profs.php:89
+msgid "Edit Profile Field"
+msgstr "Profilfeld bearbeiten"
 
-#: ../../Zotlabs/Module/Connedit.php:835
-msgid "Only import posts with this text"
-msgstr "Nur Beiträge mit diesem Text importieren"
+#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30
+msgid "Profile Fields"
+msgstr "Profil Felder"
+
+#: ../../Zotlabs/Module/Admin/Profs.php:148
+msgid "Basic Profile Fields"
+msgstr "Notwendige Profil Felder"
 
-#: ../../Zotlabs/Module/Connedit.php:835 ../../Zotlabs/Module/Connedit.php:836
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
-msgstr "Einzelne Wörter pro Zeile, #Tags oder /Reguläre Ausdrücke/. lang=xx (z.B. lang=de) ermöglicht Filterung nach Sprache. Leer lassen, um alle Beiträge zu importieren."
+#: ../../Zotlabs/Module/Admin/Profs.php:149
+msgid "Advanced Profile Fields"
+msgstr "Erweiterte Profil Felder"
 
-#: ../../Zotlabs/Module/Connedit.php:836
-msgid "Do not import posts with this text"
-msgstr "Beiträge mit diesem Text nicht importieren"
+#: ../../Zotlabs/Module/Admin/Profs.php:149
+msgid "(In addition to basic fields)"
+msgstr "(zusätzlich zu notwendige Felder)"
 
-#: ../../Zotlabs/Module/Connedit.php:838
-msgid "This information is public!"
-msgstr "Diese Information ist öffentlich!"
+#: ../../Zotlabs/Module/Admin/Profs.php:151
+msgid "All available fields"
+msgstr "Alle verfügbaren Felder"
 
-#: ../../Zotlabs/Module/Connedit.php:843
-msgid "Connection Pending Approval"
-msgstr "Verbindung wartet auf Bestätigung"
+#: ../../Zotlabs/Module/Admin/Profs.php:152
+msgid "Custom Fields"
+msgstr "Benutzerdefinierte Felder"
 
-#: ../../Zotlabs/Module/Connedit.php:846
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Settings/Permcats.php:107
-msgid "inherited"
-msgstr "geerbt"
+#: ../../Zotlabs/Module/Admin/Profs.php:156
+msgid "Create Custom Field"
+msgstr "Erstelle benutzerdefiniertes Feld"
 
-#: ../../Zotlabs/Module/Connedit.php:848
+#: ../../Zotlabs/Module/Admin/Account_edit.php:29
 #, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
+msgid "Password changed for account %d."
+msgstr "Passwort für Konto %d geändert."
 
-#: ../../Zotlabs/Module/Connedit.php:850
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
-msgid "Their Settings"
-msgstr "Deren Einstellungen"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:46
+msgid "Account settings updated."
+msgstr "Kontoeinstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Connedit.php:851
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Settings/Permcats.php:105
-msgid "My Settings"
-msgstr "Meine Einstellungen"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:61
+msgid "Account not found."
+msgstr "Konto nicht gefunden."
 
-#: ../../Zotlabs/Module/Connedit.php:853
-#: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Settings/Permcats.php:110
-msgid "Individual Permissions"
-msgstr "Individuelle Zugriffsrechte"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+msgid "Account Edit"
+msgstr "Kontobearbeitung"
 
-#: ../../Zotlabs/Module/Connedit.php:854
-#: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Settings/Permcats.php:111
-msgid ""
-"Some permissions may be inherited from your channel's <a "
-"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
-"priority than individual settings. You can <strong>not</strong> change those"
-" settings here."
-msgstr "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals vererbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung und können hier nicht verändert werden."
+#: ../../Zotlabs/Module/Admin/Account_edit.php:69
+msgid "New Password"
+msgstr "Neues Passwort"
 
-#: ../../Zotlabs/Module/Connedit.php:855
-msgid ""
-"Some permissions may be inherited from your channel's <a "
-"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
-"priority than individual settings. You can change those settings here but "
-"they wont have any impact unless the inherited setting changes."
-msgstr "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung. Werden geerbte Einstellungen hier geändert, hat dies keine Auswirkungen."
+#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+msgid "New Password again"
+msgstr "Neues Passwort wiederholen"
 
-#: ../../Zotlabs/Module/Connedit.php:856
-msgid "Last update:"
-msgstr "Letzte Aktualisierung:"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:71
+msgid "Technical skill level"
+msgstr "Technische Qualifikationsstufe"
 
-#: ../../Zotlabs/Module/Connedit.php:865
-msgid "Details"
-msgstr "Details"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:72
+msgid "Account language (for emails)"
+msgstr "Kontosprache (für E-Mails)"
 
-#: ../../Zotlabs/Module/Connedit.php:868
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137
-msgid "Organisation"
-msgstr "Organisation"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:73
+msgid "Service class"
+msgstr "Dienstklasse"
 
-#: ../../Zotlabs/Module/Connedit.php:869
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138
-#: ../../include/page_widgets.php:46
-msgid "Title"
-msgstr "Titel"
+#: ../../Zotlabs/Module/Admin/Security.php:77
+msgid ""
+"By default, unfiltered HTML is allowed in embedded media. This is inherently"
+" insecure."
+msgstr "Standardmäßig wird ungefiltertes HTML in eingebetteten Inhalten zugelassen. Das ist prinzipiell unsicher."
 
-#: ../../Zotlabs/Module/Connedit.php:870
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
-msgid "Phone"
-msgstr "Telefon"
+#: ../../Zotlabs/Module/Admin/Security.php:80
+msgid ""
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
+msgstr "Die empfohlene Einstellung ist, ungefiltertes HTML nur von den nachfolgenden Webseiten zu erlauben:"
 
-#: ../../Zotlabs/Module/Connedit.php:872
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141
-msgid "Instant messenger"
-msgstr "Sofortnachrichtendienst"
+#: ../../Zotlabs/Module/Admin/Security.php:81
+msgid ""
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br"
+" />https://vimeo.com/<br />https://soundcloud.com/<br />"
+msgstr "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
 
-#: ../../Zotlabs/Module/Connedit.php:873
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142
-msgid "Website"
-msgstr "Webseite"
+#: ../../Zotlabs/Module/Admin/Security.php:82
+msgid ""
+"All other embedded content will be filtered, <strong>unless</strong> "
+"embedded content from that site is explicitly blocked."
+msgstr "Alle anderen eingebetteten Inhalte werden gefiltert, <strong>es sei denn</strong>, eingebettete Inhalte von einer bestimmten Seite sind explizit blockiert."
 
-#: ../../Zotlabs/Module/Connedit.php:875
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144
-msgid "Note"
-msgstr "Hinweis"
+#: ../../Zotlabs/Module/Admin/Security.php:87
+#: ../../Zotlabs/Widget/Admin.php:25
+msgid "Security"
+msgstr "Sicherheit"
 
-#: ../../Zotlabs/Module/Connedit.php:876
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145
-#: ../../extend/addon/addon/cdav/cdav.php:270
-#: ../../include/connections.php:894
-msgid "Mobile"
-msgstr "Mobil"
+#: ../../Zotlabs/Module/Admin/Security.php:89
+msgid "Block public"
+msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../Zotlabs/Module/Connedit.php:877
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146
-#: ../../extend/addon/addon/cdav/cdav.php:271
-#: ../../include/connections.php:895
-msgid "Home"
-msgstr "Home"
+#: ../../Zotlabs/Module/Admin/Security.php:89
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently authenticated."
+msgstr "Blockiere den öffentlichen Zugriff auf alle ansonsten öffentlichen persönlichen Seiten dieser Website, sofern ein Besucher nicht angemeldet ist."
 
-#: ../../Zotlabs/Module/Connedit.php:878
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147
-#: ../../extend/addon/addon/cdav/cdav.php:274
-#: ../../include/connections.php:898
-msgid "Work"
-msgstr "Arbeit"
+#: ../../Zotlabs/Module/Admin/Security.php:90
+msgid "Set \"Transport Security\" HTTP header"
+msgstr "Setze den \"Transport Security\" HTTP Header"
 
-#: ../../Zotlabs/Module/Connedit.php:880
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:368
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149
-msgid "Add Contact"
-msgstr "Kontakt hinzufügen"
+#: ../../Zotlabs/Module/Admin/Security.php:91
+msgid "Set \"Content Security Policy\" HTTP header"
+msgstr "Setze den \"Content Security Policy\" HTTP Header"
 
-#: ../../Zotlabs/Module/Connedit.php:881
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150
-msgid "Add Field"
-msgstr "Feld hinzufügen"
+#: ../../Zotlabs/Module/Admin/Security.php:92
+msgid "Allowed email domains"
+msgstr "Erlaubte Domains für E-Mails"
 
-#: ../../Zotlabs/Module/Connedit.php:886
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155
-msgid "P.O. Box"
-msgstr "Postfach"
+#: ../../Zotlabs/Module/Admin/Security.php:92
+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."
 
-#: ../../Zotlabs/Module/Connedit.php:887
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156
-msgid "Additional"
-msgstr "Zusätzlich"
+#: ../../Zotlabs/Module/Admin/Security.php:93
+msgid "Not allowed email domains"
+msgstr "Nicht erlaubte Domains für E-Mails"
 
-#: ../../Zotlabs/Module/Connedit.php:888
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157
-msgid "Street"
-msgstr "Straße"
+#: ../../Zotlabs/Module/Admin/Security.php:93
+msgid ""
+"Comma separated list of domains which are not allowed in email addresses for"
+" registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains, unless allowed domains have been defined."
+msgstr "Domains in E-Mail-Adressen, die keine Erlaubnis erhalten, sich auf Deinem Hub zu registrieren. Mehrere Domains können durch Kommas getrennt werden. Platzhalter (*/?) sind möglich. Keine Eingabe bedeutet keine Einschränkung, unabhängig davon, ob unter erlaubte Domains etwas eingegeben wurde."
 
-#: ../../Zotlabs/Module/Connedit.php:889
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158
-msgid "Locality"
-msgstr "Ortschaft"
+#: ../../Zotlabs/Module/Admin/Security.php:94
+msgid "Allow communications only from these sites"
+msgstr "Kommunikation nur von diesen Servern/Domains erlauben"
 
-#: ../../Zotlabs/Module/Connedit.php:890
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159
-msgid "Region"
-msgstr "Region"
+#: ../../Zotlabs/Module/Admin/Security.php:94
+msgid ""
+"One site per line. Leave empty to allow communication from anywhere by "
+"default"
+msgstr "Ein Eintrag pro Zeile. Lasse das Feld leer, um Kommunikation grundlegend von überall her zu erlauben."
 
-#: ../../Zotlabs/Module/Connedit.php:891
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160
-msgid "ZIP Code"
-msgstr "Postleitzahl"
+#: ../../Zotlabs/Module/Admin/Security.php:95
+msgid "Block communications from these sites"
+msgstr "Kommunikation von diesen Servern/Domains blockieren"
 
-#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Profiles.php:756
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
-msgid "Country"
-msgstr "Land"
+#: ../../Zotlabs/Module/Admin/Security.php:96
+msgid "Allow communications only from these channels"
+msgstr "Kommunikation nur von diesen Kanälen erlauben"
 
-#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
-#: ../../extend/addon/addon/opensearch/opensearch.php:42
-msgid "$Projectname"
-msgstr "$Projectname"
+#: ../../Zotlabs/Module/Admin/Security.php:96
+msgid ""
+"One channel (hash) per line. Leave empty to allow from any channel by "
+"default"
+msgstr "Ein Kanal (hash) pro Zeile. Leerlassen um jeden Kanal zuzulassen. "
 
-#: ../../Zotlabs/Module/Home.php:92
-#, php-format
-msgid "Welcome to %s"
-msgstr "Willkommen auf %s"
+#: ../../Zotlabs/Module/Admin/Security.php:97
+msgid "Block communications from these channels"
+msgstr "Kommunikation von folgenden Kanälen blockieren"
 
-#: ../../Zotlabs/Module/Filestorage.php:87
-msgid "Permission Denied."
-msgstr "Zugriff verweigert."
+#: ../../Zotlabs/Module/Admin/Security.php:98
+msgid "Only allow embeds from secure (SSL) websites and links."
+msgstr "Erlaube Einbettungen nur von sicheren (SSL) Webseiten und Links."
 
-#: ../../Zotlabs/Module/Filestorage.php:103
-msgid "File not found."
-msgstr "Datei nicht gefunden."
+#: ../../Zotlabs/Module/Admin/Security.php:99
+msgid "Allow unfiltered embedded HTML content only from these domains"
+msgstr "Erlaube Einbettung von Inhalten mit ungefiltertem HTML nur von diesen Domains"
 
-#: ../../Zotlabs/Module/Filestorage.php:146
-msgid "Edit file permissions"
-msgstr "Dateiberechtigungen bearbeiten"
+#: ../../Zotlabs/Module/Admin/Security.php:99
+msgid "One site per line. By default embedded content is filtered."
+msgstr "Eine Website/Domain pro Zeile. Standardmäßig wird eingebetteter Inhalt gefiltert."
 
-#: ../../Zotlabs/Module/Filestorage.php:159
-msgid "Set/edit permissions"
-msgstr "Berechtigungen setzen/ändern"
+#: ../../Zotlabs/Module/Admin/Security.php:100
+msgid "Block embedded HTML from these domains"
+msgstr "Eingebettete HTML Inhalte von diesen Servern/Domains blockieren"
 
-#: ../../Zotlabs/Module/Filestorage.php:160
-msgid "Include all files and sub folders"
-msgstr "Alle Dateien und Unterverzeichnisse einbinden"
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
+msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
 
-#: ../../Zotlabs/Module/Filestorage.php:161
-msgid "Return to file list"
-msgstr "Zurück zur Dateiliste"
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
+msgstr "Sichtbar für:"
 
-#: ../../Zotlabs/Module/Filestorage.php:163
-msgid "Copy/paste this code to attach file to a post"
-msgstr "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen"
+#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
+#: ../../Zotlabs/Module/Acl.php:117 ../../include/acl_selectors.php:183
+msgctxt "acl"
+msgid "Profile"
+msgstr "Profil"
 
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Copy/paste this URL to link file from a web page"
-msgstr "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken"
+#: ../../Zotlabs/Module/Settings/Permcats.php:37
+msgid "Permission category saved."
+msgstr "Berechtigungsrolle gespeichert."
 
-#: ../../Zotlabs/Module/Filestorage.php:166
-msgid "Share this file"
-msgstr "Diese Datei freigeben"
+#: ../../Zotlabs/Module/Settings/Permcats.php:61
+msgid ""
+"Use this form to create permission rules for various classes of people or "
+"connections."
+msgstr "Verwende dieses Formular, um Berechtigungsrollen für verschiedene Gruppen von Personen oder Verbindungen zu erstellen."
 
-#: ../../Zotlabs/Module/Filestorage.php:167
-msgid "Show URL to this file"
-msgstr "URL zu dieser Datei anzeigen"
+#: ../../Zotlabs/Module/Settings/Permcats.php:94
+msgid "Permission Categories"
+msgstr "Berechtigungsrollen"
 
-#: ../../Zotlabs/Module/Filestorage.php:168
-msgid "Notify your contacts about this file"
-msgstr "Meine Kontakte über diese Datei benachrichtigen"
+#: ../../Zotlabs/Module/Settings/Permcats.php:102
+msgid "Permission Name"
+msgstr "Name der Berechtigungsrolle"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
-#: ../../include/conversation.php:1836
-msgid "Photos"
-msgstr "Fotos"
+#: ../../Zotlabs/Module/Settings/Permcats.php:103
+#: ../../Zotlabs/Module/Settings/Tokens.php:161
+#: ../../Zotlabs/Module/Connedit.php:886
+msgid "My Settings"
+msgstr "Meine Einstellungen"
 
-#: ../../Zotlabs/Module/Apps.php:45 ../../include/widgets.php:102
-#: ../../include/nav.php:178
-msgid "Apps"
-msgstr "Apps"
+#: ../../Zotlabs/Module/Settings/Permcats.php:105
+#: ../../Zotlabs/Module/Settings/Tokens.php:163
+#: ../../Zotlabs/Module/Connedit.php:881
+msgid "inherited"
+msgstr "geerbt"
 
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
-msgstr "Berechtigung verweigert."
+#: ../../Zotlabs/Module/Settings/Permcats.php:108
+#: ../../Zotlabs/Module/Settings/Tokens.php:166
+#: ../../Zotlabs/Module/Connedit.php:888
+msgid "Individual Permissions"
+msgstr "Individuelle Zugriffsrechte"
 
-#: ../../Zotlabs/Module/Cal.php:263 ../../Zotlabs/Module/Events.php:605
-msgid "l, F j"
-msgstr "l, j. F"
+#: ../../Zotlabs/Module/Settings/Permcats.php:109
+#: ../../Zotlabs/Module/Settings/Tokens.php:167
+#: ../../Zotlabs/Module/Connedit.php:889
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can <strong>not</strong> change those"
+" settings here."
+msgstr "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals vererbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung und können hier nicht verändert werden."
 
-#: ../../Zotlabs/Module/Cal.php:312 ../../Zotlabs/Module/Events.php:660
-#: ../../include/text.php:1761
-msgid "Link to Source"
-msgstr "Link zur Quelle"
+#: ../../Zotlabs/Module/Settings/Channel.php:62
+#: ../../Zotlabs/Module/Settings/Channel.php:66
+#: ../../Zotlabs/Module/Settings/Channel.php:67
+#: ../../Zotlabs/Module/Settings/Channel.php:70
+#: ../../Zotlabs/Module/Settings/Channel.php:81
+#: ../../Zotlabs/Module/Connedit.php:707 ../../Zotlabs/Widget/Affinity.php:28
+#: ../../include/selectors.php:123 ../../include/channel.php:406
+#: ../../include/channel.php:407 ../../include/channel.php:414
+msgid "Friends"
+msgstr "Freunde"
 
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
-msgid "Edit Event"
-msgstr "Termin bearbeiten"
+#: ../../Zotlabs/Module/Settings/Channel.php:251
+#: ../../addon/rendezvous/rendezvous.php:82
+#: ../../addon/openstreetmap/openstreetmap.php:184
+#: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54
+#: ../../addon/twitter/twitter.php:766 ../../addon/piwik/piwik.php:116
+#: ../../addon/xmpp/xmpp.php:102
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
-msgid "Create Event"
-msgstr "Termin anlegen"
+#: ../../Zotlabs/Module/Settings/Channel.php:312
+msgid "Nobody except yourself"
+msgstr "Niemand außer Dir selbst"
 
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:691
-#: ../../include/channel.php:1370
-msgid "Export"
-msgstr "Exportieren"
+#: ../../Zotlabs/Module/Settings/Channel.php:313
+msgid "Only those you specifically allow"
+msgstr "Nur die, denen Du es explizit erlaubst"
 
-#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2307
-msgid "Import"
-msgstr "Import"
+#: ../../Zotlabs/Module/Settings/Channel.php:314
+msgid "Approved connections"
+msgstr "Angenommene Verbindungen"
 
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:700
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
-msgid "Today"
-msgstr "Heute"
+#: ../../Zotlabs/Module/Settings/Channel.php:315
+msgid "Any connections"
+msgstr "Beliebige Verbindungen"
 
-#: ../../Zotlabs/Module/Group.php:24
-msgid "Privacy group created."
-msgstr "Gruppe wurde erstellt."
+#: ../../Zotlabs/Module/Settings/Channel.php:316
+msgid "Anybody on this website"
+msgstr "Jeder auf dieser Website"
 
-#: ../../Zotlabs/Module/Group.php:30
-msgid "Could not create privacy group."
-msgstr "Gruppe konnte nicht erstellt werden."
+#: ../../Zotlabs/Module/Settings/Channel.php:317
+msgid "Anybody in this network"
+msgstr "Alle $Projectname-Mitglieder"
 
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3899
-msgid "Privacy group not found."
-msgstr "Gruppe nicht gefunden."
+#: ../../Zotlabs/Module/Settings/Channel.php:318
+msgid "Anybody authenticated"
+msgstr "Jeder authentifizierte"
 
-#: ../../Zotlabs/Module/Group.php:58
-msgid "Privacy group updated."
-msgstr "Gruppe wurde aktualisiert."
+#: ../../Zotlabs/Module/Settings/Channel.php:319
+msgid "Anybody on the internet"
+msgstr "Jeder im Internet"
 
-#: ../../Zotlabs/Module/Group.php:90
-msgid "Create a group of channels."
-msgstr "Erstelle eine Gruppe für Kanäle."
+#: ../../Zotlabs/Module/Settings/Channel.php:395
+msgid "Publish your default profile in the network directory"
+msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
 
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
-msgid "Privacy group name: "
-msgstr "Gruppenname:"
+#: ../../Zotlabs/Module/Settings/Channel.php:400
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
-msgid "Members are visible to other channels"
-msgstr "Mitglieder sind sichtbar für andere Kanäle"
+#: ../../Zotlabs/Module/Settings/Channel.php:404
+#: ../../Zotlabs/Module/Profile_photo.php:429
+#: ../../Zotlabs/Module/Cover_photo.php:365
+msgid "or"
+msgstr "oder"
 
-#: ../../Zotlabs/Module/Group.php:111
-msgid "Privacy group removed."
-msgstr "Gruppe wurde entfernt."
+#: ../../Zotlabs/Module/Settings/Channel.php:409
+msgid "Your channel address is"
+msgstr "Deine Kanal-Adresse lautet"
 
-#: ../../Zotlabs/Module/Group.php:113
-msgid "Unable to remove privacy group."
-msgstr "Gruppe konnte nicht entfernt werden."
+#: ../../Zotlabs/Module/Settings/Channel.php:412
+msgid "Your files/photos are accessible via WebDAV at"
+msgstr "Deine Dateien/Fotos sind via WebDAV verfügbar auf"
 
-#: ../../Zotlabs/Module/Group.php:183
-msgid "Privacy group editor"
-msgstr "Gruppeneditor"
+#: ../../Zotlabs/Module/Settings/Channel.php:474
+msgid "Channel Settings"
+msgstr "Kanal-Einstellungen"
 
-#: ../../Zotlabs/Module/Group.php:199
-msgid "All Connected Channels"
-msgstr "Alle verbundenen Kanäle"
+#: ../../Zotlabs/Module/Settings/Channel.php:481
+msgid "Basic Settings"
+msgstr "Grundeinstellungen"
 
-#: ../../Zotlabs/Module/Group.php:231
-msgid "Click on a channel to add or remove."
-msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
+#: ../../Zotlabs/Module/Settings/Channel.php:482
+#: ../../include/channel.php:1250
+msgid "Full Name:"
+msgstr "Voller Name:"
 
-#: ../../Zotlabs/Module/Dreport.php:45
-msgid "Invalid message"
-msgstr "Ungültige Beitrags-ID (mid)"
+#: ../../Zotlabs/Module/Settings/Channel.php:483
+#: ../../Zotlabs/Module/Settings/Account.php:119
+msgid "Email Address:"
+msgstr "Email Adresse:"
 
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "no results"
-msgstr "keine Ergebnisse"
+#: ../../Zotlabs/Module/Settings/Channel.php:484
+msgid "Your Timezone:"
+msgstr "Ihre Zeitzone:"
 
-#: ../../Zotlabs/Module/Dreport.php:93
-msgid "channel sync processed"
-msgstr "Kanal-Sync verarbeitet"
+#: ../../Zotlabs/Module/Settings/Channel.php:485
+msgid "Default Post Location:"
+msgstr "Standardstandort:"
 
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "queued"
-msgstr "zur Warteschlange hinzugefügt"
+#: ../../Zotlabs/Module/Settings/Channel.php:485
+msgid "Geographical location to display on your posts"
+msgstr "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll"
 
-#: ../../Zotlabs/Module/Dreport.php:101
-msgid "posted"
-msgstr "zugestellt"
+#: ../../Zotlabs/Module/Settings/Channel.php:486
+msgid "Use Browser Location:"
+msgstr "Standort des Browsers verwenden:"
 
-#: ../../Zotlabs/Module/Dreport.php:105
-msgid "accepted for delivery"
-msgstr "für Zustellung akzeptiert"
+#: ../../Zotlabs/Module/Settings/Channel.php:488
+msgid "Adult Content"
+msgstr "Nicht jugendfreie Inhalte"
 
-#: ../../Zotlabs/Module/Dreport.php:109
-msgid "updated"
-msgstr "aktualisiert"
+#: ../../Zotlabs/Module/Settings/Channel.php:488
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
 
-#: ../../Zotlabs/Module/Dreport.php:112
-msgid "update ignored"
-msgstr "Aktualisierung ignoriert"
+#: ../../Zotlabs/Module/Settings/Channel.php:490
+msgid "Security and Privacy Settings"
+msgstr "Sicherheits- und Datenschutz-Einstellungen"
 
-#: ../../Zotlabs/Module/Dreport.php:115
-msgid "permission denied"
-msgstr "Zugriff verweigert"
+#: ../../Zotlabs/Module/Settings/Channel.php:493
+msgid "Your permissions are already configured. Click to view/adjust"
+msgstr "Deine Zugriffsrechte sind schon konfiguriert. Klicke hier, um sie zu betrachten oder zu ändern"
 
-#: ../../Zotlabs/Module/Dreport.php:119
-msgid "recipient not found"
-msgstr "Empfänger nicht gefunden."
+#: ../../Zotlabs/Module/Settings/Channel.php:495
+msgid "Hide my online presence"
+msgstr "Meine Online-Präsenz verbergen"
 
-#: ../../Zotlabs/Module/Dreport.php:122
-msgid "mail recalled"
-msgstr "Mail widerrufen"
+#: ../../Zotlabs/Module/Settings/Channel.php:495
+msgid "Prevents displaying in your profile that you are online"
+msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
 
-#: ../../Zotlabs/Module/Dreport.php:125
-msgid "duplicate mail received"
-msgstr "Doppelte Mail erhalten"
+#: ../../Zotlabs/Module/Settings/Channel.php:497
+msgid "Simple Privacy Settings:"
+msgstr "Einfache Privatsphäre-Einstellungen"
 
-#: ../../Zotlabs/Module/Dreport.php:128
-msgid "mail delivered"
-msgstr "Mail zugestellt"
+#: ../../Zotlabs/Module/Settings/Channel.php:498
+msgid ""
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
+msgstr "Komplett offen – <em>extrem ungeschützt (mit großer Vorsicht verwenden!)</em>"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:499
+msgid ""
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
+msgstr "Typisch – <em>Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)</em>"
 
-#: ../../Zotlabs/Module/Dreport.php:148
-#, php-format
-msgid "Delivery report for %1$s"
-msgstr "Zustellungsbericht für %1$s"
+#: ../../Zotlabs/Module/Settings/Channel.php:500
+msgid "Private - <em>default private, never open or public</em>"
+msgstr "Privat – <em>Standard privat, nie offen oder öffentlich</em>"
 
-#: ../../Zotlabs/Module/Dreport.php:151
-msgid "Options"
-msgstr "Optionen"
+#: ../../Zotlabs/Module/Settings/Channel.php:501
+msgid "Blocked - <em>default blocked to/from everybody</em>"
+msgstr "Blockiert – <em>Alle standardmäßig blockiert</em>"
 
-#: ../../Zotlabs/Module/Dreport.php:152
-msgid "Redeliver"
-msgstr "Erneut zustellen"
+#: ../../Zotlabs/Module/Settings/Channel.php:503
+msgid "Allow others to tag your posts"
+msgstr "Erlaube anderen, Deine Beiträge zu verschlagworten"
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
-msgid "webpage"
-msgstr "Webseite"
+#: ../../Zotlabs/Module/Settings/Channel.php:503
+msgid ""
+"Often used by the community to retro-actively flag inappropriate content"
+msgstr "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren"
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
-msgid "block"
-msgstr "Block"
+#: ../../Zotlabs/Module/Settings/Channel.php:505
+msgid "Channel Permission Limits"
+msgstr "Kanal-Berechtigungslimits"
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
-msgid "layout"
-msgstr "Layout"
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+msgid "Expire other channel content after this many days"
+msgstr "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen"
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
-msgid "menu"
-msgstr "Menü"
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+msgid "0 or blank to use the website limit."
+msgstr "0 oder leer lassen, um den voreingestellten Wert der Webseite zu verwenden."
 
-#: ../../Zotlabs/Module/Impel.php:191
+#: ../../Zotlabs/Module/Settings/Channel.php:507
 #, php-format
-msgid "%s element installed"
-msgstr "Element für %s installiert"
+msgid "This website expires after %d days."
+msgstr "Diese Webseite läuft nach %d Tagen ab."
 
-#: ../../Zotlabs/Module/Impel.php:194
-#, php-format
-msgid "%s element installation failed"
-msgstr "Installation des Elements %s fehlgeschlagen"
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+msgid "This website does not expire imported content."
+msgstr "Diese Webseite lässt importierte Inhalte nicht verfallen."
 
-#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:57
-msgid "Nothing to import."
-msgstr "Nichts zu importieren."
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+msgid "The website limit takes precedence if lower than your limit."
+msgstr "Das Verfallslimit der Webseite hat Vorrang, wenn es niedriger als Deines hier ist."
 
-#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:69
-#: ../../Zotlabs/Module/Import.php:84
-msgid "Unable to download data from old server"
-msgstr "Daten können vom alten Server nicht heruntergeladen werden"
+#: ../../Zotlabs/Module/Settings/Channel.php:508
+msgid "Maximum Friend Requests/Day:"
+msgstr "Maximale Kontaktanfragen pro Tag:"
 
-#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:91
-msgid "Imported file is empty."
-msgstr "Die importierte Datei ist leer."
+#: ../../Zotlabs/Module/Settings/Channel.php:508
+msgid "May reduce spam activity"
+msgstr "Kann die Spam-Aktivität verringern"
 
-#: ../../Zotlabs/Module/Import_items.php:88
-#: ../../Zotlabs/Module/Import.php:111
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr "Achtung: Datenbankversionen unterscheiden sich um %1$d Aktualisierungen."
+#: ../../Zotlabs/Module/Settings/Channel.php:509
+msgid "Default Access Control List (ACL)"
+msgstr "Standard-Zugriffsberechtigungsliste (ACL)"
 
-#: ../../Zotlabs/Module/Import_items.php:104
-msgid "Import completed"
-msgstr "Import abgeschlossen"
+#: ../../Zotlabs/Module/Settings/Channel.php:511
+msgid "Use my default audience setting for the type of object published"
+msgstr "Verwende Deine eingestellte Standard-Zielgruppe des jeweiligen Inhaltstyps"
 
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "Import Items"
-msgstr "Beiträge importieren"
+#: ../../Zotlabs/Module/Settings/Channel.php:518
+msgid "Channel permissions category:"
+msgstr "Zugriffsrechte-Kategorie des Kanals:"
 
-#: ../../Zotlabs/Module/Import_items.php:120
-msgid ""
-"Use this form to import existing posts and content from an export file."
-msgstr "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren."
+#: ../../Zotlabs/Module/Settings/Channel.php:519
+msgid "Default Permissions Group"
+msgstr "Standard-Berechtigungsgruppe"
 
-#: ../../Zotlabs/Module/Import_items.php:121
-#: ../../Zotlabs/Module/Import.php:495
-msgid "File to Upload"
-msgstr "Hochzuladende Datei:"
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
 
-#: ../../Zotlabs/Module/Manage.php:136
-#: ../../Zotlabs/Module/New_channel.php:121
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+msgid "Useful to reduce spamming"
+msgstr "Nützlich, um Spam zu verringern"
 
-#: ../../Zotlabs/Module/Manage.php:143
-msgid "Create a new channel"
-msgstr "Neuen Kanal anlegen"
+#: ../../Zotlabs/Module/Settings/Channel.php:528
+msgid "Notification Settings"
+msgstr "Benachrichtigungs-Einstellungen"
 
-#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Profiles.php:813
-#: ../../Zotlabs/Module/Wiki.php:166 ../../Zotlabs/Module/Chat.php:255
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152
-msgid "Create New"
-msgstr "Neu anlegen"
+#: ../../Zotlabs/Module/Settings/Channel.php:529
+msgid "By default post a status message when:"
+msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
 
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:221
-#: ../../include/nav.php:223
-msgid "Channel Manager"
-msgstr "Kanal-Manager"
+#: ../../Zotlabs/Module/Settings/Channel.php:530
+msgid "accepting a friend request"
+msgstr "Du eine Verbindungsanfrage annimmst"
 
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Current Channel"
-msgstr "Aktueller Kanal"
+#: ../../Zotlabs/Module/Settings/Channel.php:531
+msgid "joining a forum/community"
+msgstr "Du einem Forum beitrittst"
 
-#: ../../Zotlabs/Module/Manage.php:167
-msgid "Switch to one of your channels by selecting it."
-msgstr "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst."
+#: ../../Zotlabs/Module/Settings/Channel.php:532
+msgid "making an <em>interesting</em> profile change"
+msgstr "Du eine <em>interessante</em> Änderung an Deinem Profil vornimmst"
 
-#: ../../Zotlabs/Module/Manage.php:168
-msgid "Default Channel"
-msgstr "Standard Kanal"
+#: ../../Zotlabs/Module/Settings/Channel.php:533
+msgid "Send a notification email when:"
+msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
 
-#: ../../Zotlabs/Module/Manage.php:169
-msgid "Make Default"
-msgstr "Zum Standard machen"
+#: ../../Zotlabs/Module/Settings/Channel.php:534
+msgid "You receive a connection request"
+msgstr "Du eine Verbindungsanfrage erhältst"
 
-#: ../../Zotlabs/Module/Manage.php:172
-#, php-format
-msgid "%d new messages"
-msgstr "%d neue Nachrichten"
+#: ../../Zotlabs/Module/Settings/Channel.php:535
+msgid "Your connections are confirmed"
+msgstr "Eine Verbindung bestätigt wurde"
 
-#: ../../Zotlabs/Module/Manage.php:173
-#, php-format
-msgid "%d new introductions"
-msgstr "%d neue Vorstellungen"
+#: ../../Zotlabs/Module/Settings/Channel.php:536
+msgid "Someone writes on your profile wall"
+msgstr "Jemand auf Deine Pinnwand schreibt"
 
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Delegated Channel"
-msgstr "Delegierte Kanäle"
+#: ../../Zotlabs/Module/Settings/Channel.php:537
+msgid "Someone writes a followup comment"
+msgstr "Jemand einen Beitrag kommentiert"
 
-#: ../../Zotlabs/Module/Import.php:134
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr "Dein Vertrag erlaubt nur %d Kanäle."
+#: ../../Zotlabs/Module/Settings/Channel.php:538
+msgid "You receive a private message"
+msgstr "Du eine private Nachricht erhältst"
 
-#: ../../Zotlabs/Module/Import.php:149
-msgid "No channel. Import failed."
-msgstr "Kein Kanal. Import fehlgeschlagen."
+#: ../../Zotlabs/Module/Settings/Channel.php:539
+msgid "You receive a friend suggestion"
+msgstr "Du einen Kontaktvorschlag erhältst"
 
-#: ../../Zotlabs/Module/Import.php:467
-#: ../../extend/addon/addon/diaspora/import_diaspora.php:142
-msgid "Import completed."
-msgstr "Import abgeschlossen."
+#: ../../Zotlabs/Module/Settings/Channel.php:540
+msgid "You are tagged in a post"
+msgstr "Du in einem Beitrag erwähnt wurdest"
 
-#: ../../Zotlabs/Module/Import.php:488
-msgid "You must be logged in to use this feature."
-msgstr "Du musst angemeldet sein um diese Funktion zu nutzen."
+#: ../../Zotlabs/Module/Settings/Channel.php:541
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
 
-#: ../../Zotlabs/Module/Import.php:493
-msgid "Import Channel"
-msgstr "Kanal importieren"
+#: ../../Zotlabs/Module/Settings/Channel.php:543
+msgid "Someone likes your post/comment"
+msgstr "Jemand mag Ihren Beitrag/Kommentar"
 
-#: ../../Zotlabs/Module/Import.php:494
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You"
-" may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file."
-msgstr "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren."
+#: ../../Zotlabs/Module/Settings/Channel.php:546
+msgid "Show visual notifications including:"
+msgstr "Visuelle Benachrichtigungen anzeigen für:"
 
-#: ../../Zotlabs/Module/Import.php:496
-msgid "Or provide the old server/hub details"
-msgstr "Oder gib die Details Deines bisherigen $Projectname-Hubs ein"
+#: ../../Zotlabs/Module/Settings/Channel.php:548
+msgid "Unseen grid activity"
+msgstr "Ungesehene Netzwerk-Aktivität"
 
-#: ../../Zotlabs/Module/Import.php:497
-msgid "Your old identity address (xyz@example.com)"
-msgstr "Bisherige Kanal-Adresse (xyz@example.com)"
+#: ../../Zotlabs/Module/Settings/Channel.php:549
+msgid "Unseen channel activity"
+msgstr "Ungesehene Kanal-Aktivität"
 
-#: ../../Zotlabs/Module/Import.php:498
-msgid "Your old login email address"
-msgstr "Deine alte Login-E-Mail-Adresse"
+#: ../../Zotlabs/Module/Settings/Channel.php:550
+msgid "Unseen private messages"
+msgstr "Ungelesene persönliche Nachrichten"
 
-#: ../../Zotlabs/Module/Import.php:499
-msgid "Your old login password"
-msgstr "Dein altes Passwort"
+#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Zotlabs/Module/Settings/Channel.php:556
+#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../addon/jappixmini/jappixmini.php:343
+msgid "Recommended"
+msgstr "Empfohlen"
 
-#: ../../Zotlabs/Module/Import.php:500
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be"
-" able to post from either location, but only one can be marked as the "
-"primary location for files, photos, and media."
-msgstr "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige $Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein."
+#: ../../Zotlabs/Module/Settings/Channel.php:551
+msgid "Upcoming events"
+msgstr "Baldige Termine"
 
-#: ../../Zotlabs/Module/Import.php:501
-msgid "Make this hub my primary location"
-msgstr "Dieser $Pojectname-Hub ist mein primärer Hub."
+#: ../../Zotlabs/Module/Settings/Channel.php:552
+msgid "Events today"
+msgstr "Heutige Termine"
 
-#: ../../Zotlabs/Module/Import.php:502
-msgid "Move this channel (disable all previous locations)"
-msgstr "Verschiebe diesen Kanal (deaktiviere alle vorherigen Adressen/Klone)"
+#: ../../Zotlabs/Module/Settings/Channel.php:553
+msgid "Upcoming birthdays"
+msgstr "Baldige Geburtstage"
 
-#: ../../Zotlabs/Module/Import.php:503
-msgid "Import a few months of posts if possible (limited by available memory"
-msgstr "Importiere die Beiträge einiger Monate, sofern möglich (beschränkt durch verfügbaren Speicher)"
+#: ../../Zotlabs/Module/Settings/Channel.php:553
+msgid "Not available in all themes"
+msgstr "Nicht in allen Themes verfügbar"
 
-#: ../../Zotlabs/Module/Import.php:504
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
-msgstr "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen."
+#: ../../Zotlabs/Module/Settings/Channel.php:554
+msgid "System (personal) notifications"
+msgstr "System – (persönliche) Benachrichtigungen"
 
-#: ../../Zotlabs/Module/Lockview.php:75
-msgid "Remote privacy information not available."
-msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
+#: ../../Zotlabs/Module/Settings/Channel.php:555
+msgid "System info messages"
+msgstr "System – Info-Nachrichten"
 
-#: ../../Zotlabs/Module/Lockview.php:96
-msgid "Visible to:"
-msgstr "Sichtbar für:"
+#: ../../Zotlabs/Module/Settings/Channel.php:556
+msgid "System critical alerts"
+msgstr "System – kritische Warnungen"
 
-#: ../../Zotlabs/Module/Magic.php:71
-msgid "Hub not found."
-msgstr "Server nicht gefunden."
+#: ../../Zotlabs/Module/Settings/Channel.php:557
+msgid "New connections"
+msgstr "Neue Verbindungen"
 
-#: ../../Zotlabs/Module/Mitem.php:52
-msgid "Unable to create element."
-msgstr "Element konnte nicht erstellt werden."
+#: ../../Zotlabs/Module/Settings/Channel.php:558
+msgid "System Registrations"
+msgstr "System – Registrierungen"
 
-#: ../../Zotlabs/Module/Mitem.php:76
-msgid "Unable to update menu element."
-msgstr "Kann Menü-Element nicht aktualisieren."
+#: ../../Zotlabs/Module/Settings/Channel.php:559
+msgid ""
+"Also show new wall posts, private messages and connections under Notices"
+msgstr "Neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen anzeigen"
 
-#: ../../Zotlabs/Module/Mitem.php:92
-msgid "Unable to add menu element."
-msgstr "Kann Menü-Bestandteil nicht hinzufügen."
+#: ../../Zotlabs/Module/Settings/Channel.php:561
+msgid "Notify me of events this many days in advance"
+msgstr "Benachrichtige mich zu Terminen so viele Tage im Voraus"
 
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
-msgid "Menu Item Permissions"
-msgstr "Zugriffsrechte des Menü-Elements"
+#: ../../Zotlabs/Module/Settings/Channel.php:561
+msgid "Must be greater than 0"
+msgstr "Muss größer als 0 sein"
 
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:510
-msgid "(click to open/close)"
-msgstr "(zum öffnen/schließen anklicken)"
+#: ../../Zotlabs/Module/Settings/Channel.php:567
+msgid "Advanced Account/Page Type Settings"
+msgstr "Erweiterte Account- und Seitenart-Einstellungen"
 
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
-msgid "Link Name"
-msgstr "Name des Links"
+#: ../../Zotlabs/Module/Settings/Channel.php:568
+msgid "Change the behaviour of this account for special situations"
+msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
 
-#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
-msgid "Link or Submenu Target"
-msgstr "Ziel des Links oder Untermenüs"
+#: ../../Zotlabs/Module/Settings/Channel.php:570
+msgid "Miscellaneous Settings"
+msgstr "Sonstige Einstellungen"
 
-#: ../../Zotlabs/Module/Mitem.php:161
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen."
+#: ../../Zotlabs/Module/Settings/Channel.php:571
+msgid "Default photo upload folder"
+msgstr "Voreingestellter Ordner für hochgeladene Fotos"
 
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
-msgid "Use magic-auth if available"
-msgstr "Magic-Auth verwenden, falls verfügbar"
+#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Zotlabs/Module/Settings/Channel.php:572
+msgid "%Y - current year, %m -  current month"
+msgstr "%Y - aktuelles Jahr, %m -  aktueller Monat"
 
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
-msgid "Open link in new window"
-msgstr "Öffne Link in neuem Fenster"
+#: ../../Zotlabs/Module/Settings/Channel.php:572
+msgid "Default file upload folder"
+msgstr "Voreingestellter Ordner für hochgeladene Dateien"
 
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
-msgid "Order in list"
-msgstr "Reihenfolge in der Liste"
+#: ../../Zotlabs/Module/Settings/Channel.php:574
+msgid "Personal menu to display in your channel pages"
+msgstr "Eigenes Menü zur Anzeige auf den Seiten deines Kanals"
 
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
+#: ../../Zotlabs/Module/Settings/Channel.php:576
+msgid "Remove this channel."
+msgstr "Diesen Kanal löschen"
 
-#: ../../Zotlabs/Module/Mitem.php:165
-msgid "Submit and finish"
-msgstr "Absenden und fertigstellen"
+#: ../../Zotlabs/Module/Settings/Channel.php:577
+msgid "Firefox Share $Projectname provider"
+msgstr "$Projectname-Provider für Firefox Share"
 
-#: ../../Zotlabs/Module/Mitem.php:166
-msgid "Submit and continue"
-msgstr "Absenden und fortfahren"
+#: ../../Zotlabs/Module/Settings/Channel.php:578
+msgid "Start calendar week on Monday"
+msgstr "Beginne die kalendarische Woche am Montag"
 
-#: ../../Zotlabs/Module/Mitem.php:174
-msgid "Menu:"
-msgstr "Menü:"
+#: ../../Zotlabs/Module/Settings/Features.php:45
+msgid "Additional Features"
+msgstr "Zusätzliche Funktionen"
 
-#: ../../Zotlabs/Module/Mitem.php:177
-msgid "Link Target"
-msgstr "Ziel des Links"
+#: ../../Zotlabs/Module/Settings/Tokens.php:31
+#, php-format
+msgid "This channel is limited to %d tokens"
+msgstr "Dieser Kanal ist auf %d Token begrenzt"
 
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Edit menu"
-msgstr "Menü bearbeiten"
+#: ../../Zotlabs/Module/Settings/Tokens.php:37
+msgid "Name and Password are required."
+msgstr "Name und Passwort sind erforderlich."
 
-#: ../../Zotlabs/Module/Mitem.php:183
-msgid "Edit element"
-msgstr "Bestandteil bearbeiten"
+#: ../../Zotlabs/Module/Settings/Tokens.php:77
+msgid "Token saved."
+msgstr "Token gespeichert."
 
-#: ../../Zotlabs/Module/Mitem.php:184
-msgid "Drop element"
-msgstr "Bestandteil löschen"
+#: ../../Zotlabs/Module/Settings/Tokens.php:113
+msgid ""
+"Use this form to create temporary access identifiers to share things with "
+"non-members. These identities may be used in Access Control Lists and "
+"visitors may login using these credentials to access private content."
+msgstr "Mit diesem Formular kannst Du temporäre Zugangs-IDs anlegen, um Inhalte mit Nicht-Mitgliedern zu teilen. Die IDs können in Berechtigungslisten (ACLs) verwendet werden, und Besucher können sich damit einloggen, um auf private Inhalte zuzugreifen."
 
-#: ../../Zotlabs/Module/Mitem.php:185
-msgid "New element"
-msgstr "Neues Bestandteil"
+#: ../../Zotlabs/Module/Settings/Tokens.php:115
+msgid ""
+"You may also provide <em>dropbox</em> style access links to friends and "
+"associates by adding the Login Password to any specific site URL as shown. "
+"Examples:"
+msgstr "Du kannst auch <em>Dropbox</em>-ähnliche Zugriffslinks an Andere weitergeben, indem du das Login-Passwort an eine entsprechende URL anhängst wie nachfolgend gezeigt. Beispiele:"
 
-#: ../../Zotlabs/Module/Mitem.php:186
-msgid "Edit this menu container"
-msgstr "Diesen Menü-Container bearbeiten"
+#: ../../Zotlabs/Module/Settings/Tokens.php:150
+#: ../../Zotlabs/Widget/Settings_menu.php:90
+msgid "Guest Access Tokens"
+msgstr "Gastzugangstoken"
 
-#: ../../Zotlabs/Module/Mitem.php:187
-msgid "Add menu element"
-msgstr "Menüelement hinzufügen"
+#: ../../Zotlabs/Module/Settings/Tokens.php:157
+msgid "Login Name"
+msgstr "Anmeldename"
 
-#: ../../Zotlabs/Module/Mitem.php:188
-msgid "Delete this menu item"
-msgstr "Lösche dieses Menü-Bestandteil"
+#: ../../Zotlabs/Module/Settings/Tokens.php:158
+msgid "Login Password"
+msgstr "Anmeldepasswort"
 
-#: ../../Zotlabs/Module/Mitem.php:189
-msgid "Edit this menu item"
-msgstr "Bearbeite dieses Menü-Bestandteil"
+#: ../../Zotlabs/Module/Settings/Tokens.php:159
+msgid "Expires (yyyy-mm-dd)"
+msgstr "Läuft ab (jjjj-mm-tt)"
 
-#: ../../Zotlabs/Module/Mitem.php:206
-msgid "Menu item not found."
-msgstr "Menü-Bestandteil nicht gefunden."
+#: ../../Zotlabs/Module/Settings/Tokens.php:160
+#: ../../Zotlabs/Module/Connedit.php:885
+msgid "Their Settings"
+msgstr "Deren Einstellungen"
 
-#: ../../Zotlabs/Module/Mitem.php:219
-msgid "Menu item deleted."
-msgstr "Menü-Bestandteil gelöscht."
+#: ../../Zotlabs/Module/Settings/Account.php:20
+msgid "Not valid email."
+msgstr "Keine gültige E-Mail Adresse."
 
-#: ../../Zotlabs/Module/Mitem.php:221
-msgid "Menu item could not be deleted."
-msgstr "Menü-Bestandteil kann nicht gelöscht werden."
+#: ../../Zotlabs/Module/Settings/Account.php:23
+msgid "Protected email address. Cannot change to that email."
+msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
 
-#: ../../Zotlabs/Module/Mitem.php:228
-msgid "Edit Menu Element"
-msgstr "Bearbeite Menü-Bestandteil"
+#: ../../Zotlabs/Module/Settings/Account.php:32
+msgid "System failure storing new email. Please try again."
+msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
 
-#: ../../Zotlabs/Module/Mitem.php:238
-msgid "Link text"
-msgstr "Link Text"
+#: ../../Zotlabs/Module/Settings/Account.php:40
+msgid "Technical skill level updated"
+msgstr "Technische Qualifikationsstufe aktualisiert"
 
-#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:54
-msgid "App installed."
-msgstr "App installiert."
+#: ../../Zotlabs/Module/Settings/Account.php:56
+msgid "Password verification failed."
+msgstr "Passwortüberprüfung fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Appman.php:47
-msgid "Malformed app."
-msgstr "Fehlerhafte App."
+#: ../../Zotlabs/Module/Settings/Account.php:63
+msgid "Passwords do not match. Password unchanged."
+msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
 
-#: ../../Zotlabs/Module/Appman.php:110
-msgid "Embed code"
-msgstr "Code einbetten"
+#: ../../Zotlabs/Module/Settings/Account.php:67
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
 
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Edit App"
-msgstr "App bearbeiten"
+#: ../../Zotlabs/Module/Settings/Account.php:81
+msgid "Password changed."
+msgstr "Kennwort geändert."
 
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Create App"
-msgstr "App erstellen"
+#: ../../Zotlabs/Module/Settings/Account.php:83
+msgid "Password update failed. Please try again."
+msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
 
-#: ../../Zotlabs/Module/Appman.php:121
-msgid "Name of app"
-msgstr "Name der App"
+#: ../../Zotlabs/Module/Settings/Account.php:112
+msgid "Account Settings"
+msgstr "Konto-Einstellungen"
 
-#: ../../Zotlabs/Module/Appman.php:121 ../../Zotlabs/Module/Appman.php:122
-#: ../../Zotlabs/Module/Profiles.php:744 ../../Zotlabs/Module/Profiles.php:748
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../include/datetime.php:259
-msgid "Required"
-msgstr "Benötigt"
+#: ../../Zotlabs/Module/Settings/Account.php:113
+msgid "Current Password"
+msgstr "Aktuelles Passwort"
 
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Location (URL) of app"
-msgstr "Ort (URL) der App"
+#: ../../Zotlabs/Module/Settings/Account.php:114
+msgid "Enter New Password"
+msgstr "Gib ein neues Passwort ein"
 
-#: ../../Zotlabs/Module/Appman.php:123 ../../Zotlabs/Module/Events.php:473
-#: ../../Zotlabs/Module/Rbmark.php:101
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:838
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:173
-msgid "Description"
-msgstr "Beschreibung"
+#: ../../Zotlabs/Module/Settings/Account.php:115
+msgid "Confirm New Password"
+msgstr "Bestätige das neue Passwort"
 
-#: ../../Zotlabs/Module/Appman.php:124
-msgid "Photo icon URL"
-msgstr "URL zum Icon"
+#: ../../Zotlabs/Module/Settings/Account.php:115
+msgid "Leave password fields blank unless changing"
+msgstr "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern"
+
+#: ../../Zotlabs/Module/Settings/Account.php:116
+msgid "Your technical skill level"
+msgstr "Deine technische Qualifikationsstufe"
 
-#: ../../Zotlabs/Module/Appman.php:124
-msgid "80 x 80 pixels - optional"
-msgstr "80 x 80 Pixel – optional"
+#: ../../Zotlabs/Module/Settings/Account.php:116
+msgid "Used to provide a member experience matched to your comfort level"
+msgstr "Dies wird verwendet, um Dir eine Benutzererfahrung  passend zu Deiner technischen Qualifikationsstufe zu bieten."
 
-#: ../../Zotlabs/Module/Appman.php:125
-msgid "Categories (optional, comma separated list)"
-msgstr "Kategorien (optional, kommagetrennte Liste)"
+#: ../../Zotlabs/Module/Settings/Account.php:120
+#: ../../Zotlabs/Module/Removeaccount.php:61
+msgid "Remove Account"
+msgstr "Konto entfernen"
 
-#: ../../Zotlabs/Module/Appman.php:126
-msgid "Version ID"
-msgstr "Versions-ID"
+#: ../../Zotlabs/Module/Settings/Account.php:121
+msgid "Remove this account including all its channels"
+msgstr "Dieses Konto inklusive all seiner Kanäle löschen"
 
-#: ../../Zotlabs/Module/Appman.php:127
-msgid "Price of app"
-msgstr "Preis der App"
+#: ../../Zotlabs/Module/Settings/Featured.php:20
+msgid "Affinity Slider settings updated."
+msgstr "Die Beziehungsgrad-Schieberegler-Einstellungen wurden aktualisiert."
 
-#: ../../Zotlabs/Module/Appman.php:128
-msgid "Location (URL) to purchase app"
-msgstr "Ort (URL), um die App zu kaufen"
+#: ../../Zotlabs/Module/Settings/Featured.php:34
+msgid "No feature settings configured"
+msgstr "Keine Funktions-Einstellungen konfiguriert"
 
-#: ../../Zotlabs/Module/Ratings.php:70
-msgid "No ratings"
-msgstr "Keine Bewertungen"
+#: ../../Zotlabs/Module/Settings/Featured.php:41
+msgid "Default maximum affinity level"
+msgstr "Voreinstellung für maximalen Beziehungsgrad"
 
-#: ../../Zotlabs/Module/Ratings.php:98
-msgid "Rating: "
-msgstr "Bewertung: "
+#: ../../Zotlabs/Module/Settings/Featured.php:46
+msgid "Default minimum affinity level"
+msgstr "Voreinstellung für minimalen Beziehungsgrad"
 
-#: ../../Zotlabs/Module/Ratings.php:99
-msgid "Website: "
-msgstr "Webseite: "
+#: ../../Zotlabs/Module/Settings/Featured.php:50
+msgid "Affinity Slider Settings"
+msgstr "Beziehungsgrad-Schieberegler-Einstellungen"
 
-#: ../../Zotlabs/Module/Ratings.php:101
-msgid "Description: "
-msgstr "Beschreibung: "
+#: ../../Zotlabs/Module/Settings/Featured.php:60
+msgid "Feature/Addon Settings"
+msgstr "Funktions-/Addon-Einstellungen"
 
-#: ../../Zotlabs/Module/Attach.php:13
-msgid "Item not available."
-msgstr "Element nicht verfügbar."
+#: ../../Zotlabs/Module/Settings/Display.php:145
+msgid "No special theme for mobile devices"
+msgstr "Keine spezielle Theme für mobile Geräte"
 
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
+#: ../../Zotlabs/Module/Settings/Display.php:148
 #, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr "%1$s ist %2$s"
+msgid "%s - (Experimental)"
+msgstr "%s – (experimentell)"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234
-msgid "Mood"
-msgstr "Laune"
+#: ../../Zotlabs/Module/Settings/Display.php:198
+msgid "Display Settings"
+msgstr "Anzeige-Einstellungen"
 
-#: ../../Zotlabs/Module/Mood.php:136
-msgid "Set your current mood and tell your friends"
-msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"
+#: ../../Zotlabs/Module/Settings/Display.php:199
+msgid "Theme Settings"
+msgstr "Theme-Einstellungen"
 
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:38
-msgid "No more system notifications."
-msgstr "Keine System-Benachrichtigungen mehr."
+#: ../../Zotlabs/Module/Settings/Display.php:200
+msgid "Custom Theme Settings"
+msgstr "Benutzerdefinierte Theme-Einstellungen"
 
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:42
-msgid "System Notifications"
-msgstr "System-Benachrichtigungen"
+#: ../../Zotlabs/Module/Settings/Display.php:201
+msgid "Content Settings"
+msgstr "Inhaltseinstellungen"
 
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
-#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:660
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62
-msgid "Profile not found."
-msgstr "Profil nicht gefunden."
+#: ../../Zotlabs/Module/Settings/Display.php:207
+msgid "Display Theme:"
+msgstr "Anzeige-Theme:"
 
-#: ../../Zotlabs/Module/Profiles.php:44
-msgid "Profile deleted."
-msgstr "Profil gelöscht."
+#: ../../Zotlabs/Module/Settings/Display.php:208
+msgid "Select scheme"
+msgstr "Schema wählen"
 
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
-msgid "Profile-"
-msgstr "Profil-"
+#: ../../Zotlabs/Module/Settings/Display.php:210
+msgid "Mobile Theme:"
+msgstr "Mobile Theme:"
 
-#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
-msgid "New profile created."
-msgstr "Neues Profil erstellt."
+#: ../../Zotlabs/Module/Settings/Display.php:211
+msgid "Preload images before rendering the page"
+msgstr "Bilder im voraus laden, bevor die Seite angezeigt wird"
 
-#: ../../Zotlabs/Module/Profiles.php:111
-msgid "Profile unavailable to clone."
-msgstr "Profil kann nicht geklont werden."
+#: ../../Zotlabs/Module/Settings/Display.php:211
+msgid ""
+"The subjective page load time will be longer but the page will be ready when"
+" displayed"
+msgstr "Die empfundene Ladezeit wird sich erhöhen, aber dafür ist das Layout stabil, sobald eine Seite angezeigt wird"
 
-#: ../../Zotlabs/Module/Profiles.php:146
-msgid "Profile unavailable to export."
-msgstr "Dieses Profil kann nicht exportiert werden."
+#: ../../Zotlabs/Module/Settings/Display.php:212
+msgid "Enable user zoom on mobile devices"
+msgstr "Zoom auf Mobilgeräten aktivieren"
 
-#: ../../Zotlabs/Module/Profiles.php:252
-msgid "Profile Name is required."
-msgstr "Profil-Name erforderlich."
+#: ../../Zotlabs/Module/Settings/Display.php:213
+msgid "Update browser every xx seconds"
+msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../Zotlabs/Module/Profiles.php:460
-msgid "Marital Status"
-msgstr "Familienstand"
+#: ../../Zotlabs/Module/Settings/Display.php:213
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Minimum 10 Sekunden, kein Maximum"
 
-#: ../../Zotlabs/Module/Profiles.php:464
-msgid "Romantic Partner"
-msgstr "Romantische Partner"
+#: ../../Zotlabs/Module/Settings/Display.php:214
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:"
 
-#: ../../Zotlabs/Module/Profiles.php:468 ../../Zotlabs/Module/Profiles.php:771
-msgid "Likes"
-msgstr "Gefällt"
+#: ../../Zotlabs/Module/Settings/Display.php:214
+msgid "Maximum of 100 items"
+msgstr "Maximum: 100 Beiträge"
 
-#: ../../Zotlabs/Module/Profiles.php:472 ../../Zotlabs/Module/Profiles.php:772
-msgid "Dislikes"
-msgstr "Gefällt nicht"
+#: ../../Zotlabs/Module/Settings/Display.php:215
+msgid "Show emoticons (smilies) as images"
+msgstr "Emoticons (Smilies) als Bilder anzeigen"
 
-#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:779
-msgid "Work/Employment"
-msgstr "Arbeit/Anstellung"
+#: ../../Zotlabs/Module/Settings/Display.php:216
+msgid "Manual conversation updates"
+msgstr "Manuelle Konversationsaktualisierung"
 
-#: ../../Zotlabs/Module/Profiles.php:479
-msgid "Religion"
-msgstr "Religion"
+#: ../../Zotlabs/Module/Settings/Display.php:216
+msgid "Default is on, turning this off may increase screen jumping"
+msgstr "Voreinstellung ist An, dies abzuschalten kann das unerwartete Springen der Seitenanzeige erhöhen."
 
-#: ../../Zotlabs/Module/Profiles.php:483
-msgid "Political Views"
-msgstr "Politische Ansichten"
+#: ../../Zotlabs/Module/Settings/Display.php:217
+msgid "Link post titles to source"
+msgstr "Beitragstitel zum Originalbeitrag verlinken"
 
-#: ../../Zotlabs/Module/Profiles.php:487
-#: ../../extend/addon/addon/openid/MysqlProvider.php:74
-msgid "Gender"
-msgstr "Geschlecht"
+#: ../../Zotlabs/Module/Settings/Display.php:218
+msgid "System Page Layout Editor - (advanced)"
+msgstr "System-Seitenlayout-Editor (für Experten)"
 
-#: ../../Zotlabs/Module/Profiles.php:491
-msgid "Sexual Preference"
-msgstr "Sexuelle Orientierung"
+#: ../../Zotlabs/Module/Settings/Display.php:221
+msgid "Use blog/list mode on channel page"
+msgstr "Blog-/Listenmodus auf der Kanalseite verwenden"
 
-#: ../../Zotlabs/Module/Profiles.php:495
-msgid "Homepage"
-msgstr "Webseite"
+#: ../../Zotlabs/Module/Settings/Display.php:221
+#: ../../Zotlabs/Module/Settings/Display.php:222
+msgid "(comments displayed separately)"
+msgstr "(Kommentare werden separat angezeigt)"
 
-#: ../../Zotlabs/Module/Profiles.php:499
-msgid "Interests"
-msgstr "Hobbys/Interessen"
+#: ../../Zotlabs/Module/Settings/Display.php:222
+msgid "Use blog/list mode on grid page"
+msgstr "Blog-/Listenmodus auf der Netzwerkseite verwenden"
 
-#: ../../Zotlabs/Module/Profiles.php:595
-msgid "Profile updated."
-msgstr "Profil aktualisiert."
+#: ../../Zotlabs/Module/Settings/Display.php:223
+msgid "Channel page max height of content (in pixels)"
+msgstr "Maximale Höhe von Beitragsblöcken auf der Kanalseite (in Pixeln)"
 
-#: ../../Zotlabs/Module/Profiles.php:679
-msgid "Hide your connections list from viewers of this profile"
-msgstr "Deine Verbindungen vor Betrachtern dieses Profils verbergen"
+#: ../../Zotlabs/Module/Settings/Display.php:223
+#: ../../Zotlabs/Module/Settings/Display.php:224
+msgid "click to expand content exceeding this height"
+msgstr "Blöcke, deren Inhalt diese Höhe überschreitet, können per Klick vergrößert werden."
 
-#: ../../Zotlabs/Module/Profiles.php:721
-msgid "Edit Profile Details"
-msgstr "Bearbeite Profil-Details"
+#: ../../Zotlabs/Module/Settings/Display.php:224
+msgid "Grid page max height of content (in pixels)"
+msgstr "Maximale Höhe (in Pixel) des Inhalts der Netzwerkseite"
 
-#: ../../Zotlabs/Module/Profiles.php:723
-msgid "View this profile"
-msgstr "Dieses Profil ansehen"
+#: ../../Zotlabs/Module/Settings/Oauth.php:34
+msgid "Name is required"
+msgstr "Name ist erforderlich"
 
-#: ../../Zotlabs/Module/Profiles.php:724 ../../Zotlabs/Module/Profiles.php:806
-#: ../../include/channel.php:1066
-msgid "Edit visibility"
-msgstr "Sichtbarkeit bearbeiten"
+#: ../../Zotlabs/Module/Settings/Oauth.php:38
+msgid "Key and Secret are required"
+msgstr "Schlüssel und Geheimnis werden benötigt"
 
-#: ../../Zotlabs/Module/Profiles.php:725
-msgid "Profile Tools"
-msgstr "Profilwerkzeuge"
+#: ../../Zotlabs/Module/Settings/Oauth.php:86
+#: ../../Zotlabs/Module/Settings/Oauth.php:112
+#: ../../Zotlabs/Module/Settings/Oauth.php:148
+msgid "Add application"
+msgstr "Anwendung hinzufügen"
 
-#: ../../Zotlabs/Module/Profiles.php:726
-msgid "Change cover photo"
-msgstr "Titelbild ändern"
+#: ../../Zotlabs/Module/Settings/Oauth.php:89
+msgid "Name of application"
+msgstr "Name der Anwendung"
 
-#: ../../Zotlabs/Module/Profiles.php:727 ../../include/channel.php:1037
-msgid "Change profile photo"
-msgstr "Profilfoto ändern"
+#: ../../Zotlabs/Module/Settings/Oauth.php:90
+#: ../../Zotlabs/Module/Settings/Oauth.php:116
+#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:775
+msgid "Consumer Key"
+msgstr "Consumer Key"
 
-#: ../../Zotlabs/Module/Profiles.php:728
-msgid "Create a new profile using these settings"
-msgstr "Neues Profil anlegen und diese Einstellungen übernehmen"
+#: ../../Zotlabs/Module/Settings/Oauth.php:90
+#: ../../Zotlabs/Module/Settings/Oauth.php:91
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"
 
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Clone this profile"
-msgstr "Dieses Profil klonen"
+#: ../../Zotlabs/Module/Settings/Oauth.php:91
+#: ../../Zotlabs/Module/Settings/Oauth.php:117
+#: ../../addon/statusnet/statusnet.php:892 ../../addon/twitter/twitter.php:776
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
 
-#: ../../Zotlabs/Module/Profiles.php:730
-msgid "Delete this profile"
-msgstr "Dieses Profil löschen"
+#: ../../Zotlabs/Module/Settings/Oauth.php:92
+#: ../../Zotlabs/Module/Settings/Oauth.php:118
+msgid "Redirect"
+msgstr "Umleitung"
 
-#: ../../Zotlabs/Module/Profiles.php:731
-msgid "Add profile things"
-msgstr "Sachen zum Profil hinzufügen"
+#: ../../Zotlabs/Module/Settings/Oauth.php:92
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires "
+"this"
+msgstr "Umleitungs-URl – lasse das leer, solange Deine Anwendung es nicht explizit erfordert"
 
-#: ../../Zotlabs/Module/Profiles.php:732 ../../include/conversation.php:1715
-#: ../../include/widgets.php:105
-msgid "Personal"
-msgstr "Persönlich"
+#: ../../Zotlabs/Module/Settings/Oauth.php:93
+#: ../../Zotlabs/Module/Settings/Oauth.php:119
+msgid "Icon url"
+msgstr "Symbol-URL"
 
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Relation"
-msgstr "Beziehung"
+#: ../../Zotlabs/Module/Settings/Oauth.php:93
+#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+msgid "Optional"
+msgstr "Optional"
 
-#: ../../Zotlabs/Module/Profiles.php:735 ../../include/datetime.php:55
-msgid "Miscellaneous"
-msgstr "Verschiedenes"
+#: ../../Zotlabs/Module/Settings/Oauth.php:104
+msgid "Application not found."
+msgstr "Die Anwendung wurde nicht gefunden."
 
-#: ../../Zotlabs/Module/Profiles.php:737
-msgid "Import profile from file"
-msgstr "Profil aus einer Datei importieren"
+#: ../../Zotlabs/Module/Settings/Oauth.php:147
+msgid "Connected Apps"
+msgstr "Verbundene Apps"
 
-#: ../../Zotlabs/Module/Profiles.php:738
-msgid "Export profile to file"
-msgstr "Profil in eine Datei exportieren"
+#: ../../Zotlabs/Module/Settings/Oauth.php:151
+msgid "Client key starts with"
+msgstr "Client Key beginnt mit"
 
-#: ../../Zotlabs/Module/Profiles.php:739
-msgid "Your gender"
-msgstr "Dein Geschlecht"
+#: ../../Zotlabs/Module/Settings/Oauth.php:152
+msgid "No name"
+msgstr "Kein Name"
 
-#: ../../Zotlabs/Module/Profiles.php:740
-msgid "Marital status"
-msgstr "Familienstand"
+#: ../../Zotlabs/Module/Settings/Oauth.php:153
+msgid "Remove authorization"
+msgstr "Authorisierung aufheben"
 
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "Sexual preference"
-msgstr "Sexuelle Orientierung"
+#: ../../Zotlabs/Module/Embedphotos.php:140
+#: ../../Zotlabs/Module/Photos.php:751 ../../Zotlabs/Module/Photos.php:1290
+#: ../../Zotlabs/Widget/Album.php:78
+msgid "View Photo"
+msgstr "Foto ansehen"
 
-#: ../../Zotlabs/Module/Profiles.php:744
-msgid "Profile name"
-msgstr "Profilname"
+#: ../../Zotlabs/Module/Embedphotos.php:146
+#: ../../Zotlabs/Module/Photos.php:757 ../../Zotlabs/Module/Photos.php:1213
+#: ../../Zotlabs/Lib/Apps.php:571 ../../Zotlabs/Lib/Apps.php:649
+#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Widget/Album.php:84
+#: ../../addon/cdav/Mod_Cdav.php:745 ../../addon/cdav/Mod_Cdav.php:746
+#: ../../addon/cdav/Mod_Cdav.php:753 ../../include/conversation.php:1110
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: ../../Zotlabs/Module/Profiles.php:746
-msgid "This is your default profile."
-msgstr "Das ist Dein Standardprofil."
+#: ../../Zotlabs/Module/Embedphotos.php:156
+#: ../../Zotlabs/Module/Photos.php:782 ../../Zotlabs/Widget/Album.php:95
+msgid "Edit Album"
+msgstr "Album bearbeiten"
 
-#: ../../Zotlabs/Module/Profiles.php:748
-msgid "Your full name"
-msgstr "Dein voller Name"
+#: ../../Zotlabs/Module/Embedphotos.php:158
+#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1321
+#: ../../Zotlabs/Module/Profile_photo.php:423
+#: ../../Zotlabs/Module/Cover_photo.php:361
+#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:334
+#: ../../Zotlabs/Widget/Album.php:97 ../../addon/cdav/include/widgets.php:132
+#: ../../addon/cdav/include/widgets.php:168
+msgid "Upload"
+msgstr "Hochladen"
 
-#: ../../Zotlabs/Module/Profiles.php:749
-msgid "Title/Description"
-msgstr "Titel/Beschreibung"
+#: ../../Zotlabs/Module/Achievements.php:38
+msgid "Some blurb about what to do when you're new here"
+msgstr "Ein Hinweis, was man tun kann, wenn man neu hier ist"
 
-#: ../../Zotlabs/Module/Profiles.php:752
-msgid "Street address"
-msgstr "Straße und Hausnummer"
+#: ../../Zotlabs/Module/Thing.php:114
+msgid "Thing updated"
+msgstr "Sache aktualisiert"
 
-#: ../../Zotlabs/Module/Profiles.php:753
-msgid "Locality/City"
-msgstr "Wohnort"
+#: ../../Zotlabs/Module/Thing.php:166
+msgid "Object store: failed"
+msgstr "Speichern des Objekts fehlgeschlagen"
 
-#: ../../Zotlabs/Module/Profiles.php:754
-msgid "Region/State"
-msgstr "Region/Bundesstaat"
+#: ../../Zotlabs/Module/Thing.php:170
+msgid "Thing added"
+msgstr "Sache hinzugefügt"
 
-#: ../../Zotlabs/Module/Profiles.php:755
-msgid "Postal/Zip code"
-msgstr "Postleitzahl"
+#: ../../Zotlabs/Module/Thing.php:196
+#, php-format
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../Zotlabs/Module/Profiles.php:761
-msgid "Who (if applicable)"
-msgstr "Wer (falls anwendbar)"
+#: ../../Zotlabs/Module/Thing.php:259
+msgid "Show Thing"
+msgstr "Sache anzeigen"
 
-#: ../../Zotlabs/Module/Profiles.php:761
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
+#: ../../Zotlabs/Module/Thing.php:266
+msgid "item not found."
+msgstr "Eintrag nicht gefunden"
 
-#: ../../Zotlabs/Module/Profiles.php:762
-msgid "Since (date)"
-msgstr "Seit (Datum)"
+#: ../../Zotlabs/Module/Thing.php:299
+msgid "Edit Thing"
+msgstr "Sache bearbeiten"
 
-#: ../../Zotlabs/Module/Profiles.php:765
-msgid "Tell us about yourself"
-msgstr "Erzähle uns ein wenig von Dir"
+#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:355
+msgid "Select a profile"
+msgstr "Wähle ein Profil"
 
-#: ../../Zotlabs/Module/Profiles.php:766
-#: ../../extend/addon/addon/openid/MysqlProvider.php:68
-msgid "Homepage URL"
-msgstr "Homepage-URL"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358
+msgid "Post an activity"
+msgstr "Aktivitätsnachricht senden"
 
-#: ../../Zotlabs/Module/Profiles.php:767
-msgid "Hometown"
-msgstr "Heimatort"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Nur an Betrachter des ausgewählten Profils senden"
 
-#: ../../Zotlabs/Module/Profiles.php:768
-msgid "Political views"
-msgstr "Politische Ansichten"
+#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:360
+msgid "Name of thing e.g. something"
+msgstr "Name der Sache, z. B. irgendwas"
 
-#: ../../Zotlabs/Module/Profiles.php:769
-msgid "Religious views"
-msgstr "Religiöse Ansichten"
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:361
+msgid "URL of thing (optional)"
+msgstr "URL der Sache (optional)"
 
-#: ../../Zotlabs/Module/Profiles.php:770
-msgid "Keywords used in directory listings"
-msgstr "Schlüsselwörter, die in Verzeichnis-Auflistungen verwendet werden"
+#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:362
+msgid "URL for photo of thing (optional)"
+msgstr "URL eines Fotos der Sache (optional)"
 
-#: ../../Zotlabs/Module/Profiles.php:770
-msgid "Example: fishing photography software"
-msgstr "Beispiel: Angeln Fotografie Software"
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363
+#: ../../Zotlabs/Module/Photos.php:647 ../../Zotlabs/Module/Photos.php:1011
+#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:233
+#: ../../Zotlabs/Module/Filestorage.php:152
+#: ../../include/acl_selectors.php:218
+msgid "Permissions"
+msgstr "Berechtigungen"
 
-#: ../../Zotlabs/Module/Profiles.php:773
-msgid "Musical interests"
-msgstr "Musikalische Interessen"
+#: ../../Zotlabs/Module/Thing.php:353
+msgid "Add Thing to your Profile"
+msgstr "Die Sache Deinem Profil hinzufügen"
 
-#: ../../Zotlabs/Module/Profiles.php:774
-msgid "Books, literature"
-msgstr "Bücher, Literatur"
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:38
+msgid "No more system notifications."
+msgstr "Keine System-Benachrichtigungen mehr."
 
-#: ../../Zotlabs/Module/Profiles.php:775
-msgid "Television"
-msgstr "Fernsehen"
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:42
+msgid "System Notifications"
+msgstr "System-Benachrichtigungen"
 
-#: ../../Zotlabs/Module/Profiles.php:776
-msgid "Film/Dance/Culture/Entertainment"
-msgstr "Film/Tanz/Kultur/Unterhaltung"
+#: ../../Zotlabs/Module/Follow.php:31
+msgid "Channel added."
+msgstr "Kanal hinzugefügt."
 
-#: ../../Zotlabs/Module/Profiles.php:777
-msgid "Hobbies/Interests"
-msgstr "Hobbys/Interessen"
+#: ../../Zotlabs/Module/Import.php:144
+#, php-format
+msgid "Your service plan only allows %d channels."
+msgstr "Dein Vertrag erlaubt nur %d Kanäle."
 
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Love/Romance"
-msgstr "Liebe/Romantik"
+#: ../../Zotlabs/Module/Import.php:158
+msgid "No channel. Import failed."
+msgstr "Kein Kanal. Import fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Profiles.php:780
-msgid "School/Education"
-msgstr "Schule/Ausbildung"
+#: ../../Zotlabs/Module/Import.php:466
+#: ../../addon/diaspora/import_diaspora.php:142
+msgid "Import completed."
+msgstr "Import abgeschlossen."
 
-#: ../../Zotlabs/Module/Profiles.php:781
-msgid "Contact information and social networks"
-msgstr "Kontaktinformation und soziale Netzwerke"
+#: ../../Zotlabs/Module/Import.php:494
+msgid "You must be logged in to use this feature."
+msgstr "Du musst angemeldet sein um diese Funktion zu nutzen."
 
-#: ../../Zotlabs/Module/Profiles.php:782
-msgid "My other channels"
-msgstr "Meine anderen Kanäle"
+#: ../../Zotlabs/Module/Import.php:499
+msgid "Import Channel"
+msgstr "Kanal importieren"
 
-#: ../../Zotlabs/Module/Profiles.php:802 ../../include/channel.php:1062
-msgid "Profile Image"
-msgstr "Profilfoto:"
+#: ../../Zotlabs/Module/Import.php:500
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You"
+" may retrieve the channel identity from the old server/hub via the network "
+"or provide an export file."
+msgstr "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren."
 
-#: ../../Zotlabs/Module/Profiles.php:812 ../../include/channel.php:1044
-#: ../../include/nav.php:105
-msgid "Edit Profiles"
-msgstr "Profile bearbeiten"
+#: ../../Zotlabs/Module/Import.php:502
+msgid "Or provide the old server/hub details"
+msgstr "Oder gib die Details Deines bisherigen $Projectname-Hubs ein"
 
-#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
-msgid "Authorize application connection"
-msgstr "Zugriff für die Anwendung autorisieren"
+#: ../../Zotlabs/Module/Import.php:503
+msgid "Your old identity address (xyz@example.com)"
+msgstr "Bisherige Kanal-Adresse (xyz@example.com)"
 
-#: ../../Zotlabs/Module/Api.php:73
-msgid "Return to your app and insert this Security Code:"
-msgstr "Gehen Sie zu Ihrer App zurück und tragen Sie diesen Sicherheitscode ein:"
+#: ../../Zotlabs/Module/Import.php:504
+msgid "Your old login email address"
+msgstr "Deine alte Login-E-Mail-Adresse"
 
-#: ../../Zotlabs/Module/Api.php:83
-msgid "Please login to continue."
-msgstr "Zum Weitermachen, bitte einloggen."
+#: ../../Zotlabs/Module/Import.php:505
+msgid "Your old login password"
+msgstr "Dein altes Passwort"
 
-#: ../../Zotlabs/Module/Api.php:95
+#: ../../Zotlabs/Module/Import.php:506
 msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be"
+" able to post from either location, but only one can be marked as the "
+"primary location for files, photos, and media."
+msgstr "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige $Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein."
 
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
-msgstr "Einladungslimit überschritten."
+#: ../../Zotlabs/Module/Import.php:507
+msgid "Make this hub my primary location"
+msgstr "Dieser $Pojectname-Hub ist mein primärer Hub."
 
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : Keine gültige Email Adresse."
+#: ../../Zotlabs/Module/Import.php:508
+msgid "Move this channel (disable all previous locations)"
+msgstr "Verschiebe diesen Kanal (deaktiviere alle vorherigen Adressen/Klone)"
 
-#: ../../Zotlabs/Module/Invite.php:67
-msgid "Please join us on $Projectname"
-msgstr "Schließe Dich uns auf $Projectname an!"
+#: ../../Zotlabs/Module/Import.php:509
+msgid "Import a few months of posts if possible (limited by available memory"
+msgstr "Importiere die Beiträge einiger Monate, sofern möglich (beschränkt durch verfügbaren Speicher)"
 
-#: ../../Zotlabs/Module/Invite.php:77
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines $Projectname-Servers."
+#: ../../Zotlabs/Module/Import.php:510
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen."
+
+#: ../../Zotlabs/Module/Rmagic.php:35
+msgid "Authentication failed."
+msgstr "Authentifizierung fehlgeschlagen."
+
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1984
+msgid "Remote Authentication"
+msgstr "Entfernte Authentifizierung"
 
-#: ../../Zotlabs/Module/Invite.php:82
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Nachricht konnte nicht zugestellt werden."
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1985
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
 
-#: ../../Zotlabs/Module/Invite.php:86
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d Nachricht gesendet."
-msgstr[1] "%d Nachrichten gesendet."
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1986
+msgid "Authenticate"
+msgstr "Authentifizieren"
 
-#: ../../Zotlabs/Module/Invite.php:105
-msgid "You have no more invitations available"
-msgstr "Du hast keine weiteren verfügbare Einladungen"
+#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:31
+#: ../../Zotlabs/Module/Block.php:43
+msgid "Channel not found."
+msgstr "Kanal nicht gefunden."
 
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Send invitations"
-msgstr "Einladungen senden"
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
+msgstr "Berechtigung verweigert."
 
-#: ../../Zotlabs/Module/Invite.php:137
-msgid "Enter email addresses, one per line:"
-msgstr "Email-Adressen eintragen, eine pro Zeile:"
+#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2291
+msgid "Import"
+msgstr "Import"
 
-#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284
-msgid "Your message:"
-msgstr "Deine Nachricht:"
+#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
+msgid "Authorize application connection"
+msgstr "Zugriff für die Anwendung autorisieren"
 
-#: ../../Zotlabs/Module/Invite.php:139
-msgid "Please join my community on $Projectname."
-msgstr "Schließe Dich uns auf $Projectname an!"
+#: ../../Zotlabs/Module/Api.php:73
+msgid "Return to your app and insert this Security Code:"
+msgstr "Gehen Sie zu Ihrer App zurück und tragen Sie diesen Sicherheitscode ein:"
 
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "You will need to supply this invitation code:"
-msgstr "Bitte verwende bei der Registrierung den folgenden Einladungscode:"
+#: ../../Zotlabs/Module/Api.php:83
+msgid "Please login to continue."
+msgstr "Zum Weitermachen, bitte einloggen."
 
-#: ../../Zotlabs/Module/Invite.php:142
+#: ../../Zotlabs/Module/Api.php:95
 msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Registriere Dich auf einem beliebigen $Projectname-Hub (sie sind alle miteinander verbunden)"
-
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Gib meine $Projectname-Adresse im Suchfeld ein."
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
 
-#: ../../Zotlabs/Module/Invite.php:145
-msgid "or visit"
-msgstr "oder besuche"
+#: ../../Zotlabs/Module/Attach.php:13
+msgid "Item not available."
+msgstr "Element nicht verfügbar."
 
-#: ../../Zotlabs/Module/Invite.php:147
-msgid "3. Click [Connect]"
-msgstr "3. Klicke auf [Verbinden]"
+#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:205
+#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:306
+#: ../../Zotlabs/Module/Mail.php:448 ../../include/conversation.php:1228
+msgid "Insert web link"
+msgstr "Link einfügen"
 
-#: ../../Zotlabs/Module/Siteinfo.php:20
-msgid "About this site"
-msgstr "Über diese Seite"
+#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1339
+msgid "Title (optional)"
+msgstr "Titel (optional)"
 
-#: ../../Zotlabs/Module/Siteinfo.php:21
-msgid "Site Name"
-msgstr "Seitenname"
+#: ../../Zotlabs/Module/Editblock.php:138
+msgid "Edit Block"
+msgstr "Block bearbeiten"
 
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1972
-msgid "Administrator"
-msgstr "Administrator"
+#: ../../Zotlabs/Module/Profile.php:91
+msgid "vcard"
+msgstr "VCard"
 
-#: ../../Zotlabs/Module/Siteinfo.php:28
-msgid "Software and Project information"
-msgstr "Software und Projektinformationen"
+#: ../../Zotlabs/Module/Apps.php:45
+msgid "Apps"
+msgstr "Apps"
 
-#: ../../Zotlabs/Module/Siteinfo.php:29
-msgid "This site is powered by $Projectname"
-msgstr "Diese Website wird bereitgestellt durch $Projectname"
+#: ../../Zotlabs/Module/Apps.php:48
+msgid "Manage apps"
+msgstr "Apps verwalten"
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
-msgid ""
-"Federated and decentralised networking and identity services provided by Zot"
-msgstr "Verbundene, dezentrale Netzwerk- und Identitätsdienste, ermöglicht mittels Zot"
+#: ../../Zotlabs/Module/Apps.php:49
+msgid "Create new app"
+msgstr "Neue App erstellen"
 
-#: ../../Zotlabs/Module/Siteinfo.php:32
+#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:256
 #, php-format
-msgid "Version %s"
-msgstr "Version %s"
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr "%1$s ist %2$s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:33
-msgid "Project homepage"
-msgstr "Projekt-Website"
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234
+msgid "Mood"
+msgstr "Laune"
 
-#: ../../Zotlabs/Module/Siteinfo.php:34
-msgid "Developer homepage"
-msgstr "Entwickler-Website"
+#: ../../Zotlabs/Module/Mood.php:136
+msgid "Set your current mood and tell your friends"
+msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"
 
-#: ../../Zotlabs/Module/New_channel.php:140
-msgid "Create Channel"
-msgstr "Einen neuen Kanal anlegen"
+#: ../../Zotlabs/Module/Connections.php:52
+#: ../../Zotlabs/Module/Connections.php:157
+#: ../../Zotlabs/Module/Connections.php:246
+msgid "Blocked"
+msgstr "Blockiert"
 
-#: ../../Zotlabs/Module/New_channel.php:141
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
-msgstr "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen."
+#: ../../Zotlabs/Module/Connections.php:57
+#: ../../Zotlabs/Module/Connections.php:164
+#: ../../Zotlabs/Module/Connections.php:245
+msgid "Ignored"
+msgstr "Ignoriert"
 
-#: ../../Zotlabs/Module/New_channel.php:142
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr "oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server."
+#: ../../Zotlabs/Module/Connections.php:62
+#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Zotlabs/Module/Connections.php:244
+msgid "Hidden"
+msgstr "Versteckt"
 
-#: ../../Zotlabs/Module/Setup.php:176
-msgid "$Projectname Server - Setup"
-msgstr "$Projectname Server-Einrichtung"
+#: ../../Zotlabs/Module/Connections.php:67
+#: ../../Zotlabs/Module/Connections.php:171
+#: ../../Zotlabs/Module/Connections.php:243
+msgid "Archived"
+msgstr "Archiviert"
 
-#: ../../Zotlabs/Module/Setup.php:180
-msgid "Could not connect to database."
-msgstr "Kann nicht mit der Datenbank verbinden."
+#: ../../Zotlabs/Module/Connections.php:72
+#: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116
+#: ../../include/conversation.php:1666
+msgid "New"
+msgstr "Neu"
 
-#: ../../Zotlabs/Module/Setup.php:184
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS."
+#: ../../Zotlabs/Module/Connections.php:88
+#: ../../Zotlabs/Module/Connections.php:103
+#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30
+msgid "All"
+msgstr "Alle"
 
-#: ../../Zotlabs/Module/Setup.php:191
-msgid "Could not create table."
-msgstr "Konnte Tabelle nicht erstellen."
+#: ../../Zotlabs/Module/Connections.php:134
+msgid "New Connections"
+msgstr "Neue Verbindungen"
 
-#: ../../Zotlabs/Module/Setup.php:196
-msgid "Your site database has been installed."
-msgstr "Die Datenbank Deines Hubs wurde installiert."
+#: ../../Zotlabs/Module/Connections.php:137
+msgid "Show pending (new) connections"
+msgstr "Ausstehende (neue) Verbindungsanfragen anzeigen"
 
-#: ../../Zotlabs/Module/Setup.php:200
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren."
+#: ../../Zotlabs/Module/Connections.php:144
+msgid "Show all connections"
+msgstr "Alle Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Setup.php:750
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Lies die Datei \"install/INSTALL.txt\"."
+#: ../../Zotlabs/Module/Connections.php:160
+msgid "Only show blocked connections"
+msgstr "Nur blockierte Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Setup.php:260
-msgid "System check"
-msgstr "Systemprüfung"
+#: ../../Zotlabs/Module/Connections.php:167
+msgid "Only show ignored connections"
+msgstr "Nur ignorierte Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Setup.php:265
-msgid "Check again"
-msgstr "Nochmal prüfen"
+#: ../../Zotlabs/Module/Connections.php:174
+msgid "Only show archived connections"
+msgstr "Nur archivierte Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Setup.php:287
-msgid "Database connection"
-msgstr "Datenbankverbindung"
+#: ../../Zotlabs/Module/Connections.php:181
+msgid "Only show hidden connections"
+msgstr "Nur versteckte Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Setup.php:288
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
-msgstr "Um $Projectname zu installieren, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."
+#: ../../Zotlabs/Module/Connections.php:242
+msgid "Pending approval"
+msgstr "Wartet auf Genehmigung"
 
-#: ../../Zotlabs/Module/Setup.php:289
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast."
+#: ../../Zotlabs/Module/Connections.php:258
+#, php-format
+msgid "%1$s [%2$s]"
+msgstr "%1$s [%2$s]"
 
-#: ../../Zotlabs/Module/Setup.php:290
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst."
+#: ../../Zotlabs/Module/Connections.php:259
+msgid "Edit connection"
+msgstr "Verbindung bearbeiten"
 
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Database Server Name"
-msgstr "Datenbankservername"
+#: ../../Zotlabs/Module/Connections.php:260
+msgid "Delete connection"
+msgstr "Verbindung löschen"
 
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Default is 127.0.0.1"
-msgstr "Standard ist 127.0.0.1"
+#: ../../Zotlabs/Module/Connections.php:269
+msgid "Channel address"
+msgstr "Kanaladresse"
 
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Database Port"
-msgstr "Datenbankport"
+#: ../../Zotlabs/Module/Connections.php:271
+msgid "Network"
+msgstr "Netzwerk"
 
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Communication port number - use 0 for default"
-msgstr "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung"
+#: ../../Zotlabs/Module/Connections.php:274
+msgid "Call"
+msgstr "Anruf"
 
-#: ../../Zotlabs/Module/Setup.php:296
-msgid "Database Login Name"
-msgstr "Datenbank-Benutzername"
+#: ../../Zotlabs/Module/Connections.php:276
+msgid "Status"
+msgstr "Status"
 
-#: ../../Zotlabs/Module/Setup.php:297
-msgid "Database Login Password"
-msgstr "Datenbank-Passwort"
+#: ../../Zotlabs/Module/Connections.php:278
+msgid "Connected"
+msgstr "Verbunden"
 
-#: ../../Zotlabs/Module/Setup.php:298
-msgid "Database Name"
-msgstr "Datenbankname"
+#: ../../Zotlabs/Module/Connections.php:280
+msgid "Approve connection"
+msgstr "Verbindung genehmigen"
 
-#: ../../Zotlabs/Module/Setup.php:299
-msgid "Database Type"
-msgstr "Datenbanktyp"
+#: ../../Zotlabs/Module/Connections.php:282
+msgid "Ignore connection"
+msgstr "Verbindung ignorieren"
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
-msgid "Site administrator email address"
-msgstr "E-Mail Adresse des Seiten-Administrators"
+#: ../../Zotlabs/Module/Connections.php:283
+#: ../../Zotlabs/Module/Connedit.php:626
+msgid "Ignore"
+msgstr "Ignorieren"
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst."
+#: ../../Zotlabs/Module/Connections.php:284
+msgid "Recent activity"
+msgstr "Kürzliche Aktivitäten"
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
-msgid "Website URL"
-msgstr "Webseiten-URL"
+#: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216
+#: ../../include/text.php:957 ../../include/nav.php:185
+msgid "Connections"
+msgstr "Verbindungen"
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
-msgid "Please use SSL (https) URL if available."
-msgstr "Nutze wenn möglich eine SSL-URL (https)."
+#: ../../Zotlabs/Module/Connections.php:313
+msgid "Search your connections"
+msgstr "Verbindungen durchsuchen"
 
-#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:353
-msgid "Please select a default timezone for your website"
-msgstr "Standard-Zeitzone für Deinen Server"
+#: ../../Zotlabs/Module/Connections.php:314
+msgid "Connections search"
+msgstr "Verbindung suchen"
 
-#: ../../Zotlabs/Module/Setup.php:336
-msgid "Site settings"
-msgstr "Seiteneinstellungen"
+#: ../../Zotlabs/Module/Connections.php:315
+#: ../../Zotlabs/Module/Directory.php:391
+#: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23
+msgid "Find"
+msgstr "Finde"
 
-#: ../../Zotlabs/Module/Setup.php:392
-msgid "PHP version 5.5 or greater is required."
-msgstr "PHP-Version 5.5 oder höher ist erforderlich."
+#: ../../Zotlabs/Module/Viewsrc.php:43
+msgid "item"
+msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:393
-msgid "PHP version"
-msgstr "PHP-Version"
+#: ../../Zotlabs/Module/Viewsrc.php:55
+msgid "Source of Item"
+msgstr "Quelle des Elements"
 
-#: ../../Zotlabs/Module/Setup.php:409
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden."
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
+msgstr "Lesezeichen hinzugefügt"
 
-#: ../../Zotlabs/Module/Setup.php:410
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen."
+#: ../../Zotlabs/Module/Bookmarks.php:76
+msgid "My Bookmarks"
+msgstr "Meine Lesezeichen"
 
-#: ../../Zotlabs/Module/Setup.php:414
-msgid "PHP executable path"
-msgstr "PHP-Pfad zu ausführbarer Datei"
+#: ../../Zotlabs/Module/Bookmarks.php:87
+msgid "My Connections Bookmarks"
+msgstr "Lesezeichen meiner Kontakte"
 
-#: ../../Zotlabs/Module/Setup.php:414
+#: ../../Zotlabs/Module/Removeaccount.php:35
 msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren."
+"Account removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt."
 
-#: ../../Zotlabs/Module/Setup.php:419
-msgid "Command line PHP"
-msgstr "PHP-Befehlszeile"
+#: ../../Zotlabs/Module/Removeaccount.php:57
+msgid "Remove This Account"
+msgstr "Dieses Konto löschen"
 
-#: ../../Zotlabs/Module/Setup.php:429
+#: ../../Zotlabs/Module/Removeaccount.php:58
 msgid ""
-"Unable to check command line PHP, as shell_exec() is disabled. This is "
-"required."
-msgstr "Prüfung auf Kommandozeilen-PHP fehlgeschlagen, da shell_exec() deaktiviert ist. Dies wird aber benötigt."
+"This account and all its channels will be completely removed from the "
+"network. "
+msgstr "Dieses Konto mit all seinen Kanälen wird vollständig aus dem Netzwerk gelöscht."
 
-#: ../../Zotlabs/Module/Setup.php:432
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert."
-
-#: ../../Zotlabs/Module/Setup.php:433
-msgid "This is required for message delivery to work."
-msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
-
-#: ../../Zotlabs/Module/Setup.php:436
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
+"Remove this account, all its channels and all its channel clones from the "
+"network"
+msgstr "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen"
 
-#: ../../Zotlabs/Module/Setup.php:454
-#, php-format
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
-"Your max allowed total upload size is set to %s. Maximum size of one file to"
-" upload is set to %s. You are allowed to upload up to %d files at once."
-msgstr "Die Maximalgröße für Uploads insgesamt liegt bei %s. Die Maximalgröße für eine Datei liegt bei %s. Es können maximal %d Dateien gleichzeitig hochgeladen werden."
+"By default only the instances of the channels located on this hub will be "
+"removed from the network"
+msgstr "Standardmäßig werden nur die Kanalklone auf diesem $Projectname-Hub aus dem Netzwerk entfernt"
 
-#: ../../Zotlabs/Module/Setup.php:459
-msgid "You can adjust these settings in the server php.ini file."
-msgstr "Du kannst diese Einstellungen in der php.ini - Datei des Servers anpassen."
+#: ../../Zotlabs/Module/Photos.php:78
+msgid "Page owner information could not be retrieved."
+msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden."
 
-#: ../../Zotlabs/Module/Setup.php:461
-msgid "PHP upload limits"
-msgstr "PHP-Hochladebeschränkungen"
+#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120
+msgid "Album not found."
+msgstr "Album nicht gefunden."
 
-#: ../../Zotlabs/Module/Setup.php:484
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen."
+#: ../../Zotlabs/Module/Photos.php:103
+msgid "Delete Album"
+msgstr "Album löschen"
 
-#: ../../Zotlabs/Module/Setup.php:485
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung."
+#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1023
+msgid "Delete Photo"
+msgstr "Foto löschen"
 
-#: ../../Zotlabs/Module/Setup.php:488
-msgid "Generate encryption keys"
-msgstr "Verschlüsselungsschlüssel erzeugen"
+#: ../../Zotlabs/Module/Photos.php:501
+msgid "No photos selected"
+msgstr "Keine Fotos ausgewählt"
 
-#: ../../Zotlabs/Module/Setup.php:505
-msgid "libCurl PHP module"
-msgstr "libCurl-PHP-Modul"
+#: ../../Zotlabs/Module/Photos.php:550
+msgid "Access to this item is restricted."
+msgstr "Der Zugriff auf dieses Foto ist eingeschränkt."
 
-#: ../../Zotlabs/Module/Setup.php:506
-msgid "GD graphics PHP module"
-msgstr "GD-Grafik-PHP-Modul"
+#: ../../Zotlabs/Module/Photos.php:591
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "%1$.2f MB von %2$.2f MB Foto-Speicher belegt."
 
-#: ../../Zotlabs/Module/Setup.php:507
-msgid "OpenSSL PHP module"
-msgstr "OpenSSL-PHP-Modul"
+#: ../../Zotlabs/Module/Photos.php:594
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB Foto-Speicher belegt."
 
-#: ../../Zotlabs/Module/Setup.php:508
-msgid "PDO database PHP module"
-msgstr "PDO-Datenbank-PHP-Modul"
+#: ../../Zotlabs/Module/Photos.php:636
+msgid "Upload Photos"
+msgstr "Fotos hochladen"
 
-#: ../../Zotlabs/Module/Setup.php:509
-msgid "mb_string PHP module"
-msgstr "mb_string-PHP-Modul"
+#: ../../Zotlabs/Module/Photos.php:640
+msgid "Enter an album name"
+msgstr "Namen für ein neues Album eingeben"
 
-#: ../../Zotlabs/Module/Setup.php:510
-msgid "xml PHP module"
-msgstr "xml-PHP-Modul"
+#: ../../Zotlabs/Module/Photos.php:641
+msgid "or select an existing album (doubleclick)"
+msgstr "oder ein bereits vorhandenes auswählen (Doppelklick)"
 
-#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:516
-msgid "Apache mod_rewrite module"
-msgstr "Apache-mod_rewrite-Modul"
+#: ../../Zotlabs/Module/Photos.php:642
+msgid "Create a status post for this upload"
+msgstr "Einen Statusbeitrag für diesen Upload erzeugen"
 
-#: ../../Zotlabs/Module/Setup.php:514
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert."
+#: ../../Zotlabs/Module/Photos.php:643
+msgid "Caption (optional):"
+msgstr "Beschriftung (optional):"
 
-#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:523
-msgid "exec"
-msgstr "exec"
+#: ../../Zotlabs/Module/Photos.php:644
+msgid "Description (optional):"
+msgstr "Beschreibung (optional):"
 
-#: ../../Zotlabs/Module/Setup.php:520
-msgid ""
-"Error: exec is required but is either not installed or has been disabled in "
-"php.ini"
-msgstr "Fehler: exec ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
+#: ../../Zotlabs/Module/Photos.php:725
+msgid "Show Newest First"
+msgstr "Neueste zuerst anzeigen"
 
-#: ../../Zotlabs/Module/Setup.php:526 ../../Zotlabs/Module/Setup.php:529
-msgid "shell_exec"
-msgstr "shell_exec"
+#: ../../Zotlabs/Module/Photos.php:727
+msgid "Show Oldest First"
+msgstr "Älteste zuerst anzeigen"
 
-#: ../../Zotlabs/Module/Setup.php:526
-msgid ""
-"Error: shell_exec is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr "Fehler: shell_exec ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
+#: ../../Zotlabs/Module/Photos.php:832
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
 
-#: ../../Zotlabs/Module/Setup.php:534
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert."
+#: ../../Zotlabs/Module/Photos.php:834
+msgid "Photo not available"
+msgstr "Foto nicht verfügbar"
 
-#: ../../Zotlabs/Module/Setup.php:538
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert."
+#: ../../Zotlabs/Module/Photos.php:892
+msgid "Use as profile photo"
+msgstr "Als Profilfoto verwenden"
 
-#: ../../Zotlabs/Module/Setup.php:542
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert."
+#: ../../Zotlabs/Module/Photos.php:893
+msgid "Use as cover photo"
+msgstr "Als Titelbild verwenden"
 
-#: ../../Zotlabs/Module/Setup.php:546
-msgid "Error: PDO database PHP module required but not installed."
-msgstr "Fehler: PDO-Datenbank-PHP-Modul ist erforderlich, aber nicht installiert."
+#: ../../Zotlabs/Module/Photos.php:900
+msgid "Private Photo"
+msgstr "Privates Foto"
 
-#: ../../Zotlabs/Module/Setup.php:550
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."
+#: ../../Zotlabs/Module/Photos.php:915
+msgid "View Full Size"
+msgstr "In voller Größe anzeigen"
 
-#: ../../Zotlabs/Module/Setup.php:554
-msgid "Error: xml PHP module required for DAV but not installed."
-msgstr "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert."
+#: ../../Zotlabs/Module/Photos.php:997
+msgid "Edit photo"
+msgstr "Foto bearbeiten"
 
-#: ../../Zotlabs/Module/Setup.php:572
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht."
+#: ../../Zotlabs/Module/Photos.php:999
+msgid "Rotate CW (right)"
+msgstr "Drehen im UZS (rechts)"
 
-#: ../../Zotlabs/Module/Setup.php:573
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst."
+#: ../../Zotlabs/Module/Photos.php:1000
+msgid "Rotate CCW (left)"
+msgstr "Drehen gegen UZS (links)"
 
-#: ../../Zotlabs/Module/Setup.php:574
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Hubzilla-Installation speichern musst."
+#: ../../Zotlabs/Module/Photos.php:1003
+msgid "Move photo to album"
+msgstr "Foto in Album verschieben"
 
-#: ../../Zotlabs/Module/Setup.php:575
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
+#: ../../Zotlabs/Module/Photos.php:1004
+msgid "Enter a new album name"
+msgstr "Gib einen Namen für ein neues Album ein"
 
-#: ../../Zotlabs/Module/Setup.php:578
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php ist beschreibbar"
+#: ../../Zotlabs/Module/Photos.php:1005
+msgid "or select an existing one (doubleclick)"
+msgstr "oder wähle ein bereits vorhandenes aus (Doppelklick)"
 
-#: ../../Zotlabs/Module/Setup.php:592
-msgid ""
-"This software uses the Smarty3 template engine to render its web views. "
-"Smarty3 compiles templates to PHP to speed up rendering."
-msgstr "Diese Software verwendet die Smarty3 Template Engine, um Vorlagen für die Webdarstellung zu verarbeiten. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen."
+#: ../../Zotlabs/Module/Photos.php:1008
+msgid "Caption"
+msgstr "Bildunterschrift"
 
-#: ../../Zotlabs/Module/Setup.php:593
-#, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the top level web folder."
-msgstr "Um diese kompilierten Vorlagen speichern zu können, braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Hubzilla-Stammverzeichnisses."
+#: ../../Zotlabs/Module/Photos.php:1010
+msgid "Add a Tag"
+msgstr "Schlagwort hinzufügen"
 
-#: ../../Zotlabs/Module/Setup.php:594 ../../Zotlabs/Module/Setup.php:615
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat."
+#: ../../Zotlabs/Module/Photos.php:1018
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Beispiele: @ben, @Karl_Prester, @lieschen@example.com"
 
-#: ../../Zotlabs/Module/Setup.php:595
-#, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
-msgstr "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält."
+#: ../../Zotlabs/Module/Photos.php:1021
+msgid "Flag as adult in album view"
+msgstr "In der Albumansicht als nicht jugendfrei markieren"
 
-#: ../../Zotlabs/Module/Setup.php:598
-#, php-format
-msgid "%s is writable"
-msgstr "%s ist beschreibbar"
+#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:269
+msgid "I like this (toggle)"
+msgstr "Mir gefällt das (Umschalter)"
 
-#: ../../Zotlabs/Module/Setup.php:614
-msgid ""
-"This software uses the store directory to save uploaded files. The web "
-"server needs to have write access to the store directory under the top level"
-" web folder"
-msgstr "Diese Software benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Webserver benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Web-Stammverzeichnisses."
+#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:270
+msgid "I don't like this (toggle)"
+msgstr "Mir gefällt das nicht (Umschalter)"
 
-#: ../../Zotlabs/Module/Setup.php:618
-msgid "store is writable"
-msgstr "store ist schreibbar"
+#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:412
+#: ../../include/conversation.php:739
+msgid "Please wait"
+msgstr "Bitte warten"
 
-#: ../../Zotlabs/Module/Setup.php:651
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server."
+#: ../../Zotlabs/Module/Photos.php:1059 ../../Zotlabs/Module/Photos.php:1177
+#: ../../Zotlabs/Lib/ThreadItem.php:729
+msgid "This is you"
+msgstr "Das bist Du"
 
-#: ../../Zotlabs/Module/Setup.php:652
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
-msgstr "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich."
+#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179
+#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr "Kommentar"
 
-#: ../../Zotlabs/Module/Setup.php:653
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können."
+#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+msgctxt "title"
+msgid "Likes"
+msgstr "Gefällt mir"
 
-#: ../../Zotlabs/Module/Setup.php:654
-msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
-msgstr "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer $Projectname-Hubs (die mit korrekten Zertifikaten ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird)."
+#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+msgctxt "title"
+msgid "Dislikes"
+msgstr "Gefällt mir nicht"
 
-#: ../../Zotlabs/Module/Setup.php:655
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen."
+#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+msgctxt "title"
+msgid "Agree"
+msgstr "Zustimmungen"
 
-#: ../../Zotlabs/Module/Setup.php:656
-msgid ""
-"Providers are available that issue free certificates which are browser-"
-"valid."
-msgstr "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind."
+#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+msgctxt "title"
+msgid "Disagree"
+msgstr "Ablehnungen"
 
-#: ../../Zotlabs/Module/Setup.php:658
-msgid ""
-"If you are confident that the certificate is valid and signed by a trusted "
-"authority, check to see if you have failed to install an intermediate cert. "
-"These are not normally required by browsers, but are required for server-to-"
-"server communications."
-msgstr "Wenn Du sicher bist, dass das Zertifikat gültig und von einer vertrauenswürdigen Zertifizierungsstelle signiert ist, prüfe auf ggf. noch zu installierende Zwischenzertifikate (intermediate). Diese werden nicht unbedingt von Browsern benötigt, aber sehr wohl für die Kommunikation zwischen Servern."
+#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+msgctxt "title"
+msgid "Abstain"
+msgstr "Enthaltungen"
 
-#: ../../Zotlabs/Module/Setup.php:660
-msgid "SSL certificate validation"
-msgstr "SSL Zertifikatverifizierung"
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+msgctxt "title"
+msgid "Attending"
+msgstr "Zusagen"
 
-#: ../../Zotlabs/Module/Setup.php:666
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server "
-"configuration.Test: "
-msgstr "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:"
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+msgctxt "title"
+msgid "Not attending"
+msgstr "Absagen"
 
-#: ../../Zotlabs/Module/Setup.php:669
-msgid "Url rewrite is working"
-msgstr "Url rewrite funktioniert"
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+msgctxt "title"
+msgid "Might attend"
+msgstr "Vielleicht"
 
-#: ../../Zotlabs/Module/Setup.php:683
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
+#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1108
+#: ../../Zotlabs/Lib/ThreadItem.php:187 ../../Zotlabs/Lib/ThreadItem.php:199
+msgid "View all"
+msgstr "Alles anzeigen"
 
-#: ../../Zotlabs/Module/Setup.php:707
-#: ../../extend/addon/addon/cdav/cdav.php:41
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:401
-msgid "Errors encountered creating database tables."
-msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
+#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:191
+#: ../../include/conversation.php:1907 ../../include/channel.php:1268
+#: ../../include/taxonomy.php:403
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Gefällt mir"
+msgstr[1] "Gefällt mir"
 
-#: ../../Zotlabs/Module/Setup.php:748
-msgid "<h1>What next</h1>"
-msgstr "<h1>Was als Nächstes</h1>"
+#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:196
+#: ../../include/conversation.php:1910
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "Gefällt nicht"
+msgstr[1] "Gefällt nicht"
 
-#: ../../Zotlabs/Module/Setup.php:749
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten."
+#: ../../Zotlabs/Module/Photos.php:1205
+msgid "Photo Tools"
+msgstr "Fotowerkzeuge"
 
-#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:208
-msgid "Mark all system notifications seen"
-msgstr "Markiere alle System-Benachrichtigungen als gesehen"
+#: ../../Zotlabs/Module/Photos.php:1214
+msgid "In This Photo:"
+msgstr "Auf diesem Foto:"
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235
-#: ../../include/conversation.php:942 ../../include/conversation.php:1109
-msgid "Poke"
-msgstr "Anstupsen"
+#: ../../Zotlabs/Module/Photos.php:1219
+msgid "Map"
+msgstr "Karte"
 
-#: ../../Zotlabs/Module/Poke.php:169
-msgid "Poke somebody"
-msgstr "Jemanden anstupsen"
+#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:401
+msgctxt "noun"
+msgid "Likes"
+msgstr "Gefällt mir"
 
-#: ../../Zotlabs/Module/Poke.php:172
-msgid "Poke/Prod"
-msgstr "Anstupsen/Knuffen"
+#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:402
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "Gefällt nicht"
 
-#: ../../Zotlabs/Module/Poke.php:173
-msgid "Poke, prod or do other things to somebody"
-msgstr "Jemanden anstupsen, knuffen oder sonstiges"
+#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:407
+#: ../../include/acl_selectors.php:220
+msgid "Close"
+msgstr "Schließen"
 
-#: ../../Zotlabs/Module/Poke.php:180
-msgid "Recipient"
-msgstr "Empfänger"
+#: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318
+#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:529
+msgid "Recent Photos"
+msgstr "Neueste Fotos"
 
-#: ../../Zotlabs/Module/Poke.php:181
-msgid "Choose what you wish to do to recipient"
-msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst"
+#: ../../Zotlabs/Module/Wiki.php:30
+msgid "Profile Unavailable."
+msgstr "Profil nicht verfügbar."
 
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
-msgid "Make this post private"
-msgstr "Diesen Beitrag privat machen"
+#: ../../Zotlabs/Module/Wiki.php:44 ../../addon/gitwiki/Mod_Gitwiki.php:42
+msgid "Not found"
+msgstr "Nicht gefunden"
 
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr "Konnte Deinen Server nicht finden."
+#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/gitwiki/Mod_Gitwiki.php:62
+msgid "Invalid channel"
+msgstr "Ungültiger Kanal"
 
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr "Veröffentlichung erfolgreich."
+#: ../../Zotlabs/Module/Wiki.php:160 ../../addon/gitwiki/Mod_Gitwiki.php:146
+#: ../../include/conversation.php:1854 ../../include/nav.php:462
+msgid "Wikis"
+msgstr "Wikis"
 
-#: ../../Zotlabs/Module/Item.php:184
-msgid "Unable to locate original post."
-msgstr "Originalbeitrag nicht gefunden."
+#: ../../Zotlabs/Module/Wiki.php:166 ../../addon/gitwiki/Mod_Gitwiki.php:152
+msgid "Download"
+msgstr "Herunterladen"
 
-#: ../../Zotlabs/Module/Item.php:450
-msgid "Empty post discarded."
-msgstr "Leeren Beitrag verworfen."
+#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Chat.php:254
+#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:143
+#: ../../addon/gitwiki/Mod_Gitwiki.php:154
+msgid "Create New"
+msgstr "Neu anlegen"
+
+#: ../../Zotlabs/Module/Wiki.php:170 ../../addon/gitwiki/Mod_Gitwiki.php:156
+msgid "Wiki name"
+msgstr "Name des Wiki"
 
-#: ../../Zotlabs/Module/Item.php:492
-msgid "Executable content type not permitted to this channel."
-msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
+#: ../../Zotlabs/Module/Wiki.php:171 ../../addon/gitwiki/Mod_Gitwiki.php:157
+msgid "Content type"
+msgstr "Inhaltstyp"
 
-#: ../../Zotlabs/Module/Item.php:842
-msgid "Duplicate post suppressed."
-msgstr "Doppelter Beitrag unterdrückt."
+#: ../../Zotlabs/Module/Wiki.php:173 ../../Zotlabs/Storage/Browser.php:234
+#: ../../addon/gitwiki/Mod_Gitwiki.php:159
+msgid "Type"
+msgstr "Typ"
 
-#: ../../Zotlabs/Module/Item.php:984
-msgid "System error. Post not saved."
-msgstr "Systemfehler. Beitrag nicht gespeichert."
+#: ../../Zotlabs/Module/Wiki.php:180 ../../addon/gitwiki/Mod_Gitwiki.php:166
+msgid "Create a status post for this wiki"
+msgstr "Erzeuge einen Statusbeitrag für dieses Wiki"
 
-#: ../../Zotlabs/Module/Item.php:1114
-msgid "Unable to obtain post information from database."
-msgstr "Beitragsinformationen können nicht aus der Datenbank abgerufen werden."
+#: ../../Zotlabs/Module/Wiki.php:205 ../../addon/gitwiki/Mod_Gitwiki.php:185
+msgid "Wiki not found"
+msgstr "Wiki nicht gefunden"
 
-#: ../../Zotlabs/Module/Item.php:1121
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
+#: ../../Zotlabs/Module/Wiki.php:229 ../../addon/gitwiki/Mod_Gitwiki.php:210
+msgid "Rename page"
+msgstr "Seite umbenennen"
 
-#: ../../Zotlabs/Module/Item.php:1128
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
+#: ../../Zotlabs/Module/Wiki.php:233 ../../addon/gitwiki/Mod_Gitwiki.php:214
+msgid "Error retrieving page content"
+msgstr "Fehler beim Abrufen des Seiteninhalts"
 
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
-msgstr "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert."
+#: ../../Zotlabs/Module/Wiki.php:239
+msgid "New page"
+msgstr "Neue Seite"
 
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
-msgstr "Konfigurationseditor"
+#: ../../Zotlabs/Module/Wiki.php:263 ../../addon/gitwiki/Mod_Gitwiki.php:242
+msgid "Revision Comparison"
+msgstr "Revisionsvergleich"
 
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please"
-" leave this page unless you are comfortable with and knowledgeable about how"
-" to correctly use this feature."
-msgstr "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird."
+#: ../../Zotlabs/Module/Wiki.php:264 ../../addon/gitwiki/Mod_Gitwiki.php:243
+msgid "Revert"
+msgstr "Rückgängig machen"
 
-#: ../../Zotlabs/Module/Profile.php:78
-msgid "vcard"
-msgstr "VCard"
+#: ../../Zotlabs/Module/Wiki.php:268
+msgid "Short description of your changes (optional)"
+msgstr "Kurze Beschreibung Ihrer Änderungen (optional)"
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2283
-msgid "Blocks"
-msgstr "Blöcke"
+#: ../../Zotlabs/Module/Wiki.php:275 ../../addon/gitwiki/Mod_Gitwiki.php:252
+msgid "Source"
+msgstr "Quelle"
 
-#: ../../Zotlabs/Module/Blocks.php:156
-msgid "Block Title"
-msgstr "Titel des Blocks"
+#: ../../Zotlabs/Module/Wiki.php:283 ../../addon/gitwiki/Mod_Gitwiki.php:260
+msgid "New page name"
+msgstr "Neuer Seitenname"
 
-#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2285
-msgid "Layouts"
-msgstr "Layouts"
+#: ../../Zotlabs/Module/Wiki.php:288 ../../addon/gitwiki/Mod_Gitwiki.php:265
+#: ../../include/conversation.php:1232
+msgid "Embed image from photo albums"
+msgstr "Bild aus Fotoalben einbetten"
 
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:232
-#: ../../include/nav.php:174 ../../include/help.php:53
-#: ../../include/help.php:59
-msgid "Help"
-msgstr "Hilfe"
+#: ../../Zotlabs/Module/Wiki.php:289 ../../addon/gitwiki/Mod_Gitwiki.php:266
+#: ../../include/conversation.php:1326
+msgid "Embed an image from your albums"
+msgstr "Betten Sie ein Bild aus Ihren Alben ein"
 
-#: ../../Zotlabs/Module/Layouts.php:185
-msgid "Comanche page description language help"
-msgstr "Hilfe zur Comanche-Seitenbeschreibungssprache"
+#: ../../Zotlabs/Module/Wiki.php:291 ../../addon/gitwiki/Mod_Gitwiki.php:268
+#: ../../include/conversation.php:1328 ../../include/conversation.php:1375
+msgid "OK"
+msgstr "Ok"
 
-#: ../../Zotlabs/Module/Layouts.php:189
-msgid "Layout Description"
-msgstr "Layout-Beschreibung"
+#: ../../Zotlabs/Module/Wiki.php:292 ../../addon/gitwiki/Mod_Gitwiki.php:269
+#: ../../include/conversation.php:1268
+msgid "Choose images to embed"
+msgstr "Wählen Sie Bilder zum Einbetten aus"
 
-#: ../../Zotlabs/Module/Layouts.php:194
-msgid "Download PDL file"
-msgstr "PDL-Datei herunterladen"
+#: ../../Zotlabs/Module/Wiki.php:293 ../../addon/gitwiki/Mod_Gitwiki.php:270
+#: ../../include/conversation.php:1269
+msgid "Choose an album"
+msgstr "Wählen Sie ein Album aus"
 
-#: ../../Zotlabs/Module/Rate.php:156
-msgid "Website:"
-msgstr "Webseite:"
+#: ../../Zotlabs/Module/Wiki.php:294 ../../addon/gitwiki/Mod_Gitwiki.php:271
+msgid "Choose a different album"
+msgstr "Wählen Sie ein anderes Album aus"
 
-#: ../../Zotlabs/Module/Rate.php:159
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Kanal [%s] (auf diesem Server noch unbekannt)"
+#: ../../Zotlabs/Module/Wiki.php:295 ../../addon/gitwiki/Mod_Gitwiki.php:272
+#: ../../include/conversation.php:1271
+msgid "Error getting album list"
+msgstr "Fehler beim Holen der Albenliste"
 
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Rating (this information is public)"
-msgstr "Bewertung (öffentlich sichtbar)"
+#: ../../Zotlabs/Module/Wiki.php:296 ../../addon/gitwiki/Mod_Gitwiki.php:273
+#: ../../include/conversation.php:1272
+msgid "Error getting photo link"
+msgstr "Fehler beim Holen des Fotolinks"
 
-#: ../../Zotlabs/Module/Rate.php:161
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)"
+#: ../../Zotlabs/Module/Wiki.php:297 ../../addon/gitwiki/Mod_Gitwiki.php:274
+#: ../../include/conversation.php:1273
+msgid "Error getting album"
+msgstr "Fehler beim Holen des Albums"
 
-#: ../../Zotlabs/Module/Profile_photo.php:190
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:295
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
+#: ../../Zotlabs/Module/Wiki.php:364 ../../addon/gitwiki/Mod_Gitwiki.php:337
+msgid "Error creating wiki. Invalid name."
+msgstr "Fehler beim Erstellen des Wiki. Ungültiger Name."
 
-#: ../../Zotlabs/Module/Profile_photo.php:411
-msgid "Use Photo for Profile"
-msgstr "Foto für Profil verwenden"
+#: ../../Zotlabs/Module/Wiki.php:371
+msgid "A wiki with this name already exists."
+msgstr "Es existiert bereits ein Wiki mit diesem Namen."
 
-#: ../../Zotlabs/Module/Profile_photo.php:411
-msgid "Upload Profile Photo"
-msgstr "Lade neues Profilfoto hoch"
+#: ../../Zotlabs/Module/Wiki.php:384 ../../addon/gitwiki/Mod_Gitwiki.php:348
+msgid "Wiki created, but error creating Home page."
+msgstr "Das Wiki wurde erzeugt, aber es gab einen Fehler bei der Erstellung der Startseite"
 
-#: ../../Zotlabs/Module/Profile_photo.php:412
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:182
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:194
-msgid "Use"
-msgstr "Verwenden"
+#: ../../Zotlabs/Module/Wiki.php:391 ../../addon/gitwiki/Mod_Gitwiki.php:353
+msgid "Error creating wiki"
+msgstr "Fehler beim Erstellen des Wiki"
 
-#: ../../Zotlabs/Module/Events.php:25
-msgid "Calendar entries imported."
-msgstr "Kalendereinträge wurden importiert."
+#: ../../Zotlabs/Module/Wiki.php:403
+msgid "Wiki delete permission denied."
+msgstr "Wiki-Löschberechtigung verweigert."
 
-#: ../../Zotlabs/Module/Events.php:27
-msgid "No calendar entries found."
-msgstr "Keine Kalendereinträge gefunden."
+#: ../../Zotlabs/Module/Wiki.php:413
+msgid "Error deleting wiki"
+msgstr "Fehler beim Löschen des Wiki"
 
-#: ../../Zotlabs/Module/Events.php:110
-msgid "Event can not end before it has started."
-msgstr "Termin-Ende liegt vor dem Beginn."
+#: ../../Zotlabs/Module/Wiki.php:439 ../../addon/gitwiki/Mod_Gitwiki.php:400
+msgid "New page created"
+msgstr "Neue Seite erstellt"
 
-#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
-#: ../../Zotlabs/Module/Events.php:143
-msgid "Unable to generate preview."
-msgstr "Vorschau konnte nicht erzeugt werden."
+#: ../../Zotlabs/Module/Wiki.php:558
+msgid "Cannot delete Home"
+msgstr "Kann die Startseite nicht löschen"
 
-#: ../../Zotlabs/Module/Events.php:119
-msgid "Event title and start time are required."
-msgstr "Titel und Startzeit des Termins sind erforderlich."
+#: ../../Zotlabs/Module/Wiki.php:622
+msgid "Current Revision"
+msgstr "Aktuelle Revision"
 
-#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
-msgid "Event not found."
-msgstr "Termin nicht gefunden."
+#: ../../Zotlabs/Module/Wiki.php:622
+msgid "Selected Revision"
+msgstr "Ausgewählte Revision"
 
-#: ../../Zotlabs/Module/Events.php:460
-msgid "Edit event title"
-msgstr "Termintitel bearbeiten"
+#: ../../Zotlabs/Module/Wiki.php:672
+msgid "You must be authenticated."
+msgstr "Sie müssen authenzifiziert sein."
 
-#: ../../Zotlabs/Module/Events.php:460
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
-msgid "Event title"
-msgstr "Termintitel"
+#: ../../Zotlabs/Module/Chanview.php:134
+msgid "toggle full screen mode"
+msgstr "auf Vollbildmodus umschalten"
 
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Categories (comma-separated list)"
-msgstr "Kategorien (Kommagetrennte Liste)"
+#: ../../Zotlabs/Module/Pdledit.php:21
+msgid "Layout updated."
+msgstr "Layout aktualisiert."
 
-#: ../../Zotlabs/Module/Events.php:463
-msgid "Edit Category"
-msgstr "Kategorie bearbeiten"
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:217
+msgid "Feature disabled."
+msgstr "Funktion deaktiviert."
 
-#: ../../Zotlabs/Module/Events.php:463
-msgid "Category"
-msgstr "Kategorie"
+#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69
+msgid "Edit System Page Description"
+msgstr "Systemseitenbeschreibung bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:466
-msgid "Edit start date and time"
-msgstr "Startdatum und -zeit bearbeiten"
+#: ../../Zotlabs/Module/Pdledit.php:64
+msgid "Layout not found."
+msgstr "Layout nicht gefunden."
 
-#: ../../Zotlabs/Module/Events.php:466
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
-msgid "Start date and time"
-msgstr "Startdatum und -zeit"
+#: ../../Zotlabs/Module/Pdledit.php:70
+msgid "Module Name:"
+msgstr "Modulname:"
 
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
-msgid "Finish date and time are not known or not relevant"
-msgstr "Enddatum und -zeit sind unbekannt oder irrelevant"
+#: ../../Zotlabs/Module/Pdledit.php:71
+msgid "Layout Help"
+msgstr "Layout-Hilfe"
 
-#: ../../Zotlabs/Module/Events.php:469
-msgid "Edit finish date and time"
-msgstr "Enddatum und -zeit bearbeiten"
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235
+#: ../../include/conversation.php:1042
+msgid "Poke"
+msgstr "Anstupsen"
 
-#: ../../Zotlabs/Module/Events.php:469
-msgid "Finish date and time"
-msgstr "Enddatum und -zeit"
+#: ../../Zotlabs/Module/Poke.php:169
+msgid "Poke somebody"
+msgstr "Jemanden anstupsen"
 
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
-msgid "Adjust for viewer timezone"
-msgstr "An die Zeitzone des Betrachters anpassen"
+#: ../../Zotlabs/Module/Poke.php:172
+msgid "Poke/Prod"
+msgstr "Anstupsen/Knuffen"
 
-#: ../../Zotlabs/Module/Events.php:471
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien."
+#: ../../Zotlabs/Module/Poke.php:173
+msgid "Poke, prod or do other things to somebody"
+msgstr "Jemanden anstupsen, knuffen oder sonstiges"
 
-#: ../../Zotlabs/Module/Events.php:473
-msgid "Edit Description"
-msgstr "Beschreibung bearbeiten"
+#: ../../Zotlabs/Module/Poke.php:180
+msgid "Recipient"
+msgstr "Empfänger"
 
-#: ../../Zotlabs/Module/Events.php:475
-msgid "Edit Location"
-msgstr "Ort bearbeiten"
+#: ../../Zotlabs/Module/Poke.php:181
+msgid "Choose what you wish to do to recipient"
+msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst"
 
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1410
-msgid "Permission settings"
-msgstr "Berechtigungs-Einstellungen"
+#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+msgid "Make this post private"
+msgstr "Diesen Beitrag privat machen"
 
-#: ../../Zotlabs/Module/Events.php:489
-msgid "Timezone:"
-msgstr "Zeitzone:"
+#: ../../Zotlabs/Module/Profile_photo.php:61
+#: ../../Zotlabs/Module/Cover_photo.php:56
+msgid "Image uploaded but image cropping failed."
+msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."
 
-#: ../../Zotlabs/Module/Events.php:494
-msgid "Advanced Options"
-msgstr "Weitere Optionen"
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:226
+#: ../../include/photo/photo_driver.php:647
+msgid "Profile Photos"
+msgstr "Profilfotos"
 
-#: ../../Zotlabs/Module/Events.php:633
-msgid "Edit event"
-msgstr "Termin bearbeiten"
+#: ../../Zotlabs/Module/Profile_photo.php:137
+#: ../../Zotlabs/Module/Cover_photo.php:159
+msgid "Image resize failed."
+msgstr "Bild-Anpassung fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Events.php:635
-msgid "Delete event"
-msgstr "Termin löschen"
+#: ../../Zotlabs/Module/Profile_photo.php:196
+#: ../../addon/openclipatar/openclipatar.php:298
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
 
-#: ../../Zotlabs/Module/Events.php:669
-msgid "calendar"
-msgstr "Kalender"
+#: ../../Zotlabs/Module/Profile_photo.php:203
+#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:149
+msgid "Unable to process image"
+msgstr "Kann Bild nicht verarbeiten"
 
-#: ../../Zotlabs/Module/Events.php:695
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849
-msgid "Month"
-msgstr "Monat"
+#: ../../Zotlabs/Module/Profile_photo.php:238
+#: ../../Zotlabs/Module/Cover_photo.php:197
+msgid "Image upload failed."
+msgstr "Hochladen des Bilds fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Events.php:696
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850
-msgid "Week"
-msgstr "Woche"
+#: ../../Zotlabs/Module/Profile_photo.php:257
+#: ../../Zotlabs/Module/Cover_photo.php:214
+msgid "Unable to process image."
+msgstr "Kann Bild nicht verarbeiten."
 
-#: ../../Zotlabs/Module/Events.php:697
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851
-msgid "Day"
-msgstr "Tag"
+#: ../../Zotlabs/Module/Profile_photo.php:318
+#: ../../Zotlabs/Module/Profile_photo.php:365
+#: ../../Zotlabs/Module/Cover_photo.php:307
+#: ../../Zotlabs/Module/Cover_photo.php:322
+msgid "Photo not available."
+msgstr "Foto nicht verfügbar."
 
-#: ../../Zotlabs/Module/Events.php:731
-msgid "Event removed"
-msgstr "Termin gelöscht"
+#: ../../Zotlabs/Module/Profile_photo.php:420
+#: ../../Zotlabs/Module/Cover_photo.php:358
+msgid "Upload File:"
+msgstr "Datei hochladen:"
 
-#: ../../Zotlabs/Module/Events.php:734
-msgid "Failed to remove event"
-msgstr "Termin konnte nicht gelöscht werden"
+#: ../../Zotlabs/Module/Profile_photo.php:421
+#: ../../Zotlabs/Module/Cover_photo.php:359
+msgid "Select a profile:"
+msgstr "Wähle ein Profil:"
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
-msgstr "Kein Kanal."
+#: ../../Zotlabs/Module/Profile_photo.php:422
+msgid "Use Photo for Profile"
+msgstr "Foto für Profil verwenden"
 
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
-msgstr "Gemeinsame Verbindungen"
+#: ../../Zotlabs/Module/Profile_photo.php:422
+msgid "Upload Profile Photo"
+msgstr "Lade neues Profilfoto hoch"
 
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
-msgstr "Keine gemeinsamen Verbindungen."
+#: ../../Zotlabs/Module/Profile_photo.php:423
+#: ../../addon/openclipatar/openclipatar.php:182
+#: ../../addon/openclipatar/openclipatar.php:194
+msgid "Use"
+msgstr "Verwenden"
 
-#: ../../Zotlabs/Module/Chanview.php:134
-msgid "toggle full screen mode"
-msgstr "auf Vollbildmodus umschalten"
+#: ../../Zotlabs/Module/Profile_photo.php:429
+#: ../../Zotlabs/Module/Cover_photo.php:365
+msgid "skip this step"
+msgstr "diesen Schritt überspringen"
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr "Ungültiger Profil-Identifikator"
+#: ../../Zotlabs/Module/Profile_photo.php:429
+#: ../../Zotlabs/Module/Cover_photo.php:365
+msgid "select a photo from your photo albums"
+msgstr "ein Foto aus meinen Fotoalben"
 
-#: ../../Zotlabs/Module/Profperm.php:111
-msgid "Profile Visibility Editor"
-msgstr "Profil-Sichtbarkeits-Editor"
+#: ../../Zotlabs/Module/Profile_photo.php:448
+#: ../../Zotlabs/Module/Cover_photo.php:381
+msgid "Crop Image"
+msgstr "Bild zuschneiden"
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1367
-msgid "Profile"
-msgstr "Profil"
+#: ../../Zotlabs/Module/Profile_photo.php:449
+#: ../../Zotlabs/Module/Cover_photo.php:382
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu."
 
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Click on a contact to add or remove."
-msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
+#: ../../Zotlabs/Module/Profile_photo.php:451
+#: ../../Zotlabs/Module/Cover_photo.php:384
+msgid "Done Editing"
+msgstr "Bearbeitung fertigstellen"
 
-#: ../../Zotlabs/Module/Profperm.php:124
-msgid "Visible To"
-msgstr "Sichtbar für"
+#: ../../Zotlabs/Module/Chatsvc.php:131
+msgid "Away"
+msgstr "Abwesend"
 
-#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25
-#: ../../extend/addon/addon/chess/chess.php:400
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:26
-msgid "You must be logged in to see this page."
-msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
+#: ../../Zotlabs/Module/Chatsvc.php:136
+msgid "Online"
+msgstr "Online"
 
-#: ../../Zotlabs/Module/Channel.php:44
-msgid "Posts and comments"
-msgstr "Beiträge und Kommentare"
+#: ../../Zotlabs/Module/Item.php:185
+msgid "Unable to locate original post."
+msgstr "Originalbeitrag nicht gefunden."
 
-#: ../../Zotlabs/Module/Channel.php:45
-msgid "Only posts"
-msgstr "Nur Beiträge"
+#: ../../Zotlabs/Module/Item.php:451
+msgid "Empty post discarded."
+msgstr "Leeren Beitrag verworfen."
 
-#: ../../Zotlabs/Module/Channel.php:104
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
+#: ../../Zotlabs/Module/Item.php:825
+msgid "Duplicate post suppressed."
+msgstr "Doppelter Beitrag unterdrückt."
 
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr "Kein gültiges Konto gefunden."
+#: ../../Zotlabs/Module/Item.php:955
+msgid "System error. Post not saved."
+msgstr "Systemfehler. Beitrag nicht gespeichert."
 
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."
+#: ../../Zotlabs/Module/Item.php:1085
+msgid "Unable to obtain post information from database."
+msgstr "Beitragsinformationen können nicht aus der Datenbank abgerufen werden."
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#: ../../Zotlabs/Module/Item.php:1092
 #, php-format
-msgid "Site Member (%s)"
-msgstr "Nutzer (%s)"
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
 
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#: ../../Zotlabs/Module/Item.php:1099
 #, php-format
-msgid "Password reset requested at %s"
-msgstr "Passwort-Rücksetzung auf %s angefordert"
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
 
-#: ../../Zotlabs/Module/Lostpass.php:68
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
+#: ../../Zotlabs/Module/Ping.php:254
+msgid "sent you a private message"
+msgstr "hat Dir eine private Nachricht geschickt"
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1740
-msgid "Password Reset"
-msgstr "Zurücksetzen des Kennworts"
+#: ../../Zotlabs/Module/Ping.php:302
+msgid "added your channel"
+msgstr "hat deinen Kanal hinzugefügt"
 
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your password has been reset as requested."
-msgstr "Dein Passwort wurde wie angefordert neu erstellt."
+#: ../../Zotlabs/Module/Ping.php:312
+msgid "g A l F d"
+msgstr "l, d. F, G:i \\U\\h\\r"
 
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Your new password is"
-msgstr "Dein neues Passwort lautet"
+#: ../../Zotlabs/Module/Ping.php:330
+msgid "[today]"
+msgstr "[Heute]"
 
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "Save or copy your new password - and then"
-msgstr "Speichere oder kopiere Dein neues Passwort – und dann"
+#: ../../Zotlabs/Module/Ping.php:339
+msgid "posted an event"
+msgstr "hat einen Termin veröffentlicht"
 
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid "click here to login"
-msgstr "Klicke hier, um dich anzumelden"
+#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
+msgstr "Ungültiges Element."
 
-#: ../../Zotlabs/Module/Lostpass.php:96
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79
+#: ../../Zotlabs/Module/Display.php:122
+#: ../../Zotlabs/Lib/NativeWikiPage.php:500 ../../Zotlabs/Web/Router.php:146
+#: ../../include/help.php:68
+msgid "Page not found."
+msgstr "Seite nicht gefunden."
+
+#: ../../Zotlabs/Module/Page.php:131
 msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden."
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
+" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-#: ../../Zotlabs/Module/Lostpass.php:117
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Auf %s wurde Dein Passwort geändert"
+#: ../../Zotlabs/Module/Connedit.php:79
+msgid "Could not access contact record."
+msgstr "Konnte nicht auf den Kontakteintrag zugreifen."
 
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Forgot your Password?"
-msgstr "Kennwort vergessen?"
+#: ../../Zotlabs/Module/Connedit.php:109
+msgid "Could not locate selected profile."
+msgstr "Gewähltes Profil nicht gefunden."
 
-#: ../../Zotlabs/Module/Lostpass.php:131
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."
+#: ../../Zotlabs/Module/Connedit.php:246
+msgid "Connection updated."
+msgstr "Verbindung aktualisiert."
 
-#: ../../Zotlabs/Module/Lostpass.php:132
-msgid "Email Address"
-msgstr "E-Mail Adresse"
+#: ../../Zotlabs/Module/Connedit.php:248
+msgid "Failed to update connection record."
+msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
 
-#: ../../Zotlabs/Module/Lostpass.php:133
-msgid "Reset"
-msgstr "Zurücksetzen"
+#: ../../Zotlabs/Module/Connedit.php:298
+msgid "is now connected to"
+msgstr "ist jetzt verbunden mit"
 
-#: ../../Zotlabs/Module/Rbmark.php:94
-msgid "Select a bookmark folder"
-msgstr "Lesezeichenordner wählen"
+#: ../../Zotlabs/Module/Connedit.php:423
+msgid "Could not access address book record."
+msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen."
 
-#: ../../Zotlabs/Module/Rbmark.php:99
-msgid "Save Bookmark"
-msgstr "Lesezeichen speichern"
+#: ../../Zotlabs/Module/Connedit.php:471
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
 
-#: ../../Zotlabs/Module/Rbmark.php:100
-msgid "URL of bookmark"
-msgstr "URL des Lesezeichens"
+#: ../../Zotlabs/Module/Connedit.php:486 ../../Zotlabs/Module/Connedit.php:495
+#: ../../Zotlabs/Module/Connedit.php:504 ../../Zotlabs/Module/Connedit.php:513
+#: ../../Zotlabs/Module/Connedit.php:526
+msgid "Unable to set address book parameters."
+msgstr "Konnte die Adressbuch-Parameter nicht setzen."
 
-#: ../../Zotlabs/Module/Rbmark.php:105
-msgid "Or enter new bookmark folder name"
-msgstr "Oder gib einen neuen Namen für den Lesezeichenordner ein"
+#: ../../Zotlabs/Module/Connedit.php:550
+msgid "Connection has been removed."
+msgstr "Verbindung wurde gelöscht."
 
-#: ../../Zotlabs/Module/Follow.php:31
-msgid "Channel added."
-msgstr "Kanal hinzugefügt."
+#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:228
+#: ../../addon/openclipatar/openclipatar.php:57
+#: ../../include/conversation.php:982 ../../include/nav.php:106
+msgid "View Profile"
+msgstr "Profil ansehen"
 
-#: ../../Zotlabs/Module/Rmagic.php:35
-msgid "Authentication failed."
-msgstr "Authentifizierung fehlgeschlagen."
+#: ../../Zotlabs/Module/Connedit.php:593
+#, php-format
+msgid "View %s's profile"
+msgstr "%ss Profil ansehen"
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1991
-msgid "Remote Authentication"
-msgstr "Entfernte Authentifizierung"
+#: ../../Zotlabs/Module/Connedit.php:597
+msgid "Refresh Permissions"
+msgstr "Zugriffsrechte neu laden"
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1992
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
+#: ../../Zotlabs/Module/Connedit.php:600
+msgid "Fetch updated permissions"
+msgstr "Aktualisierte Zugriffsrechte abrufen"
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1993
-msgid "Authenticate"
-msgstr "Authentifizieren"
+#: ../../Zotlabs/Module/Connedit.php:604
+msgid "Refresh Photo"
+msgstr "Foto aktualisieren"
 
-#: ../../Zotlabs/Module/Regmod.php:15
-msgid "Please login."
-msgstr "Bitte melde dich an."
+#: ../../Zotlabs/Module/Connedit.php:607
+msgid "Fetch updated photo"
+msgstr "Aktualisiertes Profilfoto abrufen"
 
-#: ../../Zotlabs/Module/Removeaccount.php:35
-msgid ""
-"Account removals are not allowed within 48 hours of changing the account "
-"password."
-msgstr "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt."
+#: ../../Zotlabs/Module/Connedit.php:611
+msgid "Recent Activity"
+msgstr "Kürzliche Aktivitäten"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-msgid "Remove This Account"
-msgstr "Dieses Konto löschen"
+#: ../../Zotlabs/Module/Connedit.php:614
+msgid "View recent posts and comments"
+msgstr "Betrachte die neuesten Beiträge und Kommentare"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "WARNING: "
-msgstr "WARNUNG: "
+#: ../../Zotlabs/Module/Connedit.php:621
+msgid "Block (or Unblock) all communications with this connection"
+msgstr "Jegliche Kommunikation mit dieser Verbindung blockieren/zulassen"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-msgid ""
-"This account and all its channels will be completely removed from the "
-"network. "
-msgstr "Dieses Konto mit all seinen Kanälen wird vollständig aus dem Netzwerk gelöscht."
+#: ../../Zotlabs/Module/Connedit.php:622
+msgid "This connection is blocked!"
+msgstr "Die Verbindung ist geblockt!"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "This action is permanent and can not be undone!"
-msgstr "Dieser Schritt ist endgültig und kann nicht rückgängig gemacht werden!"
+#: ../../Zotlabs/Module/Connedit.php:626
+msgid "Unignore"
+msgstr "Nicht ignorieren"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
-#: ../../Zotlabs/Module/Removeme.php:62
-msgid "Please enter your password for verification:"
-msgstr "Bitte gib zur Bestätigung Dein Passwort ein:"
+#: ../../Zotlabs/Module/Connedit.php:629
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr "Jegliche eingehende Kommunikation von dieser Verbindung ignorieren/zulassen"
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
-msgid ""
-"Remove this account, all its channels and all its channel clones from the "
-"network"
-msgstr "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen"
+#: ../../Zotlabs/Module/Connedit.php:630
+msgid "This connection is ignored!"
+msgstr "Die Verbindung wird ignoriert!"
+
+#: ../../Zotlabs/Module/Connedit.php:634
+msgid "Unarchive"
+msgstr "Aus Archiv zurückholen"
+
+#: ../../Zotlabs/Module/Connedit.php:634
+msgid "Archive"
+msgstr "Archivieren"
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Zotlabs/Module/Connedit.php:637
 msgid ""
-"By default only the instances of the channels located on this hub will be "
-"removed from the network"
-msgstr "Standardmäßig werden nur die Kanalklone auf diesem $Projectname-Hub aus dem Netzwerk entfernt"
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr "Verbindung archivieren/aus dem Archiv zurückholen (Archiv = Kanal als erloschen markieren, aber die Beiträge behalten)"
 
-#: ../../Zotlabs/Module/Removeaccount.php:61
-#: ../../Zotlabs/Module/Settings/Account.php:120
-msgid "Remove Account"
-msgstr "Konto entfernen"
+#: ../../Zotlabs/Module/Connedit.php:638
+msgid "This connection is archived!"
+msgstr "Die Verbindung ist archiviert!"
 
-#: ../../Zotlabs/Module/Pdledit.php:21
-msgid "Layout updated."
-msgstr "Layout aktualisiert."
+#: ../../Zotlabs/Module/Connedit.php:642
+msgid "Unhide"
+msgstr "Wieder sichtbar machen"
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:218
-msgid "Feature disabled."
-msgstr "Funktion deaktiviert."
+#: ../../Zotlabs/Module/Connedit.php:642
+msgid "Hide"
+msgstr "Verstecken"
 
-#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69
-msgid "Edit System Page Description"
-msgstr "Systemseitenbeschreibung bearbeiten"
+#: ../../Zotlabs/Module/Connedit.php:645
+msgid "Hide or Unhide this connection from your other connections"
+msgstr "Diese Verbindung vor anderen Verbindungen verstecken/zeigen"
 
-#: ../../Zotlabs/Module/Pdledit.php:64
-msgid "Layout not found."
-msgstr "Layout nicht gefunden."
+#: ../../Zotlabs/Module/Connedit.php:646
+msgid "This connection is hidden!"
+msgstr "Die Verbindung ist versteckt!"
 
-#: ../../Zotlabs/Module/Pdledit.php:70
-msgid "Module Name:"
-msgstr "Modulname:"
+#: ../../Zotlabs/Module/Connedit.php:653
+msgid "Delete this connection"
+msgstr "Verbindung löschen"
 
-#: ../../Zotlabs/Module/Pdledit.php:71
-msgid "Layout Help"
-msgstr "Layout-Hilfe"
+#: ../../Zotlabs/Module/Connedit.php:661
+msgid "Fetch Vcard"
+msgstr "Vcard abrufen"
 
-#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
-msgid "Export Channel"
-msgstr "Kanal exportieren"
+#: ../../Zotlabs/Module/Connedit.php:664
+msgid "Fetch electronic calling card for this connection"
+msgstr "Rufe eine digitale Visitenkarte für diese Verbindung ab"
 
-#: ../../Zotlabs/Module/Uexport.php:59
-msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
-msgstr "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält."
+#: ../../Zotlabs/Module/Connedit.php:675
+msgid "Open Individual Permissions section by default"
+msgstr "Öffne standardmäßig den Bereich für individuelle Berechtigungen"
 
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export Content"
-msgstr "Kanal und Inhalte exportieren"
+#: ../../Zotlabs/Module/Connedit.php:698
+msgid "Affinity"
+msgstr "Beziehung"
 
-#: ../../Zotlabs/Module/Uexport.php:61
-msgid ""
-"Export your channel information and recent content to a JSON backup that can"
-" be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for"
-" this download to begin."
-msgstr "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet."
+#: ../../Zotlabs/Module/Connedit.php:701
+msgid "Open Set Affinity section by default"
+msgstr "Öffne standardmäßig den Bereich für Beziehungsgrad-Einstellungen"
 
-#: ../../Zotlabs/Module/Uexport.php:63
-msgid "Export your posts from a given year."
-msgstr "Exportiert die Beiträge des angegebenen Jahres."
+#: ../../Zotlabs/Module/Connedit.php:705 ../../Zotlabs/Widget/Affinity.php:26
+msgid "Me"
+msgstr "Ich"
 
-#: ../../Zotlabs/Module/Uexport.php:65
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
-msgstr "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne."
+#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Widget/Affinity.php:27
+msgid "Family"
+msgstr "Familie"
 
-#: ../../Zotlabs/Module/Uexport.php:66
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a "
-"href=\"%1$s\">%2$s</a>"
-msgstr "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1$s\">%2$s</a>."
+#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:29
+msgid "Acquaintances"
+msgstr "Bekannte"
 
-#: ../../Zotlabs/Module/Uexport.php:67
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
-msgstr "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1$s\">%2$s</a>."
+#: ../../Zotlabs/Module/Connedit.php:735
+msgid "Filter"
+msgstr "Filter"
 
-#: ../../Zotlabs/Module/Uexport.php:68
-#, php-format
-msgid ""
-"These content files may be imported or restored by visiting <a "
-"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
-" please import or restore these in date order (oldest first)."
-msgstr "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1$s\">%2$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst."
+#: ../../Zotlabs/Module/Connedit.php:738
+msgid "Open Custom Filter section by default"
+msgstr "Öffne standardmäßig den Bereich für benutzerdefinierte Filter"
 
-#: ../../Zotlabs/Module/Directory.php:246
-#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] "%d Bewertung"
-msgstr[1] "%d Bewertungen"
+#: ../../Zotlabs/Module/Connedit.php:775
+msgid "Approve this connection"
+msgstr "Verbindung genehmigen"
 
-#: ../../Zotlabs/Module/Directory.php:257
-msgid "Gender: "
-msgstr "Geschlecht:"
+#: ../../Zotlabs/Module/Connedit.php:775
+msgid "Accept connection to allow communication"
+msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen"
 
-#: ../../Zotlabs/Module/Directory.php:259
-msgid "Status: "
-msgstr "Status:"
+#: ../../Zotlabs/Module/Connedit.php:780
+msgid "Set Affinity"
+msgstr "Beziehung festlegen"
 
-#: ../../Zotlabs/Module/Directory.php:261
-msgid "Homepage: "
-msgstr "Webseite:"
+#: ../../Zotlabs/Module/Connedit.php:783
+msgid "Set Profile"
+msgstr "Profil festlegen"
 
-#: ../../Zotlabs/Module/Directory.php:310 ../../include/channel.php:1298
-msgid "Age:"
-msgstr "Alter:"
+#: ../../Zotlabs/Module/Connedit.php:786
+msgid "Set Affinity & Profile"
+msgstr "Beziehung und Profile festlegen"
 
-#: ../../Zotlabs/Module/Directory.php:315 ../../include/markdown.php:561
-#: ../../include/channel.php:1134 ../../include/event.php:52
-#: ../../include/event.php:84
-msgid "Location:"
-msgstr "Ort:"
+#: ../../Zotlabs/Module/Connedit.php:844
+msgid "none"
+msgstr "Keine"
 
-#: ../../Zotlabs/Module/Directory.php:321
-msgid "Description:"
-msgstr "Beschreibung:"
+#: ../../Zotlabs/Module/Connedit.php:847
+#: ../../Zotlabs/Widget/Settings_menu.php:107
+msgid "Connection Default Permissions"
+msgstr "Standardzugriffsrechte für neue Verbindungen:"
 
-#: ../../Zotlabs/Module/Directory.php:326 ../../include/channel.php:1314
-msgid "Hometown:"
-msgstr "Heimatstadt:"
+#: ../../Zotlabs/Module/Connedit.php:847 ../../include/items.php:3955
+#, php-format
+msgid "Connection: %s"
+msgstr "Verbindung: %s"
 
-#: ../../Zotlabs/Module/Directory.php:328 ../../include/channel.php:1322
-msgid "About:"
-msgstr "Über:"
+#: ../../Zotlabs/Module/Connedit.php:848
+msgid "Apply these permissions automatically"
+msgstr "Diese Berechtigungen automatisch anwenden"
 
-#: ../../Zotlabs/Module/Directory.php:329 ../../Zotlabs/Module/Suggest.php:56
-#: ../../include/connections.php:110 ../../include/conversation.php:938
-#: ../../include/conversation.php:1069 ../../include/widgets.php:148
-#: ../../include/widgets.php:185 ../../include/channel.php:1119
-msgid "Connect"
-msgstr "Verbinden"
+#: ../../Zotlabs/Module/Connedit.php:848
+msgid "Connection requests will be approved without your interaction"
+msgstr "Verbindungsanfragen werden sofort bestätigt, ohne dass Deine aktive Zustimmung erforderlich ist."
 
-#: ../../Zotlabs/Module/Directory.php:330
-msgid "Public Forum:"
-msgstr "Öffentliches Forum:"
+#: ../../Zotlabs/Module/Connedit.php:849
+msgid "Permission role"
+msgstr "Berechtigungsrolle"
 
-#: ../../Zotlabs/Module/Directory.php:333
-msgid "Keywords: "
-msgstr "Schlüsselwörter:"
+#: ../../Zotlabs/Module/Connedit.php:850
+msgid "Add permission role"
+msgstr "Berechtigungsrolle hinzufügen"
 
-#: ../../Zotlabs/Module/Directory.php:336
-msgid "Don't suggest"
-msgstr "Nicht vorschlagen"
+#: ../../Zotlabs/Module/Connedit.php:856
+msgid "This connection's primary address is"
+msgstr "Die Hauptadresse der Verbindung ist"
 
-#: ../../Zotlabs/Module/Directory.php:338
-msgid "Common connections:"
-msgstr "Gemeinsame Verbindungen:"
+#: ../../Zotlabs/Module/Connedit.php:857
+msgid "Available locations:"
+msgstr "Verfügbare Klone:"
 
-#: ../../Zotlabs/Module/Directory.php:387
-msgid "Global Directory"
-msgstr "Globales Verzeichnis"
+#: ../../Zotlabs/Module/Connedit.php:861
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr "Die auf dieser Seite angegebenen Berechtigungen werden auf alle neuen Verbindungen angewendet."
 
-#: ../../Zotlabs/Module/Directory.php:387
-msgid "Local Directory"
-msgstr "Lokales Verzeichnis"
+#: ../../Zotlabs/Module/Connedit.php:862
+msgid "Connection Tools"
+msgstr "Verbindungswerkzeuge"
 
-#: ../../Zotlabs/Module/Directory.php:393
-msgid "Finding:"
-msgstr "Ergebnisse:"
+#: ../../Zotlabs/Module/Connedit.php:864
+msgid "Slide to adjust your degree of friendship"
+msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
 
-#: ../../Zotlabs/Module/Directory.php:396 ../../Zotlabs/Module/Suggest.php:64
-#: ../../include/contact_widgets.php:24
-msgid "Channel Suggestions"
-msgstr "Kanal-Vorschläge"
+#: ../../Zotlabs/Module/Connedit.php:865 ../../Zotlabs/Module/Rate.php:155
+#: ../../include/js_strings.php:20
+msgid "Rating"
+msgstr "Bewertung"
 
-#: ../../Zotlabs/Module/Directory.php:398
-msgid "next page"
-msgstr "nächste Seite"
+#: ../../Zotlabs/Module/Connedit.php:866
+msgid "Slide to adjust your rating"
+msgstr "Verschieben, um Deine Bewertung einzustellen"
 
-#: ../../Zotlabs/Module/Directory.php:398
-msgid "previous page"
-msgstr "vorherige Seite"
+#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Connedit.php:872
+msgid "Optionally explain your rating"
+msgstr "Optional kannst Du Deine Bewertung begründen"
 
-#: ../../Zotlabs/Module/Directory.php:399
-msgid "Sort options"
-msgstr "Sortieroptionen"
+#: ../../Zotlabs/Module/Connedit.php:869
+msgid "Custom Filter"
+msgstr "Benutzerdefinierter Filter"
 
-#: ../../Zotlabs/Module/Directory.php:400
-msgid "Alphabetic"
-msgstr "alphabetisch"
+#: ../../Zotlabs/Module/Connedit.php:870
+msgid "Only import posts with this text"
+msgstr "Nur Beiträge mit diesem Text importieren"
 
-#: ../../Zotlabs/Module/Directory.php:401
-msgid "Reverse Alphabetic"
-msgstr "Entgegengesetzt alphabetisch"
+#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Connedit.php:871
+msgid ""
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr "Einzelne Wörter pro Zeile, #Tags oder /Reguläre Ausdrücke/. lang=xx (z.B. lang=de) ermöglicht Filterung nach Sprache. Leer lassen, um alle Beiträge zu importieren."
 
-#: ../../Zotlabs/Module/Directory.php:402
-msgid "Newest to Oldest"
-msgstr "Neueste zuerst"
+#: ../../Zotlabs/Module/Connedit.php:871
+msgid "Do not import posts with this text"
+msgstr "Beiträge mit diesem Text nicht importieren"
 
-#: ../../Zotlabs/Module/Directory.php:403
-msgid "Oldest to Newest"
-msgstr "Älteste zuerst"
+#: ../../Zotlabs/Module/Connedit.php:873
+msgid "This information is public!"
+msgstr "Diese Information ist öffentlich!"
 
-#: ../../Zotlabs/Module/Directory.php:420
-msgid "No entries (some entries may be hidden)."
-msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
+#: ../../Zotlabs/Module/Connedit.php:878
+msgid "Connection Pending Approval"
+msgstr "Verbindung wartet auf Bestätigung"
+
+#: ../../Zotlabs/Module/Connedit.php:883
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
+
+#: ../../Zotlabs/Module/Connedit.php:890
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can change those settings here but "
+"they wont have any impact unless the inherited setting changes."
+msgstr "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung. Werden geerbte Einstellungen hier geändert, hat dies keine Auswirkungen."
+
+#: ../../Zotlabs/Module/Connedit.php:891
+msgid "Last update:"
+msgstr "Letzte Aktualisierung:"
 
-#: ../../Zotlabs/Module/Chatsvc.php:131
-msgid "Away"
-msgstr "Abwesend"
+#: ../../Zotlabs/Module/Connedit.php:900
+msgid "Details"
+msgstr "Details"
 
-#: ../../Zotlabs/Module/Chatsvc.php:136
-msgid "Online"
-msgstr "Online"
+#: ../../Zotlabs/Module/Connedit.php:903 ../../addon/cdav/Mod_Cdav.php:1137
+msgid "Organisation"
+msgstr "Organisation"
 
-#: ../../Zotlabs/Module/Service_limits.php:23
-msgid "No service class restrictions found."
-msgstr "Keine Dienstklassenbeschränkungen gefunden."
+#: ../../Zotlabs/Module/Connedit.php:904 ../../addon/cdav/Mod_Cdav.php:1138
+#: ../../include/page_widgets.php:46
+msgid "Title"
+msgstr "Titel"
 
-#: ../../Zotlabs/Module/Webpages.php:52
-msgid "Import Webpage Elements"
-msgstr "Webseitenelemente importieren"
+#: ../../Zotlabs/Module/Connedit.php:905 ../../Zotlabs/Module/Profiles.php:789
+#: ../../addon/cdav/Mod_Cdav.php:1139
+msgid "Phone"
+msgstr "Telefon"
 
-#: ../../Zotlabs/Module/Webpages.php:53
-msgid "Import selected"
-msgstr "Import ausgewählt"
+#: ../../Zotlabs/Module/Connedit.php:907 ../../Zotlabs/Module/Profiles.php:791
+#: ../../addon/cdav/Mod_Cdav.php:1141
+msgid "Instant messenger"
+msgstr "Sofortnachrichtendienst"
 
-#: ../../Zotlabs/Module/Webpages.php:76
-msgid "Export Webpage Elements"
-msgstr "Webseitenelemente exportieren"
+#: ../../Zotlabs/Module/Connedit.php:908 ../../Zotlabs/Module/Profiles.php:792
+#: ../../addon/cdav/Mod_Cdav.php:1142
+msgid "Website"
+msgstr "Webseite"
 
-#: ../../Zotlabs/Module/Webpages.php:77
-msgid "Export selected"
-msgstr "Exportieren ausgewählt"
+#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:794
+#: ../../addon/cdav/Mod_Cdav.php:1144
+msgid "Note"
+msgstr "Hinweis"
 
-#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/conversation.php:1889
-msgid "Webpages"
-msgstr "Webseiten"
+#: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:795
+#: ../../addon/cdav/Mod_Cdav.php:1145 ../../addon/cdav/cdav.php:270
+#: ../../include/connections.php:668
+msgid "Mobile"
+msgstr "Mobil"
 
-#: ../../Zotlabs/Module/Webpages.php:252 ../../include/page_widgets.php:44
-msgid "Actions"
-msgstr "Aktionen"
+#: ../../Zotlabs/Module/Connedit.php:912 ../../Zotlabs/Module/Profiles.php:796
+#: ../../addon/cdav/Mod_Cdav.php:1146 ../../addon/cdav/cdav.php:271
+#: ../../include/connections.php:669
+msgid "Home"
+msgstr "Home"
 
-#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:45
-msgid "Page Link"
-msgstr "Seiten-Link"
+#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:797
+#: ../../addon/cdav/Mod_Cdav.php:1147 ../../addon/cdav/cdav.php:274
+#: ../../include/connections.php:672
+msgid "Work"
+msgstr "Arbeit"
 
-#: ../../Zotlabs/Module/Webpages.php:254
-msgid "Page Title"
-msgstr "Seitentitel"
+#: ../../Zotlabs/Module/Connedit.php:915 ../../Zotlabs/Module/Profiles.php:799
+#: ../../addon/cdav/Mod_Cdav.php:1149
+#: ../../addon/jappixmini/jappixmini.php:368
+msgid "Add Contact"
+msgstr "Kontakt hinzufügen"
 
-#: ../../Zotlabs/Module/Webpages.php:284
-msgid "Invalid file type."
-msgstr "Ungültiger Dateityp."
+#: ../../Zotlabs/Module/Connedit.php:916 ../../Zotlabs/Module/Profiles.php:800
+#: ../../addon/cdav/Mod_Cdav.php:1150
+msgid "Add Field"
+msgstr "Feld hinzufügen"
 
-#: ../../Zotlabs/Module/Webpages.php:296
-msgid "Error opening zip file"
-msgstr "Fehler beim Öffnen der ZIP-Datei"
+#: ../../Zotlabs/Module/Connedit.php:921 ../../addon/cdav/Mod_Cdav.php:1155
+msgid "P.O. Box"
+msgstr "Postfach"
 
-#: ../../Zotlabs/Module/Webpages.php:307
-msgid "Invalid folder path."
-msgstr "Ungültiger Ordnerpfad."
+#: ../../Zotlabs/Module/Connedit.php:922 ../../addon/cdav/Mod_Cdav.php:1156
+msgid "Additional"
+msgstr "Zusätzlich"
 
-#: ../../Zotlabs/Module/Webpages.php:334
-msgid "No webpage elements detected."
-msgstr "Keine Webseitenelemente erkannt."
+#: ../../Zotlabs/Module/Connedit.php:923 ../../addon/cdav/Mod_Cdav.php:1157
+msgid "Street"
+msgstr "Straße"
 
-#: ../../Zotlabs/Module/Webpages.php:409
-msgid "Import complete."
-msgstr "Import abgeschlossen."
+#: ../../Zotlabs/Module/Connedit.php:924 ../../addon/cdav/Mod_Cdav.php:1158
+msgid "Locality"
+msgstr "Ortschaft"
 
-#: ../../Zotlabs/Module/Removeme.php:35
-msgid ""
-"Channel removals are not allowed within 48 hours of changing the account "
-"password."
-msgstr "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden."
+#: ../../Zotlabs/Module/Connedit.php:925 ../../addon/cdav/Mod_Cdav.php:1159
+msgid "Region"
+msgstr "Region"
 
-#: ../../Zotlabs/Module/Removeme.php:60
-msgid "Remove This Channel"
-msgstr "Diesen Kanal löschen"
+#: ../../Zotlabs/Module/Connedit.php:926 ../../addon/cdav/Mod_Cdav.php:1160
+msgid "ZIP Code"
+msgstr "Postleitzahl"
 
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "This channel will be completely removed from the network. "
-msgstr "Dieser Kanal wird vollständig aus dem Netzwerk gelöscht."
+#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:760
+#: ../../addon/cdav/Mod_Cdav.php:1161
+msgid "Country"
+msgstr "Land"
 
-#: ../../Zotlabs/Module/Removeme.php:63
-msgid "Remove this channel and all its clones from the network"
-msgstr "Lösche diesen Kanal und all seine Klone aus dem Netzwerk"
+#: ../../Zotlabs/Module/Chat.php:179
+msgid "Room not found"
+msgstr "Chatraum nicht gefunden"
 
-#: ../../Zotlabs/Module/Removeme.php:63
-msgid ""
-"By default only the instance of the channel located on this hub will be "
-"removed from the network"
-msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"
+#: ../../Zotlabs/Module/Chat.php:195
+msgid "Leave Room"
+msgstr "Raum verlassen"
 
-#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:575
-msgid "Remove Channel"
-msgstr "Kanal löschen"
+#: ../../Zotlabs/Module/Chat.php:196
+msgid "Delete Room"
+msgstr "Raum löschen"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:98
-msgid "Files: shared with me"
-msgstr "Dateien, die mit mir geteilt wurden"
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "I am away right now"
+msgstr "Ich bin gerade nicht da"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:100
-msgid "NEW"
-msgstr "NEU"
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "I am online"
+msgstr "Ich bin online"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:103
-msgid "Remove all files"
-msgstr "Alle Dateien löschen"
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "Bookmark this room"
+msgstr "Lesezeichen für diesen Raum setzen"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
-msgid "Remove this file"
-msgstr "Diese Datei löschen"
+#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:259
+#: ../../Zotlabs/Module/Mail.php:380 ../../include/conversation.php:1263
+msgid "Please enter a link URL:"
+msgstr "Gib eine URL ein:"
 
-#: ../../Zotlabs/Module/Wiki.php:29
-msgid "Profile Unavailable."
-msgstr "Profil nicht verfügbar."
+#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:312
+#: ../../Zotlabs/Module/Mail.php:454 ../../Zotlabs/Lib/ThreadItem.php:744
+#: ../../include/conversation.php:1373
+msgid "Encrypt text"
+msgstr "Text verschlüsseln"
 
-#: ../../Zotlabs/Module/Wiki.php:43
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:40
-msgid "Not found"
-msgstr "Nicht gefunden"
+#: ../../Zotlabs/Module/Chat.php:230
+msgid "New Chatroom"
+msgstr "Neuer Chatraum"
 
-#: ../../Zotlabs/Module/Wiki.php:67
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:60
-msgid "Invalid channel"
-msgstr "Ungültiger Kanal"
+#: ../../Zotlabs/Module/Chat.php:231
+msgid "Chatroom name"
+msgstr "Chatraumname"
 
-#: ../../Zotlabs/Module/Wiki.php:158
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:144
-#: ../../include/conversation.php:1900
-msgid "Wikis"
-msgstr "Wikis"
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "Expiration of chats (minutes)"
+msgstr "Verfall von Chats (Minuten)"
 
-#: ../../Zotlabs/Module/Wiki.php:164
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:150
-msgid "Download"
-msgstr "Herunterladen"
+#: ../../Zotlabs/Module/Chat.php:248
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "%1$ss Chaträume"
 
-#: ../../Zotlabs/Module/Wiki.php:168
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154
-msgid "Wiki name"
-msgstr "Name des Wiki"
+#: ../../Zotlabs/Module/Chat.php:253
+msgid "No chatrooms available"
+msgstr "Keine Chaträume verfügbar"
 
-#: ../../Zotlabs/Module/Wiki.php:169
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155
-msgid "Content type"
-msgstr "Inhaltstyp"
+#: ../../Zotlabs/Module/Chat.php:257
+msgid "Expiration"
+msgstr "Verfall"
 
-#: ../../Zotlabs/Module/Wiki.php:178
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
-msgid "Create a status post for this wiki"
-msgstr "Erzeuge einen Statusbeitrag für dieses Wiki"
+#: ../../Zotlabs/Module/Chat.php:258
+msgid "min"
+msgstr "min"
 
-#: ../../Zotlabs/Module/Wiki.php:203
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:183
-msgid "Wiki not found"
-msgstr "Wiki nicht gefunden"
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
+#: ../../include/conversation.php:1783 ../../include/nav.php:392
+msgid "Photos"
+msgstr "Fotos"
 
-#: ../../Zotlabs/Module/Wiki.php:227
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:208
-msgid "Rename page"
-msgstr "Seite umbenennen"
+#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:224
+#: ../../Zotlabs/Storage/Browser.php:224 ../../include/conversation.php:1791
+#: ../../include/nav.php:400
+msgid "Files"
+msgstr "Dateien"
 
-#: ../../Zotlabs/Module/Wiki.php:231
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:212
-msgid "Error retrieving page content"
-msgstr "Fehler beim Abrufen des Seiteninhalts"
+#: ../../Zotlabs/Module/Menu.php:49
+msgid "Unable to update menu."
+msgstr "Kann Menü nicht aktualisieren."
 
-#: ../../Zotlabs/Module/Wiki.php:261
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:241
-msgid "Revision Comparison"
-msgstr "Revisionsvergleich"
+#: ../../Zotlabs/Module/Menu.php:60
+msgid "Unable to create menu."
+msgstr "Kann Menü nicht erstellen."
 
-#: ../../Zotlabs/Module/Wiki.php:262
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
-msgid "Revert"
-msgstr "Rückgängig machen"
+#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+msgid "Menu Name"
+msgstr "Name des Menüs"
 
-#: ../../Zotlabs/Module/Wiki.php:266
-msgid "Short description of your changes (optional)"
-msgstr "Kurze Beschreibung Ihrer Änderungen (optional)"
+#: ../../Zotlabs/Module/Menu.php:98
+msgid "Unique name (not visible on webpage) - required"
+msgstr "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich"
 
-#: ../../Zotlabs/Module/Wiki.php:273
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251
-msgid "Source"
-msgstr "Quelle"
+#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+msgid "Menu Title"
+msgstr "Menütitel"
 
-#: ../../Zotlabs/Module/Wiki.php:281
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:259
-msgid "New page name"
-msgstr "Neuer Seitenname"
+#: ../../Zotlabs/Module/Menu.php:99
+msgid "Visible on webpage - leave empty for no title"
+msgstr "Sichtbar auf der Webseite – für keinen Titel leer lassen"
 
-#: ../../Zotlabs/Module/Wiki.php:286
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:264
-#: ../../include/conversation.php:1299
-msgid "Embed image from photo albums"
-msgstr "Bild aus Fotoalben einbetten"
+#: ../../Zotlabs/Module/Menu.php:100
+msgid "Allow Bookmarks"
+msgstr "Lesezeichen erlauben"
 
-#: ../../Zotlabs/Module/Wiki.php:287
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
-#: ../../include/conversation.php:1393
-msgid "Embed an image from your albums"
-msgstr "Betten Sie ein Bild aus Ihren Alben ein"
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+msgid "Menu may be used to store saved bookmarks"
+msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
 
-#: ../../Zotlabs/Module/Wiki.php:289
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267
-#: ../../include/conversation.php:1395 ../../include/conversation.php:1442
-msgid "OK"
-msgstr "Ok"
+#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+msgid "Submit and proceed"
+msgstr "Absenden und fortfahren"
 
-#: ../../Zotlabs/Module/Wiki.php:290
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
-#: ../../include/conversation.php:1335
-msgid "Choose images to embed"
-msgstr "Wählen Sie Bilder zum Einbetten aus"
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2268
+msgid "Menus"
+msgstr "Menüs"
 
-#: ../../Zotlabs/Module/Wiki.php:291
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
-#: ../../include/conversation.php:1336
-msgid "Choose an album"
-msgstr "Wählen Sie ein Album aus"
+#: ../../Zotlabs/Module/Menu.php:117
+msgid "Bookmarks allowed"
+msgstr "Lesezeichen erlaubt"
 
-#: ../../Zotlabs/Module/Wiki.php:292
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
-msgid "Choose a different album"
-msgstr "Wählen Sie ein anderes Album aus"
+#: ../../Zotlabs/Module/Menu.php:119
+msgid "Delete this menu"
+msgstr "Lösche dieses Menü"
 
-#: ../../Zotlabs/Module/Wiki.php:293
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
-#: ../../include/conversation.php:1338
-msgid "Error getting album list"
-msgstr "Fehler beim Holen der Albenliste"
+#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+msgid "Edit menu contents"
+msgstr "Bearbeite Menü Inhalte"
 
-#: ../../Zotlabs/Module/Wiki.php:294
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
-#: ../../include/conversation.php:1339
-msgid "Error getting photo link"
-msgstr "Fehler beim Holen des Fotolinks"
+#: ../../Zotlabs/Module/Menu.php:121
+msgid "Edit this menu"
+msgstr "Dieses Menü bearbeiten"
 
-#: ../../Zotlabs/Module/Wiki.php:295
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
-#: ../../include/conversation.php:1340
-msgid "Error getting album"
-msgstr "Fehler beim Holen des Albums"
+#: ../../Zotlabs/Module/Menu.php:136
+msgid "Menu could not be deleted."
+msgstr "Menü konnte nicht gelöscht werden."
 
-#: ../../Zotlabs/Module/Wiki.php:364
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
-msgid "Error creating wiki. Invalid name."
-msgstr "Fehler beim Erstellen des Wiki. Ungültiger Name."
+#: ../../Zotlabs/Module/Menu.php:149
+msgid "Edit Menu"
+msgstr "Menü bearbeiten"
 
-#: ../../Zotlabs/Module/Wiki.php:376
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
-msgid "Wiki created, but error creating Home page."
-msgstr "Das Wiki wurde erzeugt, aber es gab einen Fehler bei der Erstellung der Startseite"
+#: ../../Zotlabs/Module/Menu.php:153
+msgid "Add or remove entries to this menu"
+msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
 
-#: ../../Zotlabs/Module/Wiki.php:383
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
-msgid "Error creating wiki"
-msgstr "Fehler beim Erstellen des Wiki"
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Menu name"
+msgstr "Menü Name"
 
-#: ../../Zotlabs/Module/Wiki.php:395
-msgid "Wiki delete permission denied."
-msgstr "Wiki-Löschberechtigung verweigert."
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Must be unique, only seen by you"
+msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar"
 
-#: ../../Zotlabs/Module/Wiki.php:405
-msgid "Error deleting wiki"
-msgstr "Fehler beim Löschen des Wiki"
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title"
+msgstr "Menü Titel"
 
-#: ../../Zotlabs/Module/Wiki.php:431
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
-msgid "New page created"
-msgstr "Neue Seite erstellt"
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title as seen by others"
+msgstr "Menü Titel wie er von anderen gesehen wird"
 
-#: ../../Zotlabs/Module/Wiki.php:546
-msgid "Cannot delete Home"
-msgstr "Kann die Startseite nicht löschen"
+#: ../../Zotlabs/Module/Menu.php:157
+msgid "Allow bookmarks"
+msgstr "Erlaube Lesezeichen"
 
-#: ../../Zotlabs/Module/Wiki.php:610
-msgid "Current Revision"
-msgstr "Aktuelle Revision"
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2269
+msgid "Layouts"
+msgstr "Layouts"
 
-#: ../../Zotlabs/Module/Wiki.php:610
-msgid "Selected Revision"
-msgstr "Ausgewählte Revision"
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232
+#: ../../include/nav.php:161 ../../include/nav.php:268
+#: ../../include/help.php:55 ../../include/help.php:61
+msgid "Help"
+msgstr "Hilfe"
 
-#: ../../Zotlabs/Module/Wiki.php:660
-msgid "You must be authenticated."
-msgstr "Sie müssen authenzifiziert sein."
+#: ../../Zotlabs/Module/Layouts.php:186
+msgid "Comanche page description language help"
+msgstr "Hilfe zur Comanche-Seitenbeschreibungssprache"
 
-#: ../../Zotlabs/Module/Sources.php:37
-msgid "Failed to create source. No channel selected."
-msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."
+#: ../../Zotlabs/Module/Layouts.php:190
+msgid "Layout Description"
+msgstr "Layout-Beschreibung"
 
-#: ../../Zotlabs/Module/Sources.php:51
-msgid "Source created."
-msgstr "Quelle erstellt."
+#: ../../Zotlabs/Module/Layouts.php:195
+msgid "Download PDL file"
+msgstr "PDL-Datei herunterladen"
 
-#: ../../Zotlabs/Module/Sources.php:64
-msgid "Source updated."
-msgstr "Quelle aktualisiert."
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:274
+msgid "post"
+msgstr "Beitrag"
 
-#: ../../Zotlabs/Module/Sources.php:90
-msgid "*"
-msgstr "*"
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146
+#: ../../include/text.php:1945
+msgid "comment"
+msgstr "Kommentar"
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:691
-#: ../../include/features.php:213
-msgid "Channel Sources"
-msgstr "Kanal-Quellen"
+#: ../../Zotlabs/Module/Tagger.php:95
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet"
 
-#: ../../Zotlabs/Module/Sources.php:97
-msgid "Manage remote sources of content for your channel."
-msgstr "Externe Inhaltsquellen für Deinen Kanal verwalten."
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert."
 
-#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
-msgid "New Source"
-msgstr "Neue Quelle"
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
+msgstr "Konfigurationseditor"
 
-#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
+#: ../../Zotlabs/Module/Pconfig.php:49
 msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
-msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird."
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
-msgid "Only import content with these words (one per line)"
-msgstr "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
+#: ../../Zotlabs/Module/Group.php:24
+msgid "Privacy group created."
+msgstr "Gruppe wurde erstellt."
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
-msgid "Leave blank to import all public content"
-msgstr "Leer lassen, um alle öffentlichen Beiträge zu importieren"
+#: ../../Zotlabs/Module/Group.php:30
+msgid "Could not create privacy group."
+msgstr "Gruppe konnte nicht erstellt werden."
 
-#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
-msgid "Channel Name"
-msgstr "Name des Kanals"
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
+#: ../../include/items.php:3922
+msgid "Privacy group not found."
+msgstr "Gruppe nicht gefunden."
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
-msgid ""
-"Add the following categories to posts imported from this source (comma "
-"separated)"
-msgstr "Füge die folgenden Kategorien zu Beiträgen, die aus dieser Quelle importiert werden, hinzu (kommagetrennt)"
+#: ../../Zotlabs/Module/Group.php:58
+msgid "Privacy group updated."
+msgstr "Gruppe wurde aktualisiert."
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-msgid "Optional"
-msgstr "Optional"
+#: ../../Zotlabs/Module/Group.php:90
+msgid "Create a group of channels."
+msgstr "Erstelle eine Gruppe für Kanäle."
 
-#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
-msgid "Source not found."
-msgstr "Quelle nicht gefunden."
+#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+msgid "Privacy group name: "
+msgstr "Gruppenname:"
 
-#: ../../Zotlabs/Module/Sources.php:140
-msgid "Edit Source"
-msgstr "Quelle bearbeiten"
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+msgid "Members are visible to other channels"
+msgstr "Mitglieder sind sichtbar für andere Kanäle"
 
-#: ../../Zotlabs/Module/Sources.php:141
-msgid "Delete Source"
-msgstr "Quelle löschen"
+#: ../../Zotlabs/Module/Group.php:111
+msgid "Privacy group removed."
+msgstr "Gruppe wurde entfernt."
 
-#: ../../Zotlabs/Module/Sources.php:169
-msgid "Source removed"
-msgstr "Quelle gelöscht"
+#: ../../Zotlabs/Module/Group.php:113
+msgid "Unable to remove privacy group."
+msgstr "Gruppe konnte nicht entfernt werden."
 
-#: ../../Zotlabs/Module/Sources.php:171
-msgid "Unable to remove source."
-msgstr "Konnte die Quelle nicht löschen."
+#: ../../Zotlabs/Module/Group.php:183
+msgid "Privacy group editor"
+msgstr "Gruppeneditor"
 
-#: ../../Zotlabs/Module/Subthread.php:118
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s folgt nun %2$ss %3$s"
+#: ../../Zotlabs/Module/Group.php:197 ../../Zotlabs/Module/Help.php:81
+msgid "Members"
+msgstr "Mitglieder"
 
-#: ../../Zotlabs/Module/Subthread.php:120
-#, php-format
-msgid "%1$s stopped following %2$s's %3$s"
-msgstr "%1$s folgt %2$ss %3$s nicht mehr"
+#: ../../Zotlabs/Module/Group.php:199
+msgid "All Connected Channels"
+msgstr "Alle verbundenen Kanäle"
 
-#: ../../Zotlabs/Module/Suggest.php:39
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal."
+#: ../../Zotlabs/Module/Group.php:231
+msgid "Click on a channel to add or remove."
+msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
 
-#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:150
-msgid "Ignore/Hide"
-msgstr "Ignorieren/Verstecken"
+#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
+#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659
+msgid "Profile not found."
+msgstr "Profil nicht gefunden."
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:274
-msgid "post"
-msgstr "Beitrag"
+#: ../../Zotlabs/Module/Profiles.php:44
+msgid "Profile deleted."
+msgstr "Profil gelöscht."
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
-#: ../../include/text.php:1961
-msgid "comment"
-msgstr "Kommentar"
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
+msgid "Profile-"
+msgstr "Profil-"
 
-#: ../../Zotlabs/Module/Tagger.php:95
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet"
+#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
+msgid "New profile created."
+msgstr "Neues Profil erstellt."
 
-#: ../../Zotlabs/Module/Settings/Features.php:45
-msgid "Additional Features"
-msgstr "Zusätzliche Funktionen"
+#: ../../Zotlabs/Module/Profiles.php:111
+msgid "Profile unavailable to clone."
+msgstr "Profil kann nicht geklont werden."
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:34
-msgid "Name is required"
-msgstr "Name ist erforderlich"
+#: ../../Zotlabs/Module/Profiles.php:146
+msgid "Profile unavailable to export."
+msgstr "Dieses Profil kann nicht exportiert werden."
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:38
-msgid "Key and Secret are required"
-msgstr "Schlüssel und Geheimnis werden benötigt"
+#: ../../Zotlabs/Module/Profiles.php:252
+msgid "Profile Name is required."
+msgstr "Profil-Name erforderlich."
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:86
-#: ../../Zotlabs/Module/Settings/Oauth.php:112
-#: ../../Zotlabs/Module/Settings/Oauth.php:148
-msgid "Add application"
-msgstr "Anwendung hinzufügen"
+#: ../../Zotlabs/Module/Profiles.php:459
+msgid "Marital Status"
+msgstr "Familienstand"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-msgid "Name of application"
-msgstr "Name der Anwendung"
+#: ../../Zotlabs/Module/Profiles.php:463
+msgid "Romantic Partner"
+msgstr "Romantische Partner"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth.php:116
-#: ../../extend/addon/addon/statusnet/statusnet.php:893
-#: ../../extend/addon/addon/twitter/twitter.php:775
-msgid "Consumer Key"
-msgstr "Consumer Key"
+#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775
+msgid "Likes"
+msgstr "Gefällt"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"
+#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776
+msgid "Dislikes"
+msgstr "Gefällt nicht"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:117
-#: ../../extend/addon/addon/statusnet/statusnet.php:892
-#: ../../extend/addon/addon/twitter/twitter.php:776
-msgid "Consumer Secret"
-msgstr "Consumer Secret"
+#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783
+msgid "Work/Employment"
+msgstr "Arbeit/Anstellung"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-#: ../../Zotlabs/Module/Settings/Oauth.php:118
-msgid "Redirect"
-msgstr "Umleitung"
+#: ../../Zotlabs/Module/Profiles.php:478
+msgid "Religion"
+msgstr "Religion"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires "
-"this"
-msgstr "Umleitungs-URl – lasse das leer, solange Deine Anwendung es nicht explizit erfordert"
+#: ../../Zotlabs/Module/Profiles.php:482
+msgid "Political Views"
+msgstr "Politische Ansichten"
+
+#: ../../Zotlabs/Module/Profiles.php:486
+#: ../../addon/openid/MysqlProvider.php:74
+msgid "Gender"
+msgstr "Geschlecht"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-#: ../../Zotlabs/Module/Settings/Oauth.php:119
-msgid "Icon url"
-msgstr "Symbol-URL"
+#: ../../Zotlabs/Module/Profiles.php:490
+msgid "Sexual Preference"
+msgstr "Sexuelle Orientierung"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:104
-msgid "Application not found."
-msgstr "Die Anwendung wurde nicht gefunden."
+#: ../../Zotlabs/Module/Profiles.php:494
+msgid "Homepage"
+msgstr "Webseite"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:147
-msgid "Connected Apps"
-msgstr "Verbundene Apps"
+#: ../../Zotlabs/Module/Profiles.php:498
+msgid "Interests"
+msgstr "Hobbys/Interessen"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:151
-msgid "Client key starts with"
-msgstr "Client Key beginnt mit"
+#: ../../Zotlabs/Module/Profiles.php:594
+msgid "Profile updated."
+msgstr "Profil aktualisiert."
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:152
-msgid "No name"
-msgstr "Kein Name"
+#: ../../Zotlabs/Module/Profiles.php:678
+msgid "Hide your connections list from viewers of this profile"
+msgstr "Deine Verbindungen vor Betrachtern dieses Profils verbergen"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:153
-msgid "Remove authorization"
-msgstr "Authorisierung aufheben"
+#: ../../Zotlabs/Module/Profiles.php:725
+msgid "Edit Profile Details"
+msgstr "Bearbeite Profil-Details"
 
-#: ../../Zotlabs/Module/Settings/Account.php:20
-msgid "Not valid email."
-msgstr "Keine gültige E-Mail Adresse."
+#: ../../Zotlabs/Module/Profiles.php:727
+msgid "View this profile"
+msgstr "Dieses Profil ansehen"
 
-#: ../../Zotlabs/Module/Settings/Account.php:23
-msgid "Protected email address. Cannot change to that email."
-msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
+#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
+#: ../../include/channel.php:1066
+msgid "Edit visibility"
+msgstr "Sichtbarkeit bearbeiten"
 
-#: ../../Zotlabs/Module/Settings/Account.php:32
-msgid "System failure storing new email. Please try again."
-msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
+#: ../../Zotlabs/Module/Profiles.php:729
+msgid "Profile Tools"
+msgstr "Profilwerkzeuge"
 
-#: ../../Zotlabs/Module/Settings/Account.php:40
-msgid "Technical skill level updated"
-msgstr "Technische Qualifikationsstufe aktualisiert"
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Change cover photo"
+msgstr "Titelbild ändern"
 
-#: ../../Zotlabs/Module/Settings/Account.php:56
-msgid "Password verification failed."
-msgstr "Passwortüberprüfung fehlgeschlagen."
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
+msgid "Change profile photo"
+msgstr "Profilfoto ändern"
 
-#: ../../Zotlabs/Module/Settings/Account.php:63
-msgid "Passwords do not match. Password unchanged."
-msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Create a new profile using these settings"
+msgstr "Neues Profil anlegen und diese Einstellungen übernehmen"
 
-#: ../../Zotlabs/Module/Settings/Account.php:67
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Clone this profile"
+msgstr "Dieses Profil klonen"
 
-#: ../../Zotlabs/Module/Settings/Account.php:81
-msgid "Password changed."
-msgstr "Kennwort geändert."
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Delete this profile"
+msgstr "Dieses Profil löschen"
 
-#: ../../Zotlabs/Module/Settings/Account.php:83
-msgid "Password update failed. Please try again."
-msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Add profile things"
+msgstr "Sachen zum Profil hinzufügen"
 
-#: ../../Zotlabs/Module/Settings/Account.php:112
-msgid "Account Settings"
-msgstr "Konto-Einstellungen"
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1657
+msgid "Personal"
+msgstr "Persönlich"
 
-#: ../../Zotlabs/Module/Settings/Account.php:113
-msgid "Current Password"
-msgstr "Aktuelles Passwort"
+#: ../../Zotlabs/Module/Profiles.php:738
+msgid "Relation"
+msgstr "Beziehung"
 
-#: ../../Zotlabs/Module/Settings/Account.php:114
-msgid "Enter New Password"
-msgstr "Gib ein neues Passwort ein"
+#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
-msgid "Confirm New Password"
-msgstr "Bestätige das neue Passwort"
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Import profile from file"
+msgstr "Profil aus einer Datei importieren"
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
-msgid "Leave password fields blank unless changing"
-msgstr "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern"
+#: ../../Zotlabs/Module/Profiles.php:742
+msgid "Export profile to file"
+msgstr "Profil in eine Datei exportieren"
 
-#: ../../Zotlabs/Module/Settings/Account.php:116
-msgid "Your technical skill level"
-msgstr "Deine technische Qualifikationsstufe"
+#: ../../Zotlabs/Module/Profiles.php:743
+msgid "Your gender"
+msgstr "Dein Geschlecht"
 
-#: ../../Zotlabs/Module/Settings/Account.php:116
-msgid "Used to provide a member experience matched to your comfort level"
-msgstr "Dies wird verwendet, um Dir eine Benutzererfahrung  passend zu Deiner technischen Qualifikationsstufe zu bieten."
+#: ../../Zotlabs/Module/Profiles.php:744
+msgid "Marital status"
+msgstr "Familienstand"
 
-#: ../../Zotlabs/Module/Settings/Account.php:119
-#: ../../Zotlabs/Module/Settings/Channel.php:483
-msgid "Email Address:"
-msgstr "Email Adresse:"
+#: ../../Zotlabs/Module/Profiles.php:745
+msgid "Sexual preference"
+msgstr "Sexuelle Orientierung"
 
-#: ../../Zotlabs/Module/Settings/Account.php:121
-msgid "Remove this account including all its channels"
-msgstr "Dieses Konto inklusive all seiner Kanäle löschen"
+#: ../../Zotlabs/Module/Profiles.php:748
+msgid "Profile name"
+msgstr "Profilname"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:31
-#, php-format
-msgid "This channel is limited to %d tokens"
-msgstr "Dieser Kanal ist auf %d Token begrenzt"
+#: ../../Zotlabs/Module/Profiles.php:750
+msgid "This is your default profile."
+msgstr "Das ist Dein Standardprofil."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:37
-msgid "Name and Password are required."
-msgstr "Name und Passwort sind erforderlich."
+#: ../../Zotlabs/Module/Profiles.php:752
+msgid "Your full name"
+msgstr "Dein voller Name"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:77
-msgid "Token saved."
-msgstr "Token gespeichert."
+#: ../../Zotlabs/Module/Profiles.php:753
+msgid "Title/Description"
+msgstr "Titel/Beschreibung"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:113
-msgid ""
-"Use this form to create temporary access identifiers to share things with "
-"non-members. These identities may be used in Access Control Lists and "
-"visitors may login using these credentials to access private content."
-msgstr "Mit diesem Formular kannst Du temporäre Zugangs-IDs anlegen, um Inhalte mit Nicht-Mitgliedern zu teilen. Die IDs können in Berechtigungslisten (ACLs) verwendet werden, und Besucher können sich damit einloggen, um auf private Inhalte zuzugreifen."
+#: ../../Zotlabs/Module/Profiles.php:756
+msgid "Street address"
+msgstr "Straße und Hausnummer"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:115
-msgid ""
-"You may also provide <em>dropbox</em> style access links to friends and "
-"associates by adding the Login Password to any specific site URL as shown. "
-"Examples:"
-msgstr "Du kannst auch <em>Dropbox</em>-ähnliche Zugriffslinks an Andere weitergeben, indem du das Login-Passwort an eine entsprechende URL anhängst wie nachfolgend gezeigt. Beispiele:"
+#: ../../Zotlabs/Module/Profiles.php:757
+msgid "Locality/City"
+msgstr "Wohnort"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:150 ../../include/widgets.php:658
-msgid "Guest Access Tokens"
-msgstr "Gastzugangstoken"
+#: ../../Zotlabs/Module/Profiles.php:758
+msgid "Region/State"
+msgstr "Region/Bundesstaat"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:157
-msgid "Login Name"
-msgstr "Anmeldename"
+#: ../../Zotlabs/Module/Profiles.php:759
+msgid "Postal/Zip code"
+msgstr "Postleitzahl"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:158
-msgid "Login Password"
-msgstr "Anmeldepasswort"
+#: ../../Zotlabs/Module/Profiles.php:765
+msgid "Who (if applicable)"
+msgstr "Wer (falls anwendbar)"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:159
-msgid "Expires (yyyy-mm-dd)"
-msgstr "Läuft ab (jjjj-mm-tt)"
+#: ../../Zotlabs/Module/Profiles.php:765
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:20
-msgid "Affinity Slider settings updated."
-msgstr "Die Beziehungsgrad-Schieberegler-Einstellungen wurden aktualisiert."
+#: ../../Zotlabs/Module/Profiles.php:766
+msgid "Since (date)"
+msgstr "Seit (Datum)"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:34
-msgid "No feature settings configured"
-msgstr "Keine Funktions-Einstellungen konfiguriert"
+#: ../../Zotlabs/Module/Profiles.php:769
+msgid "Tell us about yourself"
+msgstr "Erzähle uns ein wenig von Dir"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:41
-msgid "Default maximum affinity level"
-msgstr "Voreinstellung für maximalen Beziehungsgrad"
+#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../addon/openid/MysqlProvider.php:68
+msgid "Homepage URL"
+msgstr "Homepage-URL"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:46
-msgid "Default minimum affinity level"
-msgstr "Voreinstellung für minimalen Beziehungsgrad"
+#: ../../Zotlabs/Module/Profiles.php:771
+msgid "Hometown"
+msgstr "Heimatort"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
-msgid "Affinity Slider Settings"
-msgstr "Beziehungsgrad-Schieberegler-Einstellungen"
+#: ../../Zotlabs/Module/Profiles.php:772
+msgid "Political views"
+msgstr "Politische Ansichten"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:60
-msgid "Feature/Addon Settings"
-msgstr "Funktions-/Addon-Einstellungen"
+#: ../../Zotlabs/Module/Profiles.php:773
+msgid "Religious views"
+msgstr "Religiöse Ansichten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:251
-#: ../../extend/addon/addon/logrot/logrot.php:54
-#: ../../extend/addon/addon/msgfooter/msgfooter.php:54
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:184
-#: ../../extend/addon/addon/piwik/piwik.php:116
-#: ../../extend/addon/addon/twitter/twitter.php:766
-#: ../../extend/addon/addon/xmpp/xmpp.php:102
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:82
-msgid "Settings updated."
-msgstr "Einstellungen aktualisiert."
+#: ../../Zotlabs/Module/Profiles.php:774
+msgid "Keywords used in directory listings"
+msgstr "Schlüsselwörter, die in Verzeichnis-Auflistungen verwendet werden"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:312
-msgid "Nobody except yourself"
-msgstr "Niemand außer Dir selbst"
+#: ../../Zotlabs/Module/Profiles.php:774
+msgid "Example: fishing photography software"
+msgstr "Beispiel: Angeln Fotografie Software"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:313
-msgid "Only those you specifically allow"
-msgstr "Nur die, denen Du es explizit erlaubst"
+#: ../../Zotlabs/Module/Profiles.php:777
+msgid "Musical interests"
+msgstr "Musikalische Interessen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:314
-msgid "Approved connections"
-msgstr "Angenommene Verbindungen"
+#: ../../Zotlabs/Module/Profiles.php:778
+msgid "Books, literature"
+msgstr "Bücher, Literatur"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:315
-msgid "Any connections"
-msgstr "Beliebige Verbindungen"
+#: ../../Zotlabs/Module/Profiles.php:779
+msgid "Television"
+msgstr "Fernsehen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:316
-msgid "Anybody on this website"
-msgstr "Jeder auf dieser Website"
+#: ../../Zotlabs/Module/Profiles.php:780
+msgid "Film/Dance/Culture/Entertainment"
+msgstr "Film/Tanz/Kultur/Unterhaltung"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:317
-msgid "Anybody in this network"
-msgstr "Alle $Projectname-Mitglieder"
+#: ../../Zotlabs/Module/Profiles.php:781
+msgid "Hobbies/Interests"
+msgstr "Hobbys/Interessen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:318
-msgid "Anybody authenticated"
-msgstr "Jeder authentifizierte"
+#: ../../Zotlabs/Module/Profiles.php:782
+msgid "Love/Romance"
+msgstr "Liebe/Romantik"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:319
-msgid "Anybody on the internet"
-msgstr "Jeder im Internet"
+#: ../../Zotlabs/Module/Profiles.php:784
+msgid "School/Education"
+msgstr "Schule/Ausbildung"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:395
-msgid "Publish your default profile in the network directory"
-msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
+#: ../../Zotlabs/Module/Profiles.php:785
+msgid "Contact information and social networks"
+msgstr "Kontaktinformation und soziale Netzwerke"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:400
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
+#: ../../Zotlabs/Module/Profiles.php:786
+msgid "My other channels"
+msgstr "Meine anderen Kanäle"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:409
-msgid "Your channel address is"
-msgstr "Deine Kanal-Adresse lautet"
+#: ../../Zotlabs/Module/Profiles.php:788
+msgid "Communications"
+msgstr "Kommunikation"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:412
-msgid "Your files/photos are accessible via WebDAV at"
-msgstr "Deine Dateien/Fotos sind via WebDAV verfügbar auf"
+#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
+msgid "Profile Image"
+msgstr "Profilfoto:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:474
-msgid "Channel Settings"
-msgstr "Kanal-Einstellungen"
+#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1044
+#: ../../include/nav.php:109
+msgid "Edit Profiles"
+msgstr "Profile bearbeiten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:481
-msgid "Basic Settings"
-msgstr "Grundeinstellungen"
+#: ../../Zotlabs/Module/Editwebpage.php:139
+msgid "Page link"
+msgstr "Seiten-Link"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:482
-#: ../../include/channel.php:1255
-msgid "Full Name:"
-msgstr "Voller Name:"
+#: ../../Zotlabs/Module/Editwebpage.php:166
+msgid "Edit Webpage"
+msgstr "Webseite bearbeiten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:484
-msgid "Your Timezone:"
-msgstr "Ihre Zeitzone:"
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create a new channel"
+msgstr "Neuen Kanal anlegen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:485
-msgid "Default Post Location:"
-msgstr "Standardstandort:"
+#: ../../Zotlabs/Module/Manage.php:168 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:205
+msgid "Channel Manager"
+msgstr "Kanal-Manager"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:485
-msgid "Geographical location to display on your posts"
-msgstr "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll"
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Current Channel"
+msgstr "Aktueller Kanal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:486
-msgid "Use Browser Location:"
-msgstr "Standort des Browsers verwenden:"
+#: ../../Zotlabs/Module/Manage.php:171
+msgid "Switch to one of your channels by selecting it."
+msgstr "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:488
-msgid "Adult Content"
-msgstr "Nicht jugendfreie Inhalte"
+#: ../../Zotlabs/Module/Manage.php:172
+msgid "Default Channel"
+msgstr "Standard Kanal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:488
-msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
+#: ../../Zotlabs/Module/Manage.php:173
+msgid "Make Default"
+msgstr "Zum Standard machen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:490
-msgid "Security and Privacy Settings"
-msgstr "Sicherheits- und Datenschutz-Einstellungen"
+#: ../../Zotlabs/Module/Manage.php:176
+#, php-format
+msgid "%d new messages"
+msgstr "%d neue Nachrichten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:493
-msgid "Your permissions are already configured. Click to view/adjust"
-msgstr "Deine Zugriffsrechte sind schon konfiguriert. Klicke hier, um sie zu betrachten oder zu ändern"
+#: ../../Zotlabs/Module/Manage.php:177
+#, php-format
+msgid "%d new introductions"
+msgstr "%d neue Vorstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:495
-msgid "Hide my online presence"
-msgstr "Meine Online-Präsenz verbergen"
+#: ../../Zotlabs/Module/Manage.php:179
+msgid "Delegated Channel"
+msgstr "Delegierte Kanäle"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:495
-msgid "Prevents displaying in your profile that you are online"
-msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
+#: ../../Zotlabs/Module/Dirsearch.php:33
+msgid "This directory server requires an access token"
+msgstr "Dieser Verzeichnisserver benötigt einen Zugriffstoken"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:497
-msgid "Simple Privacy Settings:"
-msgstr "Einfache Privatsphäre-Einstellungen"
+#: ../../Zotlabs/Module/Siteinfo.php:20
+msgid "About this site"
+msgstr "Über diese Seite"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:498
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
-msgstr "Komplett offen – <em>extrem ungeschützt (mit großer Vorsicht verwenden!)</em>"
+#: ../../Zotlabs/Module/Siteinfo.php:21
+msgid "Site Name"
+msgstr "Seitenname"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:499
-msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
-msgstr "Typisch – <em>Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)</em>"
+#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:2025
+msgid "Administrator"
+msgstr "Administrator"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:500
-msgid "Private - <em>default private, never open or public</em>"
-msgstr "Privat – <em>Standard privat, nie offen oder öffentlich</em>"
+#: ../../Zotlabs/Module/Siteinfo.php:27 ../../Zotlabs/Module/Register.php:221
+msgid "Terms of Service"
+msgstr "Nutzungsbedingungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:501
-msgid "Blocked - <em>default blocked to/from everybody</em>"
-msgstr "Blockiert – <em>Alle standardmäßig blockiert</em>"
+#: ../../Zotlabs/Module/Siteinfo.php:28
+msgid "Software and Project information"
+msgstr "Software und Projektinformationen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
-msgid "Allow others to tag your posts"
-msgstr "Erlaube anderen, Deine Beiträge zu verschlagworten"
+#: ../../Zotlabs/Module/Siteinfo.php:29
+msgid "This site is powered by $Projectname"
+msgstr "Diese Website wird bereitgestellt durch $Projectname"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Zotlabs/Module/Siteinfo.php:30
 msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
-msgstr "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren"
+"Federated and decentralised networking and identity services provided by Zot"
+msgstr "Verbundene, dezentrale Netzwerk- und Identitätsdienste, ermöglicht mittels Zot"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:505
-msgid "Channel Permission Limits"
-msgstr "Kanal-Berechtigungslimits"
+#: ../../Zotlabs/Module/Siteinfo.php:32
+#, php-format
+msgid "Version %s"
+msgstr "Version %s"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid "Expire other channel content after this many days"
-msgstr "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen"
+#: ../../Zotlabs/Module/Siteinfo.php:33
+msgid "Project homepage"
+msgstr "Projekt-Website"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid "0 or blank to use the website limit."
-msgstr "0 oder leer lassen, um den voreingestellten Wert der Webseite zu verwenden."
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Developer homepage"
+msgstr "Entwickler-Website"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-#, php-format
-msgid "This website expires after %d days."
-msgstr "Diese Webseite läuft nach %d Tagen ab."
+#: ../../Zotlabs/Module/Ratings.php:70
+msgid "No ratings"
+msgstr "Keine Bewertungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid "This website does not expire imported content."
-msgstr "Diese Webseite lässt importierte Inhalte nicht verfallen."
+#: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35
+#: ../../include/conversation.php:1032
+msgid "Ratings"
+msgstr "Bewertungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid "The website limit takes precedence if lower than your limit."
-msgstr "Das Verfallslimit der Webseite hat Vorrang, wenn es niedriger als Deines hier ist."
+#: ../../Zotlabs/Module/Ratings.php:98
+msgid "Rating: "
+msgstr "Bewertung: "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:508
-msgid "Maximum Friend Requests/Day:"
-msgstr "Maximale Kontaktanfragen pro Tag:"
+#: ../../Zotlabs/Module/Ratings.php:99
+msgid "Website: "
+msgstr "Webseite: "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:508
-msgid "May reduce spam activity"
-msgstr "Kann die Spam-Aktivität verringern"
+#: ../../Zotlabs/Module/Ratings.php:101
+msgid "Description: "
+msgstr "Beschreibung: "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:509
-msgid "Default Access Control List (ACL)"
-msgstr "Standard-Zugriffsberechtigungsliste (ACL)"
+#: ../../Zotlabs/Module/Webpages.php:52
+msgid "Import Webpage Elements"
+msgstr "Webseitenelemente importieren"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:511
-msgid "Use my default audience setting for the type of object published"
-msgstr "Verwende Deine eingestellte Standard-Zielgruppe des jeweiligen Inhaltstyps"
+#: ../../Zotlabs/Module/Webpages.php:53
+msgid "Import selected"
+msgstr "Import ausgewählt"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:518
-msgid "Channel permissions category:"
-msgstr "Zugriffsrechte-Kategorie des Kanals:"
+#: ../../Zotlabs/Module/Webpages.php:76
+msgid "Export Webpage Elements"
+msgstr "Webseitenelemente exportieren"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:519
-msgid "Default Permissions Group"
-msgstr "Standard-Berechtigungsgruppe"
+#: ../../Zotlabs/Module/Webpages.php:77
+msgid "Export selected"
+msgstr "Exportieren ausgewählt"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
+#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/conversation.php:1841 ../../include/nav.php:449
+msgid "Webpages"
+msgstr "Webseiten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "Useful to reduce spamming"
-msgstr "Nützlich, um Spam zu verringern"
+#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:44
+msgid "Actions"
+msgstr "Aktionen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:528
-msgid "Notification Settings"
-msgstr "Benachrichtigungs-Einstellungen"
+#: ../../Zotlabs/Module/Webpages.php:254 ../../include/page_widgets.php:45
+msgid "Page Link"
+msgstr "Seiten-Link"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:529
-msgid "By default post a status message when:"
-msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
+#: ../../Zotlabs/Module/Webpages.php:255
+msgid "Page Title"
+msgstr "Seitentitel"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:530
-msgid "accepting a friend request"
-msgstr "Du eine Verbindungsanfrage annimmst"
+#: ../../Zotlabs/Module/Webpages.php:285
+msgid "Invalid file type."
+msgstr "Ungültiger Dateityp."
+
+#: ../../Zotlabs/Module/Webpages.php:297
+msgid "Error opening zip file"
+msgstr "Fehler beim Öffnen der ZIP-Datei"
+
+#: ../../Zotlabs/Module/Webpages.php:308
+msgid "Invalid folder path."
+msgstr "Ungültiger Ordnerpfad."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:531
-msgid "joining a forum/community"
-msgstr "Du einem Forum beitrittst"
+#: ../../Zotlabs/Module/Webpages.php:335
+msgid "No webpage elements detected."
+msgstr "Keine Webseitenelemente erkannt."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:532
-msgid "making an <em>interesting</em> profile change"
-msgstr "Du eine <em>interessante</em> Änderung an Deinem Profil vornimmst"
+#: ../../Zotlabs/Module/Webpages.php:410
+msgid "Import complete."
+msgstr "Import abgeschlossen."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:533
-msgid "Send a notification email when:"
-msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
+#: ../../Zotlabs/Module/Editpost.php:38
+msgid "Item is not editable"
+msgstr "Element kann nicht bearbeitet werden."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:534
-msgid "You receive a connection request"
-msgstr "Du eine Verbindungsanfrage erhältst"
+#: ../../Zotlabs/Module/Editpost.php:103 ../../Zotlabs/Module/Rpost.php:138
+msgid "Edit post"
+msgstr "Bearbeite Beitrag"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:535
-msgid "Your connections are confirmed"
-msgstr "Eine Verbindung bestätigt wurde"
+#: ../../Zotlabs/Module/Dreport.php:45
+msgid "Invalid message"
+msgstr "Ungültige Beitrags-ID (mid)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:536
-msgid "Someone writes on your profile wall"
-msgstr "Jemand auf Deine Pinnwand schreibt"
+#: ../../Zotlabs/Module/Dreport.php:78
+msgid "no results"
+msgstr "keine Ergebnisse"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:537
-msgid "Someone writes a followup comment"
-msgstr "Jemand einen Beitrag kommentiert"
+#: ../../Zotlabs/Module/Dreport.php:93
+msgid "channel sync processed"
+msgstr "Kanal-Sync verarbeitet"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:538
-msgid "You receive a private message"
-msgstr "Du eine private Nachricht erhältst"
+#: ../../Zotlabs/Module/Dreport.php:97
+msgid "queued"
+msgstr "zur Warteschlange hinzugefügt"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:539
-msgid "You receive a friend suggestion"
-msgstr "Du einen Kontaktvorschlag erhältst"
+#: ../../Zotlabs/Module/Dreport.php:101
+msgid "posted"
+msgstr "zugestellt"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:540
-msgid "You are tagged in a post"
-msgstr "Du in einem Beitrag erwähnt wurdest"
+#: ../../Zotlabs/Module/Dreport.php:105
+msgid "accepted for delivery"
+msgstr "für Zustellung akzeptiert"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:541
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
+#: ../../Zotlabs/Module/Dreport.php:109
+msgid "updated"
+msgstr "aktualisiert"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:543
-msgid "Someone likes your post/comment"
-msgstr "Jemand mag Ihren Beitrag/Kommentar"
+#: ../../Zotlabs/Module/Dreport.php:112
+msgid "update ignored"
+msgstr "Aktualisierung ignoriert"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
-msgid "Show visual notifications including:"
-msgstr "Visuelle Benachrichtigungen anzeigen für:"
+#: ../../Zotlabs/Module/Dreport.php:115
+msgid "permission denied"
+msgstr "Zugriff verweigert"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:548
-msgid "Unseen grid activity"
-msgstr "Ungesehene Netzwerk-Aktivität"
+#: ../../Zotlabs/Module/Dreport.php:119
+msgid "recipient not found"
+msgstr "Empfänger nicht gefunden."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:549
-msgid "Unseen channel activity"
-msgstr "Ungesehene Kanal-Aktivität"
+#: ../../Zotlabs/Module/Dreport.php:122
+msgid "mail recalled"
+msgstr "Mail widerrufen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
-msgid "Unseen private messages"
-msgstr "Ungelesene persönliche Nachrichten"
+#: ../../Zotlabs/Module/Dreport.php:125
+msgid "duplicate mail received"
+msgstr "Doppelte Mail erhalten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
-#: ../../Zotlabs/Module/Settings/Channel.php:555
-#: ../../Zotlabs/Module/Settings/Channel.php:556
-#: ../../Zotlabs/Module/Settings/Channel.php:557
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
-msgid "Recommended"
-msgstr "Empfohlen"
+#: ../../Zotlabs/Module/Dreport.php:128
+msgid "mail delivered"
+msgstr "Mail zugestellt"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:551
-msgid "Upcoming events"
-msgstr "Baldige Termine"
+#: ../../Zotlabs/Module/Dreport.php:148
+#, php-format
+msgid "Delivery report for %1$s"
+msgstr "Zustellungsbericht für %1$s"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:552
-msgid "Events today"
-msgstr "Heutige Termine"
+#: ../../Zotlabs/Module/Dreport.php:151
+msgid "Options"
+msgstr "Optionen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553
-msgid "Upcoming birthdays"
-msgstr "Baldige Geburtstage"
+#: ../../Zotlabs/Module/Dreport.php:152
+msgid "Redeliver"
+msgstr "Erneut zustellen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553
-msgid "Not available in all themes"
-msgstr "Nicht in allen Themes verfügbar"
+#: ../../Zotlabs/Module/Sources.php:37
+msgid "Failed to create source. No channel selected."
+msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:554
-msgid "System (personal) notifications"
-msgstr "System – (persönliche) Benachrichtigungen"
+#: ../../Zotlabs/Module/Sources.php:51
+msgid "Source created."
+msgstr "Quelle erstellt."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:555
-msgid "System info messages"
-msgstr "System – Info-Nachrichten"
+#: ../../Zotlabs/Module/Sources.php:64
+msgid "Source updated."
+msgstr "Quelle aktualisiert."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:556
-msgid "System critical alerts"
-msgstr "System – kritische Warnungen"
+#: ../../Zotlabs/Module/Sources.php:90
+msgid "*"
+msgstr "*"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:557
-msgid "New connections"
-msgstr "Neue Verbindungen"
+#: ../../Zotlabs/Module/Sources.php:96
+#: ../../Zotlabs/Widget/Settings_menu.php:123 ../../include/features.php:213
+msgid "Channel Sources"
+msgstr "Kanal-Quellen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:558
-msgid "System Registrations"
-msgstr "System – Registrierungen"
+#: ../../Zotlabs/Module/Sources.php:97
+msgid "Manage remote sources of content for your channel."
+msgstr "Externe Inhaltsquellen für Deinen Kanal verwalten."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:559
-msgid ""
-"Also show new wall posts, private messages and connections under Notices"
-msgstr "Neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen anzeigen"
+#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
+msgid "New Source"
+msgstr "Neue Quelle"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:561
-msgid "Notify me of events this many days in advance"
-msgstr "Benachrichtige mich zu Terminen so viele Tage im Voraus"
+#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:561
-msgid "Must be greater than 0"
-msgstr "Muss größer als 0 sein"
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+msgid "Only import content with these words (one per line)"
+msgstr "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
-msgid "Advanced Account/Page Type Settings"
-msgstr "Erweiterte Account- und Seitenart-Einstellungen"
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+msgid "Leave blank to import all public content"
+msgstr "Leer lassen, um alle öffentlichen Beiträge zu importieren"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:568
-msgid "Change the behaviour of this account for special situations"
-msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
+#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
+msgid "Channel Name"
+msgstr "Name des Kanals"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:570
-msgid "Miscellaneous Settings"
-msgstr "Sonstige Einstellungen"
+#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+msgid ""
+"Add the following categories to posts imported from this source (comma "
+"separated)"
+msgstr "Füge die folgenden Kategorien zu Beiträgen, die aus dieser Quelle importiert werden, hinzu (kommagetrennt)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
-msgid "Default photo upload folder"
-msgstr "Voreingestellter Ordner für hochgeladene Fotos"
+#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
+msgid "Source not found."
+msgstr "Quelle nicht gefunden."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
-#: ../../Zotlabs/Module/Settings/Channel.php:572
-msgid "%Y - current year, %m -  current month"
-msgstr "%Y - aktuelles Jahr, %m -  aktueller Monat"
+#: ../../Zotlabs/Module/Sources.php:140
+msgid "Edit Source"
+msgstr "Quelle bearbeiten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
-msgid "Default file upload folder"
-msgstr "Voreingestellter Ordner für hochgeladene Dateien"
+#: ../../Zotlabs/Module/Sources.php:141
+msgid "Delete Source"
+msgstr "Quelle löschen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
-msgid "Personal menu to display in your channel pages"
-msgstr "Eigenes Menü zur Anzeige auf den Seiten deines Kanals"
+#: ../../Zotlabs/Module/Sources.php:169
+msgid "Source removed"
+msgstr "Quelle gelöscht"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:576
-msgid "Remove this channel."
-msgstr "Diesen Kanal löschen"
+#: ../../Zotlabs/Module/Sources.php:171
+msgid "Unable to remove source."
+msgstr "Konnte die Quelle nicht löschen."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:577
-msgid "Firefox Share $Projectname provider"
-msgstr "$Projectname-Provider für Firefox Share"
+#: ../../Zotlabs/Module/Like.php:19
+msgid "Like/Dislike"
+msgstr "Mögen/Nicht mögen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:578
-msgid "Start calendar week on monday"
-msgstr "Montag als erster Tag der Kalenderwoche"
+#: ../../Zotlabs/Module/Like.php:24
+msgid "This action is restricted to members."
+msgstr "Diese Aktion kann nur von Mitgliedern ausgeführt werden."
 
-#: ../../Zotlabs/Module/Settings/Display.php:137
-msgid "No special theme for mobile devices"
-msgstr "Keine spezielle Theme für mobile Geräte"
+#: ../../Zotlabs/Module/Like.php:25
+msgid ""
+"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a "
+"href=\"register\">register as a new $Projectname member</a> to continue."
+msgstr "Um fortzufahren <a href=\"rmagic\">melde Dich bitte mit Deiner $Projectname-ID an</a> oder <a href=\"register\">registriere Dich als neues $Projectname-Mitglied</a>."
 
-#: ../../Zotlabs/Module/Settings/Display.php:140
-#, php-format
-msgid "%s - (Experimental)"
-msgstr "%s – (experimentell)"
+#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
+#: ../../Zotlabs/Module/Like.php:169
+msgid "Invalid request."
+msgstr "Ungültige Anfrage."
 
-#: ../../Zotlabs/Module/Settings/Display.php:191
-msgid "Display Settings"
-msgstr "Anzeige-Einstellungen"
+#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:122
+msgid "channel"
+msgstr "Kanal"
 
-#: ../../Zotlabs/Module/Settings/Display.php:192
-msgid "Theme Settings"
-msgstr "Theme-Einstellungen"
+#: ../../Zotlabs/Module/Like.php:146
+msgid "thing"
+msgstr "Sache"
 
-#: ../../Zotlabs/Module/Settings/Display.php:193
-msgid "Custom Theme Settings"
-msgstr "Benutzerdefinierte Theme-Einstellungen"
+#: ../../Zotlabs/Module/Like.php:192
+msgid "Channel unavailable."
+msgstr "Kanal nicht vorhanden."
 
-#: ../../Zotlabs/Module/Settings/Display.php:194
-msgid "Content Settings"
-msgstr "Inhaltseinstellungen"
+#: ../../Zotlabs/Module/Like.php:240
+msgid "Previous action reversed."
+msgstr "Die vorherige Aktion wurde rückgängig gemacht."
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
-msgid "Display Theme:"
-msgstr "Anzeige-Theme:"
+#: ../../Zotlabs/Module/Like.php:419 ../../addon/diaspora/inbound.php:1812
+#: ../../include/conversation.php:160
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s gefällt %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
-msgid "Select scheme"
-msgstr "Schema wählen"
+#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:163
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "%1$s gefällt %2$ss %3$s nicht"
 
-#: ../../Zotlabs/Module/Settings/Display.php:203
-msgid "Mobile Theme:"
-msgstr "Mobile Theme:"
+#: ../../Zotlabs/Module/Like.php:423
+#, php-format
+msgid "%1$s agrees with %2$s's %3$s"
+msgstr "%1$s stimmt %2$ss %3$s zu"
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
-msgid "Preload images before rendering the page"
-msgstr "Bilder im voraus laden, bevor die Seite angezeigt wird"
+#: ../../Zotlabs/Module/Like.php:425
+#, php-format
+msgid "%1$s doesn't agree with %2$s's %3$s"
+msgstr "%1$s lehnt %2$ss %3$s ab"
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
-msgid ""
-"The subjective page load time will be longer but the page will be ready when"
-" displayed"
-msgstr "Die empfundene Ladezeit wird sich erhöhen, aber dafür ist das Layout stabil, sobald eine Seite angezeigt wird"
+#: ../../Zotlabs/Module/Like.php:427
+#, php-format
+msgid "%1$s abstains from a decision on %2$s's %3$s"
+msgstr "%1$s enthält sich zu %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
-msgid "Enable user zoom on mobile devices"
-msgstr "Zoom auf Mobilgeräten aktivieren"
+#: ../../Zotlabs/Module/Like.php:429
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
+msgstr "%1$s nimmt an %2$ss %3$s teil"
 
-#: ../../Zotlabs/Module/Settings/Display.php:206
-msgid "Update browser every xx seconds"
-msgstr "Browser alle xx Sekunden aktualisieren"
+#: ../../Zotlabs/Module/Like.php:431
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
+msgstr "%1$s nimmt an %2$ss %3$s nicht teil"
 
-#: ../../Zotlabs/Module/Settings/Display.php:206
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Minimum 10 Sekunden, kein Maximum"
+#: ../../Zotlabs/Module/Like.php:433
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
+msgstr "%1$s nimmt vielleicht an %2$ss %3$s teil"
 
-#: ../../Zotlabs/Module/Settings/Display.php:207
-msgid "Maximum number of conversations to load at any time:"
-msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:"
+#: ../../Zotlabs/Module/Like.php:538
+msgid "Action completed."
+msgstr "Aktion durchgeführt."
 
-#: ../../Zotlabs/Module/Settings/Display.php:207
-msgid "Maximum of 100 items"
-msgstr "Maximum: 100 Beiträge"
+#: ../../Zotlabs/Module/Like.php:539
+msgid "Thank you."
+msgstr "Vielen Dank."
 
-#: ../../Zotlabs/Module/Settings/Display.php:208
-msgid "Show emoticons (smilies) as images"
-msgstr "Emoticons (Smilies) als Bilder anzeigen"
+#: ../../Zotlabs/Module/Directory.php:245
+#, php-format
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] "%d Bewertung"
+msgstr[1] "%d Bewertungen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:209
-msgid "Manual conversation updates"
-msgstr "Manuelle Konversationsaktualisierung"
+#: ../../Zotlabs/Module/Directory.php:256
+msgid "Gender: "
+msgstr "Geschlecht:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:209
-msgid "Default is on, turning this off may increase screen jumping"
-msgstr "Voreinstellung ist An, dies abzuschalten kann das unerwartete Springen der Seitenanzeige erhöhen."
+#: ../../Zotlabs/Module/Directory.php:258
+msgid "Status: "
+msgstr "Status:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
-msgid "Link post titles to source"
-msgstr "Beitragstitel zum Originalbeitrag verlinken"
+#: ../../Zotlabs/Module/Directory.php:260
+msgid "Homepage: "
+msgstr "Webseite:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:211
-msgid "System Page Layout Editor - (advanced)"
-msgstr "System-Seitenlayout-Editor (für Experten)"
+#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1293
+msgid "Age:"
+msgstr "Alter:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:214
-msgid "Use blog/list mode on channel page"
-msgstr "Blog-/Listenmodus auf der Kanalseite verwenden"
+#: ../../Zotlabs/Module/Directory.php:314 ../../include/markdown.php:560
+#: ../../include/channel.php:1134 ../../include/event.php:52
+#: ../../include/event.php:84
+msgid "Location:"
+msgstr "Ort:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:214
-#: ../../Zotlabs/Module/Settings/Display.php:215
-msgid "(comments displayed separately)"
-msgstr "(Kommentare werden separat angezeigt)"
+#: ../../Zotlabs/Module/Directory.php:320
+msgid "Description:"
+msgstr "Beschreibung:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:215
-msgid "Use blog/list mode on grid page"
-msgstr "Blog-/Listenmodus auf der Netzwerkseite verwenden"
+#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1309
+msgid "Hometown:"
+msgstr "Heimatstadt:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:216
-msgid "Channel page max height of content (in pixels)"
-msgstr "Maximale Höhe von Beitragsblöcken auf der Kanalseite (in Pixeln)"
+#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1317
+msgid "About:"
+msgstr "Über:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:216
-#: ../../Zotlabs/Module/Settings/Display.php:217
-msgid "click to expand content exceeding this height"
-msgstr "Blöcke, deren Inhalt diese Höhe überschreitet, können per Klick vergrößert werden."
+#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54
+#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
+#: ../../include/conversation.php:1002 ../../include/channel.php:1119
+#: ../../include/connections.php:110
+msgid "Connect"
+msgstr "Verbinden"
 
-#: ../../Zotlabs/Module/Settings/Display.php:217
-msgid "Grid page max height of content (in pixels)"
-msgstr "Maximale Höhe (in Pixel) des Inhalts der Netzwerkseite"
+#: ../../Zotlabs/Module/Directory.php:329
+msgid "Public Forum:"
+msgstr "Öffentliches Forum:"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:37
-msgid "Permission category saved."
-msgstr "Berechtigungsrolle gespeichert."
+#: ../../Zotlabs/Module/Directory.php:332
+msgid "Keywords: "
+msgstr "Schlüsselwörter:"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:63
-msgid ""
-"Use this form to create permission rules for various classes of people or "
-"connections."
-msgstr "Verwende dieses Formular, um Berechtigungsrollen für verschiedene Gruppen von Personen oder Verbindungen zu erstellen."
+#: ../../Zotlabs/Module/Directory.php:335
+msgid "Don't suggest"
+msgstr "Nicht vorschlagen"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:96
-msgid "Permission Categories"
-msgstr "Berechtigungsrollen"
+#: ../../Zotlabs/Module/Directory.php:337
+msgid "Common connections:"
+msgstr "Gemeinsame Verbindungen:"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:104
-msgid "Permission Name"
-msgstr "Name der Berechtigungsrolle"
+#: ../../Zotlabs/Module/Directory.php:386
+msgid "Global Directory"
+msgstr "Globales Verzeichnis"
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
-msgid "Tag removed"
-msgstr "Schlagwort entfernt"
+#: ../../Zotlabs/Module/Directory.php:386
+msgid "Local Directory"
+msgstr "Lokales Verzeichnis"
 
-#: ../../Zotlabs/Module/Tagrm.php:123
-msgid "Remove Item Tag"
-msgstr "Schlagwort entfernen"
+#: ../../Zotlabs/Module/Directory.php:392
+msgid "Finding:"
+msgstr "Ergebnisse:"
 
-#: ../../Zotlabs/Module/Tagrm.php:125
-msgid "Select a tag to remove: "
-msgstr "Schlagwort zum Entfernen auswählen:"
+#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62
+#: ../../include/contact_widgets.php:24
+msgid "Channel Suggestions"
+msgstr "Kanal-Vorschläge"
 
-#: ../../Zotlabs/Module/Thing.php:114
-msgid "Thing updated"
-msgstr "Sache aktualisiert"
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "next page"
+msgstr "nächste Seite"
 
-#: ../../Zotlabs/Module/Thing.php:166
-msgid "Object store: failed"
-msgstr "Speichern des Objekts fehlgeschlagen"
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "previous page"
+msgstr "vorherige Seite"
 
-#: ../../Zotlabs/Module/Thing.php:170
-msgid "Thing added"
-msgstr "Sache hinzugefügt"
+#: ../../Zotlabs/Module/Directory.php:398
+msgid "Sort options"
+msgstr "Sortieroptionen"
 
-#: ../../Zotlabs/Module/Thing.php:196
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr "OBJ: %1$s %2$s %3$s"
+#: ../../Zotlabs/Module/Directory.php:399
+msgid "Alphabetic"
+msgstr "alphabetisch"
 
-#: ../../Zotlabs/Module/Thing.php:259
-msgid "Show Thing"
-msgstr "Sache anzeigen"
+#: ../../Zotlabs/Module/Directory.php:400
+msgid "Reverse Alphabetic"
+msgstr "Entgegengesetzt alphabetisch"
 
-#: ../../Zotlabs/Module/Thing.php:266
-msgid "item not found."
-msgstr "Eintrag nicht gefunden"
+#: ../../Zotlabs/Module/Directory.php:401
+msgid "Newest to Oldest"
+msgstr "Neueste zuerst"
 
-#: ../../Zotlabs/Module/Thing.php:299
-msgid "Edit Thing"
-msgstr "Sache bearbeiten"
+#: ../../Zotlabs/Module/Directory.php:402
+msgid "Oldest to Newest"
+msgstr "Älteste zuerst"
 
-#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:355
-msgid "Select a profile"
-msgstr "Wähle ein Profil"
+#: ../../Zotlabs/Module/Directory.php:419
+msgid "No entries (some entries may be hidden)."
+msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
 
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358
-msgid "Post an activity"
-msgstr "Aktivitätsnachricht senden"
+#: ../../Zotlabs/Module/Xchan.php:10
+msgid "Xchan Lookup"
+msgstr "Xchan-Suche"
 
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358
-msgid "Only sends to viewers of the applicable profile"
-msgstr "Nur an Betrachter des ausgewählten Profils senden"
+#: ../../Zotlabs/Module/Xchan.php:13
+msgid "Lookup xchan beginning with (or webbie): "
+msgstr "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:"
 
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:360
-msgid "Name of thing e.g. something"
-msgstr "Name der Sache, z. B. irgendwas"
+#: ../../Zotlabs/Module/Suggest.php:37
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal."
 
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:361
-msgid "URL of thing (optional)"
-msgstr "URL der Sache (optional)"
+#: ../../Zotlabs/Module/Suggest.php:56 ../../Zotlabs/Widget/Suggestions.php:46
+msgid "Ignore/Hide"
+msgstr "Ignorieren/Verstecken"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:362
-msgid "URL for photo of thing (optional)"
-msgstr "URL eines Fotos der Sache (optional)"
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr "Konnte Deinen Server nicht finden."
 
-#: ../../Zotlabs/Module/Thing.php:353
-msgid "Add Thing to your Profile"
-msgstr "Die Sache Deinem Profil hinzufügen"
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr "Veröffentlichung erfolgreich."
 
 #: ../../Zotlabs/Module/Mail.php:65
 msgid "Unable to lookup recipient."
@@ -7044,677 +6429,644 @@ msgstr "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten.
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../../Zotlabs/Module/Mail.php:213
+#: ../../Zotlabs/Module/Mail.php:191
+msgid "message"
+msgstr "Nachricht"
+
+#: ../../Zotlabs/Module/Mail.php:232
 msgid "Message recalled."
 msgstr "Nachricht widerrufen."
 
-#: ../../Zotlabs/Module/Mail.php:226
+#: ../../Zotlabs/Module/Mail.php:245
 msgid "Conversation removed."
 msgstr "Unterhaltung gelöscht."
 
-#: ../../Zotlabs/Module/Mail.php:240 ../../Zotlabs/Module/Mail.php:349
-#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1330
-msgid "Please enter a link URL:"
-msgstr "Gib eine URL ein:"
-
-#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:350
+#: ../../Zotlabs/Module/Mail.php:260 ../../Zotlabs/Module/Mail.php:381
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verfällt YYYY-MM-DD HH;MM"
 
-#: ../../Zotlabs/Module/Mail.php:269
+#: ../../Zotlabs/Module/Mail.php:288
 msgid "Requested channel is not in this network"
 msgstr "Angeforderter Kanal ist nicht in diesem Netzwerk."
 
-#: ../../Zotlabs/Module/Mail.php:277
+#: ../../Zotlabs/Module/Mail.php:296
 msgid "Send Private Message"
 msgstr "Private Nachricht senden"
 
-#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:403
+#: ../../Zotlabs/Module/Mail.php:297 ../../Zotlabs/Module/Mail.php:439
 msgid "To:"
 msgstr "An:"
 
-#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:405
+#: ../../Zotlabs/Module/Mail.php:300 ../../Zotlabs/Module/Mail.php:441
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:411
-#: ../../include/conversation.php:1390
+#: ../../Zotlabs/Module/Mail.php:305 ../../Zotlabs/Module/Mail.php:447
+#: ../../include/conversation.php:1323
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: ../../Zotlabs/Module/Mail.php:288
+#: ../../Zotlabs/Module/Mail.php:307
 msgid "Send"
 msgstr "Absenden"
 
-#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:416
-#: ../../include/conversation.php:1435
+#: ../../Zotlabs/Module/Mail.php:310 ../../Zotlabs/Module/Mail.php:452
+#: ../../include/conversation.php:1368
 msgid "Set expiration date"
 msgstr "Verfallsdatum"
 
-#: ../../Zotlabs/Module/Mail.php:293 ../../Zotlabs/Module/Mail.php:418
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:743
-#: ../../include/conversation.php:1440
-msgid "Encrypt text"
-msgstr "Text verschlüsseln"
-
-#: ../../Zotlabs/Module/Mail.php:375
+#: ../../Zotlabs/Module/Mail.php:411
 msgid "Delete message"
 msgstr "Nachricht löschen"
 
-#: ../../Zotlabs/Module/Mail.php:376
+#: ../../Zotlabs/Module/Mail.php:412
 msgid "Delivery report"
 msgstr "Zustellungsbericht"
 
-#: ../../Zotlabs/Module/Mail.php:377
+#: ../../Zotlabs/Module/Mail.php:413
 msgid "Recall message"
 msgstr "Nachricht widerrufen"
 
-#: ../../Zotlabs/Module/Mail.php:379
+#: ../../Zotlabs/Module/Mail.php:415
 msgid "Message has been recalled."
 msgstr "Die Nachricht wurde widerrufen."
 
-#: ../../Zotlabs/Module/Mail.php:396
+#: ../../Zotlabs/Module/Mail.php:432
 msgid "Delete Conversation"
 msgstr "Unterhaltung löschen"
 
-#: ../../Zotlabs/Module/Mail.php:398
+#: ../../Zotlabs/Module/Mail.php:434
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten."
 
-#: ../../Zotlabs/Module/Mail.php:402
+#: ../../Zotlabs/Module/Mail.php:438
 msgid "Send Reply"
 msgstr "Antwort senden"
 
-#: ../../Zotlabs/Module/Mail.php:407
+#: ../../Zotlabs/Module/Mail.php:443
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Deine Nachricht für %s (%s):"
 
-#: ../../Zotlabs/Module/Viewconnections.php:65
-msgid "No connections."
-msgstr "Keine Verbindungen."
+#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12
+msgid "Public Hubs"
+msgstr "Öffentliche Hubs"
 
-#: ../../Zotlabs/Module/Viewconnections.php:78
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "%ss Profil [%s] besuchen"
+#: ../../Zotlabs/Module/Pubsites.php:27
+msgid ""
+"The listed hubs allow public registration for the $Projectname network. All "
+"hubs in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some hubs may require subscription or "
+"provide tiered service plans. The hub itself <strong>may</strong> provide "
+"additional details."
+msgstr "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung im $Projectname Netzwerk. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen Seiten und Kanälen auf anderen Hubs ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den Seiten der einzelnen Hubs <strong>könnten</strong> jeweils nähere Informationen dazu stehen."
 
-#: ../../Zotlabs/Module/Viewconnections.php:107
-msgid "View Connections"
-msgstr "Verbindungen anzeigen"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Hub URL"
+msgstr "Hub-URL"
 
-#: ../../Zotlabs/Module/Viewsrc.php:44
-msgid "Source of Item"
-msgstr "Quelle des Elements"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Access Type"
+msgstr "Zugriffstyp"
 
-#: ../../Zotlabs/Module/Chat.php:181
-msgid "Room not found"
-msgstr "Chatraum nicht gefunden"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Registration Policy"
+msgstr "Registrierungsrichtlinien"
 
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "Leave Room"
-msgstr "Raum verlassen"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Stats"
+msgstr "Statistiken"
 
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "Delete Room"
-msgstr "Raum löschen"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Software"
+msgstr "Software"
 
-#: ../../Zotlabs/Module/Chat.php:199
-msgid "I am away right now"
-msgstr "Ich bin gerade nicht da"
+#: ../../Zotlabs/Module/Pubsites.php:48
+msgid "Rate"
+msgstr "Bewerten"
 
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "I am online"
-msgstr "Ich bin online"
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+msgid "webpage"
+msgstr "Webseite"
 
-#: ../../Zotlabs/Module/Chat.php:202
-msgid "Bookmark this room"
-msgstr "Lesezeichen für diesen Raum setzen"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+msgid "block"
+msgstr "Block"
 
-#: ../../Zotlabs/Module/Chat.php:231
-msgid "New Chatroom"
-msgstr "Neuer Chatraum"
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+msgid "layout"
+msgstr "Layout"
 
-#: ../../Zotlabs/Module/Chat.php:232
-msgid "Chatroom name"
-msgstr "Chatraumname"
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+msgid "menu"
+msgstr "Menü"
 
-#: ../../Zotlabs/Module/Chat.php:233
-msgid "Expiration of chats (minutes)"
-msgstr "Verfall von Chats (Minuten)"
+#: ../../Zotlabs/Module/Impel.php:181
+#, php-format
+msgid "%s element installed"
+msgstr "Element für %s installiert"
 
-#: ../../Zotlabs/Module/Chat.php:249
+#: ../../Zotlabs/Module/Impel.php:184
 #, php-format
-msgid "%1$s's Chatrooms"
-msgstr "%1$ss Chaträume"
+msgid "%s element installation failed"
+msgstr "Installation des Elements %s fehlgeschlagen"
 
-#: ../../Zotlabs/Module/Chat.php:254
-msgid "No chatrooms available"
-msgstr "Keine Chaträume verfügbar"
+#: ../../Zotlabs/Module/Rbmark.php:94
+msgid "Select a bookmark folder"
+msgstr "Lesezeichenordner wählen"
 
-#: ../../Zotlabs/Module/Chat.php:258
-msgid "Expiration"
-msgstr "Verfall"
+#: ../../Zotlabs/Module/Rbmark.php:99
+msgid "Save Bookmark"
+msgstr "Lesezeichen speichern"
 
-#: ../../Zotlabs/Module/Chat.php:259
-msgid "min"
-msgstr "min"
+#: ../../Zotlabs/Module/Rbmark.php:100
+msgid "URL of bookmark"
+msgstr "URL des Lesezeichens"
 
-#: ../../Zotlabs/Module/Xchan.php:10
-msgid "Xchan Lookup"
-msgstr "Xchan-Suche"
+#: ../../Zotlabs/Module/Rbmark.php:105
+msgid "Or enter new bookmark folder name"
+msgstr "Oder gib einen neuen Namen für den Lesezeichenordner ein"
 
-#: ../../Zotlabs/Module/Xchan.php:13
-msgid "Lookup xchan beginning with (or webbie): "
-msgstr "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:"
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Enter a folder name"
+msgstr "Gib einen Ordnernamen ein"
 
-#: ../../Zotlabs/Lib/Chatroom.php:27
-msgid "Missing room name"
-msgstr "Der Chatraum hat keinen Namen"
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "or select an existing folder (doubleclick)"
+msgstr "oder wähle einen vorhanden Ordner aus (Doppelklick)"
 
-#: ../../Zotlabs/Lib/Chatroom.php:36
-msgid "Duplicate room name"
-msgstr "Name des Chatraums bereits vergeben"
+#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:137
+msgid "Save to Folder"
+msgstr "In Ordner speichern"
 
-#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94
-msgid "Invalid room specifier."
-msgstr "Ungültiger Raumbezeichner."
+#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr "Abrufen der URL gab einen Fehler zurück: %1$s"
 
-#: ../../Zotlabs/Lib/Chatroom.php:126
-msgid "Room not found."
-msgstr "Chatraum konnte nicht gefunden werden."
+#: ../../Zotlabs/Module/Register.php:49
+msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
+msgstr "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."
 
-#: ../../Zotlabs/Lib/Chatroom.php:147
-msgid "Room is full"
-msgstr "Der Chatraum ist voll"
+#: ../../Zotlabs/Module/Register.php:55
+msgid ""
+"Please indicate acceptance of the Terms of Service. Registration failed."
+msgstr "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen."
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1924
-msgid "$Projectname Notification"
-msgstr "$Projectname-Benachrichtigung"
+#: ../../Zotlabs/Module/Register.php:89
+msgid "Passwords do not match."
+msgstr "Passwörter stimmen nicht überein."
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../extend/addon/addon/diaspora/p.php:46
-#: ../../extend/addon/addon/diaspora/util.php:218
-#: ../../extend/addon/addon/diaspora/util.php:231
-#: ../../include/network.php:1925
-msgid "$projectname"
-msgstr "$projectname"
+#: ../../Zotlabs/Module/Register.php:131
+msgid ""
+"Registration successful. Please check your email for validation "
+"instructions."
+msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1927
-msgid "Thank You,"
-msgstr "Danke."
+#: ../../Zotlabs/Module/Register.php:137
+msgid "Your registration is pending approval by the site owner."
+msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1929
-#, php-format
-msgid "%s Administrator"
-msgstr "der Administrator von %s"
+#: ../../Zotlabs/Module/Register.php:140
+msgid "Your registration can not be processed."
+msgstr "Deine Registrierung konnte nicht verarbeitet werden."
 
-#: ../../Zotlabs/Lib/Enotify.php:116
-#, php-format
-msgid "%s <!item_type!>"
-msgstr "%s <!item_type!>"
+#: ../../Zotlabs/Module/Register.php:184
+msgid "Registration on this hub is disabled."
+msgstr "Die Registrierung auf diesem Hub ist nicht möglich."
 
-#: ../../Zotlabs/Lib/Enotify.php:120
-#, php-format
-msgid "[$Projectname:Notify] New mail received at %s"
-msgstr "[$Projectname:Benachrichtigung] Neue Mail empfangen auf %s"
+#: ../../Zotlabs/Module/Register.php:193
+msgid "Registration on this hub is by approval only."
+msgstr "Eine Registrierung auf diesem Hub erfordert die Zustimmung durch den Administrator."
 
-#: ../../Zotlabs/Lib/Enotify.php:122
+#: ../../Zotlabs/Module/Register.php:194
+msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>"
+msgstr "<a href=\"pubsites\">Registriere Dich auf einem der anderen verbundenen Hubs.</a>"
+
+#: ../../Zotlabs/Module/Register.php:204
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal."
+
+#: ../../Zotlabs/Module/Register.php:227
 #, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s hat Dir eine private Nachricht auf %3$s gesendet."
+msgid "I accept the %s for this website"
+msgstr "Ich akzeptiere die %s für diese Webseite"
 
-#: ../../Zotlabs/Lib/Enotify.php:123
+#: ../../Zotlabs/Module/Register.php:229
 #, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s hat Dir %2$s geschickt."
+msgid "I am over 13 years of age and accept the %s for this website"
+msgstr "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite"
 
-#: ../../Zotlabs/Lib/Enotify.php:123
-msgid "a private message"
-msgstr "eine private Nachricht"
+#: ../../Zotlabs/Module/Register.php:233
+msgid "Your email address"
+msgstr "Ihre E-Mail Adresse"
 
-#: ../../Zotlabs/Lib/Enotify.php:124
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
+#: ../../Zotlabs/Module/Register.php:234
+msgid "Choose a password"
+msgstr "Passwort"
 
-#: ../../Zotlabs/Lib/Enotify.php:183
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]einen %4$s[/zrl] kommentiert"
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Please re-enter your password"
+msgstr "Bitte gib Dein Passwort noch einmal ein"
 
-#: ../../Zotlabs/Lib/Enotify.php:191
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
+#: ../../Zotlabs/Module/Register.php:236
+msgid "Please enter your invitation code"
+msgstr "Bitte trage Deinen Einladungs-Code ein"
 
-#: ../../Zotlabs/Lib/Enotify.php:200
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen %4$s[/zrl] kommentiert"
+#: ../../Zotlabs/Module/Register.php:241
+msgid "no"
+msgstr "nein"
 
-#: ../../Zotlabs/Lib/Enotify.php:211
-#, php-format
-msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[$Projectname:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
+#: ../../Zotlabs/Module/Register.php:241
+msgid "yes"
+msgstr "ja"
 
-#: ../../Zotlabs/Lib/Enotify.php:212
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s hat eine Unterhaltung kommentiert, der Du folgst."
+#: ../../Zotlabs/Module/Register.php:258
+msgid "Membership on this site is by invitation only."
+msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
+
+#: ../../Zotlabs/Module/Register.php:270 ../../boot.php:1610
+#: ../../include/nav.php:149
+msgid "Register"
+msgstr "Registrieren"
 
-#: ../../Zotlabs/Lib/Enotify.php:215 ../../Zotlabs/Lib/Enotify.php:292
-#: ../../Zotlabs/Lib/Enotify.php:309 ../../Zotlabs/Lib/Enotify.php:335
-#: ../../Zotlabs/Lib/Enotify.php:353 ../../Zotlabs/Lib/Enotify.php:367
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."
+#: ../../Zotlabs/Module/Register.php:271
+msgid ""
+"This site may require email verification after submitting this form. If you "
+"are returned to a login page, please check your email for instructions."
+msgstr "Diese Seite verlangt möglicherweise eine Emailbestätigung nach dem Absenden des Formulars. Wenn Du auf eine Login-Seite zurückgeleitet wirst, prüfe bitte Deinen Posteingang auf neue Mails mit entsprechenden Hinweisen."
 
-#: ../../Zotlabs/Lib/Enotify.php:273
-#, php-format
-msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
-msgstr ""
+#: ../../Zotlabs/Module/Cover_photo.php:136
+#: ../../Zotlabs/Module/Cover_photo.php:186
+msgid "Cover Photos"
+msgstr "Cover Foto"
 
-#: ../../Zotlabs/Lib/Enotify.php:288
-#, php-format
-msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
-msgstr "[$Projectname:Benachrichtigung] Gefällt mir in Unterhaltung #%1$d von %2$s erhalten"
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4303
+msgid "female"
+msgstr "weiblich"
 
-#: ../../Zotlabs/Lib/Enotify.php:289
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4304
 #, php-format
-msgid "%1$s, %2$s liked an item/conversation you created."
-msgstr "%1$s, %2$s gefällt ein Beitrag oder eine Unterhaltung von Dir"
+msgid "%1$s updated her %2$s"
+msgstr "%1$s hat ihr %2$s aktualisiert"
 
-#: ../../Zotlabs/Lib/Enotify.php:300
-#, php-format
-msgid "[$Projectname:Notify] %s posted to your profile wall"
-msgstr "[$Projectname:Benachrichtigung] %s schrieb auf Deine Pinnwand"
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4305
+msgid "male"
+msgstr "männlich"
 
-#: ../../Zotlabs/Lib/Enotify.php:302
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4306
 #, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s hat auf Deine Pinnwand auf %3$s geschrieben"
+msgid "%1$s updated his %2$s"
+msgstr "%1$s hat sein %2$s aktualisiert"
 
-#: ../../Zotlabs/Lib/Enotify.php:304
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4308
 #, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s hat auf [zrl=%3$s]Deine Pinnwand[/zrl] geschrieben"
+msgid "%1$s updated their %2$s"
+msgstr "%1$s hat sein/ihr %2$s aktualisiert"
 
-#: ../../Zotlabs/Lib/Enotify.php:328
-#, php-format
-msgid "[$Projectname:Notify] %s tagged you"
-msgstr "[$Projectname:Benachrichtigung] %s hat Dich erwähnt"
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1759
+msgid "cover photo"
+msgstr "Cover Foto"
 
-#: ../../Zotlabs/Lib/Enotify.php:329
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s hat Dich auf %3$s erwähnt"
+#: ../../Zotlabs/Module/Cover_photo.php:360
+msgid "Upload Cover Photo"
+msgstr "Cover Foto hochladen"
 
-#: ../../Zotlabs/Lib/Enotify.php:330
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]hat Dich erwähnt[/zrl]."
+#: ../../Zotlabs/Module/Help.php:23
+msgid "Documentation Search"
+msgstr "Suche in der Dokumentation"
 
-#: ../../Zotlabs/Lib/Enotify.php:342
-#, php-format
-msgid "[$Projectname:Notify] %1$s poked you"
-msgstr "[$Projectname:Benachrichtigung] %1$s hat Dich angestupst"
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1773
+#: ../../include/nav.php:382
+msgid "About"
+msgstr "Über"
 
-#: ../../Zotlabs/Lib/Enotify.php:343
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s hat Dich auf %3$s angestupst"
+#: ../../Zotlabs/Module/Help.php:82
+msgid "Administrators"
+msgstr "Administratoren"
 
-#: ../../Zotlabs/Lib/Enotify.php:344
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]hat Dich angestupst[/zrl]."
+#: ../../Zotlabs/Module/Help.php:83
+msgid "Developers"
+msgstr "Entwickler"
 
-#: ../../Zotlabs/Lib/Enotify.php:360
-#, php-format
-msgid "[$Projectname:Notify] %s tagged your post"
-msgstr "[$Projectname:Benachrichtigung] %s hat Deinen Beitrag verschlagwortet"
+#: ../../Zotlabs/Module/Help.php:84
+msgid "Tutorials"
+msgstr "Tutorials"
 
-#: ../../Zotlabs/Lib/Enotify.php:361
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s hat Deinen Beitrag auf %3$s verschlagwortet"
+#: ../../Zotlabs/Module/Help.php:93
+msgid "$Projectname Documentation"
+msgstr "$Projectname-Dokumentation"
 
-#: ../../Zotlabs/Lib/Enotify.php:362
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen Beitrag[/zrl] verschlagwortet"
+#: ../../Zotlabs/Module/Help.php:94
+msgid "Contents"
+msgstr "Inhalt"
 
-#: ../../Zotlabs/Lib/Enotify.php:374
-msgid "[$Projectname:Notify] Introduction received"
-msgstr "[$Projectname:Benachrichtigung] Verbindungsanfrage erhalten"
+#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+msgid "Tag removed"
+msgstr "Schlagwort entfernt"
 
-#: ../../Zotlabs/Lib/Enotify.php:375
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
-msgstr "%1$s, Du hast eine neue Verbindungsanfrage von '%2$s' auf %3$s erhalten"
+#: ../../Zotlabs/Module/Tagrm.php:123
+msgid "Remove Item Tag"
+msgstr "Schlagwort entfernen"
 
-#: ../../Zotlabs/Lib/Enotify.php:376
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
-msgstr "%1$s, Du hast [zrl=%2$s]eine neue Verbindungsanfrage[/zrl] von %3$s erhalten."
+#: ../../Zotlabs/Module/Tagrm.php:125
+msgid "Select a tag to remove: "
+msgstr "Schlagwort zum Entfernen auswählen:"
 
-#: ../../Zotlabs/Lib/Enotify.php:380 ../../Zotlabs/Lib/Enotify.php:399
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Du kannst Dir das Profil unter %s ansehen"
+#: ../../Zotlabs/Module/Network.php:96
+msgid "No such group"
+msgstr "Gruppe nicht gefunden"
 
-#: ../../Zotlabs/Lib/Enotify.php:382
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen."
+#: ../../Zotlabs/Module/Network.php:136
+msgid "No such channel"
+msgstr "Kanal nicht gefunden"
 
-#: ../../Zotlabs/Lib/Enotify.php:389
-msgid "[$Projectname:Notify] Friend suggestion received"
-msgstr "[$Projectname:Benachrichtigung] Freundschaftsvorschlag erhalten"
+#: ../../Zotlabs/Module/Network.php:141
+msgid "forum"
+msgstr "Forum"
 
-#: ../../Zotlabs/Lib/Enotify.php:390
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, Du hast einen Kontaktvorschlag von „%2$s“ auf %3$s erhalten"
+#: ../../Zotlabs/Module/Network.php:153
+msgid "Search Results For:"
+msgstr "Suchergebnisse für:"
 
-#: ../../Zotlabs/Lib/Enotify.php:391
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
-"%4$s."
-msgstr "%1$s, Du hast [zrl=%2$s]einen Kontaktvorschlag[/zrl] für %3$s von %4$s erhalten."
+#: ../../Zotlabs/Module/Network.php:221
+msgid "Privacy group is empty"
+msgstr "Gruppe ist leer"
 
-#: ../../Zotlabs/Lib/Enotify.php:397
-msgid "Name:"
-msgstr "Name:"
+#: ../../Zotlabs/Module/Network.php:230
+msgid "Privacy group: "
+msgstr "Gruppe:"
 
-#: ../../Zotlabs/Lib/Enotify.php:398
-msgid "Photo:"
-msgstr "Foto:"
+#: ../../Zotlabs/Module/Network.php:256
+msgid "Invalid connection."
+msgstr "Ungültige Verbindung."
 
-#: ../../Zotlabs/Lib/Enotify.php:401
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
+#: ../../Zotlabs/Module/Network.php:275 ../../addon/redred/redred.php:65
+msgid "Invalid channel."
+msgstr "Ungültiger Kanal."
 
-#: ../../Zotlabs/Lib/Enotify.php:619
-msgid "[$Projectname:Notify]"
-msgstr "[$Projectname:Benachrichtigung]"
+#: ../../Zotlabs/Module/Acl.php:344
+msgid "network"
+msgstr "Netzwerk"
 
-#: ../../Zotlabs/Lib/Enotify.php:779
-msgid "created a new post"
-msgstr "Neuer Beitrag wurde erzeugt"
+#: ../../Zotlabs/Module/Acl.php:354
+msgid "RSS"
+msgstr "RSS"
 
-#: ../../Zotlabs/Lib/Enotify.php:780
-#, php-format
-msgid "commented on %s's post"
-msgstr "hat %s's Beitrag kommentiert"
+#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+#: ../../addon/opensearch/opensearch.php:42
+msgid "$Projectname"
+msgstr "$Projectname"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:34
-#: ../../include/acl_selectors.php:128
-msgid "Visible to your default audience"
-msgstr "Standard-Sichtbarkeit gemäß Kanaleinstellungen"
+#: ../../Zotlabs/Module/Home.php:92
+#, php-format
+msgid "Welcome to %s"
+msgstr "Willkommen auf %s"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:107
-#: ../../include/acl_selectors.php:201
-msgid "Only me"
-msgstr "Nur ich"
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
+msgstr "Zugriff verweigert."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:108
-msgid "Public"
-msgstr "Öffentlich"
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
+msgstr "Datei nicht gefunden."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:109
-msgid "Anybody in the $Projectname network"
-msgstr "Jeder innerhalb des $Projectname Netzwerks"
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
+msgstr "Dateiberechtigungen bearbeiten"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:110
-#, php-format
-msgid "Any account on %s"
-msgstr "Jedes Nutzerkonto auf %s"
+#: ../../Zotlabs/Module/Filestorage.php:159
+msgid "Set/edit permissions"
+msgstr "Berechtigungen setzen/ändern"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:111
-msgid "Any of my connections"
-msgstr "Alle meine Verbindungen"
+#: ../../Zotlabs/Module/Filestorage.php:160
+msgid "Include all files and sub folders"
+msgstr "Alle Dateien und Unterverzeichnisse einbinden"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:112
-msgid "Only connections I specifically allow"
-msgstr "Nur Verbindungen, denen ich es explizit erlaube"
+#: ../../Zotlabs/Module/Filestorage.php:161
+msgid "Return to file list"
+msgstr "Zurück zur Dateiliste"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:113
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr "Jeder, der angemeldet ist (kann Besucher anderer Netzwerke beinhalten)"
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Copy/paste this code to attach file to a post"
+msgstr "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:114
-msgid "Any connections including those who haven't yet been approved"
-msgstr "Alle Verbindungen einschließlich der noch nicht bestätigten"
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Copy/paste this URL to link file from a web page"
+msgstr "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:150
-msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
-msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner normalen Beiträge (Stream)."
+#: ../../Zotlabs/Module/Filestorage.php:166
+msgid "Share this file"
+msgstr "Diese Datei freigeben"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:151
-msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deines Standard-Kanalprofils."
+#: ../../Zotlabs/Module/Filestorage.php:167
+msgid "Show URL to this file"
+msgstr "URL zu dieser Datei anzeigen"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:152
-msgid "This is your default setting for who can view your connections"
-msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Verbindungen."
+#: ../../Zotlabs/Module/Filestorage.php:168
+msgid "Notify your contacts about this file"
+msgstr "Meine Kontakte über diese Datei benachrichtigen"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:153
-msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Dateien und Fotos."
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr "Kein Kanal."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:154
-msgid "This is your default setting for the audience of your webpages"
-msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Webseiten."
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
+msgstr "Gemeinsame Verbindungen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:663
-msgid "Private Message"
-msgstr "Private Nachricht"
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
+msgstr "Keine gemeinsamen Verbindungen."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:655
-msgid "Select"
-msgstr "Auswählen"
+#: ../../Zotlabs/Module/Viewconnections.php:65
+msgid "No connections."
+msgstr "Keine Verbindungen."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:136
-msgid "Save to Folder"
-msgstr "In Ordner speichern"
+#: ../../Zotlabs/Module/Viewconnections.php:78
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "%ss Profil [%s] besuchen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
-msgid "I will attend"
-msgstr "Ich werde teilnehmen"
+#: ../../Zotlabs/Module/Viewconnections.php:107
+msgid "View Connections"
+msgstr "Verbindungen anzeigen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
-msgid "I will not attend"
-msgstr "Ich werde nicht teilnehmen"
+#: ../../Zotlabs/Module/Admin.php:94
+msgid "# Accounts"
+msgstr "Anzahl der Konten"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
-msgid "I might attend"
-msgstr "Ich werde vielleicht teilnehmen"
+#: ../../Zotlabs/Module/Admin.php:95
+msgid "# blocked accounts"
+msgstr "Anzahl der blockierten Konten"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
-msgid "I agree"
-msgstr "Ich stimme zu"
+#: ../../Zotlabs/Module/Admin.php:96
+msgid "# expired accounts"
+msgstr "Anzahl der abgelaufenen Konten"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
-msgid "I disagree"
-msgstr "Ich lehne ab"
+#: ../../Zotlabs/Module/Admin.php:97
+msgid "# expiring accounts"
+msgstr "Anzahl der ablaufenden Konten"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
-msgid "I abstain"
-msgstr "Ich enthalte mich"
+#: ../../Zotlabs/Module/Admin.php:108
+msgid "# Channels"
+msgstr "Anzahl der Kanäle"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:223
-msgid "Add Star"
-msgstr "Stern hinzufügen"
+#: ../../Zotlabs/Module/Admin.php:109
+msgid "# primary"
+msgstr "Anzahl der primären Kanäle"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:224
-msgid "Remove Star"
-msgstr "Stern entfernen"
+#: ../../Zotlabs/Module/Admin.php:110
+msgid "# clones"
+msgstr "Anzahl der Klone"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:225
-msgid "Toggle Star Status"
-msgstr "Markierungsstatus (Stern) umschalten"
+#: ../../Zotlabs/Module/Admin.php:116
+msgid "Message queues"
+msgstr "Nachrichten-Warteschlangen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:229
-msgid "starred"
-msgstr "markiert"
+#: ../../Zotlabs/Module/Admin.php:133
+msgid "Your software should be updated"
+msgstr "Die installierte Software sollte aktualisiert werden"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../include/conversation.php:670
-msgid "Message signature validated"
-msgstr "Signatur überprüft"
+#: ../../Zotlabs/Module/Admin.php:138
+msgid "Summary"
+msgstr "Zusammenfassung"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:671
-msgid "Message signature incorrect"
-msgstr "Signatur nicht korrekt"
+#: ../../Zotlabs/Module/Admin.php:141
+msgid "Registered accounts"
+msgstr "Registrierte Konten"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:248
-msgid "Add Tag"
-msgstr "Tag hinzufügen"
+#: ../../Zotlabs/Module/Admin.php:142
+msgid "Pending registrations"
+msgstr "Ausstehende Registrierungen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:316
-msgid "like"
-msgstr "mag"
+#: ../../Zotlabs/Module/Admin.php:143
+msgid "Registered channels"
+msgstr "Registrierte Kanäle"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:317
-msgid "dislike"
-msgstr "verurteile"
+#: ../../Zotlabs/Module/Admin.php:144
+msgid "Active plugins"
+msgstr "Aktive Plug-Ins"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:273
-msgid "Share This"
-msgstr "Teilen"
+#: ../../Zotlabs/Module/Admin.php:145
+msgid "Version"
+msgstr "Version"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:273
-msgid "share"
-msgstr "Teilen"
+#: ../../Zotlabs/Module/Admin.php:146
+msgid "Repository version (master)"
+msgstr "Repository-Version (master)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:282
-msgid "Delivery Report"
-msgstr "Zustellungsbericht"
+#: ../../Zotlabs/Module/Admin.php:147
+msgid "Repository version (dev)"
+msgstr "Repository-Version (dev)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:300
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d Kommentar"
-msgstr[1] "%d Kommentare"
+#: ../../Zotlabs/Module/Service_limits.php:23
+msgid "No service class restrictions found."
+msgstr "Keine Dienstklassenbeschränkungen gefunden."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:329 ../../Zotlabs/Lib/ThreadItem.php:330
-#, php-format
-msgid "View %s's profile - %s"
-msgstr "Schaue Dir %ss Profil an – %s"
+#: ../../Zotlabs/Module/Rate.php:156
+msgid "Website:"
+msgstr "Webseite:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:333
-msgid "to"
-msgstr "an"
+#: ../../Zotlabs/Module/Rate.php:159
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Kanal [%s] (auf diesem Server noch unbekannt)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:334
-msgid "via"
-msgstr "via"
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Rating (this information is public)"
+msgstr "Bewertung (öffentlich sichtbar)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:335
-msgid "Wall-to-Wall"
-msgstr "Wall-to-Wall"
+#: ../../Zotlabs/Module/Rate.php:161
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:336
-msgid "via Wall-To-Wall:"
-msgstr "via Wall-To-Wall:"
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
+msgstr "Kein gültiges Konto gefunden."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:717
-#, php-format
-msgid "from %s"
-msgstr "via %s"
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
+msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:720
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
 #, php-format
-msgid "last edited: %s"
-msgstr "zuletzt bearbeitet: %s"
+msgid "Site Member (%s)"
+msgstr "Nutzer (%s)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:721
+#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
 #, php-format
-msgid "Expires: %s"
-msgstr "Verfällt: %s"
+msgid "Password reset requested at %s"
+msgstr "Passwort-Rücksetzung auf %s angefordert"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:360
-msgid "Attend"
-msgstr "Zusagen"
+#: ../../Zotlabs/Module/Lostpass.php:68
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:361
-msgid "Attendance Options"
-msgstr "Zusageoptionen"
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1637
+msgid "Password Reset"
+msgstr "Zurücksetzen des Kennworts"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:362
-msgid "Vote"
-msgstr "Abstimmen"
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your password has been reset as requested."
+msgstr "Dein Passwort wurde wie angefordert neu erstellt."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:363
-msgid "Voting Options"
-msgstr "Abstimmungsoptionen"
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Your new password is"
+msgstr "Dein neues Passwort lautet"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:383
-#: ../../extend/addon/addon/bookmarker/bookmarker.php:38
-msgid "Save Bookmarks"
-msgstr "Favoriten speichern"
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "Save or copy your new password - and then"
+msgstr "Speichere oder kopiere Dein neues Passwort – und dann"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:384
-msgid "Add to Calendar"
-msgstr "Zum Kalender hinzufügen"
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid "click here to login"
+msgstr "Klicke hier, um dich anzumelden"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:393
-msgid "Mark all seen"
-msgstr "Alle als gelesen markieren"
+#: ../../Zotlabs/Module/Lostpass.php:96
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:442 ../../include/js_strings.php:7
+#: ../../Zotlabs/Module/Lostpass.php:117
 #, php-format
-msgid "%s show all"
-msgstr "%s mehr anzeigen"
-
-#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1385
-msgid "Bold"
-msgstr "Fett"
-
-#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1386
-msgid "Italic"
-msgstr "Kursiv"
-
-#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1387
-msgid "Underline"
-msgstr "Unterstrichen"
+msgid "Your password has changed at %s"
+msgstr "Auf %s wurde Dein Passwort geändert"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1388
-msgid "Quote"
-msgstr "Zitat"
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Forgot your Password?"
+msgstr "Kennwort vergessen?"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1389
-msgid "Code"
-msgstr "Code"
+#: ../../Zotlabs/Module/Lostpass.php:131
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:737
-msgid "Image"
-msgstr "Bild"
+#: ../../Zotlabs/Module/Lostpass.php:132
+msgid "Email Address"
+msgstr "E-Mail Adresse"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:738
-msgid "Insert Link"
-msgstr "Link einfügen"
+#: ../../Zotlabs/Module/Lostpass.php:133
+msgid "Reset"
+msgstr "Zurücksetzen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:739
-msgid "Video"
-msgstr "Video"
+#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:190
+msgid "Mark all system notifications seen"
+msgstr "Markiere alle System-Benachrichtigungen als gesehen"
 
 #: ../../Zotlabs/Lib/Apps.php:212
 msgid "Site Admin"
 msgstr "Hub-Administration"
 
-#: ../../Zotlabs/Lib/Apps.php:213
-#: ../../extend/addon/addon/buglink/buglink.php:16
+#: ../../Zotlabs/Lib/Apps.php:213 ../../addon/buglink/buglink.php:16
 msgid "Report Bug"
 msgstr "Fehler melden"
 
@@ -7738,34 +7090,35 @@ msgstr "Ferndiagnose"
 msgid "Suggest Channels"
 msgstr "Kanäle vorschlagen"
 
-#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:130
-#: ../../boot.php:1732
+#: ../../Zotlabs/Lib/Apps.php:220 ../../boot.php:1629
+#: ../../include/nav.php:117
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:194
-msgid "Grid"
-msgstr "Grid"
+#: ../../Zotlabs/Lib/Apps.php:222
+msgid "Activity"
+msgstr "Aktivität"
 
-#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1903
-#: ../../include/features.php:99
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1857
+#: ../../include/features.php:99 ../../include/nav.php:465
 msgid "Wiki"
 msgstr "Wiki"
 
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:198
+#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:180
 msgid "Channel Home"
 msgstr "Mein Kanal"
 
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1853
-#: ../../include/conversation.php:1856 ../../include/nav.php:218
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1802
+#: ../../include/conversation.php:1805 ../../include/nav.php:200
+#: ../../include/nav.php:411 ../../include/nav.php:414
 msgid "Events"
 msgstr "Termine"
 
-#: ../../Zotlabs/Lib/Apps.php:231 ../../include/nav.php:182
+#: ../../Zotlabs/Lib/Apps.php:231
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:210
+#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:192
 msgid "Mail"
 msgstr "Mail"
 
@@ -7789,12 +7142,11 @@ msgstr "Zufälliger Kanal"
 msgid "Invite"
 msgstr "Einladen"
 
-#: ../../Zotlabs/Lib/Apps.php:242 ../../include/widgets.php:1595
+#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26
 msgid "Features"
 msgstr "Funktionen"
 
-#: ../../Zotlabs/Lib/Apps.php:243
-#: ../../extend/addon/addon/openid/MysqlProvider.php:69
+#: ../../Zotlabs/Lib/Apps.php:243 ../../addon/openid/MysqlProvider.php:69
 msgid "Language"
 msgstr "Sprache"
 
@@ -7802,24 +7154,27 @@ msgstr "Sprache"
 msgid "Post"
 msgstr "Beitrag schreiben"
 
-#: ../../Zotlabs/Lib/Apps.php:245
-#: ../../extend/addon/addon/openid/MysqlProvider.php:58
-#: ../../extend/addon/addon/openid/MysqlProvider.php:59
-#: ../../extend/addon/addon/openid/MysqlProvider.php:60
+#: ../../Zotlabs/Lib/Apps.php:245 ../../addon/openid/MysqlProvider.php:58
+#: ../../addon/openid/MysqlProvider.php:59
+#: ../../addon/openid/MysqlProvider.php:60
 msgid "Profile Photo"
 msgstr "Profilfoto"
 
-#: ../../Zotlabs/Lib/Apps.php:355
+#: ../../Zotlabs/Lib/Apps.php:365
 msgid "Purchase"
 msgstr "Kaufen"
 
-#: ../../Zotlabs/Lib/Apps.php:359
+#: ../../Zotlabs/Lib/Apps.php:369
 msgid "Undelete"
 msgstr "Wieder hergestellt"
 
-#: ../../Zotlabs/Lib/NativeWiki.php:126
-msgid "Wiki files deleted successfully"
-msgstr "Wiki-Dateien erfolgreich gelöscht"
+#: ../../Zotlabs/Lib/Apps.php:374
+msgid "Add to app-tray"
+msgstr "Zum App-Menü hinzufügen"
+
+#: ../../Zotlabs/Lib/Apps.php:375
+msgid "Remove from app-tray"
+msgstr "Aus dem App-Menü entfernen"
 
 #: ../../Zotlabs/Lib/Permcat.php:58
 msgctxt "permcat"
@@ -7841,5419 +7196,5408 @@ msgctxt "permcat"
 msgid "publisher"
 msgstr "Autor"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:31
-#: ../../Zotlabs/Lib/NativeWikiPage.php:62
+#: ../../Zotlabs/Lib/NativeWikiPage.php:42
+#: ../../Zotlabs/Lib/NativeWikiPage.php:83
 msgid "(No Title)"
 msgstr "(Kein Titel)"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:76
+#: ../../Zotlabs/Lib/NativeWikiPage.php:97
 msgid "Wiki page create failed."
 msgstr "Anlegen der Wiki-Seite fehlgeschlagen."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:89
+#: ../../Zotlabs/Lib/NativeWikiPage.php:110
 msgid "Wiki not found."
 msgstr "Wiki nicht gefunden."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:100
+#: ../../Zotlabs/Lib/NativeWikiPage.php:121
 msgid "Destination name already exists"
 msgstr "Zielname bereits vorhanden"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:126
-#: ../../Zotlabs/Lib/NativeWikiPage.php:345
+#: ../../Zotlabs/Lib/NativeWikiPage.php:147
+#: ../../Zotlabs/Lib/NativeWikiPage.php:342
 msgid "Page not found"
 msgstr "Seite nicht gefunden"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:156
+#: ../../Zotlabs/Lib/NativeWikiPage.php:177
 msgid "Error reading page content"
 msgstr "Fehler beim Lesen des Seiteninhalts"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:338
-#: ../../Zotlabs/Lib/NativeWikiPage.php:383
-#: ../../Zotlabs/Lib/NativeWikiPage.php:450
-#: ../../Zotlabs/Lib/NativeWikiPage.php:491
+#: ../../Zotlabs/Lib/NativeWikiPage.php:333
+#: ../../Zotlabs/Lib/NativeWikiPage.php:381
+#: ../../Zotlabs/Lib/NativeWikiPage.php:448
+#: ../../Zotlabs/Lib/NativeWikiPage.php:489
 msgid "Error reading wiki"
 msgstr "Fehler beim Lesen des Wiki"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:371
+#: ../../Zotlabs/Lib/NativeWikiPage.php:369
 msgid "Page update failed."
 msgstr "Seitenaktualisierung fehlgeschlagen."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:405
+#: ../../Zotlabs/Lib/NativeWikiPage.php:403
 msgid "Nothing deleted"
 msgstr "Nichts gelöscht"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:471
+#: ../../Zotlabs/Lib/NativeWikiPage.php:469
 msgid "Compare: object not found."
 msgstr "Vergleichen: Objekt nicht gefunden."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:477
+#: ../../Zotlabs/Lib/NativeWikiPage.php:475
 msgid "Page updated"
 msgstr "Seite aktualisiert"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:480
+#: ../../Zotlabs/Lib/NativeWikiPage.php:478
 msgid "Untitled"
 msgstr "Ohne Titel"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:486
+#: ../../Zotlabs/Lib/NativeWikiPage.php:484
 msgid "Wiki resource_id required for git commit"
-msgstr ""
+msgstr "Die resource_id des Wiki wird benötigt für den git commit."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:557
-#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579
-#: ../../include/bbcode.php:610 ../../include/bbcode.php:756
+#: ../../Zotlabs/Lib/NativeWikiPage.php:540
+#: ../../Zotlabs/Widget/Wiki_page_history.php:23
+msgctxt "wiki_history"
+msgid "Message"
+msgstr "Nachricht"
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:578
+#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:610
+#: ../../include/bbcode.php:756
 msgid "Different viewers will see this text differently"
 msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen"
 
-#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24
-msgid "Flag Adult Photos"
-msgstr "Nicht jugendfreie Fotos markieren"
+#: ../../Zotlabs/Lib/PermissionDescription.php:34
+#: ../../include/acl_selectors.php:128
+msgid "Visible to your default audience"
+msgstr "Standard-Sichtbarkeit gemäß Kanaleinstellungen"
 
-#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:25
-msgid ""
-"Provide photo edit option to hide inappropriate photos from default album "
-"view"
-msgstr "Stellt eine Option zum Verstecken von Fotos mit unangemessenen Inhalten in der Standard-Albumansicht bereit"
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../include/acl_selectors.php:201
+msgid "Only me"
+msgstr "Nur ich"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+msgid "Public"
+msgstr "Öffentlich"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+msgid "Anybody in the $Projectname network"
+msgstr "Jeder innerhalb des $Projectname Netzwerks"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
+#, php-format
+msgid "Any account on %s"
+msgstr "Jedes Nutzerkonto auf %s"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Any of my connections"
+msgstr "Alle meine Verbindungen"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Only connections I specifically allow"
+msgstr "Nur Verbindungen, denen ich es explizit erlaube"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr "Jeder, der angemeldet ist (kann Besucher anderer Netzwerke beinhalten)"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:114
+msgid "Any connections including those who haven't yet been approved"
+msgstr "Alle Verbindungen einschließlich der noch nicht bestätigten"
 
-#: ../../extend/addon/addon/chords/Mod_Chords.php:44
+#: ../../Zotlabs/Lib/PermissionDescription.php:150
 msgid ""
-"This is a fairly comprehensive and complete guitar chord dictionary which "
-"will list most of the available ways to play a certain chord, starting from "
-"the base of the fingerboard up to a few frets beyond the twelfth fret "
-"(beyond which everything repeats). A couple of non-standard tunings are "
-"provided for the benefit of slide players, etc."
-msgstr ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner normalen Beiträge (Stream)."
 
-#: ../../extend/addon/addon/chords/Mod_Chords.php:46
+#: ../../Zotlabs/Lib/PermissionDescription.php:151
 msgid ""
-"Chord names start with a root note (A-G) and may include sharps (#) and "
-"flats (b). This software will parse most of the standard naming conventions "
-"such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."
-msgstr ""
+"This is your default setting for who can view your default channel profile"
+msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deines Standard-Kanalprofils."
 
-#: ../../extend/addon/addon/chords/Mod_Chords.php:48
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+msgid "This is your default setting for who can view your connections"
+msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Verbindungen."
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
 msgid ""
-"Valid examples include  A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, "
-"E7b13b11 ..."
-msgstr "Einige gültige Beispiele: A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."
+"This is your default setting for who can view your file storage and photos"
+msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Dateien und Fotos."
 
-#: ../../extend/addon/addon/chords/Mod_Chords.php:51
-msgid "Guitar Chords"
-msgstr "Gitarrenakkorde"
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+msgid "This is your default setting for the audience of your webpages"
+msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Webseiten."
 
-#: ../../extend/addon/addon/chords/Mod_Chords.php:52
-msgid "The complete online chord dictionary"
-msgstr "Das komplette online Akkord-Verzeichnis"
+#: ../../Zotlabs/Lib/Chatroom.php:27
+msgid "Missing room name"
+msgstr "Der Chatraum hat keinen Namen"
 
-#: ../../extend/addon/addon/chords/Mod_Chords.php:57
-msgid "Tuning"
-msgstr "Stimmen"
+#: ../../Zotlabs/Lib/Chatroom.php:36
+msgid "Duplicate room name"
+msgstr "Name des Chatraums bereits vergeben"
 
-#: ../../extend/addon/addon/chords/Mod_Chords.php:58
-msgid "Chord name: example: Em7"
-msgstr "Beispiel Akkord Name: Em7"
+#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94
+msgid "Invalid room specifier."
+msgstr "Ungültiger Raumbezeichner."
 
-#: ../../extend/addon/addon/chords/Mod_Chords.php:59
-msgid "Show for left handed stringing"
-msgstr "Linkshänder-Besaitung anzeigen"
+#: ../../Zotlabs/Lib/Chatroom.php:126
+msgid "Room not found."
+msgstr "Chatraum konnte nicht gefunden werden."
 
-#: ../../extend/addon/addon/chords/chords.php:33
-msgid "Quick Reference"
-msgstr "Schnellreferenz"
+#: ../../Zotlabs/Lib/Chatroom.php:147
+msgid "Room is full"
+msgstr "Der Chatraum ist voll"
 
-#: ../../extend/addon/addon/diaspora/import_diaspora.php:16
-msgid "No username found in import file."
-msgstr "Kein Benutzername in der Importdatei gefunden."
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1977
+msgid "$Projectname Notification"
+msgstr "$Projectname-Benachrichtigung"
 
-#: ../../extend/addon/addon/diaspora/import_diaspora.php:41
-#: ../../include/import.php:51
-msgid "Unable to create a unique channel address. Import failed."
-msgstr "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Import ist fehlgeschlagen."
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:218
+#: ../../addon/diaspora/util.php:231 ../../addon/diaspora/p.php:46
+#: ../../include/network.php:1978
+msgid "$projectname"
+msgstr "$projectname"
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:677
-msgid "Diaspora Protocol Settings updated."
-msgstr "Diaspora-Protokolleinstellungen aktualisiert."
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1980
+msgid "Thank You,"
+msgstr "Danke."
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:696
-msgid "Enable the Diaspora protocol for this channel"
-msgstr "Diaspora-Protokoll für diesen Kanal aktivieren"
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1982
+#, php-format
+msgid "%s Administrator"
+msgstr "der Administrator von %s"
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:700
-msgid "Allow any Diaspora member to comment on your public posts"
-msgstr "Jedem Diaspora-Mitglied erlauben, Deine öffentlichen Beiträge zu kommentieren"
+#: ../../Zotlabs/Lib/Enotify.php:116
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:704
-msgid "Prevent your hashtags from being redirected to other sites"
-msgstr "Verhindern, dass Deine hashtags zu anderen Seiten umgeleitet werden"
+#: ../../Zotlabs/Lib/Enotify.php:120
+#, php-format
+msgid "[$Projectname:Notify] New mail received at %s"
+msgstr "[$Projectname:Benachrichtigung] Neue Mail empfangen auf %s"
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:709
-msgid "Followed hashtags (comma separated, do not include the #)"
-msgstr "Verfolgte Hashtags (Komma separierte Liste, ohne die #)"
+#: ../../Zotlabs/Lib/Enotify.php:122
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s hat Dir eine private Nachricht auf %3$s gesendet."
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:714
-msgid "Diaspora Protocol Settings"
-msgstr "Diaspora-Protokolleinstellungen"
+#: ../../Zotlabs/Lib/Enotify.php:123
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s hat Dir %2$s geschickt."
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:94
-msgid "Hubzilla Directory Stats"
-msgstr "Hubzilla-Verzeichnisstatistiken"
+#: ../../Zotlabs/Lib/Enotify.php:123
+msgid "a private message"
+msgstr "eine private Nachricht"
+
+#: ../../Zotlabs/Lib/Enotify.php:124
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
+
+#: ../../Zotlabs/Lib/Enotify.php:183
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]einen %4$s[/zrl] kommentiert"
+
+#: ../../Zotlabs/Lib/Enotify.php:191
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
+
+#: ../../Zotlabs/Lib/Enotify.php:200
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen %4$s[/zrl] kommentiert"
+
+#: ../../Zotlabs/Lib/Enotify.php:211
+#, php-format
+msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[$Projectname:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
+
+#: ../../Zotlabs/Lib/Enotify.php:212
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr "%1$s, %2$s hat eine Unterhaltung kommentiert, der Du folgst."
+
+#: ../../Zotlabs/Lib/Enotify.php:215 ../../Zotlabs/Lib/Enotify.php:292
+#: ../../Zotlabs/Lib/Enotify.php:309 ../../Zotlabs/Lib/Enotify.php:335
+#: ../../Zotlabs/Lib/Enotify.php:353 ../../Zotlabs/Lib/Enotify.php:367
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."
+
+#: ../../Zotlabs/Lib/Enotify.php:273
+#, php-format
+msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s gefällt [zrl=%3$s]dein %4$s[/zrl]"
+
+#: ../../Zotlabs/Lib/Enotify.php:288
+#, php-format
+msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
+msgstr "[$Projectname:Benachrichtigung] Gefällt mir in Unterhaltung #%1$d von %2$s erhalten"
+
+#: ../../Zotlabs/Lib/Enotify.php:289
+#, php-format
+msgid "%1$s, %2$s liked an item/conversation you created."
+msgstr "%1$s, %2$s gefällt ein Beitrag oder eine Unterhaltung von Dir"
+
+#: ../../Zotlabs/Lib/Enotify.php:300
+#, php-format
+msgid "[$Projectname:Notify] %s posted to your profile wall"
+msgstr "[$Projectname:Benachrichtigung] %s schrieb auf Deine Pinnwand"
+
+#: ../../Zotlabs/Lib/Enotify.php:302
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr "%1$s, %2$s hat auf Deine Pinnwand auf %3$s geschrieben"
+
+#: ../../Zotlabs/Lib/Enotify.php:304
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr "%1$s, %2$s hat auf [zrl=%3$s]Deine Pinnwand[/zrl] geschrieben"
+
+#: ../../Zotlabs/Lib/Enotify.php:328
+#, php-format
+msgid "[$Projectname:Notify] %s tagged you"
+msgstr "[$Projectname:Benachrichtigung] %s hat Dich erwähnt"
+
+#: ../../Zotlabs/Lib/Enotify.php:329
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s hat Dich auf %3$s erwähnt"
+
+#: ../../Zotlabs/Lib/Enotify.php:330
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]hat Dich erwähnt[/zrl]."
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:95
-msgid "Total Hubs"
-msgstr "Hubs insgesamt"
+#: ../../Zotlabs/Lib/Enotify.php:342
+#, php-format
+msgid "[$Projectname:Notify] %1$s poked you"
+msgstr "[$Projectname:Benachrichtigung] %1$s hat Dich angestupst"
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:97
-msgid "Hubzilla Hubs"
-msgstr "Hubzilla Hubs"
+#: ../../Zotlabs/Lib/Enotify.php:343
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, %2$s hat Dich auf %3$s angestupst"
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:99
-msgid "Friendica Hubs"
-msgstr "Friendica Hubs"
+#: ../../Zotlabs/Lib/Enotify.php:344
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]hat Dich angestupst[/zrl]."
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:101
-msgid "Diaspora Pods"
-msgstr "Diaspora Pods"
+#: ../../Zotlabs/Lib/Enotify.php:360
+#, php-format
+msgid "[$Projectname:Notify] %s tagged your post"
+msgstr "[$Projectname:Benachrichtigung] %s hat Deinen Beitrag verschlagwortet"
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:103
-msgid "Hubzilla Channels"
-msgstr "Hubzilla-Kanäle"
+#: ../../Zotlabs/Lib/Enotify.php:361
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr "%1$s, %2$s hat Deinen Beitrag auf %3$s verschlagwortet"
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:105
-msgid "Friendica Channels"
-msgstr "Friendica-Kanäle"
+#: ../../Zotlabs/Lib/Enotify.php:362
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen Beitrag[/zrl] verschlagwortet"
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:107
-msgid "Diaspora Channels"
-msgstr "Diaspora-Kanäle"
+#: ../../Zotlabs/Lib/Enotify.php:374
+msgid "[$Projectname:Notify] Introduction received"
+msgstr "[$Projectname:Benachrichtigung] Verbindungsanfrage erhalten"
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:109
-msgid "Aged 35 and above"
-msgstr "35 und älter"
+#: ../../Zotlabs/Lib/Enotify.php:375
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr "%1$s, Du hast eine neue Verbindungsanfrage von '%2$s' auf %3$s erhalten"
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:111
-msgid "Aged 34 and under"
-msgstr "34 und jünger"
+#: ../../Zotlabs/Lib/Enotify.php:376
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+msgstr "%1$s, Du hast [zrl=%2$s]eine neue Verbindungsanfrage[/zrl] von %3$s erhalten."
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:113
-msgid "Average Age"
-msgstr "Durchschnittsalter"
+#: ../../Zotlabs/Lib/Enotify.php:380 ../../Zotlabs/Lib/Enotify.php:399
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Du kannst Dir das Profil unter %s ansehen"
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:115
-msgid "Known Chatrooms"
-msgstr "Bekannte Chaträume"
+#: ../../Zotlabs/Lib/Enotify.php:382
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen."
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:117
-msgid "Known Tags"
-msgstr "Bekannte Schlagwörter"
+#: ../../Zotlabs/Lib/Enotify.php:389
+msgid "[$Projectname:Notify] Friend suggestion received"
+msgstr "[$Projectname:Benachrichtigung] Freundschaftsvorschlag erhalten"
+
+#: ../../Zotlabs/Lib/Enotify.php:390
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr "%1$s, Du hast einen Kontaktvorschlag von „%2$s“ auf %3$s erhalten"
 
-#: ../../extend/addon/addon/dirstats/dirstats.php:119
+#: ../../Zotlabs/Lib/Enotify.php:391
+#, php-format
 msgid ""
-"Please note Diaspora and Friendica statistics are merely those **this "
-"directory** is aware of, and not all those known in the network.  This also "
-"applies to chatrooms,"
-msgstr "Bitte berücksichtige, dass Diaspora und Friendica Statistiken nur solche einschließen, die **diesem Verzeichnis** bekannt sind, nicht alle im Netzwerk bekannten. Das gilt auch für Chaträume."
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
+"%4$s."
+msgstr "%1$s, Du hast [zrl=%2$s]einen Kontaktvorschlag[/zrl] für %3$s von %4$s erhalten."
 
-#: ../../extend/addon/addon/donate/donate.php:21
-msgid "Project Servers and Resources"
-msgstr "Projektserver und -ressourcen"
+#: ../../Zotlabs/Lib/Enotify.php:397
+msgid "Name:"
+msgstr "Name:"
 
-#: ../../extend/addon/addon/donate/donate.php:22
-msgid "Project Creator and Tech Lead"
-msgstr "Projektersteller und Technischer Leiter"
+#: ../../Zotlabs/Lib/Enotify.php:398
+msgid "Photo:"
+msgstr "Foto:"
 
-#: ../../extend/addon/addon/donate/donate.php:23
-msgid "Admin, developer, directorymin, support bloke"
-msgstr "Administrator, Entwickler, Verzeichnis Betreibender, Supportleistende"
+#: ../../Zotlabs/Lib/Enotify.php:401
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
 
-#: ../../extend/addon/addon/donate/donate.php:50
-msgid ""
-"And the hundreds of other people and organisations who helped make the "
-"Hubzilla possible."
-msgstr "Und die hunderte anderen Menschen und Organisationen, die geholfen haben Hubzilla möglich zu machen."
+#: ../../Zotlabs/Lib/Enotify.php:620
+msgid "[$Projectname:Notify]"
+msgstr "[$Projectname:Benachrichtigung]"
 
-#: ../../extend/addon/addon/donate/donate.php:53
-msgid ""
-"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving "
-"their time and expertise - and often paying out of pocket for services they "
-"share with others."
-msgstr "Die Redmatrix/Hubzilla Projekte werden hauptsächlich von Freiwilligen bereitgestellt, die ihre Zeit und Expertise zur Verfügung stellen - und oft aus eigener Tasche für die Dienste zahlen, die sie mit anderen teilen."
+#: ../../Zotlabs/Lib/Enotify.php:780
+msgid "created a new post"
+msgstr "Neuer Beitrag wurde erzeugt"
 
-#: ../../extend/addon/addon/donate/donate.php:54
-msgid ""
-"There is no corporate funding and no ads, and we do not collect and sell "
-"your personal information. (We don't control your personal information - "
-"<strong>you do</strong>.)"
-msgstr "Es gibt keine Finanzierung durch Firmen, keine Werbung und wir verkaufen Deine persönlichen Daten nicht. (Wir kontrollieren Deine persönlichen Daten nicht - <strong>das machst Du</strong>.)"
+#: ../../Zotlabs/Lib/Enotify.php:781
+#, php-format
+msgid "commented on %s's post"
+msgstr "hat %s's Beitrag kommentiert"
 
-#: ../../extend/addon/addon/donate/donate.php:55
-msgid ""
-"Help support our ground-breaking work in decentralisation, web identity, and"
-" privacy."
-msgstr "Hilf uns bei unserer wegweisenden Arbeit im Bereich der Dezantralisation, von Web-Identitäten und Privatsphäre."
+#: ../../Zotlabs/Lib/NativeWiki.php:128
+msgid "Wiki files deleted successfully"
+msgstr "Wiki-Dateien erfolgreich gelöscht"
 
-#: ../../extend/addon/addon/donate/donate.php:57
-msgid ""
-"Your donations keep servers and services running and also helps us to "
-"provide innovative new features and continued development."
-msgstr "Die Spenden werden dafür verwendet Server und Dienste am laufen zu halten und helfen desweiteren innovative Neuerungen zu schaffen und die Entwicklung voran zu treiben."
+#: ../../Zotlabs/Lib/DB_Upgrade.php:93
+#, php-format
+msgid "Update Error at %s"
+msgstr "Aktualisierungsfehler auf %s"
 
-#: ../../extend/addon/addon/donate/donate.php:60
-msgid "Donate"
-msgstr "Spenden"
+#: ../../Zotlabs/Lib/DB_Upgrade.php:99
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."
 
-#: ../../extend/addon/addon/donate/donate.php:62
-msgid ""
-"Choose a project, developer, or public hub to support with a one-time "
-"donation"
-msgstr "Wähle ein Projekt, einen Entwickler oder einen öffentlichen Hub den du mit einer einmaligen Spende unterstützen willst."
+#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:661
+msgid "Private Message"
+msgstr "Private Nachricht"
 
-#: ../../extend/addon/addon/donate/donate.php:63
-msgid "Donate Now"
-msgstr "Jetzt spenden"
+#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:653
+msgid "Select"
+msgstr "Auswählen"
 
-#: ../../extend/addon/addon/donate/donate.php:64
-msgid ""
-"<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project "
-"only)"
-msgstr "<strong><em>Oder</em></strong> werde ein Unterstützer des Projekts (ausschließlich Hubzilla)"
+#: ../../Zotlabs/Lib/ThreadItem.php:158
+msgid "I will attend"
+msgstr "Ich werde teilnehmen"
 
-#: ../../extend/addon/addon/donate/donate.php:65
-msgid ""
-"Please indicate if you would like your first name or full name (or nothing) "
-"to appear in our sponsor listing"
-msgstr "Bitte teile uns mit ob dein kompletter Name oder dein Vorname (oder gar nichts) auf unserer Sponsoren-Seite veröffentlicht werden soll."
+#: ../../Zotlabs/Lib/ThreadItem.php:158
+msgid "I will not attend"
+msgstr "Ich werde nicht teilnehmen"
 
-#: ../../extend/addon/addon/donate/donate.php:66
-msgid "Sponsor"
-msgstr "Sponsor"
+#: ../../Zotlabs/Lib/ThreadItem.php:158
+msgid "I might attend"
+msgstr "Ich werde vielleicht teilnehmen"
 
-#: ../../extend/addon/addon/donate/donate.php:69
-msgid "Special thanks to: "
-msgstr "Besonderer Dank an: "
+#: ../../Zotlabs/Lib/ThreadItem.php:168
+msgid "I agree"
+msgstr "Ich stimme zu"
 
-#: ../../extend/addon/addon/dwpost/dwpost.php:42
-msgid "Post to Dreamwidth"
-msgstr "Bei Dreamwidth veröffentlichen"
+#: ../../Zotlabs/Lib/ThreadItem.php:168
+msgid "I disagree"
+msgstr "Ich lehne ab"
 
-#: ../../extend/addon/addon/dwpost/dwpost.php:73
-msgid "Enable Dreamwidth Post Plugin"
-msgstr "Aktiviere das Dreamwidth-Plugin"
+#: ../../Zotlabs/Lib/ThreadItem.php:168
+msgid "I abstain"
+msgstr "Ich enthalte mich"
 
-#: ../../extend/addon/addon/dwpost/dwpost.php:77
-msgid "Dreamwidth username"
-msgstr "Dreamwidth-Benutzername"
+#: ../../Zotlabs/Lib/ThreadItem.php:224
+msgid "Add Star"
+msgstr "Stern hinzufügen"
 
-#: ../../extend/addon/addon/dwpost/dwpost.php:81
-msgid "Dreamwidth password"
-msgstr "Dreamwidth-Passwort"
+#: ../../Zotlabs/Lib/ThreadItem.php:225
+msgid "Remove Star"
+msgstr "Stern entfernen"
 
-#: ../../extend/addon/addon/dwpost/dwpost.php:85
-msgid "Post to Dreamwidth by default"
-msgstr "Standardmäßig auf auf Dreamwidth posten"
+#: ../../Zotlabs/Lib/ThreadItem.php:226
+msgid "Toggle Star Status"
+msgstr "Markierungsstatus (Stern) umschalten"
 
-#: ../../extend/addon/addon/dwpost/dwpost.php:89
-msgid "Dreamwidth Post Settings"
-msgstr "Dreamwidth-Beitragseinstellungen"
+#: ../../Zotlabs/Lib/ThreadItem.php:230
+msgid "starred"
+msgstr "markiert"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:45
-msgid "Flattr this!"
-msgstr "Flattr this!"
+#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:668
+msgid "Message signature validated"
+msgstr "Signatur überprüft"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:83
-msgid "Flattr widget settings updated."
-msgstr "Flattr Widget Einstellungen aktualisiert"
+#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:669
+msgid "Message signature incorrect"
+msgstr "Signatur nicht korrekt"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:100
-msgid "Flattr user"
-msgstr "Flattr Nutzer"
+#: ../../Zotlabs/Lib/ThreadItem.php:249
+msgid "Add Tag"
+msgstr "Tag hinzufügen"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:104
-msgid "URL of the Thing to flattr"
-msgstr "URL des Dings zum flattrn"
+#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:316
+msgid "like"
+msgstr "mag"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:104
-msgid "If empty channel URL is used"
-msgstr "Falls leer wird die Channel URL verwendet"
+#: ../../Zotlabs/Lib/ThreadItem.php:270 ../../include/taxonomy.php:317
+msgid "dislike"
+msgstr "verurteile"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:108
-msgid "Title of the Thing to flattr"
-msgstr "Titel des Dings zum flattrn"
+#: ../../Zotlabs/Lib/ThreadItem.php:274
+msgid "Share This"
+msgstr "Teilen"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:108
-msgid "If empty \"channel name on The Hubzilla\" will be used"
-msgstr "Falls leer wird \"Kanalname auf The Hubzilla\" verwendet"
+#: ../../Zotlabs/Lib/ThreadItem.php:274
+msgid "share"
+msgstr "Teilen"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112
-msgid "Static or dynamic flattr button"
-msgstr "Statischer oder dynamischer Flattr Button"
+#: ../../Zotlabs/Lib/ThreadItem.php:283
+msgid "Delivery Report"
+msgstr "Zustellungsbericht"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112
-msgid "static"
-msgstr "statisch"
+#: ../../Zotlabs/Lib/ThreadItem.php:301
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d Kommentar"
+msgstr[1] "%d Kommentare"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112
-msgid "dynamic"
-msgstr "dynamisch"
+#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Lib/ThreadItem.php:331
+#, php-format
+msgid "View %s's profile - %s"
+msgstr "Schaue Dir %ss Profil an – %s"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116
-msgid "Alignment of the widget"
-msgstr "Ausrichtung des Widgets"
+#: ../../Zotlabs/Lib/ThreadItem.php:334
+msgid "to"
+msgstr "an"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116
-msgid "left"
-msgstr "links"
+#: ../../Zotlabs/Lib/ThreadItem.php:335
+msgid "via"
+msgstr "via"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116
-msgid "right"
-msgstr "rechts"
+#: ../../Zotlabs/Lib/ThreadItem.php:336
+msgid "Wall-to-Wall"
+msgstr "Wall-to-Wall"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
-msgid "Enable Flattr widget"
-msgstr "Flattr Widget verwenden"
+#: ../../Zotlabs/Lib/ThreadItem.php:337
+msgid "via Wall-To-Wall:"
+msgstr "via Wall-To-Wall:"
 
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124
-msgid "Flattr Widget Settings"
-msgstr "Flattr Widget Einstellungen"
+#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:718
+#, php-format
+msgid "from %s"
+msgstr "via %s"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:118
-msgid "Contact not found."
-msgstr "Kontakt nicht gefunden."
+#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:721
+#, php-format
+msgid "last edited: %s"
+msgstr "zuletzt bearbeitet: %s"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:119
-msgid ""
-"This may occasionally happen if contact was requested by both persons and it"
-" has already been approved."
-msgstr "Dies kann unter Umständen passieren, wenn der Kontakt von beiden Seiten aus angefragt wurde und er bereits akzeptiert wurde.."
+#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:722
+#, php-format
+msgid "Expires: %s"
+msgstr "Verfällt: %s"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:238
-msgid "Response from remote site was not understood."
-msgstr "Antwort des entfernten Seite war unverständlich."
+#: ../../Zotlabs/Lib/ThreadItem.php:360
+msgid "Attend"
+msgstr "Zusagen"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:247
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:252
-msgid "Unexpected response from remote site: "
-msgstr "Unerwartete Antwort der entfernten Seite"
+#: ../../Zotlabs/Lib/ThreadItem.php:361
+msgid "Attendance Options"
+msgstr "Zusageoptionen"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:261
-msgid "Confirmation completed successfully."
-msgstr "Bestätigung erfolgreich abgeschlossen."
+#: ../../Zotlabs/Lib/ThreadItem.php:362
+msgid "Vote"
+msgstr "Abstimmen"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:263
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:277
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:284
-msgid "Remote site reported: "
-msgstr "Meldung der entfernten Seite"
+#: ../../Zotlabs/Lib/ThreadItem.php:363
+msgid "Voting Options"
+msgstr "Abstimmungsoptionen"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:275
-msgid "Temporary failure. Please wait and try again."
-msgstr "Vorübergehende Störung. Bitte warte einen Moment und versuche es später erneut."
+#: ../../Zotlabs/Lib/ThreadItem.php:384
+#: ../../addon/bookmarker/bookmarker.php:38
+msgid "Save Bookmarks"
+msgstr "Favoriten speichern"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:282
-msgid "Introduction failed or was revoked."
-msgstr "Vorstellung fehlgeschlagen oder wurde zurück gezogen."
+#: ../../Zotlabs/Lib/ThreadItem.php:385
+msgid "Add to Calendar"
+msgstr "Zum Kalender hinzufügen"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:428
-msgid "Unable to set contact photo."
-msgstr "Konnte das Kontakt-Photo nicht setzen."
+#: ../../Zotlabs/Lib/ThreadItem.php:394
+msgid "Mark all seen"
+msgstr "Alle als gelesen markieren"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:485
+#: ../../Zotlabs/Lib/ThreadItem.php:443 ../../include/js_strings.php:7
 #, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr "%1$s ist nun mit %2$s befreundet"
+msgid "%s show all"
+msgstr "%s mehr anzeigen"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:570
-#, php-format
-msgid "No user record found for '%s' "
-msgstr "Kein Benutzereintrag für '%s'  gefunden"
+#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1318
+msgid "Bold"
+msgstr "Fett"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:580
-msgid "Our site encryption key is apparently messed up."
-msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend kaputt."
+#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1319
+msgid "Italic"
+msgstr "Kursiv"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:591
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr "Eine leere Seiten URL wurde angegeben, oder die URL konnte von uns nicht entziffert werden."
+#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1320
+msgid "Underline"
+msgstr "Unterstrichen"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:612
-msgid "Contact record was not found for you on our site."
-msgstr "Für dich wurden keinerlei Kontaktdaten auf unserer Seite gefunden."
+#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1321
+msgid "Quote"
+msgstr "Zitat"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:626
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr "Der öffentliche Schlüssel dieser Seite ist für die Kontaktdaten mit der URL %s nocht verfügbar."
+#: ../../Zotlabs/Lib/ThreadItem.php:737 ../../include/conversation.php:1322
+msgid "Code"
+msgstr "Code"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:646
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
-msgstr "Die ID, die Durch Dein System angegeben wurde ist ein Duplikat auf unserem. Es sollte funktionieren, wenn Du es noch einmal versuchst."
+#: ../../Zotlabs/Lib/ThreadItem.php:738
+msgid "Image"
+msgstr "Bild"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:657
-msgid "Unable to set your contact credentials on our system."
-msgstr ""
+#: ../../Zotlabs/Lib/ThreadItem.php:739
+msgid "Insert Link"
+msgstr "Link einfügen"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:724
-msgid "Unable to update your contact profile details on our system"
-msgstr "Konnte die Details deines Profils auf unserem System nicht aktualisieren."
+#: ../../Zotlabs/Lib/ThreadItem.php:740
+msgid "Video"
+msgstr "Video"
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:751
-#: ../../extend/addon/addon/friendica/dfrn_request.php:749
-msgid "[Name Withheld]"
-msgstr "[Name zurück gehalten]"
+#: ../../Zotlabs/Zot/Auth.php:138
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:796
+#: ../../Zotlabs/Zot/Auth.php:250 ../../addon/openid/Mod_Openid.php:76
+#: ../../addon/openid/Mod_Openid.php:178
 #, php-format
-msgid "%1$s has joined %2$s"
-msgstr "%1$s ist %2$s beigetreten"
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
 
-#: ../../extend/addon/addon/friendica/dfrn_poll.php:103
-#: ../../extend/addon/addon/friendica/dfrn_poll.php:536
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr "%1$s heißt %2$s willkommen"
+#: ../../Zotlabs/Storage/Browser.php:106 ../../Zotlabs/Storage/Browser.php:237
+msgid "parent"
+msgstr "Übergeordnetes Verzeichnis"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:102
-msgid "This introduction has already been accepted."
-msgstr "Die Vorstellung wurde bereits akzeptiert."
+#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2679
+msgid "Collection"
+msgstr "Sammlung"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:123
-#: ../../extend/addon/addon/friendica/dfrn_request.php:528
-msgid "Profile location is not valid or does not contain profile information."
-msgstr "Die angegebenen Profil Lokalität ist nicht gültig oder enthält keine Profil-Informationen."
+#: ../../Zotlabs/Storage/Browser.php:133
+msgid "Principal"
+msgstr "Prinzipal"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:128
-#: ../../extend/addon/addon/friendica/dfrn_request.php:533
-msgid "Warning: profile location has no identifiable owner name."
-msgstr ""
+#: ../../Zotlabs/Storage/Browser.php:136
+msgid "Addressbook"
+msgstr "Adressbuch"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:130
-#: ../../extend/addon/addon/friendica/dfrn_request.php:535
-msgid "Warning: profile location has no profile photo."
-msgstr "Warnung: Beim angegebenen Profil liegt kein Profil-Bild bei."
+#: ../../Zotlabs/Storage/Browser.php:139
+msgid "Calendar"
+msgstr "Kalender"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:133
-#: ../../extend/addon/addon/friendica/dfrn_request.php:538
-#, php-format
-msgid "%d required parameter was not found at the given location"
-msgid_plural "%d required parameters were not found at the given location"
-msgstr[0] "Konnte %d benötigten Parameter an der angegebenen Stelle nicht finden."
-msgstr[1] "Konnte %d benötigte Parameter an der angegebenen Stelle nicht finden."
+#: ../../Zotlabs/Storage/Browser.php:142
+msgid "Schedule Inbox"
+msgstr "Posteingang für überwachte Kalender"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:180
-msgid "Introduction complete."
-msgstr "Einführung abgeschlossen."
+#: ../../Zotlabs/Storage/Browser.php:145
+msgid "Schedule Outbox"
+msgstr "Postausgang für überwachte Kalender"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:224
-msgid "Unrecoverable protocol error."
-msgstr "Nicht behebbarer Protokollfehler."
+#: ../../Zotlabs/Storage/Browser.php:225
+msgid "Total"
+msgstr "Summe"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:252
-msgid "Profile unavailable."
-msgstr "Profil nicht verfügbar."
+#: ../../Zotlabs/Storage/Browser.php:227
+msgid "Shared"
+msgstr "Geteilt"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:277
+#: ../../Zotlabs/Storage/Browser.php:301
 #, php-format
-msgid "%s has received too many connection requests today."
-msgstr "%s hat heute bereits zu viele Kontaktanfragen erhalten."
+msgid "You are using %1$s of your available file storage."
+msgstr "Sie verwenden %1$s von Ihrem verfügbaren Dateispeicher."
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:278
-msgid "Spam protection measures have been invoked."
-msgstr "Maßnahmen zum Spam-Schutz wurden aktiviert."
+#: ../../Zotlabs/Storage/Browser.php:306
+#, php-format
+msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
+msgstr "Sie verwenden %1$s von %2$s verfügbarem Dateispeicher. (%3$s&#37;)"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:279
-msgid "Friends are advised to please try again in 24 hours."
-msgstr "Freunde sollten es bitte in 24 Stunden erneut versuchen."
+#: ../../Zotlabs/Storage/Browser.php:317
+msgid "WARNING:"
+msgstr "WARNUNG:"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:341
-msgid "Invalid locator"
-msgstr ""
+#: ../../Zotlabs/Storage/Browser.php:327
+msgid ""
+"Please use DAV to upload large (video, audio) files.<br>See <a class=\"zrl\""
+" href=\"help/member/member_guide#Cloud_Desktop_Clients\">Cloud Desktop "
+"Clients</a>"
+msgstr "Bitte verwende DAV, um große Dateien (Audio, Video) hochzuladen.<br>Für weitere Informationen siehe <a class=\"zrl\" href=\"help/member/member_guide#Cloud_Desktop_Clients\">Cloud Desktop Clients</a>"
+
+#: ../../Zotlabs/Storage/Browser.php:331
+msgid "Create new folder"
+msgstr "Neuen Ordner anlegen"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:350
-msgid "Invalid email address."
-msgstr "Ungültige E-Mail-Adresse."
+#: ../../Zotlabs/Storage/Browser.php:333
+msgid "Upload file"
+msgstr "Datei hochladen"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:377
-msgid "This account has not been configured for email. Request failed."
-msgstr "Dieser Account wurde nicht für E-Mail konfiguriert. Anfrage gescheitert."
+#: ../../Zotlabs/Storage/Browser.php:347
+msgid "Drop files here to immediately upload"
+msgstr "Dateien zum sofortigen Hochladen hier fallen lassen"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:473
-msgid "Unable to resolve your name at the provided location."
-msgstr "Konnte deinen Namen nicht bei der angegebenen Stelle ermitteln."
+#: ../../Zotlabs/Widget/Forums.php:85
+msgid "Forums"
+msgstr "Foren"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:486
-msgid "You have already introduced yourself here."
-msgstr "Du hast dich hier bereits vorgestellt."
+#: ../../Zotlabs/Widget/Appcategories.php:39
+#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:91
+#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
+msgid "Categories"
+msgstr "Kategorien"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:490
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr "Anscheinend bist du bereits mit %s in Kontakt."
+#: ../../Zotlabs/Widget/Appcategories.php:42 ../../Zotlabs/Widget/Filer.php:31
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
+msgstr "Alles"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:511
-msgid "Invalid profile URL."
-msgstr "Ungültige Profil-URL."
+#: ../../Zotlabs/Widget/Eventstools.php:13
+msgid "Events Tools"
+msgstr "Kalenderwerkzeuge"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:517
-msgid "Disallowed profile URL."
-msgstr "Nicht erlaubte Profil-URL."
+#: ../../Zotlabs/Widget/Eventstools.php:14
+msgid "Export Calendar"
+msgstr "Kalender exportieren"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:587
-msgid "Failed to update contact record."
-msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
+#: ../../Zotlabs/Widget/Eventstools.php:15
+msgid "Import Calendar"
+msgstr "Kalender importieren"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:608
-msgid "Your introduction has been sent."
-msgstr "Deine Vorstellung wurde gesendet."
+#: ../../Zotlabs/Widget/Suggestedchats.php:32
+msgid "Suggested Chatrooms"
+msgstr "Chatraum-Vorschläge"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:662
-msgid "Please login to confirm introduction."
-msgstr "Bitte melde dich an um die Vorstellung zu bestätigen."
+#: ../../Zotlabs/Widget/Mailmenu.php:13
+msgid "Private Mail Menu"
+msgstr "Private Nachrichten"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:676
-msgid ""
-"Incorrect identity currently logged in. Please login to "
-"<strong>this</strong> profile."
-msgstr ""
+#: ../../Zotlabs/Widget/Mailmenu.php:15
+msgid "Combined View"
+msgstr "Kombinierte Anzeige"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:690
-#: ../../extend/addon/addon/friendica/dfrn_request.php:707
-msgid "Confirm"
-msgstr "Bestätigen"
+#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:195
+msgid "Inbox"
+msgstr "Eingang"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:702
-msgid "Hide this contact"
-msgstr "Diesen Kontakt verbergen"
+#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:196
+msgid "Outbox"
+msgstr "Ausgang"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:705
-#, php-format
-msgid "Welcome home %s."
-msgstr "Willkommen daheim %s"
+#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:197
+msgid "New Message"
+msgstr "Neue Nachricht"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:706
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr "Bitte bestätige deine Vorstellung/Kontaktanfrage bei %s."
+#: ../../Zotlabs/Widget/Chatroom_list.php:16
+#: ../../include/conversation.php:1816 ../../include/conversation.php:1819
+#: ../../include/nav.php:425 ../../include/nav.php:428
+msgid "Chatrooms"
+msgstr "Chaträume"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:836
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
-msgstr "Bitte gib deine \"Identitäts Adresse\" von einem der folgenden unterstützten Kommunikations Netzwerke an."
+#: ../../Zotlabs/Widget/Chatroom_list.php:20
+msgid "Overview"
+msgstr "Übersicht"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:857
-#, php-format
-msgid ""
-"If you are not yet a member of the free social web, <a "
-"href=\"%s/siteinfo\">follow this link to find a public Friendica site and "
-"join us today</a>."
-msgstr ""
+#: ../../Zotlabs/Widget/Rating.php:51
+msgid "Rating Tools"
+msgstr "Bewertungswerkzeuge"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:862
-msgid "Friend/Connection Request"
-msgstr "Freundschafts-/Verbindungsanfrage"
+#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
+msgid "Rate Me"
+msgstr "Bewerte mich"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:863
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
-msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
+#: ../../Zotlabs/Widget/Rating.php:60
+msgid "View Ratings"
+msgstr "Bewertungen ansehen"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:864
-msgid "Please answer the following:"
-msgstr "Bitte beantworten Sie folgendes:"
+#: ../../Zotlabs/Widget/Activity.php:50
+msgctxt "widget"
+msgid "Activity"
+msgstr "Aktivität"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:865
+#: ../../Zotlabs/Widget/Follow.php:22
 #, php-format
-msgid "Does %s know you?"
-msgstr "Kennt %s Sie?"
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:869
-msgid "Add a personal note:"
-msgstr "Eine persönliche Nachricht hinterlassen:"
+#: ../../Zotlabs/Widget/Follow.php:29
+msgid "Add New Connection"
+msgstr "Neue Verbindung hinzufügen"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:871
-#: ../../include/network.php:2242 ../../include/network.php:2243
-msgid "Friendica"
-msgstr "Friendica"
+#: ../../Zotlabs/Widget/Follow.php:30
+msgid "Enter channel address"
+msgstr "Adresse des Kanals eingeben"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:872
-msgid "StatusNet/Federated Social Web"
-msgstr "StatusNet/Föderierte Soziale Netzwerke"
+#: ../../Zotlabs/Widget/Follow.php:31
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Beispiele: bob@beispiel.com, http://beispiel.com/barbara"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:873
-#: ../../include/network.php:2248
-msgid "Diaspora"
-msgstr "Diaspora"
+#: ../../Zotlabs/Widget/Wiki_list.php:15 ../../addon/gitwiki/gitwiki.php:95
+msgid "Wiki List"
+msgstr "Wikiliste"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:874
-#, php-format
-msgid ""
-" - please do not use this form.  Instead, enter %s into your Diaspora search"
-" bar."
-msgstr "- bitte verwende nicht dieses Formular sondern gib %s in die Suchleiste deiner Diaspora Seite ein."
+#: ../../Zotlabs/Widget/Archive.php:43
+msgid "Archives"
+msgstr "Archive"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:875
-msgid "Your Identity Address:"
-msgstr "Ihre Identitätsadresse:"
+#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Zotlabs/Widget/Conversations.php:29
+msgid "Conversations"
+msgstr "Konversationen"
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:878
-msgid "Submit Request"
-msgstr "Anfrage absenden"
+#: ../../Zotlabs/Widget/Conversations.php:21
+msgid "Received Messages"
+msgstr "Erhaltene Nachrichten"
 
-#: ../../extend/addon/addon/friendica/friendica.php:113
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:118
-msgid "GNU-Social Protocol Settings updated."
-msgstr "GNU Social Protokoll Einstellungen aktualisiert"
+#: ../../Zotlabs/Widget/Conversations.php:25
+msgid "Sent Messages"
+msgstr "Gesendete Nachrichten"
 
-#: ../../extend/addon/addon/friendica/friendica.php:124
-msgid "Enable the (experimental) GNU-Social protocol for this channel"
-msgstr "GNU Social Protokoll (experimentell) für diesen Kanal aktualisieren"
+#: ../../Zotlabs/Widget/Conversations.php:39
+msgid "No messages."
+msgstr "Keine Nachrichten."
 
-#: ../../extend/addon/addon/friendica/friendica.php:128
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:133
-msgid "GNU-Social Protocol Settings"
-msgstr "GNU Social Protokoll Einstellungen"
+#: ../../Zotlabs/Widget/Conversations.php:57
+msgid "Delete conversation"
+msgstr "Unterhaltung löschen"
 
-#: ../../extend/addon/addon/friendica/friendica.php:185
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:323
-msgid "Follow"
-msgstr "Folgen"
+#: ../../Zotlabs/Widget/Chatroom_members.php:11
+msgid "Chat Members"
+msgstr "Chatmitglieder"
 
-#: ../../extend/addon/addon/friendica/friendica.php:188
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:326
-#, php-format
-msgid "%1$s is now following %2$s"
-msgstr "%1$s folgt nun %2$s"
+#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
+msgid "photo/image"
+msgstr "Foto/Bild"
 
-#: ../../extend/addon/addon/frphotos/frphotos.php:91
-msgid "Friendica Photo Album Import"
-msgstr "Friendica-Fotoalbumimport"
+#: ../../Zotlabs/Widget/Savedsearch.php:75
+msgid "Remove term"
+msgstr "Eintrag löschen"
 
-#: ../../extend/addon/addon/frphotos/frphotos.php:92
-msgid "This will import all your Friendica photo albums to this Red channel."
-msgstr "Hiermit werden all deine Fotoalben von Friendica in diesen Hubzilla Kanal importiert."
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301
+msgid "Saved Searches"
+msgstr "Gespeicherte Suchanfragen"
 
-#: ../../extend/addon/addon/frphotos/frphotos.php:93
-msgid "Friendica Server base URL"
-msgstr "BasisURL des Friendica Servers"
+#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336
+msgid "add"
+msgstr "hinzufügen"
 
-#: ../../extend/addon/addon/frphotos/frphotos.php:94
-msgid "Friendica Login Username"
-msgstr "Friendica-Anmeldebenutzername"
+#: ../../Zotlabs/Widget/Notes.php:16
+msgid "Notes"
+msgstr "Notizen"
 
-#: ../../extend/addon/addon/frphotos/frphotos.php:95
-msgid "Friendica Login Password"
-msgstr "Friendica-Anmeldepasswort"
+#: ../../Zotlabs/Widget/Wiki_pages.php:54 ../../addon/gitwiki/gitwiki.php:76
+msgid "Wiki Pages"
+msgstr "Wikiseiten"
 
-#: ../../extend/addon/addon/hubwall/hubwall.php:19
-msgid "Send email to all members"
-msgstr "E-Mail an alle Mitglieder senden"
+#: ../../Zotlabs/Widget/Wiki_pages.php:60 ../../addon/gitwiki/gitwiki.php:81
+msgid "Add new page"
+msgstr "Neue Seite hinzufügen"
 
-#: ../../extend/addon/addon/hubwall/hubwall.php:33
-#, php-format
-msgid "$1%s Administrator"
-msgstr "$1%s Administrator"
+#: ../../Zotlabs/Widget/Wiki_pages.php:61 ../../addon/gitwiki/gitwiki.php:82
+msgid "Page name"
+msgstr "Seitenname"
 
-#: ../../extend/addon/addon/hubwall/hubwall.php:50
-#: ../../extend/addon/addon/mailtest/mailtest.php:50
-msgid "No recipients found."
-msgstr "Keine Empfänger gefunden."
+#: ../../Zotlabs/Widget/Affinity.php:49
+msgid "Refresh"
+msgstr "Aktualisieren"
 
-#: ../../extend/addon/addon/hubwall/hubwall.php:73
-#, php-format
-msgid "%1$d of %2$d messages sent."
-msgstr "%1$d von %2$d Nachrichten gesendet."
+#: ../../Zotlabs/Widget/Tasklist.php:23
+msgid "Tasks"
+msgstr "Aufgaben"
 
-#: ../../extend/addon/addon/hubwall/hubwall.php:81
-msgid "Send email to all hub members."
-msgstr "Eine E-Mail an alle Mitglieder dieses Hubs senden."
+#: ../../Zotlabs/Widget/Suggestions.php:51
+msgid "Suggestions"
+msgstr "Vorschläge"
 
-#: ../../extend/addon/addon/hubwall/hubwall.php:92
-#: ../../extend/addon/addon/mailtest/mailtest.php:96
-msgid "Message subject"
-msgstr "Betreff der Nachricht"
+#: ../../Zotlabs/Widget/Suggestions.php:52
+msgid "See more..."
+msgstr "Mehr anzeigen …"
 
-#: ../../extend/addon/addon/hubwall/hubwall.php:93
-msgid "Sender Email address"
-msgstr "E-Mail Adresse des Absenders"
+#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
+#: ../../include/features.php:390
+msgid "Saved Folders"
+msgstr "Gespeicherte Ordner"
+
+#: ../../Zotlabs/Widget/Cover_photo.php:54
+msgid "Click to show more"
+msgstr "Klick, um mehr anzuzeigen"
+
+#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+msgid "Member registrations waiting for confirmation"
+msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
 
-#: ../../extend/addon/addon/hubwall/hubwall.php:94
-msgid "Test mode (only send to hub administrator)"
-msgstr "Test Modus (nur an Hub Administratoren senden)"
+#: ../../Zotlabs/Widget/Admin.php:29
+msgid "Inspect queue"
+msgstr "Warteschlange kontrollieren"
 
-#: ../../extend/addon/addon/ijpost/ijpost.php:42
-msgid "Post to Insanejournal"
-msgstr "Bei InsaneJournal veröffentlichen"
+#: ../../Zotlabs/Widget/Admin.php:31
+msgid "DB updates"
+msgstr "DB-Aktualisierungen"
 
-#: ../../extend/addon/addon/ijpost/ijpost.php:73
-msgid "Enable InsaneJournal Post Plugin"
-msgstr "Aktiviere das InsaneJournal Plugin"
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:215
+msgid "Admin"
+msgstr "Administration"
 
-#: ../../extend/addon/addon/ijpost/ijpost.php:77
-msgid "InsaneJournal username"
-msgstr "InsaneJournal-Benutzername"
+#: ../../Zotlabs/Widget/Admin.php:56
+msgid "Plugin Features"
+msgstr "Plug-In Funktionen"
 
-#: ../../extend/addon/addon/ijpost/ijpost.php:81
-msgid "InsaneJournal password"
-msgstr "InsaneJournal-Passwort"
+#: ../../Zotlabs/Widget/Settings_menu.php:35
+msgid "Account settings"
+msgstr "Konto-Einstellungen"
 
-#: ../../extend/addon/addon/ijpost/ijpost.php:85
-msgid "Post to InsaneJournal by default"
-msgstr "Standardmäßig bei InsaneJournal veröffentlichen"
+#: ../../Zotlabs/Widget/Settings_menu.php:41
+msgid "Channel settings"
+msgstr "Kanal-Einstellungen"
 
-#: ../../extend/addon/addon/ijpost/ijpost.php:89
-msgid "InsaneJournal Post Settings"
-msgstr "InsaneJournal-Beitragseinstellungen"
+#: ../../Zotlabs/Widget/Settings_menu.php:50
+msgid "Additional features"
+msgstr "Zusätzliche Funktionen"
 
-#: ../../extend/addon/addon/ijpost/ijpost.php:104
-msgid "Insane Journal Settings saved."
-msgstr "InsaneJournal-Einstellungen gespeichert."
+#: ../../Zotlabs/Widget/Settings_menu.php:57
+msgid "Feature/Addon settings"
+msgstr "Plugin-Einstellungen"
 
-#: ../../extend/addon/addon/irc/irc.php:45
-msgid "Channels to auto connect"
-msgstr "Kanäle zur automatischen Verbindung"
+#: ../../Zotlabs/Widget/Settings_menu.php:63
+msgid "Display settings"
+msgstr "Anzeige-Einstellungen"
 
-#: ../../extend/addon/addon/irc/irc.php:45
-#: ../../extend/addon/addon/irc/irc.php:49
-msgid "Comma separated list"
-msgstr "Kommagetrennte Liste"
+#: ../../Zotlabs/Widget/Settings_menu.php:70
+msgid "Manage locations"
+msgstr "Klon-Adressen verwalten"
 
-#: ../../extend/addon/addon/irc/irc.php:49
-#: ../../extend/addon/addon/irc/irc.php:96
-msgid "Popular Channels"
-msgstr "Beliebte Kanäle"
+#: ../../Zotlabs/Widget/Settings_menu.php:77
+msgid "Export channel"
+msgstr "Kanal exportieren"
 
-#: ../../extend/addon/addon/irc/irc.php:53
-msgid "IRC Settings"
-msgstr "IRC-Einstellungen"
+#: ../../Zotlabs/Widget/Settings_menu.php:83
+msgid "Connected apps"
+msgstr "Verbundene Apps"
 
-#: ../../extend/addon/addon/irc/irc.php:69
-msgid "IRC settings saved."
-msgstr "IRC-Einstellungen gespeichert."
+#: ../../Zotlabs/Widget/Settings_menu.php:98 ../../include/features.php:153
+msgid "Permission Groups"
+msgstr "Berechtigungsrollen"
 
-#: ../../extend/addon/addon/irc/irc.php:74
-msgid "IRC Chatroom"
-msgstr "IRC-Chatraum"
+#: ../../Zotlabs/Widget/Settings_menu.php:115
+msgid "Premium Channel Settings"
+msgstr "Premium-Kanal-Einstellungen"
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:305
-#: ../../include/channel.php:1139 ../../include/channel.php:1301
-msgid "Status:"
-msgstr "Status:"
+#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+msgid "Bookmarked Chatrooms"
+msgstr "Gespeicherte Chatrooms"
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
-msgid "Activate addon"
-msgstr "Addon aktiviren"
+#: ../../util/nconfig.php:34
+msgid "Source channel not found."
+msgstr "Quellkanal nicht gefunden."
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
-msgid "Hide Jappixmini Chat-Widget from the webinterface"
-msgstr "Jappix Mini Chat-Widget von der Weboberfläche verbergen"
+#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:26
+#, php-format
+msgctxt "opensearch"
+msgid "Search %1$s (%2$s)"
+msgstr "Suche %1$s (%2$s)"
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:318
-msgid "Jabber username"
-msgstr "Jabber-Benutzername"
+#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:28
+msgctxt "opensearch"
+msgid "$Projectname"
+msgstr "$Projectname"
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:324
-msgid "Jabber server"
-msgstr "Jabber-Server"
+#: ../../boot.php:1609
+msgid "Create an account to access services and applications"
+msgstr "Erstelle ein Konto, um auf Dienste und Anwendungen zugreifen zu können."
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:330
-msgid "Jabber BOSH host URL"
-msgstr "Jabber BOSH Host URL"
+#: ../../boot.php:1628 ../../include/nav.php:103 ../../include/nav.php:127
+msgid "Logout"
+msgstr "Abmelden"
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:337
-msgid "Jabber password"
-msgstr "Jabber-Passwort"
+#: ../../boot.php:1631
+msgid "Login/Email"
+msgstr "Anmelden/E-Mail"
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
-msgid "Encrypt Jabber password with Hubzilla password"
-msgstr "Jabber-Passwort mit Hubzilla-Passwort verschlüsseln"
+#: ../../boot.php:1632
+msgid "Password"
+msgstr "Kennwort"
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:347
-#: ../../extend/addon/addon/redred/redred.php:115
-msgid "Hubzilla password"
-msgstr "Hubzilla-Passwort"
+#: ../../boot.php:1633
+msgid "Remember me"
+msgstr "Angaben speichern"
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
-msgid "Approve subscription requests from Hubzilla contacts automatically"
-msgstr ""
+#: ../../boot.php:1636
+msgid "Forgot your password?"
+msgstr "Passwort vergessen?"
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
-msgid "Purge internal list of jabber addresses of contacts"
-msgstr "Interne Liste der Jabber Adressen von Kontakten löschen"
+#: ../../boot.php:2174
+msgid "toggle mobile"
+msgstr "auf/von mobile Ansicht wechseln"
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:364
-msgid "Configuration Help"
-msgstr "Konfigurationshilfe"
+#: ../../boot.php:2327
+#, php-format
+msgid "[$Projectname] Website SSL error for %s"
+msgstr "[$Projectname] Webseiten-SSL-Fehler für %s"
 
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:371
-msgid "Jappix Mini Settings"
-msgstr "Jappix Mini Einstellungen"
+#: ../../boot.php:2332
+msgid "Website SSL certificate is not valid. Please correct."
+msgstr "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben."
 
-#: ../../extend/addon/addon/js_upload/js_upload.php:44
-msgid "Upload a file"
-msgstr "Datei hochladen"
+#: ../../boot.php:2450
+#, php-format
+msgid "[$Projectname] Cron tasks not running on %s"
+msgstr "[$Projectname] Cron-Jobs laufen nicht auf %s"
 
-#: ../../extend/addon/addon/js_upload/js_upload.php:45
-msgid "Drop files here to upload"
-msgstr "Dateien zum Hochladen hier fallen lassen"
+#: ../../boot.php:2455
+msgid "Cron/Scheduled tasks not running."
+msgstr "Cron-Aufgaben laufen nicht."
 
-#: ../../extend/addon/addon/js_upload/js_upload.php:47
-msgid "Failed"
-msgstr "Fehlgeschlagen"
+#: ../../boot.php:2456 ../../include/datetime.php:286
+msgid "never"
+msgstr "Nie"
 
-#: ../../extend/addon/addon/js_upload/js_upload.php:315
-msgid "No files were uploaded."
-msgstr "Es wurden keine Dateien hochgeladen."
+#: ../../view/theme/redbasic/php/config.php:9
+msgid "Focus (Hubzilla default)"
+msgstr "Focus (Voreinstellung für Hubzilla)"
 
-#: ../../extend/addon/addon/js_upload/js_upload.php:322
-msgid "Uploaded file is empty"
-msgstr "Hochgeladene Datei ist leer"
+#: ../../view/theme/redbasic/php/config.php:88
+msgid "Theme settings"
+msgstr "Theme-Einstellungen"
 
-#: ../../extend/addon/addon/js_upload/js_upload.php:335
-msgid "Image exceeds size limit of "
-msgstr "Bild überschreitet Größenbeschränkung von "
+#: ../../view/theme/redbasic/php/config.php:89
+msgid "Narrow navbar"
+msgstr "Schmale Navigationsleiste"
 
-#: ../../extend/addon/addon/js_upload/js_upload.php:347
-msgid "File has an invalid extension, it should be one of "
-msgstr "Die Datei hat eine ungültige Endung. Erlaubt sind folgende:"
+#: ../../view/theme/redbasic/php/config.php:90
+msgid "Navigation bar background color"
+msgstr "Hintergrundfarbe der Navigationsleiste"
 
-#: ../../extend/addon/addon/js_upload/js_upload.php:359
-msgid "Upload was cancelled, or server error encountered"
-msgstr "Das Hochladen wurde abgebrochen oder es ist ein Serverfehler aufgetreten."
+#: ../../view/theme/redbasic/php/config.php:91
+msgid "Navigation bar icon color "
+msgstr "Farbe für die Icons der Navigationsleiste"
 
-#: ../../extend/addon/addon/ldapauth/ldapauth.php:61
-msgid "An account has been created for you."
-msgstr "Ein Konto wurde für Sie erstellt."
+#: ../../view/theme/redbasic/php/config.php:92
+msgid "Navigation bar active icon color "
+msgstr "Farbe für aktive Icons der Navigationsleiste"
 
-#: ../../extend/addon/addon/ldapauth/ldapauth.php:68
-msgid "Authentication successful but rejected: account creation is disabled."
-msgstr "Authentifizierung war erfolgreich wurde aber abgewiesen! Das Anlegen von Accounts wurde deaktiviert."
+#: ../../view/theme/redbasic/php/config.php:93
+msgid "Link color"
+msgstr "Linkfarbe"
 
-#: ../../extend/addon/addon/libertree/libertree.php:38
-msgid "Post to Libertree"
-msgstr "Bei Libertree veröffentlichen"
+#: ../../view/theme/redbasic/php/config.php:94
+msgid "Set font-color for banner"
+msgstr "Farbe der Schrift des Banners"
 
-#: ../../extend/addon/addon/libertree/libertree.php:69
-msgid "Enable Libertree Post Plugin"
-msgstr "Aktivire das Libertree-Plugin"
+#: ../../view/theme/redbasic/php/config.php:95
+msgid "Set the background color"
+msgstr "Hintergrundfarbe"
 
-#: ../../extend/addon/addon/libertree/libertree.php:73
-msgid "Libertree API token"
-msgstr "Libertree API Token"
+#: ../../view/theme/redbasic/php/config.php:96
+msgid "Set the background image"
+msgstr "Hintergrundbild"
 
-#: ../../extend/addon/addon/libertree/libertree.php:77
-msgid "Libertree site URL"
-msgstr "URL der Libertree Seite"
+#: ../../view/theme/redbasic/php/config.php:97
+msgid "Set the background color of items"
+msgstr "Hintergrundfarbe für Beiträge"
 
-#: ../../extend/addon/addon/libertree/libertree.php:81
-msgid "Post to Libertree by default"
-msgstr "Standardmäßig bei Libertree veröffentlichen"
+#: ../../view/theme/redbasic/php/config.php:98
+msgid "Set the background color of comments"
+msgstr "Hintergrundfarbe für Kommentare"
 
-#: ../../extend/addon/addon/libertree/libertree.php:85
-msgid "Libertree Post Settings"
-msgstr "Libertree-Beitragseinstellungen"
+#: ../../view/theme/redbasic/php/config.php:99
+msgid "Set font-size for the entire application"
+msgstr "Schriftgröße für die gesamte Anwendung"
 
-#: ../../extend/addon/addon/libertree/libertree.php:99
-msgid "Libertree Settings saved."
-msgstr "Libertree-Einstellungen gespeichert."
+#: ../../view/theme/redbasic/php/config.php:99
+msgid "Examples: 1rem, 100%, 16px"
+msgstr "Beispiele: 1rem, 100%, 16px"
 
-#: ../../extend/addon/addon/ljpost/ljpost.php:42
-msgid "Post to LiveJournal"
-msgstr "Bei LiveJurnal veröffentlichen"
+#: ../../view/theme/redbasic/php/config.php:100
+msgid "Set font-color for posts and comments"
+msgstr "Schriftfarbe für Beiträge und Kommentare"
 
-#: ../../extend/addon/addon/ljpost/ljpost.php:70
-msgid "Enable LiveJournal Post Plugin"
-msgstr "Aktiviere das LiveJurnal Plugin"
+#: ../../view/theme/redbasic/php/config.php:101
+msgid "Set radius of corners"
+msgstr "Ecken-Radius"
 
-#: ../../extend/addon/addon/ljpost/ljpost.php:74
-msgid "LiveJournal username"
-msgstr "LiveJournal-Benutzername"
+#: ../../view/theme/redbasic/php/config.php:101
+msgid "Example: 4px"
+msgstr "Beispiel: 4px"
 
-#: ../../extend/addon/addon/ljpost/ljpost.php:78
-msgid "LiveJournal password"
-msgstr "LiveJournal-Passwort"
+#: ../../view/theme/redbasic/php/config.php:102
+msgid "Set shadow depth of photos"
+msgstr "Schattentiefe von Fotos"
 
-#: ../../extend/addon/addon/ljpost/ljpost.php:82
-msgid "Post to LiveJournal by default"
-msgstr "Standardmäßig bei LiveJurnal veröffentlichen"
+#: ../../view/theme/redbasic/php/config.php:103
+msgid "Set maximum width of content region in pixel"
+msgstr "Maximalbreite des Inhaltsbereichs in Pixel festlegen"
 
-#: ../../extend/addon/addon/ljpost/ljpost.php:86
-msgid "LiveJournal Post Settings"
-msgstr "LiveJournal-Beitragseinstellungen"
+#: ../../view/theme/redbasic/php/config.php:103
+msgid "Leave empty for default width"
+msgstr "Leer lassen für Standardbreite"
 
-#: ../../extend/addon/addon/ljpost/ljpost.php:101
-msgid "LiveJournal Settings saved."
-msgstr "LiveJournal-Einstellungen gespeichert."
+#: ../../view/theme/redbasic/php/config.php:104
+msgid "Left align page content"
+msgstr "Seiteninhalt linksbündig anzeigen"
 
-#: ../../extend/addon/addon/logrot/logrot.php:36
-msgid "Logfile archive directory"
-msgstr "Verzeichnis der Logdatei"
+#: ../../view/theme/redbasic/php/config.php:105
+msgid "Set size of conversation author photo"
+msgstr "Größe der Avatare von Themenstartern"
 
-#: ../../extend/addon/addon/logrot/logrot.php:36
-msgid "Directory to store rotated logs"
-msgstr "Verzeichnis, in dem rotierte Logs gespeichert werden sollen"
+#: ../../view/theme/redbasic/php/config.php:106
+msgid "Set size of followup author photos"
+msgstr "Größe der Avatare von Kommentatoren"
 
-#: ../../extend/addon/addon/logrot/logrot.php:37
-msgid "Logfile size in bytes before rotating"
-msgstr "zu erreichende Logdateigröße in Bytes, bevor rotiert wird"
+#: ../../addon/rendezvous/rendezvous.php:57
+msgid "Errors encountered deleting database table "
+msgstr "Beim Löschen der Datenbanktabelle sind Fehler aufgetreten."
 
-#: ../../extend/addon/addon/logrot/logrot.php:38
-msgid "Number of logfiles to retain"
-msgstr "Anzahl aufzubewahrender rotierter Logdateien"
+#: ../../addon/rendezvous/rendezvous.php:95
+#: ../../addon/twitter/twitter.php:773
+msgid "Submit Settings"
+msgstr "Einstellungen absenden"
 
-#: ../../extend/addon/addon/mailhost/mailhost.php:36
-msgid "Email notification hub"
-msgstr "Hub für E-Mail-Benachrichtigungen"
+#: ../../addon/rendezvous/rendezvous.php:96
+msgid "Drop tables when uninstalling?"
+msgstr "Lösche Tabellen beim Deinstallieren?"
 
-#: ../../extend/addon/addon/mailhost/mailhost.php:36
-msgid "Hostname"
-msgstr "Servername"
+#: ../../addon/rendezvous/rendezvous.php:96
+msgid ""
+"If checked, the Rendezvous database tables will be deleted when the plugin "
+"is uninstalled."
+msgstr "Wenn ausgewählt, werden die Rendezvous-Tabellen in der Datenbank gelöscht, sobald das Plugin deinstalliert wird."
 
-#: ../../extend/addon/addon/mailhost/mailhost.php:40
-msgid "Mailhost Settings"
-msgstr "Mailhost-Einstellungen"
+#: ../../addon/rendezvous/rendezvous.php:97
+msgid "Mapbox Access Token"
+msgstr "Mapbox Zugangs-Token"
 
-#: ../../extend/addon/addon/mailhost/mailhost.php:54
-msgid "MAILHOST Settings saved."
-msgstr "MAILHOST-Einstellungen gespeichert."
+#: ../../addon/rendezvous/rendezvous.php:97
+msgid ""
+"If you enter a Mapbox access token, it will be used to retrieve map tiles "
+"from Mapbox instead of the default OpenStreetMap tile server."
+msgstr "Wenn Du ein Mapbox Zugangs-Token eingibst, werden die Kartendaten (Kacheln) damit von Mapbox geladen, anstatt von OpenStreetMap, welches die Voreinstellung ist."
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:19
-msgid "lonely"
-msgstr "einsam"
+#: ../../addon/rendezvous/rendezvous.php:162
+msgid "Rendezvous"
+msgstr "Rendezvous"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:20
-msgid "drunk"
-msgstr "betrunken"
+#: ../../addon/rendezvous/rendezvous.php:167
+msgid ""
+"This identity has been deleted by another member due to inactivity. Please "
+"press the \"New identity\" button or refresh the page to register a new "
+"identity. You may use the same name."
+msgstr "Diese Identität wurde von einem anderen Mitglied aufgrund von Inaktivität gelöscht. Bitte klicke auf \"Neue Identität\" oder aktualisiere die Website im Browser, um eine neue Identität zu registrieren. Du kannst dabei den selben Namen verwenden."
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:21
-msgid "horny"
-msgstr "geil"
+#: ../../addon/rendezvous/rendezvous.php:168
+msgid "Welcome to Rendezvous!"
+msgstr "Willkommen bei Rendezvous!"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:22
-msgid "stoned"
-msgstr "bekifft"
+#: ../../addon/rendezvous/rendezvous.php:169
+msgid ""
+"Enter your name to join this rendezvous. To begin sharing your location with"
+" the other members, tap the GPS control. When your location is discovered, a"
+" red dot will appear and others will be able to see you on the map."
+msgstr "Gib Deinen Namen ein, um diesem Rendezvous beizutreten. Um Deinen Standort mit anderen Mitgliedern zu teilen, klicke auf das GPS Symbol. Sobald Dein Standort ermittelt ist, erscheint ein roter Punkt, und die Anderen werden Dich auf der Karte sehen können."
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:23
-msgid "fucked up"
-msgstr "beschissen"
+#: ../../addon/rendezvous/rendezvous.php:171
+msgid "Let's meet here"
+msgstr "Lasst uns hier treffen"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:24
-msgid "clusterfucked"
-msgstr "clusterfucked"
+#: ../../addon/rendezvous/rendezvous.php:174
+msgid "New marker"
+msgstr "Neue Markierung"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:25
-msgid "crazy"
-msgstr "verrückt"
+#: ../../addon/rendezvous/rendezvous.php:175
+msgid "Edit marker"
+msgstr "Markierung bearbeiten"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:26
-msgid "hurt"
-msgstr "verletzt"
+#: ../../addon/rendezvous/rendezvous.php:176
+msgid "New identity"
+msgstr "Neue Identität"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:27
-msgid "sleepy"
-msgstr "müde"
+#: ../../addon/rendezvous/rendezvous.php:177
+msgid "Delete marker"
+msgstr "Markierung löschen"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:28
-msgid "grumpy"
-msgstr "mürrisch"
+#: ../../addon/rendezvous/rendezvous.php:178
+msgid "Delete member"
+msgstr "Mitglied löschen"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:29
-msgid "high"
-msgstr "hoch"
+#: ../../addon/rendezvous/rendezvous.php:179
+msgid "Edit proximity alert"
+msgstr "Annäherungsalarm bearbeiten"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:30
-msgid "semi-conscious"
-msgstr "halb bewusstlos"
+#: ../../addon/rendezvous/rendezvous.php:180
+msgid ""
+"A proximity alert will be issued when this member is within a certain radius"
+" of you.<br><br>Enter a radius in meters (0 to disable):"
+msgstr "Ein Annäherungsalarm wird ausgelöst werden, sobald sich dieses Mitglied innerhalb eines bestimmten Radius von Dir aufhält.<br><br>Gib einen Radius in Metern ein (0 zum Abschalten der Funktion):"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:31
-msgid "in love"
-msgstr "verliebt"
+#: ../../addon/rendezvous/rendezvous.php:180
+#: ../../addon/rendezvous/rendezvous.php:185
+msgid "distance"
+msgstr "Entfernung"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:32
-msgid "in lust"
-msgstr ""
+#: ../../addon/rendezvous/rendezvous.php:181
+msgid "Proximity alert distance (meters)"
+msgstr "Entfernung für Annäherungsalarm (in Metern)"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:33
-msgid "naked"
-msgstr "nackt"
+#: ../../addon/rendezvous/rendezvous.php:182
+#: ../../addon/rendezvous/rendezvous.php:184
+msgid ""
+"A proximity alert will be issued when you are within a certain radius of the"
+" marker location.<br><br>Enter a radius in meters (0 to disable):"
+msgstr "Ein Annäherungsalarm wird ausgelöst werden, sobald Du Dich innerhalb eines bestimmten Radius der Markierung aufhält.<br><br>Gib einen Radius in Metern ein (0 zum Abschalten der Funktion):"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:34
-msgid "stinky"
-msgstr "stinkend"
+#: ../../addon/rendezvous/rendezvous.php:183
+msgid "Marker proximity alert"
+msgstr "Annäherungsalarm für Markierung"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:35
-msgid "sweaty"
-msgstr "verschwitzt"
+#: ../../addon/rendezvous/rendezvous.php:186
+msgid "Reminder note"
+msgstr "Erinnerungshinweis"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:36
-msgid "bleeding out"
-msgstr "blutend"
+#: ../../addon/rendezvous/rendezvous.php:187
+msgid ""
+"Enter a note to be displayed when you are within the specified proximity..."
+msgstr "Gib eine Nachricht ein, die angezeigt werden soll, wenn Du Dich in der festgelegten Nähe befindest..."
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:37
-msgid "victorious"
-msgstr "siegreich"
+#: ../../addon/rendezvous/rendezvous.php:199
+msgid "Add new rendezvous"
+msgstr "Neues Rendezvous hinzufügen"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:38
-msgid "defeated"
-msgstr "besiegt"
+#: ../../addon/rendezvous/rendezvous.php:200
+msgid ""
+"Create a new rendezvous and share the access link with those you wish to "
+"invite to the group. Those who open the link become members of the "
+"rendezvous. They can view other member locations, add markers to the map, or"
+" share their own locations with the group."
+msgstr "Erstelle ein neues Rendezvous und teile den Zugriffslink mit allen, die Du in die Gruppe einladen möchtest. Die, die den Link öffnen, werden Mitglieder des Rendezvous. Sie können die Standorte der anderen Mitglieder sehen, Marker zur Karte hinzufügen oder ihre eigenen Standorte mit der Gruppe teilen."
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:39
-msgid "envious"
-msgstr "neidisch"
+#: ../../addon/skeleton/skeleton.php:59
+msgid "Some setting"
+msgstr "Einige Einstellungen"
 
-#: ../../extend/addon/addon/moremoods/moremoods.php:40
-msgid "jealous"
-msgstr "eifersüchtig"
+#: ../../addon/skeleton/skeleton.php:61
+msgid "A setting"
+msgstr "Eine Einstellung"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:19
-msgid "bitchslap"
-msgstr "Ohrfeige"
+#: ../../addon/skeleton/skeleton.php:64
+msgid "Skeleton Settings"
+msgstr "Skeleton Einstellungen"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:19
-msgid "bitchslapped"
-msgstr "geohrfeigt"
+#: ../../addon/gnusoc/gnusoc.php:119
+msgid "GNU-Social Protocol Settings updated."
+msgstr "GNU social Protokoll Einstellungen aktualisiert"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:20
-msgid "shag"
-msgstr "bumsen"
+#: ../../addon/gnusoc/gnusoc.php:130
+msgid "Enable the GNU-Social protocol for this channel"
+msgstr "Aktiviere das GNU social Protokoll für diesen Kanal"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:20
-msgid "shagged"
-msgstr "gebumst"
+#: ../../addon/gnusoc/gnusoc.php:134
+msgid "GNU-Social Protocol Settings"
+msgstr "GNU social Protokoll Einstellungen"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:21
-msgid "patent"
-msgstr "Patent"
+#: ../../addon/gnusoc/gnusoc.php:324
+msgid "Follow"
+msgstr "Folgen"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:21
-msgid "patented"
-msgstr "patentiert"
+#: ../../addon/gnusoc/gnusoc.php:327
+#, php-format
+msgid "%1$s is now following %2$s"
+msgstr "%1$s folgt nun %2$s"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:22
-msgid "hug"
-msgstr "umarmen"
+#: ../../addon/cdav/Mod_Cdav.php:744
+msgid "INVALID EVENT DISMISSED!"
+msgstr "UNGÜLTIGEN TERMIN ABGELEHNT!"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:22
-msgid "hugged"
-msgstr "umarmt"
+#: ../../addon/cdav/Mod_Cdav.php:745
+msgid "Summary: "
+msgstr "Zusammenfassung:"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:23
-msgid "murder"
-msgstr "ermorden"
+#: ../../addon/cdav/Mod_Cdav.php:746
+msgid "Date: "
+msgstr "Datum:"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:23
-msgid "murdered"
-msgstr "ermordet"
+#: ../../addon/cdav/Mod_Cdav.php:747 ../../addon/cdav/Mod_Cdav.php:754
+msgid "Reason: "
+msgstr "Grund:"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:24
-msgid "worship"
-msgstr "Anbetung"
+#: ../../addon/cdav/Mod_Cdav.php:752
+msgid "INVALID CARD DISMISSED!"
+msgstr "UNGÜLTIGE KARTE ABGELEHNT!"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:24
-msgid "worshipped"
-msgstr "angebetet"
+#: ../../addon/cdav/Mod_Cdav.php:753
+msgid "Name: "
+msgstr "Name: "
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:25
-msgid "kiss"
-msgstr "küssen"
+#: ../../addon/cdav/Mod_Cdav.php:770
+msgid ""
+"You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV "
+"Settings before you can use it."
+msgstr "Du musst dieses Plugin zunächst in Einstellungen > Plugin-Einstellungen > CalDAV/CardDAV-Einstellungen aktivieren, bevor Du es verwenden kannst."
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:25
-msgid "kissed"
-msgstr "geküsst"
+#: ../../addon/cdav/Mod_Cdav.php:836 ../../addon/cdav/Mod_Cdav.php:837
+msgid "Example: YYYY-MM-DD HH:mm"
+msgstr "Beispiel: JJJJ-MM-TT HH:mm"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:26
-msgid "tempt"
-msgstr "verlocken"
+#: ../../addon/cdav/Mod_Cdav.php:837
+msgid "End date and time"
+msgstr "Enddatum und -zeit"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:26
-msgid "tempted"
-msgstr "verlockt"
+#: ../../addon/cdav/Mod_Cdav.php:852
+msgid "List month"
+msgstr "Liste Monat"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:27
-msgid "raise eyebrows at"
-msgstr ""
+#: ../../addon/cdav/Mod_Cdav.php:853
+msgid "List week"
+msgstr "Liste Woche"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:27
-msgid "raised their eyebrows at"
-msgstr ""
+#: ../../addon/cdav/Mod_Cdav.php:854
+msgid "List day"
+msgstr "Liste Tag"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:28
-msgid "insult"
-msgstr "beleidigen"
+#: ../../addon/cdav/Mod_Cdav.php:861
+msgid "More"
+msgstr "Mehr"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:28
-msgid "insulted"
-msgstr "beleidigt"
+#: ../../addon/cdav/Mod_Cdav.php:862
+msgid "Less"
+msgstr "Weniger"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:29
-msgid "praise"
-msgstr "loben"
+#: ../../addon/cdav/Mod_Cdav.php:863
+msgid "Select calendar"
+msgstr "Kalender auswählen"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:29
-msgid "praised"
-msgstr "gelobt"
+#: ../../addon/cdav/Mod_Cdav.php:865
+msgid "Delete all"
+msgstr "Alles löschen"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:30
-msgid "be dubious of"
-msgstr ""
+#: ../../addon/cdav/Mod_Cdav.php:867
+msgid "Sorry! Editing of recurrent events is not yet implemented."
+msgstr "Entschuldigung, aber das Bearbeiten von wiederkehrenden Veranstaltungen ist leider noch nicht implementiert."
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:30
-msgid "was dubious of"
-msgstr ""
+#: ../../addon/cdav/cdav.php:36
+msgid "Errors encountered creating database table: "
+msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:31
-msgid "eat"
-msgstr "essen"
+#: ../../addon/cdav/cdav.php:197
+msgid "Default Calendar"
+msgstr "Standardkalender"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:31
-msgid "ate"
-msgstr "aß"
+#: ../../addon/cdav/cdav.php:206
+msgid "Default Addressbook"
+msgstr "Standardadressbuch"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:32
-msgid "giggle and fawn at"
-msgstr ""
+#: ../../addon/cdav/cdav.php:215
+msgid "CalDAV/CardDAV Settings saved."
+msgstr "CalDAV/CardDAV-Einstellungen gespeichert."
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:32
-msgid "giggled and fawned at"
-msgstr ""
+#: ../../addon/cdav/cdav.php:234
+msgid "Enable CalDAV/CardDAV Server for this channel"
+msgstr "Aktiviere den CalDAV/CardDAV Server für diesen Kanal"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:33
-msgid "doubt"
-msgstr "anzweifeln"
+#: ../../addon/cdav/cdav.php:237
+#, php-format
+msgid "Your CalDAV resources are located at %s "
+msgstr "Deine CalDAV Resourcen sind unter %s verfügbar"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:33
-msgid "doubted"
-msgstr "angezweifelt"
+#: ../../addon/cdav/cdav.php:240
+#, php-format
+msgid "Your CardDAV resources are located at %s "
+msgstr "Deine CardDAV Ressourcen sind unter %s verfügbar"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:34
-msgid "glare"
-msgstr ""
+#: ../../addon/cdav/cdav.php:246
+msgid "CalDAV/CardDAV Settings"
+msgstr "CalDAV/CardDAV-Einstellungen"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:34
-msgid "glared at"
-msgstr ""
+#: ../../addon/cdav/cdav.php:272 ../../include/connections.php:670
+msgid "Home, Voice"
+msgstr "Zuhause, Sprache"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:35
-msgid "fuck"
-msgstr "ficken"
+#: ../../addon/cdav/cdav.php:273 ../../include/connections.php:671
+msgid "Home, Fax"
+msgstr "Zuhause, Fax"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:35
-msgid "fucked"
-msgstr "gefickt"
+#: ../../addon/cdav/cdav.php:275 ../../include/connections.php:673
+msgid "Work, Voice"
+msgstr "Arbeit, Sprache"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:36
-msgid "bonk"
-msgstr ""
+#: ../../addon/cdav/cdav.php:276 ../../include/connections.php:674
+msgid "Work, Fax"
+msgstr "Arbeit, Fax"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:36
-msgid "bonked"
-msgstr ""
+#: ../../addon/cdav/include/widgets.php:37
+msgid "Select Channel"
+msgstr "Kanal auswählen"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:37
-msgid "declare undying love for"
-msgstr ""
+#: ../../addon/cdav/include/widgets.php:42
+msgid "Read-write"
+msgstr "Lesen-schreiben"
 
-#: ../../extend/addon/addon/morepokes/morepokes.php:37
-msgid "declared undying love for"
-msgstr ""
+#: ../../addon/cdav/include/widgets.php:43
+msgid "Read-only"
+msgstr "Nur Lesen"
 
-#: ../../extend/addon/addon/msgfooter/msgfooter.php:46
-#: ../../extend/addon/addon/xmpp/xmpp.php:91
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
+#: ../../addon/cdav/include/widgets.php:116
+msgid "My Calendars"
+msgstr "Meine Kalender"
 
-#: ../../extend/addon/addon/msgfooter/msgfooter.php:47
-msgid "text to include in all outgoing posts from this site"
-msgstr "Test der in alle Beiträge angefügt werden soll, die von dieser Seite ausgehen"
+#: ../../addon/cdav/include/widgets.php:118
+msgid "Shared Calendars"
+msgstr "Geteilte Kalender"
 
-#: ../../extend/addon/addon/nofed/nofed.php:42
-msgid "Federate"
-msgstr ""
+#: ../../addon/cdav/include/widgets.php:122
+msgid "Share this calendar"
+msgstr "Diesen Kalender teilen"
 
-#: ../../extend/addon/addon/nofed/nofed.php:56
-msgid "nofed Settings saved."
-msgstr "nofed Einstellungen gespeichert"
+#: ../../addon/cdav/include/widgets.php:124
+msgid "Calendar name and color"
+msgstr "Kalendername und -farbe"
 
-#: ../../extend/addon/addon/nofed/nofed.php:72
-msgid "Allow Federation Toggle"
-msgstr ""
+#: ../../addon/cdav/include/widgets.php:126
+msgid "Create new calendar"
+msgstr "Neuen Kalender erstellen"
 
-#: ../../extend/addon/addon/nofed/nofed.php:76
-msgid "Federate posts by default"
-msgstr ""
+#: ../../addon/cdav/include/widgets.php:128
+msgid "Calendar Name"
+msgstr "Kalendername"
 
-#: ../../extend/addon/addon/nofed/nofed.php:80
-msgid "NoFed Settings"
-msgstr "NoFed-Einstellungen"
+#: ../../addon/cdav/include/widgets.php:129
+msgid "Calendar Tools"
+msgstr "Kalenderwerkzeuge"
 
-#: ../../extend/addon/addon/nsabait/nsabait.php:125
-msgid "Nsabait Settings updated."
-msgstr "Nsabait-Einstellungen aktualisiert."
+#: ../../addon/cdav/include/widgets.php:130
+msgid "Import calendar"
+msgstr "Kalender importieren"
 
-#: ../../extend/addon/addon/nsabait/nsabait.php:157
-msgid "Enable NSAbait Plugin"
-msgstr "Aktiviere das NSAbait Plugin"
+#: ../../addon/cdav/include/widgets.php:131
+msgid "Select a calendar to import to"
+msgstr "Kalender zum Hineinimportieren auswählen"
 
-#: ../../extend/addon/addon/nsabait/nsabait.php:161
-msgid "NSAbait Settings"
-msgstr "NSAbait-Einstellungen"
+#: ../../addon/cdav/include/widgets.php:158
+msgid "Addressbooks"
+msgstr "Adressbücher"
 
-#: ../../extend/addon/addon/nsfw/nsfw.php:80
-msgid ""
-"This plugin looks in posts for the words/text you specify below, and "
-"collapses any content containing those keywords so it is not displayed at "
-"inappropriate times, such as sexual innuendo that may be improper in a work "
-"setting. It is polite and recommended to tag any content containing nudity "
-"with #NSFW.  This filter can also match any other word/text you specify, and"
-" can thereby be used as a general purpose content filter."
-msgstr ""
+#: ../../addon/cdav/include/widgets.php:160
+msgid "Addressbook name"
+msgstr "Adressbuchname"
 
-#: ../../extend/addon/addon/nsfw/nsfw.php:84
-msgid "Enable Content filter"
-msgstr "Inhaltsfilter aktivieren"
+#: ../../addon/cdav/include/widgets.php:162
+msgid "Create new addressbook"
+msgstr "Neues Adressbuch erstellen"
 
-#: ../../extend/addon/addon/nsfw/nsfw.php:88
-msgid "Comma separated list of keywords to hide"
-msgstr "Kommaseparierte Liste von Schlüsselworten die verborgen werden sollen."
+#: ../../addon/cdav/include/widgets.php:163
+msgid "Addressbook Name"
+msgstr "Adressbuchname"
 
-#: ../../extend/addon/addon/nsfw/nsfw.php:88
-msgid "Word, /regular-expression/, lang=xx, lang!=xx"
-msgstr ""
+#: ../../addon/cdav/include/widgets.php:165
+msgid "Addressbook Tools"
+msgstr "Adressbuchwerkzeuge"
 
-#: ../../extend/addon/addon/nsfw/nsfw.php:92
-msgid "Not Safe For Work Settings"
-msgstr "Not Safe For Work Einstellungen"
+#: ../../addon/cdav/include/widgets.php:166
+msgid "Import addressbook"
+msgstr "Adressbuch importieren"
 
-#: ../../extend/addon/addon/nsfw/nsfw.php:92
-msgid "General Purpose Content Filter"
-msgstr "Allzweck-Inhaltsfilter"
+#: ../../addon/cdav/include/widgets.php:167
+msgid "Select an addressbook to import to"
+msgstr "Adressbuch zum Hineinimportieren auswählen"
 
-#: ../../extend/addon/addon/nsfw/nsfw.php:110
-msgid "NSFW Settings saved."
-msgstr "NSFW-Einstellungen gespeichert."
+#: ../../addon/planets/planets.php:121
+msgid "Planets Settings updated."
+msgstr "Planeten Einstellungen aktualisiert"
 
-#: ../../extend/addon/addon/nsfw/nsfw.php:207
-msgid "Possible adult content"
-msgstr "Möglicherweise nicht jugendfreie Inhalte"
+#: ../../addon/planets/planets.php:153
+msgid "Enable Planets Plugin"
+msgstr "Aktiviere Planeten Plugin"
 
-#: ../../extend/addon/addon/nsfw/nsfw.php:211
-#, php-format
-msgid "%s - view"
-msgstr ""
+#: ../../addon/planets/planets.php:157
+msgid "Planets Settings"
+msgstr "Planeten Einstellungen"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:50
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:128
+#: ../../addon/openclipatar/openclipatar.php:50
+#: ../../addon/openclipatar/openclipatar.php:128
 msgid "System defaults:"
 msgstr "Systemstandardeinstellungen:"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:54
+#: ../../addon/openclipatar/openclipatar.php:54
 msgid "Preferred Clipart IDs"
-msgstr ""
+msgstr "Bevorzugte Clipart-IDs"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:54
+#: ../../addon/openclipatar/openclipatar.php:54
 msgid "List of preferred clipart ids. These will be shown first."
-msgstr ""
+msgstr "Liste bevorzugter Clipart-IDs. Diese werden zuerst angezeigt."
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:55
+#: ../../addon/openclipatar/openclipatar.php:55
 msgid "Default Search Term"
 msgstr "Standard-Suchbegriff"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:55
+#: ../../addon/openclipatar/openclipatar.php:55
 msgid "The default search term. These will be shown second."
-msgstr ""
+msgstr "Der Standard-Suchbegriff. Dieser wird an zweiter Stelle angezeigt."
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:56
+#: ../../addon/openclipatar/openclipatar.php:56
 msgid "Return After"
-msgstr ""
+msgstr "Zurückkehren nach"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:56
+#: ../../addon/openclipatar/openclipatar.php:56
 msgid "Page to load after image selection."
-msgstr ""
+msgstr "Die Seite, die nach Auswahl eines Bildes geladen werden soll."
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:58
-#: ../../include/channel.php:1048 ../../include/nav.php:107
+#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1048
+#: ../../include/nav.php:111
 msgid "Edit Profile"
-msgstr "Profile bearbeiten"
+msgstr "Profil bearbeiten"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:59
+#: ../../addon/openclipatar/openclipatar.php:59
 msgid "Profile List"
 msgstr "Profilliste"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:61
+#: ../../addon/openclipatar/openclipatar.php:61
 msgid "Order of Preferred"
-msgstr "Bevorzugte Reihenfolge"
+msgstr "Reihenfolge der Bevorzugten"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:61
+#: ../../addon/openclipatar/openclipatar.php:61
 msgid "Sort order of preferred clipart ids."
-msgstr ""
+msgstr "Sortierreihenfolge der bevorzugten Clipart-IDs."
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:62
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:68
+#: ../../addon/openclipatar/openclipatar.php:62
+#: ../../addon/openclipatar/openclipatar.php:68
 msgid "Newest first"
 msgstr "Neueste zuerst"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:65
+#: ../../addon/openclipatar/openclipatar.php:65
 msgid "As entered"
 msgstr "Wie eingegeben"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:67
+#: ../../addon/openclipatar/openclipatar.php:67
 msgid "Order of other"
-msgstr ""
+msgstr "Sortierung aller anderen"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:67
+#: ../../addon/openclipatar/openclipatar.php:67
 msgid "Sort order of other clipart ids."
-msgstr ""
+msgstr "Sortierreihenfolge der übrigen Clipart-IDs."
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:69
+#: ../../addon/openclipatar/openclipatar.php:69
 msgid "Most downloaded first"
 msgstr "Meist heruntergeladene zuerst"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:70
+#: ../../addon/openclipatar/openclipatar.php:70
 msgid "Most liked first"
 msgstr "Beliebteste zuerst"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:72
+#: ../../addon/openclipatar/openclipatar.php:72
 msgid "Preferred IDs Message"
-msgstr ""
+msgstr "Nachricht für bevorzugte IDs"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:72
+#: ../../addon/openclipatar/openclipatar.php:72
 msgid "Message to display above preferred results."
-msgstr ""
+msgstr "Nachricht, die über den Ergebnissen mit den bevorzugten IDs angezeigt werden soll."
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:78
+#: ../../addon/openclipatar/openclipatar.php:78
 msgid "Uploaded by: "
 msgstr "Hochgeladen von: "
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:78
+#: ../../addon/openclipatar/openclipatar.php:78
 msgid "Drawn by: "
 msgstr "Gezeichnet von: "
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:192
+#: ../../addon/openclipatar/openclipatar.php:192
 msgid "Or select from a free OpenClipart.org image:"
 msgstr "Oder wähle ein freies Bild von OpenClipart.org:"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:195
+#: ../../addon/openclipatar/openclipatar.php:195
 msgid "Search Term"
 msgstr "Suchbegriff"
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:232
+#: ../../addon/openclipatar/openclipatar.php:232
 msgid "Unknown error. Please try again later."
 msgstr "Unbekannter Fehler. Bitte versuchen Sie es später erneut."
 
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:305
+#: ../../addon/openclipatar/openclipatar.php:308
 msgid "Profile photo updated successfully."
 msgstr "Profilfoto erfolgreich aktualisiert."
 
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:146
-msgid "View Larger"
-msgstr "Größer anzeigen"
-
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:169
-msgid "Tile Server URL"
-msgstr "Kachelserver-URL"
-
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:169
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
-"target=\"_blank\">public tile servers</a>"
-msgstr "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Kachelserver</a>"
-
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:170
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr "Nominatim (reverse Geokodierung) Server URL"
-
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:170
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
-"target=\"_blank\">Nominatim servers</a>"
-msgstr "Eine Liste der <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">Nominatim Server</a>"
-
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:171
-msgid "Default zoom"
-msgstr "Standardzoom"
-
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:171
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr "Die Standard-Vergrößerungsstufe (1:Welt, 18:höchste, hängt außerdem vom Kachelserver ab)."
-
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:172
-msgid "Include marker on map"
-msgstr "Markierung auf der Karte einschließen"
-
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:172
-msgid "Include a marker on the map."
-msgstr "Binde eine Markierung auf der Karte ein."
-
-#: ../../extend/addon/addon/pageheader/pageheader.php:43
-msgid "Message to display on every page on this server"
-msgstr "Nachricht, die auf jeder Seite dieses Servers angezeigt werden soll"
-
-#: ../../extend/addon/addon/pageheader/pageheader.php:48
-msgid "Pageheader Settings"
-msgstr "Nachrichtenkopf-Einstellungen"
-
-#: ../../extend/addon/addon/pageheader/pageheader.php:64
-msgid "pageheader Settings saved."
-msgstr "Nachrichtenkopf-Einstellungen gespeichert."
-
-#: ../../extend/addon/addon/piwik/piwik.php:85
-msgid ""
-"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
-"analytics tool."
-msgstr "Diese Website verwendet <a href='http://www.piwik.org'>Piwik</a>, um die Besucherzugriffe auszuwerten."
-
-#: ../../extend/addon/addon/piwik/piwik.php:88
-#, php-format
-msgid ""
-"If you do not want that your visits are logged this way you <a href='%s'>can"
-" set a cookie to prevent Piwik from tracking further visits of the site</a> "
-"(opt-out)."
-msgstr "Wenn Du nicht möchtest, dass Deine Besuche zu diesem Zweck gespeichert werden, kannst Du <a href='%s'>ein Cookie setzen, welches Piwik davon abhält, Deine weiteren Besuche auf dieser Website zu verfolgen</a> (Opt-out)."
-
-#: ../../extend/addon/addon/piwik/piwik.php:96
-msgid "Piwik Base URL"
-msgstr "Piwik Basis-URL"
-
-#: ../../extend/addon/addon/piwik/piwik.php:96
-msgid ""
-"Absolute path to your Piwik installation. (without protocol (http/s), with "
-"trailing slash)"
-msgstr "Der absolute Pfad zu Deiner Piwik-Installation (ohne Protokoll (http/s), aber mit abschließendem Schrägstrich / )."
-
-#: ../../extend/addon/addon/piwik/piwik.php:97
-msgid "Site ID"
-msgstr "Seitenkennung"
-
-#: ../../extend/addon/addon/piwik/piwik.php:98
-msgid "Show opt-out cookie link?"
-msgstr "Den Opt-out Cookie-Link anzeigen?"
-
-#: ../../extend/addon/addon/piwik/piwik.php:99
-msgid "Asynchronous tracking"
-msgstr "Asynchrones Tracking"
-
-#: ../../extend/addon/addon/piwik/piwik.php:100
-msgid "Enable frontend JavaScript error tracking"
-msgstr "Ermögliche Frontend-JavaScript-Fehlertracking"
-
-#: ../../extend/addon/addon/piwik/piwik.php:100
-msgid "This feature requires Piwik >= 2.2.0"
-msgstr "Diese Funktion erfordert Piwik >= 2.2.0"
-
-#: ../../extend/addon/addon/planets/planets.php:121
-msgid "Planets Settings updated."
-msgstr "Planeten Einstellungen aktualisiert"
-
-#: ../../extend/addon/addon/planets/planets.php:153
-msgid "Enable Planets Plugin"
-msgstr "Aktiviere Planeten Plugin"
-
-#: ../../extend/addon/addon/planets/planets.php:157
-msgid "Planets Settings"
-msgstr "Planeten Einstellungen"
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:148
-msgid "You are now authenticated to pumpio."
-msgstr "Du bist nun bei pumpio authenzifiziert."
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:149
-msgid "return to the featured settings page"
-msgstr ""
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:163
-msgid "Post to Pump.io"
-msgstr "Bei pumpio veröffentlichen"
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:198
-msgid "Pump.io servername"
-msgstr "Pump.io-Servername"
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:198
-msgid "Without \"http://\" or \"https://\""
-msgstr "Ohne \"http://\" oder \"https://\""
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:202
-msgid "Pump.io username"
-msgstr "Pump.io-Benutzername"
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:202
-msgid "Without the servername"
-msgstr "Ohne dem Servernamen"
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:213
-msgid "You are not authenticated to pumpio"
-msgstr "Du bist nicht bei pumpio authentifiziert."
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:215
-msgid "(Re-)Authenticate your pump.io connection"
-msgstr "Deine pumpio Verbindung (erneut) authentifizieren"
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:219
-msgid "Enable pump.io Post Plugin"
-msgstr "Aktiviere das pumpio-Plugin"
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:223
-msgid "Post to pump.io by default"
-msgstr "Standardmäßig bei pumpio veröffentlichen"
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:227
-msgid "Should posts be public"
-msgstr "Sollen die Beiträge öffentlich sein"
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:231
-msgid "Mirror all public posts"
-msgstr "Öffentliche Beiträge spiegeln"
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:237
-msgid "Pump.io Post Settings"
-msgstr "Pump.io-Beitragseinstellungen"
-
-#: ../../extend/addon/addon/pumpio/pumpio.php:266
-msgid "PumpIO Settings saved."
-msgstr "PumpIO-Einstellungen gespeichert."
-
-#: ../../extend/addon/addon/qrator/qrator.php:48
-msgid "QR code"
-msgstr "QR-Code"
-
-#: ../../extend/addon/addon/qrator/qrator.php:63
-msgid "QR Generator"
-msgstr "QR-Generator"
-
-#: ../../extend/addon/addon/qrator/qrator.php:64
-msgid "Enter some text"
-msgstr "Etwas Text eingeben"
-
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
-msgid "Enable Rainbowtag"
-msgstr "Rainbowtag aktivieren"
-
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85
-msgid "Rainbowtag Settings"
-msgstr "Rainbowtag-Einstellungen"
-
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:101
-msgid "Rainbowtag Settings saved."
-msgstr "Rainbowtag-Einstellungen gespeichert."
-
-#: ../../extend/addon/addon/randpost/randpost.php:97
-msgid "You're welcome."
-msgstr "Gern geschehen."
-
-#: ../../extend/addon/addon/randpost/randpost.php:98
-msgid "Ah shucks..."
-msgstr ""
-
-#: ../../extend/addon/addon/randpost/randpost.php:99
-msgid "Don't mention it."
-msgstr "Keine Ursache."
-
-#: ../../extend/addon/addon/randpost/randpost.php:100
-msgid "&lt;blush&gt;"
-msgstr ""
-
-#: ../../extend/addon/addon/redfiles/redfiles.php:119
-msgid "Redmatrix File Storage Import"
-msgstr ""
-
-#: ../../extend/addon/addon/redfiles/redfiles.php:120
-msgid "This will import all your Redmatrix cloud files to this channel."
-msgstr "Hiermit werden alle deine Daten aus der Redmatrix Cloud in diesen Kanal importiert."
-
-#: ../../extend/addon/addon/redfiles/redfiles.php:121
-#: ../../extend/addon/addon/redphotos/redphotos.php:131
-msgid "Redmatrix Server base URL"
-msgstr "Basis-URL des Redmatrix Servers"
-
-#: ../../extend/addon/addon/redfiles/redfiles.php:122
-#: ../../extend/addon/addon/redphotos/redphotos.php:132
-msgid "Redmatrix Login Username"
-msgstr "Redmatrix-Anmeldebenutzername"
-
-#: ../../extend/addon/addon/redfiles/redfiles.php:123
-#: ../../extend/addon/addon/redphotos/redphotos.php:133
-msgid "Redmatrix Login Password"
-msgstr "Redmatrix-Anmeldepasswort"
-
-#: ../../extend/addon/addon/redfiles/redfilehelper.php:67
-msgid "file"
-msgstr "Datei"
-
-#: ../../extend/addon/addon/redphotos/redphotos.php:106
-msgid "Photos imported"
-msgstr "Fotos importiert"
-
-#: ../../extend/addon/addon/redphotos/redphotos.php:129
-msgid "Redmatrix Photo Album Import"
-msgstr "Redmatrix-Fotoalbumimport"
+#: ../../addon/adultphotoflag/adultphotoflag.php:24
+msgid "Flag Adult Photos"
+msgstr "Nicht jugendfreie Fotos markieren"
 
-#: ../../extend/addon/addon/redphotos/redphotos.php:130
-msgid "This will import all your Redmatrix photo albums to this channel."
-msgstr "Hiermit werden all deine Fotoalben von Redmatrix in diesen Kanal importiert."
+#: ../../addon/adultphotoflag/adultphotoflag.php:25
+msgid ""
+"Provide photo edit option to hide inappropriate photos from default album "
+"view"
+msgstr "Stellt eine Option zum Verstecken von Fotos mit unangemessenen Inhalten in der Standard-Albumansicht bereit"
 
-#: ../../extend/addon/addon/redphotos/redphotos.php:134
-msgid "Import just this album"
-msgstr "Nur dieses Album importieren"
+#: ../../addon/wppost/wppost.php:45
+msgid "Post to WordPress"
+msgstr "Auf WordPress posten"
 
-#: ../../extend/addon/addon/redphotos/redphotos.php:134
-msgid "Leave blank to import all albums"
-msgstr "Leer lassen um alle Alben zu importieren"
+#: ../../addon/wppost/wppost.php:82
+msgid "Enable WordPress Post Plugin"
+msgstr "Aktiviere das WordPress-Plugin"
 
-#: ../../extend/addon/addon/redphotos/redphotos.php:135
-msgid "Maximum count to import"
-msgstr "Maximal zu importierende Anzahl"
+#: ../../addon/wppost/wppost.php:86
+msgid "WordPress username"
+msgstr "WordPress-Benutzername"
 
-#: ../../extend/addon/addon/redphotos/redphotos.php:135
-msgid "0 or blank to import all available"
-msgstr "0 oder leer lassen um alles zu importieren"
+#: ../../addon/wppost/wppost.php:90
+msgid "WordPress password"
+msgstr "WordPress-Passwort"
 
-#: ../../extend/addon/addon/redred/redred.php:45
-msgid "Post to Red"
-msgstr ""
+#: ../../addon/wppost/wppost.php:94
+msgid "WordPress API URL"
+msgstr "WordPress-API-URL"
 
-#: ../../extend/addon/addon/redred/redred.php:60
-msgid "Channel is required."
-msgstr "Kanal ist erforderlich."
+#: ../../addon/wppost/wppost.php:95
+msgid "Typically https://your-blog.tld/xmlrpc.php"
+msgstr "Normalerweise https://your-blog.tld/xmlrpc.php"
 
-#: ../../extend/addon/addon/redred/redred.php:65
-msgid "Invalid channel."
-msgstr "Ungültiger Kanal."
+#: ../../addon/wppost/wppost.php:98
+msgid "WordPress blogid"
+msgstr "WordPress blogid"
 
-#: ../../extend/addon/addon/redred/redred.php:76
-msgid "redred Settings saved."
-msgstr "redred-Einstellungen gespeichert."
+#: ../../addon/wppost/wppost.php:99
+msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
+msgstr "Nötig für Mehrbenutzer Seiten wie wordpress.com, andernfalls frei lassen"
 
-#: ../../extend/addon/addon/redred/redred.php:95
-msgid "Allow posting to another Hubzilla Channel"
-msgstr "Erlaube die Veröffentlichung in anderen Hubzilla Kanälen"
+#: ../../addon/wppost/wppost.php:105
+msgid "Post to WordPress by default"
+msgstr "Standardmäßig auf auf WordPress posten"
 
-#: ../../extend/addon/addon/redred/redred.php:99
-msgid "Send public postings to Hubzilla channel by default"
-msgstr ""
+#: ../../addon/wppost/wppost.php:109
+msgid "Forward comments (requires hubzilla_wp plugin)"
+msgstr "Kommentare weiterleiten (benötigt hubzilla_wp Plugin)"
 
-#: ../../extend/addon/addon/redred/redred.php:103
-msgid "Hubzilla API Path"
-msgstr "Hubzilla-API-Pfad"
+#: ../../addon/wppost/wppost.php:113
+msgid "WordPress Post Settings"
+msgstr "WordPress-Beitragseinstellungen"
 
-#: ../../extend/addon/addon/redred/redred.php:103
-#: ../../extend/addon/addon/rtof/rtof.php:89
-msgid "https://{sitename}/api"
-msgstr "https://{sitename}/api"
+#: ../../addon/wppost/wppost.php:129
+msgid "Wordpress Settings saved."
+msgstr "Wordpress-Einstellungen gespeichert."
 
-#: ../../extend/addon/addon/redred/redred.php:107
-msgid "Hubzilla login name"
-msgstr "Hubzilla-Anmeldename"
+#: ../../addon/nsfw/nsfw.php:80
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and"
+" can thereby be used as a general purpose content filter."
+msgstr ""
 
-#: ../../extend/addon/addon/redred/redred.php:111
-msgid "Hubzilla channel name"
-msgstr "Hubzilla-Kanalname"
+#: ../../addon/nsfw/nsfw.php:84
+msgid "Enable Content filter"
+msgstr "Inhaltsfilter aktivieren"
 
-#: ../../extend/addon/addon/redred/redred.php:111
-#: ../../extend/addon/addon/openid/MysqlProvider.php:54
-msgid "Nickname"
-msgstr "Spitzname"
+#: ../../addon/nsfw/nsfw.php:88
+msgid "Comma separated list of keywords to hide"
+msgstr "Kommaseparierte Liste von Schlüsselworten die verborgen werden sollen."
 
-#: ../../extend/addon/addon/redred/redred.php:119
-msgid "Hubzilla Crosspost Settings"
+#: ../../addon/nsfw/nsfw.php:88
+msgid "Word, /regular-expression/, lang=xx, lang!=xx"
 msgstr ""
 
-#: ../../extend/addon/addon/rtof/rtof.php:45
-msgid "Post to Friendica"
-msgstr "Bei Friendica veröffentlichen"
+#: ../../addon/nsfw/nsfw.php:92
+msgid "Not Safe For Work Settings"
+msgstr "Not Safe For Work Einstellungen"
 
-#: ../../extend/addon/addon/rtof/rtof.php:62
-msgid "rtof Settings saved."
-msgstr "rtof-Einstellungen gespeichert."
+#: ../../addon/nsfw/nsfw.php:92
+msgid "General Purpose Content Filter"
+msgstr "Allzweck-Inhaltsfilter"
 
-#: ../../extend/addon/addon/rtof/rtof.php:81
-msgid "Allow posting to Friendica"
-msgstr "Erlaube die Veröffentlichung bei Friendica"
+#: ../../addon/nsfw/nsfw.php:110
+msgid "NSFW Settings saved."
+msgstr "NSFW-Einstellungen gespeichert."
 
-#: ../../extend/addon/addon/rtof/rtof.php:85
-msgid "Send public postings to Friendica by default"
-msgstr "Standardmäßig öffentliche Beiträge bei Friendica veröffentlichen"
+#: ../../addon/nsfw/nsfw.php:207
+msgid "Possible adult content"
+msgstr "Möglicherweise nicht jugendfreie Inhalte"
 
-#: ../../extend/addon/addon/rtof/rtof.php:89
-msgid "Friendica API Path"
-msgstr "Friendica-API-Pfad"
+#: ../../addon/nsfw/nsfw.php:211
+#, php-format
+msgid "%s - view"
+msgstr "%s - ansehen"
 
-#: ../../extend/addon/addon/rtof/rtof.php:93
-msgid "Friendica login name"
-msgstr "Friendica-Anmeldename"
+#: ../../addon/ijpost/ijpost.php:42
+msgid "Post to Insanejournal"
+msgstr "Bei InsaneJournal veröffentlichen"
 
-#: ../../extend/addon/addon/rtof/rtof.php:97
-msgid "Friendica password"
-msgstr "Friendica-Passwort"
+#: ../../addon/ijpost/ijpost.php:73
+msgid "Enable InsaneJournal Post Plugin"
+msgstr "Aktiviere das InsaneJournal Plugin"
 
-#: ../../extend/addon/addon/rtof/rtof.php:101
-msgid "Hubzilla to Friendica Post Settings"
-msgstr ""
+#: ../../addon/ijpost/ijpost.php:77
+msgid "InsaneJournal username"
+msgstr "InsaneJournal-Benutzername"
 
-#: ../../extend/addon/addon/sendzid/sendzid.php:25
-msgid "Extended Identity Sharing"
-msgstr "Erweitertes Teilen von Identitäten"
+#: ../../addon/ijpost/ijpost.php:81
+msgid "InsaneJournal password"
+msgstr "InsaneJournal-Passwort"
 
-#: ../../extend/addon/addon/sendzid/sendzid.php:26
-msgid ""
-"Share your identity with all websites on the internet. When disabled, "
-"identity is only shared with sites in the matrix."
-msgstr ""
+#: ../../addon/ijpost/ijpost.php:85
+msgid "Post to InsaneJournal by default"
+msgstr "Standardmäßig bei InsaneJournal veröffentlichen"
 
-#: ../../extend/addon/addon/skeleton/skeleton.php:59
-msgid "Some setting"
-msgstr "Einige Einstellungen"
+#: ../../addon/ijpost/ijpost.php:89
+msgid "InsaneJournal Post Settings"
+msgstr "InsaneJournal-Beitragseinstellungen"
 
-#: ../../extend/addon/addon/skeleton/skeleton.php:61
-msgid "A setting"
-msgstr "Eine Einstellung"
+#: ../../addon/ijpost/ijpost.php:104
+msgid "Insane Journal Settings saved."
+msgstr "InsaneJournal-Einstellungen gespeichert."
 
-#: ../../extend/addon/addon/skeleton/skeleton.php:64
-msgid "Skeleton Settings"
-msgstr ""
+#: ../../addon/js_upload/js_upload.php:44
+msgid "Upload a file"
+msgstr "Datei hochladen"
 
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
-msgid "Deactivate the feature"
-msgstr "Diese Funktion abschalten"
+#: ../../addon/js_upload/js_upload.php:45
+msgid "Drop files here to upload"
+msgstr "Dateien zum Hochladen hier fallen lassen"
 
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
-msgid "Hide the button and show the smilies directly."
-msgstr "Verstecke die Schaltfläche und zeige die Smilies direkt an."
+#: ../../addon/js_upload/js_upload.php:47
+msgid "Failed"
+msgstr "Fehlgeschlagen"
 
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:281
-msgid "Smileybutton Settings"
-msgstr "Smileyknopf-Einstellungen"
+#: ../../addon/js_upload/js_upload.php:315
+msgid "No files were uploaded."
+msgstr "Es wurden keine Dateien hochgeladen."
 
-#: ../../extend/addon/addon/startpage/startpage.php:109
-msgid "Page to load after login"
-msgstr "Seite, die nach dem Login geladen werden soll"
+#: ../../addon/js_upload/js_upload.php:322
+msgid "Uploaded file is empty"
+msgstr "Hochgeladene Datei ist leer"
 
-#: ../../extend/addon/addon/startpage/startpage.php:109
-msgid ""
-"Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy "
-"collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave "
-"blank for default network page (grid)."
-msgstr "Beispiele: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (Gruppen-gefilterte Beiträge), &quot;channel&quot; oder &quot;notifications/system&quot; (freilassen für die Standard-Netzwerkseite (grid)."
+#: ../../addon/js_upload/js_upload.php:335
+msgid "Image exceeds size limit of "
+msgstr "Bild überschreitet Größenbeschränkung von "
 
-#: ../../extend/addon/addon/startpage/startpage.php:113
-msgid "Startpage Settings"
-msgstr "Startseiteneinstellungen"
+#: ../../addon/js_upload/js_upload.php:347
+msgid "File has an invalid extension, it should be one of "
+msgstr "Die Datei hat eine ungültige Endung. Erlaubt sind folgende:"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:143
-msgid "Post to GNU social"
-msgstr "Bei GNU social veröffentlichen"
+#: ../../addon/js_upload/js_upload.php:359
+msgid "Upload was cancelled, or server error encountered"
+msgstr "Das Hochladen wurde abgebrochen oder es ist ein Serverfehler aufgetreten."
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:195
-msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
-msgstr "Bitte kontaktiere den Administrator deines Hubs.<br />Die angegebene API URL ist nicht korrekt."
+#: ../../addon/dwpost/dwpost.php:42
+msgid "Post to Dreamwidth"
+msgstr "Bei Dreamwidth veröffentlichen"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:232
-msgid "We could not contact the GNU social API with the Path you entered."
-msgstr "Mit dem angegebenen Pfad war es uns nicht möglich, die GNU social API zu erreichen."
+#: ../../addon/dwpost/dwpost.php:73
+msgid "Enable Dreamwidth Post Plugin"
+msgstr "Aktiviere das Dreamwidth-Plugin"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:266
-msgid "GNU social settings updated."
-msgstr "GNU social Einstellungen aktualisiert."
+#: ../../addon/dwpost/dwpost.php:77
+msgid "Dreamwidth username"
+msgstr "Dreamwidth-Benutzername"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:310
-msgid "Globally Available GNU social OAuthKeys"
-msgstr "Global verfügbare GNU social OAuthKeys"
+#: ../../addon/dwpost/dwpost.php:81
+msgid "Dreamwidth password"
+msgstr "Dreamwidth-Passwort"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:312
-msgid ""
-"There are preconfigured OAuth key pairs for some GNU social servers "
-"available. If you are using one of them, please use these credentials.<br "
-"/>If not feel free to connect to any other GNU social instance (see below)."
-msgstr ""
+#: ../../addon/dwpost/dwpost.php:85
+msgid "Post to Dreamwidth by default"
+msgstr "Standardmäßig auf auf Dreamwidth posten"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:327
-msgid "Provide your own OAuth Credentials"
-msgstr ""
+#: ../../addon/dwpost/dwpost.php:89
+msgid "Dreamwidth Post Settings"
+msgstr "Dreamwidth-Beitragseinstellungen"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:329
-msgid ""
-"No consumer key pair for GNU social found. Register your Hubzilla Account as"
-" an desktop client on your GNU social account, copy the consumer key pair "
-"here and enter the API base root.<br />Before you register your own OAuth "
-"key pair ask the administrator if there is already a key pair for this "
-"Hubzilla installation at your favourite GNU social installation."
+#: ../../addon/firefox/firefox.php:23
+msgid "Install Firefox Sharing Tools"
 msgstr ""
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:333
-msgid "OAuth Consumer Key"
-msgstr "OAuth Consumer Key"
+#: ../../addon/firefox/firefox.php:34
+msgid "Share content from Firefox to $Projectname"
+msgstr "Inhalte von Firefox nach $Projectname teilen"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:337
-msgid "OAuth Consumer Secret"
-msgstr "OAuth Consumer Secret"
+#: ../../addon/firefox/firefox.php:37
+msgid "Install Firefox Sharing Tools to this web browser"
+msgstr ""
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:341
-msgid "Base API Path"
-msgstr "Basis Pfad der API"
+#: ../../addon/dirstats/dirstats.php:94
+msgid "Hubzilla Directory Stats"
+msgstr "Hubzilla-Verzeichnisstatistiken"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:341
-msgid "Remember the trailing /"
-msgstr "Denke an das abschließende /"
+#: ../../addon/dirstats/dirstats.php:95
+msgid "Total Hubs"
+msgstr "Hubs insgesamt"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:345
-msgid "GNU social application name"
-msgstr "GNU social Anwendungsname"
+#: ../../addon/dirstats/dirstats.php:97
+msgid "Hubzilla Hubs"
+msgstr "Hubzilla Hubs"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:368
-msgid ""
-"To connect to your GNU social account click the button below to get a "
-"security code from GNU social which you have to copy into the input box "
-"below and submit the form. Only your <strong>public</strong> posts will be "
-"posted to GNU social."
-msgstr ""
+#: ../../addon/dirstats/dirstats.php:99
+msgid "Friendica Hubs"
+msgstr "Friendica Hubs"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:370
-msgid "Log in with GNU social"
-msgstr "Mit GNU social anmelden"
+#: ../../addon/dirstats/dirstats.php:101
+msgid "Diaspora Pods"
+msgstr "Diaspora Pods"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:373
-msgid "Copy the security code from GNU social here"
-msgstr "Kopiere den Sicherheitscode von GNU social hier her"
+#: ../../addon/dirstats/dirstats.php:103
+msgid "Hubzilla Channels"
+msgstr "Hubzilla-Kanäle"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:383
-msgid "Cancel Connection Process"
-msgstr "Verbindungsprozes abbrechen"
+#: ../../addon/dirstats/dirstats.php:105
+msgid "Friendica Channels"
+msgstr "Friendica-Kanäle"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:385
-msgid "Current GNU social API is"
-msgstr "Aktuelle GNU social API ist"
+#: ../../addon/dirstats/dirstats.php:107
+msgid "Diaspora Channels"
+msgstr "Diaspora-Kanäle"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:389
-msgid "Cancel GNU social Connection"
-msgstr "GNU social Verbindung trennen"
+#: ../../addon/dirstats/dirstats.php:109
+msgid "Aged 35 and above"
+msgstr "35 und älter"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:401
-#: ../../extend/addon/addon/twitter/twitter.php:232
-msgid "Currently connected to: "
-msgstr "Momentan verbunden mit:"
+#: ../../addon/dirstats/dirstats.php:111
+msgid "Aged 34 and under"
+msgstr "34 und jünger"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:406
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr ""
+#: ../../addon/dirstats/dirstats.php:113
+msgid "Average Age"
+msgstr "Durchschnittsalter"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:411
-msgid "Allow posting to GNU social"
-msgstr "Erlaube die Veröffentlichung bei GNU social"
+#: ../../addon/dirstats/dirstats.php:115
+msgid "Known Chatrooms"
+msgstr "Bekannte Chaträume"
+
+#: ../../addon/dirstats/dirstats.php:117
+msgid "Known Tags"
+msgstr "Bekannte Schlagwörter"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:411
+#: ../../addon/dirstats/dirstats.php:119
 msgid ""
-"If enabled your public postings can be posted to the associated GNU-social "
-"account"
-msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen GNU social Account veröffentlicht werden."
+"Please note Diaspora and Friendica statistics are merely those **this "
+"directory** is aware of, and not all those known in the network.  This also "
+"applies to chatrooms,"
+msgstr "Bitte berücksichtige, dass Diaspora und Friendica Statistiken nur solche einschließen, die **diesem Verzeichnis** bekannt sind, nicht alle im Netzwerk bekannten. Das gilt auch für Chaträume."
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:415
-msgid "Post to GNU social by default"
-msgstr "Standardmäßig bei GNU social veröffentlichen"
+#: ../../addon/mailhost/mailhost.php:36
+msgid "Email notification hub"
+msgstr "Hub für E-Mail-Benachrichtigungen"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:415
-msgid ""
-"If enabled your public postings will be posted to the associated GNU-social "
-"account by default"
-msgstr "Wenn aktiv werden all deine öffentlichen Beiträge standardmäßig bei dem verbundenen GNU social Account veröffentlicht."
+#: ../../addon/mailhost/mailhost.php:36
+msgid "Hostname"
+msgstr "Servername"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:424
-#: ../../extend/addon/addon/twitter/twitter.php:255
-msgid "Clear OAuth configuration"
-msgstr "OAuth Konfiguration löschen"
+#: ../../addon/mailhost/mailhost.php:40
+msgid "Mailhost Settings"
+msgstr "Mailhost-Einstellungen"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:432
-msgid "GNU social Post Settings"
-msgstr "GNU social Einstellungen"
+#: ../../addon/mailhost/mailhost.php:54
+msgid "MAILHOST Settings saved."
+msgstr "MAILHOST-Einstellungen gespeichert."
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:891
-msgid "API URL"
-msgstr "API-URL"
+#: ../../addon/likebanner/likebanner.php:51
+msgid "Your Webbie:"
+msgstr "Dein Webbie"
 
-#: ../../extend/addon/addon/statusnet/statusnet.php:894
-msgid "Application name"
-msgstr "Anwendungsname"
+#: ../../addon/likebanner/likebanner.php:54
+msgid "Fontsize (px):"
+msgstr "Schriftgröße (px):"
 
-#: ../../extend/addon/addon/superblock/superblock.php:110
-msgid "Currently blocked"
-msgstr "Derzeit blockiert"
+#: ../../addon/likebanner/likebanner.php:68
+msgid "Link:"
+msgstr "Link:"
 
-#: ../../extend/addon/addon/superblock/superblock.php:112
-msgid "No channels currently blocked"
-msgstr "Momentan sind keine Kanäle blockiert"
+#: ../../addon/likebanner/likebanner.php:70
+msgid "Like us on Hubzilla"
+msgstr "Like us on Hubzilla"
 
-#: ../../extend/addon/addon/superblock/superblock.php:118
-msgid "\"Superblock\" Settings"
-msgstr "\"Superblock\"-Einstellungen"
+#: ../../addon/likebanner/likebanner.php:72
+msgid "Embed:"
+msgstr "Einbetten"
 
-#: ../../extend/addon/addon/superblock/superblock.php:322
-msgid "Block Completely"
-msgstr "Vollständig blockieren"
+#: ../../addon/redphotos/redphotos.php:106
+msgid "Photos imported"
+msgstr "Fotos importiert"
 
-#: ../../extend/addon/addon/superblock/superblock.php:371
-msgid "superblock settings updated"
-msgstr "Superblock Einstellungen aktualisiert"
+#: ../../addon/redphotos/redphotos.php:129
+msgid "Redmatrix Photo Album Import"
+msgstr "Redmatrix-Fotoalbumimport"
 
-#: ../../extend/addon/addon/testdrive/testdrive.php:104
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr "Dein Account auf %s wird in ein paar Tagen ablaufen."
+#: ../../addon/redphotos/redphotos.php:130
+msgid "This will import all your Redmatrix photo albums to this channel."
+msgstr "Hiermit werden all deine Fotoalben von Redmatrix in diesen Kanal importiert."
 
-#: ../../extend/addon/addon/testdrive/testdrive.php:105
-msgid "Your $Productname test account is about to expire."
-msgstr "Dein $Productname Test-Account wird bald auslaufen."
+#: ../../addon/redphotos/redphotos.php:131
+#: ../../addon/redfiles/redfiles.php:121
+msgid "Redmatrix Server base URL"
+msgstr "Basis-URL des Redmatrix Servers"
 
-#: ../../extend/addon/addon/tictac/tictac.php:21
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr "Dreidimensionales Tic-Tac-Toe"
+#: ../../addon/redphotos/redphotos.php:132
+#: ../../addon/redfiles/redfiles.php:122
+msgid "Redmatrix Login Username"
+msgstr "Redmatrix-Anmeldebenutzername"
 
-#: ../../extend/addon/addon/tictac/tictac.php:54
-msgid "3D Tic-Tac-Toe"
-msgstr "3D Tic-Tac-Toe"
+#: ../../addon/redphotos/redphotos.php:133
+#: ../../addon/redfiles/redfiles.php:123
+msgid "Redmatrix Login Password"
+msgstr "Redmatrix-Anmeldepasswort"
 
-#: ../../extend/addon/addon/tictac/tictac.php:59
-msgid "New game"
-msgstr "Neues Spiel"
+#: ../../addon/redphotos/redphotos.php:134
+msgid "Import just this album"
+msgstr "Nur dieses Album importieren"
 
-#: ../../extend/addon/addon/tictac/tictac.php:60
-msgid "New game with handicap"
-msgstr "Neues Handicaü-Spiel"
+#: ../../addon/redphotos/redphotos.php:134
+msgid "Leave blank to import all albums"
+msgstr "Leer lassen um alle Alben zu importieren"
 
-#: ../../extend/addon/addon/tictac/tictac.php:61
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
-msgstr "3D Tic-Tac-Toe funktioniert wie das ursprüngliche Spiel, nur dass es auf mehreren Ebenen gleichzeitig gespielt wird."
+#: ../../addon/redphotos/redphotos.php:135
+msgid "Maximum count to import"
+msgstr "Maximal zu importierende Anzahl"
 
-#: ../../extend/addon/addon/tictac/tictac.php:62
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
-msgstr "In diesem Fall sind es drei Ebenen. Du gewinnst, wenn es dir gelingt drei in einer Reihe auf einer beliebigen Ebene oder diagonal über die verschiedenen Ebenen hinweg zu erreichen."
+#: ../../addon/redphotos/redphotos.php:135
+msgid "0 or blank to import all available"
+msgstr "0 oder leer lassen um alles zu importieren"
 
-#: ../../extend/addon/addon/tictac/tictac.php:64
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr "Bei einem Handicap-Spiel wird die Position im Zentrum der mittleren Ebene gesperrt, da der Spieler der dieses Feld für sich beansprucht meist einen unfairen Vorteil hat."
+#: ../../addon/irc/irc.php:45
+msgid "Channels to auto connect"
+msgstr "Kanäle zur automatischen Verbindung"
 
-#: ../../extend/addon/addon/tictac/tictac.php:183
-msgid "You go first..."
-msgstr "Du darfst anfangen..."
+#: ../../addon/irc/irc.php:45 ../../addon/irc/irc.php:49
+msgid "Comma separated list"
+msgstr "Kommagetrennte Liste"
 
-#: ../../extend/addon/addon/tictac/tictac.php:188
-msgid "I'm going first this time..."
-msgstr "Diesmal werde ich anfangen..."
+#: ../../addon/irc/irc.php:49 ../../addon/irc/irc.php:96
+msgid "Popular Channels"
+msgstr "Beliebte Kanäle"
 
-#: ../../extend/addon/addon/tictac/tictac.php:194
-msgid "You won!"
-msgstr "Sie haben gewonnen!"
+#: ../../addon/irc/irc.php:53
+msgid "IRC Settings"
+msgstr "IRC-Einstellungen"
 
-#: ../../extend/addon/addon/tictac/tictac.php:200
-#: ../../extend/addon/addon/tictac/tictac.php:225
-msgid "\"Cat\" game!"
-msgstr "\"Katzen\"-Spiel!"
+#: ../../addon/irc/irc.php:69
+msgid "IRC settings saved."
+msgstr "IRC-Einstellungen gespeichert."
 
-#: ../../extend/addon/addon/tictac/tictac.php:223
-msgid "I won!"
-msgstr "Ich habe gewonnen!"
+#: ../../addon/irc/irc.php:74
+msgid "IRC Chatroom"
+msgstr "IRC-Chatraum"
 
-#: ../../extend/addon/addon/tour/tour.php:75
-msgid "Edit your profile and change settings."
-msgstr "Bearbeite dein Profil und ändere die Einstellungen."
+#: ../../addon/ljpost/ljpost.php:42
+msgid "Post to LiveJournal"
+msgstr "Bei LiveJurnal veröffentlichen"
 
-#: ../../extend/addon/addon/tour/tour.php:76
-msgid "Click here to see activity from your connections."
-msgstr "Klicke hier, um die Aktivitäten Deiner Verbindungen zu sehen."
+#: ../../addon/ljpost/ljpost.php:70
+msgid "Enable LiveJournal Post Plugin"
+msgstr "Aktiviere das LiveJurnal Plugin"
 
-#: ../../extend/addon/addon/tour/tour.php:77
-msgid "Click here to see your channel home."
-msgstr "Klicke hier, um Deine Kanal-Hauptseite zu sehen."
+#: ../../addon/ljpost/ljpost.php:74
+msgid "LiveJournal username"
+msgstr "LiveJournal-Benutzername"
 
-#: ../../extend/addon/addon/tour/tour.php:78
-msgid "You can access your private messages from here."
-msgstr "Hierüber kannst Du auf Deine privaten Nachrichten zugreifen."
+#: ../../addon/ljpost/ljpost.php:78
+msgid "LiveJournal password"
+msgstr "LiveJournal-Passwort"
 
-#: ../../extend/addon/addon/tour/tour.php:79
-msgid "Create new events here."
-msgstr "Neue Termine hier erstellen"
+#: ../../addon/ljpost/ljpost.php:82
+msgid "Post to LiveJournal by default"
+msgstr "Standardmäßig bei LiveJurnal veröffentlichen"
 
-#: ../../extend/addon/addon/tour/tour.php:80
-msgid ""
-"You can accept new connections and change permissions for existing ones "
-"here. You can also e.g. create groups of contacts."
-msgstr "Du kannst hier neue Verbindungen akzeptieren sowie die Einstellungen bereits vorhandener Vebindungen bearbeiten. Außerdem kannst Du Verbindungen in Gruppen zusammenfassen."
+#: ../../addon/ljpost/ljpost.php:86
+msgid "LiveJournal Post Settings"
+msgstr "LiveJournal-Beitragseinstellungen"
 
-#: ../../extend/addon/addon/tour/tour.php:81
-msgid "System notifications will arrive here"
-msgstr "Systembenachrichtigungen werden hier eintreffen"
+#: ../../addon/ljpost/ljpost.php:101
+msgid "LiveJournal Settings saved."
+msgstr "LiveJournal-Einstellungen gespeichert."
 
-#: ../../extend/addon/addon/tour/tour.php:82
-msgid "Search for content and users"
-msgstr "Nach Inhalt von Benutzern suchen"
+#: ../../addon/openid/openid.php:49
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal."
 
-#: ../../extend/addon/addon/tour/tour.php:83
-msgid "Browse for new contacts"
-msgstr "Schaue nach möglichen neuen Verbindungen."
+#: ../../addon/openid/openid.php:49
+msgid "The error message was:"
+msgstr "Die Fehlermeldung war:"
 
-#: ../../extend/addon/addon/tour/tour.php:84
-msgid "Launch installed apps"
-msgstr "Installierte Apps starten"
+#: ../../addon/openid/MysqlProvider.php:52
+msgid "First Name"
+msgstr "Vorname"
 
-#: ../../extend/addon/addon/tour/tour.php:85
-msgid "Looking for help? Click here."
-msgstr "Du benötigst Hilfe? Klicke hier."
+#: ../../addon/openid/MysqlProvider.php:53
+msgid "Last Name"
+msgstr "Nachname"
 
-#: ../../extend/addon/addon/tour/tour.php:86
-msgid ""
-"New events have occurred in your network. Click here to see what has "
-"happened!"
-msgstr "In Deinem Netzwerk gibt es neue Ereignisse. Klicke hier, um zu sehen, was passiert ist!"
+#: ../../addon/openid/MysqlProvider.php:54 ../../addon/redred/redred.php:111
+msgid "Nickname"
+msgstr "Spitzname"
 
-#: ../../extend/addon/addon/tour/tour.php:87
-msgid "You have received a new private message. Click here to see from who!"
-msgstr "Du hast eine neue private Nachricht erhalten. Klicke hier, um zu sehen, von wem!"
+#: ../../addon/openid/MysqlProvider.php:55
+msgid "Full Name"
+msgstr "Voller Name"
 
-#: ../../extend/addon/addon/tour/tour.php:88
-msgid "There are events this week. Click here too see which!"
-msgstr "Es gibt neue Termine diese Woche. Klicke hier, um zu sehen, welche!"
+#: ../../addon/openid/MysqlProvider.php:61
+msgid "Profile Photo 16px"
+msgstr "Profilfoto 16 px"
 
-#: ../../extend/addon/addon/tour/tour.php:89
-msgid "You have received a new introduction. Click here to see who!"
-msgstr "Du hast eine neue Verbindungsanfrage erhalten. Klicke hier, um zu sehen, wer es ist!"
+#: ../../addon/openid/MysqlProvider.php:62
+msgid "Profile Photo 32px"
+msgstr "Profilfoto 32 px"
 
-#: ../../extend/addon/addon/tour/tour.php:90
-msgid ""
-"There is a new system notification. Click here to see what has happened!"
-msgstr "Es gibt eine neue Systembenachrichtigung. Klicke hier, um zu sehen, was passiert ist!"
+#: ../../addon/openid/MysqlProvider.php:63
+msgid "Profile Photo 48px"
+msgstr "Profilfoto 48 px"
 
-#: ../../extend/addon/addon/tour/tour.php:93
-msgid "Click here to share text, images, videos and sound."
-msgstr "Klicke hier, um Texte, Bilder, Videos und Klänge zu teilen."
+#: ../../addon/openid/MysqlProvider.php:64
+msgid "Profile Photo 64px"
+msgstr "Profilfoto 64 px"
 
-#: ../../extend/addon/addon/tour/tour.php:94
-msgid "You can write an optional title for your update (good for long posts)."
-msgstr "Du kannst Deinem Beitrag einen optionalen Titel geben (gut für lange Beiträge)."
+#: ../../addon/openid/MysqlProvider.php:65
+msgid "Profile Photo 80px"
+msgstr "Profilfoto 80 px"
 
-#: ../../extend/addon/addon/tour/tour.php:95
-msgid "Entering some categories here makes it easier to find your post later."
-msgstr "Ein paar Kategorien hier einzugeben, macht es leichter, Deinen Beitrag später wiederzufinden."
+#: ../../addon/openid/MysqlProvider.php:66
+msgid "Profile Photo 128px"
+msgstr "Profilfoto 128 px"
 
-#: ../../extend/addon/addon/tour/tour.php:96
-msgid "Share photos, links, location, etc."
-msgstr "Teile Photos, Links, Standort, usw."
+#: ../../addon/openid/MysqlProvider.php:67
+msgid "Timezone"
+msgstr "Zeitzone"
 
-#: ../../extend/addon/addon/tour/tour.php:97
-msgid ""
-"Only want to share content for a while? Make it expire at a certain date."
-msgstr "Du möchtest diesen Inhalt nur für eine Weile teilen? Dann lass ihn zu einem bestimmten Datum ablaufen."
+#: ../../addon/openid/MysqlProvider.php:70
+msgid "Birth Year"
+msgstr "Geburtsjahr"
 
-#: ../../extend/addon/addon/tour/tour.php:98
-msgid "You can password protect content."
-msgstr "Du kannst Inhalte mit einem Passwort schützen."
+#: ../../addon/openid/MysqlProvider.php:71
+msgid "Birth Month"
+msgstr "Geburtsmonat"
 
-#: ../../extend/addon/addon/tour/tour.php:99
-msgid "Choose who you share with."
-msgstr "Wähle aus, mit wem Du teilen möchtest."
+#: ../../addon/openid/MysqlProvider.php:72
+msgid "Birth Day"
+msgstr "Geburtstag"
 
-#: ../../extend/addon/addon/tour/tour.php:101
-msgid "Click here when you are done."
-msgstr "Klicke hier, wenn Du fertig bist."
+#: ../../addon/openid/MysqlProvider.php:73
+msgid "Birthdate"
+msgstr "Geburtsdatum"
 
-#: ../../extend/addon/addon/tour/tour.php:104
-msgid "Adjust from which channels posts should be displayed."
-msgstr "Lege fest, von welchen Kanälen Beiträge angezeigt werden sollen."
+#: ../../addon/openid/Mod_Openid.php:30
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID-Protokollfehler. Keine Kennung zurückgegeben."
 
-#: ../../extend/addon/addon/tour/tour.php:105
-msgid "Only show posts from channels in the specified privacy group."
-msgstr "Zeige nur Beträge von Kanälen, die in einer bestimmten Gruppe sind."
+#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:286
+msgid "Login failed."
+msgstr "Login fehlgeschlagen."
 
-#: ../../extend/addon/addon/tour/tour.php:109
-msgid "Easily find posts containing tags (keywords preceded by the \"#\" symbol)."
-msgstr "Finde Beiträge, die bestimmte Tags enthalten (Stichworte, die mit dem \"#\"-Symbol beginnen)."
+#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Male"
+msgstr "Männlich"
 
-#: ../../extend/addon/addon/tour/tour.php:110
-msgid "Easily find posts in given category."
-msgstr "Finde Beiträge in bestimmten Kategorien."
+#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Female"
+msgstr "Weiblich"
 
-#: ../../extend/addon/addon/tour/tour.php:111
-msgid "Easily find posts by date."
-msgstr "Finde Beiträge anhand des Datums."
+#: ../../addon/randpost/randpost.php:97
+msgid "You're welcome."
+msgstr "Gern geschehen."
 
-#: ../../extend/addon/addon/tour/tour.php:112
-msgid ""
-"Suggested users who have volounteered to be shown as suggestions, and who we"
-" think you might find interesting."
-msgstr "Vorgeschlagene Kanäle, die in ihren Einstellungen zugestimmt haben, als Vorschläge angezeigt zu werden, und die Du eventuell interessant finden könntest."
+#: ../../addon/randpost/randpost.php:98
+msgid "Ah shucks..."
+msgstr ""
 
-#: ../../extend/addon/addon/tour/tour.php:113
-msgid "Here you see channels you have connected to."
-msgstr "Hier siehst du die Kanäle, mit denen Du verbunden bist."
+#: ../../addon/randpost/randpost.php:99
+msgid "Don't mention it."
+msgstr "Keine Ursache."
 
-#: ../../extend/addon/addon/tour/tour.php:114
-msgid "Save your search so you can repeat it at a later date."
-msgstr "Speichere Deine Suche, so dass Du sie später leicht erneut durchführen kannst."
+#: ../../addon/randpost/randpost.php:100
+msgid "&lt;blush&gt;"
+msgstr ""
 
-#: ../../extend/addon/addon/tour/tour.php:117
-msgid ""
-"If you see this icon you can be sure that the sender is who it say it is. It"
-" is normal that it is not always possible to verify the sender, so the icon "
-"will be missing sometimes. There is usually no need to worry about that."
-msgstr "Wenn Du dieses Symbol siehst, kannst Du weitgehend sicher sein, dass der Ansender dem angegebenen entspricht. Nicht immer ist es möglich, den Absender zu verifizieren, daher fehlt das Symbol mitunter. Das ist aber in der Regel kein Grund zur Sorge."
+#: ../../addon/startpage/startpage.php:109
+msgid "Page to load after login"
+msgstr "Seite, die nach dem Login geladen werden soll"
 
-#: ../../extend/addon/addon/tour/tour.php:118
+#: ../../addon/startpage/startpage.php:109
 msgid ""
-"Danger! It seems someone tried to forge a message! This message is not "
-"necessarily from who it says it is from!"
-msgstr "Vorsicht! Es kann sein, dass jemand versucht, eine Nachricht zu fälschen! Diese Nachricht muss nicht unbedingt vom angegebenen Absender stammen!"
+"Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy "
+"collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave "
+"blank for default network page (grid)."
+msgstr "Beispiele: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (Gruppen-gefilterte Beiträge), &quot;channel&quot; oder &quot;notifications/system&quot; (freilassen für die Standard-Netzwerkseite (grid)."
 
-#: ../../extend/addon/addon/tour/tour.php:125
-msgid ""
-"Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can "
-"pause it at any time and continue where you left off by reloading the page, "
-"or navigting to another page.</p><p>You can also advance by pressing the "
-"return key"
-msgstr "Willkommen zu Hubzilla! Möchtest Du eine Tour der Benutzeroberfläche angezeigt bekommen?</p><p>Du kannst zu jeder Zeit pausieren und fortsetzen, wo Du aufgehört hast, indem Du die Seite neu lädtst, oder zu einer anderen Seite springst.</p><p>Du kannst auc durch das Drücken der Enter-Taste weitergehen."
+#: ../../addon/startpage/startpage.php:113
+msgid "Startpage Settings"
+msgstr "Startseiteneinstellungen"
 
-#: ../../extend/addon/addon/twitter/twitter.php:99
-msgid "Post to Twitter"
-msgstr "Bei Twitter veröffentlichen"
+#: ../../addon/morepokes/morepokes.php:19
+msgid "bitchslap"
+msgstr "Ohrfeige"
 
-#: ../../extend/addon/addon/twitter/twitter.php:154
-msgid "Twitter settings updated."
-msgstr "Twitter-Einstellungen aktualisiert."
+#: ../../addon/morepokes/morepokes.php:19
+msgid "bitchslapped"
+msgstr "geohrfeigt"
 
-#: ../../extend/addon/addon/twitter/twitter.php:183
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
-msgstr "Es wurde kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte kontaktiere deinen Seiten-Administrator."
+#: ../../addon/morepokes/morepokes.php:20
+msgid "shag"
+msgstr "bumsen"
 
-#: ../../extend/addon/addon/twitter/twitter.php:205
-msgid ""
-"At this Hubzilla instance the Twitter plugin was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input"
-" box below and submit the form. Only your <strong>public</strong> posts will"
-" be posted to Twitter."
-msgstr ""
+#: ../../addon/morepokes/morepokes.php:20
+msgid "shagged"
+msgstr "gebumst"
 
-#: ../../extend/addon/addon/twitter/twitter.php:207
-msgid "Log in with Twitter"
-msgstr "Mit Twitter anmelden"
+#: ../../addon/morepokes/morepokes.php:21
+msgid "patent"
+msgstr "Patent"
 
-#: ../../extend/addon/addon/twitter/twitter.php:210
-msgid "Copy the PIN from Twitter here"
-msgstr "PIN von Twitter hier her kopieren"
+#: ../../addon/morepokes/morepokes.php:21
+msgid "patented"
+msgstr "patentiert"
 
-#: ../../extend/addon/addon/twitter/twitter.php:237
-msgid ""
-"<strong>Note:</strong> Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to Twitter will lead the visitor to a blank page informing "
-"the visitor that the access to your profile has been restricted."
-msgstr ""
+#: ../../addon/morepokes/morepokes.php:22
+msgid "hug"
+msgstr "umarmen"
 
-#: ../../extend/addon/addon/twitter/twitter.php:242
-msgid "Allow posting to Twitter"
-msgstr "Erlaube die Veröffentlichung bei Twitter"
+#: ../../addon/morepokes/morepokes.php:22
+msgid "hugged"
+msgstr "umarmt"
 
-#: ../../extend/addon/addon/twitter/twitter.php:242
-msgid ""
-"If enabled your public postings can be posted to the associated Twitter "
-"account"
-msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden."
+#: ../../addon/morepokes/morepokes.php:23
+msgid "murder"
+msgstr "ermorden"
 
-#: ../../extend/addon/addon/twitter/twitter.php:246
-msgid "Send public postings to Twitter by default"
-msgstr "Standardmäßig öffentliche Beiträge bei Twitter veröffentlichen"
+#: ../../addon/morepokes/morepokes.php:23
+msgid "murdered"
+msgstr "ermordet"
 
-#: ../../extend/addon/addon/twitter/twitter.php:246
-msgid ""
-"If enabled your public postings will be posted to the associated Twitter "
-"account by default"
-msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden."
+#: ../../addon/morepokes/morepokes.php:24
+msgid "worship"
+msgstr "Anbetung"
 
-#: ../../extend/addon/addon/twitter/twitter.php:264
-msgid "Twitter Post Settings"
-msgstr "Twitter-Beitragseinstellungen"
+#: ../../addon/morepokes/morepokes.php:24
+msgid "worshipped"
+msgstr "angebetet"
 
-#: ../../extend/addon/addon/twitter/twitter.php:773
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:95
-msgid "Submit Settings"
-msgstr "Einstellungen absenden"
+#: ../../addon/morepokes/morepokes.php:25
+msgid "kiss"
+msgstr "küssen"
 
-#: ../../extend/addon/addon/upload_limits/upload_limits.php:25
-msgid "Show Upload Limits"
-msgstr "Hochladebeschränkungen anzeigen"
+#: ../../addon/morepokes/morepokes.php:25
+msgid "kissed"
+msgstr "geküsst"
 
-#: ../../extend/addon/addon/upload_limits/upload_limits.php:27
-msgid "Hubzilla configured maximum size: "
-msgstr "Die in Hubzilla eingestellte maximale Größe:"
+#: ../../addon/morepokes/morepokes.php:26
+msgid "tempt"
+msgstr "verlocken"
 
-#: ../../extend/addon/addon/upload_limits/upload_limits.php:28
-msgid "PHP upload_max_filesize: "
-msgstr "PHP upload_max_filesize:"
+#: ../../addon/morepokes/morepokes.php:26
+msgid "tempted"
+msgstr "verlockt"
 
-#: ../../extend/addon/addon/upload_limits/upload_limits.php:29
-msgid "PHP post_max_size (must be larger than upload_max_filesize): "
-msgstr "PHP post_max_size (muss größer sein als upload_max_filesize):"
+#: ../../addon/morepokes/morepokes.php:27
+msgid "raise eyebrows at"
+msgstr ""
 
-#: ../../extend/addon/addon/visage/visage.php:93
-msgid "Recent Channel/Profile Viewers"
-msgstr "Kürzliche Kanal/Profil Besucher"
+#: ../../addon/morepokes/morepokes.php:27
+msgid "raised their eyebrows at"
+msgstr ""
 
-#: ../../extend/addon/addon/visage/visage.php:98
-msgid "This plugin/addon has not been configured."
-msgstr "Dieses Plugin/Addon wurde noch nicht konfiguriert."
+#: ../../addon/morepokes/morepokes.php:28
+msgid "insult"
+msgstr "beleidigen"
 
-#: ../../extend/addon/addon/visage/visage.php:99
-#, php-format
-msgid "Please visit the Visage settings on %s"
-msgstr "Bitte rufe die Visage Einstellungen auf %s auf"
+#: ../../addon/morepokes/morepokes.php:28
+msgid "insulted"
+msgstr "beleidigt"
 
-#: ../../extend/addon/addon/visage/visage.php:99
-msgid "your feature settings page"
-msgstr "Die Funktions-Einstellungsseite"
+#: ../../addon/morepokes/morepokes.php:29
+msgid "praise"
+msgstr "loben"
 
-#: ../../extend/addon/addon/visage/visage.php:112
-msgid "No entries."
-msgstr "Keine Einträge."
+#: ../../addon/morepokes/morepokes.php:29
+msgid "praised"
+msgstr "gelobt"
 
-#: ../../extend/addon/addon/visage/visage.php:166
-msgid "Enable Visage Visitor Logging"
-msgstr "Aktiviere das Visage-Besucher Logging"
+#: ../../addon/morepokes/morepokes.php:30
+msgid "be dubious of"
+msgstr ""
 
-#: ../../extend/addon/addon/visage/visage.php:170
-msgid "Visage Settings"
-msgstr "Visage-Einstellungen"
+#: ../../addon/morepokes/morepokes.php:30
+msgid "was dubious of"
+msgstr ""
 
-#: ../../extend/addon/addon/wholikesme/wholikesme.php:29
-msgid "Who likes me?"
-msgstr "Wer mag mich?"
+#: ../../addon/morepokes/morepokes.php:31
+msgid "eat"
+msgstr "essen"
 
-#: ../../extend/addon/addon/wppost/wppost.php:45
-msgid "Post to WordPress"
-msgstr "Auf WordPress posten"
+#: ../../addon/morepokes/morepokes.php:31
+msgid "ate"
+msgstr "aß"
 
-#: ../../extend/addon/addon/wppost/wppost.php:82
-msgid "Enable WordPress Post Plugin"
-msgstr "Aktiviere das WordPress-Plugin"
+#: ../../addon/morepokes/morepokes.php:32
+msgid "giggle and fawn at"
+msgstr ""
 
-#: ../../extend/addon/addon/wppost/wppost.php:86
-msgid "WordPress username"
-msgstr "WordPress-Benutzername"
+#: ../../addon/morepokes/morepokes.php:32
+msgid "giggled and fawned at"
+msgstr ""
 
-#: ../../extend/addon/addon/wppost/wppost.php:90
-msgid "WordPress password"
-msgstr "WordPress-Passwort"
+#: ../../addon/morepokes/morepokes.php:33
+msgid "doubt"
+msgstr "anzweifeln"
 
-#: ../../extend/addon/addon/wppost/wppost.php:94
-msgid "WordPress API URL"
-msgstr "WordPress-API-URL"
+#: ../../addon/morepokes/morepokes.php:33
+msgid "doubted"
+msgstr "angezweifelt"
 
-#: ../../extend/addon/addon/wppost/wppost.php:95
-msgid "Typically https://your-blog.tld/xmlrpc.php"
-msgstr "Normalerweise https://your-blog.tld/xmlrpc.php"
+#: ../../addon/morepokes/morepokes.php:34
+msgid "glare"
+msgstr ""
 
-#: ../../extend/addon/addon/wppost/wppost.php:98
-msgid "WordPress blogid"
-msgstr "WordPress blogid"
+#: ../../addon/morepokes/morepokes.php:34
+msgid "glared at"
+msgstr ""
 
-#: ../../extend/addon/addon/wppost/wppost.php:99
-msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
-msgstr "Nötig für Mehrbenutzer Seiten wie wordpress.com, andernfalls frei lassen"
+#: ../../addon/morepokes/morepokes.php:35
+msgid "fuck"
+msgstr "ficken"
 
-#: ../../extend/addon/addon/wppost/wppost.php:105
-msgid "Post to WordPress by default"
-msgstr "Standardmäßig auf auf WordPress posten"
+#: ../../addon/morepokes/morepokes.php:35
+msgid "fucked"
+msgstr "gefickt"
 
-#: ../../extend/addon/addon/wppost/wppost.php:109
-msgid "Forward comments (requires hubzilla_wp plugin)"
-msgstr "Kommentare weiterleiten (benötigt hubzilla_wp Plugin)"
+#: ../../addon/morepokes/morepokes.php:36
+msgid "bonk"
+msgstr ""
 
-#: ../../extend/addon/addon/wppost/wppost.php:113
-msgid "WordPress Post Settings"
-msgstr "WordPress-Beitragseinstellungen"
+#: ../../addon/morepokes/morepokes.php:36
+msgid "bonked"
+msgstr ""
 
-#: ../../extend/addon/addon/wppost/wppost.php:129
-msgid "Wordpress Settings saved."
-msgstr "Wordpress-Einstellungen gespeichert."
+#: ../../addon/morepokes/morepokes.php:37
+msgid "declare undying love for"
+msgstr ""
 
-#: ../../extend/addon/addon/xmpp/xmpp.php:31
-msgid "XMPP settings updated."
-msgstr "XMPP-Einstellungen aktualisiert."
+#: ../../addon/morepokes/morepokes.php:37
+msgid "declared undying love for"
+msgstr ""
 
-#: ../../extend/addon/addon/xmpp/xmpp.php:53
-msgid "Enable Chat"
-msgstr "Chat aktivieren"
+#: ../../addon/diaspora/diaspora.php:675
+msgid "Diaspora Protocol Settings updated."
+msgstr ""
 
-#: ../../extend/addon/addon/xmpp/xmpp.php:58
-msgid "Individual credentials"
-msgstr "Individuelle Anmeldedaten"
+#: ../../addon/diaspora/diaspora.php:694
+msgid "Enable the Diaspora protocol for this channel"
+msgstr ""
 
-#: ../../extend/addon/addon/xmpp/xmpp.php:64
-msgid "Jabber BOSH server"
-msgstr "Jabber BOSH Server"
+#: ../../addon/diaspora/diaspora.php:698
+msgid "Allow any Diaspora member to comment on your public posts"
+msgstr ""
 
-#: ../../extend/addon/addon/xmpp/xmpp.php:69
-msgid "XMPP Settings"
-msgstr "XMPP-Einstellungen"
+#: ../../addon/diaspora/diaspora.php:702
+msgid "Prevent your hashtags from being redirected to other sites"
+msgstr ""
 
-#: ../../extend/addon/addon/xmpp/xmpp.php:92
-msgid "Jabber BOSH host"
-msgstr "Jabber BOSH Host"
+#: ../../addon/diaspora/diaspora.php:707
+msgid "Followed hashtags (comma separated, do not include the #)"
+msgstr ""
 
-#: ../../extend/addon/addon/xmpp/xmpp.php:93
-msgid "Use central userbase"
-msgstr "Zentrale Benutzerbasis verwenden"
+#: ../../addon/diaspora/diaspora.php:712
+msgid "Diaspora Protocol Settings"
+msgstr ""
 
-#: ../../extend/addon/addon/xmpp/xmpp.php:93
-msgid ""
-"If enabled, members will automatically login to an ejabberd server that has "
-"to be installed on this machine with synchronized credentials via the "
-"\"auth_ejabberd.php\" script."
+#: ../../addon/diaspora/import_diaspora.php:16
+msgid "No username found in import file."
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:37
-msgid "Select Channel"
-msgstr "Kanal auswählen"
+#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:62
+msgid "Unable to create a unique channel address. Import failed."
+msgstr "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Import ist fehlgeschlagen."
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:42
-msgid "Read-write"
-msgstr "Lesen-schreiben"
+#: ../../addon/gitwiki/Mod_Gitwiki.php:107
+msgid "Error retrieving wiki"
+msgstr "Fehler beim Abrufen des Wiki"
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:43
-msgid "Read-only"
-msgstr "Nur Lesen"
+#: ../../addon/gitwiki/Mod_Gitwiki.php:114
+msgid "Error creating zip file export folder"
+msgstr "Fehler bei der Erzeugung des Zip-Datei Export-Verzeichnisses "
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:116
-msgid "My Calendars"
-msgstr "Meine Kalender"
+#: ../../addon/gitwiki/Mod_Gitwiki.php:132
+msgid "Error downloading wiki: "
+msgstr "Fehler beim Herunterladen des Wiki:"
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:118
-msgid "Shared Calendars"
-msgstr "Geteilte Kalender"
+#: ../../addon/testdrive/testdrive.php:104
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr "Dein Account auf %s wird in ein paar Tagen ablaufen."
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:122
-msgid "Share this calendar"
-msgstr "Diesen Kalender teilen"
+#: ../../addon/testdrive/testdrive.php:105
+msgid "Your $Productname test account is about to expire."
+msgstr "Dein $Productname Test-Account wird bald auslaufen."
+
+#: ../../addon/rainbowtag/rainbowtag.php:81
+msgid "Enable Rainbowtag"
+msgstr "Rainbowtag aktivieren"
+
+#: ../../addon/rainbowtag/rainbowtag.php:85
+msgid "Rainbowtag Settings"
+msgstr "Rainbowtag-Einstellungen"
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:124
-msgid "Calendar name and color"
-msgstr "Kalendername und -farbe"
+#: ../../addon/rainbowtag/rainbowtag.php:101
+msgid "Rainbowtag Settings saved."
+msgstr "Rainbowtag-Einstellungen gespeichert."
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:126
-msgid "Create new calendar"
-msgstr "Neuen Kalender erstellen"
+#: ../../addon/upload_limits/upload_limits.php:25
+msgid "Show Upload Limits"
+msgstr "Hochladebeschränkungen anzeigen"
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:128
-msgid "Calendar Name"
-msgstr "Kalendername"
+#: ../../addon/upload_limits/upload_limits.php:27
+msgid "Hubzilla configured maximum size: "
+msgstr "Die in Hubzilla eingestellte maximale Größe:"
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:129
-msgid "Calendar Tools"
-msgstr "Kalenderwerkzeuge"
+#: ../../addon/upload_limits/upload_limits.php:28
+msgid "PHP upload_max_filesize: "
+msgstr "PHP upload_max_filesize:"
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:130
-msgid "Import calendar"
-msgstr "Kalender importieren"
+#: ../../addon/upload_limits/upload_limits.php:29
+msgid "PHP post_max_size (must be larger than upload_max_filesize): "
+msgstr "PHP post_max_size (muss größer sein als upload_max_filesize):"
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:131
-msgid "Select a calendar to import to"
-msgstr "Kalender zum Hineinimportieren auswählen"
+#: ../../addon/visage/visage.php:93
+msgid "Recent Channel/Profile Viewers"
+msgstr "Kürzliche Kanal/Profil Besucher"
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:158
-msgid "Addressbooks"
-msgstr "Adressbücher"
+#: ../../addon/visage/visage.php:98
+msgid "This plugin/addon has not been configured."
+msgstr "Dieses Plugin/Addon wurde noch nicht konfiguriert."
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:160
-msgid "Addressbook name"
-msgstr "Adressbuchname"
+#: ../../addon/visage/visage.php:99
+#, php-format
+msgid "Please visit the Visage settings on %s"
+msgstr "Bitte rufe die Visage Einstellungen auf %s auf"
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:162
-msgid "Create new addressbook"
-msgstr "Neues Adressbuch erstellen"
+#: ../../addon/visage/visage.php:99
+msgid "your feature settings page"
+msgstr "Die Funktions-Einstellungsseite"
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:163
-msgid "Addressbook Name"
-msgstr "Adressbuchname"
+#: ../../addon/visage/visage.php:112
+msgid "No entries."
+msgstr "Keine Einträge."
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:165
-msgid "Addressbook Tools"
-msgstr "Adressbuchwerkzeuge"
+#: ../../addon/visage/visage.php:166
+msgid "Enable Visage Visitor Logging"
+msgstr "Aktiviere das Visage-Besucher Logging"
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:166
-msgid "Import addressbook"
-msgstr "Adressbuch importieren"
+#: ../../addon/visage/visage.php:170
+msgid "Visage Settings"
+msgstr "Visage-Einstellungen"
 
-#: ../../extend/addon/addon/cdav/include/widgets.php:167
-msgid "Select an addressbook to import to"
-msgstr "Adressbuch zum Hineinimportieren auswählen"
+#: ../../addon/nsabait/nsabait.php:125
+msgid "Nsabait Settings updated."
+msgstr "Nsabait-Einstellungen aktualisiert."
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:744
-msgid "INVALID EVENT DISMISSED!"
-msgstr "UNGÜLTIGEN TERMIN ABGELEHNT!"
+#: ../../addon/nsabait/nsabait.php:157
+msgid "Enable NSAbait Plugin"
+msgstr "Aktiviere das NSAbait Plugin"
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:745
-msgid "Summary: "
-msgstr "Zusammenfassung:"
+#: ../../addon/nsabait/nsabait.php:161
+msgid "NSAbait Settings"
+msgstr "NSAbait-Einstellungen"
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:746
-msgid "Date: "
-msgstr "Datum:"
+#: ../../addon/mailtest/mailtest.php:19
+msgid "Send test email"
+msgstr "Test-E-Mail senden"
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:747
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:754
-msgid "Reason: "
-msgstr "Grund:"
+#: ../../addon/mailtest/mailtest.php:50 ../../addon/hubwall/hubwall.php:50
+msgid "No recipients found."
+msgstr "Keine Empfänger gefunden."
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:752
-msgid "INVALID CARD DISMISSED!"
-msgstr "UNGÜLTIGE KARTE ABGELEHNT!"
+#: ../../addon/mailtest/mailtest.php:66
+msgid "Mail sent."
+msgstr "Mail gesendet."
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:753
-msgid "Name: "
-msgstr "Name: "
+#: ../../addon/mailtest/mailtest.php:68
+msgid "Sending of mail failed."
+msgstr "Senden der E-Mail fehlgeschlagen."
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:770
-msgid ""
-"You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV "
-"Settings before you can use it."
-msgstr ""
+#: ../../addon/mailtest/mailtest.php:77
+msgid "Mail Test"
+msgstr "Mail Test"
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:837
-msgid "Example: YYYY-MM-DD HH:mm"
-msgstr "Beispiel: JJJJ-MM-TT HH:mm"
+#: ../../addon/mailtest/mailtest.php:96 ../../addon/hubwall/hubwall.php:92
+msgid "Message subject"
+msgstr "Betreff der Nachricht"
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:837
-msgid "End date and time"
-msgstr "Enddatum und -zeit"
+#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:44
+#, php-format
+msgid "Reconnecting %d connections"
+msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:852
-msgid "List month"
+#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:63
+msgid "Diaspora Reconnect"
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:853
-msgid "List week"
+#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:65
+msgid ""
+"Use this form to re-establish Diaspora connections which were initially made"
+" from a different hub."
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:854
-msgid "List day"
+#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:70
+msgid "Reconnect"
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:861
-msgid "More"
-msgstr "Mehr"
+#: ../../addon/openstreetmap/openstreetmap.php:146
+msgid "View Larger"
+msgstr "Größer anzeigen"
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:862
-msgid "Less"
-msgstr "Weniger"
+#: ../../addon/openstreetmap/openstreetmap.php:169
+msgid "Tile Server URL"
+msgstr "Kachelserver-URL"
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:863
-msgid "Select calendar"
-msgstr "Kalender auswählen"
+#: ../../addon/openstreetmap/openstreetmap.php:169
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
+"target=\"_blank\">public tile servers</a>"
+msgstr "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Kachelserver</a>"
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:865
-msgid "Delete all"
-msgstr "Alles löschen"
+#: ../../addon/openstreetmap/openstreetmap.php:170
+msgid "Nominatim (reverse geocoding) Server URL"
+msgstr "Nominatim (reverse Geokodierung) Server URL"
 
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:867
-msgid "Sorry! Editing of recurrent events is not yet implemented."
-msgstr "Entschuldigung, aber das Bearbeiten von wiederkehrenden Veranstaltungen ist leider noch nicht implementiert."
+#: ../../addon/openstreetmap/openstreetmap.php:170
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
+"target=\"_blank\">Nominatim servers</a>"
+msgstr "Eine Liste der <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">Nominatim Server</a>"
 
-#: ../../extend/addon/addon/cdav/cdav.php:36
-msgid "Errors encountered creating database table: "
-msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
+#: ../../addon/openstreetmap/openstreetmap.php:171
+msgid "Default zoom"
+msgstr "Standardzoom"
 
-#: ../../extend/addon/addon/cdav/cdav.php:197
-msgid "Default Calendar"
-msgstr "Standardkalender"
+#: ../../addon/openstreetmap/openstreetmap.php:171
+msgid ""
+"The default zoom level. (1:world, 18:highest, also depends on tile server)"
+msgstr "Die Standard-Vergrößerungsstufe (1:Welt, 18:höchste, hängt außerdem vom Kachelserver ab)."
 
-#: ../../extend/addon/addon/cdav/cdav.php:206
-msgid "Default Addressbook"
-msgstr "Standardadressbuch"
+#: ../../addon/openstreetmap/openstreetmap.php:172
+msgid "Include marker on map"
+msgstr "Markierung auf der Karte einschließen"
 
-#: ../../extend/addon/addon/cdav/cdav.php:215
-msgid "CalDAV/CardDAV Settings saved."
-msgstr "CalDAV/CardDAV-Einstellungen gespeichert."
+#: ../../addon/openstreetmap/openstreetmap.php:172
+msgid "Include a marker on the map."
+msgstr "Binde eine Markierung auf der Karte ein."
 
-#: ../../extend/addon/addon/cdav/cdav.php:234
-msgid "Enable CalDAV/CardDAV Server for this channel"
-msgstr "Aktiviere den CalDAV/CardDAV Server für diesen Kanal"
+#: ../../addon/msgfooter/msgfooter.php:46 ../../addon/xmpp/xmpp.php:91
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
 
-#: ../../extend/addon/addon/cdav/cdav.php:237
-#, php-format
-msgid "Your CalDAV resources are located at %s "
-msgstr "Deine CalDAV Resourcen sind unter %s verfügbar"
+#: ../../addon/msgfooter/msgfooter.php:47
+msgid "text to include in all outgoing posts from this site"
+msgstr "Test der in alle Beiträge angefügt werden soll, die von dieser Seite ausgehen"
 
-#: ../../extend/addon/addon/cdav/cdav.php:240
-#, php-format
-msgid "Your CardDAV resources are located at %s "
-msgstr "Deine CardDAV Ressourcen sind unter %s verfügbar"
+#: ../../addon/rtof/rtof.php:45
+msgid "Post to Friendica"
+msgstr "Bei Friendica veröffentlichen"
 
-#: ../../extend/addon/addon/cdav/cdav.php:246
-msgid "CalDAV/CardDAV Settings"
-msgstr "CalDAV/CardDAV-Einstellungen"
+#: ../../addon/rtof/rtof.php:62
+msgid "rtof Settings saved."
+msgstr "rtof-Einstellungen gespeichert."
 
-#: ../../extend/addon/addon/cdav/cdav.php:272
-#: ../../include/connections.php:896
-msgid "Home, Voice"
-msgstr "Zuhause, Sprache"
+#: ../../addon/rtof/rtof.php:81
+msgid "Allow posting to Friendica"
+msgstr "Erlaube die Veröffentlichung bei Friendica"
 
-#: ../../extend/addon/addon/cdav/cdav.php:273
-#: ../../include/connections.php:897
-msgid "Home, Fax"
-msgstr "Zuhause, Fax"
+#: ../../addon/rtof/rtof.php:85
+msgid "Send public postings to Friendica by default"
+msgstr "Standardmäßig öffentliche Beiträge bei Friendica veröffentlichen"
 
-#: ../../extend/addon/addon/cdav/cdav.php:275
-#: ../../include/connections.php:899
-msgid "Work, Voice"
-msgstr "Arbeit, Sprache"
+#: ../../addon/rtof/rtof.php:89
+msgid "Friendica API Path"
+msgstr "Friendica-API-Pfad"
 
-#: ../../extend/addon/addon/cdav/cdav.php:276
-#: ../../include/connections.php:900
-msgid "Work, Fax"
-msgstr "Arbeit, Fax"
+#: ../../addon/rtof/rtof.php:89 ../../addon/redred/redred.php:103
+msgid "https://{sitename}/api"
+msgstr "https://{sitename}/api"
 
-#: ../../extend/addon/addon/chess/chess.php:276
-#: ../../extend/addon/addon/chess/chess.php:430
-msgid "Invalid game."
-msgstr "Ungültiges Spiel."
+#: ../../addon/rtof/rtof.php:93
+msgid "Friendica login name"
+msgstr "Friendica-Anmeldename"
 
-#: ../../extend/addon/addon/chess/chess.php:282
-#: ../../extend/addon/addon/chess/chess.php:436
-msgid "You are not a player in this game."
-msgstr "Sie sind kein Spieler in diesem Spiel."
+#: ../../addon/rtof/rtof.php:97
+msgid "Friendica password"
+msgstr "Friendica-Passwort"
 
-#: ../../extend/addon/addon/chess/chess.php:315
-msgid "You must be a local channel to create a game."
-msgstr "Um ein Spiel zu eröffnen, musst du ein lokaler Kanal sein"
+#: ../../addon/rtof/rtof.php:101
+msgid "Hubzilla to Friendica Post Settings"
+msgstr ""
 
-#: ../../extend/addon/addon/chess/chess.php:333
-msgid "You must select one opponent that is not yourself."
-msgstr "Du musst einen Gegner wählen, der nicht du selbst ist"
+#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1139
+#: ../../include/channel.php:1296
+msgid "Status:"
+msgstr "Status:"
 
-#: ../../extend/addon/addon/chess/chess.php:336
-msgid "Creating new game..."
-msgstr "Neues Spiel wird erstellt..."
+#: ../../addon/jappixmini/jappixmini.php:309
+msgid "Activate addon"
+msgstr "Addon aktiviren"
 
-#: ../../extend/addon/addon/chess/chess.php:342
-msgid "You must select white or black."
-msgstr "Sie müssen weiß oder schwarz auswählen."
+#: ../../addon/jappixmini/jappixmini.php:313
+msgid "Hide Jappixmini Chat-Widget from the webinterface"
+msgstr "Jappix Mini Chat-Widget von der Weboberfläche verbergen"
 
-#: ../../extend/addon/addon/chess/chess.php:349
-msgid "Error creating new game."
-msgstr "Fehler beim Erstellen eines neuen Spiels."
+#: ../../addon/jappixmini/jappixmini.php:318
+msgid "Jabber username"
+msgstr "Jabber-Benutzername"
 
-#: ../../extend/addon/addon/chess/chess.php:379 ../../include/channel.php:899
-msgid "Requested channel is not available."
-msgstr "Angeforderte Kanal nicht verfügbar."
+#: ../../addon/jappixmini/jappixmini.php:324
+msgid "Jabber server"
+msgstr "Jabber-Server"
 
-#: ../../extend/addon/addon/chess/chess.php:392
-msgid "You must select a local channel /chess/channelname"
-msgstr "Du musst einen lokalen Kanal/Schach(Kanalnamen aufwählen"
+#: ../../addon/jappixmini/jappixmini.php:330
+msgid "Jabber BOSH host URL"
+msgstr "Jabber BOSH Host URL"
 
-#: ../../extend/addon/addon/chess/chess.php:920
-msgid "Enable notifications"
-msgstr "Benachrichtigungen aktivieren"
+#: ../../addon/jappixmini/jappixmini.php:337
+msgid "Jabber password"
+msgstr "Jabber-Passwort"
 
-#: ../../extend/addon/addon/likebanner/likebanner.php:51
-msgid "Your Webbie:"
-msgstr "Dein Webbie"
+#: ../../addon/jappixmini/jappixmini.php:343
+msgid "Encrypt Jabber password with Hubzilla password"
+msgstr "Jabber-Passwort mit Hubzilla-Passwort verschlüsseln"
 
-#: ../../extend/addon/addon/likebanner/likebanner.php:54
-msgid "Fontsize (px):"
-msgstr "Schriftgröße (px):"
+#: ../../addon/jappixmini/jappixmini.php:347 ../../addon/redred/redred.php:115
+msgid "Hubzilla password"
+msgstr "Hubzilla-Passwort"
 
-#: ../../extend/addon/addon/likebanner/likebanner.php:68
-msgid "Link:"
-msgstr "Link:"
+#: ../../addon/jappixmini/jappixmini.php:351
+#: ../../addon/jappixmini/jappixmini.php:355
+msgid "Approve subscription requests from Hubzilla contacts automatically"
+msgstr ""
 
-#: ../../extend/addon/addon/likebanner/likebanner.php:70
-msgid "Like us on Hubzilla"
-msgstr "Like us on Hubzilla"
+#: ../../addon/jappixmini/jappixmini.php:359
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Interne Liste der Jabber Adressen von Kontakten löschen"
 
-#: ../../extend/addon/addon/likebanner/likebanner.php:72
-msgid "Embed:"
-msgstr "Einbetten"
+#: ../../addon/jappixmini/jappixmini.php:364
+msgid "Configuration Help"
+msgstr "Konfigurationshilfe"
 
-#: ../../extend/addon/addon/openid/Mod_Id.php:85
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-msgid "Male"
-msgstr "Männlich"
+#: ../../addon/jappixmini/jappixmini.php:371
+msgid "Jappix Mini Settings"
+msgstr "Jappix Mini Einstellungen"
 
-#: ../../extend/addon/addon/openid/Mod_Id.php:87
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-msgid "Female"
-msgstr "Weiblich"
+#: ../../addon/superblock/superblock.php:112
+msgid "Currently blocked"
+msgstr "Derzeit blockiert"
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:52
-msgid "First Name"
-msgstr "Vorname"
+#: ../../addon/superblock/superblock.php:114
+msgid "No channels currently blocked"
+msgstr "Momentan sind keine Kanäle blockiert"
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:53
-msgid "Last Name"
-msgstr "Nachname"
+#: ../../addon/superblock/superblock.php:120
+msgid "\"Superblock\" Settings"
+msgstr "\"Superblock\"-Einstellungen"
+
+#: ../../addon/superblock/superblock.php:345
+msgid "Block Completely"
+msgstr "Vollständig blockieren"
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:55
-msgid "Full Name"
-msgstr "Voller Name"
+#: ../../addon/superblock/superblock.php:394
+msgid "superblock settings updated"
+msgstr "Superblock Einstellungen aktualisiert"
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:61
-msgid "Profile Photo 16px"
-msgstr "Profilfoto 16 px"
+#: ../../addon/nofed/nofed.php:42
+msgid "Federate"
+msgstr ""
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:62
-msgid "Profile Photo 32px"
-msgstr "Profilfoto 32 px"
+#: ../../addon/nofed/nofed.php:56
+msgid "nofed Settings saved."
+msgstr "nofed Einstellungen gespeichert"
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:63
-msgid "Profile Photo 48px"
-msgstr "Profilfoto 48 px"
+#: ../../addon/nofed/nofed.php:72
+msgid "Allow Federation Toggle"
+msgstr ""
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:64
-msgid "Profile Photo 64px"
-msgstr "Profilfoto 64 px"
+#: ../../addon/nofed/nofed.php:76
+msgid "Federate posts by default"
+msgstr ""
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:65
-msgid "Profile Photo 80px"
-msgstr "Profilfoto 80 px"
+#: ../../addon/nofed/nofed.php:80
+msgid "NoFed Settings"
+msgstr "NoFed-Einstellungen"
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:66
-msgid "Profile Photo 128px"
-msgstr "Profilfoto 128 px"
+#: ../../addon/redred/redred.php:45
+msgid "Post to Red"
+msgstr ""
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:67
-msgid "Timezone"
-msgstr "Zeitzone"
+#: ../../addon/redred/redred.php:60
+msgid "Channel is required."
+msgstr "Kanal ist erforderlich."
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:70
-msgid "Birth Year"
-msgstr "Geburtsjahr"
+#: ../../addon/redred/redred.php:76
+msgid "redred Settings saved."
+msgstr "redred-Einstellungen gespeichert."
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:71
-msgid "Birth Month"
-msgstr "Geburtsmonat"
+#: ../../addon/redred/redred.php:95
+msgid "Allow posting to another Hubzilla Channel"
+msgstr "Erlaube die Veröffentlichung in anderen Hubzilla Kanälen"
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:72
-msgid "Birth Day"
-msgstr "Geburtstag"
+#: ../../addon/redred/redred.php:99
+msgid "Send public postings to Hubzilla channel by default"
+msgstr ""
 
-#: ../../extend/addon/addon/openid/MysqlProvider.php:73
-msgid "Birthdate"
-msgstr "Geburtsdatum"
+#: ../../addon/redred/redred.php:103
+msgid "Hubzilla API Path"
+msgstr "Hubzilla-API-Pfad"
 
-#: ../../extend/addon/addon/openid/openid.php:49
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal."
+#: ../../addon/redred/redred.php:107
+msgid "Hubzilla login name"
+msgstr "Hubzilla-Anmeldename"
 
-#: ../../extend/addon/addon/openid/openid.php:49
-msgid "The error message was:"
-msgstr "Die Fehlermeldung war:"
+#: ../../addon/redred/redred.php:111
+msgid "Hubzilla channel name"
+msgstr "Hubzilla-Kanalname"
 
-#: ../../extend/addon/addon/openid/Mod_Openid.php:30
-msgid "OpenID protocol error. No ID returned."
-msgstr "OpenID-Protokollfehler. Keine Kennung zurückgegeben."
+#: ../../addon/redred/redred.php:119
+msgid "Hubzilla Crosspost Settings"
+msgstr ""
 
-#: ../../extend/addon/addon/openid/Mod_Openid.php:188
-#: ../../include/auth.php:286
-msgid "Login failed."
-msgstr "Login fehlgeschlagen."
+#: ../../addon/logrot/logrot.php:36
+msgid "Logfile archive directory"
+msgstr "Verzeichnis der Logdatei"
 
-#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:44
-#, php-format
-msgid "Reconnecting %d connections"
-msgstr "Erneuere %d Verbindungen"
+#: ../../addon/logrot/logrot.php:36
+msgid "Directory to store rotated logs"
+msgstr "Verzeichnis, in dem rotierte Logs gespeichert werden sollen"
 
-#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:63
-msgid "Diaspora Reconnect"
-msgstr ""
+#: ../../addon/logrot/logrot.php:37
+msgid "Logfile size in bytes before rotating"
+msgstr "zu erreichende Logdateigröße in Bytes, bevor rotiert wird"
 
-#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:65
-msgid ""
-"Use this form to re-establish Diaspora connections which were initially made"
-" from a different hub."
-msgstr ""
+#: ../../addon/logrot/logrot.php:38
+msgid "Number of logfiles to retain"
+msgstr "Anzahl aufzubewahrender rotierter Logdateien"
 
-#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:70
-msgid "Reconnect"
-msgstr "Erneut verbinden"
+#: ../../addon/frphotos/frphotos.php:91
+msgid "Friendica Photo Album Import"
+msgstr "Friendica-Fotoalbumimport"
 
-#: ../../extend/addon/addon/mailtest/mailtest.php:19
-msgid "Send test email"
-msgstr "Test-E-Mail senden"
+#: ../../addon/frphotos/frphotos.php:92
+msgid "This will import all your Friendica photo albums to this Red channel."
+msgstr "Hiermit werden all deine Fotoalben von Friendica in diesen Hubzilla Kanal importiert."
 
-#: ../../extend/addon/addon/mailtest/mailtest.php:66
-msgid "Mail sent."
-msgstr "Mail gesendet."
+#: ../../addon/frphotos/frphotos.php:93
+msgid "Friendica Server base URL"
+msgstr "BasisURL des Friendica Servers"
 
-#: ../../extend/addon/addon/mailtest/mailtest.php:68
-msgid "Sending of mail failed."
-msgstr "Senden der E-Mail fehlgeschlagen."
+#: ../../addon/frphotos/frphotos.php:94
+msgid "Friendica Login Username"
+msgstr "Friendica-Anmeldebenutzername"
 
-#: ../../extend/addon/addon/mailtest/mailtest.php:77
-msgid "Mail Test"
-msgstr "Mail Test"
+#: ../../addon/frphotos/frphotos.php:95
+msgid "Friendica Login Password"
+msgstr "Friendica-Anmeldepasswort"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:57
-msgid "Errors encountered deleting database table "
-msgstr "Beim Löschen der Datenbanktabelle sind Fehler aufgetreten."
+#: ../../addon/donate/donate.php:21
+msgid "Project Servers and Resources"
+msgstr "Projektserver und -ressourcen"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:96
-msgid "Drop tables when uninstalling?"
-msgstr "Lösche Tabellen beim Deinstallieren?"
+#: ../../addon/donate/donate.php:22
+msgid "Project Creator and Tech Lead"
+msgstr "Projektersteller und Technischer Leiter"
+
+#: ../../addon/donate/donate.php:23
+msgid "Admin, developer, directorymin, support bloke"
+msgstr "Administrator, Entwickler, Verzeichnis Betreibender, Supportleistende"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:96
+#: ../../addon/donate/donate.php:50
 msgid ""
-"If checked, the Rendezvous database tables will be deleted when the plugin "
-"is uninstalled."
-msgstr "Wenn ausgewählt, werden die Rendezvous-Tabellen in der Datenbank gelöscht, sobald das Plugin deinstalliert wird."
+"And the hundreds of other people and organisations who helped make the "
+"Hubzilla possible."
+msgstr "Und die hunderte anderen Menschen und Organisationen, die geholfen haben Hubzilla möglich zu machen."
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:97
-msgid "Mapbox Access Token"
-msgstr "Mapbox Zugangs-Token"
+#: ../../addon/donate/donate.php:53
+msgid ""
+"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving "
+"their time and expertise - and often paying out of pocket for services they "
+"share with others."
+msgstr "Die Redmatrix/Hubzilla Projekte werden hauptsächlich von Freiwilligen bereitgestellt, die ihre Zeit und Expertise zur Verfügung stellen - und oft aus eigener Tasche für die Dienste zahlen, die sie mit anderen teilen."
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:97
+#: ../../addon/donate/donate.php:54
 msgid ""
-"If you enter a Mapbox access token, it will be used to retrieve map tiles "
-"from Mapbox instead of the default OpenStreetMap tile server."
-msgstr "Wenn Du ein Mapbox Zugangs-Token eingibst, werden die Kartendaten (Kacheln) damit von Mapbox geladen, anstatt von OpenStreetMap, welches die Voreinstellung ist."
+"There is no corporate funding and no ads, and we do not collect and sell "
+"your personal information. (We don't control your personal information - "
+"<strong>you do</strong>.)"
+msgstr "Es gibt keine Finanzierung durch Firmen, keine Werbung und wir verkaufen Deine persönlichen Daten nicht. (Wir kontrollieren Deine persönlichen Daten nicht - <strong>das machst Du</strong>.)"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:162
-msgid "Rendezvous"
-msgstr "Rendezvous"
+#: ../../addon/donate/donate.php:55
+msgid ""
+"Help support our ground-breaking work in decentralisation, web identity, and"
+" privacy."
+msgstr "Hilf uns bei unserer wegweisenden Arbeit im Bereich der Dezantralisation, von Web-Identitäten und Privatsphäre."
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:167
+#: ../../addon/donate/donate.php:57
 msgid ""
-"This identity has been deleted by another member due to inactivity. Please "
-"press the \"New identity\" button or refresh the page to register a new "
-"identity. You may use the same name."
-msgstr "Diese Identität wurde von einem anderen Mitglied aufgrund von Inaktivität gelöscht. Bitte klicke auf \"Neue Identität\" oder aktualisiere die Website im Browser, um eine neue Identität zu registrieren. Du kannst dabei den selben Namen verwenden."
+"Your donations keep servers and services running and also helps us to "
+"provide innovative new features and continued development."
+msgstr "Die Spenden werden dafür verwendet Server und Dienste am laufen zu halten und helfen desweiteren innovative Neuerungen zu schaffen und die Entwicklung voran zu treiben."
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:168
-msgid "Welcome to Rendezvous!"
-msgstr "Willkommen bei Rendezvous!"
+#: ../../addon/donate/donate.php:60
+msgid "Donate"
+msgstr "Spenden"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:169
+#: ../../addon/donate/donate.php:62
 msgid ""
-"Enter your name to join this rendezvous. To begin sharing your location with"
-" the other members, tap the GPS control. When your location is discovered, a"
-" red dot will appear and others will be able to see you on the map."
-msgstr "Gib Deinen Namen ein, um diesem Rendezvous beizutreten. Um Deinen Standort mit anderen Mitgliedern zu teilen, klicke auf das GPS Symbol. Sobald Dein Standort ermittelt ist, erscheint ein roter Punkt, und die Anderen werden Dich auf der Karte sehen können."
+"Choose a project, developer, or public hub to support with a one-time "
+"donation"
+msgstr "Wähle ein Projekt, einen Entwickler oder einen öffentlichen Hub den du mit einer einmaligen Spende unterstützen willst."
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:171
-msgid "Let's meet here"
-msgstr "Lasst uns hier treffen"
+#: ../../addon/donate/donate.php:63
+msgid "Donate Now"
+msgstr "Jetzt spenden"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:174
-msgid "New marker"
-msgstr "Neue Markierung"
+#: ../../addon/donate/donate.php:64
+msgid ""
+"<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project "
+"only)"
+msgstr "<strong><em>Oder</em></strong> werde ein Unterstützer des Projekts (ausschließlich Hubzilla)"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:175
-msgid "Edit marker"
-msgstr "Markierung bearbeiten"
+#: ../../addon/donate/donate.php:65
+msgid ""
+"Please indicate if you would like your first name or full name (or nothing) "
+"to appear in our sponsor listing"
+msgstr "Bitte teile uns mit ob dein kompletter Name oder dein Vorname (oder gar nichts) auf unserer Sponsoren-Seite veröffentlicht werden soll."
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:176
-msgid "New identity"
-msgstr "Neue Identität"
+#: ../../addon/donate/donate.php:66
+msgid "Sponsor"
+msgstr "Sponsor"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:177
-msgid "Delete marker"
-msgstr "Markierung löschen"
+#: ../../addon/donate/donate.php:69
+msgid "Special thanks to: "
+msgstr "Besonderer Dank an: "
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:178
-msgid "Delete member"
-msgstr "Mitglied löschen"
+#: ../../addon/chords/Mod_Chords.php:44
+msgid ""
+"This is a fairly comprehensive and complete guitar chord dictionary which "
+"will list most of the available ways to play a certain chord, starting from "
+"the base of the fingerboard up to a few frets beyond the twelfth fret "
+"(beyond which everything repeats). A couple of non-standard tunings are "
+"provided for the benefit of slide players, etc."
+msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:179
-msgid "Edit proximity alert"
-msgstr "Annäherungsalarm bearbeiten"
+#: ../../addon/chords/Mod_Chords.php:46
+msgid ""
+"Chord names start with a root note (A-G) and may include sharps (#) and "
+"flats (b). This software will parse most of the standard naming conventions "
+"such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."
+msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:180
+#: ../../addon/chords/Mod_Chords.php:48
 msgid ""
-"A proximity alert will be issued when this member is within a certain radius"
-" of you.<br><br>Enter a radius in meters (0 to disable):"
-msgstr "Ein Annäherungsalarm wird ausgelöst werden, sobald sich dieses Mitglied innerhalb eines bestimmten Radius von Dir aufhält.<br><br>Gib einen Radius in Metern ein (0 zum Abschalten der Funktion):"
+"Valid examples include  A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, "
+"E7b13b11 ..."
+msgstr "Einige gültige Beispiele: A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:180
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:185
-msgid "distance"
-msgstr "Entfernung"
+#: ../../addon/chords/Mod_Chords.php:51
+msgid "Guitar Chords"
+msgstr "Gitarrenakkorde"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:181
-msgid "Proximity alert distance (meters)"
-msgstr ""
+#: ../../addon/chords/Mod_Chords.php:52
+msgid "The complete online chord dictionary"
+msgstr "Das komplette online Akkord-Verzeichnis"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:182
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:184
-msgid ""
-"A proximity alert will be issued when you are within a certain radius of the"
-" marker location.<br><br>Enter a radius in meters (0 to disable):"
-msgstr "Ein Annäherungsalarm wird ausgelöst werden, sobald Du Dich innerhalb eines bestimmten Radius der Markierung aufhält.<br><br>Gib einen Radius in Metern ein (0 zum Abschalten der Funktion):"
+#: ../../addon/chords/Mod_Chords.php:57
+msgid "Tuning"
+msgstr "Stimmen"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:183
-msgid "Marker proximity alert"
-msgstr "Annäherungsalarm für Markierung"
+#: ../../addon/chords/Mod_Chords.php:58
+msgid "Chord name: example: Em7"
+msgstr "Beispiel Akkord Name: Em7"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:186
-msgid "Reminder note"
-msgstr "Erinnerungshinweis"
+#: ../../addon/chords/Mod_Chords.php:59
+msgid "Show for left handed stringing"
+msgstr "Linkshänder-Besaitung anzeigen"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:187
-msgid ""
-"Enter a note to be displayed when you are within the specified proximity..."
-msgstr "Gib eine Nachricht ein, die angezeigt werden soll, wenn Du Dich in der festgelegten Nähe befindest..."
+#: ../../addon/chords/chords.php:33
+msgid "Quick Reference"
+msgstr "Schnellreferenz"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:199
-msgid "Add new rendezvous"
-msgstr "Neues Rendezvous hinzufügen"
+#: ../../addon/libertree/libertree.php:38
+msgid "Post to Libertree"
+msgstr "Bei Libertree veröffentlichen"
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:200
-msgid ""
-"Create a new rendezvous and share the access link with those you wish to "
-"invite to the group. Those who open the link become members of the "
-"rendezvous. They can view other member locations, add markers to the map, or"
-" share their own locations with the group."
-msgstr "Erstelle ein neues Rendezvous und teile den Zugriffslink mit allen, die Du in die Gruppe einladen möchtest. Die, die den Link öffnen, werden Mitglieder des Rendezvous. Sie können die Standorte der anderen Mitglieder sehen, Marker zur Karte hinzufügen oder ihre eigenen Standorte mit der Gruppe teilen."
+#: ../../addon/libertree/libertree.php:69
+msgid "Enable Libertree Post Plugin"
+msgstr "Aktivire das Libertree-Plugin"
 
-#: ../../extend/addon/addon/firefox/firefox.php:23
-msgid "Install Firefox Sharing Tools"
-msgstr ""
+#: ../../addon/libertree/libertree.php:73
+msgid "Libertree API token"
+msgstr "Libertree API Token"
+
+#: ../../addon/libertree/libertree.php:77
+msgid "Libertree site URL"
+msgstr "URL der Libertree Seite"
+
+#: ../../addon/libertree/libertree.php:81
+msgid "Post to Libertree by default"
+msgstr "Standardmäßig bei Libertree veröffentlichen"
+
+#: ../../addon/libertree/libertree.php:85
+msgid "Libertree Post Settings"
+msgstr "Libertree-Beitragseinstellungen"
+
+#: ../../addon/libertree/libertree.php:99
+msgid "Libertree Settings saved."
+msgstr "Libertree-Einstellungen gespeichert."
+
+#: ../../addon/flattrwidget/flattrwidget.php:45
+msgid "Flattr this!"
+msgstr "Flattr this!"
 
-#: ../../extend/addon/addon/firefox/firefox.php:34
-msgid "Share content from Firefox to $Projectname"
-msgstr "Inhalte von Firefox nach $Projectname teilen"
+#: ../../addon/flattrwidget/flattrwidget.php:83
+msgid "Flattr widget settings updated."
+msgstr "Flattr Widget Einstellungen aktualisiert"
 
-#: ../../extend/addon/addon/firefox/firefox.php:37
-msgid "Install Firefox Sharing Tools to this web browser"
-msgstr ""
+#: ../../addon/flattrwidget/flattrwidget.php:100
+msgid "Flattr user"
+msgstr "Flattr Nutzer"
 
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:105
-msgid "Error retrieving wiki"
-msgstr "Fehler beim Abrufen des Wiki"
+#: ../../addon/flattrwidget/flattrwidget.php:104
+msgid "URL of the Thing to flattr"
+msgstr "URL des Dings zum flattrn"
 
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:112
-msgid "Error creating zip file export folder"
-msgstr "Fehler bei der Erzeugung des Zip-Datei Export-Verzeichnisses "
+#: ../../addon/flattrwidget/flattrwidget.php:104
+msgid "If empty channel URL is used"
+msgstr "Falls leer wird die Channel URL verwendet"
 
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:130
-msgid "Error downloading wiki: "
-msgstr "Fehler beim Herunterladen des Wiki:"
+#: ../../addon/flattrwidget/flattrwidget.php:108
+msgid "Title of the Thing to flattr"
+msgstr "Titel des Dings zum flattrn"
 
-#: ../../extend/addon/addon/gitwiki/gitwiki.php:76
-#: ../../include/widgets.php:970
-msgid "Wiki Pages"
-msgstr "Wikiseiten"
+#: ../../addon/flattrwidget/flattrwidget.php:108
+msgid "If empty \"channel name on The Hubzilla\" will be used"
+msgstr "Falls leer wird \"Kanalname auf The Hubzilla\" verwendet"
 
-#: ../../extend/addon/addon/gitwiki/gitwiki.php:81
-#: ../../include/widgets.php:976
-msgid "Add new page"
-msgstr "Neue Seite hinzufügen"
+#: ../../addon/flattrwidget/flattrwidget.php:112
+msgid "Static or dynamic flattr button"
+msgstr "Statischer oder dynamischer Flattr Button"
 
-#: ../../extend/addon/addon/gitwiki/gitwiki.php:82
-#: ../../include/widgets.php:977
-msgid "Page name"
-msgstr "Seitenname"
+#: ../../addon/flattrwidget/flattrwidget.php:112
+msgid "static"
+msgstr "statisch"
 
-#: ../../extend/addon/addon/gitwiki/gitwiki.php:95
-#: ../../include/widgets.php:927
-msgid "Wiki List"
-msgstr "Wikiliste"
+#: ../../addon/flattrwidget/flattrwidget.php:112
+msgid "dynamic"
+msgstr "dynamisch"
 
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:129
-msgid "Enable the GNU-Social protocol for this channel"
-msgstr "GNU Social Protokoll für diesen Kanal aktualisieren"
+#: ../../addon/flattrwidget/flattrwidget.php:116
+msgid "Alignment of the widget"
+msgstr "Ausrichtung des Widgets"
 
-#: ../../extend/addon/addon/opensearch/opensearch.php:26 ../../boot.php:1187
-#, php-format
-msgctxt "opensearch"
-msgid "Search %1$s (%2$s)"
-msgstr "Suche %1$s (%2$s)"
+#: ../../addon/flattrwidget/flattrwidget.php:116
+msgid "left"
+msgstr "links"
 
-#: ../../extend/addon/addon/opensearch/opensearch.php:28 ../../boot.php:1187
-msgctxt "opensearch"
-msgid "$Projectname"
-msgstr "$Projectname"
+#: ../../addon/flattrwidget/flattrwidget.php:116
+msgid "right"
+msgstr "rechts"
 
-#: ../../extend/addon/addon/opensearch/opensearch.php:43
-msgid "Search $Projectname"
-msgstr ""
+#: ../../addon/flattrwidget/flattrwidget.php:120
+msgid "Enable Flattr widget"
+msgstr "Flattr Widget verwenden"
 
-#: ../../include/dba/dba_driver.php:187
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"
+#: ../../addon/flattrwidget/flattrwidget.php:124
+msgid "Flattr Widget Settings"
+msgstr "Flattr Widget Einstellungen"
 
-#: ../../include/language.php:367 ../../include/text.php:1783
-msgid "default"
-msgstr "Standard"
+#: ../../addon/statusnet/statusnet.php:143
+msgid "Post to GNU social"
+msgstr "Bei GNU social veröffentlichen"
 
-#: ../../include/language.php:380
-msgid "Select an alternate language"
-msgstr "Wähle eine alternative Sprache"
+#: ../../addon/statusnet/statusnet.php:195
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
+msgstr "Bitte kontaktiere den Administrator deines Hubs.<br />Die angegebene API URL ist nicht korrekt."
 
-#: ../../include/account.php:35
-msgid "Not a valid email address"
-msgstr "Ungültige E-Mail-Adresse"
+#: ../../addon/statusnet/statusnet.php:232
+msgid "We could not contact the GNU social API with the Path you entered."
+msgstr "Mit dem angegebenen Pfad war es uns nicht möglich, die GNU social API zu erreichen."
 
-#: ../../include/account.php:37
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Deine E-Mail-Adresse ist auf dieser Seite nicht erlaubt"
+#: ../../addon/statusnet/statusnet.php:266
+msgid "GNU social settings updated."
+msgstr "GNU social Einstellungen aktualisiert."
 
-#: ../../include/account.php:43
-msgid "Your email address is already registered at this site."
-msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert."
+#: ../../addon/statusnet/statusnet.php:310
+msgid "Globally Available GNU social OAuthKeys"
+msgstr "Global verfügbare GNU social OAuthKeys"
 
-#: ../../include/account.php:75
-msgid "An invitation is required."
-msgstr "Eine Einladung wird benötigt."
+#: ../../addon/statusnet/statusnet.php:312
+msgid ""
+"There are preconfigured OAuth key pairs for some GNU social servers "
+"available. If you are using one of them, please use these credentials.<br "
+"/>If not feel free to connect to any other GNU social instance (see below)."
+msgstr ""
 
-#: ../../include/account.php:79
-msgid "Invitation could not be verified."
-msgstr "Die Einladung konnte nicht bestätigt werden."
+#: ../../addon/statusnet/statusnet.php:327
+msgid "Provide your own OAuth Credentials"
+msgstr ""
 
-#: ../../include/account.php:130
-msgid "Please enter the required information."
-msgstr "Bitte gib die benötigten Informationen ein."
+#: ../../addon/statusnet/statusnet.php:329
+msgid ""
+"No consumer key pair for GNU social found. Register your Hubzilla Account as"
+" an desktop client on your GNU social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Hubzilla installation at your favourite GNU social installation."
+msgstr ""
 
-#: ../../include/account.php:198
-msgid "Failed to store account information."
-msgstr "Speichern der Nutzerkontodaten fehlgeschlagen."
+#: ../../addon/statusnet/statusnet.php:333
+msgid "OAuth Consumer Key"
+msgstr "OAuth Consumer Key"
 
-#: ../../include/account.php:263
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Registrierungsbestätigung für %s"
+#: ../../addon/statusnet/statusnet.php:337
+msgid "OAuth Consumer Secret"
+msgstr "OAuth Consumer Secret"
 
-#: ../../include/account.php:330
-#, php-format
-msgid "Registration request at %s"
-msgstr "Registrierungsanfrage auf %s"
+#: ../../addon/statusnet/statusnet.php:341
+msgid "Base API Path"
+msgstr "Basis Pfad der API"
 
-#: ../../include/account.php:352
-msgid "your registration password"
-msgstr "Dein Registrierungspasswort"
+#: ../../addon/statusnet/statusnet.php:341
+msgid "Remember the trailing /"
+msgstr "Denke an das abschließende /"
 
-#: ../../include/account.php:358 ../../include/account.php:420
-#, php-format
-msgid "Registration details for %s"
-msgstr "Registrierungsdetails für %s"
+#: ../../addon/statusnet/statusnet.php:345
+msgid "GNU social application name"
+msgstr "GNU social Anwendungsname"
 
-#: ../../include/account.php:431
-msgid "Account approved."
-msgstr "Nutzerkonto bestätigt."
+#: ../../addon/statusnet/statusnet.php:368
+msgid ""
+"To connect to your GNU social account click the button below to get a "
+"security code from GNU social which you have to copy into the input box "
+"below and submit the form. Only your <strong>public</strong> posts will be "
+"posted to GNU social."
+msgstr ""
 
-#: ../../include/account.php:471
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrierung für %s wurde widerrufen"
+#: ../../addon/statusnet/statusnet.php:370
+msgid "Log in with GNU social"
+msgstr "Mit GNU social anmelden"
 
-#: ../../include/account.php:756 ../../include/account.php:758
-msgid "Click here to upgrade."
-msgstr "Klicke hier, um das Upgrade durchzuführen."
+#: ../../addon/statusnet/statusnet.php:373
+msgid "Copy the security code from GNU social here"
+msgstr "Kopiere den Sicherheitscode von GNU social hier her"
 
-#: ../../include/account.php:764
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
+#: ../../addon/statusnet/statusnet.php:383
+msgid "Cancel Connection Process"
+msgstr "Verbindungsprozes abbrechen"
 
-#: ../../include/account.php:769
-msgid "This action is not available under your subscription plan."
-msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
+#: ../../addon/statusnet/statusnet.php:385
+msgid "Current GNU social API is"
+msgstr "Aktuelle GNU social API ist"
 
-#: ../../include/acl_selectors.php:208
-msgid "Who can see this?"
-msgstr "Wer kann das sehen?"
+#: ../../addon/statusnet/statusnet.php:389
+msgid "Cancel GNU social Connection"
+msgstr "GNU social Verbindung trennen"
 
-#: ../../include/acl_selectors.php:209
-msgid "Custom selection"
-msgstr "Benutzerdefinierte Auswahl"
+#: ../../addon/statusnet/statusnet.php:401 ../../addon/twitter/twitter.php:232
+msgid "Currently connected to: "
+msgstr "Momentan verbunden mit:"
 
-#: ../../include/acl_selectors.php:210
+#: ../../addon/statusnet/statusnet.php:406
 msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
-" the scope of \"Show\"."
-msgstr "Wähle \"Anzeigen\", um Betrachtung zuzulassen. \"Nicht anzeigen\" überstimmt und limitiert den Aktionsradius von \"Anzeigen\" für Ausnahmen."
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr ""
 
-#: ../../include/acl_selectors.php:211
-msgid "Show"
-msgstr "Anzeigen"
+#: ../../addon/statusnet/statusnet.php:411
+msgid "Allow posting to GNU social"
+msgstr "Erlaube die Veröffentlichung bei GNU social"
 
-#: ../../include/acl_selectors.php:212
-msgid "Don't show"
-msgstr "Nicht anzeigen"
+#: ../../addon/statusnet/statusnet.php:411
+msgid ""
+"If enabled your public postings can be posted to the associated GNU-social "
+"account"
+msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen GNU social Account veröffentlicht werden."
 
-#: ../../include/acl_selectors.php:245
-#, php-format
+#: ../../addon/statusnet/statusnet.php:415
+msgid "Post to GNU social by default"
+msgstr "Standardmäßig bei GNU social veröffentlichen"
+
+#: ../../addon/statusnet/statusnet.php:415
 msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These"
-" permissions set who is allowed to view the post."
-msgstr "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.<br />Diese Berechtigungen bestimmen, wer den Beitrag sehen kann."
+"If enabled your public postings will be posted to the associated GNU-social "
+"account by default"
+msgstr "Wenn aktiv werden all deine öffentlichen Beiträge standardmäßig bei dem verbundenen GNU social Account veröffentlicht."
 
-#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
-#: ../../include/widgets.php:46 ../../include/widgets.php:469
-#: ../../include/contact_widgets.php:91
-msgid "Categories"
-msgstr "Kategorien"
+#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:255
+msgid "Clear OAuth configuration"
+msgstr "OAuth Konfiguration löschen"
 
-#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
-msgid "Tags"
-msgstr "Schlagwörter"
+#: ../../addon/statusnet/statusnet.php:432
+msgid "GNU social Post Settings"
+msgstr "GNU social Einstellungen"
 
-#: ../../include/taxonomy.php:293
-msgid "Keywords"
-msgstr "Schlüsselwörter"
+#: ../../addon/statusnet/statusnet.php:891
+msgid "API URL"
+msgstr "API-URL"
 
-#: ../../include/taxonomy.php:314
-msgid "have"
-msgstr "habe"
+#: ../../addon/statusnet/statusnet.php:894
+msgid "Application name"
+msgstr "Anwendungsname"
 
-#: ../../include/taxonomy.php:314
-msgid "has"
-msgstr "hat"
+#: ../../addon/qrator/qrator.php:48
+msgid "QR code"
+msgstr "QR-Code"
 
-#: ../../include/taxonomy.php:315
-msgid "want"
-msgstr "will"
+#: ../../addon/qrator/qrator.php:63
+msgid "QR Generator"
+msgstr "QR-Generator"
 
-#: ../../include/taxonomy.php:315
-msgid "wants"
-msgstr "will"
+#: ../../addon/qrator/qrator.php:64
+msgid "Enter some text"
+msgstr "Etwas Text eingeben"
 
-#: ../../include/taxonomy.php:316
-msgid "likes"
-msgstr "gefällt"
+#: ../../addon/chess/chess.php:276 ../../addon/chess/chess.php:433
+msgid "Invalid game."
+msgstr "Ungültiges Spiel."
+
+#: ../../addon/chess/chess.php:282 ../../addon/chess/chess.php:439
+msgid "You are not a player in this game."
+msgstr "Sie sind kein Spieler in diesem Spiel."
+
+#: ../../addon/chess/chess.php:315
+msgid "You must be a local channel to create a game."
+msgstr "Um ein Spiel zu eröffnen, musst du ein lokaler Kanal sein"
 
-#: ../../include/taxonomy.php:317
-msgid "dislikes"
-msgstr "missfällt"
+#: ../../addon/chess/chess.php:333
+msgid "You must select one opponent that is not yourself."
+msgstr "Du musst einen Gegner wählen, der nicht du selbst ist"
 
-#: ../../include/markdown.php:444
-msgid "Attachments:"
-msgstr "Anhänge:"
+#: ../../addon/chess/chess.php:336
+msgid "Creating new game..."
+msgstr "Neues Spiel wird erstellt..."
 
-#: ../../include/markdown.php:539 ../../include/event.php:22
-#: ../../include/event.php:69
-msgid "l F d, Y \\@ g:i A"
-msgstr "l, d. F Y, H:i"
+#: ../../addon/chess/chess.php:342
+msgid "You must select white or black."
+msgstr "Sie müssen weiß oder schwarz auswählen."
 
-#: ../../include/markdown.php:541
-msgid "$Projectname event notification:"
-msgstr "$Projectname-Terminbenachrichtigung:"
+#: ../../addon/chess/chess.php:349
+msgid "Error creating new game."
+msgstr "Fehler beim Erstellen eines neuen Spiels."
 
-#: ../../include/markdown.php:545 ../../include/event.php:30
-#: ../../include/event.php:73
-msgid "Starts:"
-msgstr "Beginnt:"
+#: ../../addon/chess/chess.php:381 ../../include/channel.php:899
+msgid "Requested channel is not available."
+msgstr "Angeforderte Kanal nicht verfügbar."
 
-#: ../../include/markdown.php:553 ../../include/event.php:40
-#: ../../include/event.php:77
-msgid "Finishes:"
-msgstr "Endet:"
+#: ../../addon/chess/chess.php:395
+msgid "You must select a local channel /chess/channelname"
+msgstr "Du musst einen lokalen Kanal/Schach(Kanalnamen aufwählen"
 
-#: ../../include/datetime.php:147
-msgid "Birthday"
-msgstr "Geburtstag"
+#: ../../addon/chess/chess.php:923
+msgid "Enable notifications"
+msgstr "Benachrichtigungen aktivieren"
 
-#: ../../include/datetime.php:149
-msgid "Age: "
-msgstr "Alter:"
+#: ../../addon/twitter/twitter.php:99
+msgid "Post to Twitter"
+msgstr "Bei Twitter veröffentlichen"
 
-#: ../../include/datetime.php:151
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "JJJJ-MM-TT oder MM-TT"
+#: ../../addon/twitter/twitter.php:154
+msgid "Twitter settings updated."
+msgstr "Twitter-Einstellungen aktualisiert."
 
-#: ../../include/datetime.php:286 ../../boot.php:2578
-msgid "never"
-msgstr "Nie"
+#: ../../addon/twitter/twitter.php:183
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "Es wurde kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte kontaktiere deinen Seiten-Administrator."
 
-#: ../../include/datetime.php:292
-msgid "less than a second ago"
-msgstr "Vor weniger als einer Sekunde"
+#: ../../addon/twitter/twitter.php:205
+msgid ""
+"At this Hubzilla instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr ""
 
-#: ../../include/datetime.php:310
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr "vor %1$d %2$s"
+#: ../../addon/twitter/twitter.php:207
+msgid "Log in with Twitter"
+msgstr "Mit Twitter anmelden"
 
-#: ../../include/datetime.php:321
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] "Jahr"
-msgstr[1] "Jahre"
+#: ../../addon/twitter/twitter.php:210
+msgid "Copy the PIN from Twitter here"
+msgstr "PIN von Twitter hier her kopieren"
 
-#: ../../include/datetime.php:324
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] "Monat"
-msgstr[1] "Monate"
+#: ../../addon/twitter/twitter.php:237
+msgid ""
+"<strong>Note:</strong> Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr ""
 
-#: ../../include/datetime.php:327
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "Woche"
-msgstr[1] "Wochen"
+#: ../../addon/twitter/twitter.php:242
+msgid "Allow posting to Twitter"
+msgstr "Erlaube die Veröffentlichung bei Twitter"
 
-#: ../../include/datetime.php:330
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] "Tag"
-msgstr[1] "Tage"
+#: ../../addon/twitter/twitter.php:242
+msgid ""
+"If enabled your public postings can be posted to the associated Twitter "
+"account"
+msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden."
 
-#: ../../include/datetime.php:333
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "Stunde"
-msgstr[1] "Stunden"
+#: ../../addon/twitter/twitter.php:246
+msgid "Send public postings to Twitter by default"
+msgstr "Standardmäßig öffentliche Beiträge bei Twitter veröffentlichen"
 
-#: ../../include/datetime.php:336
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "Minute"
-msgstr[1] "Minuten"
+#: ../../addon/twitter/twitter.php:246
+msgid ""
+"If enabled your public postings will be posted to the associated Twitter "
+"account by default"
+msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden."
 
-#: ../../include/datetime.php:339
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "Sekunde"
-msgstr[1] "Sekunden"
+#: ../../addon/twitter/twitter.php:264
+msgid "Twitter Post Settings"
+msgstr "Twitter-Beitragseinstellungen"
 
-#: ../../include/datetime.php:576
-#, php-format
-msgid "%1$s's birthday"
-msgstr "%1$ss Geburtstag"
+#: ../../addon/smileybutton/smileybutton.php:273
+msgid "Deactivate the feature"
+msgstr "Diese Funktion abschalten"
 
-#: ../../include/datetime.php:577
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr "Alles Gute zum Geburtstag, %1$s"
+#: ../../addon/smileybutton/smileybutton.php:277
+msgid "Hide the button and show the smilies directly."
+msgstr "Verstecke die Schaltfläche und zeige die Smilies direkt an."
 
-#: ../../include/selectors.php:30
-msgid "Frequently"
-msgstr "Häufig"
+#: ../../addon/smileybutton/smileybutton.php:281
+msgid "Smileybutton Settings"
+msgstr "Smileyknopf-Einstellungen"
 
-#: ../../include/selectors.php:31
-msgid "Hourly"
-msgstr "Stündlich"
+#: ../../addon/piwik/piwik.php:85
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
+msgstr "Diese Website verwendet <a href='http://www.piwik.org'>Piwik</a>, um die Besucherzugriffe auszuwerten."
 
-#: ../../include/selectors.php:32
-msgid "Twice daily"
-msgstr "Zwei Mal am Tag"
+#: ../../addon/piwik/piwik.php:88
+#, php-format
+msgid ""
+"If you do not want that your visits are logged this way you <a href='%s'>can"
+" set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
+msgstr "Wenn Du nicht möchtest, dass Deine Besuche zu diesem Zweck gespeichert werden, kannst Du <a href='%s'>ein Cookie setzen, welches Piwik davon abhält, Deine weiteren Besuche auf dieser Website zu verfolgen</a> (Opt-out)."
 
-#: ../../include/selectors.php:33
-msgid "Daily"
-msgstr "Täglich"
+#: ../../addon/piwik/piwik.php:96
+msgid "Piwik Base URL"
+msgstr "Piwik Basis-URL"
 
-#: ../../include/selectors.php:34
-msgid "Weekly"
-msgstr "Wöchentlich"
+#: ../../addon/piwik/piwik.php:96
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr "Der absolute Pfad zu Deiner Piwik-Installation (ohne Protokoll (http/s), aber mit abschließendem Schrägstrich / )."
 
-#: ../../include/selectors.php:35
-msgid "Monthly"
-msgstr "Monatlich"
+#: ../../addon/piwik/piwik.php:97
+msgid "Site ID"
+msgstr "Seitenkennung"
 
-#: ../../include/selectors.php:49
-msgid "Currently Male"
-msgstr "Momentan männlich"
+#: ../../addon/piwik/piwik.php:98
+msgid "Show opt-out cookie link?"
+msgstr "Den Opt-out Cookie-Link anzeigen?"
 
-#: ../../include/selectors.php:49
-msgid "Currently Female"
-msgstr "Momentan weiblich"
+#: ../../addon/piwik/piwik.php:99
+msgid "Asynchronous tracking"
+msgstr "Asynchrones Tracking"
 
-#: ../../include/selectors.php:49
-msgid "Mostly Male"
-msgstr "Größtenteils männlich"
+#: ../../addon/piwik/piwik.php:100
+msgid "Enable frontend JavaScript error tracking"
+msgstr "Ermögliche Frontend-JavaScript-Fehlertracking"
 
-#: ../../include/selectors.php:49
-msgid "Mostly Female"
-msgstr "Größtenteils weiblich"
+#: ../../addon/piwik/piwik.php:100
+msgid "This feature requires Piwik >= 2.2.0"
+msgstr "Diese Funktion erfordert Piwik >= 2.2.0"
 
-#: ../../include/selectors.php:49
-msgid "Transgender"
-msgstr "Transsexuell"
+#: ../../addon/tour/tour.php:75
+msgid "Edit your profile and change settings."
+msgstr "Bearbeite dein Profil und ändere die Einstellungen."
 
-#: ../../include/selectors.php:49
-msgid "Intersex"
-msgstr "Zwischengeschlechtlich"
+#: ../../addon/tour/tour.php:76
+msgid "Click here to see activity from your connections."
+msgstr "Klicke hier, um die Aktivitäten Deiner Verbindungen zu sehen."
 
-#: ../../include/selectors.php:49
-msgid "Transsexual"
-msgstr "Transsexuell"
+#: ../../addon/tour/tour.php:77
+msgid "Click here to see your channel home."
+msgstr "Klicke hier, um Deine Kanal-Hauptseite zu sehen."
 
-#: ../../include/selectors.php:49
-msgid "Hermaphrodite"
-msgstr "Zwitter"
+#: ../../addon/tour/tour.php:78
+msgid "You can access your private messages from here."
+msgstr "Hierüber kannst Du auf Deine privaten Nachrichten zugreifen."
 
-#: ../../include/selectors.php:49
-msgid "Neuter"
-msgstr "Geschlechtslos"
+#: ../../addon/tour/tour.php:79
+msgid "Create new events here."
+msgstr "Neue Termine hier erstellen"
 
-#: ../../include/selectors.php:49
-msgid "Non-specific"
-msgstr "unklar"
+#: ../../addon/tour/tour.php:80
+msgid ""
+"You can accept new connections and change permissions for existing ones "
+"here. You can also e.g. create groups of contacts."
+msgstr "Du kannst hier neue Verbindungen akzeptieren sowie die Einstellungen bereits vorhandener Vebindungen bearbeiten. Außerdem kannst Du Verbindungen in Gruppen zusammenfassen."
 
-#: ../../include/selectors.php:49
-msgid "Undecided"
-msgstr "Unentschieden"
+#: ../../addon/tour/tour.php:81
+msgid "System notifications will arrive here"
+msgstr "Systembenachrichtigungen werden hier eintreffen"
 
-#: ../../include/selectors.php:85 ../../include/selectors.php:104
-msgid "Males"
-msgstr "Männer"
+#: ../../addon/tour/tour.php:82
+msgid "Search for content and users"
+msgstr "Nach Inhalt von Benutzern suchen"
 
-#: ../../include/selectors.php:85 ../../include/selectors.php:104
-msgid "Females"
-msgstr "Frauen"
+#: ../../addon/tour/tour.php:83
+msgid "Browse for new contacts"
+msgstr "Schaue nach möglichen neuen Verbindungen."
 
-#: ../../include/selectors.php:85
-msgid "Gay"
-msgstr "Schwul"
+#: ../../addon/tour/tour.php:84
+msgid "Launch installed apps"
+msgstr "Installierte Apps starten"
 
-#: ../../include/selectors.php:85
-msgid "Lesbian"
-msgstr "Lesbisch"
+#: ../../addon/tour/tour.php:85
+msgid "Looking for help? Click here."
+msgstr "Du benötigst Hilfe? Klicke hier."
 
-#: ../../include/selectors.php:85
-msgid "No Preference"
-msgstr "Keine Bevorzugung"
+#: ../../addon/tour/tour.php:86
+msgid ""
+"New events have occurred in your network. Click here to see what has "
+"happened!"
+msgstr "In Deinem Netzwerk gibt es neue Ereignisse. Klicke hier, um zu sehen, was passiert ist!"
 
-#: ../../include/selectors.php:85
-msgid "Bisexual"
-msgstr "Bisexuell"
+#: ../../addon/tour/tour.php:87
+msgid "You have received a new private message. Click here to see from who!"
+msgstr "Du hast eine neue private Nachricht erhalten. Klicke hier, um zu sehen, von wem!"
 
-#: ../../include/selectors.php:85
-msgid "Autosexual"
-msgstr "Autosexuell"
+#: ../../addon/tour/tour.php:88
+msgid "There are events this week. Click here too see which!"
+msgstr "Es gibt neue Termine diese Woche. Klicke hier, um zu sehen, welche!"
 
-#: ../../include/selectors.php:85
-msgid "Abstinent"
-msgstr "Enthaltsam"
+#: ../../addon/tour/tour.php:89
+msgid "You have received a new introduction. Click here to see who!"
+msgstr "Du hast eine neue Verbindungsanfrage erhalten. Klicke hier, um zu sehen, wer es ist!"
 
-#: ../../include/selectors.php:85
-msgid "Virgin"
-msgstr "Jungfräulich"
+#: ../../addon/tour/tour.php:90
+msgid ""
+"There is a new system notification. Click here to see what has happened!"
+msgstr "Es gibt eine neue Systembenachrichtigung. Klicke hier, um zu sehen, was passiert ist!"
 
-#: ../../include/selectors.php:85
-msgid "Deviant"
-msgstr "Abweichend"
+#: ../../addon/tour/tour.php:93
+msgid "Click here to share text, images, videos and sound."
+msgstr "Klicke hier, um Texte, Bilder, Videos und Klänge zu teilen."
 
-#: ../../include/selectors.php:85
-msgid "Fetish"
-msgstr "Fetisch"
+#: ../../addon/tour/tour.php:94
+msgid "You can write an optional title for your update (good for long posts)."
+msgstr "Du kannst Deinem Beitrag einen optionalen Titel geben (gut für lange Beiträge)."
 
-#: ../../include/selectors.php:85
-msgid "Oodles"
-msgstr "Unmengen"
+#: ../../addon/tour/tour.php:95
+msgid "Entering some categories here makes it easier to find your post later."
+msgstr "Ein paar Kategorien hier einzugeben, macht es leichter, Deinen Beitrag später wiederzufinden."
 
-#: ../../include/selectors.php:85
-msgid "Nonsexual"
-msgstr "Sexlos"
+#: ../../addon/tour/tour.php:96
+msgid "Share photos, links, location, etc."
+msgstr "Teile Photos, Links, Standort, usw."
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Single"
-msgstr "Single"
+#: ../../addon/tour/tour.php:97
+msgid ""
+"Only want to share content for a while? Make it expire at a certain date."
+msgstr "Du möchtest diesen Inhalt nur für eine Weile teilen? Dann lass ihn zu einem bestimmten Datum ablaufen."
 
-#: ../../include/selectors.php:123
-msgid "Lonely"
-msgstr "Einsam"
+#: ../../addon/tour/tour.php:98
+msgid "You can password protect content."
+msgstr "Du kannst Inhalte mit einem Passwort schützen."
 
-#: ../../include/selectors.php:123
-msgid "Available"
-msgstr "Verfügbar"
+#: ../../addon/tour/tour.php:99
+msgid "Choose who you share with."
+msgstr "Wähle aus, mit wem Du teilen möchtest."
 
-#: ../../include/selectors.php:123
-msgid "Unavailable"
-msgstr "Nicht verfügbar"
+#: ../../addon/tour/tour.php:101
+msgid "Click here when you are done."
+msgstr "Klicke hier, wenn Du fertig bist."
 
-#: ../../include/selectors.php:123
-msgid "Has crush"
-msgstr "Verguckt"
+#: ../../addon/tour/tour.php:104
+msgid "Adjust from which channels posts should be displayed."
+msgstr "Lege fest, von welchen Kanälen Beiträge angezeigt werden sollen."
 
-#: ../../include/selectors.php:123
-msgid "Infatuated"
-msgstr "Verknallt"
+#: ../../addon/tour/tour.php:105
+msgid "Only show posts from channels in the specified privacy group."
+msgstr "Zeige nur Beträge von Kanälen, die in einer bestimmten Gruppe sind."
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Dating"
-msgstr "Lerne gerade jemanden kennen"
+#: ../../addon/tour/tour.php:109
+msgid "Easily find posts containing tags (keywords preceded by the \"#\" symbol)."
+msgstr "Finde Beiträge, die bestimmte Tags enthalten (Stichworte, die mit dem \"#\"-Symbol beginnen)."
 
-#: ../../include/selectors.php:123
-msgid "Unfaithful"
-msgstr "Treulos"
+#: ../../addon/tour/tour.php:110
+msgid "Easily find posts in given category."
+msgstr "Finde Beiträge in bestimmten Kategorien."
 
-#: ../../include/selectors.php:123
-msgid "Sex Addict"
-msgstr "Sexabhängig"
+#: ../../addon/tour/tour.php:111
+msgid "Easily find posts by date."
+msgstr "Finde Beiträge anhand des Datums."
 
-#: ../../include/selectors.php:123
-msgid "Friends/Benefits"
-msgstr "Freunde/Begünstigte"
+#: ../../addon/tour/tour.php:112
+msgid ""
+"Suggested users who have volounteered to be shown as suggestions, and who we"
+" think you might find interesting."
+msgstr "Vorgeschlagene Kanäle, die in ihren Einstellungen zugestimmt haben, als Vorschläge angezeigt zu werden, und die Du eventuell interessant finden könntest."
 
-#: ../../include/selectors.php:123
-msgid "Casual"
-msgstr "Lose"
+#: ../../addon/tour/tour.php:113
+msgid "Here you see channels you have connected to."
+msgstr "Hier siehst du die Kanäle, mit denen Du verbunden bist."
 
-#: ../../include/selectors.php:123
-msgid "Engaged"
-msgstr "Verlobt"
+#: ../../addon/tour/tour.php:114
+msgid "Save your search so you can repeat it at a later date."
+msgstr "Speichere Deine Suche, so dass Du sie später leicht erneut durchführen kannst."
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Married"
-msgstr "Verheiratet"
+#: ../../addon/tour/tour.php:117
+msgid ""
+"If you see this icon you can be sure that the sender is who it say it is. It"
+" is normal that it is not always possible to verify the sender, so the icon "
+"will be missing sometimes. There is usually no need to worry about that."
+msgstr "Wenn Du dieses Symbol siehst, kannst Du weitgehend sicher sein, dass der Ansender dem angegebenen entspricht. Nicht immer ist es möglich, den Absender zu verifizieren, daher fehlt das Symbol mitunter. Das ist aber in der Regel kein Grund zur Sorge."
 
-#: ../../include/selectors.php:123
-msgid "Imaginarily married"
-msgstr "Gewissermaßen verheiratet"
+#: ../../addon/tour/tour.php:118
+msgid ""
+"Danger! It seems someone tried to forge a message! This message is not "
+"necessarily from who it says it is from!"
+msgstr "Vorsicht! Es kann sein, dass jemand versucht, eine Nachricht zu fälschen! Diese Nachricht muss nicht unbedingt vom angegebenen Absender stammen!"
 
-#: ../../include/selectors.php:123
-msgid "Partners"
-msgstr "Partner"
+#: ../../addon/tour/tour.php:125
+msgid ""
+"Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can "
+"pause it at any time and continue where you left off by reloading the page, "
+"or navigting to another page.</p><p>You can also advance by pressing the "
+"return key"
+msgstr "Willkommen zu Hubzilla! Möchtest Du eine Tour der Benutzeroberfläche angezeigt bekommen?</p><p>Du kannst zu jeder Zeit pausieren und fortsetzen, wo Du aufgehört hast, indem Du die Seite neu lädtst, oder zu einer anderen Seite springst.</p><p>Du kannst auc durch das Drücken der Enter-Taste weitergehen."
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Cohabiting"
-msgstr "Lebensgemeinschaft"
+#: ../../addon/sendzid/sendzid.php:25
+msgid "Extended Identity Sharing"
+msgstr "Erweitertes Teilen von Identitäten"
 
-#: ../../include/selectors.php:123
-msgid "Common law"
-msgstr "Informelle Ehe"
+#: ../../addon/sendzid/sendzid.php:26
+msgid ""
+"Share your identity with all websites on the internet. When disabled, "
+"identity is only shared with sites in the matrix."
+msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Happy"
-msgstr "Glücklich"
+#: ../../addon/tictac/tictac.php:21
+msgid "Three Dimensional Tic-Tac-Toe"
+msgstr "Dreidimensionales Tic-Tac-Toe"
 
-#: ../../include/selectors.php:123
-msgid "Not looking"
-msgstr "Nicht Ausschau haltend"
+#: ../../addon/tictac/tictac.php:54
+msgid "3D Tic-Tac-Toe"
+msgstr "3D Tic-Tac-Toe"
 
-#: ../../include/selectors.php:123
-msgid "Swinger"
-msgstr "Swinger"
+#: ../../addon/tictac/tictac.php:59
+msgid "New game"
+msgstr "Neues Spiel"
 
-#: ../../include/selectors.php:123
-msgid "Betrayed"
-msgstr "Betrogen"
+#: ../../addon/tictac/tictac.php:60
+msgid "New game with handicap"
+msgstr "Neues Handicaü-Spiel"
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Separated"
-msgstr "Getrennt"
+#: ../../addon/tictac/tictac.php:61
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
+msgstr "3D Tic-Tac-Toe funktioniert wie das ursprüngliche Spiel, nur dass es auf mehreren Ebenen gleichzeitig gespielt wird."
 
-#: ../../include/selectors.php:123
-msgid "Unstable"
-msgstr "Labil"
+#: ../../addon/tictac/tictac.php:62
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
+msgstr "In diesem Fall sind es drei Ebenen. Du gewinnst, wenn es dir gelingt drei in einer Reihe auf einer beliebigen Ebene oder diagonal über die verschiedenen Ebenen hinweg zu erreichen."
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Divorced"
-msgstr "Geschieden"
+#: ../../addon/tictac/tictac.php:64
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
+msgstr "Bei einem Handicap-Spiel wird die Position im Zentrum der mittleren Ebene gesperrt, da der Spieler der dieses Feld für sich beansprucht meist einen unfairen Vorteil hat."
 
-#: ../../include/selectors.php:123
-msgid "Imaginarily divorced"
-msgstr "Gewissermaßen geschieden"
+#: ../../addon/tictac/tictac.php:183
+msgid "You go first..."
+msgstr "Du darfst anfangen..."
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Widowed"
-msgstr "Verwitwet"
+#: ../../addon/tictac/tictac.php:188
+msgid "I'm going first this time..."
+msgstr "Diesmal werde ich anfangen..."
 
-#: ../../include/selectors.php:123
-msgid "Uncertain"
-msgstr "Ungewiss"
+#: ../../addon/tictac/tictac.php:194
+msgid "You won!"
+msgstr "Sie haben gewonnen!"
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "It's complicated"
-msgstr "Es ist kompliziert"
+#: ../../addon/tictac/tictac.php:200 ../../addon/tictac/tictac.php:225
+msgid "\"Cat\" game!"
+msgstr "\"Katzen\"-Spiel!"
 
-#: ../../include/selectors.php:123
-msgid "Don't care"
-msgstr "Interessiert mich nicht"
+#: ../../addon/tictac/tictac.php:223
+msgid "I won!"
+msgstr "Ich habe gewonnen!"
 
-#: ../../include/selectors.php:123
-msgid "Ask me"
-msgstr "Frag mich mal"
+#: ../../addon/pageheader/pageheader.php:43
+msgid "Message to display on every page on this server"
+msgstr "Nachricht, die auf jeder Seite dieses Servers angezeigt werden soll"
 
-#: ../../include/connections.php:127
-msgid "New window"
-msgstr "Neues Fenster"
+#: ../../addon/pageheader/pageheader.php:48
+msgid "Pageheader Settings"
+msgstr "Nachrichtenkopf-Einstellungen"
 
-#: ../../include/connections.php:128
-msgid "Open the selected location in a different window or browser tab"
-msgstr "Öffne die markierte Adresse in einem neuen Browserfenster oder Tab"
+#: ../../addon/pageheader/pageheader.php:64
+msgid "pageheader Settings saved."
+msgstr "Nachrichtenkopf-Einstellungen gespeichert."
 
-#: ../../include/connections.php:246
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Benutzer '%s' gelöscht"
+#: ../../addon/moremoods/moremoods.php:19
+msgid "lonely"
+msgstr "einsam"
 
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr "%1$s ist jetzt mit %2$s verbunden"
+#: ../../addon/moremoods/moremoods.php:20
+msgid "drunk"
+msgstr "betrunken"
 
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s stupste %2$s an"
+#: ../../addon/moremoods/moremoods.php:21
+msgid "horny"
+msgstr "geil"
 
-#: ../../include/conversation.php:243 ../../include/text.php:1092
-#: ../../include/text.php:1097
-msgid "poked"
-msgstr "stupste"
+#: ../../addon/moremoods/moremoods.php:22
+msgid "stoned"
+msgstr "bekifft"
 
-#: ../../include/conversation.php:690
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "%ss Profil auf %s ansehen"
+#: ../../addon/moremoods/moremoods.php:23
+msgid "fucked up"
+msgstr "beschissen"
+
+#: ../../addon/moremoods/moremoods.php:24
+msgid "clusterfucked"
+msgstr "clusterfucked"
 
-#: ../../include/conversation.php:710
-msgid "Categories:"
-msgstr "Kategorien:"
+#: ../../addon/moremoods/moremoods.php:25
+msgid "crazy"
+msgstr "verrückt"
 
-#: ../../include/conversation.php:711
-msgid "Filed under:"
-msgstr "Gespeichert unter:"
+#: ../../addon/moremoods/moremoods.php:26
+msgid "hurt"
+msgstr "verletzt"
 
-#: ../../include/conversation.php:736
-msgid "View in context"
-msgstr "Im Zusammenhang anschauen"
+#: ../../addon/moremoods/moremoods.php:27
+msgid "sleepy"
+msgstr "müde"
 
-#: ../../include/conversation.php:832
-msgid "remove"
-msgstr "lösche"
+#: ../../addon/moremoods/moremoods.php:28
+msgid "grumpy"
+msgstr "mürrisch"
 
-#: ../../include/conversation.php:836 ../../include/nav.php:292
-msgid "Loading..."
-msgstr "Lädt ..."
+#: ../../addon/moremoods/moremoods.php:29
+msgid "high"
+msgstr "hoch"
 
-#: ../../include/conversation.php:837
-msgid "Delete Selected Items"
-msgstr "Lösche die ausgewählten Elemente"
+#: ../../addon/moremoods/moremoods.php:30
+msgid "semi-conscious"
+msgstr "halb bewusstlos"
 
-#: ../../include/conversation.php:930 ../../include/conversation.php:972
-msgid "View Source"
-msgstr "Quelle anzeigen"
+#: ../../addon/moremoods/moremoods.php:31
+msgid "in love"
+msgstr "verliebt"
 
-#: ../../include/conversation.php:931 ../../include/conversation.php:982
-msgid "Follow Thread"
-msgstr "Unterhaltung folgen"
+#: ../../addon/moremoods/moremoods.php:32
+msgid "in lust"
+msgstr ""
 
-#: ../../include/conversation.php:932 ../../include/conversation.php:991
-msgid "Unfollow Thread"
-msgstr "Unterhaltung nicht mehr folgen"
+#: ../../addon/moremoods/moremoods.php:33
+msgid "naked"
+msgstr "nackt"
 
-#: ../../include/conversation.php:937 ../../include/conversation.php:1059
-msgid "Activity/Posts"
-msgstr "Aktivitäten/Beiträge"
+#: ../../addon/moremoods/moremoods.php:34
+msgid "stinky"
+msgstr "stinkend"
 
-#: ../../include/conversation.php:939 ../../include/conversation.php:1079
-msgid "Edit Connection"
-msgstr "Verbindung bearbeiten"
+#: ../../addon/moremoods/moremoods.php:35
+msgid "sweaty"
+msgstr "verschwitzt"
 
-#: ../../include/conversation.php:940 ../../include/conversation.php:1089
-msgid "Message"
-msgstr "Nachricht"
+#: ../../addon/moremoods/moremoods.php:36
+msgid "bleeding out"
+msgstr "blutend"
 
-#: ../../include/conversation.php:1223
-#, php-format
-msgid "%s likes this."
-msgstr "%s gefällt das."
+#: ../../addon/moremoods/moremoods.php:37
+msgid "victorious"
+msgstr "siegreich"
 
-#: ../../include/conversation.php:1223
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s gefällt das nicht."
+#: ../../addon/moremoods/moremoods.php:38
+msgid "defeated"
+msgstr "besiegt"
 
-#: ../../include/conversation.php:1227
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] "<span  %1$s>%2$d Person</span> gefällt das."
-msgstr[1] "<span  %1$s>%2$d Leuten</span> gefällt das."
+#: ../../addon/moremoods/moremoods.php:39
+msgid "envious"
+msgstr "neidisch"
 
-#: ../../include/conversation.php:1229
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] "<span  %1$s>%2$d Person</span> gefällt das nicht."
-msgstr[1] "<span  %1$s>%2$d Leuten</span> gefällt das nicht."
+#: ../../addon/moremoods/moremoods.php:40
+msgid "jealous"
+msgstr "eifersüchtig"
 
-#: ../../include/conversation.php:1235
-msgid "and"
-msgstr "und"
+#: ../../addon/xmpp/xmpp.php:31
+msgid "XMPP settings updated."
+msgstr "XMPP-Einstellungen aktualisiert."
 
-#: ../../include/conversation.php:1238
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ", und %d andere"
+#: ../../addon/xmpp/xmpp.php:53
+msgid "Enable Chat"
+msgstr "Chat aktivieren"
 
-#: ../../include/conversation.php:1239
-#, php-format
-msgid "%s like this."
-msgstr "%s gefällt das."
+#: ../../addon/xmpp/xmpp.php:58
+msgid "Individual credentials"
+msgstr "Individuelle Anmeldedaten"
 
-#: ../../include/conversation.php:1239
-#, php-format
-msgid "%s don't like this."
-msgstr "%s gefällt das nicht."
+#: ../../addon/xmpp/xmpp.php:64
+msgid "Jabber BOSH server"
+msgstr "Jabber BOSH Server"
 
-#: ../../include/conversation.php:1282
-msgid "Set your location"
-msgstr "Standort"
+#: ../../addon/xmpp/xmpp.php:69
+msgid "XMPP Settings"
+msgstr "XMPP-Einstellungen"
 
-#: ../../include/conversation.php:1283
-msgid "Clear browser location"
-msgstr "Browser-Standort löschen"
+#: ../../addon/xmpp/xmpp.php:92
+msgid "Jabber BOSH host"
+msgstr "Jabber BOSH Host"
 
-#: ../../include/conversation.php:1331
-msgid "Tag term:"
-msgstr "Schlagwort:"
+#: ../../addon/xmpp/xmpp.php:93
+msgid "Use central userbase"
+msgstr "Zentrale Benutzerbasis verwenden"
 
-#: ../../include/conversation.php:1332
-msgid "Where are you right now?"
-msgstr "Wo bist Du jetzt grade?"
+#: ../../addon/xmpp/xmpp.php:93
+msgid ""
+"If enabled, members will automatically login to an ejabberd server that has "
+"to be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr ""
 
-#: ../../include/conversation.php:1337
-msgid "Choose a different album..."
-msgstr "Wählen Sie ein anderes Album aus..."
+#: ../../addon/wholikesme/wholikesme.php:29
+msgid "Who likes me?"
+msgstr "Wer mag mich?"
 
-#: ../../include/conversation.php:1341
-msgid "Comments enabled"
-msgstr "Kommentare aktiviert"
+#: ../../addon/pumpio/pumpio.php:148
+msgid "You are now authenticated to pumpio."
+msgstr "Du bist nun bei pumpio authenzifiziert."
 
-#: ../../include/conversation.php:1342
-msgid "Comments disabled"
-msgstr "Kommentare deaktiviert"
+#: ../../addon/pumpio/pumpio.php:149
+msgid "return to the featured settings page"
+msgstr ""
 
-#: ../../include/conversation.php:1380
-msgid "Page link name"
-msgstr "Link zur Seite"
+#: ../../addon/pumpio/pumpio.php:163
+msgid "Post to Pump.io"
+msgstr "Bei pumpio veröffentlichen"
 
-#: ../../include/conversation.php:1383
-msgid "Post as"
-msgstr "Veröffentlichen als"
+#: ../../addon/pumpio/pumpio.php:198
+msgid "Pump.io servername"
+msgstr "Pump.io-Servername"
 
-#: ../../include/conversation.php:1397
-msgid "Toggle voting"
-msgstr "Umfragewerkzeug aktivieren"
+#: ../../addon/pumpio/pumpio.php:198
+msgid "Without \"http://\" or \"https://\""
+msgstr "Ohne \"http://\" oder \"https://\""
 
-#: ../../include/conversation.php:1400
-msgid "Disable comments"
-msgstr "Kommentare deaktivieren"
+#: ../../addon/pumpio/pumpio.php:202
+msgid "Pump.io username"
+msgstr "Pump.io-Benutzername"
 
-#: ../../include/conversation.php:1401
-msgid "Toggle comments"
-msgstr "Kommentare umschalten"
+#: ../../addon/pumpio/pumpio.php:202
+msgid "Without the servername"
+msgstr "Ohne dem Servernamen"
 
-#: ../../include/conversation.php:1409
-msgid "Categories (optional, comma-separated list)"
-msgstr "Kategorien (optional, kommagetrennte Liste)"
+#: ../../addon/pumpio/pumpio.php:213
+msgid "You are not authenticated to pumpio"
+msgstr "Du bist nicht bei pumpio authentifiziert."
 
-#: ../../include/conversation.php:1432
-msgid "Other networks and post services"
-msgstr "Andere Netzwerke und Platformen"
+#: ../../addon/pumpio/pumpio.php:215
+msgid "(Re-)Authenticate your pump.io connection"
+msgstr "Deine pumpio Verbindung (erneut) authentifizieren"
 
-#: ../../include/conversation.php:1438
-msgid "Set publish date"
-msgstr "Veröffentlichungsdatum festlegen"
+#: ../../addon/pumpio/pumpio.php:219
+msgid "Enable pump.io Post Plugin"
+msgstr "Aktiviere das pumpio-Plugin"
 
-#: ../../include/conversation.php:1692
-msgid "Discover"
-msgstr "Entdecken"
+#: ../../addon/pumpio/pumpio.php:223
+msgid "Post to pump.io by default"
+msgstr "Standardmäßig bei pumpio veröffentlichen"
 
-#: ../../include/conversation.php:1695
-msgid "Imported public streams"
-msgstr "Importierte öffentliche Beiträge"
+#: ../../addon/pumpio/pumpio.php:227
+msgid "Should posts be public"
+msgstr "Sollen die Beiträge öffentlich sein"
 
-#: ../../include/conversation.php:1700
-msgid "Commented Order"
-msgstr "Neueste Kommentare"
+#: ../../addon/pumpio/pumpio.php:231
+msgid "Mirror all public posts"
+msgstr "Öffentliche Beiträge spiegeln"
 
-#: ../../include/conversation.php:1703
-msgid "Sort by Comment Date"
-msgstr "Nach Kommentardatum sortiert"
+#: ../../addon/pumpio/pumpio.php:237
+msgid "Pump.io Post Settings"
+msgstr "Pump.io-Beitragseinstellungen"
 
-#: ../../include/conversation.php:1707
-msgid "Posted Order"
-msgstr "Neueste Beiträge"
+#: ../../addon/pumpio/pumpio.php:266
+msgid "PumpIO Settings saved."
+msgstr "PumpIO-Einstellungen gespeichert."
 
-#: ../../include/conversation.php:1710
-msgid "Sort by Post Date"
-msgstr "Nach Beitragsdatum sortiert"
+#: ../../addon/ldapauth/ldapauth.php:61
+msgid "An account has been created for you."
+msgstr "Ein Konto wurde für Sie erstellt."
 
-#: ../../include/conversation.php:1718
-msgid "Posts that mention or involve you"
-msgstr "Beiträge mit Beteiligung Deinerseits"
+#: ../../addon/ldapauth/ldapauth.php:68
+msgid "Authentication successful but rejected: account creation is disabled."
+msgstr "Authentifizierung war erfolgreich wurde aber abgewiesen! Das Anlegen von Accounts wurde deaktiviert."
 
-#: ../../include/conversation.php:1727
-msgid "Activity Stream - by date"
-msgstr "Activity Stream – nach Datum sortiert"
+#: ../../addon/opensearch/opensearch.php:43
+msgid "Search $Projectname"
+msgstr "$Projectname suchen"
 
-#: ../../include/conversation.php:1733
-msgid "Starred"
-msgstr "Markiert"
+#: ../../addon/redfiles/redfiles.php:119
+msgid "Redmatrix File Storage Import"
+msgstr ""
 
-#: ../../include/conversation.php:1736
-msgid "Favourite Posts"
-msgstr "Markierte Beiträge"
+#: ../../addon/redfiles/redfiles.php:120
+msgid "This will import all your Redmatrix cloud files to this channel."
+msgstr "Hiermit werden alle deine Daten aus der Redmatrix Cloud in diesen Kanal importiert."
 
-#: ../../include/conversation.php:1743
-msgid "Spam"
-msgstr "Spam"
+#: ../../addon/redfiles/redfilehelper.php:64
+msgid "file"
+msgstr "Datei"
 
-#: ../../include/conversation.php:1746
-msgid "Posts flagged as SPAM"
-msgstr "Nachrichten, die als SPAM markiert wurden"
+#: ../../addon/hubwall/hubwall.php:19
+msgid "Send email to all members"
+msgstr "E-Mail an alle Mitglieder senden"
 
-#: ../../include/conversation.php:1818
-msgid "Status Messages and Posts"
-msgstr "Statusnachrichten und Beiträge"
+#: ../../addon/hubwall/hubwall.php:33
+#, php-format
+msgid "$1%s Administrator"
+msgstr "$1%s Administrator"
 
-#: ../../include/conversation.php:1830
-msgid "Profile Details"
-msgstr "Profil-Details"
+#: ../../addon/hubwall/hubwall.php:73
+#, php-format
+msgid "%1$d of %2$d messages sent."
+msgstr "%1$d von %2$d Nachrichten gesendet."
 
-#: ../../include/conversation.php:1839 ../../include/photos.php:515
-msgid "Photo Albums"
-msgstr "Fotoalben"
+#: ../../addon/hubwall/hubwall.php:81
+msgid "Send email to all hub members."
+msgstr "Eine E-Mail an alle Mitglieder dieses Hubs senden."
 
-#: ../../include/conversation.php:1846
-msgid "Files and Storage"
-msgstr "Dateien und Speicher"
+#: ../../addon/hubwall/hubwall.php:93
+msgid "Sender Email address"
+msgstr "E-Mail Adresse des Absenders"
 
-#: ../../include/conversation.php:1866 ../../include/conversation.php:1869
-#: ../../include/widgets.php:902
-msgid "Chatrooms"
-msgstr "Chaträume"
+#: ../../addon/hubwall/hubwall.php:94
+msgid "Test mode (only send to hub administrator)"
+msgstr "Test Modus (nur an Hub Administratoren senden)"
 
-#: ../../include/conversation.php:1879
-msgid "Bookmarks"
-msgstr "Lesezeichen"
+#: ../../include/selectors.php:30
+msgid "Frequently"
+msgstr "Häufig"
 
-#: ../../include/conversation.php:1882
-msgid "Saved Bookmarks"
-msgstr "Gespeicherte Lesezeichen"
+#: ../../include/selectors.php:31
+msgid "Hourly"
+msgstr "Stündlich"
 
-#: ../../include/conversation.php:1892
-msgid "View Webpages"
-msgstr "Webseiten anzeigen"
+#: ../../include/selectors.php:32
+msgid "Twice daily"
+msgstr "Zwei Mal am Tag"
 
-#: ../../include/conversation.php:1958
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Zusage"
-msgstr[1] "Zusagen"
+#: ../../include/selectors.php:33
+msgid "Daily"
+msgstr "Täglich"
 
-#: ../../include/conversation.php:1961
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "Absage"
-msgstr[1] "Absagen"
+#: ../../include/selectors.php:34
+msgid "Weekly"
+msgstr "Wöchentlich"
 
-#: ../../include/conversation.php:1964
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] " Unentschlossen"
-msgstr[1] "Unentschlossene"
+#: ../../include/selectors.php:35
+msgid "Monthly"
+msgstr "Monatlich"
 
-#: ../../include/conversation.php:1967
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] "Zustimmung"
-msgstr[1] "Zustimmungen"
+#: ../../include/selectors.php:49
+msgid "Currently Male"
+msgstr "Momentan männlich"
 
-#: ../../include/conversation.php:1970
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] "Ablehnung"
-msgstr[1] "Ablehnungen"
+#: ../../include/selectors.php:49
+msgid "Currently Female"
+msgstr "Momentan weiblich"
 
-#: ../../include/conversation.php:1973
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] "Enthaltung"
-msgstr[1] "Enthaltungen"
+#: ../../include/selectors.php:49
+msgid "Mostly Male"
+msgstr "Größtenteils männlich"
 
-#: ../../include/message.php:32
-msgid "Unable to determine sender."
-msgstr "Kann Absender nicht bestimmen."
+#: ../../include/selectors.php:49
+msgid "Mostly Female"
+msgstr "Größtenteils weiblich"
 
-#: ../../include/message.php:69
-msgid "No recipient provided."
-msgstr "Kein Empfänger angegeben"
+#: ../../include/selectors.php:49
+msgid "Transgender"
+msgstr "Transsexuell"
 
-#: ../../include/message.php:74
-msgid "[no subject]"
-msgstr "[no subject]"
+#: ../../include/selectors.php:49
+msgid "Intersex"
+msgstr "Zwischengeschlechtlich"
 
-#: ../../include/message.php:225
-msgid "Stored post could not be verified."
-msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
+#: ../../include/selectors.php:49
+msgid "Transsexual"
+msgstr "Transsexuell"
 
-#: ../../include/security.php:117
-msgid "guest:"
-msgstr "Gast:"
+#: ../../include/selectors.php:49
+msgid "Hermaphrodite"
+msgstr "Zwitter"
 
-#: ../../include/security.php:532
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
+#: ../../include/selectors.php:49
+msgid "Neuter"
+msgstr "Geschlechtslos"
 
-#: ../../include/widgets.php:103
-msgid "System"
-msgstr "System"
+#: ../../include/selectors.php:49
+msgid "Non-specific"
+msgstr "unklar"
 
-#: ../../include/widgets.php:106
-msgid "New App"
-msgstr "Neue App"
+#: ../../include/selectors.php:49
+msgid "Undecided"
+msgstr "Unentschieden"
 
-#: ../../include/widgets.php:107
-msgid "Edit Apps"
-msgstr "Apps bearbeiten"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Males"
+msgstr "Männer"
 
-#: ../../include/widgets.php:155
-msgid "Suggestions"
-msgstr "Vorschläge"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Females"
+msgstr "Frauen"
 
-#: ../../include/widgets.php:156
-msgid "See more..."
-msgstr "Mehr anzeigen …"
+#: ../../include/selectors.php:85
+msgid "Gay"
+msgstr "Schwul"
 
-#: ../../include/widgets.php:176
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."
+#: ../../include/selectors.php:85
+msgid "Lesbian"
+msgstr "Lesbisch"
 
-#: ../../include/widgets.php:182
-msgid "Add New Connection"
-msgstr "Neue Verbindung hinzufügen"
+#: ../../include/selectors.php:85
+msgid "No Preference"
+msgstr "Keine Bevorzugung"
 
-#: ../../include/widgets.php:183
-msgid "Enter channel address"
-msgstr "Adresse des Kanals eingeben"
+#: ../../include/selectors.php:85
+msgid "Bisexual"
+msgstr "Bisexuell"
 
-#: ../../include/widgets.php:184
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Beispiele: bob@beispiel.com, http://beispiel.com/barbara"
+#: ../../include/selectors.php:85
+msgid "Autosexual"
+msgstr "Autosexuell"
 
-#: ../../include/widgets.php:200
-msgid "Notes"
-msgstr "Notizen"
+#: ../../include/selectors.php:85
+msgid "Abstinent"
+msgstr "Enthaltsam"
 
-#: ../../include/widgets.php:276
-msgid "Remove term"
-msgstr "Eintrag löschen"
+#: ../../include/selectors.php:85
+msgid "Virgin"
+msgstr "Jungfräulich"
 
-#: ../../include/widgets.php:284 ../../include/features.php:301
-msgid "Saved Searches"
-msgstr "Gespeicherte Suchanfragen"
+#: ../../include/selectors.php:85
+msgid "Deviant"
+msgstr "Abweichend"
 
-#: ../../include/widgets.php:285 ../../include/group.php:336
-msgid "add"
-msgstr "hinzufügen"
+#: ../../include/selectors.php:85
+msgid "Fetish"
+msgstr "Fetisch"
 
-#: ../../include/widgets.php:347 ../../include/contact_widgets.php:53
-#: ../../include/features.php:390
-msgid "Saved Folders"
-msgstr "Gespeicherte Ordner"
+#: ../../include/selectors.php:85
+msgid "Oodles"
+msgstr "Unmengen"
 
-#: ../../include/widgets.php:350 ../../include/widgets.php:472
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-msgid "Everything"
-msgstr "Alles"
+#: ../../include/selectors.php:85
+msgid "Nonsexual"
+msgstr "Sexlos"
 
-#: ../../include/widgets.php:391
-msgid "Archives"
-msgstr "Archive"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Single"
+msgstr "Single"
 
-#: ../../include/widgets.php:563
-msgid "Refresh"
-msgstr "Aktualisieren"
+#: ../../include/selectors.php:123
+msgid "Lonely"
+msgstr "Einsam"
 
-#: ../../include/widgets.php:603
-msgid "Account settings"
-msgstr "Konto-Einstellungen"
+#: ../../include/selectors.php:123
+msgid "Available"
+msgstr "Verfügbar"
 
-#: ../../include/widgets.php:609
-msgid "Channel settings"
-msgstr "Kanal-Einstellungen"
+#: ../../include/selectors.php:123
+msgid "Unavailable"
+msgstr "Nicht verfügbar"
 
-#: ../../include/widgets.php:618
-msgid "Additional features"
-msgstr "Zusätzliche Funktionen"
+#: ../../include/selectors.php:123
+msgid "Has crush"
+msgstr "Verguckt"
 
-#: ../../include/widgets.php:625
-msgid "Feature/Addon settings"
-msgstr "Plugin-Einstellungen"
+#: ../../include/selectors.php:123
+msgid "Infatuated"
+msgstr "Verknallt"
 
-#: ../../include/widgets.php:631
-msgid "Display settings"
-msgstr "Anzeige-Einstellungen"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Dating"
+msgstr "Lerne gerade jemanden kennen"
 
-#: ../../include/widgets.php:638
-msgid "Manage locations"
-msgstr "Klon-Adressen verwalten"
+#: ../../include/selectors.php:123
+msgid "Unfaithful"
+msgstr "Treulos"
 
-#: ../../include/widgets.php:645
-msgid "Export channel"
-msgstr "Kanal exportieren"
+#: ../../include/selectors.php:123
+msgid "Sex Addict"
+msgstr "Sexabhängig"
 
-#: ../../include/widgets.php:651
-msgid "Connected apps"
-msgstr "Verbundene Apps"
+#: ../../include/selectors.php:123
+msgid "Friends/Benefits"
+msgstr "Freunde/Begünstigte"
 
-#: ../../include/widgets.php:666 ../../include/features.php:153
-msgid "Permission Groups"
-msgstr "Berechtigungsrollen"
+#: ../../include/selectors.php:123
+msgid "Casual"
+msgstr "Lose"
 
-#: ../../include/widgets.php:683
-msgid "Premium Channel Settings"
-msgstr "Premium-Kanal-Einstellungen"
+#: ../../include/selectors.php:123
+msgid "Engaged"
+msgstr "Verlobt"
 
-#: ../../include/widgets.php:712
-msgid "Private Mail Menu"
-msgstr "Private Nachrichten"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Married"
+msgstr "Verheiratet"
 
-#: ../../include/widgets.php:714
-msgid "Combined View"
-msgstr "Kombinierte Anzeige"
+#: ../../include/selectors.php:123
+msgid "Imaginarily married"
+msgstr "Gewissermaßen verheiratet"
 
-#: ../../include/widgets.php:719 ../../include/nav.php:213
-msgid "Inbox"
-msgstr "Eingang"
+#: ../../include/selectors.php:123
+msgid "Partners"
+msgstr "Partner"
 
-#: ../../include/widgets.php:724 ../../include/nav.php:214
-msgid "Outbox"
-msgstr "Ausgang"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Cohabiting"
+msgstr "Lebensgemeinschaft"
 
-#: ../../include/widgets.php:729 ../../include/nav.php:215
-msgid "New Message"
-msgstr "Neue Nachricht"
+#: ../../include/selectors.php:123
+msgid "Common law"
+msgstr "Informelle Ehe"
 
-#: ../../include/widgets.php:746 ../../include/widgets.php:758
-msgid "Conversations"
-msgstr "Konversationen"
+#: ../../include/selectors.php:123
+msgid "Happy"
+msgstr "Glücklich"
 
-#: ../../include/widgets.php:750
-msgid "Received Messages"
-msgstr "Erhaltene Nachrichten"
+#: ../../include/selectors.php:123
+msgid "Not looking"
+msgstr "Nicht Ausschau haltend"
 
-#: ../../include/widgets.php:754
-msgid "Sent Messages"
-msgstr "Gesendete Nachrichten"
+#: ../../include/selectors.php:123
+msgid "Swinger"
+msgstr "Swinger"
 
-#: ../../include/widgets.php:768
-msgid "No messages."
-msgstr "Keine Nachrichten."
+#: ../../include/selectors.php:123
+msgid "Betrayed"
+msgstr "Betrogen"
 
-#: ../../include/widgets.php:786
-msgid "Delete conversation"
-msgstr "Unterhaltung löschen"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Separated"
+msgstr "Getrennt"
+
+#: ../../include/selectors.php:123
+msgid "Unstable"
+msgstr "Labil"
 
-#: ../../include/widgets.php:812
-msgid "Events Tools"
-msgstr "Kalenderwerkzeuge"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Divorced"
+msgstr "Geschieden"
 
-#: ../../include/widgets.php:813
-msgid "Export Calendar"
-msgstr "Kalender exportieren"
+#: ../../include/selectors.php:123
+msgid "Imaginarily divorced"
+msgstr "Gewissermaßen geschieden"
 
-#: ../../include/widgets.php:814
-msgid "Import Calendar"
-msgstr "Kalender importieren"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Widowed"
+msgstr "Verwitwet"
 
-#: ../../include/widgets.php:906
-msgid "Overview"
-msgstr "Übersicht"
+#: ../../include/selectors.php:123
+msgid "Uncertain"
+msgstr "Ungewiss"
 
-#: ../../include/widgets.php:913
-msgid "Chat Members"
-msgstr "Chatmitglieder"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "It's complicated"
+msgstr "Es ist kompliziert"
 
-#: ../../include/widgets.php:991
-msgctxt "wiki_history"
-msgid "Message"
-msgstr "Nachricht"
+#: ../../include/selectors.php:123
+msgid "Don't care"
+msgstr "Interessiert mich nicht"
 
-#: ../../include/widgets.php:1013
-msgid "Bookmarked Chatrooms"
-msgstr "Gespeicherte Chatrooms"
+#: ../../include/selectors.php:123
+msgid "Ask me"
+msgstr "Frag mich mal"
 
-#: ../../include/widgets.php:1044
-msgid "Suggested Chatrooms"
-msgstr "Chatraum-Vorschläge"
+#: ../../include/conversation.php:200
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s ist jetzt mit %2$s verbunden"
 
-#: ../../include/widgets.php:1189 ../../include/widgets.php:1301
-msgid "photo/image"
-msgstr "Foto/Bild"
+#: ../../include/conversation.php:235
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s stupste %2$s an"
 
-#: ../../include/widgets.php:1244
-msgid "Click to show more"
-msgstr "Klick, um mehr anzuzeigen"
+#: ../../include/conversation.php:239 ../../include/text.php:1115
+#: ../../include/text.php:1120
+msgid "poked"
+msgstr "stupste"
 
-#: ../../include/widgets.php:1395
-msgid "Rating Tools"
-msgstr "Bewertungswerkzeuge"
+#: ../../include/conversation.php:691
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "%ss Profil auf %s ansehen"
 
-#: ../../include/widgets.php:1399 ../../include/widgets.php:1401
-msgid "Rate Me"
-msgstr "Bewerte mich"
+#: ../../include/conversation.php:711
+msgid "Categories:"
+msgstr "Kategorien:"
 
-#: ../../include/widgets.php:1404
-msgid "View Ratings"
-msgstr "Bewertungen ansehen"
+#: ../../include/conversation.php:712
+msgid "Filed under:"
+msgstr "Gespeichert unter:"
 
-#: ../../include/widgets.php:1497
-msgid "Forums"
-msgstr "Foren"
+#: ../../include/conversation.php:737
+msgid "View in context"
+msgstr "Im Zusammenhang anschauen"
 
-#: ../../include/widgets.php:1526
-msgid "Tasks"
-msgstr "Aufgaben"
+#: ../../include/conversation.php:834
+msgid "remove"
+msgstr "lösche"
 
-#: ../../include/widgets.php:1592 ../../include/widgets.php:1630
-msgid "Member registrations waiting for confirmation"
-msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
+#: ../../include/conversation.php:838 ../../include/nav.php:272
+msgid "Loading..."
+msgstr "Lädt ..."
 
-#: ../../include/widgets.php:1598
-msgid "Inspect queue"
-msgstr "Warteschlange kontrollieren"
+#: ../../include/conversation.php:839
+msgid "Delete Selected Items"
+msgstr "Lösche die ausgewählten Elemente"
 
-#: ../../include/widgets.php:1600
-msgid "DB updates"
-msgstr "DB-Aktualisierungen"
+#: ../../include/conversation.php:882
+msgid "View Source"
+msgstr "Quelle anzeigen"
 
-#: ../../include/widgets.php:1625 ../../include/nav.php:233
-msgid "Admin"
-msgstr "Administration"
+#: ../../include/conversation.php:892
+msgid "Follow Thread"
+msgstr "Unterhaltung folgen"
 
-#: ../../include/widgets.php:1626
-msgid "Plugin Features"
-msgstr "Plug-In Funktionen"
+#: ../../include/conversation.php:901
+msgid "Unfollow Thread"
+msgstr "Unterhaltung nicht mehr folgen"
 
-#: ../../include/zot.php:652
-msgid "Invalid data packet"
-msgstr "Ungültiges Datenpaket"
+#: ../../include/conversation.php:992
+msgid "Activity/Posts"
+msgstr "Aktivitäten/Beiträge"
 
-#: ../../include/zot.php:668
-msgid "Unable to verify channel signature"
-msgstr "Konnte die Signatur des Kanals nicht verifizieren"
+#: ../../include/conversation.php:1012
+msgid "Edit Connection"
+msgstr "Verbindung bearbeiten"
 
-#: ../../include/zot.php:2319
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
+#: ../../include/conversation.php:1022
+msgid "Message"
+msgstr "Nachricht"
 
-#: ../../include/zot.php:3725
-msgid "invalid target signature"
-msgstr "Ungültige Signatur des Ziels"
+#: ../../include/conversation.php:1156
+#, php-format
+msgid "%s likes this."
+msgstr "%s gefällt das."
 
-#: ../../include/channel.php:33
-msgid "Unable to obtain identity information from database"
-msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
+#: ../../include/conversation.php:1156
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s gefällt das nicht."
 
-#: ../../include/channel.php:67
-msgid "Empty name"
-msgstr "Namensfeld leer"
+#: ../../include/conversation.php:1160
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] "<span  %1$s>%2$d Person</span> gefällt das."
+msgstr[1] "<span  %1$s>%2$d Leuten</span> gefällt das."
 
-#: ../../include/channel.php:70
-msgid "Name too long"
-msgstr "Name ist zu lang"
+#: ../../include/conversation.php:1162
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] "<span  %1$s>%2$d Person</span> gefällt das nicht."
+msgstr[1] "<span  %1$s>%2$d Leuten</span> gefällt das nicht."
 
-#: ../../include/channel.php:181
-msgid "No account identifier"
-msgstr "Keine Account-Kennung"
+#: ../../include/conversation.php:1168
+msgid "and"
+msgstr "und"
 
-#: ../../include/channel.php:193
-msgid "Nickname is required."
-msgstr "Spitzname ist erforderlich."
+#: ../../include/conversation.php:1171
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ", und %d andere"
 
-#: ../../include/channel.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr "Reservierter Kurzname. Bitte wähle einen anderen."
+#: ../../include/conversation.php:1172
+#, php-format
+msgid "%s like this."
+msgstr "%s gefällt das."
 
-#: ../../include/channel.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
+#: ../../include/conversation.php:1172
+#, php-format
+msgid "%s don't like this."
+msgstr "%s gefällt das nicht."
 
-#: ../../include/channel.php:272
-msgid "Unable to retrieve created identity"
-msgstr "Kann die erstellte Identität nicht empfangen"
+#: ../../include/conversation.php:1215
+msgid "Set your location"
+msgstr "Standort"
 
-#: ../../include/channel.php:344
-msgid "Default Profile"
-msgstr "Standard-Profil"
+#: ../../include/conversation.php:1216
+msgid "Clear browser location"
+msgstr "Browser-Standort löschen"
 
-#: ../../include/channel.php:1045
-msgid "Create New Profile"
-msgstr "Neues Profil erstellen"
+#: ../../include/conversation.php:1264
+msgid "Tag term:"
+msgstr "Schlagwort:"
 
-#: ../../include/channel.php:1065
-msgid "Visible to everybody"
-msgstr "Für jeden sichtbar"
+#: ../../include/conversation.php:1265
+msgid "Where are you right now?"
+msgstr "Wo bist Du jetzt grade?"
 
-#: ../../include/channel.php:1138 ../../include/channel.php:1257
-msgid "Gender:"
-msgstr "Geschlecht:"
+#: ../../include/conversation.php:1270
+msgid "Choose a different album..."
+msgstr "Wählen Sie ein anderes Album aus..."
 
-#: ../../include/channel.php:1140 ../../include/channel.php:1312
-msgid "Homepage:"
-msgstr "Homepage:"
+#: ../../include/conversation.php:1274
+msgid "Comments enabled"
+msgstr "Kommentare aktiviert"
 
-#: ../../include/channel.php:1141
-msgid "Online Now"
-msgstr "gerade online"
+#: ../../include/conversation.php:1275
+msgid "Comments disabled"
+msgstr "Kommentare deaktiviert"
 
-#: ../../include/channel.php:1262
-msgid "Like this channel"
-msgstr "Dieser Kanal gefällt mir"
+#: ../../include/conversation.php:1313
+msgid "Page link name"
+msgstr "Link zur Seite"
 
-#: ../../include/channel.php:1286
-msgid "j F, Y"
-msgstr "j. F Y"
+#: ../../include/conversation.php:1316
+msgid "Post as"
+msgstr "Veröffentlichen als"
 
-#: ../../include/channel.php:1287
-msgid "j F"
-msgstr "j. F"
+#: ../../include/conversation.php:1330
+msgid "Toggle voting"
+msgstr "Umfragewerkzeug aktivieren"
 
-#: ../../include/channel.php:1294
-msgid "Birthday:"
-msgstr "Geburtstag:"
+#: ../../include/conversation.php:1333
+msgid "Disable comments"
+msgstr "Kommentare deaktivieren"
 
-#: ../../include/channel.php:1307
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "seit %1$d %2$s"
+#: ../../include/conversation.php:1334
+msgid "Toggle comments"
+msgstr "Kommentare umschalten"
 
-#: ../../include/channel.php:1310
-msgid "Sexual Preference:"
-msgstr "Sexuelle Orientierung:"
+#: ../../include/conversation.php:1342
+msgid "Categories (optional, comma-separated list)"
+msgstr "Kategorien (optional, kommagetrennte Liste)"
 
-#: ../../include/channel.php:1316
-msgid "Tags:"
-msgstr "Schlagworte:"
+#: ../../include/conversation.php:1365
+msgid "Other networks and post services"
+msgstr "Andere Netzwerke und Platformen"
 
-#: ../../include/channel.php:1318
-msgid "Political Views:"
-msgstr "Politische Ansichten:"
+#: ../../include/conversation.php:1371
+msgid "Set publish date"
+msgstr "Veröffentlichungsdatum festlegen"
 
-#: ../../include/channel.php:1320
-msgid "Religion:"
-msgstr "Religion:"
+#: ../../include/conversation.php:1634
+msgid "Discover"
+msgstr "Entdecken"
 
-#: ../../include/channel.php:1324
-msgid "Hobbies/Interests:"
-msgstr "Hobbys/Interessen:"
+#: ../../include/conversation.php:1637
+msgid "Imported public streams"
+msgstr "Importierte öffentliche Beiträge"
 
-#: ../../include/channel.php:1326
-msgid "Likes:"
-msgstr "Gefällt:"
+#: ../../include/conversation.php:1642
+msgid "Commented Order"
+msgstr "Neueste Kommentare"
 
-#: ../../include/channel.php:1328
-msgid "Dislikes:"
-msgstr "Gefällt nicht:"
+#: ../../include/conversation.php:1645
+msgid "Sort by Comment Date"
+msgstr "Nach Kommentardatum sortiert"
 
-#: ../../include/channel.php:1330
-msgid "Contact information and Social Networks:"
-msgstr "Kontaktinformation und soziale Netzwerke:"
+#: ../../include/conversation.php:1649
+msgid "Posted Order"
+msgstr "Neueste Beiträge"
 
-#: ../../include/channel.php:1332
-msgid "My other channels:"
-msgstr "Meine anderen Kanäle:"
+#: ../../include/conversation.php:1652
+msgid "Sort by Post Date"
+msgstr "Nach Beitragsdatum sortiert"
 
-#: ../../include/channel.php:1334
-msgid "Musical interests:"
-msgstr "Musikalische Interessen:"
+#: ../../include/conversation.php:1660
+msgid "Posts that mention or involve you"
+msgstr "Beiträge mit Beteiligung Deinerseits"
 
-#: ../../include/channel.php:1336
-msgid "Books, literature:"
-msgstr "Bücher, Literatur:"
+#: ../../include/conversation.php:1669
+msgid "Activity Stream - by date"
+msgstr "Activity Stream – nach Datum sortiert"
 
-#: ../../include/channel.php:1338
-msgid "Television:"
-msgstr "Fernsehen:"
+#: ../../include/conversation.php:1675
+msgid "Starred"
+msgstr "Markiert"
 
-#: ../../include/channel.php:1340
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/Tanz/Kultur/Unterhaltung:"
+#: ../../include/conversation.php:1678
+msgid "Favourite Posts"
+msgstr "Markierte Beiträge"
 
-#: ../../include/channel.php:1342
-msgid "Love/Romance:"
-msgstr "Liebe/Romantik:"
+#: ../../include/conversation.php:1685
+msgid "Spam"
+msgstr "Spam"
 
-#: ../../include/channel.php:1344
-msgid "Work/employment:"
-msgstr "Arbeit/Anstellung:"
+#: ../../include/conversation.php:1688
+msgid "Posts flagged as SPAM"
+msgstr "Nachrichten, die als SPAM markiert wurden"
 
-#: ../../include/channel.php:1346
-msgid "School/education:"
-msgstr "Schule/Ausbildung:"
+#: ../../include/conversation.php:1763 ../../include/nav.php:372
+msgid "Status Messages and Posts"
+msgstr "Statusnachrichten und Beiträge"
 
-#: ../../include/channel.php:1369
-msgid "Like this thing"
-msgstr "Gefällt mir"
+#: ../../include/conversation.php:1776 ../../include/nav.php:385
+msgid "Profile Details"
+msgstr "Profil-Details"
 
-#: ../../include/page_widgets.php:7
-msgid "New Page"
-msgstr "Neue Seite"
+#: ../../include/conversation.php:1786 ../../include/nav.php:395
+#: ../../include/photos.php:528
+msgid "Photo Albums"
+msgstr "Fotoalben"
 
-#: ../../include/contact_widgets.php:11
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d Einladung verfügbar"
-msgstr[1] "%d Einladungen verfügbar"
+#: ../../include/conversation.php:1794 ../../include/nav.php:403
+msgid "Files and Storage"
+msgstr "Dateien und Speicher"
 
-#: ../../include/contact_widgets.php:19
-msgid "Find Channels"
-msgstr "Finde Kanäle"
+#: ../../include/conversation.php:1830 ../../include/nav.php:438
+msgid "Bookmarks"
+msgstr "Lesezeichen"
 
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
-msgstr "Name oder Interessen eingeben"
+#: ../../include/conversation.php:1833 ../../include/nav.php:441
+msgid "Saved Bookmarks"
+msgstr "Gespeicherte Lesezeichen"
 
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
-msgstr "Verbinden/Folgen"
+#: ../../include/conversation.php:1844 ../../include/nav.php:452
+msgid "View Webpages"
+msgstr "Webseiten anzeigen"
 
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Beispiele: Robert Morgenstein, Angeln"
+#: ../../include/conversation.php:1913
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Zusage"
+msgstr[1] "Zusagen"
 
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
-msgstr "Zufallsprofil"
+#: ../../include/conversation.php:1916
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "Absage"
+msgstr[1] "Absagen"
 
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
-msgstr "Lade Freunde ein"
+#: ../../include/conversation.php:1919
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] " Unentschlossen"
+msgstr[1] "Unentschlossene"
 
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Fortgeschrittenes Beispiel: name=fred and country=iceland"
+#: ../../include/conversation.php:1922
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] "Zustimmung"
+msgstr[1] "Zustimmungen"
 
-#: ../../include/contact_widgets.php:122
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d gemeinsame Verbindung"
-msgstr[1] "%d gemeinsame Verbindungen"
+#: ../../include/conversation.php:1925
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] "Ablehnung"
+msgstr[1] "Ablehnungen"
 
-#: ../../include/contact_widgets.php:127
-msgid "show more"
-msgstr "mehr zeigen"
+#: ../../include/conversation.php:1928
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] "Enthaltung"
+msgstr[1] "Enthaltungen"
 
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
-msgstr "Dieses Element löschen?"
+#: ../../include/permissions.php:35
+msgid "Can view my normal stream and posts"
+msgstr "Kann meine normalen Beiträge sehen"
 
-#: ../../include/js_strings.php:8
-#, php-format
-msgid "%s show less"
-msgstr "%s weniger anzeigen"
+#: ../../include/permissions.php:39
+msgid "Can view my webpages"
+msgstr "Kann meine Webseiten sehen"
 
-#: ../../include/js_strings.php:9
-#, php-format
-msgid "%s expand"
-msgstr "%s aufklappen"
+#: ../../include/permissions.php:43
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
 
-#: ../../include/js_strings.php:10
-#, php-format
-msgid "%s collapse"
-msgstr "%s einklappen"
+#: ../../include/permissions.php:46
+msgid "Can like/dislike stuff"
+msgstr "Kann andere Elemente mögen/nicht mögen"
 
-#: ../../include/js_strings.php:11
-msgid "Password too short"
-msgstr "Kennwort zu kurz"
+#: ../../include/permissions.php:46
+msgid "Profiles and things other than posts/comments"
+msgstr "Profile und alles außer Beiträge und Kommentare"
 
-#: ../../include/js_strings.php:12
-msgid "Passwords do not match"
-msgstr "Kennwörter stimmen nicht überein"
+#: ../../include/permissions.php:48
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
 
-#: ../../include/js_strings.php:13
-msgid "everybody"
-msgstr "alle"
+#: ../../include/permissions.php:48
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
 
-#: ../../include/js_strings.php:14
-msgid "Secret Passphrase"
-msgstr "geheime Passphrase"
+#: ../../include/permissions.php:49
+msgid "Can chat with me (when available)"
+msgstr "Kann mit mir chatten (wenn verfügbar)"
 
-#: ../../include/js_strings.php:15
-msgid "Passphrase hint"
-msgstr "Hinweis zur Passphrase"
+#: ../../include/permissions.php:50
+msgid "Can write to my file storage and photos"
+msgstr "Kann in meine Datei- und Bilderordner schreiben"
 
-#: ../../include/js_strings.php:16
-msgid "Notice: Permissions have changed but have not yet been submitted."
-msgstr "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert."
+#: ../../include/permissions.php:51
+msgid "Can edit my webpages"
+msgstr "Kann meine Webseiten bearbeiten"
 
-#: ../../include/js_strings.php:17
-msgid "close all"
-msgstr "Alle schließen"
+#: ../../include/permissions.php:53
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften"
 
-#: ../../include/js_strings.php:18
-msgid "Nothing new here"
-msgstr "Nichts Neues hier"
+#: ../../include/permissions.php:55
+msgid "Can administer my channel resources"
+msgstr "Kann meine Kanäle administrieren"
 
-#: ../../include/js_strings.php:19
-msgid "Rate This Channel (this is public)"
-msgstr "Diesen Kanal bewerten (öffentlich sichtbar)"
+#: ../../include/permissions.php:55
+msgid ""
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust"
 
-#: ../../include/js_strings.php:21
-msgid "Describe (optional)"
-msgstr "Beschreibung (optional)"
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr "Verzeichnisoptionen"
 
-#: ../../include/js_strings.php:23
-msgid "Please enter a link URL"
-msgstr "Gib eine URL ein:"
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr "Sicherer Modus"
 
-#: ../../include/js_strings.php:24
-msgid "Unsaved changes. Are you sure you wish to leave this page?"
-msgstr "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlassen möchtest?"
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr "Nur öffentliche Foren"
 
-#: ../../include/js_strings.php:27
-msgid "timeago.prefixAgo"
-msgstr "timeago.prefixAgo"
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
+msgstr "Nur dieser Hub"
 
-#: ../../include/js_strings.php:28
-msgid "timeago.prefixFromNow"
-msgstr " "
+#: ../../include/bookmarks.php:34
+#, php-format
+msgid "%1$s's bookmarks"
+msgstr "%1$ss Lesezeichen"
 
-#: ../../include/js_strings.php:29
-msgid "ago"
-msgstr "her"
+#: ../../include/import.php:41
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen."
 
-#: ../../include/js_strings.php:30
-msgid "from now"
-msgstr "von jetzt"
+#: ../../include/import.php:105
+msgid "Cloned channel not found. Import failed."
+msgstr "Geklonter Kanal nicht gefunden. Import fehlgeschlagen."
 
-#: ../../include/js_strings.php:31
-msgid "less than a minute"
-msgstr "weniger als eine Minute"
+#: ../../include/text.php:478
+msgid "prev"
+msgstr "vorherige"
 
-#: ../../include/js_strings.php:32
-msgid "about a minute"
-msgstr "ungefähr eine Minute"
+#: ../../include/text.php:480
+msgid "first"
+msgstr "erste"
 
-#: ../../include/js_strings.php:33
-#, php-format
-msgid "%d minutes"
-msgstr "%d Minuten"
+#: ../../include/text.php:509
+msgid "last"
+msgstr "letzte"
 
-#: ../../include/js_strings.php:34
-msgid "about an hour"
-msgstr "ungefähr eine Stunde"
+#: ../../include/text.php:512
+msgid "next"
+msgstr "nächste"
 
-#: ../../include/js_strings.php:35
-#, php-format
-msgid "about %d hours"
-msgstr "ungefähr %d Stunden"
+#: ../../include/text.php:523
+msgid "older"
+msgstr "älter"
+
+#: ../../include/text.php:525
+msgid "newer"
+msgstr "neuer"
 
-#: ../../include/js_strings.php:36
-msgid "a day"
-msgstr "ein Tag"
+#: ../../include/text.php:945
+msgid "No connections"
+msgstr "Keine Verbindungen"
 
-#: ../../include/js_strings.php:37
+#: ../../include/text.php:970
 #, php-format
-msgid "%d days"
-msgstr "%d Tage"
+msgid "View all %s connections"
+msgstr "Alle Verbindungen von %s anzeigen"
 
-#: ../../include/js_strings.php:38
-msgid "about a month"
-msgstr "ungefähr ein Monat"
+#: ../../include/text.php:1115 ../../include/text.php:1120
+msgid "poke"
+msgstr "anstupsen"
 
-#: ../../include/js_strings.php:39
-#, php-format
-msgid "%d months"
-msgstr "%d Monate"
+#: ../../include/text.php:1121
+msgid "ping"
+msgstr "anpingen"
 
-#: ../../include/js_strings.php:40
-msgid "about a year"
-msgstr "ungefähr ein Jahr"
+#: ../../include/text.php:1121
+msgid "pinged"
+msgstr "pingte"
 
-#: ../../include/js_strings.php:41
-#, php-format
-msgid "%d years"
-msgstr "%d Jahre"
+#: ../../include/text.php:1122
+msgid "prod"
+msgstr "knuffen"
 
-#: ../../include/js_strings.php:42
-msgid " "
-msgstr " "
+#: ../../include/text.php:1122
+msgid "prodded"
+msgstr "knuffte"
 
-#: ../../include/js_strings.php:43
-msgid "timeago.numbers"
-msgstr "timeago.numbers"
+#: ../../include/text.php:1123
+msgid "slap"
+msgstr "ohrfeigen"
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1325
-msgid "January"
-msgstr "Januar"
+#: ../../include/text.php:1123
+msgid "slapped"
+msgstr "ohrfeigte"
 
-#: ../../include/js_strings.php:46 ../../include/text.php:1325
-msgid "February"
-msgstr "Februar"
+#: ../../include/text.php:1124
+msgid "finger"
+msgstr "befummeln"
 
-#: ../../include/js_strings.php:47 ../../include/text.php:1325
-msgid "March"
-msgstr "März"
+#: ../../include/text.php:1124
+msgid "fingered"
+msgstr "befummelte"
 
-#: ../../include/js_strings.php:48 ../../include/text.php:1325
-msgid "April"
-msgstr "April"
+#: ../../include/text.php:1125
+msgid "rebuff"
+msgstr "eine Abfuhr erteilen"
 
-#: ../../include/js_strings.php:49
-msgctxt "long"
-msgid "May"
-msgstr "Mai"
+#: ../../include/text.php:1125
+msgid "rebuffed"
+msgstr "zurückgewiesen"
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1325
-msgid "June"
-msgstr "Juni"
+#: ../../include/text.php:1137
+msgid "happy"
+msgstr "glücklich"
 
-#: ../../include/js_strings.php:51 ../../include/text.php:1325
-msgid "July"
-msgstr "Juli"
+#: ../../include/text.php:1138
+msgid "sad"
+msgstr "traurig"
 
-#: ../../include/js_strings.php:52 ../../include/text.php:1325
-msgid "August"
-msgstr "August"
+#: ../../include/text.php:1139
+msgid "mellow"
+msgstr "sanft"
 
-#: ../../include/js_strings.php:53 ../../include/text.php:1325
-msgid "September"
-msgstr "September"
+#: ../../include/text.php:1140
+msgid "tired"
+msgstr "müde"
 
-#: ../../include/js_strings.php:54 ../../include/text.php:1325
-msgid "October"
-msgstr "Oktober"
+#: ../../include/text.php:1141
+msgid "perky"
+msgstr "frech"
 
-#: ../../include/js_strings.php:55 ../../include/text.php:1325
-msgid "November"
-msgstr "November"
+#: ../../include/text.php:1142
+msgid "angry"
+msgstr "sauer"
 
-#: ../../include/js_strings.php:56 ../../include/text.php:1325
-msgid "December"
-msgstr "Dezember"
+#: ../../include/text.php:1143
+msgid "stupefied"
+msgstr "verblüfft"
 
-#: ../../include/js_strings.php:57
-msgid "Jan"
-msgstr "Jan"
+#: ../../include/text.php:1144
+msgid "puzzled"
+msgstr "verwirrt"
 
-#: ../../include/js_strings.php:58
-msgid "Feb"
-msgstr "Feb"
+#: ../../include/text.php:1145
+msgid "interested"
+msgstr "interessiert"
 
-#: ../../include/js_strings.php:59
-msgid "Mar"
-msgstr "Mär"
+#: ../../include/text.php:1146
+msgid "bitter"
+msgstr "verbittert"
 
-#: ../../include/js_strings.php:60
-msgid "Apr"
-msgstr "Apr"
+#: ../../include/text.php:1147
+msgid "cheerful"
+msgstr "fröhlich"
 
-#: ../../include/js_strings.php:61
-msgctxt "short"
-msgid "May"
-msgstr "Mai"
+#: ../../include/text.php:1148
+msgid "alive"
+msgstr "lebendig"
 
-#: ../../include/js_strings.php:62
-msgid "Jun"
-msgstr "Jun"
+#: ../../include/text.php:1149
+msgid "annoyed"
+msgstr "verärgert"
 
-#: ../../include/js_strings.php:63
-msgid "Jul"
-msgstr "Jul"
+#: ../../include/text.php:1150
+msgid "anxious"
+msgstr "unruhig"
 
-#: ../../include/js_strings.php:64
-msgid "Aug"
-msgstr "Aug"
+#: ../../include/text.php:1151
+msgid "cranky"
+msgstr "schrullig"
 
-#: ../../include/js_strings.php:65
-msgid "Sep"
-msgstr "Sep"
+#: ../../include/text.php:1152
+msgid "disturbed"
+msgstr "verstört"
 
-#: ../../include/js_strings.php:66
-msgid "Oct"
-msgstr "Okt"
+#: ../../include/text.php:1153
+msgid "frustrated"
+msgstr "frustriert"
 
-#: ../../include/js_strings.php:67
-msgid "Nov"
-msgstr "Nov"
+#: ../../include/text.php:1154
+msgid "depressed"
+msgstr "deprimiert"
 
-#: ../../include/js_strings.php:68
-msgid "Dec"
-msgstr "Dez"
+#: ../../include/text.php:1155
+msgid "motivated"
+msgstr "motiviert"
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1321
-msgid "Sunday"
-msgstr "Sonntag"
+#: ../../include/text.php:1156
+msgid "relaxed"
+msgstr "entspannt"
+
+#: ../../include/text.php:1157
+msgid "surprised"
+msgstr "überrascht"
 
-#: ../../include/js_strings.php:70 ../../include/text.php:1321
+#: ../../include/text.php:1335 ../../include/js_strings.php:70
 msgid "Monday"
 msgstr "Montag"
 
-#: ../../include/js_strings.php:71 ../../include/text.php:1321
+#: ../../include/text.php:1335 ../../include/js_strings.php:71
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../../include/js_strings.php:72 ../../include/text.php:1321
+#: ../../include/text.php:1335 ../../include/js_strings.php:72
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../../include/js_strings.php:73 ../../include/text.php:1321
+#: ../../include/text.php:1335 ../../include/js_strings.php:73
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../../include/js_strings.php:74 ../../include/text.php:1321
+#: ../../include/text.php:1335 ../../include/js_strings.php:74
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../../include/js_strings.php:75 ../../include/text.php:1321
+#: ../../include/text.php:1335 ../../include/js_strings.php:75
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../../include/js_strings.php:76
-msgid "Sun"
-msgstr "So"
+#: ../../include/text.php:1335 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "Sonntag"
 
-#: ../../include/js_strings.php:77
-msgid "Mon"
-msgstr "Mo"
+#: ../../include/text.php:1339 ../../include/js_strings.php:45
+msgid "January"
+msgstr "Januar"
 
-#: ../../include/js_strings.php:78
-msgid "Tue"
-msgstr "Di"
+#: ../../include/text.php:1339 ../../include/js_strings.php:46
+msgid "February"
+msgstr "Februar"
 
-#: ../../include/js_strings.php:79
-msgid "Wed"
-msgstr "Mi"
+#: ../../include/text.php:1339 ../../include/js_strings.php:47
+msgid "March"
+msgstr "März"
 
-#: ../../include/js_strings.php:80
-msgid "Thu"
-msgstr "Do"
+#: ../../include/text.php:1339 ../../include/js_strings.php:48
+msgid "April"
+msgstr "April"
 
-#: ../../include/js_strings.php:81
-msgid "Fri"
-msgstr "Fr"
+#: ../../include/text.php:1339
+msgid "May"
+msgstr "Mai"
 
-#: ../../include/js_strings.php:82
-msgid "Sat"
-msgstr "Sa"
+#: ../../include/text.php:1339 ../../include/js_strings.php:50
+msgid "June"
+msgstr "Juni"
 
-#: ../../include/js_strings.php:83
-msgctxt "calendar"
-msgid "today"
-msgstr "heute"
+#: ../../include/text.php:1339 ../../include/js_strings.php:51
+msgid "July"
+msgstr "Juli"
 
-#: ../../include/js_strings.php:84
-msgctxt "calendar"
-msgid "month"
-msgstr "Monat"
+#: ../../include/text.php:1339 ../../include/js_strings.php:52
+msgid "August"
+msgstr "August"
 
-#: ../../include/js_strings.php:85
-msgctxt "calendar"
-msgid "week"
-msgstr "Woche"
+#: ../../include/text.php:1339 ../../include/js_strings.php:53
+msgid "September"
+msgstr "September"
 
-#: ../../include/js_strings.php:86
-msgctxt "calendar"
-msgid "day"
-msgstr "Tag"
+#: ../../include/text.php:1339 ../../include/js_strings.php:54
+msgid "October"
+msgstr "Oktober"
 
-#: ../../include/js_strings.php:87
-msgctxt "calendar"
-msgid "All day"
-msgstr "Ganztägig"
+#: ../../include/text.php:1339 ../../include/js_strings.php:55
+msgid "November"
+msgstr "November"
 
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
-msgstr "Verzeichnisoptionen"
+#: ../../include/text.php:1339 ../../include/js_strings.php:56
+msgid "December"
+msgstr "Dezember"
+
+#: ../../include/text.php:1403 ../../include/text.php:1407
+msgid "Unknown Attachment"
+msgstr "Unbekannter Anhang"
+
+#: ../../include/text.php:1409
+msgid "unknown"
+msgstr "unbekannt"
+
+#: ../../include/text.php:1445
+msgid "remove category"
+msgstr "Kategorie entfernen"
+
+#: ../../include/text.php:1519
+msgid "remove from file"
+msgstr "aus der Datei entfernen"
+
+#: ../../include/text.php:1781 ../../include/language.php:367
+msgid "default"
+msgstr "Standard"
 
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
-msgstr "Sicherer Modus"
+#: ../../include/text.php:1789
+msgid "Page layout"
+msgstr "Seiten-Layout"
 
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr "Nur öffentliche Foren"
+#: ../../include/text.php:1789
+msgid "You can create your own with the layouts tool"
+msgstr "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen"
 
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
-msgstr "Nur dieser Hub"
+#: ../../include/text.php:1817
+msgid "Page content type"
+msgstr "Art des Seiteninhalts"
 
-#: ../../include/attach.php:250 ../../include/attach.php:338
-msgid "Item was not found."
-msgstr "Beitrag wurde nicht gefunden."
+#: ../../include/text.php:1950
+msgid "activity"
+msgstr "Aktivität"
 
-#: ../../include/attach.php:499
-msgid "No source file."
-msgstr "Keine Quelldatei."
+#: ../../include/text.php:2264
+msgid "Design Tools"
+msgstr "Gestaltungswerkzeuge"
 
-#: ../../include/attach.php:521
-msgid "Cannot locate file to replace"
-msgstr "Kann Datei zum Ersetzen nicht finden"
+#: ../../include/text.php:2270
+msgid "Pages"
+msgstr "Seiten"
 
-#: ../../include/attach.php:539
-msgid "Cannot locate file to revise/update"
-msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
+#: ../../include/text.php:2292
+msgid "Import website..."
+msgstr "Webseite importieren..."
 
-#: ../../include/attach.php:670
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Datei überschreitet das Größen-Limit von %d"
+#: ../../include/text.php:2293
+msgid "Select folder to import"
+msgstr "Ordner zum Importieren auswählen"
 
-#: ../../include/attach.php:684
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
+#: ../../include/text.php:2294
+msgid "Import from a zipped folder:"
+msgstr "Aus einem gezippten Ordner importieren:"
 
-#: ../../include/attach.php:854
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
+#: ../../include/text.php:2295
+msgid "Import from cloud files:"
+msgstr "Aus Cloud-Dateien importieren:"
 
-#: ../../include/attach.php:867
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
+#: ../../include/text.php:2296
+msgid "/cloud/channel/path/to/folder"
+msgstr "/Cloud/Kanal/Pfad/zum/Ordner"
 
-#: ../../include/attach.php:922 ../../include/attach.php:938
-msgid "Path not available."
-msgstr "Pfad nicht verfügbar."
+#: ../../include/text.php:2297
+msgid "Enter path to website files"
+msgstr "Pfad zu Webseitendateien eingeben"
 
-#: ../../include/attach.php:984 ../../include/attach.php:1142
-msgid "Empty pathname"
-msgstr "Leere Pfadangabe"
+#: ../../include/text.php:2298
+msgid "Select folder"
+msgstr "Ordner auswählen"
 
-#: ../../include/attach.php:1010
-msgid "duplicate filename or path"
-msgstr "doppelter Dateiname oder Pfad"
+#: ../../include/text.php:2299
+msgid "Export website..."
+msgstr "Webseite exportieren..."
 
-#: ../../include/attach.php:1032
-msgid "Path not found."
-msgstr "Pfad nicht gefunden."
+#: ../../include/text.php:2300
+msgid "Export to a zip file"
+msgstr "In eine ZIP-Datei exportieren"
 
-#: ../../include/attach.php:1096
-msgid "mkdir failed."
-msgstr "mkdir fehlgeschlagen."
+#: ../../include/text.php:2301
+msgid "website.zip"
+msgstr "website.zip"
 
-#: ../../include/attach.php:1100
-msgid "database storage failed."
-msgstr "Speichern in der Datenbank fehlgeschlagen."
+#: ../../include/text.php:2302
+msgid "Enter a name for the zip file."
+msgstr "Geben Sie einen für die ZIP-Datei ein."
 
-#: ../../include/attach.php:1148
-msgid "Empty path"
-msgstr "Leere Pfadangabe"
+#: ../../include/text.php:2303
+msgid "Export to cloud files"
+msgstr "In Cloud-Dateien exportieren"
 
-#: ../../include/network.php:733
-msgid "view full size"
-msgstr "In Vollbildansicht anschauen"
+#: ../../include/text.php:2304
+msgid "/path/to/export/folder"
+msgstr "/Pfad/zum/exportierenden/Ordner"
 
-#: ../../include/network.php:1988
-msgid "No Subject"
-msgstr "Kein Betreff"
+#: ../../include/text.php:2305
+msgid "Enter a path to a cloud files destination."
+msgstr "Gib den Pfad zu einem Datei-Speicherort in der Cloud ein."
 
-#: ../../include/network.php:2244
-msgid "OStatus"
-msgstr "OStatus"
+#: ../../include/text.php:2306
+msgid "Specify folder"
+msgstr "Ordner angeben"
 
-#: ../../include/network.php:2245
-msgid "GNU-Social"
-msgstr "GNU-Social"
+#: ../../include/contact_widgets.php:11
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d Einladung verfügbar"
+msgstr[1] "%d Einladungen verfügbar"
 
-#: ../../include/network.php:2246
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
+msgstr "Finde Kanäle"
 
-#: ../../include/network.php:2249
-msgid "Facebook"
-msgstr "Facebook"
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
+msgstr "Name oder Interessen eingeben"
 
-#: ../../include/network.php:2250
-msgid "Zot"
-msgstr "Zot!"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
+msgstr "Verbinden/Folgen"
 
-#: ../../include/network.php:2251
-msgid "LinkedIn"
-msgstr "LinkedIn"
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Beispiele: Robert Morgenstein, Angeln"
 
-#: ../../include/network.php:2252
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
+msgstr "Zufallsprofil"
 
-#: ../../include/network.php:2253
-msgid "MySpace"
-msgstr "MySpace"
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
+msgstr "Lade Freunde ein"
 
-#: ../../include/oembed.php:308
-msgid " by "
-msgstr "von"
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Fortgeschrittenes Beispiel: name=fred and country=iceland"
 
-#: ../../include/oembed.php:309
-msgid " on "
-msgstr "am"
+#: ../../include/contact_widgets.php:122
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d gemeinsame Verbindung"
+msgstr[1] "%d gemeinsame Verbindungen"
 
-#: ../../include/oembed.php:338
-msgid "Embedded content"
-msgstr "Eingebetteter Inhalt"
+#: ../../include/contact_widgets.php:127
+msgid "show more"
+msgstr "mehr zeigen"
 
-#: ../../include/oembed.php:347
-msgid "Embedding disabled"
-msgstr "Einbetten deaktiviert"
+#: ../../include/markdown.php:444
+msgid "Attachments:"
+msgstr "Anhänge:"
 
-#: ../../include/photos.php:115
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Bild überschreitet das Webseitenlimit von %lu Bytes"
+#: ../../include/markdown.php:538 ../../include/event.php:22
+#: ../../include/event.php:69
+msgid "l F d, Y \\@ g:i A"
+msgstr "l, d. F Y, H:i"
 
-#: ../../include/photos.php:122
-msgid "Image file is empty."
-msgstr "Bilddatei ist leer."
+#: ../../include/markdown.php:540
+msgid "$Projectname event notification:"
+msgstr ""
 
-#: ../../include/photos.php:260
-msgid "Photo storage failed."
-msgstr "Fotospeicherung fehlgeschlagen."
+#: ../../include/markdown.php:544 ../../include/event.php:30
+#: ../../include/event.php:73
+msgid "Starts:"
+msgstr "Beginnt:"
 
-#: ../../include/photos.php:300
-msgid "a new photo"
-msgstr "ein neues Foto"
+#: ../../include/markdown.php:552 ../../include/event.php:40
+#: ../../include/event.php:77
+msgid "Finishes:"
+msgstr "Endet:"
 
-#: ../../include/photos.php:304
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr "%1$s hat %2$s auf %3$s veröffentlicht"
+#: ../../include/follow.php:26
+msgid "Channel is blocked on this site."
+msgstr "Der Kanal ist auf dieser Seite blockiert "
 
-#: ../../include/photos.php:519
-msgid "Upload New Photos"
-msgstr "Neue Fotos hochladen"
+#: ../../include/follow.php:31
+msgid "Channel location missing."
+msgstr "Adresse des Kanals fehlt."
 
-#: ../../include/text.php:460
-msgid "prev"
-msgstr "vorherige"
+#: ../../include/follow.php:73
+msgid "Response from remote channel was incomplete."
+msgstr "Antwort des entfernten Kanals war unvollständig."
 
-#: ../../include/text.php:462
-msgid "first"
-msgstr "erste"
+#: ../../include/follow.php:90
+msgid "Channel was deleted and no longer exists."
+msgstr "Kanal wurde gelöscht und existiert nicht mehr."
 
-#: ../../include/text.php:491
-msgid "last"
-msgstr "letzte"
+#: ../../include/follow.php:140 ../../include/follow.php:175
+msgid "Protocol disabled."
+msgstr "Protokoll deaktiviert."
 
-#: ../../include/text.php:494
-msgid "next"
-msgstr "nächste"
+#: ../../include/follow.php:163
+msgid "Channel discovery failed."
+msgstr "Kanalsuche fehlgeschlagen"
 
-#: ../../include/text.php:505
-msgid "older"
-msgstr "älter"
+#: ../../include/follow.php:202
+msgid "Cannot connect to yourself."
+msgstr "Du kannst Dich nicht mit Dir selbst verbinden."
 
-#: ../../include/text.php:507
-msgid "newer"
-msgstr "neuer"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
+msgstr "Dieses Element löschen?"
 
-#: ../../include/text.php:922
-msgid "No connections"
-msgstr "Keine Verbindungen"
+#: ../../include/js_strings.php:8
+#, php-format
+msgid "%s show less"
+msgstr "%s weniger anzeigen"
 
-#: ../../include/text.php:947
+#: ../../include/js_strings.php:9
 #, php-format
-msgid "View all %s connections"
-msgstr "Alle Verbindungen von %s anzeigen"
+msgid "%s expand"
+msgstr "%s aufklappen"
 
-#: ../../include/text.php:1092 ../../include/text.php:1097
-msgid "poke"
-msgstr "anstupsen"
+#: ../../include/js_strings.php:10
+#, php-format
+msgid "%s collapse"
+msgstr "%s einklappen"
 
-#: ../../include/text.php:1098
-msgid "ping"
-msgstr "anpingen"
+#: ../../include/js_strings.php:11
+msgid "Password too short"
+msgstr "Kennwort zu kurz"
 
-#: ../../include/text.php:1098
-msgid "pinged"
-msgstr "pingte"
+#: ../../include/js_strings.php:12
+msgid "Passwords do not match"
+msgstr "Kennwörter stimmen nicht überein"
 
-#: ../../include/text.php:1099
-msgid "prod"
-msgstr "knuffen"
+#: ../../include/js_strings.php:13
+msgid "everybody"
+msgstr "alle"
+
+#: ../../include/js_strings.php:14
+msgid "Secret Passphrase"
+msgstr "geheime Passphrase"
+
+#: ../../include/js_strings.php:15
+msgid "Passphrase hint"
+msgstr "Hinweis zur Passphrase"
+
+#: ../../include/js_strings.php:16
+msgid "Notice: Permissions have changed but have not yet been submitted."
+msgstr "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert."
 
-#: ../../include/text.php:1099
-msgid "prodded"
-msgstr "knuffte"
+#: ../../include/js_strings.php:17
+msgid "close all"
+msgstr "Alle schließen"
 
-#: ../../include/text.php:1100
-msgid "slap"
-msgstr "ohrfeigen"
+#: ../../include/js_strings.php:18
+msgid "Nothing new here"
+msgstr "Nichts Neues hier"
 
-#: ../../include/text.php:1100
-msgid "slapped"
-msgstr "ohrfeigte"
+#: ../../include/js_strings.php:19
+msgid "Rate This Channel (this is public)"
+msgstr "Diesen Kanal bewerten (öffentlich sichtbar)"
 
-#: ../../include/text.php:1101
-msgid "finger"
-msgstr "befummeln"
+#: ../../include/js_strings.php:21
+msgid "Describe (optional)"
+msgstr "Beschreibung (optional)"
 
-#: ../../include/text.php:1101
-msgid "fingered"
-msgstr "befummelte"
+#: ../../include/js_strings.php:23
+msgid "Please enter a link URL"
+msgstr "Gib eine URL ein:"
 
-#: ../../include/text.php:1102
-msgid "rebuff"
-msgstr "eine Abfuhr erteilen"
+#: ../../include/js_strings.php:24
+msgid "Unsaved changes. Are you sure you wish to leave this page?"
+msgstr "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlassen möchtest?"
 
-#: ../../include/text.php:1102
-msgid "rebuffed"
-msgstr "zurückgewiesen"
+#: ../../include/js_strings.php:27
+msgid "timeago.prefixAgo"
+msgstr "timeago.prefixAgo"
 
-#: ../../include/text.php:1114
-msgid "happy"
-msgstr "glücklich"
+#: ../../include/js_strings.php:28
+msgid "timeago.prefixFromNow"
+msgstr " "
 
-#: ../../include/text.php:1115
-msgid "sad"
-msgstr "traurig"
+#: ../../include/js_strings.php:29
+msgid "ago"
+msgstr "her"
 
-#: ../../include/text.php:1116
-msgid "mellow"
-msgstr "sanft"
+#: ../../include/js_strings.php:30
+msgid "from now"
+msgstr "von jetzt"
 
-#: ../../include/text.php:1117
-msgid "tired"
-msgstr "müde"
+#: ../../include/js_strings.php:31
+msgid "less than a minute"
+msgstr "weniger als eine Minute"
 
-#: ../../include/text.php:1118
-msgid "perky"
-msgstr "frech"
+#: ../../include/js_strings.php:32
+msgid "about a minute"
+msgstr "ungefähr eine Minute"
 
-#: ../../include/text.php:1119
-msgid "angry"
-msgstr "sauer"
+#: ../../include/js_strings.php:33
+#, php-format
+msgid "%d minutes"
+msgstr "%d Minuten"
 
-#: ../../include/text.php:1120
-msgid "stupefied"
-msgstr "verblüfft"
+#: ../../include/js_strings.php:34
+msgid "about an hour"
+msgstr "ungefähr eine Stunde"
 
-#: ../../include/text.php:1121
-msgid "puzzled"
-msgstr "verwirrt"
+#: ../../include/js_strings.php:35
+#, php-format
+msgid "about %d hours"
+msgstr "ungefähr %d Stunden"
 
-#: ../../include/text.php:1122
-msgid "interested"
-msgstr "interessiert"
+#: ../../include/js_strings.php:36
+msgid "a day"
+msgstr "ein Tag"
 
-#: ../../include/text.php:1123
-msgid "bitter"
-msgstr "verbittert"
+#: ../../include/js_strings.php:37
+#, php-format
+msgid "%d days"
+msgstr "%d Tage"
 
-#: ../../include/text.php:1124
-msgid "cheerful"
-msgstr "fröhlich"
+#: ../../include/js_strings.php:38
+msgid "about a month"
+msgstr "ungefähr ein Monat"
 
-#: ../../include/text.php:1125
-msgid "alive"
-msgstr "lebendig"
+#: ../../include/js_strings.php:39
+#, php-format
+msgid "%d months"
+msgstr "%d Monate"
 
-#: ../../include/text.php:1126
-msgid "annoyed"
-msgstr "verärgert"
+#: ../../include/js_strings.php:40
+msgid "about a year"
+msgstr "ungefähr ein Jahr"
 
-#: ../../include/text.php:1127
-msgid "anxious"
-msgstr "unruhig"
+#: ../../include/js_strings.php:41
+#, php-format
+msgid "%d years"
+msgstr "%d Jahre"
 
-#: ../../include/text.php:1128
-msgid "cranky"
-msgstr "schrullig"
+#: ../../include/js_strings.php:42
+msgid " "
+msgstr " "
 
-#: ../../include/text.php:1129
-msgid "disturbed"
-msgstr "verstört"
+#: ../../include/js_strings.php:43
+msgid "timeago.numbers"
+msgstr "timeago.numbers"
 
-#: ../../include/text.php:1130
-msgid "frustrated"
-msgstr "frustriert"
+#: ../../include/js_strings.php:49
+msgctxt "long"
+msgid "May"
+msgstr "Mai"
 
-#: ../../include/text.php:1131
-msgid "depressed"
-msgstr "deprimiert"
+#: ../../include/js_strings.php:57
+msgid "Jan"
+msgstr "Jan"
 
-#: ../../include/text.php:1132
-msgid "motivated"
-msgstr "motiviert"
+#: ../../include/js_strings.php:58
+msgid "Feb"
+msgstr "Feb"
 
-#: ../../include/text.php:1133
-msgid "relaxed"
-msgstr "entspannt"
+#: ../../include/js_strings.php:59
+msgid "Mar"
+msgstr "Mär"
 
-#: ../../include/text.php:1134
-msgid "surprised"
-msgstr "überrascht"
+#: ../../include/js_strings.php:60
+msgid "Apr"
+msgstr "Apr"
 
-#: ../../include/text.php:1325
+#: ../../include/js_strings.php:61
+msgctxt "short"
 msgid "May"
 msgstr "Mai"
 
-#: ../../include/text.php:1402 ../../include/text.php:1406
-msgid "Unknown Attachment"
-msgstr "Unbekannter Anhang"
+#: ../../include/js_strings.php:62
+msgid "Jun"
+msgstr "Jun"
 
-#: ../../include/text.php:1408
-msgid "unknown"
-msgstr "unbekannt"
+#: ../../include/js_strings.php:63
+msgid "Jul"
+msgstr "Jul"
 
-#: ../../include/text.php:1444
-msgid "remove category"
-msgstr "Kategorie entfernen"
+#: ../../include/js_strings.php:64
+msgid "Aug"
+msgstr "Aug"
 
-#: ../../include/text.php:1521
-msgid "remove from file"
-msgstr "aus der Datei entfernen"
+#: ../../include/js_strings.php:65
+msgid "Sep"
+msgstr "Sep"
 
-#: ../../include/text.php:1791
-msgid "Page layout"
-msgstr "Seiten-Layout"
+#: ../../include/js_strings.php:66
+msgid "Oct"
+msgstr "Okt"
 
-#: ../../include/text.php:1791
-msgid "You can create your own with the layouts tool"
-msgstr "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen"
+#: ../../include/js_strings.php:67
+msgid "Nov"
+msgstr "Nov"
 
-#: ../../include/text.php:1833
-msgid "Page content type"
-msgstr "Art des Seiteninhalts"
+#: ../../include/js_strings.php:68
+msgid "Dec"
+msgstr "Dez"
 
-#: ../../include/text.php:1966
-msgid "activity"
-msgstr "Aktivität"
+#: ../../include/js_strings.php:76
+msgid "Sun"
+msgstr "So"
 
-#: ../../include/text.php:2280
-msgid "Design Tools"
-msgstr "Gestaltungswerkzeuge"
+#: ../../include/js_strings.php:77
+msgid "Mon"
+msgstr "Mo"
 
-#: ../../include/text.php:2286
-msgid "Pages"
-msgstr "Seiten"
+#: ../../include/js_strings.php:78
+msgid "Tue"
+msgstr "Di"
 
-#: ../../include/text.php:2308
-msgid "Import website..."
-msgstr "Webseite importieren..."
+#: ../../include/js_strings.php:79
+msgid "Wed"
+msgstr "Mi"
 
-#: ../../include/text.php:2309
-msgid "Select folder to import"
-msgstr "Ordner zum Importieren auswählen"
+#: ../../include/js_strings.php:80
+msgid "Thu"
+msgstr "Do"
 
-#: ../../include/text.php:2310
-msgid "Import from a zipped folder:"
-msgstr "Aus einem gezippten Ordner importieren:"
+#: ../../include/js_strings.php:81
+msgid "Fri"
+msgstr "Fr"
 
-#: ../../include/text.php:2311
-msgid "Import from cloud files:"
-msgstr "Aus Cloud-Dateien importieren:"
+#: ../../include/js_strings.php:82
+msgid "Sat"
+msgstr "Sa"
 
-#: ../../include/text.php:2312
-msgid "/cloud/channel/path/to/folder"
-msgstr "/Cloud/Kanal/Pfad/zum/Ordner"
+#: ../../include/js_strings.php:83
+msgctxt "calendar"
+msgid "today"
+msgstr "heute"
 
-#: ../../include/text.php:2313
-msgid "Enter path to website files"
-msgstr "Pfad zu Webseitendateien eingeben"
+#: ../../include/js_strings.php:84
+msgctxt "calendar"
+msgid "month"
+msgstr "Monat"
 
-#: ../../include/text.php:2314
-msgid "Select folder"
-msgstr "Ordner auswählen"
+#: ../../include/js_strings.php:85
+msgctxt "calendar"
+msgid "week"
+msgstr "Woche"
+
+#: ../../include/js_strings.php:86
+msgctxt "calendar"
+msgid "day"
+msgstr "Tag"
+
+#: ../../include/js_strings.php:87
+msgctxt "calendar"
+msgid "All day"
+msgstr "Ganztägig"
+
+#: ../../include/message.php:30
+msgid "Unable to determine sender."
+msgstr "Kann Absender nicht bestimmen."
 
-#: ../../include/text.php:2315
-msgid "Export website..."
-msgstr "Webseite exportieren..."
+#: ../../include/message.php:69
+msgid "No recipient provided."
+msgstr "Kein Empfänger angegeben"
 
-#: ../../include/text.php:2316
-msgid "Export to a zip file"
-msgstr "In eine ZIP-Datei exportieren"
+#: ../../include/message.php:74
+msgid "[no subject]"
+msgstr "[no subject]"
 
-#: ../../include/text.php:2317
-msgid "website.zip"
-msgstr "website.zip"
+#: ../../include/message.php:227
+msgid "Stored post could not be verified."
+msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
 
-#: ../../include/text.php:2318
-msgid "Enter a name for the zip file."
-msgstr "Geben Sie einen für die ZIP-Datei ein."
+#: ../../include/activities.php:41
+msgid " and "
+msgstr "und"
 
-#: ../../include/text.php:2319
-msgid "Export to cloud files"
-msgstr "In Cloud-Dateien exportieren"
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr "öffentliches Profil"
 
-#: ../../include/text.php:2320
-msgid "/path/to/export/folder"
-msgstr "/Pfad/zum/exportierenden/Ordner"
+#: ../../include/activities.php:58
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s hat %2$s auf &ldquo;%3$s&rdquo; geändert"
 
-#: ../../include/text.php:2321
-msgid "Enter a path to a cloud files destination."
-msgstr "Gib den Pfad zu einem Datei-Speicherort in der Cloud ein."
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Besuche %1$s's %2$s"
 
-#: ../../include/text.php:2322
-msgid "Specify folder"
-msgstr "Ordner angeben"
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
 
-#: ../../include/nav.php:88
-msgid "Remote authentication"
-msgstr "Über Konto auf anderem Server einloggen"
+#: ../../include/attach.php:250 ../../include/attach.php:339
+msgid "Item was not found."
+msgstr "Beitrag wurde nicht gefunden."
 
-#: ../../include/nav.php:88
-msgid "Click to authenticate to your home hub"
-msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
+#: ../../include/attach.php:500
+msgid "No source file."
+msgstr "Keine Quelldatei."
 
-#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1731
-msgid "Logout"
-msgstr "Abmelden"
+#: ../../include/attach.php:522
+msgid "Cannot locate file to replace"
+msgstr "Kann Datei zum Ersetzen nicht finden"
 
-#: ../../include/nav.php:99 ../../include/nav.php:140
-msgid "End this session"
-msgstr "Beende diese Sitzung"
+#: ../../include/attach.php:540
+msgid "Cannot locate file to revise/update"
+msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
 
-#: ../../include/nav.php:103
-msgid "Your profile page"
-msgstr "Deine Profilseite"
+#: ../../include/attach.php:671
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Datei überschreitet das Größen-Limit von %d"
 
-#: ../../include/nav.php:105
-msgid "Manage/Edit profiles"
-msgstr "Profile verwalten"
+#: ../../include/attach.php:685
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
 
-#: ../../include/nav.php:107
-msgid "Edit your profile"
-msgstr "Profil bearbeiten"
+#: ../../include/attach.php:855
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
 
-#: ../../include/nav.php:130
-msgid "Sign in"
-msgstr "Anmelden"
+#: ../../include/attach.php:868
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
 
-#: ../../include/nav.php:155
-msgid "Get me home"
-msgstr "Bringe mich nach Hause (eigener Kanal)"
+#: ../../include/attach.php:923 ../../include/attach.php:939
+msgid "Path not available."
+msgstr "Pfad nicht verfügbar."
 
-#: ../../include/nav.php:157
-msgid "Log me out of this site"
-msgstr "Logge mich von dieser Seite aus"
+#: ../../include/attach.php:988 ../../include/attach.php:1153
+msgid "Empty pathname"
+msgstr "Leere Pfadangabe"
 
-#: ../../include/nav.php:162
-msgid "Create an account"
-msgstr "Erzeuge ein Konto"
+#: ../../include/attach.php:1014
+msgid "duplicate filename or path"
+msgstr "doppelter Dateiname oder Pfad"
 
-#: ../../include/nav.php:174
-msgid "Help and documentation"
-msgstr "Hilfe und Dokumentation"
+#: ../../include/attach.php:1039
+msgid "Path not found."
+msgstr "Pfad nicht gefunden."
 
-#: ../../include/nav.php:178
-msgid "Applications, utilities, links, games"
-msgstr "Anwendungen (Apps), Zubehör, Links, Spiele"
+#: ../../include/attach.php:1107
+msgid "mkdir failed."
+msgstr "mkdir fehlgeschlagen."
 
-#: ../../include/nav.php:180
-msgid "Search site @name, #tag, ?docs, content"
-msgstr "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt"
+#: ../../include/attach.php:1111
+msgid "database storage failed."
+msgstr "Speichern in der Datenbank fehlgeschlagen."
 
-#: ../../include/nav.php:182
-msgid "Channel Directory"
-msgstr "Kanal-Verzeichnis"
+#: ../../include/attach.php:1159
+msgid "Empty path"
+msgstr "Leere Pfadangabe"
 
-#: ../../include/nav.php:194
-msgid "Your grid"
-msgstr "Dein Grid"
+#: ../../include/security.php:117
+msgid "guest:"
+msgstr "Gast:"
 
-#: ../../include/nav.php:195
-msgid "View your network/grid"
-msgstr "Zeige Dein Netzwerk/Grid an"
+#: ../../include/security.php:532
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
 
-#: ../../include/nav.php:196
-msgid "Mark all grid notifications seen"
-msgstr "Alle Grid-Benachrichtigungen als angesehen markieren"
+#: ../../include/items.php:869 ../../include/items.php:916
+msgid "(Unknown)"
+msgstr "(Unbekannt)"
 
-#: ../../include/nav.php:198
-msgid "Channel home"
-msgstr "Mein Kanal"
+#: ../../include/items.php:1110
+msgid "Visible to anybody on the internet."
+msgstr "Für jeden im Internet sichtbar."
 
-#: ../../include/nav.php:199
-msgid "View your channel home"
-msgstr "Zeige Deine Kanalseite an"
+#: ../../include/items.php:1112
+msgid "Visible to you only."
+msgstr "Nur für Dich sichtbar."
 
-#: ../../include/nav.php:200
-msgid "Mark all channel notifications seen"
-msgstr "Markiere alle Kanal-Benachrichtigungen als angesehen"
+#: ../../include/items.php:1114
+msgid "Visible to anybody in this network."
+msgstr "Für jedes $Projectname-Mitglied sichtbar."
 
-#: ../../include/nav.php:206
-msgid "Notices"
-msgstr "Benachrichtigungen"
+#: ../../include/items.php:1116
+msgid "Visible to anybody authenticated."
+msgstr "Für jeden sichtbar, der angemeldet ist."
 
-#: ../../include/nav.php:206
-msgid "Notifications"
-msgstr "Benachrichtigungen"
+#: ../../include/items.php:1118
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Für jeden auf %s sichtbar."
 
-#: ../../include/nav.php:207
-msgid "View all notifications"
-msgstr "Alle Benachrichtigungen ansehen"
+#: ../../include/items.php:1120
+msgid "Visible to all connections."
+msgstr "Für alle Verbindungen sichtbar."
 
-#: ../../include/nav.php:210
-msgid "Private mail"
-msgstr "Persönliche Mail"
+#: ../../include/items.php:1122
+msgid "Visible to approved connections."
+msgstr "Nur für akzeptierte Verbindungen sichtbar."
 
-#: ../../include/nav.php:211
-msgid "View your private messages"
-msgstr "Zeige Deine persönlichen Nachrichten an"
+#: ../../include/items.php:1124
+msgid "Visible to specific connections."
+msgstr "Sichtbar für bestimmte Verbindungen."
 
-#: ../../include/nav.php:212
-msgid "Mark all private messages seen"
-msgstr "Markiere alle persönlichen Nachrichten als gesehen"
+#: ../../include/items.php:3938
+msgid "Privacy group is empty."
+msgstr "Gruppe ist leer."
 
-#: ../../include/nav.php:218
-msgid "Event Calendar"
-msgstr "Terminkalender"
+#: ../../include/items.php:3945
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Gruppe: %s"
 
-#: ../../include/nav.php:219
-msgid "View events"
-msgstr "Termine ansehen"
+#: ../../include/items.php:3957
+msgid "Connection not found."
+msgstr "Die Verbindung wurde nicht gefunden."
 
-#: ../../include/nav.php:220
-msgid "Mark all events seen"
-msgstr "Markiere alle Termine als gesehen"
+#: ../../include/items.php:4310
+msgid "profile photo"
+msgstr "Profilfoto"
 
-#: ../../include/nav.php:223
-msgid "Manage Your Channels"
-msgstr "Verwalte Deine Kanäle"
+#: ../../include/items.php:4506
+#, php-format
+msgid "[Edited %s]"
+msgstr "[%s wurde bearbeitet]"
 
-#: ../../include/nav.php:225
-msgid "Account/Channel Settings"
-msgstr "Konto-/Kanal-Einstellungen"
+#: ../../include/items.php:4506
+msgctxt "edit_activity"
+msgid "Post"
+msgstr "Beitrag"
 
-#: ../../include/nav.php:233
-msgid "Site Setup and Configuration"
-msgstr "Seiten-Einrichtung und -Konfiguration"
+#: ../../include/items.php:4506
+msgctxt "edit_activity"
+msgid "Comment"
+msgstr "Kommentar"
 
-#: ../../include/nav.php:288
-msgid "Documentation"
-msgstr "Dokumentation"
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
+msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
 
-#: ../../include/nav.php:297
-msgid "@name, #tag, ?doc, content"
-msgstr "@Name, #Schlagwort, ?Dokumentation, Inhalt"
+#: ../../include/channel.php:67
+msgid "Empty name"
+msgstr "Namensfeld leer"
 
-#: ../../include/nav.php:298
-msgid "Please wait..."
-msgstr "Bitte warten..."
+#: ../../include/channel.php:70
+msgid "Name too long"
+msgstr "Name ist zu lang"
 
-#: ../../include/import.php:30
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen."
+#: ../../include/channel.php:181
+msgid "No account identifier"
+msgstr "Keine Account-Kennung"
 
-#: ../../include/import.php:90
-msgid "Channel clone failed. Import failed."
-msgstr "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen."
+#: ../../include/channel.php:193
+msgid "Nickname is required."
+msgstr "Spitzname ist erforderlich."
 
-#: ../../include/import.php:100
-msgid "Cloned channel not found. Import failed."
-msgstr "Geklonter Kanal nicht gefunden. Import fehlgeschlagen."
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Reservierter Kurzname. Bitte wähle einen anderen."
 
-#: ../../include/import.php:1373
-msgid "Unable to import element \""
-msgstr "Element konnte nicht importiert werden."
+#: ../../include/channel.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
 
-#: ../../include/auth.php:148
-msgid "Logged out."
-msgstr "Ausgeloggt."
+#: ../../include/channel.php:270
+msgid "Unable to retrieve created identity"
+msgstr "Kann die erstellte Identität nicht empfangen"
 
-#: ../../include/auth.php:275
-msgid "Failed authentication"
-msgstr "Authentifizierung fehlgeschlagen"
+#: ../../include/channel.php:342
+msgid "Default Profile"
+msgstr "Standard-Profil"
 
-#: ../../include/follow.php:26
-msgid "Channel is blocked on this site."
-msgstr "Der Kanal ist auf dieser Seite blockiert "
+#: ../../include/channel.php:1045
+msgid "Create New Profile"
+msgstr "Neues Profil erstellen"
 
-#: ../../include/follow.php:31
-msgid "Channel location missing."
-msgstr "Adresse des Kanals fehlt."
+#: ../../include/channel.php:1065
+msgid "Visible to everybody"
+msgstr "Für jeden sichtbar"
 
-#: ../../include/follow.php:73
-msgid "Response from remote channel was incomplete."
-msgstr "Antwort des entfernten Kanals war unvollständig."
+#: ../../include/channel.php:1138 ../../include/channel.php:1252
+msgid "Gender:"
+msgstr "Geschlecht:"
 
-#: ../../include/follow.php:90
-msgid "Channel was deleted and no longer exists."
-msgstr "Kanal wurde gelöscht und existiert nicht mehr."
+#: ../../include/channel.php:1140 ../../include/channel.php:1307
+msgid "Homepage:"
+msgstr "Homepage:"
 
-#: ../../include/follow.php:140 ../../include/follow.php:175
-msgid "Protocol disabled."
-msgstr "Protokoll deaktiviert."
+#: ../../include/channel.php:1141
+msgid "Online Now"
+msgstr "gerade online"
 
-#: ../../include/follow.php:163
-msgid "Channel discovery failed."
-msgstr "Kanalsuche fehlgeschlagen"
+#: ../../include/channel.php:1257
+msgid "Like this channel"
+msgstr "Dieser Kanal gefällt mir"
 
-#: ../../include/follow.php:202
-msgid "Cannot connect to yourself."
-msgstr "Du kannst Dich nicht mit Dir selbst verbinden."
+#: ../../include/channel.php:1281
+msgid "j F, Y"
+msgstr "j. F Y"
 
-#: ../../include/activities.php:41
-msgid " and "
-msgstr "und"
+#: ../../include/channel.php:1282
+msgid "j F"
+msgstr "j. F"
 
-#: ../../include/activities.php:49
-msgid "public profile"
-msgstr "öffentliches Profil"
+#: ../../include/channel.php:1289
+msgid "Birthday:"
+msgstr "Geburtstag:"
 
-#: ../../include/activities.php:58
+#: ../../include/channel.php:1302
 #, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s hat %2$s auf &ldquo;%3$s&rdquo; geändert"
+msgid "for %1$d %2$s"
+msgstr "seit %1$d %2$s"
 
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Besuche %1$s's %2$s"
+#: ../../include/channel.php:1305
+msgid "Sexual Preference:"
+msgstr "Sexuelle Orientierung:"
 
-#: ../../include/activities.php:62
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
+#: ../../include/channel.php:1311
+msgid "Tags:"
+msgstr "Schlagworte:"
 
-#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
-#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
-#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
-#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062
-#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070
-#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076
-#: ../../include/bbcode.php:1079
-msgid "Image/photo"
-msgstr "Bild/Foto"
+#: ../../include/channel.php:1313
+msgid "Political Views:"
+msgstr "Politische Ansichten:"
 
-#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
+#: ../../include/channel.php:1315
+msgid "Religion:"
+msgstr "Religion:"
 
-#: ../../include/bbcode.php:189
-#, php-format
-msgid "Install %s element: "
-msgstr "Element %s installieren: "
+#: ../../include/channel.php:1319
+msgid "Hobbies/Interests:"
+msgstr "Hobbys/Interessen:"
 
-#: ../../include/bbcode.php:193
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren."
+#: ../../include/channel.php:1321
+msgid "Likes:"
+msgstr "Gefällt:"
 
-#: ../../include/bbcode.php:272
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schrieb den folgenden %2$s %3$s"
+#: ../../include/channel.php:1323
+msgid "Dislikes:"
+msgstr "Gefällt nicht:"
 
-#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
-msgid "Click to open/close"
-msgstr "Klicke zum Öffnen/Schließen"
+#: ../../include/channel.php:1325
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktinformation und soziale Netzwerke:"
 
-#: ../../include/bbcode.php:357
-msgid "spoiler"
-msgstr "Spoiler"
+#: ../../include/channel.php:1327
+msgid "My other channels:"
+msgstr "Meine anderen Kanäle:"
 
-#: ../../include/bbcode.php:1028
-msgid "$1 wrote:"
-msgstr "$1 schrieb:"
+#: ../../include/channel.php:1329
+msgid "Musical interests:"
+msgstr "Musikalische Interessen:"
 
-#: ../../include/bookmarks.php:34
-#, php-format
-msgid "%1$s's bookmarks"
-msgstr "%1$ss Lesezeichen"
+#: ../../include/channel.php:1331
+msgid "Books, literature:"
+msgstr "Bücher, Literatur:"
 
-#: ../../include/group.php:26
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr "Es hat früher schon einmal eine Gruppe mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Gruppe den Zugriff erlauben. Wenn das nicht Deine Absicht ist, erstelle bitte eine neue Gruppe mit einem anderen Namen."
+#: ../../include/channel.php:1333
+msgid "Television:"
+msgstr "Fernsehen:"
 
-#: ../../include/group.php:268
-msgid "Add new connections to this privacy group"
-msgstr "Neue Verbindung zu dieser Gruppe hinzufügen"
+#: ../../include/channel.php:1335
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/Tanz/Kultur/Unterhaltung:"
 
-#: ../../include/group.php:309
-msgid "edit"
-msgstr "Bearbeiten"
+#: ../../include/channel.php:1337
+msgid "Love/Romance:"
+msgstr "Liebe/Romantik:"
 
-#: ../../include/group.php:331 ../../include/features.php:292
-msgid "Privacy Groups"
-msgstr "Gruppen"
+#: ../../include/channel.php:1339
+msgid "Work/employment:"
+msgstr "Arbeit/Anstellung:"
 
-#: ../../include/group.php:332
-msgid "Edit group"
-msgstr "Gruppe ändern"
+#: ../../include/channel.php:1341
+msgid "School/education:"
+msgstr "Schule/Ausbildung:"
 
-#: ../../include/group.php:333
-msgid "Add privacy group"
-msgstr "Gruppe hinzufügen"
+#: ../../include/channel.php:1364
+msgid "Like this thing"
+msgstr "Gefällt mir"
 
-#: ../../include/group.php:334
-msgid "Channels not in any privacy group"
-msgstr "Kanäle, die in keiner Gruppe sind"
+#: ../../include/channel.php:2139
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Benutzer '%s' gelöscht"
 
-#: ../../include/event.php:863
+#: ../../include/event.php:1004
 msgid "This event has been added to your calendar."
 msgstr "Dieser Termin wurde zu Deinem Kalender hinzugefügt"
 
-#: ../../include/event.php:1063
+#: ../../include/event.php:1204
 msgid "Not specified"
 msgstr "Keine Angabe"
 
-#: ../../include/event.php:1064
+#: ../../include/event.php:1205
 msgid "Needs Action"
 msgstr "Aktion erforderlich"
 
-#: ../../include/event.php:1065
+#: ../../include/event.php:1206
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: ../../include/event.php:1066
+#: ../../include/event.php:1207
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: ../../include/event.php:1067
+#: ../../include/event.php:1208
 msgid "Cancelled"
 msgstr "gestrichen"
 
-#: ../../include/items.php:841 ../../include/items.php:888
-msgid "(Unknown)"
-msgstr "(Unbekannt)"
+#: ../../include/network.php:776
+msgid "view full size"
+msgstr "In Vollbildansicht anschauen"
 
-#: ../../include/items.php:1089
-msgid "Visible to anybody on the internet."
-msgstr "Für jeden im Internet sichtbar."
+#: ../../include/network.php:2042
+msgid "No Subject"
+msgstr "Kein Betreff"
 
-#: ../../include/items.php:1091
-msgid "Visible to you only."
-msgstr "Nur für Dich sichtbar."
+#: ../../include/network.php:2310 ../../include/network.php:2311
+msgid "Friendica"
+msgstr "Friendica"
 
-#: ../../include/items.php:1093
-msgid "Visible to anybody in this network."
-msgstr "Für jedes $Projectname-Mitglied sichtbar."
+#: ../../include/network.php:2312
+msgid "OStatus"
+msgstr "OStatus"
 
-#: ../../include/items.php:1095
-msgid "Visible to anybody authenticated."
-msgstr "Für jeden sichtbar, der angemeldet ist."
+#: ../../include/network.php:2313
+msgid "GNU-Social"
+msgstr "GNU-Social"
 
-#: ../../include/items.php:1097
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Für jeden auf %s sichtbar."
+#: ../../include/network.php:2314
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
 
-#: ../../include/items.php:1099
-msgid "Visible to all connections."
-msgstr "Für alle Verbindungen sichtbar."
+#: ../../include/network.php:2316
+msgid "Diaspora"
+msgstr "Diaspora"
 
-#: ../../include/items.php:1101
-msgid "Visible to approved connections."
-msgstr "Nur für akzeptierte Verbindungen sichtbar."
+#: ../../include/network.php:2317
+msgid "Facebook"
+msgstr "Facebook"
 
-#: ../../include/items.php:1103
-msgid "Visible to specific connections."
-msgstr "Sichtbar für bestimmte Verbindungen."
+#: ../../include/network.php:2318
+msgid "Zot"
+msgstr "Zot!"
 
-#: ../../include/items.php:3915
-msgid "Privacy group is empty."
-msgstr "Gruppe ist leer."
+#: ../../include/network.php:2319
+msgid "LinkedIn"
+msgstr "LinkedIn"
 
-#: ../../include/items.php:3922
-#, php-format
-msgid "Privacy group: %s"
-msgstr "Gruppe: %s"
+#: ../../include/network.php:2320
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
 
-#: ../../include/items.php:3934
-msgid "Connection not found."
-msgstr "Die Verbindung wurde nicht gefunden."
+#: ../../include/network.php:2321
+msgid "MySpace"
+msgstr "MySpace"
 
-#: ../../include/items.php:4283
-msgid "profile photo"
-msgstr "Profilfoto"
+#: ../../include/page_widgets.php:7
+msgid "New Page"
+msgstr "Neue Seite"
 
-#: ../../include/items.php:4479
-#, php-format
-msgid "[Edited %s]"
-msgstr "[%s wurde bearbeitet]"
+#: ../../include/language.php:380
+msgid "Select an alternate language"
+msgstr "Wähle eine alternative Sprache"
 
-#: ../../include/items.php:4479
-msgctxt "edit_activity"
-msgid "Post"
-msgstr "Beitrag"
+#: ../../include/acl_selectors.php:208
+msgid "Who can see this?"
+msgstr "Wer kann das sehen?"
 
-#: ../../include/items.php:4479
-msgctxt "edit_activity"
-msgid "Comment"
-msgstr "Kommentar"
+#: ../../include/acl_selectors.php:209
+msgid "Custom selection"
+msgstr "Benutzerdefinierte Auswahl"
 
-#: ../../include/permissions.php:35
-msgid "Can view my normal stream and posts"
-msgstr "Kann meine normalen Beiträge sehen"
+#: ../../include/acl_selectors.php:210
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
+" the scope of \"Show\"."
+msgstr "Wähle \"Anzeigen\", um Betrachtung zuzulassen. \"Nicht anzeigen\" überstimmt und limitiert den Aktionsradius von \"Anzeigen\" für Ausnahmen."
 
-#: ../../include/permissions.php:39
-msgid "Can view my webpages"
-msgstr "Kann meine Webseiten sehen"
+#: ../../include/acl_selectors.php:211
+msgid "Show"
+msgstr "Anzeigen"
 
-#: ../../include/permissions.php:43
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
+#: ../../include/acl_selectors.php:212
+msgid "Don't show"
+msgstr "Nicht anzeigen"
 
-#: ../../include/permissions.php:46
-msgid "Can like/dislike stuff"
-msgstr "Kann andere Elemente mögen/nicht mögen"
+#: ../../include/acl_selectors.php:245
+#, php-format
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These"
+" permissions set who is allowed to view the post."
+msgstr "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.<br />Diese Berechtigungen bestimmen, wer den Beitrag sehen kann."
+
+#: ../../include/dba/dba_driver.php:189
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"
+
+#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
+#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
+#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
+#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062
+#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070
+#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076
+#: ../../include/bbcode.php:1079
+msgid "Image/photo"
+msgstr "Bild/Foto"
+
+#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
+
+#: ../../include/bbcode.php:189
+#, php-format
+msgid "Install %s element: "
+msgstr "Element %s installieren: "
 
-#: ../../include/permissions.php:46
-msgid "Profiles and things other than posts/comments"
-msgstr "Profile und alles außer Beiträge und Kommentare"
+#: ../../include/bbcode.php:193
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren."
 
-#: ../../include/permissions.php:48
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
+#: ../../include/bbcode.php:272
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schrieb den folgenden %2$s %3$s"
 
-#: ../../include/permissions.php:48
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
+#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
+msgid "Click to open/close"
+msgstr "Klicke zum Öffnen/Schließen"
 
-#: ../../include/permissions.php:49
-msgid "Can chat with me (when available)"
-msgstr "Kann mit mir chatten (wenn verfügbar)"
+#: ../../include/bbcode.php:357
+msgid "spoiler"
+msgstr "Spoiler"
 
-#: ../../include/permissions.php:50
-msgid "Can write to my file storage and photos"
-msgstr "Kann in meine Datei- und Bilderordner schreiben"
+#: ../../include/bbcode.php:1028
+msgid "$1 wrote:"
+msgstr "$1 schrieb:"
 
-#: ../../include/permissions.php:51
-msgid "Can edit my webpages"
-msgstr "Kann meine Webseiten bearbeiten"
+#: ../../include/oembed.php:315
+msgid " by "
+msgstr "von"
 
-#: ../../include/permissions.php:53
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften"
+#: ../../include/oembed.php:316
+msgid " on "
+msgstr "am"
 
-#: ../../include/permissions.php:55
-msgid "Can administer my channel resources"
-msgstr "Kann meine Kanäle administrieren"
+#: ../../include/oembed.php:345
+msgid "Embedded content"
+msgstr "Eingebetteter Inhalt"
 
-#: ../../include/permissions.php:55
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust"
+#: ../../include/oembed.php:354
+msgid "Embedding disabled"
+msgstr "Einbetten deaktiviert"
 
 #: ../../include/features.php:58
 msgid "General Features"
@@ -13347,7 +12691,7 @@ msgstr "Termin-Zeitzonenauswahl"
 
 #: ../../include/features.php:172
 msgid "Allow event creation in timezones other than your own."
-msgstr ""
+msgstr "Ermögliche das Erstellen von Terminen in anderen Zeitzonen als Deiner eigenen."
 
 #: ../../include/features.php:180
 msgid "Advanced Directory Search"
@@ -13446,6 +12790,10 @@ msgstr "Suche nach Datum"
 msgid "Ability to select posts by date ranges"
 msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"
 
+#: ../../include/features.php:292 ../../include/group.php:331
+msgid "Privacy Groups"
+msgstr "Gruppen"
+
 #: ../../include/features.php:293
 msgid "Enable management and selection of privacy groups"
 msgstr "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren"
@@ -13518,252 +12866,452 @@ msgstr "Emoji Reaktionen"
 msgid "Add emoji reaction ability to posts"
 msgstr "Aktiviert Emoji-Reaktionen für Beiträge"
 
-#: ../../include/features.php:391
-msgid "Ability to file posts under folders"
-msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"
+#: ../../include/features.php:391
+msgid "Ability to file posts under folders"
+msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"
+
+#: ../../include/features.php:399
+msgid "Dislike Posts"
+msgstr "Gefällt-mir-nicht-Beiträge"
+
+#: ../../include/features.php:400
+msgid "Ability to dislike posts/comments"
+msgstr "Aktiviert die „Gefällt mir nicht“-Schaltfläche"
+
+#: ../../include/features.php:408
+msgid "Star Posts"
+msgstr "Beiträge mit Sternchen versehen"
+
+#: ../../include/features.php:409
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Ermöglicht die lokale Markierung spezieller Beiträge mit einem Sternchen-Symbol"
+
+#: ../../include/features.php:417
+msgid "Tag Cloud"
+msgstr "Schlagwort-Wolke"
+
+#: ../../include/features.php:418
+msgid "Provide a personal tag cloud on your channel page"
+msgstr "Aktiviert die Anzeige einer Schlagwort-Wolke (Tag Cloud) auf Deiner Kanal-Seite"
+
+#: ../../include/features.php:430
+msgid "Premium Channel"
+msgstr "Premium-Kanal"
+
+#: ../../include/features.php:431
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen"
+
+#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
+msgid "Tags"
+msgstr "Schlagwörter"
+
+#: ../../include/taxonomy.php:293
+msgid "Keywords"
+msgstr "Schlüsselwörter"
+
+#: ../../include/taxonomy.php:314
+msgid "have"
+msgstr "habe"
+
+#: ../../include/taxonomy.php:314
+msgid "has"
+msgstr "hat"
+
+#: ../../include/taxonomy.php:315
+msgid "want"
+msgstr "will"
+
+#: ../../include/taxonomy.php:315
+msgid "wants"
+msgstr "will"
+
+#: ../../include/taxonomy.php:316
+msgid "likes"
+msgstr "gefällt"
+
+#: ../../include/taxonomy.php:317
+msgid "dislikes"
+msgstr "missfällt"
+
+#: ../../include/account.php:35
+msgid "Not a valid email address"
+msgstr "Ungültige E-Mail-Adresse"
+
+#: ../../include/account.php:37
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Deine E-Mail-Adresse ist auf dieser Seite nicht erlaubt"
+
+#: ../../include/account.php:43
+msgid "Your email address is already registered at this site."
+msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert."
+
+#: ../../include/account.php:75
+msgid "An invitation is required."
+msgstr "Eine Einladung wird benötigt."
+
+#: ../../include/account.php:79
+msgid "Invitation could not be verified."
+msgstr "Die Einladung konnte nicht bestätigt werden."
+
+#: ../../include/account.php:130
+msgid "Please enter the required information."
+msgstr "Bitte gib die benötigten Informationen ein."
+
+#: ../../include/account.php:198
+msgid "Failed to store account information."
+msgstr "Speichern der Nutzerkontodaten fehlgeschlagen."
+
+#: ../../include/account.php:263
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr "Registrierungsbestätigung für %s"
+
+#: ../../include/account.php:330
+#, php-format
+msgid "Registration request at %s"
+msgstr "Registrierungsanfrage auf %s"
+
+#: ../../include/account.php:352
+msgid "your registration password"
+msgstr "Dein Registrierungspasswort"
+
+#: ../../include/account.php:358 ../../include/account.php:420
+#, php-format
+msgid "Registration details for %s"
+msgstr "Registrierungsdetails für %s"
+
+#: ../../include/account.php:431
+msgid "Account approved."
+msgstr "Nutzerkonto bestätigt."
+
+#: ../../include/account.php:471
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registrierung für %s wurde widerrufen"
+
+#: ../../include/account.php:756 ../../include/account.php:758
+msgid "Click here to upgrade."
+msgstr "Klicke hier, um das Upgrade durchzuführen."
+
+#: ../../include/account.php:764
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
+
+#: ../../include/account.php:769
+msgid "This action is not available under your subscription plan."
+msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
+
+#: ../../include/datetime.php:147
+msgid "Birthday"
+msgstr "Geburtstag"
+
+#: ../../include/datetime.php:149
+msgid "Age: "
+msgstr "Alter:"
+
+#: ../../include/datetime.php:151
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "JJJJ-MM-TT oder MM-TT"
+
+#: ../../include/datetime.php:292
+msgid "less than a second ago"
+msgstr "Vor weniger als einer Sekunde"
+
+#: ../../include/datetime.php:310
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr "vor %1$d %2$s"
+
+#: ../../include/datetime.php:321
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] "Jahr"
+msgstr[1] "Jahre"
+
+#: ../../include/datetime.php:324
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] "Monat"
+msgstr[1] "Monate"
+
+#: ../../include/datetime.php:327
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "Woche"
+msgstr[1] "Wochen"
+
+#: ../../include/datetime.php:330
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "Tag"
+msgstr[1] "Tage"
+
+#: ../../include/datetime.php:333
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "Stunde"
+msgstr[1] "Stunden"
+
+#: ../../include/datetime.php:336
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "Minute"
+msgstr[1] "Minuten"
 
-#: ../../include/features.php:399
-msgid "Dislike Posts"
-msgstr "Gefällt-mir-nicht-Beiträge"
+#: ../../include/datetime.php:339
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "Sekunde"
+msgstr[1] "Sekunden"
 
-#: ../../include/features.php:400
-msgid "Ability to dislike posts/comments"
-msgstr "Aktiviert die „Gefällt mir nicht“-Schaltfläche"
+#: ../../include/datetime.php:576
+#, php-format
+msgid "%1$s's birthday"
+msgstr "%1$ss Geburtstag"
 
-#: ../../include/features.php:408
-msgid "Star Posts"
-msgstr "Beiträge mit Sternchen versehen"
+#: ../../include/datetime.php:577
+#, php-format
+msgid "Happy Birthday %1$s"
+msgstr "Alles Gute zum Geburtstag, %1$s"
 
-#: ../../include/features.php:409
-msgid "Ability to mark special posts with a star indicator"
-msgstr "Ermöglicht die lokale Markierung spezieller Beiträge mit einem Sternchen-Symbol"
+#: ../../include/nav.php:92
+msgid "Remote authentication"
+msgstr "Über Konto auf anderem Server einloggen"
 
-#: ../../include/features.php:417
-msgid "Tag Cloud"
-msgstr "Schlagwort-Wolke"
+#: ../../include/nav.php:92
+msgid "Click to authenticate to your home hub"
+msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
 
-#: ../../include/features.php:418
-msgid "Provide a personal tag cloud on your channel page"
-msgstr "Aktiviert die Anzeige einer Schlagwort-Wolke (Tag Cloud) auf Deiner Kanal-Seite"
+#: ../../include/nav.php:103 ../../include/nav.php:127
+msgid "End this session"
+msgstr "Beende diese Sitzung"
 
-#: ../../include/features.php:430
-msgid "Premium Channel"
-msgstr "Premium-Kanal"
+#: ../../include/nav.php:106
+msgid "Your profile page"
+msgstr "Deine Profilseite"
 
-#: ../../include/features.php:431
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen"
+#: ../../include/nav.php:109
+msgid "Manage/Edit profiles"
+msgstr "Profile verwalten"
 
-#: ../../include/help.php:31
-msgid "Help:"
-msgstr "Hilfe:"
+#: ../../include/nav.php:111
+msgid "Edit your profile"
+msgstr "Profil bearbeiten"
 
-#: ../../include/help.php:63
-msgid "Not Found"
-msgstr "Nicht gefunden"
+#: ../../include/nav.php:117
+msgid "Sign in"
+msgstr "Anmelden"
 
-#: ../../util/nconfig.php:34
-msgid "Source channel not found."
-msgstr "Quellkanal nicht gefunden."
+#: ../../include/nav.php:142
+msgid "Take me home"
+msgstr "Bringe mich nach Hause (eigener Kanal)"
 
-#: ../../view/theme/redbasic/php/config.php:9
-msgid "Focus (Hubzilla default)"
-msgstr "Focus (Voreinstellung für Hubzilla)"
+#: ../../include/nav.php:144
+msgid "Log me out of this site"
+msgstr "Logge mich von dieser Seite aus"
 
-#: ../../view/theme/redbasic/php/config.php:110
-msgid "Theme settings"
-msgstr "Theme-Einstellungen"
+#: ../../include/nav.php:149
+msgid "Create an account"
+msgstr "Erzeuge ein Konto"
 
-#: ../../view/theme/redbasic/php/config.php:111
-msgid "Narrow navbar"
-msgstr "Schmale Navigationsleiste"
+#: ../../include/nav.php:161
+msgid "Help and documentation"
+msgstr "Hilfe und Dokumentation"
 
-#: ../../view/theme/redbasic/php/config.php:112
-msgid "Navigation bar background color"
-msgstr "Hintergrundfarbe der Navigationsleiste"
+#: ../../include/nav.php:164
+msgid "Search site @name, #tag, ?docs, content"
+msgstr "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt"
 
-#: ../../view/theme/redbasic/php/config.php:113
-msgid "Navigation bar gradient top color"
-msgstr "Farbverlauf der Navigationsleiste: Farbe oben"
+#: ../../include/nav.php:176
+msgid "Grid"
+msgstr "Grid"
 
-#: ../../view/theme/redbasic/php/config.php:114
-msgid "Navigation bar gradient bottom color"
-msgstr "Farbverlauf der Navigationsleiste: Farbe unten"
+#: ../../include/nav.php:176
+msgid "Your grid"
+msgstr "Dein Grid"
 
-#: ../../view/theme/redbasic/php/config.php:115
-msgid "Navigation active button gradient top color"
-msgstr "Navigations-Button aktiv: Farbe für Farbverlauf oben"
+#: ../../include/nav.php:177
+msgid "View your network/grid"
+msgstr "Zeige Dein Netzwerk/Grid an"
 
-#: ../../view/theme/redbasic/php/config.php:116
-msgid "Navigation active button gradient bottom color"
-msgstr "Navigations-Button aktiv: Farbe für Farbverlauf unten"
+#: ../../include/nav.php:178
+msgid "Mark all grid notifications seen"
+msgstr "Alle Grid-Benachrichtigungen als angesehen markieren"
 
-#: ../../view/theme/redbasic/php/config.php:117
-msgid "Navigation bar border color "
-msgstr "Farbe für den Rand der Navigationsleiste"
+#: ../../include/nav.php:180
+msgid "Channel home"
+msgstr "Mein Kanal"
 
-#: ../../view/theme/redbasic/php/config.php:118
-msgid "Navigation bar icon color "
-msgstr "Farbe für die Icons der Navigationsleiste"
+#: ../../include/nav.php:181
+msgid "View your channel home"
+msgstr "Zeige Deine Kanalseite an"
 
-#: ../../view/theme/redbasic/php/config.php:119
-msgid "Navigation bar active icon color "
-msgstr "Farbe für aktive Icons der Navigationsleiste"
+#: ../../include/nav.php:182
+msgid "Mark all channel notifications seen"
+msgstr "Markiere alle Kanal-Benachrichtigungen als angesehen"
 
-#: ../../view/theme/redbasic/php/config.php:120
-msgid "link color"
-msgstr "Farbe für Links"
+#: ../../include/nav.php:188
+msgid "Notices"
+msgstr "Benachrichtigungen"
 
-#: ../../view/theme/redbasic/php/config.php:121
-msgid "Set font-color for banner"
-msgstr "Farbe der Schrift des Banners"
+#: ../../include/nav.php:188
+msgid "Notifications"
+msgstr "Benachrichtigungen"
 
-#: ../../view/theme/redbasic/php/config.php:122
-msgid "Set the background color"
-msgstr "Hintergrundfarbe"
+#: ../../include/nav.php:189
+msgid "View all notifications"
+msgstr "Alle Benachrichtigungen ansehen"
 
-#: ../../view/theme/redbasic/php/config.php:123
-msgid "Set the background image"
-msgstr "Hintergrundbild"
+#: ../../include/nav.php:192
+msgid "Private mail"
+msgstr "Persönliche Mail"
 
-#: ../../view/theme/redbasic/php/config.php:124
-msgid "Set the background color of items"
-msgstr "Hintergrundfarbe für Beiträge"
+#: ../../include/nav.php:193
+msgid "View your private messages"
+msgstr "Zeige Deine persönlichen Nachrichten an"
 
-#: ../../view/theme/redbasic/php/config.php:125
-msgid "Set the background color of comments"
-msgstr "Hintergrundfarbe für Kommentare"
+#: ../../include/nav.php:194
+msgid "Mark all private messages seen"
+msgstr "Markiere alle persönlichen Nachrichten als gesehen"
 
-#: ../../view/theme/redbasic/php/config.php:126
-msgid "Set the border color of comments"
-msgstr "Farbe des Randes von Kommentaren"
+#: ../../include/nav.php:200
+msgid "Event Calendar"
+msgstr "Terminkalender"
 
-#: ../../view/theme/redbasic/php/config.php:127
-msgid "Set the indent for comments"
-msgstr "Einzugsbreite für Kommentare"
+#: ../../include/nav.php:201
+msgid "View events"
+msgstr "Termine ansehen"
 
-#: ../../view/theme/redbasic/php/config.php:128
-msgid "Set the basic color for item icons"
-msgstr "Grundfarbe für Beitrags-Icons"
+#: ../../include/nav.php:202
+msgid "Mark all events seen"
+msgstr "Markiere alle Termine als gesehen"
 
-#: ../../view/theme/redbasic/php/config.php:129
-msgid "Set the hover color for item icons"
-msgstr "Farbe für Beitrags-Icons unter dem Mauszeiger"
+#: ../../include/nav.php:205
+msgid "Manage Your Channels"
+msgstr "Verwalte Deine Kanäle"
 
-#: ../../view/theme/redbasic/php/config.php:130
-msgid "Set font-size for the entire application"
-msgstr "Schriftgröße für die gesamte Anwendung"
+#: ../../include/nav.php:207
+msgid "Account/Channel Settings"
+msgstr "Konto-/Kanal-Einstellungen"
 
-#: ../../view/theme/redbasic/php/config.php:130
-msgid "Example: 14px"
-msgstr "Beispiel: 14px"
+#: ../../include/nav.php:215
+msgid "Site Setup and Configuration"
+msgstr "Seiten-Einrichtung und -Konfiguration"
 
-#: ../../view/theme/redbasic/php/config.php:131
-msgid "Set font-size for posts and comments"
-msgstr "Schriftgröße für Beiträge und Kommentare"
+#: ../../include/nav.php:277
+msgid "@name, #tag, ?doc, content"
+msgstr "@Name, #Schlagwort, ?Dokumentation, Inhalt"
 
-#: ../../view/theme/redbasic/php/config.php:132
-msgid "Set font-color for posts and comments"
-msgstr "Schriftfarbe für Beiträge und Kommentare"
+#: ../../include/nav.php:278
+msgid "Please wait..."
+msgstr "Bitte warten..."
 
-#: ../../view/theme/redbasic/php/config.php:133
-msgid "Set radius of corners"
-msgstr "Ecken-Radius"
+#: ../../include/nav.php:280
+msgid "Add Apps"
+msgstr "Apps hinzufügen"
 
-#: ../../view/theme/redbasic/php/config.php:134
-msgid "Set shadow depth of photos"
-msgstr "Schattentiefe von Fotos"
+#: ../../include/photos.php:115
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Bild überschreitet das Webseitenlimit von %lu Bytes"
 
-#: ../../view/theme/redbasic/php/config.php:135
-msgid "Set maximum width of content region in pixel"
-msgstr "Maximalbreite des Inhaltsbereichs in Pixel festlegen"
+#: ../../include/photos.php:122
+msgid "Image file is empty."
+msgstr "Bilddatei ist leer."
 
-#: ../../view/theme/redbasic/php/config.php:135
-msgid "Leave empty for default width"
-msgstr "Leer lassen für Standardbreite"
+#: ../../include/photos.php:261
+msgid "Photo storage failed."
+msgstr "Fotospeicherung fehlgeschlagen."
 
-#: ../../view/theme/redbasic/php/config.php:136
-msgid "Left align page content"
-msgstr "Seiteninhalt linksbündig anzeigen"
+#: ../../include/photos.php:301
+msgid "a new photo"
+msgstr "ein neues Foto"
 
-#: ../../view/theme/redbasic/php/config.php:137
-msgid "Set minimum opacity of nav bar - to hide it"
-msgstr "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)"
+#: ../../include/photos.php:305
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s hat %2$s auf %3$s veröffentlicht"
 
-#: ../../view/theme/redbasic/php/config.php:138
-msgid "Set size of conversation author photo"
-msgstr "Größe der Avatare von Themenstartern"
+#: ../../include/photos.php:533
+msgid "Upload New Photos"
+msgstr "Neue Fotos hochladen"
 
-#: ../../view/theme/redbasic/php/config.php:139
-msgid "Set size of followup author photos"
-msgstr "Größe der Avatare von Kommentatoren"
+#: ../../include/zot.php:646
+msgid "Invalid data packet"
+msgstr "Ungültiges Datenpaket"
 
-#: ../../boot.php:1505
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."
+#: ../../include/zot.php:662
+msgid "Unable to verify channel signature"
+msgstr "Konnte die Signatur des Kanals nicht verifizieren"
 
-#: ../../boot.php:1508
+#: ../../include/zot.php:2313
 #, php-format
-msgid "Update Error at %s"
-msgstr "Aktualisierungsfehler auf %s"
-
-#: ../../boot.php:1712
-msgid "Create an account to access services and applications"
-msgstr "Erstelle ein Konto, um auf Dienste und Anwendungen zugreifen zu können."
+msgid "Unable to verify site signature for %s"
+msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
 
-#: ../../boot.php:1734
-msgid "Login/Email"
-msgstr "Anmelden/E-Mail"
+#: ../../include/zot.php:3764
+msgid "invalid target signature"
+msgstr "Ungültige Signatur des Ziels"
 
-#: ../../boot.php:1735
-msgid "Password"
-msgstr "Kennwort"
+#: ../../include/group.php:26
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "Es hat früher schon einmal eine Gruppe mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Gruppe den Zugriff erlauben. Wenn das nicht Deine Absicht ist, erstelle bitte eine neue Gruppe mit einem anderen Namen."
 
-#: ../../boot.php:1736
-msgid "Remember me"
-msgstr "Angaben speichern"
+#: ../../include/group.php:268
+msgid "Add new connections to this privacy group"
+msgstr "Neue Verbindung zu dieser Gruppe hinzufügen"
 
-#: ../../boot.php:1739
-msgid "Forgot your password?"
-msgstr "Passwort vergessen?"
+#: ../../include/group.php:309
+msgid "edit"
+msgstr "Bearbeiten"
 
-#: ../../boot.php:2300
-msgid "toggle mobile"
-msgstr "auf/von mobile Ansicht wechseln"
+#: ../../include/group.php:332
+msgid "Edit group"
+msgstr "Gruppe ändern"
 
-#: ../../boot.php:2455
-msgid "Website SSL certificate is not valid. Please correct."
-msgstr "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben."
+#: ../../include/group.php:333
+msgid "Add privacy group"
+msgstr "Gruppe hinzufügen"
 
-#: ../../boot.php:2458
-#, php-format
-msgid "[hubzilla] Website SSL error for %s"
-msgstr "[hubzilla] Website-SSL-Fehler für %s"
+#: ../../include/group.php:334
+msgid "Channels not in any privacy group"
+msgstr "Kanäle, die in keiner Gruppe sind"
 
-#: ../../boot.php:2577
-msgid "Cron/Scheduled tasks not running."
-msgstr "Cron-Aufgaben laufen nicht."
+#: ../../include/connections.php:127
+msgid "New window"
+msgstr "Neues Fenster"
 
-#: ../../boot.php:2581
-#, php-format
-msgid "[hubzilla] Cron tasks not running on %s"
-msgstr "[hubzilla] Cron-Aufgaben für %s laufen nicht"
+#: ../../include/connections.php:128
+msgid "Open the selected location in a different window or browser tab"
+msgstr "Öffne die markierte Adresse in einem neuen Browserfenster oder Tab"
 
-#: ../../addon/demohub/demohub.php:41
-msgid "Welcome to the Hubzilla demo hub!"
-msgstr "Willkommen auf dem Hubzilla demo Hub!"
+#: ../../include/auth.php:148
+msgid "Logged out."
+msgstr "Ausgeloggt."
 
-#: ../../addon/demohub/demohub.php:42
-msgid "This demo hub is designed to give you a chance to explore some of the features offered by the Hubzilla platform. The activities of the fictional characters illustrate only a few of the ways communities can use Hubzilla to collaborate and connect."
-msgstr "Dieser demo Hub (Hubzilla-Knoten) ist konzipiert, um Ihnen eine Chance zu geben, einige Features der Hubzilla-Platform kennenzulernen. Die fiktive Aktivitäten illustrieren nur einige von vielen Möglichkeiten, die den Communities für die Kommunikation und Zusammenarbeit im Hubzilla-Netzwerk zur Verfügung stehen."
+#: ../../include/auth.php:275
+msgid "Failed authentication"
+msgstr "Authentifizierung fehlgeschlagen"
 
-#: ../../addon/demohub/demohub.php:45
-msgid "To really grasp what Hubzilla is offering in terms of nomadic identity and decentralized access control, you have to try it for yourself. Run your own hub or register on an open hub. You can always clone your channels and migrate to another hub later. With Hubzilla, <i>you</i> not only own your <b>data</b>, but your <b>identity</b> as well!</p><p>The demo resets every ten minutes, which may interrupt your session. Simply reload the page as necessary. You can return to this dialog using the blue info button in the navbar."
-msgstr "Sie können selbst in der Praxis testen, welche Möglichkeiten Ihnen im Hubzilla-Netzwerk mit Nomadic Identity und mit dem dezentralen Zugang. Richten Sie einen eigenen Hubzilla-Knoten ein oder registrieren Sie sich auf einem offenen Hub. Sie können dann Ihren Kanal klonen oder mit diesem Kanal auf einen anderen Hub umziehen. Mit Hubzilla kontrollieren Sie Ihre Daten, aber auch Ihre Identität!</p><p>Die Demoinstanz wird im 10-Minuten-Takt zurückgesetzt, wobei Ihre Hubzilla-Sitzung evtl. unterbrochen wird. Laden Sie die Website #^https://demo.hubzilla.org/ einfach neu, um fortzufahren. Sie können dieses Dialog-Fenster mit einem Klick auf das blaue [i]-Symbol rechts oben in der Navigationsleiste."
+#: ../../include/help.php:33
+msgid "Help:"
+msgstr "Hilfe:"
 
-#: ../../addon/demohub/demohub.php:52
-msgid "Explore"
-msgstr "Erforschen"
\ No newline at end of file
+#: ../../include/help.php:65
+msgid "Not Found"
+msgstr "Nicht gefunden"
diff --git a/view/de/hstrings.php b/view/de/hstrings.php
index c01d28f13..adeceacb9 100644
--- a/view/de/hstrings.php
+++ b/view/de/hstrings.php
@@ -5,22 +5,6 @@ function string_plural_select_de($n){
 	return ($n != 1);;
 }}
 App::$rtl = 0;
-App::$strings["Social Networking"] = "Soziales Netzwerk";
-App::$strings["Social - Mostly Public"] = "Soziales Netzwerk - Weitgehend öffentlich";
-App::$strings["Social - Restricted"] = "Soziales Netzwerk - Beschränkt";
-App::$strings["Social - Private"] = "Soziales Netzwerk - Privat";
-App::$strings["Community Forum"] = "Forum";
-App::$strings["Forum - Mostly Public"] = "Forum - Weitgehend öffentlich";
-App::$strings["Forum - Restricted"] = "Forum - Beschränkt";
-App::$strings["Forum - Private"] = "Forum - Privat";
-App::$strings["Feed Republish"] = "Teilen von Feeds";
-App::$strings["Feed - Mostly Public"] = "Feeds - Weitgehend öffentlich";
-App::$strings["Feed - Restricted"] = "Feeds - Beschränkt";
-App::$strings["Special Purpose"] = "Für besondere Zwecke";
-App::$strings["Special - Celebrity/Soapbox"] = "Speziell - Mitteilungs-Kanal (keine Kommentare)";
-App::$strings["Special - Group Repository"] = "Speziell - Gruppenarchiv";
-App::$strings["Other"] = "Andere";
-App::$strings["Custom/Expert Mode"] = "Benutzerdefiniert/Expertenmodus";
 App::$strings["Can view my channel stream and posts"] = "Kann meinen Kanal-Stream und meine Beiträge sehen";
 App::$strings["Can send me their channel stream and posts"] = "Kann mir die Beiträge aus seinem/ihrem Kanal schicken";
 App::$strings["Can view my default channel profile"] = "Kann mein Standardprofil sehen";
@@ -39,57 +23,201 @@ App::$strings["Can forward to all my channel connections via @+ mentions in post
 App::$strings["Can chat with me"] = "Kann mit mir chatten";
 App::$strings["Can source my public posts in derived channels"] = "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden";
 App::$strings["Can administer my channel"] = "Kann meinen Kanal administrieren";
-App::$strings["parent"] = "Übergeordnetes Verzeichnis";
-App::$strings["Collection"] = "Sammlung";
-App::$strings["Principal"] = "Prinzipal";
-App::$strings["Addressbook"] = "Adressbuch";
-App::$strings["Calendar"] = "Kalender";
-App::$strings["Schedule Inbox"] = "Posteingang für überwachte Kalender";
-App::$strings["Schedule Outbox"] = "Postausgang für überwachte Kalender";
-App::$strings["Unknown"] = "Unbekannt";
-App::$strings["Files"] = "Dateien";
-App::$strings["Total"] = "Summe";
-App::$strings["Shared"] = "Geteilt";
+App::$strings["Social Networking"] = "Soziales Netzwerk";
+App::$strings["Social - Mostly Public"] = "Soziales Netzwerk - Weitgehend öffentlich";
+App::$strings["Social - Restricted"] = "Soziales Netzwerk - Beschränkt";
+App::$strings["Social - Private"] = "Soziales Netzwerk - Privat";
+App::$strings["Community Forum"] = "Forum";
+App::$strings["Forum - Mostly Public"] = "Forum - Weitgehend öffentlich";
+App::$strings["Forum - Restricted"] = "Forum - Beschränkt";
+App::$strings["Forum - Private"] = "Forum - Privat";
+App::$strings["Feed Republish"] = "Teilen von Feeds";
+App::$strings["Feed - Mostly Public"] = "Feeds - Weitgehend öffentlich";
+App::$strings["Feed - Restricted"] = "Feeds - Beschränkt";
+App::$strings["Special Purpose"] = "Für besondere Zwecke";
+App::$strings["Special - Celebrity/Soapbox"] = "Speziell - Mitteilungs-Kanal (keine Kommentare)";
+App::$strings["Special - Group Repository"] = "Speziell - Gruppenarchiv";
+App::$strings["Other"] = "Andere";
+App::$strings["Custom/Expert Mode"] = "Benutzerdefiniert/Expertenmodus";
+App::$strings["Requested profile is not available."] = "Das angefragte Profil ist nicht verfügbar.";
+App::$strings["Permission denied."] = "Berechtigung verweigert.";
+App::$strings["Block Name"] = "Block-Name";
+App::$strings["Blocks"] = "Blöcke";
+App::$strings["Block Title"] = "Titel des Blocks";
+App::$strings["Created"] = "Erstellt";
+App::$strings["Edited"] = "Geändert";
 App::$strings["Create"] = "Erstelle";
-App::$strings["Upload"] = "Hochladen";
-App::$strings["Name"] = "Name";
-App::$strings["Type"] = "Typ";
-App::$strings["Size"] = "Größe";
-App::$strings["Last Modified"] = "Zuletzt geändert";
 App::$strings["Edit"] = "Bearbeiten";
+App::$strings["Share"] = "Teilen";
 App::$strings["Delete"] = "Löschen";
-App::$strings["You are using %1\$s of your available file storage."] = "Sie verwenden %1\$s von Ihrem verfügbaren Dateispeicher.";
-App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s&#37;)"] = "Sie verwenden %1\$s von %2\$s verfügbarem Dateispeicher. (%3\$s&#37;)";
-App::$strings["WARNING:"] = "WARNUNG:";
-App::$strings["Create new folder"] = "Neuen Ordner anlegen";
-App::$strings["Upload file"] = "Datei hochladen";
-App::$strings["Drop files here to immediately upload"] = "Dateien zum sofortigen Hochladen hier fallen lassen";
+App::$strings["View"] = "Ansicht";
+App::$strings["Total invitation limit exceeded."] = "Einladungslimit überschritten.";
+App::$strings["%s : Not a valid email address."] = "%s : Keine gültige Email Adresse.";
+App::$strings["Please join us on \$Projectname"] = "Schließe Dich uns auf \$Projectname an!";
+App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines \$Projectname-Servers.";
+App::$strings["%s : Message delivery failed."] = "%s : Nachricht konnte nicht zugestellt werden.";
+App::$strings["%d message sent."] = array(
+	0 => "%d Nachricht gesendet.",
+	1 => "%d Nachrichten gesendet.",
+);
+App::$strings["You have no more invitations available"] = "Du hast keine weiteren verfügbare Einladungen";
+App::$strings["Send invitations"] = "Einladungen senden";
+App::$strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
+App::$strings["Your message:"] = "Deine Nachricht:";
+App::$strings["Please join my community on \$Projectname."] = "Schließe Dich uns auf \$Projectname an!";
+App::$strings["You will need to supply this invitation code:"] = "Bitte verwende bei der Registrierung den folgenden Einladungscode:";
+App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registriere Dich auf einem beliebigen \$Projectname-Hub (sie sind alle miteinander verbunden)";
+App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Gib meine \$Projectname-Adresse im Suchfeld ein.";
+App::$strings["or visit"] = "oder besuche";
+App::$strings["3. Click [Connect]"] = "3. Klicke auf [Verbinden]";
+App::$strings["Submit"] = "Absenden";
+App::$strings["Item not found"] = "Element nicht gefunden";
+App::$strings["Layout Name"] = "Layout-Name";
+App::$strings["Layout Description (Optional)"] = "Layout-Beschreibung (optional)";
+App::$strings["Edit Layout"] = "Layout bearbeiten";
 App::$strings["Permission denied"] = "Keine Berechtigung";
-App::$strings["Permission denied."] = "Berechtigung verweigert.";
-App::$strings["Page not found."] = "Seite nicht gefunden.";
-App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut.";
-App::$strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
-App::$strings["Requested profile is not available."] = "Das angefragte Profil ist nicht verfügbar.";
-App::$strings["Some blurb about what to do when you're new here"] = "Ein Hinweis, was man tun kann, wenn man neu hier ist";
+App::$strings["Invalid profile identifier."] = "Ungültiger Profil-Identifikator";
+App::$strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits-Editor";
+App::$strings["Profile"] = "Profil";
+App::$strings["Click on a contact to add or remove."] = "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen.";
+App::$strings["Visible To"] = "Sichtbar für";
+App::$strings["All Connections"] = "Alle Verbindungen";
+App::$strings["This site is not a directory server"] = "Diese Webseite ist kein Verzeichnisserver";
+App::$strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können.";
+App::$strings["Posts and comments"] = "Beiträge und Kommentare";
+App::$strings["Only posts"] = "Nur Beiträge";
+App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
+App::$strings["Export Channel"] = "Kanal exportieren";
+App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält.";
+App::$strings["Export Content"] = "Kanal und Inhalte exportieren";
+App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet.";
+App::$strings["Export your posts from a given year."] = "Exportiert die Beiträge des angegebenen Jahres.";
+App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne.";
+App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1\$s\">%2\$s</a>.";
+App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1\$s\">%2\$s</a>.";
+App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1\$s\">%2\$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst.";
 App::$strings["Public access denied."] = "Öffentlichen Zugriff verweigert.";
-App::$strings["Item not found."] = "Element nicht gefunden.";
-App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
-App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen.";
-App::$strings["Passwords do not match."] = "Passwörter stimmen nicht überein.";
-App::$strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
-App::$strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
-App::$strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
-App::$strings["Registration on this hub is disabled."] = "Die Registrierung auf diesem Hub ist nicht möglich.";
-App::$strings["Registration on this hub is by approval only."] = "Eine Registrierung auf diesem Hub erfordert die Zustimmung durch den Administrator.";
-App::$strings["<a href=\"pubsites\">Register at another affiliated hub.</a>"] = "<a href=\"pubsites\">Registriere Dich auf einem der anderen verbundenen Hubs.</a>";
-App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal.";
-App::$strings["Terms of Service"] = "Nutzungsbedingungen";
-App::$strings["I accept the %s for this website"] = "Ich akzeptiere die %s für diese Webseite";
-App::$strings["I am over 13 years of age and accept the %s for this website"] = "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite";
-App::$strings["Your email address"] = "Ihre E-Mail Adresse";
-App::$strings["Choose a password"] = "Passwort";
-App::$strings["Please re-enter your password"] = "Bitte gib Dein Passwort noch einmal ein";
-App::$strings["Please enter your invitation code"] = "Bitte trage Deinen Einladungs-Code ein";
+App::$strings["Search"] = "Suche";
+App::$strings["Items tagged with: %s"] = "Beiträge mit Schlagwort: %s";
+App::$strings["Search results for: %s"] = "Suchergebnisse für: %s";
+App::$strings["Location not found."] = "Klon nicht gefunden.";
+App::$strings["Location lookup failed."] = "Nachschlagen des Kanal-Ortes fehlgeschlagen";
+App::$strings["Please select another location to become primary before removing the primary location."] = "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst.";
+App::$strings["Syncing locations"] = "Synchronisiere Klone";
+App::$strings["No locations found."] = "Keine Klon-Adressen gefunden.";
+App::$strings["Manage Channel Locations"] = "Klon-Adressen verwalten";
+App::$strings["Location"] = "Ort";
+App::$strings["Address"] = "Adresse";
+App::$strings["Primary"] = "Primär";
+App::$strings["Drop"] = "Löschen";
+App::$strings["Sync Now"] = "Jetzt synchronisieren";
+App::$strings["Please wait several minutes between consecutive operations."] = "Bitte warte mehrere Minuten zwischen dem Ausführen zweier Operationen!";
+App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub einloggst und den Kanal dort löschst.";
+App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt.";
+App::$strings["Menu not found."] = "Menü nicht gefunden";
+App::$strings["Unable to create element."] = "Element konnte nicht erstellt werden.";
+App::$strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren.";
+App::$strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen.";
+App::$strings["Not found."] = "Nicht gefunden.";
+App::$strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements";
+App::$strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
+App::$strings["Link Name"] = "Name des Links";
+App::$strings["Link or Submenu Target"] = "Ziel des Links oder Untermenüs";
+App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen.";
+App::$strings["Use magic-auth if available"] = "Magic-Auth verwenden, falls verfügbar";
+App::$strings["No"] = "Nein";
+App::$strings["Yes"] = "Ja";
+App::$strings["Open link in new window"] = "Öffne Link in neuem Fenster";
+App::$strings["Order in list"] = "Reihenfolge in der Liste";
+App::$strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert";
+App::$strings["Submit and finish"] = "Absenden und fertigstellen";
+App::$strings["Submit and continue"] = "Absenden und fortfahren";
+App::$strings["Menu:"] = "Menü:";
+App::$strings["Link Target"] = "Ziel des Links";
+App::$strings["Edit menu"] = "Menü bearbeiten";
+App::$strings["Edit element"] = "Bestandteil bearbeiten";
+App::$strings["Drop element"] = "Bestandteil löschen";
+App::$strings["New element"] = "Neues Bestandteil";
+App::$strings["Edit this menu container"] = "Diesen Menü-Container bearbeiten";
+App::$strings["Add menu element"] = "Menüelement hinzufügen";
+App::$strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
+App::$strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
+App::$strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden.";
+App::$strings["Menu item deleted."] = "Menü-Bestandteil gelöscht.";
+App::$strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden.";
+App::$strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil";
+App::$strings["Link text"] = "Link Text";
+App::$strings["Calendar entries imported."] = "Kalendereinträge wurden importiert.";
+App::$strings["No calendar entries found."] = "Keine Kalendereinträge gefunden.";
+App::$strings["Event can not end before it has started."] = "Termin-Ende liegt vor dem Beginn.";
+App::$strings["Unable to generate preview."] = "Vorschau konnte nicht erzeugt werden.";
+App::$strings["Event title and start time are required."] = "Titel und Startzeit des Termins sind erforderlich.";
+App::$strings["Event not found."] = "Termin nicht gefunden.";
+App::$strings["event"] = "Termin";
+App::$strings["Edit event title"] = "Termintitel bearbeiten";
+App::$strings["Event title"] = "Termintitel";
+App::$strings["Required"] = "Benötigt";
+App::$strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
+App::$strings["Edit Category"] = "Kategorie bearbeiten";
+App::$strings["Category"] = "Kategorie";
+App::$strings["Edit start date and time"] = "Startdatum und -zeit bearbeiten";
+App::$strings["Start date and time"] = "Startdatum und -zeit";
+App::$strings["Finish date and time are not known or not relevant"] = "Enddatum und -zeit sind unbekannt oder irrelevant";
+App::$strings["Edit finish date and time"] = "Enddatum und -zeit bearbeiten";
+App::$strings["Finish date and time"] = "Enddatum und -zeit";
+App::$strings["Adjust for viewer timezone"] = "An die Zeitzone des Betrachters anpassen";
+App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien.";
+App::$strings["Edit Description"] = "Beschreibung bearbeiten";
+App::$strings["Description"] = "Beschreibung";
+App::$strings["Edit Location"] = "Ort bearbeiten";
+App::$strings["Preview"] = "Vorschau";
+App::$strings["Permission settings"] = "Berechtigungs-Einstellungen";
+App::$strings["Timezone:"] = "Zeitzone:";
+App::$strings["Advanced Options"] = "Weitere Optionen";
+App::$strings["l, F j"] = "l, j. F";
+App::$strings["Edit event"] = "Termin bearbeiten";
+App::$strings["Delete event"] = "Termin löschen";
+App::$strings["Link to Source"] = "Link zur Quelle";
+App::$strings["calendar"] = "Kalender";
+App::$strings["Edit Event"] = "Termin bearbeiten";
+App::$strings["Create Event"] = "Termin anlegen";
+App::$strings["Previous"] = "Voriges";
+App::$strings["Next"] = "Nächste";
+App::$strings["Export"] = "Exportieren";
+App::$strings["Month"] = "Monat";
+App::$strings["Week"] = "Woche";
+App::$strings["Day"] = "Tag";
+App::$strings["Today"] = "Heute";
+App::$strings["Event removed"] = "Termin gelöscht";
+App::$strings["Failed to remove event"] = "Termin konnte nicht gelöscht werden";
+App::$strings["App installed."] = "App installiert.";
+App::$strings["Malformed app."] = "Fehlerhafte App.";
+App::$strings["Embed code"] = "Code einbetten";
+App::$strings["Edit App"] = "App bearbeiten";
+App::$strings["Create App"] = "App erstellen";
+App::$strings["Name of app"] = "Name der App";
+App::$strings["Location (URL) of app"] = "Ort (URL) der App";
+App::$strings["Photo icon URL"] = "URL zum Icon";
+App::$strings["80 x 80 pixels - optional"] = "80 x 80 Pixel – optional";
+App::$strings["Categories (optional, comma separated list)"] = "Kategorien (optional, kommagetrennte Liste)";
+App::$strings["Version ID"] = "Versions-ID";
+App::$strings["Price of app"] = "Preis der App";
+App::$strings["Location (URL) to purchase app"] = "Ort (URL), um die App zu kaufen";
+App::$strings["Please login."] = "Bitte melde dich an.";
+App::$strings["Hub not found."] = "Server nicht gefunden.";
+App::$strings["photo"] = "Foto";
+App::$strings["status"] = "Status";
+App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$ss %3\$s";
+App::$strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s folgt %2\$ss %3\$s nicht mehr";
+App::$strings["Nothing to import."] = "Nichts zu importieren.";
+App::$strings["Unable to download data from old server"] = "Daten können vom alten Server nicht heruntergeladen werden";
+App::$strings["Imported file is empty."] = "Die importierte Datei ist leer.";
+App::$strings["Warning: Database versions differ by %1\$d updates."] = "Achtung: Datenbankversionen unterscheiden sich um %1\$d Aktualisierungen.";
+App::$strings["Import completed"] = "Import abgeschlossen";
+App::$strings["Import Items"] = "Beiträge importieren";
+App::$strings["Use this form to import existing posts and content from an export file."] = "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren.";
+App::$strings["File to Upload"] = "Hochzuladende Datei:";
+App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet.";
 App::$strings["Name or caption"] = "Name oder Titel";
 App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ ";
 App::$strings["Choose a short nickname"] = "Wähle einen kurzen Spitznamen";
@@ -97,107 +225,117 @@ App::$strings["Your nickname will be used to create an easy to remember channel
 App::$strings["Channel role and privacy"] = "Kanaltyp und Privatspäre-Einstellungen";
 App::$strings["Select a channel role with your privacy requirements."] = "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre.";
 App::$strings["Read more about roles"] = "Mehr Informationen über Rollen";
-App::$strings["no"] = "nein";
-App::$strings["yes"] = "ja";
-App::$strings["Registration"] = "Registrierung";
-App::$strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
-App::$strings["Register"] = "Registrieren";
-App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "Diese Seite verlangt möglicherweise eine Emailbestätigung nach dem Absenden des Formulars. Wenn Du auf eine Login-Seite zurückgeleitet wirst, prüfe bitte Deinen Posteingang auf neue Mails mit entsprechenden Hinweisen.";
-App::$strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen Fehler zurück: %1\$s";
-App::$strings["Page owner information could not be retrieved."] = "Informationen über den Besitzer der Seite konnten nicht gefunden werden.";
-App::$strings["Profile Photos"] = "Profilfotos";
-App::$strings["Album not found."] = "Album nicht gefunden.";
-App::$strings["Delete Album"] = "Album löschen";
-App::$strings["Multiple storage folders exist with this album name, but within different directories. Please remove the desired folder or folders using the Files manager"] = "Mehrere Speicherordner mit diesem Albumnamen sind bereits vorhanden, aber in verschiedenen Verzeichnissen. Bitte entfernen Sie den oder die gewünschten Ordner mit dem Dateimanager";
-App::$strings["Delete Photo"] = "Foto löschen";
-App::$strings["No photos selected"] = "Keine Fotos ausgewählt";
-App::$strings["Access to this item is restricted."] = "Der Zugriff auf dieses Foto ist eingeschränkt.";
-App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB von %2$.2f MB Foto-Speicher belegt.";
-App::$strings["%1$.2f MB photo storage used."] = "%1$.2f MB Foto-Speicher belegt.";
-App::$strings["Upload Photos"] = "Fotos hochladen";
-App::$strings["Enter an album name"] = "Namen für ein neues Album eingeben";
-App::$strings["or select an existing album (doubleclick)"] = "oder ein bereits vorhandenes auswählen (Doppelklick)";
-App::$strings["Create a status post for this upload"] = "Einen Statusbeitrag für diesen Upload erzeugen";
-App::$strings["No"] = "Nein";
-App::$strings["Yes"] = "Ja";
-App::$strings["Caption (optional):"] = "Beschriftung (optional):";
-App::$strings["Description (optional):"] = "Beschreibung (optional):";
-App::$strings["Permissions"] = "Berechtigungen";
-App::$strings["Submit"] = "Absenden";
-App::$strings["Album name could not be decoded"] = "Albumname konnte nicht dekodiert werden";
-App::$strings["Contact Photos"] = "Kontakt-Bilder";
-App::$strings["Show Newest First"] = "Neueste zuerst anzeigen";
-App::$strings["Show Oldest First"] = "Älteste zuerst anzeigen";
-App::$strings["View Photo"] = "Foto ansehen";
-App::$strings["Edit Album"] = "Album bearbeiten";
-App::$strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden.";
-App::$strings["Photo not available"] = "Foto nicht verfügbar";
-App::$strings["Use as profile photo"] = "Als Profilfoto verwenden";
-App::$strings["Use as cover photo"] = "Als Titelbild verwenden";
-App::$strings["Private Photo"] = "Privates Foto";
-App::$strings["Previous"] = "Voriges";
-App::$strings["View Full Size"] = "In voller Größe anzeigen";
-App::$strings["Next"] = "Nächste";
-App::$strings["Remove"] = "Entfernen";
-App::$strings["Edit photo"] = "Foto bearbeiten";
-App::$strings["Rotate CW (right)"] = "Drehen im UZS (rechts)";
-App::$strings["Rotate CCW (left)"] = "Drehen gegen UZS (links)";
-App::$strings["Move photo to album"] = "Foto in Album verschieben";
-App::$strings["Enter a new album name"] = "Gib einen Namen für ein neues Album ein";
-App::$strings["or select an existing one (doubleclick)"] = "oder wähle ein bereits vorhandenes aus (Doppelklick)";
-App::$strings["Caption"] = "Bildunterschrift";
-App::$strings["Add a Tag"] = "Schlagwort hinzufügen";
-App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Beispiele: @ben, @Karl_Prester, @lieschen@example.com";
-App::$strings["Flag as adult in album view"] = "In der Albumansicht als nicht jugendfrei markieren";
-App::$strings["I like this (toggle)"] = "Mir gefällt das (Umschalter)";
-App::$strings["I don't like this (toggle)"] = "Mir gefällt das nicht (Umschalter)";
-App::$strings["Share"] = "Teilen";
-App::$strings["Please wait"] = "Bitte warten";
-App::$strings["This is you"] = "Das bist Du";
-App::$strings["Comment"] = "Kommentar";
-App::$strings["Preview"] = "Vorschau";
-App::$strings["__ctx:title__ Likes"] = "Gefällt mir";
-App::$strings["__ctx:title__ Dislikes"] = "Gefällt mir nicht";
-App::$strings["__ctx:title__ Agree"] = "Zustimmungen";
-App::$strings["__ctx:title__ Disagree"] = "Ablehnungen";
-App::$strings["__ctx:title__ Abstain"] = "Enthaltungen";
-App::$strings["__ctx:title__ Attending"] = "Zusagen";
-App::$strings["__ctx:title__ Not attending"] = "Absagen";
-App::$strings["__ctx:title__ Might attend"] = "Vielleicht";
-App::$strings["View all"] = "Alles anzeigen";
-App::$strings["__ctx:noun__ Like"] = array(
-	0 => "Gefällt mir",
-	1 => "Gefällt mir",
-);
-App::$strings["__ctx:noun__ Dislike"] = array(
-	0 => "Gefällt nicht",
-	1 => "Gefällt nicht",
-);
-App::$strings["Photo Tools"] = "Fotowerkzeuge";
-App::$strings["In This Photo:"] = "Auf diesem Foto:";
-App::$strings["Map"] = "Karte";
-App::$strings["__ctx:noun__ Likes"] = "Gefällt mir";
-App::$strings["__ctx:noun__ Dislikes"] = "Gefällt nicht";
-App::$strings["Close"] = "Schließen";
-App::$strings["View Album"] = "Album ansehen";
-App::$strings["Recent Photos"] = "Neueste Fotos";
-App::$strings["Item not found"] = "Element nicht gefunden";
-App::$strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
-App::$strings["Edit post"] = "Bearbeite Beitrag";
-App::$strings["__ctx:acl__ Profile"] = "Profil";
-App::$strings["network"] = "Netzwerk";
-App::$strings["RSS"] = "RSS";
-App::$strings["Documentation Search"] = "Suche in der Dokumentation";
-App::$strings["About"] = "Über";
-App::$strings["Members"] = "Mitglieder";
-App::$strings["Administrators"] = "Administratoren";
-App::$strings["Developers"] = "Entwickler";
-App::$strings["Tutorials"] = "Tutorials";
-App::$strings["\$Projectname Documentation"] = "\$Projectname-Dokumentation";
-App::$strings["Contents"] = "Inhalt";
-App::$strings["Bookmark added"] = "Lesezeichen hinzugefügt";
-App::$strings["My Bookmarks"] = "Meine Lesezeichen";
-App::$strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
+App::$strings["Create Channel"] = "Einen neuen Kanal anlegen";
+App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen.";
+App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server.";
+App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden.";
+App::$strings["Remove This Channel"] = "Diesen Kanal löschen";
+App::$strings["WARNING: "] = "WARNUNG: ";
+App::$strings["This channel will be completely removed from the network. "] = "Dieser Kanal wird vollständig aus dem Netzwerk gelöscht.";
+App::$strings["This action is permanent and can not be undone!"] = "Dieser Schritt ist endgültig und kann nicht rückgängig gemacht werden!";
+App::$strings["Please enter your password for verification:"] = "Bitte gib zur Bestätigung Dein Passwort ein:";
+App::$strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk";
+App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk";
+App::$strings["Remove Channel"] = "Kanal löschen";
+App::$strings["Files: shared with me"] = "Dateien, die mit mir geteilt wurden";
+App::$strings["Name"] = "Name";
+App::$strings["NEW"] = "NEU";
+App::$strings["Size"] = "Größe";
+App::$strings["Last Modified"] = "Zuletzt geändert";
+App::$strings["Remove all files"] = "Alle Dateien löschen";
+App::$strings["Remove this file"] = "Diese Datei löschen";
+App::$strings["\$Projectname Server - Setup"] = "\$Projectname Server-Einrichtung";
+App::$strings["Could not connect to database."] = "Kann nicht mit der Datenbank verbinden.";
+App::$strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS.";
+App::$strings["Could not create table."] = "Konnte Tabelle nicht erstellen.";
+App::$strings["Your site database has been installed."] = "Die Datenbank Deines Hubs wurde installiert.";
+App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren.";
+App::$strings["Please see the file \"install/INSTALL.txt\"."] = "Lies die Datei \"install/INSTALL.txt\".";
+App::$strings["System check"] = "Systemprüfung";
+App::$strings["Check again"] = "Nochmal prüfen";
+App::$strings["Database connection"] = "Datenbankverbindung";
+App::$strings["In order to install \$Projectname we need to know how to connect to your database."] = "Um \$Projectname zu installieren, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können.";
+App::$strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast.";
+App::$strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst.";
+App::$strings["Database Server Name"] = "Datenbankservername";
+App::$strings["Default is 127.0.0.1"] = "Standard ist 127.0.0.1";
+App::$strings["Database Port"] = "Datenbankport";
+App::$strings["Communication port number - use 0 for default"] = "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung";
+App::$strings["Database Login Name"] = "Datenbank-Benutzername";
+App::$strings["Database Login Password"] = "Datenbank-Passwort";
+App::$strings["Database Name"] = "Datenbankname";
+App::$strings["Database Type"] = "Datenbanktyp";
+App::$strings["Site administrator email address"] = "E-Mail Adresse des Seiten-Administrators";
+App::$strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst.";
+App::$strings["Website URL"] = "Webseiten-URL";
+App::$strings["Please use SSL (https) URL if available."] = "Nutze wenn möglich eine SSL-URL (https).";
+App::$strings["Please select a default timezone for your website"] = "Standard-Zeitzone für Deinen Server";
+App::$strings["Basic/Minimal Social Networking"] = "Einfaches/minimales soziales Netzwerken";
+App::$strings["Standard Configuration (default)"] = "Standardkonfiguration (Standard)";
+App::$strings["Professional"] = "Professionell";
+App::$strings["Site settings"] = "Seiteneinstellungen";
+App::$strings["Server Configuration/Role"] = "Serverkonfiguration/Rolle";
+App::$strings["PHP version 5.5 or greater is required."] = "PHP-Version 5.5 oder höher ist erforderlich.";
+App::$strings["PHP version"] = "PHP-Version";
+App::$strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden.";
+App::$strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen.";
+App::$strings["PHP executable path"] = "PHP-Pfad zu ausführbarer Datei";
+App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren.";
+App::$strings["Command line PHP"] = "PHP-Befehlszeile";
+App::$strings["Unable to check command line PHP, as shell_exec() is disabled. This is required."] = "Prüfung auf Kommandozeilen-PHP fehlgeschlagen, da shell_exec() deaktiviert ist. Dies wird aber benötigt.";
+App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert.";
+App::$strings["This is required for message delivery to work."] = "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert.";
+App::$strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+App::$strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "Die Maximalgröße für Uploads insgesamt liegt bei %s. Die Maximalgröße für eine Datei liegt bei %s. Es können maximal %d Dateien gleichzeitig hochgeladen werden.";
+App::$strings["You can adjust these settings in the server php.ini file."] = "Du kannst diese Einstellungen in der php.ini - Datei des Servers anpassen.";
+App::$strings["PHP upload limits"] = "PHP-Hochladebeschränkungen";
+App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen.";
+App::$strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung.";
+App::$strings["Generate encryption keys"] = "Verschlüsselungsschlüssel erzeugen";
+App::$strings["libCurl PHP module"] = "libCurl-PHP-Modul";
+App::$strings["GD graphics PHP module"] = "GD-Grafik-PHP-Modul";
+App::$strings["OpenSSL PHP module"] = "OpenSSL-PHP-Modul";
+App::$strings["PDO database PHP module"] = "PDO-Datenbank-PHP-Modul";
+App::$strings["mb_string PHP module"] = "mb_string-PHP-Modul";
+App::$strings["xml PHP module"] = "xml-PHP-Modul";
+App::$strings["Apache mod_rewrite module"] = "Apache-mod_rewrite-Modul";
+App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert.";
+App::$strings["exec"] = "exec";
+App::$strings["Error: exec is required but is either not installed or has been disabled in php.ini"] = "Fehler: exec ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
+App::$strings["shell_exec"] = "shell_exec";
+App::$strings["Error: shell_exec is required but is either not installed or has been disabled in php.ini"] = "Fehler: shell_exec ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
+App::$strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert.";
+App::$strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert.";
+App::$strings["Error: openssl PHP module required but not installed."] = "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert.";
+App::$strings["Error: PDO database PHP module required but not installed."] = "Fehler: PDO-Datenbank-PHP-Modul ist erforderlich, aber nicht installiert.";
+App::$strings["Error: mb_string PHP module required but not installed."] = "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert.";
+App::$strings["Error: xml PHP module required for DAV but not installed."] = "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert.";
+App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht.";
+App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst.";
+App::$strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Hubzilla-Installation speichern musst.";
+App::$strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt.";
+App::$strings[".htconfig.php is writable"] = ".htconfig.php ist beschreibbar";
+App::$strings["This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Diese Software verwendet die Smarty3 Template Engine, um Vorlagen für die Webdarstellung zu verarbeiten. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen.";
+App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "Um diese kompilierten Vorlagen speichern zu können, braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Hubzilla-Stammverzeichnisses.";
+App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat.";
+App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält.";
+App::$strings["%s is writable"] = "%s ist beschreibbar";
+App::$strings["This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"] = "Diese Software benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Webserver benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Web-Stammverzeichnisses.";
+App::$strings["store is writable"] = "store ist schreibbar";
+App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server.";
+App::$strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich.";
+App::$strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können.";
+App::$strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer \$Projectname-Hubs (die mit korrekten Zertifikaten ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird).";
+App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen.";
+App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind.";
+App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = "Wenn Du sicher bist, dass das Zertifikat gültig und von einer vertrauenswürdigen Zertifizierungsstelle signiert ist, prüfe auf ggf. noch zu installierende Zwischenzertifikate (intermediate). Diese werden nicht unbedingt von Browsern benötigt, aber sehr wohl für die Kommunikation zwischen Servern.";
+App::$strings["SSL certificate validation"] = "SSL Zertifikatverifizierung";
+App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:";
+App::$strings["Url rewrite is working"] = "Url rewrite funktioniert";
+App::$strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen.";
+App::$strings["Errors encountered creating database tables."] = "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten.";
+App::$strings["<h1>What next</h1>"] = "<h1>Was als Nächstes</h1>";
+App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten.";
 App::$strings["Continue"] = "Fortfahren";
 App::$strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung";
 App::$strings["Enable premium channel connection restrictions"] = "Einschränkungen für einen Premium-Kanal aktivieren";
@@ -207,166 +345,57 @@ App::$strings["Potential connections will then see the following text before pro
 App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite.";
 App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)";
 App::$strings["Restricted or Premium Channel"] = "Eingeschränkter oder Premium-Kanal";
-App::$strings["# Accounts"] = "Anzahl der Konten";
-App::$strings["# blocked accounts"] = "Anzahl der blockierten Konten";
-App::$strings["# expired accounts"] = "Anzahl der abgelaufenen Konten";
-App::$strings["# expiring accounts"] = "Anzahl der ablaufenden Konten";
-App::$strings["# Channels"] = "Anzahl der Kanäle";
-App::$strings["# primary"] = "Anzahl der primären Kanäle";
-App::$strings["# clones"] = "Anzahl der Klone";
-App::$strings["Message queues"] = "Nachrichten-Warteschlangen";
-App::$strings["Your software should be updated"] = "Die installierte Software sollte aktualisiert werden";
+App::$strings["Queue Statistics"] = "Warteschlangenstatistiken";
+App::$strings["Total Entries"] = "Einträge insgesamt";
+App::$strings["Priority"] = "Priorität";
+App::$strings["Destination URL"] = "Ziel-URL";
+App::$strings["Mark hub permanently offline"] = "Hub als permanent offline markieren";
+App::$strings["Empty queue for this hub"] = "Warteschlange für diesen Hub leeren";
+App::$strings["Last known contact"] = "Letzter Kontakt";
+App::$strings["Off"] = "Aus";
+App::$strings["On"] = "An";
+App::$strings["Lock feature %s"] = "Blockiere die Funktion %s";
+App::$strings["Manage Additional Features"] = "Zusätzliche Funktionen verwalten";
+App::$strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert";
+App::$strings["Executing %s failed. Check system logs."] = "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle.";
+App::$strings["Update %s was successfully applied."] = "Update %s wurde erfolgreich ausgeführt.";
+App::$strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt.";
+App::$strings["Update function %s could not be found."] = "Update-Funktion %s konnte nicht gefunden werden.";
+App::$strings["No failed updates."] = "Keine fehlgeschlagenen Aktualisierungen.";
+App::$strings["Failed Updates"] = "Fehlgeschlagene Aktualisierungen";
+App::$strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)";
+App::$strings["Attempt to execute this update step automatically"] = "Versuche, diesen Updateschritt automatisch auszuführen";
+App::$strings["Item not found."] = "Element nicht gefunden.";
+App::$strings["Plugin %s disabled."] = "Plug-In %s deaktiviert.";
+App::$strings["Plugin %s enabled."] = "Plug-In %s aktiviert.";
+App::$strings["Disable"] = "Deaktivieren";
+App::$strings["Enable"] = "Aktivieren";
 App::$strings["Administration"] = "Administration";
-App::$strings["Summary"] = "Zusammenfassung";
-App::$strings["Registered accounts"] = "Registrierte Konten";
-App::$strings["Pending registrations"] = "Ausstehende Registrierungen";
-App::$strings["Registered channels"] = "Registrierte Kanäle";
-App::$strings["Active plugins"] = "Aktive Plug-Ins";
-App::$strings["Version"] = "Version";
-App::$strings["Repository version (master)"] = "Repository-Version (master)";
-App::$strings["Repository version (dev)"] = "Repository-Version (dev)";
-App::$strings["Block Name"] = "Block-Name";
-App::$strings["Insert web link"] = "Link einfügen";
-App::$strings["Title (optional)"] = "Titel (optional)";
-App::$strings["Edit Block"] = "Block bearbeiten";
-App::$strings["Invalid item."] = "Ungültiges Element.";
-App::$strings["Channel not found."] = "Kanal nicht gefunden.";
-App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-App::$strings["Save to Folder:"] = "Speichern in Ordner:";
-App::$strings["- select -"] = "– auswählen –";
-App::$strings["Save"] = "Speichern";
-App::$strings["sent you a private message"] = "hat Dir eine private Nachricht geschickt";
-App::$strings["added your channel"] = "hat deinen Kanal hinzugefügt";
-App::$strings["g A l F d"] = "l, d. F, G:i \\U\\h\\r";
-App::$strings["[today]"] = "[Heute]";
-App::$strings["posted an event"] = "hat einen Termin veröffentlicht";
-App::$strings["Blocked"] = "Blockiert";
-App::$strings["Ignored"] = "Ignoriert";
-App::$strings["Hidden"] = "Versteckt";
-App::$strings["Archived"] = "Archiviert";
-App::$strings["New"] = "Neu";
-App::$strings["All"] = "Alle";
-App::$strings["New Connections"] = "Neue Verbindungen";
-App::$strings["Show pending (new) connections"] = "Ausstehende (neue) Verbindungsanfragen anzeigen";
-App::$strings["All Connections"] = "Alle Verbindungen";
-App::$strings["Show all connections"] = "Alle Verbindungen anzeigen";
-App::$strings["Only show blocked connections"] = "Nur blockierte Verbindungen anzeigen";
-App::$strings["Only show ignored connections"] = "Nur ignorierte Verbindungen anzeigen";
-App::$strings["Only show archived connections"] = "Nur archivierte Verbindungen anzeigen";
-App::$strings["Only show hidden connections"] = "Nur versteckte Verbindungen anzeigen";
-App::$strings["Pending approval"] = "Wartet auf Genehmigung";
-App::$strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
-App::$strings["Edit connection"] = "Verbindung bearbeiten";
-App::$strings["Delete connection"] = "Verbindung löschen";
-App::$strings["Channel address"] = "Kanaladresse";
-App::$strings["Network"] = "Netzwerk";
-App::$strings["Call"] = "Anruf";
-App::$strings["Status"] = "Status";
-App::$strings["Connected"] = "Verbunden";
-App::$strings["Approve connection"] = "Verbindung genehmigen";
-App::$strings["Approve"] = "Genehmigen";
-App::$strings["Ignore connection"] = "Verbindung ignorieren";
-App::$strings["Ignore"] = "Ignorieren";
-App::$strings["Recent activity"] = "Kürzliche Aktivitäten";
-App::$strings["Connections"] = "Verbindungen";
-App::$strings["Search"] = "Suche";
-App::$strings["Search your connections"] = "Verbindungen durchsuchen";
-App::$strings["Connections search"] = "Verbindung suchen";
-App::$strings["Find"] = "Finde";
-App::$strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zurechtschneiden schlug fehl.";
-App::$strings["Cover Photos"] = "Cover Foto";
-App::$strings["Image resize failed."] = "Bild-Anpassung fehlgeschlagen.";
-App::$strings["Unable to process image"] = "Kann Bild nicht verarbeiten";
-App::$strings["Image upload failed."] = "Hochladen des Bilds fehlgeschlagen.";
-App::$strings["Unable to process image."] = "Kann Bild nicht verarbeiten.";
-App::$strings["female"] = "weiblich";
-App::$strings["%1\$s updated her %2\$s"] = "%1\$s hat ihr %2\$s aktualisiert";
-App::$strings["male"] = "männlich";
-App::$strings["%1\$s updated his %2\$s"] = "%1\$s hat sein %2\$s aktualisiert";
-App::$strings["%1\$s updated their %2\$s"] = "%1\$s hat sein/ihr %2\$s aktualisiert";
-App::$strings["cover photo"] = "Cover Foto";
-App::$strings["Photo not available."] = "Foto nicht verfügbar.";
-App::$strings["Upload File:"] = "Datei hochladen:";
-App::$strings["Select a profile:"] = "Wähle ein Profil:";
-App::$strings["Upload Cover Photo"] = "Cover Foto hochladen";
-App::$strings["or"] = "oder";
-App::$strings["skip this step"] = "diesen Schritt überspringen";
-App::$strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben";
-App::$strings["Crop Image"] = "Bild zuschneiden";
-App::$strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu.";
-App::$strings["Done Editing"] = "Bearbeitung fertigstellen";
-App::$strings["Off"] = "Aus";
-App::$strings["On"] = "An";
-App::$strings["Lock feature %s"] = "Blockiere die Funktion %s";
-App::$strings["Manage Additional Features"] = "Zusätzliche Funktionen verwalten";
-App::$strings["Log settings updated."] = "Protokoll-Einstellungen aktualisiert.";
-App::$strings["Logs"] = "Protokolle";
-App::$strings["Clear"] = "Leeren";
-App::$strings["Debugging"] = "Debugging";
-App::$strings["Log file"] = "Protokolldatei";
-App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "Muss für den Web-Server schreibbar sein. Relativ zum Hubzilla-Stammverzeichnis.";
-App::$strings["Log level"] = "Protokollstufe";
-App::$strings["New Profile Field"] = "Neues Profilfeld";
-App::$strings["Field nickname"] = "Kurzname für das Feld";
-App::$strings["System name of field"] = "Systemname des Feldes";
-App::$strings["Input type"] = "Art des Inhalts";
-App::$strings["Field Name"] = "Feldname";
-App::$strings["Label on profile pages"] = "Bezeichnung auf Profilseiten";
-App::$strings["Help text"] = "Hilfetext";
-App::$strings["Additional info (optional)"] = "Zusätzliche Informationen (optional)";
-App::$strings["Field definition not found"] = "Feld-Definition nicht gefunden";
-App::$strings["Edit Profile Field"] = "Profilfeld bearbeiten";
-App::$strings["Profile Fields"] = "Profil Felder";
-App::$strings["Basic Profile Fields"] = "Notwendige Profil Felder";
-App::$strings["Advanced Profile Fields"] = "Erweiterte Profil Felder";
-App::$strings["(In addition to basic fields)"] = "(zusätzlich zu notwendige Felder)";
-App::$strings["All available fields"] = "Alle verfügbaren Felder";
-App::$strings["Custom Fields"] = "Benutzerdefinierte Felder";
-App::$strings["Create Custom Field"] = "Erstelle benutzerdefiniertes Feld";
-App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Standardmäßig wird ungefiltertes HTML in eingebetteten Inhalten zugelassen. Das ist prinzipiell unsicher.";
-App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Die empfohlene Einstellung ist, ungefiltertes HTML nur von den nachfolgenden Webseiten zu erlauben:";
-App::$strings["https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />"] = "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />";
-App::$strings["All other embedded content will be filtered, <strong>unless</strong> embedded content from that site is explicitly blocked."] = "Alle anderen eingebetteten Inhalte werden gefiltert, <strong>es sei denn</strong>, eingebettete Inhalte von einer bestimmten Seite sind explizit blockiert.";
-App::$strings["Security"] = "Sicherheit";
-App::$strings["Block public"] = "Öffentlichen Zugriff blockieren";
-App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "Blockiere den öffentlichen Zugriff auf alle ansonsten öffentlichen persönlichen Seiten dieser Website, sofern ein Besucher nicht angemeldet ist.";
-App::$strings["Set \"Transport Security\" HTTP header"] = "Setze den \"Transport Security\" HTTP Header";
-App::$strings["Set \"Content Security Policy\" HTTP header"] = "Setze den \"Content Security Policy\" HTTP Header";
-App::$strings["Allowed email domains"] = "Erlaubte Domains für E-Mails";
-App::$strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "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.";
-App::$strings["Not allowed email domains"] = "Nicht erlaubte Domains für E-Mails";
-App::$strings["Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined."] = "Domains in E-Mail-Adressen, die keine Erlaubnis erhalten, sich auf Deinem Hub zu registrieren. Mehrere Domains können durch Kommas getrennt werden. Platzhalter (*/?) sind möglich. Keine Eingabe bedeutet keine Einschränkung, unabhängig davon, ob unter erlaubte Domains etwas eingegeben wurde.";
-App::$strings["Allow communications only from these sites"] = "Kommunikation nur von diesen Servern/Domains erlauben";
-App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Ein Eintrag pro Zeile. Lasse das Feld leer, um Kommunikation grundlegend von überall her zu erlauben.";
-App::$strings["Block communications from these sites"] = "Kommunikation von diesen Servern/Domains blockieren";
-App::$strings["Allow communications only from these channels"] = "Kommunikation nur von diesen Kanälen erlauben";
-App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = "Ein Kanal (hash) pro Zeile. Leerlassen um jeden Kanal zuzulassen. ";
-App::$strings["Block communications from these channels"] = "Kommunikation von folgenden Kanälen blockieren";
-App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Erlaube Einbettungen nur von sicheren (SSL) Webseiten und Links.";
-App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Erlaube Einbettung von Inhalten mit ungefiltertem HTML nur von diesen Domains";
-App::$strings["One site per line. By default embedded content is filtered."] = "Eine Website/Domain pro Zeile. Standardmäßig wird eingebetteter Inhalt gefiltert.";
-App::$strings["Block embedded HTML from these domains"] = "Eingebettete HTML Inhalte von diesen Servern/Domains blockieren";
-App::$strings["Theme settings updated."] = "Theme-Einstellungen aktualisiert.";
-App::$strings["No themes found."] = "Keine Theme gefunden.";
-App::$strings["Disable"] = "Deaktivieren";
-App::$strings["Enable"] = "Aktivieren";
-App::$strings["Screenshot"] = "Bildschirmfoto";
-App::$strings["Themes"] = "Themes";
+App::$strings["Plugins"] = "Plug-Ins";
 App::$strings["Toggle"] = "Umschalten";
 App::$strings["Settings"] = "Einstellungen";
 App::$strings["Author: "] = "Autor: ";
 App::$strings["Maintainer: "] = "Betreuer:";
-App::$strings["[Experimental]"] = "[Experimentell]";
-App::$strings["[Unsupported]"] = "[Nicht unterstützt]";
-App::$strings["Password changed for account %d."] = "Passwort für Konto %d geändert.";
-App::$strings["Account settings updated."] = "Kontoeinstellungen aktualisiert.";
-App::$strings["Account not found."] = "Konto nicht gefunden.";
-App::$strings["Account Edit"] = "Kontobearbeitung";
-App::$strings["New Password"] = "Neues Passwort";
-App::$strings["New Password again"] = "Neues Passwort wiederholen";
-App::$strings["Technical skill level"] = "Technische Qualifikationsstufe";
-App::$strings["Account language (for emails)"] = "Kontosprache (für E-Mails)";
-App::$strings["Service class"] = "Dienstklasse";
+App::$strings["Minimum project version: "] = "Minimale Version des Projekts:";
+App::$strings["Maximum project version: "] = "Maximale Version des Projekts:";
+App::$strings["Minimum PHP version: "] = "Minimale PHP Version:";
+App::$strings["Compatible Server Roles: "] = "Kompatible Serverrollen: ";
+App::$strings["Requires: "] = "Benötigt:";
+App::$strings["Disabled - version incompatibility"] = "Abgeschaltet - Versionsinkompatibilität";
+App::$strings["Enter the public git repository URL of the plugin repo."] = "Gib die öffentliche Git-Repository-URL des Plugin-Repository an.";
+App::$strings["Plugin repo git URL"] = "Plugin-Repository Git URL";
+App::$strings["Custom repo name"] = "Benutzerdefinierter Repository-Name";
+App::$strings["(optional)"] = "(optional)";
+App::$strings["Download Plugin Repo"] = "Plugin-Repository herunterladen";
+App::$strings["Install new repo"] = "Neues Repository installieren";
+App::$strings["Install"] = "Installieren";
+App::$strings["Cancel"] = "Abbrechen";
+App::$strings["Manage Repos"] = "Repositorien verwalten";
+App::$strings["Installed Plugin Repositories"] = "Installierte Plugin-Repositorien";
+App::$strings["Install a New Plugin Repository"] = "Ein neues Plugin-Repository installieren";
+App::$strings["Update"] = "Aktualisieren";
+App::$strings["Switch branch"] = "Zweig/Branch wechseln";
+App::$strings["Remove"] = "Entfernen";
 App::$strings["%s account blocked/unblocked"] = array(
 	0 => "%s Konto blockiert/freigegeben",
 	1 => "%s Konten blockiert/freigegeben",
@@ -385,6 +414,7 @@ App::$strings["Registrations waiting for confirm"] = "Registrierungen warten auf
 App::$strings["Request date"] = "Antragsdatum";
 App::$strings["Email"] = "E-Mail";
 App::$strings["No registrations."] = "Keine Registrierungen.";
+App::$strings["Approve"] = "Genehmigen";
 App::$strings["Deny"] = "Verweigern";
 App::$strings["Block"] = "Blockieren";
 App::$strings["Unblock"] = "Freigeben";
@@ -396,6 +426,13 @@ App::$strings["Expires"] = "Verfällt";
 App::$strings["Service Class"] = "Service-Klasse";
 App::$strings["Selected accounts will be deleted!\\n\\nEverything these accounts had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Die ausgewählten Konten werden gelöscht!\\n\\nAlles, was diese Konten auf diesem Hub veröffentlicht haben, wird endgültig gelöscht werden!\\n\\nBist du dir sicher?";
 App::$strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Das Konto {0} wird gelöscht!\\n\\nAlles, was dieses Konto auf diesem Hub veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?";
+App::$strings["Log settings updated."] = "Protokoll-Einstellungen aktualisiert.";
+App::$strings["Logs"] = "Protokolle";
+App::$strings["Clear"] = "Leeren";
+App::$strings["Debugging"] = "Debugging";
+App::$strings["Log file"] = "Protokolldatei";
+App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "Muss für den Web-Server schreibbar sein. Relativ zum Hubzilla-Stammverzeichnis.";
+App::$strings["Log level"] = "Protokollstufe";
 App::$strings["%s channel censored/uncensored"] = array(
 	0 => "%s Kanal gesperrt/freigegeben",
 	1 => "%s Kanäle gesperrt/freigegeben",
@@ -421,20 +458,17 @@ App::$strings["Allow Code"] = "Code erlauben";
 App::$strings["Disallow Code"] = "Code sperren";
 App::$strings["Channel"] = "Kanal";
 App::$strings["UID"] = "UID";
-App::$strings["Address"] = "Adresse";
 App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?";
 App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?";
-App::$strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert";
-App::$strings["Executing %s failed. Check system logs."] = "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle.";
-App::$strings["Update %s was successfully applied."] = "Update %s wurde erfolgreich ausgeführt.";
-App::$strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt.";
-App::$strings["Update function %s could not be found."] = "Update-Funktion %s konnte nicht gefunden werden.";
-App::$strings["No failed updates."] = "Keine fehlgeschlagenen Aktualisierungen.";
-App::$strings["Failed Updates"] = "Fehlgeschlagene Aktualisierungen";
-App::$strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)";
-App::$strings["Attempt to execute this update step automatically"] = "Versuche, diesen Updateschritt automatisch auszuführen";
+App::$strings["Theme settings updated."] = "Theme-Einstellungen aktualisiert.";
+App::$strings["No themes found."] = "Keine Theme gefunden.";
+App::$strings["Screenshot"] = "Bildschirmfoto";
+App::$strings["Themes"] = "Themes";
+App::$strings["[Experimental]"] = "[Experimentell]";
+App::$strings["[Unsupported]"] = "[Nicht unterstützt]";
 App::$strings["Site settings updated."] = "Site-Einstellungen aktualisiert.";
 App::$strings["Default"] = "Standard";
+App::$strings["%s - (Incompatible)"] = "%s - (Inkompatibel)";
 App::$strings["mobile"] = "mobil";
 App::$strings["experimental"] = "experimentell";
 App::$strings["unsupported"] = "nicht unterstützt";
@@ -443,9 +477,6 @@ App::$strings["My site is not a public server"] = "Mein Server ist kein öffentl
 App::$strings["My site has paid access only"] = "Meine Seite hat nur bezahlten Zugriff";
 App::$strings["My site has free access only"] = "Meine Seite hat nur freien Zugriff";
 App::$strings["My site offers free accounts with optional paid upgrades"] = "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades";
-App::$strings["Basic/Minimal Social Networking"] = "Einfaches/minimales soziales Netzwerken";
-App::$strings["Standard Configuration (default)"] = "Standardkonfiguration (Standard)";
-App::$strings["Professional"] = "Professionell";
 App::$strings["Beginner/Basic"] = "Anfänger/Basis";
 App::$strings["Novice - not skilled but willing to learn"] = "Anfänger - unerfahren, aber bereit zu lernen";
 App::$strings["Intermediate - somewhat comfortable"] = "Fortgeschritten - relativ komfortabel";
@@ -453,11 +484,11 @@ App::$strings["Advanced - very comfortable"] = "Fortgeschritten - sehr komfortab
 App::$strings["Expert - I can write computer code"] = "Experte - Ich kann Computercode schreiben";
 App::$strings["Wizard - I probably know more than you do"] = "Zauberer - ich kann wahrscheinlich mehr als Du";
 App::$strings["Site"] = "Seite";
+App::$strings["Registration"] = "Registrierung";
 App::$strings["File upload"] = "Dateiupload";
 App::$strings["Policies"] = "Richtlinien";
 App::$strings["Advanced"] = "Fortgeschritten";
 App::$strings["Site name"] = "Seitenname";
-App::$strings["Server Configuration/Role"] = "Serverkonfiguration/Rolle";
 App::$strings["Site default technical skill level"] = "Standard-Qualifikationsstufe der Website";
 App::$strings["Used to provide a member experience matched to technical comfort level"] = "Dies wird verwendet, um eine Benutzererfahrung  passend zur technischen Qualifikationsstufe zu bieten.";
 App::$strings["Lock the technical skill level setting"] = "Sperre die technische Qualifikationsstufe";
@@ -500,6 +531,9 @@ App::$strings["Login on Homepage"] = "Log-in auf der Startseite";
 App::$strings["Present a login box to visitors on the home page if no other content has been configured."] = "Zeigt Besuchern der Homepage eine Anmeldemaske, falls keine anderen Inhalte konfiguriert wurden.";
 App::$strings["Enable context help"] = "Kontext-Hilfe aktivieren";
 App::$strings["Display contextual help for the current page when the help button is pressed."] = "Zeigt Kontext-sensitive Hilfe für die aktuelle Seite an, wenn der Hilfe-Knopf geklickt wird.";
+App::$strings["Reply-to email address for system generated email."] = "Antwortadresse (reply-to) für Emails, die vom System generiert wurden.";
+App::$strings["Sender (From) email address for system generated email."] = "Absenderadresse (from) für Emails, die vom System generiert wurden.";
+App::$strings["Name of email sender for system generated email."] = "Name des Versenders von Emails, die vom System generiert wurden.";
 App::$strings["Directory Server URL"] = "Verzeichnisserver-URL";
 App::$strings["Default directory server"] = "Standard-Verzeichnisserver";
 App::$strings["Proxy user"] = "Proxy Benutzer";
@@ -516,747 +550,412 @@ App::$strings["Maximum Load Average"] = "Maximales Load Average";
 App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50";
 App::$strings["Expiration period in days for imported (grid/network) content"] = "Setze den Zeitraum (in Tagen), ab wann importierte (aus dem Netzwerk) Inhalte ablaufen sollen";
 App::$strings["0 for no expiration of imported content"] = "0 = keine Löschung importierter Inhalte";
-App::$strings["Plugin %s disabled."] = "Plug-In %s deaktiviert.";
-App::$strings["Plugin %s enabled."] = "Plug-In %s aktiviert.";
-App::$strings["Plugins"] = "Plug-Ins";
-App::$strings["Minimum project version: "] = "Minimale Version des Projekts:";
-App::$strings["Maximum project version: "] = "Maximale Version des Projekts:";
-App::$strings["Minimum PHP version: "] = "Minimale PHP Version:";
-App::$strings["Compatible Server Roles: "] = "Kompatible Serverrollen: ";
-App::$strings["Requires: "] = "Benötigt:";
-App::$strings["Disabled - version incompatibility"] = "Abgeschaltet - Versionsinkompatibilität";
-App::$strings["Enter the public git repository URL of the plugin repo."] = "Gib die öffentliche Git-Repository-URL des Plugin-Repository an.";
-App::$strings["Plugin repo git URL"] = "Plugin-Repository Git URL";
-App::$strings["Custom repo name"] = "Benutzerdefinierter Repository-Name";
-App::$strings["(optional)"] = "(optional)";
-App::$strings["Download Plugin Repo"] = "Plugin-Repository herunterladen";
-App::$strings["Install new repo"] = "Neues Repository installieren";
-App::$strings["Install"] = "Installieren";
-App::$strings["Cancel"] = "Abbrechen";
-App::$strings["Manage Repos"] = "Repositorien verwalten";
-App::$strings["Installed Plugin Repositories"] = "Installierte Plugin-Repositorien";
-App::$strings["Install a New Plugin Repository"] = "Ein neues Plugin-Repository installieren";
-App::$strings["Update"] = "Aktualisieren";
-App::$strings["Switch branch"] = "Zweig/Branch wechseln";
-App::$strings["Queue Statistics"] = "Warteschlangenstatistiken";
-App::$strings["Total Entries"] = "Einträge insgesamt";
-App::$strings["Priority"] = "Priorität";
-App::$strings["Destination URL"] = "Ziel-URL";
-App::$strings["Mark hub permanently offline"] = "Hub als permanent offline markieren";
-App::$strings["Empty queue for this hub"] = "Warteschlange für diesen Hub leeren";
-App::$strings["Last known contact"] = "Letzter Kontakt";
-App::$strings["Items tagged with: %s"] = "Beiträge mit Schlagwort: %s";
-App::$strings["Search results for: %s"] = "Suchergebnisse für: %s";
-App::$strings["Layout Name"] = "Layout-Name";
-App::$strings["Layout Description (Optional)"] = "Layout-Beschreibung (optional)";
-App::$strings["Edit Layout"] = "Layout bearbeiten";
-App::$strings["Page link"] = "Seiten-Link";
-App::$strings["Edit Webpage"] = "Webseite bearbeiten";
-App::$strings["Like/Dislike"] = "Mögen/Nicht mögen";
-App::$strings["This action is restricted to members."] = "Diese Aktion kann nur von Mitgliedern ausgeführt werden.";
-App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Um fortzufahren <a href=\"rmagic\">melde Dich bitte mit Deiner \$Projectname-ID an</a> oder <a href=\"register\">registriere Dich als neues \$Projectname-Mitglied</a>.";
-App::$strings["Invalid request."] = "Ungültige Anfrage.";
-App::$strings["channel"] = "Kanal";
-App::$strings["thing"] = "Sache";
-App::$strings["Channel unavailable."] = "Kanal nicht vorhanden.";
-App::$strings["Previous action reversed."] = "Die vorherige Aktion wurde rückgängig gemacht.";
-App::$strings["photo"] = "Foto";
-App::$strings["status"] = "Status";
-App::$strings["event"] = "Termin";
-App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s";
-App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s nicht";
-App::$strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s stimmt %2\$ss %3\$s zu";
-App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s lehnt %2\$ss %3\$s ab";
-App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s enthält sich zu %2\$ss %3\$s";
-App::$strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil";
-App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s nicht teil";
-App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt vielleicht an %2\$ss %3\$s teil";
-App::$strings["Action completed."] = "Aktion durchgeführt.";
-App::$strings["Thank you."] = "Vielen Dank.";
-App::$strings["This site is not a directory server"] = "Diese Webseite ist kein Verzeichnisserver";
-App::$strings["This directory server requires an access token"] = "Dieser Verzeichnisserver benötigt einen Zugriffstoken";
-App::$strings["No such group"] = "Gruppe nicht gefunden";
-App::$strings["No such channel"] = "Kanal nicht gefunden";
-App::$strings["forum"] = "Forum";
-App::$strings["Search Results For:"] = "Suchergebnisse für:";
-App::$strings["Privacy group is empty"] = "Gruppe ist leer";
-App::$strings["Privacy group: "] = "Gruppe:";
-App::$strings["Invalid connection."] = "Ungültige Verbindung.";
-App::$strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
-App::$strings["Unable to create menu."] = "Kann Menü nicht erstellen.";
-App::$strings["Menu Name"] = "Name des Menüs";
-App::$strings["Unique name (not visible on webpage) - required"] = "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich";
-App::$strings["Menu Title"] = "Menütitel";
-App::$strings["Visible on webpage - leave empty for no title"] = "Sichtbar auf der Webseite – für keinen Titel leer lassen";
-App::$strings["Allow Bookmarks"] = "Lesezeichen erlauben";
-App::$strings["Menu may be used to store saved bookmarks"] = "Im Menü können gespeicherte Lesezeichen abgelegt werden";
-App::$strings["Submit and proceed"] = "Absenden und fortfahren";
-App::$strings["Menus"] = "Menüs";
-App::$strings["Drop"] = "Löschen";
-App::$strings["Created"] = "Erstellt";
-App::$strings["Edited"] = "Geändert";
-App::$strings["Bookmarks allowed"] = "Lesezeichen erlaubt";
-App::$strings["Delete this menu"] = "Lösche dieses Menü";
-App::$strings["Edit menu contents"] = "Bearbeite Menü Inhalte";
-App::$strings["Edit this menu"] = "Dieses Menü bearbeiten";
-App::$strings["Menu could not be deleted."] = "Menü konnte nicht gelöscht werden.";
-App::$strings["Menu not found."] = "Menü nicht gefunden";
-App::$strings["Edit Menu"] = "Menü bearbeiten";
-App::$strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü hinzufügen oder entfernen";
-App::$strings["Menu name"] = "Menü Name";
-App::$strings["Must be unique, only seen by you"] = "Muss eindeutig sein, ist aber nur für Dich sichtbar";
-App::$strings["Menu title"] = "Menü Titel";
-App::$strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird";
-App::$strings["Allow bookmarks"] = "Erlaube Lesezeichen";
-App::$strings["Not found."] = "Nicht gefunden.";
-App::$strings["Location not found."] = "Klon nicht gefunden.";
-App::$strings["Location lookup failed."] = "Nachschlagen des Kanal-Ortes fehlgeschlagen";
-App::$strings["Please select another location to become primary before removing the primary location."] = "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst.";
-App::$strings["Syncing locations"] = "Synchronisiere Klone";
-App::$strings["No locations found."] = "Keine Klon-Adressen gefunden.";
-App::$strings["Manage Channel Locations"] = "Klon-Adressen verwalten";
-App::$strings["Location"] = "Ort";
-App::$strings["Primary"] = "Primär";
-App::$strings["Sync Now"] = "Jetzt synchronisieren";
-App::$strings["Please wait several minutes between consecutive operations."] = "Bitte warte mehrere Minuten zwischen dem Ausführen zweier Operationen!";
-App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub einloggst und den Kanal dort löschst.";
-App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt.";
-App::$strings["Public Hubs"] = "Öffentliche Hubs";
-App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung im \$Projectname Netzwerk. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen Seiten und Kanälen auf anderen Hubs ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den Seiten der einzelnen Hubs <strong>könnten</strong> jeweils nähere Informationen dazu stehen.";
-App::$strings["Hub URL"] = "Hub-URL";
-App::$strings["Access Type"] = "Zugriffstyp";
-App::$strings["Registration Policy"] = "Registrierungsrichtlinien";
-App::$strings["Stats"] = "Statistiken";
-App::$strings["Software"] = "Software";
-App::$strings["Ratings"] = "Bewertungen";
-App::$strings["Rate"] = "Bewerten";
-App::$strings["View"] = "Ansicht";
-App::$strings["Could not access contact record."] = "Konnte nicht auf den Kontakteintrag zugreifen.";
-App::$strings["Could not locate selected profile."] = "Gewähltes Profil nicht gefunden.";
-App::$strings["Connection updated."] = "Verbindung aktualisiert.";
-App::$strings["Failed to update connection record."] = "Konnte den Verbindungseintrag nicht aktualisieren.";
-App::$strings["is now connected to"] = "ist jetzt verbunden mit";
-App::$strings["Could not access address book record."] = "Konnte nicht auf den Adressbuch-Eintrag zugreifen.";
-App::$strings["Refresh failed - channel is currently unavailable."] = "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar.";
-App::$strings["Unable to set address book parameters."] = "Konnte die Adressbuch-Parameter nicht setzen.";
-App::$strings["Connection has been removed."] = "Verbindung wurde gelöscht.";
-App::$strings["View Profile"] = "Profil ansehen";
-App::$strings["View %s's profile"] = "%ss Profil ansehen";
-App::$strings["Refresh Permissions"] = "Zugriffsrechte neu laden";
-App::$strings["Fetch updated permissions"] = "Aktualisierte Zugriffsrechte abfragen";
-App::$strings["Recent Activity"] = "Kürzliche Aktivitäten";
-App::$strings["View recent posts and comments"] = "Betrachte die neuesten Beiträge und Kommentare";
-App::$strings["Block (or Unblock) all communications with this connection"] = "Jegliche Kommunikation mit dieser Verbindung blockieren/zulassen";
-App::$strings["This connection is blocked!"] = "Die Verbindung ist geblockt!";
-App::$strings["Unignore"] = "Nicht ignorieren";
-App::$strings["Ignore (or Unignore) all inbound communications from this connection"] = "Jegliche eingehende Kommunikation von dieser Verbindung ignorieren/zulassen";
-App::$strings["This connection is ignored!"] = "Die Verbindung wird ignoriert!";
-App::$strings["Unarchive"] = "Aus Archiv zurückholen";
-App::$strings["Archive"] = "Archivieren";
-App::$strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Verbindung archivieren/aus dem Archiv zurückholen (Archiv = Kanal als erloschen markieren, aber die Beiträge behalten)";
-App::$strings["This connection is archived!"] = "Die Verbindung ist archiviert!";
-App::$strings["Unhide"] = "Wieder sichtbar machen";
-App::$strings["Hide"] = "Verstecken";
-App::$strings["Hide or Unhide this connection from your other connections"] = "Diese Verbindung vor anderen Verbindungen verstecken/zeigen";
-App::$strings["This connection is hidden!"] = "Die Verbindung ist versteckt!";
-App::$strings["Delete this connection"] = "Verbindung löschen";
-App::$strings["Open Individual Permissions section by default"] = "Öffne standardmäßig den Bereich für individuelle Berechtigungen";
-App::$strings["Affinity"] = "Beziehung";
-App::$strings["Open Set Affinity section by default"] = "Öffne standardmäßig den Bereich für Beziehungsgrad-Einstellungen";
-App::$strings["Me"] = "Ich";
-App::$strings["Family"] = "Familie";
-App::$strings["Friends"] = "Freunde";
-App::$strings["Acquaintances"] = "Bekannte";
-App::$strings["Filter"] = "Filter";
-App::$strings["Open Custom Filter section by default"] = "Öffne standardmäßig den Bereich für benutzerdefinierte Filter";
-App::$strings["Approve this connection"] = "Verbindung genehmigen";
-App::$strings["Accept connection to allow communication"] = "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen";
-App::$strings["Set Affinity"] = "Beziehung festlegen";
-App::$strings["Set Profile"] = "Profil festlegen";
-App::$strings["Set Affinity & Profile"] = "Beziehung und Profile festlegen";
-App::$strings["none"] = "Keine";
-App::$strings["Connection Default Permissions"] = "Standardzugriffsrechte für neue Verbindungen:";
-App::$strings["Connection: %s"] = "Verbindung: %s";
-App::$strings["Apply these permissions automatically"] = "Diese Berechtigungen automatisch anwenden";
-App::$strings["Connection requests will be approved without your interaction"] = "Verbindungsanfragen werden sofort bestätigt, ohne dass Deine aktive Zustimmung erforderlich ist.";
-App::$strings["Permission role"] = "Berechtigungsrolle";
-App::$strings["Add permission role"] = "Berechtigungsrolle hinzufügen";
-App::$strings["This connection's primary address is"] = "Die Hauptadresse der Verbindung ist";
-App::$strings["Available locations:"] = "Verfügbare Klone:";
-App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Die auf dieser Seite angegebenen Berechtigungen werden auf alle neuen Verbindungen angewendet.";
-App::$strings["Connection Tools"] = "Verbindungswerkzeuge";
-App::$strings["Slide to adjust your degree of friendship"] = "Verschieben, um den Grad der Freundschaft zu einzustellen";
-App::$strings["Rating"] = "Bewertung";
-App::$strings["Slide to adjust your rating"] = "Verschieben, um Deine Bewertung einzustellen";
-App::$strings["Optionally explain your rating"] = "Optional kannst Du Deine Bewertung begründen";
-App::$strings["Custom Filter"] = "Benutzerdefinierter Filter";
-App::$strings["Only import posts with this text"] = "Nur Beiträge mit diesem Text importieren";
-App::$strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "Einzelne Wörter pro Zeile, #Tags oder /Reguläre Ausdrücke/. lang=xx (z.B. lang=de) ermöglicht Filterung nach Sprache. Leer lassen, um alle Beiträge zu importieren.";
-App::$strings["Do not import posts with this text"] = "Beiträge mit diesem Text nicht importieren";
-App::$strings["This information is public!"] = "Diese Information ist öffentlich!";
-App::$strings["Connection Pending Approval"] = "Verbindung wartet auf Bestätigung";
-App::$strings["inherited"] = "geerbt";
-App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird.";
-App::$strings["Their Settings"] = "Deren Einstellungen";
+App::$strings["New Profile Field"] = "Neues Profilfeld";
+App::$strings["Field nickname"] = "Kurzname für das Feld";
+App::$strings["System name of field"] = "Systemname des Feldes";
+App::$strings["Input type"] = "Art des Inhalts";
+App::$strings["Field Name"] = "Feldname";
+App::$strings["Label on profile pages"] = "Bezeichnung auf Profilseiten";
+App::$strings["Help text"] = "Hilfetext";
+App::$strings["Additional info (optional)"] = "Zusätzliche Informationen (optional)";
+App::$strings["Save"] = "Speichern";
+App::$strings["Field definition not found"] = "Feld-Definition nicht gefunden";
+App::$strings["Edit Profile Field"] = "Profilfeld bearbeiten";
+App::$strings["Profile Fields"] = "Profil Felder";
+App::$strings["Basic Profile Fields"] = "Notwendige Profil Felder";
+App::$strings["Advanced Profile Fields"] = "Erweiterte Profil Felder";
+App::$strings["(In addition to basic fields)"] = "(zusätzlich zu notwendige Felder)";
+App::$strings["All available fields"] = "Alle verfügbaren Felder";
+App::$strings["Custom Fields"] = "Benutzerdefinierte Felder";
+App::$strings["Create Custom Field"] = "Erstelle benutzerdefiniertes Feld";
+App::$strings["Password changed for account %d."] = "Passwort für Konto %d geändert.";
+App::$strings["Account settings updated."] = "Kontoeinstellungen aktualisiert.";
+App::$strings["Account not found."] = "Konto nicht gefunden.";
+App::$strings["Account Edit"] = "Kontobearbeitung";
+App::$strings["New Password"] = "Neues Passwort";
+App::$strings["New Password again"] = "Neues Passwort wiederholen";
+App::$strings["Technical skill level"] = "Technische Qualifikationsstufe";
+App::$strings["Account language (for emails)"] = "Kontosprache (für E-Mails)";
+App::$strings["Service class"] = "Dienstklasse";
+App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Standardmäßig wird ungefiltertes HTML in eingebetteten Inhalten zugelassen. Das ist prinzipiell unsicher.";
+App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Die empfohlene Einstellung ist, ungefiltertes HTML nur von den nachfolgenden Webseiten zu erlauben:";
+App::$strings["https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />"] = "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />";
+App::$strings["All other embedded content will be filtered, <strong>unless</strong> embedded content from that site is explicitly blocked."] = "Alle anderen eingebetteten Inhalte werden gefiltert, <strong>es sei denn</strong>, eingebettete Inhalte von einer bestimmten Seite sind explizit blockiert.";
+App::$strings["Security"] = "Sicherheit";
+App::$strings["Block public"] = "Öffentlichen Zugriff blockieren";
+App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "Blockiere den öffentlichen Zugriff auf alle ansonsten öffentlichen persönlichen Seiten dieser Website, sofern ein Besucher nicht angemeldet ist.";
+App::$strings["Set \"Transport Security\" HTTP header"] = "Setze den \"Transport Security\" HTTP Header";
+App::$strings["Set \"Content Security Policy\" HTTP header"] = "Setze den \"Content Security Policy\" HTTP Header";
+App::$strings["Allowed email domains"] = "Erlaubte Domains für E-Mails";
+App::$strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "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.";
+App::$strings["Not allowed email domains"] = "Nicht erlaubte Domains für E-Mails";
+App::$strings["Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined."] = "Domains in E-Mail-Adressen, die keine Erlaubnis erhalten, sich auf Deinem Hub zu registrieren. Mehrere Domains können durch Kommas getrennt werden. Platzhalter (*/?) sind möglich. Keine Eingabe bedeutet keine Einschränkung, unabhängig davon, ob unter erlaubte Domains etwas eingegeben wurde.";
+App::$strings["Allow communications only from these sites"] = "Kommunikation nur von diesen Servern/Domains erlauben";
+App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Ein Eintrag pro Zeile. Lasse das Feld leer, um Kommunikation grundlegend von überall her zu erlauben.";
+App::$strings["Block communications from these sites"] = "Kommunikation von diesen Servern/Domains blockieren";
+App::$strings["Allow communications only from these channels"] = "Kommunikation nur von diesen Kanälen erlauben";
+App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = "Ein Kanal (hash) pro Zeile. Leerlassen um jeden Kanal zuzulassen. ";
+App::$strings["Block communications from these channels"] = "Kommunikation von folgenden Kanälen blockieren";
+App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Erlaube Einbettungen nur von sicheren (SSL) Webseiten und Links.";
+App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Erlaube Einbettung von Inhalten mit ungefiltertem HTML nur von diesen Domains";
+App::$strings["One site per line. By default embedded content is filtered."] = "Eine Website/Domain pro Zeile. Standardmäßig wird eingebetteter Inhalt gefiltert.";
+App::$strings["Block embedded HTML from these domains"] = "Eingebettete HTML Inhalte von diesen Servern/Domains blockieren";
+App::$strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar.";
+App::$strings["Visible to:"] = "Sichtbar für:";
+App::$strings["__ctx:acl__ Profile"] = "Profil";
+App::$strings["Permission category saved."] = "Berechtigungsrolle gespeichert.";
+App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Verwende dieses Formular, um Berechtigungsrollen für verschiedene Gruppen von Personen oder Verbindungen zu erstellen.";
+App::$strings["Permission Categories"] = "Berechtigungsrollen";
+App::$strings["Permission Name"] = "Name der Berechtigungsrolle";
 App::$strings["My Settings"] = "Meine Einstellungen";
+App::$strings["inherited"] = "geerbt";
 App::$strings["Individual Permissions"] = "Individuelle Zugriffsrechte";
 App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals vererbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung und können hier nicht verändert werden.";
-App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung. Werden geerbte Einstellungen hier geändert, hat dies keine Auswirkungen.";
-App::$strings["Last update:"] = "Letzte Aktualisierung:";
-App::$strings["Details"] = "Details";
-App::$strings["Organisation"] = "Organisation";
-App::$strings["Title"] = "Titel";
-App::$strings["Phone"] = "Telefon";
-App::$strings["Instant messenger"] = "Sofortnachrichtendienst";
-App::$strings["Website"] = "Webseite";
-App::$strings["Note"] = "Hinweis";
-App::$strings["Mobile"] = "Mobil";
-App::$strings["Home"] = "Home";
-App::$strings["Work"] = "Arbeit";
-App::$strings["Add Contact"] = "Kontakt hinzufügen";
-App::$strings["Add Field"] = "Feld hinzufügen";
-App::$strings["P.O. Box"] = "Postfach";
-App::$strings["Additional"] = "Zusätzlich";
-App::$strings["Street"] = "Straße";
-App::$strings["Locality"] = "Ortschaft";
-App::$strings["Region"] = "Region";
-App::$strings["ZIP Code"] = "Postleitzahl";
-App::$strings["Country"] = "Land";
-App::$strings["\$Projectname"] = "\$Projectname";
-App::$strings["Welcome to %s"] = "Willkommen auf %s";
-App::$strings["Permission Denied."] = "Zugriff verweigert.";
-App::$strings["File not found."] = "Datei nicht gefunden.";
-App::$strings["Edit file permissions"] = "Dateiberechtigungen bearbeiten";
-App::$strings["Set/edit permissions"] = "Berechtigungen setzen/ändern";
-App::$strings["Include all files and sub folders"] = "Alle Dateien und Unterverzeichnisse einbinden";
-App::$strings["Return to file list"] = "Zurück zur Dateiliste";
-App::$strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen";
-App::$strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken";
-App::$strings["Share this file"] = "Diese Datei freigeben";
-App::$strings["Show URL to this file"] = "URL zu dieser Datei anzeigen";
-App::$strings["Notify your contacts about this file"] = "Meine Kontakte über diese Datei benachrichtigen";
-App::$strings["Photos"] = "Fotos";
-App::$strings["Apps"] = "Apps";
-App::$strings["Permissions denied."] = "Berechtigung verweigert.";
-App::$strings["l, F j"] = "l, j. F";
-App::$strings["Link to Source"] = "Link zur Quelle";
-App::$strings["Edit Event"] = "Termin bearbeiten";
-App::$strings["Create Event"] = "Termin anlegen";
-App::$strings["Export"] = "Exportieren";
-App::$strings["Import"] = "Import";
-App::$strings["Today"] = "Heute";
-App::$strings["Privacy group created."] = "Gruppe wurde erstellt.";
-App::$strings["Could not create privacy group."] = "Gruppe konnte nicht erstellt werden.";
-App::$strings["Privacy group not found."] = "Gruppe nicht gefunden.";
-App::$strings["Privacy group updated."] = "Gruppe wurde aktualisiert.";
-App::$strings["Create a group of channels."] = "Erstelle eine Gruppe für Kanäle.";
-App::$strings["Privacy group name: "] = "Gruppenname:";
-App::$strings["Members are visible to other channels"] = "Mitglieder sind sichtbar für andere Kanäle";
-App::$strings["Privacy group removed."] = "Gruppe wurde entfernt.";
-App::$strings["Unable to remove privacy group."] = "Gruppe konnte nicht entfernt werden.";
-App::$strings["Privacy group editor"] = "Gruppeneditor";
-App::$strings["All Connected Channels"] = "Alle verbundenen Kanäle";
-App::$strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus.";
-App::$strings["Invalid message"] = "Ungültige Beitrags-ID (mid)";
-App::$strings["no results"] = "keine Ergebnisse";
-App::$strings["channel sync processed"] = "Kanal-Sync verarbeitet";
-App::$strings["queued"] = "zur Warteschlange hinzugefügt";
-App::$strings["posted"] = "zugestellt";
-App::$strings["accepted for delivery"] = "für Zustellung akzeptiert";
-App::$strings["updated"] = "aktualisiert";
-App::$strings["update ignored"] = "Aktualisierung ignoriert";
-App::$strings["permission denied"] = "Zugriff verweigert";
-App::$strings["recipient not found"] = "Empfänger nicht gefunden.";
-App::$strings["mail recalled"] = "Mail widerrufen";
-App::$strings["duplicate mail received"] = "Doppelte Mail erhalten";
-App::$strings["mail delivered"] = "Mail zugestellt";
-App::$strings["Delivery report for %1\$s"] = "Zustellungsbericht für %1\$s";
-App::$strings["Options"] = "Optionen";
-App::$strings["Redeliver"] = "Erneut zustellen";
-App::$strings["webpage"] = "Webseite";
-App::$strings["block"] = "Block";
-App::$strings["layout"] = "Layout";
-App::$strings["menu"] = "Menü";
-App::$strings["%s element installed"] = "Element für %s installiert";
-App::$strings["%s element installation failed"] = "Installation des Elements %s fehlgeschlagen";
-App::$strings["Nothing to import."] = "Nichts zu importieren.";
-App::$strings["Unable to download data from old server"] = "Daten können vom alten Server nicht heruntergeladen werden";
-App::$strings["Imported file is empty."] = "Die importierte Datei ist leer.";
-App::$strings["Warning: Database versions differ by %1\$d updates."] = "Achtung: Datenbankversionen unterscheiden sich um %1\$d Aktualisierungen.";
-App::$strings["Import completed"] = "Import abgeschlossen";
-App::$strings["Import Items"] = "Beiträge importieren";
-App::$strings["Use this form to import existing posts and content from an export file."] = "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren.";
-App::$strings["File to Upload"] = "Hochzuladende Datei:";
-App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet.";
-App::$strings["Create a new channel"] = "Neuen Kanal anlegen";
-App::$strings["Create New"] = "Neu anlegen";
-App::$strings["Channel Manager"] = "Kanal-Manager";
-App::$strings["Current Channel"] = "Aktueller Kanal";
-App::$strings["Switch to one of your channels by selecting it."] = "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst.";
-App::$strings["Default Channel"] = "Standard Kanal";
-App::$strings["Make Default"] = "Zum Standard machen";
-App::$strings["%d new messages"] = "%d neue Nachrichten";
-App::$strings["%d new introductions"] = "%d neue Vorstellungen";
-App::$strings["Delegated Channel"] = "Delegierte Kanäle";
-App::$strings["Your service plan only allows %d channels."] = "Dein Vertrag erlaubt nur %d Kanäle.";
-App::$strings["No channel. Import failed."] = "Kein Kanal. Import fehlgeschlagen.";
-App::$strings["Import completed."] = "Import abgeschlossen.";
-App::$strings["You must be logged in to use this feature."] = "Du musst angemeldet sein um diese Funktion zu nutzen.";
-App::$strings["Import Channel"] = "Kanal importieren";
-App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren.";
-App::$strings["Or provide the old server/hub details"] = "Oder gib die Details Deines bisherigen \$Projectname-Hubs ein";
-App::$strings["Your old identity address (xyz@example.com)"] = "Bisherige Kanal-Adresse (xyz@example.com)";
-App::$strings["Your old login email address"] = "Deine alte Login-E-Mail-Adresse";
-App::$strings["Your old login password"] = "Dein altes Passwort";
-App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige \$Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein.";
-App::$strings["Make this hub my primary location"] = "Dieser $Pojectname-Hub ist mein primärer Hub.";
-App::$strings["Move this channel (disable all previous locations)"] = "Verschiebe diesen Kanal (deaktiviere alle vorherigen Adressen/Klone)";
-App::$strings["Import a few months of posts if possible (limited by available memory"] = "Importiere die Beiträge einiger Monate, sofern möglich (beschränkt durch verfügbaren Speicher)";
-App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen.";
-App::$strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar.";
-App::$strings["Visible to:"] = "Sichtbar für:";
-App::$strings["Hub not found."] = "Server nicht gefunden.";
-App::$strings["Unable to create element."] = "Element konnte nicht erstellt werden.";
-App::$strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren.";
-App::$strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen.";
-App::$strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements";
-App::$strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
-App::$strings["Link Name"] = "Name des Links";
-App::$strings["Link or Submenu Target"] = "Ziel des Links oder Untermenüs";
-App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen.";
-App::$strings["Use magic-auth if available"] = "Magic-Auth verwenden, falls verfügbar";
-App::$strings["Open link in new window"] = "Öffne Link in neuem Fenster";
-App::$strings["Order in list"] = "Reihenfolge in der Liste";
-App::$strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert";
-App::$strings["Submit and finish"] = "Absenden und fertigstellen";
-App::$strings["Submit and continue"] = "Absenden und fortfahren";
-App::$strings["Menu:"] = "Menü:";
-App::$strings["Link Target"] = "Ziel des Links";
-App::$strings["Edit menu"] = "Menü bearbeiten";
-App::$strings["Edit element"] = "Bestandteil bearbeiten";
-App::$strings["Drop element"] = "Bestandteil löschen";
-App::$strings["New element"] = "Neues Bestandteil";
-App::$strings["Edit this menu container"] = "Diesen Menü-Container bearbeiten";
-App::$strings["Add menu element"] = "Menüelement hinzufügen";
-App::$strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
-App::$strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
-App::$strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden.";
-App::$strings["Menu item deleted."] = "Menü-Bestandteil gelöscht.";
-App::$strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden.";
-App::$strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil";
-App::$strings["Link text"] = "Link Text";
-App::$strings["App installed."] = "App installiert.";
-App::$strings["Malformed app."] = "Fehlerhafte App.";
-App::$strings["Embed code"] = "Code einbetten";
-App::$strings["Edit App"] = "App bearbeiten";
-App::$strings["Create App"] = "App erstellen";
-App::$strings["Name of app"] = "Name der App";
-App::$strings["Required"] = "Benötigt";
-App::$strings["Location (URL) of app"] = "Ort (URL) der App";
-App::$strings["Description"] = "Beschreibung";
-App::$strings["Photo icon URL"] = "URL zum Icon";
-App::$strings["80 x 80 pixels - optional"] = "80 x 80 Pixel – optional";
-App::$strings["Categories (optional, comma separated list)"] = "Kategorien (optional, kommagetrennte Liste)";
-App::$strings["Version ID"] = "Versions-ID";
-App::$strings["Price of app"] = "Preis der App";
-App::$strings["Location (URL) to purchase app"] = "Ort (URL), um die App zu kaufen";
-App::$strings["No ratings"] = "Keine Bewertungen";
-App::$strings["Rating: "] = "Bewertung: ";
-App::$strings["Website: "] = "Webseite: ";
-App::$strings["Description: "] = "Beschreibung: ";
-App::$strings["Item not available."] = "Element nicht verfügbar.";
-App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s ist %2\$s";
-App::$strings["Mood"] = "Laune";
-App::$strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden";
-App::$strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr.";
-App::$strings["System Notifications"] = "System-Benachrichtigungen";
-App::$strings["Profile not found."] = "Profil nicht gefunden.";
-App::$strings["Profile deleted."] = "Profil gelöscht.";
-App::$strings["Profile-"] = "Profil-";
-App::$strings["New profile created."] = "Neues Profil erstellt.";
-App::$strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden.";
-App::$strings["Profile unavailable to export."] = "Dieses Profil kann nicht exportiert werden.";
-App::$strings["Profile Name is required."] = "Profil-Name erforderlich.";
-App::$strings["Marital Status"] = "Familienstand";
-App::$strings["Romantic Partner"] = "Romantische Partner";
-App::$strings["Likes"] = "Gefällt";
-App::$strings["Dislikes"] = "Gefällt nicht";
-App::$strings["Work/Employment"] = "Arbeit/Anstellung";
-App::$strings["Religion"] = "Religion";
-App::$strings["Political Views"] = "Politische Ansichten";
-App::$strings["Gender"] = "Geschlecht";
-App::$strings["Sexual Preference"] = "Sexuelle Orientierung";
-App::$strings["Homepage"] = "Webseite";
-App::$strings["Interests"] = "Hobbys/Interessen";
-App::$strings["Profile updated."] = "Profil aktualisiert.";
-App::$strings["Hide your connections list from viewers of this profile"] = "Deine Verbindungen vor Betrachtern dieses Profils verbergen";
-App::$strings["Edit Profile Details"] = "Bearbeite Profil-Details";
-App::$strings["View this profile"] = "Dieses Profil ansehen";
-App::$strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
-App::$strings["Profile Tools"] = "Profilwerkzeuge";
-App::$strings["Change cover photo"] = "Titelbild ändern";
-App::$strings["Change profile photo"] = "Profilfoto ändern";
-App::$strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen übernehmen";
-App::$strings["Clone this profile"] = "Dieses Profil klonen";
-App::$strings["Delete this profile"] = "Dieses Profil löschen";
-App::$strings["Add profile things"] = "Sachen zum Profil hinzufügen";
-App::$strings["Personal"] = "Persönlich";
-App::$strings["Relation"] = "Beziehung";
-App::$strings["Miscellaneous"] = "Verschiedenes";
-App::$strings["Import profile from file"] = "Profil aus einer Datei importieren";
-App::$strings["Export profile to file"] = "Profil in eine Datei exportieren";
-App::$strings["Your gender"] = "Dein Geschlecht";
-App::$strings["Marital status"] = "Familienstand";
-App::$strings["Sexual preference"] = "Sexuelle Orientierung";
-App::$strings["Profile name"] = "Profilname";
-App::$strings["This is your default profile."] = "Das ist Dein Standardprofil.";
-App::$strings["Your full name"] = "Dein voller Name";
-App::$strings["Title/Description"] = "Titel/Beschreibung";
-App::$strings["Street address"] = "Straße und Hausnummer";
-App::$strings["Locality/City"] = "Wohnort";
-App::$strings["Region/State"] = "Region/Bundesstaat";
-App::$strings["Postal/Zip code"] = "Postleitzahl";
-App::$strings["Who (if applicable)"] = "Wer (falls anwendbar)";
-App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
-App::$strings["Since (date)"] = "Seit (Datum)";
-App::$strings["Tell us about yourself"] = "Erzähle uns ein wenig von Dir";
-App::$strings["Homepage URL"] = "Homepage-URL";
-App::$strings["Hometown"] = "Heimatort";
-App::$strings["Political views"] = "Politische Ansichten";
-App::$strings["Religious views"] = "Religiöse Ansichten";
-App::$strings["Keywords used in directory listings"] = "Schlüsselwörter, die in Verzeichnis-Auflistungen verwendet werden";
-App::$strings["Example: fishing photography software"] = "Beispiel: Angeln Fotografie Software";
-App::$strings["Musical interests"] = "Musikalische Interessen";
-App::$strings["Books, literature"] = "Bücher, Literatur";
-App::$strings["Television"] = "Fernsehen";
-App::$strings["Film/Dance/Culture/Entertainment"] = "Film/Tanz/Kultur/Unterhaltung";
-App::$strings["Hobbies/Interests"] = "Hobbys/Interessen";
-App::$strings["Love/Romance"] = "Liebe/Romantik";
-App::$strings["School/Education"] = "Schule/Ausbildung";
-App::$strings["Contact information and social networks"] = "Kontaktinformation und soziale Netzwerke";
-App::$strings["My other channels"] = "Meine anderen Kanäle";
-App::$strings["Profile Image"] = "Profilfoto:";
-App::$strings["Edit Profiles"] = "Profile bearbeiten";
-App::$strings["Authorize application connection"] = "Zugriff für die Anwendung autorisieren";
-App::$strings["Return to your app and insert this Security Code:"] = "Gehen Sie zu Ihrer App zurück und tragen Sie diesen Sicherheitscode ein:";
-App::$strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen.";
-App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?";
-App::$strings["Total invitation limit exceeded."] = "Einladungslimit überschritten.";
-App::$strings["%s : Not a valid email address."] = "%s : Keine gültige Email Adresse.";
-App::$strings["Please join us on \$Projectname"] = "Schließe Dich uns auf \$Projectname an!";
-App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines \$Projectname-Servers.";
-App::$strings["%s : Message delivery failed."] = "%s : Nachricht konnte nicht zugestellt werden.";
-App::$strings["%d message sent."] = array(
-	0 => "%d Nachricht gesendet.",
-	1 => "%d Nachrichten gesendet.",
-);
-App::$strings["You have no more invitations available"] = "Du hast keine weiteren verfügbare Einladungen";
-App::$strings["Send invitations"] = "Einladungen senden";
-App::$strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
-App::$strings["Your message:"] = "Deine Nachricht:";
-App::$strings["Please join my community on \$Projectname."] = "Schließe Dich uns auf \$Projectname an!";
-App::$strings["You will need to supply this invitation code:"] = "Bitte verwende bei der Registrierung den folgenden Einladungscode:";
-App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registriere Dich auf einem beliebigen \$Projectname-Hub (sie sind alle miteinander verbunden)";
-App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Gib meine \$Projectname-Adresse im Suchfeld ein.";
-App::$strings["or visit"] = "oder besuche";
-App::$strings["3. Click [Connect]"] = "3. Klicke auf [Verbinden]";
-App::$strings["About this site"] = "Über diese Seite";
-App::$strings["Site Name"] = "Seitenname";
-App::$strings["Administrator"] = "Administrator";
-App::$strings["Software and Project information"] = "Software und Projektinformationen";
-App::$strings["This site is powered by \$Projectname"] = "Diese Website wird bereitgestellt durch \$Projectname";
-App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "Verbundene, dezentrale Netzwerk- und Identitätsdienste, ermöglicht mittels Zot";
-App::$strings["Version %s"] = "Version %s";
-App::$strings["Project homepage"] = "Projekt-Website";
-App::$strings["Developer homepage"] = "Entwickler-Website";
-App::$strings["Create Channel"] = "Einen neuen Kanal anlegen";
-App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen.";
-App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server.";
-App::$strings["\$Projectname Server - Setup"] = "\$Projectname Server-Einrichtung";
-App::$strings["Could not connect to database."] = "Kann nicht mit der Datenbank verbinden.";
-App::$strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS.";
-App::$strings["Could not create table."] = "Konnte Tabelle nicht erstellen.";
-App::$strings["Your site database has been installed."] = "Die Datenbank Deines Hubs wurde installiert.";
-App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren.";
-App::$strings["Please see the file \"install/INSTALL.txt\"."] = "Lies die Datei \"install/INSTALL.txt\".";
-App::$strings["System check"] = "Systemprüfung";
-App::$strings["Check again"] = "Nochmal prüfen";
-App::$strings["Database connection"] = "Datenbankverbindung";
-App::$strings["In order to install \$Projectname we need to know how to connect to your database."] = "Um \$Projectname zu installieren, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können.";
-App::$strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast.";
-App::$strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst.";
-App::$strings["Database Server Name"] = "Datenbankservername";
-App::$strings["Default is 127.0.0.1"] = "Standard ist 127.0.0.1";
-App::$strings["Database Port"] = "Datenbankport";
-App::$strings["Communication port number - use 0 for default"] = "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung";
-App::$strings["Database Login Name"] = "Datenbank-Benutzername";
-App::$strings["Database Login Password"] = "Datenbank-Passwort";
-App::$strings["Database Name"] = "Datenbankname";
-App::$strings["Database Type"] = "Datenbanktyp";
-App::$strings["Site administrator email address"] = "E-Mail Adresse des Seiten-Administrators";
-App::$strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst.";
-App::$strings["Website URL"] = "Webseiten-URL";
-App::$strings["Please use SSL (https) URL if available."] = "Nutze wenn möglich eine SSL-URL (https).";
-App::$strings["Please select a default timezone for your website"] = "Standard-Zeitzone für Deinen Server";
-App::$strings["Site settings"] = "Seiteneinstellungen";
-App::$strings["PHP version 5.5 or greater is required."] = "PHP-Version 5.5 oder höher ist erforderlich.";
-App::$strings["PHP version"] = "PHP-Version";
-App::$strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden.";
-App::$strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen.";
-App::$strings["PHP executable path"] = "PHP-Pfad zu ausführbarer Datei";
-App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren.";
-App::$strings["Command line PHP"] = "PHP-Befehlszeile";
-App::$strings["Unable to check command line PHP, as shell_exec() is disabled. This is required."] = "Prüfung auf Kommandozeilen-PHP fehlgeschlagen, da shell_exec() deaktiviert ist. Dies wird aber benötigt.";
-App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert.";
-App::$strings["This is required for message delivery to work."] = "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert.";
-App::$strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-App::$strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "Die Maximalgröße für Uploads insgesamt liegt bei %s. Die Maximalgröße für eine Datei liegt bei %s. Es können maximal %d Dateien gleichzeitig hochgeladen werden.";
-App::$strings["You can adjust these settings in the server php.ini file."] = "Du kannst diese Einstellungen in der php.ini - Datei des Servers anpassen.";
-App::$strings["PHP upload limits"] = "PHP-Hochladebeschränkungen";
-App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen.";
-App::$strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung.";
-App::$strings["Generate encryption keys"] = "Verschlüsselungsschlüssel erzeugen";
-App::$strings["libCurl PHP module"] = "libCurl-PHP-Modul";
-App::$strings["GD graphics PHP module"] = "GD-Grafik-PHP-Modul";
-App::$strings["OpenSSL PHP module"] = "OpenSSL-PHP-Modul";
-App::$strings["PDO database PHP module"] = "PDO-Datenbank-PHP-Modul";
-App::$strings["mb_string PHP module"] = "mb_string-PHP-Modul";
-App::$strings["xml PHP module"] = "xml-PHP-Modul";
-App::$strings["Apache mod_rewrite module"] = "Apache-mod_rewrite-Modul";
-App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert.";
-App::$strings["exec"] = "exec";
-App::$strings["Error: exec is required but is either not installed or has been disabled in php.ini"] = "Fehler: exec ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
-App::$strings["shell_exec"] = "shell_exec";
-App::$strings["Error: shell_exec is required but is either not installed or has been disabled in php.ini"] = "Fehler: shell_exec ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
-App::$strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert.";
-App::$strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert.";
-App::$strings["Error: openssl PHP module required but not installed."] = "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert.";
-App::$strings["Error: PDO database PHP module required but not installed."] = "Fehler: PDO-Datenbank-PHP-Modul ist erforderlich, aber nicht installiert.";
-App::$strings["Error: mb_string PHP module required but not installed."] = "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert.";
-App::$strings["Error: xml PHP module required for DAV but not installed."] = "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert.";
-App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht.";
-App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst.";
-App::$strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Hubzilla-Installation speichern musst.";
-App::$strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt.";
-App::$strings[".htconfig.php is writable"] = ".htconfig.php ist beschreibbar";
-App::$strings["This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Diese Software verwendet die Smarty3 Template Engine, um Vorlagen für die Webdarstellung zu verarbeiten. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen.";
-App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "Um diese kompilierten Vorlagen speichern zu können, braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Hubzilla-Stammverzeichnisses.";
-App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat.";
-App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält.";
-App::$strings["%s is writable"] = "%s ist beschreibbar";
-App::$strings["This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"] = "Diese Software benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Webserver benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Web-Stammverzeichnisses.";
-App::$strings["store is writable"] = "store ist schreibbar";
-App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server.";
-App::$strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich.";
-App::$strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können.";
-App::$strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer \$Projectname-Hubs (die mit korrekten Zertifikaten ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird).";
-App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen.";
-App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind.";
-App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = "Wenn Du sicher bist, dass das Zertifikat gültig und von einer vertrauenswürdigen Zertifizierungsstelle signiert ist, prüfe auf ggf. noch zu installierende Zwischenzertifikate (intermediate). Diese werden nicht unbedingt von Browsern benötigt, aber sehr wohl für die Kommunikation zwischen Servern.";
-App::$strings["SSL certificate validation"] = "SSL Zertifikatverifizierung";
-App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:";
-App::$strings["Url rewrite is working"] = "Url rewrite funktioniert";
-App::$strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen.";
-App::$strings["Errors encountered creating database tables."] = "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten.";
-App::$strings["<h1>What next</h1>"] = "<h1>Was als Nächstes</h1>";
-App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten.";
-App::$strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gesehen";
-App::$strings["Poke"] = "Anstupsen";
-App::$strings["Poke somebody"] = "Jemanden anstupsen";
-App::$strings["Poke/Prod"] = "Anstupsen/Knuffen";
-App::$strings["Poke, prod or do other things to somebody"] = "Jemanden anstupsen, knuffen oder sonstiges";
-App::$strings["Recipient"] = "Empfänger";
-App::$strings["Choose what you wish to do to recipient"] = "Wähle, was Du mit dem/r Empfänger/in tun willst";
-App::$strings["Make this post private"] = "Diesen Beitrag privat machen";
-App::$strings["Unable to find your hub."] = "Konnte Deinen Server nicht finden.";
-App::$strings["Post successful."] = "Veröffentlichung erfolgreich.";
-App::$strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden.";
-App::$strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
-App::$strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
-App::$strings["Duplicate post suppressed."] = "Doppelter Beitrag unterdrückt.";
-App::$strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
-App::$strings["Unable to obtain post information from database."] = "Beitragsinformationen können nicht aus der Datenbank abgerufen werden.";
-App::$strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
-App::$strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
-App::$strings["This setting requires special processing and editing has been blocked."] = "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert.";
-App::$strings["Configuration Editor"] = "Konfigurationseditor";
-App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird.";
-App::$strings["vcard"] = "VCard";
-App::$strings["Blocks"] = "Blöcke";
-App::$strings["Block Title"] = "Titel des Blocks";
-App::$strings["Layouts"] = "Layouts";
-App::$strings["Help"] = "Hilfe";
-App::$strings["Comanche page description language help"] = "Hilfe zur Comanche-Seitenbeschreibungssprache";
-App::$strings["Layout Description"] = "Layout-Beschreibung";
-App::$strings["Download PDL file"] = "PDL-Datei herunterladen";
-App::$strings["Website:"] = "Webseite:";
-App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Kanal [%s] (auf diesem Server noch unbekannt)";
-App::$strings["Rating (this information is public)"] = "Bewertung (öffentlich sichtbar)";
-App::$strings["Optionally explain your rating (this information is public)"] = "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)";
-App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird.";
-App::$strings["Use Photo for Profile"] = "Foto für Profil verwenden";
-App::$strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch";
-App::$strings["Use"] = "Verwenden";
-App::$strings["Calendar entries imported."] = "Kalendereinträge wurden importiert.";
-App::$strings["No calendar entries found."] = "Keine Kalendereinträge gefunden.";
-App::$strings["Event can not end before it has started."] = "Termin-Ende liegt vor dem Beginn.";
-App::$strings["Unable to generate preview."] = "Vorschau konnte nicht erzeugt werden.";
-App::$strings["Event title and start time are required."] = "Titel und Startzeit des Termins sind erforderlich.";
-App::$strings["Event not found."] = "Termin nicht gefunden.";
-App::$strings["Edit event title"] = "Termintitel bearbeiten";
-App::$strings["Event title"] = "Termintitel";
-App::$strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
-App::$strings["Edit Category"] = "Kategorie bearbeiten";
-App::$strings["Category"] = "Kategorie";
-App::$strings["Edit start date and time"] = "Startdatum und -zeit bearbeiten";
-App::$strings["Start date and time"] = "Startdatum und -zeit";
-App::$strings["Finish date and time are not known or not relevant"] = "Enddatum und -zeit sind unbekannt oder irrelevant";
-App::$strings["Edit finish date and time"] = "Enddatum und -zeit bearbeiten";
-App::$strings["Finish date and time"] = "Enddatum und -zeit";
-App::$strings["Adjust for viewer timezone"] = "An die Zeitzone des Betrachters anpassen";
-App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien.";
-App::$strings["Edit Description"] = "Beschreibung bearbeiten";
-App::$strings["Edit Location"] = "Ort bearbeiten";
-App::$strings["Permission settings"] = "Berechtigungs-Einstellungen";
-App::$strings["Timezone:"] = "Zeitzone:";
-App::$strings["Advanced Options"] = "Weitere Optionen";
-App::$strings["Edit event"] = "Termin bearbeiten";
-App::$strings["Delete event"] = "Termin löschen";
-App::$strings["calendar"] = "Kalender";
-App::$strings["Month"] = "Monat";
-App::$strings["Week"] = "Woche";
-App::$strings["Day"] = "Tag";
-App::$strings["Event removed"] = "Termin gelöscht";
-App::$strings["Failed to remove event"] = "Termin konnte nicht gelöscht werden";
-App::$strings["No channel."] = "Kein Kanal.";
-App::$strings["Common connections"] = "Gemeinsame Verbindungen";
-App::$strings["No connections in common."] = "Keine gemeinsamen Verbindungen.";
-App::$strings["toggle full screen mode"] = "auf Vollbildmodus umschalten";
-App::$strings["Invalid profile identifier."] = "Ungültiger Profil-Identifikator";
-App::$strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits-Editor";
-App::$strings["Profile"] = "Profil";
-App::$strings["Click on a contact to add or remove."] = "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen.";
-App::$strings["Visible To"] = "Sichtbar für";
-App::$strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können.";
-App::$strings["Posts and comments"] = "Beiträge und Kommentare";
-App::$strings["Only posts"] = "Nur Beiträge";
-App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
-App::$strings["No valid account found."] = "Kein gültiges Konto gefunden.";
-App::$strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails.";
-App::$strings["Site Member (%s)"] = "Nutzer (%s)";
-App::$strings["Password reset requested at %s"] = "Passwort-Rücksetzung auf %s angefordert";
-App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen.";
-App::$strings["Password Reset"] = "Zurücksetzen des Kennworts";
-App::$strings["Your password has been reset as requested."] = "Dein Passwort wurde wie angefordert neu erstellt.";
-App::$strings["Your new password is"] = "Dein neues Passwort lautet";
-App::$strings["Save or copy your new password - and then"] = "Speichere oder kopiere Dein neues Passwort – und dann";
-App::$strings["click here to login"] = "Klicke hier, um dich anzumelden";
-App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden.";
-App::$strings["Your password has changed at %s"] = "Auf %s wurde Dein Passwort geändert";
-App::$strings["Forgot your Password?"] = "Kennwort vergessen?";
-App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail.";
-App::$strings["Email Address"] = "E-Mail Adresse";
-App::$strings["Reset"] = "Zurücksetzen";
-App::$strings["Select a bookmark folder"] = "Lesezeichenordner wählen";
-App::$strings["Save Bookmark"] = "Lesezeichen speichern";
-App::$strings["URL of bookmark"] = "URL des Lesezeichens";
-App::$strings["Or enter new bookmark folder name"] = "Oder gib einen neuen Namen für den Lesezeichenordner ein";
+App::$strings["Friends"] = "Freunde";
+App::$strings["Settings updated."] = "Einstellungen aktualisiert.";
+App::$strings["Nobody except yourself"] = "Niemand außer Dir selbst";
+App::$strings["Only those you specifically allow"] = "Nur die, denen Du es explizit erlaubst";
+App::$strings["Approved connections"] = "Angenommene Verbindungen";
+App::$strings["Any connections"] = "Beliebige Verbindungen";
+App::$strings["Anybody on this website"] = "Jeder auf dieser Website";
+App::$strings["Anybody in this network"] = "Alle \$Projectname-Mitglieder";
+App::$strings["Anybody authenticated"] = "Jeder authentifizierte";
+App::$strings["Anybody on the internet"] = "Jeder im Internet";
+App::$strings["Publish your default profile in the network directory"] = "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen";
+App::$strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
+App::$strings["or"] = "oder";
+App::$strings["Your channel address is"] = "Deine Kanal-Adresse lautet";
+App::$strings["Your files/photos are accessible via WebDAV at"] = "Deine Dateien/Fotos sind via WebDAV verfügbar auf";
+App::$strings["Channel Settings"] = "Kanal-Einstellungen";
+App::$strings["Basic Settings"] = "Grundeinstellungen";
+App::$strings["Full Name:"] = "Voller Name:";
+App::$strings["Email Address:"] = "Email Adresse:";
+App::$strings["Your Timezone:"] = "Ihre Zeitzone:";
+App::$strings["Default Post Location:"] = "Standardstandort:";
+App::$strings["Geographical location to display on your posts"] = "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll";
+App::$strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
+App::$strings["Adult Content"] = "Nicht jugendfreie Inhalte";
+App::$strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)";
+App::$strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
+App::$strings["Your permissions are already configured. Click to view/adjust"] = "Deine Zugriffsrechte sind schon konfiguriert. Klicke hier, um sie zu betrachten oder zu ändern";
+App::$strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
+App::$strings["Prevents displaying in your profile that you are online"] = "Verhindert die Anzeige Deines Online-Status in deinem Profil";
+App::$strings["Simple Privacy Settings:"] = "Einfache Privatsphäre-Einstellungen";
+App::$strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Komplett offen – <em>extrem ungeschützt (mit großer Vorsicht verwenden!)</em>";
+App::$strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Typisch – <em>Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)</em>";
+App::$strings["Private - <em>default private, never open or public</em>"] = "Privat – <em>Standard privat, nie offen oder öffentlich</em>";
+App::$strings["Blocked - <em>default blocked to/from everybody</em>"] = "Blockiert – <em>Alle standardmäßig blockiert</em>";
+App::$strings["Allow others to tag your posts"] = "Erlaube anderen, Deine Beiträge zu verschlagworten";
+App::$strings["Often used by the community to retro-actively flag inappropriate content"] = "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren";
+App::$strings["Channel Permission Limits"] = "Kanal-Berechtigungslimits";
+App::$strings["Expire other channel content after this many days"] = "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen";
+App::$strings["0 or blank to use the website limit."] = "0 oder leer lassen, um den voreingestellten Wert der Webseite zu verwenden.";
+App::$strings["This website expires after %d days."] = "Diese Webseite läuft nach %d Tagen ab.";
+App::$strings["This website does not expire imported content."] = "Diese Webseite lässt importierte Inhalte nicht verfallen.";
+App::$strings["The website limit takes precedence if lower than your limit."] = "Das Verfallslimit der Webseite hat Vorrang, wenn es niedriger als Deines hier ist.";
+App::$strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:";
+App::$strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern";
+App::$strings["Default Access Control List (ACL)"] = "Standard-Zugriffsberechtigungsliste (ACL)";
+App::$strings["Use my default audience setting for the type of object published"] = "Verwende Deine eingestellte Standard-Zielgruppe des jeweiligen Inhaltstyps";
+App::$strings["Channel permissions category:"] = "Zugriffsrechte-Kategorie des Kanals:";
+App::$strings["Default Permissions Group"] = "Standard-Berechtigungsgruppe";
+App::$strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:";
+App::$strings["Useful to reduce spamming"] = "Nützlich, um Spam zu verringern";
+App::$strings["Notification Settings"] = "Benachrichtigungs-Einstellungen";
+App::$strings["By default post a status message when:"] = "Sende standardmäßig Status-Nachrichten, wenn:";
+App::$strings["accepting a friend request"] = "Du eine Verbindungsanfrage annimmst";
+App::$strings["joining a forum/community"] = "Du einem Forum beitrittst";
+App::$strings["making an <em>interesting</em> profile change"] = "Du eine <em>interessante</em> Änderung an Deinem Profil vornimmst";
+App::$strings["Send a notification email when:"] = "Eine E-Mail-Benachrichtigung senden, wenn:";
+App::$strings["You receive a connection request"] = "Du eine Verbindungsanfrage erhältst";
+App::$strings["Your connections are confirmed"] = "Eine Verbindung bestätigt wurde";
+App::$strings["Someone writes on your profile wall"] = "Jemand auf Deine Pinnwand schreibt";
+App::$strings["Someone writes a followup comment"] = "Jemand einen Beitrag kommentiert";
+App::$strings["You receive a private message"] = "Du eine private Nachricht erhältst";
+App::$strings["You receive a friend suggestion"] = "Du einen Kontaktvorschlag erhältst";
+App::$strings["You are tagged in a post"] = "Du in einem Beitrag erwähnt wurdest";
+App::$strings["You are poked/prodded/etc. in a post"] = "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest";
+App::$strings["Someone likes your post/comment"] = "Jemand mag Ihren Beitrag/Kommentar";
+App::$strings["Show visual notifications including:"] = "Visuelle Benachrichtigungen anzeigen für:";
+App::$strings["Unseen grid activity"] = "Ungesehene Netzwerk-Aktivität";
+App::$strings["Unseen channel activity"] = "Ungesehene Kanal-Aktivität";
+App::$strings["Unseen private messages"] = "Ungelesene persönliche Nachrichten";
+App::$strings["Recommended"] = "Empfohlen";
+App::$strings["Upcoming events"] = "Baldige Termine";
+App::$strings["Events today"] = "Heutige Termine";
+App::$strings["Upcoming birthdays"] = "Baldige Geburtstage";
+App::$strings["Not available in all themes"] = "Nicht in allen Themes verfügbar";
+App::$strings["System (personal) notifications"] = "System – (persönliche) Benachrichtigungen";
+App::$strings["System info messages"] = "System – Info-Nachrichten";
+App::$strings["System critical alerts"] = "System – kritische Warnungen";
+App::$strings["New connections"] = "Neue Verbindungen";
+App::$strings["System Registrations"] = "System – Registrierungen";
+App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen anzeigen";
+App::$strings["Notify me of events this many days in advance"] = "Benachrichtige mich zu Terminen so viele Tage im Voraus";
+App::$strings["Must be greater than 0"] = "Muss größer als 0 sein";
+App::$strings["Advanced Account/Page Type Settings"] = "Erweiterte Account- und Seitenart-Einstellungen";
+App::$strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Accounts unter speziellen Umständen";
+App::$strings["Miscellaneous Settings"] = "Sonstige Einstellungen";
+App::$strings["Default photo upload folder"] = "Voreingestellter Ordner für hochgeladene Fotos";
+App::$strings["%Y - current year, %m -  current month"] = "%Y - aktuelles Jahr, %m -  aktueller Monat";
+App::$strings["Default file upload folder"] = "Voreingestellter Ordner für hochgeladene Dateien";
+App::$strings["Personal menu to display in your channel pages"] = "Eigenes Menü zur Anzeige auf den Seiten deines Kanals";
+App::$strings["Remove this channel."] = "Diesen Kanal löschen";
+App::$strings["Firefox Share \$Projectname provider"] = "\$Projectname-Provider für Firefox Share";
+App::$strings["Start calendar week on Monday"] = "Beginne die kalendarische Woche am Montag";
+App::$strings["Additional Features"] = "Zusätzliche Funktionen";
+App::$strings["This channel is limited to %d tokens"] = "Dieser Kanal ist auf %d Token begrenzt";
+App::$strings["Name and Password are required."] = "Name und Passwort sind erforderlich.";
+App::$strings["Token saved."] = "Token gespeichert.";
+App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content."] = "Mit diesem Formular kannst Du temporäre Zugangs-IDs anlegen, um Inhalte mit Nicht-Mitgliedern zu teilen. Die IDs können in Berechtigungslisten (ACLs) verwendet werden, und Besucher können sich damit einloggen, um auf private Inhalte zuzugreifen.";
+App::$strings["You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "Du kannst auch <em>Dropbox</em>-ähnliche Zugriffslinks an Andere weitergeben, indem du das Login-Passwort an eine entsprechende URL anhängst wie nachfolgend gezeigt. Beispiele:";
+App::$strings["Guest Access Tokens"] = "Gastzugangstoken";
+App::$strings["Login Name"] = "Anmeldename";
+App::$strings["Login Password"] = "Anmeldepasswort";
+App::$strings["Expires (yyyy-mm-dd)"] = "Läuft ab (jjjj-mm-tt)";
+App::$strings["Their Settings"] = "Deren Einstellungen";
+App::$strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
+App::$strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
+App::$strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
+App::$strings["Technical skill level updated"] = "Technische Qualifikationsstufe aktualisiert";
+App::$strings["Password verification failed."] = "Passwortüberprüfung fehlgeschlagen.";
+App::$strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
+App::$strings["Empty passwords are not allowed. Password unchanged."] = "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert.";
+App::$strings["Password changed."] = "Kennwort geändert.";
+App::$strings["Password update failed. Please try again."] = "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal.";
+App::$strings["Account Settings"] = "Konto-Einstellungen";
+App::$strings["Current Password"] = "Aktuelles Passwort";
+App::$strings["Enter New Password"] = "Gib ein neues Passwort ein";
+App::$strings["Confirm New Password"] = "Bestätige das neue Passwort";
+App::$strings["Leave password fields blank unless changing"] = "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern";
+App::$strings["Your technical skill level"] = "Deine technische Qualifikationsstufe";
+App::$strings["Used to provide a member experience matched to your comfort level"] = "Dies wird verwendet, um Dir eine Benutzererfahrung  passend zu Deiner technischen Qualifikationsstufe zu bieten.";
+App::$strings["Remove Account"] = "Konto entfernen";
+App::$strings["Remove this account including all its channels"] = "Dieses Konto inklusive all seiner Kanäle löschen";
+App::$strings["Affinity Slider settings updated."] = "Die Beziehungsgrad-Schieberegler-Einstellungen wurden aktualisiert.";
+App::$strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
+App::$strings["Default maximum affinity level"] = "Voreinstellung für maximalen Beziehungsgrad";
+App::$strings["Default minimum affinity level"] = "Voreinstellung für minimalen Beziehungsgrad";
+App::$strings["Affinity Slider Settings"] = "Beziehungsgrad-Schieberegler-Einstellungen";
+App::$strings["Feature/Addon Settings"] = "Funktions-/Addon-Einstellungen";
+App::$strings["No special theme for mobile devices"] = "Keine spezielle Theme für mobile Geräte";
+App::$strings["%s - (Experimental)"] = "%s – (experimentell)";
+App::$strings["Display Settings"] = "Anzeige-Einstellungen";
+App::$strings["Theme Settings"] = "Theme-Einstellungen";
+App::$strings["Custom Theme Settings"] = "Benutzerdefinierte Theme-Einstellungen";
+App::$strings["Content Settings"] = "Inhaltseinstellungen";
+App::$strings["Display Theme:"] = "Anzeige-Theme:";
+App::$strings["Select scheme"] = "Schema wählen";
+App::$strings["Mobile Theme:"] = "Mobile Theme:";
+App::$strings["Preload images before rendering the page"] = "Bilder im voraus laden, bevor die Seite angezeigt wird";
+App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "Die empfundene Ladezeit wird sich erhöhen, aber dafür ist das Layout stabil, sobald eine Seite angezeigt wird";
+App::$strings["Enable user zoom on mobile devices"] = "Zoom auf Mobilgeräten aktivieren";
+App::$strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
+App::$strings["Minimum of 10 seconds, no maximum"] = "Minimum 10 Sekunden, kein Maximum";
+App::$strings["Maximum number of conversations to load at any time:"] = "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:";
+App::$strings["Maximum of 100 items"] = "Maximum: 100 Beiträge";
+App::$strings["Show emoticons (smilies) as images"] = "Emoticons (Smilies) als Bilder anzeigen";
+App::$strings["Manual conversation updates"] = "Manuelle Konversationsaktualisierung";
+App::$strings["Default is on, turning this off may increase screen jumping"] = "Voreinstellung ist An, dies abzuschalten kann das unerwartete Springen der Seitenanzeige erhöhen.";
+App::$strings["Link post titles to source"] = "Beitragstitel zum Originalbeitrag verlinken";
+App::$strings["System Page Layout Editor - (advanced)"] = "System-Seitenlayout-Editor (für Experten)";
+App::$strings["Use blog/list mode on channel page"] = "Blog-/Listenmodus auf der Kanalseite verwenden";
+App::$strings["(comments displayed separately)"] = "(Kommentare werden separat angezeigt)";
+App::$strings["Use blog/list mode on grid page"] = "Blog-/Listenmodus auf der Netzwerkseite verwenden";
+App::$strings["Channel page max height of content (in pixels)"] = "Maximale Höhe von Beitragsblöcken auf der Kanalseite (in Pixeln)";
+App::$strings["click to expand content exceeding this height"] = "Blöcke, deren Inhalt diese Höhe überschreitet, können per Klick vergrößert werden.";
+App::$strings["Grid page max height of content (in pixels)"] = "Maximale Höhe (in Pixel) des Inhalts der Netzwerkseite";
+App::$strings["Name is required"] = "Name ist erforderlich";
+App::$strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
+App::$strings["Add application"] = "Anwendung hinzufügen";
+App::$strings["Name of application"] = "Name der Anwendung";
+App::$strings["Consumer Key"] = "Consumer Key";
+App::$strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20";
+App::$strings["Consumer Secret"] = "Consumer Secret";
+App::$strings["Redirect"] = "Umleitung";
+App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "Umleitungs-URl – lasse das leer, solange Deine Anwendung es nicht explizit erfordert";
+App::$strings["Icon url"] = "Symbol-URL";
+App::$strings["Optional"] = "Optional";
+App::$strings["Application not found."] = "Die Anwendung wurde nicht gefunden.";
+App::$strings["Connected Apps"] = "Verbundene Apps";
+App::$strings["Client key starts with"] = "Client Key beginnt mit";
+App::$strings["No name"] = "Kein Name";
+App::$strings["Remove authorization"] = "Authorisierung aufheben";
+App::$strings["View Photo"] = "Foto ansehen";
+App::$strings["Unknown"] = "Unbekannt";
+App::$strings["Edit Album"] = "Album bearbeiten";
+App::$strings["Upload"] = "Hochladen";
+App::$strings["Some blurb about what to do when you're new here"] = "Ein Hinweis, was man tun kann, wenn man neu hier ist";
+App::$strings["Thing updated"] = "Sache aktualisiert";
+App::$strings["Object store: failed"] = "Speichern des Objekts fehlgeschlagen";
+App::$strings["Thing added"] = "Sache hinzugefügt";
+App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+App::$strings["Show Thing"] = "Sache anzeigen";
+App::$strings["item not found."] = "Eintrag nicht gefunden";
+App::$strings["Edit Thing"] = "Sache bearbeiten";
+App::$strings["Select a profile"] = "Wähle ein Profil";
+App::$strings["Post an activity"] = "Aktivitätsnachricht senden";
+App::$strings["Only sends to viewers of the applicable profile"] = "Nur an Betrachter des ausgewählten Profils senden";
+App::$strings["Name of thing e.g. something"] = "Name der Sache, z. B. irgendwas";
+App::$strings["URL of thing (optional)"] = "URL der Sache (optional)";
+App::$strings["URL for photo of thing (optional)"] = "URL eines Fotos der Sache (optional)";
+App::$strings["Permissions"] = "Berechtigungen";
+App::$strings["Add Thing to your Profile"] = "Die Sache Deinem Profil hinzufügen";
+App::$strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr.";
+App::$strings["System Notifications"] = "System-Benachrichtigungen";
 App::$strings["Channel added."] = "Kanal hinzugefügt.";
+App::$strings["Your service plan only allows %d channels."] = "Dein Vertrag erlaubt nur %d Kanäle.";
+App::$strings["No channel. Import failed."] = "Kein Kanal. Import fehlgeschlagen.";
+App::$strings["Import completed."] = "Import abgeschlossen.";
+App::$strings["You must be logged in to use this feature."] = "Du musst angemeldet sein um diese Funktion zu nutzen.";
+App::$strings["Import Channel"] = "Kanal importieren";
+App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren.";
+App::$strings["Or provide the old server/hub details"] = "Oder gib die Details Deines bisherigen \$Projectname-Hubs ein";
+App::$strings["Your old identity address (xyz@example.com)"] = "Bisherige Kanal-Adresse (xyz@example.com)";
+App::$strings["Your old login email address"] = "Deine alte Login-E-Mail-Adresse";
+App::$strings["Your old login password"] = "Dein altes Passwort";
+App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige \$Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein.";
+App::$strings["Make this hub my primary location"] = "Dieser $Pojectname-Hub ist mein primärer Hub.";
+App::$strings["Move this channel (disable all previous locations)"] = "Verschiebe diesen Kanal (deaktiviere alle vorherigen Adressen/Klone)";
+App::$strings["Import a few months of posts if possible (limited by available memory"] = "Importiere die Beiträge einiger Monate, sofern möglich (beschränkt durch verfügbaren Speicher)";
+App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen.";
 App::$strings["Authentication failed."] = "Authentifizierung fehlgeschlagen.";
 App::$strings["Remote Authentication"] = "Entfernte Authentifizierung";
 App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z. B. channel@example.com)";
 App::$strings["Authenticate"] = "Authentifizieren";
-App::$strings["Please login."] = "Bitte melde dich an.";
+App::$strings["Channel not found."] = "Kanal nicht gefunden.";
+App::$strings["Permissions denied."] = "Berechtigung verweigert.";
+App::$strings["Import"] = "Import";
+App::$strings["Authorize application connection"] = "Zugriff für die Anwendung autorisieren";
+App::$strings["Return to your app and insert this Security Code:"] = "Gehen Sie zu Ihrer App zurück und tragen Sie diesen Sicherheitscode ein:";
+App::$strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen.";
+App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?";
+App::$strings["Item not available."] = "Element nicht verfügbar.";
+App::$strings["Insert web link"] = "Link einfügen";
+App::$strings["Title (optional)"] = "Titel (optional)";
+App::$strings["Edit Block"] = "Block bearbeiten";
+App::$strings["vcard"] = "VCard";
+App::$strings["Apps"] = "Apps";
+App::$strings["Manage apps"] = "Apps verwalten";
+App::$strings["Create new app"] = "Neue App erstellen";
+App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s ist %2\$s";
+App::$strings["Mood"] = "Laune";
+App::$strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden";
+App::$strings["Blocked"] = "Blockiert";
+App::$strings["Ignored"] = "Ignoriert";
+App::$strings["Hidden"] = "Versteckt";
+App::$strings["Archived"] = "Archiviert";
+App::$strings["New"] = "Neu";
+App::$strings["All"] = "Alle";
+App::$strings["New Connections"] = "Neue Verbindungen";
+App::$strings["Show pending (new) connections"] = "Ausstehende (neue) Verbindungsanfragen anzeigen";
+App::$strings["Show all connections"] = "Alle Verbindungen anzeigen";
+App::$strings["Only show blocked connections"] = "Nur blockierte Verbindungen anzeigen";
+App::$strings["Only show ignored connections"] = "Nur ignorierte Verbindungen anzeigen";
+App::$strings["Only show archived connections"] = "Nur archivierte Verbindungen anzeigen";
+App::$strings["Only show hidden connections"] = "Nur versteckte Verbindungen anzeigen";
+App::$strings["Pending approval"] = "Wartet auf Genehmigung";
+App::$strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
+App::$strings["Edit connection"] = "Verbindung bearbeiten";
+App::$strings["Delete connection"] = "Verbindung löschen";
+App::$strings["Channel address"] = "Kanaladresse";
+App::$strings["Network"] = "Netzwerk";
+App::$strings["Call"] = "Anruf";
+App::$strings["Status"] = "Status";
+App::$strings["Connected"] = "Verbunden";
+App::$strings["Approve connection"] = "Verbindung genehmigen";
+App::$strings["Ignore connection"] = "Verbindung ignorieren";
+App::$strings["Ignore"] = "Ignorieren";
+App::$strings["Recent activity"] = "Kürzliche Aktivitäten";
+App::$strings["Connections"] = "Verbindungen";
+App::$strings["Search your connections"] = "Verbindungen durchsuchen";
+App::$strings["Connections search"] = "Verbindung suchen";
+App::$strings["Find"] = "Finde";
+App::$strings["item"] = "";
+App::$strings["Source of Item"] = "Quelle des Elements";
+App::$strings["Bookmark added"] = "Lesezeichen hinzugefügt";
+App::$strings["My Bookmarks"] = "Meine Lesezeichen";
+App::$strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
 App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt.";
 App::$strings["Remove This Account"] = "Dieses Konto löschen";
-App::$strings["WARNING: "] = "WARNUNG: ";
 App::$strings["This account and all its channels will be completely removed from the network. "] = "Dieses Konto mit all seinen Kanälen wird vollständig aus dem Netzwerk gelöscht.";
-App::$strings["This action is permanent and can not be undone!"] = "Dieser Schritt ist endgültig und kann nicht rückgängig gemacht werden!";
-App::$strings["Please enter your password for verification:"] = "Bitte gib zur Bestätigung Dein Passwort ein:";
 App::$strings["Remove this account, all its channels and all its channel clones from the network"] = "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen";
 App::$strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standardmäßig werden nur die Kanalklone auf diesem \$Projectname-Hub aus dem Netzwerk entfernt";
-App::$strings["Remove Account"] = "Konto entfernen";
-App::$strings["Layout updated."] = "Layout aktualisiert.";
-App::$strings["Feature disabled."] = "Funktion deaktiviert.";
-App::$strings["Edit System Page Description"] = "Systemseitenbeschreibung bearbeiten";
-App::$strings["Layout not found."] = "Layout nicht gefunden.";
-App::$strings["Module Name:"] = "Modulname:";
-App::$strings["Layout Help"] = "Layout-Hilfe";
-App::$strings["Export Channel"] = "Kanal exportieren";
-App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält.";
-App::$strings["Export Content"] = "Kanal und Inhalte exportieren";
-App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet.";
-App::$strings["Export your posts from a given year."] = "Exportiert die Beiträge des angegebenen Jahres.";
-App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne.";
-App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1\$s\">%2\$s</a>.";
-App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1\$s\">%2\$s</a>.";
-App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1\$s\">%2\$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst.";
-App::$strings["%d rating"] = array(
-	0 => "%d Bewertung",
-	1 => "%d Bewertungen",
+App::$strings["Page owner information could not be retrieved."] = "Informationen über den Besitzer der Seite konnten nicht gefunden werden.";
+App::$strings["Album not found."] = "Album nicht gefunden.";
+App::$strings["Delete Album"] = "Album löschen";
+App::$strings["Delete Photo"] = "Foto löschen";
+App::$strings["No photos selected"] = "Keine Fotos ausgewählt";
+App::$strings["Access to this item is restricted."] = "Der Zugriff auf dieses Foto ist eingeschränkt.";
+App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB von %2$.2f MB Foto-Speicher belegt.";
+App::$strings["%1$.2f MB photo storage used."] = "%1$.2f MB Foto-Speicher belegt.";
+App::$strings["Upload Photos"] = "Fotos hochladen";
+App::$strings["Enter an album name"] = "Namen für ein neues Album eingeben";
+App::$strings["or select an existing album (doubleclick)"] = "oder ein bereits vorhandenes auswählen (Doppelklick)";
+App::$strings["Create a status post for this upload"] = "Einen Statusbeitrag für diesen Upload erzeugen";
+App::$strings["Caption (optional):"] = "Beschriftung (optional):";
+App::$strings["Description (optional):"] = "Beschreibung (optional):";
+App::$strings["Show Newest First"] = "Neueste zuerst anzeigen";
+App::$strings["Show Oldest First"] = "Älteste zuerst anzeigen";
+App::$strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden.";
+App::$strings["Photo not available"] = "Foto nicht verfügbar";
+App::$strings["Use as profile photo"] = "Als Profilfoto verwenden";
+App::$strings["Use as cover photo"] = "Als Titelbild verwenden";
+App::$strings["Private Photo"] = "Privates Foto";
+App::$strings["View Full Size"] = "In voller Größe anzeigen";
+App::$strings["Edit photo"] = "Foto bearbeiten";
+App::$strings["Rotate CW (right)"] = "Drehen im UZS (rechts)";
+App::$strings["Rotate CCW (left)"] = "Drehen gegen UZS (links)";
+App::$strings["Move photo to album"] = "Foto in Album verschieben";
+App::$strings["Enter a new album name"] = "Gib einen Namen für ein neues Album ein";
+App::$strings["or select an existing one (doubleclick)"] = "oder wähle ein bereits vorhandenes aus (Doppelklick)";
+App::$strings["Caption"] = "Bildunterschrift";
+App::$strings["Add a Tag"] = "Schlagwort hinzufügen";
+App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Beispiele: @ben, @Karl_Prester, @lieschen@example.com";
+App::$strings["Flag as adult in album view"] = "In der Albumansicht als nicht jugendfrei markieren";
+App::$strings["I like this (toggle)"] = "Mir gefällt das (Umschalter)";
+App::$strings["I don't like this (toggle)"] = "Mir gefällt das nicht (Umschalter)";
+App::$strings["Please wait"] = "Bitte warten";
+App::$strings["This is you"] = "Das bist Du";
+App::$strings["Comment"] = "Kommentar";
+App::$strings["__ctx:title__ Likes"] = "Gefällt mir";
+App::$strings["__ctx:title__ Dislikes"] = "Gefällt mir nicht";
+App::$strings["__ctx:title__ Agree"] = "Zustimmungen";
+App::$strings["__ctx:title__ Disagree"] = "Ablehnungen";
+App::$strings["__ctx:title__ Abstain"] = "Enthaltungen";
+App::$strings["__ctx:title__ Attending"] = "Zusagen";
+App::$strings["__ctx:title__ Not attending"] = "Absagen";
+App::$strings["__ctx:title__ Might attend"] = "Vielleicht";
+App::$strings["View all"] = "Alles anzeigen";
+App::$strings["__ctx:noun__ Like"] = array(
+	0 => "Gefällt mir",
+	1 => "Gefällt mir",
+);
+App::$strings["__ctx:noun__ Dislike"] = array(
+	0 => "Gefällt nicht",
+	1 => "Gefällt nicht",
 );
-App::$strings["Gender: "] = "Geschlecht:";
-App::$strings["Status: "] = "Status:";
-App::$strings["Homepage: "] = "Webseite:";
-App::$strings["Age:"] = "Alter:";
-App::$strings["Location:"] = "Ort:";
-App::$strings["Description:"] = "Beschreibung:";
-App::$strings["Hometown:"] = "Heimatstadt:";
-App::$strings["About:"] = "Über:";
-App::$strings["Connect"] = "Verbinden";
-App::$strings["Public Forum:"] = "Öffentliches Forum:";
-App::$strings["Keywords: "] = "Schlüsselwörter:";
-App::$strings["Don't suggest"] = "Nicht vorschlagen";
-App::$strings["Common connections:"] = "Gemeinsame Verbindungen:";
-App::$strings["Global Directory"] = "Globales Verzeichnis";
-App::$strings["Local Directory"] = "Lokales Verzeichnis";
-App::$strings["Finding:"] = "Ergebnisse:";
-App::$strings["Channel Suggestions"] = "Kanal-Vorschläge";
-App::$strings["next page"] = "nächste Seite";
-App::$strings["previous page"] = "vorherige Seite";
-App::$strings["Sort options"] = "Sortieroptionen";
-App::$strings["Alphabetic"] = "alphabetisch";
-App::$strings["Reverse Alphabetic"] = "Entgegengesetzt alphabetisch";
-App::$strings["Newest to Oldest"] = "Neueste zuerst";
-App::$strings["Oldest to Newest"] = "Älteste zuerst";
-App::$strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
-App::$strings["Away"] = "Abwesend";
-App::$strings["Online"] = "Online";
-App::$strings["No service class restrictions found."] = "Keine Dienstklassenbeschränkungen gefunden.";
-App::$strings["Import Webpage Elements"] = "Webseitenelemente importieren";
-App::$strings["Import selected"] = "Import ausgewählt";
-App::$strings["Export Webpage Elements"] = "Webseitenelemente exportieren";
-App::$strings["Export selected"] = "Exportieren ausgewählt";
-App::$strings["Webpages"] = "Webseiten";
-App::$strings["Actions"] = "Aktionen";
-App::$strings["Page Link"] = "Seiten-Link";
-App::$strings["Page Title"] = "Seitentitel";
-App::$strings["Invalid file type."] = "Ungültiger Dateityp.";
-App::$strings["Error opening zip file"] = "Fehler beim Öffnen der ZIP-Datei";
-App::$strings["Invalid folder path."] = "Ungültiger Ordnerpfad.";
-App::$strings["No webpage elements detected."] = "Keine Webseitenelemente erkannt.";
-App::$strings["Import complete."] = "Import abgeschlossen.";
-App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden.";
-App::$strings["Remove This Channel"] = "Diesen Kanal löschen";
-App::$strings["This channel will be completely removed from the network. "] = "Dieser Kanal wird vollständig aus dem Netzwerk gelöscht.";
-App::$strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk";
-App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk";
-App::$strings["Remove Channel"] = "Kanal löschen";
-App::$strings["Files: shared with me"] = "Dateien, die mit mir geteilt wurden";
-App::$strings["NEW"] = "NEU";
-App::$strings["Remove all files"] = "Alle Dateien löschen";
-App::$strings["Remove this file"] = "Diese Datei löschen";
+App::$strings["Photo Tools"] = "Fotowerkzeuge";
+App::$strings["In This Photo:"] = "Auf diesem Foto:";
+App::$strings["Map"] = "Karte";
+App::$strings["__ctx:noun__ Likes"] = "Gefällt mir";
+App::$strings["__ctx:noun__ Dislikes"] = "Gefällt nicht";
+App::$strings["Close"] = "Schließen";
+App::$strings["Recent Photos"] = "Neueste Fotos";
 App::$strings["Profile Unavailable."] = "Profil nicht verfügbar.";
 App::$strings["Not found"] = "Nicht gefunden";
 App::$strings["Invalid channel"] = "Ungültiger Kanal";
 App::$strings["Wikis"] = "Wikis";
 App::$strings["Download"] = "Herunterladen";
+App::$strings["Create New"] = "Neu anlegen";
 App::$strings["Wiki name"] = "Name des Wiki";
 App::$strings["Content type"] = "Inhaltstyp";
+App::$strings["Type"] = "Typ";
 App::$strings["Create a status post for this wiki"] = "Erzeuge einen Statusbeitrag für dieses Wiki";
 App::$strings["Wiki not found"] = "Wiki nicht gefunden";
 App::$strings["Rename page"] = "Seite umbenennen";
 App::$strings["Error retrieving page content"] = "Fehler beim Abrufen des Seiteninhalts";
+App::$strings["New page"] = "Neue Seite";
 App::$strings["Revision Comparison"] = "Revisionsvergleich";
 App::$strings["Revert"] = "Rückgängig machen";
 App::$strings["Short description of your changes (optional)"] = "Kurze Beschreibung Ihrer Änderungen (optional)";
@@ -1272,6 +971,7 @@ App::$strings["Error getting album list"] = "Fehler beim Holen der Albenliste";
 App::$strings["Error getting photo link"] = "Fehler beim Holen des Fotolinks";
 App::$strings["Error getting album"] = "Fehler beim Holen des Albums";
 App::$strings["Error creating wiki. Invalid name."] = "Fehler beim Erstellen des Wiki. Ungültiger Name.";
+App::$strings["A wiki with this name already exists."] = "Es existiert bereits ein Wiki mit diesem Namen.";
 App::$strings["Wiki created, but error creating Home page."] = "Das Wiki wurde erzeugt, aber es gab einen Fehler bei der Erstellung der Startseite";
 App::$strings["Error creating wiki"] = "Fehler beim Erstellen des Wiki";
 App::$strings["Wiki delete permission denied."] = "Wiki-Löschberechtigung verweigert.";
@@ -1281,225 +981,411 @@ App::$strings["Cannot delete Home"] = "Kann die Startseite nicht löschen";
 App::$strings["Current Revision"] = "Aktuelle Revision";
 App::$strings["Selected Revision"] = "Ausgewählte Revision";
 App::$strings["You must be authenticated."] = "Sie müssen authenzifiziert sein.";
-App::$strings["Failed to create source. No channel selected."] = "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt.";
-App::$strings["Source created."] = "Quelle erstellt.";
-App::$strings["Source updated."] = "Quelle aktualisiert.";
-App::$strings["*"] = "*";
-App::$strings["Channel Sources"] = "Kanal-Quellen";
-App::$strings["Manage remote sources of content for your channel."] = "Externe Inhaltsquellen für Deinen Kanal verwalten.";
-App::$strings["New Source"] = "Neue Quelle";
-App::$strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals.";
-App::$strings["Only import content with these words (one per line)"] = "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten";
-App::$strings["Leave blank to import all public content"] = "Leer lassen, um alle öffentlichen Beiträge zu importieren";
-App::$strings["Channel Name"] = "Name des Kanals";
-App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "Füge die folgenden Kategorien zu Beiträgen, die aus dieser Quelle importiert werden, hinzu (kommagetrennt)";
-App::$strings["Optional"] = "Optional";
-App::$strings["Source not found."] = "Quelle nicht gefunden.";
-App::$strings["Edit Source"] = "Quelle bearbeiten";
-App::$strings["Delete Source"] = "Quelle löschen";
-App::$strings["Source removed"] = "Quelle gelöscht";
-App::$strings["Unable to remove source."] = "Konnte die Quelle nicht löschen.";
-App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$ss %3\$s";
-App::$strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s folgt %2\$ss %3\$s nicht mehr";
-App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal.";
-App::$strings["Ignore/Hide"] = "Ignorieren/Verstecken";
+App::$strings["toggle full screen mode"] = "auf Vollbildmodus umschalten";
+App::$strings["Layout updated."] = "Layout aktualisiert.";
+App::$strings["Feature disabled."] = "Funktion deaktiviert.";
+App::$strings["Edit System Page Description"] = "Systemseitenbeschreibung bearbeiten";
+App::$strings["Layout not found."] = "Layout nicht gefunden.";
+App::$strings["Module Name:"] = "Modulname:";
+App::$strings["Layout Help"] = "Layout-Hilfe";
+App::$strings["Poke"] = "Anstupsen";
+App::$strings["Poke somebody"] = "Jemanden anstupsen";
+App::$strings["Poke/Prod"] = "Anstupsen/Knuffen";
+App::$strings["Poke, prod or do other things to somebody"] = "Jemanden anstupsen, knuffen oder sonstiges";
+App::$strings["Recipient"] = "Empfänger";
+App::$strings["Choose what you wish to do to recipient"] = "Wähle, was Du mit dem/r Empfänger/in tun willst";
+App::$strings["Make this post private"] = "Diesen Beitrag privat machen";
+App::$strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zurechtschneiden schlug fehl.";
+App::$strings["Profile Photos"] = "Profilfotos";
+App::$strings["Image resize failed."] = "Bild-Anpassung fehlgeschlagen.";
+App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird.";
+App::$strings["Unable to process image"] = "Kann Bild nicht verarbeiten";
+App::$strings["Image upload failed."] = "Hochladen des Bilds fehlgeschlagen.";
+App::$strings["Unable to process image."] = "Kann Bild nicht verarbeiten.";
+App::$strings["Photo not available."] = "Foto nicht verfügbar.";
+App::$strings["Upload File:"] = "Datei hochladen:";
+App::$strings["Select a profile:"] = "Wähle ein Profil:";
+App::$strings["Use Photo for Profile"] = "Foto für Profil verwenden";
+App::$strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch";
+App::$strings["Use"] = "Verwenden";
+App::$strings["skip this step"] = "diesen Schritt überspringen";
+App::$strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben";
+App::$strings["Crop Image"] = "Bild zuschneiden";
+App::$strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu.";
+App::$strings["Done Editing"] = "Bearbeitung fertigstellen";
+App::$strings["Away"] = "Abwesend";
+App::$strings["Online"] = "Online";
+App::$strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden.";
+App::$strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
+App::$strings["Duplicate post suppressed."] = "Doppelter Beitrag unterdrückt.";
+App::$strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
+App::$strings["Unable to obtain post information from database."] = "Beitragsinformationen können nicht aus der Datenbank abgerufen werden.";
+App::$strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
+App::$strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
+App::$strings["sent you a private message"] = "hat Dir eine private Nachricht geschickt";
+App::$strings["added your channel"] = "hat deinen Kanal hinzugefügt";
+App::$strings["g A l F d"] = "l, d. F, G:i \\U\\h\\r";
+App::$strings["[today]"] = "[Heute]";
+App::$strings["posted an event"] = "hat einen Termin veröffentlicht";
+App::$strings["Invalid item."] = "Ungültiges Element.";
+App::$strings["Page not found."] = "Seite nicht gefunden.";
+App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+App::$strings["Could not access contact record."] = "Konnte nicht auf den Kontakteintrag zugreifen.";
+App::$strings["Could not locate selected profile."] = "Gewähltes Profil nicht gefunden.";
+App::$strings["Connection updated."] = "Verbindung aktualisiert.";
+App::$strings["Failed to update connection record."] = "Konnte den Verbindungseintrag nicht aktualisieren.";
+App::$strings["is now connected to"] = "ist jetzt verbunden mit";
+App::$strings["Could not access address book record."] = "Konnte nicht auf den Adressbuch-Eintrag zugreifen.";
+App::$strings["Refresh failed - channel is currently unavailable."] = "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar.";
+App::$strings["Unable to set address book parameters."] = "Konnte die Adressbuch-Parameter nicht setzen.";
+App::$strings["Connection has been removed."] = "Verbindung wurde gelöscht.";
+App::$strings["View Profile"] = "Profil ansehen";
+App::$strings["View %s's profile"] = "%ss Profil ansehen";
+App::$strings["Refresh Permissions"] = "Zugriffsrechte neu laden";
+App::$strings["Fetch updated permissions"] = "Aktualisierte Zugriffsrechte abrufen";
+App::$strings["Refresh Photo"] = "Foto aktualisieren";
+App::$strings["Fetch updated photo"] = "Aktualisiertes Profilfoto abrufen";
+App::$strings["Recent Activity"] = "Kürzliche Aktivitäten";
+App::$strings["View recent posts and comments"] = "Betrachte die neuesten Beiträge und Kommentare";
+App::$strings["Block (or Unblock) all communications with this connection"] = "Jegliche Kommunikation mit dieser Verbindung blockieren/zulassen";
+App::$strings["This connection is blocked!"] = "Die Verbindung ist geblockt!";
+App::$strings["Unignore"] = "Nicht ignorieren";
+App::$strings["Ignore (or Unignore) all inbound communications from this connection"] = "Jegliche eingehende Kommunikation von dieser Verbindung ignorieren/zulassen";
+App::$strings["This connection is ignored!"] = "Die Verbindung wird ignoriert!";
+App::$strings["Unarchive"] = "Aus Archiv zurückholen";
+App::$strings["Archive"] = "Archivieren";
+App::$strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Verbindung archivieren/aus dem Archiv zurückholen (Archiv = Kanal als erloschen markieren, aber die Beiträge behalten)";
+App::$strings["This connection is archived!"] = "Die Verbindung ist archiviert!";
+App::$strings["Unhide"] = "Wieder sichtbar machen";
+App::$strings["Hide"] = "Verstecken";
+App::$strings["Hide or Unhide this connection from your other connections"] = "Diese Verbindung vor anderen Verbindungen verstecken/zeigen";
+App::$strings["This connection is hidden!"] = "Die Verbindung ist versteckt!";
+App::$strings["Delete this connection"] = "Verbindung löschen";
+App::$strings["Fetch Vcard"] = "Vcard abrufen";
+App::$strings["Fetch electronic calling card for this connection"] = "Rufe eine digitale Visitenkarte für diese Verbindung ab";
+App::$strings["Open Individual Permissions section by default"] = "Öffne standardmäßig den Bereich für individuelle Berechtigungen";
+App::$strings["Affinity"] = "Beziehung";
+App::$strings["Open Set Affinity section by default"] = "Öffne standardmäßig den Bereich für Beziehungsgrad-Einstellungen";
+App::$strings["Me"] = "Ich";
+App::$strings["Family"] = "Familie";
+App::$strings["Acquaintances"] = "Bekannte";
+App::$strings["Filter"] = "Filter";
+App::$strings["Open Custom Filter section by default"] = "Öffne standardmäßig den Bereich für benutzerdefinierte Filter";
+App::$strings["Approve this connection"] = "Verbindung genehmigen";
+App::$strings["Accept connection to allow communication"] = "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen";
+App::$strings["Set Affinity"] = "Beziehung festlegen";
+App::$strings["Set Profile"] = "Profil festlegen";
+App::$strings["Set Affinity & Profile"] = "Beziehung und Profile festlegen";
+App::$strings["none"] = "Keine";
+App::$strings["Connection Default Permissions"] = "Standardzugriffsrechte für neue Verbindungen:";
+App::$strings["Connection: %s"] = "Verbindung: %s";
+App::$strings["Apply these permissions automatically"] = "Diese Berechtigungen automatisch anwenden";
+App::$strings["Connection requests will be approved without your interaction"] = "Verbindungsanfragen werden sofort bestätigt, ohne dass Deine aktive Zustimmung erforderlich ist.";
+App::$strings["Permission role"] = "Berechtigungsrolle";
+App::$strings["Add permission role"] = "Berechtigungsrolle hinzufügen";
+App::$strings["This connection's primary address is"] = "Die Hauptadresse der Verbindung ist";
+App::$strings["Available locations:"] = "Verfügbare Klone:";
+App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Die auf dieser Seite angegebenen Berechtigungen werden auf alle neuen Verbindungen angewendet.";
+App::$strings["Connection Tools"] = "Verbindungswerkzeuge";
+App::$strings["Slide to adjust your degree of friendship"] = "Verschieben, um den Grad der Freundschaft zu einzustellen";
+App::$strings["Rating"] = "Bewertung";
+App::$strings["Slide to adjust your rating"] = "Verschieben, um Deine Bewertung einzustellen";
+App::$strings["Optionally explain your rating"] = "Optional kannst Du Deine Bewertung begründen";
+App::$strings["Custom Filter"] = "Benutzerdefinierter Filter";
+App::$strings["Only import posts with this text"] = "Nur Beiträge mit diesem Text importieren";
+App::$strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "Einzelne Wörter pro Zeile, #Tags oder /Reguläre Ausdrücke/. lang=xx (z.B. lang=de) ermöglicht Filterung nach Sprache. Leer lassen, um alle Beiträge zu importieren.";
+App::$strings["Do not import posts with this text"] = "Beiträge mit diesem Text nicht importieren";
+App::$strings["This information is public!"] = "Diese Information ist öffentlich!";
+App::$strings["Connection Pending Approval"] = "Verbindung wartet auf Bestätigung";
+App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird.";
+App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung. Werden geerbte Einstellungen hier geändert, hat dies keine Auswirkungen.";
+App::$strings["Last update:"] = "Letzte Aktualisierung:";
+App::$strings["Details"] = "Details";
+App::$strings["Organisation"] = "Organisation";
+App::$strings["Title"] = "Titel";
+App::$strings["Phone"] = "Telefon";
+App::$strings["Instant messenger"] = "Sofortnachrichtendienst";
+App::$strings["Website"] = "Webseite";
+App::$strings["Note"] = "Hinweis";
+App::$strings["Mobile"] = "Mobil";
+App::$strings["Home"] = "Home";
+App::$strings["Work"] = "Arbeit";
+App::$strings["Add Contact"] = "Kontakt hinzufügen";
+App::$strings["Add Field"] = "Feld hinzufügen";
+App::$strings["P.O. Box"] = "Postfach";
+App::$strings["Additional"] = "Zusätzlich";
+App::$strings["Street"] = "Straße";
+App::$strings["Locality"] = "Ortschaft";
+App::$strings["Region"] = "Region";
+App::$strings["ZIP Code"] = "Postleitzahl";
+App::$strings["Country"] = "Land";
+App::$strings["Room not found"] = "Chatraum nicht gefunden";
+App::$strings["Leave Room"] = "Raum verlassen";
+App::$strings["Delete Room"] = "Raum löschen";
+App::$strings["I am away right now"] = "Ich bin gerade nicht da";
+App::$strings["I am online"] = "Ich bin online";
+App::$strings["Bookmark this room"] = "Lesezeichen für diesen Raum setzen";
+App::$strings["Please enter a link URL:"] = "Gib eine URL ein:";
+App::$strings["Encrypt text"] = "Text verschlüsseln";
+App::$strings["New Chatroom"] = "Neuer Chatraum";
+App::$strings["Chatroom name"] = "Chatraumname";
+App::$strings["Expiration of chats (minutes)"] = "Verfall von Chats (Minuten)";
+App::$strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume";
+App::$strings["No chatrooms available"] = "Keine Chaträume verfügbar";
+App::$strings["Expiration"] = "Verfall";
+App::$strings["min"] = "min";
+App::$strings["Photos"] = "Fotos";
+App::$strings["Files"] = "Dateien";
+App::$strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
+App::$strings["Unable to create menu."] = "Kann Menü nicht erstellen.";
+App::$strings["Menu Name"] = "Name des Menüs";
+App::$strings["Unique name (not visible on webpage) - required"] = "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich";
+App::$strings["Menu Title"] = "Menütitel";
+App::$strings["Visible on webpage - leave empty for no title"] = "Sichtbar auf der Webseite – für keinen Titel leer lassen";
+App::$strings["Allow Bookmarks"] = "Lesezeichen erlauben";
+App::$strings["Menu may be used to store saved bookmarks"] = "Im Menü können gespeicherte Lesezeichen abgelegt werden";
+App::$strings["Submit and proceed"] = "Absenden und fortfahren";
+App::$strings["Menus"] = "Menüs";
+App::$strings["Bookmarks allowed"] = "Lesezeichen erlaubt";
+App::$strings["Delete this menu"] = "Lösche dieses Menü";
+App::$strings["Edit menu contents"] = "Bearbeite Menü Inhalte";
+App::$strings["Edit this menu"] = "Dieses Menü bearbeiten";
+App::$strings["Menu could not be deleted."] = "Menü konnte nicht gelöscht werden.";
+App::$strings["Edit Menu"] = "Menü bearbeiten";
+App::$strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü hinzufügen oder entfernen";
+App::$strings["Menu name"] = "Menü Name";
+App::$strings["Must be unique, only seen by you"] = "Muss eindeutig sein, ist aber nur für Dich sichtbar";
+App::$strings["Menu title"] = "Menü Titel";
+App::$strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird";
+App::$strings["Allow bookmarks"] = "Erlaube Lesezeichen";
+App::$strings["Layouts"] = "Layouts";
+App::$strings["Help"] = "Hilfe";
+App::$strings["Comanche page description language help"] = "Hilfe zur Comanche-Seitenbeschreibungssprache";
+App::$strings["Layout Description"] = "Layout-Beschreibung";
+App::$strings["Download PDL file"] = "PDL-Datei herunterladen";
 App::$strings["post"] = "Beitrag";
 App::$strings["comment"] = "Kommentar";
 App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s verschlagwortet";
-App::$strings["Additional Features"] = "Zusätzliche Funktionen";
-App::$strings["Name is required"] = "Name ist erforderlich";
-App::$strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
-App::$strings["Add application"] = "Anwendung hinzufügen";
-App::$strings["Name of application"] = "Name der Anwendung";
-App::$strings["Consumer Key"] = "Consumer Key";
-App::$strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20";
-App::$strings["Consumer Secret"] = "Consumer Secret";
-App::$strings["Redirect"] = "Umleitung";
-App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "Umleitungs-URl – lasse das leer, solange Deine Anwendung es nicht explizit erfordert";
-App::$strings["Icon url"] = "Symbol-URL";
-App::$strings["Application not found."] = "Die Anwendung wurde nicht gefunden.";
-App::$strings["Connected Apps"] = "Verbundene Apps";
-App::$strings["Client key starts with"] = "Client Key beginnt mit";
-App::$strings["No name"] = "Kein Name";
-App::$strings["Remove authorization"] = "Authorisierung aufheben";
-App::$strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
-App::$strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
-App::$strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
-App::$strings["Technical skill level updated"] = "Technische Qualifikationsstufe aktualisiert";
-App::$strings["Password verification failed."] = "Passwortüberprüfung fehlgeschlagen.";
-App::$strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
-App::$strings["Empty passwords are not allowed. Password unchanged."] = "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert.";
-App::$strings["Password changed."] = "Kennwort geändert.";
-App::$strings["Password update failed. Please try again."] = "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal.";
-App::$strings["Account Settings"] = "Konto-Einstellungen";
-App::$strings["Current Password"] = "Aktuelles Passwort";
-App::$strings["Enter New Password"] = "Gib ein neues Passwort ein";
-App::$strings["Confirm New Password"] = "Bestätige das neue Passwort";
-App::$strings["Leave password fields blank unless changing"] = "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern";
-App::$strings["Your technical skill level"] = "Deine technische Qualifikationsstufe";
-App::$strings["Used to provide a member experience matched to your comfort level"] = "Dies wird verwendet, um Dir eine Benutzererfahrung  passend zu Deiner technischen Qualifikationsstufe zu bieten.";
-App::$strings["Email Address:"] = "Email Adresse:";
-App::$strings["Remove this account including all its channels"] = "Dieses Konto inklusive all seiner Kanäle löschen";
-App::$strings["This channel is limited to %d tokens"] = "Dieser Kanal ist auf %d Token begrenzt";
-App::$strings["Name and Password are required."] = "Name und Passwort sind erforderlich.";
-App::$strings["Token saved."] = "Token gespeichert.";
-App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content."] = "Mit diesem Formular kannst Du temporäre Zugangs-IDs anlegen, um Inhalte mit Nicht-Mitgliedern zu teilen. Die IDs können in Berechtigungslisten (ACLs) verwendet werden, und Besucher können sich damit einloggen, um auf private Inhalte zuzugreifen.";
-App::$strings["You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "Du kannst auch <em>Dropbox</em>-ähnliche Zugriffslinks an Andere weitergeben, indem du das Login-Passwort an eine entsprechende URL anhängst wie nachfolgend gezeigt. Beispiele:";
-App::$strings["Guest Access Tokens"] = "Gastzugangstoken";
-App::$strings["Login Name"] = "Anmeldename";
-App::$strings["Login Password"] = "Anmeldepasswort";
-App::$strings["Expires (yyyy-mm-dd)"] = "Läuft ab (jjjj-mm-tt)";
-App::$strings["Affinity Slider settings updated."] = "Die Beziehungsgrad-Schieberegler-Einstellungen wurden aktualisiert.";
-App::$strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
-App::$strings["Default maximum affinity level"] = "Voreinstellung für maximalen Beziehungsgrad";
-App::$strings["Default minimum affinity level"] = "Voreinstellung für minimalen Beziehungsgrad";
-App::$strings["Affinity Slider Settings"] = "Beziehungsgrad-Schieberegler-Einstellungen";
-App::$strings["Feature/Addon Settings"] = "Funktions-/Addon-Einstellungen";
-App::$strings["Settings updated."] = "Einstellungen aktualisiert.";
-App::$strings["Nobody except yourself"] = "Niemand außer Dir selbst";
-App::$strings["Only those you specifically allow"] = "Nur die, denen Du es explizit erlaubst";
-App::$strings["Approved connections"] = "Angenommene Verbindungen";
-App::$strings["Any connections"] = "Beliebige Verbindungen";
-App::$strings["Anybody on this website"] = "Jeder auf dieser Website";
-App::$strings["Anybody in this network"] = "Alle \$Projectname-Mitglieder";
-App::$strings["Anybody authenticated"] = "Jeder authentifizierte";
-App::$strings["Anybody on the internet"] = "Jeder im Internet";
-App::$strings["Publish your default profile in the network directory"] = "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen";
-App::$strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
-App::$strings["Your channel address is"] = "Deine Kanal-Adresse lautet";
-App::$strings["Your files/photos are accessible via WebDAV at"] = "Deine Dateien/Fotos sind via WebDAV verfügbar auf";
-App::$strings["Channel Settings"] = "Kanal-Einstellungen";
-App::$strings["Basic Settings"] = "Grundeinstellungen";
-App::$strings["Full Name:"] = "Voller Name:";
-App::$strings["Your Timezone:"] = "Ihre Zeitzone:";
-App::$strings["Default Post Location:"] = "Standardstandort:";
-App::$strings["Geographical location to display on your posts"] = "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll";
-App::$strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
-App::$strings["Adult Content"] = "Nicht jugendfreie Inhalte";
-App::$strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)";
-App::$strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
-App::$strings["Your permissions are already configured. Click to view/adjust"] = "Deine Zugriffsrechte sind schon konfiguriert. Klicke hier, um sie zu betrachten oder zu ändern";
-App::$strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
-App::$strings["Prevents displaying in your profile that you are online"] = "Verhindert die Anzeige Deines Online-Status in deinem Profil";
-App::$strings["Simple Privacy Settings:"] = "Einfache Privatsphäre-Einstellungen";
-App::$strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Komplett offen – <em>extrem ungeschützt (mit großer Vorsicht verwenden!)</em>";
-App::$strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Typisch – <em>Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)</em>";
-App::$strings["Private - <em>default private, never open or public</em>"] = "Privat – <em>Standard privat, nie offen oder öffentlich</em>";
-App::$strings["Blocked - <em>default blocked to/from everybody</em>"] = "Blockiert – <em>Alle standardmäßig blockiert</em>";
-App::$strings["Allow others to tag your posts"] = "Erlaube anderen, Deine Beiträge zu verschlagworten";
-App::$strings["Often used by the community to retro-actively flag inappropriate content"] = "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren";
-App::$strings["Channel Permission Limits"] = "Kanal-Berechtigungslimits";
-App::$strings["Expire other channel content after this many days"] = "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen";
-App::$strings["0 or blank to use the website limit."] = "0 oder leer lassen, um den voreingestellten Wert der Webseite zu verwenden.";
-App::$strings["This website expires after %d days."] = "Diese Webseite läuft nach %d Tagen ab.";
-App::$strings["This website does not expire imported content."] = "Diese Webseite lässt importierte Inhalte nicht verfallen.";
-App::$strings["The website limit takes precedence if lower than your limit."] = "Das Verfallslimit der Webseite hat Vorrang, wenn es niedriger als Deines hier ist.";
-App::$strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:";
-App::$strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern";
-App::$strings["Default Access Control List (ACL)"] = "Standard-Zugriffsberechtigungsliste (ACL)";
-App::$strings["Use my default audience setting for the type of object published"] = "Verwende Deine eingestellte Standard-Zielgruppe des jeweiligen Inhaltstyps";
-App::$strings["Channel permissions category:"] = "Zugriffsrechte-Kategorie des Kanals:";
-App::$strings["Default Permissions Group"] = "Standard-Berechtigungsgruppe";
-App::$strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:";
-App::$strings["Useful to reduce spamming"] = "Nützlich, um Spam zu verringern";
-App::$strings["Notification Settings"] = "Benachrichtigungs-Einstellungen";
-App::$strings["By default post a status message when:"] = "Sende standardmäßig Status-Nachrichten, wenn:";
-App::$strings["accepting a friend request"] = "Du eine Verbindungsanfrage annimmst";
-App::$strings["joining a forum/community"] = "Du einem Forum beitrittst";
-App::$strings["making an <em>interesting</em> profile change"] = "Du eine <em>interessante</em> Änderung an Deinem Profil vornimmst";
-App::$strings["Send a notification email when:"] = "Eine E-Mail-Benachrichtigung senden, wenn:";
-App::$strings["You receive a connection request"] = "Du eine Verbindungsanfrage erhältst";
-App::$strings["Your connections are confirmed"] = "Eine Verbindung bestätigt wurde";
-App::$strings["Someone writes on your profile wall"] = "Jemand auf Deine Pinnwand schreibt";
-App::$strings["Someone writes a followup comment"] = "Jemand einen Beitrag kommentiert";
-App::$strings["You receive a private message"] = "Du eine private Nachricht erhältst";
-App::$strings["You receive a friend suggestion"] = "Du einen Kontaktvorschlag erhältst";
-App::$strings["You are tagged in a post"] = "Du in einem Beitrag erwähnt wurdest";
-App::$strings["You are poked/prodded/etc. in a post"] = "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest";
-App::$strings["Someone likes your post/comment"] = "Jemand mag Ihren Beitrag/Kommentar";
-App::$strings["Show visual notifications including:"] = "Visuelle Benachrichtigungen anzeigen für:";
-App::$strings["Unseen grid activity"] = "Ungesehene Netzwerk-Aktivität";
-App::$strings["Unseen channel activity"] = "Ungesehene Kanal-Aktivität";
-App::$strings["Unseen private messages"] = "Ungelesene persönliche Nachrichten";
-App::$strings["Recommended"] = "Empfohlen";
-App::$strings["Upcoming events"] = "Baldige Termine";
-App::$strings["Events today"] = "Heutige Termine";
-App::$strings["Upcoming birthdays"] = "Baldige Geburtstage";
-App::$strings["Not available in all themes"] = "Nicht in allen Themes verfügbar";
-App::$strings["System (personal) notifications"] = "System – (persönliche) Benachrichtigungen";
-App::$strings["System info messages"] = "System – Info-Nachrichten";
-App::$strings["System critical alerts"] = "System – kritische Warnungen";
-App::$strings["New connections"] = "Neue Verbindungen";
-App::$strings["System Registrations"] = "System – Registrierungen";
-App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen anzeigen";
-App::$strings["Notify me of events this many days in advance"] = "Benachrichtige mich zu Terminen so viele Tage im Voraus";
-App::$strings["Must be greater than 0"] = "Muss größer als 0 sein";
-App::$strings["Advanced Account/Page Type Settings"] = "Erweiterte Account- und Seitenart-Einstellungen";
-App::$strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Accounts unter speziellen Umständen";
-App::$strings["Miscellaneous Settings"] = "Sonstige Einstellungen";
-App::$strings["Default photo upload folder"] = "Voreingestellter Ordner für hochgeladene Fotos";
-App::$strings["%Y - current year, %m -  current month"] = "%Y - aktuelles Jahr, %m -  aktueller Monat";
-App::$strings["Default file upload folder"] = "Voreingestellter Ordner für hochgeladene Dateien";
-App::$strings["Personal menu to display in your channel pages"] = "Eigenes Menü zur Anzeige auf den Seiten deines Kanals";
-App::$strings["Remove this channel."] = "Diesen Kanal löschen";
-App::$strings["Firefox Share \$Projectname provider"] = "\$Projectname-Provider für Firefox Share";
-App::$strings["Start calendar week on monday"] = "Montag als erster Tag der Kalenderwoche";
-App::$strings["No special theme for mobile devices"] = "Keine spezielle Theme für mobile Geräte";
-App::$strings["%s - (Experimental)"] = "%s – (experimentell)";
-App::$strings["Display Settings"] = "Anzeige-Einstellungen";
-App::$strings["Theme Settings"] = "Theme-Einstellungen";
-App::$strings["Custom Theme Settings"] = "Benutzerdefinierte Theme-Einstellungen";
-App::$strings["Content Settings"] = "Inhaltseinstellungen";
-App::$strings["Display Theme:"] = "Anzeige-Theme:";
-App::$strings["Select scheme"] = "Schema wählen";
-App::$strings["Mobile Theme:"] = "Mobile Theme:";
-App::$strings["Preload images before rendering the page"] = "Bilder im voraus laden, bevor die Seite angezeigt wird";
-App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "Die empfundene Ladezeit wird sich erhöhen, aber dafür ist das Layout stabil, sobald eine Seite angezeigt wird";
-App::$strings["Enable user zoom on mobile devices"] = "Zoom auf Mobilgeräten aktivieren";
-App::$strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
-App::$strings["Minimum of 10 seconds, no maximum"] = "Minimum 10 Sekunden, kein Maximum";
-App::$strings["Maximum number of conversations to load at any time:"] = "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:";
-App::$strings["Maximum of 100 items"] = "Maximum: 100 Beiträge";
-App::$strings["Show emoticons (smilies) as images"] = "Emoticons (Smilies) als Bilder anzeigen";
-App::$strings["Manual conversation updates"] = "Manuelle Konversationsaktualisierung";
-App::$strings["Default is on, turning this off may increase screen jumping"] = "Voreinstellung ist An, dies abzuschalten kann das unerwartete Springen der Seitenanzeige erhöhen.";
-App::$strings["Link post titles to source"] = "Beitragstitel zum Originalbeitrag verlinken";
-App::$strings["System Page Layout Editor - (advanced)"] = "System-Seitenlayout-Editor (für Experten)";
-App::$strings["Use blog/list mode on channel page"] = "Blog-/Listenmodus auf der Kanalseite verwenden";
-App::$strings["(comments displayed separately)"] = "(Kommentare werden separat angezeigt)";
-App::$strings["Use blog/list mode on grid page"] = "Blog-/Listenmodus auf der Netzwerkseite verwenden";
-App::$strings["Channel page max height of content (in pixels)"] = "Maximale Höhe von Beitragsblöcken auf der Kanalseite (in Pixeln)";
-App::$strings["click to expand content exceeding this height"] = "Blöcke, deren Inhalt diese Höhe überschreitet, können per Klick vergrößert werden.";
-App::$strings["Grid page max height of content (in pixels)"] = "Maximale Höhe (in Pixel) des Inhalts der Netzwerkseite";
-App::$strings["Permission category saved."] = "Berechtigungsrolle gespeichert.";
-App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Verwende dieses Formular, um Berechtigungsrollen für verschiedene Gruppen von Personen oder Verbindungen zu erstellen.";
-App::$strings["Permission Categories"] = "Berechtigungsrollen";
-App::$strings["Permission Name"] = "Name der Berechtigungsrolle";
-App::$strings["Tag removed"] = "Schlagwort entfernt";
-App::$strings["Remove Item Tag"] = "Schlagwort entfernen";
-App::$strings["Select a tag to remove: "] = "Schlagwort zum Entfernen auswählen:";
-App::$strings["Thing updated"] = "Sache aktualisiert";
-App::$strings["Object store: failed"] = "Speichern des Objekts fehlgeschlagen";
-App::$strings["Thing added"] = "Sache hinzugefügt";
-App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-App::$strings["Show Thing"] = "Sache anzeigen";
-App::$strings["item not found."] = "Eintrag nicht gefunden";
-App::$strings["Edit Thing"] = "Sache bearbeiten";
-App::$strings["Select a profile"] = "Wähle ein Profil";
-App::$strings["Post an activity"] = "Aktivitätsnachricht senden";
-App::$strings["Only sends to viewers of the applicable profile"] = "Nur an Betrachter des ausgewählten Profils senden";
-App::$strings["Name of thing e.g. something"] = "Name der Sache, z. B. irgendwas";
-App::$strings["URL of thing (optional)"] = "URL der Sache (optional)";
-App::$strings["URL for photo of thing (optional)"] = "URL eines Fotos der Sache (optional)";
-App::$strings["Add Thing to your Profile"] = "Die Sache Deinem Profil hinzufügen";
+App::$strings["This setting requires special processing and editing has been blocked."] = "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert.";
+App::$strings["Configuration Editor"] = "Konfigurationseditor";
+App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird.";
+App::$strings["Privacy group created."] = "Gruppe wurde erstellt.";
+App::$strings["Could not create privacy group."] = "Gruppe konnte nicht erstellt werden.";
+App::$strings["Privacy group not found."] = "Gruppe nicht gefunden.";
+App::$strings["Privacy group updated."] = "Gruppe wurde aktualisiert.";
+App::$strings["Create a group of channels."] = "Erstelle eine Gruppe für Kanäle.";
+App::$strings["Privacy group name: "] = "Gruppenname:";
+App::$strings["Members are visible to other channels"] = "Mitglieder sind sichtbar für andere Kanäle";
+App::$strings["Privacy group removed."] = "Gruppe wurde entfernt.";
+App::$strings["Unable to remove privacy group."] = "Gruppe konnte nicht entfernt werden.";
+App::$strings["Privacy group editor"] = "Gruppeneditor";
+App::$strings["Members"] = "Mitglieder";
+App::$strings["All Connected Channels"] = "Alle verbundenen Kanäle";
+App::$strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus.";
+App::$strings["Profile not found."] = "Profil nicht gefunden.";
+App::$strings["Profile deleted."] = "Profil gelöscht.";
+App::$strings["Profile-"] = "Profil-";
+App::$strings["New profile created."] = "Neues Profil erstellt.";
+App::$strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden.";
+App::$strings["Profile unavailable to export."] = "Dieses Profil kann nicht exportiert werden.";
+App::$strings["Profile Name is required."] = "Profil-Name erforderlich.";
+App::$strings["Marital Status"] = "Familienstand";
+App::$strings["Romantic Partner"] = "Romantische Partner";
+App::$strings["Likes"] = "Gefällt";
+App::$strings["Dislikes"] = "Gefällt nicht";
+App::$strings["Work/Employment"] = "Arbeit/Anstellung";
+App::$strings["Religion"] = "Religion";
+App::$strings["Political Views"] = "Politische Ansichten";
+App::$strings["Gender"] = "Geschlecht";
+App::$strings["Sexual Preference"] = "Sexuelle Orientierung";
+App::$strings["Homepage"] = "Webseite";
+App::$strings["Interests"] = "Hobbys/Interessen";
+App::$strings["Profile updated."] = "Profil aktualisiert.";
+App::$strings["Hide your connections list from viewers of this profile"] = "Deine Verbindungen vor Betrachtern dieses Profils verbergen";
+App::$strings["Edit Profile Details"] = "Bearbeite Profil-Details";
+App::$strings["View this profile"] = "Dieses Profil ansehen";
+App::$strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
+App::$strings["Profile Tools"] = "Profilwerkzeuge";
+App::$strings["Change cover photo"] = "Titelbild ändern";
+App::$strings["Change profile photo"] = "Profilfoto ändern";
+App::$strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen übernehmen";
+App::$strings["Clone this profile"] = "Dieses Profil klonen";
+App::$strings["Delete this profile"] = "Dieses Profil löschen";
+App::$strings["Add profile things"] = "Sachen zum Profil hinzufügen";
+App::$strings["Personal"] = "Persönlich";
+App::$strings["Relation"] = "Beziehung";
+App::$strings["Miscellaneous"] = "Verschiedenes";
+App::$strings["Import profile from file"] = "Profil aus einer Datei importieren";
+App::$strings["Export profile to file"] = "Profil in eine Datei exportieren";
+App::$strings["Your gender"] = "Dein Geschlecht";
+App::$strings["Marital status"] = "Familienstand";
+App::$strings["Sexual preference"] = "Sexuelle Orientierung";
+App::$strings["Profile name"] = "Profilname";
+App::$strings["This is your default profile."] = "Das ist Dein Standardprofil.";
+App::$strings["Your full name"] = "Dein voller Name";
+App::$strings["Title/Description"] = "Titel/Beschreibung";
+App::$strings["Street address"] = "Straße und Hausnummer";
+App::$strings["Locality/City"] = "Wohnort";
+App::$strings["Region/State"] = "Region/Bundesstaat";
+App::$strings["Postal/Zip code"] = "Postleitzahl";
+App::$strings["Who (if applicable)"] = "Wer (falls anwendbar)";
+App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
+App::$strings["Since (date)"] = "Seit (Datum)";
+App::$strings["Tell us about yourself"] = "Erzähle uns ein wenig von Dir";
+App::$strings["Homepage URL"] = "Homepage-URL";
+App::$strings["Hometown"] = "Heimatort";
+App::$strings["Political views"] = "Politische Ansichten";
+App::$strings["Religious views"] = "Religiöse Ansichten";
+App::$strings["Keywords used in directory listings"] = "Schlüsselwörter, die in Verzeichnis-Auflistungen verwendet werden";
+App::$strings["Example: fishing photography software"] = "Beispiel: Angeln Fotografie Software";
+App::$strings["Musical interests"] = "Musikalische Interessen";
+App::$strings["Books, literature"] = "Bücher, Literatur";
+App::$strings["Television"] = "Fernsehen";
+App::$strings["Film/Dance/Culture/Entertainment"] = "Film/Tanz/Kultur/Unterhaltung";
+App::$strings["Hobbies/Interests"] = "Hobbys/Interessen";
+App::$strings["Love/Romance"] = "Liebe/Romantik";
+App::$strings["School/Education"] = "Schule/Ausbildung";
+App::$strings["Contact information and social networks"] = "Kontaktinformation und soziale Netzwerke";
+App::$strings["My other channels"] = "Meine anderen Kanäle";
+App::$strings["Communications"] = "Kommunikation";
+App::$strings["Profile Image"] = "Profilfoto:";
+App::$strings["Edit Profiles"] = "Profile bearbeiten";
+App::$strings["Page link"] = "Seiten-Link";
+App::$strings["Edit Webpage"] = "Webseite bearbeiten";
+App::$strings["Create a new channel"] = "Neuen Kanal anlegen";
+App::$strings["Channel Manager"] = "Kanal-Manager";
+App::$strings["Current Channel"] = "Aktueller Kanal";
+App::$strings["Switch to one of your channels by selecting it."] = "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst.";
+App::$strings["Default Channel"] = "Standard Kanal";
+App::$strings["Make Default"] = "Zum Standard machen";
+App::$strings["%d new messages"] = "%d neue Nachrichten";
+App::$strings["%d new introductions"] = "%d neue Vorstellungen";
+App::$strings["Delegated Channel"] = "Delegierte Kanäle";
+App::$strings["This directory server requires an access token"] = "Dieser Verzeichnisserver benötigt einen Zugriffstoken";
+App::$strings["About this site"] = "Über diese Seite";
+App::$strings["Site Name"] = "Seitenname";
+App::$strings["Administrator"] = "Administrator";
+App::$strings["Terms of Service"] = "Nutzungsbedingungen";
+App::$strings["Software and Project information"] = "Software und Projektinformationen";
+App::$strings["This site is powered by \$Projectname"] = "Diese Website wird bereitgestellt durch \$Projectname";
+App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "Verbundene, dezentrale Netzwerk- und Identitätsdienste, ermöglicht mittels Zot";
+App::$strings["Version %s"] = "Version %s";
+App::$strings["Project homepage"] = "Projekt-Website";
+App::$strings["Developer homepage"] = "Entwickler-Website";
+App::$strings["No ratings"] = "Keine Bewertungen";
+App::$strings["Ratings"] = "Bewertungen";
+App::$strings["Rating: "] = "Bewertung: ";
+App::$strings["Website: "] = "Webseite: ";
+App::$strings["Description: "] = "Beschreibung: ";
+App::$strings["Import Webpage Elements"] = "Webseitenelemente importieren";
+App::$strings["Import selected"] = "Import ausgewählt";
+App::$strings["Export Webpage Elements"] = "Webseitenelemente exportieren";
+App::$strings["Export selected"] = "Exportieren ausgewählt";
+App::$strings["Webpages"] = "Webseiten";
+App::$strings["Actions"] = "Aktionen";
+App::$strings["Page Link"] = "Seiten-Link";
+App::$strings["Page Title"] = "Seitentitel";
+App::$strings["Invalid file type."] = "Ungültiger Dateityp.";
+App::$strings["Error opening zip file"] = "Fehler beim Öffnen der ZIP-Datei";
+App::$strings["Invalid folder path."] = "Ungültiger Ordnerpfad.";
+App::$strings["No webpage elements detected."] = "Keine Webseitenelemente erkannt.";
+App::$strings["Import complete."] = "Import abgeschlossen.";
+App::$strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
+App::$strings["Edit post"] = "Bearbeite Beitrag";
+App::$strings["Invalid message"] = "Ungültige Beitrags-ID (mid)";
+App::$strings["no results"] = "keine Ergebnisse";
+App::$strings["channel sync processed"] = "Kanal-Sync verarbeitet";
+App::$strings["queued"] = "zur Warteschlange hinzugefügt";
+App::$strings["posted"] = "zugestellt";
+App::$strings["accepted for delivery"] = "für Zustellung akzeptiert";
+App::$strings["updated"] = "aktualisiert";
+App::$strings["update ignored"] = "Aktualisierung ignoriert";
+App::$strings["permission denied"] = "Zugriff verweigert";
+App::$strings["recipient not found"] = "Empfänger nicht gefunden.";
+App::$strings["mail recalled"] = "Mail widerrufen";
+App::$strings["duplicate mail received"] = "Doppelte Mail erhalten";
+App::$strings["mail delivered"] = "Mail zugestellt";
+App::$strings["Delivery report for %1\$s"] = "Zustellungsbericht für %1\$s";
+App::$strings["Options"] = "Optionen";
+App::$strings["Redeliver"] = "Erneut zustellen";
+App::$strings["Failed to create source. No channel selected."] = "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt.";
+App::$strings["Source created."] = "Quelle erstellt.";
+App::$strings["Source updated."] = "Quelle aktualisiert.";
+App::$strings["*"] = "*";
+App::$strings["Channel Sources"] = "Kanal-Quellen";
+App::$strings["Manage remote sources of content for your channel."] = "Externe Inhaltsquellen für Deinen Kanal verwalten.";
+App::$strings["New Source"] = "Neue Quelle";
+App::$strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals.";
+App::$strings["Only import content with these words (one per line)"] = "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten";
+App::$strings["Leave blank to import all public content"] = "Leer lassen, um alle öffentlichen Beiträge zu importieren";
+App::$strings["Channel Name"] = "Name des Kanals";
+App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "Füge die folgenden Kategorien zu Beiträgen, die aus dieser Quelle importiert werden, hinzu (kommagetrennt)";
+App::$strings["Source not found."] = "Quelle nicht gefunden.";
+App::$strings["Edit Source"] = "Quelle bearbeiten";
+App::$strings["Delete Source"] = "Quelle löschen";
+App::$strings["Source removed"] = "Quelle gelöscht";
+App::$strings["Unable to remove source."] = "Konnte die Quelle nicht löschen.";
+App::$strings["Like/Dislike"] = "Mögen/Nicht mögen";
+App::$strings["This action is restricted to members."] = "Diese Aktion kann nur von Mitgliedern ausgeführt werden.";
+App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Um fortzufahren <a href=\"rmagic\">melde Dich bitte mit Deiner \$Projectname-ID an</a> oder <a href=\"register\">registriere Dich als neues \$Projectname-Mitglied</a>.";
+App::$strings["Invalid request."] = "Ungültige Anfrage.";
+App::$strings["channel"] = "Kanal";
+App::$strings["thing"] = "Sache";
+App::$strings["Channel unavailable."] = "Kanal nicht vorhanden.";
+App::$strings["Previous action reversed."] = "Die vorherige Aktion wurde rückgängig gemacht.";
+App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s";
+App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s nicht";
+App::$strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s stimmt %2\$ss %3\$s zu";
+App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s lehnt %2\$ss %3\$s ab";
+App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s enthält sich zu %2\$ss %3\$s";
+App::$strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil";
+App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s nicht teil";
+App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt vielleicht an %2\$ss %3\$s teil";
+App::$strings["Action completed."] = "Aktion durchgeführt.";
+App::$strings["Thank you."] = "Vielen Dank.";
+App::$strings["%d rating"] = array(
+	0 => "%d Bewertung",
+	1 => "%d Bewertungen",
+);
+App::$strings["Gender: "] = "Geschlecht:";
+App::$strings["Status: "] = "Status:";
+App::$strings["Homepage: "] = "Webseite:";
+App::$strings["Age:"] = "Alter:";
+App::$strings["Location:"] = "Ort:";
+App::$strings["Description:"] = "Beschreibung:";
+App::$strings["Hometown:"] = "Heimatstadt:";
+App::$strings["About:"] = "Über:";
+App::$strings["Connect"] = "Verbinden";
+App::$strings["Public Forum:"] = "Öffentliches Forum:";
+App::$strings["Keywords: "] = "Schlüsselwörter:";
+App::$strings["Don't suggest"] = "Nicht vorschlagen";
+App::$strings["Common connections:"] = "Gemeinsame Verbindungen:";
+App::$strings["Global Directory"] = "Globales Verzeichnis";
+App::$strings["Local Directory"] = "Lokales Verzeichnis";
+App::$strings["Finding:"] = "Ergebnisse:";
+App::$strings["Channel Suggestions"] = "Kanal-Vorschläge";
+App::$strings["next page"] = "nächste Seite";
+App::$strings["previous page"] = "vorherige Seite";
+App::$strings["Sort options"] = "Sortieroptionen";
+App::$strings["Alphabetic"] = "alphabetisch";
+App::$strings["Reverse Alphabetic"] = "Entgegengesetzt alphabetisch";
+App::$strings["Newest to Oldest"] = "Neueste zuerst";
+App::$strings["Oldest to Newest"] = "Älteste zuerst";
+App::$strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
+App::$strings["Xchan Lookup"] = "Xchan-Suche";
+App::$strings["Lookup xchan beginning with (or webbie): "] = "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:";
+App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal.";
+App::$strings["Ignore/Hide"] = "Ignorieren/Verstecken";
+App::$strings["Unable to find your hub."] = "Konnte Deinen Server nicht finden.";
+App::$strings["Post successful."] = "Veröffentlichung erfolgreich.";
 App::$strings["Unable to lookup recipient."] = "Konnte den Empfänger nicht finden.";
 App::$strings["Unable to communicate with requested channel."] = "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen.";
 App::$strings["Cannot verify requested channel."] = "Verifizierung des angeforderten Kanals fehlgeschlagen.";
 App::$strings["Selected channel has private message restrictions. Send failed."] = "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen.";
 App::$strings["Messages"] = "Nachrichten";
+App::$strings["message"] = "Nachricht";
 App::$strings["Message recalled."] = "Nachricht widerrufen.";
 App::$strings["Conversation removed."] = "Unterhaltung gelöscht.";
-App::$strings["Please enter a link URL:"] = "Gib eine URL ein:";
 App::$strings["Expires YYYY-MM-DD HH:MM"] = "Verfällt YYYY-MM-DD HH;MM";
 App::$strings["Requested channel is not in this network"] = "Angeforderter Kanal ist nicht in diesem Netzwerk.";
 App::$strings["Send Private Message"] = "Private Nachricht senden";
@@ -1508,7 +1394,6 @@ App::$strings["Subject:"] = "Betreff:";
 App::$strings["Attach file"] = "Datei anhängen";
 App::$strings["Send"] = "Absenden";
 App::$strings["Set expiration date"] = "Verfallsdatum";
-App::$strings["Encrypt text"] = "Text verschlüsseln";
 App::$strings["Delete message"] = "Nachricht löschen";
 App::$strings["Delivery report"] = "Zustellungsbericht";
 App::$strings["Recall message"] = "Nachricht widerrufen";
@@ -1517,25 +1402,195 @@ App::$strings["Delete Conversation"] = "Unterhaltung löschen";
 App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten.";
 App::$strings["Send Reply"] = "Antwort senden";
 App::$strings["Your message for %s (%s):"] = "Deine Nachricht für %s (%s):";
+App::$strings["Public Hubs"] = "Öffentliche Hubs";
+App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung im \$Projectname Netzwerk. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen Seiten und Kanälen auf anderen Hubs ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den Seiten der einzelnen Hubs <strong>könnten</strong> jeweils nähere Informationen dazu stehen.";
+App::$strings["Hub URL"] = "Hub-URL";
+App::$strings["Access Type"] = "Zugriffstyp";
+App::$strings["Registration Policy"] = "Registrierungsrichtlinien";
+App::$strings["Stats"] = "Statistiken";
+App::$strings["Software"] = "Software";
+App::$strings["Rate"] = "Bewerten";
+App::$strings["webpage"] = "Webseite";
+App::$strings["block"] = "Block";
+App::$strings["layout"] = "Layout";
+App::$strings["menu"] = "Menü";
+App::$strings["%s element installed"] = "Element für %s installiert";
+App::$strings["%s element installation failed"] = "Installation des Elements %s fehlgeschlagen";
+App::$strings["Select a bookmark folder"] = "Lesezeichenordner wählen";
+App::$strings["Save Bookmark"] = "Lesezeichen speichern";
+App::$strings["URL of bookmark"] = "URL des Lesezeichens";
+App::$strings["Or enter new bookmark folder name"] = "Oder gib einen neuen Namen für den Lesezeichenordner ein";
+App::$strings["Enter a folder name"] = "Gib einen Ordnernamen ein";
+App::$strings["or select an existing folder (doubleclick)"] = "oder wähle einen vorhanden Ordner aus (Doppelklick)";
+App::$strings["Save to Folder"] = "In Ordner speichern";
+App::$strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen Fehler zurück: %1\$s";
+App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
+App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen.";
+App::$strings["Passwords do not match."] = "Passwörter stimmen nicht überein.";
+App::$strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
+App::$strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
+App::$strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
+App::$strings["Registration on this hub is disabled."] = "Die Registrierung auf diesem Hub ist nicht möglich.";
+App::$strings["Registration on this hub is by approval only."] = "Eine Registrierung auf diesem Hub erfordert die Zustimmung durch den Administrator.";
+App::$strings["<a href=\"pubsites\">Register at another affiliated hub.</a>"] = "<a href=\"pubsites\">Registriere Dich auf einem der anderen verbundenen Hubs.</a>";
+App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal.";
+App::$strings["I accept the %s for this website"] = "Ich akzeptiere die %s für diese Webseite";
+App::$strings["I am over 13 years of age and accept the %s for this website"] = "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite";
+App::$strings["Your email address"] = "Ihre E-Mail Adresse";
+App::$strings["Choose a password"] = "Passwort";
+App::$strings["Please re-enter your password"] = "Bitte gib Dein Passwort noch einmal ein";
+App::$strings["Please enter your invitation code"] = "Bitte trage Deinen Einladungs-Code ein";
+App::$strings["no"] = "nein";
+App::$strings["yes"] = "ja";
+App::$strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
+App::$strings["Register"] = "Registrieren";
+App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "Diese Seite verlangt möglicherweise eine Emailbestätigung nach dem Absenden des Formulars. Wenn Du auf eine Login-Seite zurückgeleitet wirst, prüfe bitte Deinen Posteingang auf neue Mails mit entsprechenden Hinweisen.";
+App::$strings["Cover Photos"] = "Cover Foto";
+App::$strings["female"] = "weiblich";
+App::$strings["%1\$s updated her %2\$s"] = "%1\$s hat ihr %2\$s aktualisiert";
+App::$strings["male"] = "männlich";
+App::$strings["%1\$s updated his %2\$s"] = "%1\$s hat sein %2\$s aktualisiert";
+App::$strings["%1\$s updated their %2\$s"] = "%1\$s hat sein/ihr %2\$s aktualisiert";
+App::$strings["cover photo"] = "Cover Foto";
+App::$strings["Upload Cover Photo"] = "Cover Foto hochladen";
+App::$strings["Documentation Search"] = "Suche in der Dokumentation";
+App::$strings["About"] = "Über";
+App::$strings["Administrators"] = "Administratoren";
+App::$strings["Developers"] = "Entwickler";
+App::$strings["Tutorials"] = "Tutorials";
+App::$strings["\$Projectname Documentation"] = "\$Projectname-Dokumentation";
+App::$strings["Contents"] = "Inhalt";
+App::$strings["Tag removed"] = "Schlagwort entfernt";
+App::$strings["Remove Item Tag"] = "Schlagwort entfernen";
+App::$strings["Select a tag to remove: "] = "Schlagwort zum Entfernen auswählen:";
+App::$strings["No such group"] = "Gruppe nicht gefunden";
+App::$strings["No such channel"] = "Kanal nicht gefunden";
+App::$strings["forum"] = "Forum";
+App::$strings["Search Results For:"] = "Suchergebnisse für:";
+App::$strings["Privacy group is empty"] = "Gruppe ist leer";
+App::$strings["Privacy group: "] = "Gruppe:";
+App::$strings["Invalid connection."] = "Ungültige Verbindung.";
+App::$strings["Invalid channel."] = "Ungültiger Kanal.";
+App::$strings["network"] = "Netzwerk";
+App::$strings["RSS"] = "RSS";
+App::$strings["\$Projectname"] = "\$Projectname";
+App::$strings["Welcome to %s"] = "Willkommen auf %s";
+App::$strings["Permission Denied."] = "Zugriff verweigert.";
+App::$strings["File not found."] = "Datei nicht gefunden.";
+App::$strings["Edit file permissions"] = "Dateiberechtigungen bearbeiten";
+App::$strings["Set/edit permissions"] = "Berechtigungen setzen/ändern";
+App::$strings["Include all files and sub folders"] = "Alle Dateien und Unterverzeichnisse einbinden";
+App::$strings["Return to file list"] = "Zurück zur Dateiliste";
+App::$strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen";
+App::$strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken";
+App::$strings["Share this file"] = "Diese Datei freigeben";
+App::$strings["Show URL to this file"] = "URL zu dieser Datei anzeigen";
+App::$strings["Notify your contacts about this file"] = "Meine Kontakte über diese Datei benachrichtigen";
+App::$strings["No channel."] = "Kein Kanal.";
+App::$strings["Common connections"] = "Gemeinsame Verbindungen";
+App::$strings["No connections in common."] = "Keine gemeinsamen Verbindungen.";
 App::$strings["No connections."] = "Keine Verbindungen.";
 App::$strings["Visit %s's profile [%s]"] = "%ss Profil [%s] besuchen";
 App::$strings["View Connections"] = "Verbindungen anzeigen";
-App::$strings["Source of Item"] = "Quelle des Elements";
-App::$strings["Room not found"] = "Chatraum nicht gefunden";
-App::$strings["Leave Room"] = "Raum verlassen";
-App::$strings["Delete Room"] = "Raum löschen";
-App::$strings["I am away right now"] = "Ich bin gerade nicht da";
-App::$strings["I am online"] = "Ich bin online";
-App::$strings["Bookmark this room"] = "Lesezeichen für diesen Raum setzen";
-App::$strings["New Chatroom"] = "Neuer Chatraum";
-App::$strings["Chatroom name"] = "Chatraumname";
-App::$strings["Expiration of chats (minutes)"] = "Verfall von Chats (Minuten)";
-App::$strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume";
-App::$strings["No chatrooms available"] = "Keine Chaträume verfügbar";
-App::$strings["Expiration"] = "Verfall";
-App::$strings["min"] = "min";
-App::$strings["Xchan Lookup"] = "Xchan-Suche";
-App::$strings["Lookup xchan beginning with (or webbie): "] = "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:";
+App::$strings["# Accounts"] = "Anzahl der Konten";
+App::$strings["# blocked accounts"] = "Anzahl der blockierten Konten";
+App::$strings["# expired accounts"] = "Anzahl der abgelaufenen Konten";
+App::$strings["# expiring accounts"] = "Anzahl der ablaufenden Konten";
+App::$strings["# Channels"] = "Anzahl der Kanäle";
+App::$strings["# primary"] = "Anzahl der primären Kanäle";
+App::$strings["# clones"] = "Anzahl der Klone";
+App::$strings["Message queues"] = "Nachrichten-Warteschlangen";
+App::$strings["Your software should be updated"] = "Die installierte Software sollte aktualisiert werden";
+App::$strings["Summary"] = "Zusammenfassung";
+App::$strings["Registered accounts"] = "Registrierte Konten";
+App::$strings["Pending registrations"] = "Ausstehende Registrierungen";
+App::$strings["Registered channels"] = "Registrierte Kanäle";
+App::$strings["Active plugins"] = "Aktive Plug-Ins";
+App::$strings["Version"] = "Version";
+App::$strings["Repository version (master)"] = "Repository-Version (master)";
+App::$strings["Repository version (dev)"] = "Repository-Version (dev)";
+App::$strings["No service class restrictions found."] = "Keine Dienstklassenbeschränkungen gefunden.";
+App::$strings["Website:"] = "Webseite:";
+App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Kanal [%s] (auf diesem Server noch unbekannt)";
+App::$strings["Rating (this information is public)"] = "Bewertung (öffentlich sichtbar)";
+App::$strings["Optionally explain your rating (this information is public)"] = "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)";
+App::$strings["No valid account found."] = "Kein gültiges Konto gefunden.";
+App::$strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails.";
+App::$strings["Site Member (%s)"] = "Nutzer (%s)";
+App::$strings["Password reset requested at %s"] = "Passwort-Rücksetzung auf %s angefordert";
+App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen.";
+App::$strings["Password Reset"] = "Zurücksetzen des Kennworts";
+App::$strings["Your password has been reset as requested."] = "Dein Passwort wurde wie angefordert neu erstellt.";
+App::$strings["Your new password is"] = "Dein neues Passwort lautet";
+App::$strings["Save or copy your new password - and then"] = "Speichere oder kopiere Dein neues Passwort – und dann";
+App::$strings["click here to login"] = "Klicke hier, um dich anzumelden";
+App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden.";
+App::$strings["Your password has changed at %s"] = "Auf %s wurde Dein Passwort geändert";
+App::$strings["Forgot your Password?"] = "Kennwort vergessen?";
+App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail.";
+App::$strings["Email Address"] = "E-Mail Adresse";
+App::$strings["Reset"] = "Zurücksetzen";
+App::$strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gesehen";
+App::$strings["Site Admin"] = "Hub-Administration";
+App::$strings["Report Bug"] = "Fehler melden";
+App::$strings["View Bookmarks"] = "Lesezeichen ansehen";
+App::$strings["My Chatrooms"] = "Meine Chaträume";
+App::$strings["Firefox Share"] = "Teilen-Knopf für Firefox";
+App::$strings["Remote Diagnostics"] = "Ferndiagnose";
+App::$strings["Suggest Channels"] = "Kanäle vorschlagen";
+App::$strings["Login"] = "Anmelden";
+App::$strings["Activity"] = "Aktivität";
+App::$strings["Wiki"] = "Wiki";
+App::$strings["Channel Home"] = "Mein Kanal";
+App::$strings["Events"] = "Termine";
+App::$strings["Directory"] = "Verzeichnis";
+App::$strings["Mail"] = "Mail";
+App::$strings["Chat"] = "Chat";
+App::$strings["Probe"] = "Testen";
+App::$strings["Suggest"] = "Empfehlen";
+App::$strings["Random Channel"] = "Zufälliger Kanal";
+App::$strings["Invite"] = "Einladen";
+App::$strings["Features"] = "Funktionen";
+App::$strings["Language"] = "Sprache";
+App::$strings["Post"] = "Beitrag schreiben";
+App::$strings["Profile Photo"] = "Profilfoto";
+App::$strings["Purchase"] = "Kaufen";
+App::$strings["Undelete"] = "Wieder hergestellt";
+App::$strings["Add to app-tray"] = "Zum App-Menü hinzufügen";
+App::$strings["Remove from app-tray"] = "Aus dem App-Menü entfernen";
+App::$strings["__ctx:permcat__ default"] = "Standard";
+App::$strings["__ctx:permcat__ follower"] = "Abonnent";
+App::$strings["__ctx:permcat__ contributor"] = "Beitragender";
+App::$strings["__ctx:permcat__ publisher"] = "Autor";
+App::$strings["(No Title)"] = "(Kein Titel)";
+App::$strings["Wiki page create failed."] = "Anlegen der Wiki-Seite fehlgeschlagen.";
+App::$strings["Wiki not found."] = "Wiki nicht gefunden.";
+App::$strings["Destination name already exists"] = "Zielname bereits vorhanden";
+App::$strings["Page not found"] = "Seite nicht gefunden";
+App::$strings["Error reading page content"] = "Fehler beim Lesen des Seiteninhalts";
+App::$strings["Error reading wiki"] = "Fehler beim Lesen des Wiki";
+App::$strings["Page update failed."] = "Seitenaktualisierung fehlgeschlagen.";
+App::$strings["Nothing deleted"] = "Nichts gelöscht";
+App::$strings["Compare: object not found."] = "Vergleichen: Objekt nicht gefunden.";
+App::$strings["Page updated"] = "Seite aktualisiert";
+App::$strings["Untitled"] = "Ohne Titel";
+App::$strings["Wiki resource_id required for git commit"] = "Die resource_id des Wiki wird benötigt für den git commit.";
+App::$strings["__ctx:wiki_history__ Message"] = "Nachricht";
+App::$strings["Different viewers will see this text differently"] = "Verschiedene Betrachter werden diesen Text unterschiedlich sehen";
+App::$strings["Visible to your default audience"] = "Standard-Sichtbarkeit gemäß Kanaleinstellungen";
+App::$strings["Only me"] = "Nur ich";
+App::$strings["Public"] = "Öffentlich";
+App::$strings["Anybody in the \$Projectname network"] = "Jeder innerhalb des \$Projectname Netzwerks";
+App::$strings["Any account on %s"] = "Jedes Nutzerkonto auf %s";
+App::$strings["Any of my connections"] = "Alle meine Verbindungen";
+App::$strings["Only connections I specifically allow"] = "Nur Verbindungen, denen ich es explizit erlaube";
+App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Jeder, der angemeldet ist (kann Besucher anderer Netzwerke beinhalten)";
+App::$strings["Any connections including those who haven't yet been approved"] = "Alle Verbindungen einschließlich der noch nicht bestätigten";
+App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner normalen Beiträge (Stream).";
+App::$strings["This is your default setting for who can view your default channel profile"] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deines Standard-Kanalprofils.";
+App::$strings["This is your default setting for who can view your connections"] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Verbindungen.";
+App::$strings["This is your default setting for who can view your file storage and photos"] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Dateien und Fotos.";
+App::$strings["This is your default setting for the audience of your webpages"] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Webseiten.";
 App::$strings["Missing room name"] = "Der Chatraum hat keinen Namen";
 App::$strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
 App::$strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
@@ -1557,7 +1612,7 @@ App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s,
 App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s";
 App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat eine Unterhaltung kommentiert, der Du folgst.";
 App::$strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren.";
-App::$strings["%1\$s, %2\$s liked [zrl=%3\$s]your %4\$s[/zrl]"] = "";
+App::$strings["%1\$s, %2\$s liked [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s gefällt [zrl=%3\$s]dein %4\$s[/zrl]";
 App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Benachrichtigung] Gefällt mir in Unterhaltung #%1\$d von %2\$s erhalten";
 App::$strings["%1\$s, %2\$s liked an item/conversation you created."] = "%1\$s, %2\$s gefällt ein Beitrag oder eine Unterhaltung von Dir";
 App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = "[\$Projectname:Benachrichtigung] %s schrieb auf Deine Pinnwand";
@@ -1586,264 +1641,306 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Bitte b
 App::$strings["[\$Projectname:Notify]"] = "[\$Projectname:Benachrichtigung]";
 App::$strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
 App::$strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
-App::$strings["Visible to your default audience"] = "Standard-Sichtbarkeit gemäß Kanaleinstellungen";
-App::$strings["Only me"] = "Nur ich";
-App::$strings["Public"] = "Öffentlich";
-App::$strings["Anybody in the \$Projectname network"] = "Jeder innerhalb des \$Projectname Netzwerks";
-App::$strings["Any account on %s"] = "Jedes Nutzerkonto auf %s";
-App::$strings["Any of my connections"] = "Alle meine Verbindungen";
-App::$strings["Only connections I specifically allow"] = "Nur Verbindungen, denen ich es explizit erlaube";
-App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Jeder, der angemeldet ist (kann Besucher anderer Netzwerke beinhalten)";
-App::$strings["Any connections including those who haven't yet been approved"] = "Alle Verbindungen einschließlich der noch nicht bestätigten";
-App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner normalen Beiträge (Stream).";
-App::$strings["This is your default setting for who can view your default channel profile"] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deines Standard-Kanalprofils.";
-App::$strings["This is your default setting for who can view your connections"] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Verbindungen.";
-App::$strings["This is your default setting for who can view your file storage and photos"] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Dateien und Fotos.";
-App::$strings["This is your default setting for the audience of your webpages"] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Webseiten.";
-App::$strings["Private Message"] = "Private Nachricht";
-App::$strings["Select"] = "Auswählen";
-App::$strings["Save to Folder"] = "In Ordner speichern";
-App::$strings["I will attend"] = "Ich werde teilnehmen";
-App::$strings["I will not attend"] = "Ich werde nicht teilnehmen";
-App::$strings["I might attend"] = "Ich werde vielleicht teilnehmen";
-App::$strings["I agree"] = "Ich stimme zu";
-App::$strings["I disagree"] = "Ich lehne ab";
-App::$strings["I abstain"] = "Ich enthalte mich";
-App::$strings["Add Star"] = "Stern hinzufügen";
-App::$strings["Remove Star"] = "Stern entfernen";
-App::$strings["Toggle Star Status"] = "Markierungsstatus (Stern) umschalten";
-App::$strings["starred"] = "markiert";
-App::$strings["Message signature validated"] = "Signatur überprüft";
-App::$strings["Message signature incorrect"] = "Signatur nicht korrekt";
-App::$strings["Add Tag"] = "Tag hinzufügen";
-App::$strings["like"] = "mag";
-App::$strings["dislike"] = "verurteile";
-App::$strings["Share This"] = "Teilen";
-App::$strings["share"] = "Teilen";
-App::$strings["Delivery Report"] = "Zustellungsbericht";
-App::$strings["%d comment"] = array(
-	0 => "%d Kommentar",
-	1 => "%d Kommentare",
-);
-App::$strings["View %s's profile - %s"] = "Schaue Dir %ss Profil an – %s";
-App::$strings["to"] = "an";
-App::$strings["via"] = "via";
-App::$strings["Wall-to-Wall"] = "Wall-to-Wall";
-App::$strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
-App::$strings["from %s"] = "via %s";
-App::$strings["last edited: %s"] = "zuletzt bearbeitet: %s";
-App::$strings["Expires: %s"] = "Verfällt: %s";
-App::$strings["Attend"] = "Zusagen";
-App::$strings["Attendance Options"] = "Zusageoptionen";
-App::$strings["Vote"] = "Abstimmen";
-App::$strings["Voting Options"] = "Abstimmungsoptionen";
-App::$strings["Save Bookmarks"] = "Favoriten speichern";
-App::$strings["Add to Calendar"] = "Zum Kalender hinzufügen";
-App::$strings["Mark all seen"] = "Alle als gelesen markieren";
-App::$strings["%s show all"] = "%s mehr anzeigen";
-App::$strings["Bold"] = "Fett";
-App::$strings["Italic"] = "Kursiv";
-App::$strings["Underline"] = "Unterstrichen";
-App::$strings["Quote"] = "Zitat";
-App::$strings["Code"] = "Code";
-App::$strings["Image"] = "Bild";
-App::$strings["Insert Link"] = "Link einfügen";
-App::$strings["Video"] = "Video";
-App::$strings["Site Admin"] = "Hub-Administration";
-App::$strings["Report Bug"] = "Fehler melden";
-App::$strings["View Bookmarks"] = "Lesezeichen ansehen";
-App::$strings["My Chatrooms"] = "Meine Chaträume";
-App::$strings["Firefox Share"] = "Teilen-Knopf für Firefox";
-App::$strings["Remote Diagnostics"] = "Ferndiagnose";
-App::$strings["Suggest Channels"] = "Kanäle vorschlagen";
-App::$strings["Login"] = "Anmelden";
-App::$strings["Grid"] = "Grid";
-App::$strings["Wiki"] = "Wiki";
-App::$strings["Channel Home"] = "Mein Kanal";
-App::$strings["Events"] = "Termine";
-App::$strings["Directory"] = "Verzeichnis";
-App::$strings["Mail"] = "Mail";
-App::$strings["Chat"] = "Chat";
-App::$strings["Probe"] = "Testen";
-App::$strings["Suggest"] = "Empfehlen";
-App::$strings["Random Channel"] = "Zufälliger Kanal";
-App::$strings["Invite"] = "Einladen";
-App::$strings["Features"] = "Funktionen";
-App::$strings["Language"] = "Sprache";
-App::$strings["Post"] = "Beitrag schreiben";
-App::$strings["Profile Photo"] = "Profilfoto";
-App::$strings["Purchase"] = "Kaufen";
-App::$strings["Undelete"] = "Wieder hergestellt";
-App::$strings["Wiki files deleted successfully"] = "Wiki-Dateien erfolgreich gelöscht";
-App::$strings["__ctx:permcat__ default"] = "Standard";
-App::$strings["__ctx:permcat__ follower"] = "Abonnent";
-App::$strings["__ctx:permcat__ contributor"] = "Beitragender";
-App::$strings["__ctx:permcat__ publisher"] = "Autor";
-App::$strings["(No Title)"] = "(Kein Titel)";
-App::$strings["Wiki page create failed."] = "Anlegen der Wiki-Seite fehlgeschlagen.";
-App::$strings["Wiki not found."] = "Wiki nicht gefunden.";
-App::$strings["Destination name already exists"] = "Zielname bereits vorhanden";
-App::$strings["Page not found"] = "Seite nicht gefunden";
-App::$strings["Error reading page content"] = "Fehler beim Lesen des Seiteninhalts";
-App::$strings["Error reading wiki"] = "Fehler beim Lesen des Wiki";
-App::$strings["Page update failed."] = "Seitenaktualisierung fehlgeschlagen.";
-App::$strings["Nothing deleted"] = "Nichts gelöscht";
-App::$strings["Compare: object not found."] = "Vergleichen: Objekt nicht gefunden.";
-App::$strings["Page updated"] = "Seite aktualisiert";
-App::$strings["Untitled"] = "Ohne Titel";
-App::$strings["Wiki resource_id required for git commit"] = "";
-App::$strings["Different viewers will see this text differently"] = "Verschiedene Betrachter werden diesen Text unterschiedlich sehen";
-App::$strings["Flag Adult Photos"] = "Nicht jugendfreie Fotos markieren";
-App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Stellt eine Option zum Verstecken von Fotos mit unangemessenen Inhalten in der Standard-Albumansicht bereit";
-App::$strings["This is a fairly comprehensive and complete guitar chord dictionary which will list most of the available ways to play a certain chord, starting from the base of the fingerboard up to a few frets beyond the twelfth fret (beyond which everything repeats). A couple of non-standard tunings are provided for the benefit of slide players, etc."] = "";
-App::$strings["Chord names start with a root note (A-G) and may include sharps (#) and flats (b). This software will parse most of the standard naming conventions such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."] = "";
-App::$strings["Valid examples include  A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."] = "Einige gültige Beispiele: A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ...";
-App::$strings["Guitar Chords"] = "Gitarrenakkorde";
-App::$strings["The complete online chord dictionary"] = "Das komplette online Akkord-Verzeichnis";
-App::$strings["Tuning"] = "Stimmen";
-App::$strings["Chord name: example: Em7"] = "Beispiel Akkord Name: Em7";
-App::$strings["Show for left handed stringing"] = "Linkshänder-Besaitung anzeigen";
-App::$strings["Quick Reference"] = "Schnellreferenz";
-App::$strings["No username found in import file."] = "Kein Benutzername in der Importdatei gefunden.";
-App::$strings["Unable to create a unique channel address. Import failed."] = "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Import ist fehlgeschlagen.";
-App::$strings["Diaspora Protocol Settings updated."] = "Diaspora-Protokolleinstellungen aktualisiert.";
-App::$strings["Enable the Diaspora protocol for this channel"] = "Diaspora-Protokoll für diesen Kanal aktivieren";
-App::$strings["Allow any Diaspora member to comment on your public posts"] = "Jedem Diaspora-Mitglied erlauben, Deine öffentlichen Beiträge zu kommentieren";
-App::$strings["Prevent your hashtags from being redirected to other sites"] = "Verhindern, dass Deine hashtags zu anderen Seiten umgeleitet werden";
-App::$strings["Followed hashtags (comma separated, do not include the #)"] = "Verfolgte Hashtags (Komma separierte Liste, ohne die #)";
-App::$strings["Diaspora Protocol Settings"] = "Diaspora-Protokolleinstellungen";
-App::$strings["Hubzilla Directory Stats"] = "Hubzilla-Verzeichnisstatistiken";
-App::$strings["Total Hubs"] = "Hubs insgesamt";
-App::$strings["Hubzilla Hubs"] = "Hubzilla Hubs";
-App::$strings["Friendica Hubs"] = "Friendica Hubs";
-App::$strings["Diaspora Pods"] = "Diaspora Pods";
-App::$strings["Hubzilla Channels"] = "Hubzilla-Kanäle";
-App::$strings["Friendica Channels"] = "Friendica-Kanäle";
-App::$strings["Diaspora Channels"] = "Diaspora-Kanäle";
-App::$strings["Aged 35 and above"] = "35 und älter";
-App::$strings["Aged 34 and under"] = "34 und jünger";
-App::$strings["Average Age"] = "Durchschnittsalter";
-App::$strings["Known Chatrooms"] = "Bekannte Chaträume";
-App::$strings["Known Tags"] = "Bekannte Schlagwörter";
-App::$strings["Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network.  This also applies to chatrooms,"] = "Bitte berücksichtige, dass Diaspora und Friendica Statistiken nur solche einschließen, die **diesem Verzeichnis** bekannt sind, nicht alle im Netzwerk bekannten. Das gilt auch für Chaträume.";
-App::$strings["Project Servers and Resources"] = "Projektserver und -ressourcen";
-App::$strings["Project Creator and Tech Lead"] = "Projektersteller und Technischer Leiter";
-App::$strings["Admin, developer, directorymin, support bloke"] = "Administrator, Entwickler, Verzeichnis Betreibender, Supportleistende";
-App::$strings["And the hundreds of other people and organisations who helped make the Hubzilla possible."] = "Und die hunderte anderen Menschen und Organisationen, die geholfen haben Hubzilla möglich zu machen.";
-App::$strings["The Redmatrix/Hubzilla projects are provided primarily by volunteers giving their time and expertise - and often paying out of pocket for services they share with others."] = "Die Redmatrix/Hubzilla Projekte werden hauptsächlich von Freiwilligen bereitgestellt, die ihre Zeit und Expertise zur Verfügung stellen - und oft aus eigener Tasche für die Dienste zahlen, die sie mit anderen teilen.";
-App::$strings["There is no corporate funding and no ads, and we do not collect and sell your personal information. (We don't control your personal information - <strong>you do</strong>.)"] = "Es gibt keine Finanzierung durch Firmen, keine Werbung und wir verkaufen Deine persönlichen Daten nicht. (Wir kontrollieren Deine persönlichen Daten nicht - <strong>das machst Du</strong>.)";
-App::$strings["Help support our ground-breaking work in decentralisation, web identity, and privacy."] = "Hilf uns bei unserer wegweisenden Arbeit im Bereich der Dezantralisation, von Web-Identitäten und Privatsphäre.";
-App::$strings["Your donations keep servers and services running and also helps us to provide innovative new features and continued development."] = "Die Spenden werden dafür verwendet Server und Dienste am laufen zu halten und helfen desweiteren innovative Neuerungen zu schaffen und die Entwicklung voran zu treiben.";
-App::$strings["Donate"] = "Spenden";
-App::$strings["Choose a project, developer, or public hub to support with a one-time donation"] = "Wähle ein Projekt, einen Entwickler oder einen öffentlichen Hub den du mit einer einmaligen Spende unterstützen willst.";
-App::$strings["Donate Now"] = "Jetzt spenden";
-App::$strings["<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"] = "<strong><em>Oder</em></strong> werde ein Unterstützer des Projekts (ausschließlich Hubzilla)";
-App::$strings["Please indicate if you would like your first name or full name (or nothing) to appear in our sponsor listing"] = "Bitte teile uns mit ob dein kompletter Name oder dein Vorname (oder gar nichts) auf unserer Sponsoren-Seite veröffentlicht werden soll.";
-App::$strings["Sponsor"] = "Sponsor";
-App::$strings["Special thanks to: "] = "Besonderer Dank an: ";
-App::$strings["Post to Dreamwidth"] = "Bei Dreamwidth veröffentlichen";
-App::$strings["Enable Dreamwidth Post Plugin"] = "Aktiviere das Dreamwidth-Plugin";
-App::$strings["Dreamwidth username"] = "Dreamwidth-Benutzername";
-App::$strings["Dreamwidth password"] = "Dreamwidth-Passwort";
-App::$strings["Post to Dreamwidth by default"] = "Standardmäßig auf auf Dreamwidth posten";
-App::$strings["Dreamwidth Post Settings"] = "Dreamwidth-Beitragseinstellungen";
-App::$strings["Flattr this!"] = "Flattr this!";
-App::$strings["Flattr widget settings updated."] = "Flattr Widget Einstellungen aktualisiert";
-App::$strings["Flattr user"] = "Flattr Nutzer";
-App::$strings["URL of the Thing to flattr"] = "URL des Dings zum flattrn";
-App::$strings["If empty channel URL is used"] = "Falls leer wird die Channel URL verwendet";
-App::$strings["Title of the Thing to flattr"] = "Titel des Dings zum flattrn";
-App::$strings["If empty \"channel name on The Hubzilla\" will be used"] = "Falls leer wird \"Kanalname auf The Hubzilla\" verwendet";
-App::$strings["Static or dynamic flattr button"] = "Statischer oder dynamischer Flattr Button";
-App::$strings["static"] = "statisch";
-App::$strings["dynamic"] = "dynamisch";
-App::$strings["Alignment of the widget"] = "Ausrichtung des Widgets";
-App::$strings["left"] = "links";
-App::$strings["right"] = "rechts";
-App::$strings["Enable Flattr widget"] = "Flattr Widget verwenden";
-App::$strings["Flattr Widget Settings"] = "Flattr Widget Einstellungen";
-App::$strings["Contact not found."] = "Kontakt nicht gefunden.";
-App::$strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Dies kann unter Umständen passieren, wenn der Kontakt von beiden Seiten aus angefragt wurde und er bereits akzeptiert wurde..";
-App::$strings["Response from remote site was not understood."] = "Antwort des entfernten Seite war unverständlich.";
-App::$strings["Unexpected response from remote site: "] = "Unerwartete Antwort der entfernten Seite";
-App::$strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen.";
-App::$strings["Remote site reported: "] = "Meldung der entfernten Seite";
-App::$strings["Temporary failure. Please wait and try again."] = "Vorübergehende Störung. Bitte warte einen Moment und versuche es später erneut.";
-App::$strings["Introduction failed or was revoked."] = "Vorstellung fehlgeschlagen oder wurde zurück gezogen.";
-App::$strings["Unable to set contact photo."] = "Konnte das Kontakt-Photo nicht setzen.";
-App::$strings["%1\$s is now friends with %2\$s"] = "%1\$s ist nun mit %2\$s befreundet";
-App::$strings["No user record found for '%s' "] = "Kein Benutzereintrag für '%s'  gefunden";
-App::$strings["Our site encryption key is apparently messed up."] = "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend kaputt.";
-App::$strings["Empty site URL was provided or URL could not be decrypted by us."] = "Eine leere Seiten URL wurde angegeben, oder die URL konnte von uns nicht entziffert werden.";
-App::$strings["Contact record was not found for you on our site."] = "Für dich wurden keinerlei Kontaktdaten auf unserer Seite gefunden.";
-App::$strings["Site public key not available in contact record for URL %s."] = "Der öffentliche Schlüssel dieser Seite ist für die Kontaktdaten mit der URL %s nocht verfügbar.";
-App::$strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die Durch Dein System angegeben wurde ist ein Duplikat auf unserem. Es sollte funktionieren, wenn Du es noch einmal versuchst.";
-App::$strings["Unable to set your contact credentials on our system."] = "";
-App::$strings["Unable to update your contact profile details on our system"] = "Konnte die Details deines Profils auf unserem System nicht aktualisieren.";
-App::$strings["[Name Withheld]"] = "[Name zurück gehalten]";
-App::$strings["%1\$s has joined %2\$s"] = "%1\$s ist %2\$s beigetreten";
-App::$strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s willkommen";
-App::$strings["This introduction has already been accepted."] = "Die Vorstellung wurde bereits akzeptiert.";
-App::$strings["Profile location is not valid or does not contain profile information."] = "Die angegebenen Profil Lokalität ist nicht gültig oder enthält keine Profil-Informationen.";
-App::$strings["Warning: profile location has no identifiable owner name."] = "";
-App::$strings["Warning: profile location has no profile photo."] = "Warnung: Beim angegebenen Profil liegt kein Profil-Bild bei.";
-App::$strings["%d required parameter was not found at the given location"] = array(
-	0 => "Konnte %d benötigten Parameter an der angegebenen Stelle nicht finden.",
-	1 => "Konnte %d benötigte Parameter an der angegebenen Stelle nicht finden.",
+App::$strings["Wiki files deleted successfully"] = "Wiki-Dateien erfolgreich gelöscht";
+App::$strings["Update Error at %s"] = "Aktualisierungsfehler auf %s";
+App::$strings["Update %s failed. See error logs."] = "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen.";
+App::$strings["Private Message"] = "Private Nachricht";
+App::$strings["Select"] = "Auswählen";
+App::$strings["I will attend"] = "Ich werde teilnehmen";
+App::$strings["I will not attend"] = "Ich werde nicht teilnehmen";
+App::$strings["I might attend"] = "Ich werde vielleicht teilnehmen";
+App::$strings["I agree"] = "Ich stimme zu";
+App::$strings["I disagree"] = "Ich lehne ab";
+App::$strings["I abstain"] = "Ich enthalte mich";
+App::$strings["Add Star"] = "Stern hinzufügen";
+App::$strings["Remove Star"] = "Stern entfernen";
+App::$strings["Toggle Star Status"] = "Markierungsstatus (Stern) umschalten";
+App::$strings["starred"] = "markiert";
+App::$strings["Message signature validated"] = "Signatur überprüft";
+App::$strings["Message signature incorrect"] = "Signatur nicht korrekt";
+App::$strings["Add Tag"] = "Tag hinzufügen";
+App::$strings["like"] = "mag";
+App::$strings["dislike"] = "verurteile";
+App::$strings["Share This"] = "Teilen";
+App::$strings["share"] = "Teilen";
+App::$strings["Delivery Report"] = "Zustellungsbericht";
+App::$strings["%d comment"] = array(
+	0 => "%d Kommentar",
+	1 => "%d Kommentare",
 );
-App::$strings["Introduction complete."] = "Einführung abgeschlossen.";
-App::$strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler.";
-App::$strings["Profile unavailable."] = "Profil nicht verfügbar.";
-App::$strings["%s has received too many connection requests today."] = "%s hat heute bereits zu viele Kontaktanfragen erhalten.";
-App::$strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spam-Schutz wurden aktiviert.";
-App::$strings["Friends are advised to please try again in 24 hours."] = "Freunde sollten es bitte in 24 Stunden erneut versuchen.";
-App::$strings["Invalid locator"] = "";
-App::$strings["Invalid email address."] = "Ungültige E-Mail-Adresse.";
-App::$strings["This account has not been configured for email. Request failed."] = "Dieser Account wurde nicht für E-Mail konfiguriert. Anfrage gescheitert.";
-App::$strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen nicht bei der angegebenen Stelle ermitteln.";
-App::$strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
-App::$strings["Apparently you are already friends with %s."] = "Anscheinend bist du bereits mit %s in Kontakt.";
-App::$strings["Invalid profile URL."] = "Ungültige Profil-URL.";
-App::$strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL.";
-App::$strings["Failed to update contact record."] = "Konnte den Verbindungseintrag nicht aktualisieren.";
-App::$strings["Your introduction has been sent."] = "Deine Vorstellung wurde gesendet.";
-App::$strings["Please login to confirm introduction."] = "Bitte melde dich an um die Vorstellung zu bestätigen.";
-App::$strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "";
-App::$strings["Confirm"] = "Bestätigen";
-App::$strings["Hide this contact"] = "Diesen Kontakt verbergen";
-App::$strings["Welcome home %s."] = "Willkommen daheim %s";
-App::$strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Vorstellung/Kontaktanfrage bei %s.";
-App::$strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib deine \"Identitäts Adresse\" von einem der folgenden unterstützten Kommunikations Netzwerke an.";
-App::$strings["If you are not yet a member of the free social web, <a href=\"%s/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "";
-App::$strings["Friend/Connection Request"] = "Freundschafts-/Verbindungsanfrage";
-App::$strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
-App::$strings["Please answer the following:"] = "Bitte beantworten Sie folgendes:";
-App::$strings["Does %s know you?"] = "Kennt %s Sie?";
-App::$strings["Add a personal note:"] = "Eine persönliche Nachricht hinterlassen:";
-App::$strings["Friendica"] = "Friendica";
-App::$strings["StatusNet/Federated Social Web"] = "StatusNet/Föderierte Soziale Netzwerke";
-App::$strings["Diaspora"] = "Diaspora";
-App::$strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = "- bitte verwende nicht dieses Formular sondern gib %s in die Suchleiste deiner Diaspora Seite ein.";
-App::$strings["Your Identity Address:"] = "Ihre Identitätsadresse:";
-App::$strings["Submit Request"] = "Anfrage absenden";
-App::$strings["GNU-Social Protocol Settings updated."] = "GNU Social Protokoll Einstellungen aktualisiert";
-App::$strings["Enable the (experimental) GNU-Social protocol for this channel"] = "GNU Social Protokoll (experimentell) für diesen Kanal aktualisieren";
-App::$strings["GNU-Social Protocol Settings"] = "GNU Social Protokoll Einstellungen";
+App::$strings["View %s's profile - %s"] = "Schaue Dir %ss Profil an – %s";
+App::$strings["to"] = "an";
+App::$strings["via"] = "via";
+App::$strings["Wall-to-Wall"] = "Wall-to-Wall";
+App::$strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
+App::$strings["from %s"] = "via %s";
+App::$strings["last edited: %s"] = "zuletzt bearbeitet: %s";
+App::$strings["Expires: %s"] = "Verfällt: %s";
+App::$strings["Attend"] = "Zusagen";
+App::$strings["Attendance Options"] = "Zusageoptionen";
+App::$strings["Vote"] = "Abstimmen";
+App::$strings["Voting Options"] = "Abstimmungsoptionen";
+App::$strings["Save Bookmarks"] = "Favoriten speichern";
+App::$strings["Add to Calendar"] = "Zum Kalender hinzufügen";
+App::$strings["Mark all seen"] = "Alle als gelesen markieren";
+App::$strings["%s show all"] = "%s mehr anzeigen";
+App::$strings["Bold"] = "Fett";
+App::$strings["Italic"] = "Kursiv";
+App::$strings["Underline"] = "Unterstrichen";
+App::$strings["Quote"] = "Zitat";
+App::$strings["Code"] = "Code";
+App::$strings["Image"] = "Bild";
+App::$strings["Insert Link"] = "Link einfügen";
+App::$strings["Video"] = "Video";
+App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut.";
+App::$strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
+App::$strings["parent"] = "Übergeordnetes Verzeichnis";
+App::$strings["Collection"] = "Sammlung";
+App::$strings["Principal"] = "Prinzipal";
+App::$strings["Addressbook"] = "Adressbuch";
+App::$strings["Calendar"] = "Kalender";
+App::$strings["Schedule Inbox"] = "Posteingang für überwachte Kalender";
+App::$strings["Schedule Outbox"] = "Postausgang für überwachte Kalender";
+App::$strings["Total"] = "Summe";
+App::$strings["Shared"] = "Geteilt";
+App::$strings["You are using %1\$s of your available file storage."] = "Sie verwenden %1\$s von Ihrem verfügbaren Dateispeicher.";
+App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s&#37;)"] = "Sie verwenden %1\$s von %2\$s verfügbarem Dateispeicher. (%3\$s&#37;)";
+App::$strings["WARNING:"] = "WARNUNG:";
+App::$strings["Please use DAV to upload large (video, audio) files.<br>See <a class=\"zrl\" href=\"help/member/member_guide#Cloud_Desktop_Clients\">Cloud Desktop Clients</a>"] = "Bitte verwende DAV, um große Dateien (Audio, Video) hochzuladen.<br>Für weitere Informationen siehe <a class=\"zrl\" href=\"help/member/member_guide#Cloud_Desktop_Clients\">Cloud Desktop Clients</a>";
+App::$strings["Create new folder"] = "Neuen Ordner anlegen";
+App::$strings["Upload file"] = "Datei hochladen";
+App::$strings["Drop files here to immediately upload"] = "Dateien zum sofortigen Hochladen hier fallen lassen";
+App::$strings["Forums"] = "Foren";
+App::$strings["Categories"] = "Kategorien";
+App::$strings["Everything"] = "Alles";
+App::$strings["Events Tools"] = "Kalenderwerkzeuge";
+App::$strings["Export Calendar"] = "Kalender exportieren";
+App::$strings["Import Calendar"] = "Kalender importieren";
+App::$strings["Suggested Chatrooms"] = "Chatraum-Vorschläge";
+App::$strings["Private Mail Menu"] = "Private Nachrichten";
+App::$strings["Combined View"] = "Kombinierte Anzeige";
+App::$strings["Inbox"] = "Eingang";
+App::$strings["Outbox"] = "Ausgang";
+App::$strings["New Message"] = "Neue Nachricht";
+App::$strings["Chatrooms"] = "Chaträume";
+App::$strings["Overview"] = "Übersicht";
+App::$strings["Rating Tools"] = "Bewertungswerkzeuge";
+App::$strings["Rate Me"] = "Bewerte mich";
+App::$strings["View Ratings"] = "Bewertungen ansehen";
+App::$strings["__ctx:widget__ Activity"] = "Aktivität";
+App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen.";
+App::$strings["Add New Connection"] = "Neue Verbindung hinzufügen";
+App::$strings["Enter channel address"] = "Adresse des Kanals eingeben";
+App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Beispiele: bob@beispiel.com, http://beispiel.com/barbara";
+App::$strings["Wiki List"] = "Wikiliste";
+App::$strings["Archives"] = "Archive";
+App::$strings["Conversations"] = "Konversationen";
+App::$strings["Received Messages"] = "Erhaltene Nachrichten";
+App::$strings["Sent Messages"] = "Gesendete Nachrichten";
+App::$strings["No messages."] = "Keine Nachrichten.";
+App::$strings["Delete conversation"] = "Unterhaltung löschen";
+App::$strings["Chat Members"] = "Chatmitglieder";
+App::$strings["photo/image"] = "Foto/Bild";
+App::$strings["Remove term"] = "Eintrag löschen";
+App::$strings["Saved Searches"] = "Gespeicherte Suchanfragen";
+App::$strings["add"] = "hinzufügen";
+App::$strings["Notes"] = "Notizen";
+App::$strings["Wiki Pages"] = "Wikiseiten";
+App::$strings["Add new page"] = "Neue Seite hinzufügen";
+App::$strings["Page name"] = "Seitenname";
+App::$strings["Refresh"] = "Aktualisieren";
+App::$strings["Tasks"] = "Aufgaben";
+App::$strings["Suggestions"] = "Vorschläge";
+App::$strings["See more..."] = "Mehr anzeigen …";
+App::$strings["Saved Folders"] = "Gespeicherte Ordner";
+App::$strings["Click to show more"] = "Klick, um mehr anzuzeigen";
+App::$strings["Member registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
+App::$strings["Inspect queue"] = "Warteschlange kontrollieren";
+App::$strings["DB updates"] = "DB-Aktualisierungen";
+App::$strings["Admin"] = "Administration";
+App::$strings["Plugin Features"] = "Plug-In Funktionen";
+App::$strings["Account settings"] = "Konto-Einstellungen";
+App::$strings["Channel settings"] = "Kanal-Einstellungen";
+App::$strings["Additional features"] = "Zusätzliche Funktionen";
+App::$strings["Feature/Addon settings"] = "Plugin-Einstellungen";
+App::$strings["Display settings"] = "Anzeige-Einstellungen";
+App::$strings["Manage locations"] = "Klon-Adressen verwalten";
+App::$strings["Export channel"] = "Kanal exportieren";
+App::$strings["Connected apps"] = "Verbundene Apps";
+App::$strings["Permission Groups"] = "Berechtigungsrollen";
+App::$strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen";
+App::$strings["Bookmarked Chatrooms"] = "Gespeicherte Chatrooms";
+App::$strings["Source channel not found."] = "Quellkanal nicht gefunden.";
+App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Suche %1\$s (%2\$s)";
+App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
+App::$strings["Create an account to access services and applications"] = "Erstelle ein Konto, um auf Dienste und Anwendungen zugreifen zu können.";
+App::$strings["Logout"] = "Abmelden";
+App::$strings["Login/Email"] = "Anmelden/E-Mail";
+App::$strings["Password"] = "Kennwort";
+App::$strings["Remember me"] = "Angaben speichern";
+App::$strings["Forgot your password?"] = "Passwort vergessen?";
+App::$strings["toggle mobile"] = "auf/von mobile Ansicht wechseln";
+App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] Webseiten-SSL-Fehler für %s";
+App::$strings["Website SSL certificate is not valid. Please correct."] = "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben.";
+App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Cron-Jobs laufen nicht auf %s";
+App::$strings["Cron/Scheduled tasks not running."] = "Cron-Aufgaben laufen nicht.";
+App::$strings["never"] = "Nie";
+App::$strings["Focus (Hubzilla default)"] = "Focus (Voreinstellung für Hubzilla)";
+App::$strings["Theme settings"] = "Theme-Einstellungen";
+App::$strings["Narrow navbar"] = "Schmale Navigationsleiste";
+App::$strings["Navigation bar background color"] = "Hintergrundfarbe der Navigationsleiste";
+App::$strings["Navigation bar icon color "] = "Farbe für die Icons der Navigationsleiste";
+App::$strings["Navigation bar active icon color "] = "Farbe für aktive Icons der Navigationsleiste";
+App::$strings["Link color"] = "Linkfarbe";
+App::$strings["Set font-color for banner"] = "Farbe der Schrift des Banners";
+App::$strings["Set the background color"] = "Hintergrundfarbe";
+App::$strings["Set the background image"] = "Hintergrundbild";
+App::$strings["Set the background color of items"] = "Hintergrundfarbe für Beiträge";
+App::$strings["Set the background color of comments"] = "Hintergrundfarbe für Kommentare";
+App::$strings["Set font-size for the entire application"] = "Schriftgröße für die gesamte Anwendung";
+App::$strings["Examples: 1rem, 100%, 16px"] = "Beispiele: 1rem, 100%, 16px";
+App::$strings["Set font-color for posts and comments"] = "Schriftfarbe für Beiträge und Kommentare";
+App::$strings["Set radius of corners"] = "Ecken-Radius";
+App::$strings["Example: 4px"] = "Beispiel: 4px";
+App::$strings["Set shadow depth of photos"] = "Schattentiefe von Fotos";
+App::$strings["Set maximum width of content region in pixel"] = "Maximalbreite des Inhaltsbereichs in Pixel festlegen";
+App::$strings["Leave empty for default width"] = "Leer lassen für Standardbreite";
+App::$strings["Left align page content"] = "Seiteninhalt linksbündig anzeigen";
+App::$strings["Set size of conversation author photo"] = "Größe der Avatare von Themenstartern";
+App::$strings["Set size of followup author photos"] = "Größe der Avatare von Kommentatoren";
+App::$strings["Errors encountered deleting database table "] = "Beim Löschen der Datenbanktabelle sind Fehler aufgetreten.";
+App::$strings["Submit Settings"] = "Einstellungen absenden";
+App::$strings["Drop tables when uninstalling?"] = "Lösche Tabellen beim Deinstallieren?";
+App::$strings["If checked, the Rendezvous database tables will be deleted when the plugin is uninstalled."] = "Wenn ausgewählt, werden die Rendezvous-Tabellen in der Datenbank gelöscht, sobald das Plugin deinstalliert wird.";
+App::$strings["Mapbox Access Token"] = "Mapbox Zugangs-Token";
+App::$strings["If you enter a Mapbox access token, it will be used to retrieve map tiles from Mapbox instead of the default OpenStreetMap tile server."] = "Wenn Du ein Mapbox Zugangs-Token eingibst, werden die Kartendaten (Kacheln) damit von Mapbox geladen, anstatt von OpenStreetMap, welches die Voreinstellung ist.";
+App::$strings["Rendezvous"] = "Rendezvous";
+App::$strings["This identity has been deleted by another member due to inactivity. Please press the \"New identity\" button or refresh the page to register a new identity. You may use the same name."] = "Diese Identität wurde von einem anderen Mitglied aufgrund von Inaktivität gelöscht. Bitte klicke auf \"Neue Identität\" oder aktualisiere die Website im Browser, um eine neue Identität zu registrieren. Du kannst dabei den selben Namen verwenden.";
+App::$strings["Welcome to Rendezvous!"] = "Willkommen bei Rendezvous!";
+App::$strings["Enter your name to join this rendezvous. To begin sharing your location with the other members, tap the GPS control. When your location is discovered, a red dot will appear and others will be able to see you on the map."] = "Gib Deinen Namen ein, um diesem Rendezvous beizutreten. Um Deinen Standort mit anderen Mitgliedern zu teilen, klicke auf das GPS Symbol. Sobald Dein Standort ermittelt ist, erscheint ein roter Punkt, und die Anderen werden Dich auf der Karte sehen können.";
+App::$strings["Let's meet here"] = "Lasst uns hier treffen";
+App::$strings["New marker"] = "Neue Markierung";
+App::$strings["Edit marker"] = "Markierung bearbeiten";
+App::$strings["New identity"] = "Neue Identität";
+App::$strings["Delete marker"] = "Markierung löschen";
+App::$strings["Delete member"] = "Mitglied löschen";
+App::$strings["Edit proximity alert"] = "Annäherungsalarm bearbeiten";
+App::$strings["A proximity alert will be issued when this member is within a certain radius of you.<br><br>Enter a radius in meters (0 to disable):"] = "Ein Annäherungsalarm wird ausgelöst werden, sobald sich dieses Mitglied innerhalb eines bestimmten Radius von Dir aufhält.<br><br>Gib einen Radius in Metern ein (0 zum Abschalten der Funktion):";
+App::$strings["distance"] = "Entfernung";
+App::$strings["Proximity alert distance (meters)"] = "Entfernung für Annäherungsalarm (in Metern)";
+App::$strings["A proximity alert will be issued when you are within a certain radius of the marker location.<br><br>Enter a radius in meters (0 to disable):"] = "Ein Annäherungsalarm wird ausgelöst werden, sobald Du Dich innerhalb eines bestimmten Radius der Markierung aufhält.<br><br>Gib einen Radius in Metern ein (0 zum Abschalten der Funktion):";
+App::$strings["Marker proximity alert"] = "Annäherungsalarm für Markierung";
+App::$strings["Reminder note"] = "Erinnerungshinweis";
+App::$strings["Enter a note to be displayed when you are within the specified proximity..."] = "Gib eine Nachricht ein, die angezeigt werden soll, wenn Du Dich in der festgelegten Nähe befindest...";
+App::$strings["Add new rendezvous"] = "Neues Rendezvous hinzufügen";
+App::$strings["Create a new rendezvous and share the access link with those you wish to invite to the group. Those who open the link become members of the rendezvous. They can view other member locations, add markers to the map, or share their own locations with the group."] = "Erstelle ein neues Rendezvous und teile den Zugriffslink mit allen, die Du in die Gruppe einladen möchtest. Die, die den Link öffnen, werden Mitglieder des Rendezvous. Sie können die Standorte der anderen Mitglieder sehen, Marker zur Karte hinzufügen oder ihre eigenen Standorte mit der Gruppe teilen.";
+App::$strings["Some setting"] = "Einige Einstellungen";
+App::$strings["A setting"] = "Eine Einstellung";
+App::$strings["Skeleton Settings"] = "Skeleton Einstellungen";
+App::$strings["GNU-Social Protocol Settings updated."] = "GNU social Protokoll Einstellungen aktualisiert";
+App::$strings["Enable the GNU-Social protocol for this channel"] = "Aktiviere das GNU social Protokoll für diesen Kanal";
+App::$strings["GNU-Social Protocol Settings"] = "GNU social Protokoll Einstellungen";
 App::$strings["Follow"] = "Folgen";
 App::$strings["%1\$s is now following %2\$s"] = "%1\$s folgt nun %2\$s";
-App::$strings["Friendica Photo Album Import"] = "Friendica-Fotoalbumimport";
-App::$strings["This will import all your Friendica photo albums to this Red channel."] = "Hiermit werden all deine Fotoalben von Friendica in diesen Hubzilla Kanal importiert.";
-App::$strings["Friendica Server base URL"] = "BasisURL des Friendica Servers";
-App::$strings["Friendica Login Username"] = "Friendica-Anmeldebenutzername";
-App::$strings["Friendica Login Password"] = "Friendica-Anmeldepasswort";
-App::$strings["Send email to all members"] = "E-Mail an alle Mitglieder senden";
-App::$strings["$1%s Administrator"] = "$1%s Administrator";
-App::$strings["No recipients found."] = "Keine Empfänger gefunden.";
-App::$strings["%1\$d of %2\$d messages sent."] = "%1\$d von %2\$d Nachrichten gesendet.";
-App::$strings["Send email to all hub members."] = "Eine E-Mail an alle Mitglieder dieses Hubs senden.";
-App::$strings["Message subject"] = "Betreff der Nachricht";
-App::$strings["Sender Email address"] = "E-Mail Adresse des Absenders";
-App::$strings["Test mode (only send to hub administrator)"] = "Test Modus (nur an Hub Administratoren senden)";
+App::$strings["INVALID EVENT DISMISSED!"] = "UNGÜLTIGEN TERMIN ABGELEHNT!";
+App::$strings["Summary: "] = "Zusammenfassung:";
+App::$strings["Date: "] = "Datum:";
+App::$strings["Reason: "] = "Grund:";
+App::$strings["INVALID CARD DISMISSED!"] = "UNGÜLTIGE KARTE ABGELEHNT!";
+App::$strings["Name: "] = "Name: ";
+App::$strings["You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV Settings before you can use it."] = "Du musst dieses Plugin zunächst in Einstellungen > Plugin-Einstellungen > CalDAV/CardDAV-Einstellungen aktivieren, bevor Du es verwenden kannst.";
+App::$strings["Example: YYYY-MM-DD HH:mm"] = "Beispiel: JJJJ-MM-TT HH:mm";
+App::$strings["End date and time"] = "Enddatum und -zeit";
+App::$strings["List month"] = "Liste Monat";
+App::$strings["List week"] = "Liste Woche";
+App::$strings["List day"] = "Liste Tag";
+App::$strings["More"] = "Mehr";
+App::$strings["Less"] = "Weniger";
+App::$strings["Select calendar"] = "Kalender auswählen";
+App::$strings["Delete all"] = "Alles löschen";
+App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "Entschuldigung, aber das Bearbeiten von wiederkehrenden Veranstaltungen ist leider noch nicht implementiert.";
+App::$strings["Errors encountered creating database table: "] = "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten.";
+App::$strings["Default Calendar"] = "Standardkalender";
+App::$strings["Default Addressbook"] = "Standardadressbuch";
+App::$strings["CalDAV/CardDAV Settings saved."] = "CalDAV/CardDAV-Einstellungen gespeichert.";
+App::$strings["Enable CalDAV/CardDAV Server for this channel"] = "Aktiviere den CalDAV/CardDAV Server für diesen Kanal";
+App::$strings["Your CalDAV resources are located at %s "] = "Deine CalDAV Resourcen sind unter %s verfügbar";
+App::$strings["Your CardDAV resources are located at %s "] = "Deine CardDAV Ressourcen sind unter %s verfügbar";
+App::$strings["CalDAV/CardDAV Settings"] = "CalDAV/CardDAV-Einstellungen";
+App::$strings["Home, Voice"] = "Zuhause, Sprache";
+App::$strings["Home, Fax"] = "Zuhause, Fax";
+App::$strings["Work, Voice"] = "Arbeit, Sprache";
+App::$strings["Work, Fax"] = "Arbeit, Fax";
+App::$strings["Select Channel"] = "Kanal auswählen";
+App::$strings["Read-write"] = "Lesen-schreiben";
+App::$strings["Read-only"] = "Nur Lesen";
+App::$strings["My Calendars"] = "Meine Kalender";
+App::$strings["Shared Calendars"] = "Geteilte Kalender";
+App::$strings["Share this calendar"] = "Diesen Kalender teilen";
+App::$strings["Calendar name and color"] = "Kalendername und -farbe";
+App::$strings["Create new calendar"] = "Neuen Kalender erstellen";
+App::$strings["Calendar Name"] = "Kalendername";
+App::$strings["Calendar Tools"] = "Kalenderwerkzeuge";
+App::$strings["Import calendar"] = "Kalender importieren";
+App::$strings["Select a calendar to import to"] = "Kalender zum Hineinimportieren auswählen";
+App::$strings["Addressbooks"] = "Adressbücher";
+App::$strings["Addressbook name"] = "Adressbuchname";
+App::$strings["Create new addressbook"] = "Neues Adressbuch erstellen";
+App::$strings["Addressbook Name"] = "Adressbuchname";
+App::$strings["Addressbook Tools"] = "Adressbuchwerkzeuge";
+App::$strings["Import addressbook"] = "Adressbuch importieren";
+App::$strings["Select an addressbook to import to"] = "Adressbuch zum Hineinimportieren auswählen";
+App::$strings["Planets Settings updated."] = "Planeten Einstellungen aktualisiert";
+App::$strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin";
+App::$strings["Planets Settings"] = "Planeten Einstellungen";
+App::$strings["System defaults:"] = "Systemstandardeinstellungen:";
+App::$strings["Preferred Clipart IDs"] = "Bevorzugte Clipart-IDs";
+App::$strings["List of preferred clipart ids. These will be shown first."] = "Liste bevorzugter Clipart-IDs. Diese werden zuerst angezeigt.";
+App::$strings["Default Search Term"] = "Standard-Suchbegriff";
+App::$strings["The default search term. These will be shown second."] = "Der Standard-Suchbegriff. Dieser wird an zweiter Stelle angezeigt.";
+App::$strings["Return After"] = "Zurückkehren nach";
+App::$strings["Page to load after image selection."] = "Die Seite, die nach Auswahl eines Bildes geladen werden soll.";
+App::$strings["Edit Profile"] = "Profil bearbeiten";
+App::$strings["Profile List"] = "Profilliste";
+App::$strings["Order of Preferred"] = "Reihenfolge der Bevorzugten";
+App::$strings["Sort order of preferred clipart ids."] = "Sortierreihenfolge der bevorzugten Clipart-IDs.";
+App::$strings["Newest first"] = "Neueste zuerst";
+App::$strings["As entered"] = "Wie eingegeben";
+App::$strings["Order of other"] = "Sortierung aller anderen";
+App::$strings["Sort order of other clipart ids."] = "Sortierreihenfolge der übrigen Clipart-IDs.";
+App::$strings["Most downloaded first"] = "Meist heruntergeladene zuerst";
+App::$strings["Most liked first"] = "Beliebteste zuerst";
+App::$strings["Preferred IDs Message"] = "Nachricht für bevorzugte IDs";
+App::$strings["Message to display above preferred results."] = "Nachricht, die über den Ergebnissen mit den bevorzugten IDs angezeigt werden soll.";
+App::$strings["Uploaded by: "] = "Hochgeladen von: ";
+App::$strings["Drawn by: "] = "Gezeichnet von: ";
+App::$strings["Or select from a free OpenClipart.org image:"] = "Oder wähle ein freies Bild von OpenClipart.org:";
+App::$strings["Search Term"] = "Suchbegriff";
+App::$strings["Unknown error. Please try again later."] = "Unbekannter Fehler. Bitte versuchen Sie es später erneut.";
+App::$strings["Profile photo updated successfully."] = "Profilfoto erfolgreich aktualisiert.";
+App::$strings["Flag Adult Photos"] = "Nicht jugendfreie Fotos markieren";
+App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Stellt eine Option zum Verstecken von Fotos mit unangemessenen Inhalten in der Standard-Albumansicht bereit";
+App::$strings["Post to WordPress"] = "Auf WordPress posten";
+App::$strings["Enable WordPress Post Plugin"] = "Aktiviere das WordPress-Plugin";
+App::$strings["WordPress username"] = "WordPress-Benutzername";
+App::$strings["WordPress password"] = "WordPress-Passwort";
+App::$strings["WordPress API URL"] = "WordPress-API-URL";
+App::$strings["Typically https://your-blog.tld/xmlrpc.php"] = "Normalerweise https://your-blog.tld/xmlrpc.php";
+App::$strings["WordPress blogid"] = "WordPress blogid";
+App::$strings["For multi-user sites such as wordpress.com, otherwise leave blank"] = "Nötig für Mehrbenutzer Seiten wie wordpress.com, andernfalls frei lassen";
+App::$strings["Post to WordPress by default"] = "Standardmäßig auf auf WordPress posten";
+App::$strings["Forward comments (requires hubzilla_wp plugin)"] = "Kommentare weiterleiten (benötigt hubzilla_wp Plugin)";
+App::$strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen";
+App::$strings["Wordpress Settings saved."] = "Wordpress-Einstellungen gespeichert.";
+App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "";
+App::$strings["Enable Content filter"] = "Inhaltsfilter aktivieren";
+App::$strings["Comma separated list of keywords to hide"] = "Kommaseparierte Liste von Schlüsselworten die verborgen werden sollen.";
+App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "";
+App::$strings["Not Safe For Work Settings"] = "Not Safe For Work Einstellungen";
+App::$strings["General Purpose Content Filter"] = "Allzweck-Inhaltsfilter";
+App::$strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert.";
+App::$strings["Possible adult content"] = "Möglicherweise nicht jugendfreie Inhalte";
+App::$strings["%s - view"] = "%s - ansehen";
 App::$strings["Post to Insanejournal"] = "Bei InsaneJournal veröffentlichen";
 App::$strings["Enable InsaneJournal Post Plugin"] = "Aktiviere das InsaneJournal Plugin";
 App::$strings["InsaneJournal username"] = "InsaneJournal-Benutzername";
@@ -1851,25 +1948,6 @@ App::$strings["InsaneJournal password"] = "InsaneJournal-Passwort";
 App::$strings["Post to InsaneJournal by default"] = "Standardmäßig bei InsaneJournal veröffentlichen";
 App::$strings["InsaneJournal Post Settings"] = "InsaneJournal-Beitragseinstellungen";
 App::$strings["Insane Journal Settings saved."] = "InsaneJournal-Einstellungen gespeichert.";
-App::$strings["Channels to auto connect"] = "Kanäle zur automatischen Verbindung";
-App::$strings["Comma separated list"] = "Kommagetrennte Liste";
-App::$strings["Popular Channels"] = "Beliebte Kanäle";
-App::$strings["IRC Settings"] = "IRC-Einstellungen";
-App::$strings["IRC settings saved."] = "IRC-Einstellungen gespeichert.";
-App::$strings["IRC Chatroom"] = "IRC-Chatraum";
-App::$strings["Status:"] = "Status:";
-App::$strings["Activate addon"] = "Addon aktiviren";
-App::$strings["Hide Jappixmini Chat-Widget from the webinterface"] = "Jappix Mini Chat-Widget von der Weboberfläche verbergen";
-App::$strings["Jabber username"] = "Jabber-Benutzername";
-App::$strings["Jabber server"] = "Jabber-Server";
-App::$strings["Jabber BOSH host URL"] = "Jabber BOSH Host URL";
-App::$strings["Jabber password"] = "Jabber-Passwort";
-App::$strings["Encrypt Jabber password with Hubzilla password"] = "Jabber-Passwort mit Hubzilla-Passwort verschlüsseln";
-App::$strings["Hubzilla password"] = "Hubzilla-Passwort";
-App::$strings["Approve subscription requests from Hubzilla contacts automatically"] = "";
-App::$strings["Purge internal list of jabber addresses of contacts"] = "Interne Liste der Jabber Adressen von Kontakten löschen";
-App::$strings["Configuration Help"] = "Konfigurationshilfe";
-App::$strings["Jappix Mini Settings"] = "Jappix Mini Einstellungen";
 App::$strings["Upload a file"] = "Datei hochladen";
 App::$strings["Drop files here to upload"] = "Dateien zum Hochladen hier fallen lassen";
 App::$strings["Failed"] = "Fehlgeschlagen";
@@ -1878,15 +1956,54 @@ App::$strings["Uploaded file is empty"] = "Hochgeladene Datei ist leer";
 App::$strings["Image exceeds size limit of "] = "Bild überschreitet Größenbeschränkung von ";
 App::$strings["File has an invalid extension, it should be one of "] = "Die Datei hat eine ungültige Endung. Erlaubt sind folgende:";
 App::$strings["Upload was cancelled, or server error encountered"] = "Das Hochladen wurde abgebrochen oder es ist ein Serverfehler aufgetreten.";
-App::$strings["An account has been created for you."] = "Ein Konto wurde für Sie erstellt.";
-App::$strings["Authentication successful but rejected: account creation is disabled."] = "Authentifizierung war erfolgreich wurde aber abgewiesen! Das Anlegen von Accounts wurde deaktiviert.";
-App::$strings["Post to Libertree"] = "Bei Libertree veröffentlichen";
-App::$strings["Enable Libertree Post Plugin"] = "Aktivire das Libertree-Plugin";
-App::$strings["Libertree API token"] = "Libertree API Token";
-App::$strings["Libertree site URL"] = "URL der Libertree Seite";
-App::$strings["Post to Libertree by default"] = "Standardmäßig bei Libertree veröffentlichen";
-App::$strings["Libertree Post Settings"] = "Libertree-Beitragseinstellungen";
-App::$strings["Libertree Settings saved."] = "Libertree-Einstellungen gespeichert.";
+App::$strings["Post to Dreamwidth"] = "Bei Dreamwidth veröffentlichen";
+App::$strings["Enable Dreamwidth Post Plugin"] = "Aktiviere das Dreamwidth-Plugin";
+App::$strings["Dreamwidth username"] = "Dreamwidth-Benutzername";
+App::$strings["Dreamwidth password"] = "Dreamwidth-Passwort";
+App::$strings["Post to Dreamwidth by default"] = "Standardmäßig auf auf Dreamwidth posten";
+App::$strings["Dreamwidth Post Settings"] = "Dreamwidth-Beitragseinstellungen";
+App::$strings["Install Firefox Sharing Tools"] = "";
+App::$strings["Share content from Firefox to \$Projectname"] = "Inhalte von Firefox nach \$Projectname teilen";
+App::$strings["Install Firefox Sharing Tools to this web browser"] = "";
+App::$strings["Hubzilla Directory Stats"] = "Hubzilla-Verzeichnisstatistiken";
+App::$strings["Total Hubs"] = "Hubs insgesamt";
+App::$strings["Hubzilla Hubs"] = "Hubzilla Hubs";
+App::$strings["Friendica Hubs"] = "Friendica Hubs";
+App::$strings["Diaspora Pods"] = "Diaspora Pods";
+App::$strings["Hubzilla Channels"] = "Hubzilla-Kanäle";
+App::$strings["Friendica Channels"] = "Friendica-Kanäle";
+App::$strings["Diaspora Channels"] = "Diaspora-Kanäle";
+App::$strings["Aged 35 and above"] = "35 und älter";
+App::$strings["Aged 34 and under"] = "34 und jünger";
+App::$strings["Average Age"] = "Durchschnittsalter";
+App::$strings["Known Chatrooms"] = "Bekannte Chaträume";
+App::$strings["Known Tags"] = "Bekannte Schlagwörter";
+App::$strings["Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network.  This also applies to chatrooms,"] = "Bitte berücksichtige, dass Diaspora und Friendica Statistiken nur solche einschließen, die **diesem Verzeichnis** bekannt sind, nicht alle im Netzwerk bekannten. Das gilt auch für Chaträume.";
+App::$strings["Email notification hub"] = "Hub für E-Mail-Benachrichtigungen";
+App::$strings["Hostname"] = "Servername";
+App::$strings["Mailhost Settings"] = "Mailhost-Einstellungen";
+App::$strings["MAILHOST Settings saved."] = "MAILHOST-Einstellungen gespeichert.";
+App::$strings["Your Webbie:"] = "Dein Webbie";
+App::$strings["Fontsize (px):"] = "Schriftgröße (px):";
+App::$strings["Link:"] = "Link:";
+App::$strings["Like us on Hubzilla"] = "Like us on Hubzilla";
+App::$strings["Embed:"] = "Einbetten";
+App::$strings["Photos imported"] = "Fotos importiert";
+App::$strings["Redmatrix Photo Album Import"] = "Redmatrix-Fotoalbumimport";
+App::$strings["This will import all your Redmatrix photo albums to this channel."] = "Hiermit werden all deine Fotoalben von Redmatrix in diesen Kanal importiert.";
+App::$strings["Redmatrix Server base URL"] = "Basis-URL des Redmatrix Servers";
+App::$strings["Redmatrix Login Username"] = "Redmatrix-Anmeldebenutzername";
+App::$strings["Redmatrix Login Password"] = "Redmatrix-Anmeldepasswort";
+App::$strings["Import just this album"] = "Nur dieses Album importieren";
+App::$strings["Leave blank to import all albums"] = "Leer lassen um alle Alben zu importieren";
+App::$strings["Maximum count to import"] = "Maximal zu importierende Anzahl";
+App::$strings["0 or blank to import all available"] = "0 oder leer lassen um alles zu importieren";
+App::$strings["Channels to auto connect"] = "Kanäle zur automatischen Verbindung";
+App::$strings["Comma separated list"] = "Kommagetrennte Liste";
+App::$strings["Popular Channels"] = "Beliebte Kanäle";
+App::$strings["IRC Settings"] = "IRC-Einstellungen";
+App::$strings["IRC settings saved."] = "IRC-Einstellungen gespeichert.";
+App::$strings["IRC Chatroom"] = "IRC-Chatraum";
 App::$strings["Post to LiveJournal"] = "Bei LiveJurnal veröffentlichen";
 App::$strings["Enable LiveJournal Post Plugin"] = "Aktiviere das LiveJurnal Plugin";
 App::$strings["LiveJournal username"] = "LiveJournal-Benutzername";
@@ -1894,36 +2011,34 @@ App::$strings["LiveJournal password"] = "LiveJournal-Passwort";
 App::$strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJurnal veröffentlichen";
 App::$strings["LiveJournal Post Settings"] = "LiveJournal-Beitragseinstellungen";
 App::$strings["LiveJournal Settings saved."] = "LiveJournal-Einstellungen gespeichert.";
-App::$strings["Logfile archive directory"] = "Verzeichnis der Logdatei";
-App::$strings["Directory to store rotated logs"] = "Verzeichnis, in dem rotierte Logs gespeichert werden sollen";
-App::$strings["Logfile size in bytes before rotating"] = "zu erreichende Logdateigröße in Bytes, bevor rotiert wird";
-App::$strings["Number of logfiles to retain"] = "Anzahl aufzubewahrender rotierter Logdateien";
-App::$strings["Email notification hub"] = "Hub für E-Mail-Benachrichtigungen";
-App::$strings["Hostname"] = "Servername";
-App::$strings["Mailhost Settings"] = "Mailhost-Einstellungen";
-App::$strings["MAILHOST Settings saved."] = "MAILHOST-Einstellungen gespeichert.";
-App::$strings["lonely"] = "einsam";
-App::$strings["drunk"] = "betrunken";
-App::$strings["horny"] = "geil";
-App::$strings["stoned"] = "bekifft";
-App::$strings["fucked up"] = "beschissen";
-App::$strings["clusterfucked"] = "clusterfucked";
-App::$strings["crazy"] = "verrückt";
-App::$strings["hurt"] = "verletzt";
-App::$strings["sleepy"] = "müde";
-App::$strings["grumpy"] = "mürrisch";
-App::$strings["high"] = "hoch";
-App::$strings["semi-conscious"] = "halb bewusstlos";
-App::$strings["in love"] = "verliebt";
-App::$strings["in lust"] = "";
-App::$strings["naked"] = "nackt";
-App::$strings["stinky"] = "stinkend";
-App::$strings["sweaty"] = "verschwitzt";
-App::$strings["bleeding out"] = "blutend";
-App::$strings["victorious"] = "siegreich";
-App::$strings["defeated"] = "besiegt";
-App::$strings["envious"] = "neidisch";
-App::$strings["jealous"] = "eifersüchtig";
+App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal.";
+App::$strings["The error message was:"] = "Die Fehlermeldung war:";
+App::$strings["First Name"] = "Vorname";
+App::$strings["Last Name"] = "Nachname";
+App::$strings["Nickname"] = "Spitzname";
+App::$strings["Full Name"] = "Voller Name";
+App::$strings["Profile Photo 16px"] = "Profilfoto 16 px";
+App::$strings["Profile Photo 32px"] = "Profilfoto 32 px";
+App::$strings["Profile Photo 48px"] = "Profilfoto 48 px";
+App::$strings["Profile Photo 64px"] = "Profilfoto 64 px";
+App::$strings["Profile Photo 80px"] = "Profilfoto 80 px";
+App::$strings["Profile Photo 128px"] = "Profilfoto 128 px";
+App::$strings["Timezone"] = "Zeitzone";
+App::$strings["Birth Year"] = "Geburtsjahr";
+App::$strings["Birth Month"] = "Geburtsmonat";
+App::$strings["Birth Day"] = "Geburtstag";
+App::$strings["Birthdate"] = "Geburtsdatum";
+App::$strings["OpenID protocol error. No ID returned."] = "OpenID-Protokollfehler. Keine Kennung zurückgegeben.";
+App::$strings["Login failed."] = "Login fehlgeschlagen.";
+App::$strings["Male"] = "Männlich";
+App::$strings["Female"] = "Weiblich";
+App::$strings["You're welcome."] = "Gern geschehen.";
+App::$strings["Ah shucks..."] = "";
+App::$strings["Don't mention it."] = "Keine Ursache.";
+App::$strings["&lt;blush&gt;"] = "";
+App::$strings["Page to load after login"] = "Seite, die nach dem Login geladen werden soll";
+App::$strings["Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave blank for default network page (grid)."] = "Beispiele: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (Gruppen-gefilterte Beiträge), &quot;channel&quot; oder &quot;notifications/system&quot; (freilassen für die Standard-Netzwerkseite (grid).";
+App::$strings["Startpage Settings"] = "Startseiteneinstellungen";
 App::$strings["bitchslap"] = "Ohrfeige";
 App::$strings["bitchslapped"] = "geohrfeigt";
 App::$strings["shag"] = "bumsen";
@@ -1960,145 +2075,155 @@ App::$strings["fuck"] = "ficken";
 App::$strings["fucked"] = "gefickt";
 App::$strings["bonk"] = "";
 App::$strings["bonked"] = "";
-App::$strings["declare undying love for"] = "";
-App::$strings["declared undying love for"] = "";
-App::$strings["Save Settings"] = "Einstellungen speichern";
-App::$strings["text to include in all outgoing posts from this site"] = "Test der in alle Beiträge angefügt werden soll, die von dieser Seite ausgehen";
-App::$strings["Federate"] = "";
-App::$strings["nofed Settings saved."] = "nofed Einstellungen gespeichert";
-App::$strings["Allow Federation Toggle"] = "";
-App::$strings["Federate posts by default"] = "";
-App::$strings["NoFed Settings"] = "NoFed-Einstellungen";
-App::$strings["Nsabait Settings updated."] = "Nsabait-Einstellungen aktualisiert.";
-App::$strings["Enable NSAbait Plugin"] = "Aktiviere das NSAbait Plugin";
-App::$strings["NSAbait Settings"] = "NSAbait-Einstellungen";
-App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "";
-App::$strings["Enable Content filter"] = "Inhaltsfilter aktivieren";
-App::$strings["Comma separated list of keywords to hide"] = "Kommaseparierte Liste von Schlüsselworten die verborgen werden sollen.";
-App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "";
-App::$strings["Not Safe For Work Settings"] = "Not Safe For Work Einstellungen";
-App::$strings["General Purpose Content Filter"] = "Allzweck-Inhaltsfilter";
-App::$strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert.";
-App::$strings["Possible adult content"] = "Möglicherweise nicht jugendfreie Inhalte";
-App::$strings["%s - view"] = "";
-App::$strings["System defaults:"] = "Systemstandardeinstellungen:";
-App::$strings["Preferred Clipart IDs"] = "";
-App::$strings["List of preferred clipart ids. These will be shown first."] = "";
-App::$strings["Default Search Term"] = "Standard-Suchbegriff";
-App::$strings["The default search term. These will be shown second."] = "";
-App::$strings["Return After"] = "";
-App::$strings["Page to load after image selection."] = "";
-App::$strings["Edit Profile"] = "Profile bearbeiten";
-App::$strings["Profile List"] = "Profilliste";
-App::$strings["Order of Preferred"] = "Bevorzugte Reihenfolge";
-App::$strings["Sort order of preferred clipart ids."] = "";
-App::$strings["Newest first"] = "Neueste zuerst";
-App::$strings["As entered"] = "Wie eingegeben";
-App::$strings["Order of other"] = "";
-App::$strings["Sort order of other clipart ids."] = "";
-App::$strings["Most downloaded first"] = "Meist heruntergeladene zuerst";
-App::$strings["Most liked first"] = "Beliebteste zuerst";
-App::$strings["Preferred IDs Message"] = "";
-App::$strings["Message to display above preferred results."] = "";
-App::$strings["Uploaded by: "] = "Hochgeladen von: ";
-App::$strings["Drawn by: "] = "Gezeichnet von: ";
-App::$strings["Or select from a free OpenClipart.org image:"] = "Oder wähle ein freies Bild von OpenClipart.org:";
-App::$strings["Search Term"] = "Suchbegriff";
-App::$strings["Unknown error. Please try again later."] = "Unbekannter Fehler. Bitte versuchen Sie es später erneut.";
-App::$strings["Profile photo updated successfully."] = "Profilfoto erfolgreich aktualisiert.";
-App::$strings["View Larger"] = "Größer anzeigen";
-App::$strings["Tile Server URL"] = "Kachelserver-URL";
-App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Kachelserver</a>";
-App::$strings["Nominatim (reverse geocoding) Server URL"] = "Nominatim (reverse Geokodierung) Server URL";
-App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">Nominatim servers</a>"] = "Eine Liste der <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">Nominatim Server</a>";
-App::$strings["Default zoom"] = "Standardzoom";
-App::$strings["The default zoom level. (1:world, 18:highest, also depends on tile server)"] = "Die Standard-Vergrößerungsstufe (1:Welt, 18:höchste, hängt außerdem vom Kachelserver ab).";
-App::$strings["Include marker on map"] = "Markierung auf der Karte einschließen";
-App::$strings["Include a marker on the map."] = "Binde eine Markierung auf der Karte ein.";
-App::$strings["Message to display on every page on this server"] = "Nachricht, die auf jeder Seite dieses Servers angezeigt werden soll";
-App::$strings["Pageheader Settings"] = "Nachrichtenkopf-Einstellungen";
-App::$strings["pageheader Settings saved."] = "Nachrichtenkopf-Einstellungen gespeichert.";
-App::$strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Diese Website verwendet <a href='http://www.piwik.org'>Piwik</a>, um die Besucherzugriffe auszuwerten.";
-App::$strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Wenn Du nicht möchtest, dass Deine Besuche zu diesem Zweck gespeichert werden, kannst Du <a href='%s'>ein Cookie setzen, welches Piwik davon abhält, Deine weiteren Besuche auf dieser Website zu verfolgen</a> (Opt-out).";
-App::$strings["Piwik Base URL"] = "Piwik Basis-URL";
-App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Der absolute Pfad zu Deiner Piwik-Installation (ohne Protokoll (http/s), aber mit abschließendem Schrägstrich / ).";
-App::$strings["Site ID"] = "Seitenkennung";
-App::$strings["Show opt-out cookie link?"] = "Den Opt-out Cookie-Link anzeigen?";
-App::$strings["Asynchronous tracking"] = "Asynchrones Tracking";
-App::$strings["Enable frontend JavaScript error tracking"] = "Ermögliche Frontend-JavaScript-Fehlertracking";
-App::$strings["This feature requires Piwik >= 2.2.0"] = "Diese Funktion erfordert Piwik >= 2.2.0";
-App::$strings["Planets Settings updated."] = "Planeten Einstellungen aktualisiert";
-App::$strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin";
-App::$strings["Planets Settings"] = "Planeten Einstellungen";
-App::$strings["You are now authenticated to pumpio."] = "Du bist nun bei pumpio authenzifiziert.";
-App::$strings["return to the featured settings page"] = "";
-App::$strings["Post to Pump.io"] = "Bei pumpio veröffentlichen";
-App::$strings["Pump.io servername"] = "Pump.io-Servername";
-App::$strings["Without \"http://\" or \"https://\""] = "Ohne \"http://\" oder \"https://\"";
-App::$strings["Pump.io username"] = "Pump.io-Benutzername";
-App::$strings["Without the servername"] = "Ohne dem Servernamen";
-App::$strings["You are not authenticated to pumpio"] = "Du bist nicht bei pumpio authentifiziert.";
-App::$strings["(Re-)Authenticate your pump.io connection"] = "Deine pumpio Verbindung (erneut) authentifizieren";
-App::$strings["Enable pump.io Post Plugin"] = "Aktiviere das pumpio-Plugin";
-App::$strings["Post to pump.io by default"] = "Standardmäßig bei pumpio veröffentlichen";
-App::$strings["Should posts be public"] = "Sollen die Beiträge öffentlich sein";
-App::$strings["Mirror all public posts"] = "Öffentliche Beiträge spiegeln";
-App::$strings["Pump.io Post Settings"] = "Pump.io-Beitragseinstellungen";
-App::$strings["PumpIO Settings saved."] = "PumpIO-Einstellungen gespeichert.";
-App::$strings["QR code"] = "QR-Code";
-App::$strings["QR Generator"] = "QR-Generator";
-App::$strings["Enter some text"] = "Etwas Text eingeben";
-App::$strings["Enable Rainbowtag"] = "Rainbowtag aktivieren";
-App::$strings["Rainbowtag Settings"] = "Rainbowtag-Einstellungen";
-App::$strings["Rainbowtag Settings saved."] = "Rainbowtag-Einstellungen gespeichert.";
-App::$strings["You're welcome."] = "Gern geschehen.";
-App::$strings["Ah shucks..."] = "";
-App::$strings["Don't mention it."] = "Keine Ursache.";
-App::$strings["&lt;blush&gt;"] = "";
-App::$strings["Redmatrix File Storage Import"] = "";
-App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Hiermit werden alle deine Daten aus der Redmatrix Cloud in diesen Kanal importiert.";
-App::$strings["Redmatrix Server base URL"] = "Basis-URL des Redmatrix Servers";
-App::$strings["Redmatrix Login Username"] = "Redmatrix-Anmeldebenutzername";
-App::$strings["Redmatrix Login Password"] = "Redmatrix-Anmeldepasswort";
-App::$strings["file"] = "Datei";
-App::$strings["Photos imported"] = "Fotos importiert";
-App::$strings["Redmatrix Photo Album Import"] = "Redmatrix-Fotoalbumimport";
-App::$strings["This will import all your Redmatrix photo albums to this channel."] = "Hiermit werden all deine Fotoalben von Redmatrix in diesen Kanal importiert.";
-App::$strings["Import just this album"] = "Nur dieses Album importieren";
-App::$strings["Leave blank to import all albums"] = "Leer lassen um alle Alben zu importieren";
-App::$strings["Maximum count to import"] = "Maximal zu importierende Anzahl";
-App::$strings["0 or blank to import all available"] = "0 oder leer lassen um alles zu importieren";
+App::$strings["declare undying love for"] = "";
+App::$strings["declared undying love for"] = "";
+App::$strings["Diaspora Protocol Settings updated."] = "";
+App::$strings["Enable the Diaspora protocol for this channel"] = "";
+App::$strings["Allow any Diaspora member to comment on your public posts"] = "";
+App::$strings["Prevent your hashtags from being redirected to other sites"] = "";
+App::$strings["Followed hashtags (comma separated, do not include the #)"] = "";
+App::$strings["Diaspora Protocol Settings"] = "";
+App::$strings["No username found in import file."] = "";
+App::$strings["Unable to create a unique channel address. Import failed."] = "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Import ist fehlgeschlagen.";
+App::$strings["Error retrieving wiki"] = "Fehler beim Abrufen des Wiki";
+App::$strings["Error creating zip file export folder"] = "Fehler bei der Erzeugung des Zip-Datei Export-Verzeichnisses ";
+App::$strings["Error downloading wiki: "] = "Fehler beim Herunterladen des Wiki:";
+App::$strings["Your account on %s will expire in a few days."] = "Dein Account auf %s wird in ein paar Tagen ablaufen.";
+App::$strings["Your $Productname test account is about to expire."] = "Dein $Productname Test-Account wird bald auslaufen.";
+App::$strings["Enable Rainbowtag"] = "Rainbowtag aktivieren";
+App::$strings["Rainbowtag Settings"] = "Rainbowtag-Einstellungen";
+App::$strings["Rainbowtag Settings saved."] = "Rainbowtag-Einstellungen gespeichert.";
+App::$strings["Show Upload Limits"] = "Hochladebeschränkungen anzeigen";
+App::$strings["Hubzilla configured maximum size: "] = "Die in Hubzilla eingestellte maximale Größe:";
+App::$strings["PHP upload_max_filesize: "] = "PHP upload_max_filesize:";
+App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = "PHP post_max_size (muss größer sein als upload_max_filesize):";
+App::$strings["Recent Channel/Profile Viewers"] = "Kürzliche Kanal/Profil Besucher";
+App::$strings["This plugin/addon has not been configured."] = "Dieses Plugin/Addon wurde noch nicht konfiguriert.";
+App::$strings["Please visit the Visage settings on %s"] = "Bitte rufe die Visage Einstellungen auf %s auf";
+App::$strings["your feature settings page"] = "Die Funktions-Einstellungsseite";
+App::$strings["No entries."] = "Keine Einträge.";
+App::$strings["Enable Visage Visitor Logging"] = "Aktiviere das Visage-Besucher Logging";
+App::$strings["Visage Settings"] = "Visage-Einstellungen";
+App::$strings["Nsabait Settings updated."] = "Nsabait-Einstellungen aktualisiert.";
+App::$strings["Enable NSAbait Plugin"] = "Aktiviere das NSAbait Plugin";
+App::$strings["NSAbait Settings"] = "NSAbait-Einstellungen";
+App::$strings["Send test email"] = "Test-E-Mail senden";
+App::$strings["No recipients found."] = "Keine Empfänger gefunden.";
+App::$strings["Mail sent."] = "Mail gesendet.";
+App::$strings["Sending of mail failed."] = "Senden der E-Mail fehlgeschlagen.";
+App::$strings["Mail Test"] = "Mail Test";
+App::$strings["Message subject"] = "Betreff der Nachricht";
+App::$strings["Reconnecting %d connections"] = "";
+App::$strings["Diaspora Reconnect"] = "";
+App::$strings["Use this form to re-establish Diaspora connections which were initially made from a different hub."] = "";
+App::$strings["Reconnect"] = "";
+App::$strings["View Larger"] = "Größer anzeigen";
+App::$strings["Tile Server URL"] = "Kachelserver-URL";
+App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Kachelserver</a>";
+App::$strings["Nominatim (reverse geocoding) Server URL"] = "Nominatim (reverse Geokodierung) Server URL";
+App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">Nominatim servers</a>"] = "Eine Liste der <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">Nominatim Server</a>";
+App::$strings["Default zoom"] = "Standardzoom";
+App::$strings["The default zoom level. (1:world, 18:highest, also depends on tile server)"] = "Die Standard-Vergrößerungsstufe (1:Welt, 18:höchste, hängt außerdem vom Kachelserver ab).";
+App::$strings["Include marker on map"] = "Markierung auf der Karte einschließen";
+App::$strings["Include a marker on the map."] = "Binde eine Markierung auf der Karte ein.";
+App::$strings["Save Settings"] = "Einstellungen speichern";
+App::$strings["text to include in all outgoing posts from this site"] = "Test der in alle Beiträge angefügt werden soll, die von dieser Seite ausgehen";
+App::$strings["Post to Friendica"] = "Bei Friendica veröffentlichen";
+App::$strings["rtof Settings saved."] = "rtof-Einstellungen gespeichert.";
+App::$strings["Allow posting to Friendica"] = "Erlaube die Veröffentlichung bei Friendica";
+App::$strings["Send public postings to Friendica by default"] = "Standardmäßig öffentliche Beiträge bei Friendica veröffentlichen";
+App::$strings["Friendica API Path"] = "Friendica-API-Pfad";
+App::$strings["https://{sitename}/api"] = "https://{sitename}/api";
+App::$strings["Friendica login name"] = "Friendica-Anmeldename";
+App::$strings["Friendica password"] = "Friendica-Passwort";
+App::$strings["Hubzilla to Friendica Post Settings"] = "";
+App::$strings["Status:"] = "Status:";
+App::$strings["Activate addon"] = "Addon aktiviren";
+App::$strings["Hide Jappixmini Chat-Widget from the webinterface"] = "Jappix Mini Chat-Widget von der Weboberfläche verbergen";
+App::$strings["Jabber username"] = "Jabber-Benutzername";
+App::$strings["Jabber server"] = "Jabber-Server";
+App::$strings["Jabber BOSH host URL"] = "Jabber BOSH Host URL";
+App::$strings["Jabber password"] = "Jabber-Passwort";
+App::$strings["Encrypt Jabber password with Hubzilla password"] = "Jabber-Passwort mit Hubzilla-Passwort verschlüsseln";
+App::$strings["Hubzilla password"] = "Hubzilla-Passwort";
+App::$strings["Approve subscription requests from Hubzilla contacts automatically"] = "";
+App::$strings["Purge internal list of jabber addresses of contacts"] = "Interne Liste der Jabber Adressen von Kontakten löschen";
+App::$strings["Configuration Help"] = "Konfigurationshilfe";
+App::$strings["Jappix Mini Settings"] = "Jappix Mini Einstellungen";
+App::$strings["Currently blocked"] = "Derzeit blockiert";
+App::$strings["No channels currently blocked"] = "Momentan sind keine Kanäle blockiert";
+App::$strings["\"Superblock\" Settings"] = "\"Superblock\"-Einstellungen";
+App::$strings["Block Completely"] = "Vollständig blockieren";
+App::$strings["superblock settings updated"] = "Superblock Einstellungen aktualisiert";
+App::$strings["Federate"] = "";
+App::$strings["nofed Settings saved."] = "nofed Einstellungen gespeichert";
+App::$strings["Allow Federation Toggle"] = "";
+App::$strings["Federate posts by default"] = "";
+App::$strings["NoFed Settings"] = "NoFed-Einstellungen";
 App::$strings["Post to Red"] = "";
 App::$strings["Channel is required."] = "Kanal ist erforderlich.";
-App::$strings["Invalid channel."] = "Ungültiger Kanal.";
 App::$strings["redred Settings saved."] = "redred-Einstellungen gespeichert.";
 App::$strings["Allow posting to another Hubzilla Channel"] = "Erlaube die Veröffentlichung in anderen Hubzilla Kanälen";
 App::$strings["Send public postings to Hubzilla channel by default"] = "";
 App::$strings["Hubzilla API Path"] = "Hubzilla-API-Pfad";
-App::$strings["https://{sitename}/api"] = "https://{sitename}/api";
 App::$strings["Hubzilla login name"] = "Hubzilla-Anmeldename";
 App::$strings["Hubzilla channel name"] = "Hubzilla-Kanalname";
-App::$strings["Nickname"] = "Spitzname";
 App::$strings["Hubzilla Crosspost Settings"] = "";
-App::$strings["Post to Friendica"] = "Bei Friendica veröffentlichen";
-App::$strings["rtof Settings saved."] = "rtof-Einstellungen gespeichert.";
-App::$strings["Allow posting to Friendica"] = "Erlaube die Veröffentlichung bei Friendica";
-App::$strings["Send public postings to Friendica by default"] = "Standardmäßig öffentliche Beiträge bei Friendica veröffentlichen";
-App::$strings["Friendica API Path"] = "Friendica-API-Pfad";
-App::$strings["Friendica login name"] = "Friendica-Anmeldename";
-App::$strings["Friendica password"] = "Friendica-Passwort";
-App::$strings["Hubzilla to Friendica Post Settings"] = "";
-App::$strings["Extended Identity Sharing"] = "Erweitertes Teilen von Identitäten";
-App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "";
-App::$strings["Some setting"] = "Einige Einstellungen";
-App::$strings["A setting"] = "Eine Einstellung";
-App::$strings["Skeleton Settings"] = "";
-App::$strings["Deactivate the feature"] = "Diese Funktion abschalten";
-App::$strings["Hide the button and show the smilies directly."] = "Verstecke die Schaltfläche und zeige die Smilies direkt an.";
-App::$strings["Smileybutton Settings"] = "Smileyknopf-Einstellungen";
-App::$strings["Page to load after login"] = "Seite, die nach dem Login geladen werden soll";
-App::$strings["Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave blank for default network page (grid)."] = "Beispiele: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (Gruppen-gefilterte Beiträge), &quot;channel&quot; oder &quot;notifications/system&quot; (freilassen für die Standard-Netzwerkseite (grid).";
-App::$strings["Startpage Settings"] = "Startseiteneinstellungen";
+App::$strings["Logfile archive directory"] = "Verzeichnis der Logdatei";
+App::$strings["Directory to store rotated logs"] = "Verzeichnis, in dem rotierte Logs gespeichert werden sollen";
+App::$strings["Logfile size in bytes before rotating"] = "zu erreichende Logdateigröße in Bytes, bevor rotiert wird";
+App::$strings["Number of logfiles to retain"] = "Anzahl aufzubewahrender rotierter Logdateien";
+App::$strings["Friendica Photo Album Import"] = "Friendica-Fotoalbumimport";
+App::$strings["This will import all your Friendica photo albums to this Red channel."] = "Hiermit werden all deine Fotoalben von Friendica in diesen Hubzilla Kanal importiert.";
+App::$strings["Friendica Server base URL"] = "BasisURL des Friendica Servers";
+App::$strings["Friendica Login Username"] = "Friendica-Anmeldebenutzername";
+App::$strings["Friendica Login Password"] = "Friendica-Anmeldepasswort";
+App::$strings["Project Servers and Resources"] = "Projektserver und -ressourcen";
+App::$strings["Project Creator and Tech Lead"] = "Projektersteller und Technischer Leiter";
+App::$strings["Admin, developer, directorymin, support bloke"] = "Administrator, Entwickler, Verzeichnis Betreibender, Supportleistende";
+App::$strings["And the hundreds of other people and organisations who helped make the Hubzilla possible."] = "Und die hunderte anderen Menschen und Organisationen, die geholfen haben Hubzilla möglich zu machen.";
+App::$strings["The Redmatrix/Hubzilla projects are provided primarily by volunteers giving their time and expertise - and often paying out of pocket for services they share with others."] = "Die Redmatrix/Hubzilla Projekte werden hauptsächlich von Freiwilligen bereitgestellt, die ihre Zeit und Expertise zur Verfügung stellen - und oft aus eigener Tasche für die Dienste zahlen, die sie mit anderen teilen.";
+App::$strings["There is no corporate funding and no ads, and we do not collect and sell your personal information. (We don't control your personal information - <strong>you do</strong>.)"] = "Es gibt keine Finanzierung durch Firmen, keine Werbung und wir verkaufen Deine persönlichen Daten nicht. (Wir kontrollieren Deine persönlichen Daten nicht - <strong>das machst Du</strong>.)";
+App::$strings["Help support our ground-breaking work in decentralisation, web identity, and privacy."] = "Hilf uns bei unserer wegweisenden Arbeit im Bereich der Dezantralisation, von Web-Identitäten und Privatsphäre.";
+App::$strings["Your donations keep servers and services running and also helps us to provide innovative new features and continued development."] = "Die Spenden werden dafür verwendet Server und Dienste am laufen zu halten und helfen desweiteren innovative Neuerungen zu schaffen und die Entwicklung voran zu treiben.";
+App::$strings["Donate"] = "Spenden";
+App::$strings["Choose a project, developer, or public hub to support with a one-time donation"] = "Wähle ein Projekt, einen Entwickler oder einen öffentlichen Hub den du mit einer einmaligen Spende unterstützen willst.";
+App::$strings["Donate Now"] = "Jetzt spenden";
+App::$strings["<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"] = "<strong><em>Oder</em></strong> werde ein Unterstützer des Projekts (ausschließlich Hubzilla)";
+App::$strings["Please indicate if you would like your first name or full name (or nothing) to appear in our sponsor listing"] = "Bitte teile uns mit ob dein kompletter Name oder dein Vorname (oder gar nichts) auf unserer Sponsoren-Seite veröffentlicht werden soll.";
+App::$strings["Sponsor"] = "Sponsor";
+App::$strings["Special thanks to: "] = "Besonderer Dank an: ";
+App::$strings["This is a fairly comprehensive and complete guitar chord dictionary which will list most of the available ways to play a certain chord, starting from the base of the fingerboard up to a few frets beyond the twelfth fret (beyond which everything repeats). A couple of non-standard tunings are provided for the benefit of slide players, etc."] = "";
+App::$strings["Chord names start with a root note (A-G) and may include sharps (#) and flats (b). This software will parse most of the standard naming conventions such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."] = "";
+App::$strings["Valid examples include  A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."] = "Einige gültige Beispiele: A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ...";
+App::$strings["Guitar Chords"] = "Gitarrenakkorde";
+App::$strings["The complete online chord dictionary"] = "Das komplette online Akkord-Verzeichnis";
+App::$strings["Tuning"] = "Stimmen";
+App::$strings["Chord name: example: Em7"] = "Beispiel Akkord Name: Em7";
+App::$strings["Show for left handed stringing"] = "Linkshänder-Besaitung anzeigen";
+App::$strings["Quick Reference"] = "Schnellreferenz";
+App::$strings["Post to Libertree"] = "Bei Libertree veröffentlichen";
+App::$strings["Enable Libertree Post Plugin"] = "Aktivire das Libertree-Plugin";
+App::$strings["Libertree API token"] = "Libertree API Token";
+App::$strings["Libertree site URL"] = "URL der Libertree Seite";
+App::$strings["Post to Libertree by default"] = "Standardmäßig bei Libertree veröffentlichen";
+App::$strings["Libertree Post Settings"] = "Libertree-Beitragseinstellungen";
+App::$strings["Libertree Settings saved."] = "Libertree-Einstellungen gespeichert.";
+App::$strings["Flattr this!"] = "Flattr this!";
+App::$strings["Flattr widget settings updated."] = "Flattr Widget Einstellungen aktualisiert";
+App::$strings["Flattr user"] = "Flattr Nutzer";
+App::$strings["URL of the Thing to flattr"] = "URL des Dings zum flattrn";
+App::$strings["If empty channel URL is used"] = "Falls leer wird die Channel URL verwendet";
+App::$strings["Title of the Thing to flattr"] = "Titel des Dings zum flattrn";
+App::$strings["If empty \"channel name on The Hubzilla\" will be used"] = "Falls leer wird \"Kanalname auf The Hubzilla\" verwendet";
+App::$strings["Static or dynamic flattr button"] = "Statischer oder dynamischer Flattr Button";
+App::$strings["static"] = "statisch";
+App::$strings["dynamic"] = "dynamisch";
+App::$strings["Alignment of the widget"] = "Ausrichtung des Widgets";
+App::$strings["left"] = "links";
+App::$strings["right"] = "rechts";
+App::$strings["Enable Flattr widget"] = "Flattr Widget verwenden";
+App::$strings["Flattr Widget Settings"] = "Flattr Widget Einstellungen";
 App::$strings["Post to GNU social"] = "Bei GNU social veröffentlichen";
 App::$strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Bitte kontaktiere den Administrator deines Hubs.<br />Die angegebene API URL ist nicht korrekt.";
 App::$strings["We could not contact the GNU social API with the Path you entered."] = "Mit dem angegebenen Pfad war es uns nicht möglich, die GNU social API zu erreichen.";
@@ -2128,25 +2253,43 @@ App::$strings["Clear OAuth configuration"] = "OAuth Konfiguration löschen";
 App::$strings["GNU social Post Settings"] = "GNU social Einstellungen";
 App::$strings["API URL"] = "API-URL";
 App::$strings["Application name"] = "Anwendungsname";
-App::$strings["Currently blocked"] = "Derzeit blockiert";
-App::$strings["No channels currently blocked"] = "Momentan sind keine Kanäle blockiert";
-App::$strings["\"Superblock\" Settings"] = "\"Superblock\"-Einstellungen";
-App::$strings["Block Completely"] = "Vollständig blockieren";
-App::$strings["superblock settings updated"] = "Superblock Einstellungen aktualisiert";
-App::$strings["Your account on %s will expire in a few days."] = "Dein Account auf %s wird in ein paar Tagen ablaufen.";
-App::$strings["Your $Productname test account is about to expire."] = "Dein $Productname Test-Account wird bald auslaufen.";
-App::$strings["Three Dimensional Tic-Tac-Toe"] = "Dreidimensionales Tic-Tac-Toe";
-App::$strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
-App::$strings["New game"] = "Neues Spiel";
-App::$strings["New game with handicap"] = "Neues Handicaü-Spiel";
-App::$strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "3D Tic-Tac-Toe funktioniert wie das ursprüngliche Spiel, nur dass es auf mehreren Ebenen gleichzeitig gespielt wird.";
-App::$strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "In diesem Fall sind es drei Ebenen. Du gewinnst, wenn es dir gelingt drei in einer Reihe auf einer beliebigen Ebene oder diagonal über die verschiedenen Ebenen hinweg zu erreichen.";
-App::$strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Bei einem Handicap-Spiel wird die Position im Zentrum der mittleren Ebene gesperrt, da der Spieler der dieses Feld für sich beansprucht meist einen unfairen Vorteil hat.";
-App::$strings["You go first..."] = "Du darfst anfangen...";
-App::$strings["I'm going first this time..."] = "Diesmal werde ich anfangen...";
-App::$strings["You won!"] = "Sie haben gewonnen!";
-App::$strings["\"Cat\" game!"] = "\"Katzen\"-Spiel!";
-App::$strings["I won!"] = "Ich habe gewonnen!";
+App::$strings["QR code"] = "QR-Code";
+App::$strings["QR Generator"] = "QR-Generator";
+App::$strings["Enter some text"] = "Etwas Text eingeben";
+App::$strings["Invalid game."] = "Ungültiges Spiel.";
+App::$strings["You are not a player in this game."] = "Sie sind kein Spieler in diesem Spiel.";
+App::$strings["You must be a local channel to create a game."] = "Um ein Spiel zu eröffnen, musst du ein lokaler Kanal sein";
+App::$strings["You must select one opponent that is not yourself."] = "Du musst einen Gegner wählen, der nicht du selbst ist";
+App::$strings["Creating new game..."] = "Neues Spiel wird erstellt...";
+App::$strings["You must select white or black."] = "Sie müssen weiß oder schwarz auswählen.";
+App::$strings["Error creating new game."] = "Fehler beim Erstellen eines neuen Spiels.";
+App::$strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
+App::$strings["You must select a local channel /chess/channelname"] = "Du musst einen lokalen Kanal/Schach(Kanalnamen aufwählen";
+App::$strings["Enable notifications"] = "Benachrichtigungen aktivieren";
+App::$strings["Post to Twitter"] = "Bei Twitter veröffentlichen";
+App::$strings["Twitter settings updated."] = "Twitter-Einstellungen aktualisiert.";
+App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Es wurde kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte kontaktiere deinen Seiten-Administrator.";
+App::$strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "";
+App::$strings["Log in with Twitter"] = "Mit Twitter anmelden";
+App::$strings["Copy the PIN from Twitter here"] = "PIN von Twitter hier her kopieren";
+App::$strings["<strong>Note:</strong> Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
+App::$strings["Allow posting to Twitter"] = "Erlaube die Veröffentlichung bei Twitter";
+App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden.";
+App::$strings["Send public postings to Twitter by default"] = "Standardmäßig öffentliche Beiträge bei Twitter veröffentlichen";
+App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden.";
+App::$strings["Twitter Post Settings"] = "Twitter-Beitragseinstellungen";
+App::$strings["Deactivate the feature"] = "Diese Funktion abschalten";
+App::$strings["Hide the button and show the smilies directly."] = "Verstecke die Schaltfläche und zeige die Smilies direkt an.";
+App::$strings["Smileybutton Settings"] = "Smileyknopf-Einstellungen";
+App::$strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Diese Website verwendet <a href='http://www.piwik.org'>Piwik</a>, um die Besucherzugriffe auszuwerten.";
+App::$strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Wenn Du nicht möchtest, dass Deine Besuche zu diesem Zweck gespeichert werden, kannst Du <a href='%s'>ein Cookie setzen, welches Piwik davon abhält, Deine weiteren Besuche auf dieser Website zu verfolgen</a> (Opt-out).";
+App::$strings["Piwik Base URL"] = "Piwik Basis-URL";
+App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Der absolute Pfad zu Deiner Piwik-Installation (ohne Protokoll (http/s), aber mit abschließendem Schrägstrich / ).";
+App::$strings["Site ID"] = "Seitenkennung";
+App::$strings["Show opt-out cookie link?"] = "Den Opt-out Cookie-Link anzeigen?";
+App::$strings["Asynchronous tracking"] = "Asynchrones Tracking";
+App::$strings["Enable frontend JavaScript error tracking"] = "Ermögliche Frontend-JavaScript-Fehlertracking";
+App::$strings["This feature requires Piwik >= 2.2.0"] = "Diese Funktion erfordert Piwik >= 2.2.0";
 App::$strings["Edit your profile and change settings."] = "Bearbeite dein Profil und ändere die Einstellungen.";
 App::$strings["Click here to see activity from your connections."] = "Klicke hier, um die Aktivitäten Deiner Verbindungen zu sehen.";
 App::$strings["Click here to see your channel home."] = "Klicke hier, um Deine Kanal-Hauptseite zu sehen.";
@@ -2171,54 +2314,56 @@ App::$strings["Only want to share content for a while? Make it expire at a certa
 App::$strings["You can password protect content."] = "Du kannst Inhalte mit einem Passwort schützen.";
 App::$strings["Choose who you share with."] = "Wähle aus, mit wem Du teilen möchtest.";
 App::$strings["Click here when you are done."] = "Klicke hier, wenn Du fertig bist.";
-App::$strings["Adjust from which channels posts should be displayed."] = "Lege fest, von welchen Kanälen Beiträge angezeigt werden sollen.";
-App::$strings["Only show posts from channels in the specified privacy group."] = "Zeige nur Beträge von Kanälen, die in einer bestimmten Gruppe sind.";
-App::$strings["Easily find posts containing tags (keywords preceded by the \"#\" symbol)."] = "Finde Beiträge, die bestimmte Tags enthalten (Stichworte, die mit dem \"#\"-Symbol beginnen).";
-App::$strings["Easily find posts in given category."] = "Finde Beiträge in bestimmten Kategorien.";
-App::$strings["Easily find posts by date."] = "Finde Beiträge anhand des Datums.";
-App::$strings["Suggested users who have volounteered to be shown as suggestions, and who we think you might find interesting."] = "Vorgeschlagene Kanäle, die in ihren Einstellungen zugestimmt haben, als Vorschläge angezeigt zu werden, und die Du eventuell interessant finden könntest.";
-App::$strings["Here you see channels you have connected to."] = "Hier siehst du die Kanäle, mit denen Du verbunden bist.";
-App::$strings["Save your search so you can repeat it at a later date."] = "Speichere Deine Suche, so dass Du sie später leicht erneut durchführen kannst.";
-App::$strings["If you see this icon you can be sure that the sender is who it say it is. It is normal that it is not always possible to verify the sender, so the icon will be missing sometimes. There is usually no need to worry about that."] = "Wenn Du dieses Symbol siehst, kannst Du weitgehend sicher sein, dass der Ansender dem angegebenen entspricht. Nicht immer ist es möglich, den Absender zu verifizieren, daher fehlt das Symbol mitunter. Das ist aber in der Regel kein Grund zur Sorge.";
-App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "Vorsicht! Es kann sein, dass jemand versucht, eine Nachricht zu fälschen! Diese Nachricht muss nicht unbedingt vom angegebenen Absender stammen!";
-App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.</p><p>You can also advance by pressing the return key"] = "Willkommen zu Hubzilla! Möchtest Du eine Tour der Benutzeroberfläche angezeigt bekommen?</p><p>Du kannst zu jeder Zeit pausieren und fortsetzen, wo Du aufgehört hast, indem Du die Seite neu lädtst, oder zu einer anderen Seite springst.</p><p>Du kannst auc durch das Drücken der Enter-Taste weitergehen.";
-App::$strings["Post to Twitter"] = "Bei Twitter veröffentlichen";
-App::$strings["Twitter settings updated."] = "Twitter-Einstellungen aktualisiert.";
-App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Es wurde kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte kontaktiere deinen Seiten-Administrator.";
-App::$strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "";
-App::$strings["Log in with Twitter"] = "Mit Twitter anmelden";
-App::$strings["Copy the PIN from Twitter here"] = "PIN von Twitter hier her kopieren";
-App::$strings["<strong>Note:</strong> Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
-App::$strings["Allow posting to Twitter"] = "Erlaube die Veröffentlichung bei Twitter";
-App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden.";
-App::$strings["Send public postings to Twitter by default"] = "Standardmäßig öffentliche Beiträge bei Twitter veröffentlichen";
-App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden.";
-App::$strings["Twitter Post Settings"] = "Twitter-Beitragseinstellungen";
-App::$strings["Submit Settings"] = "Einstellungen absenden";
-App::$strings["Show Upload Limits"] = "Hochladebeschränkungen anzeigen";
-App::$strings["Hubzilla configured maximum size: "] = "Die in Hubzilla eingestellte maximale Größe:";
-App::$strings["PHP upload_max_filesize: "] = "PHP upload_max_filesize:";
-App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = "PHP post_max_size (muss größer sein als upload_max_filesize):";
-App::$strings["Recent Channel/Profile Viewers"] = "Kürzliche Kanal/Profil Besucher";
-App::$strings["This plugin/addon has not been configured."] = "Dieses Plugin/Addon wurde noch nicht konfiguriert.";
-App::$strings["Please visit the Visage settings on %s"] = "Bitte rufe die Visage Einstellungen auf %s auf";
-App::$strings["your feature settings page"] = "Die Funktions-Einstellungsseite";
-App::$strings["No entries."] = "Keine Einträge.";
-App::$strings["Enable Visage Visitor Logging"] = "Aktiviere das Visage-Besucher Logging";
-App::$strings["Visage Settings"] = "Visage-Einstellungen";
-App::$strings["Who likes me?"] = "Wer mag mich?";
-App::$strings["Post to WordPress"] = "Auf WordPress posten";
-App::$strings["Enable WordPress Post Plugin"] = "Aktiviere das WordPress-Plugin";
-App::$strings["WordPress username"] = "WordPress-Benutzername";
-App::$strings["WordPress password"] = "WordPress-Passwort";
-App::$strings["WordPress API URL"] = "WordPress-API-URL";
-App::$strings["Typically https://your-blog.tld/xmlrpc.php"] = "Normalerweise https://your-blog.tld/xmlrpc.php";
-App::$strings["WordPress blogid"] = "WordPress blogid";
-App::$strings["For multi-user sites such as wordpress.com, otherwise leave blank"] = "Nötig für Mehrbenutzer Seiten wie wordpress.com, andernfalls frei lassen";
-App::$strings["Post to WordPress by default"] = "Standardmäßig auf auf WordPress posten";
-App::$strings["Forward comments (requires hubzilla_wp plugin)"] = "Kommentare weiterleiten (benötigt hubzilla_wp Plugin)";
-App::$strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen";
-App::$strings["Wordpress Settings saved."] = "Wordpress-Einstellungen gespeichert.";
+App::$strings["Adjust from which channels posts should be displayed."] = "Lege fest, von welchen Kanälen Beiträge angezeigt werden sollen.";
+App::$strings["Only show posts from channels in the specified privacy group."] = "Zeige nur Beträge von Kanälen, die in einer bestimmten Gruppe sind.";
+App::$strings["Easily find posts containing tags (keywords preceded by the \"#\" symbol)."] = "Finde Beiträge, die bestimmte Tags enthalten (Stichworte, die mit dem \"#\"-Symbol beginnen).";
+App::$strings["Easily find posts in given category."] = "Finde Beiträge in bestimmten Kategorien.";
+App::$strings["Easily find posts by date."] = "Finde Beiträge anhand des Datums.";
+App::$strings["Suggested users who have volounteered to be shown as suggestions, and who we think you might find interesting."] = "Vorgeschlagene Kanäle, die in ihren Einstellungen zugestimmt haben, als Vorschläge angezeigt zu werden, und die Du eventuell interessant finden könntest.";
+App::$strings["Here you see channels you have connected to."] = "Hier siehst du die Kanäle, mit denen Du verbunden bist.";
+App::$strings["Save your search so you can repeat it at a later date."] = "Speichere Deine Suche, so dass Du sie später leicht erneut durchführen kannst.";
+App::$strings["If you see this icon you can be sure that the sender is who it say it is. It is normal that it is not always possible to verify the sender, so the icon will be missing sometimes. There is usually no need to worry about that."] = "Wenn Du dieses Symbol siehst, kannst Du weitgehend sicher sein, dass der Ansender dem angegebenen entspricht. Nicht immer ist es möglich, den Absender zu verifizieren, daher fehlt das Symbol mitunter. Das ist aber in der Regel kein Grund zur Sorge.";
+App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "Vorsicht! Es kann sein, dass jemand versucht, eine Nachricht zu fälschen! Diese Nachricht muss nicht unbedingt vom angegebenen Absender stammen!";
+App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.</p><p>You can also advance by pressing the return key"] = "Willkommen zu Hubzilla! Möchtest Du eine Tour der Benutzeroberfläche angezeigt bekommen?</p><p>Du kannst zu jeder Zeit pausieren und fortsetzen, wo Du aufgehört hast, indem Du die Seite neu lädtst, oder zu einer anderen Seite springst.</p><p>Du kannst auc durch das Drücken der Enter-Taste weitergehen.";
+App::$strings["Extended Identity Sharing"] = "Erweitertes Teilen von Identitäten";
+App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "";
+App::$strings["Three Dimensional Tic-Tac-Toe"] = "Dreidimensionales Tic-Tac-Toe";
+App::$strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
+App::$strings["New game"] = "Neues Spiel";
+App::$strings["New game with handicap"] = "Neues Handicaü-Spiel";
+App::$strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "3D Tic-Tac-Toe funktioniert wie das ursprüngliche Spiel, nur dass es auf mehreren Ebenen gleichzeitig gespielt wird.";
+App::$strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "In diesem Fall sind es drei Ebenen. Du gewinnst, wenn es dir gelingt drei in einer Reihe auf einer beliebigen Ebene oder diagonal über die verschiedenen Ebenen hinweg zu erreichen.";
+App::$strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Bei einem Handicap-Spiel wird die Position im Zentrum der mittleren Ebene gesperrt, da der Spieler der dieses Feld für sich beansprucht meist einen unfairen Vorteil hat.";
+App::$strings["You go first..."] = "Du darfst anfangen...";
+App::$strings["I'm going first this time..."] = "Diesmal werde ich anfangen...";
+App::$strings["You won!"] = "Sie haben gewonnen!";
+App::$strings["\"Cat\" game!"] = "\"Katzen\"-Spiel!";
+App::$strings["I won!"] = "Ich habe gewonnen!";
+App::$strings["Message to display on every page on this server"] = "Nachricht, die auf jeder Seite dieses Servers angezeigt werden soll";
+App::$strings["Pageheader Settings"] = "Nachrichtenkopf-Einstellungen";
+App::$strings["pageheader Settings saved."] = "Nachrichtenkopf-Einstellungen gespeichert.";
+App::$strings["lonely"] = "einsam";
+App::$strings["drunk"] = "betrunken";
+App::$strings["horny"] = "geil";
+App::$strings["stoned"] = "bekifft";
+App::$strings["fucked up"] = "beschissen";
+App::$strings["clusterfucked"] = "clusterfucked";
+App::$strings["crazy"] = "verrückt";
+App::$strings["hurt"] = "verletzt";
+App::$strings["sleepy"] = "müde";
+App::$strings["grumpy"] = "mürrisch";
+App::$strings["high"] = "hoch";
+App::$strings["semi-conscious"] = "halb bewusstlos";
+App::$strings["in love"] = "verliebt";
+App::$strings["in lust"] = "";
+App::$strings["naked"] = "nackt";
+App::$strings["stinky"] = "stinkend";
+App::$strings["sweaty"] = "verschwitzt";
+App::$strings["bleeding out"] = "blutend";
+App::$strings["victorious"] = "siegreich";
+App::$strings["defeated"] = "besiegt";
+App::$strings["envious"] = "neidisch";
+App::$strings["jealous"] = "eifersüchtig";
 App::$strings["XMPP settings updated."] = "XMPP-Einstellungen aktualisiert.";
 App::$strings["Enable Chat"] = "Chat aktivieren";
 App::$strings["Individual credentials"] = "Individuelle Anmeldedaten";
@@ -2227,211 +2372,34 @@ App::$strings["XMPP Settings"] = "XMPP-Einstellungen";
 App::$strings["Jabber BOSH host"] = "Jabber BOSH Host";
 App::$strings["Use central userbase"] = "Zentrale Benutzerbasis verwenden";
 App::$strings["If enabled, members will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "";
-App::$strings["Select Channel"] = "Kanal auswählen";
-App::$strings["Read-write"] = "Lesen-schreiben";
-App::$strings["Read-only"] = "Nur Lesen";
-App::$strings["My Calendars"] = "Meine Kalender";
-App::$strings["Shared Calendars"] = "Geteilte Kalender";
-App::$strings["Share this calendar"] = "Diesen Kalender teilen";
-App::$strings["Calendar name and color"] = "Kalendername und -farbe";
-App::$strings["Create new calendar"] = "Neuen Kalender erstellen";
-App::$strings["Calendar Name"] = "Kalendername";
-App::$strings["Calendar Tools"] = "Kalenderwerkzeuge";
-App::$strings["Import calendar"] = "Kalender importieren";
-App::$strings["Select a calendar to import to"] = "Kalender zum Hineinimportieren auswählen";
-App::$strings["Addressbooks"] = "Adressbücher";
-App::$strings["Addressbook name"] = "Adressbuchname";
-App::$strings["Create new addressbook"] = "Neues Adressbuch erstellen";
-App::$strings["Addressbook Name"] = "Adressbuchname";
-App::$strings["Addressbook Tools"] = "Adressbuchwerkzeuge";
-App::$strings["Import addressbook"] = "Adressbuch importieren";
-App::$strings["Select an addressbook to import to"] = "Adressbuch zum Hineinimportieren auswählen";
-App::$strings["INVALID EVENT DISMISSED!"] = "UNGÜLTIGEN TERMIN ABGELEHNT!";
-App::$strings["Summary: "] = "Zusammenfassung:";
-App::$strings["Date: "] = "Datum:";
-App::$strings["Reason: "] = "Grund:";
-App::$strings["INVALID CARD DISMISSED!"] = "UNGÜLTIGE KARTE ABGELEHNT!";
-App::$strings["Name: "] = "Name: ";
-App::$strings["You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV Settings before you can use it."] = "";
-App::$strings["Example: YYYY-MM-DD HH:mm"] = "Beispiel: JJJJ-MM-TT HH:mm";
-App::$strings["End date and time"] = "Enddatum und -zeit";
-App::$strings["List month"] = "";
-App::$strings["List week"] = "";
-App::$strings["List day"] = "";
-App::$strings["More"] = "Mehr";
-App::$strings["Less"] = "Weniger";
-App::$strings["Select calendar"] = "Kalender auswählen";
-App::$strings["Delete all"] = "Alles löschen";
-App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "Entschuldigung, aber das Bearbeiten von wiederkehrenden Veranstaltungen ist leider noch nicht implementiert.";
-App::$strings["Errors encountered creating database table: "] = "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten.";
-App::$strings["Default Calendar"] = "Standardkalender";
-App::$strings["Default Addressbook"] = "Standardadressbuch";
-App::$strings["CalDAV/CardDAV Settings saved."] = "CalDAV/CardDAV-Einstellungen gespeichert.";
-App::$strings["Enable CalDAV/CardDAV Server for this channel"] = "Aktiviere den CalDAV/CardDAV Server für diesen Kanal";
-App::$strings["Your CalDAV resources are located at %s "] = "Deine CalDAV Resourcen sind unter %s verfügbar";
-App::$strings["Your CardDAV resources are located at %s "] = "Deine CardDAV Ressourcen sind unter %s verfügbar";
-App::$strings["CalDAV/CardDAV Settings"] = "CalDAV/CardDAV-Einstellungen";
-App::$strings["Home, Voice"] = "Zuhause, Sprache";
-App::$strings["Home, Fax"] = "Zuhause, Fax";
-App::$strings["Work, Voice"] = "Arbeit, Sprache";
-App::$strings["Work, Fax"] = "Arbeit, Fax";
-App::$strings["Invalid game."] = "Ungültiges Spiel.";
-App::$strings["You are not a player in this game."] = "Sie sind kein Spieler in diesem Spiel.";
-App::$strings["You must be a local channel to create a game."] = "Um ein Spiel zu eröffnen, musst du ein lokaler Kanal sein";
-App::$strings["You must select one opponent that is not yourself."] = "Du musst einen Gegner wählen, der nicht du selbst ist";
-App::$strings["Creating new game..."] = "Neues Spiel wird erstellt...";
-App::$strings["You must select white or black."] = "Sie müssen weiß oder schwarz auswählen.";
-App::$strings["Error creating new game."] = "Fehler beim Erstellen eines neuen Spiels.";
-App::$strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
-App::$strings["You must select a local channel /chess/channelname"] = "Du musst einen lokalen Kanal/Schach(Kanalnamen aufwählen";
-App::$strings["Enable notifications"] = "Benachrichtigungen aktivieren";
-App::$strings["Your Webbie:"] = "Dein Webbie";
-App::$strings["Fontsize (px):"] = "Schriftgröße (px):";
-App::$strings["Link:"] = "Link:";
-App::$strings["Like us on Hubzilla"] = "Like us on Hubzilla";
-App::$strings["Embed:"] = "Einbetten";
-App::$strings["Male"] = "Männlich";
-App::$strings["Female"] = "Weiblich";
-App::$strings["First Name"] = "Vorname";
-App::$strings["Last Name"] = "Nachname";
-App::$strings["Full Name"] = "Voller Name";
-App::$strings["Profile Photo 16px"] = "Profilfoto 16 px";
-App::$strings["Profile Photo 32px"] = "Profilfoto 32 px";
-App::$strings["Profile Photo 48px"] = "Profilfoto 48 px";
-App::$strings["Profile Photo 64px"] = "Profilfoto 64 px";
-App::$strings["Profile Photo 80px"] = "Profilfoto 80 px";
-App::$strings["Profile Photo 128px"] = "Profilfoto 128 px";
-App::$strings["Timezone"] = "Zeitzone";
-App::$strings["Birth Year"] = "Geburtsjahr";
-App::$strings["Birth Month"] = "Geburtsmonat";
-App::$strings["Birth Day"] = "Geburtstag";
-App::$strings["Birthdate"] = "Geburtsdatum";
-App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal.";
-App::$strings["The error message was:"] = "Die Fehlermeldung war:";
-App::$strings["OpenID protocol error. No ID returned."] = "OpenID-Protokollfehler. Keine Kennung zurückgegeben.";
-App::$strings["Login failed."] = "Login fehlgeschlagen.";
-App::$strings["Reconnecting %d connections"] = "Erneuere %d Verbindungen";
-App::$strings["Diaspora Reconnect"] = "";
-App::$strings["Use this form to re-establish Diaspora connections which were initially made from a different hub."] = "";
-App::$strings["Reconnect"] = "Erneut verbinden";
-App::$strings["Send test email"] = "Test-E-Mail senden";
-App::$strings["Mail sent."] = "Mail gesendet.";
-App::$strings["Sending of mail failed."] = "Senden der E-Mail fehlgeschlagen.";
-App::$strings["Mail Test"] = "Mail Test";
-App::$strings["Errors encountered deleting database table "] = "Beim Löschen der Datenbanktabelle sind Fehler aufgetreten.";
-App::$strings["Drop tables when uninstalling?"] = "Lösche Tabellen beim Deinstallieren?";
-App::$strings["If checked, the Rendezvous database tables will be deleted when the plugin is uninstalled."] = "Wenn ausgewählt, werden die Rendezvous-Tabellen in der Datenbank gelöscht, sobald das Plugin deinstalliert wird.";
-App::$strings["Mapbox Access Token"] = "Mapbox Zugangs-Token";
-App::$strings["If you enter a Mapbox access token, it will be used to retrieve map tiles from Mapbox instead of the default OpenStreetMap tile server."] = "Wenn Du ein Mapbox Zugangs-Token eingibst, werden die Kartendaten (Kacheln) damit von Mapbox geladen, anstatt von OpenStreetMap, welches die Voreinstellung ist.";
-App::$strings["Rendezvous"] = "Rendezvous";
-App::$strings["This identity has been deleted by another member due to inactivity. Please press the \"New identity\" button or refresh the page to register a new identity. You may use the same name."] = "Diese Identität wurde von einem anderen Mitglied aufgrund von Inaktivität gelöscht. Bitte klicke auf \"Neue Identität\" oder aktualisiere die Website im Browser, um eine neue Identität zu registrieren. Du kannst dabei den selben Namen verwenden.";
-App::$strings["Welcome to Rendezvous!"] = "Willkommen bei Rendezvous!";
-App::$strings["Enter your name to join this rendezvous. To begin sharing your location with the other members, tap the GPS control. When your location is discovered, a red dot will appear and others will be able to see you on the map."] = "Gib Deinen Namen ein, um diesem Rendezvous beizutreten. Um Deinen Standort mit anderen Mitgliedern zu teilen, klicke auf das GPS Symbol. Sobald Dein Standort ermittelt ist, erscheint ein roter Punkt, und die Anderen werden Dich auf der Karte sehen können.";
-App::$strings["Let's meet here"] = "Lasst uns hier treffen";
-App::$strings["New marker"] = "Neue Markierung";
-App::$strings["Edit marker"] = "Markierung bearbeiten";
-App::$strings["New identity"] = "Neue Identität";
-App::$strings["Delete marker"] = "Markierung löschen";
-App::$strings["Delete member"] = "Mitglied löschen";
-App::$strings["Edit proximity alert"] = "Annäherungsalarm bearbeiten";
-App::$strings["A proximity alert will be issued when this member is within a certain radius of you.<br><br>Enter a radius in meters (0 to disable):"] = "Ein Annäherungsalarm wird ausgelöst werden, sobald sich dieses Mitglied innerhalb eines bestimmten Radius von Dir aufhält.<br><br>Gib einen Radius in Metern ein (0 zum Abschalten der Funktion):";
-App::$strings["distance"] = "Entfernung";
-App::$strings["Proximity alert distance (meters)"] = "";
-App::$strings["A proximity alert will be issued when you are within a certain radius of the marker location.<br><br>Enter a radius in meters (0 to disable):"] = "Ein Annäherungsalarm wird ausgelöst werden, sobald Du Dich innerhalb eines bestimmten Radius der Markierung aufhält.<br><br>Gib einen Radius in Metern ein (0 zum Abschalten der Funktion):";
-App::$strings["Marker proximity alert"] = "Annäherungsalarm für Markierung";
-App::$strings["Reminder note"] = "Erinnerungshinweis";
-App::$strings["Enter a note to be displayed when you are within the specified proximity..."] = "Gib eine Nachricht ein, die angezeigt werden soll, wenn Du Dich in der festgelegten Nähe befindest...";
-App::$strings["Add new rendezvous"] = "Neues Rendezvous hinzufügen";
-App::$strings["Create a new rendezvous and share the access link with those you wish to invite to the group. Those who open the link become members of the rendezvous. They can view other member locations, add markers to the map, or share their own locations with the group."] = "Erstelle ein neues Rendezvous und teile den Zugriffslink mit allen, die Du in die Gruppe einladen möchtest. Die, die den Link öffnen, werden Mitglieder des Rendezvous. Sie können die Standorte der anderen Mitglieder sehen, Marker zur Karte hinzufügen oder ihre eigenen Standorte mit der Gruppe teilen.";
-App::$strings["Install Firefox Sharing Tools"] = "";
-App::$strings["Share content from Firefox to \$Projectname"] = "Inhalte von Firefox nach \$Projectname teilen";
-App::$strings["Install Firefox Sharing Tools to this web browser"] = "";
-App::$strings["Error retrieving wiki"] = "Fehler beim Abrufen des Wiki";
-App::$strings["Error creating zip file export folder"] = "Fehler bei der Erzeugung des Zip-Datei Export-Verzeichnisses ";
-App::$strings["Error downloading wiki: "] = "Fehler beim Herunterladen des Wiki:";
-App::$strings["Wiki Pages"] = "Wikiseiten";
-App::$strings["Add new page"] = "Neue Seite hinzufügen";
-App::$strings["Page name"] = "Seitenname";
-App::$strings["Wiki List"] = "Wikiliste";
-App::$strings["Enable the GNU-Social protocol for this channel"] = "GNU Social Protokoll für diesen Kanal aktualisieren";
-App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Suche %1\$s (%2\$s)";
-App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
-App::$strings["Search \$Projectname"] = "";
-App::$strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden";
-App::$strings["default"] = "Standard";
-App::$strings["Select an alternate language"] = "Wähle eine alternative Sprache";
-App::$strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
-App::$strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist auf dieser Seite nicht erlaubt";
-App::$strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
-App::$strings["An invitation is required."] = "Eine Einladung wird benötigt.";
-App::$strings["Invitation could not be verified."] = "Die Einladung konnte nicht bestätigt werden.";
-App::$strings["Please enter the required information."] = "Bitte gib die benötigten Informationen ein.";
-App::$strings["Failed to store account information."] = "Speichern der Nutzerkontodaten fehlgeschlagen.";
-App::$strings["Registration confirmation for %s"] = "Registrierungsbestätigung für %s";
-App::$strings["Registration request at %s"] = "Registrierungsanfrage auf %s";
-App::$strings["your registration password"] = "Dein Registrierungspasswort";
-App::$strings["Registration details for %s"] = "Registrierungsdetails für %s";
-App::$strings["Account approved."] = "Nutzerkonto bestätigt.";
-App::$strings["Registration revoked for %s"] = "Registrierung für %s wurde widerrufen";
-App::$strings["Click here to upgrade."] = "Klicke hier, um das Upgrade durchzuführen.";
-App::$strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Grenzen Ihres Abonnements.";
-App::$strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar.";
-App::$strings["Who can see this?"] = "Wer kann das sehen?";
-App::$strings["Custom selection"] = "Benutzerdefinierte Auswahl";
-App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Wähle \"Anzeigen\", um Betrachtung zuzulassen. \"Nicht anzeigen\" überstimmt und limitiert den Aktionsradius von \"Anzeigen\" für Ausnahmen.";
-App::$strings["Show"] = "Anzeigen";
-App::$strings["Don't show"] = "Nicht anzeigen";
-App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.<br />Diese Berechtigungen bestimmen, wer den Beitrag sehen kann.";
-App::$strings["Categories"] = "Kategorien";
-App::$strings["Tags"] = "Schlagwörter";
-App::$strings["Keywords"] = "Schlüsselwörter";
-App::$strings["have"] = "habe";
-App::$strings["has"] = "hat";
-App::$strings["want"] = "will";
-App::$strings["wants"] = "will";
-App::$strings["likes"] = "gefällt";
-App::$strings["dislikes"] = "missfällt";
-App::$strings["Attachments:"] = "Anhänge:";
-App::$strings["l F d, Y \\@ g:i A"] = "l, d. F Y, H:i";
-App::$strings["\$Projectname event notification:"] = "\$Projectname-Terminbenachrichtigung:";
-App::$strings["Starts:"] = "Beginnt:";
-App::$strings["Finishes:"] = "Endet:";
-App::$strings["Birthday"] = "Geburtstag";
-App::$strings["Age: "] = "Alter:";
-App::$strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-TT oder MM-TT";
-App::$strings["never"] = "Nie";
-App::$strings["less than a second ago"] = "Vor weniger als einer Sekunde";
-App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "vor %1\$d %2\$s";
-App::$strings["__ctx:relative_date__ year"] = array(
-	0 => "Jahr",
-	1 => "Jahre",
-);
-App::$strings["__ctx:relative_date__ month"] = array(
-	0 => "Monat",
-	1 => "Monate",
-);
-App::$strings["__ctx:relative_date__ week"] = array(
-	0 => "Woche",
-	1 => "Wochen",
-);
-App::$strings["__ctx:relative_date__ day"] = array(
-	0 => "Tag",
-	1 => "Tage",
-);
-App::$strings["__ctx:relative_date__ hour"] = array(
-	0 => "Stunde",
-	1 => "Stunden",
-);
-App::$strings["__ctx:relative_date__ minute"] = array(
-	0 => "Minute",
-	1 => "Minuten",
-);
-App::$strings["__ctx:relative_date__ second"] = array(
-	0 => "Sekunde",
-	1 => "Sekunden",
-);
-App::$strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
-App::$strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
+App::$strings["Who likes me?"] = "Wer mag mich?";
+App::$strings["You are now authenticated to pumpio."] = "Du bist nun bei pumpio authenzifiziert.";
+App::$strings["return to the featured settings page"] = "";
+App::$strings["Post to Pump.io"] = "Bei pumpio veröffentlichen";
+App::$strings["Pump.io servername"] = "Pump.io-Servername";
+App::$strings["Without \"http://\" or \"https://\""] = "Ohne \"http://\" oder \"https://\"";
+App::$strings["Pump.io username"] = "Pump.io-Benutzername";
+App::$strings["Without the servername"] = "Ohne dem Servernamen";
+App::$strings["You are not authenticated to pumpio"] = "Du bist nicht bei pumpio authentifiziert.";
+App::$strings["(Re-)Authenticate your pump.io connection"] = "Deine pumpio Verbindung (erneut) authentifizieren";
+App::$strings["Enable pump.io Post Plugin"] = "Aktiviere das pumpio-Plugin";
+App::$strings["Post to pump.io by default"] = "Standardmäßig bei pumpio veröffentlichen";
+App::$strings["Should posts be public"] = "Sollen die Beiträge öffentlich sein";
+App::$strings["Mirror all public posts"] = "Öffentliche Beiträge spiegeln";
+App::$strings["Pump.io Post Settings"] = "Pump.io-Beitragseinstellungen";
+App::$strings["PumpIO Settings saved."] = "PumpIO-Einstellungen gespeichert.";
+App::$strings["An account has been created for you."] = "Ein Konto wurde für Sie erstellt.";
+App::$strings["Authentication successful but rejected: account creation is disabled."] = "Authentifizierung war erfolgreich wurde aber abgewiesen! Das Anlegen von Accounts wurde deaktiviert.";
+App::$strings["Search \$Projectname"] = "\$Projectname suchen";
+App::$strings["Redmatrix File Storage Import"] = "";
+App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Hiermit werden alle deine Daten aus der Redmatrix Cloud in diesen Kanal importiert.";
+App::$strings["file"] = "Datei";
+App::$strings["Send email to all members"] = "E-Mail an alle Mitglieder senden";
+App::$strings["$1%s Administrator"] = "$1%s Administrator";
+App::$strings["%1\$d of %2\$d messages sent."] = "%1\$d von %2\$d Nachrichten gesendet.";
+App::$strings["Send email to all hub members."] = "Eine E-Mail an alle Mitglieder dieses Hubs senden.";
+App::$strings["Sender Email address"] = "E-Mail Adresse des Absenders";
+App::$strings["Test mode (only send to hub administrator)"] = "Test Modus (nur an Hub Administratoren senden)";
 App::$strings["Frequently"] = "Häufig";
 App::$strings["Hourly"] = "Stündlich";
 App::$strings["Twice daily"] = "Zwei Mal am Tag";
@@ -2492,9 +2460,6 @@ App::$strings["Uncertain"] = "Ungewiss";
 App::$strings["It's complicated"] = "Es ist kompliziert";
 App::$strings["Don't care"] = "Interessiert mich nicht";
 App::$strings["Ask me"] = "Frag mich mal";
-App::$strings["New window"] = "Neues Fenster";
-App::$strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browserfenster oder Tab";
-App::$strings["User '%s' deleted"] = "Benutzer '%s' gelöscht";
 App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden";
 App::$strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s an";
 App::$strings["poked"] = "stupste";
@@ -2543,285 +2508,69 @@ App::$strings["Toggle comments"] = "Kommentare umschalten";
 App::$strings["Categories (optional, comma-separated list)"] = "Kategorien (optional, kommagetrennte Liste)";
 App::$strings["Other networks and post services"] = "Andere Netzwerke und Platformen";
 App::$strings["Set publish date"] = "Veröffentlichungsdatum festlegen";
-App::$strings["Discover"] = "Entdecken";
-App::$strings["Imported public streams"] = "Importierte öffentliche Beiträge";
-App::$strings["Commented Order"] = "Neueste Kommentare";
-App::$strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert";
-App::$strings["Posted Order"] = "Neueste Beiträge";
-App::$strings["Sort by Post Date"] = "Nach Beitragsdatum sortiert";
-App::$strings["Posts that mention or involve you"] = "Beiträge mit Beteiligung Deinerseits";
-App::$strings["Activity Stream - by date"] = "Activity Stream – nach Datum sortiert";
-App::$strings["Starred"] = "Markiert";
-App::$strings["Favourite Posts"] = "Markierte Beiträge";
-App::$strings["Spam"] = "Spam";
-App::$strings["Posts flagged as SPAM"] = "Nachrichten, die als SPAM markiert wurden";
-App::$strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
-App::$strings["Profile Details"] = "Profil-Details";
-App::$strings["Photo Albums"] = "Fotoalben";
-App::$strings["Files and Storage"] = "Dateien und Speicher";
-App::$strings["Chatrooms"] = "Chaträume";
-App::$strings["Bookmarks"] = "Lesezeichen";
-App::$strings["Saved Bookmarks"] = "Gespeicherte Lesezeichen";
-App::$strings["View Webpages"] = "Webseiten anzeigen";
-App::$strings["__ctx:noun__ Attending"] = array(
-	0 => "Zusage",
-	1 => "Zusagen",
-);
-App::$strings["__ctx:noun__ Not Attending"] = array(
-	0 => "Absage",
-	1 => "Absagen",
-);
-App::$strings["__ctx:noun__ Undecided"] = array(
-	0 => " Unentschlossen",
-	1 => "Unentschlossene",
-);
-App::$strings["__ctx:noun__ Agree"] = array(
-	0 => "Zustimmung",
-	1 => "Zustimmungen",
-);
-App::$strings["__ctx:noun__ Disagree"] = array(
-	0 => "Ablehnung",
-	1 => "Ablehnungen",
-);
-App::$strings["__ctx:noun__ Abstain"] = array(
-	0 => "Enthaltung",
-	1 => "Enthaltungen",
-);
-App::$strings["Unable to determine sender."] = "Kann Absender nicht bestimmen.";
-App::$strings["No recipient provided."] = "Kein Empfänger angegeben";
-App::$strings["[no subject]"] = "[no subject]";
-App::$strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden.";
-App::$strings["guest:"] = "Gast:";
-App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
-App::$strings["System"] = "System";
-App::$strings["New App"] = "Neue App";
-App::$strings["Edit Apps"] = "Apps bearbeiten";
-App::$strings["Suggestions"] = "Vorschläge";
-App::$strings["See more..."] = "Mehr anzeigen …";
-App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen.";
-App::$strings["Add New Connection"] = "Neue Verbindung hinzufügen";
-App::$strings["Enter channel address"] = "Adresse des Kanals eingeben";
-App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Beispiele: bob@beispiel.com, http://beispiel.com/barbara";
-App::$strings["Notes"] = "Notizen";
-App::$strings["Remove term"] = "Eintrag löschen";
-App::$strings["Saved Searches"] = "Gespeicherte Suchanfragen";
-App::$strings["add"] = "hinzufügen";
-App::$strings["Saved Folders"] = "Gespeicherte Ordner";
-App::$strings["Everything"] = "Alles";
-App::$strings["Archives"] = "Archive";
-App::$strings["Refresh"] = "Aktualisieren";
-App::$strings["Account settings"] = "Konto-Einstellungen";
-App::$strings["Channel settings"] = "Kanal-Einstellungen";
-App::$strings["Additional features"] = "Zusätzliche Funktionen";
-App::$strings["Feature/Addon settings"] = "Plugin-Einstellungen";
-App::$strings["Display settings"] = "Anzeige-Einstellungen";
-App::$strings["Manage locations"] = "Klon-Adressen verwalten";
-App::$strings["Export channel"] = "Kanal exportieren";
-App::$strings["Connected apps"] = "Verbundene Apps";
-App::$strings["Permission Groups"] = "Berechtigungsrollen";
-App::$strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen";
-App::$strings["Private Mail Menu"] = "Private Nachrichten";
-App::$strings["Combined View"] = "Kombinierte Anzeige";
-App::$strings["Inbox"] = "Eingang";
-App::$strings["Outbox"] = "Ausgang";
-App::$strings["New Message"] = "Neue Nachricht";
-App::$strings["Conversations"] = "Konversationen";
-App::$strings["Received Messages"] = "Erhaltene Nachrichten";
-App::$strings["Sent Messages"] = "Gesendete Nachrichten";
-App::$strings["No messages."] = "Keine Nachrichten.";
-App::$strings["Delete conversation"] = "Unterhaltung löschen";
-App::$strings["Events Tools"] = "Kalenderwerkzeuge";
-App::$strings["Export Calendar"] = "Kalender exportieren";
-App::$strings["Import Calendar"] = "Kalender importieren";
-App::$strings["Overview"] = "Übersicht";
-App::$strings["Chat Members"] = "Chatmitglieder";
-App::$strings["__ctx:wiki_history__ Message"] = "Nachricht";
-App::$strings["Bookmarked Chatrooms"] = "Gespeicherte Chatrooms";
-App::$strings["Suggested Chatrooms"] = "Chatraum-Vorschläge";
-App::$strings["photo/image"] = "Foto/Bild";
-App::$strings["Click to show more"] = "Klick, um mehr anzuzeigen";
-App::$strings["Rating Tools"] = "Bewertungswerkzeuge";
-App::$strings["Rate Me"] = "Bewerte mich";
-App::$strings["View Ratings"] = "Bewertungen ansehen";
-App::$strings["Forums"] = "Foren";
-App::$strings["Tasks"] = "Aufgaben";
-App::$strings["Member registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
-App::$strings["Inspect queue"] = "Warteschlange kontrollieren";
-App::$strings["DB updates"] = "DB-Aktualisierungen";
-App::$strings["Admin"] = "Administration";
-App::$strings["Plugin Features"] = "Plug-In Funktionen";
-App::$strings["Invalid data packet"] = "Ungültiges Datenpaket";
-App::$strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
-App::$strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
-App::$strings["invalid target signature"] = "Ungültige Signatur des Ziels";
-App::$strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
-App::$strings["Empty name"] = "Namensfeld leer";
-App::$strings["Name too long"] = "Name ist zu lang";
-App::$strings["No account identifier"] = "Keine Account-Kennung";
-App::$strings["Nickname is required."] = "Spitzname ist erforderlich.";
-App::$strings["Reserved nickname. Please choose another."] = "Reservierter Kurzname. Bitte wähle einen anderen.";
-App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
-App::$strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
-App::$strings["Default Profile"] = "Standard-Profil";
-App::$strings["Create New Profile"] = "Neues Profil erstellen";
-App::$strings["Visible to everybody"] = "Für jeden sichtbar";
-App::$strings["Gender:"] = "Geschlecht:";
-App::$strings["Homepage:"] = "Homepage:";
-App::$strings["Online Now"] = "gerade online";
-App::$strings["Like this channel"] = "Dieser Kanal gefällt mir";
-App::$strings["j F, Y"] = "j. F Y";
-App::$strings["j F"] = "j. F";
-App::$strings["Birthday:"] = "Geburtstag:";
-App::$strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s";
-App::$strings["Sexual Preference:"] = "Sexuelle Orientierung:";
-App::$strings["Tags:"] = "Schlagworte:";
-App::$strings["Political Views:"] = "Politische Ansichten:";
-App::$strings["Religion:"] = "Religion:";
-App::$strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
-App::$strings["Likes:"] = "Gefällt:";
-App::$strings["Dislikes:"] = "Gefällt nicht:";
-App::$strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
-App::$strings["My other channels:"] = "Meine anderen Kanäle:";
-App::$strings["Musical interests:"] = "Musikalische Interessen:";
-App::$strings["Books, literature:"] = "Bücher, Literatur:";
-App::$strings["Television:"] = "Fernsehen:";
-App::$strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:";
-App::$strings["Love/Romance:"] = "Liebe/Romantik:";
-App::$strings["Work/employment:"] = "Arbeit/Anstellung:";
-App::$strings["School/education:"] = "Schule/Ausbildung:";
-App::$strings["Like this thing"] = "Gefällt mir";
-App::$strings["New Page"] = "Neue Seite";
-App::$strings["%d invitation available"] = array(
-	0 => "%d Einladung verfügbar",
-	1 => "%d Einladungen verfügbar",
-);
-App::$strings["Find Channels"] = "Finde Kanäle";
-App::$strings["Enter name or interest"] = "Name oder Interessen eingeben";
-App::$strings["Connect/Follow"] = "Verbinden/Folgen";
-App::$strings["Examples: Robert Morgenstein, Fishing"] = "Beispiele: Robert Morgenstein, Angeln";
-App::$strings["Random Profile"] = "Zufallsprofil";
-App::$strings["Invite Friends"] = "Lade Freunde ein";
-App::$strings["Advanced example: name=fred and country=iceland"] = "Fortgeschrittenes Beispiel: name=fred and country=iceland";
-App::$strings["%d connection in common"] = array(
-	0 => "%d gemeinsame Verbindung",
-	1 => "%d gemeinsame Verbindungen",
-);
-App::$strings["show more"] = "mehr zeigen";
-App::$strings["Delete this item?"] = "Dieses Element löschen?";
-App::$strings["%s show less"] = "%s weniger anzeigen";
-App::$strings["%s expand"] = "%s aufklappen";
-App::$strings["%s collapse"] = "%s einklappen";
-App::$strings["Password too short"] = "Kennwort zu kurz";
-App::$strings["Passwords do not match"] = "Kennwörter stimmen nicht überein";
-App::$strings["everybody"] = "alle";
-App::$strings["Secret Passphrase"] = "geheime Passphrase";
-App::$strings["Passphrase hint"] = "Hinweis zur Passphrase";
-App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert.";
-App::$strings["close all"] = "Alle schließen";
-App::$strings["Nothing new here"] = "Nichts Neues hier";
-App::$strings["Rate This Channel (this is public)"] = "Diesen Kanal bewerten (öffentlich sichtbar)";
-App::$strings["Describe (optional)"] = "Beschreibung (optional)";
-App::$strings["Please enter a link URL"] = "Gib eine URL ein:";
-App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlassen möchtest?";
-App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo";
-App::$strings["timeago.prefixFromNow"] = " ";
-App::$strings["ago"] = "her";
-App::$strings["from now"] = "von jetzt";
-App::$strings["less than a minute"] = "weniger als eine Minute";
-App::$strings["about a minute"] = "ungefähr eine Minute";
-App::$strings["%d minutes"] = "%d Minuten";
-App::$strings["about an hour"] = "ungefähr eine Stunde";
-App::$strings["about %d hours"] = "ungefähr %d Stunden";
-App::$strings["a day"] = "ein Tag";
-App::$strings["%d days"] = "%d Tage";
-App::$strings["about a month"] = "ungefähr ein Monat";
-App::$strings["%d months"] = "%d Monate";
-App::$strings["about a year"] = "ungefähr ein Jahr";
-App::$strings["%d years"] = "%d Jahre";
-App::$strings[" "] = " ";
-App::$strings["timeago.numbers"] = "timeago.numbers";
-App::$strings["January"] = "Januar";
-App::$strings["February"] = "Februar";
-App::$strings["March"] = "März";
-App::$strings["April"] = "April";
-App::$strings["__ctx:long__ May"] = "Mai";
-App::$strings["June"] = "Juni";
-App::$strings["July"] = "Juli";
-App::$strings["August"] = "August";
-App::$strings["September"] = "September";
-App::$strings["October"] = "Oktober";
-App::$strings["November"] = "November";
-App::$strings["December"] = "Dezember";
-App::$strings["Jan"] = "Jan";
-App::$strings["Feb"] = "Feb";
-App::$strings["Mar"] = "Mär";
-App::$strings["Apr"] = "Apr";
-App::$strings["__ctx:short__ May"] = "Mai";
-App::$strings["Jun"] = "Jun";
-App::$strings["Jul"] = "Jul";
-App::$strings["Aug"] = "Aug";
-App::$strings["Sep"] = "Sep";
-App::$strings["Oct"] = "Okt";
-App::$strings["Nov"] = "Nov";
-App::$strings["Dec"] = "Dez";
-App::$strings["Sunday"] = "Sonntag";
-App::$strings["Monday"] = "Montag";
-App::$strings["Tuesday"] = "Dienstag";
-App::$strings["Wednesday"] = "Mittwoch";
-App::$strings["Thursday"] = "Donnerstag";
-App::$strings["Friday"] = "Freitag";
-App::$strings["Saturday"] = "Samstag";
-App::$strings["Sun"] = "So";
-App::$strings["Mon"] = "Mo";
-App::$strings["Tue"] = "Di";
-App::$strings["Wed"] = "Mi";
-App::$strings["Thu"] = "Do";
-App::$strings["Fri"] = "Fr";
-App::$strings["Sat"] = "Sa";
-App::$strings["__ctx:calendar__ today"] = "heute";
-App::$strings["__ctx:calendar__ month"] = "Monat";
-App::$strings["__ctx:calendar__ week"] = "Woche";
-App::$strings["__ctx:calendar__ day"] = "Tag";
-App::$strings["__ctx:calendar__ All day"] = "Ganztägig";
+App::$strings["Discover"] = "Entdecken";
+App::$strings["Imported public streams"] = "Importierte öffentliche Beiträge";
+App::$strings["Commented Order"] = "Neueste Kommentare";
+App::$strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert";
+App::$strings["Posted Order"] = "Neueste Beiträge";
+App::$strings["Sort by Post Date"] = "Nach Beitragsdatum sortiert";
+App::$strings["Posts that mention or involve you"] = "Beiträge mit Beteiligung Deinerseits";
+App::$strings["Activity Stream - by date"] = "Activity Stream – nach Datum sortiert";
+App::$strings["Starred"] = "Markiert";
+App::$strings["Favourite Posts"] = "Markierte Beiträge";
+App::$strings["Spam"] = "Spam";
+App::$strings["Posts flagged as SPAM"] = "Nachrichten, die als SPAM markiert wurden";
+App::$strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
+App::$strings["Profile Details"] = "Profil-Details";
+App::$strings["Photo Albums"] = "Fotoalben";
+App::$strings["Files and Storage"] = "Dateien und Speicher";
+App::$strings["Bookmarks"] = "Lesezeichen";
+App::$strings["Saved Bookmarks"] = "Gespeicherte Lesezeichen";
+App::$strings["View Webpages"] = "Webseiten anzeigen";
+App::$strings["__ctx:noun__ Attending"] = array(
+	0 => "Zusage",
+	1 => "Zusagen",
+);
+App::$strings["__ctx:noun__ Not Attending"] = array(
+	0 => "Absage",
+	1 => "Absagen",
+);
+App::$strings["__ctx:noun__ Undecided"] = array(
+	0 => " Unentschlossen",
+	1 => "Unentschlossene",
+);
+App::$strings["__ctx:noun__ Agree"] = array(
+	0 => "Zustimmung",
+	1 => "Zustimmungen",
+);
+App::$strings["__ctx:noun__ Disagree"] = array(
+	0 => "Ablehnung",
+	1 => "Ablehnungen",
+);
+App::$strings["__ctx:noun__ Abstain"] = array(
+	0 => "Enthaltung",
+	1 => "Enthaltungen",
+);
+App::$strings["Can view my normal stream and posts"] = "Kann meine normalen Beiträge sehen";
+App::$strings["Can view my webpages"] = "Kann meine Webseiten sehen";
+App::$strings["Can post on my channel page (\"wall\")"] = "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen";
+App::$strings["Can like/dislike stuff"] = "Kann andere Elemente mögen/nicht mögen";
+App::$strings["Profiles and things other than posts/comments"] = "Profile und alles außer Beiträge und Kommentare";
+App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten";
+App::$strings["Advanced - useful for creating group forum channels"] = "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen";
+App::$strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
+App::$strings["Can write to my file storage and photos"] = "Kann in meine Datei- und Bilderordner schreiben";
+App::$strings["Can edit my webpages"] = "Kann meine Webseiten bearbeiten";
+App::$strings["Somewhat advanced - very useful in open communities"] = "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften";
+App::$strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
+App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust";
 App::$strings["Directory Options"] = "Verzeichnisoptionen";
 App::$strings["Safe Mode"] = "Sicherer Modus";
 App::$strings["Public Forums Only"] = "Nur öffentliche Foren";
 App::$strings["This Website Only"] = "Nur dieser Hub";
-App::$strings["Item was not found."] = "Beitrag wurde nicht gefunden.";
-App::$strings["No source file."] = "Keine Quelldatei.";
-App::$strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden";
-App::$strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden";
-App::$strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d";
-App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht.";
-App::$strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
-App::$strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
-App::$strings["Path not available."] = "Pfad nicht verfügbar.";
-App::$strings["Empty pathname"] = "Leere Pfadangabe";
-App::$strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
-App::$strings["Path not found."] = "Pfad nicht gefunden.";
-App::$strings["mkdir failed."] = "mkdir fehlgeschlagen.";
-App::$strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
-App::$strings["Empty path"] = "Leere Pfadangabe";
-App::$strings["view full size"] = "In Vollbildansicht anschauen";
-App::$strings["No Subject"] = "Kein Betreff";
-App::$strings["OStatus"] = "OStatus";
-App::$strings["GNU-Social"] = "GNU-Social";
-App::$strings["RSS/Atom"] = "RSS/Atom";
-App::$strings["Facebook"] = "Facebook";
-App::$strings["Zot"] = "Zot!";
-App::$strings["LinkedIn"] = "LinkedIn";
-App::$strings["XMPP/IM"] = "XMPP/IM";
-App::$strings["MySpace"] = "MySpace";
-App::$strings[" by "] = "von";
-App::$strings[" on "] = "am";
-App::$strings["Embedded content"] = "Eingebetteter Inhalt";
-App::$strings["Embedding disabled"] = "Einbetten deaktiviert";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Webseitenlimit von %lu Bytes";
-App::$strings["Image file is empty."] = "Bilddatei ist leer.";
-App::$strings["Photo storage failed."] = "Fotospeicherung fehlgeschlagen.";
-App::$strings["a new photo"] = "ein neues Foto";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s hat %2\$s auf %3\$s veröffentlicht";
-App::$strings["Upload New Photos"] = "Neue Fotos hochladen";
+App::$strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen";
+App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen.";
+App::$strings["Cloned channel not found. Import failed."] = "Geklonter Kanal nicht gefunden. Import fehlgeschlagen.";
 App::$strings["prev"] = "vorherige";
 App::$strings["first"] = "erste";
 App::$strings["last"] = "letzte";
@@ -2862,11 +2611,30 @@ App::$strings["depressed"] = "deprimiert";
 App::$strings["motivated"] = "motiviert";
 App::$strings["relaxed"] = "entspannt";
 App::$strings["surprised"] = "überrascht";
+App::$strings["Monday"] = "Montag";
+App::$strings["Tuesday"] = "Dienstag";
+App::$strings["Wednesday"] = "Mittwoch";
+App::$strings["Thursday"] = "Donnerstag";
+App::$strings["Friday"] = "Freitag";
+App::$strings["Saturday"] = "Samstag";
+App::$strings["Sunday"] = "Sonntag";
+App::$strings["January"] = "Januar";
+App::$strings["February"] = "Februar";
+App::$strings["March"] = "März";
+App::$strings["April"] = "April";
 App::$strings["May"] = "Mai";
+App::$strings["June"] = "Juni";
+App::$strings["July"] = "Juli";
+App::$strings["August"] = "August";
+App::$strings["September"] = "September";
+App::$strings["October"] = "Oktober";
+App::$strings["November"] = "November";
+App::$strings["December"] = "Dezember";
 App::$strings["Unknown Attachment"] = "Unbekannter Anhang";
 App::$strings["unknown"] = "unbekannt";
 App::$strings["remove category"] = "Kategorie entfernen";
 App::$strings["remove from file"] = "aus der Datei entfernen";
+App::$strings["default"] = "Standard";
 App::$strings["Page layout"] = "Seiten-Layout";
 App::$strings["You can create your own with the layouts tool"] = "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen";
 App::$strings["Page content type"] = "Art des Seiteninhalts";
@@ -2888,48 +2656,27 @@ App::$strings["Export to cloud files"] = "In Cloud-Dateien exportieren";
 App::$strings["/path/to/export/folder"] = "/Pfad/zum/exportierenden/Ordner";
 App::$strings["Enter a path to a cloud files destination."] = "Gib den Pfad zu einem Datei-Speicherort in der Cloud ein.";
 App::$strings["Specify folder"] = "Ordner angeben";
-App::$strings["Remote authentication"] = "Über Konto auf anderem Server einloggen";
-App::$strings["Click to authenticate to your home hub"] = "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren";
-App::$strings["Logout"] = "Abmelden";
-App::$strings["End this session"] = "Beende diese Sitzung";
-App::$strings["Your profile page"] = "Deine Profilseite";
-App::$strings["Manage/Edit profiles"] = "Profile verwalten";
-App::$strings["Edit your profile"] = "Profil bearbeiten";
-App::$strings["Sign in"] = "Anmelden";
-App::$strings["Get me home"] = "Bringe mich nach Hause (eigener Kanal)";
-App::$strings["Log me out of this site"] = "Logge mich von dieser Seite aus";
-App::$strings["Create an account"] = "Erzeuge ein Konto";
-App::$strings["Help and documentation"] = "Hilfe und Dokumentation";
-App::$strings["Applications, utilities, links, games"] = "Anwendungen (Apps), Zubehör, Links, Spiele";
-App::$strings["Search site @name, #tag, ?docs, content"] = "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt";
-App::$strings["Channel Directory"] = "Kanal-Verzeichnis";
-App::$strings["Your grid"] = "Dein Grid";
-App::$strings["View your network/grid"] = "Zeige Dein Netzwerk/Grid an";
-App::$strings["Mark all grid notifications seen"] = "Alle Grid-Benachrichtigungen als angesehen markieren";
-App::$strings["Channel home"] = "Mein Kanal";
-App::$strings["View your channel home"] = "Zeige Deine Kanalseite an";
-App::$strings["Mark all channel notifications seen"] = "Markiere alle Kanal-Benachrichtigungen als angesehen";
-App::$strings["Notices"] = "Benachrichtigungen";
-App::$strings["Notifications"] = "Benachrichtigungen";
-App::$strings["View all notifications"] = "Alle Benachrichtigungen ansehen";
-App::$strings["Private mail"] = "Persönliche Mail";
-App::$strings["View your private messages"] = "Zeige Deine persönlichen Nachrichten an";
-App::$strings["Mark all private messages seen"] = "Markiere alle persönlichen Nachrichten als gesehen";
-App::$strings["Event Calendar"] = "Terminkalender";
-App::$strings["View events"] = "Termine ansehen";
-App::$strings["Mark all events seen"] = "Markiere alle Termine als gesehen";
-App::$strings["Manage Your Channels"] = "Verwalte Deine Kanäle";
-App::$strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen";
-App::$strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
-App::$strings["Documentation"] = "Dokumentation";
-App::$strings["@name, #tag, ?doc, content"] = "@Name, #Schlagwort, ?Dokumentation, Inhalt";
-App::$strings["Please wait..."] = "Bitte warten...";
-App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen.";
-App::$strings["Channel clone failed. Import failed."] = "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen.";
-App::$strings["Cloned channel not found. Import failed."] = "Geklonter Kanal nicht gefunden. Import fehlgeschlagen.";
-App::$strings["Unable to import element \""] = "Element konnte nicht importiert werden.";
-App::$strings["Logged out."] = "Ausgeloggt.";
-App::$strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
+App::$strings["%d invitation available"] = array(
+	0 => "%d Einladung verfügbar",
+	1 => "%d Einladungen verfügbar",
+);
+App::$strings["Find Channels"] = "Finde Kanäle";
+App::$strings["Enter name or interest"] = "Name oder Interessen eingeben";
+App::$strings["Connect/Follow"] = "Verbinden/Folgen";
+App::$strings["Examples: Robert Morgenstein, Fishing"] = "Beispiele: Robert Morgenstein, Angeln";
+App::$strings["Random Profile"] = "Zufallsprofil";
+App::$strings["Invite Friends"] = "Lade Freunde ein";
+App::$strings["Advanced example: name=fred and country=iceland"] = "Fortgeschrittenes Beispiel: name=fred and country=iceland";
+App::$strings["%d connection in common"] = array(
+	0 => "%d gemeinsame Verbindung",
+	1 => "%d gemeinsame Verbindungen",
+);
+App::$strings["show more"] = "mehr zeigen";
+App::$strings["Attachments:"] = "Anhänge:";
+App::$strings["l F d, Y \\@ g:i A"] = "l, d. F Y, H:i";
+App::$strings["\$Projectname event notification:"] = "";
+App::$strings["Starts:"] = "Beginnt:";
+App::$strings["Finishes:"] = "Endet:";
 App::$strings["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert ";
 App::$strings["Channel location missing."] = "Adresse des Kanals fehlt.";
 App::$strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
@@ -2937,33 +2684,90 @@ App::$strings["Channel was deleted and no longer exists."] = "Kanal wurde gelös
 App::$strings["Protocol disabled."] = "Protokoll deaktiviert.";
 App::$strings["Channel discovery failed."] = "Kanalsuche fehlgeschlagen";
 App::$strings["Cannot connect to yourself."] = "Du kannst Dich nicht mit Dir selbst verbinden.";
-App::$strings[" and "] = "und";
-App::$strings["public profile"] = "öffentliches Profil";
-App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s hat %2\$s auf &ldquo;%3\$s&rdquo; geändert";
-App::$strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s";
-App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat ein aktualisiertes %2\$s, %3\$s wurde verändert.";
-App::$strings["Image/photo"] = "Bild/Foto";
-App::$strings["Encrypted content"] = "Verschlüsselter Inhalt";
-App::$strings["Install %s element: "] = "Element %s installieren: ";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
-App::$strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
-App::$strings["spoiler"] = "Spoiler";
-App::$strings["$1 wrote:"] = "$1 schrieb:";
-App::$strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen";
-App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Es hat früher schon einmal eine Gruppe mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Gruppe den Zugriff erlauben. Wenn das nicht Deine Absicht ist, erstelle bitte eine neue Gruppe mit einem anderen Namen.";
-App::$strings["Add new connections to this privacy group"] = "Neue Verbindung zu dieser Gruppe hinzufügen";
-App::$strings["edit"] = "Bearbeiten";
-App::$strings["Privacy Groups"] = "Gruppen";
-App::$strings["Edit group"] = "Gruppe ändern";
-App::$strings["Add privacy group"] = "Gruppe hinzufügen";
-App::$strings["Channels not in any privacy group"] = "Kanäle, die in keiner Gruppe sind";
-App::$strings["This event has been added to your calendar."] = "Dieser Termin wurde zu Deinem Kalender hinzugefügt";
-App::$strings["Not specified"] = "Keine Angabe";
-App::$strings["Needs Action"] = "Aktion erforderlich";
-App::$strings["Completed"] = "Abgeschlossen";
-App::$strings["In Process"] = "In Bearbeitung";
-App::$strings["Cancelled"] = "gestrichen";
+App::$strings["Delete this item?"] = "Dieses Element löschen?";
+App::$strings["%s show less"] = "%s weniger anzeigen";
+App::$strings["%s expand"] = "%s aufklappen";
+App::$strings["%s collapse"] = "%s einklappen";
+App::$strings["Password too short"] = "Kennwort zu kurz";
+App::$strings["Passwords do not match"] = "Kennwörter stimmen nicht überein";
+App::$strings["everybody"] = "alle";
+App::$strings["Secret Passphrase"] = "geheime Passphrase";
+App::$strings["Passphrase hint"] = "Hinweis zur Passphrase";
+App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert.";
+App::$strings["close all"] = "Alle schließen";
+App::$strings["Nothing new here"] = "Nichts Neues hier";
+App::$strings["Rate This Channel (this is public)"] = "Diesen Kanal bewerten (öffentlich sichtbar)";
+App::$strings["Describe (optional)"] = "Beschreibung (optional)";
+App::$strings["Please enter a link URL"] = "Gib eine URL ein:";
+App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlassen möchtest?";
+App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo";
+App::$strings["timeago.prefixFromNow"] = " ";
+App::$strings["ago"] = "her";
+App::$strings["from now"] = "von jetzt";
+App::$strings["less than a minute"] = "weniger als eine Minute";
+App::$strings["about a minute"] = "ungefähr eine Minute";
+App::$strings["%d minutes"] = "%d Minuten";
+App::$strings["about an hour"] = "ungefähr eine Stunde";
+App::$strings["about %d hours"] = "ungefähr %d Stunden";
+App::$strings["a day"] = "ein Tag";
+App::$strings["%d days"] = "%d Tage";
+App::$strings["about a month"] = "ungefähr ein Monat";
+App::$strings["%d months"] = "%d Monate";
+App::$strings["about a year"] = "ungefähr ein Jahr";
+App::$strings["%d years"] = "%d Jahre";
+App::$strings[" "] = " ";
+App::$strings["timeago.numbers"] = "timeago.numbers";
+App::$strings["__ctx:long__ May"] = "Mai";
+App::$strings["Jan"] = "Jan";
+App::$strings["Feb"] = "Feb";
+App::$strings["Mar"] = "Mär";
+App::$strings["Apr"] = "Apr";
+App::$strings["__ctx:short__ May"] = "Mai";
+App::$strings["Jun"] = "Jun";
+App::$strings["Jul"] = "Jul";
+App::$strings["Aug"] = "Aug";
+App::$strings["Sep"] = "Sep";
+App::$strings["Oct"] = "Okt";
+App::$strings["Nov"] = "Nov";
+App::$strings["Dec"] = "Dez";
+App::$strings["Sun"] = "So";
+App::$strings["Mon"] = "Mo";
+App::$strings["Tue"] = "Di";
+App::$strings["Wed"] = "Mi";
+App::$strings["Thu"] = "Do";
+App::$strings["Fri"] = "Fr";
+App::$strings["Sat"] = "Sa";
+App::$strings["__ctx:calendar__ today"] = "heute";
+App::$strings["__ctx:calendar__ month"] = "Monat";
+App::$strings["__ctx:calendar__ week"] = "Woche";
+App::$strings["__ctx:calendar__ day"] = "Tag";
+App::$strings["__ctx:calendar__ All day"] = "Ganztägig";
+App::$strings["Unable to determine sender."] = "Kann Absender nicht bestimmen.";
+App::$strings["No recipient provided."] = "Kein Empfänger angegeben";
+App::$strings["[no subject]"] = "[no subject]";
+App::$strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden.";
+App::$strings[" and "] = "und";
+App::$strings["public profile"] = "öffentliches Profil";
+App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s hat %2\$s auf &ldquo;%3\$s&rdquo; geändert";
+App::$strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s";
+App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat ein aktualisiertes %2\$s, %3\$s wurde verändert.";
+App::$strings["Item was not found."] = "Beitrag wurde nicht gefunden.";
+App::$strings["No source file."] = "Keine Quelldatei.";
+App::$strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden";
+App::$strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden";
+App::$strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d";
+App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht.";
+App::$strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
+App::$strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
+App::$strings["Path not available."] = "Pfad nicht verfügbar.";
+App::$strings["Empty pathname"] = "Leere Pfadangabe";
+App::$strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
+App::$strings["Path not found."] = "Pfad nicht gefunden.";
+App::$strings["mkdir failed."] = "mkdir fehlgeschlagen.";
+App::$strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
+App::$strings["Empty path"] = "Leere Pfadangabe";
+App::$strings["guest:"] = "Gast:";
+App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
 App::$strings["(Unknown)"] = "(Unbekannt)";
 App::$strings["Visible to anybody on the internet."] = "Für jeden im Internet sichtbar.";
 App::$strings["Visible to you only."] = "Nur für Dich sichtbar.";
@@ -2980,19 +2784,82 @@ App::$strings["profile photo"] = "Profilfoto";
 App::$strings["[Edited %s]"] = "[%s wurde bearbeitet]";
 App::$strings["__ctx:edit_activity__ Post"] = "Beitrag";
 App::$strings["__ctx:edit_activity__ Comment"] = "Kommentar";
-App::$strings["Can view my normal stream and posts"] = "Kann meine normalen Beiträge sehen";
-App::$strings["Can view my webpages"] = "Kann meine Webseiten sehen";
-App::$strings["Can post on my channel page (\"wall\")"] = "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen";
-App::$strings["Can like/dislike stuff"] = "Kann andere Elemente mögen/nicht mögen";
-App::$strings["Profiles and things other than posts/comments"] = "Profile und alles außer Beiträge und Kommentare";
-App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten";
-App::$strings["Advanced - useful for creating group forum channels"] = "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen";
-App::$strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
-App::$strings["Can write to my file storage and photos"] = "Kann in meine Datei- und Bilderordner schreiben";
-App::$strings["Can edit my webpages"] = "Kann meine Webseiten bearbeiten";
-App::$strings["Somewhat advanced - very useful in open communities"] = "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften";
-App::$strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
-App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust";
+App::$strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
+App::$strings["Empty name"] = "Namensfeld leer";
+App::$strings["Name too long"] = "Name ist zu lang";
+App::$strings["No account identifier"] = "Keine Account-Kennung";
+App::$strings["Nickname is required."] = "Spitzname ist erforderlich.";
+App::$strings["Reserved nickname. Please choose another."] = "Reservierter Kurzname. Bitte wähle einen anderen.";
+App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
+App::$strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
+App::$strings["Default Profile"] = "Standard-Profil";
+App::$strings["Create New Profile"] = "Neues Profil erstellen";
+App::$strings["Visible to everybody"] = "Für jeden sichtbar";
+App::$strings["Gender:"] = "Geschlecht:";
+App::$strings["Homepage:"] = "Homepage:";
+App::$strings["Online Now"] = "gerade online";
+App::$strings["Like this channel"] = "Dieser Kanal gefällt mir";
+App::$strings["j F, Y"] = "j. F Y";
+App::$strings["j F"] = "j. F";
+App::$strings["Birthday:"] = "Geburtstag:";
+App::$strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s";
+App::$strings["Sexual Preference:"] = "Sexuelle Orientierung:";
+App::$strings["Tags:"] = "Schlagworte:";
+App::$strings["Political Views:"] = "Politische Ansichten:";
+App::$strings["Religion:"] = "Religion:";
+App::$strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
+App::$strings["Likes:"] = "Gefällt:";
+App::$strings["Dislikes:"] = "Gefällt nicht:";
+App::$strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
+App::$strings["My other channels:"] = "Meine anderen Kanäle:";
+App::$strings["Musical interests:"] = "Musikalische Interessen:";
+App::$strings["Books, literature:"] = "Bücher, Literatur:";
+App::$strings["Television:"] = "Fernsehen:";
+App::$strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:";
+App::$strings["Love/Romance:"] = "Liebe/Romantik:";
+App::$strings["Work/employment:"] = "Arbeit/Anstellung:";
+App::$strings["School/education:"] = "Schule/Ausbildung:";
+App::$strings["Like this thing"] = "Gefällt mir";
+App::$strings["User '%s' deleted"] = "Benutzer '%s' gelöscht";
+App::$strings["This event has been added to your calendar."] = "Dieser Termin wurde zu Deinem Kalender hinzugefügt";
+App::$strings["Not specified"] = "Keine Angabe";
+App::$strings["Needs Action"] = "Aktion erforderlich";
+App::$strings["Completed"] = "Abgeschlossen";
+App::$strings["In Process"] = "In Bearbeitung";
+App::$strings["Cancelled"] = "gestrichen";
+App::$strings["view full size"] = "In Vollbildansicht anschauen";
+App::$strings["No Subject"] = "Kein Betreff";
+App::$strings["Friendica"] = "Friendica";
+App::$strings["OStatus"] = "OStatus";
+App::$strings["GNU-Social"] = "GNU-Social";
+App::$strings["RSS/Atom"] = "RSS/Atom";
+App::$strings["Diaspora"] = "Diaspora";
+App::$strings["Facebook"] = "Facebook";
+App::$strings["Zot"] = "Zot!";
+App::$strings["LinkedIn"] = "LinkedIn";
+App::$strings["XMPP/IM"] = "XMPP/IM";
+App::$strings["MySpace"] = "MySpace";
+App::$strings["New Page"] = "Neue Seite";
+App::$strings["Select an alternate language"] = "Wähle eine alternative Sprache";
+App::$strings["Who can see this?"] = "Wer kann das sehen?";
+App::$strings["Custom selection"] = "Benutzerdefinierte Auswahl";
+App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Wähle \"Anzeigen\", um Betrachtung zuzulassen. \"Nicht anzeigen\" überstimmt und limitiert den Aktionsradius von \"Anzeigen\" für Ausnahmen.";
+App::$strings["Show"] = "Anzeigen";
+App::$strings["Don't show"] = "Nicht anzeigen";
+App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.<br />Diese Berechtigungen bestimmen, wer den Beitrag sehen kann.";
+App::$strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden";
+App::$strings["Image/photo"] = "Bild/Foto";
+App::$strings["Encrypted content"] = "Verschlüsselter Inhalt";
+App::$strings["Install %s element: "] = "Element %s installieren: ";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren.";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
+App::$strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
+App::$strings["spoiler"] = "Spoiler";
+App::$strings["$1 wrote:"] = "$1 schrieb:";
+App::$strings[" by "] = "von";
+App::$strings[" on "] = "am";
+App::$strings["Embedded content"] = "Eingebetteter Inhalt";
+App::$strings["Embedding disabled"] = "Einbetten deaktiviert";
 App::$strings["General Features"] = "Allgemeine Funktionen";
 App::$strings["Multiple Profiles"] = "Mehrfachprofile";
 App::$strings["Ability to create multiple profiles"] = "Ermöglicht das Anlegen mehrerer Profile pro Kanal";
@@ -3015,7 +2882,7 @@ App::$strings["Provide alternate connection permission roles."] = "Stelle benutz
 App::$strings["Smart Birthdays"] = "Smarte Geburtstage";
 App::$strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "Stellt für Geburtstage einen Zeitzonenbezug her, falls deine Freunde über den ganzen Planeten verstreut sind.";
 App::$strings["Event Timezone Selection"] = "Termin-Zeitzonenauswahl";
-App::$strings["Allow event creation in timezones other than your own."] = "";
+App::$strings["Allow event creation in timezones other than your own."] = "Ermögliche das Erstellen von Terminen in anderen Zeitzonen als Deiner eigenen.";
 App::$strings["Advanced Directory Search"] = "Erweiterte Verzeichnissuche";
 App::$strings["Allows creation of complex directory search queries"] = "Ermöglicht die Erstellung komplexer Verzeichnis-Suchabfragen";
 App::$strings["Advanced Theme and Layout Settings"] = "Erweiterte Design- und Layout-Einstellungen";
@@ -3039,6 +2906,7 @@ App::$strings["Prevent posts with identical content to be published with less th
 App::$strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter";
 App::$strings["Search by Date"] = "Suche nach Datum";
 App::$strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen";
+App::$strings["Privacy Groups"] = "Gruppen";
 App::$strings["Enable management and selection of privacy groups"] = "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren";
 App::$strings["Save search terms for re-use"] = "Ermöglicht das Abspeichern von Suchbegriffen zur Wiederverwendung";
 App::$strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter";
@@ -3066,51 +2934,118 @@ App::$strings["Tag Cloud"] = "Schlagwort-Wolke";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Aktiviert die Anzeige einer Schlagwort-Wolke (Tag Cloud) auf Deiner Kanal-Seite";
 App::$strings["Premium Channel"] = "Premium-Kanal";
 App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen";
+App::$strings["Tags"] = "Schlagwörter";
+App::$strings["Keywords"] = "Schlüsselwörter";
+App::$strings["have"] = "habe";
+App::$strings["has"] = "hat";
+App::$strings["want"] = "will";
+App::$strings["wants"] = "will";
+App::$strings["likes"] = "gefällt";
+App::$strings["dislikes"] = "missfällt";
+App::$strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
+App::$strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist auf dieser Seite nicht erlaubt";
+App::$strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
+App::$strings["An invitation is required."] = "Eine Einladung wird benötigt.";
+App::$strings["Invitation could not be verified."] = "Die Einladung konnte nicht bestätigt werden.";
+App::$strings["Please enter the required information."] = "Bitte gib die benötigten Informationen ein.";
+App::$strings["Failed to store account information."] = "Speichern der Nutzerkontodaten fehlgeschlagen.";
+App::$strings["Registration confirmation for %s"] = "Registrierungsbestätigung für %s";
+App::$strings["Registration request at %s"] = "Registrierungsanfrage auf %s";
+App::$strings["your registration password"] = "Dein Registrierungspasswort";
+App::$strings["Registration details for %s"] = "Registrierungsdetails für %s";
+App::$strings["Account approved."] = "Nutzerkonto bestätigt.";
+App::$strings["Registration revoked for %s"] = "Registrierung für %s wurde widerrufen";
+App::$strings["Click here to upgrade."] = "Klicke hier, um das Upgrade durchzuführen.";
+App::$strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Grenzen Ihres Abonnements.";
+App::$strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar.";
+App::$strings["Birthday"] = "Geburtstag";
+App::$strings["Age: "] = "Alter:";
+App::$strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-TT oder MM-TT";
+App::$strings["less than a second ago"] = "Vor weniger als einer Sekunde";
+App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "vor %1\$d %2\$s";
+App::$strings["__ctx:relative_date__ year"] = array(
+	0 => "Jahr",
+	1 => "Jahre",
+);
+App::$strings["__ctx:relative_date__ month"] = array(
+	0 => "Monat",
+	1 => "Monate",
+);
+App::$strings["__ctx:relative_date__ week"] = array(
+	0 => "Woche",
+	1 => "Wochen",
+);
+App::$strings["__ctx:relative_date__ day"] = array(
+	0 => "Tag",
+	1 => "Tage",
+);
+App::$strings["__ctx:relative_date__ hour"] = array(
+	0 => "Stunde",
+	1 => "Stunden",
+);
+App::$strings["__ctx:relative_date__ minute"] = array(
+	0 => "Minute",
+	1 => "Minuten",
+);
+App::$strings["__ctx:relative_date__ second"] = array(
+	0 => "Sekunde",
+	1 => "Sekunden",
+);
+App::$strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
+App::$strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
+App::$strings["Remote authentication"] = "Über Konto auf anderem Server einloggen";
+App::$strings["Click to authenticate to your home hub"] = "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren";
+App::$strings["End this session"] = "Beende diese Sitzung";
+App::$strings["Your profile page"] = "Deine Profilseite";
+App::$strings["Manage/Edit profiles"] = "Profile verwalten";
+App::$strings["Edit your profile"] = "Profil bearbeiten";
+App::$strings["Sign in"] = "Anmelden";
+App::$strings["Take me home"] = "Bringe mich nach Hause (eigener Kanal)";
+App::$strings["Log me out of this site"] = "Logge mich von dieser Seite aus";
+App::$strings["Create an account"] = "Erzeuge ein Konto";
+App::$strings["Help and documentation"] = "Hilfe und Dokumentation";
+App::$strings["Search site @name, #tag, ?docs, content"] = "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt";
+App::$strings["Grid"] = "Grid";
+App::$strings["Your grid"] = "Dein Grid";
+App::$strings["View your network/grid"] = "Zeige Dein Netzwerk/Grid an";
+App::$strings["Mark all grid notifications seen"] = "Alle Grid-Benachrichtigungen als angesehen markieren";
+App::$strings["Channel home"] = "Mein Kanal";
+App::$strings["View your channel home"] = "Zeige Deine Kanalseite an";
+App::$strings["Mark all channel notifications seen"] = "Markiere alle Kanal-Benachrichtigungen als angesehen";
+App::$strings["Notices"] = "Benachrichtigungen";
+App::$strings["Notifications"] = "Benachrichtigungen";
+App::$strings["View all notifications"] = "Alle Benachrichtigungen ansehen";
+App::$strings["Private mail"] = "Persönliche Mail";
+App::$strings["View your private messages"] = "Zeige Deine persönlichen Nachrichten an";
+App::$strings["Mark all private messages seen"] = "Markiere alle persönlichen Nachrichten als gesehen";
+App::$strings["Event Calendar"] = "Terminkalender";
+App::$strings["View events"] = "Termine ansehen";
+App::$strings["Mark all events seen"] = "Markiere alle Termine als gesehen";
+App::$strings["Manage Your Channels"] = "Verwalte Deine Kanäle";
+App::$strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen";
+App::$strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
+App::$strings["@name, #tag, ?doc, content"] = "@Name, #Schlagwort, ?Dokumentation, Inhalt";
+App::$strings["Please wait..."] = "Bitte warten...";
+App::$strings["Add Apps"] = "Apps hinzufügen";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Webseitenlimit von %lu Bytes";
+App::$strings["Image file is empty."] = "Bilddatei ist leer.";
+App::$strings["Photo storage failed."] = "Fotospeicherung fehlgeschlagen.";
+App::$strings["a new photo"] = "ein neues Foto";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s hat %2\$s auf %3\$s veröffentlicht";
+App::$strings["Upload New Photos"] = "Neue Fotos hochladen";
+App::$strings["Invalid data packet"] = "Ungültiges Datenpaket";
+App::$strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
+App::$strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
+App::$strings["invalid target signature"] = "Ungültige Signatur des Ziels";
+App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Es hat früher schon einmal eine Gruppe mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Gruppe den Zugriff erlauben. Wenn das nicht Deine Absicht ist, erstelle bitte eine neue Gruppe mit einem anderen Namen.";
+App::$strings["Add new connections to this privacy group"] = "Neue Verbindung zu dieser Gruppe hinzufügen";
+App::$strings["edit"] = "Bearbeiten";
+App::$strings["Edit group"] = "Gruppe ändern";
+App::$strings["Add privacy group"] = "Gruppe hinzufügen";
+App::$strings["Channels not in any privacy group"] = "Kanäle, die in keiner Gruppe sind";
+App::$strings["New window"] = "Neues Fenster";
+App::$strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browserfenster oder Tab";
+App::$strings["Logged out."] = "Ausgeloggt.";
+App::$strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
 App::$strings["Help:"] = "Hilfe:";
 App::$strings["Not Found"] = "Nicht gefunden";
-App::$strings["Source channel not found."] = "Quellkanal nicht gefunden.";
-App::$strings["Focus (Hubzilla default)"] = "Focus (Voreinstellung für Hubzilla)";
-App::$strings["Theme settings"] = "Theme-Einstellungen";
-App::$strings["Narrow navbar"] = "Schmale Navigationsleiste";
-App::$strings["Navigation bar background color"] = "Hintergrundfarbe der Navigationsleiste";
-App::$strings["Navigation bar gradient top color"] = "Farbverlauf der Navigationsleiste: Farbe oben";
-App::$strings["Navigation bar gradient bottom color"] = "Farbverlauf der Navigationsleiste: Farbe unten";
-App::$strings["Navigation active button gradient top color"] = "Navigations-Button aktiv: Farbe für Farbverlauf oben";
-App::$strings["Navigation active button gradient bottom color"] = "Navigations-Button aktiv: Farbe für Farbverlauf unten";
-App::$strings["Navigation bar border color "] = "Farbe für den Rand der Navigationsleiste";
-App::$strings["Navigation bar icon color "] = "Farbe für die Icons der Navigationsleiste";
-App::$strings["Navigation bar active icon color "] = "Farbe für aktive Icons der Navigationsleiste";
-App::$strings["link color"] = "Farbe für Links";
-App::$strings["Set font-color for banner"] = "Farbe der Schrift des Banners";
-App::$strings["Set the background color"] = "Hintergrundfarbe";
-App::$strings["Set the background image"] = "Hintergrundbild";
-App::$strings["Set the background color of items"] = "Hintergrundfarbe für Beiträge";
-App::$strings["Set the background color of comments"] = "Hintergrundfarbe für Kommentare";
-App::$strings["Set the border color of comments"] = "Farbe des Randes von Kommentaren";
-App::$strings["Set the indent for comments"] = "Einzugsbreite für Kommentare";
-App::$strings["Set the basic color for item icons"] = "Grundfarbe für Beitrags-Icons";
-App::$strings["Set the hover color for item icons"] = "Farbe für Beitrags-Icons unter dem Mauszeiger";
-App::$strings["Set font-size for the entire application"] = "Schriftgröße für die gesamte Anwendung";
-App::$strings["Example: 14px"] = "Beispiel: 14px";
-App::$strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare";
-App::$strings["Set font-color for posts and comments"] = "Schriftfarbe für Beiträge und Kommentare";
-App::$strings["Set radius of corners"] = "Ecken-Radius";
-App::$strings["Set shadow depth of photos"] = "Schattentiefe von Fotos";
-App::$strings["Set maximum width of content region in pixel"] = "Maximalbreite des Inhaltsbereichs in Pixel festlegen";
-App::$strings["Leave empty for default width"] = "Leer lassen für Standardbreite";
-App::$strings["Left align page content"] = "Seiteninhalt linksbündig anzeigen";
-App::$strings["Set minimum opacity of nav bar - to hide it"] = "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)";
-App::$strings["Set size of conversation author photo"] = "Größe der Avatare von Themenstartern";
-App::$strings["Set size of followup author photos"] = "Größe der Avatare von Kommentatoren";
-App::$strings["Update %s failed. See error logs."] = "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen.";
-App::$strings["Update Error at %s"] = "Aktualisierungsfehler auf %s";
-App::$strings["Create an account to access services and applications"] = "Erstelle ein Konto, um auf Dienste und Anwendungen zugreifen zu können.";
-App::$strings["Login/Email"] = "Anmelden/E-Mail";
-App::$strings["Password"] = "Kennwort";
-App::$strings["Remember me"] = "Angaben speichern";
-App::$strings["Forgot your password?"] = "Passwort vergessen?";
-App::$strings["toggle mobile"] = "auf/von mobile Ansicht wechseln";
-App::$strings["Website SSL certificate is not valid. Please correct."] = "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben.";
-App::$strings["[hubzilla] Website SSL error for %s"] = "[hubzilla] Website-SSL-Fehler für %s";
-App::$strings["Cron/Scheduled tasks not running."] = "Cron-Aufgaben laufen nicht.";
-App::$strings["[hubzilla] Cron tasks not running on %s"] = "[hubzilla] Cron-Aufgaben für %s laufen nicht";
-- 
cgit v1.2.3


From 582d075c4501ede78e35ac2207741c9a849d3673 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 10 May 2017 17:39:15 +0200
Subject: missing clearfix

---
 view/tpl/chatrooms.tpl | 2 +-
 view/tpl/myapps.tpl    | 2 +-
 view/tpl/wikilist.tpl  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'view')

diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl
index 71a2acada..d3eeed24f 100644
--- a/view/tpl/chatrooms.tpl
+++ b/view/tpl/chatrooms.tpl
@@ -1,5 +1,5 @@
 <div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
+	<div class="section-title-wrapper clearfix">
 		{{if $is_owner}}
 		<button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$newroom}}</button>
 		{{/if}}
diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl
index ccefa4a49..dd2a67a63 100755
--- a/view/tpl/myapps.tpl
+++ b/view/tpl/myapps.tpl
@@ -1,5 +1,5 @@
 <div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
+	<div class="section-title-wrapper clearfix">
 		{{if $authed}}
 		{{if $create}}
 		<a href="appman" class="pull-right btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</a>
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index 760cf41b9..2deec76c0 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -1,5 +1,5 @@
 <div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
+	<div class="section-title-wrapper clearfix">
 		{{if $owner}}
 		<button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$create}}</button>
 		{{/if}}
-- 
cgit v1.2.3


From e501289a5544823eed3834a831770c07159664ff Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 11 May 2017 17:39:26 -0700
Subject: consolidate and simplify the generation of activitystreams persons,
 add a couple more fields hoping eventually Mastodon will accept legal follow
 activities without choking on them. Requires an update of plugins also.

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

(limited to 'view')

diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
index ba50867ff..fe38fdc80 100755
--- a/view/tpl/atom_feed.tpl
+++ b/view/tpl/atom_feed.tpl
@@ -22,9 +22,4 @@
 
   <updated>{{$feed_updated}}</updated>
 
-  <zot:owner>
-    <name>{{$name}}</name>
-    <uri>{{$profile_page}}</uri>
-    <link rel="photo"  type="{{$mimephoto}}" media:width="175" media:height="175" href="{{$photo}}" />
-    <link rel="avatar" type="{{$mimephoto}}" media:width="175" media:height="175" href="{{$photo}}" />
-  </zot:owner>
+{{$owner}}
-- 
cgit v1.2.3


From 4b718929df2d88a14c602ae50454631d36276765 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 17 May 2017 11:25:14 +0200
Subject: css first aid for mod setup

---
 view/css/mod_setup.css | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'view')

diff --git a/view/css/mod_setup.css b/view/css/mod_setup.css
index ee725d055..f0d91a0ae 100644
--- a/view/css/mod_setup.css
+++ b/view/css/mod_setup.css
@@ -32,3 +32,9 @@
        margin-top: 18px;
        margin-left: 20px;
 }
+
+main {
+	max-width: 790px;
+	margin-left: auto;
+	margin-right: auto;
+}
-- 
cgit v1.2.3


From 3fad69e5cad9aab1cb31969253919198e551b048 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 18 May 2017 14:57:10 +0200
Subject: some styling for system notifications

---
 view/tpl/notifications.tpl | 20 ++++++++++----------
 view/tpl/notify.tpl        |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'view')

diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl
index 0b24da7c3..53ff8de52 100755
--- a/view/tpl/notifications.tpl
+++ b/view/tpl/notifications.tpl
@@ -1,11 +1,11 @@
-<div class="generic-content-wrapper-styled">
-
-<h1>{{$notif_header}}</h1>
-
-{{if $notifications_available}}
-<a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a>
-{{/if}}
-<div class="notif-network-wrapper">
-	{{$notif_content}}
-</div>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper clearfix">
+		{{if $notifications_available}}
+		<a href="#" class="btn btn-outline-secondary btn-sm float-right" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a>
+		{{/if}}
+		<h2>{{$notif_header}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		{{$notif_content}}
+	</div>
 </div>
diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl
index d3c79be82..ae6e160b1 100755
--- a/view/tpl/notify.tpl
+++ b/view/tpl/notify.tpl
@@ -1,3 +1,3 @@
-<div class="notif-item">
-	<a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+<div class="mb-2 notif-item">
+	<a href="{{$item_link}}"><img src="{{$item_image}}" class="menu-img-1">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
-- 
cgit v1.2.3


From e4448423fbcee4e685b410a62844a245601d2e0b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 21 May 2017 22:23:36 -0700
Subject: apporder module and all the associated backend stuff to make it work;
 probably needs a bit of UI cleanup and a link to it from somewhere

---
 view/tpl/app.tpl      | 7 ++++++-
 view/tpl/apporder.tpl | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 view/tpl/apporder.tpl

(limited to 'view')

diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 28f28611e..f45510a58 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -25,6 +25,11 @@
 	{{/if}}
 </div>
 {{else}}
+{{if $order}}
+<a href="{{$hosturl}}appman/{{$app.guid}}/moveup"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
+<a href="{{$hosturl}}appman/{{$app.guid}}/movedown"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
+{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}<br>
+{{else}}
 <a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
 {{/if}}
-
+{{/if}}
diff --git a/view/tpl/apporder.tpl b/view/tpl/apporder.tpl
new file mode 100644
index 000000000..fdb726131
--- /dev/null
+++ b/view/tpl/apporder.tpl
@@ -0,0 +1,7 @@
+<h2>{{$header}}</h2>
+
+<div class="descriptive-text">{{$desc}}</div>
+<br><br><br>
+{{foreach $nav_apps as $nav_app}}
+{{$nav_app}}
+{{/foreach}}
-- 
cgit v1.2.3


From 07ee4984cbdb3fa59441792a23c1cf3fc4151936 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 21 May 2017 22:42:22 -0700
Subject: some issues with the app order template logic

---
 view/tpl/app.tpl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'view')

diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index f45510a58..0c8ba7459 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -1,4 +1,4 @@
-{{if !$navapps}}
+{{if ! ($navapps || $order)}}
 <div class="app-container">
 	<div class="app-detail{{if $deleted}} app-deleted{{/if}}">
 		<a href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $app.desc}} title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}}
@@ -24,12 +24,13 @@
 	{{/if}}
 	{{/if}}
 </div>
-{{else}}
+{{/if}}
+{{if $navapps}}
+<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
+{{/if}}
 {{if $order}}
 <a href="{{$hosturl}}appman/{{$app.guid}}/moveup"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
 <a href="{{$hosturl}}appman/{{$app.guid}}/movedown"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
 {{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}<br>
-{{else}}
-<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
-{{/if}}
 {{/if}}
+
-- 
cgit v1.2.3


From 7ae0317b6a2bed323492ef987ddbaaf4f2a1a9b9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 22 May 2017 17:07:34 -0700
Subject: apporder style improvement and add to nav menu, also add language
 awareness to webpages

---
 view/tpl/app.tpl | 4 ++--
 view/tpl/nav.tpl | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 0c8ba7459..804db426f 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -29,8 +29,8 @@
 <a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
 {{/if}}
 {{if $order}}
-<a href="{{$hosturl}}appman/{{$app.guid}}/moveup"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
-<a href="{{$hosturl}}appman/{{$app.guid}}/movedown"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
+<a href="{{$hosturl}}appman/{{$app.guid}}/moveup" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
+<a href="{{$hosturl}}appman/{{$app.guid}}/movedown" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
 {{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}<br>
 {{/if}}
 
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 5c301b4d2..39fe686a9 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -207,6 +207,7 @@
 				{{if $localuser}}
 				<div class="dropdown-divider"></div>
 				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+				<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
 				{{/if}}
 			</div>
 		</li>
@@ -232,6 +233,7 @@
 		{{if $localuser}}
 		<div class="dropdown-divider"></div>
 		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+		<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
 		{{/if}}
 	</div>
 </div>
-- 
cgit v1.2.3


From ec7ecc285ec10a7990db09bda436fd498e05245a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 21 May 2017 22:23:36 -0700
Subject: apporder module and all the associated backend stuff to make it work;
 probably needs a bit of UI cleanup and a link to it from somewhere

---
 view/tpl/app.tpl      | 7 ++++++-
 view/tpl/apporder.tpl | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 view/tpl/apporder.tpl

(limited to 'view')

diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 28f28611e..f45510a58 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -25,6 +25,11 @@
 	{{/if}}
 </div>
 {{else}}
+{{if $order}}
+<a href="{{$hosturl}}appman/{{$app.guid}}/moveup"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
+<a href="{{$hosturl}}appman/{{$app.guid}}/movedown"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
+{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}<br>
+{{else}}
 <a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
 {{/if}}
-
+{{/if}}
diff --git a/view/tpl/apporder.tpl b/view/tpl/apporder.tpl
new file mode 100644
index 000000000..fdb726131
--- /dev/null
+++ b/view/tpl/apporder.tpl
@@ -0,0 +1,7 @@
+<h2>{{$header}}</h2>
+
+<div class="descriptive-text">{{$desc}}</div>
+<br><br><br>
+{{foreach $nav_apps as $nav_app}}
+{{$nav_app}}
+{{/foreach}}
-- 
cgit v1.2.3


From 50c9aec43652726b17e0fee3b555fb1344f38dbd Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 21 May 2017 22:42:22 -0700
Subject: some issues with the app order template logic

---
 view/tpl/app.tpl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'view')

diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index f45510a58..0c8ba7459 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -1,4 +1,4 @@
-{{if !$navapps}}
+{{if ! ($navapps || $order)}}
 <div class="app-container">
 	<div class="app-detail{{if $deleted}} app-deleted{{/if}}">
 		<a href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $app.desc}} title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}}
@@ -24,12 +24,13 @@
 	{{/if}}
 	{{/if}}
 </div>
-{{else}}
+{{/if}}
+{{if $navapps}}
+<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
+{{/if}}
 {{if $order}}
 <a href="{{$hosturl}}appman/{{$app.guid}}/moveup"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
 <a href="{{$hosturl}}appman/{{$app.guid}}/movedown"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
 {{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}<br>
-{{else}}
-<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
-{{/if}}
 {{/if}}
+
-- 
cgit v1.2.3


From 647b5d098f0985a12acbaf6fc1d3d89c2a758129 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 22 May 2017 17:07:34 -0700
Subject: apporder style improvement and add to nav menu, also add language
 awareness to webpages

---
 view/tpl/app.tpl | 4 ++--
 view/tpl/nav.tpl | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 0c8ba7459..804db426f 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -29,8 +29,8 @@
 <a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
 {{/if}}
 {{if $order}}
-<a href="{{$hosturl}}appman/{{$app.guid}}/moveup"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
-<a href="{{$hosturl}}appman/{{$app.guid}}/movedown"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
+<a href="{{$hosturl}}appman/{{$app.guid}}/moveup" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
+<a href="{{$hosturl}}appman/{{$app.guid}}/movedown" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
 {{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}<br>
 {{/if}}
 
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 5c301b4d2..39fe686a9 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -207,6 +207,7 @@
 				{{if $localuser}}
 				<div class="dropdown-divider"></div>
 				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+				<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
 				{{/if}}
 			</div>
 		</li>
@@ -232,6 +233,7 @@
 		{{if $localuser}}
 		<div class="dropdown-divider"></div>
 		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+		<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
 		{{/if}}
 	</div>
 </div>
-- 
cgit v1.2.3


From 1b75e4de0db02389108aba2b89830f7804f289f4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 26 May 2017 14:52:45 -0700
Subject: hubzilla issue #795

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

(limited to 'view')

diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index fcf9de75a..1c909b9b8 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -31,7 +31,7 @@
 			<tr id="webpage-list-item-{{$item.url}}">
 				<td>
 					{{if $view}}
-					<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
+					<a href="page/{{$channel}}/{{$item.pageurl}}" title="{{$view}}">{{$item.pagetitle}}</a>
 					{{else}}
 					{{$item.pagetitle}}
 					{{/if}}
-- 
cgit v1.2.3


From 184f522d5f6b03267f4fdf59f382408f91f44439 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 26 May 2017 14:52:45 -0700
Subject: hubzilla issue #795

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

(limited to 'view')

diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index fcf9de75a..1c909b9b8 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -31,7 +31,7 @@
 			<tr id="webpage-list-item-{{$item.url}}">
 				<td>
 					{{if $view}}
-					<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
+					<a href="page/{{$channel}}/{{$item.pageurl}}" title="{{$view}}">{{$item.pagetitle}}</a>
 					{{else}}
 					{{$item.pagetitle}}
 					{{/if}}
-- 
cgit v1.2.3


From 4fcfcc81172ebdfa4a27d3bca94bffe97356f600 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 29 May 2017 13:50:02 -0700
Subject: start deprecation of server_role

---
 view/tpl/admin_site.tpl | 3 ---
 view/tpl/settings.tpl   | 9 +++------
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'view')

diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 6fd0fd9ce..e995f82b2 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -41,12 +41,9 @@
     <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 	{{include file="field_input.tpl" field=$sitename}}
-	{{include file="field_select.tpl" field=$server_role}}
 
-	{{if $z_server_role == 'pro'}}
 	{{include file="field_select.tpl" field=$techlevel}}
     {{include file="field_checkbox.tpl" field=$techlock}}
-	{{/if}}
 
 	{{include file="field_textarea.tpl" field=$banner}}
 	{{include file="field_textarea.tpl" field=$siteinfo}}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index dd5fecb43..6673e5815 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,6 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		{{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-sm pull-right" href="removeme"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>{{/if}}
+		<a title="{{$removechannel}}" class="btn btn-danger btn-sm pull-right" href="removeme"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>
 		<h2>{{$ptitle}}</h2>
 		<div class="clear"></div>
 	</div>
@@ -44,12 +44,9 @@
 				</div>
 				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings">
 					<div class="section-content-tools-wrapper">
-						{{if $server_role != 'basic'}}
 						{{include file="field_select_grouped.tpl" field=$role}}
-						{{/if}}
-						<div id="advanced-perm" style="display:{{if $permissions_set && $server_role != 'basic' }}none{{else}}block{{/if}};">
+						<div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};">
 
-							{{if $server_role != 'basic'}}
 							<div class="form-group">
 								<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button>
 							</div>
@@ -71,7 +68,7 @@
 									</div><!-- /.modal-content -->
 								</div><!-- /.modal-dialog -->
 							</div><!-- /.modal -->
-							{{/if}}
+
 							<div id="settings-default-perms" class="form-group" >
 								<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button>
 							</div>
-- 
cgit v1.2.3


From fd915138322b920036a2a21c56fdfb6a56749303 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 29 May 2017 16:25:27 -0700
Subject: more deprecate server_role

---
 view/tpl/admin_account_edit.tpl | 5 -----
 view/tpl/settings_account.tpl   | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'view')

diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl
index 82d137de4..239d9084a 100644
--- a/view/tpl/admin_account_edit.tpl
+++ b/view/tpl/admin_account_edit.tpl
@@ -8,12 +8,7 @@
 
 {{include file="field_password.tpl" field=$pass1}}
 {{include file="field_password.tpl" field=$pass2}}
-
-{{if $z_server_role == 'pro'}}
 {{include file="field_select.tpl" field=$account_level}}
-{{else}}
-<input type="hidden" name="account_level" value="{{$account_level.2}}" />
-{{/if}}
 {{include file="field_select.tpl" field=$account_language}}
 {{include file="field_input.tpl" field=$service_class}}
 
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
index b7fdfb9a9..dd1d0d0c9 100755
--- a/view/tpl/settings_account.tpl
+++ b/view/tpl/settings_account.tpl
@@ -12,7 +12,7 @@
 			{{include file="field_password.tpl" field=$password1}}
 			{{include file="field_password.tpl" field=$password2}}
 
-			{{if $z_server_role == 'pro' && ! $techlock}}
+			{{if ! $techlock}}
 			{{include file="field_select.tpl" field=$techlevel}}
 			{{else}}
 			<input type="hidden" name="techlevel" value="{{$techlevel.2}}" />
-- 
cgit v1.2.3


From 321957781e047b8da55e2d8b5510bc595c0d2cf9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 29 May 2017 20:59:05 -0700
Subject: remove server role from language configs

---
 view/de/htconfig.tpl    | 7 -------
 view/en-au/htconfig.tpl | 7 -------
 view/en-gb/htconfig.tpl | 8 --------
 view/en/htconfig.tpl    | 9 ---------
 view/fr/htconfig.tpl    | 9 ---------
 view/it/htconfig.tpl    | 8 --------
 view/nb-no/htconfig.tpl | 8 --------
 view/pt-br/htconfig.tpl | 8 --------
 view/ru/htconfig.tpl    | 7 -------
 view/sv/htconfig.tpl    | 7 -------
 10 files changed, 78 deletions(-)

(limited to 'view')

diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index 9d4333fb0..46bf0de14 100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -34,13 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/en-au/htconfig.tpl b/view/en-au/htconfig.tpl
index 090bbf06f..cefcba727 100644
--- a/view/en-au/htconfig.tpl
+++ b/view/en-au/htconfig.tpl
@@ -34,13 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/en-gb/htconfig.tpl b/view/en-gb/htconfig.tpl
index 515957b36..ea458d664 100644
--- a/view/en-gb/htconfig.tpl
+++ b/view/en-gb/htconfig.tpl
@@ -34,14 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 042c89797..8159b6d44 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -34,15 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the server for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro disables protocol federation plugins and only supports the zot protocol
-// if you are in doubt or are unsure, it is strongly advised that you select 'standard'. 
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index fae8e3f98..ddc1d1053 100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -35,15 +35,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
-
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index ea3f5b5c2..5acb0ebe2 100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -34,14 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl
index ea3f5b5c2..5acb0ebe2 100644
--- a/view/nb-no/htconfig.tpl
+++ b/view/nb-no/htconfig.tpl
@@ -34,14 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl
index ea3f5b5c2..5acb0ebe2 100644
--- a/view/pt-br/htconfig.tpl
+++ b/view/pt-br/htconfig.tpl
@@ -34,14 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/ru/htconfig.tpl b/view/ru/htconfig.tpl
index 00da08c91..58a18fbd0 100644
--- a/view/ru/htconfig.tpl
+++ b/view/ru/htconfig.tpl
@@ -34,13 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
 // Be certain to create your own personal account before setting 
 // REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
index 00da08c91..58a18fbd0 100644
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
@@ -34,13 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
 // Be certain to create your own personal account before setting 
 // REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
-- 
cgit v1.2.3


From e48d5383cec4f5e7bd40bbac005819d60f38c970 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 30 May 2017 16:50:57 -0700
Subject: move disapora xrd stuff to plugin

---
 view/tpl/xrd_diaspora.tpl | 3 ---
 view/tpl/xrd_person.tpl   | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 view/tpl/xrd_diaspora.tpl

(limited to 'view')

diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl
deleted file mode 100644
index aa0d8c740..000000000
--- a/view/tpl/xrd_diaspora.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
-	<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
-	<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
index 93fdcb1df..225892d70 100755
--- a/view/tpl/xrd_person.tpl
+++ b/view/tpl/xrd_person.tpl
@@ -22,10 +22,7 @@
           href="{{$hcard_url}}" />
     <Link rel="http://ostatus.org/schema/1.0/subscribe"
           template="{{$subscribe}}" />
-
-   <Link rel="magic-public-key"
+    <Link rel="magic-public-key"
           href="{{$modexp}}" />
 
-	{{$dspr}}
-
 </XRD>
-- 
cgit v1.2.3


From 909e618f6ce5638e8205873aeb9a214a52cb379d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 30 May 2017 21:28:59 -0700
Subject: remove text_highlight css load from core

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

(limited to 'view')

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 869b97473..ff37023cf 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -10,7 +10,6 @@ head_add_css('/view/css/conversation.css');
 head_add_css('/view/css/widgets.css');
 head_add_css('/view/css/colorbox.css');
 head_add_css('/library/justifiedGallery/justifiedGallery.min.css');
-head_add_css('/library/Text_Highlighter/sample.css');	
 
 head_add_js('jquery.js');
 head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js');
-- 
cgit v1.2.3


From e6581aa09c582e32f5b4e5b06243265abd1ff45e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 31 May 2017 21:57:01 -0700
Subject: active nav-link was white on white

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

(limited to 'view')

diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index ebef68a52..756c583ff 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -139,6 +139,10 @@ option {
     background-color: #111;
 }
 
+.nav-link.active {
+	color:#000 !important;
+}
+
 a.btn, aside a {
 	font-weight: 400 !important;
 }
-- 
cgit v1.2.3


From 7562f77bdf7040d5cc63473a3c6ff7c499600f13 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sat, 3 Jun 2017 17:23:53 +0200
Subject: rewrite wiki pages widget - no need for ajax on pageload, show the
 pages to not authenticated people.

---
 view/tpl/wiki.tpl           | 19 ++++++++-----------
 view/tpl/wiki_page_list.tpl | 16 ++++++++++------
 2 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'view')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 564db3324..7cd3708b8 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -115,7 +115,7 @@
 	});
 
 	$( "#rename-page-form" ).submit(function( event ) {
-		$.post("wiki/{{$channel}}/rename/page", 
+		$.post("wiki/{{$channel_address}}/rename/page",
 		{
 			oldName: window.wiki_page_name, 
 			newName: $('#id_pageRename').val(), 
@@ -177,7 +177,7 @@
 	});
 
 	$('#wiki-get-preview').click(function (ev) {
-		$.post("wiki/{{$channel}}/preview", {
+		$.post("wiki/{{$channel_address}}/preview", {
 			{{if !$mimeType || $mimeType == 'text/markdown'}}
 			content: editor.getValue(),
 			{{else}}
@@ -200,7 +200,7 @@
 	});
 
 	$('#wiki-get-history').click(function (ev) {
-		$.post("wiki/{{$channel}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
+		$.post("wiki/{{$channel_address}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
 			if (data.success) {
 				$('#page-history-list').html(data.historyHTML);
 				$('#page-tools').hide();
@@ -215,10 +215,9 @@
 		if (window.wiki_resource_id === '') {
 			return false;
 		}
-		$.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) {
+		$.post("wiki/{{$channel_address}}/get/page/list/", {channel_id: '{{$channel_id}}', resource_id: window.wiki_resource_id}, function (data) {
 			if (data.success) {
-				$('#wiki_page_list_container').html(data.pages);
-				$('#wiki_page_list_container').show();
+				$('#wiki_page_list').html(data.pages);
 			} else {
 				alert('Error fetching page list!');
 				window.console.log('Error fetching page list!');
@@ -245,7 +244,7 @@
 			ev.preventDefault();
 			return false;
 		}
-		$.post("wiki/{{$channel}}/save/page", {
+		$.post("wiki/{{$channel_address}}/save/page", {
 			content: currentContent, 
 			commitMsg: $('#id_commitMsg').val(),
 			name: window.wiki_page_name, 
@@ -276,7 +275,7 @@
 			window.console.log('You must have a wiki page open in order to revert pages.');
 			return false;
 		}
-		$.post("wiki/{{$channel}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
+		$.post("wiki/{{$channel_address}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id},
 		function (data) {
 			if (data.success) {
 			$('button[id^=revert-]').removeClass('btn-success');
@@ -299,7 +298,7 @@
 			window.console.log('You must have a wiki page open in order to revert pages.');
 			return false;
 		}
-		$.post("wiki/{{$channel}}/compare/page", {
+		$.post("wiki/{{$channel_address}}/compare/page", {
 			compareCommit: compareCommit, 
 			currentCommit: window.wiki_page_commit, 
 			name: window.wiki_page_name, 
@@ -442,8 +441,6 @@
 	};
 
 	$(document).ready(function () {
-		wiki_refresh_page_list();
-
 		{{if !$mimeType || $mimeType == 'text/markdown'}}
 		$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
 		window.editor.on("input", function() {
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index 44fba15cc..6d09fcd5d 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -1,5 +1,6 @@
-{{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}}
+{{if ! $refresh}}
 <div id="wiki_page_list" class="widget" >
+{{/if}}
 	<h3>{{$header}}</h3>
 	<ul class="nav nav-pills flex-column">
 		{{if $pages}}
@@ -8,7 +9,7 @@
 			{{if $page.resource_id && $candel}}
 			<i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.url}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i>
 			{{/if}}
-			<a class="nav-link" href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a>
+			<a class="nav-link" href="/wiki/{{$channel_address}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a>
 		</li>
 		{{/foreach}}
 		{{/if}}
@@ -18,19 +19,21 @@
 	</ul>
 	{{if $canadd}}
 	<div id="new-page-form-wrapper" class="sub-menu" style="display:none;">
-		<form id="new-page-form" action="wiki/{{$channel}}/create/page" method="post" >
+		<form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" >
 			<input type="hidden" name="resource_id" value="{{$resource_id}}">
 			{{include file="field_input.tpl" field=$pageName}}
 			<button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button>
 		</form>
 	</div>
 	{{/if}}
+{{if ! $refresh}}
 </div>
-{{if $not_refresh}}</div>{{/if}}
+{{/if}}
 
+{{if $canadd}}
 <script>
 	$('#new-page-submit').click(function (ev) {
-		$.post("wiki/{{$channel}}/create/page", {pageName: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, 
+		$.post("wiki/{{$channel_address}}/create/page", {pageName: $('#id_pageName').val(), resource_id: window.wiki_resource_id},
 		function(data) {
 			if(data.success) {
 				window.location = data.url;
@@ -45,7 +48,7 @@
 		if(!confirm('Are you sure you want to delete the page: ' + wiki_page_name)) {
 			return;
 		}
-		$.post("wiki/{{$channel}}/delete/page", {name: wiki_page_url, resource_id: wiki_resource_id},
+		$.post("wiki/{{$channel_address}}/delete/page", {name: wiki_page_url, resource_id: wiki_resource_id},
 		function (data) {
 			if (data.success) {
 				window.console.log('Page deleted successfully.');
@@ -74,3 +77,4 @@
 		return false;
 	}
 </script>
+{{/if}}
-- 
cgit v1.2.3


From e8a4e9a31f57e53e076b440fc3b728044c42adda Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sun, 4 Jun 2017 12:52:52 +0200
Subject: class mixup

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

(limited to 'view')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 39fe686a9..4719e1b17 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -233,7 +233,7 @@
 		{{if $localuser}}
 		<div class="dropdown-divider"></div>
 		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
-		<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
+		<a class="nav-link" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
 		{{/if}}
 	</div>
 </div>
-- 
cgit v1.2.3


From e7c3ca9bd832f83bf2f66d6a06761062f2118185 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sun, 4 Jun 2017 16:39:52 +0200
Subject: fix allow setting a default schema for the hub (issue #797) and allow
 selecting of focus (hubzilla default) schema if a default is set.

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

(limited to 'view')

diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 752a02a6a..8dbe1be9c 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -5,10 +5,20 @@ namespace Zotlabs\Theme;
 class RedbasicConfig {
 
 	function get_schemas() {
-		$scheme_choices = array();
-		$scheme_choices["---"] = t("Focus (Hubzilla default)");
 		$files = glob('view/theme/redbasic/schema/*.php');
+
+		$scheme_choices = [];
+
 		if($files) {
+
+			if(in_array('view/theme/redbasic/schema/default.php', $files)) {
+				$scheme_choices['---'] = t('Default');
+				$scheme_choices['focus'] = t('Focus (Hubzilla default)');
+			}
+			else {
+				$scheme_choices['---'] = t('Focus (Hubzilla default)');
+			}
+
 			foreach($files as $file) {
 				$f = basename($file, ".php");
 				if($f != 'default') {
@@ -17,6 +27,7 @@ class RedbasicConfig {
 				}
 			}
 		}
+
 		return $scheme_choices;
 	}
 
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index a666f96f2..06cf23ba2 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -56,10 +56,9 @@ if (($schema) && ($schema != '---')) {
 
 }
 
-// If we haven't got a schema, load the default.  We shouldn't touch this - we
-// should leave it for admins to define for themselves.
-// default.php and default.css MUST be symlinks to existing schema files.
-if (! $schema) {
+// Allow admins to set a default schema for the hub.
+// default.php and default.css MUST be symlinks to existing schema files in view/theme/redbasic/schema
+if ((!$schema) || ($schema == '---')) {
 
 	if(file_exists('view/theme/redbasic/schema/default.php')) {
 		$schemefile = 'view/theme/redbasic/schema/default.php';
-- 
cgit v1.2.3


From 4784f847c9d752c34ff4eeec8a6c40455fe313ce Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sun, 4 Jun 2017 17:15:33 +0200
Subject: fix nav-tabs for dark scheme

---
 view/theme/redbasic/schema/dark.css | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index ebef68a52..4154c88fa 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -270,26 +270,20 @@ nav .dropdown-menu {
 	background: #999;
 }
 
-.nav-tabs{
+.nav-tabs {
 	border-bottom:1px solid #333;
 }
 
-.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
-	border:1px solid #333;
-}
-
-.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { 
+.nav-tabs .nav-link.active { 
 	color: #fff;
-	background-color: #111; 
-}
-
-.nav-tabs.nav-justified > li > a {
-	color: #ccc;
+	background-color: #111;
+	border-color: #333;
 }
 
-.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
-    text-decoration: underline;
-    background-color: #222;
+.nav-tabs .nav-link:hover,
+.nav-tabs .nav-link:focus {
+	text-decoration: underline;
+	background-color: #222;
 	color: #ccc;
 	border-color: #333;
 }
-- 
cgit v1.2.3


From 84c04cfe1c2ccb95067bc118a16cd70ce2c6ee05 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 30 May 2017 21:28:59 -0700
Subject: remove text_highlight css load from core

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

(limited to 'view')

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 869b97473..ff37023cf 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -10,7 +10,6 @@ head_add_css('/view/css/conversation.css');
 head_add_css('/view/css/widgets.css');
 head_add_css('/view/css/colorbox.css');
 head_add_css('/library/justifiedGallery/justifiedGallery.min.css');
-head_add_css('/library/Text_Highlighter/sample.css');	
 
 head_add_js('jquery.js');
 head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js');
-- 
cgit v1.2.3


From 55836e8ca65ca9a2ae25591de3232470d7a50049 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 7 Jun 2017 22:40:44 +0200
Subject: update bs-dev

---
 view/css/bootstrap-red.css             | 6 ++++++
 view/theme/redbasic/php/theme_init.php | 1 +
 2 files changed, 7 insertions(+)

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 1bb82f11c..b2b2ca759 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -46,6 +46,12 @@ nav .dropdown-menu {
 	overflow: auto;
 }
 
+/* this is a hack and needs fixing in bootstrap */
+nav .dropdown-menu-right {
+	right: 0;
+	left: auto !important;
+}
+
 #navbar-collapse-2 {
 	flex-basis: 100%;
 	max-height: 70vh;
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 020bda363..bfeabcb46 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -8,6 +8,7 @@ head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
 head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
 require_once('view/php/theme_init.php');
 
+head_add_js('/library/popper/popper.js');
 head_add_js('/library/bootstrap/js/bootstrap.min.js');
 head_add_js('/library/bootbox/bootbox.min.js');
 head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
-- 
cgit v1.2.3


From cf583168dd1b3ea461e07918eda404546d8136f4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 8 Jun 2017 19:15:55 -0700
Subject: put unreachable federated connections in the archived tab of the
 connections list page

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

(limited to 'view')

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 9fb5c4b18..8d44e8b16 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -59,6 +59,11 @@
 				{{$loc_text}} {{$locstr}}
 			</div>
 			{{/if}}
+			{{if $not_here}}
+			<div>
+				<strong>{{$not_here}}</strong>
+			</div>
+			{{/if}}
 			{{if $last_update}}
 			<div>
 				{{$lastupdtext}} {{$last_update}}
-- 
cgit v1.2.3


From 3389df77cc01cb7527623efebc9a640ad1454eb3 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 18 Apr 2017 21:18:49 -0700
Subject: give the item_obscured flag a new lease on life by using it to
 designate third party client-side e2ee or binary content which can only be
 downloaded and not viewed directly on the web (as a side effect this also
 allows binary files to be submitted as activities/content). The content
 display is suppressed and replaced with a download button. This is unfinished
 but harmless to backport while work is in progress unless told otherwise.
 Future development will take care of the remaining loose ends.

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

(limited to 'view')

diff --git a/view/tpl/item_binary.tpl b/view/tpl/item_binary.tpl
new file mode 100644
index 000000000..b19f7e7dd
--- /dev/null
+++ b/view/tpl/item_binary.tpl
@@ -0,0 +1,3 @@
+<p>
+<center><a class="zrl" href="{{$url}}"><button class="btn btn-warning fakelink">{{$download}}</button></a></center>
+</p>
-- 
cgit v1.2.3


From 2a4032d71aaa8934ce948f549e55e53d14cdfc93 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 9 Jun 2017 16:26:30 -0700
Subject: clean up the warnings about connections on unclonable networks

---
 view/tpl/abook_edit.tpl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 8d44e8b16..146030494 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -59,10 +59,11 @@
 				{{$loc_text}} {{$locstr}}
 			</div>
 			{{/if}}
-			{{if $not_here}}
+			{{if $unclonable}}
 			<div>
-				<strong>{{$not_here}}</strong>
+				<br>{{$unclonable}}
 			</div>
+			<br>
 			{{/if}}
 			{{if $last_update}}
 			<div>
-- 
cgit v1.2.3


From 643a62038e002c8944dda37f4023129bb50272c1 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 10 Jun 2017 20:01:23 +0200
Subject: css fixes

---
 view/tpl/conv_item.tpl | 106 +++++++++++++++++++++++++------------------------
 view/tpl/conv_list.tpl | 102 ++++++++++++++++++++++++-----------------------
 2 files changed, 106 insertions(+), 102 deletions(-)

(limited to 'view')

diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 2d51af4ff..36cb4cc83 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -84,9 +84,9 @@
 				</div>
 				{{/if}}
 				<div class="p-2 clearfix wall-item-tools">
-					<div class="wall-item-tools-right pull-right">
+					<div class="float-right wall-item-tools-right">
 						{{if $item.toplevel && $item.emojis && $item.reactions}}
-						<div class="btn-group dropdown">
+						<div class="btn-group">
 							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
 								<i class="fa fa-smile-o"></i>
 							</button>
@@ -97,7 +97,7 @@
 							</div>
 						</div>
 						{{/if}}
-						<div class="btn-group dropdown">
+						<div class="btn-group">
 							{{if $item.like}}
 							<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
 								<i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i>
@@ -109,11 +109,11 @@
 							</button>
 							{{/if}}
 							{{if $item.isevent}}
-							<div class="btn-group dropdown">
+							<div class="btn-group">
 								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
 									<i class="fa fa-calendar-check-o"></i>
 								</button>
-								<div class="dropdown-menu">
+								<div class="dropdown-menu dropdown-menu-right">
 									<a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
 										<i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}}
 									</a>
@@ -127,11 +127,11 @@
 							</div>
 							{{/if}}
 							{{if $item.canvote}}
-							<div class="btn-group dropdown">
+							<div class="btn-group">
 								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}">
 									<i class="fa fa-check-square-o"></i>
 								</button>
-								<div class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}">
+								<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}">
 									<a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;">
 										<i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}}
 									</a>
@@ -144,51 +144,53 @@
 								</div>
 							</div>
 							{{/if}}
-							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
-								<i class="fa fa-cog"></i>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
-								{{if $item.share}}
-								<a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a>
-								{{/if}}
-								{{if $item.plink}}
-								<a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a>
-								{{/if}}
-								{{if $item.edpost}}
-								<a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a>
-								{{/if}}
-								{{if $item.tagger}}
-								<a class="dropdown-item" href="#"  onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a>
-								{{/if}}
-								{{if $item.filer}}
-								<a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a>
-								{{/if}}
-								{{if $item.bookmark}}
-								<a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a>
-								{{/if}}
-								{{if $item.addtocal}}
-								<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
-								{{/if}}
-								{{if $item.star}}
-								<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
-								{{/if}}
-								{{if $item.thread_action_menu}}
-								{{foreach $item.thread_action_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a>
-								{{/foreach}}
-								{{/if}}
-								{{if $item.drop.dropping}}
-								<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
-								{{/if}}
-								{{if $item.thread_author_menu}}
-								<div class="dropdown-divider"></div>
-								{{foreach $item.thread_author_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
-								{{/foreach}}
-								{{/if}}
-								{{if $item.edpost && $item.dreport}}
-								<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
-								{{/if}}
+							<div class="btn-group">
+								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
+									<i class="fa fa-cog"></i>
+								</button>
+								<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
+									{{if $item.share}}
+									<a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a>
+									{{/if}}
+									{{if $item.plink}}
+									<a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a>
+									{{/if}}
+									{{if $item.edpost}}
+									<a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a>
+									{{/if}}
+									{{if $item.tagger}}
+									<a class="dropdown-item" href="#"  onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a>
+									{{/if}}
+									{{if $item.filer}}
+									<a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a>
+									{{/if}}
+									{{if $item.bookmark}}
+									<a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a>
+									{{/if}}
+									{{if $item.addtocal}}
+									<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
+									{{/if}}
+									{{if $item.star}}
+									<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
+									{{/if}}
+									{{if $item.thread_action_menu}}
+									{{foreach $item.thread_action_menu as $mitem}}
+									<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a>
+									{{/foreach}}
+									{{/if}}
+									{{if $item.drop.dropping}}
+									<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
+									{{/if}}
+									{{if $item.thread_author_menu}}
+									<div class="dropdown-divider"></div>
+									{{foreach $item.thread_author_menu as $mitem}}
+									<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
+									{{/foreach}}
+									{{/if}}
+									{{if $item.edpost && $item.dreport}}
+									<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
+									{{/if}}
+								</div>
 							</div>
 						</div>
 					</div>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 59153e41f..e442dd3cc 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -84,9 +84,9 @@
 				</div>
 				{{/if}}
 				<div class="p-2 clearfix wall-item-tools">
-					<div class="wall-item-tools-right pull-right">
+					<div class="float-right wall-item-tools-right">
 						{{if $item.toplevel && $item.emojis && $item.reactions}}
-						<div class="btn-group dropdown">
+						<div class="btn-group">
 							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
 								<i class="fa fa-smile-o"></i>
 							</button>
@@ -97,7 +97,7 @@
 							</div>
 						</div>
 						{{/if}}
-						<div class="btn-group dropdown">
+						<div class="btn-group">
 							{{if $item.like}}
 							<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
 								<i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i>
@@ -109,7 +109,7 @@
 							</button>
 							{{/if}}
 							{{if $item.isevent}}
-							<div class="btn-group dropdown">
+							<div class="btn-group">
 								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
 									<i class="fa fa-calendar-check-o"></i>
 								</button>
@@ -127,7 +127,7 @@
 							</div>
 							{{/if}}
 							{{if $item.canvote}}
-							<div class="btn-group dropdown">
+							<div class="btn-group">
 								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}">
 									<i class="fa fa-check-square-o"></i>
 								</button>
@@ -144,51 +144,53 @@
 								</div>
 							</div>
 							{{/if}}
-							<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
-								<i class="fa fa-cog"></i>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
-								{{if $item.share}}
-								<a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a>
-								{{/if}}
-								{{if $item.plink}}
-								<a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a>
-								{{/if}}
-								{{if $item.edpost}}
-								<a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a>
-								{{/if}}
-								{{if $item.tagger}}
-								<a class="dropdown-item" href="#"  onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a>
-								{{/if}}
-								{{if $item.filer}}
-								<a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a>
-								{{/if}}
-								{{if $item.bookmark}}
-								<a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a>
-								{{/if}}
-								{{if $item.addtocal}}
-								<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
-								{{/if}}
-								{{if $item.star}}
-								<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
-								{{/if}}
-								{{if $item.thread_action_menu}}
-								{{foreach $item.thread_action_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a>
-								{{/foreach}}
-								{{/if}}
-								{{if $item.drop.dropping}}
-								<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
-								{{/if}}
-								{{if $item.thread_author_menu}}
-								<div class="dropdown-divider"></div>
-								{{foreach $item.thread_author_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
-								{{/foreach}}
-								{{/if}}
-								{{if $item.edpost && $item.dreport}}
-								<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
-								{{/if}}
+							<div class="btn-group">
+								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
+									<i class="fa fa-cog"></i>
+								</button>
+								<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
+									{{if $item.share}}
+									<a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a>
+									{{/if}}
+									{{if $item.plink}}
+									<a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a>
+									{{/if}}
+									{{if $item.edpost}}
+									<a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a>
+									{{/if}}
+									{{if $item.tagger}}
+									<a class="dropdown-item" href="#"  onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a>
+									{{/if}}
+									{{if $item.filer}}
+									<a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a>
+									{{/if}}
+									{{if $item.bookmark}}
+									<a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a>
+									{{/if}}
+									{{if $item.addtocal}}
+									<a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a>
+									{{/if}}
+									{{if $item.star}}
+									<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
+									{{/if}}
+									{{if $item.thread_action_menu}}
+									{{foreach $item.thread_action_menu as $mitem}}
+									<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a>
+									{{/foreach}}
+									{{/if}}
+									{{if $item.drop.dropping}}
+									<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
+									{{/if}}
+									{{if $item.thread_author_menu}}
+									<div class="dropdown-divider"></div>
+									{{foreach $item.thread_author_menu as $mitem}}
+									<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
+									{{/foreach}}
+									{{/if}}
+									{{if $item.edpost && $item.dreport}}
+									<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
+									{{/if}}
+								</div>
 							</div>
 						</div>
 					</div>
-- 
cgit v1.2.3


From 836cb16455095d4fb34d73c86174b061203485f9 Mon Sep 17 00:00:00 2001
From: Haakon Meland Eriksen <haakon.eriksen@far.no>
Date: Tue, 13 Jun 2017 21:08:21 +0200
Subject: Added Portfolio widget

---
 view/tpl/photo_album_portfolio.tpl | 11 +++++++++++
 view/tpl/photo_portfolio.tpl       | 13 +++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100755 view/tpl/photo_album_portfolio.tpl
 create mode 100755 view/tpl/photo_portfolio.tpl

(limited to 'view')

diff --git a/view/tpl/photo_album_portfolio.tpl b/view/tpl/photo_album_portfolio.tpl
new file mode 100755
index 000000000..7aadbc7e0
--- /dev/null
+++ b/view/tpl/photo_album_portfolio.tpl
@@ -0,0 +1,11 @@
+<div class="row column">
+		<div id="photo-album-contents-{{$album_id}}">
+			{{foreach $photos as $photo}}
+			{{include file="photo_portfolio.tpl"}}
+			{{/foreach}}
+			<div id="page-end"></div>
+		</div>
+<div class="photos-end"></div>
+<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
+<div id="page-spinner"></div>
+</div>
\ No newline at end of file
diff --git a/view/tpl/photo_portfolio.tpl b/view/tpl/photo_portfolio.tpl
new file mode 100755
index 000000000..cbc8ea214
--- /dev/null
+++ b/view/tpl/photo_portfolio.tpl
@@ -0,0 +1,13 @@
+
+
+		<a data-open="portfolioModal-{{$photo.resource_id}}" aria-controls="portfolioModal-{{$photo.resource_id}}" aria-haspopup="true" tabindex="0">
+			<img class="thumbnail" src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.desc}}" id="photo-top-photo-{{$photo.resource_id}}">
+		</a>
+
+	<div class="full reveal without-overlay" id="portfolioModal-{{$photo.resource_id}}" data-reveal="f175mw-reveal" role="dialog" aria-hidden="true" data-yeti-box="portfolioModal-{{$photo.resource_id}}" data-resize="portfolioModal-{{$photo.resource_id}}">
+            <h5>{{$photo.desc}}</h5>
+		<img class="thumbnail" src="{{$photo.fullsrc}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.desc}}" id="photo-top-photo-{{$photo.resource_id}}x">
+		<button class="close-button" data-close="" aria-label="Close reveal" type="button">
+			<span aria-hidden="true">×</span>
+		</button>
+	</div>
-- 
cgit v1.2.3


From 4d5469f27ed2bea05dcfc4c286a9d14413a9e6b6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 17 Jun 2017 17:59:31 -0700
Subject: brainstorming a comment moderation system

---
 view/tpl/comment_item.tpl | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'view')

diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index bd5176c83..92eeac056 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -10,6 +10,13 @@
 				<input type="hidden" name="return" value="{{$return_path}}" />
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				{{if $anoncomments && ! $observer}}
+				<div id="comment-edit-anon-{{$id}}">
+					{{include file="field_input.tpl" field=$authorname}}
+					{{include file="field_input.tpl" field=$authormail}}
+					{{$anon_extras}}
+				</div>
+				{{/if}}
 				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$comment}}</textarea>
 				{{if $qcomment}}
 					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-- 
cgit v1.2.3


From b917cf1eccc62f5f533c0a61ffd699764b39e404 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 18 Jun 2017 22:25:41 -0700
Subject: allow moderated comments like wordpress if permissions are compatible

---
 view/js/main.js           |  2 ++
 view/tpl/comment_item.tpl |  7 ++++---
 view/tpl/search_item.tpl  | 11 +++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index 38b9754a1..6c42531ea 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -13,6 +13,7 @@ function commentOpenUI(obj, id) {
 			$("#comment-edit-text-" + id).attr('tabindex','9');
 			$("#comment-edit-submit-" + id).attr('tabindex','10');
 			$("#comment-tools-" + id).show();
+			$("#comment-edit-anon-" + id).show();
 		}
 	};
 
@@ -41,6 +42,7 @@ function commentOpen(obj, id) {
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 		$("#mod-cmnt-wrap-" + id).show();
+		$("#comment-edit-anon-" + id).show();
 		openMenu("comment-tools-" + id);
 		return true;
 	}
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 92eeac056..02b0c527c 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -11,9 +11,10 @@
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				{{if $anoncomments && ! $observer}}
-				<div id="comment-edit-anon-{{$id}}">
-					{{include file="field_input.tpl" field=$authorname}}
-					{{include file="field_input.tpl" field=$authormail}}
+				<div id="comment-edit-anon-{{$id}}" style="display: none;" >
+					{{include file="field_input.tpl" field=$anonname}}
+					{{include file="field_input.tpl" field=$anonmail}}
+					{{include file="field_input.tpl" field=$anonurl}}
 					{{$anon_extras}}
 				</div>
 				{{/if}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 66618a216..4ca6378b8 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -101,6 +101,17 @@
 					<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
 					<div class="dropdown-menu">{{$item.attachments}}</div>
 				</div>
+				{{/if}}
+				{{if $item.mode === 'moderate'}}
+
+				<div class="wall-item-tools-left btn-group">
+					<a href="moderate/{{$item.id}}/approve" class="btn btn-outline-secondary btn-small">{{$item.approve}}</a>
+					<a href="moderate/{{$item.id}}/drop" class="btn btn-outline-secondary btn-small">{{$item.delete}}</a>
+
+				</div>
+
+
+
 				{{/if}}
 			</div>
 		</div>
-- 
cgit v1.2.3


From 3d6255ae24310a935caf4e74729aa7165f94aeda Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 17 Jun 2017 17:59:31 -0700
Subject: brainstorming a comment moderation system

---
 view/tpl/comment_item.tpl | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'view')

diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index bd5176c83..92eeac056 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -10,6 +10,13 @@
 				<input type="hidden" name="return" value="{{$return_path}}" />
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				{{if $anoncomments && ! $observer}}
+				<div id="comment-edit-anon-{{$id}}">
+					{{include file="field_input.tpl" field=$authorname}}
+					{{include file="field_input.tpl" field=$authormail}}
+					{{$anon_extras}}
+				</div>
+				{{/if}}
 				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$comment}}</textarea>
 				{{if $qcomment}}
 					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-- 
cgit v1.2.3


From 1472f85b162ea6f1ab9e19e94b86fc4a8ef074be Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 18 Jun 2017 22:25:41 -0700
Subject: allow moderated comments like wordpress if permissions are compatible

---
 view/js/main.js           |  2 ++
 view/tpl/comment_item.tpl |  7 ++++---
 view/tpl/search_item.tpl  | 11 +++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index 38b9754a1..6c42531ea 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -13,6 +13,7 @@ function commentOpenUI(obj, id) {
 			$("#comment-edit-text-" + id).attr('tabindex','9');
 			$("#comment-edit-submit-" + id).attr('tabindex','10');
 			$("#comment-tools-" + id).show();
+			$("#comment-edit-anon-" + id).show();
 		}
 	};
 
@@ -41,6 +42,7 @@ function commentOpen(obj, id) {
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 		$("#mod-cmnt-wrap-" + id).show();
+		$("#comment-edit-anon-" + id).show();
 		openMenu("comment-tools-" + id);
 		return true;
 	}
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 92eeac056..02b0c527c 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -11,9 +11,10 @@
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				{{if $anoncomments && ! $observer}}
-				<div id="comment-edit-anon-{{$id}}">
-					{{include file="field_input.tpl" field=$authorname}}
-					{{include file="field_input.tpl" field=$authormail}}
+				<div id="comment-edit-anon-{{$id}}" style="display: none;" >
+					{{include file="field_input.tpl" field=$anonname}}
+					{{include file="field_input.tpl" field=$anonmail}}
+					{{include file="field_input.tpl" field=$anonurl}}
 					{{$anon_extras}}
 				</div>
 				{{/if}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 66618a216..4ca6378b8 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -101,6 +101,17 @@
 					<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
 					<div class="dropdown-menu">{{$item.attachments}}</div>
 				</div>
+				{{/if}}
+				{{if $item.mode === 'moderate'}}
+
+				<div class="wall-item-tools-left btn-group">
+					<a href="moderate/{{$item.id}}/approve" class="btn btn-outline-secondary btn-small">{{$item.approve}}</a>
+					<a href="moderate/{{$item.id}}/drop" class="btn btn-outline-secondary btn-small">{{$item.delete}}</a>
+
+				</div>
+
+
+
 				{{/if}}
 			</div>
 		</div>
-- 
cgit v1.2.3


From aed1373b7099a081f258d36270df509eeed9ddcd Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 20 Jun 2017 11:52:09 +0200
Subject: update bs4-dev and use min version of popper

---
 view/css/bootstrap-red.css             | 6 ------
 view/theme/redbasic/php/theme_init.php | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index b2b2ca759..1bb82f11c 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -46,12 +46,6 @@ nav .dropdown-menu {
 	overflow: auto;
 }
 
-/* this is a hack and needs fixing in bootstrap */
-nav .dropdown-menu-right {
-	right: 0;
-	left: auto !important;
-}
-
 #navbar-collapse-2 {
 	flex-basis: 100%;
 	max-height: 70vh;
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index bfeabcb46..b12d80ea5 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -8,7 +8,7 @@ head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
 head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
 require_once('view/php/theme_init.php');
 
-head_add_js('/library/popper/popper.js');
+head_add_js('/library/popper/popper.min.js');
 head_add_js('/library/bootstrap/js/bootstrap.min.js');
 head_add_js('/library/bootbox/bootbox.min.js');
 head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
-- 
cgit v1.2.3


From b858eec644f5a3e773c9513891070bc86f700aa8 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 20 Jun 2017 12:57:23 +0200
Subject: make bootstrap respect our radius setting

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

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index faa292fe5..ce98f8d49 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1339,6 +1339,14 @@ main.fullscreen .section-content-wrapper-np {
 }
 /* bootstrap overrides */
 
+.btn,
+.rounded-top,
+.form-control,
+.nav-pills .nav-link,
+.nav-tabs .nav-link {
+	border-radius: $radius !important;
+}
+
 blockquote {
 	font-size: 1rem;
 	font-style: italic;
@@ -1353,10 +1361,6 @@ blockquote {
 	border-radius: $radius;
 }
 
-.dropdown-menu img {
-	border-radius: $radius;
-}
-
 .dropdown-item {
 	color: $font_colour;
 }
@@ -1491,7 +1495,7 @@ dl.bb-dl > dd > li {
 .form-group.checkbox > div label {
     display: block; overflow: hidden; cursor: pointer;
     border: 1px solid #ccc;
-    border-radius: 4px;
+    border-radius: $radius;
     margin:0px;
 	-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
 	-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-- 
cgit v1.2.3


From 075ced80a6e167c8a81b07d134c7575ba5da6676 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Tue, 20 Jun 2017 15:44:47 +0200
Subject: Remove important flag

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

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ce98f8d49..07dfd938d 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1344,7 +1344,7 @@ main.fullscreen .section-content-wrapper-np {
 .form-control,
 .nav-pills .nav-link,
 .nav-tabs .nav-link {
-	border-radius: $radius !important;
+	border-radius: $radius;
 }
 
 blockquote {
-- 
cgit v1.2.3


From dc14f8bf2c233dd4d3fb7b1144762306382793af Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Thu, 22 Jun 2017 20:28:47 +0200
Subject: fix post title radius

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

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 07dfd938d..c7869de8f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1340,13 +1340,17 @@ main.fullscreen .section-content-wrapper-np {
 /* bootstrap overrides */
 
 .btn,
-.rounded-top,
 .form-control,
 .nav-pills .nav-link,
 .nav-tabs .nav-link {
 	border-radius: $radius;
 }
 
+.rounded-top {
+	border-top-left-radius: $radius !important;
+	border-top-right-radius: $radius !important;
+}
+
 blockquote {
 	font-size: 1rem;
 	font-style: italic;
-- 
cgit v1.2.3


From 02b7bc08033b21ea5438aa667e8dbb1fd72022bb Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 22 Jun 2017 20:16:54 -0700
Subject: cdav migration to core

---
 view/css/cdav_addressbook.css | 103 ++++++++++++++++++++++++++++++++++++++++++
 view/css/cdav_calendar.css    |  22 +++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 view/css/cdav_addressbook.css
 create mode 100644 view/css/cdav_calendar.css

(limited to 'view')

diff --git a/view/css/cdav_addressbook.css b/view/css/cdav_addressbook.css
new file mode 100644
index 000000000..038358e43
--- /dev/null
+++ b/view/css/cdav_addressbook.css
@@ -0,0 +1,103 @@
+.vcard-header {
+	cursor: pointer;
+	padding: 7px 10px;
+	margin-bottom: 3px;
+}
+
+.vcard-header:hover,
+.vcard-header.active {
+	background-color: rgb(238,238,238);
+	cursor: pointer;
+}
+
+.vcard-header.active:hover {
+	cursor: initial;
+}
+
+.vcard-add-field {
+	margin-top: 8px;
+	display: none;
+}
+
+.vcard-cancel {
+	margin: 6px 10px;
+	height: 32px;
+	line-height: 32px;
+	color: #777;
+	font-size: 16px;
+
+	cursor: pointer;
+	display: none;
+	float: right;
+}
+
+.vcard-info {
+	display: none;
+}
+
+.vcard-nophoto {
+	display: inline-block;
+	width: 32px;
+	height: 32px;
+	border-radius: 4px;
+	border: 1px solid #ccc;
+	text-align: center;
+	font-size: 20px;
+	color: #fff;
+	background-color: #ddd;
+}
+
+.vcard-photo {
+	width: 32px;
+	height: 32px;
+	border-radius: 4px;
+	border: 1px solid #ccc;
+	text-align: center;
+}
+
+.vcard-fn-preview,
+input.vcard-fn {
+	font-size: 16px !important;
+	margin-left: 5px;
+}
+
+.vcard-email-preview,
+.vcard-tel-preview {
+	color: #999;
+}
+
+
+.vcard-fn,
+#create_form,
+#more_block {
+	display: none;
+}
+
+input.vcard-fn,
+.vcard-fn-create input,
+.vcard-org input,
+.vcard-title input,
+.vcard-tel input,
+.vcard-email input,
+.vcard-impp input,
+.vcard-url input,
+.vcard-adr input,
+.vcard-note input {
+	padding: 0px;
+	margin-left: 5px;
+	border-width: 0px 0px 1px 0px;
+	border-radius: 0px;
+	background-color: transparent;
+	min-width: 160px;
+}
+
+#template-form-vcard-org,
+#template-form-vcard-title,
+#template-form-vcard-tel,
+#template-form-vcard-email,
+#template-form-vcard-impp,
+#template-form-vcard-url,
+#template-form-vcard-adr,
+#template-form-vcard-note {
+	display: none;
+}
diff --git a/view/css/cdav_calendar.css b/view/css/cdav_calendar.css
new file mode 100644
index 000000000..d68278a63
--- /dev/null
+++ b/view/css/cdav_calendar.css
@@ -0,0 +1,22 @@
+/* fix borders */
+
+.fc th:first-child,
+.fc td:first-child {
+    border-left-width: 0px;
+}
+
+.fc th:last-child,
+.fc td:last-child {
+    border-right-width: 0px;
+    border-bottom-width: 0px;
+}
+
+.fc-unthemed th,
+.fc-unthemed td,
+.fc-unthemed thead,
+.fc-unthemed tbody,
+.fc-unthemed .fc-divider,
+.fc-unthemed .fc-row,
+.fc-unthemed .fc-popover {
+	border-color: #ccc !important;
+}
-- 
cgit v1.2.3


From 7f982a07781f09756d852f423bba37dc11abf2a5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 25 Jun 2017 20:03:26 -0700
Subject: minor usability enhancements with the connections list - label the
 edit icon so it's more obvious; the intuitive action is to click the photo or
 name which isn't what we usually want. Also move the Delete button over just
 a bit more so it's harder to accidentally click on small screens with big
 thumbs.

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

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 07dfd938d..0dee7dead 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -427,6 +427,10 @@ footer {
 	right: 5px;
 }
 
+.contact-delete-btn {
+	margin-right: 32px;
+}
+
 #contact-block {
 	width: 100%;
 }
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 16915abda..8e49c9e27 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -8,8 +8,8 @@
 			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-sm" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a>
 
 			{{/if}}
-			<a href="#" class="btn btn-danger btn-sm" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
-			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i></a>
+			<a href="#" class="btn btn-danger btn-sm contact-delete-btn" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
+			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i> {{$contact.edit}}</a>
 			{{if $contact.approve}}
 			</form>
 			{{/if}}
-- 
cgit v1.2.3


From 54c5e03b4f94e07fccf1d67078a534d2e7da99b4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 26 Jun 2017 22:42:01 -0700
Subject: provide more comprehensible information on the admin summary page

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

(limited to 'view')

diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
index ca94b0ef7..8125703d7 100755
--- a/view/tpl/admin_summary.tpl
+++ b/view/tpl/admin_summary.tpl
@@ -12,7 +12,7 @@
 	</dl>
 	<dl>
 		<dt>{{$accounts.0}}</dt>
-		<dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd>
+		<dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}} {{$acc.label}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd>
 	</dl>
 	<dl>
 		<dt>{{$pending.0}}</dt>
@@ -20,7 +20,7 @@
 	</dl>
 	<dl>
 		<dt>{{$channels.0}}</dt>
-		<dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd>
+		<dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}} {{$ch.label}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd>
 	</dl>
 	<dl>
 		<dt>{{$plugins.0}}</dt>
-- 
cgit v1.2.3


From 4c50bfebc293554d9c9a4a8c34b929b03c132d68 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Jun 2017 21:55:34 -0700
Subject: provide a gender icon on the profile sidebar within reason

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

(limited to 'view')

diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index c17a7878c..13c22a2c7 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -43,7 +43,7 @@
 		</dl>
 	{{/if}}
 
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{if $profile.gender_icon}}<i class="fa fa-{{$profile.gender_icon}}"></i>&nbsp;{{/if}}{{$profile.gender}}</dd></dl>{{/if}}
 
 	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
 
-- 
cgit v1.2.3


From 34c4775916f824755b4545f8d6f0ec2b8a653a88 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Jun 2017 16:45:48 -0700
Subject: missing space in nav tpl

---
 view/tpl/nav.tpl        | 2 +-
 view/tpl/xrd_person.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 4719e1b17..e1ee07935 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -83,7 +83,7 @@
 			</a>
 			<div id="nav-network-menu" class="dropdown-menu" rel="network">
 				<a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a>
-				<a class="dropdown-item" id="nav-network-mark-all"href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a>
+				<a class="dropdown-item" id="nav-network-mark-all" href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a>
 				{{$emptynotifications}}
 			</div>
 		</li>
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
index 225892d70..52adb54e3 100755
--- a/view/tpl/xrd_person.tpl
+++ b/view/tpl/xrd_person.tpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
  
-    <Subject>{{$accturi}}</Subject>
+    <Subject>{{$subject}}</Subject>
 	{{if $aliases}}{{foreach $aliases as $a}}
 	<Alias>{{$a}}</Alias>   
 	{{/foreach}}{{/if}}
-- 
cgit v1.2.3


From 798a03c2ab3d848fb7ba09027e968a99b67e7d95 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Jun 2017 17:03:17 -0700
Subject: diaspora hcard wasn't being rendered

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

(limited to 'view')

diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 13c22a2c7..f51f0719c 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -49,9 +49,9 @@
 
 	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url">{{$profile.homepage}}</dd></dl>{{/if}}
 
-
+<div class="hcard-addon"></div>
 </div>
-<div id="clear"></div>
+<div class="clear"></div>
 
 {{$rating}}
 
-- 
cgit v1.2.3


From 133292e241f9408ff793aa95aceec00c808fbd68 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 2 Jul 2017 11:24:17 +0200
Subject: update bs-dev and min version bump

---
 view/css/bootstrap-red.css        | 4 ----
 view/php/default.php              | 2 +-
 view/php/full.php                 | 2 +-
 view/theme/redbasic/css/style.css | 8 ++++----
 view/theme/redbasic/php/style.php | 2 +-
 view/tpl/chatrooms.tpl            | 2 +-
 view/tpl/item_categories.tpl      | 2 +-
 view/tpl/nav.tpl                  | 4 ++--
 view/tpl/photo_albums.tpl         | 2 +-
 9 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 1bb82f11c..04db6193d 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -66,10 +66,6 @@ nav .dropdown-menu {
 }
 /* nav overrides end */
 
-.btn-outline-secondary {
-	color: #aaa;
-}
-
 .wall-item-tools .dropdown-menu {
 	min-width: auto;
 }
diff --git a/view/php/default.php b/view/php/default.php
index e4553a17f..bd4d7dc22 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -8,7 +8,7 @@
 <body <?php if($page['direction']) echo 'dir="rtl"' ?> >
 	<?php if(x($page,'banner')) echo $page['banner']; ?>
 	<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-	<nav class="navbar fixed-top navbar-expand-md navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
+	<nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
 	<main>
 		<aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
 		<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
diff --git a/view/php/full.php b/view/php/full.php
index 64e32c5bd..094874766 100644
--- a/view/php/full.php
+++ b/view/php/full.php
@@ -7,7 +7,7 @@
 </head>
 <body>
 	<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-	<nav class="navbar fixed-top navbar-expand-md navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
+	<nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
 	<section><?php if(x($page,'content')) echo $page['content']; ?>
 		<div id="page-footer"></div>
 	</section>
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c7869de8f..510f7c80b 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1380,17 +1380,17 @@ blockquote {
 	background-color: $item_colour;
 }
 
-.bg-inverse {
+.bg-dark {
 	background-color: $nav_bg !important;
 }
 
-.navbar-inverse .navbar-nav .nav-link,
+.navbar-dark .navbar-nav .nav-link,
 .usermenu i {
 	color: $nav_icon_colour;
 }
 
-.navbar-inverse .navbar-nav .nav-link:focus,
-.navbar-inverse .navbar-nav .nav-link:hover,
+.navbar-dark .navbar-nav .nav-link:focus,
+.navbar-dark .navbar-nav .nav-link:hover,
 .usermenu:focus i,
 .usermenu:hover i {
 	color: $nav_active_icon_colour;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 06cf23ba2..ad8220028 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -74,7 +74,7 @@ if ((!$schema) || ($schema == '---')) {
 //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
 //individually.  If we don't, we'll have problems if a user has set one, but not all options.
 if (! $nav_bg)
-	$nav_bg = '#222';
+	$nav_bg = '#343a40';
 if (! $nav_icon_colour)
 	$nav_icon_colour = 'rgba(255, 255, 255, 0.5)';
 if (! $nav_active_icon_colour)
diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl
index d3eeed24f..0e6847608 100644
--- a/view/tpl/chatrooms.tpl
+++ b/view/tpl/chatrooms.tpl
@@ -27,7 +27,7 @@
 					<ul id="panel-{{$room.cr_id}}" class="lockview-panel dropdown-menu"></ul>
 					{{/if}}
 				</td>
-				<td><span class="badge badge-default">{{$room.cr_inroom}}</span></td>
+				<td><span class="badge badge-secondary">{{$room.cr_inroom}}</span></td>
 			</tr>
 			{{/foreach}}
 		</table>
diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl
index e1b183c0d..fa07fa39f 100644
--- a/view/tpl/item_categories.tpl
+++ b/view/tpl/item_categories.tpl
@@ -1,7 +1,7 @@
 {{if $categories}}
 <!--div class="categorytags"-->
 {{foreach $categories as $cat}}
-<span class="item-category badge badge-pill badge-warning"><i class="fa fa-asterisk"></i>&nbsp;{{if $cat.url}}<a class="text-white" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
+<span class="item-category badge badge-pill badge-warning"><i class="fa fa-asterisk"></i>&nbsp;{{if $cat.url}}<a class="text-dark" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
 {{/foreach}}
 <!--/div-->
 {{/if}}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 4719e1b17..f71feafe6 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -79,7 +79,7 @@
 		<li class="nav-item dropdown net-button" style="display: none;">
 			<a class="nav-link" href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu">
 				<i class="fa fa-fw fa-th"></i>
-				<span class="badge badge-pill badge-default net-update"></span>
+				<span class="badge badge-pill badge-secondary net-update"></span>
 			</a>
 			<div id="nav-network-menu" class="dropdown-menu" rel="network">
 				<a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a>
@@ -118,7 +118,7 @@
 		<li class="nav-item dropdown all_events-button" style="display: none;">
 			<a class="nav-link" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu">
 				<i class="fa fa-fw fa-calendar"></i>
-				<span class="badge badge-pill badge-default all_events-update"></span>
+				<span class="badge badge-pill badge-secondary all_events-update"></span>
 			</a>
 			<div id="nav-all_events-menu" class="dropdown-menu" rel="all_events">
 				<a class="dropdown-item" id="nav-all_events-see-all" href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a>
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index a238e61bc..83bdd95e7 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -5,7 +5,7 @@
 		{{if $albums}}
 		{{foreach $albums as $al}}
 		{{if $al.shorttext}}
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li>
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-secondary float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li>
 		{{/if}}
 		{{/foreach}}
 		{{/if}}
-- 
cgit v1.2.3


From 562124c29f821b046bc4cf4b48a7bde39c70a07b Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 3 Jul 2017 21:22:13 +0200
Subject: bs-dev, minor css fix and min version

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

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 04db6193d..24f04dfe7 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -61,7 +61,7 @@ nav .dropdown-menu {
 	padding: 0.5rem 0.1rem;
 }
 
-.navbar-inverse .navbar-toggler {
+.navbar-dark .navbar-toggler {
 	color: rgba(255,255,255,1);
 }
 /* nav overrides end */
-- 
cgit v1.2.3


From 76850a73404d8366f085765cef850d12b5644f68 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 3 Jul 2017 21:38:29 +0200
Subject: minor css fix

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

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 71ae085ea..510f7c80b 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -427,10 +427,6 @@ footer {
 	right: 5px;
 }
 
-.contact-delete-btn {
-	margin-right: 32px;
-}
-
 #contact-block {
 	width: 100%;
 }
-- 
cgit v1.2.3


From 271ed82d0def7b658f074ada9adb1aaa51bdd507 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 10 Jul 2017 22:43:32 +0200
Subject: update to match primary color

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

(limited to 'view')

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 08f23c4d0..d10e1e14e 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -77,7 +77,7 @@
 /* conv_item */
 
 .wall-item-head-new {
-	border-top: 0.2rem solid #0275d8;
+	border-top: 0.2rem solid #007bff;
 }
 
 .wall-item-info {
@@ -168,11 +168,11 @@ a.wall-item-name-link {
 }
 
 .ivoted {
-	color: #0275d8;
+	color: #007bff;
 }
 
 .item-highlight {
-	border-left: 0.2rem solid #0275d8;
+	border-left: 0.2rem solid #007bff;
 }
 
 .item-highlight .wall-item-head,
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index ad8220028..e5a6eb0cd 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -80,7 +80,7 @@ if (! $nav_icon_colour)
 if (! $nav_active_icon_colour)
 	$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
 if (! $link_colour)
-	$link_colour = '#0275d8';
+	$link_colour = '#007bff';
 if (! $banner_colour)
 	$banner_colour = '#fff';
 if (! $bgcolour)
-- 
cgit v1.2.3


From c940d8d7ca25691519d400ad19aa22b5611fc2e7 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 13 Jul 2017 17:04:58 -0700
Subject: implement chunked uploads on the wall; making it work painlessly on
 /cloud was attempted but will not be implemented today. That presents some
 interesting dragons to slay.

---
 view/tpl/jot-header.tpl | 172 +++++++++++++-----------------------------------
 view/tpl/jot.tpl        |   3 +-
 2 files changed, 47 insertions(+), 128 deletions(-)

(limited to 'view')

diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 1cc5a898a..d8f296aa4 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -100,77 +100,44 @@ function enableOnUser(){
 	initEditor();
 }
 </script>
-<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>
+
+<script src="library/blueimp_upload/js/vendor/jquery.ui.widget.js"></script>
+<script src="library/blueimp_upload/js/jquery.iframe-transport.js"></script>
+<script src="library/blueimp_upload/js/jquery.fileupload.js"></script>
+
 <script>
 	$(document).ready(function() {
 		/* enable tinymce on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
 
-		var upload_title = $('#wall-image-upload').attr('title');
-		var attach_title = $('#wall-file-upload').attr('title');
-		try {
-			var uploader = new window.AjaxUpload('wall-image-upload',
-			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
-				name: 'userfile',
-				title: upload_title,
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#jot-media').val($('#jot-media').val() + response);
-					$('#profile-rotator').spin(false);
-				}
-			});
-		} catch (e) {
-		}
-		try {
-			var uploader_sub = new window.AjaxUpload('wall-image-upload-sub',
-			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
-				name: 'userfile',
-				title: upload_title,
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#jot-media').val($('#jot-media').val() + response);
-					$('#profile-rotator').spin(false);
-				}
-			});
-		} catch(e) {
-		}
-		try {
-			var file_uploader = new window.AjaxUpload('wall-file-upload',
-			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
-				name: 'userfile',
-				title: attach_title,
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#jot-media').val($('#jot-media').val() + response);
-					$('#profile-rotator').spin(false);
-				}
-			});
-		} catch(e) {
-		}
-		try {
-			var file_uploader_sub = new window.AjaxUpload('wall-file-upload-sub',
-			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
-				name: 'userfile',
-				title: attach_title,
-				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#jot-media').val($('#jot-media').val() + response);
-					$('#profile-rotator').spin(false);
-				}
-			});
-		} catch(e) {
-		}
-        
-        
+
+		$('#invisible-wall-file-upload').fileupload({
+			url: 'wall_attach/{{$nickname}}',
+			dataType: 'json',
+			dropZone: $('#profile-jot-text'),
+			maxChunkSize: 4 * 1024 * 1024,
+			add: function(e,data) {
+				$('#profile-rotator').spin('tiny');
+				data.submit();
+			},
+			done: function(e,data) {
+				addeditortext(data.result.message);
+				$('#jot-media').val($('#jot-media').val() + data.result.message);
+			},
+			stop: function(e,data) {
+				$('#profile-rotator').spin(false);
+			},
+		});
+
+		$('#wall-file-upload').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;});
+		$('#wall-file-upload-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;});
+
         // call initialization file
         if (window.File && window.FileList && window.FileReader) {
           DragDropUploadInit();
         }
+
 	});
 
 	function deleteCheckedItems() {
@@ -291,15 +258,17 @@ function enableOnUser(){
 
 	function linkdrop(event) {
 		var reply = event.dataTransfer.getData("text/uri-list");
-		event.preventDefault();
-		var editwin = '#' + event.target.id;
-		var commentwin = false;
-		if(editwin) {
-			commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
-			if(commentwin) {
-				var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
-				commentOpen(document.getElementById(event.target.id),commentid);
+		if(reply) {
+			event.preventDefault();
+			var editwin = '#' + event.target.id;
+			var commentwin = false;
+			if(editwin) {
+				commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
+				if(commentwin) {
+					var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
+					commentOpen(document.getElementById(event.target.id),commentid);
 
+				}
 			}
 		}
 
@@ -353,8 +322,6 @@ function enableOnUser(){
 					commentBusy = true;
 					$('body').css('cursor', 'wait');
 					$.get('{{$baseurl}}/filer/' + id + '?term=' + reply, NavUpdate);
-//					if(timer) clearTimeout(timer);
-//					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
 					$('#item-filer-dialog').modal('hide');
 				}
@@ -499,32 +466,20 @@ function enableOnUser(){
     };
 
     //
-    // initialize
+    // initialize drag-drop
     function DragDropUploadInit() {
 
       var filedrag = $("#profile-jot-text");
 
-      // is XHR2 available?
-      var xhr = new XMLHttpRequest();
-      if (xhr.upload) {
-
-        // file drop
+	  // file drop
         filedrag.on("dragover", DragDropUploadFileHover);
         filedrag.on("dragleave", DragDropUploadFileHover);
         filedrag.on("drop", DragDropUploadFileSelectHandler);
 
-      }
-
-      window.filesToUpload = 0;
-      window.fileUploadsCompleted = 0;
-
-
     }
 
     // file drag hover
     function DragDropUploadFileHover(e) {
-      e.stopPropagation();
-      e.preventDefault();
       e.target.className = (e.type == "dragover" ? "hover" : "");
     }
 
@@ -533,49 +488,12 @@ function enableOnUser(){
 
       // cancel event and hover styling
       DragDropUploadFileHover(e);
-	  if (!editor) $("#profile-jot-text").val("");
-
-
-      // fetch FileList object
-      var files = e.target.files || e.originalEvent.dataTransfer.files;
-      // process all File objects
-      for (var i = 0, f; f = files[i]; i++) {
-        DragDropUploadFile(f, i);
-      }
-
-    }
-
-    // upload  files
-    function DragDropUploadFile(file, idx) {
-
-      window.filesToUpload = window.filesToUpload + 1;
-
-      var xhr = new XMLHttpRequest();
-      xhr.withCredentials = true;   // Include the SESSION cookie info for authentication
-      (xhr.upload || xhr).addEventListener('progress', function (e) {
-         $('#profile-rotator').spin('tiny');
-      });
-      xhr.addEventListener('load', function (e) {
-        //console.log('xhr upload complete', e);
-        window.fileUploadsCompleted = window.fileUploadsCompleted + 1;
-
-		initEditor(function() {
-			addeditortext(xhr.responseText);
-		});
-
-		$('#jot-media').val($('#jot-media').val() + xhr.responseText);
-        // When all the uploads have completed, refresh the page
-        if (window.filesToUpload > 0 && window.fileUploadsCompleted === window.filesToUpload) {  
-          $('#profile-rotator').spin(false);
-          window.fileUploadsCompleted = window.filesToUpload = 0;
-        }
-      });
-      // POST to the wall_upload endpoint
-      xhr.open('post', '{{$baseurl}}/wall_attach/{{$nickname}}', true);
+      // open editor if it isn't yet initialised
+	  if (!editor) {
+			initEditor();
+	  }
+	  linkdrop(e);
 
-      var data = new FormData();
-      data.append('userfile', file);
-      xhr.send(data);
     }
 
 </script>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index dbbb470c5..cf99ede42 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,3 +1,4 @@
+<input id="invisible-wall-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple>
 <form id="profile-jot-form" action="{{$action}}" method="post" class="acl-form" data-form_id="profile-jot-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 	{{$mimeselect}}
 	{{$layoutselect}}
@@ -39,7 +40,7 @@
 		</div>
 		{{/if}}
 		<div id="jot-text-wrap">
-			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$share}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$content}}</textarea>
+			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$share}}" >{{$content}}</textarea>
 		</div>
 		{{if $attachment}}
 		<div id="jot-attachment-wrap">
-- 
cgit v1.2.3


From bd17dc52f263206923fca43bf5c15b0754e66c82 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sun, 16 Jul 2017 16:25:52 +0200
Subject: fix photo item comments

---
 view/tpl/photo_item.tpl | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'view')

diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
index ec643c4a9..b6ee4508b 100755
--- a/view/tpl/photo_item.tpl
+++ b/view/tpl/photo_item.tpl
@@ -1,10 +1,10 @@
 <div class="wall-item-outside-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-outside-wrapper-{{$id}}" >
-	<div class="wall-item-content-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;">
-		<div class="wall-item-head">
+	<div class="clearfix wall-item-content-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-content-wrapper-{{$id}}">
+		<div class="p-2 clearfix wall-item-head">
 			<div class="wall-item-info" id="wall-item-info-{{$id}}" >
 				<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
 					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
-					<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
+					<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" alt="{{$name}}" /></a>
 				</div>
 			</div>
 			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
@@ -14,20 +14,18 @@
 				<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
 			</div>
 		</div>
-		<div class="wall-item-content" id="wall-item-content-{{$id}}" >
+		<div class="p-2 clearfix wall-item-content" id="wall-item-content-{{$id}}" >
 			<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
 			<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
 
 		</div>
 		{{if $drop}}
-		<div class="wall-item-tools" id="wall-item-tools-{{$id}}" >
+		<div class="p-2 clearfix wall-item-tools" id="wall-item-tools-{{$id}}" >
 			<div class="wall-item-tools-right pull-right">
 				{{$drop}}
 			</div>
-			<div class="clear"></div>
 		</div>
 		{{/if}}
-		<div class="clear"></div>
 		{{$comment}}
 	</div>
 </div>
-- 
cgit v1.2.3


From 4728e72d182f78dc2f5768fdb55d1e142fc92129 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Mon, 17 Jul 2017 16:19:19 +0200
Subject: some love for the installer

---
 view/css/mod_setup.css        | 40 -----------------------------
 view/php/mod_import.php       |  2 --
 view/php/mod_setup.php        |  2 ++
 view/tpl/install.tpl          | 20 ++++++++++-----
 view/tpl/install_checks.tpl   | 49 +++++++++++++++++++----------------
 view/tpl/install_db.tpl       | 59 ++++++++++++++++++++++---------------------
 view/tpl/install_settings.tpl | 56 ++++++++++++++++++++--------------------
 7 files changed, 100 insertions(+), 128 deletions(-)
 delete mode 100644 view/css/mod_setup.css
 delete mode 100644 view/php/mod_import.php
 create mode 100644 view/php/mod_setup.php

(limited to 'view')

diff --git a/view/css/mod_setup.css b/view/css/mod_setup.css
deleted file mode 100644
index f0d91a0ae..000000000
--- a/view/css/mod_setup.css
+++ /dev/null
@@ -1,40 +0,0 @@
-#install-dbhost-label,
-#install-dbuser-label,
-#install-dbpass-label,
-#install-dbdata-label,
-#install-tz-desc {
-       float: left;
-       width: 250px;
-       margin-top: 10px;
-       margin-bottom: 10px;
-
-}
-
-#install-dbhost,
-#install-dbuser,
-#install-dbpass,
-#install-dbdata {
-       float: left;
-       width: 200px;
-       margin-left: 20px;
-}
-
-#install-dbhost-end,
-#install-dbuser-end,
-#install-dbpass-end,
-#install-dbdata-end,
-#install-tz-end {
-       clear: both;
-}
-
-#install-form select#timezone_select {
-       float: left;
-       margin-top: 18px;
-       margin-left: 20px;
-}
-
-main {
-	max-width: 790px;
-	margin-left: auto;
-	margin-right: auto;
-}
diff --git a/view/php/mod_import.php b/view/php/mod_import.php
deleted file mode 100644
index 56c4eff86..000000000
--- a/view/php/mod_import.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-App::$page['template'] = 'full';
diff --git a/view/php/mod_setup.php b/view/php/mod_setup.php
new file mode 100644
index 000000000..f0ed2742d
--- /dev/null
+++ b/view/php/mod_setup.php
@@ -0,0 +1,2 @@
+<?php
+App::$page['template'] = 'zen';
diff --git a/view/tpl/install.tpl b/view/tpl/install.tpl
index 0e77aa97b..5ab722b12 100755
--- a/view/tpl/install.tpl
+++ b/view/tpl/install.tpl
@@ -1,9 +1,15 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
+<div class="container mt-4 mb-4">
+	<div class="jumbotron">
+		<h1>{{$title}}</h1>
+		<hr class="my-4">
+		<h2><i class="fa fa-{{$icon}}"></i>&nbsp; {{$pass}}</h2>
+	</div>
 
+	{{if $status}}
+	<div class="alert alert-danger">{{$status}}</div>
+	{{/if}}
 
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-{{$text}}
+	<div class="alert alert-info">{{$text}}</div>
+	<br>
+	{{$what_next}}
+</div>
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
index ad0aef6a3..8bbb9f26d 100755
--- a/view/tpl/install_checks.tpl
+++ b/view/tpl/install_checks.tpl
@@ -1,24 +1,29 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-<form  action="{{$baseurl}}/index.php?q=setup" method="post">
-<table>
-{{foreach $checks as $check}}
-	<tr><td>{{$check.title}} </td><td><i class="fa {{if $check.status}}fa-check-square-o{{else}}{{if $check.required}}fa-square-o{{else}}fa-exclamation{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr>
-	{{if $check.help}}
-	<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
-	{{/if}}
-{{/foreach}}
-</table>
+<div class="container mt-4 mb-4">
+	<div class="jumbotron">
+		<h1>{{$title}}</h1>
+		<hr class="my-4">
+		<h2><i class="fa fa-heartbeat"></i>&nbsp; {{$pass}}</h2>
+	</div>
+	<form  action="{{$baseurl}}/index.php?q=setup" method="post">
+		<table class="table">
+			{{foreach $checks as $check}}
+			<tr><td{{if ! $check.status}} class="text-danger"{{/if}}>{{$check.title}}</td><td><i class="fa {{if $check.status}}fa-check-square-o{{else}}{{if $check.required}}fa-square-o{{else}}fa-exclamation text-danger{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr>
+			{{if $check.help}}
+			<tr><td colspan="3" class="border-top-0 pt-0 pb-0"><div class="alert alert-info">{{$check.help}}</div></td></tr>
+			{{/if}}
+			{{/foreach}}
+		</table>
 
-{{if $phpath}}
-	<input type="hidden" name="phpath" value="{{$phpath}}">
-{{/if}}
+		{{if $phpath}}
+		<input type="hidden" name="phpath" value="{{$phpath}}">
+		{{/if}}
 
-{{if $passed}}
-	<input type="hidden" name="pass" value="2">
-	<input type="submit" value="{{$next}}">
-{{else}}
-	<input type="hidden" name="pass" value="1">
-	<input type="submit" value="{{$reload}}">
-{{/if}}
-</form>
+		{{if $passed}}
+		<input type="hidden" name="pass" value="2">
+		<button class="btn btn-success" type="submit"><i class="fa fa-check"></i> {{$next}}</button>
+		{{else}}
+		<input type="hidden" name="pass" value="1">
+		<button class="btn btn-warning" type="submit"><i class="fa fa-refresh"></i> {{$reload}}</button>
+		{{/if}}
+	</form>
+</div>
diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl
index 1a58de129..8b9023443 100755
--- a/view/tpl/install_db.tpl
+++ b/view/tpl/install_db.tpl
@@ -1,30 +1,31 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-<p>
-{{$info_01}}<br>
-{{$info_02}}<br>
-{{$info_03}}
-</p>
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-<form id="install-form" action="{{$baseurl}}/setup" method="post">
-
-<input type="hidden" name="phpath" value="{{$phpath}}" />
-<input type="hidden" name="pass" value="3" />
-
-{{include file="field_input.tpl" field=$dbhost}}
-{{include file="field_input.tpl" field=$dbport}}
-{{include file="field_input.tpl" field=$dbuser}}
-{{include file="field_password.tpl" field=$dbpass}}
-{{include file="field_input.tpl" field=$dbdata}}
-{{include file="field_select.tpl" field=$dbtype}}
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
-
-</form>
+<div class="container mt-4 mb-4">
+	<div class="jumbotron">
+		<h1>{{$title}}</h1>
+		<hr class="my-4">
+		<h2><i class="fa fa-database"></i>&nbsp; {{$pass}}</h2>
+	</div>
+	<div class="alert alert-info">
+	{{$info_01}}<br>
+	{{$info_02}}<br>
+	{{$info_03}}
+	</div>
+
+	{{if $status}}
+	<div class="alert alert-danger">{{$status}}</div>
+	{{/if}}
+
+	<form id="install-form" action="{{$baseurl}}/setup" method="post">
+		<input type="hidden" name="phpath" value="{{$phpath}}" />
+		<input type="hidden" name="pass" value="3" />
+
+		{{include file="field_input.tpl" field=$dbhost}}
+		{{include file="field_input.tpl" field=$dbport}}
+		{{include file="field_input.tpl" field=$dbuser}}
+		{{include file="field_password.tpl" field=$dbpass}}
+		{{include file="field_input.tpl" field=$dbdata}}
+		{{include file="field_select.tpl" field=$dbtype}}
+
+		<button class="btn btn-primary" id="install-submit" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> 
+	</form>
+</div>
 
diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
index 62dcbb8b3..b62f8508b 100755
--- a/view/tpl/install_settings.tpl
+++ b/view/tpl/install_settings.tpl
@@ -1,28 +1,28 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-<form id="install-form" action="{{$baseurl}}/setup" method="post">
-
-<input type="hidden" name="phpath" value="{{$phpath}}" />
-<input type="hidden" name="dbhost" value="{{$dbhost}}" />
-<input type="hidden" name="dbport" value="{{$dbport}}" />
-<input type="hidden" name="dbuser" value="{{$dbuser}}" />
-<input type="hidden" name="dbpass" value="{{$dbpass}}" />
-<input type="hidden" name="dbdata" value="{{$dbdata}}" />
-<input type="hidden" name="dbtype" value="{{$dbtype}}" />
-<input type="hidden" name="pass" value="4" />
-
-{{include file="field_input.tpl" field=$adminmail}}
-{{include file="field_input.tpl" field=$siteurl}}
-
-{{include file="field_select_grouped.tpl" field=$timezone}}
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
-
-</form>
-
+<div class="container mt-4 mb-4">
+	<div class="jumbotron">
+		<h1>{{$title}}</h1>
+		<hr class="my-4">
+		<h2><i class="fa fa-cogs"></i>&nbsp; {{$pass}}</h2>
+	</div>
+
+	{{if $status}}
+	<div class="alert alert-danger">{{$status}}</div>
+	{{/if}}
+
+	<form id="install-form" action="{{$baseurl}}/setup" method="post">
+		<input type="hidden" name="phpath" value="{{$phpath}}" />
+		<input type="hidden" name="dbhost" value="{{$dbhost}}" />
+		<input type="hidden" name="dbport" value="{{$dbport}}" />
+		<input type="hidden" name="dbuser" value="{{$dbuser}}" />
+		<input type="hidden" name="dbpass" value="{{$dbpass}}" />
+		<input type="hidden" name="dbdata" value="{{$dbdata}}" />
+		<input type="hidden" name="dbtype" value="{{$dbtype}}" />
+		<input type="hidden" name="pass" value="4" />
+
+		{{include file="field_input.tpl" field=$adminmail}}
+		{{include file="field_input.tpl" field=$siteurl}}
+		{{include file="field_select_grouped.tpl" field=$timezone}}
+
+		<button class="btn btn-primary" id="install-submit" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+	</form>
+</div>
-- 
cgit v1.2.3


From 229f95d55584008740ce50859ca54fd94c6db11f Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Tue, 18 Jul 2017 15:45:45 +0200
Subject: some fixes for the bs-default schema

---
 view/theme/redbasic/schema/BS-Default.css |  7 +++++++
 view/theme/redbasic/schema/BS-Default.php | 20 +++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 view/theme/redbasic/schema/BS-Default.css

(limited to 'view')

diff --git a/view/theme/redbasic/schema/BS-Default.css b/view/theme/redbasic/schema/BS-Default.css
new file mode 100644
index 000000000..9045d3b97
--- /dev/null
+++ b/view/theme/redbasic/schema/BS-Default.css
@@ -0,0 +1,7 @@
+.navbar-dark .navbar-toggler {
+	color: rgba(0,0,0,0.7);
+}
+
+#notifications-btn.text-white {
+	color: #777 !important;
+}
diff --git a/view/theme/redbasic/schema/BS-Default.php b/view/theme/redbasic/schema/BS-Default.php
index ce464fe2c..14ee130d9 100644
--- a/view/theme/redbasic/schema/BS-Default.php
+++ b/view/theme/redbasic/schema/BS-Default.php
@@ -1,22 +1,12 @@
 <?php
 	
 	if (! $nav_bg)
-		$nav_bg = "#f8f8f8";
-	if (! $nav_bd)
-		$nav_bd = "#e7e7e7";
-	if (! $nav_gradient_top)
-		$nav_gradient_top = "#fff";
-	if (! $nav_gradient_bottom)
-		$nav_gradient_bottom = "#f8f8f8";
-	if (! $nav_active_gradient_top)
-		$nav_active_gradient_top = "#ebebeb";
-	if (! $nav_active_gradient_bottom)
-		$nav_active_gradient_bottom = "#f3f3f3";
+		$nav_bg = "#f8f9fa";
 	if (! $nav_icon_colour)
-		$nav_icon_colour = "#777";
+		$nav_icon_colour = "rgba(0, 0, 0, 0.5);";
 	if (! $nav_active_icon_colour)
-		$nav_active_icon_colour = "#555";
+		$nav_active_icon_colour = "rgba(0, 0, 0, 0.7)";
 	if (! $radius)
-		$radius = "4";
+		$radius = "4px";
 	if (! $banner_colour)
-		$banner_colour = "#777";
+		$banner_colour = "rgba(0, 0, 0, 0.7)";
-- 
cgit v1.2.3


From 77b58ec02f624f8242995f46e720b6783eb59300 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Thu, 20 Jul 2017 11:56:46 +0200
Subject: css fix

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

(limited to 'view')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 051797658..0f2628761 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -4,7 +4,7 @@
 		{{$nav.loginmenu.1.1}}
 	</a>
 	{{if $nav.register}}
-	<a class="btn btn-warning btn-sm text-white" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
+	<a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
 		{{$nav.register.1}}
 	</a>
 	{{/if}}
-- 
cgit v1.2.3


From 8e5c56dcc2e38884f897acaf9d2b39e5b5dd8c29 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Thu, 20 Jul 2017 12:03:54 +0200
Subject: more css fixes

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

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 510f7c80b..7f2ca4853 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1235,24 +1235,24 @@ img.mail-conv-sender-photo {
 
 .section-content-info-wrapper {
 	padding: 21px 10px;
-	color: #31708f;
-	background-color: #d9edf7;
+	color: #0c5460;
+	background-color: #d1ecf1;
 	border-bottom: 3px solid $comment_item_colour;
 	text-align: center;
 }
 
 .section-content-warning-wrapper {
 	padding: 21px 10px;
-	color: #8a6d3b;
-	background-color: #fcf8e3;
+	color: #856404;
+	background-color: #fff3cd;
 	border-bottom: 3px solid $comment_item_colour;
 	text-align: center;
 }
 
 .section-content-danger-wrapper {
 	padding: 21px 10px;
-	color: #a94442;
-	background-color: #f2dede;
+	color: #721c24;
+	background-color: #f8d7da;
 	border-bottom: 3px solid $comment_item_colour;
 	text-align: center;
 }
-- 
cgit v1.2.3


From 1bdcfe5219c810758ae255427513a7a0c09ce8e1 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Fri, 21 Jul 2017 10:32:21 +0200
Subject: provide a mechanism to mark apps active in the bin

---
 view/tpl/app.tpl | 2 +-
 view/tpl/nav.tpl | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'view')

diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 804db426f..ac5c18deb 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -26,7 +26,7 @@
 </div>
 {{/if}}
 {{if $navapps}}
-<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
+<a class="dropdown-item{{if $app.active}} active{{/if}}" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
 {{/if}}
 {{if $order}}
 <a href="{{$hosturl}}appman/{{$app.guid}}/moveup" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 0f2628761..93bbe187f 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -19,10 +19,10 @@
 	{{if $localuser}}
 	<div class="dropdown-menu">
 		{{foreach $nav.usermenu as $usermenu}}
-		<a class="dropdown-item"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
+		<a class="dropdown-item{{if $usermenu.2}} active{{/if}}"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
 		{{/foreach}}
 		{{if $nav.manage}}
-		<a class="dropdown-item" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
+		<a class="dropdown-item{{if $sel.active == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
 		{{/if}}	
 		{{if $nav.channels}}
 		{{foreach $nav.channels as $chan}}
@@ -34,11 +34,11 @@
 		{{/if}}
 		{{if $nav.settings}}
 		<div class="dropdown-divider"></div>
-		<a class="dropdown-item" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
+		<a class="dropdown-item{{if $sel.active == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
 		{{/if}}
 		{{if $nav.admin}}
 		<div class="dropdown-divider"></div>
-		<a class="dropdown-item" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
+		<a class="dropdown-item{{if $sel.active == Admin}} active{{/if}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
 		{{/if}}
 		{{if $nav.logout}}
 		<div class="dropdown-divider"></div>
-- 
cgit v1.2.3


From 4335e49381a766bc59b3ccd3df9c4981afab7603 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sat, 22 Jul 2017 11:04:18 +0200
Subject: more nav_set_selected

---
 view/theme/redbasic/css/style.css | 5 +++++
 view/tpl/nav.tpl                  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 7f2ca4853..2c881049e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1380,6 +1380,11 @@ blockquote {
 	background-color: $item_colour;
 }
 
+.dropdown-item.active {
+	color: #fff;
+	background-color: #007bff;
+}
+
 .bg-dark {
 	background-color: $nav_bg !important;
 }
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 93bbe187f..cb0e2af32 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,5 +1,5 @@
 {{if $nav.login && !$userinfo}}
-<div class="d-md-none p-1">
+<div class="d-md-none pt-1 pb-1">
 	<a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
 		{{$nav.loginmenu.1.1}}
 	</a>
-- 
cgit v1.2.3


From f4a4d70149b74a73faf5e777350d76946eeefe93 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sat, 22 Jul 2017 12:01:13 +0200
Subject: indicate the selected channel in the dropdown menu and minor css
 fixes

---
 view/css/mod_manage.css | 12 ------------
 view/tpl/channel.tpl    |  6 +++---
 view/tpl/nav.tpl        |  2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'view')

diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css
index 077b6b838..b08c90b62 100644
--- a/view/css/mod_manage.css
+++ b/view/css/mod_manage.css
@@ -4,10 +4,6 @@
 	text-decoration: none;
 }
 
-.new-notification {
-	color: #c60032;
-}
-
 .channel-photo-wrapper {
 	display: table-cell;
 	table-layout: fixed;
@@ -24,11 +20,3 @@
 	vertical-align: top;
 	padding-left: 10px;
 }
-
-.selected-channel {
-	color: green;
-}
-
-#all-channels-end {
-	margin-bottom: 20px;
-}
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index 1a84f1e66..63e09ec05 100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -17,7 +17,7 @@
 	</div>
 	<h3>
 		{{if $selected == $channel.channel_id}}
-		<i class="selected-channel fa fa-circle" title="{{$msg_selected}}"></i>
+		<i class="fa fa-circle text-success" title="{{$msg_selected}}"></i>
 		{{/if}}
 		{{if $channel.delegate}}
 		<i class="fa fa-arrow-circle-right" title="{{$delegated_desc}}"></i>
@@ -37,11 +37,11 @@
 	<div class="channel-notifications-wrapper">
 		{{if !$channel.delegate}}
 		<div class="channel-notification">
-			<i class="fa fa-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i>
+			<i class="fa fa-fw fa-envelope{{if $channel.mail != 0}} text-danger{{/if}}"></i>
 			{{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}}
 		</div>
 		<div class="channel-notification">
-			<i class="fa fa-user{{if $channel.intros != 0}} new-notification{{/if}}"></i>
+			<i class="fa fa-fw fa-user{{if $channel.intros != 0}} text-danger{{/if}}"></i>
 			{{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}}
 		</div>
 		{{/if}}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index cb0e2af32..288a15f2c 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -26,7 +26,7 @@
 		{{/if}}	
 		{{if $nav.channels}}
 		{{foreach $nav.channels as $chan}}
-		<a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a>
+		<a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem"><i class="fa fa-circle{{if $localuser == $chan.channel_id}} text-success{{else}} invisible{{/if}}"></i> {{$chan.channel_name}}</a>
 		{{/foreach}}
 		{{/if}}
 		{{if $nav.profiles}}
-- 
cgit v1.2.3


From 16067db718b0746892a5c81782ee72e21554b62c Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sat, 22 Jul 2017 12:46:02 +0200
Subject: show the right conversation active and do not show any conversation
 active if we compose a new one

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

(limited to 'view')

diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 827c7628f..65d8dcdb4 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,6 +1,6 @@
 <li class="nav-item">
 	<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}">
-		<span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br>
+		<span class="{{if ! $message.seen || $message.selected}}font-weight-bold{{/if}}">{{$message.subject}}</span><br>
 		<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
 		<span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span>
 	</a>
-- 
cgit v1.2.3


From 72ed290ccd63d8cc92d50ed8239159a2f3fa307a Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sat, 22 Jul 2017 16:23:41 +0200
Subject: add text-dark class to cat tagsinput

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

(limited to 'view')

diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 14b977b80..a4fee495c 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -55,7 +55,7 @@ $(document).ready(function() {
 	});
 
 	$("input[data-role=cat-tagsinput]").tagsinput({
-		tagClass: 'badge badge-pill badge-warning'
+		tagClass: 'badge badge-pill badge-warning text-dark'
 	});
 
 	var doctitle = document.title;
-- 
cgit v1.2.3


From 5cc8837fb6605d18f09693e4ca418b8a5d38f57b Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Tue, 25 Jul 2017 20:06:01 +0200
Subject: make local channel (not our own) nav menus appear similar to what we
 are used from remote channels

---
 view/tpl/nav.tpl | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'view')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 288a15f2c..c0b34bbe8 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -16,7 +16,7 @@
 		<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
 		<i class="fa fa-caret-down"></i>
 	</div>
-	{{if $localuser}}
+	{{if $is_owner}}
 	<div class="dropdown-menu">
 		{{foreach $nav.usermenu as $usermenu}}
 		<a class="dropdown-item{{if $usermenu.2}} active{{/if}}"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
@@ -45,14 +45,13 @@
 		<a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a>
 		{{/if}}
 	</div>
-	{{else}}
-	{{if $nav.rusermenu}}
+	{{/if}}
+	{{if ! $is_owner}}
 	<div class="dropdown-menu" role="menu" aria-labelledby="avatar">
 		<a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a>
 		<a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a>
 	</div>
 	{{/if}}
-	{{/if}}
 </div>
 {{/if}}
 <div class="navbar-toggler-right">
@@ -204,7 +203,7 @@
 				{{if $channel_apps.0}}
 				</div>
 				{{/if}}
-				{{if $localuser}}
+				{{if $is_owner}}
 				<div class="dropdown-divider"></div>
 				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
 				<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
@@ -230,7 +229,7 @@
 		{{if $channel_apps.0}}
 		</div>
 		{{/if}}
-		{{if $localuser}}
+		{{if $is_owner}}
 		<div class="dropdown-divider"></div>
 		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
 		<a class="nav-link" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
-- 
cgit v1.2.3


From 53570de5a3585193089bf00c421e4b9c9059e139 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Thu, 27 Jul 2017 20:47:07 +0200
Subject: remove borders from navbar toggler

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

(limited to 'view')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index c0b34bbe8..b9abf4d48 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -68,7 +68,7 @@
 		<i class="fa fa-exclamation-circle"></i>
 	</button>
 	{{/if}}
-	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
+	<button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
 		<i class="fa fa-bars"></i>
 	</button>
 </div>
-- 
cgit v1.2.3


From 11cdd0033d7cff690a9df75d8b5a3b8a29f8098b Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sun, 30 Jul 2017 10:45:59 +0200
Subject: no need for jquery here

---
 view/tpl/photo_album.tpl   | 5 ++++-
 view/tpl/photos_recent.tpl | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 8bacb1575..89b169f58 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -28,5 +28,8 @@
 	</div>
 </div>
 <div class="photos-end"></div>
-<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
+<script>
+	loadingPage = false;
+	justifyPhotos('photo-album-contents-{{$album_id}}');
+</script>
 <div id="page-spinner"></div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 8fe631ca6..c6a9067c1 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -19,5 +19,8 @@
 	</div>
 </div>
 <div class="photos-end"></div>
-<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
+<script>
+	loadingPage = false;
+	justifyPhotos('photo-album-contents-{{$album_id}}');
+</script>
 <div id="page-spinner"></div>
-- 
cgit v1.2.3


From 280f52f007f00e0a8b2c910445bb54dfbf7275a0 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sat, 29 Jul 2017 16:06:42 +0200
Subject: close the apps-menu if the notifications-menu is open and vice versa

---
 view/js/main.js                    |  2 +-
 view/theme/redbasic/js/redbasic.js | 12 ++++++++++++
 view/tpl/nav.tpl                   |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index 6c42531ea..61a37aa99 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -375,7 +375,7 @@ function NavUpdate() {
 			}
 			else {
 				$('#notifications-btn').css('opacity', 0.5);
-				$('#navbar-collapse-1').removeClass('in');
+				$('#navbar-collapse-1').removeClass('show');
 			}
 
 			if(data.network == 0) {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index a4fee495c..5a586b9f9 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -54,6 +54,18 @@ $(document).ready(function() {
 		}
 	});
 
+	$('#menu-btn').click(function() {
+		if($('#navbar-collapse-1').hasClass('show')){
+			$('#navbar-collapse-1').removeClass('show');
+		}
+	});
+
+	$('#notifications-btn').click(function() {
+		if($('#navbar-collapse-2').hasClass('show')){
+			$('#navbar-collapse-2').removeClass('show');
+		}
+	});
+
 	$("input[data-role=cat-tagsinput]").tagsinput({
 		tagClass: 'badge badge-pill badge-warning text-dark'
 	});
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index b9abf4d48..f480ce994 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -68,7 +68,7 @@
 		<i class="fa fa-exclamation-circle"></i>
 	</button>
 	{{/if}}
-	<button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
+	<button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
 		<i class="fa fa-bars"></i>
 	</button>
 </div>
-- 
cgit v1.2.3


From a72b549aa717e988df006061af38e5c4d91d4ce0 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 1 Aug 2017 00:56:59 +0200
Subject: less badge more icon

---
 view/css/bootstrap-red.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 2133a2461..d7638714b 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -5,6 +5,7 @@
 nav .badge {
 	position: absolute;
 	font-size: 0.75rem;
+	line-height: 0.75;
 }
 
 @media screen and (min-width: 767px) {
-- 
cgit v1.2.3


From 4e2a050afbd62f7b893d91306daa3e4b0328d006 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 1 Aug 2017 14:25:59 +0200
Subject: remove blugrid schema until somebody cares to fix it

---
 view/theme/redbasic/schema/bluegrid.css | 515 --------------------------------
 view/theme/redbasic/schema/bluegrid.php |  28 --
 2 files changed, 543 deletions(-)
 delete mode 100644 view/theme/redbasic/schema/bluegrid.css
 delete mode 100644 view/theme/redbasic/schema/bluegrid.php

(limited to 'view')

diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
deleted file mode 100644
index 46e28197e..000000000
--- a/view/theme/redbasic/schema/bluegrid.css
+++ /dev/null
@@ -1,515 +0,0 @@
-body 	{
-    background-size: auto;
-}
-
-.generic-content-wrapper-styled {
-    background-color: rgba(67,72,138,.8);
-	color: #FFF;
-}
-
-.generic-content-wrapper-styled .btn-default:hover, #profile-jot-wrapper .btn-default:hover {
-	border: 1px solid #FFF;
-}
-
-#profile-jot-wrapper {
-	background-color: inherit;
-	border: none;
-}
-
-.generic-content-wrapper-styled a:hover, .generic-content-wrapper-styled a:focus, .generic-content-wrapper-styled .field.checkbox:hover label, .generic-content-wrapper-styled .field.checkbox:focus label, .allcontact-link:hover, .allcontact-link:focus {
-	color: rgba(255,255,255,.8);
-}
-
-.generic-content-wrapper, .profile-jot-text, .comment-edit-text-empty, .comment-edit-text-full, input.widget-input, .wall-item-content-wrapper, .section-title-wrapper, .section-content-wrapper {
-	border-radius: 0px !important;
-}
-
-.generic-content-wrapper {
-	background-color: rgba(255,255,255,.8);
-	color: #4d4d4d;
-}
-
-.wall-item-content-wrapper {
-	background-color: #FFF;
-}
-
-.hide-comments-outer, .wall-item-content-wrapper.comment, .wall-item-comment-wrapper {
-	background-color: transparent;
-}
-
-.generic-content-wrapper-styled .generic-content-wrapper {
-		color: #4D4D4D;
-}
-
-.generic-content-wrapper-styled .generic-content-wrapper a {
-		color: #43488A;
-}
-
-.generic-content-wrapper #profile-jot-wrapper {
-    background-color: transparent;
-	color: #4D4D4D;
-}
-
-.generic-content-wrapper input#jot-title, .generic-content-wrapper input#jot-pagetitle {
-    color: #4D4D4D;
-}
-
-.generic-content-wrapper input#jot-title:hover, .generic-content-wrapper input#jot-title:focus {
-    color: #4D4D4D;
-    border-radius: 0px;
-}
-
-
-.fn, .widget h3, .nav-tabs a, .generic-content-wrapper-styled a, .dropdown-menu > li > a, #channels-desc, input#jot-title {
-    color: #fff;
-	border-radius: 0px
-}
-
-ul.dropdown-menu.acpopup > li.textcomplete-item > a {
-	color: #43488A;
-}
-
-ul.dropdown-menu.acpopup > li.textcomplete-item > a:hover, ul.dropdown-menu.acpopup > li.textcomplete-item > a:focus {
-	background-color: #43488A;
-	color: #FFF;
-	cursor: pointer;
-}
-
-input#jot-title:hover, input#jot-title:focus {
-	color: #43488A;
-	border-radius: 0px;
-}
-
-.navbar-inverse {
-    background-color: transparent;
-    border-color: transparent;
-    background-image: none;
-}
-
-.navbar-inverse .navbar-nav > .active > a {
-	background-image: none;
-	background: rgba(255,255,255,.5);
-}
-
-.navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus {
-	background: rgba(255,255,255,.5);
-}
-
-.navbar-inverse .navbar-nav > li > a:hover,
-.navbar-inverse .navbar-nav > li > a:focus {
-	color: #43488A;
-	background: rgba(255,255,255,.5);
-}
-
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus {
-	background-color: #43488A;
-	color: #fff;
-}
-
-#nav-search-text {
-    color: #fff;
-    background-color: #43488A;
-    border-radius: 0px;
-    border-color: transparent;
-}
-
-nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu, .section-content-wrapper .dropdown-menu {
-    background-color: #43488A;
-    color: #fff;
-    border-radius: 0;
-    border: none;
-    box-shadow: 0px 6px 12px rgba(45,48,92,.176);
-}
-
-.dropdown-menu > li > a:focus, .dropdown-menu > li > a:hover {
-    color: #43488A;
-    background-color: rgba(255,255,255,.7);
-    text-decoration: underline;
-}
-
-.vcard .dropdown-menu {
-    background-color: rgba(255,255,255,.97);
-    border-radius: 0;
-    border: none;
-    box-shadow: 0px 6px 12px rgba(169,169,169,.176);
-}
-
-.vcard .dropdown-menu a, .fc-today {
-    color: #43488A;
-}
-
-.vcard .dropdown-menu > li > a:focus, .vcard .dropdown-menu > li > a:hover {
-    color: #43488A;
-    background-color: rgba(	255,255,255,.7);
-    text-decoration: underline;
-}
-
-nav .badge {
-    background-color: rgba(255,255,255,.8);
-	color: #43488A;
-	border-radius: 0px !important;
-}
-
-nav .badge:hover, nav .badge:focus {
-    background-color: rgba(67,72,138,.8);
-	color: #FFF;
-}
-
-.field.checkbox > div > input:checked + label .onoffswitch-switch {
-	background-color: #43488A;
-}
-
-.widget .field.checkbox:hover label {
-    color: rgba(255,255,255,.8);
-}
-
-.widget .conv-participants {
-	color: #BBB;
-}
-
-.widget .active:hover .conv-participants, .widget .active:focus .conv-participants {
-	color: inherit;
-}
-
-.help-block, .comment-icon, .jot-icons, .admin-icons {
-	color: inherit;
-}
-
-#adminpage table tr:hover, #adminpage table tr:hover a, #adminpage table tr td.tools a:hover, #adminpage table tr:focus, #adminpage table tr:focus a, #adminpage table tr td.tools a:focus {
-    color: #43488A;
-}
-
-#adminpage table tr:hover .tools a, #adminpage table tr:focus .tools a, .generic-content-wrapper-styled > .descriptive-text {
-	color: #FFF;
-}
-
-.generic-content-wrapper-styled > .sources-links {
-	font-weight: bold;
-}
-
-.wall-item-tools .btn {
-	border-color: #43488A;
-}
-
-.vcard, #contact-block, .widget {
-    background-color: rgba(67,72,138,.8);
-    color: #fff;
-    border-radius: 0;
-    border: none;
-    box-shadow: 0px 6px 12px rgba(45,48,92,.176);
-}
-
-.tags a {
-	color: inherit;
-}
-
-#profile-photo-wrapper {
-    border: none;
-}
-
-.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
-    color: #43488A;
-    text-decoration: none;
-	border: none;	
-}
-
-.nav-tabs > li.active {
-    background-color: rgba(255,255,255,.5);
-}
-
-.nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover {
-    border-color: transparent;
-}
-
-.nav-tabs.nav-justified {
-    background-color: rgba(67,72,138,.8);
-    border-bottom: 1px solid rgba(255,255,255,.5);
-    border-radius: 0px;
-}
-
-.nav-tabs.nav-justified > li > a {
-    border-bottom: 1px solid transparent;
-    border-radius: 0px;
-}
-
-.nav > li > a:focus, .nav > li > a:hover {
-    text-decoration: underline;
-    background-color: rgba(255,255,255,.5);
-    color: #43488A;
-	border-radius: 0;	
-	border-color: transparent;	
-}
-
-.nav > li > a {
-    color: #FFF;
-    border-radius: 0px;
-}
-
-.fc-event {
-    border: none !important;
-    background-color: rgba(255,255,255,.7) !important;
-    color: #43488A !important;
-    text-shadow: none !important;
-}
-
-div.rateme {
-	border-radius: 0px;
-    font-weight: 400;
-}
-
-div.rateme:hover, div.rateme:focus, a.rateme:hover, a.rateme:focus {
-	background-color: #43488A;
-	border-radius: 0px;
-	color: #FFF;
-    font-weight: 400;
-    -webkit-transition: all .3s ease-in-out;
-    -moz-transition: all .3s ease-in-out;
-    transition: all .3s ease-in-out;
-}
-
-.info {
-	background: rgba(255,255,255,.7) url("/images/hz-32.png") no-repeat scroll 15px center !important;
-	color: #43488A !important;
-}
-
-.notice {
-	background: rgba(215,43,52,.7) url("/images/hz-white-32.png") no-repeat scroll 15px center !important;
-	color: #FFF !important;
-}
-
-#chatTopBar {
-	background-color: rgba(255,255,255,.8);
-	color: #4d4d4d;
-    height: 500px;
-    width: 596px;
-    overflow-y: auto;
-}
-
-.chat-item-text {
-    border-radius: 0px;
-	padding: 5px;
-    background-color: #FFF;
-}
-
-input {
-	border-radius: 0px;	
-}
-
-.home-welcome {
-	color: #FFF;
-	margin-bottom: 30px;
-} 
-
-#login-main {
-    margin-top: 0;
-    color: #EEE;
-}
-
-#remember_me_container label:hover, #remember_container label:hover {
-    color: #FFF;
-}
-
-#login-main #lost-password-link, #login-main #register-link {
-    color: #FFF;
-}
-
-#nav-login .modal-content {
-	background-color: #43488A;
-	background-image: url('/images/bggrid.png');
-	box-shadow: 0 5px 15px rgba(0,0,0,.3);
-	-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.3);
-}
-
-#nav-login h3, #nav-login button.close {
-    color: #EEE;
-}
-
-#nav-login .modal-header {
-	border-bottom: none;
-}
-
-.directory-item {
-    margin-bottom: 0px;
-	padding-bottom: 20px;
-	background-color: #FFF;
-}
-
-.directory-item.lframe {
-	background-color: transparent !important;
-}
-
-.contact-entry-wrapper {
-	border: 1px solid rgba(255,255,255,.5);
-}
-
-.contact-entry-edit:hover a, .contact-entry-edit:focus	 a, .generic-content-wrapper-styled > p > span.btn.btn-default > a:hover,.generic-content-wrapper-styled > p > span.btn.btn-default > a:focus, div#profile-edit-links a:hover, div#profile-edit-links a:focus {
-	color: #43488A;
-}
-
-.profile-edit-side-link, input#profile-photo-upload, .allcontact-link, #newchannel-form .descriptive-paragraph	 {
-	color: #FFF;
-}
-
-.profile-edit-side-link:hover, .profile-edit-side-link:focus {
-	color: #FFF;
-	text-decoration: none;
-}
-
-.section-content-info-wrapper {
-	color: #fff;
-	background-color: #43488A;
-}
-
-.section-content-info-wrapper a {
-	color: #fff;
-}
-
-.btn, #event-edit-form .btn, input.directory-rating-submit {
-    border: 1px solid #FFF;
-    color: #FFF; 
-    background-color: #43488A;
-    border-radius: 0;
-    font-weight: 400;
-    -webkit-transition: all .3s ease-in-out;
-    -moz-transition: all .3s ease-in-out;
-    transition: all .3s ease-in-out;
-}
-
-.btn:hover, .btn:focus, #event-edit-form .btn:hover, #event-edit-form .btn:focus {
-    border: 1px solid #FFF;
-    outline: 0;
-    color: #43488A;
-    background-color: #FFF;
-}
-
-.btn-default:hover, .btn-default:focus, .open > .dropdown-toggle.btn-default, input.directory-rating-submit:hover, input.directory-rating-submit:focus {
-    border: 1px solid #43488A;
-    outline: 0;
-    color: #43488A;
-    background-color: #FFF;
-}
-
-.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit, input#newchannel-submit-button, input#contacts-search-submit, input#register-submit-button {
-    background-color: #FFF;
-    color: #43488A;
-	border-radius: 0px;
-    -webkit-transition: all .3s ease-in-out;
-    -moz-transition: all .3s ease-in-out;
-    transition: all .3s ease-in-out;
-}
-
-.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus, input#newchannel-submit-button:hover, input#newchannel-submit-button:focus, input#contacts-search-submit:hover, input#contacts-search-submit:focus, input#register-submit-button:hover, input#register-submit-button:focus {
-    border-color: #FFF;
-    background-color: #43488A;
-    color: #FFF;
-	border-radius: 0px;
-}
-
-.comment-tools .btn, #prvmail-tools .btn, .generic-content-wrapper .btn {
-    border: 1px solid #43488A;
-    color: #43488A; 
-    background-color: #FFF;
-}
-
-.comment-tools .btn:hover, .comment-tools .btn:focus, #prvmail-tools .btn:hover, #prvmail-tools .btn:focus, .generic-content-wrapper .btn:hover, .generic-content-wrapper .btn:focus {
-    border: 1px solid #43488A !important;
-    color: #FFF; 
-    background-color: #43488A;
-}
-
-.comment-tools .btn-primary, #prvmail-submit .btn-primary, .settings-submit-wrapper .btn-primary, .generic-content-wrapper .btn-primary {
-    background-color: #43488A;
-    color: #FFF;
-    border: 1px solid #43488A;
-}
-
-.comment-tools .btn-primary:hover, .comment-tools .btn-primary:focus, #prvmail-submit .btn-primary:hover, #prvmail-submit .btn-primary:focus, .settings-submit-wrapper .btn-primary:hover, .settings-submit-wrapper .btn-primary:focus, .generic-content-wrapper .btn-primary:hover, .generic-content-wrapper .btn-primary:focus {
-    border-color: #43488A;
-    background-color: #FFF;
-    color: #43488A;
-}
-
-.btn-success {
-    color: #FFF !important;
-    background-color: #5CB85C !important;
-    border-color: #4CAE4C !important;
-}
-
-.btn-success:hover, .btn-success:focus {
-    color: #FFF !important;
-    background-color: #449D44 !important;
-    border-color: #398439 !important;
-}
-
-.btn-warning {
-    color: #FFF !important;
-    background-color: #F0AD4E !important;
-    border-color: #EEA236 !important;
-}
-
-.btn-warning:hover, .btn-warning:focus {
-	color: #FFF !important;
-	background-color: #EC971F !important;
-	border-color: #D58512 !important;
-}
-
-.btn-danger, form#chat-destroy > input {
-    background-color: #D9534F !important;
-    border-color: #D43F3A !important;
-	color: #FFF !important;
-}
-.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
-	color: #FFF !important;
-    background-color: #C9302C !important;		
-    border-color: #AC2925 !important;
-}
-
-a:hover > .fa-trash-o {
-	color: #C9302C !important;	
-}
-
-@media screen and (max-width: 767px) {
-	.navbar-inverse .navbar-collapse {
-    		background-color: #43488A;
-    		border: none;
-	}
-	.navbar-inverse .navbar-toggle {
-		border-color: #576295;
-		background-color: #43488A;
-		border-radius: 0px;
-	}
-	.navbar-inverse .navbar-toggle .icon-bar {
-		background-color: #FFF;
-	}
-	.navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left, .navbar-inverse .navbar-toggle .fa-question-circle  {
-		color: #FFF;
-	}
-	.navbar-inverse .navbar-toggle:hover .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-left, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-left {
-		color: #43488A;
-	}
-	.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
-		background-color: #FFF !important;
-	}
-	.navbar-toggle:hover .icon-bar , .navbar-toggle:focus .icon-bar 	{
-		background-color: #43488A !important;
-	}
-}
-
-.help-content {
-	color: #FFF;
-	border: none;
-}
-
-.help-content a {
-	color: #FFF;
-	font-weight: 600;
-}
-
-.help-content-open {
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
-
diff --git a/view/theme/redbasic/schema/bluegrid.php b/view/theme/redbasic/schema/bluegrid.php
deleted file mode 100644
index fdb552611..000000000
--- a/view/theme/redbasic/schema/bluegrid.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-	
-	if (! $nav_bg)
-		$nav_bg = "#FFF";
-	if (! $nav_active_gradient_top)
-		$nav_active_gradient_top = "#FFF";
-	if (! $nav_active_gradient_bottom)
-		$nav_active_gradient_bottom = "#43488A";
-	if (! $nav_bd)
-		$nav_bd = "#fff";
-	if (! $nav_icon_colour)
-		$nav_icon_colour = "#FFF";
-	if (! $nav_active_icon_colour)
-			$nav_active_icon_colour = "#43488A";
-	if (! $banner_colour)
-		$banner_colour = "#fff";
-	if (! $bgcolour)
-		$bgcolour = "#43488A";
-	if (! $background_image)
-		$background_image = "/images/bggrid.png";
-	if (! $link_colour)
-		$link_colour = "#43488A";
-
-
-		
-		
-
-		
-- 
cgit v1.2.3


From 1416b818770ed7f867a7c95021dc45f038edf8d2 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Tue, 1 Aug 2017 18:03:53 +0200
Subject: use small line-height only for larger screens

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

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index d7638714b..a3a8ce0be 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -5,13 +5,13 @@
 nav .badge {
 	position: absolute;
 	font-size: 0.75rem;
-	line-height: 0.75;
 }
 
 @media screen and (min-width: 767px) {
 	nav .badge {
 		top: 0px;
 		left: 0px;
+		line-height: 0.75;
 	}
 }
 
-- 
cgit v1.2.3


From acddf5aa8d5f18181fcef5432c69e0f790c7f458 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Wed, 2 Aug 2017 00:28:05 +0200
Subject: css fix

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

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 2c881049e..fd2ceb2c9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -484,6 +484,7 @@ footer {
 
 #nav-search-text {
 	width: 280px;
+	padding: .15rem .5rem;
 }
 
 #nav-search-text::-webkit-input-placeholder {
-- 
cgit v1.2.3


From 2a34a497d5f845a2d1b1a71d459bff279be3cf9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= <mjfriaza@openmailbox.org>
Date: Wed, 2 Aug 2017 08:57:30 +0200
Subject: Updated the Spanish translation

---
 view/es-es/hmessages.po | 4412 ++++++++++++++++++++++++-----------------------
 view/es-es/hstrings.php |  298 ++--
 2 files changed, 2380 insertions(+), 2330 deletions(-)

(limited to 'view')

diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index f67a524d5..3f95bb6a7 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 15:36+0200\n"
-"PO-Revision-Date: 2017-05-04 10:22+0000\n"
+"POT-Creation-Date: 2017-08-01 12:13+0200\n"
+"PO-Revision-Date: 2017-08-02 06:49+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -23,163 +23,147 @@ msgstr ""
 "Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../Zotlabs/Access/Permissions.php:46
+#: ../../Zotlabs/Access/Permissions.php:53
 msgid "Can view my channel stream and posts"
 msgstr "Pueden verse la actividad y publicaciones de mi canal"
 
-#: ../../Zotlabs/Access/Permissions.php:47 ../../include/permissions.php:42
+#: ../../Zotlabs/Access/Permissions.php:54
 msgid "Can send me their channel stream and posts"
 msgstr "Se me pueden enviar entradas y contenido de un canal"
 
-#: ../../Zotlabs/Access/Permissions.php:48 ../../include/permissions.php:36
+#: ../../Zotlabs/Access/Permissions.php:55
 msgid "Can view my default channel profile"
 msgstr "Puede verse mi perfil de canal predeterminado."
 
-#: ../../Zotlabs/Access/Permissions.php:49 ../../include/permissions.php:37
+#: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my connections"
 msgstr "Pueden verse mis conexiones"
 
-#: ../../Zotlabs/Access/Permissions.php:50 ../../include/permissions.php:38
+#: ../../Zotlabs/Access/Permissions.php:57
 msgid "Can view my file storage and photos"
 msgstr "Pueden verse mi repositorio de ficheros y mis fotos"
 
-#: ../../Zotlabs/Access/Permissions.php:51
+#: ../../Zotlabs/Access/Permissions.php:58
 msgid "Can upload/modify my file storage and photos"
 msgstr "Se pueden subir / modificar elementos en mi repositorio de ficheros y fotos"
 
-#: ../../Zotlabs/Access/Permissions.php:52
+#: ../../Zotlabs/Access/Permissions.php:59
 msgid "Can view my channel webpages"
 msgstr "Pueden verse las páginas personales de mi canal"
 
-#: ../../Zotlabs/Access/Permissions.php:53
+#: ../../Zotlabs/Access/Permissions.php:60
 msgid "Can view my wiki pages"
 msgstr "Pueden verse mis páginas wiki"
 
-#: ../../Zotlabs/Access/Permissions.php:54
+#: ../../Zotlabs/Access/Permissions.php:61
 msgid "Can create/edit my channel webpages"
 msgstr "Pueden crearse / modificarse páginas personales en mi canal"
 
-#: ../../Zotlabs/Access/Permissions.php:55
+#: ../../Zotlabs/Access/Permissions.php:62
 msgid "Can write to my wiki pages"
 msgstr "Se pueden modificar las páginas de mi wiki"
 
-#: ../../Zotlabs/Access/Permissions.php:56
+#: ../../Zotlabs/Access/Permissions.php:63
 msgid "Can post on my channel (wall) page"
 msgstr "Pueden crearse entradas en mi página de inicio del canal (“muro”)"
 
-#: ../../Zotlabs/Access/Permissions.php:57 ../../include/permissions.php:44
+#: ../../Zotlabs/Access/Permissions.php:64
 msgid "Can comment on or like my posts"
 msgstr "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'."
 
-#: ../../Zotlabs/Access/Permissions.php:58 ../../include/permissions.php:45
+#: ../../Zotlabs/Access/Permissions.php:65
 msgid "Can send me private mail messages"
 msgstr "Se me pueden enviar mensajes privados"
 
-#: ../../Zotlabs/Access/Permissions.php:59
+#: ../../Zotlabs/Access/Permissions.php:66
 msgid "Can like/dislike profiles and profile things"
 msgstr "Se puede mostrar agrado o desagrado (Me gusta / No me gusta) en mis perfiles y sus distintos apartados"
 
-#: ../../Zotlabs/Access/Permissions.php:60
+#: ../../Zotlabs/Access/Permissions.php:67
 msgid "Can forward to all my channel connections via @+ mentions in posts"
 msgstr "Pueden reenviarse publicaciones a todas las conexiones de mi canal a través de @+ menciones en las entradas"
 
-#: ../../Zotlabs/Access/Permissions.php:61
+#: ../../Zotlabs/Access/Permissions.php:68
 msgid "Can chat with me"
 msgstr "Se puede chatear conmigo"
 
-#: ../../Zotlabs/Access/Permissions.php:62 ../../include/permissions.php:53
+#: ../../Zotlabs/Access/Permissions.php:69
 msgid "Can source my public posts in derived channels"
 msgstr "Pueden utilizarse mis entradas públicas como origen de contenidos  en canales derivados"
 
-#: ../../Zotlabs/Access/Permissions.php:63
+#: ../../Zotlabs/Access/Permissions.php:70
 msgid "Can administer my channel"
 msgstr "Se puede administrar mi canal"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:248
-#: ../../include/permissions.php:946
 msgid "Social Networking"
 msgstr "Redes sociales"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:249
-#: ../../include/permissions.php:946
 msgid "Social - Mostly Public"
 msgstr "Social - Público en su mayor parte"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:250
-#: ../../include/permissions.php:946
 msgid "Social - Restricted"
 msgstr "Social - Restringido"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:251
-#: ../../include/permissions.php:946
 msgid "Social - Private"
 msgstr "Social - Privado"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:254
-#: ../../include/permissions.php:947
 msgid "Community Forum"
 msgstr "Foro de discusión"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:255
-#: ../../include/permissions.php:947
 msgid "Forum - Mostly Public"
 msgstr "Foro - Público en su mayor parte"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:256
-#: ../../include/permissions.php:947
 msgid "Forum - Restricted"
 msgstr "Foro - Restringido"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:257
-#: ../../include/permissions.php:947
 msgid "Forum - Private"
 msgstr "Foro - Privado"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:260
-#: ../../include/permissions.php:948
 msgid "Feed Republish"
 msgstr "Republicar un \"feed\""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:261
-#: ../../include/permissions.php:948
 msgid "Feed - Mostly Public"
 msgstr "Feed - Público en su mayor parte"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:262
-#: ../../include/permissions.php:948
 msgid "Feed - Restricted"
 msgstr "Feed - Restringido"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:265
-#: ../../include/permissions.php:949
 msgid "Special Purpose"
 msgstr "Propósito especial"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:266
-#: ../../include/permissions.php:949
 msgid "Special - Celebrity/Soapbox"
 msgstr "Especial - Celebridad / Tribuna improvisada"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:267
-#: ../../include/permissions.php:949
 msgid "Special - Group Repository"
 msgstr "Especial - Repositorio de grupo"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:270
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Settings/Channel.php:463
-#: ../../Zotlabs/Module/Connedit.php:914 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Register.php:213 ../../addon/cdav/Mod_Cdav.php:1148
-#: ../../addon/cdav/cdav.php:277 ../../addon/cdav/cdav.php:284
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-#: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:950 ../../include/connections.php:675
-#: ../../include/connections.php:682
+#: ../../Zotlabs/Module/Cdav.php:1123 ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Settings/Channel.php:467
+#: ../../Zotlabs/Module/Connedit.php:932 ../../Zotlabs/Module/Profiles.php:798
+#: ../../Zotlabs/Module/Register.php:213 ../../include/selectors.php:49
+#: ../../include/selectors.php:66 ../../include/selectors.php:104
+#: ../../include/selectors.php:140 ../../include/event.php:1297
+#: ../../include/event.php:1304 ../../include/connections.php:681
+#: ../../include/connections.php:688
 msgid "Other"
 msgstr "Otro"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:271
-#: ../../include/permissions.php:950
 msgid "Custom/Expert Mode"
 msgstr "Modo personalizado/experto"
 
@@ -189,7 +173,7 @@ msgstr "Modo personalizado/experto"
 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32
 #: ../../Zotlabs/Module/Webpages.php:33
-#: ../../Zotlabs/Module/Filestorage.php:59 ../../include/channel.php:945
+#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1062
 msgid "Requested profile is not available."
 msgstr "El perfil solicitado no está disponible."
 
@@ -203,41 +187,43 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Setup.php:212
+#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209
+#: ../../Zotlabs/Module/Moderate.php:13
 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:274
 #: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335
 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100
+#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:102
 #: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29
-#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:61
+#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64
 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
-#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:315
-#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Wiki.php:235 ../../Zotlabs/Module/Wiki.php:341
+#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149
 #: ../../Zotlabs/Module/Profile_photo.php:280
 #: ../../Zotlabs/Module/Profile_photo.php:293
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:221
-#: ../../Zotlabs/Module/Item.php:231 ../../Zotlabs/Module/Item.php:1038
-#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
-#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Chat.php:98
-#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Menu.php:78
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:223
+#: ../../Zotlabs/Module/Item.php:240 ../../Zotlabs/Module/Item.php:250
+#: ../../Zotlabs/Module/Item.php:1076 ../../Zotlabs/Module/Page.php:34
+#: ../../Zotlabs/Module/Page.php:125 ../../Zotlabs/Module/Connedit.php:385
+#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
+#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71
+#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
+#: ../../Zotlabs/Module/Group.php:13 ../../Zotlabs/Module/Profiles.php:198
+#: ../../Zotlabs/Module/Profiles.php:635
 #: ../../Zotlabs/Module/Editwebpage.php:68
 #: ../../Zotlabs/Module/Editwebpage.php:89
 #: ../../Zotlabs/Module/Editwebpage.php:107
 #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Webpages.php:116 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Webpages.php:118 ../../Zotlabs/Module/Block.php:24
+#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Editpost.php:17
 #: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Like.php:181
 #: ../../Zotlabs/Module/Suggest.php:28 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Mail.php:146 ../../Zotlabs/Module/Register.php:77
 #: ../../Zotlabs/Module/Cover_photo.php:281
 #: ../../Zotlabs/Module/Cover_photo.php:294
-#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Filestorage.php:23
-#: ../../Zotlabs/Module/Filestorage.php:78
-#: ../../Zotlabs/Module/Filestorage.php:93
-#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Common.php:39
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Filestorage.php:15
+#: ../../Zotlabs/Module/Filestorage.php:70
+#: ../../Zotlabs/Module/Filestorage.php:85
+#: ../../Zotlabs/Module/Filestorage.php:112 ../../Zotlabs/Module/Common.php:39
 #: ../../Zotlabs/Module/Viewconnections.php:28
 #: ../../Zotlabs/Module/Viewconnections.php:33
 #: ../../Zotlabs/Module/Service_limits.php:11
@@ -245,16 +231,14 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../Zotlabs/Lib/Chatroom.php:137 ../../Zotlabs/Web/WebServer.php:131
 #: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53
 #: ../../addon/gitwiki/Mod_Gitwiki.php:196
-#: ../../addon/gitwiki/Mod_Gitwiki.php:292
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:58
-#: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:144
-#: ../../include/attach.php:191 ../../include/attach.php:255
-#: ../../include/attach.php:269 ../../include/attach.php:276
-#: ../../include/attach.php:344 ../../include/attach.php:358
-#: ../../include/attach.php:365 ../../include/attach.php:442
-#: ../../include/attach.php:909 ../../include/attach.php:983
-#: ../../include/attach.php:1148 ../../include/items.php:3470
-#: ../../include/photos.php:27
+#: ../../addon/gitwiki/Mod_Gitwiki.php:292 ../../addon/pumpio/pumpio.php:40
+#: ../../include/attach.php:144 ../../include/attach.php:191
+#: ../../include/attach.php:255 ../../include/attach.php:269
+#: ../../include/attach.php:276 ../../include/attach.php:344
+#: ../../include/attach.php:358 ../../include/attach.php:365
+#: ../../include/attach.php:443 ../../include/attach.php:918
+#: ../../include/attach.php:992 ../../include/attach.php:1157
+#: ../../include/items.php:3440 ../../include/photos.php:28
 msgid "Permission denied."
 msgstr "Acceso denegado."
 
@@ -263,7 +247,7 @@ msgstr "Acceso denegado."
 msgid "Block Name"
 msgstr "Nombre del bloque"
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2267
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2280
 msgid "Blocks"
 msgstr "Bloques"
 
@@ -272,25 +256,22 @@ msgid "Block Title"
 msgstr "Título del bloque"
 
 #: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:256
-#: ../../include/page_widgets.php:47
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251
 msgid "Created"
 msgstr "Creado"
 
 #: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:257
-#: ../../include/page_widgets.php:48
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252
 msgid "Edited"
 msgstr "Editado"
 
-#: ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Cdav.php:1126
 #: ../../Zotlabs/Module/New_channel.php:147
-#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/Connedit.php:935 ../../Zotlabs/Module/Menu.php:118
 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801
-#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Storage/Browser.php:228
-#: ../../Zotlabs/Storage/Browser.php:332 ../../addon/cdav/Mod_Cdav.php:1151
-#: ../../addon/cdav/include/widgets.php:127
-#: ../../addon/cdav/include/widgets.php:164
+#: ../../Zotlabs/Module/Webpages.php:239 ../../Zotlabs/Storage/Browser.php:229
+#: ../../Zotlabs/Storage/Browser.php:335 ../../Zotlabs/Widget/Cdav.php:127
+#: ../../Zotlabs/Widget/Cdav.php:164
 msgid "Create"
 msgstr "Crear"
 
@@ -298,52 +279,49 @@ msgstr "Crear"
 #: ../../Zotlabs/Module/Admin/Profs.php:154
 #: ../../Zotlabs/Module/Settings/Oauth.php:149
 #: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Connections.php:296
-#: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Wiki.php:165
-#: ../../Zotlabs/Module/Wiki.php:275 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Zotlabs/Module/Connections.php:297
+#: ../../Zotlabs/Module/Connections.php:317 ../../Zotlabs/Module/Wiki.php:167
+#: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Menu.php:112
 #: ../../Zotlabs/Module/Layouts.php:193
 #: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Editpost.php:80
-#: ../../Zotlabs/Lib/Apps.php:367 ../../Zotlabs/Lib/ThreadItem.php:107
-#: ../../Zotlabs/Storage/Browser.php:238
-#: ../../addon/cdav/include/widgets.php:125
-#: ../../addon/cdav/include/widgets.php:161
-#: ../../addon/gitwiki/Mod_Gitwiki.php:151
-#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1044
-#: ../../include/channel.php:1048 ../../include/menu.php:113
-#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
+#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Editpost.php:85
+#: ../../Zotlabs/Lib/Apps.php:393 ../../Zotlabs/Lib/ThreadItem.php:107
+#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Widget/Cdav.php:125
+#: ../../Zotlabs/Widget/Cdav.php:161 ../../addon/gitwiki/Mod_Gitwiki.php:151
+#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1161
+#: ../../include/channel.php:1165 ../../include/menu.php:113
 msgid "Edit"
 msgstr "Editar"
 
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1042
-#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:246
-#: ../../addon/cdav/include/widgets.php:123
-#: ../../include/conversation.php:1311
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1044
+#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:241
+#: ../../Zotlabs/Widget/Cdav.php:123 ../../include/conversation.php:1308
 msgid "Share"
 msgstr "Compartir"
 
 #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
+#: ../../Zotlabs/Module/Cdav.php:838 ../../Zotlabs/Module/Cdav.php:1128
 #: ../../Zotlabs/Module/Admin/Accounts.php:173
 #: ../../Zotlabs/Module/Admin/Channels.php:149
 #: ../../Zotlabs/Module/Admin/Profs.php:155
 #: ../../Zotlabs/Module/Settings/Oauth.php:150
 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Connections.php:267
-#: ../../Zotlabs/Module/Photos.php:1143 ../../Zotlabs/Module/Connedit.php:650
-#: ../../Zotlabs/Module/Connedit.php:919 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Connections.php:268
+#: ../../Zotlabs/Module/Photos.php:1145 ../../Zotlabs/Module/Connedit.php:650
+#: ../../Zotlabs/Module/Connedit.php:937 ../../Zotlabs/Module/Group.php:179
 #: ../../Zotlabs/Module/Profiles.php:803
 #: ../../Zotlabs/Module/Editwebpage.php:167
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/Apps.php:368
-#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:239
-#: ../../addon/cdav/Mod_Cdav.php:864 ../../addon/cdav/Mod_Cdav.php:1153
-#: ../../include/conversation.php:654
+#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:394
+#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:240
+#: ../../include/conversation.php:649 ../../include/conversation.php:686
 msgid "Delete"
 msgstr "Eliminar"
 
 #: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
-#: ../../Zotlabs/Module/Wiki.php:167 ../../Zotlabs/Module/Layouts.php:198
-#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Pubsites.php:59
-#: ../../addon/gitwiki/Mod_Gitwiki.php:153 ../../include/page_widgets.php:42
+#: ../../Zotlabs/Module/Wiki.php:169 ../../Zotlabs/Module/Layouts.php:198
+#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:59
+#: ../../addon/gitwiki/Mod_Gitwiki.php:153
 msgid "View"
 msgstr "Ver"
 
@@ -376,52 +354,56 @@ msgid_plural "%d messages sent."
 msgstr[0] "%d mensajes enviados."
 msgstr[1] "%d mensajes enviados."
 
-#: ../../Zotlabs/Module/Invite.php:105
+#: ../../Zotlabs/Module/Invite.php:98 ../../Zotlabs/Lib/Apps.php:254
+msgid "Invite"
+msgstr "Invitar"
+
+#: ../../Zotlabs/Module/Invite.php:107
 msgid "You have no more invitations available"
 msgstr "No tiene más invitaciones disponibles"
 
-#: ../../Zotlabs/Module/Invite.php:136
+#: ../../Zotlabs/Module/Invite.php:138
 msgid "Send invitations"
 msgstr "Enviar invitaciones"
 
-#: ../../Zotlabs/Module/Invite.php:137
+#: ../../Zotlabs/Module/Invite.php:139
 msgid "Enter email addresses, one per line:"
 msgstr "Introduzca las direcciones de correo electrónico, una por línea:"
 
-#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:303
+#: ../../Zotlabs/Module/Invite.php:140 ../../Zotlabs/Module/Mail.php:285
 msgid "Your message:"
 msgstr "Su mensaje:"
 
-#: ../../Zotlabs/Module/Invite.php:139
+#: ../../Zotlabs/Module/Invite.php:141
 msgid "Please join my community on $Projectname."
 msgstr "Por favor, únase a mi comunidad en $Projectname."
 
-#: ../../Zotlabs/Module/Invite.php:141
+#: ../../Zotlabs/Module/Invite.php:143
 msgid "You will need to supply this invitation code:"
 msgstr "Tendrá que suministrar este código de invitación:"
 
-#: ../../Zotlabs/Module/Invite.php:142
+#: ../../Zotlabs/Module/Invite.php:144
 msgid ""
 "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr "1. Regístrese en cualquier sitio de $Projectname (están todos interconectados)"
 
-#: ../../Zotlabs/Module/Invite.php:144
+#: ../../Zotlabs/Module/Invite.php:146
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr "2. Introduzca mi dirección $Projectname en la caja de búsqueda del sitio."
 
-#: ../../Zotlabs/Module/Invite.php:145
+#: ../../Zotlabs/Module/Invite.php:147
 msgid "or visit"
 msgstr "o visitar"
 
-#: ../../Zotlabs/Module/Invite.php:147
+#: ../../Zotlabs/Module/Invite.php:149
 msgid "3. Click [Connect]"
 msgstr "3. Pulse [conectar]"
 
-#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121
 #: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Appman.php:134
+#: ../../Zotlabs/Module/Appman.php:148
 #: ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:357
+#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349
 #: ../../Zotlabs/Module/Connect.php:98
 #: ../../Zotlabs/Module/Admin/Features.php:66
 #: ../../Zotlabs/Module/Admin/Plugins.php:438
@@ -429,35 +411,35 @@ msgstr "3. Pulse [conectar]"
 #: ../../Zotlabs/Module/Admin/Logs.php:84
 #: ../../Zotlabs/Module/Admin/Channels.php:147
 #: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Site.php:279
+#: ../../Zotlabs/Module/Admin/Site.php:271
 #: ../../Zotlabs/Module/Admin/Profs.php:157
 #: ../../Zotlabs/Module/Admin/Account_edit.php:74
 #: ../../Zotlabs/Module/Admin/Security.php:104
 #: ../../Zotlabs/Module/Settings/Permcats.php:110
-#: ../../Zotlabs/Module/Settings/Channel.php:476
+#: ../../Zotlabs/Module/Settings/Channel.php:480
 #: ../../Zotlabs/Module/Settings/Features.php:47
 #: ../../Zotlabs/Module/Settings/Tokens.php:168
 #: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Zotlabs/Module/Settings/Featured.php:52
 #: ../../Zotlabs/Module/Settings/Display.php:203
 #: ../../Zotlabs/Module/Settings/Oauth.php:87
 #: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Import.php:514 ../../Zotlabs/Module/Cal.php:343
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:657
-#: ../../Zotlabs/Module/Photos.php:1022 ../../Zotlabs/Module/Photos.php:1062
-#: ../../Zotlabs/Module/Photos.php:1180 ../../Zotlabs/Module/Wiki.php:169
-#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Chat.php:194
-#: ../../Zotlabs/Module/Chat.php:240 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Profiles.php:726
+#: ../../Zotlabs/Module/Import.php:518 ../../Zotlabs/Module/Cal.php:343
+#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:659
+#: ../../Zotlabs/Module/Photos.php:1024 ../../Zotlabs/Module/Photos.php:1064
+#: ../../Zotlabs/Module/Photos.php:1182 ../../Zotlabs/Module/Wiki.php:171
+#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:200
+#: ../../Zotlabs/Module/Connedit.php:900 ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:242 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726
 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
-#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:449
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Rate.php:166
-#: ../../Zotlabs/Lib/ThreadItem.php:732
+#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431
+#: ../../Zotlabs/Module/Filestorage.php:155 ../../Zotlabs/Module/Rate.php:166
+#: ../../Zotlabs/Lib/ThreadItem.php:730
 #: ../../Zotlabs/Widget/Eventstools.php:16
-#: ../../view/theme/redbasic/php/config.php:84
-#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:134
-#: ../../addon/cdav/cdav.php:246 ../../addon/planets/planets.php:157
+#: ../../view/theme/redbasic/php/config.php:95
+#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:226
+#: ../../addon/planets/planets.php:153
 #: ../../addon/openclipatar/openclipatar.php:53
 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92
 #: ../../addon/ijpost/ijpost.php:89 ../../addon/dwpost/dwpost.php:89
@@ -465,7 +447,7 @@ msgstr "3. Pulse [conectar]"
 #: ../../addon/likebanner/likebanner.php:57
 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53
 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113
-#: ../../addon/diaspora/diaspora.php:712
+#: ../../addon/diaspora/diaspora.php:759
 #: ../../addon/gitwiki/Mod_Gitwiki.php:155
 #: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/visage/visage.php:170
 #: ../../addon/nsabait/nsabait.php:161 ../../addon/mailtest/mailtest.php:100
@@ -481,11 +463,11 @@ msgstr "3. Pulse [conectar]"
 #: ../../addon/statusnet/statusnet.php:432
 #: ../../addon/statusnet/statusnet.php:899 ../../addon/twitter/twitter.php:217
 #: ../../addon/twitter/twitter.php:259
-#: ../../addon/smileybutton/smileybutton.php:281
+#: ../../addon/smileybutton/smileybutton.php:219
 #: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48
-#: ../../addon/xmpp/xmpp.php:69 ../../addon/pumpio/pumpio.php:237
-#: ../../addon/redfiles/redfiles.php:124 ../../addon/hubwall/hubwall.php:95
-#: ../../include/js_strings.php:22
+#: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69
+#: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124
+#: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22
 msgid "Submit"
 msgstr "Enviar"
 
@@ -511,12 +493,12 @@ msgid "Edit Layout"
 msgstr "Modificar la plantilla"
 
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
-#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:74
 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
 #: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Web/WebServer.php:130
 #: ../../addon/redphotos/redphotos.php:119
 #: ../../addon/frphotos/frphotos.php:81 ../../addon/redfiles/redfiles.php:109
-#: ../../include/items.php:327
+#: ../../include/items.php:340
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -528,7 +510,7 @@ msgstr "Identificador del perfil no válido"
 msgid "Profile Visibility Editor"
 msgstr "Editor de visibilidad del perfil"
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1362
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1485
 msgid "Profile"
 msgstr "Perfil"
 
@@ -541,10 +523,291 @@ msgid "Visible To"
 msgstr "Visible para"
 
 #: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:141
+#: ../../Zotlabs/Module/Connections.php:140
 msgid "All Connections"
 msgstr "Todas las conexiones"
 
+#: ../../Zotlabs/Module/Cdav.php:726
+msgid "INVALID EVENT DISMISSED!"
+msgstr "¡EVENTO NO VÁLIDO RECHAZADO!"
+
+#: ../../Zotlabs/Module/Cdav.php:727
+msgid "Summary: "
+msgstr "Resumen: "
+
+#: ../../Zotlabs/Module/Cdav.php:727 ../../Zotlabs/Module/Cdav.php:728
+#: ../../Zotlabs/Module/Cdav.php:735 ../../Zotlabs/Module/Embedphotos.php:146
+#: ../../Zotlabs/Module/Photos.php:759 ../../Zotlabs/Module/Photos.php:1215
+#: ../../Zotlabs/Lib/Apps.php:721 ../../Zotlabs/Lib/Apps.php:799
+#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:86
+#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1107
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../../Zotlabs/Module/Cdav.php:728
+msgid "Date: "
+msgstr "Fecha: "
+
+#: ../../Zotlabs/Module/Cdav.php:729 ../../Zotlabs/Module/Cdav.php:736
+msgid "Reason: "
+msgstr "Razón: "
+
+#: ../../Zotlabs/Module/Cdav.php:734
+msgid "INVALID CARD DISMISSED!"
+msgstr "¡TARJETA NO VÁLIDA RECHAZADA!"
+
+#: ../../Zotlabs/Module/Cdav.php:735
+msgid "Name: "
+msgstr "Nombre: "
+
+#: ../../Zotlabs/Module/Cdav.php:768
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../../Zotlabs/Module/Cdav.php:809 ../../Zotlabs/Module/Events.php:460
+msgid "Event title"
+msgstr "Título del evento"
+
+#: ../../Zotlabs/Module/Cdav.php:810 ../../Zotlabs/Module/Events.php:466
+msgid "Start date and time"
+msgstr "Fecha y hora de comienzo"
+
+#: ../../Zotlabs/Module/Cdav.php:810 ../../Zotlabs/Module/Cdav.php:811
+msgid "Example: YYYY-MM-DD HH:mm"
+msgstr "Ejemplo: YYYY-MM-DD HH:mm"
+
+#: ../../Zotlabs/Module/Cdav.php:811
+msgid "End date and time"
+msgstr "Fecha y hora de finalización"
+
+#: ../../Zotlabs/Module/Cdav.php:812 ../../Zotlabs/Module/Events.php:473
+#: ../../Zotlabs/Module/Appman.php:138 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../addon/rendezvous/rendezvous.php:173
+msgid "Description"
+msgstr "Descripción"
+
+#: ../../Zotlabs/Module/Cdav.php:813 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509
+#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Module/Pubsites.php:51
+#: ../../include/js_strings.php:25
+msgid "Location"
+msgstr "Ubicación"
+
+#: ../../Zotlabs/Module/Cdav.php:820 ../../Zotlabs/Module/Events.php:689
+#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:337
+#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Photos.php:913
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../../Zotlabs/Module/Cdav.php:821 ../../Zotlabs/Module/Events.php:690
+#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Cal.php:345
+#: ../../Zotlabs/Module/Photos.php:922
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../../Zotlabs/Module/Cdav.php:822 ../../Zotlabs/Module/Events.php:700
+#: ../../Zotlabs/Module/Cal.php:346
+msgid "Today"
+msgstr "Hoy"
+
+#: ../../Zotlabs/Module/Cdav.php:823 ../../Zotlabs/Module/Events.php:695
+msgid "Month"
+msgstr "Mes"
+
+#: ../../Zotlabs/Module/Cdav.php:824 ../../Zotlabs/Module/Events.php:696
+msgid "Week"
+msgstr "Semana"
+
+#: ../../Zotlabs/Module/Cdav.php:825 ../../Zotlabs/Module/Events.php:697
+msgid "Day"
+msgstr "Día"
+
+#: ../../Zotlabs/Module/Cdav.php:826
+msgid "List month"
+msgstr "Lista mensual"
+
+#: ../../Zotlabs/Module/Cdav.php:827
+msgid "List week"
+msgstr "Lista semanal"
+
+#: ../../Zotlabs/Module/Cdav.php:828
+msgid "List day"
+msgstr "Lista diaria"
+
+#: ../../Zotlabs/Module/Cdav.php:835
+msgid "More"
+msgstr "Más"
+
+#: ../../Zotlabs/Module/Cdav.php:836
+msgid "Less"
+msgstr "Menos"
+
+#: ../../Zotlabs/Module/Cdav.php:837
+msgid "Select calendar"
+msgstr "Seleccionar un calendario"
+
+#: ../../Zotlabs/Module/Cdav.php:839
+msgid "Delete all"
+msgstr "Eliminar todos"
+
+#: ../../Zotlabs/Module/Cdav.php:840 ../../Zotlabs/Module/Cdav.php:1129
+#: ../../Zotlabs/Module/Admin/Plugins.php:423
+#: ../../Zotlabs/Module/Settings/Oauth.php:88
+#: ../../Zotlabs/Module/Settings/Oauth.php:114
+#: ../../Zotlabs/Module/Wiki.php:290 ../../Zotlabs/Module/Wiki.php:316
+#: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/js_upload/js_upload.php:46
+#: ../../addon/gitwiki/Mod_Gitwiki.php:244
+#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1324
+#: ../../include/conversation.php:1373
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../../Zotlabs/Module/Cdav.php:841
+msgid "Sorry! Editing of recurrent events is not yet implemented."
+msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado."
+
+#: ../../Zotlabs/Module/Cdav.php:969
+msgid "CardDAV"
+msgstr "CardDAV"
+
+#: ../../Zotlabs/Module/Cdav.php:1111
+#: ../../Zotlabs/Module/Sharedwithme.php:105
+#: ../../Zotlabs/Module/Admin/Channels.php:159
+#: ../../Zotlabs/Module/Settings/Oauth.php:89
+#: ../../Zotlabs/Module/Settings/Oauth.php:115
+#: ../../Zotlabs/Module/Wiki.php:174 ../../Zotlabs/Module/Connedit.php:920
+#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:539
+#: ../../Zotlabs/Storage/Browser.php:234
+#: ../../Zotlabs/Widget/Wiki_page_history.php:22
+#: ../../addon/rendezvous/rendezvous.php:172
+#: ../../addon/gitwiki/Mod_Gitwiki.php:158
+msgid "Name"
+msgstr "Nombre"
+
+#: ../../Zotlabs/Module/Cdav.php:1112 ../../Zotlabs/Module/Connedit.php:921
+msgid "Organisation"
+msgstr "Organización"
+
+#: ../../Zotlabs/Module/Cdav.php:1113 ../../Zotlabs/Module/Connedit.php:922
+msgid "Title"
+msgstr "Título"
+
+#: ../../Zotlabs/Module/Cdav.php:1114 ../../Zotlabs/Module/Connedit.php:923
+#: ../../Zotlabs/Module/Profiles.php:789
+msgid "Phone"
+msgstr "Teléfono"
+
+#: ../../Zotlabs/Module/Cdav.php:1115
+#: ../../Zotlabs/Module/Admin/Accounts.php:169
+#: ../../Zotlabs/Module/Admin/Accounts.php:181
+#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Profiles.php:790
+#: ../../addon/openid/MysqlProvider.php:56
+#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
+#: ../../addon/redred/redred.php:107 ../../include/network.php:1697
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: ../../Zotlabs/Module/Cdav.php:1116 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Zotlabs/Module/Profiles.php:791
+msgid "Instant messenger"
+msgstr "Mensajería instantánea"
+
+#: ../../Zotlabs/Module/Cdav.php:1117 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Zotlabs/Module/Profiles.php:792
+msgid "Website"
+msgstr "Sitio web"
+
+#: ../../Zotlabs/Module/Cdav.php:1118 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:502
+#: ../../Zotlabs/Module/Profiles.php:793
+msgid "Address"
+msgstr "Dirección"
+
+#: ../../Zotlabs/Module/Cdav.php:1119 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Zotlabs/Module/Profiles.php:794
+msgid "Note"
+msgstr "Nota"
+
+#: ../../Zotlabs/Module/Cdav.php:1120 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1290
+#: ../../include/connections.php:674
+msgid "Mobile"
+msgstr "Móvil"
+
+#: ../../Zotlabs/Module/Cdav.php:1121 ../../Zotlabs/Module/Connedit.php:930
+#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1291
+#: ../../include/connections.php:675
+msgid "Home"
+msgstr "Inicio"
+
+#: ../../Zotlabs/Module/Cdav.php:1122 ../../Zotlabs/Module/Connedit.php:931
+#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1294
+#: ../../include/connections.php:678
+msgid "Work"
+msgstr "Trabajo"
+
+#: ../../Zotlabs/Module/Cdav.php:1124 ../../Zotlabs/Module/Connedit.php:933
+#: ../../Zotlabs/Module/Profiles.php:799
+#: ../../addon/jappixmini/jappixmini.php:368
+msgid "Add Contact"
+msgstr "Añadir un contacto"
+
+#: ../../Zotlabs/Module/Cdav.php:1125 ../../Zotlabs/Module/Connedit.php:934
+#: ../../Zotlabs/Module/Profiles.php:800
+msgid "Add Field"
+msgstr "Añadir un campo"
+
+#: ../../Zotlabs/Module/Cdav.php:1127
+#: ../../Zotlabs/Module/Admin/Plugins.php:453
+#: ../../Zotlabs/Module/Settings/Oauth.php:42
+#: ../../Zotlabs/Module/Settings/Oauth.php:113
+#: ../../Zotlabs/Module/Connedit.php:936 ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Lib/Apps.php:384
+msgid "Update"
+msgstr "Actualizar"
+
+#: ../../Zotlabs/Module/Cdav.php:1130 ../../Zotlabs/Module/Connedit.php:939
+msgid "P.O. Box"
+msgstr "Buzón de correos"
+
+#: ../../Zotlabs/Module/Cdav.php:1131 ../../Zotlabs/Module/Connedit.php:940
+msgid "Additional"
+msgstr "Adicional"
+
+#: ../../Zotlabs/Module/Cdav.php:1132 ../../Zotlabs/Module/Connedit.php:941
+msgid "Street"
+msgstr "Calle"
+
+#: ../../Zotlabs/Module/Cdav.php:1133 ../../Zotlabs/Module/Connedit.php:942
+msgid "Locality"
+msgstr "Localidad"
+
+#: ../../Zotlabs/Module/Cdav.php:1134 ../../Zotlabs/Module/Connedit.php:943
+msgid "Region"
+msgstr "Provincia, región o estado"
+
+#: ../../Zotlabs/Module/Cdav.php:1135 ../../Zotlabs/Module/Connedit.php:944
+msgid "ZIP Code"
+msgstr "Código postal"
+
+#: ../../Zotlabs/Module/Cdav.php:1136 ../../Zotlabs/Module/Connedit.php:945
+#: ../../Zotlabs/Module/Profiles.php:760
+msgid "Country"
+msgstr "País"
+
+#: ../../Zotlabs/Module/Cdav.php:1183
+msgid "Default Calendar"
+msgstr "Calendario por defecto"
+
+#: ../../Zotlabs/Module/Cdav.php:1193
+msgid "Default Addressbook"
+msgstr "Agenda de direcciones por defecto"
+
 #: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25
 msgid "This site is not a directory server"
 msgstr "Este sitio no es un servidor de directorio"
@@ -554,20 +817,30 @@ msgstr "Este sitio no es un servidor de directorio"
 msgid "You must be logged in to see this page."
 msgstr "Debe haber iniciado sesión para poder ver esta página."
 
-#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:35
-#: ../../Zotlabs/Module/Profile.php:43
+#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:37
+#: ../../Zotlabs/Module/Profile.php:45
 msgid "Posts and comments"
 msgstr "Publicaciones y comentarios"
 
-#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:42
-#: ../../Zotlabs/Module/Profile.php:50
+#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:44
+#: ../../Zotlabs/Module/Profile.php:52
 msgid "Only posts"
 msgstr "Solo publicaciones"
 
+#: ../../Zotlabs/Module/Channel.php:97 ../../Zotlabs/Lib/Apps.php:240
+#: ../../include/nav.php:175
+msgid "Channel Home"
+msgstr "Mi canal"
+
 #: ../../Zotlabs/Module/Channel.php:112
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
 
+#: ../../Zotlabs/Module/Lang.php:8 ../../Zotlabs/Lib/Apps.php:256
+#: ../../addon/openid/MysqlProvider.php:69
+msgid "Language"
+msgstr "Idioma"
+
 #: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
 msgid "Export Channel"
 msgstr "Exportar el canal"
@@ -633,19 +906,20 @@ msgstr "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%
 msgid "Public access denied."
 msgstr "Acceso público denegado."
 
-#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:312
-#: ../../Zotlabs/Lib/Apps.php:237 ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../include/text.php:1027 ../../include/text.php:1039
-#: ../../include/acl_selectors.php:213 ../../include/nav.php:164
+#: ../../Zotlabs/Module/Search.php:25 ../../Zotlabs/Module/Search.php:44
+#: ../../Zotlabs/Module/Connections.php:313 ../../Zotlabs/Lib/Apps.php:250
+#: ../../Zotlabs/Widget/Sitesearch.php:31 ../../include/text.php:1021
+#: ../../include/text.php:1033 ../../include/acl_selectors.php:213
+#: ../../include/nav.php:160
 msgid "Search"
 msgstr "Buscar"
 
-#: ../../Zotlabs/Module/Search.php:224
+#: ../../Zotlabs/Module/Search.php:225
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "elementos etiquetados con: %s"
 
-#: ../../Zotlabs/Module/Search.php:226
+#: ../../Zotlabs/Module/Search.php:227
 #, php-format
 msgid "Search results for: %s"
 msgstr "Resultados de la búsqueda para: %s"
@@ -676,21 +950,7 @@ msgstr "No encontrada ninguna dirección."
 msgid "Manage Channel Locations"
 msgstr "Gestionar las direcciones del canal"
 
-#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:737
-#: ../../Zotlabs/Module/Pubsites.php:51 ../../addon/cdav/Mod_Cdav.php:839
-#: ../../include/js_strings.php:25
-msgid "Location"
-msgstr "Ubicación"
-
-#: ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Connedit.php:909 ../../Zotlabs/Module/Profiles.php:502
-#: ../../Zotlabs/Module/Profiles.php:793 ../../addon/cdav/Mod_Cdav.php:1143
-msgid "Address"
-msgstr "Dirección"
-
-#: ../../Zotlabs/Module/Locs.php:119
+#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:111
 msgid "Primary"
 msgstr "Primario"
 
@@ -716,6 +976,15 @@ msgstr "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo."
 
+#: ../../Zotlabs/Module/Apporder.php:34
+msgid "Change Order of Navigation Apps"
+msgstr "Cambiar el orden de las aplicaciones en la barra de navegación"
+
+#: ../../Zotlabs/Module/Apporder.php:35
+msgid ""
+"Use arrows to move the corresponding app up or down in the display list"
+msgstr "Utilizar las flechas para mover la aplicación correspondiente hacia arriba o hacia abajo en la lista de visualización"
+
 #: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144
 msgid "Menu not found."
 msgstr "Menú no encontrado"
@@ -742,7 +1011,7 @@ msgid "Menu Item Permissions"
 msgstr "Permisos del elemento del menú"
 
 #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:510
+#: ../../Zotlabs/Module/Settings/Channel.php:513
 msgid "(click to open/close)"
 msgstr "(pulsar para abrir o cerrar)"
 
@@ -766,18 +1035,19 @@ msgstr "Usar la autenticación mágica si está disponible"
 #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
 #: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:237
-#: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Admin/Site.php:235
+#: ../../Zotlabs/Module/Settings/Channel.php:298
 #: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:642
-#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:392
+#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:644
+#: ../../Zotlabs/Module/Wiki.php:182 ../../Zotlabs/Module/Connedit.php:392
 #: ../../Zotlabs/Module/Connedit.php:775 ../../Zotlabs/Module/Menu.php:100
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1633
-#: ../../view/theme/redbasic/php/config.php:89
-#: ../../view/theme/redbasic/php/config.php:104 ../../addon/cdav/cdav.php:234
-#: ../../addon/planets/planets.php:153 ../../addon/wppost/wppost.php:82
+#: ../../Zotlabs/Module/Filestorage.php:150
+#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Zotlabs/Storage/Browser.php:351 ../../boot.php:1605
+#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:115
+#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82
 #: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109
 #: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73
@@ -800,8 +1070,9 @@ msgstr "Usar la autenticación mágica si está disponible"
 #: ../../addon/statusnet/statusnet.php:415
 #: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242
 #: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255
-#: ../../addon/smileybutton/smileybutton.php:273
-#: ../../addon/smileybutton/smileybutton.php:277 ../../addon/xmpp/xmpp.php:53
+#: ../../addon/smileybutton/smileybutton.php:211
+#: ../../addon/smileybutton/smileybutton.php:215
+#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53
 #: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223
 #: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
@@ -813,18 +1084,19 @@ msgstr "No"
 #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
 #: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:239
-#: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Admin/Site.php:237
+#: ../../Zotlabs/Module/Settings/Channel.php:298
 #: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:642
-#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:392
+#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:644
+#: ../../Zotlabs/Module/Wiki.php:182 ../../Zotlabs/Module/Connedit.php:392
 #: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
 #: ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1633
-#: ../../view/theme/redbasic/php/config.php:89
-#: ../../view/theme/redbasic/php/config.php:104 ../../addon/cdav/cdav.php:234
-#: ../../addon/planets/planets.php:153 ../../addon/wppost/wppost.php:82
+#: ../../Zotlabs/Module/Filestorage.php:150
+#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Zotlabs/Storage/Browser.php:351 ../../boot.php:1605
+#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:115
+#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82
 #: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109
 #: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73
@@ -847,8 +1119,9 @@ msgstr "No"
 #: ../../addon/statusnet/statusnet.php:415
 #: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242
 #: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255
-#: ../../addon/smileybutton/smileybutton.php:273
-#: ../../addon/smileybutton/smileybutton.php:277 ../../addon/xmpp/xmpp.php:53
+#: ../../addon/smileybutton/smileybutton.php:211
+#: ../../addon/smileybutton/smileybutton.php:215
+#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53
 #: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223
 #: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
@@ -963,20 +1236,23 @@ msgstr "Evento no encontrado."
 
 #: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:51
 #: ../../Zotlabs/Module/Like.php:372 ../../include/conversation.php:119
-#: ../../include/text.php:1940 ../../include/event.php:1141
+#: ../../include/text.php:1933 ../../include/event.php:1145
 msgid "event"
 msgstr "evento"
 
+#: ../../Zotlabs/Module/Events.php:275 ../../Zotlabs/Lib/Apps.php:243
+#: ../../include/conversation.php:1799 ../../include/conversation.php:1802
+#: ../../include/nav.php:195 ../../include/nav.php:397
+#: ../../include/nav.php:400
+msgid "Events"
+msgstr "Eventos"
+
 #: ../../Zotlabs/Module/Events.php:460
 msgid "Edit event title"
 msgstr "Editar el título del evento"
 
-#: ../../Zotlabs/Module/Events.php:460 ../../addon/cdav/Mod_Cdav.php:835
-msgid "Event title"
-msgstr "Título del evento"
-
 #: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../Zotlabs/Module/Appman.php:122 ../../Zotlabs/Module/Appman.php:123
+#: ../../Zotlabs/Module/Appman.php:136 ../../Zotlabs/Module/Appman.php:137
 #: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752
 #: ../../include/datetime.php:259
 msgid "Required"
@@ -998,10 +1274,6 @@ msgstr "Tema"
 msgid "Edit start date and time"
 msgstr "Modificar la fecha y hora de comienzo"
 
-#: ../../Zotlabs/Module/Events.php:466 ../../addon/cdav/Mod_Cdav.php:836
-msgid "Start date and time"
-msgstr "Fecha y hora de comienzo"
-
 #: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
 msgid "Finish date and time are not known or not relevant"
 msgstr "La fecha y hora de terminación no se conocen o no son relevantes"
@@ -1028,23 +1300,17 @@ msgstr "Importante para los eventos que suceden en un lugar determinado. No es p
 msgid "Edit Description"
 msgstr "Editar la descripción"
 
-#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Appman.php:124
-#: ../../Zotlabs/Module/Rbmark.php:101
-#: ../../addon/rendezvous/rendezvous.php:173 ../../addon/cdav/Mod_Cdav.php:838
-msgid "Description"
-msgstr "Descripción"
-
 #: ../../Zotlabs/Module/Events.php:475
 msgid "Edit Location"
 msgstr "Modificar la dirección"
 
-#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1063
-#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/ThreadItem.php:741
-#: ../../include/conversation.php:1280 ../../include/page_widgets.php:43
+#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1065
+#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:739
+#: ../../include/conversation.php:1277
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1343
+#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1340
 msgid "Permission settings"
 msgstr "Configuración de permisos"
 
@@ -1069,7 +1335,7 @@ msgid "Delete event"
 msgstr "Borrar evento"
 
 #: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:313
-#: ../../include/text.php:1759
+#: ../../include/text.php:1752
 msgid "Link to Source"
 msgstr "Enlazar con la entrada en su ubicación original"
 
@@ -1085,41 +1351,11 @@ msgstr "Editar el evento"
 msgid "Create Event"
 msgstr "Crear un evento"
 
-#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Cal.php:344
-#: ../../Zotlabs/Module/Photos.php:911 ../../addon/cdav/Mod_Cdav.php:846
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Events.php:699
-#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:338
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Photos.php:920
-#: ../../addon/cdav/Mod_Cdav.php:847
-msgid "Next"
-msgstr "Siguiente"
-
 #: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:339
-#: ../../include/channel.php:1365
+#: ../../include/channel.php:1488
 msgid "Export"
 msgstr "Exportar"
 
-#: ../../Zotlabs/Module/Events.php:695 ../../addon/cdav/Mod_Cdav.php:849
-msgid "Month"
-msgstr "Mes"
-
-#: ../../Zotlabs/Module/Events.php:696 ../../addon/cdav/Mod_Cdav.php:850
-msgid "Week"
-msgstr "Semana"
-
-#: ../../Zotlabs/Module/Events.php:697 ../../addon/cdav/Mod_Cdav.php:851
-msgid "Day"
-msgstr "Día"
-
-#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Cal.php:346
-#: ../../addon/cdav/Mod_Cdav.php:848
-msgid "Today"
-msgstr "Hoy"
-
 #: ../../Zotlabs/Module/Events.php:731
 msgid "Event removed"
 msgstr "Evento borrado"
@@ -1136,47 +1372,47 @@ msgstr "Aplicación instalada."
 msgid "Malformed app."
 msgstr "Aplicación con errores"
 
-#: ../../Zotlabs/Module/Appman.php:111
+#: ../../Zotlabs/Module/Appman.php:125
 msgid "Embed code"
 msgstr "Código incorporado"
 
-#: ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Appman.php:131
 msgid "Edit App"
 msgstr "Modificar la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Appman.php:131
 msgid "Create App"
 msgstr "Crear una aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:122
+#: ../../Zotlabs/Module/Appman.php:136
 msgid "Name of app"
 msgstr "Nombre de la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:123
+#: ../../Zotlabs/Module/Appman.php:137
 msgid "Location (URL) of app"
 msgstr "Dirección (URL) de la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:125
+#: ../../Zotlabs/Module/Appman.php:139
 msgid "Photo icon URL"
 msgstr "Dirección del icono"
 
-#: ../../Zotlabs/Module/Appman.php:125
+#: ../../Zotlabs/Module/Appman.php:139
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 pixels - opcional"
 
-#: ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Appman.php:140
 msgid "Categories (optional, comma separated list)"
 msgstr "Temas (opcional, lista separada por comas)"
 
-#: ../../Zotlabs/Module/Appman.php:127
+#: ../../Zotlabs/Module/Appman.php:141
 msgid "Version ID"
 msgstr "Versión"
 
-#: ../../Zotlabs/Module/Appman.php:128
+#: ../../Zotlabs/Module/Appman.php:142
 msgid "Price of app"
 msgstr "Precio de la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:129
+#: ../../Zotlabs/Module/Appman.php:143
 msgid "Location (URL) to purchase app"
 msgstr "Dirección (URL) donde adquirir la aplicación"
 
@@ -1191,14 +1427,14 @@ msgstr "Servidor no encontrado"
 #: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Tagger.php:47
 #: ../../Zotlabs/Module/Like.php:370
 #: ../../addon/redphotos/redphotohelper.php:71
-#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:116
-#: ../../include/text.php:1937
+#: ../../addon/diaspora/Receiver.php:1370 ../../include/conversation.php:116
+#: ../../include/text.php:1930
 msgid "photo"
 msgstr "foto"
 
 #: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Like.php:370
-#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:144
-#: ../../include/text.php:1943
+#: ../../addon/diaspora/Receiver.php:1370 ../../include/conversation.php:144
+#: ../../include/text.php:1936
 msgid "status"
 msgstr "el mensaje de estado"
 
@@ -1246,12 +1482,12 @@ msgid ""
 msgstr "Utilice este formulario para importar entradas existentes y contenido desde un archivo de exportación."
 
 #: ../../Zotlabs/Module/Import_items.php:127
-#: ../../Zotlabs/Module/Import.php:501
+#: ../../Zotlabs/Module/Import.php:505
 msgid "File to Upload"
 msgstr "Fichero para subir"
 
 #: ../../Zotlabs/Module/New_channel.php:121
-#: ../../Zotlabs/Module/Manage.php:136
+#: ../../Zotlabs/Module/Manage.php:138
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Ha creado %1$.0f de %2$.0f canales permitidos."
@@ -1350,456 +1586,435 @@ msgid ""
 msgstr "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red"
 
 #: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Zotlabs/Module/Settings/Channel.php:580
 msgid "Remove Channel"
 msgstr "Eliminar el canal"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:99
+#: ../../Zotlabs/Module/Sharedwithme.php:104
 msgid "Files: shared with me"
 msgstr "Ficheros: compartidos conmigo"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:100
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-#: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Wiki.php:172 ../../Zotlabs/Module/Connedit.php:902
-#: ../../Zotlabs/Module/Chat.php:249 ../../Zotlabs/Lib/NativeWikiPage.php:539
-#: ../../Zotlabs/Storage/Browser.php:233
-#: ../../Zotlabs/Widget/Wiki_page_history.php:22
-#: ../../addon/rendezvous/rendezvous.php:172
-#: ../../addon/cdav/Mod_Cdav.php:1136 ../../addon/gitwiki/Mod_Gitwiki.php:158
-msgid "Name"
-msgstr "Nombre"
-
-#: ../../Zotlabs/Module/Sharedwithme.php:101
+#: ../../Zotlabs/Module/Sharedwithme.php:106
 msgid "NEW"
 msgstr "NUEVO"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:102
-#: ../../Zotlabs/Storage/Browser.php:235 ../../include/text.php:1409
+#: ../../Zotlabs/Module/Sharedwithme.php:107
+#: ../../Zotlabs/Storage/Browser.php:236 ../../include/text.php:1386
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:103
-#: ../../Zotlabs/Storage/Browser.php:236
+#: ../../Zotlabs/Module/Sharedwithme.php:108
+#: ../../Zotlabs/Storage/Browser.php:237
 msgid "Last Modified"
 msgstr "Última modificación"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
+#: ../../Zotlabs/Module/Sharedwithme.php:109
 msgid "Remove all files"
 msgstr "Eliminar todos los ficheros"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:105
+#: ../../Zotlabs/Module/Sharedwithme.php:110
 msgid "Remove this file"
 msgstr "Eliminar este fichero"
 
-#: ../../Zotlabs/Module/Setup.php:176
+#: ../../Zotlabs/Module/Setup.php:170
 msgid "$Projectname Server - Setup"
 msgstr "Servidor $Projectname  - Instalación"
 
-#: ../../Zotlabs/Module/Setup.php:180
+#: ../../Zotlabs/Module/Setup.php:174
 msgid "Could not connect to database."
 msgstr "No se ha podido conectar a la base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:184
+#: ../../Zotlabs/Module/Setup.php:178
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "No se puede conectar con la dirección del sitio indicada. Podría tratarse de un problema de SSL o DNS."
 
-#: ../../Zotlabs/Module/Setup.php:191
+#: ../../Zotlabs/Module/Setup.php:185
 msgid "Could not create table."
 msgstr "No se puede crear la tabla."
 
-#: ../../Zotlabs/Module/Setup.php:196
+#: ../../Zotlabs/Module/Setup.php:191
 msgid "Your site database has been installed."
 msgstr "La base de datos del sitio ha sido instalada."
 
-#: ../../Zotlabs/Module/Setup.php:200
+#: ../../Zotlabs/Module/Setup.php:197
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "Podría tener que importar manualmente el fichero \"install/schema_xxx.sql\" usando un cliente de base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Setup.php:748
+#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262
+#: ../../Zotlabs/Module/Setup.php:745
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:260
+#: ../../Zotlabs/Module/Setup.php:259
 msgid "System check"
 msgstr "Verificación del sistema"
 
-#: ../../Zotlabs/Module/Setup.php:265
+#: ../../Zotlabs/Module/Setup.php:264
 msgid "Check again"
 msgstr "Verificar de nuevo"
 
-#: ../../Zotlabs/Module/Setup.php:287
+#: ../../Zotlabs/Module/Setup.php:286
 msgid "Database connection"
 msgstr "Conexión a la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:288
+#: ../../Zotlabs/Module/Setup.php:287
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "Para instalar $Projectname es necesario saber cómo conectar con su base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:289
+#: ../../Zotlabs/Module/Setup.php:288
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Por favor, contacte con el proveedor de servicios o el administrador del sitio si tiene dudas sobre estos ajustes."
 
-#: ../../Zotlabs/Module/Setup.php:290
+#: ../../Zotlabs/Module/Setup.php:289
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "La base de datos que especifique a continuación debe existir ya. Si no es así, por favor, créela antes de seguir."
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Zotlabs/Module/Setup.php:293
 msgid "Database Server Name"
 msgstr "Nombre del servidor de base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Zotlabs/Module/Setup.php:293
 msgid "Default is 127.0.0.1"
 msgstr "De forma predeterminada es 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Zotlabs/Module/Setup.php:294
 msgid "Database Port"
 msgstr "Puerto de la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Zotlabs/Module/Setup.php:294
 msgid "Communication port number - use 0 for default"
 msgstr "Número del puerto de comunicaciones - use 0 como valor por defecto"
 
-#: ../../Zotlabs/Module/Setup.php:296
+#: ../../Zotlabs/Module/Setup.php:295
 msgid "Database Login Name"
 msgstr "Usuario de la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Zotlabs/Module/Setup.php:296
 msgid "Database Login Password"
 msgstr "Contraseña de acceso a la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Zotlabs/Module/Setup.php:297
 msgid "Database Name"
 msgstr "Nombre de la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:299
+#: ../../Zotlabs/Module/Setup.php:298
 msgid "Database Type"
 msgstr "Tipo de base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
+#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
 msgid "Site administrator email address"
 msgstr "Dirección de correo electrónico del administrador del sitio"
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
+#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Su cuenta deberá usar la misma dirección de correo electrónico para poder utilizar el panel de administración web."
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
 msgid "Website URL"
 msgstr "Dirección del sitio web"
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
 msgid "Please use SSL (https) URL if available."
 msgstr "Por favor, use SSL (https) si está disponible."
 
-#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:353
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345
 msgid "Please select a default timezone for your website"
 msgstr "Por favor, selecciones el huso horario por defecto de su sitio web"
 
-#: ../../Zotlabs/Module/Setup.php:328 ../../Zotlabs/Module/Admin/Site.php:258
-msgid "Basic/Minimal Social Networking"
-msgstr "Red social básica o mínima"
-
-#: ../../Zotlabs/Module/Setup.php:329 ../../Zotlabs/Module/Admin/Site.php:259
-msgid "Standard Configuration (default)"
-msgstr "Configuración estándar (por defecto)"
-
-#: ../../Zotlabs/Module/Setup.php:330 ../../Zotlabs/Module/Admin/Site.php:260
-msgid "Professional"
-msgstr "Profesional"
-
-#: ../../Zotlabs/Module/Setup.php:336
+#: ../../Zotlabs/Module/Setup.php:330
 msgid "Site settings"
 msgstr "Ajustes del sitio"
 
-#: ../../Zotlabs/Module/Setup.php:351 ../../Zotlabs/Module/Admin/Site.php:289
-msgid "Server Configuration/Role"
-msgstr "Configuración del servidor"
-
-#: ../../Zotlabs/Module/Setup.php:392
+#: ../../Zotlabs/Module/Setup.php:384
 msgid "PHP version 5.5 or greater is required."
 msgstr "Se requiere la versión 5.5, o superior, de PHP."
 
-#: ../../Zotlabs/Module/Setup.php:393
+#: ../../Zotlabs/Module/Setup.php:385
 msgid "PHP version"
 msgstr "Versión de PHP"
 
-#: ../../Zotlabs/Module/Setup.php:409
+#: ../../Zotlabs/Module/Setup.php:401
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web."
 
-#: ../../Zotlabs/Module/Setup.php:410
+#: ../../Zotlabs/Module/Setup.php:402
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá realizar envíos en segundo plano mediante cron."
 
-#: ../../Zotlabs/Module/Setup.php:414
+#: ../../Zotlabs/Module/Setup.php:406
 msgid "PHP executable path"
 msgstr "Ruta del ejecutable PHP"
 
-#: ../../Zotlabs/Module/Setup.php:414
+#: ../../Zotlabs/Module/Setup.php:406
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Introducir la ruta completa del ejecutable PHP. Puede dejar la línea en blanco para continuar la instalación."
 
-#: ../../Zotlabs/Module/Setup.php:419
+#: ../../Zotlabs/Module/Setup.php:411
 msgid "Command line PHP"
 msgstr "PHP en línea de comandos"
 
-#: ../../Zotlabs/Module/Setup.php:429
+#: ../../Zotlabs/Module/Setup.php:421
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
 msgstr "No se puede comprobar la línea de comandos PHP, ya que shell_exec() está deshabilitado. Es necesario que esté activado."
 
-#: ../../Zotlabs/Module/Setup.php:432
+#: ../../Zotlabs/Module/Setup.php:424
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "La línea de comandos PHP de su sistema no tiene activado \"register_argc_argv\"."
 
-#: ../../Zotlabs/Module/Setup.php:433
+#: ../../Zotlabs/Module/Setup.php:425
 msgid "This is required for message delivery to work."
 msgstr "Esto es necesario para que funcione la transmisión de mensajes."
 
-#: ../../Zotlabs/Module/Setup.php:436
+#: ../../Zotlabs/Module/Setup.php:428
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:454
+#: ../../Zotlabs/Module/Setup.php:446
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to"
 " upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr "La carga máxima que se le permite subir está establecida en %s. El tamaño máximo de un fichero está establecido en %s. Está permitido subir hasta un máximo de %d ficheros de una sola vez."
 
-#: ../../Zotlabs/Module/Setup.php:459
+#: ../../Zotlabs/Module/Setup.php:451
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "Puede ajustar estos valores en el fichero php.ini de su servidor."
 
-#: ../../Zotlabs/Module/Setup.php:461
+#: ../../Zotlabs/Module/Setup.php:453
 msgid "PHP upload limits"
 msgstr "Límites PHP de subida"
 
-#: ../../Zotlabs/Module/Setup.php:484
+#: ../../Zotlabs/Module/Setup.php:476
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Error: La función \"openssl_pkey_new\" en este sistema no es capaz de general claves de cifrado."
 
-#: ../../Zotlabs/Module/Setup.php:485
+#: ../../Zotlabs/Module/Setup.php:477
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Si está en un servidor Windows, por favor, lea \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../Zotlabs/Module/Setup.php:488
+#: ../../Zotlabs/Module/Setup.php:480
 msgid "Generate encryption keys"
 msgstr "Generar claves de cifrado"
 
-#: ../../Zotlabs/Module/Setup.php:505
+#: ../../Zotlabs/Module/Setup.php:497
 msgid "libCurl PHP module"
 msgstr "módulo libCurl PHP"
 
-#: ../../Zotlabs/Module/Setup.php:506
+#: ../../Zotlabs/Module/Setup.php:498
 msgid "GD graphics PHP module"
 msgstr "módulo PHP GD graphics"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Zotlabs/Module/Setup.php:499
 msgid "OpenSSL PHP module"
 msgstr "módulo PHP OpenSSL"
 
-#: ../../Zotlabs/Module/Setup.php:508
+#: ../../Zotlabs/Module/Setup.php:500
 msgid "PDO database PHP module"
 msgstr "Módulo PHP de la base de datos PDO "
 
-#: ../../Zotlabs/Module/Setup.php:509
+#: ../../Zotlabs/Module/Setup.php:501
 msgid "mb_string PHP module"
 msgstr "módulo PHP mb_string"
 
-#: ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:502
 msgid "xml PHP module"
 msgstr "módulo PHP xml"
 
-#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:516
+#: ../../Zotlabs/Module/Setup.php:503
+msgid "zip PHP module"
+msgstr "Módulo zip PHP"
+
+#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
 msgid "Apache mod_rewrite module"
 msgstr "módulo Apache mod_rewrite "
 
-#: ../../Zotlabs/Module/Setup.php:514
+#: ../../Zotlabs/Module/Setup.php:507
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:523
+#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
 msgid "exec"
 msgstr "ejecutable"
 
-#: ../../Zotlabs/Module/Setup.php:520
+#: ../../Zotlabs/Module/Setup.php:513
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr "Error: se necesita un ejecutable pero o no se instaló o está deshabilitado en php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:526 ../../Zotlabs/Module/Setup.php:529
+#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
 msgid "shell_exec"
 msgstr "shell_exec"
 
-#: ../../Zotlabs/Module/Setup.php:526
+#: ../../Zotlabs/Module/Setup.php:519
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Error: se necesita shell_exec pero o no se instaló o está deshabilitado en php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:534
+#: ../../Zotlabs/Module/Setup.php:527
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Error: se necesita el módulo PHP libCURL pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:538
+#: ../../Zotlabs/Module/Setup.php:531
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Error: el módulo PHP GD graphics es necesario, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:542
+#: ../../Zotlabs/Module/Setup.php:535
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Error: el módulo PHP openssl es necesario, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:546
+#: ../../Zotlabs/Module/Setup.php:539
 msgid "Error: PDO database PHP module required but not installed."
 msgstr "Error: se necesita el módulo PHP de la base de datos PDO, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:550
+#: ../../Zotlabs/Module/Setup.php:543
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Error: el módulo PHP mb_string es necesario, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:554
+#: ../../Zotlabs/Module/Setup.php:547
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Error: el módulo PHP xml es necesario para DAV, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:572
+#: ../../Zotlabs/Module/Setup.php:551
+msgid "Error: zip PHP module required but not installed."
+msgstr "Error: se requiere el módulo zip PHP pero no está instalado."
+
+#: ../../Zotlabs/Module/Setup.php:569
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor."
 
-#: ../../Zotlabs/Module/Setup.php:573
+#: ../../Zotlabs/Module/Setup.php:570
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "Esto está generalmente ligado a un problema de permisos, a causa del cual el servidor web tiene prohibido modificar ficheros en su carpeta - incluso si usted mismo tiene esos permisos."
 
-#: ../../Zotlabs/Module/Setup.php:574
+#: ../../Zotlabs/Module/Setup.php:571
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Red top folder."
 msgstr "Al término de este procedimiento, podemos crear un fichero de texto para guardar con el nombre .htconfig.php en el directorio raíz de su instalación de Hubzilla."
 
-#: ../../Zotlabs/Module/Setup.php:575
+#: ../../Zotlabs/Module/Setup.php:572
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr "Como alternativa, puede dejar este procedimiento e intentar realizar una instalación manual. Lea, por favor, el fichero\"install/INSTALL.txt\" para las instrucciones."
 
-#: ../../Zotlabs/Module/Setup.php:578
+#: ../../Zotlabs/Module/Setup.php:575
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:592
+#: ../../Zotlabs/Module/Setup.php:589
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr "Este software hace uso del motor de plantillas Smarty3 para diseñar sus plantillas gráficas. Smarty3 compila las plantillas a PHP para acelerar la renderización."
 
-#: ../../Zotlabs/Module/Setup.php:593
+#: ../../Zotlabs/Module/Setup.php:590
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr "Para poder guardar las plantillas compiladas, el servidor web necesita permisos para acceder al directorio %s en la carpeta web principal."
 
-#: ../../Zotlabs/Module/Setup.php:594 ../../Zotlabs/Module/Setup.php:615
+#: ../../Zotlabs/Module/Setup.php:591 ../../Zotlabs/Module/Setup.php:612
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Por favor, asegúrese de que el servidor web está siendo ejecutado por un usuario que tenga permisos de escritura sobre esta carpeta (por ejemplo, www-data)."
 
-#: ../../Zotlabs/Module/Setup.php:595
+#: ../../Zotlabs/Module/Setup.php:592
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr "Nota: como medida de seguridad, debe dar al servidor web permisos de escritura solo sobre %s - no sobre el fichero de plantilla (.tpl) que contiene."
 
-#: ../../Zotlabs/Module/Setup.php:598
+#: ../../Zotlabs/Module/Setup.php:595
 #, php-format
 msgid "%s is writable"
 msgstr "%s tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:614
+#: ../../Zotlabs/Module/Setup.php:611
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level"
 " web folder"
 msgstr "Este software utiliza el directorio de almacenamiento para guardar los ficheros subidos. El servidor web debe tener acceso de escritura a este directorio en la carpeta de nivel superior"
 
-#: ../../Zotlabs/Module/Setup.php:618
+#: ../../Zotlabs/Module/Setup.php:615
 msgid "store is writable"
 msgstr "\"store\" tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:650
+#: ../../Zotlabs/Module/Setup.php:647
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "El certificado SSL no ha podido ser validado. Corrija este problema o desactive el acceso https a este sitio."
 
-#: ../../Zotlabs/Module/Setup.php:651
+#: ../../Zotlabs/Module/Setup.php:648
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr "Si su servidor soporta conexiones cifradas SSL o si permite conexiones al puerto TCP 443 (el puerto usado por el protocolo https), debe utilizar un certificado válido. No debe usar un certificado firmado por usted mismo."
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Zotlabs/Module/Setup.php:649
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Se ha incorporado esta restricción para evitar que sus entradas públicas hagan referencia a imágenes en su propio servidor."
 
-#: ../../Zotlabs/Module/Setup.php:653
+#: ../../Zotlabs/Module/Setup.php:650
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "Si su certificado no ha sido reconocido, los miembros de otros sitios (con certificados válidos) recibirán mensajes de aviso en sus propios sitios web."
 
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Zotlabs/Module/Setup.php:651
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Por razones de compatibilidad (sobre el conjunto de la red, no solo sobre su propio sitio), debemos insistir en estos requisitos."
 
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Zotlabs/Module/Setup.php:652
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Existen varias Autoridades de Certificación que le pueden proporcionar certificados válidos."
 
-#: ../../Zotlabs/Module/Setup.php:657
+#: ../../Zotlabs/Module/Setup.php:654
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -1807,37 +2022,37 @@ msgid ""
 "server communications."
 msgstr "Si se tiene la certeza de que el certificado es válido y está firmado por una autoridad de confianza, comprobar para ver si hubo un error al instalar un certificado intermedio. Estos no son normalmente requeridos por los navegadores, pero son necesarios para las comunicaciones de servidor a servidor."
 
-#: ../../Zotlabs/Module/Setup.php:659
+#: ../../Zotlabs/Module/Setup.php:656
 msgid "SSL certificate validation"
 msgstr "validación del certificado SSL"
 
-#: ../../Zotlabs/Module/Setup.php:665
+#: ../../Zotlabs/Module/Setup.php:662
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "No se pueden reescribir las direcciones web en .htaccess. Compruebe la configuración de su servidor:"
 
-#: ../../Zotlabs/Module/Setup.php:668
+#: ../../Zotlabs/Module/Setup.php:665
 msgid "Url rewrite is working"
 msgstr "La reescritura de las direcciones funciona correctamente"
 
-#: ../../Zotlabs/Module/Setup.php:682
+#: ../../Zotlabs/Module/Setup.php:679
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "El fichero de configuración de la base de datos .htconfig.php no se ha podido modificar. Por favor, copie el texto generado en un fichero con ese nombre en el directorio raíz de su servidor."
 
-#: ../../Zotlabs/Module/Setup.php:706
-#: ../../addon/rendezvous/rendezvous.php:401 ../../addon/cdav/cdav.php:41
+#: ../../Zotlabs/Module/Setup.php:703
+#: ../../addon/rendezvous/rendezvous.php:401
 msgid "Errors encountered creating database tables."
 msgstr "Se han encontrado errores al crear las tablas de la base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:746
-msgid "<h1>What next</h1>"
-msgstr "<h1>Siguiente paso</h1>"
+#: ../../Zotlabs/Module/Setup.php:743
+msgid "<h1>What next?</h1>"
+msgstr "<h1>¿Qué sigue?</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:747
+#: ../../Zotlabs/Module/Setup.php:744
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -1978,8 +2193,8 @@ msgstr "Intentar ejecutar este paso de actualización automáticamente"
 #: ../../Zotlabs/Module/Admin/Plugins.php:259
 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89
 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:35
-#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Admin.php:60
-#: ../../include/items.php:3391
+#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62
+#: ../../include/items.php:3361
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
@@ -2010,9 +2225,9 @@ msgstr "Activar"
 #: ../../Zotlabs/Module/Admin/Channels.php:145
 #: ../../Zotlabs/Module/Admin/Themes.php:122
 #: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Site.php:277
+#: ../../Zotlabs/Module/Admin/Site.php:269
 #: ../../Zotlabs/Module/Admin/Security.php:86
-#: ../../Zotlabs/Module/Admin.php:137
+#: ../../Zotlabs/Module/Admin.php:136
 msgid "Administration"
 msgstr "Administración"
 
@@ -2028,8 +2243,8 @@ msgid "Toggle"
 msgstr "Cambiar"
 
 #: ../../Zotlabs/Module/Admin/Plugins.php:344
-#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223
-#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:207
+#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:236
+#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:201
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -2092,25 +2307,10 @@ msgstr "Descargar el repositorio"
 msgid "Install new repo"
 msgstr "Instalar un nuevo repositorio"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:358
+#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:384
 msgid "Install"
 msgstr "Instalar"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:423
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Wiki.php:265 ../../Zotlabs/Module/Wiki.php:290
-#: ../../Zotlabs/Module/Connedit.php:920 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/cdav/Mod_Cdav.php:866
-#: ../../addon/cdav/Mod_Cdav.php:1154 ../../addon/js_upload/js_upload.php:46
-#: ../../addon/gitwiki/Mod_Gitwiki.php:244
-#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1327
-#: ../../include/conversation.php:1376
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: ../../Zotlabs/Module/Admin/Plugins.php:445
 msgid "Manage Repos"
 msgstr "Gestionar los repositorios"
@@ -2123,20 +2323,12 @@ msgstr "Repositorios de los plugins instalados"
 msgid "Install a New Plugin Repository"
 msgstr "Instalar un nuevo repositorio de plugins"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:453
-#: ../../Zotlabs/Module/Settings/Oauth.php:42
-#: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:802
-#: ../../Zotlabs/Lib/Apps.php:358 ../../addon/cdav/Mod_Cdav.php:1152
-msgid "Update"
-msgstr "Actualizar"
-
 #: ../../Zotlabs/Module/Admin/Plugins.php:454
 msgid "Switch branch"
 msgstr "Cambiar la rama"
 
 #: ../../Zotlabs/Module/Admin/Plugins.php:455
-#: ../../Zotlabs/Module/Photos.php:960 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Zotlabs/Module/Photos.php:962 ../../Zotlabs/Module/Tagrm.php:137
 #: ../../addon/superblock/superblock.php:116
 msgid "Remove"
 msgstr "Eliminar"
@@ -2176,7 +2368,7 @@ msgstr "La cuenta '%s' ha sido desbloqueada"
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:165
 #: ../../Zotlabs/Module/Admin/Accounts.php:178
-#: ../../Zotlabs/Widget/Admin.php:23
+#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23
 msgid "Accounts"
 msgstr "Cuentas"
 
@@ -2193,21 +2385,12 @@ msgstr "Inscripciones en espera de confirmación"
 msgid "Request date"
 msgstr "Fecha de solicitud"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-#: ../../Zotlabs/Module/Admin/Accounts.php:181
-#: ../../Zotlabs/Module/Connedit.php:906 ../../Zotlabs/Module/Profiles.php:790
-#: ../../addon/cdav/Mod_Cdav.php:1140 ../../addon/openid/MysqlProvider.php:56
-#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
-#: ../../addon/redred/redred.php:107 ../../include/network.php:2315
-msgid "Email"
-msgstr "Correo electrónico"
-
 #: ../../Zotlabs/Module/Admin/Accounts.php:170
 msgid "No registrations."
 msgstr "Sin registros."
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:171
-#: ../../Zotlabs/Module/Connections.php:281
+#: ../../Zotlabs/Module/Connections.php:282 ../../include/conversation.php:685
 msgid "Approve"
 msgstr "Aprobar"
 
@@ -2229,7 +2412,7 @@ msgstr "Desbloquear"
 msgid "ID"
 msgstr "ID"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287
+#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:288
 msgid "All Channels"
 msgstr "Todos los canales"
 
@@ -2343,7 +2526,7 @@ msgid "Channel '%s' code disallowed"
 msgstr "Código no permitido al canal '%s'"
 
 #: ../../Zotlabs/Module/Admin/Channels.php:146
-#: ../../Zotlabs/Widget/Admin.php:24
+#: ../../Zotlabs/Module/Admin.php:110 ../../Zotlabs/Widget/Admin.php:24
 msgid "Channels"
 msgstr "Canales"
 
@@ -2364,7 +2547,7 @@ msgid "Disallow Code"
 msgstr "No permitir código"
 
 #: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1760 ../../include/nav.php:369
+#: ../../include/conversation.php:1757 ../../include/nav.php:355
 msgid "Channel"
 msgstr "Canal"
 
@@ -2409,381 +2592,382 @@ msgstr "[Experimental]"
 msgid "[Unsupported]"
 msgstr "[No soportado]"
 
-#: ../../Zotlabs/Module/Admin/Site.php:144
+#: ../../Zotlabs/Module/Admin/Site.php:142
 msgid "Site settings updated."
 msgstr "Ajustes del sitio actualizados."
 
-#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2915
+#: ../../Zotlabs/Module/Admin/Site.php:168
+#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2928
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../../Zotlabs/Module/Admin/Site.php:181
+#: ../../Zotlabs/Module/Admin/Site.php:179
 #: ../../Zotlabs/Module/Settings/Display.php:137
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (Incompatible)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:188
+#: ../../Zotlabs/Module/Admin/Site.php:186
 #: ../../Zotlabs/Module/Settings/Display.php:151
 msgid "mobile"
 msgstr "móvil"
 
-#: ../../Zotlabs/Module/Admin/Site.php:190
+#: ../../Zotlabs/Module/Admin/Site.php:188
 msgid "experimental"
 msgstr "experimental"
 
-#: ../../Zotlabs/Module/Admin/Site.php:192
+#: ../../Zotlabs/Module/Admin/Site.php:190
 msgid "unsupported"
 msgstr "no soportado"
 
-#: ../../Zotlabs/Module/Admin/Site.php:238
+#: ../../Zotlabs/Module/Admin/Site.php:236
 msgid "Yes - with approval"
 msgstr "Sí - con aprobación"
 
-#: ../../Zotlabs/Module/Admin/Site.php:244
+#: ../../Zotlabs/Module/Admin/Site.php:242
 msgid "My site is not a public server"
 msgstr "Mi sitio no es un servidor público"
 
-#: ../../Zotlabs/Module/Admin/Site.php:245
+#: ../../Zotlabs/Module/Admin/Site.php:243
 msgid "My site has paid access only"
 msgstr "Mi sitio es un servicio de pago"
 
-#: ../../Zotlabs/Module/Admin/Site.php:246
+#: ../../Zotlabs/Module/Admin/Site.php:244
 msgid "My site has free access only"
 msgstr "Mi sitio es un servicio gratuito"
 
-#: ../../Zotlabs/Module/Admin/Site.php:247
+#: ../../Zotlabs/Module/Admin/Site.php:245
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mi sitio ofrece cuentas gratuitas con opciones extra de pago"
 
-#: ../../Zotlabs/Module/Admin/Site.php:264 ../../Zotlabs/Lib/Techlevels.php:10
+#: ../../Zotlabs/Module/Admin/Site.php:256
 msgid "Beginner/Basic"
 msgstr "Principiante / Básico"
 
-#: ../../Zotlabs/Module/Admin/Site.php:265 ../../Zotlabs/Lib/Techlevels.php:11
+#: ../../Zotlabs/Module/Admin/Site.php:257
 msgid "Novice - not skilled but willing to learn"
 msgstr "Novato: no cualificado, pero dispuesto a aprender"
 
-#: ../../Zotlabs/Module/Admin/Site.php:266 ../../Zotlabs/Lib/Techlevels.php:12
+#: ../../Zotlabs/Module/Admin/Site.php:258
 msgid "Intermediate - somewhat comfortable"
 msgstr "Intermedio: bastante cómodo"
 
-#: ../../Zotlabs/Module/Admin/Site.php:267 ../../Zotlabs/Lib/Techlevels.php:13
+#: ../../Zotlabs/Module/Admin/Site.php:259
 msgid "Advanced - very comfortable"
 msgstr "Avanzado: muy cómodo"
 
-#: ../../Zotlabs/Module/Admin/Site.php:268 ../../Zotlabs/Lib/Techlevels.php:14
+#: ../../Zotlabs/Module/Admin/Site.php:260
 msgid "Expert - I can write computer code"
 msgstr "Experto: puedo escribir código informático"
 
-#: ../../Zotlabs/Module/Admin/Site.php:269 ../../Zotlabs/Lib/Techlevels.php:15
+#: ../../Zotlabs/Module/Admin/Site.php:261
 msgid "Wizard - I probably know more than you do"
 msgstr "Asistente: probablemente sé más que tú"
 
-#: ../../Zotlabs/Module/Admin/Site.php:278 ../../Zotlabs/Widget/Admin.php:22
+#: ../../Zotlabs/Module/Admin/Site.php:270 ../../Zotlabs/Widget/Admin.php:22
 msgid "Site"
 msgstr "Sitio"
 
-#: ../../Zotlabs/Module/Admin/Site.php:280
-#: ../../Zotlabs/Module/Register.php:253
+#: ../../Zotlabs/Module/Admin/Site.php:272
+#: ../../Zotlabs/Module/Register.php:251
 msgid "Registration"
 msgstr "Registro"
 
-#: ../../Zotlabs/Module/Admin/Site.php:281
+#: ../../Zotlabs/Module/Admin/Site.php:273
 msgid "File upload"
 msgstr "Subir fichero"
 
-#: ../../Zotlabs/Module/Admin/Site.php:282
+#: ../../Zotlabs/Module/Admin/Site.php:274
 msgid "Policies"
 msgstr "Políticas"
 
-#: ../../Zotlabs/Module/Admin/Site.php:283
+#: ../../Zotlabs/Module/Admin/Site.php:275
 #: ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../../Zotlabs/Module/Admin/Site.php:287
+#: ../../Zotlabs/Module/Admin/Site.php:279
 #: ../../addon/statusnet/statusnet.php:890
 msgid "Site name"
 msgstr "Nombre del sitio"
 
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Zotlabs/Module/Admin/Site.php:281
 msgid "Site default technical skill level"
 msgstr "Nivel de habilidad técnica predeterminado del sitio"
 
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Zotlabs/Module/Admin/Site.php:281
 msgid "Used to provide a member experience matched to technical comfort level"
 msgstr "Se utiliza para proporcionar una experiencia a los miembros adaptada a su nivel de comodidad técnica"
 
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Zotlabs/Module/Admin/Site.php:283
 msgid "Lock the technical skill level setting"
 msgstr "Bloquear el ajuste del nivel de habilidad técnica"
 
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Zotlabs/Module/Admin/Site.php:283
 msgid "Members can set their own technical comfort level by default"
 msgstr "Los miembros pueden configurar su nivel de comodidad técnica por defecto"
 
-#: ../../Zotlabs/Module/Admin/Site.php:295
+#: ../../Zotlabs/Module/Admin/Site.php:285
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Zotlabs/Module/Admin/Site.php:286
 msgid "Administrator Information"
 msgstr "Información del Administrador"
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Zotlabs/Module/Admin/Site.php:286
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Información de contacto de los administradores del sitio. Visible en la página \"siteinfo\". Se puede usar BBCode"
 
-#: ../../Zotlabs/Module/Admin/Site.php:297
-#: ../../Zotlabs/Module/Siteinfo.php:23
+#: ../../Zotlabs/Module/Admin/Site.php:287
+#: ../../Zotlabs/Module/Siteinfo.php:22
 msgid "Site Information"
 msgstr "Información sobre el sitio"
 
-#: ../../Zotlabs/Module/Admin/Site.php:297
+#: ../../Zotlabs/Module/Admin/Site.php:287
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Descripción pública de este sitio. Visible en la página \"siteinfo\". Se puede usar BBCode"
 
-#: ../../Zotlabs/Module/Admin/Site.php:298
+#: ../../Zotlabs/Module/Admin/Site.php:288
 msgid "System language"
 msgstr "Idioma del sistema"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:289
 msgid "System theme"
 msgstr "Tema gráfico del sistema"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:289
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - <a href='#' id='cnftheme'>modificar los ajustes del tema</a>"
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Zotlabs/Module/Admin/Site.php:290
 msgid "Mobile system theme"
 msgstr "Tema del sistema para móviles"
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Zotlabs/Module/Admin/Site.php:290
 msgid "Theme for mobile devices"
 msgstr "Tema para dispositivos móviles"
 
-#: ../../Zotlabs/Module/Admin/Site.php:302
+#: ../../Zotlabs/Module/Admin/Site.php:292
 msgid "Allow Feeds as Connections"
 msgstr "Permitir contenidos RSS como conexiones"
 
-#: ../../Zotlabs/Module/Admin/Site.php:302
+#: ../../Zotlabs/Module/Admin/Site.php:292
 msgid "(Heavy system resource usage)"
 msgstr "(Uso intenso de los recursos del sistema)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:293
 msgid "Maximum image size"
 msgstr "Tamaño máximo de la imagen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:293
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Tamaño máximo en bytes de la imagen subida. Por defecto, es 0, lo que significa que no hay límites."
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Zotlabs/Module/Admin/Site.php:294
 msgid "Does this site allow new member registration?"
 msgstr "¿Debe este sitio permitir el registro de nuevos miembros?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:295
 msgid "Invitation only"
 msgstr "Solo con una invitación"
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:295
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr "Solo se permiten inscripciones de nuevos miembros con un código de invitación. Además, deben aceptarse los términos del registro marcando \"Sí\"."
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Zotlabs/Module/Admin/Site.php:296
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "¿Cómo describiría el tipo de servicio ofrecido por este servidor?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:297
 msgid "Register text"
 msgstr "Texto del registro"
 
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:297
 msgid "Will be displayed prominently on the registration page."
 msgstr "Se mostrará de forma destacada en la página de registro."
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Zotlabs/Module/Admin/Site.php:298
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Página personal que se mostrará a los visitantes (por defecto: la página de identificación)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Zotlabs/Module/Admin/Site.php:298
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "ejemplo: 'public' para mostrar contenido público, 'page/sys/home' para mostrar la página web definida como \"home\" o 'include:home.html' para mostrar el contenido de un fichero."
 
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Zotlabs/Module/Admin/Site.php:299
 msgid "Preserve site homepage URL"
 msgstr "Preservar la dirección de la página personal"
 
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Zotlabs/Module/Admin/Site.php:299
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Presenta la página personal del sitio en un marco en la ubicación original, en vez de redirigirla."
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:300
 msgid "Accounts abandoned after x days"
 msgstr "Cuentas abandonadas después de x días"
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:300
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Para evitar consumir recursos del sistema intentando poner al día las cuentas abandonadas. Introduzca 0 para no tener límite de tiempo."
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:301
 msgid "Allowed friend domains"
 msgstr "Dominios amigos permitidos"
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:301
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Lista separada por comas de dominios a los que está permitido establecer relaciones de amistad con este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio."
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:302
 msgid "Verify Email Addresses"
 msgstr "Verificar las direcciones de correo electrónico"
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:302
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Activar para la verificación de la dirección de correo electrónico en el registro de una cuenta (recomendado)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Zotlabs/Module/Admin/Site.php:303
 msgid "Force publish"
 msgstr "Forzar la publicación"
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Zotlabs/Module/Admin/Site.php:303
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio."
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Zotlabs/Module/Admin/Site.php:304
 msgid "Import Public Streams"
 msgstr "Importar contenido público"
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Zotlabs/Module/Admin/Site.php:304
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr "Importar y permitir acceso al contenido público sacado de otros sitios. Advertencia: este contenido no está moderado, por lo que podría encontrar cosas inapropiadas u ofensivas."
 
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Zotlabs/Module/Admin/Site.php:305
 msgid "Login on Homepage"
 msgstr "Iniciar sesión en la página personal"
 
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Zotlabs/Module/Admin/Site.php:305
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Presentar a los visitantes una casilla de identificación en la página de inicio, si no se ha configurado otro tipo de contenido."
 
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:306
 msgid "Enable context help"
 msgstr "Habilitar la ayuda contextual"
 
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:306
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
 msgstr "Ver la ayuda contextual para la página actual cuando se pulse el botón de Ayuda."
 
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Zotlabs/Module/Admin/Site.php:308
 msgid "Reply-to email address for system generated email."
 msgstr "Dirección de respuesta para el correo electrónico generado por el sistema."
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Zotlabs/Module/Admin/Site.php:309
 msgid "Sender (From) email address for system generated email."
 msgstr "Dirección del remitente (From) para el correo electrónico generado por el sistema."
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Zotlabs/Module/Admin/Site.php:310
 msgid "Name of email sender for system generated email."
 msgstr "Nombre del remitente del correo electrónico generado por el sistema."
 
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Zotlabs/Module/Admin/Site.php:312
 msgid "Directory Server URL"
 msgstr "URL del servidor de directorio"
 
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Zotlabs/Module/Admin/Site.php:312
 msgid "Default directory server"
 msgstr "Servidor de directorio predeterminado"
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Zotlabs/Module/Admin/Site.php:314
 msgid "Proxy user"
 msgstr "Usuario del proxy"
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Zotlabs/Module/Admin/Site.php:315
 msgid "Proxy URL"
 msgstr "Dirección del proxy"
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:316
 msgid "Network timeout"
 msgstr "Tiempo de espera de la red"
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:316
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Valor en segundos. Poner a 0 para que no haya tiempo límite (no recomendado)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Zotlabs/Module/Admin/Site.php:317
 msgid "Delivery interval"
 msgstr "Intervalo de entrega"
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Zotlabs/Module/Admin/Site.php:317
 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 "Retrasar los procesos de transmisión en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para sitios compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados."
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Zotlabs/Module/Admin/Site.php:318
 msgid "Deliveries per process"
 msgstr "Intentos de envío por proceso"
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Zotlabs/Module/Admin/Site.php:318
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Numero de envíos a intentar en un único proceso del sistema operativo. Ajustar si es necesario mejorar el rendimiento. Se recomienda: 1-5."
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Zotlabs/Module/Admin/Site.php:319
 msgid "Poll interval"
 msgstr "Intervalo máximo de tiempo entre dos mensajes sucesivos"
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Zotlabs/Module/Admin/Site.php:319
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Retrasar el intervalo de envío en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de entrega."
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:320
 msgid "Maximum Load Average"
 msgstr "Carga media máxima"
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:320
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Carga máxima del sistema antes de que los procesos de entrega y envío se hayan retardado - por defecto, 50."
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Zotlabs/Module/Admin/Site.php:321
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr "Caducidad del contenido importado de otros sitios (en días)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Zotlabs/Module/Admin/Site.php:321
 msgid "0 for no expiration of imported content"
 msgstr "0 para que no caduque el contenido importado"
 
@@ -2829,8 +3013,8 @@ msgstr "Información adicional (opcional)"
 #: ../../Zotlabs/Module/Admin/Profs.php:74
 #: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
-#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1028
-#: ../../include/text.php:1040
+#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1022
+#: ../../include/text.php:1034
 msgid "Save"
 msgstr "Guardar"
 
@@ -3034,6 +3218,14 @@ msgctxt "acl"
 msgid "Profile"
 msgstr "Perfil"
 
+#: ../../Zotlabs/Module/Moderate.php:37
+msgid "Comment approved"
+msgstr "El comentario ha sido aprobado"
+
+#: ../../Zotlabs/Module/Moderate.php:41
+msgid "Comment deleted"
+msgstr "Se ha eliminado el comentario"
+
 #: ../../Zotlabs/Module/Settings/Permcats.php:37
 msgid "Permission category saved."
 msgstr "Se ha guardado la categoría del permiso."
@@ -3054,25 +3246,25 @@ msgstr "Nombre de la autorización"
 
 #: ../../Zotlabs/Module/Settings/Permcats.php:103
 #: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Connedit.php:886
+#: ../../Zotlabs/Module/Connedit.php:904
 msgid "My Settings"
 msgstr "Mis ajustes"
 
 #: ../../Zotlabs/Module/Settings/Permcats.php:105
 #: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Connedit.php:881
+#: ../../Zotlabs/Module/Connedit.php:899
 msgid "inherited"
 msgstr "heredado"
 
 #: ../../Zotlabs/Module/Settings/Permcats.php:108
 #: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Zotlabs/Module/Connedit.php:906
 msgid "Individual Permissions"
 msgstr "Permisos individuales"
 
 #: ../../Zotlabs/Module/Settings/Permcats.php:109
 #: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Connedit.php:889
+#: ../../Zotlabs/Module/Connedit.php:907
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -3086,12 +3278,12 @@ msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><stron
 #: ../../Zotlabs/Module/Settings/Channel.php:70
 #: ../../Zotlabs/Module/Settings/Channel.php:81
 #: ../../Zotlabs/Module/Connedit.php:707 ../../Zotlabs/Widget/Affinity.php:28
-#: ../../include/selectors.php:123 ../../include/channel.php:406
-#: ../../include/channel.php:407 ../../include/channel.php:414
+#: ../../include/selectors.php:123 ../../include/channel.php:408
+#: ../../include/channel.php:409 ../../include/channel.php:416
 msgid "Friends"
 msgstr "Amigos/as"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:251
+#: ../../Zotlabs/Module/Settings/Channel.php:255
 #: ../../addon/rendezvous/rendezvous.php:82
 #: ../../addon/openstreetmap/openstreetmap.php:184
 #: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54
@@ -3100,380 +3292,388 @@ msgstr "Amigos/as"
 msgid "Settings updated."
 msgstr "Ajustes actualizados."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:312
+#: ../../Zotlabs/Module/Settings/Channel.php:316
 msgid "Nobody except yourself"
 msgstr "Nadie excepto usted"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:313
+#: ../../Zotlabs/Module/Settings/Channel.php:317
 msgid "Only those you specifically allow"
 msgstr "Solo aquellos a los que usted permita explícitamente"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:314
+#: ../../Zotlabs/Module/Settings/Channel.php:318
 msgid "Approved connections"
 msgstr "Conexiones aprobadas"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:315
+#: ../../Zotlabs/Module/Settings/Channel.php:319
 msgid "Any connections"
 msgstr "Cualquier conexión"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:316
+#: ../../Zotlabs/Module/Settings/Channel.php:320
 msgid "Anybody on this website"
 msgstr "Cualquiera en este sitio web"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:317
+#: ../../Zotlabs/Module/Settings/Channel.php:321
 msgid "Anybody in this network"
 msgstr "Cualquiera en esta red"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:318
+#: ../../Zotlabs/Module/Settings/Channel.php:322
 msgid "Anybody authenticated"
 msgstr "Cualquiera que esté autenticado"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:319
+#: ../../Zotlabs/Module/Settings/Channel.php:323
 msgid "Anybody on the internet"
 msgstr "Cualquiera en internet"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:395
+#: ../../Zotlabs/Module/Settings/Channel.php:399
 msgid "Publish your default profile in the network directory"
 msgstr "Publicar su perfil principal en el directorio de la red"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:400
+#: ../../Zotlabs/Module/Settings/Channel.php:404
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:404
+#: ../../Zotlabs/Module/Settings/Channel.php:408
 #: ../../Zotlabs/Module/Profile_photo.php:429
 #: ../../Zotlabs/Module/Cover_photo.php:365
 msgid "or"
 msgstr "o"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:409
+#: ../../Zotlabs/Module/Settings/Channel.php:413
 msgid "Your channel address is"
 msgstr "Su dirección de canal es"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:412
+#: ../../Zotlabs/Module/Settings/Channel.php:416
 msgid "Your files/photos are accessible via WebDAV at"
 msgstr "Sus archivos y fotos son accesibles a través de WebDAV en "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:474
+#: ../../Zotlabs/Module/Settings/Channel.php:478
 msgid "Channel Settings"
 msgstr "Ajustes del canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:481
+#: ../../Zotlabs/Module/Settings/Channel.php:485
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:482
-#: ../../include/channel.php:1250
+#: ../../Zotlabs/Module/Settings/Channel.php:486
+#: ../../include/channel.php:1373
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:483
+#: ../../Zotlabs/Module/Settings/Channel.php:487
 #: ../../Zotlabs/Module/Settings/Account.php:119
 msgid "Email Address:"
 msgstr "Dirección de correo electrónico:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:484
+#: ../../Zotlabs/Module/Settings/Channel.php:488
 msgid "Your Timezone:"
 msgstr "Su huso horario:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:485
+#: ../../Zotlabs/Module/Settings/Channel.php:489
 msgid "Default Post Location:"
 msgstr "Localización geográfica predeterminada para sus publicaciones:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:485
+#: ../../Zotlabs/Module/Settings/Channel.php:489
 msgid "Geographical location to display on your posts"
 msgstr "Localización geográfica que debe mostrarse en sus publicaciones"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:486
+#: ../../Zotlabs/Module/Settings/Channel.php:490
 msgid "Use Browser Location:"
 msgstr "Usar la localización geográfica del navegador:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:488
+#: ../../Zotlabs/Module/Settings/Channel.php:492
 msgid "Adult Content"
 msgstr "Contenido solo para adultos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:488
+#: ../../Zotlabs/Module/Settings/Channel.php:492
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Este canal publica contenido solo para adultos con frecuencia o regularmente. (Por favor etiquete cualquier material para adultos con la etiqueta #NSFW)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:490
+#: ../../Zotlabs/Module/Settings/Channel.php:494
 msgid "Security and Privacy Settings"
 msgstr "Configuración de seguridad y privacidad"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:493
+#: ../../Zotlabs/Module/Settings/Channel.php:496
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Sus permisos ya están configurados. Pulse para ver/ajustar"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:495
+#: ../../Zotlabs/Module/Settings/Channel.php:498
 msgid "Hide my online presence"
 msgstr "Ocultar mi presencia en línea"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:495
+#: ../../Zotlabs/Module/Settings/Channel.php:498
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Evitar mostrar en su perfil que está en línea"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:497
+#: ../../Zotlabs/Module/Settings/Channel.php:500
 msgid "Simple Privacy Settings:"
 msgstr "Configuración de privacidad sencilla:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:498
+#: ../../Zotlabs/Module/Settings/Channel.php:501
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Muy Público - <em>extremadamente permisivo (debería ser usado con precaución)</em>"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:499
+#: ../../Zotlabs/Module/Settings/Channel.php:502
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Típico - <em>por defecto público, privado cuando se desee (similar a los permisos de una red social pero con privacidad mejorada)</em>"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:500
+#: ../../Zotlabs/Module/Settings/Channel.php:503
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privado - <em>por defecto, privado, nunca abierto o público</em>"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:501
+#: ../../Zotlabs/Module/Settings/Channel.php:504
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Bloqueado - <em>por defecto, bloqueado/a para cualquiera</em>"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Zotlabs/Module/Settings/Channel.php:506
 msgid "Allow others to tag your posts"
 msgstr "Permitir a otros etiquetar sus publicaciones"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Zotlabs/Module/Settings/Channel.php:506
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "A menudo usado por la comunidad para marcar contenido inapropiado de forma retroactiva."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:505
+#: ../../Zotlabs/Module/Settings/Channel.php:508
 msgid "Channel Permission Limits"
 msgstr "Límites de los permisos del canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:510
 msgid "Expire other channel content after this many days"
 msgstr "Caducar contenido de otros canales después de este número de días"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:510
 msgid "0 or blank to use the website limit."
 msgstr "0 o en blanco para usar el límite del sitio web."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:510
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Este sitio web caduca después de %d días."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:510
 msgid "This website does not expire imported content."
 msgstr "Este sitio web no caduca el contenido importado."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:510
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "El límite del sitio web tiene prioridad si es inferior a su propio límite."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:508
+#: ../../Zotlabs/Module/Settings/Channel.php:511
 msgid "Maximum Friend Requests/Day:"
 msgstr "Máximo de solicitudes de amistad por día:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:508
+#: ../../Zotlabs/Module/Settings/Channel.php:511
 msgid "May reduce spam activity"
 msgstr "Podría reducir la actividad de spam"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:509
+#: ../../Zotlabs/Module/Settings/Channel.php:512
 msgid "Default Access Control List (ACL)"
 msgstr "Lista de control de acceso (ACL) por defecto"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:511
+#: ../../Zotlabs/Module/Settings/Channel.php:514
 msgid "Use my default audience setting for the type of object published"
 msgstr "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:518
+#: ../../Zotlabs/Module/Settings/Channel.php:521
 msgid "Channel permissions category:"
 msgstr "Categoría de los permisos del canal:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Zotlabs/Module/Settings/Channel.php:522
 msgid "Default Permissions Group"
 msgstr "Grupo de permisos predeterminado"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Zotlabs/Module/Settings/Channel.php:528
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Máximo de mensajes privados por día de gente desconocida:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Zotlabs/Module/Settings/Channel.php:528
 msgid "Useful to reduce spamming"
 msgstr "Útil para reducir el envío de correo no deseado"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Zotlabs/Module/Settings/Channel.php:531
 msgid "Notification Settings"
 msgstr "Configuración de las notificaciones"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:529
+#: ../../Zotlabs/Module/Settings/Channel.php:532
 msgid "By default post a status message when:"
 msgstr "Por defecto, enviar un mensaje de estado cuando:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:530
+#: ../../Zotlabs/Module/Settings/Channel.php:533
 msgid "accepting a friend request"
 msgstr "Acepte una solicitud de amistad"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:531
+#: ../../Zotlabs/Module/Settings/Channel.php:534
 msgid "joining a forum/community"
 msgstr "al unirse a un foro o comunidad"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:532
+#: ../../Zotlabs/Module/Settings/Channel.php:535
 msgid "making an <em>interesting</em> profile change"
 msgstr "Realice un cambio <em>interesante</em> en su perfil"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:533
+#: ../../Zotlabs/Module/Settings/Channel.php:536
 msgid "Send a notification email when:"
 msgstr "Enviar una notificación por correo electrónico cuando:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:534
+#: ../../Zotlabs/Module/Settings/Channel.php:537
 msgid "You receive a connection request"
 msgstr "Reciba una solicitud de conexión"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:535
+#: ../../Zotlabs/Module/Settings/Channel.php:538
 msgid "Your connections are confirmed"
 msgstr "Sus conexiones hayan sido confirmadas"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:536
+#: ../../Zotlabs/Module/Settings/Channel.php:539
 msgid "Someone writes on your profile wall"
 msgstr "Alguien escriba en la página de su perfil (\"muro\")"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:537
+#: ../../Zotlabs/Module/Settings/Channel.php:540
 msgid "Someone writes a followup comment"
 msgstr "Alguien escriba un comentario sobre sus publicaciones"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:538
+#: ../../Zotlabs/Module/Settings/Channel.php:541
 msgid "You receive a private message"
 msgstr "Reciba un mensaje privado"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:539
+#: ../../Zotlabs/Module/Settings/Channel.php:542
 msgid "You receive a friend suggestion"
 msgstr "Reciba una sugerencia de amistad"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:540
+#: ../../Zotlabs/Module/Settings/Channel.php:543
 msgid "You are tagged in a post"
 msgstr "Usted sea etiquetado en una publicación"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:541
+#: ../../Zotlabs/Module/Settings/Channel.php:544
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Reciba un toque o incitación en una publicación"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:543
+#: ../../Zotlabs/Module/Settings/Channel.php:546
 msgid "Someone likes your post/comment"
 msgstr "Alguien muestre agrado por su entrada o comentario"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Zotlabs/Module/Settings/Channel.php:549
 msgid "Show visual notifications including:"
 msgstr "Mostrar notificaciones visuales que incluyan:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:548
+#: ../../Zotlabs/Module/Settings/Channel.php:551
 msgid "Unseen grid activity"
 msgstr "Nueva actividad en la red"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:549
+#: ../../Zotlabs/Module/Settings/Channel.php:552
 msgid "Unseen channel activity"
 msgstr "Actividad no vista en el canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Zotlabs/Module/Settings/Channel.php:553
 msgid "Unseen private messages"
 msgstr "Mensajes privados no leídos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
-#: ../../Zotlabs/Module/Settings/Channel.php:555
-#: ../../Zotlabs/Module/Settings/Channel.php:556
-#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Zotlabs/Module/Settings/Channel.php:558
+#: ../../Zotlabs/Module/Settings/Channel.php:559
+#: ../../Zotlabs/Module/Settings/Channel.php:560
 #: ../../addon/jappixmini/jappixmini.php:343
 msgid "Recommended"
 msgstr "Recomendado"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:551
+#: ../../Zotlabs/Module/Settings/Channel.php:554
 msgid "Upcoming events"
 msgstr "Próximos eventos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:552
+#: ../../Zotlabs/Module/Settings/Channel.php:555
 msgid "Events today"
 msgstr "Eventos de hoy"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Zotlabs/Module/Settings/Channel.php:556
 msgid "Upcoming birthdays"
 msgstr "Próximos cumpleaños"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Zotlabs/Module/Settings/Channel.php:556
 msgid "Not available in all themes"
 msgstr "No disponible en todos los temas"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:554
+#: ../../Zotlabs/Module/Settings/Channel.php:557
 msgid "System (personal) notifications"
 msgstr "Notificaciones del sistema (personales)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Zotlabs/Module/Settings/Channel.php:558
 msgid "System info messages"
 msgstr "Mensajes de información del sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:556
+#: ../../Zotlabs/Module/Settings/Channel.php:559
 msgid "System critical alerts"
 msgstr "Alertas críticas del sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../Zotlabs/Module/Settings/Channel.php:560
 msgid "New connections"
 msgstr "Nuevas conexiones"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:558
+#: ../../Zotlabs/Module/Settings/Channel.php:561
 msgid "System Registrations"
 msgstr "Registros del sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:559
+#: ../../Zotlabs/Module/Settings/Channel.php:562
+msgid "Unseen shared files"
+msgstr "Ficheros compartidos no vistos"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:563
+msgid "Unseen public activity"
+msgstr "Actividad pública no vista"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:564
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Mostrar también en Avisos las nuevas publicaciones, los mensajes privados y las conexiones"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Zotlabs/Module/Settings/Channel.php:566
 msgid "Notify me of events this many days in advance"
 msgstr "Avisarme de los eventos con algunos días de antelación"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Zotlabs/Module/Settings/Channel.php:566
 msgid "Must be greater than 0"
 msgstr "Debe ser mayor que 0"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Zotlabs/Module/Settings/Channel.php:572
 msgid "Advanced Account/Page Type Settings"
 msgstr "Ajustes avanzados de la cuenta y de los tipos de página"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:568
+#: ../../Zotlabs/Module/Settings/Channel.php:573
 msgid "Change the behaviour of this account for special situations"
 msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:570
+#: ../../Zotlabs/Module/Settings/Channel.php:575
 msgid "Miscellaneous Settings"
 msgstr "Ajustes diversos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Zotlabs/Module/Settings/Channel.php:576
 msgid "Default photo upload folder"
 msgstr "Carpeta por defecto de las fotos subidas"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:577
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - año en curso, %m - mes actual"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Zotlabs/Module/Settings/Channel.php:577
 msgid "Default file upload folder"
 msgstr "Carpeta por defecto de los ficheros subidos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Zotlabs/Module/Settings/Channel.php:579
 msgid "Personal menu to display in your channel pages"
 msgstr "Menú personal que debe mostrarse en las páginas de su canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:581
 msgid "Remove this channel."
 msgstr "Eliminar este canal."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Zotlabs/Module/Settings/Channel.php:582
 msgid "Firefox Share $Projectname provider"
 msgstr "Servicio de compartición de Firefox: proveedor $Projectname"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Zotlabs/Module/Settings/Channel.php:583
 msgid "Start calendar week on Monday"
 msgstr "Comenzar el calendario semanal por el lunes"
 
@@ -3509,7 +3709,7 @@ msgid ""
 msgstr "También puede proporcionar, con el estilo <em>dropbox</em>, enlaces de acceso a sus amigos y asociados añadiendo la contraseña de inicio de sesión a cualquier dirección URL, como se muestra. Ejemplos: "
 
 #: ../../Zotlabs/Module/Settings/Tokens.php:150
-#: ../../Zotlabs/Widget/Settings_menu.php:90
+#: ../../Zotlabs/Widget/Settings_menu.php:92
 msgid "Guest Access Tokens"
 msgstr "Tokens de acceso para invitados"
 
@@ -3526,7 +3726,7 @@ msgid "Expires (yyyy-mm-dd)"
 msgstr "Expira (aaaa-mm-dd)"
 
 #: ../../Zotlabs/Module/Settings/Tokens.php:160
-#: ../../Zotlabs/Module/Connedit.php:885
+#: ../../Zotlabs/Module/Connedit.php:903
 msgid "Their Settings"
 msgstr "Sus ajustes"
 
@@ -3603,27 +3803,27 @@ msgstr "Eliminar cuenta"
 msgid "Remove this account including all its channels"
 msgstr "Eliminar esta cuenta incluyendo todos sus canales"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:20
+#: ../../Zotlabs/Module/Settings/Featured.php:21
 msgid "Affinity Slider settings updated."
 msgstr "Se han actualizado los ajustes del controlador de afinidad."
 
-#: ../../Zotlabs/Module/Settings/Featured.php:34
+#: ../../Zotlabs/Module/Settings/Featured.php:36
 msgid "No feature settings configured"
 msgstr "No se ha establecido la configuración de los complementos"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:41
+#: ../../Zotlabs/Module/Settings/Featured.php:43
 msgid "Default maximum affinity level"
 msgstr "Nivel máximo de afinidad por defecto"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:46
+#: ../../Zotlabs/Module/Settings/Featured.php:48
 msgid "Default minimum affinity level"
 msgstr "Nivel mínimo de afinidad por defecto"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Zotlabs/Module/Settings/Featured.php:52
 msgid "Affinity Slider Settings"
 msgstr "Ajustes del controlador de afinidad"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:60
+#: ../../Zotlabs/Module/Settings/Featured.php:62
 msgid "Feature/Addon Settings"
 msgstr "Ajustes de los complementos"
 
@@ -3817,32 +4017,24 @@ msgid "Remove authorization"
 msgstr "Eliminar autorización"
 
 #: ../../Zotlabs/Module/Embedphotos.php:140
-#: ../../Zotlabs/Module/Photos.php:751 ../../Zotlabs/Module/Photos.php:1290
-#: ../../Zotlabs/Widget/Album.php:78
+#: ../../Zotlabs/Module/Photos.php:753 ../../Zotlabs/Module/Photos.php:1292
+#: ../../Zotlabs/Widget/Portfolio.php:78 ../../Zotlabs/Widget/Album.php:78
 msgid "View Photo"
 msgstr "Ver foto"
 
-#: ../../Zotlabs/Module/Embedphotos.php:146
-#: ../../Zotlabs/Module/Photos.php:757 ../../Zotlabs/Module/Photos.php:1213
-#: ../../Zotlabs/Lib/Apps.php:571 ../../Zotlabs/Lib/Apps.php:649
-#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Widget/Album.php:84
-#: ../../addon/cdav/Mod_Cdav.php:745 ../../addon/cdav/Mod_Cdav.php:746
-#: ../../addon/cdav/Mod_Cdav.php:753 ../../include/conversation.php:1110
-msgid "Unknown"
-msgstr "Desconocido"
-
 #: ../../Zotlabs/Module/Embedphotos.php:156
-#: ../../Zotlabs/Module/Photos.php:782 ../../Zotlabs/Widget/Album.php:95
+#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Widget/Portfolio.php:97
+#: ../../Zotlabs/Widget/Album.php:95
 msgid "Edit Album"
 msgstr "Editar álbum"
 
 #: ../../Zotlabs/Module/Embedphotos.php:158
-#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1321
+#: ../../Zotlabs/Module/Photos.php:786 ../../Zotlabs/Module/Photos.php:1323
 #: ../../Zotlabs/Module/Profile_photo.php:423
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:334
-#: ../../Zotlabs/Widget/Album.php:97 ../../addon/cdav/include/widgets.php:132
-#: ../../addon/cdav/include/widgets.php:168
+#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:337
+#: ../../Zotlabs/Widget/Cdav.php:132 ../../Zotlabs/Widget/Cdav.php:168
+#: ../../Zotlabs/Widget/Portfolio.php:99 ../../Zotlabs/Widget/Album.php:97
 msgid "Upload"
 msgstr "Subir"
 
@@ -3904,9 +4096,9 @@ msgid "URL for photo of thing (optional)"
 msgstr "Dirección para la foto o elemento (opcional)"
 
 #: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363
-#: ../../Zotlabs/Module/Photos.php:647 ../../Zotlabs/Module/Photos.php:1011
-#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:233
-#: ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Photos.php:649 ../../Zotlabs/Module/Photos.php:1013
+#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:235
+#: ../../Zotlabs/Module/Filestorage.php:142
 #: ../../include/acl_selectors.php:218
 msgid "Permissions"
 msgstr "Permisos"
@@ -3929,52 +4121,52 @@ msgstr "Notificaciones del sistema"
 msgid "Channel added."
 msgstr "Canal añadido."
 
-#: ../../Zotlabs/Module/Import.php:144
+#: ../../Zotlabs/Module/Import.php:143
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr "Su paquete de servicios solo permite %d canales."
 
-#: ../../Zotlabs/Module/Import.php:158
+#: ../../Zotlabs/Module/Import.php:157
 msgid "No channel. Import failed."
 msgstr "No hay canal. La importación ha fallado"
 
-#: ../../Zotlabs/Module/Import.php:466
+#: ../../Zotlabs/Module/Import.php:470
 #: ../../addon/diaspora/import_diaspora.php:142
 msgid "Import completed."
 msgstr "Importación completada."
 
-#: ../../Zotlabs/Module/Import.php:494
+#: ../../Zotlabs/Module/Import.php:498
 msgid "You must be logged in to use this feature."
 msgstr "Debe estar registrado para poder usar esta funcionalidad."
 
-#: ../../Zotlabs/Module/Import.php:499
+#: ../../Zotlabs/Module/Import.php:503
 msgid "Import Channel"
 msgstr "Importar canal"
 
-#: ../../Zotlabs/Module/Import.php:500
+#: ../../Zotlabs/Module/Import.php:504
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación."
 
-#: ../../Zotlabs/Module/Import.php:502
+#: ../../Zotlabs/Module/Import.php:506
 msgid "Or provide the old server/hub details"
 msgstr "O proporcione los detalles de su antiguo servidor/hub"
 
-#: ../../Zotlabs/Module/Import.php:503
+#: ../../Zotlabs/Module/Import.php:507
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Su identidad en el antiguo servidor  (canal@ejemplo.com)"
 
-#: ../../Zotlabs/Module/Import.php:504
+#: ../../Zotlabs/Module/Import.php:508
 msgid "Your old login email address"
 msgstr "Su antigua dirección de correo electrónico"
 
-#: ../../Zotlabs/Module/Import.php:505
+#: ../../Zotlabs/Module/Import.php:509
 msgid "Your old login password"
 msgstr "Su antigua contraseña"
 
-#: ../../Zotlabs/Module/Import.php:506
+#: ../../Zotlabs/Module/Import.php:510
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -3982,19 +4174,19 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua dirección debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos."
 
-#: ../../Zotlabs/Module/Import.php:507
+#: ../../Zotlabs/Module/Import.php:511
 msgid "Make this hub my primary location"
 msgstr "Convertir este servidor en mi ubicación primaria"
 
-#: ../../Zotlabs/Module/Import.php:508
+#: ../../Zotlabs/Module/Import.php:512
 msgid "Move this channel (disable all previous locations)"
 msgstr "Mover este canal (desactivar todas las ubicaciones anteriores)"
 
-#: ../../Zotlabs/Module/Import.php:509
+#: ../../Zotlabs/Module/Import.php:513
 msgid "Import a few months of posts if possible (limited by available memory"
 msgstr "Importar unos meses de mensajes si es posible (limitado por la memoria disponible"
 
-#: ../../Zotlabs/Module/Import.php:510
+#: ../../Zotlabs/Module/Import.php:514
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -4004,21 +4196,21 @@ msgstr "Este proceso puede tardar varios minutos en completarse. Por favor enví
 msgid "Authentication failed."
 msgstr "Falló la autenticación."
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1984
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:2102
 msgid "Remote Authentication"
 msgstr "Acceso desde su servidor"
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1985
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2103
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)"
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1986
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2104
 msgid "Authenticate"
 msgstr "Acceder"
 
 #: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:31
-#: ../../Zotlabs/Module/Block.php:43
+#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Wall_upload.php:31
+#: ../../Zotlabs/Module/Block.php:41
 msgid "Channel not found."
 msgstr "Canal no encontrado."
 
@@ -4026,7 +4218,7 @@ msgstr "Canal no encontrado."
 msgid "Permissions denied."
 msgstr "Permisos denegados."
 
-#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2291
+#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2304
 msgid "Import"
 msgstr "Importar"
 
@@ -4052,13 +4244,13 @@ msgstr "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y con
 msgid "Item not available."
 msgstr "Elemento no disponible"
 
-#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:205
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:306
-#: ../../Zotlabs/Module/Mail.php:448 ../../include/conversation.php:1228
+#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207
+#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288
+#: ../../Zotlabs/Module/Mail.php:430 ../../include/conversation.php:1225
 msgid "Insert web link"
 msgstr "Insertar enlace web"
 
-#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1339
+#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1336
 msgid "Title (optional)"
 msgstr "Título (opcional)"
 
@@ -4066,11 +4258,11 @@ msgstr "Título (opcional)"
 msgid "Edit Block"
 msgstr "Modificar este bloque"
 
-#: ../../Zotlabs/Module/Profile.php:91
+#: ../../Zotlabs/Module/Profile.php:93
 msgid "vcard"
 msgstr "vcard"
 
-#: ../../Zotlabs/Module/Apps.php:45
+#: ../../Zotlabs/Module/Apps.php:45 ../../Zotlabs/Lib/Apps.php:224
 msgid "Apps"
 msgstr "Aplicaciones (apps)"
 
@@ -4088,7 +4280,8 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s está %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234
+#: ../../Zotlabs/Module/Mood.php:120 ../../Zotlabs/Module/Mood.php:135
+#: ../../Zotlabs/Lib/Apps.php:247
 msgid "Mood"
 msgstr "Estado de ánimo"
 
@@ -4096,74 +4289,87 @@ msgstr "Estado de ánimo"
 msgid "Set your current mood and tell your friends"
 msgstr "Describir su estado de ánimo para comunicárselo a sus amigos"
 
-#: ../../Zotlabs/Module/Connections.php:52
-#: ../../Zotlabs/Module/Connections.php:157
-#: ../../Zotlabs/Module/Connections.php:246
+#: ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Module/Connections.php:309 ../../Zotlabs/Lib/Apps.php:229
+#: ../../include/text.php:951 ../../include/nav.php:180
+msgid "Connections"
+msgstr "Conexiones"
+
+#: ../../Zotlabs/Module/Connections.php:54
+#: ../../Zotlabs/Module/Connections.php:156
+#: ../../Zotlabs/Module/Connections.php:245
 msgid "Blocked"
 msgstr "Bloqueadas"
 
-#: ../../Zotlabs/Module/Connections.php:57
-#: ../../Zotlabs/Module/Connections.php:164
-#: ../../Zotlabs/Module/Connections.php:245
+#: ../../Zotlabs/Module/Connections.php:59
+#: ../../Zotlabs/Module/Connections.php:163
+#: ../../Zotlabs/Module/Connections.php:244
 msgid "Ignored"
 msgstr "Ignoradas"
 
-#: ../../Zotlabs/Module/Connections.php:62
-#: ../../Zotlabs/Module/Connections.php:178
-#: ../../Zotlabs/Module/Connections.php:244
+#: ../../Zotlabs/Module/Connections.php:64
+#: ../../Zotlabs/Module/Connections.php:177
+#: ../../Zotlabs/Module/Connections.php:243
 msgid "Hidden"
 msgstr "Ocultas"
 
-#: ../../Zotlabs/Module/Connections.php:67
-#: ../../Zotlabs/Module/Connections.php:171
-#: ../../Zotlabs/Module/Connections.php:243
-msgid "Archived"
-msgstr "Archivadas"
+#: ../../Zotlabs/Module/Connections.php:69
+#: ../../Zotlabs/Module/Connections.php:170
+msgid "Archived/Unreachable"
+msgstr "Archivada o inaccesible"
 
-#: ../../Zotlabs/Module/Connections.php:72
-#: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1666
+#: ../../Zotlabs/Module/Connections.php:74
+#: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116
+#: ../../include/conversation.php:1663
 msgid "New"
 msgstr "Nuevas"
 
 #: ../../Zotlabs/Module/Connections.php:88
-#: ../../Zotlabs/Module/Connections.php:103
+#: ../../Zotlabs/Module/Connections.php:102
 #: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30
 msgid "All"
 msgstr "Todos/as"
 
-#: ../../Zotlabs/Module/Connections.php:134
+#: ../../Zotlabs/Module/Connections.php:133
 msgid "New Connections"
 msgstr "Nuevas conexiones"
 
-#: ../../Zotlabs/Module/Connections.php:137
+#: ../../Zotlabs/Module/Connections.php:136
 msgid "Show pending (new) connections"
 msgstr "Mostrar conexiones (nuevas) pendientes"
 
-#: ../../Zotlabs/Module/Connections.php:144
+#: ../../Zotlabs/Module/Connections.php:143
 msgid "Show all connections"
 msgstr "Mostrar todas las conexiones"
 
-#: ../../Zotlabs/Module/Connections.php:160
+#: ../../Zotlabs/Module/Connections.php:159
 msgid "Only show blocked connections"
 msgstr "Mostrar solo las conexiones bloqueadas"
 
-#: ../../Zotlabs/Module/Connections.php:167
+#: ../../Zotlabs/Module/Connections.php:166
 msgid "Only show ignored connections"
 msgstr "Mostrar solo conexiones ignoradas"
 
-#: ../../Zotlabs/Module/Connections.php:174
-msgid "Only show archived connections"
-msgstr "Mostrar solo las conexiones archivadas"
+#: ../../Zotlabs/Module/Connections.php:173
+msgid "Only show archived/unreachable connections"
+msgstr "Mostrar solo las conexiones archivadas o inaccesibles"
 
-#: ../../Zotlabs/Module/Connections.php:181
+#: ../../Zotlabs/Module/Connections.php:180
 msgid "Only show hidden connections"
 msgstr "Mostrar solo las conexiones ocultas"
 
-#: ../../Zotlabs/Module/Connections.php:242
+#: ../../Zotlabs/Module/Connections.php:241
 msgid "Pending approval"
 msgstr "Pendiente de aprobación"
 
+#: ../../Zotlabs/Module/Connections.php:242
+msgid "Archived"
+msgstr "Archivadas"
+
+#: ../../Zotlabs/Module/Connections.php:246
+msgid "Not connected at this location"
+msgstr "No está conectado/a en esta ubicación"
+
 #: ../../Zotlabs/Module/Connections.php:258
 #, php-format
 msgid "%1$s [%2$s]"
@@ -4173,61 +4379,56 @@ msgstr "%1$s [%2$s]"
 msgid "Edit connection"
 msgstr "Editar conexión"
 
-#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Zotlabs/Module/Connections.php:261
 msgid "Delete connection"
 msgstr "Eliminar conexión"
 
-#: ../../Zotlabs/Module/Connections.php:269
+#: ../../Zotlabs/Module/Connections.php:270
 msgid "Channel address"
 msgstr "Dirección del canal"
 
-#: ../../Zotlabs/Module/Connections.php:271
+#: ../../Zotlabs/Module/Connections.php:272
 msgid "Network"
 msgstr "Red"
 
-#: ../../Zotlabs/Module/Connections.php:274
+#: ../../Zotlabs/Module/Connections.php:275
 msgid "Call"
 msgstr "Llamar"
 
-#: ../../Zotlabs/Module/Connections.php:276
+#: ../../Zotlabs/Module/Connections.php:277
 msgid "Status"
 msgstr "Estado"
 
-#: ../../Zotlabs/Module/Connections.php:278
+#: ../../Zotlabs/Module/Connections.php:279
 msgid "Connected"
 msgstr "Conectado/a"
 
-#: ../../Zotlabs/Module/Connections.php:280
+#: ../../Zotlabs/Module/Connections.php:281
 msgid "Approve connection"
 msgstr "Aprobar esta conexión"
 
-#: ../../Zotlabs/Module/Connections.php:282
+#: ../../Zotlabs/Module/Connections.php:283
 msgid "Ignore connection"
 msgstr "Ignorar esta conexión"
 
-#: ../../Zotlabs/Module/Connections.php:283
+#: ../../Zotlabs/Module/Connections.php:284
 #: ../../Zotlabs/Module/Connedit.php:626
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../../Zotlabs/Module/Connections.php:284
+#: ../../Zotlabs/Module/Connections.php:285
 msgid "Recent activity"
 msgstr "Actividad reciente"
 
-#: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/text.php:957 ../../include/nav.php:185
-msgid "Connections"
-msgstr "Conexiones"
-
-#: ../../Zotlabs/Module/Connections.php:313
+#: ../../Zotlabs/Module/Connections.php:314
 msgid "Search your connections"
 msgstr "Buscar sus conexiones"
 
-#: ../../Zotlabs/Module/Connections.php:314
+#: ../../Zotlabs/Module/Connections.php:315
 msgid "Connections search"
 msgstr "Buscar conexiones"
 
-#: ../../Zotlabs/Module/Connections.php:315
+#: ../../Zotlabs/Module/Connections.php:316
 #: ../../Zotlabs/Module/Directory.php:391
 #: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23
 msgid "Find"
@@ -4241,15 +4442,19 @@ msgstr "elemento"
 msgid "Source of Item"
 msgstr "Origen del elemento"
 
-#: ../../Zotlabs/Module/Bookmarks.php:53
+#: ../../Zotlabs/Module/Bookmarks.php:11 ../../Zotlabs/Lib/Apps.php:227
+msgid "View Bookmarks"
+msgstr "Ver los marcadores"
+
+#: ../../Zotlabs/Module/Bookmarks.php:56
 msgid "Bookmark added"
 msgstr "Marcador añadido"
 
-#: ../../Zotlabs/Module/Bookmarks.php:76
+#: ../../Zotlabs/Module/Bookmarks.php:79
 msgid "My Bookmarks"
 msgstr "Mis marcadores"
 
-#: ../../Zotlabs/Module/Bookmarks.php:87
+#: ../../Zotlabs/Module/Bookmarks.php:90
 msgid "My Connections Bookmarks"
 msgstr "Marcadores de mis conexiones"
 
@@ -4293,7 +4498,7 @@ msgstr "Álbum no encontrado."
 msgid "Delete Album"
 msgstr "Borrar álbum"
 
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1023
+#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1025
 msgid "Delete Photo"
 msgstr "Borrar foto"
 
@@ -4305,226 +4510,232 @@ msgstr "No hay fotos seleccionadas"
 msgid "Access to this item is restricted."
 msgstr "El acceso a este elemento está restringido."
 
-#: ../../Zotlabs/Module/Photos.php:591
+#: ../../Zotlabs/Module/Photos.php:558 ../../Zotlabs/Module/Fbrowser.php:29
+#: ../../Zotlabs/Lib/Apps.php:242 ../../include/conversation.php:1780
+#: ../../include/nav.php:378
+msgid "Photos"
+msgstr "Fotos"
+
+#: ../../Zotlabs/Module/Photos.php:593
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."
 
-#: ../../Zotlabs/Module/Photos.php:594
+#: ../../Zotlabs/Module/Photos.php:596
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
 
-#: ../../Zotlabs/Module/Photos.php:636
+#: ../../Zotlabs/Module/Photos.php:638
 msgid "Upload Photos"
 msgstr "Subir fotos"
 
-#: ../../Zotlabs/Module/Photos.php:640
+#: ../../Zotlabs/Module/Photos.php:642
 msgid "Enter an album name"
 msgstr "Introducir un nombre de álbum"
 
-#: ../../Zotlabs/Module/Photos.php:641
+#: ../../Zotlabs/Module/Photos.php:643
 msgid "or select an existing album (doubleclick)"
 msgstr "o seleccionar uno existente (doble click)"
 
-#: ../../Zotlabs/Module/Photos.php:642
+#: ../../Zotlabs/Module/Photos.php:644
 msgid "Create a status post for this upload"
 msgstr "Crear un mensaje de estado para esta subida"
 
-#: ../../Zotlabs/Module/Photos.php:643
+#: ../../Zotlabs/Module/Photos.php:645
 msgid "Caption (optional):"
 msgstr "Título (opcional):"
 
-#: ../../Zotlabs/Module/Photos.php:644
+#: ../../Zotlabs/Module/Photos.php:646
 msgid "Description (optional):"
 msgstr "Descripción (opcional):"
 
-#: ../../Zotlabs/Module/Photos.php:725
+#: ../../Zotlabs/Module/Photos.php:727
 msgid "Show Newest First"
 msgstr "Mostrar lo más reciente primero"
 
-#: ../../Zotlabs/Module/Photos.php:727
+#: ../../Zotlabs/Module/Photos.php:729
 msgid "Show Oldest First"
 msgstr "Mostrar lo más antiguo primero"
 
-#: ../../Zotlabs/Module/Photos.php:832
+#: ../../Zotlabs/Module/Photos.php:834
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
 
-#: ../../Zotlabs/Module/Photos.php:834
+#: ../../Zotlabs/Module/Photos.php:836
 msgid "Photo not available"
 msgstr "Foto no disponible"
 
-#: ../../Zotlabs/Module/Photos.php:892
+#: ../../Zotlabs/Module/Photos.php:894
 msgid "Use as profile photo"
 msgstr "Usar como foto del perfil"
 
-#: ../../Zotlabs/Module/Photos.php:893
+#: ../../Zotlabs/Module/Photos.php:895
 msgid "Use as cover photo"
 msgstr "Usar como imagen de portada del perfil"
 
-#: ../../Zotlabs/Module/Photos.php:900
+#: ../../Zotlabs/Module/Photos.php:902
 msgid "Private Photo"
 msgstr "Foto privada"
 
-#: ../../Zotlabs/Module/Photos.php:915
+#: ../../Zotlabs/Module/Photos.php:917
 msgid "View Full Size"
 msgstr "Ver tamaño completo"
 
-#: ../../Zotlabs/Module/Photos.php:997
+#: ../../Zotlabs/Module/Photos.php:999
 msgid "Edit photo"
 msgstr "Editar foto"
 
-#: ../../Zotlabs/Module/Photos.php:999
+#: ../../Zotlabs/Module/Photos.php:1001
 msgid "Rotate CW (right)"
 msgstr "Girar CW (a la derecha)"
 
-#: ../../Zotlabs/Module/Photos.php:1000
+#: ../../Zotlabs/Module/Photos.php:1002
 msgid "Rotate CCW (left)"
 msgstr "Girar CCW (a la izquierda)"
 
-#: ../../Zotlabs/Module/Photos.php:1003
+#: ../../Zotlabs/Module/Photos.php:1005
 msgid "Move photo to album"
 msgstr "Mover la foto a un álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1004
+#: ../../Zotlabs/Module/Photos.php:1006
 msgid "Enter a new album name"
 msgstr "Introducir un nuevo nombre de álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1005
+#: ../../Zotlabs/Module/Photos.php:1007
 msgid "or select an existing one (doubleclick)"
 msgstr "o seleccionar uno (doble click) existente"
 
-#: ../../Zotlabs/Module/Photos.php:1008
+#: ../../Zotlabs/Module/Photos.php:1010
 msgid "Caption"
 msgstr "Título"
 
-#: ../../Zotlabs/Module/Photos.php:1010
+#: ../../Zotlabs/Module/Photos.php:1012
 msgid "Add a Tag"
 msgstr "Añadir una etiqueta"
 
-#: ../../Zotlabs/Module/Photos.php:1018
+#: ../../Zotlabs/Module/Photos.php:1020
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com"
 
-#: ../../Zotlabs/Module/Photos.php:1021
+#: ../../Zotlabs/Module/Photos.php:1023
 msgid "Flag as adult in album view"
 msgstr "Marcar como \"solo para adultos\" en el álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:269
+#: ../../Zotlabs/Module/Photos.php:1042 ../../Zotlabs/Lib/ThreadItem.php:267
 msgid "I like this (toggle)"
 msgstr "Me gusta (cambiar)"
 
-#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:270
+#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:268
 msgid "I don't like this (toggle)"
 msgstr "No me gusta esto (cambiar)"
 
-#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:412
-#: ../../include/conversation.php:739
+#: ../../Zotlabs/Module/Photos.php:1045 ../../Zotlabs/Lib/ThreadItem.php:410
+#: ../../include/conversation.php:736
 msgid "Please wait"
 msgstr "Espere por favor"
 
-#: ../../Zotlabs/Module/Photos.php:1059 ../../Zotlabs/Module/Photos.php:1177
-#: ../../Zotlabs/Lib/ThreadItem.php:729
+#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179
+#: ../../Zotlabs/Lib/ThreadItem.php:727
 msgid "This is you"
 msgstr "Este es usted"
 
-#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179
-#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/js_strings.php:6
+#: ../../Zotlabs/Module/Photos.php:1063 ../../Zotlabs/Module/Photos.php:1181
+#: ../../Zotlabs/Lib/ThreadItem.php:729 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Comentar"
 
-#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:569
 msgctxt "title"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:569
 msgctxt "title"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570
 msgctxt "title"
 msgid "Agree"
 msgstr "De acuerdo"
 
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570
 msgctxt "title"
 msgid "Disagree"
 msgstr "En desacuerdo"
 
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570
 msgctxt "title"
 msgid "Abstain"
 msgstr "Abstención"
 
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571
 msgctxt "title"
 msgid "Attending"
 msgstr "Participaré"
 
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571
 msgctxt "title"
 msgid "Not attending"
 msgstr "No participaré"
 
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571
 msgctxt "title"
 msgid "Might attend"
 msgstr "Quizá participe"
 
-#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1108
+#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1110
 #: ../../Zotlabs/Lib/ThreadItem.php:187 ../../Zotlabs/Lib/ThreadItem.php:199
 msgid "View all"
 msgstr "Ver todo"
 
-#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:191
-#: ../../include/conversation.php:1907 ../../include/channel.php:1268
-#: ../../include/taxonomy.php:403
+#: ../../Zotlabs/Module/Photos.php:1102 ../../Zotlabs/Lib/ThreadItem.php:191
+#: ../../include/conversation.php:1904 ../../include/channel.php:1391
+#: ../../include/taxonomy.php:442
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Me gusta"
 msgstr[1] "Me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:196
-#: ../../include/conversation.php:1910
+#: ../../Zotlabs/Module/Photos.php:1107 ../../Zotlabs/Lib/ThreadItem.php:196
+#: ../../include/conversation.php:1907
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "No me gusta"
 msgstr[1] "No me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1205
+#: ../../Zotlabs/Module/Photos.php:1207
 msgid "Photo Tools"
 msgstr "Gestión de las fotos"
 
-#: ../../Zotlabs/Module/Photos.php:1214
+#: ../../Zotlabs/Module/Photos.php:1216
 msgid "In This Photo:"
 msgstr "En esta foto:"
 
-#: ../../Zotlabs/Module/Photos.php:1219
+#: ../../Zotlabs/Module/Photos.php:1221
 msgid "Map"
 msgstr "Mapa"
 
-#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:401
+#: ../../Zotlabs/Module/Photos.php:1229 ../../Zotlabs/Lib/ThreadItem.php:399
 msgctxt "noun"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:402
+#: ../../Zotlabs/Module/Photos.php:1230 ../../Zotlabs/Lib/ThreadItem.php:400
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:407
+#: ../../Zotlabs/Module/Photos.php:1235 ../../Zotlabs/Lib/ThreadItem.php:405
 #: ../../include/acl_selectors.php:220
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318
-#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:529
+#: ../../Zotlabs/Module/Photos.php:1307 ../../Zotlabs/Module/Photos.php:1320
+#: ../../Zotlabs/Module/Photos.php:1321 ../../include/photos.php:526
 msgid "Recent Photos"
 msgstr "Fotos recientes"
 
@@ -4540,163 +4751,169 @@ msgstr "No encontrado"
 msgid "Invalid channel"
 msgstr "Canal no válido"
 
-#: ../../Zotlabs/Module/Wiki.php:160 ../../addon/gitwiki/Mod_Gitwiki.php:146
-#: ../../include/conversation.php:1854 ../../include/nav.php:462
+#: ../../Zotlabs/Module/Wiki.php:79 ../../Zotlabs/Lib/Apps.php:239
+#: ../../include/conversation.php:1854 ../../include/features.php:95
+#: ../../include/nav.php:451
+msgid "Wiki"
+msgstr "Wiki"
+
+#: ../../Zotlabs/Module/Wiki.php:162 ../../addon/gitwiki/Mod_Gitwiki.php:146
+#: ../../include/conversation.php:1851 ../../include/nav.php:448
 msgid "Wikis"
 msgstr "Wikis"
 
-#: ../../Zotlabs/Module/Wiki.php:166 ../../addon/gitwiki/Mod_Gitwiki.php:152
+#: ../../Zotlabs/Module/Wiki.php:168 ../../addon/gitwiki/Mod_Gitwiki.php:152
 msgid "Download"
 msgstr "Descargar"
 
-#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Chat.php:254
-#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:143
+#: ../../Zotlabs/Module/Wiki.php:170 ../../Zotlabs/Module/Chat.php:256
+#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:145
 #: ../../addon/gitwiki/Mod_Gitwiki.php:154
 msgid "Create New"
 msgstr "Crear"
 
-#: ../../Zotlabs/Module/Wiki.php:170 ../../addon/gitwiki/Mod_Gitwiki.php:156
+#: ../../Zotlabs/Module/Wiki.php:172 ../../addon/gitwiki/Mod_Gitwiki.php:156
 msgid "Wiki name"
 msgstr "Nombre del wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:171 ../../addon/gitwiki/Mod_Gitwiki.php:157
+#: ../../Zotlabs/Module/Wiki.php:173 ../../addon/gitwiki/Mod_Gitwiki.php:157
 msgid "Content type"
 msgstr "Tipo de contenido"
 
-#: ../../Zotlabs/Module/Wiki.php:173 ../../Zotlabs/Storage/Browser.php:234
+#: ../../Zotlabs/Module/Wiki.php:175 ../../Zotlabs/Storage/Browser.php:235
 #: ../../addon/gitwiki/Mod_Gitwiki.php:159
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../Zotlabs/Module/Wiki.php:180 ../../addon/gitwiki/Mod_Gitwiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:182 ../../addon/gitwiki/Mod_Gitwiki.php:166
 msgid "Create a status post for this wiki"
 msgstr "Crear un mensaje de estado para este wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:205 ../../addon/gitwiki/Mod_Gitwiki.php:185
+#: ../../Zotlabs/Module/Wiki.php:224 ../../addon/gitwiki/Mod_Gitwiki.php:185
 msgid "Wiki not found"
 msgstr "Wiki no encontrado"
 
-#: ../../Zotlabs/Module/Wiki.php:229 ../../addon/gitwiki/Mod_Gitwiki.php:210
+#: ../../Zotlabs/Module/Wiki.php:248 ../../addon/gitwiki/Mod_Gitwiki.php:210
 msgid "Rename page"
 msgstr "Renombrar la página"
 
-#: ../../Zotlabs/Module/Wiki.php:233 ../../addon/gitwiki/Mod_Gitwiki.php:214
+#: ../../Zotlabs/Module/Wiki.php:258 ../../addon/gitwiki/Mod_Gitwiki.php:214
 msgid "Error retrieving page content"
 msgstr "Error al recuperar el contenido de la página"
 
-#: ../../Zotlabs/Module/Wiki.php:239
+#: ../../Zotlabs/Module/Wiki.php:264
 msgid "New page"
 msgstr "Nueva página"
 
-#: ../../Zotlabs/Module/Wiki.php:263 ../../addon/gitwiki/Mod_Gitwiki.php:242
+#: ../../Zotlabs/Module/Wiki.php:288 ../../addon/gitwiki/Mod_Gitwiki.php:242
 msgid "Revision Comparison"
 msgstr "Comparación de revisiones"
 
-#: ../../Zotlabs/Module/Wiki.php:264 ../../addon/gitwiki/Mod_Gitwiki.php:243
+#: ../../Zotlabs/Module/Wiki.php:289 ../../addon/gitwiki/Mod_Gitwiki.php:243
 msgid "Revert"
 msgstr "Revertir"
 
-#: ../../Zotlabs/Module/Wiki.php:268
+#: ../../Zotlabs/Module/Wiki.php:293
 msgid "Short description of your changes (optional)"
 msgstr "Breve descripción de sus cambios (opcional)"
 
-#: ../../Zotlabs/Module/Wiki.php:275 ../../addon/gitwiki/Mod_Gitwiki.php:252
+#: ../../Zotlabs/Module/Wiki.php:300 ../../addon/gitwiki/Mod_Gitwiki.php:252
 msgid "Source"
 msgstr "Fuente"
 
-#: ../../Zotlabs/Module/Wiki.php:283 ../../addon/gitwiki/Mod_Gitwiki.php:260
+#: ../../Zotlabs/Module/Wiki.php:309 ../../addon/gitwiki/Mod_Gitwiki.php:260
 msgid "New page name"
 msgstr "Nombre de la nueva página"
 
-#: ../../Zotlabs/Module/Wiki.php:288 ../../addon/gitwiki/Mod_Gitwiki.php:265
-#: ../../include/conversation.php:1232
+#: ../../Zotlabs/Module/Wiki.php:314 ../../addon/gitwiki/Mod_Gitwiki.php:265
+#: ../../include/conversation.php:1229
 msgid "Embed image from photo albums"
 msgstr "Incluir una imagen de los álbumes de fotos"
 
-#: ../../Zotlabs/Module/Wiki.php:289 ../../addon/gitwiki/Mod_Gitwiki.php:266
-#: ../../include/conversation.php:1326
+#: ../../Zotlabs/Module/Wiki.php:315 ../../addon/gitwiki/Mod_Gitwiki.php:266
+#: ../../include/conversation.php:1323
 msgid "Embed an image from your albums"
 msgstr "Incluir una imagen de sus álbumes"
 
-#: ../../Zotlabs/Module/Wiki.php:291 ../../addon/gitwiki/Mod_Gitwiki.php:268
-#: ../../include/conversation.php:1328 ../../include/conversation.php:1375
+#: ../../Zotlabs/Module/Wiki.php:317 ../../addon/gitwiki/Mod_Gitwiki.php:268
+#: ../../include/conversation.php:1325 ../../include/conversation.php:1372
 msgid "OK"
 msgstr "OK"
 
-#: ../../Zotlabs/Module/Wiki.php:292 ../../addon/gitwiki/Mod_Gitwiki.php:269
-#: ../../include/conversation.php:1268
+#: ../../Zotlabs/Module/Wiki.php:318 ../../addon/gitwiki/Mod_Gitwiki.php:269
+#: ../../include/conversation.php:1265
 msgid "Choose images to embed"
 msgstr "Elegir imágenes para incluir"
 
-#: ../../Zotlabs/Module/Wiki.php:293 ../../addon/gitwiki/Mod_Gitwiki.php:270
-#: ../../include/conversation.php:1269
+#: ../../Zotlabs/Module/Wiki.php:319 ../../addon/gitwiki/Mod_Gitwiki.php:270
+#: ../../include/conversation.php:1266
 msgid "Choose an album"
 msgstr "Elegir un álbum"
 
-#: ../../Zotlabs/Module/Wiki.php:294 ../../addon/gitwiki/Mod_Gitwiki.php:271
+#: ../../Zotlabs/Module/Wiki.php:320 ../../addon/gitwiki/Mod_Gitwiki.php:271
 msgid "Choose a different album"
 msgstr "Elegir un álbum diferente..."
 
-#: ../../Zotlabs/Module/Wiki.php:295 ../../addon/gitwiki/Mod_Gitwiki.php:272
-#: ../../include/conversation.php:1271
+#: ../../Zotlabs/Module/Wiki.php:321 ../../addon/gitwiki/Mod_Gitwiki.php:272
+#: ../../include/conversation.php:1268
 msgid "Error getting album list"
 msgstr "Error al obtener la lista de álbumes"
 
-#: ../../Zotlabs/Module/Wiki.php:296 ../../addon/gitwiki/Mod_Gitwiki.php:273
-#: ../../include/conversation.php:1272
+#: ../../Zotlabs/Module/Wiki.php:322 ../../addon/gitwiki/Mod_Gitwiki.php:273
+#: ../../include/conversation.php:1269
 msgid "Error getting photo link"
 msgstr "Error al obtener el enlace de la foto"
 
-#: ../../Zotlabs/Module/Wiki.php:297 ../../addon/gitwiki/Mod_Gitwiki.php:274
-#: ../../include/conversation.php:1273
+#: ../../Zotlabs/Module/Wiki.php:323 ../../addon/gitwiki/Mod_Gitwiki.php:274
+#: ../../include/conversation.php:1270
 msgid "Error getting album"
 msgstr "Error al obtener el álbum"
 
-#: ../../Zotlabs/Module/Wiki.php:364 ../../addon/gitwiki/Mod_Gitwiki.php:337
+#: ../../Zotlabs/Module/Wiki.php:391 ../../addon/gitwiki/Mod_Gitwiki.php:337
 msgid "Error creating wiki. Invalid name."
 msgstr "Error al crear el wiki: el nombre no es válido."
 
-#: ../../Zotlabs/Module/Wiki.php:371
+#: ../../Zotlabs/Module/Wiki.php:398
 msgid "A wiki with this name already exists."
 msgstr "Ya hay un wiki con este nombre."
 
-#: ../../Zotlabs/Module/Wiki.php:384 ../../addon/gitwiki/Mod_Gitwiki.php:348
+#: ../../Zotlabs/Module/Wiki.php:411 ../../addon/gitwiki/Mod_Gitwiki.php:348
 msgid "Wiki created, but error creating Home page."
 msgstr "Se ha creado el wiki, pero se ha producido un error al crear la página de inicio."
 
-#: ../../Zotlabs/Module/Wiki.php:391 ../../addon/gitwiki/Mod_Gitwiki.php:353
+#: ../../Zotlabs/Module/Wiki.php:418 ../../addon/gitwiki/Mod_Gitwiki.php:353
 msgid "Error creating wiki"
 msgstr "Error al crear el wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:403
+#: ../../Zotlabs/Module/Wiki.php:430
 msgid "Wiki delete permission denied."
 msgstr "Se ha denegado el permiso para eliminar el wiki."
 
-#: ../../Zotlabs/Module/Wiki.php:413
+#: ../../Zotlabs/Module/Wiki.php:440
 msgid "Error deleting wiki"
 msgstr "Se ha producido un error al eliminar el wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:439 ../../addon/gitwiki/Mod_Gitwiki.php:400
+#: ../../Zotlabs/Module/Wiki.php:466 ../../addon/gitwiki/Mod_Gitwiki.php:400
 msgid "New page created"
 msgstr "Se ha creado la nueva página"
 
-#: ../../Zotlabs/Module/Wiki.php:558
+#: ../../Zotlabs/Module/Wiki.php:587
 msgid "Cannot delete Home"
 msgstr "No se puede eliminar la página principal"
 
-#: ../../Zotlabs/Module/Wiki.php:622
+#: ../../Zotlabs/Module/Wiki.php:651
 msgid "Current Revision"
 msgstr "Revisión actual"
 
-#: ../../Zotlabs/Module/Wiki.php:622
+#: ../../Zotlabs/Module/Wiki.php:651
 msgid "Selected Revision"
 msgstr "Revisión seleccionada"
 
-#: ../../Zotlabs/Module/Wiki.php:672
+#: ../../Zotlabs/Module/Wiki.php:701
 msgid "You must be authenticated."
 msgstr "Debe estar autenticado."
 
-#: ../../Zotlabs/Module/Chanview.php:134
+#: ../../Zotlabs/Module/Chanview.php:139
 msgid "toggle full screen mode"
 msgstr "cambiar al modo de pantalla completa"
 
@@ -4704,7 +4921,7 @@ msgstr "cambiar al modo de pantalla completa"
 msgid "Layout updated."
 msgstr "Plantilla actualizada."
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:217
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219
 msgid "Feature disabled."
 msgstr "Funcionalidad deshabilitada."
 
@@ -4724,32 +4941,32 @@ msgstr "Nombre del módulo:"
 msgid "Layout Help"
 msgstr "Ayuda para el diseño de plantillas de página"
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235
-#: ../../include/conversation.php:1042
+#: ../../Zotlabs/Module/Poke.php:153 ../../Zotlabs/Module/Poke.php:182
+#: ../../Zotlabs/Lib/Apps.php:248 ../../include/conversation.php:1039
 msgid "Poke"
 msgstr "Toques y otras cosas"
 
-#: ../../Zotlabs/Module/Poke.php:169
+#: ../../Zotlabs/Module/Poke.php:183
 msgid "Poke somebody"
 msgstr "Dar un toque a alguien"
 
-#: ../../Zotlabs/Module/Poke.php:172
+#: ../../Zotlabs/Module/Poke.php:186
 msgid "Poke/Prod"
 msgstr "Toque/Incitación"
 
-#: ../../Zotlabs/Module/Poke.php:173
+#: ../../Zotlabs/Module/Poke.php:187
 msgid "Poke, prod or do other things to somebody"
 msgstr "Dar un toque, incitar o hacer otras cosas a alguien"
 
-#: ../../Zotlabs/Module/Poke.php:180
+#: ../../Zotlabs/Module/Poke.php:194
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: ../../Zotlabs/Module/Poke.php:181
+#: ../../Zotlabs/Module/Poke.php:195
 msgid "Choose what you wish to do to recipient"
 msgstr "Elegir qué desea enviar al destinatario"
 
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199
 msgid "Make this post private"
 msgstr "Convertir en privado este envío"
 
@@ -4760,7 +4977,7 @@ msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. "
 
 #: ../../Zotlabs/Module/Profile_photo.php:115
 #: ../../Zotlabs/Module/Profile_photo.php:226
-#: ../../include/photo/photo_driver.php:647
+#: ../../include/photo/photo_driver.php:658
 msgid "Profile Photos"
 msgstr "Fotos del perfil"
 
@@ -4777,7 +4994,7 @@ msgid ""
 msgstr "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente."
 
 #: ../../Zotlabs/Module/Profile_photo.php:203
-#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:149
+#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:145
 msgid "Unable to process image"
 msgstr "No ha sido posible procesar la imagen"
 
@@ -4859,64 +5076,68 @@ msgstr "Conectado/a"
 msgid "Unable to locate original post."
 msgstr "No ha sido posible encontrar la entrada original."
 
-#: ../../Zotlabs/Module/Item.php:451
+#: ../../Zotlabs/Module/Item.php:470
 msgid "Empty post discarded."
 msgstr "La entrada vacía ha sido desechada."
 
-#: ../../Zotlabs/Module/Item.php:825
+#: ../../Zotlabs/Module/Item.php:844
 msgid "Duplicate post suppressed."
 msgstr "Se ha suprimido la entrada duplicada."
 
-#: ../../Zotlabs/Module/Item.php:955
+#: ../../Zotlabs/Module/Item.php:989
 msgid "System error. Post not saved."
 msgstr "Error del sistema. La entrada no se ha podido salvar."
 
-#: ../../Zotlabs/Module/Item.php:1085
+#: ../../Zotlabs/Module/Item.php:1025
+msgid "Your comment is awaiting approval."
+msgstr "Su comentario está pendiente de aprobación."
+
+#: ../../Zotlabs/Module/Item.php:1123
 msgid "Unable to obtain post information from database."
 msgstr "No ha sido posible obtener información de la entrada en la base de datos."
 
-#: ../../Zotlabs/Module/Item.php:1092
+#: ../../Zotlabs/Module/Item.php:1130
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
 
-#: ../../Zotlabs/Module/Item.php:1099
+#: ../../Zotlabs/Module/Item.php:1137
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Ha alcanzado su límite de %1$.0f páginas web."
 
-#: ../../Zotlabs/Module/Ping.php:254
+#: ../../Zotlabs/Module/Ping.php:280
 msgid "sent you a private message"
 msgstr "le ha enviado un mensaje privado"
 
-#: ../../Zotlabs/Module/Ping.php:302
+#: ../../Zotlabs/Module/Ping.php:331
 msgid "added your channel"
 msgstr "añadió este canal a sus conexiones"
 
-#: ../../Zotlabs/Module/Ping.php:312
+#: ../../Zotlabs/Module/Ping.php:341
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../Zotlabs/Module/Ping.php:330
+#: ../../Zotlabs/Module/Ping.php:359
 msgid "[today]"
 msgstr "[hoy]"
 
-#: ../../Zotlabs/Module/Ping.php:339
+#: ../../Zotlabs/Module/Ping.php:368
 msgid "posted an event"
 msgstr "publicó un evento"
 
-#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
 msgid "Invalid item."
 msgstr "Elemento no válido."
 
-#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79
+#: ../../Zotlabs/Module/Page.php:128 ../../Zotlabs/Module/Block.php:77
 #: ../../Zotlabs/Module/Display.php:122
 #: ../../Zotlabs/Lib/NativeWikiPage.php:500 ../../Zotlabs/Web/Router.php:146
 #: ../../include/help.php:68
 msgid "Page not found."
 msgstr "Página no encontrada."
 
-#: ../../Zotlabs/Module/Page.php:131
+#: ../../Zotlabs/Module/Page.php:165
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
@@ -4964,9 +5185,9 @@ msgstr "No ha sido posible establecer los parámetros de la libreta de direccion
 msgid "Connection has been removed."
 msgstr "La conexión ha sido eliminada."
 
-#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:228
+#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:241
 #: ../../addon/openclipatar/openclipatar.php:57
-#: ../../include/conversation.php:982 ../../include/nav.php:106
+#: ../../include/conversation.php:979 ../../include/nav.php:102
 msgid "View Profile"
 msgstr "Ver el perfil"
 
@@ -5116,105 +5337,119 @@ msgstr "Ajustar el perfil"
 msgid "Set Affinity & Profile"
 msgstr "Ajustar la afinidad y el perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:844
-msgid "none"
-msgstr "-"
+#: ../../Zotlabs/Module/Connedit.php:851
+msgid "This connection is unreachable from this location."
+msgstr "No se puede acceder a la conexión desde este sitio."
+
+#: ../../Zotlabs/Module/Connedit.php:852
+msgid "This connection may be unreachable from other channel locations."
+msgstr "Esta conexión puede ser inaccesible desde otras ubicaciones del canal."
+
+#: ../../Zotlabs/Module/Connedit.php:854
+msgid "Location independence is not supported by their network."
+msgstr "La independencia de ubicación no es compatible con su red."
 
-#: ../../Zotlabs/Module/Connedit.php:847
-#: ../../Zotlabs/Widget/Settings_menu.php:107
+#: ../../Zotlabs/Module/Connedit.php:860
+msgid ""
+"This connection is unreachable from this location. Location independence is "
+"not supported by their network."
+msgstr "Esta conexión no es accesible desde este sitio. La independencia de ubicación no es compatible con su red."
+
+#: ../../Zotlabs/Module/Connedit.php:863
+#: ../../Zotlabs/Widget/Settings_menu.php:109
 msgid "Connection Default Permissions"
 msgstr "Permisos predeterminados de conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:847 ../../include/items.php:3955
+#: ../../Zotlabs/Module/Connedit.php:863 ../../include/items.php:3925
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:848
+#: ../../Zotlabs/Module/Connedit.php:864
 msgid "Apply these permissions automatically"
 msgstr "Aplicar estos permisos automaticamente"
 
-#: ../../Zotlabs/Module/Connedit.php:848
+#: ../../Zotlabs/Module/Connedit.php:864
 msgid "Connection requests will be approved without your interaction"
 msgstr "Las solicitudes de conexión serán aprobadas sin su intervención"
 
-#: ../../Zotlabs/Module/Connedit.php:849
+#: ../../Zotlabs/Module/Connedit.php:865
 msgid "Permission role"
 msgstr "Rol de acceso"
 
-#: ../../Zotlabs/Module/Connedit.php:850
+#: ../../Zotlabs/Module/Connedit.php:866
 msgid "Add permission role"
 msgstr "Añadir un rol de acceso"
 
-#: ../../Zotlabs/Module/Connedit.php:856
+#: ../../Zotlabs/Module/Connedit.php:873
 msgid "This connection's primary address is"
 msgstr "La dirección primaria de esta conexión es"
 
-#: ../../Zotlabs/Module/Connedit.php:857
+#: ../../Zotlabs/Module/Connedit.php:874
 msgid "Available locations:"
 msgstr "Ubicaciones disponibles:"
 
-#: ../../Zotlabs/Module/Connedit.php:861
+#: ../../Zotlabs/Module/Connedit.php:879
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."
 
-#: ../../Zotlabs/Module/Connedit.php:862
+#: ../../Zotlabs/Module/Connedit.php:880
 msgid "Connection Tools"
 msgstr "Gestión de las conexiones"
 
-#: ../../Zotlabs/Module/Connedit.php:864
+#: ../../Zotlabs/Module/Connedit.php:882
 msgid "Slide to adjust your degree of friendship"
 msgstr "Deslizar para ajustar el grado de amistad"
 
-#: ../../Zotlabs/Module/Connedit.php:865 ../../Zotlabs/Module/Rate.php:155
+#: ../../Zotlabs/Module/Connedit.php:883 ../../Zotlabs/Module/Rate.php:155
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Valoración"
 
-#: ../../Zotlabs/Module/Connedit.php:866
+#: ../../Zotlabs/Module/Connedit.php:884
 msgid "Slide to adjust your rating"
 msgstr "Deslizar para ajustar su valoración"
 
-#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Connedit.php:872
+#: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Connedit.php:890
 msgid "Optionally explain your rating"
 msgstr "Opcionalmente, puede explicar su valoración"
 
-#: ../../Zotlabs/Module/Connedit.php:869
+#: ../../Zotlabs/Module/Connedit.php:887
 msgid "Custom Filter"
 msgstr "Filtro personalizado"
 
-#: ../../Zotlabs/Module/Connedit.php:870
+#: ../../Zotlabs/Module/Connedit.php:888
 msgid "Only import posts with this text"
 msgstr "Importar solo entradas que contengan este texto"
 
-#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Connedit.php:871
+#: ../../Zotlabs/Module/Connedit.php:888 ../../Zotlabs/Module/Connedit.php:889
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "Una sola opción por línea: palabras, #etiquetas,  /patrones/ o lang=xx. Dejar en blanco para importarlo todo"
 
-#: ../../Zotlabs/Module/Connedit.php:871
+#: ../../Zotlabs/Module/Connedit.php:889
 msgid "Do not import posts with this text"
 msgstr "No importar entradas que contengan este texto"
 
-#: ../../Zotlabs/Module/Connedit.php:873
+#: ../../Zotlabs/Module/Connedit.php:891
 msgid "This information is public!"
 msgstr "¡Esta información es pública!"
 
-#: ../../Zotlabs/Module/Connedit.php:878
+#: ../../Zotlabs/Module/Connedit.php:896
 msgid "Connection Pending Approval"
 msgstr "Conexión pendiente de aprobación"
 
-#: ../../Zotlabs/Module/Connedit.php:883
+#: ../../Zotlabs/Module/Connedit.php:901
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura."
 
-#: ../../Zotlabs/Module/Connedit.php:890
+#: ../../Zotlabs/Module/Connedit.php:908
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -5222,173 +5457,85 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."
 
-#: ../../Zotlabs/Module/Connedit.php:891
+#: ../../Zotlabs/Module/Connedit.php:909
 msgid "Last update:"
 msgstr "Última actualización:"
 
-#: ../../Zotlabs/Module/Connedit.php:900
+#: ../../Zotlabs/Module/Connedit.php:918
 msgid "Details"
 msgstr "Detalles"
 
-#: ../../Zotlabs/Module/Connedit.php:903 ../../addon/cdav/Mod_Cdav.php:1137
-msgid "Organisation"
-msgstr "Organización"
-
-#: ../../Zotlabs/Module/Connedit.php:904 ../../addon/cdav/Mod_Cdav.php:1138
-#: ../../include/page_widgets.php:46
-msgid "Title"
-msgstr "Título"
-
-#: ../../Zotlabs/Module/Connedit.php:905 ../../Zotlabs/Module/Profiles.php:789
-#: ../../addon/cdav/Mod_Cdav.php:1139
-msgid "Phone"
-msgstr "Teléfono"
-
-#: ../../Zotlabs/Module/Connedit.php:907 ../../Zotlabs/Module/Profiles.php:791
-#: ../../addon/cdav/Mod_Cdav.php:1141
-msgid "Instant messenger"
-msgstr "Mensajería instantánea"
-
-#: ../../Zotlabs/Module/Connedit.php:908 ../../Zotlabs/Module/Profiles.php:792
-#: ../../addon/cdav/Mod_Cdav.php:1142
-msgid "Website"
-msgstr "Sitio web"
-
-#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:794
-#: ../../addon/cdav/Mod_Cdav.php:1144
-msgid "Note"
-msgstr "Nota"
-
-#: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:795
-#: ../../addon/cdav/Mod_Cdav.php:1145 ../../addon/cdav/cdav.php:270
-#: ../../include/connections.php:668
-msgid "Mobile"
-msgstr "Móvil"
-
-#: ../../Zotlabs/Module/Connedit.php:912 ../../Zotlabs/Module/Profiles.php:796
-#: ../../addon/cdav/Mod_Cdav.php:1146 ../../addon/cdav/cdav.php:271
-#: ../../include/connections.php:669
-msgid "Home"
-msgstr "Inicio"
-
-#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:797
-#: ../../addon/cdav/Mod_Cdav.php:1147 ../../addon/cdav/cdav.php:274
-#: ../../include/connections.php:672
-msgid "Work"
-msgstr "Trabajo"
-
-#: ../../Zotlabs/Module/Connedit.php:915 ../../Zotlabs/Module/Profiles.php:799
-#: ../../addon/cdav/Mod_Cdav.php:1149
-#: ../../addon/jappixmini/jappixmini.php:368
-msgid "Add Contact"
-msgstr "Añadir un contacto"
-
-#: ../../Zotlabs/Module/Connedit.php:916 ../../Zotlabs/Module/Profiles.php:800
-#: ../../addon/cdav/Mod_Cdav.php:1150
-msgid "Add Field"
-msgstr "Añadir un campo"
-
-#: ../../Zotlabs/Module/Connedit.php:921 ../../addon/cdav/Mod_Cdav.php:1155
-msgid "P.O. Box"
-msgstr "Buzón de correos"
-
-#: ../../Zotlabs/Module/Connedit.php:922 ../../addon/cdav/Mod_Cdav.php:1156
-msgid "Additional"
-msgstr "Adicional"
-
-#: ../../Zotlabs/Module/Connedit.php:923 ../../addon/cdav/Mod_Cdav.php:1157
-msgid "Street"
-msgstr "Calle"
-
-#: ../../Zotlabs/Module/Connedit.php:924 ../../addon/cdav/Mod_Cdav.php:1158
-msgid "Locality"
-msgstr "Localidad"
-
-#: ../../Zotlabs/Module/Connedit.php:925 ../../addon/cdav/Mod_Cdav.php:1159
-msgid "Region"
-msgstr "Provincia, región o estado"
-
-#: ../../Zotlabs/Module/Connedit.php:926 ../../addon/cdav/Mod_Cdav.php:1160
-msgid "ZIP Code"
-msgstr "Código postal"
-
-#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:760
-#: ../../addon/cdav/Mod_Cdav.php:1161
-msgid "Country"
-msgstr "País"
+#: ../../Zotlabs/Module/Chat.php:94 ../../Zotlabs/Lib/Apps.php:228
+msgid "My Chatrooms"
+msgstr "Mis salas de chat"
 
-#: ../../Zotlabs/Module/Chat.php:179
+#: ../../Zotlabs/Module/Chat.php:181
 msgid "Room not found"
 msgstr "Sala no encontrada"
 
-#: ../../Zotlabs/Module/Chat.php:195
+#: ../../Zotlabs/Module/Chat.php:197
 msgid "Leave Room"
 msgstr "Abandonar la sala"
 
-#: ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:198
 msgid "Delete Room"
 msgstr "Eliminar esta sala"
 
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Zotlabs/Module/Chat.php:199
 msgid "I am away right now"
 msgstr "Estoy ausente momentáneamente"
 
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Zotlabs/Module/Chat.php:200
 msgid "I am online"
 msgstr "Estoy conectado/a"
 
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Zotlabs/Module/Chat.php:202
 msgid "Bookmark this room"
 msgstr "Añadir esta sala a Marcadores"
 
-#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:259
-#: ../../Zotlabs/Module/Mail.php:380 ../../include/conversation.php:1263
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241
+#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1260
 msgid "Please enter a link URL:"
 msgstr "Por favor, introduzca la dirección del enlace:"
 
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:312
-#: ../../Zotlabs/Module/Mail.php:454 ../../Zotlabs/Lib/ThreadItem.php:744
-#: ../../include/conversation.php:1373
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294
+#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:742
+#: ../../include/conversation.php:1370
 msgid "Encrypt text"
 msgstr "Cifrar texto"
 
-#: ../../Zotlabs/Module/Chat.php:230
+#: ../../Zotlabs/Module/Chat.php:232
 msgid "New Chatroom"
 msgstr "Nueva sala de chat"
 
-#: ../../Zotlabs/Module/Chat.php:231
+#: ../../Zotlabs/Module/Chat.php:233
 msgid "Chatroom name"
 msgstr "Nombre de la sala de chat"
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Zotlabs/Module/Chat.php:234
 msgid "Expiration of chats (minutes)"
 msgstr "Caducidad de los mensajes en los chats (en minutos)"
 
-#: ../../Zotlabs/Module/Chat.php:248
+#: ../../Zotlabs/Module/Chat.php:250
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Salas de chat de %1$s"
 
-#: ../../Zotlabs/Module/Chat.php:253
+#: ../../Zotlabs/Module/Chat.php:255
 msgid "No chatrooms available"
 msgstr "No hay salas de chat disponibles"
 
-#: ../../Zotlabs/Module/Chat.php:257
+#: ../../Zotlabs/Module/Chat.php:259
 msgid "Expiration"
 msgstr "Caducidad"
 
-#: ../../Zotlabs/Module/Chat.php:258
+#: ../../Zotlabs/Module/Chat.php:260
 msgid "min"
 msgstr "min"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
-#: ../../include/conversation.php:1783 ../../include/nav.php:392
-msgid "Photos"
-msgstr "Fotos"
-
-#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:224
-#: ../../Zotlabs/Storage/Browser.php:224 ../../include/conversation.php:1791
-#: ../../include/nav.php:400
+#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:237
+#: ../../Zotlabs/Storage/Browser.php:225 ../../Zotlabs/Storage/Browser.php:247
+#: ../../include/conversation.php:1788 ../../include/nav.php:386
 msgid "Files"
 msgstr "Ficheros"
 
@@ -5428,7 +5575,7 @@ msgstr "El menú se puede usar para guardar marcadores"
 msgid "Submit and proceed"
 msgstr "Enviar y proceder"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2268
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2281
 msgid "Menus"
 msgstr "Menús"
 
@@ -5480,13 +5627,14 @@ msgstr "El título del menú tal como será visto por los demás"
 msgid "Allow bookmarks"
 msgstr "Permitir marcadores"
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2269
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2282
 msgid "Layouts"
 msgstr "Plantillas"
 
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232
-#: ../../include/nav.php:161 ../../include/nav.php:268
-#: ../../include/help.php:55 ../../include/help.php:61
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Module/Help.php:18
+#: ../../Zotlabs/Lib/Apps.php:245 ../../include/nav.php:157
+#: ../../include/nav.php:264 ../../include/help.php:55
+#: ../../include/help.php:61
 msgid "Help"
 msgstr "Ayuda"
 
@@ -5502,12 +5650,13 @@ msgstr "Descripción de la plantilla"
 msgid "Download PDL file"
 msgstr "Descargar el fichero PDL"
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:274
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/markdown.php:141
+#: ../../include/bbcode.php:334
 msgid "post"
 msgstr "la entrada"
 
 #: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146
-#: ../../include/text.php:1945
+#: ../../include/text.php:1938
 msgid "comment"
 msgstr "el comentario"
 
@@ -5539,8 +5688,8 @@ msgstr "El grupo de canales ha sido creado."
 msgid "Could not create privacy group."
 msgstr "No se puede crear el grupo de canales"
 
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3922
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143
+#: ../../include/items.php:3892
 msgid "Privacy group not found."
 msgstr "Grupo de canales no encontrado."
 
@@ -5548,39 +5697,39 @@ msgstr "Grupo de canales no encontrado."
 msgid "Privacy group updated."
 msgstr "Grupo de canales actualizado."
 
-#: ../../Zotlabs/Module/Group.php:90
+#: ../../Zotlabs/Module/Group.php:92
 msgid "Create a group of channels."
 msgstr "Crear un grupo de canales."
 
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:186
 msgid "Privacy group name: "
 msgstr "Nombre del grupo de canales:"
 
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+#: ../../Zotlabs/Module/Group.php:95 ../../Zotlabs/Module/Group.php:189
 msgid "Members are visible to other channels"
 msgstr "Los miembros son visibles para otros canales"
 
-#: ../../Zotlabs/Module/Group.php:111
+#: ../../Zotlabs/Module/Group.php:113
 msgid "Privacy group removed."
 msgstr "Grupo de canales eliminado."
 
-#: ../../Zotlabs/Module/Group.php:113
+#: ../../Zotlabs/Module/Group.php:115
 msgid "Unable to remove privacy group."
 msgstr "No se puede eliminar el grupo de canales."
 
-#: ../../Zotlabs/Module/Group.php:183
+#: ../../Zotlabs/Module/Group.php:185
 msgid "Privacy group editor"
 msgstr "Editor de grupos de canales"
 
-#: ../../Zotlabs/Module/Group.php:197 ../../Zotlabs/Module/Help.php:81
+#: ../../Zotlabs/Module/Group.php:199 ../../Zotlabs/Module/Help.php:81
 msgid "Members"
 msgstr "Miembros"
 
-#: ../../Zotlabs/Module/Group.php:199
+#: ../../Zotlabs/Module/Group.php:201
 msgid "All Connected Channels"
 msgstr "Todos los canales conectados"
 
-#: ../../Zotlabs/Module/Group.php:231
+#: ../../Zotlabs/Module/Group.php:233
 msgid "Click on a channel to add or remove."
 msgstr "Haga clic en un canal para agregarlo o quitarlo."
 
@@ -5675,7 +5824,7 @@ msgid "View this profile"
 msgstr "Ver este perfil"
 
 #: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
-#: ../../include/channel.php:1066
+#: ../../include/channel.php:1183
 msgid "Edit visibility"
 msgstr "Editar visibilidad"
 
@@ -5687,7 +5836,7 @@ msgstr "Gestión del perfil"
 msgid "Change cover photo"
 msgstr "Cambiar la imagen de portada del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1154
 msgid "Change profile photo"
 msgstr "Cambiar la foto del perfil"
 
@@ -5707,7 +5856,7 @@ msgstr "Eliminar este perfil"
 msgid "Add profile things"
 msgstr "Añadir cosas al perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1657
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1654
 msgid "Personal"
 msgstr "Personales"
 
@@ -5852,12 +6001,12 @@ msgstr "Mis otros canales"
 msgid "Communications"
 msgstr "Comunicaciones"
 
-#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
+#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1179
 msgid "Profile Image"
 msgstr "Imagen del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1044
-#: ../../include/nav.php:109
+#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1161
+#: ../../include/nav.php:105
 msgid "Edit Profiles"
 msgstr "Editar perfiles"
 
@@ -5869,42 +6018,42 @@ msgstr "Enlace de la página"
 msgid "Edit Webpage"
 msgstr "Editar la página web"
 
-#: ../../Zotlabs/Module/Manage.php:143
+#: ../../Zotlabs/Module/Manage.php:145
 msgid "Create a new channel"
 msgstr "Crear un nuevo canal"
 
-#: ../../Zotlabs/Module/Manage.php:168 ../../Zotlabs/Lib/Apps.php:221
-#: ../../include/nav.php:205
+#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:234
+#: ../../include/nav.php:199
 msgid "Channel Manager"
 msgstr "Administración de canales"
 
-#: ../../Zotlabs/Module/Manage.php:169
+#: ../../Zotlabs/Module/Manage.php:171
 msgid "Current Channel"
 msgstr "Canal actual"
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Zotlabs/Module/Manage.php:173
 msgid "Switch to one of your channels by selecting it."
 msgstr "Cambiar a uno de sus canales seleccionándolo."
 
-#: ../../Zotlabs/Module/Manage.php:172
+#: ../../Zotlabs/Module/Manage.php:174
 msgid "Default Channel"
 msgstr "Canal principal"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Zotlabs/Module/Manage.php:175
 msgid "Make Default"
 msgstr "Convertir en predeterminado"
 
-#: ../../Zotlabs/Module/Manage.php:176
+#: ../../Zotlabs/Module/Manage.php:178
 #, php-format
 msgid "%d new messages"
 msgstr "%d mensajes nuevos"
 
-#: ../../Zotlabs/Module/Manage.php:177
+#: ../../Zotlabs/Module/Manage.php:179
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nuevas solicitudes de conexión"
 
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../Zotlabs/Module/Manage.php:181
 msgid "Delegated Channel"
 msgstr "Canal delegado"
 
@@ -5912,45 +6061,45 @@ msgstr "Canal delegado"
 msgid "This directory server requires an access token"
 msgstr "El servidor de este directorio necesita un \"token\" de acceso"
 
-#: ../../Zotlabs/Module/Siteinfo.php:20
+#: ../../Zotlabs/Module/Siteinfo.php:19
 msgid "About this site"
 msgstr "Acerca de este sitio"
 
-#: ../../Zotlabs/Module/Siteinfo.php:21
+#: ../../Zotlabs/Module/Siteinfo.php:20
 msgid "Site Name"
 msgstr "Nombre del sitio"
 
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:2025
+#: ../../Zotlabs/Module/Siteinfo.php:24
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../../Zotlabs/Module/Siteinfo.php:27 ../../Zotlabs/Module/Register.php:221
+#: ../../Zotlabs/Module/Siteinfo.php:26 ../../Zotlabs/Module/Register.php:221
 msgid "Terms of Service"
 msgstr "Términos del servicio"
 
-#: ../../Zotlabs/Module/Siteinfo.php:28
+#: ../../Zotlabs/Module/Siteinfo.php:27
 msgid "Software and Project information"
 msgstr "Información sobre el software y el proyecto"
 
-#: ../../Zotlabs/Module/Siteinfo.php:29
+#: ../../Zotlabs/Module/Siteinfo.php:28
 msgid "This site is powered by $Projectname"
 msgstr "Este sitio funciona con $Projectname"
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
+#: ../../Zotlabs/Module/Siteinfo.php:29
 msgid ""
 "Federated and decentralised networking and identity services provided by Zot"
 msgstr "Servicios federados y descentralizados de identidad y redes proporcionados por Zot"
 
-#: ../../Zotlabs/Module/Siteinfo.php:32
+#: ../../Zotlabs/Module/Siteinfo.php:31
 #, php-format
 msgid "Version %s"
 msgstr "Versión %s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:33
+#: ../../Zotlabs/Module/Siteinfo.php:32
 msgid "Project homepage"
 msgstr "Página principal del proyecto"
 
-#: ../../Zotlabs/Module/Siteinfo.php:34
+#: ../../Zotlabs/Module/Siteinfo.php:33
 msgid "Developer homepage"
 msgstr "Página principal del desarrollador"
 
@@ -5959,7 +6108,7 @@ msgid "No ratings"
 msgstr "Ninguna valoración"
 
 #: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35
-#: ../../include/conversation.php:1032
+#: ../../include/conversation.php:1029
 msgid "Ratings"
 msgstr "Valoraciones"
 
@@ -5975,64 +6124,65 @@ msgstr "Sitio web:"
 msgid "Description: "
 msgstr "Descripción:"
 
-#: ../../Zotlabs/Module/Webpages.php:52
+#: ../../Zotlabs/Module/Webpages.php:38 ../../Zotlabs/Module/Webpages.php:237
+#: ../../Zotlabs/Lib/Apps.php:238 ../../include/conversation.php:1838
+#: ../../include/nav.php:435
+msgid "Webpages"
+msgstr "Páginas web"
+
+#: ../../Zotlabs/Module/Webpages.php:54
 msgid "Import Webpage Elements"
 msgstr "Importar elementos de una página web"
 
-#: ../../Zotlabs/Module/Webpages.php:53
+#: ../../Zotlabs/Module/Webpages.php:55
 msgid "Import selected"
 msgstr "Importar elementos seleccionados"
 
-#: ../../Zotlabs/Module/Webpages.php:76
+#: ../../Zotlabs/Module/Webpages.php:78
 msgid "Export Webpage Elements"
 msgstr "Exportar elementos de una página web"
 
-#: ../../Zotlabs/Module/Webpages.php:77
+#: ../../Zotlabs/Module/Webpages.php:79
 msgid "Export selected"
 msgstr "Exportar los elementos seleccionados"
 
-#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/conversation.php:1841 ../../include/nav.php:449
-msgid "Webpages"
-msgstr "Páginas web"
-
-#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:44
+#: ../../Zotlabs/Module/Webpages.php:248
 msgid "Actions"
 msgstr "Acciones"
 
-#: ../../Zotlabs/Module/Webpages.php:254 ../../include/page_widgets.php:45
+#: ../../Zotlabs/Module/Webpages.php:249
 msgid "Page Link"
 msgstr "Vínculo de la página"
 
-#: ../../Zotlabs/Module/Webpages.php:255
+#: ../../Zotlabs/Module/Webpages.php:250
 msgid "Page Title"
 msgstr "Título de página"
 
-#: ../../Zotlabs/Module/Webpages.php:285
+#: ../../Zotlabs/Module/Webpages.php:280
 msgid "Invalid file type."
 msgstr "Tipo de fichero no válido."
 
-#: ../../Zotlabs/Module/Webpages.php:297
+#: ../../Zotlabs/Module/Webpages.php:292
 msgid "Error opening zip file"
 msgstr "Error al abrir el fichero comprimido zip"
 
-#: ../../Zotlabs/Module/Webpages.php:308
+#: ../../Zotlabs/Module/Webpages.php:303
 msgid "Invalid folder path."
 msgstr "La ruta de la carpeta no es válida."
 
-#: ../../Zotlabs/Module/Webpages.php:335
+#: ../../Zotlabs/Module/Webpages.php:330
 msgid "No webpage elements detected."
 msgstr "No se han detectado elementos de ninguna página web."
 
-#: ../../Zotlabs/Module/Webpages.php:410
+#: ../../Zotlabs/Module/Webpages.php:405
 msgid "Import complete."
 msgstr "Importación completada."
 
-#: ../../Zotlabs/Module/Editpost.php:38
+#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
 msgid "Item is not editable"
 msgstr "El elemento no es editable"
 
-#: ../../Zotlabs/Module/Editpost.php:103 ../../Zotlabs/Module/Rpost.php:138
+#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:140
 msgid "Edit post"
 msgstr "Editar la entrada"
 
@@ -6118,7 +6268,7 @@ msgid "*"
 msgstr "*"
 
 #: ../../Zotlabs/Module/Sources.php:96
-#: ../../Zotlabs/Widget/Settings_menu.php:123 ../../include/features.php:213
+#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:209
 msgid "Channel Sources"
 msgstr "Orígenes de los contenidos del canal"
 
@@ -6174,6 +6324,10 @@ msgstr "Fuente eliminada"
 msgid "Unable to remove source."
 msgstr "No se puede eliminar la fuente."
 
+#: ../../Zotlabs/Module/Rpost.php:63 ../../Zotlabs/Lib/Apps.php:257
+msgid "Post"
+msgstr "Publicación"
+
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr "Me gusta/No me gusta"
@@ -6209,55 +6363,59 @@ msgstr "Canal no disponible."
 msgid "Previous action reversed."
 msgstr "Acción anterior revocada."
 
-#: ../../Zotlabs/Module/Like.php:419 ../../addon/diaspora/inbound.php:1812
+#: ../../Zotlabs/Module/Like.php:423 ../../addon/diaspora/Receiver.php:1399
 #: ../../include/conversation.php:160
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "A %1$s le gusta %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:163
+#: ../../Zotlabs/Module/Like.php:425 ../../include/conversation.php:163
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "A %1$s no le gusta %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:423
+#: ../../Zotlabs/Module/Like.php:427
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s está de acuerdo"
 
-#: ../../Zotlabs/Module/Like.php:425
+#: ../../Zotlabs/Module/Like.php:429
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s no está de acuerdo"
 
-#: ../../Zotlabs/Module/Like.php:427
+#: ../../Zotlabs/Module/Like.php:431
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s se abstiene"
 
-#: ../../Zotlabs/Module/Like.php:429
+#: ../../Zotlabs/Module/Like.php:433
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s participa"
 
-#: ../../Zotlabs/Module/Like.php:431
+#: ../../Zotlabs/Module/Like.php:435
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s no participa"
 
-#: ../../Zotlabs/Module/Like.php:433
+#: ../../Zotlabs/Module/Like.php:437
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s quizá participe"
 
-#: ../../Zotlabs/Module/Like.php:538
+#: ../../Zotlabs/Module/Like.php:547
 msgid "Action completed."
 msgstr "Acción completada."
 
-#: ../../Zotlabs/Module/Like.php:539
+#: ../../Zotlabs/Module/Like.php:548
 msgid "Thank you."
 msgstr "Gracias."
 
+#: ../../Zotlabs/Module/Directory.php:80 ../../Zotlabs/Lib/Apps.php:244
+msgid "Directory"
+msgstr "Directorio"
+
 #: ../../Zotlabs/Module/Directory.php:245
 #, php-format
 msgid "%d rating"
@@ -6277,13 +6435,12 @@ msgstr "Estado:"
 msgid "Homepage: "
 msgstr "Página personal:"
 
-#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1293
+#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1416
 msgid "Age:"
 msgstr "Edad:"
 
-#: ../../Zotlabs/Module/Directory.php:314 ../../include/markdown.php:560
-#: ../../include/channel.php:1134 ../../include/event.php:52
-#: ../../include/event.php:84
+#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1251
+#: ../../include/event.php:52 ../../include/event.php:84
 msgid "Location:"
 msgstr "Ubicación:"
 
@@ -6291,18 +6448,18 @@ msgstr "Ubicación:"
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1309
+#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1432
 msgid "Hometown:"
 msgstr "Lugar de nacimiento:"
 
-#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1317
+#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1440
 msgid "About:"
 msgstr "Sobre mí:"
 
-#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54
+#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:56
 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
-#: ../../include/conversation.php:1002 ../../include/channel.php:1119
-#: ../../include/connections.php:110
+#: ../../include/conversation.php:999 ../../include/channel.php:1236
+#: ../../include/connections.php:111
 msgid "Connect"
 msgstr "Conectar"
 
@@ -6334,7 +6491,7 @@ msgstr "Directorio local:"
 msgid "Finding:"
 msgstr "Encontrar:"
 
-#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62
+#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr "Sugerencias de canales"
@@ -6379,13 +6536,18 @@ msgstr "Búsqueda de canales"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Buscar un canal (o un \"webbie\") que comience por:"
 
-#: ../../Zotlabs/Module/Suggest.php:37
+#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Lib/Apps.php:232
+#: ../../include/features.php:333
+msgid "Suggest Channels"
+msgstr "Sugerir canales"
+
+#: ../../Zotlabs/Module/Suggest.php:39
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo."
 
-#: ../../Zotlabs/Module/Suggest.php:56 ../../Zotlabs/Widget/Suggestions.php:46
+#: ../../Zotlabs/Module/Suggest.php:58 ../../Zotlabs/Widget/Suggestions.php:46
 msgid "Ignore/Hide"
 msgstr "Ignorar/Ocultar"
 
@@ -6397,103 +6559,108 @@ msgstr "No se puede encontrar su servidor."
 msgid "Post successful."
 msgstr "Enviado con éxito."
 
-#: ../../Zotlabs/Module/Mail.php:65
+#: ../../Zotlabs/Module/Mail.php:73
 msgid "Unable to lookup recipient."
 msgstr "No se puede asociar a un destinatario."
 
-#: ../../Zotlabs/Module/Mail.php:72
+#: ../../Zotlabs/Module/Mail.php:80
 msgid "Unable to communicate with requested channel."
 msgstr "No se puede establecer la comunicación con el canal solicitado."
 
-#: ../../Zotlabs/Module/Mail.php:79
+#: ../../Zotlabs/Module/Mail.php:87
 msgid "Cannot verify requested channel."
 msgstr "No se puede verificar el canal solicitado."
 
-#: ../../Zotlabs/Module/Mail.php:97
+#: ../../Zotlabs/Module/Mail.php:105
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
 
-#: ../../Zotlabs/Module/Mail.php:178
+#: ../../Zotlabs/Module/Mail.php:143 ../../Zotlabs/Lib/Apps.php:246
+#: ../../include/nav.php:187
+msgid "Mail"
+msgstr "Correo"
+
+#: ../../Zotlabs/Module/Mail.php:160
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../../Zotlabs/Module/Mail.php:191
+#: ../../Zotlabs/Module/Mail.php:173
 msgid "message"
 msgstr "mensaje"
 
-#: ../../Zotlabs/Module/Mail.php:232
+#: ../../Zotlabs/Module/Mail.php:214
 msgid "Message recalled."
 msgstr "Mensaje revocado."
 
-#: ../../Zotlabs/Module/Mail.php:245
+#: ../../Zotlabs/Module/Mail.php:227
 msgid "Conversation removed."
 msgstr "Conversación eliminada."
 
-#: ../../Zotlabs/Module/Mail.php:260 ../../Zotlabs/Module/Mail.php:381
+#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Caduca YYYY-MM-DD HH:MM"
 
-#: ../../Zotlabs/Module/Mail.php:288
+#: ../../Zotlabs/Module/Mail.php:270
 msgid "Requested channel is not in this network"
 msgstr "El canal solicitado no existe en esta red"
 
-#: ../../Zotlabs/Module/Mail.php:296
+#: ../../Zotlabs/Module/Mail.php:278
 msgid "Send Private Message"
 msgstr "Enviar un mensaje privado"
 
-#: ../../Zotlabs/Module/Mail.php:297 ../../Zotlabs/Module/Mail.php:439
+#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421
 msgid "To:"
 msgstr "Para:"
 
-#: ../../Zotlabs/Module/Mail.php:300 ../../Zotlabs/Module/Mail.php:441
+#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../../Zotlabs/Module/Mail.php:305 ../../Zotlabs/Module/Mail.php:447
-#: ../../include/conversation.php:1323
+#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429
+#: ../../include/conversation.php:1320
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
-#: ../../Zotlabs/Module/Mail.php:307
+#: ../../Zotlabs/Module/Mail.php:289
 msgid "Send"
 msgstr "Enviar"
 
-#: ../../Zotlabs/Module/Mail.php:310 ../../Zotlabs/Module/Mail.php:452
-#: ../../include/conversation.php:1368
+#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434
+#: ../../include/conversation.php:1365
 msgid "Set expiration date"
 msgstr "Configurar fecha de caducidad"
 
-#: ../../Zotlabs/Module/Mail.php:411
+#: ../../Zotlabs/Module/Mail.php:393
 msgid "Delete message"
 msgstr "Borrar mensaje"
 
-#: ../../Zotlabs/Module/Mail.php:412
+#: ../../Zotlabs/Module/Mail.php:394
 msgid "Delivery report"
 msgstr "Informe de transmisión"
 
-#: ../../Zotlabs/Module/Mail.php:413
+#: ../../Zotlabs/Module/Mail.php:395
 msgid "Recall message"
 msgstr "Revocar el mensaje"
 
-#: ../../Zotlabs/Module/Mail.php:415
+#: ../../Zotlabs/Module/Mail.php:397
 msgid "Message has been recalled."
 msgstr "El mensaje ha sido revocado."
 
-#: ../../Zotlabs/Module/Mail.php:432
+#: ../../Zotlabs/Module/Mail.php:414
 msgid "Delete Conversation"
 msgstr "Eliminar conversación"
 
-#: ../../Zotlabs/Module/Mail.php:434
+#: ../../Zotlabs/Module/Mail.php:416
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
 
-#: ../../Zotlabs/Module/Mail.php:438
+#: ../../Zotlabs/Module/Mail.php:420
 msgid "Send Reply"
 msgstr "Responder"
 
-#: ../../Zotlabs/Module/Mail.php:443
+#: ../../Zotlabs/Module/Mail.php:425
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Su mensaje para %s (%s):"
@@ -6535,19 +6702,19 @@ msgstr "Software"
 msgid "Rate"
 msgstr "Valorar"
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:263
 msgid "webpage"
 msgstr "página web"
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:269
 msgid "block"
 msgstr "bloque"
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:266
 msgid "layout"
 msgstr "plantilla"
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:272
 msgid "menu"
 msgstr "menú"
 
@@ -6589,7 +6756,11 @@ msgstr "o seleccione una (con un doble click)"
 msgid "Save to Folder"
 msgstr "Guardar en carpeta"
 
-#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
+#: ../../Zotlabs/Module/Probe.php:11 ../../Zotlabs/Lib/Apps.php:231
+msgid "Remote Diagnostics"
+msgstr "Diagnóstico remoto"
+
+#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr "Al intentar obtener la dirección, retorna el error: %1$s"
@@ -6673,16 +6844,16 @@ msgstr "no"
 msgid "yes"
 msgstr "sí"
 
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Zotlabs/Module/Register.php:256
 msgid "Membership on this site is by invitation only."
 msgstr "Para registrarse en este sitio es necesaria una invitación."
 
-#: ../../Zotlabs/Module/Register.php:270 ../../boot.php:1610
-#: ../../include/nav.php:149
+#: ../../Zotlabs/Module/Register.php:268 ../../boot.php:1582
+#: ../../include/nav.php:145
 msgid "Register"
 msgstr "Registrarse"
 
-#: ../../Zotlabs/Module/Register.php:271
+#: ../../Zotlabs/Module/Register.php:269
 msgid ""
 "This site may require email verification after submitting this form. If you "
 "are returned to a login page, please check your email for instructions."
@@ -6693,30 +6864,30 @@ msgstr "Este sitio puede requerir una verificación de correo electrónico despu
 msgid "Cover Photos"
 msgstr "Imágenes de portada del perfil"
 
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4303
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4273
 msgid "female"
 msgstr "mujer"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4304
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4274
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4305
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4275
 msgid "male"
 msgstr "hombre"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4306
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4276
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4308
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4278
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1759
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1878
 msgid "cover photo"
 msgstr "Imagen de portada del perfil"
 
@@ -6728,8 +6899,8 @@ msgstr "Subir imagen de portada del perfil"
 msgid "Documentation Search"
 msgstr "Búsqueda de Documentación"
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1773
-#: ../../include/nav.php:382
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1770
+#: ../../include/nav.php:368
 msgid "About"
 msgstr "Mi perfil"
 
@@ -6781,6 +6952,10 @@ msgstr "foro"
 msgid "Search Results For:"
 msgstr "Buscar resultados para:"
 
+#: ../../Zotlabs/Module/Network.php:157 ../../Zotlabs/Lib/Apps.php:235
+msgid "Activity"
+msgstr "Actividad"
+
 #: ../../Zotlabs/Module/Network.php:221
 msgid "Privacy group is empty"
 msgstr "El grupo de canales está vacío"
@@ -6815,49 +6990,50 @@ msgstr "$Projectname"
 msgid "Welcome to %s"
 msgstr "Bienvenido a %s"
 
-#: ../../Zotlabs/Module/Filestorage.php:87
+#: ../../Zotlabs/Module/Filestorage.php:79
 msgid "Permission Denied."
 msgstr "Permiso denegado"
 
-#: ../../Zotlabs/Module/Filestorage.php:103
+#: ../../Zotlabs/Module/Filestorage.php:95
 msgid "File not found."
 msgstr "Fichero no encontrado."
 
-#: ../../Zotlabs/Module/Filestorage.php:146
+#: ../../Zotlabs/Module/Filestorage.php:137
 msgid "Edit file permissions"
 msgstr "Modificar los permisos del fichero"
 
-#: ../../Zotlabs/Module/Filestorage.php:159
+#: ../../Zotlabs/Module/Filestorage.php:149
 msgid "Set/edit permissions"
 msgstr "Establecer/editar los permisos"
 
-#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:150
 msgid "Include all files and sub folders"
 msgstr "Incluir todos los ficheros y subcarpetas"
 
-#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Filestorage.php:151
 msgid "Return to file list"
 msgstr "Volver a la lista de ficheros"
 
-#: ../../Zotlabs/Module/Filestorage.php:163
+#: ../../Zotlabs/Module/Filestorage.php:153
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Copiar/pegar este código para adjuntar el fichero al envío"
 
-#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Filestorage.php:154
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Copiar/pegar esta dirección para enlazar el fichero desde una página web"
 
-#: ../../Zotlabs/Module/Filestorage.php:166
+#: ../../Zotlabs/Module/Filestorage.php:156
 msgid "Share this file"
 msgstr "Compartir este fichero"
 
-#: ../../Zotlabs/Module/Filestorage.php:167
+#: ../../Zotlabs/Module/Filestorage.php:157
 msgid "Show URL to this file"
 msgstr "Mostrar la dirección de este fichero"
 
-#: ../../Zotlabs/Module/Filestorage.php:168
-msgid "Notify your contacts about this file"
-msgstr "Avisar a sus contactos sobre este fichero"
+#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Zotlabs/Storage/Browser.php:351
+msgid "Show in your contacts shared folder"
+msgstr "Mostrar en la carpeta compartida con sus contactos"
 
 #: ../../Zotlabs/Module/Common.php:14
 msgid "No channel."
@@ -6884,71 +7060,59 @@ msgstr "Visitar el perfil de %s [%s]"
 msgid "View Connections"
 msgstr "Ver conexiones"
 
-#: ../../Zotlabs/Module/Admin.php:94
-msgid "# Accounts"
-msgstr "# Cuentas"
-
-#: ../../Zotlabs/Module/Admin.php:95
-msgid "# blocked accounts"
-msgstr "# cuentas bloqueadas"
-
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "# expired accounts"
-msgstr "# cuentas caducadas"
-
 #: ../../Zotlabs/Module/Admin.php:97
-msgid "# expiring accounts"
-msgstr "# cuentas que caducan"
+msgid "Blocked accounts"
+msgstr "Cuentas bloqueadas"
 
-#: ../../Zotlabs/Module/Admin.php:108
-msgid "# Channels"
-msgstr "# Canales"
+#: ../../Zotlabs/Module/Admin.php:98
+msgid "Expired accounts"
+msgstr "Cuentas caducadas"
 
-#: ../../Zotlabs/Module/Admin.php:109
-msgid "# primary"
-msgstr "# primario"
+#: ../../Zotlabs/Module/Admin.php:99
+msgid "Expiring accounts"
+msgstr "Cuentas que caducan"
 
-#: ../../Zotlabs/Module/Admin.php:110
-msgid "# clones"
-msgstr "# clones"
+#: ../../Zotlabs/Module/Admin.php:112
+msgid "Clones"
+msgstr "Clones"
 
-#: ../../Zotlabs/Module/Admin.php:116
+#: ../../Zotlabs/Module/Admin.php:118
 msgid "Message queues"
 msgstr "Mensajes en cola"
 
-#: ../../Zotlabs/Module/Admin.php:133
+#: ../../Zotlabs/Module/Admin.php:132
 msgid "Your software should be updated"
 msgstr "Debe actualizar su software"
 
-#: ../../Zotlabs/Module/Admin.php:138
+#: ../../Zotlabs/Module/Admin.php:137
 msgid "Summary"
 msgstr "Sumario"
 
-#: ../../Zotlabs/Module/Admin.php:141
+#: ../../Zotlabs/Module/Admin.php:140
 msgid "Registered accounts"
 msgstr "Cuentas registradas"
 
-#: ../../Zotlabs/Module/Admin.php:142
+#: ../../Zotlabs/Module/Admin.php:141
 msgid "Pending registrations"
 msgstr "Registros pendientes"
 
-#: ../../Zotlabs/Module/Admin.php:143
+#: ../../Zotlabs/Module/Admin.php:142
 msgid "Registered channels"
 msgstr "Canales registrados"
 
-#: ../../Zotlabs/Module/Admin.php:144
+#: ../../Zotlabs/Module/Admin.php:143
 msgid "Active plugins"
 msgstr "Extensiones (plugins) activas"
 
-#: ../../Zotlabs/Module/Admin.php:145
+#: ../../Zotlabs/Module/Admin.php:144
 msgid "Version"
 msgstr "Versión"
 
-#: ../../Zotlabs/Module/Admin.php:146
+#: ../../Zotlabs/Module/Admin.php:145
 msgid "Repository version (master)"
 msgstr "Versión del repositorio (master)"
 
-#: ../../Zotlabs/Module/Admin.php:147
+#: ../../Zotlabs/Module/Admin.php:146
 msgid "Repository version (dev)"
 msgstr "Versión del repositorio (dev)"
 
@@ -6997,7 +7161,7 @@ msgid ""
 "Password reset failed."
 msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1637
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1609
 msgid "Password Reset"
 msgstr "Restablecer la contraseña"
 
@@ -7046,121 +7210,91 @@ msgstr "Dirección de correo electrónico"
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:190
-msgid "Mark all system notifications seen"
-msgstr "Marcar todas las notificaciones del sistema como leídas"
+#: ../../Zotlabs/Module/Notifications.php:43
+#: ../../Zotlabs/Lib/ThreadItem.php:392
+msgid "Mark all seen"
+msgstr "Marcar todo como visto"
+
+#: ../../Zotlabs/Lib/Techlevels.php:10
+msgid "0. Beginner/Basic"
+msgstr "0. Principiante/Básico"
+
+#: ../../Zotlabs/Lib/Techlevels.php:11
+msgid "1. Novice - not skilled but willing to learn"
+msgstr "1. Novicio - no está preparado pero está dispuestos a aprender"
+
+#: ../../Zotlabs/Lib/Techlevels.php:12
+msgid "2. Intermediate - somewhat comfortable"
+msgstr "2. Intermedio - algo cómodo"
+
+#: ../../Zotlabs/Lib/Techlevels.php:13
+msgid "3. Advanced - very comfortable"
+msgstr "3. Avanzado - muy cómodo"
+
+#: ../../Zotlabs/Lib/Techlevels.php:14
+msgid "4. Expert - I can write computer code"
+msgstr "4. Experto - Puedo escribir código informático"
 
-#: ../../Zotlabs/Lib/Apps.php:212
+#: ../../Zotlabs/Lib/Techlevels.php:15
+msgid "5. Wizard - I probably know more than you do"
+msgstr "5. Asistente - probablemente sé más que tú"
+
+#: ../../Zotlabs/Lib/Apps.php:225
 msgid "Site Admin"
 msgstr "Administrador del sitio"
 
-#: ../../Zotlabs/Lib/Apps.php:213 ../../addon/buglink/buglink.php:16
+#: ../../Zotlabs/Lib/Apps.php:226 ../../addon/buglink/buglink.php:16
 msgid "Report Bug"
 msgstr "Informe de errores"
 
-#: ../../Zotlabs/Lib/Apps.php:214
-msgid "View Bookmarks"
-msgstr "Ver los marcadores"
-
-#: ../../Zotlabs/Lib/Apps.php:215
-msgid "My Chatrooms"
-msgstr "Mis salas de chat"
-
-#: ../../Zotlabs/Lib/Apps.php:217
+#: ../../Zotlabs/Lib/Apps.php:230
 msgid "Firefox Share"
 msgstr "Servicio de compartición de Firefox"
 
-#: ../../Zotlabs/Lib/Apps.php:218
-msgid "Remote Diagnostics"
-msgstr "Diagnóstico remoto"
-
-#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:337
-msgid "Suggest Channels"
-msgstr "Sugerir canales"
-
-#: ../../Zotlabs/Lib/Apps.php:220 ../../boot.php:1629
-#: ../../include/nav.php:117
+#: ../../Zotlabs/Lib/Apps.php:233 ../../boot.php:1601
+#: ../../include/nav.php:113
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: ../../Zotlabs/Lib/Apps.php:222
-msgid "Activity"
-msgstr "Actividad"
-
-#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1857
-#: ../../include/features.php:99 ../../include/nav.php:465
-msgid "Wiki"
-msgstr "Wiki"
-
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:180
-msgid "Channel Home"
-msgstr "Mi canal"
-
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1802
-#: ../../include/conversation.php:1805 ../../include/nav.php:200
-#: ../../include/nav.php:411 ../../include/nav.php:414
-msgid "Events"
-msgstr "Eventos"
-
-#: ../../Zotlabs/Lib/Apps.php:231
-msgid "Directory"
-msgstr "Directorio"
-
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:192
-msgid "Mail"
-msgstr "Correo"
-
-#: ../../Zotlabs/Lib/Apps.php:236
+#: ../../Zotlabs/Lib/Apps.php:249
 msgid "Chat"
 msgstr "Chat"
 
-#: ../../Zotlabs/Lib/Apps.php:238
+#: ../../Zotlabs/Lib/Apps.php:251
 msgid "Probe"
 msgstr "Probar"
 
-#: ../../Zotlabs/Lib/Apps.php:239
+#: ../../Zotlabs/Lib/Apps.php:252
 msgid "Suggest"
 msgstr "Sugerir"
 
-#: ../../Zotlabs/Lib/Apps.php:240
+#: ../../Zotlabs/Lib/Apps.php:253
 msgid "Random Channel"
 msgstr "Canal aleatorio"
 
-#: ../../Zotlabs/Lib/Apps.php:241
-msgid "Invite"
-msgstr "Invitar"
-
-#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26
+#: ../../Zotlabs/Lib/Apps.php:255 ../../Zotlabs/Widget/Admin.php:26
 msgid "Features"
 msgstr "Funcionalidades"
 
-#: ../../Zotlabs/Lib/Apps.php:243 ../../addon/openid/MysqlProvider.php:69
-msgid "Language"
-msgstr "Idioma"
-
-#: ../../Zotlabs/Lib/Apps.php:244
-msgid "Post"
-msgstr "Publicación"
-
-#: ../../Zotlabs/Lib/Apps.php:245 ../../addon/openid/MysqlProvider.php:58
+#: ../../Zotlabs/Lib/Apps.php:258 ../../addon/openid/MysqlProvider.php:58
 #: ../../addon/openid/MysqlProvider.php:59
 #: ../../addon/openid/MysqlProvider.php:60
 msgid "Profile Photo"
 msgstr "Foto del perfil"
 
-#: ../../Zotlabs/Lib/Apps.php:365
+#: ../../Zotlabs/Lib/Apps.php:391
 msgid "Purchase"
 msgstr "Comprar"
 
-#: ../../Zotlabs/Lib/Apps.php:369
+#: ../../Zotlabs/Lib/Apps.php:395
 msgid "Undelete"
 msgstr "Recuperar"
 
-#: ../../Zotlabs/Lib/Apps.php:374
+#: ../../Zotlabs/Lib/Apps.php:401
 msgid "Add to app-tray"
 msgstr "Añadir a la bandeja de aplicaciones"
 
-#: ../../Zotlabs/Lib/Apps.php:375
+#: ../../Zotlabs/Lib/Apps.php:402
 msgid "Remove from app-tray"
 msgstr "Quitar de la bandeja de aplicaciones"
 
@@ -7248,8 +7382,8 @@ msgid "Message"
 msgstr "Mensaje"
 
 #: ../../Zotlabs/Lib/NativeWikiPage.php:578
-#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:610
-#: ../../include/bbcode.php:756
+#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:667
+#: ../../include/bbcode.php:813
 msgid "Different viewers will see this text differently"
 msgstr "Visitantes diferentes verán este texto de forma distinta"
 
@@ -7336,21 +7470,20 @@ msgstr "Sala no encontrada."
 msgid "Room is full"
 msgstr "La sala está llena."
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1977
+#: ../../Zotlabs/Lib/Enotify.php:60
 msgid "$Projectname Notification"
 msgstr "Notificación de $Projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:218
-#: ../../addon/diaspora/util.php:231 ../../addon/diaspora/p.php:46
-#: ../../include/network.php:1978
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:283
+#: ../../addon/diaspora/util.php:296 ../../addon/diaspora/p.php:46
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1980
+#: ../../Zotlabs/Lib/Enotify.php:63
 msgid "Thank You,"
 msgstr "Gracias,"
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1982
+#: ../../Zotlabs/Lib/Enotify.php:65
 #, php-format
 msgid "%s Administrator"
 msgstr "%s Administrador"
@@ -7384,176 +7517,186 @@ msgstr "un mensaje privado"
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Por favor visite %s para ver y/o responder a su mensaje privado."
 
-#: ../../Zotlabs/Lib/Enotify.php:183
+#: ../../Zotlabs/Lib/Enotify.php:184
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:191
+#: ../../Zotlabs/Lib/Enotify.php:192
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%5$s de %4$s[/zrl] "
 
-#: ../../Zotlabs/Lib/Enotify.php:200
+#: ../../Zotlabs/Lib/Enotify.php:201
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s creado por usted[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:211
+#: ../../Zotlabs/Lib/Enotify.php:213
+#, php-format
+msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
+msgstr "[$Projectname:Aviso] Comentario moderado en la conversación #%1$d por %2$s"
+
+#: ../../Zotlabs/Lib/Enotify.php:215
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Aviso] Nuevo comentario de %2$s en la conversación #%1$d"
 
-#: ../../Zotlabs/Lib/Enotify.php:212
+#: ../../Zotlabs/Lib/Enotify.php:216
 #, php-format
 msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr "%1$s, %2$s ha comentado un elemento/conversación que ha estado siguiendo."
 
-#: ../../Zotlabs/Lib/Enotify.php:215 ../../Zotlabs/Lib/Enotify.php:292
-#: ../../Zotlabs/Lib/Enotify.php:309 ../../Zotlabs/Lib/Enotify.php:335
-#: ../../Zotlabs/Lib/Enotify.php:353 ../../Zotlabs/Lib/Enotify.php:367
+#: ../../Zotlabs/Lib/Enotify.php:219 ../../Zotlabs/Lib/Enotify.php:301
+#: ../../Zotlabs/Lib/Enotify.php:318 ../../Zotlabs/Lib/Enotify.php:344
+#: ../../Zotlabs/Lib/Enotify.php:362 ../../Zotlabs/Lib/Enotify.php:376
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Para ver o comentar la conversación, visite %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:273
+#: ../../Zotlabs/Lib/Enotify.php:223 ../../Zotlabs/Lib/Enotify.php:224
+#, php-format
+msgid "Please visit %s to approve or reject this comment."
+msgstr "Por favor, visite %spara aprobar o rechazar este comentario."
+
+#: ../../Zotlabs/Lib/Enotify.php:282
 #, php-format
 msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s, %2$s ha mostrado su agrado por [zrl=%3$s]%4$s creado por usted[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:288
+#: ../../Zotlabs/Lib/Enotify.php:297
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Aviso] \"Me gusta\" de %2$s en la conversación #%1$d"
 
-#: ../../Zotlabs/Lib/Enotify.php:289
+#: ../../Zotlabs/Lib/Enotify.php:298
 #, php-format
 msgid "%1$s, %2$s liked an item/conversation you created."
 msgstr "%1$s, %2$s ha mostrado su agrado por un elemento o conversación que ha creado usted."
 
-#: ../../Zotlabs/Lib/Enotify.php:300
+#: ../../Zotlabs/Lib/Enotify.php:309
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr "[$Projectname:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")"
 
-#: ../../Zotlabs/Lib/Enotify.php:302
+#: ../../Zotlabs/Lib/Enotify.php:311
 #, php-format
 msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr "%1$s, %2$s ha publicado en su página del perfil en %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:304
+#: ../../Zotlabs/Lib/Enotify.php:313
 #, php-format
 msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr "%1$s, %2$s ha publicado en [zrl=%3$s]su página del perfil[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:328
+#: ../../Zotlabs/Lib/Enotify.php:337
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr "[$Projectname:Aviso] %s le ha etiquetado"
 
-#: ../../Zotlabs/Lib/Enotify.php:329
+#: ../../Zotlabs/Lib/Enotify.php:338
 #, php-format
 msgid "%1$s, %2$s tagged you at %3$s"
 msgstr "%1$s, %2$s le ha etiquetado en %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:330
+#: ../../Zotlabs/Lib/Enotify.php:339
 #, php-format
 msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%3$s]le etiquetó[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:342
+#: ../../Zotlabs/Lib/Enotify.php:351
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr "[$Projectname:Aviso] %1$s le ha dado un toque"
 
-#: ../../Zotlabs/Lib/Enotify.php:343
+#: ../../Zotlabs/Lib/Enotify.php:352
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
 msgstr "%1$s, %2$s le ha dado un toque en %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:344
+#: ../../Zotlabs/Lib/Enotify.php:353
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%2$s]le ha dado un toque[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:360
+#: ../../Zotlabs/Lib/Enotify.php:369
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr "[$Projectname:Aviso] %s ha etiquetado su entrada"
 
-#: ../../Zotlabs/Lib/Enotify.php:361
+#: ../../Zotlabs/Lib/Enotify.php:370
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr "%1$s, %2$s ha etiquetado su publicación en %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:362
+#: ../../Zotlabs/Lib/Enotify.php:371
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr "%1$s, %2$s ha etiquetado [zrl=%3$s]su publicación[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:374
+#: ../../Zotlabs/Lib/Enotify.php:383
 msgid "[$Projectname:Notify] Introduction received"
 msgstr "[$Projectname:Aviso] Ha recibido una solicitud de conexión"
 
-#: ../../Zotlabs/Lib/Enotify.php:375
+#: ../../Zotlabs/Lib/Enotify.php:384
 #, php-format
 msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
 msgstr "%1$s, ha recibido una nueva solicitud de conexión de '%2$s' en  %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:376
+#: ../../Zotlabs/Lib/Enotify.php:385
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr "%1$s, ha recibido [zrl=%2$s]una nueva solicitud de conexión[/zrl] de %3$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:380 ../../Zotlabs/Lib/Enotify.php:399
+#: ../../Zotlabs/Lib/Enotify.php:389 ../../Zotlabs/Lib/Enotify.php:408
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Puede visitar su perfil en %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:382
+#: ../../Zotlabs/Lib/Enotify.php:391
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr "Por favor, visite %s para permitir o rechazar la solicitad de conexión."
 
-#: ../../Zotlabs/Lib/Enotify.php:389
+#: ../../Zotlabs/Lib/Enotify.php:398
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr "[$Projectname:Aviso] Ha recibido una sugerencia de conexión"
 
-#: ../../Zotlabs/Lib/Enotify.php:390
+#: ../../Zotlabs/Lib/Enotify.php:399
 #, php-format
 msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr "%1$s, ha recibido una sugerencia de conexión de '%2$s' en %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:391
+#: ../../Zotlabs/Lib/Enotify.php:400
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
 "%4$s."
 msgstr "%1$s, ha recibido [zrl=%2$s]una sugerencia de conexión[/zrl] para %3$s de %4$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:397
+#: ../../Zotlabs/Lib/Enotify.php:406
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../../Zotlabs/Lib/Enotify.php:398
+#: ../../Zotlabs/Lib/Enotify.php:407
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../Zotlabs/Lib/Enotify.php:401
+#: ../../Zotlabs/Lib/Enotify.php:410
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
 
-#: ../../Zotlabs/Lib/Enotify.php:620
+#: ../../Zotlabs/Lib/Enotify.php:629
 msgid "[$Projectname:Notify]"
 msgstr "[$Projectname:Aviso]"
 
-#: ../../Zotlabs/Lib/Enotify.php:780
+#: ../../Zotlabs/Lib/Enotify.php:789
 msgid "created a new post"
 msgstr "ha creado una nueva entrada"
 
-#: ../../Zotlabs/Lib/Enotify.php:781
+#: ../../Zotlabs/Lib/Enotify.php:790
 #, php-format
 msgid "commented on %s's post"
 msgstr "ha comentado la entrada de %s"
@@ -7562,21 +7705,21 @@ msgstr "ha comentado la entrada de %s"
 msgid "Wiki files deleted successfully"
 msgstr "Se han borrado con éxito los ficheros del wiki"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:93
+#: ../../Zotlabs/Lib/DB_Upgrade.php:95
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error de actualización en %s"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:99
+#: ../../Zotlabs/Lib/DB_Upgrade.php:101
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "La actualización %s ha fallado. Mire el informe de errores."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:661
+#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:656
 msgid "Private Message"
 msgstr "Mensaje Privado"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:653
+#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:648
 msgid "Select"
 msgstr "Seleccionar"
 
@@ -7620,11 +7763,11 @@ msgstr "Activar o desactivar el estado de entrada preferida"
 msgid "starred"
 msgstr "preferidas"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:668
+#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:663
 msgid "Message signature validated"
 msgstr "Firma de mensaje validada"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:669
+#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:664
 msgid "Message signature incorrect"
 msgstr "Firma de mensaje incorrecta"
 
@@ -7632,135 +7775,143 @@ msgstr "Firma de mensaje incorrecta"
 msgid "Add Tag"
 msgstr "Añadir etiqueta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:316
+#: ../../Zotlabs/Lib/ThreadItem.php:267 ../../include/taxonomy.php:355
 msgid "like"
 msgstr "me gusta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:270 ../../include/taxonomy.php:317
+#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:356
 msgid "dislike"
 msgstr "no me gusta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:274
+#: ../../Zotlabs/Lib/ThreadItem.php:272
 msgid "Share This"
 msgstr "Compartir esto"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:274
+#: ../../Zotlabs/Lib/ThreadItem.php:272
 msgid "share"
 msgstr "compartir"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:283
+#: ../../Zotlabs/Lib/ThreadItem.php:281
 msgid "Delivery Report"
 msgstr "Informe de transmisión"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:301
+#: ../../Zotlabs/Lib/ThreadItem.php:299
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d comentario"
 msgstr[1] "%d comentarios"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Lib/ThreadItem.php:331
+#: ../../Zotlabs/Lib/ThreadItem.php:328 ../../Zotlabs/Lib/ThreadItem.php:329
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Ver el perfil de %s - %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:334
+#: ../../Zotlabs/Lib/ThreadItem.php:332
 msgid "to"
 msgstr "a"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:335
+#: ../../Zotlabs/Lib/ThreadItem.php:333
 msgid "via"
 msgstr "mediante"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:336
+#: ../../Zotlabs/Lib/ThreadItem.php:334
 msgid "Wall-to-Wall"
 msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:337
+#: ../../Zotlabs/Lib/ThreadItem.php:335
 msgid "via Wall-To-Wall:"
 msgstr "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:718
+#: ../../Zotlabs/Lib/ThreadItem.php:348 ../../include/conversation.php:715
 #, php-format
 msgid "from %s"
 msgstr "desde %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:721
+#: ../../Zotlabs/Lib/ThreadItem.php:351 ../../include/conversation.php:718
 #, php-format
 msgid "last edited: %s"
 msgstr "último cambio: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:722
+#: ../../Zotlabs/Lib/ThreadItem.php:352 ../../include/conversation.php:719
 #, php-format
 msgid "Expires: %s"
 msgstr "Caduca: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:360
+#: ../../Zotlabs/Lib/ThreadItem.php:358
 msgid "Attend"
 msgstr "Participar o asistir"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:361
+#: ../../Zotlabs/Lib/ThreadItem.php:359
 msgid "Attendance Options"
 msgstr "Opciones de participación o asistencia"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:362
+#: ../../Zotlabs/Lib/ThreadItem.php:360
 msgid "Vote"
 msgstr "Votar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:363
+#: ../../Zotlabs/Lib/ThreadItem.php:361
 msgid "Voting Options"
 msgstr "Opciones de votación"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:384
+#: ../../Zotlabs/Lib/ThreadItem.php:382
 #: ../../addon/bookmarker/bookmarker.php:38
 msgid "Save Bookmarks"
 msgstr "Guardar en Marcadores"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:385
+#: ../../Zotlabs/Lib/ThreadItem.php:383
 msgid "Add to Calendar"
 msgstr "Añadir al calendario"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:394
-msgid "Mark all seen"
-msgstr "Marcar todo como visto"
-
-#: ../../Zotlabs/Lib/ThreadItem.php:443 ../../include/js_strings.php:7
+#: ../../Zotlabs/Lib/ThreadItem.php:441 ../../include/js_strings.php:7
 #, php-format
 msgid "%s show all"
 msgstr "%s mostrar todo"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1318
+#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/conversation.php:1315
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1319
+#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1316
 msgid "Italic"
 msgstr "Itálico "
 
-#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1320
+#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1317
 msgid "Underline"
 msgstr "Subrayar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1321
+#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1318
 msgid "Quote"
 msgstr "Citar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:737 ../../include/conversation.php:1322
+#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1319
 msgid "Code"
 msgstr "Código"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:738
+#: ../../Zotlabs/Lib/ThreadItem.php:736
 msgid "Image"
 msgstr "Imagen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:739
+#: ../../Zotlabs/Lib/ThreadItem.php:737
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:740
+#: ../../Zotlabs/Lib/ThreadItem.php:738
 msgid "Video"
 msgstr "Vídeo"
 
+#: ../../Zotlabs/Lib/ThreadItem.php:747
+msgid "Your full name (required)"
+msgstr "Su nombre completo (requerido)"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:748
+msgid "Your email address (required)"
+msgstr "Su dirección de correo electrónico (requerido)"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:749
+msgid "Your website URL (optional)"
+msgstr "La URL de su sitio web (opcional)"
+
 #: ../../Zotlabs/Zot/Auth.php:138
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
@@ -7773,72 +7924,72 @@ msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
 
-#: ../../Zotlabs/Storage/Browser.php:106 ../../Zotlabs/Storage/Browser.php:237
+#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:238
 msgid "parent"
 msgstr "padre"
 
-#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2679
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2692
 msgid "Collection"
 msgstr "Colección"
 
-#: ../../Zotlabs/Storage/Browser.php:133
+#: ../../Zotlabs/Storage/Browser.php:134
 msgid "Principal"
 msgstr "Principal"
 
-#: ../../Zotlabs/Storage/Browser.php:136
+#: ../../Zotlabs/Storage/Browser.php:137
 msgid "Addressbook"
 msgstr "Libreta de direcciones"
 
-#: ../../Zotlabs/Storage/Browser.php:139
+#: ../../Zotlabs/Storage/Browser.php:140
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../../Zotlabs/Storage/Browser.php:142
+#: ../../Zotlabs/Storage/Browser.php:143
 msgid "Schedule Inbox"
 msgstr "Programar bandeja de entrada"
 
-#: ../../Zotlabs/Storage/Browser.php:145
+#: ../../Zotlabs/Storage/Browser.php:146
 msgid "Schedule Outbox"
 msgstr "Programar bandeja de salida"
 
-#: ../../Zotlabs/Storage/Browser.php:225
+#: ../../Zotlabs/Storage/Browser.php:226
 msgid "Total"
 msgstr "Total"
 
-#: ../../Zotlabs/Storage/Browser.php:227
+#: ../../Zotlabs/Storage/Browser.php:228
 msgid "Shared"
 msgstr "Compartido"
 
-#: ../../Zotlabs/Storage/Browser.php:301
+#: ../../Zotlabs/Storage/Browser.php:304
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "Está usando %1$s de su espacio disponible para ficheros."
 
-#: ../../Zotlabs/Storage/Browser.php:306
+#: ../../Zotlabs/Storage/Browser.php:309
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
 msgstr "Está usando %1$s de %2$s que tiene a su disposición para ficheros. (%3$s&#37;)"
 
-#: ../../Zotlabs/Storage/Browser.php:317
+#: ../../Zotlabs/Storage/Browser.php:320
 msgid "WARNING:"
 msgstr "ATENCIÓN: "
 
-#: ../../Zotlabs/Storage/Browser.php:327
+#: ../../Zotlabs/Storage/Browser.php:330
 msgid ""
 "Please use DAV to upload large (video, audio) files.<br>See <a class=\"zrl\""
 " href=\"help/member/member_guide#Cloud_Desktop_Clients\">Cloud Desktop "
 "Clients</a>"
 msgstr "Por favor, use DAV para subir ficheros de gran tamaño (vídeo, audio).<br>Mire en <a class=\"zrl\" href=\"help/member/member_guide#Cloud_Desktop_Clients\">Cloud Desktop Clients</a>"
 
-#: ../../Zotlabs/Storage/Browser.php:331
+#: ../../Zotlabs/Storage/Browser.php:334
 msgid "Create new folder"
 msgstr "Crear nueva carpeta"
 
-#: ../../Zotlabs/Storage/Browser.php:333
+#: ../../Zotlabs/Storage/Browser.php:336
 msgid "Upload file"
 msgstr "Subir fichero"
 
-#: ../../Zotlabs/Storage/Browser.php:347
+#: ../../Zotlabs/Storage/Browser.php:350
 msgid "Drop files here to immediately upload"
 msgstr "Arrastre los ficheros aquí para subirlos de forma inmediata"
 
@@ -7846,9 +7997,85 @@ msgstr "Arrastre los ficheros aquí para subirlos de forma inmediata"
 msgid "Forums"
 msgstr "Foros"
 
+#: ../../Zotlabs/Widget/Cdav.php:37
+msgid "Select Channel"
+msgstr "Seleccionar un canal"
+
+#: ../../Zotlabs/Widget/Cdav.php:42
+msgid "Read-write"
+msgstr "Lectura y escritura"
+
+#: ../../Zotlabs/Widget/Cdav.php:43
+msgid "Read-only"
+msgstr "Sólo lectura"
+
+#: ../../Zotlabs/Widget/Cdav.php:116
+msgid "My Calendars"
+msgstr "Mis calendarios"
+
+#: ../../Zotlabs/Widget/Cdav.php:118
+msgid "Shared Calendars"
+msgstr "Calendarios compartidos"
+
+#: ../../Zotlabs/Widget/Cdav.php:122
+msgid "Share this calendar"
+msgstr "Compartir este calendario"
+
+#: ../../Zotlabs/Widget/Cdav.php:124
+msgid "Calendar name and color"
+msgstr "Nombre y color del calendario"
+
+#: ../../Zotlabs/Widget/Cdav.php:126
+msgid "Create new calendar"
+msgstr "Crear un nuevo calendario"
+
+#: ../../Zotlabs/Widget/Cdav.php:128
+msgid "Calendar Name"
+msgstr "Nombre del calendario"
+
+#: ../../Zotlabs/Widget/Cdav.php:129
+msgid "Calendar Tools"
+msgstr "Gestión de calendarios"
+
+#: ../../Zotlabs/Widget/Cdav.php:130
+msgid "Import calendar"
+msgstr "Importar un calendario"
+
+#: ../../Zotlabs/Widget/Cdav.php:131
+msgid "Select a calendar to import to"
+msgstr "Seleccionar un calendario para importarlo"
+
+#: ../../Zotlabs/Widget/Cdav.php:158
+msgid "Addressbooks"
+msgstr "Agenda de direcciones"
+
+#: ../../Zotlabs/Widget/Cdav.php:160
+msgid "Addressbook name"
+msgstr "Nombre de la agenda"
+
+#: ../../Zotlabs/Widget/Cdav.php:162
+msgid "Create new addressbook"
+msgstr "Crear una nueva agenda de direcciones"
+
+#: ../../Zotlabs/Widget/Cdav.php:163
+msgid "Addressbook Name"
+msgstr "Nombre de la agenda"
+
+#: ../../Zotlabs/Widget/Cdav.php:165
+msgid "Addressbook Tools"
+msgstr "Gestión de agendas de direcciones"
+
+#: ../../Zotlabs/Widget/Cdav.php:166
+msgid "Import addressbook"
+msgstr "Importar una agenda de direcciones"
+
+#: ../../Zotlabs/Widget/Cdav.php:167
+msgid "Select an addressbook to import to"
+msgstr "Seleccionar una agenda para importarla"
+
 #: ../../Zotlabs/Widget/Appcategories.php:39
 #: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:91
-#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
+#: ../../include/taxonomy.php:227 ../../include/taxonomy.php:309
 msgid "Categories"
 msgstr "Temas"
 
@@ -7881,21 +8108,21 @@ msgstr "Menú de correo privado"
 msgid "Combined View"
 msgstr "Vista combinada"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:195
+#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:190
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:196
+#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:191
 msgid "Outbox"
 msgstr "Bandeja de salida"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:197
+#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:192
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #: ../../Zotlabs/Widget/Chatroom_list.php:16
-#: ../../include/conversation.php:1816 ../../include/conversation.php:1819
-#: ../../include/nav.php:425 ../../include/nav.php:428
+#: ../../include/conversation.php:1813 ../../include/conversation.php:1816
+#: ../../include/nav.php:411 ../../include/nav.php:414
 msgid "Chatrooms"
 msgstr "Salas de chat"
 
@@ -7946,23 +8173,22 @@ msgid "Archives"
 msgstr "Hemeroteca"
 
 #: ../../Zotlabs/Widget/Conversations.php:17
-#: ../../Zotlabs/Widget/Conversations.php:29
-msgid "Conversations"
-msgstr "Conversaciones"
-
-#: ../../Zotlabs/Widget/Conversations.php:21
 msgid "Received Messages"
 msgstr "Mensajes recibidos"
 
-#: ../../Zotlabs/Widget/Conversations.php:25
+#: ../../Zotlabs/Widget/Conversations.php:21
 msgid "Sent Messages"
 msgstr "Enviar mensajes"
 
-#: ../../Zotlabs/Widget/Conversations.php:39
+#: ../../Zotlabs/Widget/Conversations.php:25
+msgid "Conversations"
+msgstr "Conversaciones"
+
+#: ../../Zotlabs/Widget/Conversations.php:35
 msgid "No messages."
 msgstr "Sin mensajes."
 
-#: ../../Zotlabs/Widget/Conversations.php:57
+#: ../../Zotlabs/Widget/Conversations.php:55
 msgid "Delete conversation"
 msgstr "Eliminar conversación"
 
@@ -7978,11 +8204,11 @@ msgstr "foto/imagen"
 msgid "Remove term"
 msgstr "Eliminar término"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:297
 msgid "Saved Searches"
 msgstr "Búsquedas guardadas"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336
+#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:337
 msgid "add"
 msgstr "añadir"
 
@@ -7990,15 +8216,15 @@ msgstr "añadir"
 msgid "Notes"
 msgstr "Notas"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:54 ../../addon/gitwiki/gitwiki.php:76
+#: ../../Zotlabs/Widget/Wiki_pages.php:52 ../../addon/gitwiki/gitwiki.php:76
 msgid "Wiki Pages"
 msgstr "Páginas del wiki"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:60 ../../addon/gitwiki/gitwiki.php:81
+#: ../../Zotlabs/Widget/Wiki_pages.php:58 ../../addon/gitwiki/gitwiki.php:81
 msgid "Add new page"
 msgstr "Añadir una nueva página"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:61 ../../addon/gitwiki/gitwiki.php:82
+#: ../../Zotlabs/Widget/Wiki_pages.php:59 ../../addon/gitwiki/gitwiki.php:82
 msgid "Page name"
 msgstr "Nombre de la página"
 
@@ -8019,7 +8245,7 @@ msgid "See more..."
 msgstr "Ver más..."
 
 #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
-#: ../../include/features.php:390
+#: ../../include/features.php:386
 msgid "Saved Folders"
 msgstr "Carpetas guardadas"
 
@@ -8075,15 +8301,15 @@ msgstr "Gestión de ubicaciones (clones) del canal"
 msgid "Export channel"
 msgstr "Exportar canal"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:83
+#: ../../Zotlabs/Widget/Settings_menu.php:84
 msgid "Connected apps"
 msgstr "Aplicaciones (apps) conectadas"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:98 ../../include/features.php:153
+#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:149
 msgid "Permission Groups"
 msgstr "Grupos de permisos"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:115
+#: ../../Zotlabs/Widget/Settings_menu.php:117
 msgid "Premium Channel Settings"
 msgstr "Configuración del canal premium"
 
@@ -8095,156 +8321,147 @@ msgstr "Salas de chat preferidas"
 msgid "Source channel not found."
 msgstr "No se ha encontrado el canal de origen."
 
-#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:26
-#, php-format
-msgctxt "opensearch"
-msgid "Search %1$s (%2$s)"
-msgstr "Buscar %1$s (%2$s)"
-
-#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:28
-msgctxt "opensearch"
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../boot.php:1609
+#: ../../boot.php:1581
 msgid "Create an account to access services and applications"
 msgstr "Crear una cuenta para acceder a los servicios y aplicaciones"
 
-#: ../../boot.php:1628 ../../include/nav.php:103 ../../include/nav.php:127
+#: ../../boot.php:1600 ../../include/nav.php:99 ../../include/nav.php:123
+#: ../../include/nav.php:140
 msgid "Logout"
 msgstr "Finalizar sesión"
 
-#: ../../boot.php:1631
+#: ../../boot.php:1603
 msgid "Login/Email"
 msgstr "Inicio de sesión / Correo electrónico"
 
-#: ../../boot.php:1632
+#: ../../boot.php:1604
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../../boot.php:1633
+#: ../../boot.php:1605
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../../boot.php:1636
+#: ../../boot.php:1608
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:2174
+#: ../../boot.php:2146
 msgid "toggle mobile"
 msgstr "cambiar a modo móvil"
 
-#: ../../boot.php:2327
+#: ../../boot.php:2299
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr "[$Projectname] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2332
+#: ../../boot.php:2304
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
 
-#: ../../boot.php:2450
+#: ../../boot.php:2423
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr "[$Projectname] Las tareas de Cron no están funcionando en %s"
 
-#: ../../boot.php:2455
+#: ../../boot.php:2428
 msgid "Cron/Scheduled tasks not running."
 msgstr "Las tareas del Planificador/Cron no están funcionando."
 
-#: ../../boot.php:2456 ../../include/datetime.php:286
+#: ../../boot.php:2429 ../../include/datetime.php:286
 msgid "never"
 msgstr "nunca"
 
-#: ../../view/theme/redbasic/php/config.php:9
+#: ../../view/theme/redbasic/php/config.php:16
+#: ../../view/theme/redbasic/php/config.php:19
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (predefinido)"
 
-#: ../../view/theme/redbasic/php/config.php:88
+#: ../../view/theme/redbasic/php/config.php:99
 msgid "Theme settings"
 msgstr "Ajustes del tema"
 
-#: ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:100
 msgid "Narrow navbar"
 msgstr "Estrechar la barra de navegación"
 
-#: ../../view/theme/redbasic/php/config.php:90
+#: ../../view/theme/redbasic/php/config.php:101
 msgid "Navigation bar background color"
 msgstr "Color de fondo de la barra de navegación"
 
-#: ../../view/theme/redbasic/php/config.php:91
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Navigation bar icon color "
 msgstr "Color del icono de la barra de navegación"
 
-#: ../../view/theme/redbasic/php/config.php:92
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Navigation bar active icon color "
 msgstr "Color del icono activo de la barra de navegación"
 
-#: ../../view/theme/redbasic/php/config.php:93
+#: ../../view/theme/redbasic/php/config.php:104
 msgid "Link color"
 msgstr "Color del enlace"
 
-#: ../../view/theme/redbasic/php/config.php:94
+#: ../../view/theme/redbasic/php/config.php:105
 msgid "Set font-color for banner"
 msgstr "Ajustar el color del tipo de letra para el \"banner\""
 
-#: ../../view/theme/redbasic/php/config.php:95
+#: ../../view/theme/redbasic/php/config.php:106
 msgid "Set the background color"
 msgstr "Ajustar el color de fondo"
 
-#: ../../view/theme/redbasic/php/config.php:96
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Set the background image"
 msgstr "Ajustar la imagen de fondo"
 
-#: ../../view/theme/redbasic/php/config.php:97
+#: ../../view/theme/redbasic/php/config.php:108
 msgid "Set the background color of items"
 msgstr "Ajustar el color de los elementos de fondo"
 
-#: ../../view/theme/redbasic/php/config.php:98
+#: ../../view/theme/redbasic/php/config.php:109
 msgid "Set the background color of comments"
 msgstr "Ajustar el color de fondo de los comentarios"
 
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:110
 msgid "Set font-size for the entire application"
 msgstr "Ajustar el tamaño de letra para toda la aplicación"
 
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:110
 msgid "Examples: 1rem, 100%, 16px"
 msgstr "Ejemplos: 1rem, 100%, 16px"
 
-#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:111
 msgid "Set font-color for posts and comments"
 msgstr "Establecer el color de la letra para publicaciones y comentarios"
 
-#: ../../view/theme/redbasic/php/config.php:101
+#: ../../view/theme/redbasic/php/config.php:112
 msgid "Set radius of corners"
 msgstr "Establecer el radio de curvatura de las esquinas"
 
-#: ../../view/theme/redbasic/php/config.php:101
+#: ../../view/theme/redbasic/php/config.php:112
 msgid "Example: 4px"
 msgstr "Ejemplo: 4px"
 
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:113
 msgid "Set shadow depth of photos"
 msgstr "Ajustar la profundidad de sombras de las fotos"
 
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:114
 msgid "Set maximum width of content region in pixel"
 msgstr "Ajustar la anchura máxima de la región de contenido, en pixels"
 
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:114
 msgid "Leave empty for default width"
 msgstr "Dejar en blanco para la anchura predeterminada"
 
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:115
 msgid "Left align page content"
 msgstr "Alinear a la izquierda el contenido de la página"
 
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:116
 msgid "Set size of conversation author photo"
 msgstr "Ajustar el tamaño de la foto del autor de la conversación"
 
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:117
 msgid "Set size of followup author photos"
 msgstr "Ajustar el tamaño de foto de los seguidores del autor"
 
@@ -8349,269 +8566,80 @@ msgid ""
 " marker location.<br><br>Enter a radius in meters (0 to disable):"
 msgstr "Se emitirá una alerta de proximidad cuando usted esté dentro de un radio determinado respecto al marcador de localización.<br><br> Ingrese el radio en metros (0 para deshabilitar):"
 
-#: ../../addon/rendezvous/rendezvous.php:183
-msgid "Marker proximity alert"
-msgstr "Marcador de alerta de proximidad"
-
-#: ../../addon/rendezvous/rendezvous.php:186
-msgid "Reminder note"
-msgstr "Recordatorio"
-
-#: ../../addon/rendezvous/rendezvous.php:187
-msgid ""
-"Enter a note to be displayed when you are within the specified proximity..."
-msgstr "Introduzca una nota que se mostrará cuando esté dentro de la proximidad especificada..."
-
-#: ../../addon/rendezvous/rendezvous.php:199
-msgid "Add new rendezvous"
-msgstr "Añadir una nueva cita"
-
-#: ../../addon/rendezvous/rendezvous.php:200
-msgid ""
-"Create a new rendezvous and share the access link with those you wish to "
-"invite to the group. Those who open the link become members of the "
-"rendezvous. They can view other member locations, add markers to the map, or"
-" share their own locations with the group."
-msgstr "Cree una nueva cita y comparta los enlaces de acceso con los que desea invitar al grupo. Aquellos que abran el enlace se convertirán en miembros de la cita. Pueden ver otras ubicaciones de miembros, añadir marcadores al mapa o compartir sus propias ubicaciones con el grupo."
-
-#: ../../addon/skeleton/skeleton.php:59
-msgid "Some setting"
-msgstr "Algunos ajustes"
-
-#: ../../addon/skeleton/skeleton.php:61
-msgid "A setting"
-msgstr "Un ajuste"
-
-#: ../../addon/skeleton/skeleton.php:64
-msgid "Skeleton Settings"
-msgstr "Ajustes de Skeleton"
-
-#: ../../addon/gnusoc/gnusoc.php:119
-msgid "GNU-Social Protocol Settings updated."
-msgstr "Se han actualizado los ajustes del protocolo de GNU-Social."
-
-#: ../../addon/gnusoc/gnusoc.php:130
-msgid "Enable the GNU-Social protocol for this channel"
-msgstr "Activar el protocolo de GNU-Social para este canal"
-
-#: ../../addon/gnusoc/gnusoc.php:134
-msgid "GNU-Social Protocol Settings"
-msgstr "Ajustes del protocolo de GNU-Social"
-
-#: ../../addon/gnusoc/gnusoc.php:324
-msgid "Follow"
-msgstr "Seguir"
-
-#: ../../addon/gnusoc/gnusoc.php:327
-#, php-format
-msgid "%1$s is now following %2$s"
-msgstr "%1$s está siguiendo ahora a %2$s"
-
-#: ../../addon/cdav/Mod_Cdav.php:744
-msgid "INVALID EVENT DISMISSED!"
-msgstr "¡EVENTO NO VÁLIDO RECHAZADO!"
-
-#: ../../addon/cdav/Mod_Cdav.php:745
-msgid "Summary: "
-msgstr "Resumen: "
-
-#: ../../addon/cdav/Mod_Cdav.php:746
-msgid "Date: "
-msgstr "Fecha: "
-
-#: ../../addon/cdav/Mod_Cdav.php:747 ../../addon/cdav/Mod_Cdav.php:754
-msgid "Reason: "
-msgstr "Razón: "
-
-#: ../../addon/cdav/Mod_Cdav.php:752
-msgid "INVALID CARD DISMISSED!"
-msgstr "¡TARJETA NO VÁLIDA RECHAZADA!"
-
-#: ../../addon/cdav/Mod_Cdav.php:753
-msgid "Name: "
-msgstr "Nombre: "
-
-#: ../../addon/cdav/Mod_Cdav.php:770
-msgid ""
-"You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV "
-"Settings before you can use it."
-msgstr "Debe habilitar este complemento en Ajustes/Complementos>Configuración de CalDAV/CardDAV antes de poder utilizarlo."
-
-#: ../../addon/cdav/Mod_Cdav.php:836 ../../addon/cdav/Mod_Cdav.php:837
-msgid "Example: YYYY-MM-DD HH:mm"
-msgstr "Ejemplo: YYYY-MM-DD HH:mm"
-
-#: ../../addon/cdav/Mod_Cdav.php:837
-msgid "End date and time"
-msgstr "Fecha y hora de finalización"
-
-#: ../../addon/cdav/Mod_Cdav.php:852
-msgid "List month"
-msgstr "Lista mensual"
-
-#: ../../addon/cdav/Mod_Cdav.php:853
-msgid "List week"
-msgstr "Lista semanal"
-
-#: ../../addon/cdav/Mod_Cdav.php:854
-msgid "List day"
-msgstr "Lista diaria"
-
-#: ../../addon/cdav/Mod_Cdav.php:861
-msgid "More"
-msgstr "Más"
-
-#: ../../addon/cdav/Mod_Cdav.php:862
-msgid "Less"
-msgstr "Menos"
-
-#: ../../addon/cdav/Mod_Cdav.php:863
-msgid "Select calendar"
-msgstr "Seleccionar un calendario"
-
-#: ../../addon/cdav/Mod_Cdav.php:865
-msgid "Delete all"
-msgstr "Eliminar todos"
-
-#: ../../addon/cdav/Mod_Cdav.php:867
-msgid "Sorry! Editing of recurrent events is not yet implemented."
-msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado."
-
-#: ../../addon/cdav/cdav.php:36
-msgid "Errors encountered creating database table: "
-msgstr "Errores encontrados al crear la tabla de la base de datos: "
-
-#: ../../addon/cdav/cdav.php:197
-msgid "Default Calendar"
-msgstr "Calendario por defecto"
-
-#: ../../addon/cdav/cdav.php:206
-msgid "Default Addressbook"
-msgstr "Agenda de direcciones por defecto"
-
-#: ../../addon/cdav/cdav.php:215
-msgid "CalDAV/CardDAV Settings saved."
-msgstr "Se ha guardado la configuración de CalDAV/CardDAV."
-
-#: ../../addon/cdav/cdav.php:234
-msgid "Enable CalDAV/CardDAV Server for this channel"
-msgstr "Habilitar el servidor CalDAV/CardDAV para este canal"
-
-#: ../../addon/cdav/cdav.php:237
-#, php-format
-msgid "Your CalDAV resources are located at %s "
-msgstr "Los recursos de CalDAV se encuentran en %s"
-
-#: ../../addon/cdav/cdav.php:240
-#, php-format
-msgid "Your CardDAV resources are located at %s "
-msgstr "Sus recursos de CalDAV están localizados en %s "
-
-#: ../../addon/cdav/cdav.php:246
-msgid "CalDAV/CardDAV Settings"
-msgstr "Configuración de CalDAV/CardDAV"
-
-#: ../../addon/cdav/cdav.php:272 ../../include/connections.php:670
-msgid "Home, Voice"
-msgstr "Llamadas particulares"
-
-#: ../../addon/cdav/cdav.php:273 ../../include/connections.php:671
-msgid "Home, Fax"
-msgstr "Fax particular"
-
-#: ../../addon/cdav/cdav.php:275 ../../include/connections.php:673
-msgid "Work, Voice"
-msgstr "Llamadas de trabajo"
-
-#: ../../addon/cdav/cdav.php:276 ../../include/connections.php:674
-msgid "Work, Fax"
-msgstr "Fax de trabajo"
-
-#: ../../addon/cdav/include/widgets.php:37
-msgid "Select Channel"
-msgstr "Seleccionar un canal"
-
-#: ../../addon/cdav/include/widgets.php:42
-msgid "Read-write"
-msgstr "Lectura y escritura"
-
-#: ../../addon/cdav/include/widgets.php:43
-msgid "Read-only"
-msgstr "Sólo lectura"
-
-#: ../../addon/cdav/include/widgets.php:116
-msgid "My Calendars"
-msgstr "Mis calendarios"
-
-#: ../../addon/cdav/include/widgets.php:118
-msgid "Shared Calendars"
-msgstr "Calendarios compartidos"
-
-#: ../../addon/cdav/include/widgets.php:122
-msgid "Share this calendar"
-msgstr "Compartir este calendario"
+#: ../../addon/rendezvous/rendezvous.php:183
+msgid "Marker proximity alert"
+msgstr "Marcador de alerta de proximidad"
 
-#: ../../addon/cdav/include/widgets.php:124
-msgid "Calendar name and color"
-msgstr "Nombre y color del calendario"
+#: ../../addon/rendezvous/rendezvous.php:186
+msgid "Reminder note"
+msgstr "Recordatorio"
 
-#: ../../addon/cdav/include/widgets.php:126
-msgid "Create new calendar"
-msgstr "Crear un nuevo calendario"
+#: ../../addon/rendezvous/rendezvous.php:187
+msgid ""
+"Enter a note to be displayed when you are within the specified proximity..."
+msgstr "Introduzca una nota que se mostrará cuando esté dentro de la proximidad especificada..."
 
-#: ../../addon/cdav/include/widgets.php:128
-msgid "Calendar Name"
-msgstr "Nombre del calendario"
+#: ../../addon/rendezvous/rendezvous.php:199
+msgid "Add new rendezvous"
+msgstr "Añadir una nueva cita"
 
-#: ../../addon/cdav/include/widgets.php:129
-msgid "Calendar Tools"
-msgstr "Gestión de calendarios"
+#: ../../addon/rendezvous/rendezvous.php:200
+msgid ""
+"Create a new rendezvous and share the access link with those you wish to "
+"invite to the group. Those who open the link become members of the "
+"rendezvous. They can view other member locations, add markers to the map, or"
+" share their own locations with the group."
+msgstr "Cree una nueva cita y comparta los enlaces de acceso con los que desea invitar al grupo. Aquellos que abran el enlace se convertirán en miembros de la cita. Pueden ver otras ubicaciones de miembros, añadir marcadores al mapa o compartir sus propias ubicaciones con el grupo."
 
-#: ../../addon/cdav/include/widgets.php:130
-msgid "Import calendar"
-msgstr "Importar un calendario"
+#: ../../addon/skeleton/skeleton.php:59
+msgid "Some setting"
+msgstr "Algunos ajustes"
 
-#: ../../addon/cdav/include/widgets.php:131
-msgid "Select a calendar to import to"
-msgstr "Seleccionar un calendario para importarlo"
+#: ../../addon/skeleton/skeleton.php:61
+msgid "A setting"
+msgstr "Un ajuste"
 
-#: ../../addon/cdav/include/widgets.php:158
-msgid "Addressbooks"
-msgstr "Agenda de direcciones"
+#: ../../addon/skeleton/skeleton.php:64
+msgid "Skeleton Settings"
+msgstr "Ajustes de Skeleton"
 
-#: ../../addon/cdav/include/widgets.php:160
-msgid "Addressbook name"
-msgstr "Nombre de la agenda"
+#: ../../addon/gnusoc/gnusoc.php:200
+msgid "GNU-Social Protocol Settings updated."
+msgstr "Se han actualizado los ajustes del protocolo de GNU-Social."
 
-#: ../../addon/cdav/include/widgets.php:162
-msgid "Create new addressbook"
-msgstr "Crear una nueva agenda de direcciones"
+#: ../../addon/gnusoc/gnusoc.php:219
+msgid ""
+"The GNU-Social protocol does not support location independence. Connections "
+"you make within that network may be unreachable from alternate channel "
+"locations."
+msgstr "El protocolo de GNU-Social no admite la independencia de la ubicación. Las\n conexiones que realice dentro de esa red pueden ser inaccesibles desde \nubicaciones de canales alternativos."
 
-#: ../../addon/cdav/include/widgets.php:163
-msgid "Addressbook Name"
-msgstr "Nombre de la agenda"
+#: ../../addon/gnusoc/gnusoc.php:222
+msgid "Enable the GNU-Social protocol for this channel"
+msgstr "Activar el protocolo de GNU-Social para este canal"
 
-#: ../../addon/cdav/include/widgets.php:165
-msgid "Addressbook Tools"
-msgstr "Gestión de agendas de direcciones"
+#: ../../addon/gnusoc/gnusoc.php:226
+msgid "GNU-Social Protocol Settings"
+msgstr "Ajustes del protocolo de GNU-Social"
 
-#: ../../addon/cdav/include/widgets.php:166
-msgid "Import addressbook"
-msgstr "Importar una agenda de direcciones"
+#: ../../addon/gnusoc/gnusoc.php:417
+msgid "Follow"
+msgstr "Seguir"
 
-#: ../../addon/cdav/include/widgets.php:167
-msgid "Select an addressbook to import to"
-msgstr "Seleccionar una agenda para importarla"
+#: ../../addon/gnusoc/gnusoc.php:420
+#, php-format
+msgid "%1$s is now following %2$s"
+msgstr "%1$s está siguiendo ahora a %2$s"
 
 #: ../../addon/planets/planets.php:121
 msgid "Planets Settings updated."
 msgstr "Se han guardado los ajustes de Planets."
 
-#: ../../addon/planets/planets.php:153
+#: ../../addon/planets/planets.php:149
 msgid "Enable Planets Plugin"
 msgstr "Habilitar el plugin Planets"
 
-#: ../../addon/planets/planets.php:157
+#: ../../addon/planets/planets.php:153
 msgid "Planets Settings"
 msgstr "Ajustes de Planets"
 
@@ -8644,8 +8672,8 @@ msgstr "Regresar después"
 msgid "Page to load after image selection."
 msgstr "Página para cargar después de la selección de imágenes."
 
-#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1048
-#: ../../include/nav.php:111
+#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1165
+#: ../../include/nav.php:107
 msgid "Edit Profile"
 msgstr "Editar el perfil"
 
@@ -9184,12 +9212,12 @@ msgid "Login failed."
 msgstr "El acceso ha fallado."
 
 #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
+#: ../../include/selectors.php:66 ../../include/channel.php:1332
 msgid "Male"
 msgstr "Hombre"
 
 #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
+#: ../../include/selectors.php:66 ../../include/channel.php:1330
 msgid "Female"
 msgstr "Mujer"
 
@@ -9376,27 +9404,39 @@ msgstr "una declaración de amor eterno"
 msgid "declared undying love for"
 msgstr "ha declarado amor eterno a"
 
-#: ../../addon/diaspora/diaspora.php:675
+#: ../../addon/diaspora/diaspora.php:715
 msgid "Diaspora Protocol Settings updated."
 msgstr "Los ajustes del protocolo de Diaspora se han actualizado."
 
-#: ../../addon/diaspora/diaspora.php:694
+#: ../../addon/diaspora/diaspora.php:734
+msgid ""
+"The Diaspora protocol does not support location independence. Connections "
+"you make within that network may be unreachable from alternate channel "
+"locations."
+msgstr "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos."
+
+#: ../../addon/diaspora/diaspora.php:737
 msgid "Enable the Diaspora protocol for this channel"
 msgstr "Activar el protocolo de Diaspora para este canal"
 
-#: ../../addon/diaspora/diaspora.php:698
+#: ../../addon/diaspora/diaspora.php:741
 msgid "Allow any Diaspora member to comment on your public posts"
 msgstr "Permitir a cualquier miembro de Diaspora comentar sus entradas públicas"
 
-#: ../../addon/diaspora/diaspora.php:702
+#: ../../addon/diaspora/diaspora.php:745
 msgid "Prevent your hashtags from being redirected to other sites"
 msgstr "Impedir que sus \"hashtags\" sean redirigidos a otros sitios "
 
-#: ../../addon/diaspora/diaspora.php:707
+#: ../../addon/diaspora/diaspora.php:749
+msgid ""
+"Sign and forward posts and comments with no existing Diaspora signature"
+msgstr "Firmar y enviar entradas y comentarios sin firma de Diaspora"
+
+#: ../../addon/diaspora/diaspora.php:754
 msgid "Followed hashtags (comma separated, do not include the #)"
 msgstr "\"Hashtags\" seguidos (separados por comas, sin incluir #)"
 
-#: ../../addon/diaspora/diaspora.php:712
+#: ../../addon/diaspora/diaspora.php:759
 msgid "Diaspora Protocol Settings"
 msgstr "Ajustes del protocolo de Diaspora"
 
@@ -9522,25 +9562,6 @@ msgstr "Prueba de correo"
 msgid "Message subject"
 msgstr "Asunto del mensaje"
 
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:44
-#, php-format
-msgid "Reconnecting %d connections"
-msgstr "Reconectando %d conexiones"
-
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:63
-msgid "Diaspora Reconnect"
-msgstr "Reconectar con Diaspora"
-
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:65
-msgid ""
-"Use this form to re-establish Diaspora connections which were initially made"
-" from a different hub."
-msgstr "Utilice este formulario para restablecer las conexiones de diáspora que se hicieron inicialmente desde un hub diferente."
-
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:70
-msgid "Reconnect"
-msgstr "Reconectar"
-
 #: ../../addon/openstreetmap/openstreetmap.php:146
 msgid "View Larger"
 msgstr "Ver más grande"
@@ -9626,8 +9647,8 @@ msgstr "Contraseña de Friendica"
 msgid "Hubzilla to Friendica Post Settings"
 msgstr "Ajustes de publicación de Hubzilla a Friendica"
 
-#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1139
-#: ../../include/channel.php:1296
+#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1256
+#: ../../include/channel.php:1419
 msgid "Status:"
 msgstr "Estado:"
 
@@ -10182,7 +10203,7 @@ msgstr "Debe elegir blancas o negras."
 msgid "Error creating new game."
 msgstr "Error al crear un nuevo juego."
 
-#: ../../addon/chess/chess.php:381 ../../include/channel.php:899
+#: ../../addon/chess/chess.php:381 ../../include/channel.php:1016
 msgid "Requested channel is not available."
 msgstr "El canal solicitado no está disponible."
 
@@ -10257,15 +10278,15 @@ msgstr "Si está activado, sus entradas públicas se publicarán en la cuenta de
 msgid "Twitter Post Settings"
 msgstr "Ajustes de publicación en Twitter"
 
-#: ../../addon/smileybutton/smileybutton.php:273
+#: ../../addon/smileybutton/smileybutton.php:211
 msgid "Deactivate the feature"
 msgstr "Desactivar la funcionalidad"
 
-#: ../../addon/smileybutton/smileybutton.php:277
+#: ../../addon/smileybutton/smileybutton.php:215
 msgid "Hide the button and show the smilies directly."
 msgstr "Ocultar el botón y mostrar los smilies directamente."
 
-#: ../../addon/smileybutton/smileybutton.php:281
+#: ../../addon/smileybutton/smileybutton.php:219
 msgid "Smileybutton Settings"
 msgstr "Ajustes de Smileybutton"
 
@@ -10546,6 +10567,22 @@ msgstr "Ajustes del encabezado de página"
 msgid "pageheader Settings saved."
 msgstr "Se han guardado los ajustes del encabezado de página."
 
+#: ../../addon/authchoose/authchoose.php:67
+msgid "Only authenticate automatically to sites of your friends"
+msgstr "Autenticación automática solo en los sitios de sus amigos"
+
+#: ../../addon/authchoose/authchoose.php:67
+msgid "By default you are automatically authenticated anywhere in the network"
+msgstr "De forma predeterminada, se autenticará automáticamente en cualquier parte de la red"
+
+#: ../../addon/authchoose/authchoose.php:71
+msgid "Authchoose Settings"
+msgstr "Ajustes de Authchoose"
+
+#: ../../addon/authchoose/authchoose.php:85
+msgid "Atuhchoose Settings updated."
+msgstr "Se han actualizado los ajustes de Atuhchoose."
+
 #: ../../addon/moremoods/moremoods.php:19
 msgid "lonely"
 msgstr "Solo/a"
@@ -10741,6 +10778,17 @@ msgstr "Se ha creado una cuenta para usted."
 msgid "Authentication successful but rejected: account creation is disabled."
 msgstr "Autenticación correcta pero rechazada: la creación de cuentas está deshabilitada."
 
+#: ../../addon/opensearch/opensearch.php:26
+#, php-format
+msgctxt "opensearch"
+msgid "Search %1$s (%2$s)"
+msgstr "Buscar %1$s (%2$s)"
+
+#: ../../addon/opensearch/opensearch.php:28
+msgctxt "opensearch"
+msgid "$Projectname"
+msgstr "$Projectname"
+
 #: ../../addon/opensearch/opensearch.php:43
 msgid "Search $Projectname"
 msgstr "Buscar $Projectname"
@@ -10839,11 +10887,11 @@ msgstr "Transexual"
 msgid "Hermaphrodite"
 msgstr "Hermafrodita"
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:49 ../../include/channel.php:1336
 msgid "Neuter"
 msgstr "Neutral"
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:49 ../../include/channel.php:1338
 msgid "Non-specific"
 msgstr "No especificado"
 
@@ -11033,341 +11081,288 @@ msgstr "%1$s ahora está conectado/a con %2$s"
 msgid "%1$s poked %2$s"
 msgstr "%1$s ha dado un toque a %2$s"
 
-#: ../../include/conversation.php:239 ../../include/text.php:1115
-#: ../../include/text.php:1120
+#: ../../include/conversation.php:239 ../../include/text.php:1096
+#: ../../include/text.php:1101
 msgid "poked"
 msgstr "ha dado un toque a"
 
-#: ../../include/conversation.php:691
+#: ../../include/conversation.php:688
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Ver el perfil @ %s de %s"
 
-#: ../../include/conversation.php:711
+#: ../../include/conversation.php:708
 msgid "Categories:"
 msgstr "Temas:"
 
-#: ../../include/conversation.php:712
+#: ../../include/conversation.php:709
 msgid "Filed under:"
 msgstr "Archivado bajo:"
 
-#: ../../include/conversation.php:737
+#: ../../include/conversation.php:734
 msgid "View in context"
 msgstr "Mostrar en su contexto"
 
-#: ../../include/conversation.php:834
+#: ../../include/conversation.php:831
 msgid "remove"
 msgstr "eliminar"
 
-#: ../../include/conversation.php:838 ../../include/nav.php:272
+#: ../../include/conversation.php:835 ../../include/nav.php:268
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ../../include/conversation.php:839
+#: ../../include/conversation.php:836
 msgid "Delete Selected Items"
 msgstr "Eliminar elementos seleccionados"
 
-#: ../../include/conversation.php:882
+#: ../../include/conversation.php:879
 msgid "View Source"
 msgstr "Ver el código fuente de la entrada"
 
-#: ../../include/conversation.php:892
+#: ../../include/conversation.php:889
 msgid "Follow Thread"
 msgstr "Seguir este hilo"
 
-#: ../../include/conversation.php:901
+#: ../../include/conversation.php:898
 msgid "Unfollow Thread"
 msgstr "Dejar de seguir este hilo"
 
-#: ../../include/conversation.php:992
+#: ../../include/conversation.php:989
 msgid "Activity/Posts"
 msgstr "Actividad y publicaciones"
 
-#: ../../include/conversation.php:1012
+#: ../../include/conversation.php:1009
 msgid "Edit Connection"
 msgstr "Editar conexión"
 
-#: ../../include/conversation.php:1022
+#: ../../include/conversation.php:1019
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../../include/conversation.php:1156
+#: ../../include/conversation.php:1153
 #, php-format
 msgid "%s likes this."
 msgstr "A %s le gusta esto."
 
-#: ../../include/conversation.php:1156
+#: ../../include/conversation.php:1153
 #, php-format
 msgid "%s doesn't like this."
 msgstr "A %s no le gusta esto."
 
-#: ../../include/conversation.php:1160
+#: ../../include/conversation.php:1157
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] "a <span %1$s>%2$d personas</span> le gusta esto."
 msgstr[1] "A <span  %1$s>%2$d personas</span> les gusta esto."
 
-#: ../../include/conversation.php:1162
+#: ../../include/conversation.php:1159
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] "a <span %1$s>%2$d personas</span> no les gusta esto."
 msgstr[1] "A <span  %1$s>%2$d personas</span> no les gusta esto."
 
-#: ../../include/conversation.php:1168
+#: ../../include/conversation.php:1165
 msgid "and"
 msgstr "y"
 
-#: ../../include/conversation.php:1171
+#: ../../include/conversation.php:1168
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ", y %d persona más"
 msgstr[1] ", y %d personas más"
 
-#: ../../include/conversation.php:1172
+#: ../../include/conversation.php:1169
 #, php-format
 msgid "%s like this."
 msgstr "A %s le gusta esto."
 
-#: ../../include/conversation.php:1172
+#: ../../include/conversation.php:1169
 #, php-format
 msgid "%s don't like this."
 msgstr "A %s no le gusta esto."
 
-#: ../../include/conversation.php:1215
+#: ../../include/conversation.php:1212
 msgid "Set your location"
 msgstr "Establecer su ubicación"
 
-#: ../../include/conversation.php:1216
+#: ../../include/conversation.php:1213
 msgid "Clear browser location"
 msgstr "Eliminar los datos de localización geográfica del navegador"
 
-#: ../../include/conversation.php:1264
+#: ../../include/conversation.php:1261
 msgid "Tag term:"
 msgstr "Término de la etiqueta:"
 
-#: ../../include/conversation.php:1265
+#: ../../include/conversation.php:1262
 msgid "Where are you right now?"
 msgstr "¿Donde está ahora?"
 
-#: ../../include/conversation.php:1270
+#: ../../include/conversation.php:1267
 msgid "Choose a different album..."
 msgstr "Elegir un álbum diferente..."
 
-#: ../../include/conversation.php:1274
+#: ../../include/conversation.php:1271
 msgid "Comments enabled"
 msgstr "Comentarios habilitados"
 
-#: ../../include/conversation.php:1275
+#: ../../include/conversation.php:1272
 msgid "Comments disabled"
 msgstr "Comentarios deshabilitados"
 
-#: ../../include/conversation.php:1313
+#: ../../include/conversation.php:1310
 msgid "Page link name"
 msgstr "Nombre del enlace de la página"
 
-#: ../../include/conversation.php:1316
+#: ../../include/conversation.php:1313
 msgid "Post as"
 msgstr "Publicar como"
 
-#: ../../include/conversation.php:1330
+#: ../../include/conversation.php:1327
 msgid "Toggle voting"
 msgstr "Cambiar votación"
 
-#: ../../include/conversation.php:1333
+#: ../../include/conversation.php:1330
 msgid "Disable comments"
 msgstr "Dehabilitar los comentarios"
 
-#: ../../include/conversation.php:1334
+#: ../../include/conversation.php:1331
 msgid "Toggle comments"
 msgstr "Activar o desactivar los comentarios"
 
-#: ../../include/conversation.php:1342
+#: ../../include/conversation.php:1339
 msgid "Categories (optional, comma-separated list)"
 msgstr "Temas (opcional, lista separada por comas)"
 
-#: ../../include/conversation.php:1365
+#: ../../include/conversation.php:1362
 msgid "Other networks and post services"
 msgstr "Otras redes y servicios de publicación"
 
-#: ../../include/conversation.php:1371
+#: ../../include/conversation.php:1368
 msgid "Set publish date"
 msgstr "Establecer la fecha de publicación"
 
-#: ../../include/conversation.php:1634
+#: ../../include/conversation.php:1631
 msgid "Discover"
 msgstr "Descubrir"
 
-#: ../../include/conversation.php:1637
+#: ../../include/conversation.php:1634
 msgid "Imported public streams"
 msgstr "Contenidos públicos importados"
 
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1639
 msgid "Commented Order"
 msgstr "Comentarios recientes"
 
-#: ../../include/conversation.php:1645
+#: ../../include/conversation.php:1642
 msgid "Sort by Comment Date"
 msgstr "Ordenar por fecha de comentario"
 
-#: ../../include/conversation.php:1649
+#: ../../include/conversation.php:1646
 msgid "Posted Order"
 msgstr "Publicaciones recientes"
 
-#: ../../include/conversation.php:1652
+#: ../../include/conversation.php:1649
 msgid "Sort by Post Date"
 msgstr "Ordenar por fecha de publicación"
 
-#: ../../include/conversation.php:1660
+#: ../../include/conversation.php:1657
 msgid "Posts that mention or involve you"
 msgstr "Publicaciones que le mencionan o involucran"
 
-#: ../../include/conversation.php:1669
+#: ../../include/conversation.php:1666
 msgid "Activity Stream - by date"
 msgstr "Contenido - por fecha"
 
-#: ../../include/conversation.php:1675
+#: ../../include/conversation.php:1672
 msgid "Starred"
 msgstr "Preferidas"
 
-#: ../../include/conversation.php:1678
+#: ../../include/conversation.php:1675
 msgid "Favourite Posts"
 msgstr "Publicaciones favoritas"
 
-#: ../../include/conversation.php:1685
+#: ../../include/conversation.php:1682
 msgid "Spam"
 msgstr "Correo basura"
 
-#: ../../include/conversation.php:1688
+#: ../../include/conversation.php:1685
 msgid "Posts flagged as SPAM"
 msgstr "Publicaciones marcadas como basura"
 
-#: ../../include/conversation.php:1763 ../../include/nav.php:372
+#: ../../include/conversation.php:1760 ../../include/nav.php:358
 msgid "Status Messages and Posts"
 msgstr "Mensajes de estado y publicaciones"
 
-#: ../../include/conversation.php:1776 ../../include/nav.php:385
+#: ../../include/conversation.php:1773 ../../include/nav.php:371
 msgid "Profile Details"
 msgstr "Detalles del perfil"
 
-#: ../../include/conversation.php:1786 ../../include/nav.php:395
-#: ../../include/photos.php:528
+#: ../../include/conversation.php:1783 ../../include/nav.php:381
+#: ../../include/photos.php:525
 msgid "Photo Albums"
 msgstr "Álbumes de fotos"
 
-#: ../../include/conversation.php:1794 ../../include/nav.php:403
+#: ../../include/conversation.php:1791 ../../include/nav.php:389
 msgid "Files and Storage"
 msgstr "Ficheros y repositorio"
 
-#: ../../include/conversation.php:1830 ../../include/nav.php:438
+#: ../../include/conversation.php:1827 ../../include/nav.php:424
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../../include/conversation.php:1833 ../../include/nav.php:441
+#: ../../include/conversation.php:1830 ../../include/nav.php:427
 msgid "Saved Bookmarks"
 msgstr "Marcadores guardados"
 
-#: ../../include/conversation.php:1844 ../../include/nav.php:452
+#: ../../include/conversation.php:1841 ../../include/nav.php:438
 msgid "View Webpages"
 msgstr "Ver páginas web"
 
-#: ../../include/conversation.php:1913
+#: ../../include/conversation.php:1910
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Participaré"
 msgstr[1] "Participaré"
 
-#: ../../include/conversation.php:1916
+#: ../../include/conversation.php:1913
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "No participaré"
 msgstr[1] "No participaré"
 
-#: ../../include/conversation.php:1919
+#: ../../include/conversation.php:1916
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Indeciso/a"
 msgstr[1] "Indecisos/as"
 
-#: ../../include/conversation.php:1922
+#: ../../include/conversation.php:1919
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "De acuerdo"
 msgstr[1] "De acuerdo"
 
-#: ../../include/conversation.php:1925
+#: ../../include/conversation.php:1922
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "En desacuerdo"
 msgstr[1] "En desacuerdo"
 
-#: ../../include/conversation.php:1928
+#: ../../include/conversation.php:1925
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "se abstiene"
 msgstr[1] "Se abstienen"
 
-#: ../../include/permissions.php:35
-msgid "Can view my normal stream and posts"
-msgstr "Pueden verse mi actividad y publicaciones normales"
-
-#: ../../include/permissions.php:39
-msgid "Can view my webpages"
-msgstr "Pueden verse mis páginas web"
-
-#: ../../include/permissions.php:43
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Pueden crearse entradas en mi página de inicio del canal (“muro”)"
-
-#: ../../include/permissions.php:46
-msgid "Can like/dislike stuff"
-msgstr "Puede marcarse contenido como me gusta/no me gusta"
-
-#: ../../include/permissions.php:46
-msgid "Profiles and things other than posts/comments"
-msgstr "Perfiles y otras cosas aparte de publicaciones/comentarios"
-
-#: ../../include/permissions.php:48
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención"
-
-#: ../../include/permissions.php:48
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Avanzado - útil para crear canales de foros de discusión o grupos"
-
-#: ../../include/permissions.php:49
-msgid "Can chat with me (when available)"
-msgstr "Se puede charlar conmigo (cuando esté disponible)"
-
-#: ../../include/permissions.php:50
-msgid "Can write to my file storage and photos"
-msgstr "Puede escribirse en mi repositorio de ficheros y fotos"
-
-#: ../../include/permissions.php:51
-msgid "Can edit my webpages"
-msgstr "Pueden editarse mis páginas web"
-
-#: ../../include/permissions.php:53
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Algo avanzado - muy útil en comunidades abiertas"
-
-#: ../../include/permissions.php:55
-msgid "Can administer my channel resources"
-msgstr "Pueden administrarse mis recursos del canal"
-
-#: ../../include/permissions.php:55
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo."
-
 #: ../../include/dir_fns.php:141
 msgid "Directory Options"
 msgstr "Opciones del directorio"
@@ -11422,320 +11417,328 @@ msgstr "más antiguas"
 msgid "newer"
 msgstr "más recientes"
 
-#: ../../include/text.php:945
+#: ../../include/text.php:939
 msgid "No connections"
 msgstr "Sin conexiones"
 
-#: ../../include/text.php:970
+#: ../../include/text.php:964
 #, php-format
 msgid "View all %s connections"
 msgstr "Ver todas las %s conexiones"
 
-#: ../../include/text.php:1115 ../../include/text.php:1120
+#: ../../include/text.php:1096 ../../include/text.php:1101
 msgid "poke"
 msgstr "un toque"
 
-#: ../../include/text.php:1121
+#: ../../include/text.php:1102
 msgid "ping"
 msgstr "un \"ping\""
 
-#: ../../include/text.php:1121
+#: ../../include/text.php:1102
 msgid "pinged"
 msgstr "ha enviado un \"ping\" a"
 
-#: ../../include/text.php:1122
+#: ../../include/text.php:1103
 msgid "prod"
 msgstr "una incitación "
 
-#: ../../include/text.php:1122
+#: ../../include/text.php:1103
 msgid "prodded"
 msgstr "ha incitado a "
 
-#: ../../include/text.php:1123
+#: ../../include/text.php:1104
 msgid "slap"
 msgstr "una bofetada "
 
-#: ../../include/text.php:1123
+#: ../../include/text.php:1104
 msgid "slapped"
 msgstr "ha abofeteado a "
 
-#: ../../include/text.php:1124
+#: ../../include/text.php:1105
 msgid "finger"
 msgstr "un \"finger\" "
 
-#: ../../include/text.php:1124
+#: ../../include/text.php:1105
 msgid "fingered"
 msgstr "envió un \"finger\" a"
 
-#: ../../include/text.php:1125
+#: ../../include/text.php:1106
 msgid "rebuff"
 msgstr "un reproche"
 
-#: ../../include/text.php:1125
+#: ../../include/text.php:1106
 msgid "rebuffed"
 msgstr "ha hecho un reproche a "
 
-#: ../../include/text.php:1137
+#: ../../include/text.php:1118
 msgid "happy"
 msgstr "feliz "
 
-#: ../../include/text.php:1138
+#: ../../include/text.php:1119
 msgid "sad"
 msgstr "triste "
 
-#: ../../include/text.php:1139
+#: ../../include/text.php:1120
 msgid "mellow"
 msgstr "tranquilo/a"
 
-#: ../../include/text.php:1140
+#: ../../include/text.php:1121
 msgid "tired"
 msgstr "cansado/a "
 
-#: ../../include/text.php:1141
+#: ../../include/text.php:1122
 msgid "perky"
 msgstr "vivaz"
 
-#: ../../include/text.php:1142
+#: ../../include/text.php:1123
 msgid "angry"
 msgstr "enfadado/a"
 
-#: ../../include/text.php:1143
+#: ../../include/text.php:1124
 msgid "stupefied"
 msgstr "asombrado/a"
 
-#: ../../include/text.php:1144
+#: ../../include/text.php:1125
 msgid "puzzled"
 msgstr "perplejo/a"
 
-#: ../../include/text.php:1145
+#: ../../include/text.php:1126
 msgid "interested"
 msgstr "interesado/a"
 
-#: ../../include/text.php:1146
+#: ../../include/text.php:1127
 msgid "bitter"
 msgstr "amargado/a"
 
-#: ../../include/text.php:1147
+#: ../../include/text.php:1128
 msgid "cheerful"
 msgstr "alegre"
 
-#: ../../include/text.php:1148
+#: ../../include/text.php:1129
 msgid "alive"
 msgstr "animado/a"
 
-#: ../../include/text.php:1149
+#: ../../include/text.php:1130
 msgid "annoyed"
 msgstr "molesto/a"
 
-#: ../../include/text.php:1150
+#: ../../include/text.php:1131
 msgid "anxious"
 msgstr "ansioso/a"
 
-#: ../../include/text.php:1151
+#: ../../include/text.php:1132
 msgid "cranky"
 msgstr "de mal humor"
 
-#: ../../include/text.php:1152
+#: ../../include/text.php:1133
 msgid "disturbed"
 msgstr "perturbado/a"
 
-#: ../../include/text.php:1153
+#: ../../include/text.php:1134
 msgid "frustrated"
 msgstr "frustrado/a"
 
-#: ../../include/text.php:1154
+#: ../../include/text.php:1135
 msgid "depressed"
 msgstr "deprimido/a"
 
-#: ../../include/text.php:1155
+#: ../../include/text.php:1136
 msgid "motivated"
 msgstr "motivado/a"
 
-#: ../../include/text.php:1156
+#: ../../include/text.php:1137
 msgid "relaxed"
 msgstr "relajado/a"
 
-#: ../../include/text.php:1157
+#: ../../include/text.php:1138
 msgid "surprised"
 msgstr "sorprendido/a"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:70
+#: ../../include/text.php:1312 ../../include/js_strings.php:70
 msgid "Monday"
 msgstr "lunes"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:71
+#: ../../include/text.php:1312 ../../include/js_strings.php:71
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:72
+#: ../../include/text.php:1312 ../../include/js_strings.php:72
 msgid "Wednesday"
 msgstr "miércoles"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:73
+#: ../../include/text.php:1312 ../../include/js_strings.php:73
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:74
+#: ../../include/text.php:1312 ../../include/js_strings.php:74
 msgid "Friday"
 msgstr "viernes"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:75
+#: ../../include/text.php:1312 ../../include/js_strings.php:75
 msgid "Saturday"
 msgstr "sábado"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:69
+#: ../../include/text.php:1312 ../../include/js_strings.php:69
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:45
+#: ../../include/text.php:1316 ../../include/js_strings.php:45
 msgid "January"
 msgstr "enero"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:46
+#: ../../include/text.php:1316 ../../include/js_strings.php:46
 msgid "February"
 msgstr "febrero"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:47
+#: ../../include/text.php:1316 ../../include/js_strings.php:47
 msgid "March"
 msgstr "marzo"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:48
+#: ../../include/text.php:1316 ../../include/js_strings.php:48
 msgid "April"
 msgstr "abril"
 
-#: ../../include/text.php:1339
+#: ../../include/text.php:1316
 msgid "May"
 msgstr "mayo"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:50
+#: ../../include/text.php:1316 ../../include/js_strings.php:50
 msgid "June"
 msgstr "junio"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:51
+#: ../../include/text.php:1316 ../../include/js_strings.php:51
 msgid "July"
 msgstr "julio"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:52
+#: ../../include/text.php:1316 ../../include/js_strings.php:52
 msgid "August"
 msgstr "agosto"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:53
+#: ../../include/text.php:1316 ../../include/js_strings.php:53
 msgid "September"
 msgstr "septiembre"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:54
+#: ../../include/text.php:1316 ../../include/js_strings.php:54
 msgid "October"
 msgstr "octubre"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:55
+#: ../../include/text.php:1316 ../../include/js_strings.php:55
 msgid "November"
 msgstr "noviembre"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:56
+#: ../../include/text.php:1316 ../../include/js_strings.php:56
 msgid "December"
 msgstr "diciembre"
 
-#: ../../include/text.php:1403 ../../include/text.php:1407
+#: ../../include/text.php:1380 ../../include/text.php:1384
 msgid "Unknown Attachment"
 msgstr "Adjunto no reconocido"
 
-#: ../../include/text.php:1409
+#: ../../include/text.php:1386 ../../include/feedutils.php:780
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../../include/text.php:1445
+#: ../../include/text.php:1422
 msgid "remove category"
 msgstr "eliminar el tema"
 
-#: ../../include/text.php:1519
+#: ../../include/text.php:1496
 msgid "remove from file"
 msgstr "eliminar del fichero"
 
-#: ../../include/text.php:1781 ../../include/language.php:367
+#: ../../include/text.php:1615 ../../include/message.php:12
+msgid "Download binary/encrypted content"
+msgstr "Descargar contenido binario o cifrado"
+
+#: ../../include/text.php:1774 ../../include/language.php:367
 msgid "default"
 msgstr "por defecto"
 
-#: ../../include/text.php:1789
+#: ../../include/text.php:1782
 msgid "Page layout"
 msgstr "Plantilla de la página"
 
-#: ../../include/text.php:1789
+#: ../../include/text.php:1782
 msgid "You can create your own with the layouts tool"
 msgstr "Puede crear su propia disposición gráfica con la herramienta de plantillas"
 
-#: ../../include/text.php:1817
+#: ../../include/text.php:1810
 msgid "Page content type"
 msgstr "Tipo de contenido de la página"
 
-#: ../../include/text.php:1950
+#: ../../include/text.php:1943
 msgid "activity"
 msgstr "la actividad"
 
-#: ../../include/text.php:2264
+#: ../../include/text.php:2006
+msgid "a-z, 0-9, -, _, and . only"
+msgstr "a-z, 0-9, -, _, and . only"
+
+#: ../../include/text.php:2277
 msgid "Design Tools"
 msgstr "Herramientas de diseño web"
 
-#: ../../include/text.php:2270
+#: ../../include/text.php:2283
 msgid "Pages"
 msgstr "Páginas"
 
-#: ../../include/text.php:2292
+#: ../../include/text.php:2305
 msgid "Import website..."
 msgstr "Importar un sitio web..."
 
-#: ../../include/text.php:2293
+#: ../../include/text.php:2306
 msgid "Select folder to import"
 msgstr "Seleccionar la carpeta que se va a importar"
 
-#: ../../include/text.php:2294
+#: ../../include/text.php:2307
 msgid "Import from a zipped folder:"
 msgstr "Importar desde una carpeta comprimida: "
 
-#: ../../include/text.php:2295
+#: ../../include/text.php:2308
 msgid "Import from cloud files:"
 msgstr "Importar desde los ficheros en la nube: "
 
-#: ../../include/text.php:2296
+#: ../../include/text.php:2309
 msgid "/cloud/channel/path/to/folder"
 msgstr "/cloud/canal/ruta/a la/carpeta"
 
-#: ../../include/text.php:2297
+#: ../../include/text.php:2310
 msgid "Enter path to website files"
 msgstr "Ruta a los ficheros del sitio web"
 
-#: ../../include/text.php:2298
+#: ../../include/text.php:2311
 msgid "Select folder"
 msgstr "Seleccionar la carpeta"
 
-#: ../../include/text.php:2299
+#: ../../include/text.php:2312
 msgid "Export website..."
 msgstr "Exportar un sitio web..."
 
-#: ../../include/text.php:2300
+#: ../../include/text.php:2313
 msgid "Export to a zip file"
 msgstr "Exportar a un fichero comprimido .zip"
 
-#: ../../include/text.php:2301
+#: ../../include/text.php:2314
 msgid "website.zip"
 msgstr "sitio_web.zip"
 
-#: ../../include/text.php:2302
+#: ../../include/text.php:2315
 msgid "Enter a name for the zip file."
 msgstr "Escriba un nombre para el fichero zip."
 
-#: ../../include/text.php:2303
+#: ../../include/text.php:2316
 msgid "Export to cloud files"
 msgstr "Exportar a la nube de ficheros"
 
-#: ../../include/text.php:2304
+#: ../../include/text.php:2317
 msgid "/path/to/export/folder"
 msgstr "/ruta/para/exportar/carpeta"
 
-#: ../../include/text.php:2305
+#: ../../include/text.php:2318
 msgid "Enter a path to a cloud files destination."
 msgstr "Escriba una ruta de destino a la nube de ficheros."
 
-#: ../../include/text.php:2306
+#: ../../include/text.php:2319
 msgid "Specify folder"
 msgstr "Especificar una carpeta"
 
@@ -11785,28 +11788,10 @@ msgstr[1] "%d conexiones en común"
 msgid "show more"
 msgstr "mostrar más"
 
-#: ../../include/markdown.php:444
-msgid "Attachments:"
-msgstr "Ficheros adjuntos: "
-
-#: ../../include/markdown.php:538 ../../include/event.php:22
-#: ../../include/event.php:69
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d de F, Y \\@ G:i"
-
-#: ../../include/markdown.php:540
-msgid "$Projectname event notification:"
-msgstr "Notificación de eventos de $Projectname: "
-
-#: ../../include/markdown.php:544 ../../include/event.php:30
-#: ../../include/event.php:73
-msgid "Starts:"
-msgstr "Comienza:"
-
-#: ../../include/markdown.php:552 ../../include/event.php:40
-#: ../../include/event.php:77
-msgid "Finishes:"
-msgstr "Finaliza:"
+#: ../../include/markdown.php:139 ../../include/bbcode.php:332
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s escribió %2$s siguiente %3$s"
 
 #: ../../include/follow.php:26
 msgid "Channel is blocked on this site."
@@ -11832,7 +11817,7 @@ msgstr "Protocolo deshabilitado."
 msgid "Channel discovery failed."
 msgstr "El intento de acceder al canal ha fallado."
 
-#: ../../include/follow.php:202
+#: ../../include/follow.php:186
 msgid "Cannot connect to yourself."
 msgstr "No puede conectarse consigo mismo."
 
@@ -12083,19 +12068,19 @@ msgctxt "calendar"
 msgid "All day"
 msgstr "Todos los días"
 
-#: ../../include/message.php:30
+#: ../../include/message.php:40
 msgid "Unable to determine sender."
 msgstr "No ha sido posible determinar el remitente. "
 
-#: ../../include/message.php:69
+#: ../../include/message.php:79
 msgid "No recipient provided."
 msgstr "No se ha especificado ningún destinatario."
 
-#: ../../include/message.php:74
+#: ../../include/message.php:84
 msgid "[no subject]"
 msgstr "[sin asunto]"
 
-#: ../../include/message.php:227
+#: ../../include/message.php:214
 msgid "Stored post could not be verified."
 msgstr "No se han podido verificar las publicaciones guardadas."
 
@@ -12126,61 +12111,61 @@ msgstr "%1$s ha actualizado %2$s, cambiando %3$s."
 msgid "Item was not found."
 msgstr "Elemento no encontrado."
 
-#: ../../include/attach.php:500
+#: ../../include/attach.php:501
 msgid "No source file."
 msgstr "Ningún fichero de origen"
 
-#: ../../include/attach.php:522
+#: ../../include/attach.php:523
 msgid "Cannot locate file to replace"
 msgstr "No se puede localizar el fichero que va a ser sustituido."
 
-#: ../../include/attach.php:540
+#: ../../include/attach.php:541
 msgid "Cannot locate file to revise/update"
 msgstr "No se puede localizar el fichero para revisar/actualizar"
 
-#: ../../include/attach.php:671
+#: ../../include/attach.php:674
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "El fichero supera el limite de tamaño de %d"
 
-#: ../../include/attach.php:685
+#: ../../include/attach.php:688
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos."
 
-#: ../../include/attach.php:855
+#: ../../include/attach.php:858
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado."
 
-#: ../../include/attach.php:868
+#: ../../include/attach.php:871
 msgid "Stored file could not be verified. Upload failed."
 msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado."
 
-#: ../../include/attach.php:923 ../../include/attach.php:939
+#: ../../include/attach.php:932 ../../include/attach.php:948
 msgid "Path not available."
 msgstr "Ruta no disponible."
 
-#: ../../include/attach.php:988 ../../include/attach.php:1153
+#: ../../include/attach.php:997 ../../include/attach.php:1162
 msgid "Empty pathname"
 msgstr "Ruta vacía"
 
-#: ../../include/attach.php:1014
+#: ../../include/attach.php:1023
 msgid "duplicate filename or path"
 msgstr "Nombre duplicado de ruta o fichero"
 
-#: ../../include/attach.php:1039
+#: ../../include/attach.php:1048
 msgid "Path not found."
 msgstr "Ruta no encontrada"
 
-#: ../../include/attach.php:1107
+#: ../../include/attach.php:1116
 msgid "mkdir failed."
 msgstr "mkdir ha fallado."
 
-#: ../../include/attach.php:1111
+#: ../../include/attach.php:1120
 msgid "database storage failed."
 msgstr "el almacenamiento en la base de datos ha fallado."
 
-#: ../../include/attach.php:1159
+#: ../../include/attach.php:1168
 msgid "Empty path"
 msgstr "Ruta vacía"
 
@@ -12188,77 +12173,77 @@ msgstr "Ruta vacía"
 msgid "guest:"
 msgstr "invitado: "
 
-#: ../../include/security.php:532
+#: ../../include/security.php:531
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado"
 
-#: ../../include/items.php:869 ../../include/items.php:916
+#: ../../include/items.php:851 ../../include/items.php:903
 msgid "(Unknown)"
 msgstr "(Desconocido)"
 
-#: ../../include/items.php:1110
+#: ../../include/items.php:1087
 msgid "Visible to anybody on the internet."
 msgstr "Visible para cualquiera en internet."
 
-#: ../../include/items.php:1112
+#: ../../include/items.php:1089
 msgid "Visible to you only."
 msgstr "Visible sólo para usted."
 
-#: ../../include/items.php:1114
+#: ../../include/items.php:1091
 msgid "Visible to anybody in this network."
 msgstr "Visible para cualquiera en esta red."
 
-#: ../../include/items.php:1116
+#: ../../include/items.php:1093
 msgid "Visible to anybody authenticated."
 msgstr "Visible para cualquiera que esté autenticado."
 
-#: ../../include/items.php:1118
+#: ../../include/items.php:1095
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Visible para cualquiera en %s."
 
-#: ../../include/items.php:1120
+#: ../../include/items.php:1097
 msgid "Visible to all connections."
 msgstr "Visible para todas las conexiones."
 
-#: ../../include/items.php:1122
+#: ../../include/items.php:1099
 msgid "Visible to approved connections."
 msgstr "Visible para las conexiones permitidas."
 
-#: ../../include/items.php:1124
+#: ../../include/items.php:1101
 msgid "Visible to specific connections."
 msgstr "Visible para conexiones específicas."
 
-#: ../../include/items.php:3938
+#: ../../include/items.php:3908
 msgid "Privacy group is empty."
 msgstr "El grupo de canales está vacío."
 
-#: ../../include/items.php:3945
+#: ../../include/items.php:3915
 #, php-format
 msgid "Privacy group: %s"
 msgstr "Grupo de canales: %s"
 
-#: ../../include/items.php:3957
+#: ../../include/items.php:3927
 msgid "Connection not found."
 msgstr "Conexión no encontrada"
 
-#: ../../include/items.php:4310
+#: ../../include/items.php:4280
 msgid "profile photo"
 msgstr "foto del perfil"
 
-#: ../../include/items.php:4506
+#: ../../include/items.php:4473
 #, php-format
 msgid "[Edited %s]"
 msgstr "[se ha editado %s]"
 
-#: ../../include/items.php:4506
+#: ../../include/items.php:4473
 msgctxt "edit_activity"
 msgid "Post"
 msgstr "Publicar"
 
-#: ../../include/items.php:4506
+#: ../../include/items.php:4473
 msgctxt "edit_activity"
 msgid "Comment"
 msgstr "Comentar"
@@ -12267,229 +12252,261 @@ msgstr "Comentar"
 msgid "Unable to obtain identity information from database"
 msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
 
-#: ../../include/channel.php:67
+#: ../../include/channel.php:68
 msgid "Empty name"
 msgstr "Nombre vacío"
 
-#: ../../include/channel.php:70
+#: ../../include/channel.php:71
 msgid "Name too long"
 msgstr "Nombre demasiado largo"
 
-#: ../../include/channel.php:181
+#: ../../include/channel.php:182
 msgid "No account identifier"
 msgstr "Ningún identificador de la cuenta"
 
-#: ../../include/channel.php:193
+#: ../../include/channel.php:194
 msgid "Nickname is required."
 msgstr "Se requiere un sobrenombre (alias)."
 
-#: ../../include/channel.php:207
+#: ../../include/channel.php:208
 msgid "Reserved nickname. Please choose another."
 msgstr "Sobrenombre en uso. Por favor, elija otro."
 
-#: ../../include/channel.php:212
+#: ../../include/channel.php:213
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio."
 
-#: ../../include/channel.php:270
+#: ../../include/channel.php:272
 msgid "Unable to retrieve created identity"
 msgstr "No ha sido posible recuperar la identidad creada"
 
-#: ../../include/channel.php:342
+#: ../../include/channel.php:344
 msgid "Default Profile"
 msgstr "Perfil principal"
 
-#: ../../include/channel.php:1045
+#: ../../include/channel.php:497
+msgid "Unable to retrieve modified identity"
+msgstr "No se puede recuperar la identidad modficada"
+
+#: ../../include/channel.php:1162
 msgid "Create New Profile"
 msgstr "Crear un nuevo perfil"
 
-#: ../../include/channel.php:1065
+#: ../../include/channel.php:1182
 msgid "Visible to everybody"
 msgstr "Visible para todos"
 
-#: ../../include/channel.php:1138 ../../include/channel.php:1252
+#: ../../include/channel.php:1255 ../../include/channel.php:1375
 msgid "Gender:"
 msgstr "Género:"
 
-#: ../../include/channel.php:1140 ../../include/channel.php:1307
+#: ../../include/channel.php:1257 ../../include/channel.php:1430
 msgid "Homepage:"
 msgstr "Página personal:"
 
-#: ../../include/channel.php:1141
+#: ../../include/channel.php:1258
 msgid "Online Now"
 msgstr "Ahora en línea"
 
-#: ../../include/channel.php:1257
+#: ../../include/channel.php:1334
+msgid "Trans"
+msgstr "Trans"
+
+#: ../../include/channel.php:1380
 msgid "Like this channel"
 msgstr "Me gusta este canal"
 
-#: ../../include/channel.php:1281
+#: ../../include/channel.php:1404
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/channel.php:1282
+#: ../../include/channel.php:1405
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/channel.php:1289
+#: ../../include/channel.php:1412
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../../include/channel.php:1302
+#: ../../include/channel.php:1425
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "por %1$d %2$s"
 
-#: ../../include/channel.php:1305
+#: ../../include/channel.php:1428
 msgid "Sexual Preference:"
 msgstr "Orientación sexual:"
 
-#: ../../include/channel.php:1311
+#: ../../include/channel.php:1434
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: ../../include/channel.php:1313
+#: ../../include/channel.php:1436
 msgid "Political Views:"
 msgstr "Posición política:"
 
-#: ../../include/channel.php:1315
+#: ../../include/channel.php:1438
 msgid "Religion:"
 msgstr "Religión:"
 
-#: ../../include/channel.php:1319
+#: ../../include/channel.php:1442
 msgid "Hobbies/Interests:"
 msgstr "Aficciones o intereses:"
 
-#: ../../include/channel.php:1321
+#: ../../include/channel.php:1444
 msgid "Likes:"
 msgstr "Me gusta:"
 
-#: ../../include/channel.php:1323
+#: ../../include/channel.php:1446
 msgid "Dislikes:"
 msgstr "No me gusta:"
 
-#: ../../include/channel.php:1325
+#: ../../include/channel.php:1448
 msgid "Contact information and Social Networks:"
 msgstr "Información de contacto y redes sociales:"
 
-#: ../../include/channel.php:1327
+#: ../../include/channel.php:1450
 msgid "My other channels:"
 msgstr "Mis otros canales:"
 
-#: ../../include/channel.php:1329
+#: ../../include/channel.php:1452
 msgid "Musical interests:"
 msgstr "Preferencias musicales:"
 
-#: ../../include/channel.php:1331
+#: ../../include/channel.php:1454
 msgid "Books, literature:"
 msgstr "Libros, literatura:"
 
-#: ../../include/channel.php:1333
+#: ../../include/channel.php:1456
 msgid "Television:"
 msgstr "Televisión:"
 
-#: ../../include/channel.php:1335
+#: ../../include/channel.php:1458
 msgid "Film/dance/culture/entertainment:"
 msgstr "Cine, danza, cultura, entretenimiento:"
 
-#: ../../include/channel.php:1337
+#: ../../include/channel.php:1460
 msgid "Love/Romance:"
 msgstr "Vida sentimental o amorosa:"
 
-#: ../../include/channel.php:1339
+#: ../../include/channel.php:1462
 msgid "Work/employment:"
 msgstr "Trabajo:"
 
-#: ../../include/channel.php:1341
+#: ../../include/channel.php:1464
 msgid "School/education:"
 msgstr "Estudios:"
 
-#: ../../include/channel.php:1364
+#: ../../include/channel.php:1487
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
-#: ../../include/channel.php:2139
+#: ../../include/channel.php:2256
 #, php-format
 msgid "User '%s' deleted"
 msgstr "El usuario '%s' ha sido eliminado"
 
-#: ../../include/event.php:1004
+#: ../../include/event.php:22 ../../include/event.php:69
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d de F, Y \\@ G:i"
+
+#: ../../include/event.php:30 ../../include/event.php:73
+msgid "Starts:"
+msgstr "Comienza:"
+
+#: ../../include/event.php:40 ../../include/event.php:77
+msgid "Finishes:"
+msgstr "Finaliza:"
+
+#: ../../include/event.php:1008
 msgid "This event has been added to your calendar."
 msgstr "Este evento ha sido añadido a su calendario."
 
-#: ../../include/event.php:1204
+#: ../../include/event.php:1208
 msgid "Not specified"
 msgstr "Sin especificar"
 
-#: ../../include/event.php:1205
+#: ../../include/event.php:1209
 msgid "Needs Action"
 msgstr "Necesita de una intervención"
 
-#: ../../include/event.php:1206
+#: ../../include/event.php:1210
 msgid "Completed"
 msgstr "Completado/a"
 
-#: ../../include/event.php:1207
+#: ../../include/event.php:1211
 msgid "In Process"
 msgstr "En proceso"
 
-#: ../../include/event.php:1208
+#: ../../include/event.php:1212
 msgid "Cancelled"
 msgstr "Cancelado/a"
 
-#: ../../include/network.php:776
+#: ../../include/event.php:1292 ../../include/connections.php:676
+msgid "Home, Voice"
+msgstr "Llamadas particulares"
+
+#: ../../include/event.php:1293 ../../include/connections.php:677
+msgid "Home, Fax"
+msgstr "Fax particular"
+
+#: ../../include/event.php:1295 ../../include/connections.php:679
+msgid "Work, Voice"
+msgstr "Llamadas de trabajo"
+
+#: ../../include/event.php:1296 ../../include/connections.php:680
+msgid "Work, Fax"
+msgstr "Fax de trabajo"
+
+#: ../../include/network.php:751
 msgid "view full size"
 msgstr "Ver en el tamaño original"
 
-#: ../../include/network.php:2042
-msgid "No Subject"
-msgstr "Sin asunto"
-
-#: ../../include/network.php:2310 ../../include/network.php:2311
+#: ../../include/network.php:1691 ../../include/network.php:1692
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../include/network.php:2312
+#: ../../include/network.php:1693
 msgid "OStatus"
 msgstr "OStatus"
 
-#: ../../include/network.php:2313
+#: ../../include/network.php:1694
 msgid "GNU-Social"
 msgstr "GNU Social"
 
-#: ../../include/network.php:2314
+#: ../../include/network.php:1695
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/network.php:2316
+#: ../../include/network.php:1696
+msgid "ActivityPub"
+msgstr "ActivityPub"
+
+#: ../../include/network.php:1698
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../include/network.php:2317
+#: ../../include/network.php:1699
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../../include/network.php:2318
+#: ../../include/network.php:1700
 msgid "Zot"
 msgstr "Zot"
 
-#: ../../include/network.php:2319
+#: ../../include/network.php:1701
 msgid "LinkedIn"
 msgstr "LinkedIn"
 
-#: ../../include/network.php:2320
+#: ../../include/network.php:1702
 msgid "XMPP/IM"
 msgstr "XMPP/IM"
 
-#: ../../include/network.php:2321
+#: ../../include/network.php:1703
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/page_widgets.php:7
-msgid "New Page"
-msgstr "Nueva página"
-
 #: ../../include/language.php:380
 msgid "Select an alternate language"
 msgstr "Seleccionar un idioma alternativo"
@@ -12523,404 +12540,399 @@ msgid ""
 " permissions set who is allowed to view the post."
 msgstr "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.</br /> Estos permisos establecen quién está autorizado para ver el mensaje."
 
-#: ../../include/dba/dba_driver.php:189
+#: ../../include/dba/dba_driver.php:190
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "No se ha podido localizar información de DNS para el servidor de base de datos “%s”"
 
-#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
-#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
-#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
-#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062
-#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070
-#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076
-#: ../../include/bbcode.php:1079
+#: ../../include/bbcode.php:194 ../../include/bbcode.php:1097
+#: ../../include/bbcode.php:1100 ../../include/bbcode.php:1105
+#: ../../include/bbcode.php:1108 ../../include/bbcode.php:1111
+#: ../../include/bbcode.php:1114 ../../include/bbcode.php:1119
+#: ../../include/bbcode.php:1122 ../../include/bbcode.php:1127
+#: ../../include/bbcode.php:1130 ../../include/bbcode.php:1133
+#: ../../include/bbcode.php:1136
 msgid "Image/photo"
 msgstr "Imagen/foto"
 
-#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
+#: ../../include/bbcode.php:233 ../../include/bbcode.php:1147
 msgid "Encrypted content"
 msgstr "Contenido cifrado"
 
-#: ../../include/bbcode.php:189
+#: ../../include/bbcode.php:249
 #, php-format
 msgid "Install %s element: "
 msgstr "Instalar el elemento %s:"
 
-#: ../../include/bbcode.php:193
+#: ../../include/bbcode.php:253
 #, php-format
 msgid ""
 "This post contains an installable %s element, however you lack permissions "
 "to install it on this site."
 msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."
 
-#: ../../include/bbcode.php:272
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s escribió %2$s siguiente %3$s"
-
-#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
+#: ../../include/bbcode.php:409 ../../include/bbcode.php:417
 msgid "Click to open/close"
 msgstr "Pulsar para abrir/cerrar"
 
-#: ../../include/bbcode.php:357
+#: ../../include/bbcode.php:417
 msgid "spoiler"
 msgstr "spoiler"
 
-#: ../../include/bbcode.php:1028
+#: ../../include/bbcode.php:1085
 msgid "$1 wrote:"
 msgstr "$1 escribió:"
 
-#: ../../include/oembed.php:315
+#: ../../include/oembed.php:317
 msgid " by "
 msgstr "por"
 
-#: ../../include/oembed.php:316
+#: ../../include/oembed.php:318
 msgid " on "
 msgstr "en"
 
-#: ../../include/oembed.php:345
+#: ../../include/oembed.php:347
 msgid "Embedded content"
 msgstr "Contenido incorporado"
 
-#: ../../include/oembed.php:354
+#: ../../include/oembed.php:356
 msgid "Embedding disabled"
 msgstr "Incrustación deshabilitada"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:54
 msgid "General Features"
 msgstr "Funcionalidades básicas"
 
-#: ../../include/features.php:63
+#: ../../include/features.php:59
 msgid "Multiple Profiles"
 msgstr "Múltiples perfiles"
 
-#: ../../include/features.php:64
+#: ../../include/features.php:60
 msgid "Ability to create multiple profiles"
 msgstr "Capacidad de crear múltiples perfiles"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:68
 msgid "Advanced Profiles"
 msgstr "Perfiles avanzados"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:69
 msgid "Additional profile sections and selections"
 msgstr "Secciones y selecciones de perfil adicionales"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:77
 msgid "Profile Import/Export"
 msgstr "Importar/Exportar perfil"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:78
 msgid "Save and load profile details across sites/channels"
 msgstr "Guardar y cargar detalles del perfil a través de sitios/canales"
 
-#: ../../include/features.php:90
+#: ../../include/features.php:86
 msgid "Web Pages"
 msgstr "Páginas web"
 
-#: ../../include/features.php:91
+#: ../../include/features.php:87
 msgid "Provide managed web pages on your channel"
 msgstr "Proveer páginas web gestionadas en su canal"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:96
 msgid "Provide a wiki for your channel"
 msgstr "Proporcionar un wiki para su canal"
 
-#: ../../include/features.php:117
+#: ../../include/features.php:113
 msgid "Private Notes"
 msgstr "Notas privadas"
 
-#: ../../include/features.php:118
+#: ../../include/features.php:114
 msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr "Habilita una herramienta para guardar notas y recordatorios (advertencia: las notas no estarán cifradas)"
 
-#: ../../include/features.php:126
+#: ../../include/features.php:122
 msgid "Navigation Channel Select"
 msgstr "Navegación por el selector de canales"
 
-#: ../../include/features.php:127
+#: ../../include/features.php:123
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr "Cambiar de canales directamente desde el menú de navegación desplegable"
 
-#: ../../include/features.php:135
+#: ../../include/features.php:131
 msgid "Photo Location"
 msgstr "Ubicación de las fotos"
 
-#: ../../include/features.php:136
+#: ../../include/features.php:132
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa."
 
-#: ../../include/features.php:144
+#: ../../include/features.php:140
 msgid "Access Controlled Chatrooms"
 msgstr "Salas de chat moderadas"
 
-#: ../../include/features.php:145
+#: ../../include/features.php:141
 msgid "Provide chatrooms and chat services with access control."
 msgstr "Proporcionar salas y servicios de chat moderados."
 
-#: ../../include/features.php:154
+#: ../../include/features.php:150
 msgid "Provide alternate connection permission roles."
 msgstr "Proporcionar roles de acceso alternativos para esta conexión."
 
-#: ../../include/features.php:162
+#: ../../include/features.php:158
 msgid "Smart Birthdays"
 msgstr "Cumpleaños inteligentes"
 
-#: ../../include/features.php:163
+#: ../../include/features.php:159
 msgid ""
 "Make birthday events timezone aware in case your friends are scattered "
 "across the planet."
 msgstr "Enlazar los eventos de cumpleaños con el huso horario en el caso de que sus amigos estén dispersos por el mundo."
 
-#: ../../include/features.php:171
+#: ../../include/features.php:167
 msgid "Event Timezone Selection"
 msgstr "Selección del huso horario del evento"
 
-#: ../../include/features.php:172
+#: ../../include/features.php:168
 msgid "Allow event creation in timezones other than your own."
 msgstr "Permitir la creación de eventos en husos horarios distintos del suyo."
 
-#: ../../include/features.php:180
+#: ../../include/features.php:176
 msgid "Advanced Directory Search"
 msgstr "Búsqueda avanzada en el directorio"
 
-#: ../../include/features.php:181
+#: ../../include/features.php:177
 msgid "Allows creation of complex directory search queries"
 msgstr "Permitir la creación de consultas complejas en las búsquedas en el directorio"
 
-#: ../../include/features.php:189
+#: ../../include/features.php:185
 msgid "Advanced Theme and Layout Settings"
 msgstr "Ajustes avanzados de temas y esquemas"
 
-#: ../../include/features.php:190
+#: ../../include/features.php:186
 msgid "Allows fine tuning of themes and page layouts"
 msgstr "Permitir el ajuste fino de temas y esquemas de páginas"
 
-#: ../../include/features.php:200
+#: ../../include/features.php:196
 msgid "Post Composition Features"
 msgstr "Opciones para la redacción de entradas"
 
-#: ../../include/features.php:204
+#: ../../include/features.php:200
 msgid "Large Photos"
 msgstr "Fotos de gran tamaño"
 
-#: ../../include/features.php:205
+#: ../../include/features.php:201
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)"
 
-#: ../../include/features.php:214
+#: ../../include/features.php:210
 msgid "Automatically import channel content from other channels or feeds"
 msgstr "Importar automáticamente contenido de otros canales o \"feeds\""
 
-#: ../../include/features.php:222
+#: ../../include/features.php:218
 msgid "Even More Encryption"
 msgstr "Más cifrado todavía"
 
-#: ../../include/features.php:223
+#: ../../include/features.php:219
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida."
 
-#: ../../include/features.php:231
+#: ../../include/features.php:227
 msgid "Enable Voting Tools"
 msgstr "Permitir entradas con votación"
 
-#: ../../include/features.php:232
+#: ../../include/features.php:228
 msgid "Provide a class of post which others can vote on"
 msgstr "Proveer una clase de publicación en la que otros puedan votar"
 
-#: ../../include/features.php:240
+#: ../../include/features.php:236
 msgid "Disable Comments"
 msgstr "Deshabilitar comentarios"
 
-#: ../../include/features.php:241
+#: ../../include/features.php:237
 msgid "Provide the option to disable comments for a post"
 msgstr "Proporcionar la opción de desactivar los comentarios para una entrada"
 
-#: ../../include/features.php:249
+#: ../../include/features.php:245
 msgid "Delayed Posting"
 msgstr "Publicación aplazada"
 
-#: ../../include/features.php:250
+#: ../../include/features.php:246
 msgid "Allow posts to be published at a later date"
 msgstr "Permitir mensajes que se publicarán en una fecha posterior"
 
-#: ../../include/features.php:258
+#: ../../include/features.php:254
 msgid "Content Expiration"
 msgstr "Caducidad del contenido"
 
-#: ../../include/features.php:259
+#: ../../include/features.php:255
 msgid "Remove posts/comments and/or private messages at a future time"
 msgstr "Eliminar publicaciones/comentarios y/o mensajes privados más adelante"
 
-#: ../../include/features.php:267
+#: ../../include/features.php:263
 msgid "Suppress Duplicate Posts/Comments"
 msgstr "Prevenir entradas o comentarios duplicados"
 
-#: ../../include/features.php:268
+#: ../../include/features.php:264
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo."
 
-#: ../../include/features.php:279
+#: ../../include/features.php:275
 msgid "Network and Stream Filtering"
 msgstr "Filtrado del contenido"
 
-#: ../../include/features.php:283
+#: ../../include/features.php:279
 msgid "Search by Date"
 msgstr "Buscar por fecha"
 
-#: ../../include/features.php:284
+#: ../../include/features.php:280
 msgid "Ability to select posts by date ranges"
 msgstr "Capacidad de seleccionar entradas por rango de fechas"
 
-#: ../../include/features.php:292 ../../include/group.php:331
+#: ../../include/features.php:288 ../../include/group.php:332
 msgid "Privacy Groups"
 msgstr "Grupos de canales"
 
-#: ../../include/features.php:293
+#: ../../include/features.php:289
 msgid "Enable management and selection of privacy groups"
 msgstr "Activar la gestión y selección de grupos de canales"
 
-#: ../../include/features.php:302
+#: ../../include/features.php:298
 msgid "Save search terms for re-use"
 msgstr "Guardar términos de búsqueda para su reutilización"
 
-#: ../../include/features.php:310
+#: ../../include/features.php:306
 msgid "Network Personal Tab"
 msgstr "Actividad personal"
 
-#: ../../include/features.php:311
+#: ../../include/features.php:307
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado."
 
-#: ../../include/features.php:319
+#: ../../include/features.php:315
 msgid "Network New Tab"
 msgstr "Contenido nuevo"
 
-#: ../../include/features.php:320
+#: ../../include/features.php:316
 msgid "Enable tab to display all new Network activity"
 msgstr "Habilitar una pestaña en la que se muestre solo el contenido nuevo"
 
-#: ../../include/features.php:328
+#: ../../include/features.php:324
 msgid "Affinity Tool"
 msgstr "Herramienta de afinidad"
 
-#: ../../include/features.php:329
+#: ../../include/features.php:325
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filtrar el contenido según la profundidad de las relaciones"
 
-#: ../../include/features.php:338
+#: ../../include/features.php:334
 msgid "Show friend and connection suggestions"
 msgstr "Mostrar sugerencias de amigos y conexiones"
 
-#: ../../include/features.php:346
+#: ../../include/features.php:342
 msgid "Connection Filtering"
 msgstr "Filtrado de conexiones"
 
-#: ../../include/features.php:347
+#: ../../include/features.php:343
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"
 
-#: ../../include/features.php:359
+#: ../../include/features.php:355
 msgid "Post/Comment Tools"
 msgstr "Gestión de entradas y comentarios"
 
-#: ../../include/features.php:363
+#: ../../include/features.php:359
 msgid "Community Tagging"
 msgstr "Etiquetas de la comunidad"
 
-#: ../../include/features.php:364
+#: ../../include/features.php:360
 msgid "Ability to tag existing posts"
 msgstr "Capacidad de etiquetar entradas existentes"
 
-#: ../../include/features.php:372
+#: ../../include/features.php:368
 msgid "Post Categories"
 msgstr "Temas de las entradas"
 
-#: ../../include/features.php:373
+#: ../../include/features.php:369
 msgid "Add categories to your posts"
 msgstr "Añadir temas a sus publicaciones"
 
-#: ../../include/features.php:381
+#: ../../include/features.php:377
 msgid "Emoji Reactions"
 msgstr "Emoticonos \"emoji\""
 
-#: ../../include/features.php:382
+#: ../../include/features.php:378
 msgid "Add emoji reaction ability to posts"
 msgstr "Activar la capacidad de añadir un emoticono \"emoji\" a las entradas"
 
-#: ../../include/features.php:391
+#: ../../include/features.php:387
 msgid "Ability to file posts under folders"
 msgstr "Capacidad de archivar entradas en carpetas"
 
-#: ../../include/features.php:399
+#: ../../include/features.php:395
 msgid "Dislike Posts"
 msgstr "Desagrado de publicaciones"
 
-#: ../../include/features.php:400
+#: ../../include/features.php:396
 msgid "Ability to dislike posts/comments"
 msgstr "Capacidad de mostrar desacuerdo con el contenido de  entradas y comentarios"
 
-#: ../../include/features.php:408
+#: ../../include/features.php:404
 msgid "Star Posts"
 msgstr "Entradas destacadas"
 
-#: ../../include/features.php:409
+#: ../../include/features.php:405
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella"
 
-#: ../../include/features.php:417
+#: ../../include/features.php:413
 msgid "Tag Cloud"
 msgstr "Nube de etiquetas"
 
-#: ../../include/features.php:418
+#: ../../include/features.php:414
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Proveer nube de etiquetas personal en su página de canal"
 
-#: ../../include/features.php:430
+#: ../../include/features.php:425
 msgid "Premium Channel"
 msgstr "Canal premium"
 
-#: ../../include/features.php:431
+#: ../../include/features.php:426
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
 msgstr "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal"
 
-#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
+#: ../../include/taxonomy.php:267 ../../include/taxonomy.php:288
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: ../../include/taxonomy.php:293
+#: ../../include/taxonomy.php:332
 msgid "Keywords"
 msgstr "Palabras clave"
 
-#: ../../include/taxonomy.php:314
+#: ../../include/taxonomy.php:353
 msgid "have"
 msgstr "tener"
 
-#: ../../include/taxonomy.php:314
+#: ../../include/taxonomy.php:353
 msgid "has"
 msgstr "tiene"
 
-#: ../../include/taxonomy.php:315
+#: ../../include/taxonomy.php:354
 msgid "want"
 msgstr "quiero"
 
-#: ../../include/taxonomy.php:315
+#: ../../include/taxonomy.php:354
 msgid "wants"
 msgstr "quiere"
 
-#: ../../include/taxonomy.php:316
+#: ../../include/taxonomy.php:355
 msgid "likes"
 msgstr "gusta de"
 
-#: ../../include/taxonomy.php:317
+#: ../../include/taxonomy.php:356
 msgid "dislikes"
 msgstr "no gusta de"
 
@@ -12944,51 +12956,51 @@ msgstr "Es obligatorio que le inviten."
 msgid "Invitation could not be verified."
 msgstr "No se ha podido verificar su invitación."
 
-#: ../../include/account.php:130
+#: ../../include/account.php:157
 msgid "Please enter the required information."
 msgstr "Por favor introduzca la información requerida."
 
-#: ../../include/account.php:198
+#: ../../include/account.php:224
 msgid "Failed to store account information."
 msgstr "La información de la cuenta no se ha podido guardar."
 
-#: ../../include/account.php:263
+#: ../../include/account.php:291
 #, php-format
 msgid "Registration confirmation for %s"
 msgstr "Confirmación de registro para %s"
 
-#: ../../include/account.php:330
+#: ../../include/account.php:360
 #, php-format
 msgid "Registration request at %s"
 msgstr "Solicitud de registro en %s"
 
-#: ../../include/account.php:352
+#: ../../include/account.php:382
 msgid "your registration password"
 msgstr "su contraseña de registro"
 
-#: ../../include/account.php:358 ../../include/account.php:420
+#: ../../include/account.php:388 ../../include/account.php:450
 #, php-format
 msgid "Registration details for %s"
 msgstr "Detalles del registro de %s"
 
-#: ../../include/account.php:431
+#: ../../include/account.php:461
 msgid "Account approved."
 msgstr "Cuenta aprobada."
 
-#: ../../include/account.php:471
+#: ../../include/account.php:501
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registro revocado para %s"
 
-#: ../../include/account.php:756 ../../include/account.php:758
+#: ../../include/account.php:780 ../../include/account.php:782
 msgid "Click here to upgrade."
 msgstr "Pulse aquí para actualizar"
 
-#: ../../include/account.php:764
+#: ../../include/account.php:788
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Esta acción supera los límites establecidos por su plan de suscripción "
 
-#: ../../include/account.php:769
+#: ../../include/account.php:793
 msgid "This action is not available under your subscription plan."
 msgstr "Esta acción no está disponible en su plan de suscripción."
 
@@ -13073,183 +13085,211 @@ msgstr "Cumpleaños de %1$s"
 msgid "Happy Birthday %1$s"
 msgstr "Feliz cumpleaños %1$s"
 
-#: ../../include/nav.php:92
+#: ../../include/nav.php:90
 msgid "Remote authentication"
 msgstr "Acceder desde su servidor"
 
-#: ../../include/nav.php:92
+#: ../../include/nav.php:90
 msgid "Click to authenticate to your home hub"
 msgstr "Pulsar para identificarse en su servidor de inicio"
 
-#: ../../include/nav.php:103 ../../include/nav.php:127
+#: ../../include/nav.php:99 ../../include/nav.php:123
 msgid "End this session"
 msgstr "Finalizar esta sesión"
 
-#: ../../include/nav.php:106
+#: ../../include/nav.php:102
 msgid "Your profile page"
 msgstr "Su página del perfil"
 
-#: ../../include/nav.php:109
+#: ../../include/nav.php:105
 msgid "Manage/Edit profiles"
 msgstr "Administrar/editar perfiles"
 
-#: ../../include/nav.php:111
+#: ../../include/nav.php:107
 msgid "Edit your profile"
 msgstr "Editar su perfil"
 
-#: ../../include/nav.php:117
+#: ../../include/nav.php:113
 msgid "Sign in"
 msgstr "Acceder"
 
-#: ../../include/nav.php:142
+#: ../../include/nav.php:138
 msgid "Take me home"
 msgstr "Volver a la página principal"
 
-#: ../../include/nav.php:144
+#: ../../include/nav.php:140
 msgid "Log me out of this site"
 msgstr "Salir de este sitio"
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:145
 msgid "Create an account"
 msgstr "Crear una cuenta"
 
-#: ../../include/nav.php:161
+#: ../../include/nav.php:157
 msgid "Help and documentation"
 msgstr "Ayuda y documentación"
 
-#: ../../include/nav.php:164
+#: ../../include/nav.php:160
 msgid "Search site @name, #tag, ?docs, content"
 msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido"
 
-#: ../../include/nav.php:176
+#: ../../include/nav.php:171
 msgid "Grid"
 msgstr "Red"
 
-#: ../../include/nav.php:176
+#: ../../include/nav.php:171
 msgid "Your grid"
 msgstr "Mi red"
 
-#: ../../include/nav.php:177
+#: ../../include/nav.php:172
 msgid "View your network/grid"
 msgstr "Ver su red"
 
-#: ../../include/nav.php:178
+#: ../../include/nav.php:173
 msgid "Mark all grid notifications seen"
 msgstr "Marcar todas las notificaciones de la red como vistas"
 
-#: ../../include/nav.php:180
+#: ../../include/nav.php:175
 msgid "Channel home"
 msgstr "Mi canal"
 
-#: ../../include/nav.php:181
+#: ../../include/nav.php:176
 msgid "View your channel home"
 msgstr "Ver su página principal del canal"
 
-#: ../../include/nav.php:182
+#: ../../include/nav.php:177
 msgid "Mark all channel notifications seen"
 msgstr "Marcar todas las notificaciones del canal como leídas"
 
-#: ../../include/nav.php:188
+#: ../../include/nav.php:183
 msgid "Notices"
 msgstr "Avisos"
 
-#: ../../include/nav.php:188
+#: ../../include/nav.php:183
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../../include/nav.php:189
+#: ../../include/nav.php:184
 msgid "View all notifications"
 msgstr "Ver todas las notificaciones"
 
-#: ../../include/nav.php:192
+#: ../../include/nav.php:185
+msgid "Mark all system notifications seen"
+msgstr "Marcar todas las notificaciones del sistema como leídas"
+
+#: ../../include/nav.php:187
 msgid "Private mail"
 msgstr "Correo privado"
 
-#: ../../include/nav.php:193
+#: ../../include/nav.php:188
 msgid "View your private messages"
 msgstr "Ver sus mensajes privados"
 
-#: ../../include/nav.php:194
+#: ../../include/nav.php:189
 msgid "Mark all private messages seen"
 msgstr "Marcar todos los mensajes privados como leídos"
 
-#: ../../include/nav.php:200
+#: ../../include/nav.php:195
 msgid "Event Calendar"
 msgstr "Calendario de eventos"
 
-#: ../../include/nav.php:201
+#: ../../include/nav.php:196
 msgid "View events"
 msgstr "Ver los eventos"
 
-#: ../../include/nav.php:202
+#: ../../include/nav.php:197
 msgid "Mark all events seen"
 msgstr "Marcar todos los eventos como leidos"
 
-#: ../../include/nav.php:205
+#: ../../include/nav.php:199
 msgid "Manage Your Channels"
 msgstr "Gestionar sus canales"
 
-#: ../../include/nav.php:207
+#: ../../include/nav.php:201
 msgid "Account/Channel Settings"
 msgstr "Ajustes de cuenta/canales"
 
+#: ../../include/nav.php:203
+msgid "Shared Files"
+msgstr "Ficheros compartidos"
+
+#: ../../include/nav.php:203
+msgid "New files shared with me"
+msgstr "Nuevos ficheros compartidos conmigo"
+
+#: ../../include/nav.php:208
+msgid "Public stream"
+msgstr "\"Stream\" público"
+
+#: ../../include/nav.php:208
+msgid "Public stream activities"
+msgstr "Actividades del \"stream\" público"
+
 #: ../../include/nav.php:215
 msgid "Site Setup and Configuration"
 msgstr "Ajustes y configuración del sitio"
 
-#: ../../include/nav.php:277
+#: ../../include/nav.php:274
 msgid "@name, #tag, ?doc, content"
 msgstr "@nombre, #etiqueta, ?ayuda, contenido"
 
-#: ../../include/nav.php:278
+#: ../../include/nav.php:275
 msgid "Please wait..."
 msgstr "Espere por favor…"
 
-#: ../../include/nav.php:280
+#: ../../include/nav.php:278
 msgid "Add Apps"
 msgstr "Añadir aplicaciones"
 
-#: ../../include/photos.php:115
+#: ../../include/nav.php:279
+msgid "Arrange Apps"
+msgstr "Organizar aplicaciones"
+
+#: ../../include/nav.php:280
+msgid "Toggle System Apps"
+msgstr "Alternar aplicaciones de sistema"
+
+#: ../../include/photos.php:111
 #, php-format
 msgid "Image exceeds website size limit of %lu bytes"
 msgstr "La imagen excede el límite de %lu bytes del sitio"
 
-#: ../../include/photos.php:122
+#: ../../include/photos.php:118
 msgid "Image file is empty."
 msgstr "El fichero de imagen está vacío. "
 
-#: ../../include/photos.php:261
+#: ../../include/photos.php:257
 msgid "Photo storage failed."
 msgstr "La foto no ha podido ser guardada."
 
-#: ../../include/photos.php:301
+#: ../../include/photos.php:297
 msgid "a new photo"
 msgstr "una nueva foto"
 
-#: ../../include/photos.php:305
+#: ../../include/photos.php:301
 #, php-format
 msgctxt "photo_upload"
 msgid "%1$s posted %2$s to %3$s"
 msgstr "%1$s ha publicado %2$s en %3$s"
 
-#: ../../include/photos.php:533
+#: ../../include/photos.php:530
 msgid "Upload New Photos"
 msgstr "Subir nuevas fotos"
 
-#: ../../include/zot.php:646
+#: ../../include/zot.php:653
 msgid "Invalid data packet"
 msgstr "Paquete de datos no válido"
 
-#: ../../include/zot.php:662
+#: ../../include/zot.php:680
 msgid "Unable to verify channel signature"
 msgstr "No ha sido posible de verificar la firma del canal"
 
-#: ../../include/zot.php:2313
+#: ../../include/zot.php:2338
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "No ha sido posible de verificar la firma del sitio para %s"
 
-#: ../../include/zot.php:3764
+#: ../../include/zot.php:3946
 msgid "invalid target signature"
 msgstr "La firma recibida no es válida"
 
@@ -13264,27 +13304,27 @@ msgstr "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posi
 msgid "Add new connections to this privacy group"
 msgstr "Añadir conexiones nuevas a este grupo de canales"
 
-#: ../../include/group.php:309
+#: ../../include/group.php:310
 msgid "edit"
 msgstr "editar"
 
-#: ../../include/group.php:332
+#: ../../include/group.php:333
 msgid "Edit group"
 msgstr "Editar grupo"
 
-#: ../../include/group.php:333
+#: ../../include/group.php:334
 msgid "Add privacy group"
 msgstr "Añadir un grupo de canales"
 
-#: ../../include/group.php:334
+#: ../../include/group.php:335
 msgid "Channels not in any privacy group"
 msgstr "Sin canales en ningún grupo"
 
-#: ../../include/connections.php:127
+#: ../../include/connections.php:128
 msgid "New window"
 msgstr "Nueva ventana"
 
-#: ../../include/connections.php:128
+#: ../../include/connections.php:129
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Abrir la dirección seleccionada en una ventana o pestaña aparte"
 
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index ae1164cdb..ca809cb74 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -60,6 +60,7 @@ App::$strings["%d message sent."] = array(
 	0 => "%d mensajes enviados.",
 	1 => "%d mensajes enviados.",
 );
+App::$strings["Invite"] = "Invitar";
 App::$strings["You have no more invitations available"] = "No tiene más invitaciones disponibles";
 App::$strings["Send invitations"] = "Enviar invitaciones";
 App::$strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónico, una por línea:";
@@ -82,11 +83,67 @@ App::$strings["Profile"] = "Perfil";
 App::$strings["Click on a contact to add or remove."] = "Pulsar en un contacto para añadirlo o eliminarlo.";
 App::$strings["Visible To"] = "Visible para";
 App::$strings["All Connections"] = "Todas las conexiones";
+App::$strings["INVALID EVENT DISMISSED!"] = "¡EVENTO NO VÁLIDO RECHAZADO!";
+App::$strings["Summary: "] = "Resumen: ";
+App::$strings["Unknown"] = "Desconocido";
+App::$strings["Date: "] = "Fecha: ";
+App::$strings["Reason: "] = "Razón: ";
+App::$strings["INVALID CARD DISMISSED!"] = "¡TARJETA NO VÁLIDA RECHAZADA!";
+App::$strings["Name: "] = "Nombre: ";
+App::$strings["CalDAV"] = "CalDAV";
+App::$strings["Event title"] = "Título del evento";
+App::$strings["Start date and time"] = "Fecha y hora de comienzo";
+App::$strings["Example: YYYY-MM-DD HH:mm"] = "Ejemplo: YYYY-MM-DD HH:mm";
+App::$strings["End date and time"] = "Fecha y hora de finalización";
+App::$strings["Description"] = "Descripción";
+App::$strings["Location"] = "Ubicación";
+App::$strings["Previous"] = "Anterior";
+App::$strings["Next"] = "Siguiente";
+App::$strings["Today"] = "Hoy";
+App::$strings["Month"] = "Mes";
+App::$strings["Week"] = "Semana";
+App::$strings["Day"] = "Día";
+App::$strings["List month"] = "Lista mensual";
+App::$strings["List week"] = "Lista semanal";
+App::$strings["List day"] = "Lista diaria";
+App::$strings["More"] = "Más";
+App::$strings["Less"] = "Menos";
+App::$strings["Select calendar"] = "Seleccionar un calendario";
+App::$strings["Delete all"] = "Eliminar todos";
+App::$strings["Cancel"] = "Cancelar";
+App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado.";
+App::$strings["CardDAV"] = "CardDAV";
+App::$strings["Name"] = "Nombre";
+App::$strings["Organisation"] = "Organización";
+App::$strings["Title"] = "Título";
+App::$strings["Phone"] = "Teléfono";
+App::$strings["Email"] = "Correo electrónico";
+App::$strings["Instant messenger"] = "Mensajería instantánea";
+App::$strings["Website"] = "Sitio web";
+App::$strings["Address"] = "Dirección";
+App::$strings["Note"] = "Nota";
+App::$strings["Mobile"] = "Móvil";
+App::$strings["Home"] = "Inicio";
+App::$strings["Work"] = "Trabajo";
+App::$strings["Add Contact"] = "Añadir un contacto";
+App::$strings["Add Field"] = "Añadir un campo";
+App::$strings["Update"] = "Actualizar";
+App::$strings["P.O. Box"] = "Buzón de correos";
+App::$strings["Additional"] = "Adicional";
+App::$strings["Street"] = "Calle";
+App::$strings["Locality"] = "Localidad";
+App::$strings["Region"] = "Provincia, región o estado";
+App::$strings["ZIP Code"] = "Código postal";
+App::$strings["Country"] = "País";
+App::$strings["Default Calendar"] = "Calendario por defecto";
+App::$strings["Default Addressbook"] = "Agenda de direcciones por defecto";
 App::$strings["This site is not a directory server"] = "Este sitio no es un servidor de directorio";
 App::$strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página.";
 App::$strings["Posts and comments"] = "Publicaciones y comentarios";
 App::$strings["Only posts"] = "Solo publicaciones";
+App::$strings["Channel Home"] = "Mi canal";
 App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Permisos insuficientes. Petición redirigida a la página del perfil.";
+App::$strings["Language"] = "Idioma";
 App::$strings["Export Channel"] = "Exportar el canal";
 App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido.";
 App::$strings["Export Content"] = "Exportar contenidos";
@@ -106,14 +163,14 @@ App::$strings["Please select another location to become primary before removing
 App::$strings["Syncing locations"] = "Sincronizando ubicaciones";
 App::$strings["No locations found."] = "No encontrada ninguna dirección.";
 App::$strings["Manage Channel Locations"] = "Gestionar las direcciones del canal";
-App::$strings["Location"] = "Ubicación";
-App::$strings["Address"] = "Dirección";
 App::$strings["Primary"] = "Primario";
 App::$strings["Drop"] = "Eliminar";
 App::$strings["Sync Now"] = "Sincronizar ahora";
 App::$strings["Please wait several minutes between consecutive operations."] = "Por favor, espere algunos minutos entre operaciones consecutivas.";
 App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o \"hub\" y borrando su canal.";
 App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo.";
+App::$strings["Change Order of Navigation Apps"] = "Cambiar el orden de las aplicaciones en la barra de navegación";
+App::$strings["Use arrows to move the corresponding app up or down in the display list"] = "Utilizar las flechas para mover la aplicación correspondiente hacia arriba o hacia abajo en la lista de visualización";
 App::$strings["Menu not found."] = "Menú no encontrado";
 App::$strings["Unable to create element."] = "No se puede crear el elemento.";
 App::$strings["Unable to update menu element."] = "No es posible actualizar el elemento del menú.";
@@ -154,21 +211,19 @@ App::$strings["Unable to generate preview."] = "No se puede crear la vista previ
 App::$strings["Event title and start time are required."] = "Se requieren el título del evento y su hora de inicio.";
 App::$strings["Event not found."] = "Evento no encontrado.";
 App::$strings["event"] = "evento";
+App::$strings["Events"] = "Eventos";
 App::$strings["Edit event title"] = "Editar el título del evento";
-App::$strings["Event title"] = "Título del evento";
 App::$strings["Required"] = "Obligatorio";
 App::$strings["Categories (comma-separated list)"] = "Temas (lista separada por comas)";
 App::$strings["Edit Category"] = "Modificar el tema";
 App::$strings["Category"] = "Tema";
 App::$strings["Edit start date and time"] = "Modificar la fecha y hora de comienzo";
-App::$strings["Start date and time"] = "Fecha y hora de comienzo";
 App::$strings["Finish date and time are not known or not relevant"] = "La fecha y hora de terminación no se conocen o no son relevantes";
 App::$strings["Edit finish date and time"] = "Modificar la fecha y hora de terminación";
 App::$strings["Finish date and time"] = "Fecha y hora de terminación";
 App::$strings["Adjust for viewer timezone"] = "Ajustar para obtener el visor de los husos horarios";
 App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales.";
 App::$strings["Edit Description"] = "Editar la descripción";
-App::$strings["Description"] = "Descripción";
 App::$strings["Edit Location"] = "Modificar la dirección";
 App::$strings["Preview"] = "Previsualizar";
 App::$strings["Permission settings"] = "Configuración de permisos";
@@ -181,13 +236,7 @@ App::$strings["Link to Source"] = "Enlazar con la entrada en su ubicación origi
 App::$strings["calendar"] = "calendario";
 App::$strings["Edit Event"] = "Editar el evento";
 App::$strings["Create Event"] = "Crear un evento";
-App::$strings["Previous"] = "Anterior";
-App::$strings["Next"] = "Siguiente";
 App::$strings["Export"] = "Exportar";
-App::$strings["Month"] = "Mes";
-App::$strings["Week"] = "Semana";
-App::$strings["Day"] = "Día";
-App::$strings["Today"] = "Hoy";
 App::$strings["Event removed"] = "Evento borrado";
 App::$strings["Failed to remove event"] = "Error al eliminar el evento";
 App::$strings["App installed."] = "Aplicación instalada.";
@@ -238,7 +287,6 @@ App::$strings["Remove this channel and all its clones from the network"] = "Elim
 App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red";
 App::$strings["Remove Channel"] = "Eliminar el canal";
 App::$strings["Files: shared with me"] = "Ficheros: compartidos conmigo";
-App::$strings["Name"] = "Nombre";
 App::$strings["NEW"] = "NUEVO";
 App::$strings["Size"] = "Tamaño";
 App::$strings["Last Modified"] = "Última modificación";
@@ -270,11 +318,7 @@ App::$strings["Your account email address must match this in order to use the we
 App::$strings["Website URL"] = "Dirección del sitio web";
 App::$strings["Please use SSL (https) URL if available."] = "Por favor, use SSL (https) si está disponible.";
 App::$strings["Please select a default timezone for your website"] = "Por favor, selecciones el huso horario por defecto de su sitio web";
-App::$strings["Basic/Minimal Social Networking"] = "Red social básica o mínima";
-App::$strings["Standard Configuration (default)"] = "Configuración estándar (por defecto)";
-App::$strings["Professional"] = "Profesional";
 App::$strings["Site settings"] = "Ajustes del sitio";
-App::$strings["Server Configuration/Role"] = "Configuración del servidor";
 App::$strings["PHP version 5.5 or greater is required."] = "Se requiere la versión 5.5, o superior, de PHP.";
 App::$strings["PHP version"] = "Versión de PHP";
 App::$strings["Could not find a command line version of PHP in the web server PATH."] = "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web.";
@@ -298,6 +342,7 @@ App::$strings["OpenSSL PHP module"] = "módulo PHP OpenSSL";
 App::$strings["PDO database PHP module"] = "Módulo PHP de la base de datos PDO ";
 App::$strings["mb_string PHP module"] = "módulo PHP mb_string";
 App::$strings["xml PHP module"] = "módulo PHP xml";
+App::$strings["zip PHP module"] = "Módulo zip PHP";
 App::$strings["Apache mod_rewrite module"] = "módulo Apache mod_rewrite ";
 App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no está instalado.";
 App::$strings["exec"] = "ejecutable";
@@ -310,6 +355,7 @@ App::$strings["Error: openssl PHP module required but not installed."] = "Error:
 App::$strings["Error: PDO database PHP module required but not installed."] = "Error: se necesita el módulo PHP de la base de datos PDO, pero no está instalado.";
 App::$strings["Error: mb_string PHP module required but not installed."] = "Error: el módulo PHP mb_string es necesario, pero no está instalado.";
 App::$strings["Error: xml PHP module required for DAV but not installed."] = "Error: el módulo PHP xml es necesario para DAV, pero no está instalado.";
+App::$strings["Error: zip PHP module required but not installed."] = "Error: se requiere el módulo zip PHP pero no está instalado.";
 App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor.";
 App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Esto está generalmente ligado a un problema de permisos, a causa del cual el servidor web tiene prohibido modificar ficheros en su carpeta - incluso si usted mismo tiene esos permisos.";
 App::$strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Al término de este procedimiento, podemos crear un fichero de texto para guardar con el nombre .htconfig.php en el directorio raíz de su instalación de Hubzilla.";
@@ -334,7 +380,7 @@ App::$strings["Url rewrite in .htaccess is not working. Check your server config
 App::$strings["Url rewrite is working"] = "La reescritura de las direcciones funciona correctamente";
 App::$strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "El fichero de configuración de la base de datos .htconfig.php no se ha podido modificar. Por favor, copie el texto generado en un fichero con ese nombre en el directorio raíz de su servidor.";
 App::$strings["Errors encountered creating database tables."] = "Se han encontrado errores al crear las tablas de la base de datos.";
-App::$strings["<h1>What next</h1>"] = "<h1>Siguiente paso</h1>";
+App::$strings["<h1>What next?</h1>"] = "<h1>¿Qué sigue?</h1>";
 App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Debe crear [manualmente] una tarea programada para el \"poller\".";
 App::$strings["Continue"] = "Continuar";
 App::$strings["Premium Channel Setup"] = "Configuración del canal premium";
@@ -389,11 +435,9 @@ App::$strings["(optional)"] = "(opcional)";
 App::$strings["Download Plugin Repo"] = "Descargar el repositorio";
 App::$strings["Install new repo"] = "Instalar un nuevo repositorio";
 App::$strings["Install"] = "Instalar";
-App::$strings["Cancel"] = "Cancelar";
 App::$strings["Manage Repos"] = "Gestionar los repositorios";
 App::$strings["Installed Plugin Repositories"] = "Repositorios de los plugins instalados";
 App::$strings["Install a New Plugin Repository"] = "Instalar un nuevo repositorio de plugins";
-App::$strings["Update"] = "Actualizar";
 App::$strings["Switch branch"] = "Cambiar la rama";
 App::$strings["Remove"] = "Eliminar";
 App::$strings["%s account blocked/unblocked"] = array(
@@ -412,7 +456,6 @@ App::$strings["Accounts"] = "Cuentas";
 App::$strings["select all"] = "seleccionar todo";
 App::$strings["Registrations waiting for confirm"] = "Inscripciones en espera de confirmación";
 App::$strings["Request date"] = "Fecha de solicitud";
-App::$strings["Email"] = "Correo electrónico";
 App::$strings["No registrations."] = "Sin registros.";
 App::$strings["Approve"] = "Aprobar";
 App::$strings["Deny"] = "Rechazar";
@@ -603,6 +646,8 @@ App::$strings["Block embedded HTML from these domains"] = "Bloquear contenido co
 App::$strings["Remote privacy information not available."] = "La información privada remota no está disponible.";
 App::$strings["Visible to:"] = "Visible para:";
 App::$strings["__ctx:acl__ Profile"] = "Perfil";
+App::$strings["Comment approved"] = "El comentario ha sido aprobado";
+App::$strings["Comment deleted"] = "Se ha eliminado el comentario";
 App::$strings["Permission category saved."] = "Se ha guardado la categoría del permiso.";
 App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Utilice este formulario para crear reglas de permiso para varias clases de personas o conexiones.";
 App::$strings["Permission Categories"] = "Categorías de autorización";
@@ -690,6 +735,8 @@ App::$strings["System info messages"] = "Mensajes de información del sistema";
 App::$strings["System critical alerts"] = "Alertas críticas del sistema";
 App::$strings["New connections"] = "Nuevas conexiones";
 App::$strings["System Registrations"] = "Registros del sistema";
+App::$strings["Unseen shared files"] = "Ficheros compartidos no vistos";
+App::$strings["Unseen public activity"] = "Actividad pública no vista";
 App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Mostrar también en Avisos las nuevas publicaciones, los mensajes privados y las conexiones";
 App::$strings["Notify me of events this many days in advance"] = "Avisarme de los eventos con algunos días de antelación";
 App::$strings["Must be greater than 0"] = "Debe ser mayor que 0";
@@ -782,7 +829,6 @@ App::$strings["Client key starts with"] = "La \"client key\" empieza por";
 App::$strings["No name"] = "Sin nombre";
 App::$strings["Remove authorization"] = "Eliminar autorización";
 App::$strings["View Photo"] = "Ver foto";
-App::$strings["Unknown"] = "Desconocido";
 App::$strings["Edit Album"] = "Editar álbum";
 App::$strings["Upload"] = "Subir";
 App::$strings["Some blurb about what to do when you're new here"] = "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí";
@@ -841,10 +887,11 @@ App::$strings["Create new app"] = "Crear una nueva aplicación";
 App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s";
 App::$strings["Mood"] = "Estado de ánimo";
 App::$strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos";
+App::$strings["Connections"] = "Conexiones";
 App::$strings["Blocked"] = "Bloqueadas";
 App::$strings["Ignored"] = "Ignoradas";
 App::$strings["Hidden"] = "Ocultas";
-App::$strings["Archived"] = "Archivadas";
+App::$strings["Archived/Unreachable"] = "Archivada o inaccesible";
 App::$strings["New"] = "Nuevas";
 App::$strings["All"] = "Todos/as";
 App::$strings["New Connections"] = "Nuevas conexiones";
@@ -852,9 +899,11 @@ App::$strings["Show pending (new) connections"] = "Mostrar conexiones (nuevas) p
 App::$strings["Show all connections"] = "Mostrar todas las conexiones";
 App::$strings["Only show blocked connections"] = "Mostrar solo las conexiones bloqueadas";
 App::$strings["Only show ignored connections"] = "Mostrar solo conexiones ignoradas";
-App::$strings["Only show archived connections"] = "Mostrar solo las conexiones archivadas";
+App::$strings["Only show archived/unreachable connections"] = "Mostrar solo las conexiones archivadas o inaccesibles";
 App::$strings["Only show hidden connections"] = "Mostrar solo las conexiones ocultas";
 App::$strings["Pending approval"] = "Pendiente de aprobación";
+App::$strings["Archived"] = "Archivadas";
+App::$strings["Not connected at this location"] = "No está conectado/a en esta ubicación";
 App::$strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
 App::$strings["Edit connection"] = "Editar conexión";
 App::$strings["Delete connection"] = "Eliminar conexión";
@@ -867,12 +916,12 @@ App::$strings["Approve connection"] = "Aprobar esta conexión";
 App::$strings["Ignore connection"] = "Ignorar esta conexión";
 App::$strings["Ignore"] = "Ignorar";
 App::$strings["Recent activity"] = "Actividad reciente";
-App::$strings["Connections"] = "Conexiones";
 App::$strings["Search your connections"] = "Buscar sus conexiones";
 App::$strings["Connections search"] = "Buscar conexiones";
 App::$strings["Find"] = "Encontrar";
 App::$strings["item"] = "elemento";
 App::$strings["Source of Item"] = "Origen del elemento";
+App::$strings["View Bookmarks"] = "Ver los marcadores";
 App::$strings["Bookmark added"] = "Marcador añadido";
 App::$strings["My Bookmarks"] = "Mis marcadores";
 App::$strings["My Connections Bookmarks"] = "Marcadores de mis conexiones";
@@ -887,6 +936,7 @@ App::$strings["Delete Album"] = "Borrar álbum";
 App::$strings["Delete Photo"] = "Borrar foto";
 App::$strings["No photos selected"] = "No hay fotos seleccionadas";
 App::$strings["Access to this item is restricted."] = "El acceso a este elemento está restringido.";
+App::$strings["Photos"] = "Fotos";
 App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado.";
 App::$strings["%1$.2f MB photo storage used."] = "%1$.2f MB de almacenamiento de fotos utilizado.";
 App::$strings["Upload Photos"] = "Subir fotos";
@@ -945,6 +995,7 @@ App::$strings["Recent Photos"] = "Fotos recientes";
 App::$strings["Profile Unavailable."] = "Perfil no disponible";
 App::$strings["Not found"] = "No encontrado";
 App::$strings["Invalid channel"] = "Canal no válido";
+App::$strings["Wiki"] = "Wiki";
 App::$strings["Wikis"] = "Wikis";
 App::$strings["Download"] = "Descargar";
 App::$strings["Create New"] = "Crear";
@@ -1019,6 +1070,7 @@ App::$strings["Unable to locate original post."] = "No ha sido posible encontrar
 App::$strings["Empty post discarded."] = "La entrada vacía ha sido desechada.";
 App::$strings["Duplicate post suppressed."] = "Se ha suprimido la entrada duplicada.";
 App::$strings["System error. Post not saved."] = "Error del sistema. La entrada no se ha podido salvar.";
+App::$strings["Your comment is awaiting approval."] = "Su comentario está pendiente de aprobación.";
 App::$strings["Unable to obtain post information from database."] = "No ha sido posible obtener información de la entrada en la base de datos.";
 App::$strings["You have reached your limit of %1$.0f top level posts."] = "Ha alcanzado su límite de %1$.0f entradas en la página principal.";
 App::$strings["You have reached your limit of %1$.0f webpages."] = "Ha alcanzado su límite de %1$.0f páginas web.";
@@ -1076,7 +1128,10 @@ App::$strings["Accept connection to allow communication"] = "Aceptar la conexió
 App::$strings["Set Affinity"] = "Ajustar la afinidad";
 App::$strings["Set Profile"] = "Ajustar el perfil";
 App::$strings["Set Affinity & Profile"] = "Ajustar la afinidad y el perfil";
-App::$strings["none"] = "-";
+App::$strings["This connection is unreachable from this location."] = "No se puede acceder a la conexión desde este sitio.";
+App::$strings["This connection may be unreachable from other channel locations."] = "Esta conexión puede ser inaccesible desde otras ubicaciones del canal.";
+App::$strings["Location independence is not supported by their network."] = "La independencia de ubicación no es compatible con su red.";
+App::$strings["This connection is unreachable from this location. Location independence is not supported by their network."] = "Esta conexión no es accesible desde este sitio. La independencia de ubicación no es compatible con su red.";
 App::$strings["Connection Default Permissions"] = "Permisos predeterminados de conexión";
 App::$strings["Connection: %s"] = "Conexión: %s";
 App::$strings["Apply these permissions automatically"] = "Aplicar estos permisos automaticamente";
@@ -1101,24 +1156,7 @@ App::$strings["Please choose the profile you would like to display to %s when vi
 App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados.";
 App::$strings["Last update:"] = "Última actualización:";
 App::$strings["Details"] = "Detalles";
-App::$strings["Organisation"] = "Organización";
-App::$strings["Title"] = "Título";
-App::$strings["Phone"] = "Teléfono";
-App::$strings["Instant messenger"] = "Mensajería instantánea";
-App::$strings["Website"] = "Sitio web";
-App::$strings["Note"] = "Nota";
-App::$strings["Mobile"] = "Móvil";
-App::$strings["Home"] = "Inicio";
-App::$strings["Work"] = "Trabajo";
-App::$strings["Add Contact"] = "Añadir un contacto";
-App::$strings["Add Field"] = "Añadir un campo";
-App::$strings["P.O. Box"] = "Buzón de correos";
-App::$strings["Additional"] = "Adicional";
-App::$strings["Street"] = "Calle";
-App::$strings["Locality"] = "Localidad";
-App::$strings["Region"] = "Provincia, región o estado";
-App::$strings["ZIP Code"] = "Código postal";
-App::$strings["Country"] = "País";
+App::$strings["My Chatrooms"] = "Mis salas de chat";
 App::$strings["Room not found"] = "Sala no encontrada";
 App::$strings["Leave Room"] = "Abandonar la sala";
 App::$strings["Delete Room"] = "Eliminar esta sala";
@@ -1134,7 +1172,6 @@ App::$strings["%1\$s's Chatrooms"] = "Salas de chat de %1\$s";
 App::$strings["No chatrooms available"] = "No hay salas de chat disponibles";
 App::$strings["Expiration"] = "Caducidad";
 App::$strings["min"] = "min";
-App::$strings["Photos"] = "Fotos";
 App::$strings["Files"] = "Ficheros";
 App::$strings["Unable to update menu."] = "No se puede actualizar el menú.";
 App::$strings["Unable to create menu."] = "No se puede crear el menú.";
@@ -1277,11 +1314,11 @@ App::$strings["Ratings"] = "Valoraciones";
 App::$strings["Rating: "] = "Valoración:";
 App::$strings["Website: "] = "Sitio web:";
 App::$strings["Description: "] = "Descripción:";
+App::$strings["Webpages"] = "Páginas web";
 App::$strings["Import Webpage Elements"] = "Importar elementos de una página web";
 App::$strings["Import selected"] = "Importar elementos seleccionados";
 App::$strings["Export Webpage Elements"] = "Exportar elementos de una página web";
 App::$strings["Export selected"] = "Exportar los elementos seleccionados";
-App::$strings["Webpages"] = "Páginas web";
 App::$strings["Actions"] = "Acciones";
 App::$strings["Page Link"] = "Vínculo de la página";
 App::$strings["Page Title"] = "Título de página";
@@ -1325,6 +1362,7 @@ App::$strings["Edit Source"] = "Editar fuente";
 App::$strings["Delete Source"] = "Eliminar fuente";
 App::$strings["Source removed"] = "Fuente eliminada";
 App::$strings["Unable to remove source."] = "No se puede eliminar la fuente.";
+App::$strings["Post"] = "Publicación";
 App::$strings["Like/Dislike"] = "Me gusta/No me gusta";
 App::$strings["This action is restricted to members."] = "Esta acción está restringida solo para miembros.";
 App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Por favor, <a href=\"rmagic\">identifíquese con su \$Projectname ID</a> o <a href=\"register\">rregístrese como un nuevo \$Projectname member</a> para continuar.";
@@ -1343,6 +1381,7 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s n
 App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s quizá participe";
 App::$strings["Action completed."] = "Acción completada.";
 App::$strings["Thank you."] = "Gracias.";
+App::$strings["Directory"] = "Directorio";
 App::$strings["%d rating"] = array(
 	0 => "%d valoración",
 	1 => "%d valoraciones",
@@ -1374,6 +1413,7 @@ App::$strings["Oldest to Newest"] = "De más antiguo a más nuevo";
 App::$strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas entradas pueden estar ocultas).";
 App::$strings["Xchan Lookup"] = "Búsqueda de canales";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:";
+App::$strings["Suggest Channels"] = "Sugerir canales";
 App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo.";
 App::$strings["Ignore/Hide"] = "Ignorar/Ocultar";
 App::$strings["Unable to find your hub."] = "No se puede encontrar su servidor.";
@@ -1382,6 +1422,7 @@ App::$strings["Unable to lookup recipient."] = "No se puede asociar a un destina
 App::$strings["Unable to communicate with requested channel."] = "No se puede establecer la comunicación con el canal solicitado.";
 App::$strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
 App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
+App::$strings["Mail"] = "Correo";
 App::$strings["Messages"] = "Mensajes";
 App::$strings["message"] = "mensaje";
 App::$strings["Message recalled."] = "Mensaje revocado.";
@@ -1423,6 +1464,7 @@ App::$strings["Or enter new bookmark folder name"] = "O introduzca un nuevo nomb
 App::$strings["Enter a folder name"] = "Escriba un nombre de carpeta";
 App::$strings["or select an existing folder (doubleclick)"] = "o seleccione una (con un doble click)";
 App::$strings["Save to Folder"] = "Guardar en carpeta";
+App::$strings["Remote Diagnostics"] = "Diagnóstico remoto";
 App::$strings["Fetching URL returns error: %1\$s"] = "Al intentar obtener la dirección, retorna el error: %1\$s";
 App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana.";
 App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado.";
@@ -1467,6 +1509,7 @@ App::$strings["No such group"] = "No se encuentra el grupo";
 App::$strings["No such channel"] = "No se encuentra el  canal";
 App::$strings["forum"] = "foro";
 App::$strings["Search Results For:"] = "Buscar resultados para:";
+App::$strings["Activity"] = "Actividad";
 App::$strings["Privacy group is empty"] = "El grupo de canales está vacío";
 App::$strings["Privacy group: "] = "Grupo de canales: ";
 App::$strings["Invalid connection."] = "Conexión no válida.";
@@ -1485,20 +1528,17 @@ App::$strings["Copy/paste this code to attach file to a post"] = "Copiar/pegar e
 App::$strings["Copy/paste this URL to link file from a web page"] = "Copiar/pegar esta dirección para enlazar el fichero desde una página web";
 App::$strings["Share this file"] = "Compartir este fichero";
 App::$strings["Show URL to this file"] = "Mostrar la dirección de este fichero";
-App::$strings["Notify your contacts about this file"] = "Avisar a sus contactos sobre este fichero";
+App::$strings["Show in your contacts shared folder"] = "Mostrar en la carpeta compartida con sus contactos";
 App::$strings["No channel."] = "Ningún canal.";
 App::$strings["Common connections"] = "Conexiones comunes";
 App::$strings["No connections in common."] = "Ninguna  conexión en común.";
 App::$strings["No connections."] = "Sin conexiones.";
 App::$strings["Visit %s's profile [%s]"] = "Visitar el perfil de %s [%s]";
 App::$strings["View Connections"] = "Ver conexiones";
-App::$strings["# Accounts"] = "# Cuentas";
-App::$strings["# blocked accounts"] = "# cuentas bloqueadas";
-App::$strings["# expired accounts"] = "# cuentas caducadas";
-App::$strings["# expiring accounts"] = "# cuentas que caducan";
-App::$strings["# Channels"] = "# Canales";
-App::$strings["# primary"] = "# primario";
-App::$strings["# clones"] = "# clones";
+App::$strings["Blocked accounts"] = "Cuentas bloqueadas";
+App::$strings["Expired accounts"] = "Cuentas caducadas";
+App::$strings["Expiring accounts"] = "Cuentas que caducan";
+App::$strings["Clones"] = "Clones";
 App::$strings["Message queues"] = "Mensajes en cola";
 App::$strings["Your software should be updated"] = "Debe actualizar su software";
 App::$strings["Summary"] = "Sumario";
@@ -1530,29 +1570,22 @@ App::$strings["Forgot your Password?"] = "¿Ha olvidado su contraseña?";
 App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones.";
 App::$strings["Email Address"] = "Dirección de correo electrónico";
 App::$strings["Reset"] = "Reiniciar";
-App::$strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas";
+App::$strings["Mark all seen"] = "Marcar todo como visto";
+App::$strings["0. Beginner/Basic"] = "0. Principiante/Básico";
+App::$strings["1. Novice - not skilled but willing to learn"] = "1. Novicio - no está preparado pero está dispuestos a aprender";
+App::$strings["2. Intermediate - somewhat comfortable"] = "2. Intermedio - algo cómodo";
+App::$strings["3. Advanced - very comfortable"] = "3. Avanzado - muy cómodo";
+App::$strings["4. Expert - I can write computer code"] = "4. Experto - Puedo escribir código informático";
+App::$strings["5. Wizard - I probably know more than you do"] = "5. Asistente - probablemente sé más que tú";
 App::$strings["Site Admin"] = "Administrador del sitio";
 App::$strings["Report Bug"] = "Informe de errores";
-App::$strings["View Bookmarks"] = "Ver los marcadores";
-App::$strings["My Chatrooms"] = "Mis salas de chat";
 App::$strings["Firefox Share"] = "Servicio de compartición de Firefox";
-App::$strings["Remote Diagnostics"] = "Diagnóstico remoto";
-App::$strings["Suggest Channels"] = "Sugerir canales";
 App::$strings["Login"] = "Iniciar sesión";
-App::$strings["Activity"] = "Actividad";
-App::$strings["Wiki"] = "Wiki";
-App::$strings["Channel Home"] = "Mi canal";
-App::$strings["Events"] = "Eventos";
-App::$strings["Directory"] = "Directorio";
-App::$strings["Mail"] = "Correo";
 App::$strings["Chat"] = "Chat";
 App::$strings["Probe"] = "Probar";
 App::$strings["Suggest"] = "Sugerir";
 App::$strings["Random Channel"] = "Canal aleatorio";
-App::$strings["Invite"] = "Invitar";
 App::$strings["Features"] = "Funcionalidades";
-App::$strings["Language"] = "Idioma";
-App::$strings["Post"] = "Publicación";
 App::$strings["Profile Photo"] = "Foto del perfil";
 App::$strings["Purchase"] = "Comprar";
 App::$strings["Undelete"] = "Recuperar";
@@ -1609,9 +1642,11 @@ App::$strings["Please visit %s to view and/or reply to your private messages."]
 App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s[/zrl]";
 App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%5\$s de %4\$s[/zrl] ";
 App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s creado por usted[/zrl]";
+App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] Comentario moderado en la conversación #%1\$d por %2\$s";
 App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] Nuevo comentario de %2\$s en la conversación #%1\$d";
 App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha comentado un elemento/conversación que ha estado siguiendo.";
 App::$strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s";
+App::$strings["Please visit %s to approve or reject this comment."] = "Por favor, visite %spara aprobar o rechazar este comentario.";
 App::$strings["%1\$s, %2\$s liked [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha mostrado su agrado por [zrl=%3\$s]%4\$s creado por usted[/zrl]";
 App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] \"Me gusta\" de %2\$s en la conversación #%1\$d";
 App::$strings["%1\$s, %2\$s liked an item/conversation you created."] = "%1\$s, %2\$s ha mostrado su agrado por un elemento o conversación que ha creado usted.";
@@ -1682,7 +1717,6 @@ App::$strings["Vote"] = "Votar";
 App::$strings["Voting Options"] = "Opciones de votación";
 App::$strings["Save Bookmarks"] = "Guardar en Marcadores";
 App::$strings["Add to Calendar"] = "Añadir al calendario";
-App::$strings["Mark all seen"] = "Marcar todo como visto";
 App::$strings["%s show all"] = "%s mostrar todo";
 App::$strings["Bold"] = "Negrita";
 App::$strings["Italic"] = "Itálico ";
@@ -1692,6 +1726,9 @@ App::$strings["Code"] = "Código";
 App::$strings["Image"] = "Imagen";
 App::$strings["Insert Link"] = "Insertar enlace";
 App::$strings["Video"] = "Vídeo";
+App::$strings["Your full name (required)"] = "Su nombre completo (requerido)";
+App::$strings["Your email address (required)"] = "Su dirección de correo electrónico (requerido)";
+App::$strings["Your website URL (optional)"] = "La URL de su sitio web (opcional)";
 App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo.";
 App::$strings["Welcome %s. Remote authentication successful."] = "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente.";
 App::$strings["parent"] = "padre";
@@ -1711,6 +1748,25 @@ App::$strings["Create new folder"] = "Crear nueva carpeta";
 App::$strings["Upload file"] = "Subir fichero";
 App::$strings["Drop files here to immediately upload"] = "Arrastre los ficheros aquí para subirlos de forma inmediata";
 App::$strings["Forums"] = "Foros";
+App::$strings["Select Channel"] = "Seleccionar un canal";
+App::$strings["Read-write"] = "Lectura y escritura";
+App::$strings["Read-only"] = "Sólo lectura";
+App::$strings["My Calendars"] = "Mis calendarios";
+App::$strings["Shared Calendars"] = "Calendarios compartidos";
+App::$strings["Share this calendar"] = "Compartir este calendario";
+App::$strings["Calendar name and color"] = "Nombre y color del calendario";
+App::$strings["Create new calendar"] = "Crear un nuevo calendario";
+App::$strings["Calendar Name"] = "Nombre del calendario";
+App::$strings["Calendar Tools"] = "Gestión de calendarios";
+App::$strings["Import calendar"] = "Importar un calendario";
+App::$strings["Select a calendar to import to"] = "Seleccionar un calendario para importarlo";
+App::$strings["Addressbooks"] = "Agenda de direcciones";
+App::$strings["Addressbook name"] = "Nombre de la agenda";
+App::$strings["Create new addressbook"] = "Crear una nueva agenda de direcciones";
+App::$strings["Addressbook Name"] = "Nombre de la agenda";
+App::$strings["Addressbook Tools"] = "Gestión de agendas de direcciones";
+App::$strings["Import addressbook"] = "Importar una agenda de direcciones";
+App::$strings["Select an addressbook to import to"] = "Seleccionar una agenda para importarla";
 App::$strings["Categories"] = "Temas";
 App::$strings["Everything"] = "Todo";
 App::$strings["Events Tools"] = "Gestión de eventos";
@@ -1734,9 +1790,9 @@ App::$strings["Enter channel address"] = "Dirección del canal";
 App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen";
 App::$strings["Wiki List"] = "Lista de wikis";
 App::$strings["Archives"] = "Hemeroteca";
-App::$strings["Conversations"] = "Conversaciones";
 App::$strings["Received Messages"] = "Mensajes recibidos";
 App::$strings["Sent Messages"] = "Enviar mensajes";
+App::$strings["Conversations"] = "Conversaciones";
 App::$strings["No messages."] = "Sin mensajes.";
 App::$strings["Delete conversation"] = "Eliminar conversación";
 App::$strings["Chat Members"] = "Miembros del chat";
@@ -1771,8 +1827,6 @@ App::$strings["Permission Groups"] = "Grupos de permisos";
 App::$strings["Premium Channel Settings"] = "Configuración del canal premium";
 App::$strings["Bookmarked Chatrooms"] = "Salas de chat preferidas";
 App::$strings["Source channel not found."] = "No se ha encontrado el canal de origen.";
-App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Buscar %1\$s (%2\$s)";
-App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
 App::$strings["Create an account to access services and applications"] = "Crear una cuenta para acceder a los servicios y aplicaciones";
 App::$strings["Logout"] = "Finalizar sesión";
 App::$strings["Login/Email"] = "Inicio de sesión / Correo electrónico";
@@ -1838,58 +1892,11 @@ App::$strings["Some setting"] = "Algunos ajustes";
 App::$strings["A setting"] = "Un ajuste";
 App::$strings["Skeleton Settings"] = "Ajustes de Skeleton";
 App::$strings["GNU-Social Protocol Settings updated."] = "Se han actualizado los ajustes del protocolo de GNU-Social.";
+App::$strings["The GNU-Social protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El protocolo de GNU-Social no admite la independencia de la ubicación. Las\n conexiones que realice dentro de esa red pueden ser inaccesibles desde \nubicaciones de canales alternativos.";
 App::$strings["Enable the GNU-Social protocol for this channel"] = "Activar el protocolo de GNU-Social para este canal";
 App::$strings["GNU-Social Protocol Settings"] = "Ajustes del protocolo de GNU-Social";
 App::$strings["Follow"] = "Seguir";
 App::$strings["%1\$s is now following %2\$s"] = "%1\$s está siguiendo ahora a %2\$s";
-App::$strings["INVALID EVENT DISMISSED!"] = "¡EVENTO NO VÁLIDO RECHAZADO!";
-App::$strings["Summary: "] = "Resumen: ";
-App::$strings["Date: "] = "Fecha: ";
-App::$strings["Reason: "] = "Razón: ";
-App::$strings["INVALID CARD DISMISSED!"] = "¡TARJETA NO VÁLIDA RECHAZADA!";
-App::$strings["Name: "] = "Nombre: ";
-App::$strings["You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV Settings before you can use it."] = "Debe habilitar este complemento en Ajustes/Complementos>Configuración de CalDAV/CardDAV antes de poder utilizarlo.";
-App::$strings["Example: YYYY-MM-DD HH:mm"] = "Ejemplo: YYYY-MM-DD HH:mm";
-App::$strings["End date and time"] = "Fecha y hora de finalización";
-App::$strings["List month"] = "Lista mensual";
-App::$strings["List week"] = "Lista semanal";
-App::$strings["List day"] = "Lista diaria";
-App::$strings["More"] = "Más";
-App::$strings["Less"] = "Menos";
-App::$strings["Select calendar"] = "Seleccionar un calendario";
-App::$strings["Delete all"] = "Eliminar todos";
-App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado.";
-App::$strings["Errors encountered creating database table: "] = "Errores encontrados al crear la tabla de la base de datos: ";
-App::$strings["Default Calendar"] = "Calendario por defecto";
-App::$strings["Default Addressbook"] = "Agenda de direcciones por defecto";
-App::$strings["CalDAV/CardDAV Settings saved."] = "Se ha guardado la configuración de CalDAV/CardDAV.";
-App::$strings["Enable CalDAV/CardDAV Server for this channel"] = "Habilitar el servidor CalDAV/CardDAV para este canal";
-App::$strings["Your CalDAV resources are located at %s "] = "Los recursos de CalDAV se encuentran en %s";
-App::$strings["Your CardDAV resources are located at %s "] = "Sus recursos de CalDAV están localizados en %s ";
-App::$strings["CalDAV/CardDAV Settings"] = "Configuración de CalDAV/CardDAV";
-App::$strings["Home, Voice"] = "Llamadas particulares";
-App::$strings["Home, Fax"] = "Fax particular";
-App::$strings["Work, Voice"] = "Llamadas de trabajo";
-App::$strings["Work, Fax"] = "Fax de trabajo";
-App::$strings["Select Channel"] = "Seleccionar un canal";
-App::$strings["Read-write"] = "Lectura y escritura";
-App::$strings["Read-only"] = "Sólo lectura";
-App::$strings["My Calendars"] = "Mis calendarios";
-App::$strings["Shared Calendars"] = "Calendarios compartidos";
-App::$strings["Share this calendar"] = "Compartir este calendario";
-App::$strings["Calendar name and color"] = "Nombre y color del calendario";
-App::$strings["Create new calendar"] = "Crear un nuevo calendario";
-App::$strings["Calendar Name"] = "Nombre del calendario";
-App::$strings["Calendar Tools"] = "Gestión de calendarios";
-App::$strings["Import calendar"] = "Importar un calendario";
-App::$strings["Select a calendar to import to"] = "Seleccionar un calendario para importarlo";
-App::$strings["Addressbooks"] = "Agenda de direcciones";
-App::$strings["Addressbook name"] = "Nombre de la agenda";
-App::$strings["Create new addressbook"] = "Crear una nueva agenda de direcciones";
-App::$strings["Addressbook Name"] = "Nombre de la agenda";
-App::$strings["Addressbook Tools"] = "Gestión de agendas de direcciones";
-App::$strings["Import addressbook"] = "Importar una agenda de direcciones";
-App::$strings["Select an addressbook to import to"] = "Seleccionar una agenda para importarla";
 App::$strings["Planets Settings updated."] = "Se han guardado los ajustes de Planets.";
 App::$strings["Enable Planets Plugin"] = "Habilitar el plugin Planets";
 App::$strings["Planets Settings"] = "Ajustes de Planets";
@@ -2078,9 +2085,11 @@ App::$strings["bonked"] = "ha golpeado a";
 App::$strings["declare undying love for"] = "una declaración de amor eterno";
 App::$strings["declared undying love for"] = "ha declarado amor eterno a";
 App::$strings["Diaspora Protocol Settings updated."] = "Los ajustes del protocolo de Diaspora se han actualizado.";
+App::$strings["The Diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos.";
 App::$strings["Enable the Diaspora protocol for this channel"] = "Activar el protocolo de Diaspora para este canal";
 App::$strings["Allow any Diaspora member to comment on your public posts"] = "Permitir a cualquier miembro de Diaspora comentar sus entradas públicas";
 App::$strings["Prevent your hashtags from being redirected to other sites"] = "Impedir que sus \"hashtags\" sean redirigidos a otros sitios ";
+App::$strings["Sign and forward posts and comments with no existing Diaspora signature"] = "Firmar y enviar entradas y comentarios sin firma de Diaspora";
 App::$strings["Followed hashtags (comma separated, do not include the #)"] = "\"Hashtags\" seguidos (separados por comas, sin incluir #)";
 App::$strings["Diaspora Protocol Settings"] = "Ajustes del protocolo de Diaspora";
 App::$strings["No username found in import file."] = "No se ha encontrado el nombre de usuario en el fichero de importación.";
@@ -2113,10 +2122,6 @@ App::$strings["Mail sent."] = "El correo electrónico ha sido enviado.";
 App::$strings["Sending of mail failed."] = "No se pudo enviar el correo.";
 App::$strings["Mail Test"] = "Prueba de correo";
 App::$strings["Message subject"] = "Asunto del mensaje";
-App::$strings["Reconnecting %d connections"] = "Reconectando %d conexiones";
-App::$strings["Diaspora Reconnect"] = "Reconectar con Diaspora";
-App::$strings["Use this form to re-establish Diaspora connections which were initially made from a different hub."] = "Utilice este formulario para restablecer las conexiones de diáspora que se hicieron inicialmente desde un hub diferente.";
-App::$strings["Reconnect"] = "Reconectar";
 App::$strings["View Larger"] = "Ver más grande";
 App::$strings["Tile Server URL"] = "URL del servidor de mosaicos de imágenes ";
 App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Una lista de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\"  target=\"_blank\">servidores públicos de mosaicos de imágenes</a>";
@@ -2342,6 +2347,10 @@ App::$strings["I won!"] = "¡He ganado yo!";
 App::$strings["Message to display on every page on this server"] = "Mensaje para mostrar en todas las páginas de este servidor";
 App::$strings["Pageheader Settings"] = "Ajustes del encabezado de página";
 App::$strings["pageheader Settings saved."] = "Se han guardado los ajustes del encabezado de página.";
+App::$strings["Only authenticate automatically to sites of your friends"] = "Autenticación automática solo en los sitios de sus amigos";
+App::$strings["By default you are automatically authenticated anywhere in the network"] = "De forma predeterminada, se autenticará automáticamente en cualquier parte de la red";
+App::$strings["Authchoose Settings"] = "Ajustes de Authchoose";
+App::$strings["Atuhchoose Settings updated."] = "Se han actualizado los ajustes de Atuhchoose.";
 App::$strings["lonely"] = "Solo/a";
 App::$strings["drunk"] = "ebrio/a";
 App::$strings["horny"] = "caliente";
@@ -2390,6 +2399,8 @@ App::$strings["Pump.io Post Settings"] = "Ajustes de publicación en pump.io";
 App::$strings["PumpIO Settings saved."] = "Se han guardado los ajustes de PumpIO.";
 App::$strings["An account has been created for you."] = "Se ha creado una cuenta para usted.";
 App::$strings["Authentication successful but rejected: account creation is disabled."] = "Autenticación correcta pero rechazada: la creación de cuentas está deshabilitada.";
+App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Buscar %1\$s (%2\$s)";
+App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
 App::$strings["Search \$Projectname"] = "Buscar \$Projectname";
 App::$strings["Redmatrix File Storage Import"] = "Importar repositorio de ficheros de Redmatrix";
 App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Esto importará todos sus ficheros de la nube de Redmatrix a este canal.";
@@ -2551,19 +2562,6 @@ App::$strings["__ctx:noun__ Abstain"] = array(
 	0 => "se abstiene",
 	1 => "Se abstienen",
 );
-App::$strings["Can view my normal stream and posts"] = "Pueden verse mi actividad y publicaciones normales";
-App::$strings["Can view my webpages"] = "Pueden verse mis páginas web";
-App::$strings["Can post on my channel page (\"wall\")"] = "Pueden crearse entradas en mi página de inicio del canal (“muro”)";
-App::$strings["Can like/dislike stuff"] = "Puede marcarse contenido como me gusta/no me gusta";
-App::$strings["Profiles and things other than posts/comments"] = "Perfiles y otras cosas aparte de publicaciones/comentarios";
-App::$strings["Can forward to all my channel contacts via post @mentions"] = "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención";
-App::$strings["Advanced - useful for creating group forum channels"] = "Avanzado - útil para crear canales de foros de discusión o grupos";
-App::$strings["Can chat with me (when available)"] = "Se puede charlar conmigo (cuando esté disponible)";
-App::$strings["Can write to my file storage and photos"] = "Puede escribirse en mi repositorio de ficheros y fotos";
-App::$strings["Can edit my webpages"] = "Pueden editarse mis páginas web";
-App::$strings["Somewhat advanced - very useful in open communities"] = "Algo avanzado - muy útil en comunidades abiertas";
-App::$strings["Can administer my channel resources"] = "Pueden administrarse mis recursos del canal";
-App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo.";
 App::$strings["Directory Options"] = "Opciones del directorio";
 App::$strings["Safe Mode"] = "Modo seguro";
 App::$strings["Public Forums Only"] = "Solo foros públicos";
@@ -2634,11 +2632,13 @@ App::$strings["Unknown Attachment"] = "Adjunto no reconocido";
 App::$strings["unknown"] = "desconocido";
 App::$strings["remove category"] = "eliminar el tema";
 App::$strings["remove from file"] = "eliminar del fichero";
+App::$strings["Download binary/encrypted content"] = "Descargar contenido binario o cifrado";
 App::$strings["default"] = "por defecto";
 App::$strings["Page layout"] = "Plantilla de la página";
 App::$strings["You can create your own with the layouts tool"] = "Puede crear su propia disposición gráfica con la herramienta de plantillas";
 App::$strings["Page content type"] = "Tipo de contenido de la página";
 App::$strings["activity"] = "la actividad";
+App::$strings["a-z, 0-9, -, _, and . only"] = "a-z, 0-9, -, _, and . only";
 App::$strings["Design Tools"] = "Herramientas de diseño web";
 App::$strings["Pages"] = "Páginas";
 App::$strings["Import website..."] = "Importar un sitio web...";
@@ -2672,11 +2672,7 @@ App::$strings["%d connection in common"] = array(
 	1 => "%d conexiones en común",
 );
 App::$strings["show more"] = "mostrar más";
-App::$strings["Attachments:"] = "Ficheros adjuntos: ";
-App::$strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
-App::$strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname: ";
-App::$strings["Starts:"] = "Comienza:";
-App::$strings["Finishes:"] = "Finaliza:";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s";
 App::$strings["Channel is blocked on this site."] = "El canal está bloqueado en este sitio.";
 App::$strings["Channel location missing."] = "Falta la dirección del canal.";
 App::$strings["Response from remote channel was incomplete."] = "Respuesta incompleta del canal.";
@@ -2793,11 +2789,13 @@ App::$strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso
 App::$strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio.";
 App::$strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada";
 App::$strings["Default Profile"] = "Perfil principal";
+App::$strings["Unable to retrieve modified identity"] = "No se puede recuperar la identidad modficada";
 App::$strings["Create New Profile"] = "Crear un nuevo perfil";
 App::$strings["Visible to everybody"] = "Visible para todos";
 App::$strings["Gender:"] = "Género:";
 App::$strings["Homepage:"] = "Página personal:";
 App::$strings["Online Now"] = "Ahora en línea";
+App::$strings["Trans"] = "Trans";
 App::$strings["Like this channel"] = "Me gusta este canal";
 App::$strings["j F, Y"] = "j F Y";
 App::$strings["j F"] = "j F";
@@ -2821,25 +2819,31 @@ App::$strings["Work/employment:"] = "Trabajo:";
 App::$strings["School/education:"] = "Estudios:";
 App::$strings["Like this thing"] = "Me gusta esto";
 App::$strings["User '%s' deleted"] = "El usuario '%s' ha sido eliminado";
+App::$strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
+App::$strings["Starts:"] = "Comienza:";
+App::$strings["Finishes:"] = "Finaliza:";
 App::$strings["This event has been added to your calendar."] = "Este evento ha sido añadido a su calendario.";
 App::$strings["Not specified"] = "Sin especificar";
 App::$strings["Needs Action"] = "Necesita de una intervención";
 App::$strings["Completed"] = "Completado/a";
 App::$strings["In Process"] = "En proceso";
 App::$strings["Cancelled"] = "Cancelado/a";
+App::$strings["Home, Voice"] = "Llamadas particulares";
+App::$strings["Home, Fax"] = "Fax particular";
+App::$strings["Work, Voice"] = "Llamadas de trabajo";
+App::$strings["Work, Fax"] = "Fax de trabajo";
 App::$strings["view full size"] = "Ver en el tamaño original";
-App::$strings["No Subject"] = "Sin asunto";
 App::$strings["Friendica"] = "Friendica";
 App::$strings["OStatus"] = "OStatus";
 App::$strings["GNU-Social"] = "GNU Social";
 App::$strings["RSS/Atom"] = "RSS/Atom";
+App::$strings["ActivityPub"] = "ActivityPub";
 App::$strings["Diaspora"] = "Diaspora";
 App::$strings["Facebook"] = "Facebook";
 App::$strings["Zot"] = "Zot";
 App::$strings["LinkedIn"] = "LinkedIn";
 App::$strings["XMPP/IM"] = "XMPP/IM";
 App::$strings["MySpace"] = "MySpace";
-App::$strings["New Page"] = "Nueva página";
 App::$strings["Select an alternate language"] = "Seleccionar un idioma alternativo";
 App::$strings["Who can see this?"] = "¿Quién puede ver esto?";
 App::$strings["Custom selection"] = "Selección personalizada";
@@ -2852,7 +2856,6 @@ App::$strings["Image/photo"] = "Imagen/foto";
 App::$strings["Encrypted content"] = "Contenido cifrado";
 App::$strings["Install %s element: "] = "Instalar el elemento %s:";
 App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s";
 App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar";
 App::$strings["spoiler"] = "spoiler";
 App::$strings["$1 wrote:"] = "$1 escribió:";
@@ -3015,6 +3018,7 @@ App::$strings["Mark all channel notifications seen"] = "Marcar todas las notific
 App::$strings["Notices"] = "Avisos";
 App::$strings["Notifications"] = "Notificaciones";
 App::$strings["View all notifications"] = "Ver todas las notificaciones";
+App::$strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas";
 App::$strings["Private mail"] = "Correo privado";
 App::$strings["View your private messages"] = "Ver sus mensajes privados";
 App::$strings["Mark all private messages seen"] = "Marcar todos los mensajes privados como leídos";
@@ -3023,10 +3027,16 @@ App::$strings["View events"] = "Ver los eventos";
 App::$strings["Mark all events seen"] = "Marcar todos los eventos como leidos";
 App::$strings["Manage Your Channels"] = "Gestionar sus canales";
 App::$strings["Account/Channel Settings"] = "Ajustes de cuenta/canales";
+App::$strings["Shared Files"] = "Ficheros compartidos";
+App::$strings["New files shared with me"] = "Nuevos ficheros compartidos conmigo";
+App::$strings["Public stream"] = "\"Stream\" público";
+App::$strings["Public stream activities"] = "Actividades del \"stream\" público";
 App::$strings["Site Setup and Configuration"] = "Ajustes y configuración del sitio";
 App::$strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido";
 App::$strings["Please wait..."] = "Espere por favor…";
 App::$strings["Add Apps"] = "Añadir aplicaciones";
+App::$strings["Arrange Apps"] = "Organizar aplicaciones";
+App::$strings["Toggle System Apps"] = "Alternar aplicaciones de sistema";
 App::$strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio";
 App::$strings["Image file is empty."] = "El fichero de imagen está vacío. ";
 App::$strings["Photo storage failed."] = "La foto no ha podido ser guardada.";
-- 
cgit v1.2.3


From a100c47f117d3e4be7f7f1bd375843039b11683d Mon Sep 17 00:00:00 2001
From: Andrew Manning <andrewmanning@grid.reticu.li>
Date: Thu, 3 Aug 2017 01:56:54 +0000
Subject: Fix styling on help page content list in sidebar.

---
 view/css/mod_help.css | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'view')

diff --git a/view/css/mod_help.css b/view/css/mod_help.css
index c0b0bafa3..643885c99 100644
--- a/view/css/mod_help.css
+++ b/view/css/mod_help.css
@@ -19,3 +19,11 @@
 	#doco-top-toc li {
 	padding: 3px 0px;
 }
+
+#doco-side-toc li {
+	padding-left: 10px;
+}
+
+#doco-side-toc {
+	padding-top: 10px;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 4edf580ebfc75e26a073bfcabfb338b54cf18f63 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Thu, 3 Aug 2017 15:30:40 +0200
Subject: fix attachment upload for private mail

---
 view/tpl/msg-header.tpl  | 53 +++++++++++++++++++++++-------------------------
 view/tpl/prv_message.tpl |  1 +
 2 files changed, 26 insertions(+), 28 deletions(-)

(limited to 'view')

diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 013e1cfdc..0e8fb0389 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -1,34 +1,31 @@
-<script type="text/javascript" src="view/js/ajaxupload.js" ></script>
-<script language="javascript" type="text/javascript">
-
-	$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
-
-
+<script src="library/blueimp_upload/js/vendor/jquery.ui.widget.js"></script>
+<script src="library/blueimp_upload/js/jquery.iframe-transport.js"></script>
+<script src="library/blueimp_upload/js/jquery.fileupload.js"></script>
+<script>
 	$(document).ready(function() {
 
-		var file_uploader = new window.AjaxUpload(
-			'prvmail-attach-wrapper',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addmailtext(response);
-					$('#prvmail-rotator').spin(false);
-				}
-			}
-		);
+		$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
+
+		$('#invisible-wall-file-upload').fileupload({
+			url: 'wall_attach/{{$nickname}}',
+			dataType: 'json',
+			dropZone: $('#prvmail-text'),
+			maxChunkSize: 4 * 1024 * 1024,
+			add: function(e,data) {
+				$('#prvmail-rotator').spin('tiny');
+				data.submit();
+			},
+			done: function(e,data) {
+				addmailtext(data.result.message);
+				$('#jot-media').val($('#jot-media').val() + data.result.message);
+			},
+			stop: function(e,data) {
+				$('#prvmail-rotator').spin(false);
+			},
+		});
 
-		var file_uploader_sub = new window.AjaxUpload(
-			'prvmail-attach-sub',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addmailtext(response);
-					$('#prvmail-rotator').spin(false);
-				}
-			}
-		);
+		$('#prvmail-attach-wrapper').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;});
+		$('#prvmail-attach-wrapper-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;});
 
 
 	});
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 925447ff2..af6315c7e 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -6,6 +6,7 @@
 	<div class="section-content-wrapper">
 {{/if}}
 		<div id="prvmail-wrapper" >
+			<input id="invisible-wall-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple>
 			<form id="prvmail-form" action="mail" method="post" >
 				<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
 				<input type="hidden" name="media_str" id="jot-media" value="" />
-- 
cgit v1.2.3


From d704832ff6b3049a960fef13cada484270fde451 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Thu, 3 Aug 2017 20:35:42 +0200
Subject: fix issue #836 - missing opening form tag

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

(limited to 'view')

diff --git a/view/tpl/cdav_widget_addressbook.tpl b/view/tpl/cdav_widget_addressbook.tpl
index c875dc977..80b5feaf6 100644
--- a/view/tpl/cdav_widget_addressbook.tpl
+++ b/view/tpl/cdav_widget_addressbook.tpl
@@ -47,6 +47,7 @@
 		</li>
 		<div id="upload-form" class="sub-menu-wrapper">
 			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
 					<div class="form-group">
 						<select id="import" name="target" class="form-control">
 							<option value="">{{$import_placeholder}}</option>
-- 
cgit v1.2.3


From 23f9f8bc3bc24a30eb954f73e7e4846ae4fcbb69 Mon Sep 17 00:00:00 2001
From: phellmes <development@suschka.de>
Date: Sat, 5 Aug 2017 14:32:44 +0200
Subject: Update DE translation strings

---
 view/de/hmessages.po | 4450 +++++++++++++++++++++++++-------------------------
 view/de/hstrings.php |  366 +++--
 2 files changed, 2433 insertions(+), 2383 deletions(-)

(limited to 'view')

diff --git a/view/de/hmessages.po b/view/de/hmessages.po
index 9c24dcbbd..8ab7a7f21 100644
--- a/view/de/hmessages.po
+++ b/view/de/hmessages.po
@@ -13,7 +13,7 @@
 # Harald Klimach <harald@klimachs.de>, 2016
 # JooBee <d13@raclan.de>, 2014
 # Kai <kai@proppower.de>, 2015
-# Oliver <post@toktan.org>, 2015-2016
+# Oliver <post@toktan.org>, 2015-2017
 # Phellmes <forum@suschka.de>, 2014,2016-2017
 # sasiflo <transiflex@sasiflo.de>, 2014
 # Steff <steff@digitalesecho.de>, 2015-2016
@@ -25,9 +25,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 15:36+0200\n"
-"PO-Revision-Date: 2017-05-07 00:56+0000\n"
-"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"POT-Creation-Date: 2017-08-01 12:13+0200\n"
+"PO-Revision-Date: 2017-08-05 12:18+0000\n"
+"Last-Translator: Phellmes <forum@suschka.de>\n"
 "Language-Team: German (http://www.transifex.com/Friendica/red-matrix/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,163 +35,147 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../Zotlabs/Access/Permissions.php:46
+#: ../../Zotlabs/Access/Permissions.php:53
 msgid "Can view my channel stream and posts"
 msgstr "Kann meinen Kanal-Stream und meine Beiträge sehen"
 
-#: ../../Zotlabs/Access/Permissions.php:47 ../../include/permissions.php:42
+#: ../../Zotlabs/Access/Permissions.php:54
 msgid "Can send me their channel stream and posts"
 msgstr "Kann mir die Beiträge aus seinem/ihrem Kanal schicken"
 
-#: ../../Zotlabs/Access/Permissions.php:48 ../../include/permissions.php:36
+#: ../../Zotlabs/Access/Permissions.php:55
 msgid "Can view my default channel profile"
 msgstr "Kann mein Standardprofil sehen"
 
-#: ../../Zotlabs/Access/Permissions.php:49 ../../include/permissions.php:37
+#: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my connections"
 msgstr "Kann meine Verbindungen sehen"
 
-#: ../../Zotlabs/Access/Permissions.php:50 ../../include/permissions.php:38
+#: ../../Zotlabs/Access/Permissions.php:57
 msgid "Can view my file storage and photos"
 msgstr "Kann meine Datei- und Bilderordner sehen"
 
-#: ../../Zotlabs/Access/Permissions.php:51
+#: ../../Zotlabs/Access/Permissions.php:58
 msgid "Can upload/modify my file storage and photos"
 msgstr "Kann in meine Datei- und Bilderordner hochladen/ändern"
 
-#: ../../Zotlabs/Access/Permissions.php:52
+#: ../../Zotlabs/Access/Permissions.php:59
 msgid "Can view my channel webpages"
 msgstr "Kann die Webseiten meines Kanals sehen"
 
-#: ../../Zotlabs/Access/Permissions.php:53
+#: ../../Zotlabs/Access/Permissions.php:60
 msgid "Can view my wiki pages"
 msgstr "Kann meine Wiki-Seiten sehen"
 
-#: ../../Zotlabs/Access/Permissions.php:54
+#: ../../Zotlabs/Access/Permissions.php:61
 msgid "Can create/edit my channel webpages"
 msgstr "Kann Webseiten in meinem Kanal erstellen/ändern"
 
-#: ../../Zotlabs/Access/Permissions.php:55
+#: ../../Zotlabs/Access/Permissions.php:62
 msgid "Can write to my wiki pages"
 msgstr "Kann meine Wiki-Seiten bearbeiten"
 
-#: ../../Zotlabs/Access/Permissions.php:56
+#: ../../Zotlabs/Access/Permissions.php:63
 msgid "Can post on my channel (wall) page"
 msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
 
-#: ../../Zotlabs/Access/Permissions.php:57 ../../include/permissions.php:44
+#: ../../Zotlabs/Access/Permissions.php:64
 msgid "Can comment on or like my posts"
 msgstr "Darf meine Beiträge kommentieren und mögen/nicht mögen"
 
-#: ../../Zotlabs/Access/Permissions.php:58 ../../include/permissions.php:45
+#: ../../Zotlabs/Access/Permissions.php:65
 msgid "Can send me private mail messages"
 msgstr "Kann mir private Nachrichten schicken"
 
-#: ../../Zotlabs/Access/Permissions.php:59
+#: ../../Zotlabs/Access/Permissions.php:66
 msgid "Can like/dislike profiles and profile things"
 msgstr "Kann Profile und Profilsachen mögen/nicht mögen"
 
-#: ../../Zotlabs/Access/Permissions.php:60
+#: ../../Zotlabs/Access/Permissions.php:67
 msgid "Can forward to all my channel connections via @+ mentions in posts"
 msgstr "Kann an alle meine Verbindungen via @-Erwähnungen Nachrichten weiterleiten"
 
-#: ../../Zotlabs/Access/Permissions.php:61
+#: ../../Zotlabs/Access/Permissions.php:68
 msgid "Can chat with me"
 msgstr "Kann mit mir chatten"
 
-#: ../../Zotlabs/Access/Permissions.php:62 ../../include/permissions.php:53
+#: ../../Zotlabs/Access/Permissions.php:69
 msgid "Can source my public posts in derived channels"
 msgstr "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden"
 
-#: ../../Zotlabs/Access/Permissions.php:63
+#: ../../Zotlabs/Access/Permissions.php:70
 msgid "Can administer my channel"
 msgstr "Kann meinen Kanal administrieren"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:248
-#: ../../include/permissions.php:946
 msgid "Social Networking"
 msgstr "Soziales Netzwerk"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:249
-#: ../../include/permissions.php:946
 msgid "Social - Mostly Public"
 msgstr "Soziales Netzwerk - Weitgehend öffentlich"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:250
-#: ../../include/permissions.php:946
 msgid "Social - Restricted"
 msgstr "Soziales Netzwerk - Beschränkt"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:251
-#: ../../include/permissions.php:946
 msgid "Social - Private"
 msgstr "Soziales Netzwerk - Privat"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:254
-#: ../../include/permissions.php:947
 msgid "Community Forum"
 msgstr "Forum"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:255
-#: ../../include/permissions.php:947
 msgid "Forum - Mostly Public"
 msgstr "Forum - Weitgehend öffentlich"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:256
-#: ../../include/permissions.php:947
 msgid "Forum - Restricted"
 msgstr "Forum - Beschränkt"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:257
-#: ../../include/permissions.php:947
 msgid "Forum - Private"
 msgstr "Forum - Privat"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:260
-#: ../../include/permissions.php:948
 msgid "Feed Republish"
 msgstr "Teilen von Feeds"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:261
-#: ../../include/permissions.php:948
 msgid "Feed - Mostly Public"
 msgstr "Feeds - Weitgehend öffentlich"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:262
-#: ../../include/permissions.php:948
 msgid "Feed - Restricted"
 msgstr "Feeds - Beschränkt"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:265
-#: ../../include/permissions.php:949
 msgid "Special Purpose"
 msgstr "Für besondere Zwecke"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:266
-#: ../../include/permissions.php:949
 msgid "Special - Celebrity/Soapbox"
 msgstr "Speziell - Mitteilungs-Kanal (keine Kommentare)"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:267
-#: ../../include/permissions.php:949
 msgid "Special - Group Repository"
 msgstr "Speziell - Gruppenarchiv"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:270
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Settings/Channel.php:463
-#: ../../Zotlabs/Module/Connedit.php:914 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Register.php:213 ../../addon/cdav/Mod_Cdav.php:1148
-#: ../../addon/cdav/cdav.php:277 ../../addon/cdav/cdav.php:284
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-#: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:950 ../../include/connections.php:675
-#: ../../include/connections.php:682
+#: ../../Zotlabs/Module/Cdav.php:1123 ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Settings/Channel.php:467
+#: ../../Zotlabs/Module/Connedit.php:932 ../../Zotlabs/Module/Profiles.php:798
+#: ../../Zotlabs/Module/Register.php:213 ../../include/selectors.php:49
+#: ../../include/selectors.php:66 ../../include/selectors.php:104
+#: ../../include/selectors.php:140 ../../include/event.php:1297
+#: ../../include/event.php:1304 ../../include/connections.php:681
+#: ../../include/connections.php:688
 msgid "Other"
 msgstr "Andere"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:271
-#: ../../include/permissions.php:950
 msgid "Custom/Expert Mode"
 msgstr "Benutzerdefiniert/Expertenmodus"
 
@@ -201,7 +185,7 @@ msgstr "Benutzerdefiniert/Expertenmodus"
 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32
 #: ../../Zotlabs/Module/Webpages.php:33
-#: ../../Zotlabs/Module/Filestorage.php:59 ../../include/channel.php:945
+#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1062
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht verfügbar."
 
@@ -215,41 +199,43 @@ msgstr "Das angefragte Profil ist nicht verfügbar."
 #: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Setup.php:212
+#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209
+#: ../../Zotlabs/Module/Moderate.php:13
 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:274
 #: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335
 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100
+#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:102
 #: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29
-#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:61
+#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64
 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
-#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:315
-#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Wiki.php:235 ../../Zotlabs/Module/Wiki.php:341
+#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149
 #: ../../Zotlabs/Module/Profile_photo.php:280
 #: ../../Zotlabs/Module/Profile_photo.php:293
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:221
-#: ../../Zotlabs/Module/Item.php:231 ../../Zotlabs/Module/Item.php:1038
-#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
-#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Chat.php:98
-#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Menu.php:78
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:223
+#: ../../Zotlabs/Module/Item.php:240 ../../Zotlabs/Module/Item.php:250
+#: ../../Zotlabs/Module/Item.php:1076 ../../Zotlabs/Module/Page.php:34
+#: ../../Zotlabs/Module/Page.php:125 ../../Zotlabs/Module/Connedit.php:385
+#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
+#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71
+#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
+#: ../../Zotlabs/Module/Group.php:13 ../../Zotlabs/Module/Profiles.php:198
+#: ../../Zotlabs/Module/Profiles.php:635
 #: ../../Zotlabs/Module/Editwebpage.php:68
 #: ../../Zotlabs/Module/Editwebpage.php:89
 #: ../../Zotlabs/Module/Editwebpage.php:107
 #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Webpages.php:116 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Webpages.php:118 ../../Zotlabs/Module/Block.php:24
+#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Editpost.php:17
 #: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Like.php:181
 #: ../../Zotlabs/Module/Suggest.php:28 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Mail.php:146 ../../Zotlabs/Module/Register.php:77
 #: ../../Zotlabs/Module/Cover_photo.php:281
 #: ../../Zotlabs/Module/Cover_photo.php:294
-#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Filestorage.php:23
-#: ../../Zotlabs/Module/Filestorage.php:78
-#: ../../Zotlabs/Module/Filestorage.php:93
-#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Common.php:39
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Filestorage.php:15
+#: ../../Zotlabs/Module/Filestorage.php:70
+#: ../../Zotlabs/Module/Filestorage.php:85
+#: ../../Zotlabs/Module/Filestorage.php:112 ../../Zotlabs/Module/Common.php:39
 #: ../../Zotlabs/Module/Viewconnections.php:28
 #: ../../Zotlabs/Module/Viewconnections.php:33
 #: ../../Zotlabs/Module/Service_limits.php:11
@@ -257,16 +243,14 @@ msgstr "Das angefragte Profil ist nicht verfügbar."
 #: ../../Zotlabs/Lib/Chatroom.php:137 ../../Zotlabs/Web/WebServer.php:131
 #: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53
 #: ../../addon/gitwiki/Mod_Gitwiki.php:196
-#: ../../addon/gitwiki/Mod_Gitwiki.php:292
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:58
-#: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:144
-#: ../../include/attach.php:191 ../../include/attach.php:255
-#: ../../include/attach.php:269 ../../include/attach.php:276
-#: ../../include/attach.php:344 ../../include/attach.php:358
-#: ../../include/attach.php:365 ../../include/attach.php:442
-#: ../../include/attach.php:909 ../../include/attach.php:983
-#: ../../include/attach.php:1148 ../../include/items.php:3470
-#: ../../include/photos.php:27
+#: ../../addon/gitwiki/Mod_Gitwiki.php:292 ../../addon/pumpio/pumpio.php:40
+#: ../../include/attach.php:144 ../../include/attach.php:191
+#: ../../include/attach.php:255 ../../include/attach.php:269
+#: ../../include/attach.php:276 ../../include/attach.php:344
+#: ../../include/attach.php:358 ../../include/attach.php:365
+#: ../../include/attach.php:443 ../../include/attach.php:918
+#: ../../include/attach.php:992 ../../include/attach.php:1157
+#: ../../include/items.php:3440 ../../include/photos.php:28
 msgid "Permission denied."
 msgstr "Berechtigung verweigert."
 
@@ -275,7 +259,7 @@ msgstr "Berechtigung verweigert."
 msgid "Block Name"
 msgstr "Block-Name"
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2267
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2280
 msgid "Blocks"
 msgstr "Blöcke"
 
@@ -284,25 +268,22 @@ msgid "Block Title"
 msgstr "Titel des Blocks"
 
 #: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:256
-#: ../../include/page_widgets.php:47
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251
 msgid "Created"
 msgstr "Erstellt"
 
 #: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:257
-#: ../../include/page_widgets.php:48
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252
 msgid "Edited"
 msgstr "Geändert"
 
-#: ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Cdav.php:1126
 #: ../../Zotlabs/Module/New_channel.php:147
-#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/Connedit.php:935 ../../Zotlabs/Module/Menu.php:118
 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801
-#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Storage/Browser.php:228
-#: ../../Zotlabs/Storage/Browser.php:332 ../../addon/cdav/Mod_Cdav.php:1151
-#: ../../addon/cdav/include/widgets.php:127
-#: ../../addon/cdav/include/widgets.php:164
+#: ../../Zotlabs/Module/Webpages.php:239 ../../Zotlabs/Storage/Browser.php:229
+#: ../../Zotlabs/Storage/Browser.php:335 ../../Zotlabs/Widget/Cdav.php:127
+#: ../../Zotlabs/Widget/Cdav.php:164
 msgid "Create"
 msgstr "Erstelle"
 
@@ -310,52 +291,49 @@ msgstr "Erstelle"
 #: ../../Zotlabs/Module/Admin/Profs.php:154
 #: ../../Zotlabs/Module/Settings/Oauth.php:149
 #: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Connections.php:296
-#: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Wiki.php:165
-#: ../../Zotlabs/Module/Wiki.php:275 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Zotlabs/Module/Connections.php:297
+#: ../../Zotlabs/Module/Connections.php:317 ../../Zotlabs/Module/Wiki.php:167
+#: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Menu.php:112
 #: ../../Zotlabs/Module/Layouts.php:193
 #: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Editpost.php:80
-#: ../../Zotlabs/Lib/Apps.php:367 ../../Zotlabs/Lib/ThreadItem.php:107
-#: ../../Zotlabs/Storage/Browser.php:238
-#: ../../addon/cdav/include/widgets.php:125
-#: ../../addon/cdav/include/widgets.php:161
-#: ../../addon/gitwiki/Mod_Gitwiki.php:151
-#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1044
-#: ../../include/channel.php:1048 ../../include/menu.php:113
-#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
+#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Editpost.php:85
+#: ../../Zotlabs/Lib/Apps.php:393 ../../Zotlabs/Lib/ThreadItem.php:107
+#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Widget/Cdav.php:125
+#: ../../Zotlabs/Widget/Cdav.php:161 ../../addon/gitwiki/Mod_Gitwiki.php:151
+#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1161
+#: ../../include/channel.php:1165 ../../include/menu.php:113
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1042
-#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:246
-#: ../../addon/cdav/include/widgets.php:123
-#: ../../include/conversation.php:1311
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1044
+#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:241
+#: ../../Zotlabs/Widget/Cdav.php:123 ../../include/conversation.php:1308
 msgid "Share"
 msgstr "Teilen"
 
 #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
+#: ../../Zotlabs/Module/Cdav.php:838 ../../Zotlabs/Module/Cdav.php:1128
 #: ../../Zotlabs/Module/Admin/Accounts.php:173
 #: ../../Zotlabs/Module/Admin/Channels.php:149
 #: ../../Zotlabs/Module/Admin/Profs.php:155
 #: ../../Zotlabs/Module/Settings/Oauth.php:150
 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Connections.php:267
-#: ../../Zotlabs/Module/Photos.php:1143 ../../Zotlabs/Module/Connedit.php:650
-#: ../../Zotlabs/Module/Connedit.php:919 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Connections.php:268
+#: ../../Zotlabs/Module/Photos.php:1145 ../../Zotlabs/Module/Connedit.php:650
+#: ../../Zotlabs/Module/Connedit.php:937 ../../Zotlabs/Module/Group.php:179
 #: ../../Zotlabs/Module/Profiles.php:803
 #: ../../Zotlabs/Module/Editwebpage.php:167
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/Apps.php:368
-#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:239
-#: ../../addon/cdav/Mod_Cdav.php:864 ../../addon/cdav/Mod_Cdav.php:1153
-#: ../../include/conversation.php:654
+#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:394
+#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:240
+#: ../../include/conversation.php:649 ../../include/conversation.php:686
 msgid "Delete"
 msgstr "Löschen"
 
 #: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
-#: ../../Zotlabs/Module/Wiki.php:167 ../../Zotlabs/Module/Layouts.php:198
-#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Pubsites.php:59
-#: ../../addon/gitwiki/Mod_Gitwiki.php:153 ../../include/page_widgets.php:42
+#: ../../Zotlabs/Module/Wiki.php:169 ../../Zotlabs/Module/Layouts.php:198
+#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:59
+#: ../../addon/gitwiki/Mod_Gitwiki.php:153
 msgid "View"
 msgstr "Ansicht"
 
@@ -388,52 +366,56 @@ msgid_plural "%d messages sent."
 msgstr[0] "%d Nachricht gesendet."
 msgstr[1] "%d Nachrichten gesendet."
 
-#: ../../Zotlabs/Module/Invite.php:105
+#: ../../Zotlabs/Module/Invite.php:98 ../../Zotlabs/Lib/Apps.php:254
+msgid "Invite"
+msgstr "Einladen"
+
+#: ../../Zotlabs/Module/Invite.php:107
 msgid "You have no more invitations available"
 msgstr "Du hast keine weiteren verfügbare Einladungen"
 
-#: ../../Zotlabs/Module/Invite.php:136
+#: ../../Zotlabs/Module/Invite.php:138
 msgid "Send invitations"
 msgstr "Einladungen senden"
 
-#: ../../Zotlabs/Module/Invite.php:137
+#: ../../Zotlabs/Module/Invite.php:139
 msgid "Enter email addresses, one per line:"
 msgstr "Email-Adressen eintragen, eine pro Zeile:"
 
-#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:303
+#: ../../Zotlabs/Module/Invite.php:140 ../../Zotlabs/Module/Mail.php:285
 msgid "Your message:"
 msgstr "Deine Nachricht:"
 
-#: ../../Zotlabs/Module/Invite.php:139
+#: ../../Zotlabs/Module/Invite.php:141
 msgid "Please join my community on $Projectname."
 msgstr "Schließe Dich uns auf $Projectname an!"
 
-#: ../../Zotlabs/Module/Invite.php:141
+#: ../../Zotlabs/Module/Invite.php:143
 msgid "You will need to supply this invitation code:"
 msgstr "Bitte verwende bei der Registrierung den folgenden Einladungscode:"
 
-#: ../../Zotlabs/Module/Invite.php:142
+#: ../../Zotlabs/Module/Invite.php:144
 msgid ""
 "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr "1. Registriere Dich auf einem beliebigen $Projectname-Hub (sie sind alle miteinander verbunden)"
 
-#: ../../Zotlabs/Module/Invite.php:144
+#: ../../Zotlabs/Module/Invite.php:146
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr "2. Gib meine $Projectname-Adresse im Suchfeld ein."
 
-#: ../../Zotlabs/Module/Invite.php:145
+#: ../../Zotlabs/Module/Invite.php:147
 msgid "or visit"
 msgstr "oder besuche"
 
-#: ../../Zotlabs/Module/Invite.php:147
+#: ../../Zotlabs/Module/Invite.php:149
 msgid "3. Click [Connect]"
 msgstr "3. Klicke auf [Verbinden]"
 
-#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121
 #: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Appman.php:134
+#: ../../Zotlabs/Module/Appman.php:148
 #: ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:357
+#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349
 #: ../../Zotlabs/Module/Connect.php:98
 #: ../../Zotlabs/Module/Admin/Features.php:66
 #: ../../Zotlabs/Module/Admin/Plugins.php:438
@@ -441,35 +423,35 @@ msgstr "3. Klicke auf [Verbinden]"
 #: ../../Zotlabs/Module/Admin/Logs.php:84
 #: ../../Zotlabs/Module/Admin/Channels.php:147
 #: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Site.php:279
+#: ../../Zotlabs/Module/Admin/Site.php:271
 #: ../../Zotlabs/Module/Admin/Profs.php:157
 #: ../../Zotlabs/Module/Admin/Account_edit.php:74
 #: ../../Zotlabs/Module/Admin/Security.php:104
 #: ../../Zotlabs/Module/Settings/Permcats.php:110
-#: ../../Zotlabs/Module/Settings/Channel.php:476
+#: ../../Zotlabs/Module/Settings/Channel.php:480
 #: ../../Zotlabs/Module/Settings/Features.php:47
 #: ../../Zotlabs/Module/Settings/Tokens.php:168
 #: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Zotlabs/Module/Settings/Featured.php:52
 #: ../../Zotlabs/Module/Settings/Display.php:203
 #: ../../Zotlabs/Module/Settings/Oauth.php:87
 #: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Import.php:514 ../../Zotlabs/Module/Cal.php:343
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:657
-#: ../../Zotlabs/Module/Photos.php:1022 ../../Zotlabs/Module/Photos.php:1062
-#: ../../Zotlabs/Module/Photos.php:1180 ../../Zotlabs/Module/Wiki.php:169
-#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Chat.php:194
-#: ../../Zotlabs/Module/Chat.php:240 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Profiles.php:726
+#: ../../Zotlabs/Module/Import.php:518 ../../Zotlabs/Module/Cal.php:343
+#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:659
+#: ../../Zotlabs/Module/Photos.php:1024 ../../Zotlabs/Module/Photos.php:1064
+#: ../../Zotlabs/Module/Photos.php:1182 ../../Zotlabs/Module/Wiki.php:171
+#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:200
+#: ../../Zotlabs/Module/Connedit.php:900 ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:242 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726
 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
-#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:449
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Rate.php:166
-#: ../../Zotlabs/Lib/ThreadItem.php:732
+#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431
+#: ../../Zotlabs/Module/Filestorage.php:155 ../../Zotlabs/Module/Rate.php:166
+#: ../../Zotlabs/Lib/ThreadItem.php:730
 #: ../../Zotlabs/Widget/Eventstools.php:16
-#: ../../view/theme/redbasic/php/config.php:84
-#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:134
-#: ../../addon/cdav/cdav.php:246 ../../addon/planets/planets.php:157
+#: ../../view/theme/redbasic/php/config.php:95
+#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:226
+#: ../../addon/planets/planets.php:153
 #: ../../addon/openclipatar/openclipatar.php:53
 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92
 #: ../../addon/ijpost/ijpost.php:89 ../../addon/dwpost/dwpost.php:89
@@ -477,7 +459,7 @@ msgstr "3. Klicke auf [Verbinden]"
 #: ../../addon/likebanner/likebanner.php:57
 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53
 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113
-#: ../../addon/diaspora/diaspora.php:712
+#: ../../addon/diaspora/diaspora.php:759
 #: ../../addon/gitwiki/Mod_Gitwiki.php:155
 #: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/visage/visage.php:170
 #: ../../addon/nsabait/nsabait.php:161 ../../addon/mailtest/mailtest.php:100
@@ -493,11 +475,11 @@ msgstr "3. Klicke auf [Verbinden]"
 #: ../../addon/statusnet/statusnet.php:432
 #: ../../addon/statusnet/statusnet.php:899 ../../addon/twitter/twitter.php:217
 #: ../../addon/twitter/twitter.php:259
-#: ../../addon/smileybutton/smileybutton.php:281
+#: ../../addon/smileybutton/smileybutton.php:219
 #: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48
-#: ../../addon/xmpp/xmpp.php:69 ../../addon/pumpio/pumpio.php:237
-#: ../../addon/redfiles/redfiles.php:124 ../../addon/hubwall/hubwall.php:95
-#: ../../include/js_strings.php:22
+#: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69
+#: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124
+#: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22
 msgid "Submit"
 msgstr "Absenden"
 
@@ -523,12 +505,12 @@ msgid "Edit Layout"
 msgstr "Layout bearbeiten"
 
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
-#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:74
 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
 #: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Web/WebServer.php:130
 #: ../../addon/redphotos/redphotos.php:119
 #: ../../addon/frphotos/frphotos.php:81 ../../addon/redfiles/redfiles.php:109
-#: ../../include/items.php:327
+#: ../../include/items.php:340
 msgid "Permission denied"
 msgstr "Keine Berechtigung"
 
@@ -540,7 +522,7 @@ msgstr "Ungültiger Profil-Identifikator"
 msgid "Profile Visibility Editor"
 msgstr "Profil-Sichtbarkeits-Editor"
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1362
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1485
 msgid "Profile"
 msgstr "Profil"
 
@@ -553,10 +535,291 @@ msgid "Visible To"
 msgstr "Sichtbar für"
 
 #: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:141
+#: ../../Zotlabs/Module/Connections.php:140
 msgid "All Connections"
 msgstr "Alle Verbindungen"
 
+#: ../../Zotlabs/Module/Cdav.php:726
+msgid "INVALID EVENT DISMISSED!"
+msgstr "UNGÜLTIGEN TERMIN ABGELEHNT!"
+
+#: ../../Zotlabs/Module/Cdav.php:727
+msgid "Summary: "
+msgstr "Zusammenfassung:"
+
+#: ../../Zotlabs/Module/Cdav.php:727 ../../Zotlabs/Module/Cdav.php:728
+#: ../../Zotlabs/Module/Cdav.php:735 ../../Zotlabs/Module/Embedphotos.php:146
+#: ../../Zotlabs/Module/Photos.php:759 ../../Zotlabs/Module/Photos.php:1215
+#: ../../Zotlabs/Lib/Apps.php:721 ../../Zotlabs/Lib/Apps.php:799
+#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:86
+#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1107
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: ../../Zotlabs/Module/Cdav.php:728
+msgid "Date: "
+msgstr "Datum:"
+
+#: ../../Zotlabs/Module/Cdav.php:729 ../../Zotlabs/Module/Cdav.php:736
+msgid "Reason: "
+msgstr "Grund:"
+
+#: ../../Zotlabs/Module/Cdav.php:734
+msgid "INVALID CARD DISMISSED!"
+msgstr "UNGÜLTIGE KARTE ABGELEHNT!"
+
+#: ../../Zotlabs/Module/Cdav.php:735
+msgid "Name: "
+msgstr "Name: "
+
+#: ../../Zotlabs/Module/Cdav.php:768
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../../Zotlabs/Module/Cdav.php:809 ../../Zotlabs/Module/Events.php:460
+msgid "Event title"
+msgstr "Termintitel"
+
+#: ../../Zotlabs/Module/Cdav.php:810 ../../Zotlabs/Module/Events.php:466
+msgid "Start date and time"
+msgstr "Startdatum und -zeit"
+
+#: ../../Zotlabs/Module/Cdav.php:810 ../../Zotlabs/Module/Cdav.php:811
+msgid "Example: YYYY-MM-DD HH:mm"
+msgstr "Beispiel: JJJJ-MM-TT HH:mm"
+
+#: ../../Zotlabs/Module/Cdav.php:811
+msgid "End date and time"
+msgstr "Enddatum und -zeit"
+
+#: ../../Zotlabs/Module/Cdav.php:812 ../../Zotlabs/Module/Events.php:473
+#: ../../Zotlabs/Module/Appman.php:138 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../addon/rendezvous/rendezvous.php:173
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../../Zotlabs/Module/Cdav.php:813 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509
+#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Module/Pubsites.php:51
+#: ../../include/js_strings.php:25
+msgid "Location"
+msgstr "Ort"
+
+#: ../../Zotlabs/Module/Cdav.php:820 ../../Zotlabs/Module/Events.php:689
+#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:337
+#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Photos.php:913
+msgid "Previous"
+msgstr "Voriges"
+
+#: ../../Zotlabs/Module/Cdav.php:821 ../../Zotlabs/Module/Events.php:690
+#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Cal.php:345
+#: ../../Zotlabs/Module/Photos.php:922
+msgid "Next"
+msgstr "Nächste"
+
+#: ../../Zotlabs/Module/Cdav.php:822 ../../Zotlabs/Module/Events.php:700
+#: ../../Zotlabs/Module/Cal.php:346
+msgid "Today"
+msgstr "Heute"
+
+#: ../../Zotlabs/Module/Cdav.php:823 ../../Zotlabs/Module/Events.php:695
+msgid "Month"
+msgstr "Monat"
+
+#: ../../Zotlabs/Module/Cdav.php:824 ../../Zotlabs/Module/Events.php:696
+msgid "Week"
+msgstr "Woche"
+
+#: ../../Zotlabs/Module/Cdav.php:825 ../../Zotlabs/Module/Events.php:697
+msgid "Day"
+msgstr "Tag"
+
+#: ../../Zotlabs/Module/Cdav.php:826
+msgid "List month"
+msgstr "Liste Monat"
+
+#: ../../Zotlabs/Module/Cdav.php:827
+msgid "List week"
+msgstr "Liste Woche"
+
+#: ../../Zotlabs/Module/Cdav.php:828
+msgid "List day"
+msgstr "Liste Tag"
+
+#: ../../Zotlabs/Module/Cdav.php:835
+msgid "More"
+msgstr "Mehr"
+
+#: ../../Zotlabs/Module/Cdav.php:836
+msgid "Less"
+msgstr "Weniger"
+
+#: ../../Zotlabs/Module/Cdav.php:837
+msgid "Select calendar"
+msgstr "Kalender auswählen"
+
+#: ../../Zotlabs/Module/Cdav.php:839
+msgid "Delete all"
+msgstr "Alles löschen"
+
+#: ../../Zotlabs/Module/Cdav.php:840 ../../Zotlabs/Module/Cdav.php:1129
+#: ../../Zotlabs/Module/Admin/Plugins.php:423
+#: ../../Zotlabs/Module/Settings/Oauth.php:88
+#: ../../Zotlabs/Module/Settings/Oauth.php:114
+#: ../../Zotlabs/Module/Wiki.php:290 ../../Zotlabs/Module/Wiki.php:316
+#: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/js_upload/js_upload.php:46
+#: ../../addon/gitwiki/Mod_Gitwiki.php:244
+#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1324
+#: ../../include/conversation.php:1373
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../../Zotlabs/Module/Cdav.php:841
+msgid "Sorry! Editing of recurrent events is not yet implemented."
+msgstr "Entschuldigung, aber das Bearbeiten von wiederkehrenden Veranstaltungen ist leider noch nicht implementiert."
+
+#: ../../Zotlabs/Module/Cdav.php:969
+msgid "CardDAV"
+msgstr "CardDAV"
+
+#: ../../Zotlabs/Module/Cdav.php:1111
+#: ../../Zotlabs/Module/Sharedwithme.php:105
+#: ../../Zotlabs/Module/Admin/Channels.php:159
+#: ../../Zotlabs/Module/Settings/Oauth.php:89
+#: ../../Zotlabs/Module/Settings/Oauth.php:115
+#: ../../Zotlabs/Module/Wiki.php:174 ../../Zotlabs/Module/Connedit.php:920
+#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:539
+#: ../../Zotlabs/Storage/Browser.php:234
+#: ../../Zotlabs/Widget/Wiki_page_history.php:22
+#: ../../addon/rendezvous/rendezvous.php:172
+#: ../../addon/gitwiki/Mod_Gitwiki.php:158
+msgid "Name"
+msgstr "Name"
+
+#: ../../Zotlabs/Module/Cdav.php:1112 ../../Zotlabs/Module/Connedit.php:921
+msgid "Organisation"
+msgstr "Organisation"
+
+#: ../../Zotlabs/Module/Cdav.php:1113 ../../Zotlabs/Module/Connedit.php:922
+msgid "Title"
+msgstr "Titel"
+
+#: ../../Zotlabs/Module/Cdav.php:1114 ../../Zotlabs/Module/Connedit.php:923
+#: ../../Zotlabs/Module/Profiles.php:789
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../../Zotlabs/Module/Cdav.php:1115
+#: ../../Zotlabs/Module/Admin/Accounts.php:169
+#: ../../Zotlabs/Module/Admin/Accounts.php:181
+#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Profiles.php:790
+#: ../../addon/openid/MysqlProvider.php:56
+#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
+#: ../../addon/redred/redred.php:107 ../../include/network.php:1697
+msgid "Email"
+msgstr "E-Mail"
+
+#: ../../Zotlabs/Module/Cdav.php:1116 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Zotlabs/Module/Profiles.php:791
+msgid "Instant messenger"
+msgstr "Sofortnachrichtendienst"
+
+#: ../../Zotlabs/Module/Cdav.php:1117 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Zotlabs/Module/Profiles.php:792
+msgid "Website"
+msgstr "Webseite"
+
+#: ../../Zotlabs/Module/Cdav.php:1118 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:502
+#: ../../Zotlabs/Module/Profiles.php:793
+msgid "Address"
+msgstr "Adresse"
+
+#: ../../Zotlabs/Module/Cdav.php:1119 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Zotlabs/Module/Profiles.php:794
+msgid "Note"
+msgstr "Hinweis"
+
+#: ../../Zotlabs/Module/Cdav.php:1120 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1290
+#: ../../include/connections.php:674
+msgid "Mobile"
+msgstr "Mobil"
+
+#: ../../Zotlabs/Module/Cdav.php:1121 ../../Zotlabs/Module/Connedit.php:930
+#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1291
+#: ../../include/connections.php:675
+msgid "Home"
+msgstr "Home"
+
+#: ../../Zotlabs/Module/Cdav.php:1122 ../../Zotlabs/Module/Connedit.php:931
+#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1294
+#: ../../include/connections.php:678
+msgid "Work"
+msgstr "Arbeit"
+
+#: ../../Zotlabs/Module/Cdav.php:1124 ../../Zotlabs/Module/Connedit.php:933
+#: ../../Zotlabs/Module/Profiles.php:799
+#: ../../addon/jappixmini/jappixmini.php:368
+msgid "Add Contact"
+msgstr "Kontakt hinzufügen"
+
+#: ../../Zotlabs/Module/Cdav.php:1125 ../../Zotlabs/Module/Connedit.php:934
+#: ../../Zotlabs/Module/Profiles.php:800
+msgid "Add Field"
+msgstr "Feld hinzufügen"
+
+#: ../../Zotlabs/Module/Cdav.php:1127
+#: ../../Zotlabs/Module/Admin/Plugins.php:453
+#: ../../Zotlabs/Module/Settings/Oauth.php:42
+#: ../../Zotlabs/Module/Settings/Oauth.php:113
+#: ../../Zotlabs/Module/Connedit.php:936 ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Lib/Apps.php:384
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: ../../Zotlabs/Module/Cdav.php:1130 ../../Zotlabs/Module/Connedit.php:939
+msgid "P.O. Box"
+msgstr "Postfach"
+
+#: ../../Zotlabs/Module/Cdav.php:1131 ../../Zotlabs/Module/Connedit.php:940
+msgid "Additional"
+msgstr "Zusätzlich"
+
+#: ../../Zotlabs/Module/Cdav.php:1132 ../../Zotlabs/Module/Connedit.php:941
+msgid "Street"
+msgstr "Straße"
+
+#: ../../Zotlabs/Module/Cdav.php:1133 ../../Zotlabs/Module/Connedit.php:942
+msgid "Locality"
+msgstr "Ortschaft"
+
+#: ../../Zotlabs/Module/Cdav.php:1134 ../../Zotlabs/Module/Connedit.php:943
+msgid "Region"
+msgstr "Region"
+
+#: ../../Zotlabs/Module/Cdav.php:1135 ../../Zotlabs/Module/Connedit.php:944
+msgid "ZIP Code"
+msgstr "Postleitzahl"
+
+#: ../../Zotlabs/Module/Cdav.php:1136 ../../Zotlabs/Module/Connedit.php:945
+#: ../../Zotlabs/Module/Profiles.php:760
+msgid "Country"
+msgstr "Land"
+
+#: ../../Zotlabs/Module/Cdav.php:1183
+msgid "Default Calendar"
+msgstr "Standardkalender"
+
+#: ../../Zotlabs/Module/Cdav.php:1193
+msgid "Default Addressbook"
+msgstr "Standardadressbuch"
+
 #: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25
 msgid "This site is not a directory server"
 msgstr "Diese Webseite ist kein Verzeichnisserver"
@@ -566,20 +829,30 @@ msgstr "Diese Webseite ist kein Verzeichnisserver"
 msgid "You must be logged in to see this page."
 msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
 
-#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:35
-#: ../../Zotlabs/Module/Profile.php:43
+#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:37
+#: ../../Zotlabs/Module/Profile.php:45
 msgid "Posts and comments"
 msgstr "Beiträge und Kommentare"
 
-#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:42
-#: ../../Zotlabs/Module/Profile.php:50
+#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:44
+#: ../../Zotlabs/Module/Profile.php:52
 msgid "Only posts"
 msgstr "Nur Beiträge"
 
+#: ../../Zotlabs/Module/Channel.php:97 ../../Zotlabs/Lib/Apps.php:240
+#: ../../include/nav.php:175
+msgid "Channel Home"
+msgstr "Mein Kanal"
+
 #: ../../Zotlabs/Module/Channel.php:112
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
 
+#: ../../Zotlabs/Module/Lang.php:8 ../../Zotlabs/Lib/Apps.php:256
+#: ../../addon/openid/MysqlProvider.php:69
+msgid "Language"
+msgstr "Sprache"
+
 #: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
 msgid "Export Channel"
 msgstr "Kanal exportieren"
@@ -645,19 +918,20 @@ msgstr "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a
 msgid "Public access denied."
 msgstr "Öffentlichen Zugriff verweigert."
 
-#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:312
-#: ../../Zotlabs/Lib/Apps.php:237 ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../include/text.php:1027 ../../include/text.php:1039
-#: ../../include/acl_selectors.php:213 ../../include/nav.php:164
+#: ../../Zotlabs/Module/Search.php:25 ../../Zotlabs/Module/Search.php:44
+#: ../../Zotlabs/Module/Connections.php:313 ../../Zotlabs/Lib/Apps.php:250
+#: ../../Zotlabs/Widget/Sitesearch.php:31 ../../include/text.php:1021
+#: ../../include/text.php:1033 ../../include/acl_selectors.php:213
+#: ../../include/nav.php:160
 msgid "Search"
 msgstr "Suche"
 
-#: ../../Zotlabs/Module/Search.php:224
+#: ../../Zotlabs/Module/Search.php:225
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Beiträge mit Schlagwort: %s"
 
-#: ../../Zotlabs/Module/Search.php:226
+#: ../../Zotlabs/Module/Search.php:227
 #, php-format
 msgid "Search results for: %s"
 msgstr "Suchergebnisse für: %s"
@@ -688,21 +962,7 @@ msgstr "Keine Klon-Adressen gefunden."
 msgid "Manage Channel Locations"
 msgstr "Klon-Adressen verwalten"
 
-#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:737
-#: ../../Zotlabs/Module/Pubsites.php:51 ../../addon/cdav/Mod_Cdav.php:839
-#: ../../include/js_strings.php:25
-msgid "Location"
-msgstr "Ort"
-
-#: ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Connedit.php:909 ../../Zotlabs/Module/Profiles.php:502
-#: ../../Zotlabs/Module/Profiles.php:793 ../../addon/cdav/Mod_Cdav.php:1143
-msgid "Address"
-msgstr "Adresse"
-
-#: ../../Zotlabs/Module/Locs.php:119
+#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:111
 msgid "Primary"
 msgstr "Primär"
 
@@ -728,6 +988,15 @@ msgstr "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt."
 
+#: ../../Zotlabs/Module/Apporder.php:34
+msgid "Change Order of Navigation Apps"
+msgstr "App-Reihenfolge in der Navigation ändern"
+
+#: ../../Zotlabs/Module/Apporder.php:35
+msgid ""
+"Use arrows to move the corresponding app up or down in the display list"
+msgstr "Benutze die Pfeiltasten, um die jeweilige App in der Anzeigeliste auf- oder abwärts zu bewegen."
+
 #: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144
 msgid "Menu not found."
 msgstr "Menü nicht gefunden"
@@ -754,7 +1023,7 @@ msgid "Menu Item Permissions"
 msgstr "Zugriffsrechte des Menü-Elements"
 
 #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:510
+#: ../../Zotlabs/Module/Settings/Channel.php:513
 msgid "(click to open/close)"
 msgstr "(zum öffnen/schließen anklicken)"
 
@@ -778,18 +1047,19 @@ msgstr "Magic-Auth verwenden, falls verfügbar"
 #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
 #: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:237
-#: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Admin/Site.php:235
+#: ../../Zotlabs/Module/Settings/Channel.php:298
 #: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:642
-#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:392
+#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:644
+#: ../../Zotlabs/Module/Wiki.php:182 ../../Zotlabs/Module/Connedit.php:392
 #: ../../Zotlabs/Module/Connedit.php:775 ../../Zotlabs/Module/Menu.php:100
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1633
-#: ../../view/theme/redbasic/php/config.php:89
-#: ../../view/theme/redbasic/php/config.php:104 ../../addon/cdav/cdav.php:234
-#: ../../addon/planets/planets.php:153 ../../addon/wppost/wppost.php:82
+#: ../../Zotlabs/Module/Filestorage.php:150
+#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Zotlabs/Storage/Browser.php:351 ../../boot.php:1605
+#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:115
+#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82
 #: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109
 #: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73
@@ -812,8 +1082,9 @@ msgstr "Magic-Auth verwenden, falls verfügbar"
 #: ../../addon/statusnet/statusnet.php:415
 #: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242
 #: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255
-#: ../../addon/smileybutton/smileybutton.php:273
-#: ../../addon/smileybutton/smileybutton.php:277 ../../addon/xmpp/xmpp.php:53
+#: ../../addon/smileybutton/smileybutton.php:211
+#: ../../addon/smileybutton/smileybutton.php:215
+#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53
 #: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223
 #: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
@@ -825,18 +1096,19 @@ msgstr "Nein"
 #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
 #: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:239
-#: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Admin/Site.php:237
+#: ../../Zotlabs/Module/Settings/Channel.php:298
 #: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:642
-#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:392
+#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:644
+#: ../../Zotlabs/Module/Wiki.php:182 ../../Zotlabs/Module/Connedit.php:392
 #: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
 #: ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1633
-#: ../../view/theme/redbasic/php/config.php:89
-#: ../../view/theme/redbasic/php/config.php:104 ../../addon/cdav/cdav.php:234
-#: ../../addon/planets/planets.php:153 ../../addon/wppost/wppost.php:82
+#: ../../Zotlabs/Module/Filestorage.php:150
+#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Zotlabs/Storage/Browser.php:351 ../../boot.php:1605
+#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:115
+#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82
 #: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109
 #: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73
@@ -859,8 +1131,9 @@ msgstr "Nein"
 #: ../../addon/statusnet/statusnet.php:415
 #: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242
 #: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255
-#: ../../addon/smileybutton/smileybutton.php:273
-#: ../../addon/smileybutton/smileybutton.php:277 ../../addon/xmpp/xmpp.php:53
+#: ../../addon/smileybutton/smileybutton.php:211
+#: ../../addon/smileybutton/smileybutton.php:215
+#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53
 #: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223
 #: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
@@ -975,20 +1248,23 @@ msgstr "Termin nicht gefunden."
 
 #: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:51
 #: ../../Zotlabs/Module/Like.php:372 ../../include/conversation.php:119
-#: ../../include/text.php:1940 ../../include/event.php:1141
+#: ../../include/text.php:1933 ../../include/event.php:1145
 msgid "event"
 msgstr "Termin"
 
+#: ../../Zotlabs/Module/Events.php:275 ../../Zotlabs/Lib/Apps.php:243
+#: ../../include/conversation.php:1799 ../../include/conversation.php:1802
+#: ../../include/nav.php:195 ../../include/nav.php:397
+#: ../../include/nav.php:400
+msgid "Events"
+msgstr "Termine"
+
 #: ../../Zotlabs/Module/Events.php:460
 msgid "Edit event title"
 msgstr "Termintitel bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:460 ../../addon/cdav/Mod_Cdav.php:835
-msgid "Event title"
-msgstr "Termintitel"
-
 #: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../Zotlabs/Module/Appman.php:122 ../../Zotlabs/Module/Appman.php:123
+#: ../../Zotlabs/Module/Appman.php:136 ../../Zotlabs/Module/Appman.php:137
 #: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752
 #: ../../include/datetime.php:259
 msgid "Required"
@@ -1010,10 +1286,6 @@ msgstr "Kategorie"
 msgid "Edit start date and time"
 msgstr "Startdatum und -zeit bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:466 ../../addon/cdav/Mod_Cdav.php:836
-msgid "Start date and time"
-msgstr "Startdatum und -zeit"
-
 #: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
 msgid "Finish date and time are not known or not relevant"
 msgstr "Enddatum und -zeit sind unbekannt oder irrelevant"
@@ -1040,23 +1312,17 @@ msgstr "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht
 msgid "Edit Description"
 msgstr "Beschreibung bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Appman.php:124
-#: ../../Zotlabs/Module/Rbmark.php:101
-#: ../../addon/rendezvous/rendezvous.php:173 ../../addon/cdav/Mod_Cdav.php:838
-msgid "Description"
-msgstr "Beschreibung"
-
 #: ../../Zotlabs/Module/Events.php:475
 msgid "Edit Location"
 msgstr "Ort bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1063
-#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/ThreadItem.php:741
-#: ../../include/conversation.php:1280 ../../include/page_widgets.php:43
+#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1065
+#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:739
+#: ../../include/conversation.php:1277
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1343
+#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1340
 msgid "Permission settings"
 msgstr "Berechtigungs-Einstellungen"
 
@@ -1081,7 +1347,7 @@ msgid "Delete event"
 msgstr "Termin löschen"
 
 #: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:313
-#: ../../include/text.php:1759
+#: ../../include/text.php:1752
 msgid "Link to Source"
 msgstr "Link zur Quelle"
 
@@ -1097,41 +1363,11 @@ msgstr "Termin bearbeiten"
 msgid "Create Event"
 msgstr "Termin anlegen"
 
-#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Cal.php:344
-#: ../../Zotlabs/Module/Photos.php:911 ../../addon/cdav/Mod_Cdav.php:846
-msgid "Previous"
-msgstr "Voriges"
-
-#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Events.php:699
-#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:338
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Photos.php:920
-#: ../../addon/cdav/Mod_Cdav.php:847
-msgid "Next"
-msgstr "Nächste"
-
 #: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:339
-#: ../../include/channel.php:1365
+#: ../../include/channel.php:1488
 msgid "Export"
 msgstr "Exportieren"
 
-#: ../../Zotlabs/Module/Events.php:695 ../../addon/cdav/Mod_Cdav.php:849
-msgid "Month"
-msgstr "Monat"
-
-#: ../../Zotlabs/Module/Events.php:696 ../../addon/cdav/Mod_Cdav.php:850
-msgid "Week"
-msgstr "Woche"
-
-#: ../../Zotlabs/Module/Events.php:697 ../../addon/cdav/Mod_Cdav.php:851
-msgid "Day"
-msgstr "Tag"
-
-#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Cal.php:346
-#: ../../addon/cdav/Mod_Cdav.php:848
-msgid "Today"
-msgstr "Heute"
-
 #: ../../Zotlabs/Module/Events.php:731
 msgid "Event removed"
 msgstr "Termin gelöscht"
@@ -1148,47 +1384,47 @@ msgstr "App installiert."
 msgid "Malformed app."
 msgstr "Fehlerhafte App."
 
-#: ../../Zotlabs/Module/Appman.php:111
+#: ../../Zotlabs/Module/Appman.php:125
 msgid "Embed code"
 msgstr "Code einbetten"
 
-#: ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Appman.php:131
 msgid "Edit App"
 msgstr "App bearbeiten"
 
-#: ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Appman.php:131
 msgid "Create App"
 msgstr "App erstellen"
 
-#: ../../Zotlabs/Module/Appman.php:122
+#: ../../Zotlabs/Module/Appman.php:136
 msgid "Name of app"
 msgstr "Name der App"
 
-#: ../../Zotlabs/Module/Appman.php:123
+#: ../../Zotlabs/Module/Appman.php:137
 msgid "Location (URL) of app"
 msgstr "Ort (URL) der App"
 
-#: ../../Zotlabs/Module/Appman.php:125
+#: ../../Zotlabs/Module/Appman.php:139
 msgid "Photo icon URL"
 msgstr "URL zum Icon"
 
-#: ../../Zotlabs/Module/Appman.php:125
+#: ../../Zotlabs/Module/Appman.php:139
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 Pixel – optional"
 
-#: ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Appman.php:140
 msgid "Categories (optional, comma separated list)"
 msgstr "Kategorien (optional, kommagetrennte Liste)"
 
-#: ../../Zotlabs/Module/Appman.php:127
+#: ../../Zotlabs/Module/Appman.php:141
 msgid "Version ID"
 msgstr "Versions-ID"
 
-#: ../../Zotlabs/Module/Appman.php:128
+#: ../../Zotlabs/Module/Appman.php:142
 msgid "Price of app"
 msgstr "Preis der App"
 
-#: ../../Zotlabs/Module/Appman.php:129
+#: ../../Zotlabs/Module/Appman.php:143
 msgid "Location (URL) to purchase app"
 msgstr "Ort (URL), um die App zu kaufen"
 
@@ -1203,14 +1439,14 @@ msgstr "Server nicht gefunden."
 #: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Tagger.php:47
 #: ../../Zotlabs/Module/Like.php:370
 #: ../../addon/redphotos/redphotohelper.php:71
-#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:116
-#: ../../include/text.php:1937
+#: ../../addon/diaspora/Receiver.php:1370 ../../include/conversation.php:116
+#: ../../include/text.php:1930
 msgid "photo"
 msgstr "Foto"
 
 #: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Like.php:370
-#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:144
-#: ../../include/text.php:1943
+#: ../../addon/diaspora/Receiver.php:1370 ../../include/conversation.php:144
+#: ../../include/text.php:1936
 msgid "status"
 msgstr "Status"
 
@@ -1258,12 +1494,12 @@ msgid ""
 msgstr "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren."
 
 #: ../../Zotlabs/Module/Import_items.php:127
-#: ../../Zotlabs/Module/Import.php:501
+#: ../../Zotlabs/Module/Import.php:505
 msgid "File to Upload"
 msgstr "Hochzuladende Datei:"
 
 #: ../../Zotlabs/Module/New_channel.php:121
-#: ../../Zotlabs/Module/Manage.php:136
+#: ../../Zotlabs/Module/Manage.php:138
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
@@ -1362,456 +1598,435 @@ msgid ""
 msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"
 
 #: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Zotlabs/Module/Settings/Channel.php:580
 msgid "Remove Channel"
 msgstr "Kanal löschen"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:99
+#: ../../Zotlabs/Module/Sharedwithme.php:104
 msgid "Files: shared with me"
 msgstr "Dateien, die mit mir geteilt wurden"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:100
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-#: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Wiki.php:172 ../../Zotlabs/Module/Connedit.php:902
-#: ../../Zotlabs/Module/Chat.php:249 ../../Zotlabs/Lib/NativeWikiPage.php:539
-#: ../../Zotlabs/Storage/Browser.php:233
-#: ../../Zotlabs/Widget/Wiki_page_history.php:22
-#: ../../addon/rendezvous/rendezvous.php:172
-#: ../../addon/cdav/Mod_Cdav.php:1136 ../../addon/gitwiki/Mod_Gitwiki.php:158
-msgid "Name"
-msgstr "Name"
-
-#: ../../Zotlabs/Module/Sharedwithme.php:101
+#: ../../Zotlabs/Module/Sharedwithme.php:106
 msgid "NEW"
 msgstr "NEU"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:102
-#: ../../Zotlabs/Storage/Browser.php:235 ../../include/text.php:1409
+#: ../../Zotlabs/Module/Sharedwithme.php:107
+#: ../../Zotlabs/Storage/Browser.php:236 ../../include/text.php:1386
 msgid "Size"
 msgstr "Größe"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:103
-#: ../../Zotlabs/Storage/Browser.php:236
+#: ../../Zotlabs/Module/Sharedwithme.php:108
+#: ../../Zotlabs/Storage/Browser.php:237
 msgid "Last Modified"
 msgstr "Zuletzt geändert"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
+#: ../../Zotlabs/Module/Sharedwithme.php:109
 msgid "Remove all files"
 msgstr "Alle Dateien löschen"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:105
+#: ../../Zotlabs/Module/Sharedwithme.php:110
 msgid "Remove this file"
 msgstr "Diese Datei löschen"
 
-#: ../../Zotlabs/Module/Setup.php:176
+#: ../../Zotlabs/Module/Setup.php:170
 msgid "$Projectname Server - Setup"
 msgstr "$Projectname Server-Einrichtung"
 
-#: ../../Zotlabs/Module/Setup.php:180
+#: ../../Zotlabs/Module/Setup.php:174
 msgid "Could not connect to database."
 msgstr "Kann nicht mit der Datenbank verbinden."
 
-#: ../../Zotlabs/Module/Setup.php:184
+#: ../../Zotlabs/Module/Setup.php:178
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS."
 
-#: ../../Zotlabs/Module/Setup.php:191
+#: ../../Zotlabs/Module/Setup.php:185
 msgid "Could not create table."
 msgstr "Konnte Tabelle nicht erstellen."
 
-#: ../../Zotlabs/Module/Setup.php:196
+#: ../../Zotlabs/Module/Setup.php:191
 msgid "Your site database has been installed."
 msgstr "Die Datenbank Deines Hubs wurde installiert."
 
-#: ../../Zotlabs/Module/Setup.php:200
+#: ../../Zotlabs/Module/Setup.php:197
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren."
 
-#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Setup.php:748
+#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262
+#: ../../Zotlabs/Module/Setup.php:745
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Lies die Datei \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:260
+#: ../../Zotlabs/Module/Setup.php:259
 msgid "System check"
 msgstr "Systemprüfung"
 
-#: ../../Zotlabs/Module/Setup.php:265
+#: ../../Zotlabs/Module/Setup.php:264
 msgid "Check again"
 msgstr "Nochmal prüfen"
 
-#: ../../Zotlabs/Module/Setup.php:287
+#: ../../Zotlabs/Module/Setup.php:286
 msgid "Database connection"
 msgstr "Datenbankverbindung"
 
-#: ../../Zotlabs/Module/Setup.php:288
+#: ../../Zotlabs/Module/Setup.php:287
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "Um $Projectname zu installieren, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."
 
-#: ../../Zotlabs/Module/Setup.php:289
+#: ../../Zotlabs/Module/Setup.php:288
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast."
 
-#: ../../Zotlabs/Module/Setup.php:290
+#: ../../Zotlabs/Module/Setup.php:289
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst."
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Zotlabs/Module/Setup.php:293
 msgid "Database Server Name"
 msgstr "Datenbankservername"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Zotlabs/Module/Setup.php:293
 msgid "Default is 127.0.0.1"
 msgstr "Standard ist 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Zotlabs/Module/Setup.php:294
 msgid "Database Port"
 msgstr "Datenbankport"
 
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Zotlabs/Module/Setup.php:294
 msgid "Communication port number - use 0 for default"
 msgstr "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung"
 
-#: ../../Zotlabs/Module/Setup.php:296
+#: ../../Zotlabs/Module/Setup.php:295
 msgid "Database Login Name"
 msgstr "Datenbank-Benutzername"
 
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Zotlabs/Module/Setup.php:296
 msgid "Database Login Password"
 msgstr "Datenbank-Passwort"
 
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Zotlabs/Module/Setup.php:297
 msgid "Database Name"
 msgstr "Datenbankname"
 
-#: ../../Zotlabs/Module/Setup.php:299
+#: ../../Zotlabs/Module/Setup.php:298
 msgid "Database Type"
 msgstr "Datenbanktyp"
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
+#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
 msgid "Site administrator email address"
 msgstr "E-Mail Adresse des Seiten-Administrators"
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
+#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst."
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
 msgid "Website URL"
 msgstr "Webseiten-URL"
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
 msgid "Please use SSL (https) URL if available."
 msgstr "Nutze wenn möglich eine SSL-URL (https)."
 
-#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:353
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345
 msgid "Please select a default timezone for your website"
 msgstr "Standard-Zeitzone für Deinen Server"
 
-#: ../../Zotlabs/Module/Setup.php:328 ../../Zotlabs/Module/Admin/Site.php:258
-msgid "Basic/Minimal Social Networking"
-msgstr "Einfaches/minimales soziales Netzwerken"
-
-#: ../../Zotlabs/Module/Setup.php:329 ../../Zotlabs/Module/Admin/Site.php:259
-msgid "Standard Configuration (default)"
-msgstr "Standardkonfiguration (Standard)"
-
-#: ../../Zotlabs/Module/Setup.php:330 ../../Zotlabs/Module/Admin/Site.php:260
-msgid "Professional"
-msgstr "Professionell"
-
-#: ../../Zotlabs/Module/Setup.php:336
+#: ../../Zotlabs/Module/Setup.php:330
 msgid "Site settings"
 msgstr "Seiteneinstellungen"
 
-#: ../../Zotlabs/Module/Setup.php:351 ../../Zotlabs/Module/Admin/Site.php:289
-msgid "Server Configuration/Role"
-msgstr "Serverkonfiguration/Rolle"
-
-#: ../../Zotlabs/Module/Setup.php:392
+#: ../../Zotlabs/Module/Setup.php:384
 msgid "PHP version 5.5 or greater is required."
 msgstr "PHP-Version 5.5 oder höher ist erforderlich."
 
-#: ../../Zotlabs/Module/Setup.php:393
+#: ../../Zotlabs/Module/Setup.php:385
 msgid "PHP version"
 msgstr "PHP-Version"
 
-#: ../../Zotlabs/Module/Setup.php:409
+#: ../../Zotlabs/Module/Setup.php:401
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden."
 
-#: ../../Zotlabs/Module/Setup.php:410
+#: ../../Zotlabs/Module/Setup.php:402
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen."
 
-#: ../../Zotlabs/Module/Setup.php:414
+#: ../../Zotlabs/Module/Setup.php:406
 msgid "PHP executable path"
 msgstr "PHP-Pfad zu ausführbarer Datei"
 
-#: ../../Zotlabs/Module/Setup.php:414
+#: ../../Zotlabs/Module/Setup.php:406
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren."
 
-#: ../../Zotlabs/Module/Setup.php:419
+#: ../../Zotlabs/Module/Setup.php:411
 msgid "Command line PHP"
 msgstr "PHP-Befehlszeile"
 
-#: ../../Zotlabs/Module/Setup.php:429
+#: ../../Zotlabs/Module/Setup.php:421
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
 msgstr "Prüfung auf Kommandozeilen-PHP fehlgeschlagen, da shell_exec() deaktiviert ist. Dies wird aber benötigt."
 
-#: ../../Zotlabs/Module/Setup.php:432
+#: ../../Zotlabs/Module/Setup.php:424
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert."
 
-#: ../../Zotlabs/Module/Setup.php:433
+#: ../../Zotlabs/Module/Setup.php:425
 msgid "This is required for message delivery to work."
 msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
 
-#: ../../Zotlabs/Module/Setup.php:436
+#: ../../Zotlabs/Module/Setup.php:428
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:454
+#: ../../Zotlabs/Module/Setup.php:446
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to"
 " upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr "Die Maximalgröße für Uploads insgesamt liegt bei %s. Die Maximalgröße für eine Datei liegt bei %s. Es können maximal %d Dateien gleichzeitig hochgeladen werden."
 
-#: ../../Zotlabs/Module/Setup.php:459
+#: ../../Zotlabs/Module/Setup.php:451
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "Du kannst diese Einstellungen in der php.ini - Datei des Servers anpassen."
 
-#: ../../Zotlabs/Module/Setup.php:461
+#: ../../Zotlabs/Module/Setup.php:453
 msgid "PHP upload limits"
 msgstr "PHP-Hochladebeschränkungen"
 
-#: ../../Zotlabs/Module/Setup.php:484
+#: ../../Zotlabs/Module/Setup.php:476
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen."
 
-#: ../../Zotlabs/Module/Setup.php:485
+#: ../../Zotlabs/Module/Setup.php:477
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung."
 
-#: ../../Zotlabs/Module/Setup.php:488
+#: ../../Zotlabs/Module/Setup.php:480
 msgid "Generate encryption keys"
 msgstr "Verschlüsselungsschlüssel erzeugen"
 
-#: ../../Zotlabs/Module/Setup.php:505
+#: ../../Zotlabs/Module/Setup.php:497
 msgid "libCurl PHP module"
 msgstr "libCurl-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:506
+#: ../../Zotlabs/Module/Setup.php:498
 msgid "GD graphics PHP module"
 msgstr "GD-Grafik-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Zotlabs/Module/Setup.php:499
 msgid "OpenSSL PHP module"
 msgstr "OpenSSL-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:508
+#: ../../Zotlabs/Module/Setup.php:500
 msgid "PDO database PHP module"
 msgstr "PDO-Datenbank-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:509
+#: ../../Zotlabs/Module/Setup.php:501
 msgid "mb_string PHP module"
 msgstr "mb_string-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:502
 msgid "xml PHP module"
 msgstr "xml-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:516
+#: ../../Zotlabs/Module/Setup.php:503
+msgid "zip PHP module"
+msgstr "zip PHP Modul"
+
+#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
 msgid "Apache mod_rewrite module"
 msgstr "Apache-mod_rewrite-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:514
+#: ../../Zotlabs/Module/Setup.php:507
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:523
+#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
 msgid "exec"
 msgstr "exec"
 
-#: ../../Zotlabs/Module/Setup.php:520
+#: ../../Zotlabs/Module/Setup.php:513
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr "Fehler: exec ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
 
-#: ../../Zotlabs/Module/Setup.php:526 ../../Zotlabs/Module/Setup.php:529
+#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
 msgid "shell_exec"
 msgstr "shell_exec"
 
-#: ../../Zotlabs/Module/Setup.php:526
+#: ../../Zotlabs/Module/Setup.php:519
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Fehler: shell_exec ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
 
-#: ../../Zotlabs/Module/Setup.php:534
+#: ../../Zotlabs/Module/Setup.php:527
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:538
+#: ../../Zotlabs/Module/Setup.php:531
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:542
+#: ../../Zotlabs/Module/Setup.php:535
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:546
+#: ../../Zotlabs/Module/Setup.php:539
 msgid "Error: PDO database PHP module required but not installed."
 msgstr "Fehler: PDO-Datenbank-PHP-Modul ist erforderlich, aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:550
+#: ../../Zotlabs/Module/Setup.php:543
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:554
+#: ../../Zotlabs/Module/Setup.php:547
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:572
+#: ../../Zotlabs/Module/Setup.php:551
+msgid "Error: zip PHP module required but not installed."
+msgstr "Fehler: Das zip PHP Modul ist erforderlich, ist aber nicht installiert."
+
+#: ../../Zotlabs/Module/Setup.php:569
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht."
 
-#: ../../Zotlabs/Module/Setup.php:573
+#: ../../Zotlabs/Module/Setup.php:570
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst."
 
-#: ../../Zotlabs/Module/Setup.php:574
+#: ../../Zotlabs/Module/Setup.php:571
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Red top folder."
 msgstr "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Hubzilla-Installation speichern musst."
 
-#: ../../Zotlabs/Module/Setup.php:575
+#: ../../Zotlabs/Module/Setup.php:572
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
 
-#: ../../Zotlabs/Module/Setup.php:578
+#: ../../Zotlabs/Module/Setup.php:575
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php ist beschreibbar"
 
-#: ../../Zotlabs/Module/Setup.php:592
+#: ../../Zotlabs/Module/Setup.php:589
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr "Diese Software verwendet die Smarty3 Template Engine, um Vorlagen für die Webdarstellung zu verarbeiten. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen."
 
-#: ../../Zotlabs/Module/Setup.php:593
+#: ../../Zotlabs/Module/Setup.php:590
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr "Um diese kompilierten Vorlagen speichern zu können, braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Hubzilla-Stammverzeichnisses."
 
-#: ../../Zotlabs/Module/Setup.php:594 ../../Zotlabs/Module/Setup.php:615
+#: ../../Zotlabs/Module/Setup.php:591 ../../Zotlabs/Module/Setup.php:612
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat."
 
-#: ../../Zotlabs/Module/Setup.php:595
+#: ../../Zotlabs/Module/Setup.php:592
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält."
 
-#: ../../Zotlabs/Module/Setup.php:598
+#: ../../Zotlabs/Module/Setup.php:595
 #, php-format
 msgid "%s is writable"
 msgstr "%s ist beschreibbar"
 
-#: ../../Zotlabs/Module/Setup.php:614
+#: ../../Zotlabs/Module/Setup.php:611
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level"
 " web folder"
 msgstr "Diese Software benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Webserver benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Web-Stammverzeichnisses."
 
-#: ../../Zotlabs/Module/Setup.php:618
+#: ../../Zotlabs/Module/Setup.php:615
 msgid "store is writable"
 msgstr "store ist schreibbar"
 
-#: ../../Zotlabs/Module/Setup.php:650
+#: ../../Zotlabs/Module/Setup.php:647
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server."
 
-#: ../../Zotlabs/Module/Setup.php:651
+#: ../../Zotlabs/Module/Setup.php:648
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich."
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Zotlabs/Module/Setup.php:649
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können."
 
-#: ../../Zotlabs/Module/Setup.php:653
+#: ../../Zotlabs/Module/Setup.php:650
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer $Projectname-Hubs (die mit korrekten Zertifikaten ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird)."
 
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Zotlabs/Module/Setup.php:651
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen."
 
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Zotlabs/Module/Setup.php:652
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind."
 
-#: ../../Zotlabs/Module/Setup.php:657
+#: ../../Zotlabs/Module/Setup.php:654
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -1819,37 +2034,37 @@ msgid ""
 "server communications."
 msgstr "Wenn Du sicher bist, dass das Zertifikat gültig und von einer vertrauenswürdigen Zertifizierungsstelle signiert ist, prüfe auf ggf. noch zu installierende Zwischenzertifikate (intermediate). Diese werden nicht unbedingt von Browsern benötigt, aber sehr wohl für die Kommunikation zwischen Servern."
 
-#: ../../Zotlabs/Module/Setup.php:659
+#: ../../Zotlabs/Module/Setup.php:656
 msgid "SSL certificate validation"
 msgstr "SSL Zertifikatverifizierung"
 
-#: ../../Zotlabs/Module/Setup.php:665
+#: ../../Zotlabs/Module/Setup.php:662
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:"
 
-#: ../../Zotlabs/Module/Setup.php:668
+#: ../../Zotlabs/Module/Setup.php:665
 msgid "Url rewrite is working"
 msgstr "Url rewrite funktioniert"
 
-#: ../../Zotlabs/Module/Setup.php:682
+#: ../../Zotlabs/Module/Setup.php:679
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
 
-#: ../../Zotlabs/Module/Setup.php:706
-#: ../../addon/rendezvous/rendezvous.php:401 ../../addon/cdav/cdav.php:41
+#: ../../Zotlabs/Module/Setup.php:703
+#: ../../addon/rendezvous/rendezvous.php:401
 msgid "Errors encountered creating database tables."
 msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
 
-#: ../../Zotlabs/Module/Setup.php:746
-msgid "<h1>What next</h1>"
-msgstr "<h1>Was als Nächstes</h1>"
+#: ../../Zotlabs/Module/Setup.php:743
+msgid "<h1>What next?</h1>"
+msgstr "<h1>Wie geht es jetzt weiter?</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:747
+#: ../../Zotlabs/Module/Setup.php:744
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -1990,8 +2205,8 @@ msgstr "Versuche, diesen Updateschritt automatisch auszuführen"
 #: ../../Zotlabs/Module/Admin/Plugins.php:259
 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89
 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:35
-#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Admin.php:60
-#: ../../include/items.php:3391
+#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62
+#: ../../include/items.php:3361
 msgid "Item not found."
 msgstr "Element nicht gefunden."
 
@@ -2022,9 +2237,9 @@ msgstr "Aktivieren"
 #: ../../Zotlabs/Module/Admin/Channels.php:145
 #: ../../Zotlabs/Module/Admin/Themes.php:122
 #: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Site.php:277
+#: ../../Zotlabs/Module/Admin/Site.php:269
 #: ../../Zotlabs/Module/Admin/Security.php:86
-#: ../../Zotlabs/Module/Admin.php:137
+#: ../../Zotlabs/Module/Admin.php:136
 msgid "Administration"
 msgstr "Administration"
 
@@ -2040,8 +2255,8 @@ msgid "Toggle"
 msgstr "Umschalten"
 
 #: ../../Zotlabs/Module/Admin/Plugins.php:344
-#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223
-#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:207
+#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:236
+#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:201
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -2104,25 +2319,10 @@ msgstr "Plugin-Repository herunterladen"
 msgid "Install new repo"
 msgstr "Neues Repository installieren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:358
+#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:384
 msgid "Install"
 msgstr "Installieren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:423
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Wiki.php:265 ../../Zotlabs/Module/Wiki.php:290
-#: ../../Zotlabs/Module/Connedit.php:920 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/cdav/Mod_Cdav.php:866
-#: ../../addon/cdav/Mod_Cdav.php:1154 ../../addon/js_upload/js_upload.php:46
-#: ../../addon/gitwiki/Mod_Gitwiki.php:244
-#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1327
-#: ../../include/conversation.php:1376
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #: ../../Zotlabs/Module/Admin/Plugins.php:445
 msgid "Manage Repos"
 msgstr "Repositorien verwalten"
@@ -2135,20 +2335,12 @@ msgstr "Installierte Plugin-Repositorien"
 msgid "Install a New Plugin Repository"
 msgstr "Ein neues Plugin-Repository installieren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:453
-#: ../../Zotlabs/Module/Settings/Oauth.php:42
-#: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:802
-#: ../../Zotlabs/Lib/Apps.php:358 ../../addon/cdav/Mod_Cdav.php:1152
-msgid "Update"
-msgstr "Aktualisieren"
-
 #: ../../Zotlabs/Module/Admin/Plugins.php:454
 msgid "Switch branch"
 msgstr "Zweig/Branch wechseln"
 
 #: ../../Zotlabs/Module/Admin/Plugins.php:455
-#: ../../Zotlabs/Module/Photos.php:960 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Zotlabs/Module/Photos.php:962 ../../Zotlabs/Module/Tagrm.php:137
 #: ../../addon/superblock/superblock.php:116
 msgid "Remove"
 msgstr "Entfernen"
@@ -2188,7 +2380,7 @@ msgstr "Konto '%s' freigegeben"
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:165
 #: ../../Zotlabs/Module/Admin/Accounts.php:178
-#: ../../Zotlabs/Widget/Admin.php:23
+#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23
 msgid "Accounts"
 msgstr "Konten"
 
@@ -2205,21 +2397,12 @@ msgstr "Registrierungen warten auf Bestätigung"
 msgid "Request date"
 msgstr "Antragsdatum"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-#: ../../Zotlabs/Module/Admin/Accounts.php:181
-#: ../../Zotlabs/Module/Connedit.php:906 ../../Zotlabs/Module/Profiles.php:790
-#: ../../addon/cdav/Mod_Cdav.php:1140 ../../addon/openid/MysqlProvider.php:56
-#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
-#: ../../addon/redred/redred.php:107 ../../include/network.php:2315
-msgid "Email"
-msgstr "E-Mail"
-
 #: ../../Zotlabs/Module/Admin/Accounts.php:170
 msgid "No registrations."
 msgstr "Keine Registrierungen."
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:171
-#: ../../Zotlabs/Module/Connections.php:281
+#: ../../Zotlabs/Module/Connections.php:282 ../../include/conversation.php:685
 msgid "Approve"
 msgstr "Genehmigen"
 
@@ -2241,7 +2424,7 @@ msgstr "Freigeben"
 msgid "ID"
 msgstr "ID"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287
+#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:288
 msgid "All Channels"
 msgstr "Alle Kanäle"
 
@@ -2355,7 +2538,7 @@ msgid "Channel '%s' code disallowed"
 msgstr "Code für Kanal '%s' gesperrt"
 
 #: ../../Zotlabs/Module/Admin/Channels.php:146
-#: ../../Zotlabs/Widget/Admin.php:24
+#: ../../Zotlabs/Module/Admin.php:110 ../../Zotlabs/Widget/Admin.php:24
 msgid "Channels"
 msgstr "Kanäle"
 
@@ -2376,7 +2559,7 @@ msgid "Disallow Code"
 msgstr "Code sperren"
 
 #: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1760 ../../include/nav.php:369
+#: ../../include/conversation.php:1757 ../../include/nav.php:355
 msgid "Channel"
 msgstr "Kanal"
 
@@ -2398,11 +2581,11 @@ msgstr "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem
 
 #: ../../Zotlabs/Module/Admin/Themes.php:26
 msgid "Theme settings updated."
-msgstr "Theme-Einstellungen aktualisiert."
+msgstr "Design-Einstellungen aktualisiert."
 
 #: ../../Zotlabs/Module/Admin/Themes.php:61
 msgid "No themes found."
-msgstr "Keine Theme gefunden."
+msgstr "Keine Designs gefunden."
 
 #: ../../Zotlabs/Module/Admin/Themes.php:116
 msgid "Screenshot"
@@ -2411,7 +2594,7 @@ msgstr "Bildschirmfoto"
 #: ../../Zotlabs/Module/Admin/Themes.php:123
 #: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
 msgid "Themes"
-msgstr "Themes"
+msgstr "Designs"
 
 #: ../../Zotlabs/Module/Admin/Themes.php:162
 msgid "[Experimental]"
@@ -2421,381 +2604,382 @@ msgstr "[Experimentell]"
 msgid "[Unsupported]"
 msgstr "[Nicht unterstützt]"
 
-#: ../../Zotlabs/Module/Admin/Site.php:144
+#: ../../Zotlabs/Module/Admin/Site.php:142
 msgid "Site settings updated."
 msgstr "Site-Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2915
+#: ../../Zotlabs/Module/Admin/Site.php:168
+#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2928
 msgid "Default"
 msgstr "Standard"
 
-#: ../../Zotlabs/Module/Admin/Site.php:181
+#: ../../Zotlabs/Module/Admin/Site.php:179
 #: ../../Zotlabs/Module/Settings/Display.php:137
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (Inkompatibel)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:188
+#: ../../Zotlabs/Module/Admin/Site.php:186
 #: ../../Zotlabs/Module/Settings/Display.php:151
 msgid "mobile"
 msgstr "mobil"
 
-#: ../../Zotlabs/Module/Admin/Site.php:190
+#: ../../Zotlabs/Module/Admin/Site.php:188
 msgid "experimental"
 msgstr "experimentell"
 
-#: ../../Zotlabs/Module/Admin/Site.php:192
+#: ../../Zotlabs/Module/Admin/Site.php:190
 msgid "unsupported"
 msgstr "nicht unterstützt"
 
-#: ../../Zotlabs/Module/Admin/Site.php:238
+#: ../../Zotlabs/Module/Admin/Site.php:236
 msgid "Yes - with approval"
 msgstr "Ja - mit Zustimmung"
 
-#: ../../Zotlabs/Module/Admin/Site.php:244
+#: ../../Zotlabs/Module/Admin/Site.php:242
 msgid "My site is not a public server"
 msgstr "Mein Server ist kein öffentlicher Server"
 
-#: ../../Zotlabs/Module/Admin/Site.php:245
+#: ../../Zotlabs/Module/Admin/Site.php:243
 msgid "My site has paid access only"
 msgstr "Meine Seite hat nur bezahlten Zugriff"
 
-#: ../../Zotlabs/Module/Admin/Site.php:246
+#: ../../Zotlabs/Module/Admin/Site.php:244
 msgid "My site has free access only"
 msgstr "Meine Seite hat nur freien Zugriff"
 
-#: ../../Zotlabs/Module/Admin/Site.php:247
+#: ../../Zotlabs/Module/Admin/Site.php:245
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades"
 
-#: ../../Zotlabs/Module/Admin/Site.php:264 ../../Zotlabs/Lib/Techlevels.php:10
+#: ../../Zotlabs/Module/Admin/Site.php:256
 msgid "Beginner/Basic"
 msgstr "Anfänger/Basis"
 
-#: ../../Zotlabs/Module/Admin/Site.php:265 ../../Zotlabs/Lib/Techlevels.php:11
+#: ../../Zotlabs/Module/Admin/Site.php:257
 msgid "Novice - not skilled but willing to learn"
 msgstr "Anfänger - unerfahren, aber bereit zu lernen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:266 ../../Zotlabs/Lib/Techlevels.php:12
+#: ../../Zotlabs/Module/Admin/Site.php:258
 msgid "Intermediate - somewhat comfortable"
 msgstr "Fortgeschritten - relativ komfortabel"
 
-#: ../../Zotlabs/Module/Admin/Site.php:267 ../../Zotlabs/Lib/Techlevels.php:13
+#: ../../Zotlabs/Module/Admin/Site.php:259
 msgid "Advanced - very comfortable"
 msgstr "Fortgeschritten - sehr komfortabel"
 
-#: ../../Zotlabs/Module/Admin/Site.php:268 ../../Zotlabs/Lib/Techlevels.php:14
+#: ../../Zotlabs/Module/Admin/Site.php:260
 msgid "Expert - I can write computer code"
 msgstr "Experte - Ich kann Computercode schreiben"
 
-#: ../../Zotlabs/Module/Admin/Site.php:269 ../../Zotlabs/Lib/Techlevels.php:15
+#: ../../Zotlabs/Module/Admin/Site.php:261
 msgid "Wizard - I probably know more than you do"
 msgstr "Zauberer - ich kann wahrscheinlich mehr als Du"
 
-#: ../../Zotlabs/Module/Admin/Site.php:278 ../../Zotlabs/Widget/Admin.php:22
+#: ../../Zotlabs/Module/Admin/Site.php:270 ../../Zotlabs/Widget/Admin.php:22
 msgid "Site"
 msgstr "Seite"
 
-#: ../../Zotlabs/Module/Admin/Site.php:280
-#: ../../Zotlabs/Module/Register.php:253
+#: ../../Zotlabs/Module/Admin/Site.php:272
+#: ../../Zotlabs/Module/Register.php:251
 msgid "Registration"
 msgstr "Registrierung"
 
-#: ../../Zotlabs/Module/Admin/Site.php:281
+#: ../../Zotlabs/Module/Admin/Site.php:273
 msgid "File upload"
 msgstr "Dateiupload"
 
-#: ../../Zotlabs/Module/Admin/Site.php:282
+#: ../../Zotlabs/Module/Admin/Site.php:274
 msgid "Policies"
 msgstr "Richtlinien"
 
-#: ../../Zotlabs/Module/Admin/Site.php:283
+#: ../../Zotlabs/Module/Admin/Site.php:275
 #: ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: ../../Zotlabs/Module/Admin/Site.php:287
+#: ../../Zotlabs/Module/Admin/Site.php:279
 #: ../../addon/statusnet/statusnet.php:890
 msgid "Site name"
 msgstr "Seitenname"
 
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Zotlabs/Module/Admin/Site.php:281
 msgid "Site default technical skill level"
 msgstr "Standard-Qualifikationsstufe der Website"
 
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Zotlabs/Module/Admin/Site.php:281
 msgid "Used to provide a member experience matched to technical comfort level"
 msgstr "Dies wird verwendet, um eine Benutzererfahrung  passend zur technischen Qualifikationsstufe zu bieten."
 
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Zotlabs/Module/Admin/Site.php:283
 msgid "Lock the technical skill level setting"
 msgstr "Sperre die technische Qualifikationsstufe"
 
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Zotlabs/Module/Admin/Site.php:283
 msgid "Members can set their own technical comfort level by default"
 msgstr "Benutzer können standardmäßig ihre eigene technische Qualifikationsstufe einstellen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:295
+#: ../../Zotlabs/Module/Admin/Site.php:285
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Zotlabs/Module/Admin/Site.php:286
 msgid "Administrator Information"
 msgstr "Administrator-Informationen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Zotlabs/Module/Admin/Site.php:286
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:297
-#: ../../Zotlabs/Module/Siteinfo.php:23
+#: ../../Zotlabs/Module/Admin/Site.php:287
+#: ../../Zotlabs/Module/Siteinfo.php:22
 msgid "Site Information"
 msgstr "Seiteninformationen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:297
+#: ../../Zotlabs/Module/Admin/Site.php:287
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Öffentlich sichtbare Beschreibung dieses Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann hier verwendet werden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:298
+#: ../../Zotlabs/Module/Admin/Site.php:288
 msgid "System language"
 msgstr "System-Sprache"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:289
 msgid "System theme"
-msgstr "System-Theme"
+msgstr "System-Design"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:289
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
-msgstr "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
+msgstr "Standard-System-Design – kann durch Nutzerprofile überschieben werden – <a href='#' id='cnftheme'>Design-Einstellungen ändern</a>"
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Zotlabs/Module/Admin/Site.php:290
 msgid "Mobile system theme"
-msgstr "Mobile System-Theme:"
+msgstr "System-Design für mobile Geräte:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Zotlabs/Module/Admin/Site.php:290
 msgid "Theme for mobile devices"
 msgstr "Theme für mobile Geräte"
 
-#: ../../Zotlabs/Module/Admin/Site.php:302
+#: ../../Zotlabs/Module/Admin/Site.php:292
 msgid "Allow Feeds as Connections"
 msgstr "Feeds als Verbindungen erlauben"
 
-#: ../../Zotlabs/Module/Admin/Site.php:302
+#: ../../Zotlabs/Module/Admin/Site.php:292
 msgid "(Heavy system resource usage)"
 msgstr "(führt zu hoher Systemlast)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:293
 msgid "Maximum image size"
 msgstr "Maximale Bildgröße"
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:293
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Zotlabs/Module/Admin/Site.php:294
 msgid "Does this site allow new member registration?"
 msgstr "Erlaubt dieser Server die Registrierung neuer Nutzer?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:295
 msgid "Invitation only"
 msgstr "Nur mit Einladung"
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:295
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr "Erlaube die Neuregistrierung von Mitglieder nur mit einem Einladungscode. Die Registrierungs-Politik muss oben auf Ja gesetzt werden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Zotlabs/Module/Admin/Site.php:296
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Was ist die passendste Beschreibung der Konten auf diesem Hub?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:297
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:297
 msgid "Will be displayed prominently on the registration page."
 msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Zotlabs/Module/Admin/Site.php:298
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Homepage des Hubs, die Besuchern angezeigt wird (Voreinstellung: Anmeldemaske)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Zotlabs/Module/Admin/Site.php:298
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "Beispiele: 'public', um den Stream aller öffentlichen Beiträge anzuzeigen, 'page/sys/home', um eine System-Webseite namens 'home' anzuzeigen, 'include:home.html', um eine Datei einzufügen."
 
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Zotlabs/Module/Admin/Site.php:299
 msgid "Preserve site homepage URL"
 msgstr "Homepage-URL schützen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Zotlabs/Module/Admin/Site.php:299
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Zeigt die Homepage an der Original-URL in einem Frame an, statt auf die eigentliche Adresse der Seite umzuleiten."
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:300
 msgid "Accounts abandoned after x days"
 msgstr "Konten gelten nach X Tagen als unbenutzt"
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:300
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:301
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:301
 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."
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:302
 msgid "Verify Email Addresses"
 msgstr "E-Mail-Adressen überprüfen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:302
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Zotlabs/Module/Admin/Site.php:303
 msgid "Force publish"
 msgstr "Veröffentlichung erzwingen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Zotlabs/Module/Admin/Site.php:303
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Zotlabs/Module/Admin/Site.php:304
 msgid "Import Public Streams"
 msgstr "Öffentliche Beiträge importieren"
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Zotlabs/Module/Admin/Site.php:304
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr "Öffentliche Beiträge von anderen Servern importieren und zur Verfügung stellen. Warnung: Diese Inhalte sind nicht moderiert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Zotlabs/Module/Admin/Site.php:305
 msgid "Login on Homepage"
 msgstr "Log-in auf der Startseite"
 
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Zotlabs/Module/Admin/Site.php:305
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Zeigt Besuchern der Homepage eine Anmeldemaske, falls keine anderen Inhalte konfiguriert wurden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:306
 msgid "Enable context help"
 msgstr "Kontext-Hilfe aktivieren"
 
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:306
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
 msgstr "Zeigt Kontext-sensitive Hilfe für die aktuelle Seite an, wenn der Hilfe-Knopf geklickt wird."
 
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Zotlabs/Module/Admin/Site.php:308
 msgid "Reply-to email address for system generated email."
 msgstr "Antwortadresse (reply-to) für Emails, die vom System generiert wurden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Zotlabs/Module/Admin/Site.php:309
 msgid "Sender (From) email address for system generated email."
 msgstr "Absenderadresse (from) für Emails, die vom System generiert wurden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Zotlabs/Module/Admin/Site.php:310
 msgid "Name of email sender for system generated email."
 msgstr "Name des Versenders von Emails, die vom System generiert wurden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Zotlabs/Module/Admin/Site.php:312
 msgid "Directory Server URL"
 msgstr "Verzeichnisserver-URL"
 
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Zotlabs/Module/Admin/Site.php:312
 msgid "Default directory server"
 msgstr "Standard-Verzeichnisserver"
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Zotlabs/Module/Admin/Site.php:314
 msgid "Proxy user"
 msgstr "Proxy Benutzer"
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Zotlabs/Module/Admin/Site.php:315
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:316
 msgid "Network timeout"
 msgstr "Netzwerk-Timeout"
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:316
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Zotlabs/Module/Admin/Site.php:317
 msgid "Delivery interval"
 msgstr "Auslieferung Intervall"
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Zotlabs/Module/Admin/Site.php:317
 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 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."
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Zotlabs/Module/Admin/Site.php:318
 msgid "Deliveries per process"
 msgstr "Zustellungen pro Prozess"
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Zotlabs/Module/Admin/Site.php:318
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Anzahl der Zustellungen, die innerhalb eines einzelnen Betriebssystemprozesses versucht werden. Anpassen, falls nötig, um die System-Performance zu verbessern. Empfehlung: 1-5."
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Zotlabs/Module/Admin/Site.php:319
 msgid "Poll interval"
 msgstr "Abfrageintervall"
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Zotlabs/Module/Admin/Site.php:319
 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 Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:320
 msgid "Maximum Load Average"
 msgstr "Maximales Load Average"
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:320
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Zotlabs/Module/Admin/Site.php:321
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr "Setze den Zeitraum (in Tagen), ab wann importierte (aus dem Netzwerk) Inhalte ablaufen sollen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Zotlabs/Module/Admin/Site.php:321
 msgid "0 for no expiration of imported content"
 msgstr "0 = keine Löschung importierter Inhalte"
 
@@ -2841,8 +3025,8 @@ msgstr "Zusätzliche Informationen (optional)"
 #: ../../Zotlabs/Module/Admin/Profs.php:74
 #: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
-#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1028
-#: ../../include/text.php:1040
+#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1022
+#: ../../include/text.php:1034
 msgid "Save"
 msgstr "Speichern"
 
@@ -3046,6 +3230,14 @@ msgctxt "acl"
 msgid "Profile"
 msgstr "Profil"
 
+#: ../../Zotlabs/Module/Moderate.php:37
+msgid "Comment approved"
+msgstr "Kommentar bestätigt"
+
+#: ../../Zotlabs/Module/Moderate.php:41
+msgid "Comment deleted"
+msgstr "Kommentar gelöscht"
+
 #: ../../Zotlabs/Module/Settings/Permcats.php:37
 msgid "Permission category saved."
 msgstr "Berechtigungsrolle gespeichert."
@@ -3066,25 +3258,25 @@ msgstr "Name der Berechtigungsrolle"
 
 #: ../../Zotlabs/Module/Settings/Permcats.php:103
 #: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Connedit.php:886
+#: ../../Zotlabs/Module/Connedit.php:904
 msgid "My Settings"
 msgstr "Meine Einstellungen"
 
 #: ../../Zotlabs/Module/Settings/Permcats.php:105
 #: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Connedit.php:881
+#: ../../Zotlabs/Module/Connedit.php:899
 msgid "inherited"
 msgstr "geerbt"
 
 #: ../../Zotlabs/Module/Settings/Permcats.php:108
 #: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Zotlabs/Module/Connedit.php:906
 msgid "Individual Permissions"
 msgstr "Individuelle Zugriffsrechte"
 
 #: ../../Zotlabs/Module/Settings/Permcats.php:109
 #: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Connedit.php:889
+#: ../../Zotlabs/Module/Connedit.php:907
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -3098,12 +3290,12 @@ msgstr "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"
 #: ../../Zotlabs/Module/Settings/Channel.php:70
 #: ../../Zotlabs/Module/Settings/Channel.php:81
 #: ../../Zotlabs/Module/Connedit.php:707 ../../Zotlabs/Widget/Affinity.php:28
-#: ../../include/selectors.php:123 ../../include/channel.php:406
-#: ../../include/channel.php:407 ../../include/channel.php:414
+#: ../../include/selectors.php:123 ../../include/channel.php:408
+#: ../../include/channel.php:409 ../../include/channel.php:416
 msgid "Friends"
 msgstr "Freunde"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:251
+#: ../../Zotlabs/Module/Settings/Channel.php:255
 #: ../../addon/rendezvous/rendezvous.php:82
 #: ../../addon/openstreetmap/openstreetmap.php:184
 #: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54
@@ -3112,380 +3304,388 @@ msgstr "Freunde"
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:312
+#: ../../Zotlabs/Module/Settings/Channel.php:316
 msgid "Nobody except yourself"
 msgstr "Niemand außer Dir selbst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:313
+#: ../../Zotlabs/Module/Settings/Channel.php:317
 msgid "Only those you specifically allow"
 msgstr "Nur die, denen Du es explizit erlaubst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:314
+#: ../../Zotlabs/Module/Settings/Channel.php:318
 msgid "Approved connections"
 msgstr "Angenommene Verbindungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:315
+#: ../../Zotlabs/Module/Settings/Channel.php:319
 msgid "Any connections"
 msgstr "Beliebige Verbindungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:316
+#: ../../Zotlabs/Module/Settings/Channel.php:320
 msgid "Anybody on this website"
 msgstr "Jeder auf dieser Website"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:317
+#: ../../Zotlabs/Module/Settings/Channel.php:321
 msgid "Anybody in this network"
 msgstr "Alle $Projectname-Mitglieder"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:318
+#: ../../Zotlabs/Module/Settings/Channel.php:322
 msgid "Anybody authenticated"
 msgstr "Jeder authentifizierte"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:319
+#: ../../Zotlabs/Module/Settings/Channel.php:323
 msgid "Anybody on the internet"
 msgstr "Jeder im Internet"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:395
+#: ../../Zotlabs/Module/Settings/Channel.php:399
 msgid "Publish your default profile in the network directory"
 msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:400
+#: ../../Zotlabs/Module/Settings/Channel.php:404
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:404
+#: ../../Zotlabs/Module/Settings/Channel.php:408
 #: ../../Zotlabs/Module/Profile_photo.php:429
 #: ../../Zotlabs/Module/Cover_photo.php:365
 msgid "or"
 msgstr "oder"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:409
+#: ../../Zotlabs/Module/Settings/Channel.php:413
 msgid "Your channel address is"
 msgstr "Deine Kanal-Adresse lautet"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:412
+#: ../../Zotlabs/Module/Settings/Channel.php:416
 msgid "Your files/photos are accessible via WebDAV at"
 msgstr "Deine Dateien/Fotos sind via WebDAV verfügbar auf"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:474
+#: ../../Zotlabs/Module/Settings/Channel.php:478
 msgid "Channel Settings"
 msgstr "Kanal-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:481
+#: ../../Zotlabs/Module/Settings/Channel.php:485
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:482
-#: ../../include/channel.php:1250
+#: ../../Zotlabs/Module/Settings/Channel.php:486
+#: ../../include/channel.php:1373
 msgid "Full Name:"
 msgstr "Voller Name:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:483
+#: ../../Zotlabs/Module/Settings/Channel.php:487
 #: ../../Zotlabs/Module/Settings/Account.php:119
 msgid "Email Address:"
 msgstr "Email Adresse:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:484
+#: ../../Zotlabs/Module/Settings/Channel.php:488
 msgid "Your Timezone:"
 msgstr "Ihre Zeitzone:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:485
+#: ../../Zotlabs/Module/Settings/Channel.php:489
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:485
+#: ../../Zotlabs/Module/Settings/Channel.php:489
 msgid "Geographical location to display on your posts"
 msgstr "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:486
+#: ../../Zotlabs/Module/Settings/Channel.php:490
 msgid "Use Browser Location:"
 msgstr "Standort des Browsers verwenden:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:488
+#: ../../Zotlabs/Module/Settings/Channel.php:492
 msgid "Adult Content"
 msgstr "Nicht jugendfreie Inhalte"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:488
+#: ../../Zotlabs/Module/Settings/Channel.php:492
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:490
+#: ../../Zotlabs/Module/Settings/Channel.php:494
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Datenschutz-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:493
+#: ../../Zotlabs/Module/Settings/Channel.php:496
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Deine Zugriffsrechte sind schon konfiguriert. Klicke hier, um sie zu betrachten oder zu ändern"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:495
+#: ../../Zotlabs/Module/Settings/Channel.php:498
 msgid "Hide my online presence"
 msgstr "Meine Online-Präsenz verbergen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:495
+#: ../../Zotlabs/Module/Settings/Channel.php:498
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:497
+#: ../../Zotlabs/Module/Settings/Channel.php:500
 msgid "Simple Privacy Settings:"
 msgstr "Einfache Privatsphäre-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:498
+#: ../../Zotlabs/Module/Settings/Channel.php:501
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Komplett offen – <em>extrem ungeschützt (mit großer Vorsicht verwenden!)</em>"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:499
+#: ../../Zotlabs/Module/Settings/Channel.php:502
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Typisch – <em>Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)</em>"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:500
+#: ../../Zotlabs/Module/Settings/Channel.php:503
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privat – <em>Standard privat, nie offen oder öffentlich</em>"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:501
+#: ../../Zotlabs/Module/Settings/Channel.php:504
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Blockiert – <em>Alle standardmäßig blockiert</em>"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Zotlabs/Module/Settings/Channel.php:506
 msgid "Allow others to tag your posts"
 msgstr "Erlaube anderen, Deine Beiträge zu verschlagworten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Zotlabs/Module/Settings/Channel.php:506
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:505
+#: ../../Zotlabs/Module/Settings/Channel.php:508
 msgid "Channel Permission Limits"
 msgstr "Kanal-Berechtigungslimits"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:510
 msgid "Expire other channel content after this many days"
 msgstr "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:510
 msgid "0 or blank to use the website limit."
 msgstr "0 oder leer lassen, um den voreingestellten Wert der Webseite zu verwenden."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:510
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Diese Webseite läuft nach %d Tagen ab."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:510
 msgid "This website does not expire imported content."
 msgstr "Diese Webseite lässt importierte Inhalte nicht verfallen."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:510
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "Das Verfallslimit der Webseite hat Vorrang, wenn es niedriger als Deines hier ist."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:508
+#: ../../Zotlabs/Module/Settings/Channel.php:511
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Kontaktanfragen pro Tag:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:508
+#: ../../Zotlabs/Module/Settings/Channel.php:511
 msgid "May reduce spam activity"
 msgstr "Kann die Spam-Aktivität verringern"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:509
+#: ../../Zotlabs/Module/Settings/Channel.php:512
 msgid "Default Access Control List (ACL)"
 msgstr "Standard-Zugriffsberechtigungsliste (ACL)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:511
+#: ../../Zotlabs/Module/Settings/Channel.php:514
 msgid "Use my default audience setting for the type of object published"
 msgstr "Verwende Deine eingestellte Standard-Zielgruppe des jeweiligen Inhaltstyps"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:518
+#: ../../Zotlabs/Module/Settings/Channel.php:521
 msgid "Channel permissions category:"
 msgstr "Zugriffsrechte-Kategorie des Kanals:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Zotlabs/Module/Settings/Channel.php:522
 msgid "Default Permissions Group"
 msgstr "Standard-Berechtigungsgruppe"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Zotlabs/Module/Settings/Channel.php:528
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Zotlabs/Module/Settings/Channel.php:528
 msgid "Useful to reduce spamming"
 msgstr "Nützlich, um Spam zu verringern"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Zotlabs/Module/Settings/Channel.php:531
 msgid "Notification Settings"
 msgstr "Benachrichtigungs-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:529
+#: ../../Zotlabs/Module/Settings/Channel.php:532
 msgid "By default post a status message when:"
 msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:530
+#: ../../Zotlabs/Module/Settings/Channel.php:533
 msgid "accepting a friend request"
 msgstr "Du eine Verbindungsanfrage annimmst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:531
+#: ../../Zotlabs/Module/Settings/Channel.php:534
 msgid "joining a forum/community"
 msgstr "Du einem Forum beitrittst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:532
+#: ../../Zotlabs/Module/Settings/Channel.php:535
 msgid "making an <em>interesting</em> profile change"
 msgstr "Du eine <em>interessante</em> Änderung an Deinem Profil vornimmst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:533
+#: ../../Zotlabs/Module/Settings/Channel.php:536
 msgid "Send a notification email when:"
 msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:534
+#: ../../Zotlabs/Module/Settings/Channel.php:537
 msgid "You receive a connection request"
 msgstr "Du eine Verbindungsanfrage erhältst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:535
+#: ../../Zotlabs/Module/Settings/Channel.php:538
 msgid "Your connections are confirmed"
 msgstr "Eine Verbindung bestätigt wurde"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:536
+#: ../../Zotlabs/Module/Settings/Channel.php:539
 msgid "Someone writes on your profile wall"
 msgstr "Jemand auf Deine Pinnwand schreibt"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:537
+#: ../../Zotlabs/Module/Settings/Channel.php:540
 msgid "Someone writes a followup comment"
 msgstr "Jemand einen Beitrag kommentiert"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:538
+#: ../../Zotlabs/Module/Settings/Channel.php:541
 msgid "You receive a private message"
 msgstr "Du eine private Nachricht erhältst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:539
+#: ../../Zotlabs/Module/Settings/Channel.php:542
 msgid "You receive a friend suggestion"
 msgstr "Du einen Kontaktvorschlag erhältst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:540
+#: ../../Zotlabs/Module/Settings/Channel.php:543
 msgid "You are tagged in a post"
 msgstr "Du in einem Beitrag erwähnt wurdest"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:541
+#: ../../Zotlabs/Module/Settings/Channel.php:544
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:543
+#: ../../Zotlabs/Module/Settings/Channel.php:546
 msgid "Someone likes your post/comment"
 msgstr "Jemand mag Ihren Beitrag/Kommentar"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Zotlabs/Module/Settings/Channel.php:549
 msgid "Show visual notifications including:"
 msgstr "Visuelle Benachrichtigungen anzeigen für:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:548
+#: ../../Zotlabs/Module/Settings/Channel.php:551
 msgid "Unseen grid activity"
 msgstr "Ungesehene Netzwerk-Aktivität"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:549
+#: ../../Zotlabs/Module/Settings/Channel.php:552
 msgid "Unseen channel activity"
 msgstr "Ungesehene Kanal-Aktivität"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Zotlabs/Module/Settings/Channel.php:553
 msgid "Unseen private messages"
 msgstr "Ungelesene persönliche Nachrichten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
-#: ../../Zotlabs/Module/Settings/Channel.php:555
-#: ../../Zotlabs/Module/Settings/Channel.php:556
-#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Zotlabs/Module/Settings/Channel.php:558
+#: ../../Zotlabs/Module/Settings/Channel.php:559
+#: ../../Zotlabs/Module/Settings/Channel.php:560
 #: ../../addon/jappixmini/jappixmini.php:343
 msgid "Recommended"
 msgstr "Empfohlen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:551
+#: ../../Zotlabs/Module/Settings/Channel.php:554
 msgid "Upcoming events"
 msgstr "Baldige Termine"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:552
+#: ../../Zotlabs/Module/Settings/Channel.php:555
 msgid "Events today"
 msgstr "Heutige Termine"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Zotlabs/Module/Settings/Channel.php:556
 msgid "Upcoming birthdays"
 msgstr "Baldige Geburtstage"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Zotlabs/Module/Settings/Channel.php:556
 msgid "Not available in all themes"
-msgstr "Nicht in allen Themes verfügbar"
+msgstr "Nicht in allen Designs verfügbar"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:554
+#: ../../Zotlabs/Module/Settings/Channel.php:557
 msgid "System (personal) notifications"
 msgstr "System – (persönliche) Benachrichtigungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Zotlabs/Module/Settings/Channel.php:558
 msgid "System info messages"
 msgstr "System – Info-Nachrichten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:556
+#: ../../Zotlabs/Module/Settings/Channel.php:559
 msgid "System critical alerts"
 msgstr "System – kritische Warnungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../Zotlabs/Module/Settings/Channel.php:560
 msgid "New connections"
 msgstr "Neue Verbindungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:558
+#: ../../Zotlabs/Module/Settings/Channel.php:561
 msgid "System Registrations"
 msgstr "System – Registrierungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:559
+#: ../../Zotlabs/Module/Settings/Channel.php:562
+msgid "Unseen shared files"
+msgstr "Ungesehene geteilte Dateien"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:563
+msgid "Unseen public activity"
+msgstr "Ungesehene öffentliche Aktivität"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:564
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen anzeigen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Zotlabs/Module/Settings/Channel.php:566
 msgid "Notify me of events this many days in advance"
 msgstr "Benachrichtige mich zu Terminen so viele Tage im Voraus"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Zotlabs/Module/Settings/Channel.php:566
 msgid "Must be greater than 0"
 msgstr "Muss größer als 0 sein"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Zotlabs/Module/Settings/Channel.php:572
 msgid "Advanced Account/Page Type Settings"
 msgstr "Erweiterte Account- und Seitenart-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:568
+#: ../../Zotlabs/Module/Settings/Channel.php:573
 msgid "Change the behaviour of this account for special situations"
 msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:570
+#: ../../Zotlabs/Module/Settings/Channel.php:575
 msgid "Miscellaneous Settings"
 msgstr "Sonstige Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Zotlabs/Module/Settings/Channel.php:576
 msgid "Default photo upload folder"
 msgstr "Voreingestellter Ordner für hochgeladene Fotos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:577
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - aktuelles Jahr, %m -  aktueller Monat"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Zotlabs/Module/Settings/Channel.php:577
 msgid "Default file upload folder"
 msgstr "Voreingestellter Ordner für hochgeladene Dateien"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Zotlabs/Module/Settings/Channel.php:579
 msgid "Personal menu to display in your channel pages"
 msgstr "Eigenes Menü zur Anzeige auf den Seiten deines Kanals"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:581
 msgid "Remove this channel."
 msgstr "Diesen Kanal löschen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Zotlabs/Module/Settings/Channel.php:582
 msgid "Firefox Share $Projectname provider"
 msgstr "$Projectname-Provider für Firefox Share"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Zotlabs/Module/Settings/Channel.php:583
 msgid "Start calendar week on Monday"
 msgstr "Beginne die kalendarische Woche am Montag"
 
@@ -3521,7 +3721,7 @@ msgid ""
 msgstr "Du kannst auch <em>Dropbox</em>-ähnliche Zugriffslinks an Andere weitergeben, indem du das Login-Passwort an eine entsprechende URL anhängst wie nachfolgend gezeigt. Beispiele:"
 
 #: ../../Zotlabs/Module/Settings/Tokens.php:150
-#: ../../Zotlabs/Widget/Settings_menu.php:90
+#: ../../Zotlabs/Widget/Settings_menu.php:92
 msgid "Guest Access Tokens"
 msgstr "Gastzugangstoken"
 
@@ -3538,7 +3738,7 @@ msgid "Expires (yyyy-mm-dd)"
 msgstr "Läuft ab (jjjj-mm-tt)"
 
 #: ../../Zotlabs/Module/Settings/Tokens.php:160
-#: ../../Zotlabs/Module/Connedit.php:885
+#: ../../Zotlabs/Module/Connedit.php:903
 msgid "Their Settings"
 msgstr "Deren Einstellungen"
 
@@ -3615,33 +3815,33 @@ msgstr "Konto entfernen"
 msgid "Remove this account including all its channels"
 msgstr "Dieses Konto inklusive all seiner Kanäle löschen"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:20
+#: ../../Zotlabs/Module/Settings/Featured.php:21
 msgid "Affinity Slider settings updated."
 msgstr "Die Beziehungsgrad-Schieberegler-Einstellungen wurden aktualisiert."
 
-#: ../../Zotlabs/Module/Settings/Featured.php:34
+#: ../../Zotlabs/Module/Settings/Featured.php:36
 msgid "No feature settings configured"
 msgstr "Keine Funktions-Einstellungen konfiguriert"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:41
+#: ../../Zotlabs/Module/Settings/Featured.php:43
 msgid "Default maximum affinity level"
 msgstr "Voreinstellung für maximalen Beziehungsgrad"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:46
+#: ../../Zotlabs/Module/Settings/Featured.php:48
 msgid "Default minimum affinity level"
 msgstr "Voreinstellung für minimalen Beziehungsgrad"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Zotlabs/Module/Settings/Featured.php:52
 msgid "Affinity Slider Settings"
 msgstr "Beziehungsgrad-Schieberegler-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:60
+#: ../../Zotlabs/Module/Settings/Featured.php:62
 msgid "Feature/Addon Settings"
 msgstr "Funktions-/Addon-Einstellungen"
 
 #: ../../Zotlabs/Module/Settings/Display.php:145
 msgid "No special theme for mobile devices"
-msgstr "Keine spezielle Theme für mobile Geräte"
+msgstr "Kein spezielles Design für mobile Geräte"
 
 #: ../../Zotlabs/Module/Settings/Display.php:148
 #, php-format
@@ -3654,11 +3854,11 @@ msgstr "Anzeige-Einstellungen"
 
 #: ../../Zotlabs/Module/Settings/Display.php:199
 msgid "Theme Settings"
-msgstr "Theme-Einstellungen"
+msgstr "Design-Einstellungen"
 
 #: ../../Zotlabs/Module/Settings/Display.php:200
 msgid "Custom Theme Settings"
-msgstr "Benutzerdefinierte Theme-Einstellungen"
+msgstr "Benutzerdefinierte Design-Einstellungen"
 
 #: ../../Zotlabs/Module/Settings/Display.php:201
 msgid "Content Settings"
@@ -3666,7 +3866,7 @@ msgstr "Inhaltseinstellungen"
 
 #: ../../Zotlabs/Module/Settings/Display.php:207
 msgid "Display Theme:"
-msgstr "Anzeige-Theme:"
+msgstr "Anzeige-Design:"
 
 #: ../../Zotlabs/Module/Settings/Display.php:208
 msgid "Select scheme"
@@ -3674,7 +3874,7 @@ msgstr "Schema wählen"
 
 #: ../../Zotlabs/Module/Settings/Display.php:210
 msgid "Mobile Theme:"
-msgstr "Mobile Theme:"
+msgstr "Design für mobile Geräte:"
 
 #: ../../Zotlabs/Module/Settings/Display.php:211
 msgid "Preload images before rendering the page"
@@ -3829,32 +4029,24 @@ msgid "Remove authorization"
 msgstr "Authorisierung aufheben"
 
 #: ../../Zotlabs/Module/Embedphotos.php:140
-#: ../../Zotlabs/Module/Photos.php:751 ../../Zotlabs/Module/Photos.php:1290
-#: ../../Zotlabs/Widget/Album.php:78
+#: ../../Zotlabs/Module/Photos.php:753 ../../Zotlabs/Module/Photos.php:1292
+#: ../../Zotlabs/Widget/Portfolio.php:78 ../../Zotlabs/Widget/Album.php:78
 msgid "View Photo"
 msgstr "Foto ansehen"
 
-#: ../../Zotlabs/Module/Embedphotos.php:146
-#: ../../Zotlabs/Module/Photos.php:757 ../../Zotlabs/Module/Photos.php:1213
-#: ../../Zotlabs/Lib/Apps.php:571 ../../Zotlabs/Lib/Apps.php:649
-#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Widget/Album.php:84
-#: ../../addon/cdav/Mod_Cdav.php:745 ../../addon/cdav/Mod_Cdav.php:746
-#: ../../addon/cdav/Mod_Cdav.php:753 ../../include/conversation.php:1110
-msgid "Unknown"
-msgstr "Unbekannt"
-
 #: ../../Zotlabs/Module/Embedphotos.php:156
-#: ../../Zotlabs/Module/Photos.php:782 ../../Zotlabs/Widget/Album.php:95
+#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Widget/Portfolio.php:97
+#: ../../Zotlabs/Widget/Album.php:95
 msgid "Edit Album"
 msgstr "Album bearbeiten"
 
 #: ../../Zotlabs/Module/Embedphotos.php:158
-#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1321
+#: ../../Zotlabs/Module/Photos.php:786 ../../Zotlabs/Module/Photos.php:1323
 #: ../../Zotlabs/Module/Profile_photo.php:423
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:334
-#: ../../Zotlabs/Widget/Album.php:97 ../../addon/cdav/include/widgets.php:132
-#: ../../addon/cdav/include/widgets.php:168
+#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:337
+#: ../../Zotlabs/Widget/Cdav.php:132 ../../Zotlabs/Widget/Cdav.php:168
+#: ../../Zotlabs/Widget/Portfolio.php:99 ../../Zotlabs/Widget/Album.php:97
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -3916,9 +4108,9 @@ msgid "URL for photo of thing (optional)"
 msgstr "URL eines Fotos der Sache (optional)"
 
 #: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363
-#: ../../Zotlabs/Module/Photos.php:647 ../../Zotlabs/Module/Photos.php:1011
-#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:233
-#: ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Photos.php:649 ../../Zotlabs/Module/Photos.php:1013
+#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:235
+#: ../../Zotlabs/Module/Filestorage.php:142
 #: ../../include/acl_selectors.php:218
 msgid "Permissions"
 msgstr "Berechtigungen"
@@ -3941,52 +4133,52 @@ msgstr "System-Benachrichtigungen"
 msgid "Channel added."
 msgstr "Kanal hinzugefügt."
 
-#: ../../Zotlabs/Module/Import.php:144
+#: ../../Zotlabs/Module/Import.php:143
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr "Dein Vertrag erlaubt nur %d Kanäle."
 
-#: ../../Zotlabs/Module/Import.php:158
+#: ../../Zotlabs/Module/Import.php:157
 msgid "No channel. Import failed."
 msgstr "Kein Kanal. Import fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Import.php:466
+#: ../../Zotlabs/Module/Import.php:470
 #: ../../addon/diaspora/import_diaspora.php:142
 msgid "Import completed."
 msgstr "Import abgeschlossen."
 
-#: ../../Zotlabs/Module/Import.php:494
+#: ../../Zotlabs/Module/Import.php:498
 msgid "You must be logged in to use this feature."
 msgstr "Du musst angemeldet sein um diese Funktion zu nutzen."
 
-#: ../../Zotlabs/Module/Import.php:499
+#: ../../Zotlabs/Module/Import.php:503
 msgid "Import Channel"
 msgstr "Kanal importieren"
 
-#: ../../Zotlabs/Module/Import.php:500
+#: ../../Zotlabs/Module/Import.php:504
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren."
 
-#: ../../Zotlabs/Module/Import.php:502
+#: ../../Zotlabs/Module/Import.php:506
 msgid "Or provide the old server/hub details"
 msgstr "Oder gib die Details Deines bisherigen $Projectname-Hubs ein"
 
-#: ../../Zotlabs/Module/Import.php:503
+#: ../../Zotlabs/Module/Import.php:507
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Bisherige Kanal-Adresse (xyz@example.com)"
 
-#: ../../Zotlabs/Module/Import.php:504
+#: ../../Zotlabs/Module/Import.php:508
 msgid "Your old login email address"
 msgstr "Deine alte Login-E-Mail-Adresse"
 
-#: ../../Zotlabs/Module/Import.php:505
+#: ../../Zotlabs/Module/Import.php:509
 msgid "Your old login password"
 msgstr "Dein altes Passwort"
 
-#: ../../Zotlabs/Module/Import.php:506
+#: ../../Zotlabs/Module/Import.php:510
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -3994,19 +4186,19 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige $Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein."
 
-#: ../../Zotlabs/Module/Import.php:507
+#: ../../Zotlabs/Module/Import.php:511
 msgid "Make this hub my primary location"
 msgstr "Dieser $Pojectname-Hub ist mein primärer Hub."
 
-#: ../../Zotlabs/Module/Import.php:508
+#: ../../Zotlabs/Module/Import.php:512
 msgid "Move this channel (disable all previous locations)"
 msgstr "Verschiebe diesen Kanal (deaktiviere alle vorherigen Adressen/Klone)"
 
-#: ../../Zotlabs/Module/Import.php:509
+#: ../../Zotlabs/Module/Import.php:513
 msgid "Import a few months of posts if possible (limited by available memory"
 msgstr "Importiere die Beiträge einiger Monate, sofern möglich (beschränkt durch verfügbaren Speicher)"
 
-#: ../../Zotlabs/Module/Import.php:510
+#: ../../Zotlabs/Module/Import.php:514
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -4016,21 +4208,21 @@ msgstr "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur
 msgid "Authentication failed."
 msgstr "Authentifizierung fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1984
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:2102
 msgid "Remote Authentication"
 msgstr "Entfernte Authentifizierung"
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1985
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2103
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1986
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2104
 msgid "Authenticate"
 msgstr "Authentifizieren"
 
 #: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:31
-#: ../../Zotlabs/Module/Block.php:43
+#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Wall_upload.php:31
+#: ../../Zotlabs/Module/Block.php:41
 msgid "Channel not found."
 msgstr "Kanal nicht gefunden."
 
@@ -4038,7 +4230,7 @@ msgstr "Kanal nicht gefunden."
 msgid "Permissions denied."
 msgstr "Berechtigung verweigert."
 
-#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2291
+#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2304
 msgid "Import"
 msgstr "Import"
 
@@ -4064,13 +4256,13 @@ msgstr "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte a
 msgid "Item not available."
 msgstr "Element nicht verfügbar."
 
-#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:205
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:306
-#: ../../Zotlabs/Module/Mail.php:448 ../../include/conversation.php:1228
+#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207
+#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288
+#: ../../Zotlabs/Module/Mail.php:430 ../../include/conversation.php:1225
 msgid "Insert web link"
 msgstr "Link einfügen"
 
-#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1339
+#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1336
 msgid "Title (optional)"
 msgstr "Titel (optional)"
 
@@ -4078,11 +4270,11 @@ msgstr "Titel (optional)"
 msgid "Edit Block"
 msgstr "Block bearbeiten"
 
-#: ../../Zotlabs/Module/Profile.php:91
+#: ../../Zotlabs/Module/Profile.php:93
 msgid "vcard"
 msgstr "VCard"
 
-#: ../../Zotlabs/Module/Apps.php:45
+#: ../../Zotlabs/Module/Apps.php:45 ../../Zotlabs/Lib/Apps.php:224
 msgid "Apps"
 msgstr "Apps"
 
@@ -4100,7 +4292,8 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s ist %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234
+#: ../../Zotlabs/Module/Mood.php:120 ../../Zotlabs/Module/Mood.php:135
+#: ../../Zotlabs/Lib/Apps.php:247
 msgid "Mood"
 msgstr "Laune"
 
@@ -4108,74 +4301,87 @@ msgstr "Laune"
 msgid "Set your current mood and tell your friends"
 msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"
 
-#: ../../Zotlabs/Module/Connections.php:52
-#: ../../Zotlabs/Module/Connections.php:157
-#: ../../Zotlabs/Module/Connections.php:246
+#: ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Module/Connections.php:309 ../../Zotlabs/Lib/Apps.php:229
+#: ../../include/text.php:951 ../../include/nav.php:180
+msgid "Connections"
+msgstr "Verbindungen"
+
+#: ../../Zotlabs/Module/Connections.php:54
+#: ../../Zotlabs/Module/Connections.php:156
+#: ../../Zotlabs/Module/Connections.php:245
 msgid "Blocked"
 msgstr "Blockiert"
 
-#: ../../Zotlabs/Module/Connections.php:57
-#: ../../Zotlabs/Module/Connections.php:164
-#: ../../Zotlabs/Module/Connections.php:245
+#: ../../Zotlabs/Module/Connections.php:59
+#: ../../Zotlabs/Module/Connections.php:163
+#: ../../Zotlabs/Module/Connections.php:244
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: ../../Zotlabs/Module/Connections.php:62
-#: ../../Zotlabs/Module/Connections.php:178
-#: ../../Zotlabs/Module/Connections.php:244
+#: ../../Zotlabs/Module/Connections.php:64
+#: ../../Zotlabs/Module/Connections.php:177
+#: ../../Zotlabs/Module/Connections.php:243
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: ../../Zotlabs/Module/Connections.php:67
-#: ../../Zotlabs/Module/Connections.php:171
-#: ../../Zotlabs/Module/Connections.php:243
-msgid "Archived"
-msgstr "Archiviert"
+#: ../../Zotlabs/Module/Connections.php:69
+#: ../../Zotlabs/Module/Connections.php:170
+msgid "Archived/Unreachable"
+msgstr "Archiviert/Unerreichbar"
 
-#: ../../Zotlabs/Module/Connections.php:72
-#: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1666
+#: ../../Zotlabs/Module/Connections.php:74
+#: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116
+#: ../../include/conversation.php:1663
 msgid "New"
 msgstr "Neu"
 
 #: ../../Zotlabs/Module/Connections.php:88
-#: ../../Zotlabs/Module/Connections.php:103
+#: ../../Zotlabs/Module/Connections.php:102
 #: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30
 msgid "All"
 msgstr "Alle"
 
-#: ../../Zotlabs/Module/Connections.php:134
+#: ../../Zotlabs/Module/Connections.php:133
 msgid "New Connections"
 msgstr "Neue Verbindungen"
 
-#: ../../Zotlabs/Module/Connections.php:137
+#: ../../Zotlabs/Module/Connections.php:136
 msgid "Show pending (new) connections"
 msgstr "Ausstehende (neue) Verbindungsanfragen anzeigen"
 
-#: ../../Zotlabs/Module/Connections.php:144
+#: ../../Zotlabs/Module/Connections.php:143
 msgid "Show all connections"
 msgstr "Alle Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Connections.php:160
+#: ../../Zotlabs/Module/Connections.php:159
 msgid "Only show blocked connections"
 msgstr "Nur blockierte Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Connections.php:167
+#: ../../Zotlabs/Module/Connections.php:166
 msgid "Only show ignored connections"
 msgstr "Nur ignorierte Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Connections.php:174
-msgid "Only show archived connections"
-msgstr "Nur archivierte Verbindungen anzeigen"
+#: ../../Zotlabs/Module/Connections.php:173
+msgid "Only show archived/unreachable connections"
+msgstr "Nur archivierte/unerreichbare Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Connections.php:181
+#: ../../Zotlabs/Module/Connections.php:180
 msgid "Only show hidden connections"
 msgstr "Nur versteckte Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Connections.php:242
+#: ../../Zotlabs/Module/Connections.php:241
 msgid "Pending approval"
 msgstr "Wartet auf Genehmigung"
 
+#: ../../Zotlabs/Module/Connections.php:242
+msgid "Archived"
+msgstr "Archiviert"
+
+#: ../../Zotlabs/Module/Connections.php:246
+msgid "Not connected at this location"
+msgstr "An diesem Ort nicht verbunden"
+
 #: ../../Zotlabs/Module/Connections.php:258
 #, php-format
 msgid "%1$s [%2$s]"
@@ -4185,61 +4391,56 @@ msgstr "%1$s [%2$s]"
 msgid "Edit connection"
 msgstr "Verbindung bearbeiten"
 
-#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Zotlabs/Module/Connections.php:261
 msgid "Delete connection"
 msgstr "Verbindung löschen"
 
-#: ../../Zotlabs/Module/Connections.php:269
+#: ../../Zotlabs/Module/Connections.php:270
 msgid "Channel address"
 msgstr "Kanaladresse"
 
-#: ../../Zotlabs/Module/Connections.php:271
+#: ../../Zotlabs/Module/Connections.php:272
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../../Zotlabs/Module/Connections.php:274
+#: ../../Zotlabs/Module/Connections.php:275
 msgid "Call"
 msgstr "Anruf"
 
-#: ../../Zotlabs/Module/Connections.php:276
+#: ../../Zotlabs/Module/Connections.php:277
 msgid "Status"
 msgstr "Status"
 
-#: ../../Zotlabs/Module/Connections.php:278
+#: ../../Zotlabs/Module/Connections.php:279
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../../Zotlabs/Module/Connections.php:280
+#: ../../Zotlabs/Module/Connections.php:281
 msgid "Approve connection"
 msgstr "Verbindung genehmigen"
 
-#: ../../Zotlabs/Module/Connections.php:282
+#: ../../Zotlabs/Module/Connections.php:283
 msgid "Ignore connection"
 msgstr "Verbindung ignorieren"
 
-#: ../../Zotlabs/Module/Connections.php:283
+#: ../../Zotlabs/Module/Connections.php:284
 #: ../../Zotlabs/Module/Connedit.php:626
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../../Zotlabs/Module/Connections.php:284
+#: ../../Zotlabs/Module/Connections.php:285
 msgid "Recent activity"
 msgstr "Kürzliche Aktivitäten"
 
-#: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/text.php:957 ../../include/nav.php:185
-msgid "Connections"
-msgstr "Verbindungen"
-
-#: ../../Zotlabs/Module/Connections.php:313
+#: ../../Zotlabs/Module/Connections.php:314
 msgid "Search your connections"
 msgstr "Verbindungen durchsuchen"
 
-#: ../../Zotlabs/Module/Connections.php:314
+#: ../../Zotlabs/Module/Connections.php:315
 msgid "Connections search"
 msgstr "Verbindung suchen"
 
-#: ../../Zotlabs/Module/Connections.php:315
+#: ../../Zotlabs/Module/Connections.php:316
 #: ../../Zotlabs/Module/Directory.php:391
 #: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23
 msgid "Find"
@@ -4247,21 +4448,25 @@ msgstr "Finde"
 
 #: ../../Zotlabs/Module/Viewsrc.php:43
 msgid "item"
-msgstr ""
+msgstr "Beitrag"
 
 #: ../../Zotlabs/Module/Viewsrc.php:55
 msgid "Source of Item"
 msgstr "Quelle des Elements"
 
-#: ../../Zotlabs/Module/Bookmarks.php:53
+#: ../../Zotlabs/Module/Bookmarks.php:11 ../../Zotlabs/Lib/Apps.php:227
+msgid "View Bookmarks"
+msgstr "Lesezeichen ansehen"
+
+#: ../../Zotlabs/Module/Bookmarks.php:56
 msgid "Bookmark added"
 msgstr "Lesezeichen hinzugefügt"
 
-#: ../../Zotlabs/Module/Bookmarks.php:76
+#: ../../Zotlabs/Module/Bookmarks.php:79
 msgid "My Bookmarks"
 msgstr "Meine Lesezeichen"
 
-#: ../../Zotlabs/Module/Bookmarks.php:87
+#: ../../Zotlabs/Module/Bookmarks.php:90
 msgid "My Connections Bookmarks"
 msgstr "Lesezeichen meiner Kontakte"
 
@@ -4305,7 +4510,7 @@ msgstr "Album nicht gefunden."
 msgid "Delete Album"
 msgstr "Album löschen"
 
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1023
+#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1025
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
@@ -4317,226 +4522,232 @@ msgstr "Keine Fotos ausgewählt"
 msgid "Access to this item is restricted."
 msgstr "Der Zugriff auf dieses Foto ist eingeschränkt."
 
-#: ../../Zotlabs/Module/Photos.php:591
+#: ../../Zotlabs/Module/Photos.php:558 ../../Zotlabs/Module/Fbrowser.php:29
+#: ../../Zotlabs/Lib/Apps.php:242 ../../include/conversation.php:1780
+#: ../../include/nav.php:378
+msgid "Photos"
+msgstr "Fotos"
+
+#: ../../Zotlabs/Module/Photos.php:593
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "%1$.2f MB von %2$.2f MB Foto-Speicher belegt."
 
-#: ../../Zotlabs/Module/Photos.php:594
+#: ../../Zotlabs/Module/Photos.php:596
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "%1$.2f MB Foto-Speicher belegt."
 
-#: ../../Zotlabs/Module/Photos.php:636
+#: ../../Zotlabs/Module/Photos.php:638
 msgid "Upload Photos"
 msgstr "Fotos hochladen"
 
-#: ../../Zotlabs/Module/Photos.php:640
+#: ../../Zotlabs/Module/Photos.php:642
 msgid "Enter an album name"
 msgstr "Namen für ein neues Album eingeben"
 
-#: ../../Zotlabs/Module/Photos.php:641
+#: ../../Zotlabs/Module/Photos.php:643
 msgid "or select an existing album (doubleclick)"
 msgstr "oder ein bereits vorhandenes auswählen (Doppelklick)"
 
-#: ../../Zotlabs/Module/Photos.php:642
+#: ../../Zotlabs/Module/Photos.php:644
 msgid "Create a status post for this upload"
 msgstr "Einen Statusbeitrag für diesen Upload erzeugen"
 
-#: ../../Zotlabs/Module/Photos.php:643
+#: ../../Zotlabs/Module/Photos.php:645
 msgid "Caption (optional):"
 msgstr "Beschriftung (optional):"
 
-#: ../../Zotlabs/Module/Photos.php:644
+#: ../../Zotlabs/Module/Photos.php:646
 msgid "Description (optional):"
 msgstr "Beschreibung (optional):"
 
-#: ../../Zotlabs/Module/Photos.php:725
+#: ../../Zotlabs/Module/Photos.php:727
 msgid "Show Newest First"
 msgstr "Neueste zuerst anzeigen"
 
-#: ../../Zotlabs/Module/Photos.php:727
+#: ../../Zotlabs/Module/Photos.php:729
 msgid "Show Oldest First"
 msgstr "Älteste zuerst anzeigen"
 
-#: ../../Zotlabs/Module/Photos.php:832
+#: ../../Zotlabs/Module/Photos.php:834
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
 
-#: ../../Zotlabs/Module/Photos.php:834
+#: ../../Zotlabs/Module/Photos.php:836
 msgid "Photo not available"
 msgstr "Foto nicht verfügbar"
 
-#: ../../Zotlabs/Module/Photos.php:892
+#: ../../Zotlabs/Module/Photos.php:894
 msgid "Use as profile photo"
 msgstr "Als Profilfoto verwenden"
 
-#: ../../Zotlabs/Module/Photos.php:893
+#: ../../Zotlabs/Module/Photos.php:895
 msgid "Use as cover photo"
 msgstr "Als Titelbild verwenden"
 
-#: ../../Zotlabs/Module/Photos.php:900
+#: ../../Zotlabs/Module/Photos.php:902
 msgid "Private Photo"
 msgstr "Privates Foto"
 
-#: ../../Zotlabs/Module/Photos.php:915
+#: ../../Zotlabs/Module/Photos.php:917
 msgid "View Full Size"
 msgstr "In voller Größe anzeigen"
 
-#: ../../Zotlabs/Module/Photos.php:997
+#: ../../Zotlabs/Module/Photos.php:999
 msgid "Edit photo"
 msgstr "Foto bearbeiten"
 
-#: ../../Zotlabs/Module/Photos.php:999
+#: ../../Zotlabs/Module/Photos.php:1001
 msgid "Rotate CW (right)"
 msgstr "Drehen im UZS (rechts)"
 
-#: ../../Zotlabs/Module/Photos.php:1000
+#: ../../Zotlabs/Module/Photos.php:1002
 msgid "Rotate CCW (left)"
 msgstr "Drehen gegen UZS (links)"
 
-#: ../../Zotlabs/Module/Photos.php:1003
+#: ../../Zotlabs/Module/Photos.php:1005
 msgid "Move photo to album"
 msgstr "Foto in Album verschieben"
 
-#: ../../Zotlabs/Module/Photos.php:1004
+#: ../../Zotlabs/Module/Photos.php:1006
 msgid "Enter a new album name"
 msgstr "Gib einen Namen für ein neues Album ein"
 
-#: ../../Zotlabs/Module/Photos.php:1005
+#: ../../Zotlabs/Module/Photos.php:1007
 msgid "or select an existing one (doubleclick)"
 msgstr "oder wähle ein bereits vorhandenes aus (Doppelklick)"
 
-#: ../../Zotlabs/Module/Photos.php:1008
+#: ../../Zotlabs/Module/Photos.php:1010
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: ../../Zotlabs/Module/Photos.php:1010
+#: ../../Zotlabs/Module/Photos.php:1012
 msgid "Add a Tag"
 msgstr "Schlagwort hinzufügen"
 
-#: ../../Zotlabs/Module/Photos.php:1018
+#: ../../Zotlabs/Module/Photos.php:1020
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Beispiele: @ben, @Karl_Prester, @lieschen@example.com"
 
-#: ../../Zotlabs/Module/Photos.php:1021
+#: ../../Zotlabs/Module/Photos.php:1023
 msgid "Flag as adult in album view"
 msgstr "In der Albumansicht als nicht jugendfrei markieren"
 
-#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:269
+#: ../../Zotlabs/Module/Photos.php:1042 ../../Zotlabs/Lib/ThreadItem.php:267
 msgid "I like this (toggle)"
 msgstr "Mir gefällt das (Umschalter)"
 
-#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:270
+#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:268
 msgid "I don't like this (toggle)"
 msgstr "Mir gefällt das nicht (Umschalter)"
 
-#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:412
-#: ../../include/conversation.php:739
+#: ../../Zotlabs/Module/Photos.php:1045 ../../Zotlabs/Lib/ThreadItem.php:410
+#: ../../include/conversation.php:736
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: ../../Zotlabs/Module/Photos.php:1059 ../../Zotlabs/Module/Photos.php:1177
-#: ../../Zotlabs/Lib/ThreadItem.php:729
+#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179
+#: ../../Zotlabs/Lib/ThreadItem.php:727
 msgid "This is you"
 msgstr "Das bist Du"
 
-#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179
-#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/js_strings.php:6
+#: ../../Zotlabs/Module/Photos.php:1063 ../../Zotlabs/Module/Photos.php:1181
+#: ../../Zotlabs/Lib/ThreadItem.php:729 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:569
 msgctxt "title"
 msgid "Likes"
 msgstr "Gefällt mir"
 
-#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:569
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Gefällt mir nicht"
 
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570
 msgctxt "title"
 msgid "Agree"
 msgstr "Zustimmungen"
 
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570
 msgctxt "title"
 msgid "Disagree"
 msgstr "Ablehnungen"
 
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570
 msgctxt "title"
 msgid "Abstain"
 msgstr "Enthaltungen"
 
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571
 msgctxt "title"
 msgid "Attending"
 msgstr "Zusagen"
 
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571
 msgctxt "title"
 msgid "Not attending"
 msgstr "Absagen"
 
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571
 msgctxt "title"
 msgid "Might attend"
 msgstr "Vielleicht"
 
-#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1108
+#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1110
 #: ../../Zotlabs/Lib/ThreadItem.php:187 ../../Zotlabs/Lib/ThreadItem.php:199
 msgid "View all"
 msgstr "Alles anzeigen"
 
-#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:191
-#: ../../include/conversation.php:1907 ../../include/channel.php:1268
-#: ../../include/taxonomy.php:403
+#: ../../Zotlabs/Module/Photos.php:1102 ../../Zotlabs/Lib/ThreadItem.php:191
+#: ../../include/conversation.php:1904 ../../include/channel.php:1391
+#: ../../include/taxonomy.php:442
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Gefällt mir"
 msgstr[1] "Gefällt mir"
 
-#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:196
-#: ../../include/conversation.php:1910
+#: ../../Zotlabs/Module/Photos.php:1107 ../../Zotlabs/Lib/ThreadItem.php:196
+#: ../../include/conversation.php:1907
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "Gefällt nicht"
 msgstr[1] "Gefällt nicht"
 
-#: ../../Zotlabs/Module/Photos.php:1205
+#: ../../Zotlabs/Module/Photos.php:1207
 msgid "Photo Tools"
 msgstr "Fotowerkzeuge"
 
-#: ../../Zotlabs/Module/Photos.php:1214
+#: ../../Zotlabs/Module/Photos.php:1216
 msgid "In This Photo:"
 msgstr "Auf diesem Foto:"
 
-#: ../../Zotlabs/Module/Photos.php:1219
+#: ../../Zotlabs/Module/Photos.php:1221
 msgid "Map"
 msgstr "Karte"
 
-#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:401
+#: ../../Zotlabs/Module/Photos.php:1229 ../../Zotlabs/Lib/ThreadItem.php:399
 msgctxt "noun"
 msgid "Likes"
 msgstr "Gefällt mir"
 
-#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:402
+#: ../../Zotlabs/Module/Photos.php:1230 ../../Zotlabs/Lib/ThreadItem.php:400
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "Gefällt nicht"
 
-#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:407
+#: ../../Zotlabs/Module/Photos.php:1235 ../../Zotlabs/Lib/ThreadItem.php:405
 #: ../../include/acl_selectors.php:220
 msgid "Close"
 msgstr "Schließen"
 
-#: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318
-#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:529
+#: ../../Zotlabs/Module/Photos.php:1307 ../../Zotlabs/Module/Photos.php:1320
+#: ../../Zotlabs/Module/Photos.php:1321 ../../include/photos.php:526
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
@@ -4552,163 +4763,169 @@ msgstr "Nicht gefunden"
 msgid "Invalid channel"
 msgstr "Ungültiger Kanal"
 
-#: ../../Zotlabs/Module/Wiki.php:160 ../../addon/gitwiki/Mod_Gitwiki.php:146
-#: ../../include/conversation.php:1854 ../../include/nav.php:462
+#: ../../Zotlabs/Module/Wiki.php:79 ../../Zotlabs/Lib/Apps.php:239
+#: ../../include/conversation.php:1854 ../../include/features.php:95
+#: ../../include/nav.php:451
+msgid "Wiki"
+msgstr "Wiki"
+
+#: ../../Zotlabs/Module/Wiki.php:162 ../../addon/gitwiki/Mod_Gitwiki.php:146
+#: ../../include/conversation.php:1851 ../../include/nav.php:448
 msgid "Wikis"
 msgstr "Wikis"
 
-#: ../../Zotlabs/Module/Wiki.php:166 ../../addon/gitwiki/Mod_Gitwiki.php:152
+#: ../../Zotlabs/Module/Wiki.php:168 ../../addon/gitwiki/Mod_Gitwiki.php:152
 msgid "Download"
 msgstr "Herunterladen"
 
-#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Chat.php:254
-#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:143
+#: ../../Zotlabs/Module/Wiki.php:170 ../../Zotlabs/Module/Chat.php:256
+#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:145
 #: ../../addon/gitwiki/Mod_Gitwiki.php:154
 msgid "Create New"
 msgstr "Neu anlegen"
 
-#: ../../Zotlabs/Module/Wiki.php:170 ../../addon/gitwiki/Mod_Gitwiki.php:156
+#: ../../Zotlabs/Module/Wiki.php:172 ../../addon/gitwiki/Mod_Gitwiki.php:156
 msgid "Wiki name"
 msgstr "Name des Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:171 ../../addon/gitwiki/Mod_Gitwiki.php:157
+#: ../../Zotlabs/Module/Wiki.php:173 ../../addon/gitwiki/Mod_Gitwiki.php:157
 msgid "Content type"
 msgstr "Inhaltstyp"
 
-#: ../../Zotlabs/Module/Wiki.php:173 ../../Zotlabs/Storage/Browser.php:234
+#: ../../Zotlabs/Module/Wiki.php:175 ../../Zotlabs/Storage/Browser.php:235
 #: ../../addon/gitwiki/Mod_Gitwiki.php:159
 msgid "Type"
 msgstr "Typ"
 
-#: ../../Zotlabs/Module/Wiki.php:180 ../../addon/gitwiki/Mod_Gitwiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:182 ../../addon/gitwiki/Mod_Gitwiki.php:166
 msgid "Create a status post for this wiki"
 msgstr "Erzeuge einen Statusbeitrag für dieses Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:205 ../../addon/gitwiki/Mod_Gitwiki.php:185
+#: ../../Zotlabs/Module/Wiki.php:224 ../../addon/gitwiki/Mod_Gitwiki.php:185
 msgid "Wiki not found"
 msgstr "Wiki nicht gefunden"
 
-#: ../../Zotlabs/Module/Wiki.php:229 ../../addon/gitwiki/Mod_Gitwiki.php:210
+#: ../../Zotlabs/Module/Wiki.php:248 ../../addon/gitwiki/Mod_Gitwiki.php:210
 msgid "Rename page"
 msgstr "Seite umbenennen"
 
-#: ../../Zotlabs/Module/Wiki.php:233 ../../addon/gitwiki/Mod_Gitwiki.php:214
+#: ../../Zotlabs/Module/Wiki.php:258 ../../addon/gitwiki/Mod_Gitwiki.php:214
 msgid "Error retrieving page content"
 msgstr "Fehler beim Abrufen des Seiteninhalts"
 
-#: ../../Zotlabs/Module/Wiki.php:239
+#: ../../Zotlabs/Module/Wiki.php:264
 msgid "New page"
 msgstr "Neue Seite"
 
-#: ../../Zotlabs/Module/Wiki.php:263 ../../addon/gitwiki/Mod_Gitwiki.php:242
+#: ../../Zotlabs/Module/Wiki.php:288 ../../addon/gitwiki/Mod_Gitwiki.php:242
 msgid "Revision Comparison"
 msgstr "Revisionsvergleich"
 
-#: ../../Zotlabs/Module/Wiki.php:264 ../../addon/gitwiki/Mod_Gitwiki.php:243
+#: ../../Zotlabs/Module/Wiki.php:289 ../../addon/gitwiki/Mod_Gitwiki.php:243
 msgid "Revert"
 msgstr "Rückgängig machen"
 
-#: ../../Zotlabs/Module/Wiki.php:268
+#: ../../Zotlabs/Module/Wiki.php:293
 msgid "Short description of your changes (optional)"
 msgstr "Kurze Beschreibung Ihrer Änderungen (optional)"
 
-#: ../../Zotlabs/Module/Wiki.php:275 ../../addon/gitwiki/Mod_Gitwiki.php:252
+#: ../../Zotlabs/Module/Wiki.php:300 ../../addon/gitwiki/Mod_Gitwiki.php:252
 msgid "Source"
 msgstr "Quelle"
 
-#: ../../Zotlabs/Module/Wiki.php:283 ../../addon/gitwiki/Mod_Gitwiki.php:260
+#: ../../Zotlabs/Module/Wiki.php:309 ../../addon/gitwiki/Mod_Gitwiki.php:260
 msgid "New page name"
 msgstr "Neuer Seitenname"
 
-#: ../../Zotlabs/Module/Wiki.php:288 ../../addon/gitwiki/Mod_Gitwiki.php:265
-#: ../../include/conversation.php:1232
+#: ../../Zotlabs/Module/Wiki.php:314 ../../addon/gitwiki/Mod_Gitwiki.php:265
+#: ../../include/conversation.php:1229
 msgid "Embed image from photo albums"
 msgstr "Bild aus Fotoalben einbetten"
 
-#: ../../Zotlabs/Module/Wiki.php:289 ../../addon/gitwiki/Mod_Gitwiki.php:266
-#: ../../include/conversation.php:1326
+#: ../../Zotlabs/Module/Wiki.php:315 ../../addon/gitwiki/Mod_Gitwiki.php:266
+#: ../../include/conversation.php:1323
 msgid "Embed an image from your albums"
 msgstr "Betten Sie ein Bild aus Ihren Alben ein"
 
-#: ../../Zotlabs/Module/Wiki.php:291 ../../addon/gitwiki/Mod_Gitwiki.php:268
-#: ../../include/conversation.php:1328 ../../include/conversation.php:1375
+#: ../../Zotlabs/Module/Wiki.php:317 ../../addon/gitwiki/Mod_Gitwiki.php:268
+#: ../../include/conversation.php:1325 ../../include/conversation.php:1372
 msgid "OK"
 msgstr "Ok"
 
-#: ../../Zotlabs/Module/Wiki.php:292 ../../addon/gitwiki/Mod_Gitwiki.php:269
-#: ../../include/conversation.php:1268
+#: ../../Zotlabs/Module/Wiki.php:318 ../../addon/gitwiki/Mod_Gitwiki.php:269
+#: ../../include/conversation.php:1265
 msgid "Choose images to embed"
 msgstr "Wählen Sie Bilder zum Einbetten aus"
 
-#: ../../Zotlabs/Module/Wiki.php:293 ../../addon/gitwiki/Mod_Gitwiki.php:270
-#: ../../include/conversation.php:1269
+#: ../../Zotlabs/Module/Wiki.php:319 ../../addon/gitwiki/Mod_Gitwiki.php:270
+#: ../../include/conversation.php:1266
 msgid "Choose an album"
 msgstr "Wählen Sie ein Album aus"
 
-#: ../../Zotlabs/Module/Wiki.php:294 ../../addon/gitwiki/Mod_Gitwiki.php:271
+#: ../../Zotlabs/Module/Wiki.php:320 ../../addon/gitwiki/Mod_Gitwiki.php:271
 msgid "Choose a different album"
 msgstr "Wählen Sie ein anderes Album aus"
 
-#: ../../Zotlabs/Module/Wiki.php:295 ../../addon/gitwiki/Mod_Gitwiki.php:272
-#: ../../include/conversation.php:1271
+#: ../../Zotlabs/Module/Wiki.php:321 ../../addon/gitwiki/Mod_Gitwiki.php:272
+#: ../../include/conversation.php:1268
 msgid "Error getting album list"
 msgstr "Fehler beim Holen der Albenliste"
 
-#: ../../Zotlabs/Module/Wiki.php:296 ../../addon/gitwiki/Mod_Gitwiki.php:273
-#: ../../include/conversation.php:1272
+#: ../../Zotlabs/Module/Wiki.php:322 ../../addon/gitwiki/Mod_Gitwiki.php:273
+#: ../../include/conversation.php:1269
 msgid "Error getting photo link"
 msgstr "Fehler beim Holen des Fotolinks"
 
-#: ../../Zotlabs/Module/Wiki.php:297 ../../addon/gitwiki/Mod_Gitwiki.php:274
-#: ../../include/conversation.php:1273
+#: ../../Zotlabs/Module/Wiki.php:323 ../../addon/gitwiki/Mod_Gitwiki.php:274
+#: ../../include/conversation.php:1270
 msgid "Error getting album"
 msgstr "Fehler beim Holen des Albums"
 
-#: ../../Zotlabs/Module/Wiki.php:364 ../../addon/gitwiki/Mod_Gitwiki.php:337
+#: ../../Zotlabs/Module/Wiki.php:391 ../../addon/gitwiki/Mod_Gitwiki.php:337
 msgid "Error creating wiki. Invalid name."
 msgstr "Fehler beim Erstellen des Wiki. Ungültiger Name."
 
-#: ../../Zotlabs/Module/Wiki.php:371
+#: ../../Zotlabs/Module/Wiki.php:398
 msgid "A wiki with this name already exists."
 msgstr "Es existiert bereits ein Wiki mit diesem Namen."
 
-#: ../../Zotlabs/Module/Wiki.php:384 ../../addon/gitwiki/Mod_Gitwiki.php:348
+#: ../../Zotlabs/Module/Wiki.php:411 ../../addon/gitwiki/Mod_Gitwiki.php:348
 msgid "Wiki created, but error creating Home page."
 msgstr "Das Wiki wurde erzeugt, aber es gab einen Fehler bei der Erstellung der Startseite"
 
-#: ../../Zotlabs/Module/Wiki.php:391 ../../addon/gitwiki/Mod_Gitwiki.php:353
+#: ../../Zotlabs/Module/Wiki.php:418 ../../addon/gitwiki/Mod_Gitwiki.php:353
 msgid "Error creating wiki"
 msgstr "Fehler beim Erstellen des Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:403
+#: ../../Zotlabs/Module/Wiki.php:430
 msgid "Wiki delete permission denied."
 msgstr "Wiki-Löschberechtigung verweigert."
 
-#: ../../Zotlabs/Module/Wiki.php:413
+#: ../../Zotlabs/Module/Wiki.php:440
 msgid "Error deleting wiki"
 msgstr "Fehler beim Löschen des Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:439 ../../addon/gitwiki/Mod_Gitwiki.php:400
+#: ../../Zotlabs/Module/Wiki.php:466 ../../addon/gitwiki/Mod_Gitwiki.php:400
 msgid "New page created"
 msgstr "Neue Seite erstellt"
 
-#: ../../Zotlabs/Module/Wiki.php:558
+#: ../../Zotlabs/Module/Wiki.php:587
 msgid "Cannot delete Home"
 msgstr "Kann die Startseite nicht löschen"
 
-#: ../../Zotlabs/Module/Wiki.php:622
+#: ../../Zotlabs/Module/Wiki.php:651
 msgid "Current Revision"
 msgstr "Aktuelle Revision"
 
-#: ../../Zotlabs/Module/Wiki.php:622
+#: ../../Zotlabs/Module/Wiki.php:651
 msgid "Selected Revision"
 msgstr "Ausgewählte Revision"
 
-#: ../../Zotlabs/Module/Wiki.php:672
+#: ../../Zotlabs/Module/Wiki.php:701
 msgid "You must be authenticated."
 msgstr "Sie müssen authenzifiziert sein."
 
-#: ../../Zotlabs/Module/Chanview.php:134
+#: ../../Zotlabs/Module/Chanview.php:139
 msgid "toggle full screen mode"
 msgstr "auf Vollbildmodus umschalten"
 
@@ -4716,7 +4933,7 @@ msgstr "auf Vollbildmodus umschalten"
 msgid "Layout updated."
 msgstr "Layout aktualisiert."
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:217
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219
 msgid "Feature disabled."
 msgstr "Funktion deaktiviert."
 
@@ -4736,32 +4953,32 @@ msgstr "Modulname:"
 msgid "Layout Help"
 msgstr "Layout-Hilfe"
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235
-#: ../../include/conversation.php:1042
+#: ../../Zotlabs/Module/Poke.php:153 ../../Zotlabs/Module/Poke.php:182
+#: ../../Zotlabs/Lib/Apps.php:248 ../../include/conversation.php:1039
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: ../../Zotlabs/Module/Poke.php:169
+#: ../../Zotlabs/Module/Poke.php:183
 msgid "Poke somebody"
 msgstr "Jemanden anstupsen"
 
-#: ../../Zotlabs/Module/Poke.php:172
+#: ../../Zotlabs/Module/Poke.php:186
 msgid "Poke/Prod"
 msgstr "Anstupsen/Knuffen"
 
-#: ../../Zotlabs/Module/Poke.php:173
+#: ../../Zotlabs/Module/Poke.php:187
 msgid "Poke, prod or do other things to somebody"
 msgstr "Jemanden anstupsen, knuffen oder sonstiges"
 
-#: ../../Zotlabs/Module/Poke.php:180
+#: ../../Zotlabs/Module/Poke.php:194
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: ../../Zotlabs/Module/Poke.php:181
+#: ../../Zotlabs/Module/Poke.php:195
 msgid "Choose what you wish to do to recipient"
 msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst"
 
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199
 msgid "Make this post private"
 msgstr "Diesen Beitrag privat machen"
 
@@ -4772,7 +4989,7 @@ msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."
 
 #: ../../Zotlabs/Module/Profile_photo.php:115
 #: ../../Zotlabs/Module/Profile_photo.php:226
-#: ../../include/photo/photo_driver.php:647
+#: ../../include/photo/photo_driver.php:658
 msgid "Profile Photos"
 msgstr "Profilfotos"
 
@@ -4789,7 +5006,7 @@ msgid ""
 msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
 
 #: ../../Zotlabs/Module/Profile_photo.php:203
-#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:149
+#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:145
 msgid "Unable to process image"
 msgstr "Kann Bild nicht verarbeiten"
 
@@ -4871,64 +5088,68 @@ msgstr "Online"
 msgid "Unable to locate original post."
 msgstr "Originalbeitrag nicht gefunden."
 
-#: ../../Zotlabs/Module/Item.php:451
+#: ../../Zotlabs/Module/Item.php:470
 msgid "Empty post discarded."
 msgstr "Leeren Beitrag verworfen."
 
-#: ../../Zotlabs/Module/Item.php:825
+#: ../../Zotlabs/Module/Item.php:844
 msgid "Duplicate post suppressed."
 msgstr "Doppelter Beitrag unterdrückt."
 
-#: ../../Zotlabs/Module/Item.php:955
+#: ../../Zotlabs/Module/Item.php:989
 msgid "System error. Post not saved."
 msgstr "Systemfehler. Beitrag nicht gespeichert."
 
-#: ../../Zotlabs/Module/Item.php:1085
+#: ../../Zotlabs/Module/Item.php:1025
+msgid "Your comment is awaiting approval."
+msgstr "Dein Kommentar muss noch bestätigt werden."
+
+#: ../../Zotlabs/Module/Item.php:1123
 msgid "Unable to obtain post information from database."
 msgstr "Beitragsinformationen können nicht aus der Datenbank abgerufen werden."
 
-#: ../../Zotlabs/Module/Item.php:1092
+#: ../../Zotlabs/Module/Item.php:1130
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
 
-#: ../../Zotlabs/Module/Item.php:1099
+#: ../../Zotlabs/Module/Item.php:1137
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
 
-#: ../../Zotlabs/Module/Ping.php:254
+#: ../../Zotlabs/Module/Ping.php:280
 msgid "sent you a private message"
 msgstr "hat Dir eine private Nachricht geschickt"
 
-#: ../../Zotlabs/Module/Ping.php:302
+#: ../../Zotlabs/Module/Ping.php:331
 msgid "added your channel"
 msgstr "hat deinen Kanal hinzugefügt"
 
-#: ../../Zotlabs/Module/Ping.php:312
+#: ../../Zotlabs/Module/Ping.php:341
 msgid "g A l F d"
 msgstr "l, d. F, G:i \\U\\h\\r"
 
-#: ../../Zotlabs/Module/Ping.php:330
+#: ../../Zotlabs/Module/Ping.php:359
 msgid "[today]"
 msgstr "[Heute]"
 
-#: ../../Zotlabs/Module/Ping.php:339
+#: ../../Zotlabs/Module/Ping.php:368
 msgid "posted an event"
 msgstr "hat einen Termin veröffentlicht"
 
-#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
 msgid "Invalid item."
 msgstr "Ungültiges Element."
 
-#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79
+#: ../../Zotlabs/Module/Page.php:128 ../../Zotlabs/Module/Block.php:77
 #: ../../Zotlabs/Module/Display.php:122
 #: ../../Zotlabs/Lib/NativeWikiPage.php:500 ../../Zotlabs/Web/Router.php:146
 #: ../../include/help.php:68
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
-#: ../../Zotlabs/Module/Page.php:131
+#: ../../Zotlabs/Module/Page.php:165
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
@@ -4976,9 +5197,9 @@ msgstr "Konnte die Adressbuch-Parameter nicht setzen."
 msgid "Connection has been removed."
 msgstr "Verbindung wurde gelöscht."
 
-#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:228
+#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:241
 #: ../../addon/openclipatar/openclipatar.php:57
-#: ../../include/conversation.php:982 ../../include/nav.php:106
+#: ../../include/conversation.php:979 ../../include/nav.php:102
 msgid "View Profile"
 msgstr "Profil ansehen"
 
@@ -5128,105 +5349,119 @@ msgstr "Profil festlegen"
 msgid "Set Affinity & Profile"
 msgstr "Beziehung und Profile festlegen"
 
-#: ../../Zotlabs/Module/Connedit.php:844
-msgid "none"
-msgstr "Keine"
+#: ../../Zotlabs/Module/Connedit.php:851
+msgid "This connection is unreachable from this location."
+msgstr "Diese Verbindung ist von diesem Ort unerreichbar."
+
+#: ../../Zotlabs/Module/Connedit.php:852
+msgid "This connection may be unreachable from other channel locations."
+msgstr "Diese Verbindung könnte von anderen Standpunkten des Kanals nicht erreichbar sein."
+
+#: ../../Zotlabs/Module/Connedit.php:854
+msgid "Location independence is not supported by their network."
+msgstr "Standort Unabhängigkeit wird vom anderen Netzwerk nicht unterstützt."
+
+#: ../../Zotlabs/Module/Connedit.php:860
+msgid ""
+"This connection is unreachable from this location. Location independence is "
+"not supported by their network."
+msgstr "Diese Verbindung ist von diesem Standort aus unerreichbar. Standort Unabhängigkeit wird vom anderen Netzwerk nicht unterstützt."
 
-#: ../../Zotlabs/Module/Connedit.php:847
-#: ../../Zotlabs/Widget/Settings_menu.php:107
+#: ../../Zotlabs/Module/Connedit.php:863
+#: ../../Zotlabs/Widget/Settings_menu.php:109
 msgid "Connection Default Permissions"
 msgstr "Standardzugriffsrechte für neue Verbindungen:"
 
-#: ../../Zotlabs/Module/Connedit.php:847 ../../include/items.php:3955
+#: ../../Zotlabs/Module/Connedit.php:863 ../../include/items.php:3925
 #, php-format
 msgid "Connection: %s"
 msgstr "Verbindung: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:848
+#: ../../Zotlabs/Module/Connedit.php:864
 msgid "Apply these permissions automatically"
 msgstr "Diese Berechtigungen automatisch anwenden"
 
-#: ../../Zotlabs/Module/Connedit.php:848
+#: ../../Zotlabs/Module/Connedit.php:864
 msgid "Connection requests will be approved without your interaction"
 msgstr "Verbindungsanfragen werden sofort bestätigt, ohne dass Deine aktive Zustimmung erforderlich ist."
 
-#: ../../Zotlabs/Module/Connedit.php:849
+#: ../../Zotlabs/Module/Connedit.php:865
 msgid "Permission role"
 msgstr "Berechtigungsrolle"
 
-#: ../../Zotlabs/Module/Connedit.php:850
+#: ../../Zotlabs/Module/Connedit.php:866
 msgid "Add permission role"
 msgstr "Berechtigungsrolle hinzufügen"
 
-#: ../../Zotlabs/Module/Connedit.php:856
+#: ../../Zotlabs/Module/Connedit.php:873
 msgid "This connection's primary address is"
 msgstr "Die Hauptadresse der Verbindung ist"
 
-#: ../../Zotlabs/Module/Connedit.php:857
+#: ../../Zotlabs/Module/Connedit.php:874
 msgid "Available locations:"
 msgstr "Verfügbare Klone:"
 
-#: ../../Zotlabs/Module/Connedit.php:861
+#: ../../Zotlabs/Module/Connedit.php:879
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Die auf dieser Seite angegebenen Berechtigungen werden auf alle neuen Verbindungen angewendet."
 
-#: ../../Zotlabs/Module/Connedit.php:862
+#: ../../Zotlabs/Module/Connedit.php:880
 msgid "Connection Tools"
 msgstr "Verbindungswerkzeuge"
 
-#: ../../Zotlabs/Module/Connedit.php:864
+#: ../../Zotlabs/Module/Connedit.php:882
 msgid "Slide to adjust your degree of friendship"
 msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
 
-#: ../../Zotlabs/Module/Connedit.php:865 ../../Zotlabs/Module/Rate.php:155
+#: ../../Zotlabs/Module/Connedit.php:883 ../../Zotlabs/Module/Rate.php:155
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Bewertung"
 
-#: ../../Zotlabs/Module/Connedit.php:866
+#: ../../Zotlabs/Module/Connedit.php:884
 msgid "Slide to adjust your rating"
 msgstr "Verschieben, um Deine Bewertung einzustellen"
 
-#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Connedit.php:872
+#: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Connedit.php:890
 msgid "Optionally explain your rating"
 msgstr "Optional kannst Du Deine Bewertung begründen"
 
-#: ../../Zotlabs/Module/Connedit.php:869
+#: ../../Zotlabs/Module/Connedit.php:887
 msgid "Custom Filter"
 msgstr "Benutzerdefinierter Filter"
 
-#: ../../Zotlabs/Module/Connedit.php:870
+#: ../../Zotlabs/Module/Connedit.php:888
 msgid "Only import posts with this text"
 msgstr "Nur Beiträge mit diesem Text importieren"
 
-#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Connedit.php:871
+#: ../../Zotlabs/Module/Connedit.php:888 ../../Zotlabs/Module/Connedit.php:889
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "Einzelne Wörter pro Zeile, #Tags oder /Reguläre Ausdrücke/. lang=xx (z.B. lang=de) ermöglicht Filterung nach Sprache. Leer lassen, um alle Beiträge zu importieren."
 
-#: ../../Zotlabs/Module/Connedit.php:871
+#: ../../Zotlabs/Module/Connedit.php:889
 msgid "Do not import posts with this text"
 msgstr "Beiträge mit diesem Text nicht importieren"
 
-#: ../../Zotlabs/Module/Connedit.php:873
+#: ../../Zotlabs/Module/Connedit.php:891
 msgid "This information is public!"
 msgstr "Diese Information ist öffentlich!"
 
-#: ../../Zotlabs/Module/Connedit.php:878
+#: ../../Zotlabs/Module/Connedit.php:896
 msgid "Connection Pending Approval"
 msgstr "Verbindung wartet auf Bestätigung"
 
-#: ../../Zotlabs/Module/Connedit.php:883
+#: ../../Zotlabs/Module/Connedit.php:901
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
 
-#: ../../Zotlabs/Module/Connedit.php:890
+#: ../../Zotlabs/Module/Connedit.php:908
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -5234,173 +5469,85 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung. Werden geerbte Einstellungen hier geändert, hat dies keine Auswirkungen."
 
-#: ../../Zotlabs/Module/Connedit.php:891
+#: ../../Zotlabs/Module/Connedit.php:909
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
-#: ../../Zotlabs/Module/Connedit.php:900
+#: ../../Zotlabs/Module/Connedit.php:918
 msgid "Details"
 msgstr "Details"
 
-#: ../../Zotlabs/Module/Connedit.php:903 ../../addon/cdav/Mod_Cdav.php:1137
-msgid "Organisation"
-msgstr "Organisation"
-
-#: ../../Zotlabs/Module/Connedit.php:904 ../../addon/cdav/Mod_Cdav.php:1138
-#: ../../include/page_widgets.php:46
-msgid "Title"
-msgstr "Titel"
-
-#: ../../Zotlabs/Module/Connedit.php:905 ../../Zotlabs/Module/Profiles.php:789
-#: ../../addon/cdav/Mod_Cdav.php:1139
-msgid "Phone"
-msgstr "Telefon"
-
-#: ../../Zotlabs/Module/Connedit.php:907 ../../Zotlabs/Module/Profiles.php:791
-#: ../../addon/cdav/Mod_Cdav.php:1141
-msgid "Instant messenger"
-msgstr "Sofortnachrichtendienst"
-
-#: ../../Zotlabs/Module/Connedit.php:908 ../../Zotlabs/Module/Profiles.php:792
-#: ../../addon/cdav/Mod_Cdav.php:1142
-msgid "Website"
-msgstr "Webseite"
-
-#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:794
-#: ../../addon/cdav/Mod_Cdav.php:1144
-msgid "Note"
-msgstr "Hinweis"
-
-#: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:795
-#: ../../addon/cdav/Mod_Cdav.php:1145 ../../addon/cdav/cdav.php:270
-#: ../../include/connections.php:668
-msgid "Mobile"
-msgstr "Mobil"
-
-#: ../../Zotlabs/Module/Connedit.php:912 ../../Zotlabs/Module/Profiles.php:796
-#: ../../addon/cdav/Mod_Cdav.php:1146 ../../addon/cdav/cdav.php:271
-#: ../../include/connections.php:669
-msgid "Home"
-msgstr "Home"
-
-#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:797
-#: ../../addon/cdav/Mod_Cdav.php:1147 ../../addon/cdav/cdav.php:274
-#: ../../include/connections.php:672
-msgid "Work"
-msgstr "Arbeit"
-
-#: ../../Zotlabs/Module/Connedit.php:915 ../../Zotlabs/Module/Profiles.php:799
-#: ../../addon/cdav/Mod_Cdav.php:1149
-#: ../../addon/jappixmini/jappixmini.php:368
-msgid "Add Contact"
-msgstr "Kontakt hinzufügen"
-
-#: ../../Zotlabs/Module/Connedit.php:916 ../../Zotlabs/Module/Profiles.php:800
-#: ../../addon/cdav/Mod_Cdav.php:1150
-msgid "Add Field"
-msgstr "Feld hinzufügen"
-
-#: ../../Zotlabs/Module/Connedit.php:921 ../../addon/cdav/Mod_Cdav.php:1155
-msgid "P.O. Box"
-msgstr "Postfach"
-
-#: ../../Zotlabs/Module/Connedit.php:922 ../../addon/cdav/Mod_Cdav.php:1156
-msgid "Additional"
-msgstr "Zusätzlich"
-
-#: ../../Zotlabs/Module/Connedit.php:923 ../../addon/cdav/Mod_Cdav.php:1157
-msgid "Street"
-msgstr "Straße"
-
-#: ../../Zotlabs/Module/Connedit.php:924 ../../addon/cdav/Mod_Cdav.php:1158
-msgid "Locality"
-msgstr "Ortschaft"
-
-#: ../../Zotlabs/Module/Connedit.php:925 ../../addon/cdav/Mod_Cdav.php:1159
-msgid "Region"
-msgstr "Region"
-
-#: ../../Zotlabs/Module/Connedit.php:926 ../../addon/cdav/Mod_Cdav.php:1160
-msgid "ZIP Code"
-msgstr "Postleitzahl"
-
-#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:760
-#: ../../addon/cdav/Mod_Cdav.php:1161
-msgid "Country"
-msgstr "Land"
+#: ../../Zotlabs/Module/Chat.php:94 ../../Zotlabs/Lib/Apps.php:228
+msgid "My Chatrooms"
+msgstr "Meine Chaträume"
 
-#: ../../Zotlabs/Module/Chat.php:179
+#: ../../Zotlabs/Module/Chat.php:181
 msgid "Room not found"
 msgstr "Chatraum nicht gefunden"
 
-#: ../../Zotlabs/Module/Chat.php:195
+#: ../../Zotlabs/Module/Chat.php:197
 msgid "Leave Room"
 msgstr "Raum verlassen"
 
-#: ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:198
 msgid "Delete Room"
 msgstr "Raum löschen"
 
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Zotlabs/Module/Chat.php:199
 msgid "I am away right now"
 msgstr "Ich bin gerade nicht da"
 
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Zotlabs/Module/Chat.php:200
 msgid "I am online"
 msgstr "Ich bin online"
 
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Zotlabs/Module/Chat.php:202
 msgid "Bookmark this room"
 msgstr "Lesezeichen für diesen Raum setzen"
 
-#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:259
-#: ../../Zotlabs/Module/Mail.php:380 ../../include/conversation.php:1263
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241
+#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1260
 msgid "Please enter a link URL:"
 msgstr "Gib eine URL ein:"
 
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:312
-#: ../../Zotlabs/Module/Mail.php:454 ../../Zotlabs/Lib/ThreadItem.php:744
-#: ../../include/conversation.php:1373
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294
+#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:742
+#: ../../include/conversation.php:1370
 msgid "Encrypt text"
 msgstr "Text verschlüsseln"
 
-#: ../../Zotlabs/Module/Chat.php:230
+#: ../../Zotlabs/Module/Chat.php:232
 msgid "New Chatroom"
 msgstr "Neuer Chatraum"
 
-#: ../../Zotlabs/Module/Chat.php:231
+#: ../../Zotlabs/Module/Chat.php:233
 msgid "Chatroom name"
 msgstr "Chatraumname"
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Zotlabs/Module/Chat.php:234
 msgid "Expiration of chats (minutes)"
 msgstr "Verfall von Chats (Minuten)"
 
-#: ../../Zotlabs/Module/Chat.php:248
+#: ../../Zotlabs/Module/Chat.php:250
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "%1$ss Chaträume"
 
-#: ../../Zotlabs/Module/Chat.php:253
+#: ../../Zotlabs/Module/Chat.php:255
 msgid "No chatrooms available"
 msgstr "Keine Chaträume verfügbar"
 
-#: ../../Zotlabs/Module/Chat.php:257
+#: ../../Zotlabs/Module/Chat.php:259
 msgid "Expiration"
 msgstr "Verfall"
 
-#: ../../Zotlabs/Module/Chat.php:258
+#: ../../Zotlabs/Module/Chat.php:260
 msgid "min"
 msgstr "min"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
-#: ../../include/conversation.php:1783 ../../include/nav.php:392
-msgid "Photos"
-msgstr "Fotos"
-
-#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:224
-#: ../../Zotlabs/Storage/Browser.php:224 ../../include/conversation.php:1791
-#: ../../include/nav.php:400
+#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:237
+#: ../../Zotlabs/Storage/Browser.php:225 ../../Zotlabs/Storage/Browser.php:247
+#: ../../include/conversation.php:1788 ../../include/nav.php:386
 msgid "Files"
 msgstr "Dateien"
 
@@ -5440,7 +5587,7 @@ msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
 msgid "Submit and proceed"
 msgstr "Absenden und fortfahren"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2268
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2281
 msgid "Menus"
 msgstr "Menüs"
 
@@ -5492,13 +5639,14 @@ msgstr "Menü Titel wie er von anderen gesehen wird"
 msgid "Allow bookmarks"
 msgstr "Erlaube Lesezeichen"
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2269
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2282
 msgid "Layouts"
 msgstr "Layouts"
 
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232
-#: ../../include/nav.php:161 ../../include/nav.php:268
-#: ../../include/help.php:55 ../../include/help.php:61
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Module/Help.php:18
+#: ../../Zotlabs/Lib/Apps.php:245 ../../include/nav.php:157
+#: ../../include/nav.php:264 ../../include/help.php:55
+#: ../../include/help.php:61
 msgid "Help"
 msgstr "Hilfe"
 
@@ -5514,12 +5662,13 @@ msgstr "Layout-Beschreibung"
 msgid "Download PDL file"
 msgstr "PDL-Datei herunterladen"
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:274
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/markdown.php:141
+#: ../../include/bbcode.php:334
 msgid "post"
 msgstr "Beitrag"
 
 #: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146
-#: ../../include/text.php:1945
+#: ../../include/text.php:1938
 msgid "comment"
 msgstr "Kommentar"
 
@@ -5551,8 +5700,8 @@ msgstr "Gruppe wurde erstellt."
 msgid "Could not create privacy group."
 msgstr "Gruppe konnte nicht erstellt werden."
 
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3922
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143
+#: ../../include/items.php:3892
 msgid "Privacy group not found."
 msgstr "Gruppe nicht gefunden."
 
@@ -5560,39 +5709,39 @@ msgstr "Gruppe nicht gefunden."
 msgid "Privacy group updated."
 msgstr "Gruppe wurde aktualisiert."
 
-#: ../../Zotlabs/Module/Group.php:90
+#: ../../Zotlabs/Module/Group.php:92
 msgid "Create a group of channels."
 msgstr "Erstelle eine Gruppe für Kanäle."
 
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:186
 msgid "Privacy group name: "
 msgstr "Gruppenname:"
 
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+#: ../../Zotlabs/Module/Group.php:95 ../../Zotlabs/Module/Group.php:189
 msgid "Members are visible to other channels"
 msgstr "Mitglieder sind sichtbar für andere Kanäle"
 
-#: ../../Zotlabs/Module/Group.php:111
+#: ../../Zotlabs/Module/Group.php:113
 msgid "Privacy group removed."
 msgstr "Gruppe wurde entfernt."
 
-#: ../../Zotlabs/Module/Group.php:113
+#: ../../Zotlabs/Module/Group.php:115
 msgid "Unable to remove privacy group."
 msgstr "Gruppe konnte nicht entfernt werden."
 
-#: ../../Zotlabs/Module/Group.php:183
+#: ../../Zotlabs/Module/Group.php:185
 msgid "Privacy group editor"
 msgstr "Gruppeneditor"
 
-#: ../../Zotlabs/Module/Group.php:197 ../../Zotlabs/Module/Help.php:81
+#: ../../Zotlabs/Module/Group.php:199 ../../Zotlabs/Module/Help.php:81
 msgid "Members"
 msgstr "Mitglieder"
 
-#: ../../Zotlabs/Module/Group.php:199
+#: ../../Zotlabs/Module/Group.php:201
 msgid "All Connected Channels"
 msgstr "Alle verbundenen Kanäle"
 
-#: ../../Zotlabs/Module/Group.php:231
+#: ../../Zotlabs/Module/Group.php:233
 msgid "Click on a channel to add or remove."
 msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
 
@@ -5687,7 +5836,7 @@ msgid "View this profile"
 msgstr "Dieses Profil ansehen"
 
 #: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
-#: ../../include/channel.php:1066
+#: ../../include/channel.php:1183
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
@@ -5699,7 +5848,7 @@ msgstr "Profilwerkzeuge"
 msgid "Change cover photo"
 msgstr "Titelbild ändern"
 
-#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1154
 msgid "Change profile photo"
 msgstr "Profilfoto ändern"
 
@@ -5719,7 +5868,7 @@ msgstr "Dieses Profil löschen"
 msgid "Add profile things"
 msgstr "Sachen zum Profil hinzufügen"
 
-#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1657
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1654
 msgid "Personal"
 msgstr "Persönlich"
 
@@ -5864,12 +6013,12 @@ msgstr "Meine anderen Kanäle"
 msgid "Communications"
 msgstr "Kommunikation"
 
-#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
+#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1179
 msgid "Profile Image"
 msgstr "Profilfoto:"
 
-#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1044
-#: ../../include/nav.php:109
+#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1161
+#: ../../include/nav.php:105
 msgid "Edit Profiles"
 msgstr "Profile bearbeiten"
 
@@ -5881,42 +6030,42 @@ msgstr "Seiten-Link"
 msgid "Edit Webpage"
 msgstr "Webseite bearbeiten"
 
-#: ../../Zotlabs/Module/Manage.php:143
+#: ../../Zotlabs/Module/Manage.php:145
 msgid "Create a new channel"
 msgstr "Neuen Kanal anlegen"
 
-#: ../../Zotlabs/Module/Manage.php:168 ../../Zotlabs/Lib/Apps.php:221
-#: ../../include/nav.php:205
+#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:234
+#: ../../include/nav.php:199
 msgid "Channel Manager"
 msgstr "Kanal-Manager"
 
-#: ../../Zotlabs/Module/Manage.php:169
+#: ../../Zotlabs/Module/Manage.php:171
 msgid "Current Channel"
 msgstr "Aktueller Kanal"
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Zotlabs/Module/Manage.php:173
 msgid "Switch to one of your channels by selecting it."
 msgstr "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst."
 
-#: ../../Zotlabs/Module/Manage.php:172
+#: ../../Zotlabs/Module/Manage.php:174
 msgid "Default Channel"
 msgstr "Standard Kanal"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Zotlabs/Module/Manage.php:175
 msgid "Make Default"
 msgstr "Zum Standard machen"
 
-#: ../../Zotlabs/Module/Manage.php:176
+#: ../../Zotlabs/Module/Manage.php:178
 #, php-format
 msgid "%d new messages"
 msgstr "%d neue Nachrichten"
 
-#: ../../Zotlabs/Module/Manage.php:177
+#: ../../Zotlabs/Module/Manage.php:179
 #, php-format
 msgid "%d new introductions"
 msgstr "%d neue Vorstellungen"
 
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../Zotlabs/Module/Manage.php:181
 msgid "Delegated Channel"
 msgstr "Delegierte Kanäle"
 
@@ -5924,45 +6073,45 @@ msgstr "Delegierte Kanäle"
 msgid "This directory server requires an access token"
 msgstr "Dieser Verzeichnisserver benötigt einen Zugriffstoken"
 
-#: ../../Zotlabs/Module/Siteinfo.php:20
+#: ../../Zotlabs/Module/Siteinfo.php:19
 msgid "About this site"
 msgstr "Über diese Seite"
 
-#: ../../Zotlabs/Module/Siteinfo.php:21
+#: ../../Zotlabs/Module/Siteinfo.php:20
 msgid "Site Name"
 msgstr "Seitenname"
 
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:2025
+#: ../../Zotlabs/Module/Siteinfo.php:24
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../../Zotlabs/Module/Siteinfo.php:27 ../../Zotlabs/Module/Register.php:221
+#: ../../Zotlabs/Module/Siteinfo.php:26 ../../Zotlabs/Module/Register.php:221
 msgid "Terms of Service"
 msgstr "Nutzungsbedingungen"
 
-#: ../../Zotlabs/Module/Siteinfo.php:28
+#: ../../Zotlabs/Module/Siteinfo.php:27
 msgid "Software and Project information"
 msgstr "Software und Projektinformationen"
 
-#: ../../Zotlabs/Module/Siteinfo.php:29
+#: ../../Zotlabs/Module/Siteinfo.php:28
 msgid "This site is powered by $Projectname"
 msgstr "Diese Website wird bereitgestellt durch $Projectname"
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
+#: ../../Zotlabs/Module/Siteinfo.php:29
 msgid ""
 "Federated and decentralised networking and identity services provided by Zot"
 msgstr "Verbundene, dezentrale Netzwerk- und Identitätsdienste, ermöglicht mittels Zot"
 
-#: ../../Zotlabs/Module/Siteinfo.php:32
+#: ../../Zotlabs/Module/Siteinfo.php:31
 #, php-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:33
+#: ../../Zotlabs/Module/Siteinfo.php:32
 msgid "Project homepage"
 msgstr "Projekt-Website"
 
-#: ../../Zotlabs/Module/Siteinfo.php:34
+#: ../../Zotlabs/Module/Siteinfo.php:33
 msgid "Developer homepage"
 msgstr "Entwickler-Website"
 
@@ -5971,7 +6120,7 @@ msgid "No ratings"
 msgstr "Keine Bewertungen"
 
 #: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35
-#: ../../include/conversation.php:1032
+#: ../../include/conversation.php:1029
 msgid "Ratings"
 msgstr "Bewertungen"
 
@@ -5987,64 +6136,65 @@ msgstr "Webseite: "
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: ../../Zotlabs/Module/Webpages.php:52
+#: ../../Zotlabs/Module/Webpages.php:38 ../../Zotlabs/Module/Webpages.php:237
+#: ../../Zotlabs/Lib/Apps.php:238 ../../include/conversation.php:1838
+#: ../../include/nav.php:435
+msgid "Webpages"
+msgstr "Webseiten"
+
+#: ../../Zotlabs/Module/Webpages.php:54
 msgid "Import Webpage Elements"
 msgstr "Webseitenelemente importieren"
 
-#: ../../Zotlabs/Module/Webpages.php:53
+#: ../../Zotlabs/Module/Webpages.php:55
 msgid "Import selected"
 msgstr "Import ausgewählt"
 
-#: ../../Zotlabs/Module/Webpages.php:76
+#: ../../Zotlabs/Module/Webpages.php:78
 msgid "Export Webpage Elements"
 msgstr "Webseitenelemente exportieren"
 
-#: ../../Zotlabs/Module/Webpages.php:77
+#: ../../Zotlabs/Module/Webpages.php:79
 msgid "Export selected"
 msgstr "Exportieren ausgewählt"
 
-#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/conversation.php:1841 ../../include/nav.php:449
-msgid "Webpages"
-msgstr "Webseiten"
-
-#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:44
+#: ../../Zotlabs/Module/Webpages.php:248
 msgid "Actions"
 msgstr "Aktionen"
 
-#: ../../Zotlabs/Module/Webpages.php:254 ../../include/page_widgets.php:45
+#: ../../Zotlabs/Module/Webpages.php:249
 msgid "Page Link"
 msgstr "Seiten-Link"
 
-#: ../../Zotlabs/Module/Webpages.php:255
+#: ../../Zotlabs/Module/Webpages.php:250
 msgid "Page Title"
 msgstr "Seitentitel"
 
-#: ../../Zotlabs/Module/Webpages.php:285
+#: ../../Zotlabs/Module/Webpages.php:280
 msgid "Invalid file type."
 msgstr "Ungültiger Dateityp."
 
-#: ../../Zotlabs/Module/Webpages.php:297
+#: ../../Zotlabs/Module/Webpages.php:292
 msgid "Error opening zip file"
 msgstr "Fehler beim Öffnen der ZIP-Datei"
 
-#: ../../Zotlabs/Module/Webpages.php:308
+#: ../../Zotlabs/Module/Webpages.php:303
 msgid "Invalid folder path."
 msgstr "Ungültiger Ordnerpfad."
 
-#: ../../Zotlabs/Module/Webpages.php:335
+#: ../../Zotlabs/Module/Webpages.php:330
 msgid "No webpage elements detected."
 msgstr "Keine Webseitenelemente erkannt."
 
-#: ../../Zotlabs/Module/Webpages.php:410
+#: ../../Zotlabs/Module/Webpages.php:405
 msgid "Import complete."
 msgstr "Import abgeschlossen."
 
-#: ../../Zotlabs/Module/Editpost.php:38
+#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
 msgid "Item is not editable"
 msgstr "Element kann nicht bearbeitet werden."
 
-#: ../../Zotlabs/Module/Editpost.php:103 ../../Zotlabs/Module/Rpost.php:138
+#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:140
 msgid "Edit post"
 msgstr "Bearbeite Beitrag"
 
@@ -6130,7 +6280,7 @@ msgid "*"
 msgstr "*"
 
 #: ../../Zotlabs/Module/Sources.php:96
-#: ../../Zotlabs/Widget/Settings_menu.php:123 ../../include/features.php:213
+#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:209
 msgid "Channel Sources"
 msgstr "Kanal-Quellen"
 
@@ -6186,6 +6336,10 @@ msgstr "Quelle gelöscht"
 msgid "Unable to remove source."
 msgstr "Konnte die Quelle nicht löschen."
 
+#: ../../Zotlabs/Module/Rpost.php:63 ../../Zotlabs/Lib/Apps.php:257
+msgid "Post"
+msgstr "Beitrag schreiben"
+
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr "Mögen/Nicht mögen"
@@ -6221,55 +6375,59 @@ msgstr "Kanal nicht vorhanden."
 msgid "Previous action reversed."
 msgstr "Die vorherige Aktion wurde rückgängig gemacht."
 
-#: ../../Zotlabs/Module/Like.php:419 ../../addon/diaspora/inbound.php:1812
+#: ../../Zotlabs/Module/Like.php:423 ../../addon/diaspora/Receiver.php:1399
 #: ../../include/conversation.php:160
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s gefällt %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:163
+#: ../../Zotlabs/Module/Like.php:425 ../../include/conversation.php:163
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s gefällt %2$ss %3$s nicht"
 
-#: ../../Zotlabs/Module/Like.php:423
+#: ../../Zotlabs/Module/Like.php:427
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%1$s stimmt %2$ss %3$s zu"
 
-#: ../../Zotlabs/Module/Like.php:425
+#: ../../Zotlabs/Module/Like.php:429
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%1$s lehnt %2$ss %3$s ab"
 
-#: ../../Zotlabs/Module/Like.php:427
+#: ../../Zotlabs/Module/Like.php:431
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%1$s enthält sich zu %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Like.php:429
+#: ../../Zotlabs/Module/Like.php:433
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s nimmt an %2$ss %3$s teil"
 
-#: ../../Zotlabs/Module/Like.php:431
+#: ../../Zotlabs/Module/Like.php:435
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s nimmt an %2$ss %3$s nicht teil"
 
-#: ../../Zotlabs/Module/Like.php:433
+#: ../../Zotlabs/Module/Like.php:437
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s nimmt vielleicht an %2$ss %3$s teil"
 
-#: ../../Zotlabs/Module/Like.php:538
+#: ../../Zotlabs/Module/Like.php:547
 msgid "Action completed."
 msgstr "Aktion durchgeführt."
 
-#: ../../Zotlabs/Module/Like.php:539
+#: ../../Zotlabs/Module/Like.php:548
 msgid "Thank you."
 msgstr "Vielen Dank."
 
+#: ../../Zotlabs/Module/Directory.php:80 ../../Zotlabs/Lib/Apps.php:244
+msgid "Directory"
+msgstr "Verzeichnis"
+
 #: ../../Zotlabs/Module/Directory.php:245
 #, php-format
 msgid "%d rating"
@@ -6289,13 +6447,12 @@ msgstr "Status:"
 msgid "Homepage: "
 msgstr "Webseite:"
 
-#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1293
+#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1416
 msgid "Age:"
 msgstr "Alter:"
 
-#: ../../Zotlabs/Module/Directory.php:314 ../../include/markdown.php:560
-#: ../../include/channel.php:1134 ../../include/event.php:52
-#: ../../include/event.php:84
+#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1251
+#: ../../include/event.php:52 ../../include/event.php:84
 msgid "Location:"
 msgstr "Ort:"
 
@@ -6303,18 +6460,18 @@ msgstr "Ort:"
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1309
+#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1432
 msgid "Hometown:"
 msgstr "Heimatstadt:"
 
-#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1317
+#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1440
 msgid "About:"
 msgstr "Über:"
 
-#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54
+#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:56
 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
-#: ../../include/conversation.php:1002 ../../include/channel.php:1119
-#: ../../include/connections.php:110
+#: ../../include/conversation.php:999 ../../include/channel.php:1236
+#: ../../include/connections.php:111
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -6346,7 +6503,7 @@ msgstr "Lokales Verzeichnis"
 msgid "Finding:"
 msgstr "Ergebnisse:"
 
-#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62
+#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr "Kanal-Vorschläge"
@@ -6391,13 +6548,18 @@ msgstr "Xchan-Suche"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:"
 
-#: ../../Zotlabs/Module/Suggest.php:37
+#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Lib/Apps.php:232
+#: ../../include/features.php:333
+msgid "Suggest Channels"
+msgstr "Kanäle vorschlagen"
+
+#: ../../Zotlabs/Module/Suggest.php:39
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal."
 
-#: ../../Zotlabs/Module/Suggest.php:56 ../../Zotlabs/Widget/Suggestions.php:46
+#: ../../Zotlabs/Module/Suggest.php:58 ../../Zotlabs/Widget/Suggestions.php:46
 msgid "Ignore/Hide"
 msgstr "Ignorieren/Verstecken"
 
@@ -6409,103 +6571,108 @@ msgstr "Konnte Deinen Server nicht finden."
 msgid "Post successful."
 msgstr "Veröffentlichung erfolgreich."
 
-#: ../../Zotlabs/Module/Mail.php:65
+#: ../../Zotlabs/Module/Mail.php:73
 msgid "Unable to lookup recipient."
 msgstr "Konnte den Empfänger nicht finden."
 
-#: ../../Zotlabs/Module/Mail.php:72
+#: ../../Zotlabs/Module/Mail.php:80
 msgid "Unable to communicate with requested channel."
 msgstr "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Mail.php:79
+#: ../../Zotlabs/Module/Mail.php:87
 msgid "Cannot verify requested channel."
 msgstr "Verifizierung des angeforderten Kanals fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Mail.php:97
+#: ../../Zotlabs/Module/Mail.php:105
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Mail.php:178
+#: ../../Zotlabs/Module/Mail.php:143 ../../Zotlabs/Lib/Apps.php:246
+#: ../../include/nav.php:187
+msgid "Mail"
+msgstr "Mail"
+
+#: ../../Zotlabs/Module/Mail.php:160
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../../Zotlabs/Module/Mail.php:191
+#: ../../Zotlabs/Module/Mail.php:173
 msgid "message"
 msgstr "Nachricht"
 
-#: ../../Zotlabs/Module/Mail.php:232
+#: ../../Zotlabs/Module/Mail.php:214
 msgid "Message recalled."
 msgstr "Nachricht widerrufen."
 
-#: ../../Zotlabs/Module/Mail.php:245
+#: ../../Zotlabs/Module/Mail.php:227
 msgid "Conversation removed."
 msgstr "Unterhaltung gelöscht."
 
-#: ../../Zotlabs/Module/Mail.php:260 ../../Zotlabs/Module/Mail.php:381
+#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verfällt YYYY-MM-DD HH;MM"
 
-#: ../../Zotlabs/Module/Mail.php:288
+#: ../../Zotlabs/Module/Mail.php:270
 msgid "Requested channel is not in this network"
 msgstr "Angeforderter Kanal ist nicht in diesem Netzwerk."
 
-#: ../../Zotlabs/Module/Mail.php:296
+#: ../../Zotlabs/Module/Mail.php:278
 msgid "Send Private Message"
 msgstr "Private Nachricht senden"
 
-#: ../../Zotlabs/Module/Mail.php:297 ../../Zotlabs/Module/Mail.php:439
+#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421
 msgid "To:"
 msgstr "An:"
 
-#: ../../Zotlabs/Module/Mail.php:300 ../../Zotlabs/Module/Mail.php:441
+#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: ../../Zotlabs/Module/Mail.php:305 ../../Zotlabs/Module/Mail.php:447
-#: ../../include/conversation.php:1323
+#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429
+#: ../../include/conversation.php:1320
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: ../../Zotlabs/Module/Mail.php:307
+#: ../../Zotlabs/Module/Mail.php:289
 msgid "Send"
 msgstr "Absenden"
 
-#: ../../Zotlabs/Module/Mail.php:310 ../../Zotlabs/Module/Mail.php:452
-#: ../../include/conversation.php:1368
+#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434
+#: ../../include/conversation.php:1365
 msgid "Set expiration date"
 msgstr "Verfallsdatum"
 
-#: ../../Zotlabs/Module/Mail.php:411
+#: ../../Zotlabs/Module/Mail.php:393
 msgid "Delete message"
 msgstr "Nachricht löschen"
 
-#: ../../Zotlabs/Module/Mail.php:412
+#: ../../Zotlabs/Module/Mail.php:394
 msgid "Delivery report"
 msgstr "Zustellungsbericht"
 
-#: ../../Zotlabs/Module/Mail.php:413
+#: ../../Zotlabs/Module/Mail.php:395
 msgid "Recall message"
 msgstr "Nachricht widerrufen"
 
-#: ../../Zotlabs/Module/Mail.php:415
+#: ../../Zotlabs/Module/Mail.php:397
 msgid "Message has been recalled."
 msgstr "Die Nachricht wurde widerrufen."
 
-#: ../../Zotlabs/Module/Mail.php:432
+#: ../../Zotlabs/Module/Mail.php:414
 msgid "Delete Conversation"
 msgstr "Unterhaltung löschen"
 
-#: ../../Zotlabs/Module/Mail.php:434
+#: ../../Zotlabs/Module/Mail.php:416
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten."
 
-#: ../../Zotlabs/Module/Mail.php:438
+#: ../../Zotlabs/Module/Mail.php:420
 msgid "Send Reply"
 msgstr "Antwort senden"
 
-#: ../../Zotlabs/Module/Mail.php:443
+#: ../../Zotlabs/Module/Mail.php:425
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Deine Nachricht für %s (%s):"
@@ -6547,19 +6714,19 @@ msgstr "Software"
 msgid "Rate"
 msgstr "Bewerten"
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:263
 msgid "webpage"
 msgstr "Webseite"
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:269
 msgid "block"
 msgstr "Block"
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:266
 msgid "layout"
 msgstr "Layout"
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:272
 msgid "menu"
 msgstr "Menü"
 
@@ -6601,7 +6768,11 @@ msgstr "oder wähle einen vorhanden Ordner aus (Doppelklick)"
 msgid "Save to Folder"
 msgstr "In Ordner speichern"
 
-#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
+#: ../../Zotlabs/Module/Probe.php:11 ../../Zotlabs/Lib/Apps.php:231
+msgid "Remote Diagnostics"
+msgstr "Ferndiagnose"
+
+#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr "Abrufen der URL gab einen Fehler zurück: %1$s"
@@ -6685,16 +6856,16 @@ msgstr "nein"
 msgid "yes"
 msgstr "ja"
 
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Zotlabs/Module/Register.php:256
 msgid "Membership on this site is by invitation only."
 msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
 
-#: ../../Zotlabs/Module/Register.php:270 ../../boot.php:1610
-#: ../../include/nav.php:149
+#: ../../Zotlabs/Module/Register.php:268 ../../boot.php:1582
+#: ../../include/nav.php:145
 msgid "Register"
 msgstr "Registrieren"
 
-#: ../../Zotlabs/Module/Register.php:271
+#: ../../Zotlabs/Module/Register.php:269
 msgid ""
 "This site may require email verification after submitting this form. If you "
 "are returned to a login page, please check your email for instructions."
@@ -6705,30 +6876,30 @@ msgstr "Diese Seite verlangt möglicherweise eine Emailbestätigung nach dem Abs
 msgid "Cover Photos"
 msgstr "Cover Foto"
 
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4303
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4273
 msgid "female"
 msgstr "weiblich"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4304
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4274
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s hat ihr %2$s aktualisiert"
 
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4305
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4275
 msgid "male"
 msgstr "männlich"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4306
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4276
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s hat sein %2$s aktualisiert"
 
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4308
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4278
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s hat sein/ihr %2$s aktualisiert"
 
-#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1759
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1878
 msgid "cover photo"
 msgstr "Cover Foto"
 
@@ -6740,8 +6911,8 @@ msgstr "Cover Foto hochladen"
 msgid "Documentation Search"
 msgstr "Suche in der Dokumentation"
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1773
-#: ../../include/nav.php:382
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1770
+#: ../../include/nav.php:368
 msgid "About"
 msgstr "Über"
 
@@ -6793,6 +6964,10 @@ msgstr "Forum"
 msgid "Search Results For:"
 msgstr "Suchergebnisse für:"
 
+#: ../../Zotlabs/Module/Network.php:157 ../../Zotlabs/Lib/Apps.php:235
+msgid "Activity"
+msgstr "Aktivität"
+
 #: ../../Zotlabs/Module/Network.php:221
 msgid "Privacy group is empty"
 msgstr "Gruppe ist leer"
@@ -6827,49 +7002,50 @@ msgstr "$Projectname"
 msgid "Welcome to %s"
 msgstr "Willkommen auf %s"
 
-#: ../../Zotlabs/Module/Filestorage.php:87
+#: ../../Zotlabs/Module/Filestorage.php:79
 msgid "Permission Denied."
 msgstr "Zugriff verweigert."
 
-#: ../../Zotlabs/Module/Filestorage.php:103
+#: ../../Zotlabs/Module/Filestorage.php:95
 msgid "File not found."
 msgstr "Datei nicht gefunden."
 
-#: ../../Zotlabs/Module/Filestorage.php:146
+#: ../../Zotlabs/Module/Filestorage.php:137
 msgid "Edit file permissions"
 msgstr "Dateiberechtigungen bearbeiten"
 
-#: ../../Zotlabs/Module/Filestorage.php:159
+#: ../../Zotlabs/Module/Filestorage.php:149
 msgid "Set/edit permissions"
 msgstr "Berechtigungen setzen/ändern"
 
-#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:150
 msgid "Include all files and sub folders"
 msgstr "Alle Dateien und Unterverzeichnisse einbinden"
 
-#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Filestorage.php:151
 msgid "Return to file list"
 msgstr "Zurück zur Dateiliste"
 
-#: ../../Zotlabs/Module/Filestorage.php:163
+#: ../../Zotlabs/Module/Filestorage.php:153
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen"
 
-#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Filestorage.php:154
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken"
 
-#: ../../Zotlabs/Module/Filestorage.php:166
+#: ../../Zotlabs/Module/Filestorage.php:156
 msgid "Share this file"
 msgstr "Diese Datei freigeben"
 
-#: ../../Zotlabs/Module/Filestorage.php:167
+#: ../../Zotlabs/Module/Filestorage.php:157
 msgid "Show URL to this file"
 msgstr "URL zu dieser Datei anzeigen"
 
-#: ../../Zotlabs/Module/Filestorage.php:168
-msgid "Notify your contacts about this file"
-msgstr "Meine Kontakte über diese Datei benachrichtigen"
+#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Zotlabs/Storage/Browser.php:351
+msgid "Show in your contacts shared folder"
+msgstr "Im geteilten Ordner Deiner Kontakte anzeigen"
 
 #: ../../Zotlabs/Module/Common.php:14
 msgid "No channel."
@@ -6896,71 +7072,59 @@ msgstr "%ss Profil [%s] besuchen"
 msgid "View Connections"
 msgstr "Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Admin.php:94
-msgid "# Accounts"
-msgstr "Anzahl der Konten"
-
-#: ../../Zotlabs/Module/Admin.php:95
-msgid "# blocked accounts"
-msgstr "Anzahl der blockierten Konten"
-
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "# expired accounts"
-msgstr "Anzahl der abgelaufenen Konten"
-
 #: ../../Zotlabs/Module/Admin.php:97
-msgid "# expiring accounts"
-msgstr "Anzahl der ablaufenden Konten"
+msgid "Blocked accounts"
+msgstr "Blockierte Benutzerkonten"
 
-#: ../../Zotlabs/Module/Admin.php:108
-msgid "# Channels"
-msgstr "Anzahl der Kanäle"
+#: ../../Zotlabs/Module/Admin.php:98
+msgid "Expired accounts"
+msgstr "Abgelaufene Benutzerkonten"
 
-#: ../../Zotlabs/Module/Admin.php:109
-msgid "# primary"
-msgstr "Anzahl der primären Kanäle"
+#: ../../Zotlabs/Module/Admin.php:99
+msgid "Expiring accounts"
+msgstr "Ablaufende Benutzerkonten"
 
-#: ../../Zotlabs/Module/Admin.php:110
-msgid "# clones"
-msgstr "Anzahl der Klone"
+#: ../../Zotlabs/Module/Admin.php:112
+msgid "Clones"
+msgstr "Klone"
 
-#: ../../Zotlabs/Module/Admin.php:116
+#: ../../Zotlabs/Module/Admin.php:118
 msgid "Message queues"
 msgstr "Nachrichten-Warteschlangen"
 
-#: ../../Zotlabs/Module/Admin.php:133
+#: ../../Zotlabs/Module/Admin.php:132
 msgid "Your software should be updated"
 msgstr "Die installierte Software sollte aktualisiert werden"
 
-#: ../../Zotlabs/Module/Admin.php:138
+#: ../../Zotlabs/Module/Admin.php:137
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: ../../Zotlabs/Module/Admin.php:141
+#: ../../Zotlabs/Module/Admin.php:140
 msgid "Registered accounts"
 msgstr "Registrierte Konten"
 
-#: ../../Zotlabs/Module/Admin.php:142
+#: ../../Zotlabs/Module/Admin.php:141
 msgid "Pending registrations"
 msgstr "Ausstehende Registrierungen"
 
-#: ../../Zotlabs/Module/Admin.php:143
+#: ../../Zotlabs/Module/Admin.php:142
 msgid "Registered channels"
 msgstr "Registrierte Kanäle"
 
-#: ../../Zotlabs/Module/Admin.php:144
+#: ../../Zotlabs/Module/Admin.php:143
 msgid "Active plugins"
 msgstr "Aktive Plug-Ins"
 
-#: ../../Zotlabs/Module/Admin.php:145
+#: ../../Zotlabs/Module/Admin.php:144
 msgid "Version"
 msgstr "Version"
 
-#: ../../Zotlabs/Module/Admin.php:146
+#: ../../Zotlabs/Module/Admin.php:145
 msgid "Repository version (master)"
 msgstr "Repository-Version (master)"
 
-#: ../../Zotlabs/Module/Admin.php:147
+#: ../../Zotlabs/Module/Admin.php:146
 msgid "Repository version (dev)"
 msgstr "Repository-Version (dev)"
 
@@ -7009,7 +7173,7 @@ msgid ""
 "Password reset failed."
 msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1637
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1609
 msgid "Password Reset"
 msgstr "Zurücksetzen des Kennworts"
 
@@ -7058,121 +7222,91 @@ msgstr "E-Mail Adresse"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:190
-msgid "Mark all system notifications seen"
-msgstr "Markiere alle System-Benachrichtigungen als gesehen"
+#: ../../Zotlabs/Module/Notifications.php:43
+#: ../../Zotlabs/Lib/ThreadItem.php:392
+msgid "Mark all seen"
+msgstr "Alle als gelesen markieren"
+
+#: ../../Zotlabs/Lib/Techlevels.php:10
+msgid "0. Beginner/Basic"
+msgstr "0. Einsteiger/Basis"
+
+#: ../../Zotlabs/Lib/Techlevels.php:11
+msgid "1. Novice - not skilled but willing to learn"
+msgstr "1. Anfänger - unerfahren, aber bereit zu lernen"
+
+#: ../../Zotlabs/Lib/Techlevels.php:12
+msgid "2. Intermediate - somewhat comfortable"
+msgstr "2. Fortgeschritten - relativ komfortabel"
 
-#: ../../Zotlabs/Lib/Apps.php:212
+#: ../../Zotlabs/Lib/Techlevels.php:13
+msgid "3. Advanced - very comfortable"
+msgstr "3. Fortgeschritten - sehr komfortabel"
+
+#: ../../Zotlabs/Lib/Techlevels.php:14
+msgid "4. Expert - I can write computer code"
+msgstr "4. Experte - Ich kann Computercode schreiben"
+
+#: ../../Zotlabs/Lib/Techlevels.php:15
+msgid "5. Wizard - I probably know more than you do"
+msgstr "5. Zauberer - ich kann wahrscheinlich mehr als Du"
+
+#: ../../Zotlabs/Lib/Apps.php:225
 msgid "Site Admin"
 msgstr "Hub-Administration"
 
-#: ../../Zotlabs/Lib/Apps.php:213 ../../addon/buglink/buglink.php:16
+#: ../../Zotlabs/Lib/Apps.php:226 ../../addon/buglink/buglink.php:16
 msgid "Report Bug"
 msgstr "Fehler melden"
 
-#: ../../Zotlabs/Lib/Apps.php:214
-msgid "View Bookmarks"
-msgstr "Lesezeichen ansehen"
-
-#: ../../Zotlabs/Lib/Apps.php:215
-msgid "My Chatrooms"
-msgstr "Meine Chaträume"
-
-#: ../../Zotlabs/Lib/Apps.php:217
+#: ../../Zotlabs/Lib/Apps.php:230
 msgid "Firefox Share"
 msgstr "Teilen-Knopf für Firefox"
 
-#: ../../Zotlabs/Lib/Apps.php:218
-msgid "Remote Diagnostics"
-msgstr "Ferndiagnose"
-
-#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:337
-msgid "Suggest Channels"
-msgstr "Kanäle vorschlagen"
-
-#: ../../Zotlabs/Lib/Apps.php:220 ../../boot.php:1629
-#: ../../include/nav.php:117
+#: ../../Zotlabs/Lib/Apps.php:233 ../../boot.php:1601
+#: ../../include/nav.php:113
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../../Zotlabs/Lib/Apps.php:222
-msgid "Activity"
-msgstr "Aktivität"
-
-#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1857
-#: ../../include/features.php:99 ../../include/nav.php:465
-msgid "Wiki"
-msgstr "Wiki"
-
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:180
-msgid "Channel Home"
-msgstr "Mein Kanal"
-
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1802
-#: ../../include/conversation.php:1805 ../../include/nav.php:200
-#: ../../include/nav.php:411 ../../include/nav.php:414
-msgid "Events"
-msgstr "Termine"
-
-#: ../../Zotlabs/Lib/Apps.php:231
-msgid "Directory"
-msgstr "Verzeichnis"
-
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:192
-msgid "Mail"
-msgstr "Mail"
-
-#: ../../Zotlabs/Lib/Apps.php:236
+#: ../../Zotlabs/Lib/Apps.php:249
 msgid "Chat"
 msgstr "Chat"
 
-#: ../../Zotlabs/Lib/Apps.php:238
+#: ../../Zotlabs/Lib/Apps.php:251
 msgid "Probe"
 msgstr "Testen"
 
-#: ../../Zotlabs/Lib/Apps.php:239
+#: ../../Zotlabs/Lib/Apps.php:252
 msgid "Suggest"
 msgstr "Empfehlen"
 
-#: ../../Zotlabs/Lib/Apps.php:240
+#: ../../Zotlabs/Lib/Apps.php:253
 msgid "Random Channel"
 msgstr "Zufälliger Kanal"
 
-#: ../../Zotlabs/Lib/Apps.php:241
-msgid "Invite"
-msgstr "Einladen"
-
-#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26
+#: ../../Zotlabs/Lib/Apps.php:255 ../../Zotlabs/Widget/Admin.php:26
 msgid "Features"
 msgstr "Funktionen"
 
-#: ../../Zotlabs/Lib/Apps.php:243 ../../addon/openid/MysqlProvider.php:69
-msgid "Language"
-msgstr "Sprache"
-
-#: ../../Zotlabs/Lib/Apps.php:244
-msgid "Post"
-msgstr "Beitrag schreiben"
-
-#: ../../Zotlabs/Lib/Apps.php:245 ../../addon/openid/MysqlProvider.php:58
+#: ../../Zotlabs/Lib/Apps.php:258 ../../addon/openid/MysqlProvider.php:58
 #: ../../addon/openid/MysqlProvider.php:59
 #: ../../addon/openid/MysqlProvider.php:60
 msgid "Profile Photo"
 msgstr "Profilfoto"
 
-#: ../../Zotlabs/Lib/Apps.php:365
+#: ../../Zotlabs/Lib/Apps.php:391
 msgid "Purchase"
 msgstr "Kaufen"
 
-#: ../../Zotlabs/Lib/Apps.php:369
+#: ../../Zotlabs/Lib/Apps.php:395
 msgid "Undelete"
 msgstr "Wieder hergestellt"
 
-#: ../../Zotlabs/Lib/Apps.php:374
+#: ../../Zotlabs/Lib/Apps.php:401
 msgid "Add to app-tray"
 msgstr "Zum App-Menü hinzufügen"
 
-#: ../../Zotlabs/Lib/Apps.php:375
+#: ../../Zotlabs/Lib/Apps.php:402
 msgid "Remove from app-tray"
 msgstr "Aus dem App-Menü entfernen"
 
@@ -7260,8 +7394,8 @@ msgid "Message"
 msgstr "Nachricht"
 
 #: ../../Zotlabs/Lib/NativeWikiPage.php:578
-#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:610
-#: ../../include/bbcode.php:756
+#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:667
+#: ../../include/bbcode.php:813
 msgid "Different viewers will see this text differently"
 msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen"
 
@@ -7348,21 +7482,20 @@ msgstr "Chatraum konnte nicht gefunden werden."
 msgid "Room is full"
 msgstr "Der Chatraum ist voll"
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1977
+#: ../../Zotlabs/Lib/Enotify.php:60
 msgid "$Projectname Notification"
 msgstr "$Projectname-Benachrichtigung"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:218
-#: ../../addon/diaspora/util.php:231 ../../addon/diaspora/p.php:46
-#: ../../include/network.php:1978
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:283
+#: ../../addon/diaspora/util.php:296 ../../addon/diaspora/p.php:46
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1980
+#: ../../Zotlabs/Lib/Enotify.php:63
 msgid "Thank You,"
 msgstr "Danke."
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1982
+#: ../../Zotlabs/Lib/Enotify.php:65
 #, php-format
 msgid "%s Administrator"
 msgstr "der Administrator von %s"
@@ -7396,176 +7529,186 @@ msgstr "eine private Nachricht"
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
 
-#: ../../Zotlabs/Lib/Enotify.php:183
+#: ../../Zotlabs/Lib/Enotify.php:184
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s, %2$s hat [zrl=%3$s]einen %4$s[/zrl] kommentiert"
 
-#: ../../Zotlabs/Lib/Enotify.php:191
+#: ../../Zotlabs/Lib/Enotify.php:192
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
 
-#: ../../Zotlabs/Lib/Enotify.php:200
+#: ../../Zotlabs/Lib/Enotify.php:201
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen %4$s[/zrl] kommentiert"
 
-#: ../../Zotlabs/Lib/Enotify.php:211
+#: ../../Zotlabs/Lib/Enotify.php:213
+#, php-format
+msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
+msgstr "[$Projectname:Benachrichtigung] Moderierter Kommantar in Unterhaltung #%1$d von %2$s"
+
+#: ../../Zotlabs/Lib/Enotify.php:215
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:212
+#: ../../Zotlabs/Lib/Enotify.php:216
 #, php-format
 msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr "%1$s, %2$s hat eine Unterhaltung kommentiert, der Du folgst."
 
-#: ../../Zotlabs/Lib/Enotify.php:215 ../../Zotlabs/Lib/Enotify.php:292
-#: ../../Zotlabs/Lib/Enotify.php:309 ../../Zotlabs/Lib/Enotify.php:335
-#: ../../Zotlabs/Lib/Enotify.php:353 ../../Zotlabs/Lib/Enotify.php:367
+#: ../../Zotlabs/Lib/Enotify.php:219 ../../Zotlabs/Lib/Enotify.php:301
+#: ../../Zotlabs/Lib/Enotify.php:318 ../../Zotlabs/Lib/Enotify.php:344
+#: ../../Zotlabs/Lib/Enotify.php:362 ../../Zotlabs/Lib/Enotify.php:376
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."
 
-#: ../../Zotlabs/Lib/Enotify.php:273
+#: ../../Zotlabs/Lib/Enotify.php:223 ../../Zotlabs/Lib/Enotify.php:224
+#, php-format
+msgid "Please visit %s to approve or reject this comment."
+msgstr "Bitte besuche %s, um diesen Kommentar anzunehmen oder abzulehnen."
+
+#: ../../Zotlabs/Lib/Enotify.php:282
 #, php-format
 msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s, %2$s gefällt [zrl=%3$s]dein %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:288
+#: ../../Zotlabs/Lib/Enotify.php:297
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Benachrichtigung] Gefällt mir in Unterhaltung #%1$d von %2$s erhalten"
 
-#: ../../Zotlabs/Lib/Enotify.php:289
+#: ../../Zotlabs/Lib/Enotify.php:298
 #, php-format
 msgid "%1$s, %2$s liked an item/conversation you created."
 msgstr "%1$s, %2$s gefällt ein Beitrag oder eine Unterhaltung von Dir"
 
-#: ../../Zotlabs/Lib/Enotify.php:300
+#: ../../Zotlabs/Lib/Enotify.php:309
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr "[$Projectname:Benachrichtigung] %s schrieb auf Deine Pinnwand"
 
-#: ../../Zotlabs/Lib/Enotify.php:302
+#: ../../Zotlabs/Lib/Enotify.php:311
 #, php-format
 msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr "%1$s, %2$s hat auf Deine Pinnwand auf %3$s geschrieben"
 
-#: ../../Zotlabs/Lib/Enotify.php:304
+#: ../../Zotlabs/Lib/Enotify.php:313
 #, php-format
 msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr "%1$s, %2$s hat auf [zrl=%3$s]Deine Pinnwand[/zrl] geschrieben"
 
-#: ../../Zotlabs/Lib/Enotify.php:328
+#: ../../Zotlabs/Lib/Enotify.php:337
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr "[$Projectname:Benachrichtigung] %s hat Dich erwähnt"
 
-#: ../../Zotlabs/Lib/Enotify.php:329
+#: ../../Zotlabs/Lib/Enotify.php:338
 #, php-format
 msgid "%1$s, %2$s tagged you at %3$s"
 msgstr "%1$s, %2$s hat Dich auf %3$s erwähnt"
 
-#: ../../Zotlabs/Lib/Enotify.php:330
+#: ../../Zotlabs/Lib/Enotify.php:339
 #, php-format
 msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%3$s]hat Dich erwähnt[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:342
+#: ../../Zotlabs/Lib/Enotify.php:351
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr "[$Projectname:Benachrichtigung] %1$s hat Dich angestupst"
 
-#: ../../Zotlabs/Lib/Enotify.php:343
+#: ../../Zotlabs/Lib/Enotify.php:352
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
 msgstr "%1$s, %2$s hat Dich auf %3$s angestupst"
 
-#: ../../Zotlabs/Lib/Enotify.php:344
+#: ../../Zotlabs/Lib/Enotify.php:353
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%2$s]hat Dich angestupst[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:360
+#: ../../Zotlabs/Lib/Enotify.php:369
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr "[$Projectname:Benachrichtigung] %s hat Deinen Beitrag verschlagwortet"
 
-#: ../../Zotlabs/Lib/Enotify.php:361
+#: ../../Zotlabs/Lib/Enotify.php:370
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr "%1$s, %2$s hat Deinen Beitrag auf %3$s verschlagwortet"
 
-#: ../../Zotlabs/Lib/Enotify.php:362
+#: ../../Zotlabs/Lib/Enotify.php:371
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen Beitrag[/zrl] verschlagwortet"
 
-#: ../../Zotlabs/Lib/Enotify.php:374
+#: ../../Zotlabs/Lib/Enotify.php:383
 msgid "[$Projectname:Notify] Introduction received"
 msgstr "[$Projectname:Benachrichtigung] Verbindungsanfrage erhalten"
 
-#: ../../Zotlabs/Lib/Enotify.php:375
+#: ../../Zotlabs/Lib/Enotify.php:384
 #, php-format
 msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
 msgstr "%1$s, Du hast eine neue Verbindungsanfrage von '%2$s' auf %3$s erhalten"
 
-#: ../../Zotlabs/Lib/Enotify.php:376
+#: ../../Zotlabs/Lib/Enotify.php:385
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr "%1$s, Du hast [zrl=%2$s]eine neue Verbindungsanfrage[/zrl] von %3$s erhalten."
 
-#: ../../Zotlabs/Lib/Enotify.php:380 ../../Zotlabs/Lib/Enotify.php:399
+#: ../../Zotlabs/Lib/Enotify.php:389 ../../Zotlabs/Lib/Enotify.php:408
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Du kannst Dir das Profil unter %s ansehen"
 
-#: ../../Zotlabs/Lib/Enotify.php:382
+#: ../../Zotlabs/Lib/Enotify.php:391
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen."
 
-#: ../../Zotlabs/Lib/Enotify.php:389
+#: ../../Zotlabs/Lib/Enotify.php:398
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr "[$Projectname:Benachrichtigung] Freundschaftsvorschlag erhalten"
 
-#: ../../Zotlabs/Lib/Enotify.php:390
+#: ../../Zotlabs/Lib/Enotify.php:399
 #, php-format
 msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr "%1$s, Du hast einen Kontaktvorschlag von „%2$s“ auf %3$s erhalten"
 
-#: ../../Zotlabs/Lib/Enotify.php:391
+#: ../../Zotlabs/Lib/Enotify.php:400
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
 "%4$s."
 msgstr "%1$s, Du hast [zrl=%2$s]einen Kontaktvorschlag[/zrl] für %3$s von %4$s erhalten."
 
-#: ../../Zotlabs/Lib/Enotify.php:397
+#: ../../Zotlabs/Lib/Enotify.php:406
 msgid "Name:"
 msgstr "Name:"
 
-#: ../../Zotlabs/Lib/Enotify.php:398
+#: ../../Zotlabs/Lib/Enotify.php:407
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../Zotlabs/Lib/Enotify.php:401
+#: ../../Zotlabs/Lib/Enotify.php:410
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
 
-#: ../../Zotlabs/Lib/Enotify.php:620
+#: ../../Zotlabs/Lib/Enotify.php:629
 msgid "[$Projectname:Notify]"
 msgstr "[$Projectname:Benachrichtigung]"
 
-#: ../../Zotlabs/Lib/Enotify.php:780
+#: ../../Zotlabs/Lib/Enotify.php:789
 msgid "created a new post"
 msgstr "Neuer Beitrag wurde erzeugt"
 
-#: ../../Zotlabs/Lib/Enotify.php:781
+#: ../../Zotlabs/Lib/Enotify.php:790
 #, php-format
 msgid "commented on %s's post"
 msgstr "hat %s's Beitrag kommentiert"
@@ -7574,21 +7717,21 @@ msgstr "hat %s's Beitrag kommentiert"
 msgid "Wiki files deleted successfully"
 msgstr "Wiki-Dateien erfolgreich gelöscht"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:93
+#: ../../Zotlabs/Lib/DB_Upgrade.php:95
 #, php-format
 msgid "Update Error at %s"
 msgstr "Aktualisierungsfehler auf %s"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:99
+#: ../../Zotlabs/Lib/DB_Upgrade.php:101
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:661
+#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:656
 msgid "Private Message"
 msgstr "Private Nachricht"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:653
+#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:648
 msgid "Select"
 msgstr "Auswählen"
 
@@ -7632,11 +7775,11 @@ msgstr "Markierungsstatus (Stern) umschalten"
 msgid "starred"
 msgstr "markiert"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:668
+#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:663
 msgid "Message signature validated"
 msgstr "Signatur überprüft"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:669
+#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:664
 msgid "Message signature incorrect"
 msgstr "Signatur nicht korrekt"
 
@@ -7644,135 +7787,143 @@ msgstr "Signatur nicht korrekt"
 msgid "Add Tag"
 msgstr "Tag hinzufügen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:316
+#: ../../Zotlabs/Lib/ThreadItem.php:267 ../../include/taxonomy.php:355
 msgid "like"
 msgstr "mag"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:270 ../../include/taxonomy.php:317
+#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:356
 msgid "dislike"
 msgstr "verurteile"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:274
+#: ../../Zotlabs/Lib/ThreadItem.php:272
 msgid "Share This"
 msgstr "Teilen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:274
+#: ../../Zotlabs/Lib/ThreadItem.php:272
 msgid "share"
 msgstr "Teilen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:283
+#: ../../Zotlabs/Lib/ThreadItem.php:281
 msgid "Delivery Report"
 msgstr "Zustellungsbericht"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:301
+#: ../../Zotlabs/Lib/ThreadItem.php:299
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d Kommentar"
 msgstr[1] "%d Kommentare"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Lib/ThreadItem.php:331
+#: ../../Zotlabs/Lib/ThreadItem.php:328 ../../Zotlabs/Lib/ThreadItem.php:329
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Schaue Dir %ss Profil an – %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:334
+#: ../../Zotlabs/Lib/ThreadItem.php:332
 msgid "to"
 msgstr "an"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:335
+#: ../../Zotlabs/Lib/ThreadItem.php:333
 msgid "via"
 msgstr "via"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:336
+#: ../../Zotlabs/Lib/ThreadItem.php:334
 msgid "Wall-to-Wall"
 msgstr "Wall-to-Wall"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:337
+#: ../../Zotlabs/Lib/ThreadItem.php:335
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:718
+#: ../../Zotlabs/Lib/ThreadItem.php:348 ../../include/conversation.php:715
 #, php-format
 msgid "from %s"
 msgstr "via %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:721
+#: ../../Zotlabs/Lib/ThreadItem.php:351 ../../include/conversation.php:718
 #, php-format
 msgid "last edited: %s"
 msgstr "zuletzt bearbeitet: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:722
+#: ../../Zotlabs/Lib/ThreadItem.php:352 ../../include/conversation.php:719
 #, php-format
 msgid "Expires: %s"
 msgstr "Verfällt: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:360
+#: ../../Zotlabs/Lib/ThreadItem.php:358
 msgid "Attend"
 msgstr "Zusagen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:361
+#: ../../Zotlabs/Lib/ThreadItem.php:359
 msgid "Attendance Options"
 msgstr "Zusageoptionen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:362
+#: ../../Zotlabs/Lib/ThreadItem.php:360
 msgid "Vote"
 msgstr "Abstimmen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:363
+#: ../../Zotlabs/Lib/ThreadItem.php:361
 msgid "Voting Options"
 msgstr "Abstimmungsoptionen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:384
+#: ../../Zotlabs/Lib/ThreadItem.php:382
 #: ../../addon/bookmarker/bookmarker.php:38
 msgid "Save Bookmarks"
 msgstr "Favoriten speichern"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:385
+#: ../../Zotlabs/Lib/ThreadItem.php:383
 msgid "Add to Calendar"
 msgstr "Zum Kalender hinzufügen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:394
-msgid "Mark all seen"
-msgstr "Alle als gelesen markieren"
-
-#: ../../Zotlabs/Lib/ThreadItem.php:443 ../../include/js_strings.php:7
+#: ../../Zotlabs/Lib/ThreadItem.php:441 ../../include/js_strings.php:7
 #, php-format
 msgid "%s show all"
 msgstr "%s mehr anzeigen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1318
+#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/conversation.php:1315
 msgid "Bold"
 msgstr "Fett"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1319
+#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1316
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1320
+#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1317
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1321
+#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1318
 msgid "Quote"
 msgstr "Zitat"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:737 ../../include/conversation.php:1322
+#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1319
 msgid "Code"
 msgstr "Code"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:738
+#: ../../Zotlabs/Lib/ThreadItem.php:736
 msgid "Image"
 msgstr "Bild"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:739
+#: ../../Zotlabs/Lib/ThreadItem.php:737
 msgid "Insert Link"
 msgstr "Link einfügen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:740
+#: ../../Zotlabs/Lib/ThreadItem.php:738
 msgid "Video"
 msgstr "Video"
 
+#: ../../Zotlabs/Lib/ThreadItem.php:747
+msgid "Your full name (required)"
+msgstr "Ihr vollständiger Name (erforderlich)"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:748
+msgid "Your email address (required)"
+msgstr "Ihre E-Mail-Adresse (erforderlich)"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:749
+msgid "Your website URL (optional)"
+msgstr "Ihre Webseiten-URL (optional)"
+
 #: ../../Zotlabs/Zot/Auth.php:138
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
@@ -7785,72 +7936,72 @@ msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angeme
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
 
-#: ../../Zotlabs/Storage/Browser.php:106 ../../Zotlabs/Storage/Browser.php:237
+#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:238
 msgid "parent"
 msgstr "Übergeordnetes Verzeichnis"
 
-#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2679
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2692
 msgid "Collection"
 msgstr "Sammlung"
 
-#: ../../Zotlabs/Storage/Browser.php:133
+#: ../../Zotlabs/Storage/Browser.php:134
 msgid "Principal"
 msgstr "Prinzipal"
 
-#: ../../Zotlabs/Storage/Browser.php:136
+#: ../../Zotlabs/Storage/Browser.php:137
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: ../../Zotlabs/Storage/Browser.php:139
+#: ../../Zotlabs/Storage/Browser.php:140
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../../Zotlabs/Storage/Browser.php:142
+#: ../../Zotlabs/Storage/Browser.php:143
 msgid "Schedule Inbox"
 msgstr "Posteingang für überwachte Kalender"
 
-#: ../../Zotlabs/Storage/Browser.php:145
+#: ../../Zotlabs/Storage/Browser.php:146
 msgid "Schedule Outbox"
 msgstr "Postausgang für überwachte Kalender"
 
-#: ../../Zotlabs/Storage/Browser.php:225
+#: ../../Zotlabs/Storage/Browser.php:226
 msgid "Total"
 msgstr "Summe"
 
-#: ../../Zotlabs/Storage/Browser.php:227
+#: ../../Zotlabs/Storage/Browser.php:228
 msgid "Shared"
 msgstr "Geteilt"
 
-#: ../../Zotlabs/Storage/Browser.php:301
+#: ../../Zotlabs/Storage/Browser.php:304
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "Sie verwenden %1$s von Ihrem verfügbaren Dateispeicher."
 
-#: ../../Zotlabs/Storage/Browser.php:306
+#: ../../Zotlabs/Storage/Browser.php:309
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
 msgstr "Sie verwenden %1$s von %2$s verfügbarem Dateispeicher. (%3$s&#37;)"
 
-#: ../../Zotlabs/Storage/Browser.php:317
+#: ../../Zotlabs/Storage/Browser.php:320
 msgid "WARNING:"
 msgstr "WARNUNG:"
 
-#: ../../Zotlabs/Storage/Browser.php:327
+#: ../../Zotlabs/Storage/Browser.php:330
 msgid ""
 "Please use DAV to upload large (video, audio) files.<br>See <a class=\"zrl\""
 " href=\"help/member/member_guide#Cloud_Desktop_Clients\">Cloud Desktop "
 "Clients</a>"
 msgstr "Bitte verwende DAV, um große Dateien (Audio, Video) hochzuladen.<br>Für weitere Informationen siehe <a class=\"zrl\" href=\"help/member/member_guide#Cloud_Desktop_Clients\">Cloud Desktop Clients</a>"
 
-#: ../../Zotlabs/Storage/Browser.php:331
+#: ../../Zotlabs/Storage/Browser.php:334
 msgid "Create new folder"
 msgstr "Neuen Ordner anlegen"
 
-#: ../../Zotlabs/Storage/Browser.php:333
+#: ../../Zotlabs/Storage/Browser.php:336
 msgid "Upload file"
 msgstr "Datei hochladen"
 
-#: ../../Zotlabs/Storage/Browser.php:347
+#: ../../Zotlabs/Storage/Browser.php:350
 msgid "Drop files here to immediately upload"
 msgstr "Dateien zum sofortigen Hochladen hier fallen lassen"
 
@@ -7858,9 +8009,85 @@ msgstr "Dateien zum sofortigen Hochladen hier fallen lassen"
 msgid "Forums"
 msgstr "Foren"
 
+#: ../../Zotlabs/Widget/Cdav.php:37
+msgid "Select Channel"
+msgstr "Kanal auswählen"
+
+#: ../../Zotlabs/Widget/Cdav.php:42
+msgid "Read-write"
+msgstr "Lesen-schreiben"
+
+#: ../../Zotlabs/Widget/Cdav.php:43
+msgid "Read-only"
+msgstr "Nur Lesen"
+
+#: ../../Zotlabs/Widget/Cdav.php:116
+msgid "My Calendars"
+msgstr "Meine Kalender"
+
+#: ../../Zotlabs/Widget/Cdav.php:118
+msgid "Shared Calendars"
+msgstr "Geteilte Kalender"
+
+#: ../../Zotlabs/Widget/Cdav.php:122
+msgid "Share this calendar"
+msgstr "Diesen Kalender teilen"
+
+#: ../../Zotlabs/Widget/Cdav.php:124
+msgid "Calendar name and color"
+msgstr "Kalendername und -farbe"
+
+#: ../../Zotlabs/Widget/Cdav.php:126
+msgid "Create new calendar"
+msgstr "Neuen Kalender erstellen"
+
+#: ../../Zotlabs/Widget/Cdav.php:128
+msgid "Calendar Name"
+msgstr "Kalendername"
+
+#: ../../Zotlabs/Widget/Cdav.php:129
+msgid "Calendar Tools"
+msgstr "Kalenderwerkzeuge"
+
+#: ../../Zotlabs/Widget/Cdav.php:130
+msgid "Import calendar"
+msgstr "Kalender importieren"
+
+#: ../../Zotlabs/Widget/Cdav.php:131
+msgid "Select a calendar to import to"
+msgstr "Kalender zum Hineinimportieren auswählen"
+
+#: ../../Zotlabs/Widget/Cdav.php:158
+msgid "Addressbooks"
+msgstr "Adressbücher"
+
+#: ../../Zotlabs/Widget/Cdav.php:160
+msgid "Addressbook name"
+msgstr "Adressbuchname"
+
+#: ../../Zotlabs/Widget/Cdav.php:162
+msgid "Create new addressbook"
+msgstr "Neues Adressbuch erstellen"
+
+#: ../../Zotlabs/Widget/Cdav.php:163
+msgid "Addressbook Name"
+msgstr "Adressbuchname"
+
+#: ../../Zotlabs/Widget/Cdav.php:165
+msgid "Addressbook Tools"
+msgstr "Adressbuchwerkzeuge"
+
+#: ../../Zotlabs/Widget/Cdav.php:166
+msgid "Import addressbook"
+msgstr "Adressbuch importieren"
+
+#: ../../Zotlabs/Widget/Cdav.php:167
+msgid "Select an addressbook to import to"
+msgstr "Adressbuch zum Hineinimportieren auswählen"
+
 #: ../../Zotlabs/Widget/Appcategories.php:39
 #: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:91
-#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
+#: ../../include/taxonomy.php:227 ../../include/taxonomy.php:309
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -7893,21 +8120,21 @@ msgstr "Private Nachrichten"
 msgid "Combined View"
 msgstr "Kombinierte Anzeige"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:195
+#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:190
 msgid "Inbox"
 msgstr "Eingang"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:196
+#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:191
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:197
+#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:192
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #: ../../Zotlabs/Widget/Chatroom_list.php:16
-#: ../../include/conversation.php:1816 ../../include/conversation.php:1819
-#: ../../include/nav.php:425 ../../include/nav.php:428
+#: ../../include/conversation.php:1813 ../../include/conversation.php:1816
+#: ../../include/nav.php:411 ../../include/nav.php:414
 msgid "Chatrooms"
 msgstr "Chaträume"
 
@@ -7958,23 +8185,22 @@ msgid "Archives"
 msgstr "Archive"
 
 #: ../../Zotlabs/Widget/Conversations.php:17
-#: ../../Zotlabs/Widget/Conversations.php:29
-msgid "Conversations"
-msgstr "Konversationen"
-
-#: ../../Zotlabs/Widget/Conversations.php:21
 msgid "Received Messages"
 msgstr "Erhaltene Nachrichten"
 
-#: ../../Zotlabs/Widget/Conversations.php:25
+#: ../../Zotlabs/Widget/Conversations.php:21
 msgid "Sent Messages"
 msgstr "Gesendete Nachrichten"
 
-#: ../../Zotlabs/Widget/Conversations.php:39
+#: ../../Zotlabs/Widget/Conversations.php:25
+msgid "Conversations"
+msgstr "Konversationen"
+
+#: ../../Zotlabs/Widget/Conversations.php:35
 msgid "No messages."
 msgstr "Keine Nachrichten."
 
-#: ../../Zotlabs/Widget/Conversations.php:57
+#: ../../Zotlabs/Widget/Conversations.php:55
 msgid "Delete conversation"
 msgstr "Unterhaltung löschen"
 
@@ -7990,11 +8216,11 @@ msgstr "Foto/Bild"
 msgid "Remove term"
 msgstr "Eintrag löschen"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:297
 msgid "Saved Searches"
 msgstr "Gespeicherte Suchanfragen"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336
+#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:337
 msgid "add"
 msgstr "hinzufügen"
 
@@ -8002,15 +8228,15 @@ msgstr "hinzufügen"
 msgid "Notes"
 msgstr "Notizen"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:54 ../../addon/gitwiki/gitwiki.php:76
+#: ../../Zotlabs/Widget/Wiki_pages.php:52 ../../addon/gitwiki/gitwiki.php:76
 msgid "Wiki Pages"
 msgstr "Wikiseiten"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:60 ../../addon/gitwiki/gitwiki.php:81
+#: ../../Zotlabs/Widget/Wiki_pages.php:58 ../../addon/gitwiki/gitwiki.php:81
 msgid "Add new page"
 msgstr "Neue Seite hinzufügen"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:61 ../../addon/gitwiki/gitwiki.php:82
+#: ../../Zotlabs/Widget/Wiki_pages.php:59 ../../addon/gitwiki/gitwiki.php:82
 msgid "Page name"
 msgstr "Seitenname"
 
@@ -8031,7 +8257,7 @@ msgid "See more..."
 msgstr "Mehr anzeigen …"
 
 #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
-#: ../../include/features.php:390
+#: ../../include/features.php:386
 msgid "Saved Folders"
 msgstr "Gespeicherte Ordner"
 
@@ -8087,15 +8313,15 @@ msgstr "Klon-Adressen verwalten"
 msgid "Export channel"
 msgstr "Kanal exportieren"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:83
+#: ../../Zotlabs/Widget/Settings_menu.php:84
 msgid "Connected apps"
 msgstr "Verbundene Apps"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:98 ../../include/features.php:153
+#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:149
 msgid "Permission Groups"
 msgstr "Berechtigungsrollen"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:115
+#: ../../Zotlabs/Widget/Settings_menu.php:117
 msgid "Premium Channel Settings"
 msgstr "Premium-Kanal-Einstellungen"
 
@@ -8107,156 +8333,147 @@ msgstr "Gespeicherte Chatrooms"
 msgid "Source channel not found."
 msgstr "Quellkanal nicht gefunden."
 
-#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:26
-#, php-format
-msgctxt "opensearch"
-msgid "Search %1$s (%2$s)"
-msgstr "Suche %1$s (%2$s)"
-
-#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:28
-msgctxt "opensearch"
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../boot.php:1609
+#: ../../boot.php:1581
 msgid "Create an account to access services and applications"
 msgstr "Erstelle ein Konto, um auf Dienste und Anwendungen zugreifen zu können."
 
-#: ../../boot.php:1628 ../../include/nav.php:103 ../../include/nav.php:127
+#: ../../boot.php:1600 ../../include/nav.php:99 ../../include/nav.php:123
+#: ../../include/nav.php:140
 msgid "Logout"
 msgstr "Abmelden"
 
-#: ../../boot.php:1631
+#: ../../boot.php:1603
 msgid "Login/Email"
 msgstr "Anmelden/E-Mail"
 
-#: ../../boot.php:1632
+#: ../../boot.php:1604
 msgid "Password"
 msgstr "Kennwort"
 
-#: ../../boot.php:1633
+#: ../../boot.php:1605
 msgid "Remember me"
 msgstr "Angaben speichern"
 
-#: ../../boot.php:1636
+#: ../../boot.php:1608
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:2174
+#: ../../boot.php:2146
 msgid "toggle mobile"
 msgstr "auf/von mobile Ansicht wechseln"
 
-#: ../../boot.php:2327
+#: ../../boot.php:2299
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr "[$Projectname] Webseiten-SSL-Fehler für %s"
 
-#: ../../boot.php:2332
+#: ../../boot.php:2304
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben."
 
-#: ../../boot.php:2450
+#: ../../boot.php:2423
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr "[$Projectname] Cron-Jobs laufen nicht auf %s"
 
-#: ../../boot.php:2455
+#: ../../boot.php:2428
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron-Aufgaben laufen nicht."
 
-#: ../../boot.php:2456 ../../include/datetime.php:286
+#: ../../boot.php:2429 ../../include/datetime.php:286
 msgid "never"
 msgstr "Nie"
 
-#: ../../view/theme/redbasic/php/config.php:9
+#: ../../view/theme/redbasic/php/config.php:16
+#: ../../view/theme/redbasic/php/config.php:19
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (Voreinstellung für Hubzilla)"
 
-#: ../../view/theme/redbasic/php/config.php:88
+#: ../../view/theme/redbasic/php/config.php:99
 msgid "Theme settings"
-msgstr "Theme-Einstellungen"
+msgstr "Design-Einstellungen"
 
-#: ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:100
 msgid "Narrow navbar"
 msgstr "Schmale Navigationsleiste"
 
-#: ../../view/theme/redbasic/php/config.php:90
+#: ../../view/theme/redbasic/php/config.php:101
 msgid "Navigation bar background color"
 msgstr "Hintergrundfarbe der Navigationsleiste"
 
-#: ../../view/theme/redbasic/php/config.php:91
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Navigation bar icon color "
 msgstr "Farbe für die Icons der Navigationsleiste"
 
-#: ../../view/theme/redbasic/php/config.php:92
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Navigation bar active icon color "
 msgstr "Farbe für aktive Icons der Navigationsleiste"
 
-#: ../../view/theme/redbasic/php/config.php:93
+#: ../../view/theme/redbasic/php/config.php:104
 msgid "Link color"
 msgstr "Linkfarbe"
 
-#: ../../view/theme/redbasic/php/config.php:94
+#: ../../view/theme/redbasic/php/config.php:105
 msgid "Set font-color for banner"
 msgstr "Farbe der Schrift des Banners"
 
-#: ../../view/theme/redbasic/php/config.php:95
+#: ../../view/theme/redbasic/php/config.php:106
 msgid "Set the background color"
 msgstr "Hintergrundfarbe"
 
-#: ../../view/theme/redbasic/php/config.php:96
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Set the background image"
 msgstr "Hintergrundbild"
 
-#: ../../view/theme/redbasic/php/config.php:97
+#: ../../view/theme/redbasic/php/config.php:108
 msgid "Set the background color of items"
 msgstr "Hintergrundfarbe für Beiträge"
 
-#: ../../view/theme/redbasic/php/config.php:98
+#: ../../view/theme/redbasic/php/config.php:109
 msgid "Set the background color of comments"
 msgstr "Hintergrundfarbe für Kommentare"
 
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:110
 msgid "Set font-size for the entire application"
 msgstr "Schriftgröße für die gesamte Anwendung"
 
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:110
 msgid "Examples: 1rem, 100%, 16px"
 msgstr "Beispiele: 1rem, 100%, 16px"
 
-#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:111
 msgid "Set font-color for posts and comments"
 msgstr "Schriftfarbe für Beiträge und Kommentare"
 
-#: ../../view/theme/redbasic/php/config.php:101
+#: ../../view/theme/redbasic/php/config.php:112
 msgid "Set radius of corners"
 msgstr "Ecken-Radius"
 
-#: ../../view/theme/redbasic/php/config.php:101
+#: ../../view/theme/redbasic/php/config.php:112
 msgid "Example: 4px"
 msgstr "Beispiel: 4px"
 
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:113
 msgid "Set shadow depth of photos"
 msgstr "Schattentiefe von Fotos"
 
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:114
 msgid "Set maximum width of content region in pixel"
 msgstr "Maximalbreite des Inhaltsbereichs in Pixel festlegen"
 
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:114
 msgid "Leave empty for default width"
 msgstr "Leer lassen für Standardbreite"
 
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:115
 msgid "Left align page content"
 msgstr "Seiteninhalt linksbündig anzeigen"
 
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:116
 msgid "Set size of conversation author photo"
 msgstr "Größe der Avatare von Themenstartern"
 
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:117
 msgid "Set size of followup author photos"
 msgstr "Größe der Avatare von Kommentatoren"
 
@@ -8382,248 +8599,59 @@ msgstr "Neues Rendezvous hinzufügen"
 msgid ""
 "Create a new rendezvous and share the access link with those you wish to "
 "invite to the group. Those who open the link become members of the "
-"rendezvous. They can view other member locations, add markers to the map, or"
-" share their own locations with the group."
-msgstr "Erstelle ein neues Rendezvous und teile den Zugriffslink mit allen, die Du in die Gruppe einladen möchtest. Die, die den Link öffnen, werden Mitglieder des Rendezvous. Sie können die Standorte der anderen Mitglieder sehen, Marker zur Karte hinzufügen oder ihre eigenen Standorte mit der Gruppe teilen."
-
-#: ../../addon/skeleton/skeleton.php:59
-msgid "Some setting"
-msgstr "Einige Einstellungen"
-
-#: ../../addon/skeleton/skeleton.php:61
-msgid "A setting"
-msgstr "Eine Einstellung"
-
-#: ../../addon/skeleton/skeleton.php:64
-msgid "Skeleton Settings"
-msgstr "Skeleton Einstellungen"
-
-#: ../../addon/gnusoc/gnusoc.php:119
-msgid "GNU-Social Protocol Settings updated."
-msgstr "GNU social Protokoll Einstellungen aktualisiert"
-
-#: ../../addon/gnusoc/gnusoc.php:130
-msgid "Enable the GNU-Social protocol for this channel"
-msgstr "Aktiviere das GNU social Protokoll für diesen Kanal"
-
-#: ../../addon/gnusoc/gnusoc.php:134
-msgid "GNU-Social Protocol Settings"
-msgstr "GNU social Protokoll Einstellungen"
-
-#: ../../addon/gnusoc/gnusoc.php:324
-msgid "Follow"
-msgstr "Folgen"
-
-#: ../../addon/gnusoc/gnusoc.php:327
-#, php-format
-msgid "%1$s is now following %2$s"
-msgstr "%1$s folgt nun %2$s"
-
-#: ../../addon/cdav/Mod_Cdav.php:744
-msgid "INVALID EVENT DISMISSED!"
-msgstr "UNGÜLTIGEN TERMIN ABGELEHNT!"
-
-#: ../../addon/cdav/Mod_Cdav.php:745
-msgid "Summary: "
-msgstr "Zusammenfassung:"
-
-#: ../../addon/cdav/Mod_Cdav.php:746
-msgid "Date: "
-msgstr "Datum:"
-
-#: ../../addon/cdav/Mod_Cdav.php:747 ../../addon/cdav/Mod_Cdav.php:754
-msgid "Reason: "
-msgstr "Grund:"
-
-#: ../../addon/cdav/Mod_Cdav.php:752
-msgid "INVALID CARD DISMISSED!"
-msgstr "UNGÜLTIGE KARTE ABGELEHNT!"
-
-#: ../../addon/cdav/Mod_Cdav.php:753
-msgid "Name: "
-msgstr "Name: "
-
-#: ../../addon/cdav/Mod_Cdav.php:770
-msgid ""
-"You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV "
-"Settings before you can use it."
-msgstr "Du musst dieses Plugin zunächst in Einstellungen > Plugin-Einstellungen > CalDAV/CardDAV-Einstellungen aktivieren, bevor Du es verwenden kannst."
-
-#: ../../addon/cdav/Mod_Cdav.php:836 ../../addon/cdav/Mod_Cdav.php:837
-msgid "Example: YYYY-MM-DD HH:mm"
-msgstr "Beispiel: JJJJ-MM-TT HH:mm"
-
-#: ../../addon/cdav/Mod_Cdav.php:837
-msgid "End date and time"
-msgstr "Enddatum und -zeit"
-
-#: ../../addon/cdav/Mod_Cdav.php:852
-msgid "List month"
-msgstr "Liste Monat"
-
-#: ../../addon/cdav/Mod_Cdav.php:853
-msgid "List week"
-msgstr "Liste Woche"
-
-#: ../../addon/cdav/Mod_Cdav.php:854
-msgid "List day"
-msgstr "Liste Tag"
-
-#: ../../addon/cdav/Mod_Cdav.php:861
-msgid "More"
-msgstr "Mehr"
-
-#: ../../addon/cdav/Mod_Cdav.php:862
-msgid "Less"
-msgstr "Weniger"
-
-#: ../../addon/cdav/Mod_Cdav.php:863
-msgid "Select calendar"
-msgstr "Kalender auswählen"
-
-#: ../../addon/cdav/Mod_Cdav.php:865
-msgid "Delete all"
-msgstr "Alles löschen"
-
-#: ../../addon/cdav/Mod_Cdav.php:867
-msgid "Sorry! Editing of recurrent events is not yet implemented."
-msgstr "Entschuldigung, aber das Bearbeiten von wiederkehrenden Veranstaltungen ist leider noch nicht implementiert."
-
-#: ../../addon/cdav/cdav.php:36
-msgid "Errors encountered creating database table: "
-msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
-
-#: ../../addon/cdav/cdav.php:197
-msgid "Default Calendar"
-msgstr "Standardkalender"
-
-#: ../../addon/cdav/cdav.php:206
-msgid "Default Addressbook"
-msgstr "Standardadressbuch"
-
-#: ../../addon/cdav/cdav.php:215
-msgid "CalDAV/CardDAV Settings saved."
-msgstr "CalDAV/CardDAV-Einstellungen gespeichert."
-
-#: ../../addon/cdav/cdav.php:234
-msgid "Enable CalDAV/CardDAV Server for this channel"
-msgstr "Aktiviere den CalDAV/CardDAV Server für diesen Kanal"
-
-#: ../../addon/cdav/cdav.php:237
-#, php-format
-msgid "Your CalDAV resources are located at %s "
-msgstr "Deine CalDAV Resourcen sind unter %s verfügbar"
-
-#: ../../addon/cdav/cdav.php:240
-#, php-format
-msgid "Your CardDAV resources are located at %s "
-msgstr "Deine CardDAV Ressourcen sind unter %s verfügbar"
-
-#: ../../addon/cdav/cdav.php:246
-msgid "CalDAV/CardDAV Settings"
-msgstr "CalDAV/CardDAV-Einstellungen"
-
-#: ../../addon/cdav/cdav.php:272 ../../include/connections.php:670
-msgid "Home, Voice"
-msgstr "Zuhause, Sprache"
-
-#: ../../addon/cdav/cdav.php:273 ../../include/connections.php:671
-msgid "Home, Fax"
-msgstr "Zuhause, Fax"
-
-#: ../../addon/cdav/cdav.php:275 ../../include/connections.php:673
-msgid "Work, Voice"
-msgstr "Arbeit, Sprache"
-
-#: ../../addon/cdav/cdav.php:276 ../../include/connections.php:674
-msgid "Work, Fax"
-msgstr "Arbeit, Fax"
-
-#: ../../addon/cdav/include/widgets.php:37
-msgid "Select Channel"
-msgstr "Kanal auswählen"
-
-#: ../../addon/cdav/include/widgets.php:42
-msgid "Read-write"
-msgstr "Lesen-schreiben"
-
-#: ../../addon/cdav/include/widgets.php:43
-msgid "Read-only"
-msgstr "Nur Lesen"
-
-#: ../../addon/cdav/include/widgets.php:116
-msgid "My Calendars"
-msgstr "Meine Kalender"
-
-#: ../../addon/cdav/include/widgets.php:118
-msgid "Shared Calendars"
-msgstr "Geteilte Kalender"
-
-#: ../../addon/cdav/include/widgets.php:122
-msgid "Share this calendar"
-msgstr "Diesen Kalender teilen"
-
-#: ../../addon/cdav/include/widgets.php:124
-msgid "Calendar name and color"
-msgstr "Kalendername und -farbe"
-
-#: ../../addon/cdav/include/widgets.php:126
-msgid "Create new calendar"
-msgstr "Neuen Kalender erstellen"
-
-#: ../../addon/cdav/include/widgets.php:128
-msgid "Calendar Name"
-msgstr "Kalendername"
-
-#: ../../addon/cdav/include/widgets.php:129
-msgid "Calendar Tools"
-msgstr "Kalenderwerkzeuge"
+"rendezvous. They can view other member locations, add markers to the map, or"
+" share their own locations with the group."
+msgstr "Erstelle ein neues Rendezvous und teile den Zugriffslink mit allen, die Du in die Gruppe einladen möchtest. Die, die den Link öffnen, werden Mitglieder des Rendezvous. Sie können die Standorte der anderen Mitglieder sehen, Marker zur Karte hinzufügen oder ihre eigenen Standorte mit der Gruppe teilen."
 
-#: ../../addon/cdav/include/widgets.php:130
-msgid "Import calendar"
-msgstr "Kalender importieren"
+#: ../../addon/skeleton/skeleton.php:59
+msgid "Some setting"
+msgstr "Einige Einstellungen"
 
-#: ../../addon/cdav/include/widgets.php:131
-msgid "Select a calendar to import to"
-msgstr "Kalender zum Hineinimportieren auswählen"
+#: ../../addon/skeleton/skeleton.php:61
+msgid "A setting"
+msgstr "Eine Einstellung"
 
-#: ../../addon/cdav/include/widgets.php:158
-msgid "Addressbooks"
-msgstr "Adressbücher"
+#: ../../addon/skeleton/skeleton.php:64
+msgid "Skeleton Settings"
+msgstr "Skeleton Einstellungen"
 
-#: ../../addon/cdav/include/widgets.php:160
-msgid "Addressbook name"
-msgstr "Adressbuchname"
+#: ../../addon/gnusoc/gnusoc.php:200
+msgid "GNU-Social Protocol Settings updated."
+msgstr "GNU social Protokoll Einstellungen aktualisiert"
 
-#: ../../addon/cdav/include/widgets.php:162
-msgid "Create new addressbook"
-msgstr "Neues Adressbuch erstellen"
+#: ../../addon/gnusoc/gnusoc.php:219
+msgid ""
+"The GNU-Social protocol does not support location independence. Connections "
+"you make within that network may be unreachable from alternate channel "
+"locations."
+msgstr "Das GNU-Social-Protokoll unterstützt keine Server-unabhängigen Identitäten. Verbindungen, die Du mit diesem Netzwerk eingehst, können von anderen Orten (Klonen) dieses Kanals aus unerreichbar sein."
 
-#: ../../addon/cdav/include/widgets.php:163
-msgid "Addressbook Name"
-msgstr "Adressbuchname"
+#: ../../addon/gnusoc/gnusoc.php:222
+msgid "Enable the GNU-Social protocol for this channel"
+msgstr "Aktiviere das GNU social Protokoll für diesen Kanal"
 
-#: ../../addon/cdav/include/widgets.php:165
-msgid "Addressbook Tools"
-msgstr "Adressbuchwerkzeuge"
+#: ../../addon/gnusoc/gnusoc.php:226
+msgid "GNU-Social Protocol Settings"
+msgstr "GNU social Protokoll Einstellungen"
 
-#: ../../addon/cdav/include/widgets.php:166
-msgid "Import addressbook"
-msgstr "Adressbuch importieren"
+#: ../../addon/gnusoc/gnusoc.php:417
+msgid "Follow"
+msgstr "Folgen"
 
-#: ../../addon/cdav/include/widgets.php:167
-msgid "Select an addressbook to import to"
-msgstr "Adressbuch zum Hineinimportieren auswählen"
+#: ../../addon/gnusoc/gnusoc.php:420
+#, php-format
+msgid "%1$s is now following %2$s"
+msgstr "%1$s folgt nun %2$s"
 
 #: ../../addon/planets/planets.php:121
 msgid "Planets Settings updated."
 msgstr "Planeten Einstellungen aktualisiert"
 
-#: ../../addon/planets/planets.php:153
+#: ../../addon/planets/planets.php:149
 msgid "Enable Planets Plugin"
 msgstr "Aktiviere Planeten Plugin"
 
-#: ../../addon/planets/planets.php:157
+#: ../../addon/planets/planets.php:153
 msgid "Planets Settings"
 msgstr "Planeten Einstellungen"
 
@@ -8656,8 +8684,8 @@ msgstr "Zurückkehren nach"
 msgid "Page to load after image selection."
 msgstr "Die Seite, die nach Auswahl eines Bildes geladen werden soll."
 
-#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1048
-#: ../../include/nav.php:111
+#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1165
+#: ../../include/nav.php:107
 msgid "Edit Profile"
 msgstr "Profil bearbeiten"
 
@@ -8796,7 +8824,7 @@ msgid ""
 "setting. It is polite and recommended to tag any content containing nudity "
 "with #NSFW.  This filter can also match any other word/text you specify, and"
 " can thereby be used as a general purpose content filter."
-msgstr ""
+msgstr "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbausteinen, die Du hier unterhalb einträgst, und faltet alle Beiträge zusammen, in denen es diese Bausteine findet. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Es gilt als höflich und empfohlen, den #NSFW Tag für Beiträge zu verwenden, bei denen Du davon ausgehen kannst, dass andere sie anstößig finden könnten. Du kannst aber auch beliebige andere Wörter in der Liste angeben und das Plugin so als allgemeinen Inhaltsfilter verwenden."
 
 #: ../../addon/nsfw/nsfw.php:84
 msgid "Enable Content filter"
@@ -8808,7 +8836,7 @@ msgstr "Kommaseparierte Liste von Schlüsselworten die verborgen werden sollen."
 
 #: ../../addon/nsfw/nsfw.php:88
 msgid "Word, /regular-expression/, lang=xx, lang!=xx"
-msgstr ""
+msgstr "Wort, /regular-expression/, lang=xx, lang!=xx"
 
 #: ../../addon/nsfw/nsfw.php:92
 msgid "Not Safe For Work Settings"
@@ -8917,7 +8945,7 @@ msgstr "Dreamwidth-Beitragseinstellungen"
 
 #: ../../addon/firefox/firefox.php:23
 msgid "Install Firefox Sharing Tools"
-msgstr ""
+msgstr "Installiere das Firefox Sharing Werkzeug"
 
 #: ../../addon/firefox/firefox.php:34
 msgid "Share content from Firefox to $Projectname"
@@ -8925,7 +8953,7 @@ msgstr "Inhalte von Firefox nach $Projectname teilen"
 
 #: ../../addon/firefox/firefox.php:37
 msgid "Install Firefox Sharing Tools to this web browser"
-msgstr ""
+msgstr "Installiere das Firefox Sharing Werkzeug in diesen Webbrowser"
 
 #: ../../addon/dirstats/dirstats.php:94
 msgid "Hubzilla Directory Stats"
@@ -9196,12 +9224,12 @@ msgid "Login failed."
 msgstr "Login fehlgeschlagen."
 
 #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
+#: ../../include/selectors.php:66 ../../include/channel.php:1332
 msgid "Male"
 msgstr "Männlich"
 
 #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
+#: ../../include/selectors.php:66 ../../include/channel.php:1330
 msgid "Female"
 msgstr "Weiblich"
 
@@ -9388,33 +9416,45 @@ msgstr ""
 msgid "declared undying love for"
 msgstr ""
 
-#: ../../addon/diaspora/diaspora.php:675
+#: ../../addon/diaspora/diaspora.php:715
 msgid "Diaspora Protocol Settings updated."
-msgstr ""
+msgstr "Diaspora Protokoll Einstellungen aktualisiert"
+
+#: ../../addon/diaspora/diaspora.php:734
+msgid ""
+"The Diaspora protocol does not support location independence. Connections "
+"you make within that network may be unreachable from alternate channel "
+"locations."
+msgstr "Das Diaspora-Protokoll unterstützt keine Server-unabhängigen Identitäten. Verbindungen, die Du mit diesem Netzwerk eingehst, können von anderen Orten (Klonen) dieses Kanals aus unerreichbar sein."
 
-#: ../../addon/diaspora/diaspora.php:694
+#: ../../addon/diaspora/diaspora.php:737
 msgid "Enable the Diaspora protocol for this channel"
-msgstr ""
+msgstr "Das Diaspora Protokoll für diesen Kanal aktivieren"
 
-#: ../../addon/diaspora/diaspora.php:698
+#: ../../addon/diaspora/diaspora.php:741
 msgid "Allow any Diaspora member to comment on your public posts"
-msgstr ""
+msgstr "Erlaube jedem Diaspora Nutzer deine öffentlichen Beiträge zu kommentieren"
 
-#: ../../addon/diaspora/diaspora.php:702
+#: ../../addon/diaspora/diaspora.php:745
 msgid "Prevent your hashtags from being redirected to other sites"
-msgstr ""
+msgstr "Verhindern, dass Deine Hashtags zu anderen Seiten umgeleitet werden"
+
+#: ../../addon/diaspora/diaspora.php:749
+msgid ""
+"Sign and forward posts and comments with no existing Diaspora signature"
+msgstr "Signieren und Weiterleiten von Beiträgen und Kommentaren ohne vorhandene Diaspora-Signatur"
 
-#: ../../addon/diaspora/diaspora.php:707
+#: ../../addon/diaspora/diaspora.php:754
 msgid "Followed hashtags (comma separated, do not include the #)"
-msgstr ""
+msgstr "Verfolgte Hashtags (Komma separierte Liste, ohne die #)"
 
-#: ../../addon/diaspora/diaspora.php:712
+#: ../../addon/diaspora/diaspora.php:759
 msgid "Diaspora Protocol Settings"
-msgstr ""
+msgstr "Diaspora Protokoll Einstellungen"
 
 #: ../../addon/diaspora/import_diaspora.php:16
 msgid "No username found in import file."
-msgstr ""
+msgstr "Es wurde kein Nutzername in der importierten Datei gefunden."
 
 #: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:62
 msgid "Unable to create a unique channel address. Import failed."
@@ -9534,25 +9574,6 @@ msgstr "Mail Test"
 msgid "Message subject"
 msgstr "Betreff der Nachricht"
 
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:44
-#, php-format
-msgid "Reconnecting %d connections"
-msgstr ""
-
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:63
-msgid "Diaspora Reconnect"
-msgstr ""
-
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:65
-msgid ""
-"Use this form to re-establish Diaspora connections which were initially made"
-" from a different hub."
-msgstr ""
-
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:70
-msgid "Reconnect"
-msgstr ""
-
 #: ../../addon/openstreetmap/openstreetmap.php:146
 msgid "View Larger"
 msgstr "Größer anzeigen"
@@ -9636,10 +9657,10 @@ msgstr "Friendica-Passwort"
 
 #: ../../addon/rtof/rtof.php:101
 msgid "Hubzilla to Friendica Post Settings"
-msgstr ""
+msgstr "Hubzilla-zu-Friendica Beitragseinstellungen"
 
-#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1139
-#: ../../include/channel.php:1296
+#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1256
+#: ../../include/channel.php:1419
 msgid "Status:"
 msgstr "Status:"
 
@@ -9678,7 +9699,7 @@ msgstr "Hubzilla-Passwort"
 #: ../../addon/jappixmini/jappixmini.php:351
 #: ../../addon/jappixmini/jappixmini.php:355
 msgid "Approve subscription requests from Hubzilla contacts automatically"
-msgstr ""
+msgstr "Verbindungsanfragen von Hubzilla-Kontakten automatisch annehmen"
 
 #: ../../addon/jappixmini/jappixmini.php:359
 msgid "Purge internal list of jabber addresses of contacts"
@@ -9714,7 +9735,7 @@ msgstr "Superblock Einstellungen aktualisiert"
 
 #: ../../addon/nofed/nofed.php:42
 msgid "Federate"
-msgstr ""
+msgstr "Beitrag verteilen"
 
 #: ../../addon/nofed/nofed.php:56
 msgid "nofed Settings saved."
@@ -9722,11 +9743,11 @@ msgstr "nofed Einstellungen gespeichert"
 
 #: ../../addon/nofed/nofed.php:72
 msgid "Allow Federation Toggle"
-msgstr ""
+msgstr "Umschalter zur Beitragsverteilung bereitstellen"
 
 #: ../../addon/nofed/nofed.php:76
 msgid "Federate posts by default"
-msgstr ""
+msgstr "Beiträge standardmäßig verteilen"
 
 #: ../../addon/nofed/nofed.php:80
 msgid "NoFed Settings"
@@ -10194,7 +10215,7 @@ msgstr "Sie müssen weiß oder schwarz auswählen."
 msgid "Error creating new game."
 msgstr "Fehler beim Erstellen eines neuen Spiels."
 
-#: ../../addon/chess/chess.php:381 ../../include/channel.php:899
+#: ../../addon/chess/chess.php:381 ../../include/channel.php:1016
 msgid "Requested channel is not available."
 msgstr "Angeforderte Kanal nicht verfügbar."
 
@@ -10227,7 +10248,7 @@ msgid ""
 "button below to get a PIN from Twitter which you have to copy into the input"
 " box below and submit the form. Only your <strong>public</strong> posts will"
 " be posted to Twitter."
-msgstr ""
+msgstr "Auf diesem Hubzilla-Server ist das Twitter-Plugin aktiviert, aber Du hast Dich hier noch nicht mit Deinem Twitter-Konto verbunden. Um dies zu tun, klicke die Schaltfläche unten, um eine PIN von Twitter zu erhalten, die Du dann in das Eingabefeld darunter einfügen und das Formular bestätigen musst. Nur Deine <strong>öffentlichen</strong> Beiträge werden auf Twitter geteilt."
 
 #: ../../addon/twitter/twitter.php:207
 msgid "Log in with Twitter"
@@ -10243,7 +10264,7 @@ msgid ""
 "details from unknown viewers?</em>) the link potentially included in public "
 "postings relayed to Twitter will lead the visitor to a blank page informing "
 "the visitor that the access to your profile has been restricted."
-msgstr ""
+msgstr "<strong>Hinweis:</strong> Entsprechend Deiner Privatsphären-Einstellungen (<em>Profil-Details vor nicht angemeldeten Besuchern verbergen?</em>) kann ein ggf. zu Twitter geteilter Link Besucher auf eine leere Seite führen, die darüber informiert, dass der Zugriff zu Deinem Profil eingeschränkt ist."
 
 #: ../../addon/twitter/twitter.php:242
 msgid "Allow posting to Twitter"
@@ -10269,15 +10290,15 @@ msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twi
 msgid "Twitter Post Settings"
 msgstr "Twitter-Beitragseinstellungen"
 
-#: ../../addon/smileybutton/smileybutton.php:273
+#: ../../addon/smileybutton/smileybutton.php:211
 msgid "Deactivate the feature"
 msgstr "Diese Funktion abschalten"
 
-#: ../../addon/smileybutton/smileybutton.php:277
+#: ../../addon/smileybutton/smileybutton.php:215
 msgid "Hide the button and show the smilies directly."
 msgstr "Verstecke die Schaltfläche und zeige die Smilies direkt an."
 
-#: ../../addon/smileybutton/smileybutton.php:281
+#: ../../addon/smileybutton/smileybutton.php:219
 msgid "Smileybutton Settings"
 msgstr "Smileyknopf-Einstellungen"
 
@@ -10490,7 +10511,7 @@ msgstr "Erweitertes Teilen von Identitäten"
 msgid ""
 "Share your identity with all websites on the internet. When disabled, "
 "identity is only shared with sites in the matrix."
-msgstr ""
+msgstr "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Hubzilla-Servern geteilt."
 
 #: ../../addon/tictac/tictac.php:21
 msgid "Three Dimensional Tic-Tac-Toe"
@@ -10558,6 +10579,22 @@ msgstr "Nachrichtenkopf-Einstellungen"
 msgid "pageheader Settings saved."
 msgstr "Nachrichtenkopf-Einstellungen gespeichert."
 
+#: ../../addon/authchoose/authchoose.php:67
+msgid "Only authenticate automatically to sites of your friends"
+msgstr "Authentifiziere Dich nur auf Seiten deiner Freunde automatisch"
+
+#: ../../addon/authchoose/authchoose.php:67
+msgid "By default you are automatically authenticated anywhere in the network"
+msgstr "Authentifiziere Dich standardmäßig bei allen Seiten im Netzwerk automatisch"
+
+#: ../../addon/authchoose/authchoose.php:71
+msgid "Authchoose Settings"
+msgstr "Einstellungen für automatische Authentifizierung"
+
+#: ../../addon/authchoose/authchoose.php:85
+msgid "Atuhchoose Settings updated."
+msgstr "Einstellungen für automatische Authentifizierung aktualisiert."
+
 #: ../../addon/moremoods/moremoods.php:19
 msgid "lonely"
 msgstr "einsam"
@@ -10753,6 +10790,17 @@ msgstr "Ein Konto wurde für Sie erstellt."
 msgid "Authentication successful but rejected: account creation is disabled."
 msgstr "Authentifizierung war erfolgreich wurde aber abgewiesen! Das Anlegen von Accounts wurde deaktiviert."
 
+#: ../../addon/opensearch/opensearch.php:26
+#, php-format
+msgctxt "opensearch"
+msgid "Search %1$s (%2$s)"
+msgstr "Suche %1$s (%2$s)"
+
+#: ../../addon/opensearch/opensearch.php:28
+msgctxt "opensearch"
+msgid "$Projectname"
+msgstr "$Projectname"
+
 #: ../../addon/opensearch/opensearch.php:43
 msgid "Search $Projectname"
 msgstr "$Projectname suchen"
@@ -10851,11 +10899,11 @@ msgstr "Transsexuell"
 msgid "Hermaphrodite"
 msgstr "Zwitter"
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:49 ../../include/channel.php:1336
 msgid "Neuter"
 msgstr "Geschlechtslos"
 
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:49 ../../include/channel.php:1338
 msgid "Non-specific"
 msgstr "unklar"
 
@@ -11045,341 +11093,288 @@ msgstr "%1$s ist jetzt mit %2$s verbunden"
 msgid "%1$s poked %2$s"
 msgstr "%1$s stupste %2$s an"
 
-#: ../../include/conversation.php:239 ../../include/text.php:1115
-#: ../../include/text.php:1120
+#: ../../include/conversation.php:239 ../../include/text.php:1096
+#: ../../include/text.php:1101
 msgid "poked"
 msgstr "stupste"
 
-#: ../../include/conversation.php:691
+#: ../../include/conversation.php:688
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "%ss Profil auf %s ansehen"
 
-#: ../../include/conversation.php:711
+#: ../../include/conversation.php:708
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: ../../include/conversation.php:712
+#: ../../include/conversation.php:709
 msgid "Filed under:"
 msgstr "Gespeichert unter:"
 
-#: ../../include/conversation.php:737
+#: ../../include/conversation.php:734
 msgid "View in context"
 msgstr "Im Zusammenhang anschauen"
 
-#: ../../include/conversation.php:834
+#: ../../include/conversation.php:831
 msgid "remove"
 msgstr "lösche"
 
-#: ../../include/conversation.php:838 ../../include/nav.php:272
+#: ../../include/conversation.php:835 ../../include/nav.php:268
 msgid "Loading..."
 msgstr "Lädt ..."
 
-#: ../../include/conversation.php:839
+#: ../../include/conversation.php:836
 msgid "Delete Selected Items"
 msgstr "Lösche die ausgewählten Elemente"
 
-#: ../../include/conversation.php:882
+#: ../../include/conversation.php:879
 msgid "View Source"
 msgstr "Quelle anzeigen"
 
-#: ../../include/conversation.php:892
+#: ../../include/conversation.php:889
 msgid "Follow Thread"
 msgstr "Unterhaltung folgen"
 
-#: ../../include/conversation.php:901
+#: ../../include/conversation.php:898
 msgid "Unfollow Thread"
 msgstr "Unterhaltung nicht mehr folgen"
 
-#: ../../include/conversation.php:992
+#: ../../include/conversation.php:989
 msgid "Activity/Posts"
 msgstr "Aktivitäten/Beiträge"
 
-#: ../../include/conversation.php:1012
+#: ../../include/conversation.php:1009
 msgid "Edit Connection"
 msgstr "Verbindung bearbeiten"
 
-#: ../../include/conversation.php:1022
+#: ../../include/conversation.php:1019
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../include/conversation.php:1156
+#: ../../include/conversation.php:1153
 #, php-format
 msgid "%s likes this."
 msgstr "%s gefällt das."
 
-#: ../../include/conversation.php:1156
+#: ../../include/conversation.php:1153
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s gefällt das nicht."
 
-#: ../../include/conversation.php:1160
+#: ../../include/conversation.php:1157
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] "<span  %1$s>%2$d Person</span> gefällt das."
 msgstr[1] "<span  %1$s>%2$d Leuten</span> gefällt das."
 
-#: ../../include/conversation.php:1162
+#: ../../include/conversation.php:1159
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] "<span  %1$s>%2$d Person</span> gefällt das nicht."
 msgstr[1] "<span  %1$s>%2$d Leuten</span> gefällt das nicht."
 
-#: ../../include/conversation.php:1168
+#: ../../include/conversation.php:1165
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:1171
+#: ../../include/conversation.php:1168
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ""
 msgstr[1] ", und %d andere"
 
-#: ../../include/conversation.php:1172
+#: ../../include/conversation.php:1169
 #, php-format
 msgid "%s like this."
 msgstr "%s gefällt das."
 
-#: ../../include/conversation.php:1172
+#: ../../include/conversation.php:1169
 #, php-format
 msgid "%s don't like this."
 msgstr "%s gefällt das nicht."
 
-#: ../../include/conversation.php:1215
+#: ../../include/conversation.php:1212
 msgid "Set your location"
 msgstr "Standort"
 
-#: ../../include/conversation.php:1216
+#: ../../include/conversation.php:1213
 msgid "Clear browser location"
 msgstr "Browser-Standort löschen"
 
-#: ../../include/conversation.php:1264
+#: ../../include/conversation.php:1261
 msgid "Tag term:"
 msgstr "Schlagwort:"
 
-#: ../../include/conversation.php:1265
+#: ../../include/conversation.php:1262
 msgid "Where are you right now?"
 msgstr "Wo bist Du jetzt grade?"
 
-#: ../../include/conversation.php:1270
+#: ../../include/conversation.php:1267
 msgid "Choose a different album..."
 msgstr "Wählen Sie ein anderes Album aus..."
 
-#: ../../include/conversation.php:1274
+#: ../../include/conversation.php:1271
 msgid "Comments enabled"
 msgstr "Kommentare aktiviert"
 
-#: ../../include/conversation.php:1275
+#: ../../include/conversation.php:1272
 msgid "Comments disabled"
 msgstr "Kommentare deaktiviert"
 
-#: ../../include/conversation.php:1313
+#: ../../include/conversation.php:1310
 msgid "Page link name"
 msgstr "Link zur Seite"
 
-#: ../../include/conversation.php:1316
+#: ../../include/conversation.php:1313
 msgid "Post as"
 msgstr "Veröffentlichen als"
 
-#: ../../include/conversation.php:1330
+#: ../../include/conversation.php:1327
 msgid "Toggle voting"
 msgstr "Umfragewerkzeug aktivieren"
 
-#: ../../include/conversation.php:1333
+#: ../../include/conversation.php:1330
 msgid "Disable comments"
 msgstr "Kommentare deaktivieren"
 
-#: ../../include/conversation.php:1334
+#: ../../include/conversation.php:1331
 msgid "Toggle comments"
 msgstr "Kommentare umschalten"
 
-#: ../../include/conversation.php:1342
+#: ../../include/conversation.php:1339
 msgid "Categories (optional, comma-separated list)"
 msgstr "Kategorien (optional, kommagetrennte Liste)"
 
-#: ../../include/conversation.php:1365
+#: ../../include/conversation.php:1362
 msgid "Other networks and post services"
 msgstr "Andere Netzwerke und Platformen"
 
-#: ../../include/conversation.php:1371
+#: ../../include/conversation.php:1368
 msgid "Set publish date"
 msgstr "Veröffentlichungsdatum festlegen"
 
-#: ../../include/conversation.php:1634
+#: ../../include/conversation.php:1631
 msgid "Discover"
 msgstr "Entdecken"
 
-#: ../../include/conversation.php:1637
+#: ../../include/conversation.php:1634
 msgid "Imported public streams"
 msgstr "Importierte öffentliche Beiträge"
 
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1639
 msgid "Commented Order"
 msgstr "Neueste Kommentare"
 
-#: ../../include/conversation.php:1645
+#: ../../include/conversation.php:1642
 msgid "Sort by Comment Date"
 msgstr "Nach Kommentardatum sortiert"
 
-#: ../../include/conversation.php:1649
+#: ../../include/conversation.php:1646
 msgid "Posted Order"
 msgstr "Neueste Beiträge"
 
-#: ../../include/conversation.php:1652
+#: ../../include/conversation.php:1649
 msgid "Sort by Post Date"
 msgstr "Nach Beitragsdatum sortiert"
 
-#: ../../include/conversation.php:1660
+#: ../../include/conversation.php:1657
 msgid "Posts that mention or involve you"
 msgstr "Beiträge mit Beteiligung Deinerseits"
 
-#: ../../include/conversation.php:1669
+#: ../../include/conversation.php:1666
 msgid "Activity Stream - by date"
 msgstr "Activity Stream – nach Datum sortiert"
 
-#: ../../include/conversation.php:1675
+#: ../../include/conversation.php:1672
 msgid "Starred"
 msgstr "Markiert"
 
-#: ../../include/conversation.php:1678
+#: ../../include/conversation.php:1675
 msgid "Favourite Posts"
 msgstr "Markierte Beiträge"
 
-#: ../../include/conversation.php:1685
+#: ../../include/conversation.php:1682
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../include/conversation.php:1688
+#: ../../include/conversation.php:1685
 msgid "Posts flagged as SPAM"
 msgstr "Nachrichten, die als SPAM markiert wurden"
 
-#: ../../include/conversation.php:1763 ../../include/nav.php:372
+#: ../../include/conversation.php:1760 ../../include/nav.php:358
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../include/conversation.php:1776 ../../include/nav.php:385
+#: ../../include/conversation.php:1773 ../../include/nav.php:371
 msgid "Profile Details"
 msgstr "Profil-Details"
 
-#: ../../include/conversation.php:1786 ../../include/nav.php:395
-#: ../../include/photos.php:528
+#: ../../include/conversation.php:1783 ../../include/nav.php:381
+#: ../../include/photos.php:525
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
-#: ../../include/conversation.php:1794 ../../include/nav.php:403
+#: ../../include/conversation.php:1791 ../../include/nav.php:389
 msgid "Files and Storage"
 msgstr "Dateien und Speicher"
 
-#: ../../include/conversation.php:1830 ../../include/nav.php:438
+#: ../../include/conversation.php:1827 ../../include/nav.php:424
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: ../../include/conversation.php:1833 ../../include/nav.php:441
+#: ../../include/conversation.php:1830 ../../include/nav.php:427
 msgid "Saved Bookmarks"
 msgstr "Gespeicherte Lesezeichen"
 
-#: ../../include/conversation.php:1844 ../../include/nav.php:452
+#: ../../include/conversation.php:1841 ../../include/nav.php:438
 msgid "View Webpages"
 msgstr "Webseiten anzeigen"
 
-#: ../../include/conversation.php:1913
+#: ../../include/conversation.php:1910
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Zusage"
 msgstr[1] "Zusagen"
 
-#: ../../include/conversation.php:1916
+#: ../../include/conversation.php:1913
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Absage"
 msgstr[1] "Absagen"
 
-#: ../../include/conversation.php:1919
+#: ../../include/conversation.php:1916
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] " Unentschlossen"
 msgstr[1] "Unentschlossene"
 
-#: ../../include/conversation.php:1922
+#: ../../include/conversation.php:1919
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "Zustimmung"
 msgstr[1] "Zustimmungen"
 
-#: ../../include/conversation.php:1925
+#: ../../include/conversation.php:1922
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "Ablehnung"
 msgstr[1] "Ablehnungen"
 
-#: ../../include/conversation.php:1928
+#: ../../include/conversation.php:1925
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "Enthaltung"
 msgstr[1] "Enthaltungen"
 
-#: ../../include/permissions.php:35
-msgid "Can view my normal stream and posts"
-msgstr "Kann meine normalen Beiträge sehen"
-
-#: ../../include/permissions.php:39
-msgid "Can view my webpages"
-msgstr "Kann meine Webseiten sehen"
-
-#: ../../include/permissions.php:43
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
-
-#: ../../include/permissions.php:46
-msgid "Can like/dislike stuff"
-msgstr "Kann andere Elemente mögen/nicht mögen"
-
-#: ../../include/permissions.php:46
-msgid "Profiles and things other than posts/comments"
-msgstr "Profile und alles außer Beiträge und Kommentare"
-
-#: ../../include/permissions.php:48
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
-
-#: ../../include/permissions.php:48
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
-
-#: ../../include/permissions.php:49
-msgid "Can chat with me (when available)"
-msgstr "Kann mit mir chatten (wenn verfügbar)"
-
-#: ../../include/permissions.php:50
-msgid "Can write to my file storage and photos"
-msgstr "Kann in meine Datei- und Bilderordner schreiben"
-
-#: ../../include/permissions.php:51
-msgid "Can edit my webpages"
-msgstr "Kann meine Webseiten bearbeiten"
-
-#: ../../include/permissions.php:53
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften"
-
-#: ../../include/permissions.php:55
-msgid "Can administer my channel resources"
-msgstr "Kann meine Kanäle administrieren"
-
-#: ../../include/permissions.php:55
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust"
-
 #: ../../include/dir_fns.php:141
 msgid "Directory Options"
 msgstr "Verzeichnisoptionen"
@@ -11434,320 +11429,328 @@ msgstr "älter"
 msgid "newer"
 msgstr "neuer"
 
-#: ../../include/text.php:945
+#: ../../include/text.php:939
 msgid "No connections"
 msgstr "Keine Verbindungen"
 
-#: ../../include/text.php:970
+#: ../../include/text.php:964
 #, php-format
 msgid "View all %s connections"
 msgstr "Alle Verbindungen von %s anzeigen"
 
-#: ../../include/text.php:1115 ../../include/text.php:1120
+#: ../../include/text.php:1096 ../../include/text.php:1101
 msgid "poke"
 msgstr "anstupsen"
 
-#: ../../include/text.php:1121
+#: ../../include/text.php:1102
 msgid "ping"
 msgstr "anpingen"
 
-#: ../../include/text.php:1121
+#: ../../include/text.php:1102
 msgid "pinged"
 msgstr "pingte"
 
-#: ../../include/text.php:1122
+#: ../../include/text.php:1103
 msgid "prod"
 msgstr "knuffen"
 
-#: ../../include/text.php:1122
+#: ../../include/text.php:1103
 msgid "prodded"
 msgstr "knuffte"
 
-#: ../../include/text.php:1123
+#: ../../include/text.php:1104
 msgid "slap"
 msgstr "ohrfeigen"
 
-#: ../../include/text.php:1123
+#: ../../include/text.php:1104
 msgid "slapped"
 msgstr "ohrfeigte"
 
-#: ../../include/text.php:1124
+#: ../../include/text.php:1105
 msgid "finger"
 msgstr "befummeln"
 
-#: ../../include/text.php:1124
+#: ../../include/text.php:1105
 msgid "fingered"
 msgstr "befummelte"
 
-#: ../../include/text.php:1125
+#: ../../include/text.php:1106
 msgid "rebuff"
 msgstr "eine Abfuhr erteilen"
 
-#: ../../include/text.php:1125
+#: ../../include/text.php:1106
 msgid "rebuffed"
 msgstr "zurückgewiesen"
 
-#: ../../include/text.php:1137
+#: ../../include/text.php:1118
 msgid "happy"
 msgstr "glücklich"
 
-#: ../../include/text.php:1138
+#: ../../include/text.php:1119
 msgid "sad"
 msgstr "traurig"
 
-#: ../../include/text.php:1139
+#: ../../include/text.php:1120
 msgid "mellow"
 msgstr "sanft"
 
-#: ../../include/text.php:1140
+#: ../../include/text.php:1121
 msgid "tired"
 msgstr "müde"
 
-#: ../../include/text.php:1141
+#: ../../include/text.php:1122
 msgid "perky"
 msgstr "frech"
 
-#: ../../include/text.php:1142
+#: ../../include/text.php:1123
 msgid "angry"
 msgstr "sauer"
 
-#: ../../include/text.php:1143
+#: ../../include/text.php:1124
 msgid "stupefied"
 msgstr "verblüfft"
 
-#: ../../include/text.php:1144
+#: ../../include/text.php:1125
 msgid "puzzled"
 msgstr "verwirrt"
 
-#: ../../include/text.php:1145
+#: ../../include/text.php:1126
 msgid "interested"
 msgstr "interessiert"
 
-#: ../../include/text.php:1146
+#: ../../include/text.php:1127
 msgid "bitter"
 msgstr "verbittert"
 
-#: ../../include/text.php:1147
+#: ../../include/text.php:1128
 msgid "cheerful"
 msgstr "fröhlich"
 
-#: ../../include/text.php:1148
+#: ../../include/text.php:1129
 msgid "alive"
 msgstr "lebendig"
 
-#: ../../include/text.php:1149
+#: ../../include/text.php:1130
 msgid "annoyed"
 msgstr "verärgert"
 
-#: ../../include/text.php:1150
+#: ../../include/text.php:1131
 msgid "anxious"
 msgstr "unruhig"
 
-#: ../../include/text.php:1151
+#: ../../include/text.php:1132
 msgid "cranky"
 msgstr "schrullig"
 
-#: ../../include/text.php:1152
+#: ../../include/text.php:1133
 msgid "disturbed"
 msgstr "verstört"
 
-#: ../../include/text.php:1153
+#: ../../include/text.php:1134
 msgid "frustrated"
 msgstr "frustriert"
 
-#: ../../include/text.php:1154
+#: ../../include/text.php:1135
 msgid "depressed"
 msgstr "deprimiert"
 
-#: ../../include/text.php:1155
+#: ../../include/text.php:1136
 msgid "motivated"
 msgstr "motiviert"
 
-#: ../../include/text.php:1156
+#: ../../include/text.php:1137
 msgid "relaxed"
 msgstr "entspannt"
 
-#: ../../include/text.php:1157
+#: ../../include/text.php:1138
 msgid "surprised"
 msgstr "überrascht"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:70
+#: ../../include/text.php:1312 ../../include/js_strings.php:70
 msgid "Monday"
 msgstr "Montag"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:71
+#: ../../include/text.php:1312 ../../include/js_strings.php:71
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:72
+#: ../../include/text.php:1312 ../../include/js_strings.php:72
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:73
+#: ../../include/text.php:1312 ../../include/js_strings.php:73
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:74
+#: ../../include/text.php:1312 ../../include/js_strings.php:74
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:75
+#: ../../include/text.php:1312 ../../include/js_strings.php:75
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../../include/text.php:1335 ../../include/js_strings.php:69
+#: ../../include/text.php:1312 ../../include/js_strings.php:69
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:45
+#: ../../include/text.php:1316 ../../include/js_strings.php:45
 msgid "January"
 msgstr "Januar"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:46
+#: ../../include/text.php:1316 ../../include/js_strings.php:46
 msgid "February"
 msgstr "Februar"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:47
+#: ../../include/text.php:1316 ../../include/js_strings.php:47
 msgid "March"
 msgstr "März"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:48
+#: ../../include/text.php:1316 ../../include/js_strings.php:48
 msgid "April"
 msgstr "April"
 
-#: ../../include/text.php:1339
+#: ../../include/text.php:1316
 msgid "May"
 msgstr "Mai"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:50
+#: ../../include/text.php:1316 ../../include/js_strings.php:50
 msgid "June"
 msgstr "Juni"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:51
+#: ../../include/text.php:1316 ../../include/js_strings.php:51
 msgid "July"
 msgstr "Juli"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:52
+#: ../../include/text.php:1316 ../../include/js_strings.php:52
 msgid "August"
 msgstr "August"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:53
+#: ../../include/text.php:1316 ../../include/js_strings.php:53
 msgid "September"
 msgstr "September"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:54
+#: ../../include/text.php:1316 ../../include/js_strings.php:54
 msgid "October"
 msgstr "Oktober"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:55
+#: ../../include/text.php:1316 ../../include/js_strings.php:55
 msgid "November"
 msgstr "November"
 
-#: ../../include/text.php:1339 ../../include/js_strings.php:56
+#: ../../include/text.php:1316 ../../include/js_strings.php:56
 msgid "December"
 msgstr "Dezember"
 
-#: ../../include/text.php:1403 ../../include/text.php:1407
+#: ../../include/text.php:1380 ../../include/text.php:1384
 msgid "Unknown Attachment"
 msgstr "Unbekannter Anhang"
 
-#: ../../include/text.php:1409
+#: ../../include/text.php:1386 ../../include/feedutils.php:780
 msgid "unknown"
 msgstr "unbekannt"
 
-#: ../../include/text.php:1445
+#: ../../include/text.php:1422
 msgid "remove category"
 msgstr "Kategorie entfernen"
 
-#: ../../include/text.php:1519
+#: ../../include/text.php:1496
 msgid "remove from file"
 msgstr "aus der Datei entfernen"
 
-#: ../../include/text.php:1781 ../../include/language.php:367
+#: ../../include/text.php:1615 ../../include/message.php:12
+msgid "Download binary/encrypted content"
+msgstr "Binären/verschlüsselten Inhalt herunterladen"
+
+#: ../../include/text.php:1774 ../../include/language.php:367
 msgid "default"
 msgstr "Standard"
 
-#: ../../include/text.php:1789
+#: ../../include/text.php:1782
 msgid "Page layout"
 msgstr "Seiten-Layout"
 
-#: ../../include/text.php:1789
+#: ../../include/text.php:1782
 msgid "You can create your own with the layouts tool"
 msgstr "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen"
 
-#: ../../include/text.php:1817
+#: ../../include/text.php:1810
 msgid "Page content type"
 msgstr "Art des Seiteninhalts"
 
-#: ../../include/text.php:1950
+#: ../../include/text.php:1943
 msgid "activity"
 msgstr "Aktivität"
 
-#: ../../include/text.php:2264
+#: ../../include/text.php:2006
+msgid "a-z, 0-9, -, _, and . only"
+msgstr "nur a-z, 0-9, -, _, und ."
+
+#: ../../include/text.php:2277
 msgid "Design Tools"
 msgstr "Gestaltungswerkzeuge"
 
-#: ../../include/text.php:2270
+#: ../../include/text.php:2283
 msgid "Pages"
 msgstr "Seiten"
 
-#: ../../include/text.php:2292
+#: ../../include/text.php:2305
 msgid "Import website..."
 msgstr "Webseite importieren..."
 
-#: ../../include/text.php:2293
+#: ../../include/text.php:2306
 msgid "Select folder to import"
 msgstr "Ordner zum Importieren auswählen"
 
-#: ../../include/text.php:2294
+#: ../../include/text.php:2307
 msgid "Import from a zipped folder:"
 msgstr "Aus einem gezippten Ordner importieren:"
 
-#: ../../include/text.php:2295
+#: ../../include/text.php:2308
 msgid "Import from cloud files:"
 msgstr "Aus Cloud-Dateien importieren:"
 
-#: ../../include/text.php:2296
+#: ../../include/text.php:2309
 msgid "/cloud/channel/path/to/folder"
 msgstr "/Cloud/Kanal/Pfad/zum/Ordner"
 
-#: ../../include/text.php:2297
+#: ../../include/text.php:2310
 msgid "Enter path to website files"
 msgstr "Pfad zu Webseitendateien eingeben"
 
-#: ../../include/text.php:2298
+#: ../../include/text.php:2311
 msgid "Select folder"
 msgstr "Ordner auswählen"
 
-#: ../../include/text.php:2299
+#: ../../include/text.php:2312
 msgid "Export website..."
 msgstr "Webseite exportieren..."
 
-#: ../../include/text.php:2300
+#: ../../include/text.php:2313
 msgid "Export to a zip file"
 msgstr "In eine ZIP-Datei exportieren"
 
-#: ../../include/text.php:2301
+#: ../../include/text.php:2314
 msgid "website.zip"
 msgstr "website.zip"
 
-#: ../../include/text.php:2302
+#: ../../include/text.php:2315
 msgid "Enter a name for the zip file."
 msgstr "Geben Sie einen für die ZIP-Datei ein."
 
-#: ../../include/text.php:2303
+#: ../../include/text.php:2316
 msgid "Export to cloud files"
 msgstr "In Cloud-Dateien exportieren"
 
-#: ../../include/text.php:2304
+#: ../../include/text.php:2317
 msgid "/path/to/export/folder"
 msgstr "/Pfad/zum/exportierenden/Ordner"
 
-#: ../../include/text.php:2305
+#: ../../include/text.php:2318
 msgid "Enter a path to a cloud files destination."
 msgstr "Gib den Pfad zu einem Datei-Speicherort in der Cloud ein."
 
-#: ../../include/text.php:2306
+#: ../../include/text.php:2319
 msgid "Specify folder"
 msgstr "Ordner angeben"
 
@@ -11797,28 +11800,10 @@ msgstr[1] "%d gemeinsame Verbindungen"
 msgid "show more"
 msgstr "mehr zeigen"
 
-#: ../../include/markdown.php:444
-msgid "Attachments:"
-msgstr "Anhänge:"
-
-#: ../../include/markdown.php:538 ../../include/event.php:22
-#: ../../include/event.php:69
-msgid "l F d, Y \\@ g:i A"
-msgstr "l, d. F Y, H:i"
-
-#: ../../include/markdown.php:540
-msgid "$Projectname event notification:"
-msgstr ""
-
-#: ../../include/markdown.php:544 ../../include/event.php:30
-#: ../../include/event.php:73
-msgid "Starts:"
-msgstr "Beginnt:"
-
-#: ../../include/markdown.php:552 ../../include/event.php:40
-#: ../../include/event.php:77
-msgid "Finishes:"
-msgstr "Endet:"
+#: ../../include/markdown.php:139 ../../include/bbcode.php:332
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schrieb den folgenden %2$s %3$s"
 
 #: ../../include/follow.php:26
 msgid "Channel is blocked on this site."
@@ -11844,7 +11829,7 @@ msgstr "Protokoll deaktiviert."
 msgid "Channel discovery failed."
 msgstr "Kanalsuche fehlgeschlagen"
 
-#: ../../include/follow.php:202
+#: ../../include/follow.php:186
 msgid "Cannot connect to yourself."
 msgstr "Du kannst Dich nicht mit Dir selbst verbinden."
 
@@ -11964,7 +11949,7 @@ msgstr "%d Tage"
 
 #: ../../include/js_strings.php:38
 msgid "about a month"
-msgstr "ungefähr ein Monat"
+msgstr "ungefähr einen Monat"
 
 #: ../../include/js_strings.php:39
 #, php-format
@@ -12095,19 +12080,19 @@ msgctxt "calendar"
 msgid "All day"
 msgstr "Ganztägig"
 
-#: ../../include/message.php:30
+#: ../../include/message.php:40
 msgid "Unable to determine sender."
 msgstr "Kann Absender nicht bestimmen."
 
-#: ../../include/message.php:69
+#: ../../include/message.php:79
 msgid "No recipient provided."
 msgstr "Kein Empfänger angegeben"
 
-#: ../../include/message.php:74
+#: ../../include/message.php:84
 msgid "[no subject]"
 msgstr "[no subject]"
 
-#: ../../include/message.php:227
+#: ../../include/message.php:214
 msgid "Stored post could not be verified."
 msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
 
@@ -12138,61 +12123,61 @@ msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
 msgid "Item was not found."
 msgstr "Beitrag wurde nicht gefunden."
 
-#: ../../include/attach.php:500
+#: ../../include/attach.php:501
 msgid "No source file."
 msgstr "Keine Quelldatei."
 
-#: ../../include/attach.php:522
+#: ../../include/attach.php:523
 msgid "Cannot locate file to replace"
 msgstr "Kann Datei zum Ersetzen nicht finden"
 
-#: ../../include/attach.php:540
+#: ../../include/attach.php:541
 msgid "Cannot locate file to revise/update"
 msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
 
-#: ../../include/attach.php:671
+#: ../../include/attach.php:674
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "Datei überschreitet das Größen-Limit von %d"
 
-#: ../../include/attach.php:685
+#: ../../include/attach.php:688
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
 
-#: ../../include/attach.php:855
+#: ../../include/attach.php:858
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
 
-#: ../../include/attach.php:868
+#: ../../include/attach.php:871
 msgid "Stored file could not be verified. Upload failed."
 msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
 
-#: ../../include/attach.php:923 ../../include/attach.php:939
+#: ../../include/attach.php:932 ../../include/attach.php:948
 msgid "Path not available."
 msgstr "Pfad nicht verfügbar."
 
-#: ../../include/attach.php:988 ../../include/attach.php:1153
+#: ../../include/attach.php:997 ../../include/attach.php:1162
 msgid "Empty pathname"
 msgstr "Leere Pfadangabe"
 
-#: ../../include/attach.php:1014
+#: ../../include/attach.php:1023
 msgid "duplicate filename or path"
 msgstr "doppelter Dateiname oder Pfad"
 
-#: ../../include/attach.php:1039
+#: ../../include/attach.php:1048
 msgid "Path not found."
 msgstr "Pfad nicht gefunden."
 
-#: ../../include/attach.php:1107
+#: ../../include/attach.php:1116
 msgid "mkdir failed."
 msgstr "mkdir fehlgeschlagen."
 
-#: ../../include/attach.php:1111
+#: ../../include/attach.php:1120
 msgid "database storage failed."
 msgstr "Speichern in der Datenbank fehlgeschlagen."
 
-#: ../../include/attach.php:1159
+#: ../../include/attach.php:1168
 msgid "Empty path"
 msgstr "Leere Pfadangabe"
 
@@ -12200,77 +12185,77 @@ msgstr "Leere Pfadangabe"
 msgid "guest:"
 msgstr "Gast:"
 
-#: ../../include/security.php:532
+#: ../../include/security.php:531
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
 
-#: ../../include/items.php:869 ../../include/items.php:916
+#: ../../include/items.php:851 ../../include/items.php:903
 msgid "(Unknown)"
 msgstr "(Unbekannt)"
 
-#: ../../include/items.php:1110
+#: ../../include/items.php:1087
 msgid "Visible to anybody on the internet."
 msgstr "Für jeden im Internet sichtbar."
 
-#: ../../include/items.php:1112
+#: ../../include/items.php:1089
 msgid "Visible to you only."
 msgstr "Nur für Dich sichtbar."
 
-#: ../../include/items.php:1114
+#: ../../include/items.php:1091
 msgid "Visible to anybody in this network."
 msgstr "Für jedes $Projectname-Mitglied sichtbar."
 
-#: ../../include/items.php:1116
+#: ../../include/items.php:1093
 msgid "Visible to anybody authenticated."
 msgstr "Für jeden sichtbar, der angemeldet ist."
 
-#: ../../include/items.php:1118
+#: ../../include/items.php:1095
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Für jeden auf %s sichtbar."
 
-#: ../../include/items.php:1120
+#: ../../include/items.php:1097
 msgid "Visible to all connections."
 msgstr "Für alle Verbindungen sichtbar."
 
-#: ../../include/items.php:1122
+#: ../../include/items.php:1099
 msgid "Visible to approved connections."
 msgstr "Nur für akzeptierte Verbindungen sichtbar."
 
-#: ../../include/items.php:1124
+#: ../../include/items.php:1101
 msgid "Visible to specific connections."
 msgstr "Sichtbar für bestimmte Verbindungen."
 
-#: ../../include/items.php:3938
+#: ../../include/items.php:3908
 msgid "Privacy group is empty."
 msgstr "Gruppe ist leer."
 
-#: ../../include/items.php:3945
+#: ../../include/items.php:3915
 #, php-format
 msgid "Privacy group: %s"
 msgstr "Gruppe: %s"
 
-#: ../../include/items.php:3957
+#: ../../include/items.php:3927
 msgid "Connection not found."
 msgstr "Die Verbindung wurde nicht gefunden."
 
-#: ../../include/items.php:4310
+#: ../../include/items.php:4280
 msgid "profile photo"
 msgstr "Profilfoto"
 
-#: ../../include/items.php:4506
+#: ../../include/items.php:4473
 #, php-format
 msgid "[Edited %s]"
 msgstr "[%s wurde bearbeitet]"
 
-#: ../../include/items.php:4506
+#: ../../include/items.php:4473
 msgctxt "edit_activity"
 msgid "Post"
 msgstr "Beitrag"
 
-#: ../../include/items.php:4506
+#: ../../include/items.php:4473
 msgctxt "edit_activity"
 msgid "Comment"
 msgstr "Kommentar"
@@ -12279,229 +12264,261 @@ msgstr "Kommentar"
 msgid "Unable to obtain identity information from database"
 msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
 
-#: ../../include/channel.php:67
+#: ../../include/channel.php:68
 msgid "Empty name"
 msgstr "Namensfeld leer"
 
-#: ../../include/channel.php:70
+#: ../../include/channel.php:71
 msgid "Name too long"
 msgstr "Name ist zu lang"
 
-#: ../../include/channel.php:181
+#: ../../include/channel.php:182
 msgid "No account identifier"
 msgstr "Keine Account-Kennung"
 
-#: ../../include/channel.php:193
+#: ../../include/channel.php:194
 msgid "Nickname is required."
 msgstr "Spitzname ist erforderlich."
 
-#: ../../include/channel.php:207
+#: ../../include/channel.php:208
 msgid "Reserved nickname. Please choose another."
 msgstr "Reservierter Kurzname. Bitte wähle einen anderen."
 
-#: ../../include/channel.php:212
+#: ../../include/channel.php:213
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
 
-#: ../../include/channel.php:270
+#: ../../include/channel.php:272
 msgid "Unable to retrieve created identity"
 msgstr "Kann die erstellte Identität nicht empfangen"
 
-#: ../../include/channel.php:342
+#: ../../include/channel.php:344
 msgid "Default Profile"
 msgstr "Standard-Profil"
 
-#: ../../include/channel.php:1045
+#: ../../include/channel.php:497
+msgid "Unable to retrieve modified identity"
+msgstr "Geänderte Identität kann nicht empfangen werden"
+
+#: ../../include/channel.php:1162
 msgid "Create New Profile"
 msgstr "Neues Profil erstellen"
 
-#: ../../include/channel.php:1065
+#: ../../include/channel.php:1182
 msgid "Visible to everybody"
 msgstr "Für jeden sichtbar"
 
-#: ../../include/channel.php:1138 ../../include/channel.php:1252
+#: ../../include/channel.php:1255 ../../include/channel.php:1375
 msgid "Gender:"
 msgstr "Geschlecht:"
 
-#: ../../include/channel.php:1140 ../../include/channel.php:1307
+#: ../../include/channel.php:1257 ../../include/channel.php:1430
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../../include/channel.php:1141
+#: ../../include/channel.php:1258
 msgid "Online Now"
 msgstr "gerade online"
 
-#: ../../include/channel.php:1257
+#: ../../include/channel.php:1334
+msgid "Trans"
+msgstr ""
+
+#: ../../include/channel.php:1380
 msgid "Like this channel"
 msgstr "Dieser Kanal gefällt mir"
 
-#: ../../include/channel.php:1281
+#: ../../include/channel.php:1404
 msgid "j F, Y"
 msgstr "j. F Y"
 
-#: ../../include/channel.php:1282
+#: ../../include/channel.php:1405
 msgid "j F"
 msgstr "j. F"
 
-#: ../../include/channel.php:1289
+#: ../../include/channel.php:1412
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
-#: ../../include/channel.php:1302
+#: ../../include/channel.php:1425
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "seit %1$d %2$s"
 
-#: ../../include/channel.php:1305
+#: ../../include/channel.php:1428
 msgid "Sexual Preference:"
 msgstr "Sexuelle Orientierung:"
 
-#: ../../include/channel.php:1311
+#: ../../include/channel.php:1434
 msgid "Tags:"
 msgstr "Schlagworte:"
 
-#: ../../include/channel.php:1313
+#: ../../include/channel.php:1436
 msgid "Political Views:"
 msgstr "Politische Ansichten:"
 
-#: ../../include/channel.php:1315
+#: ../../include/channel.php:1438
 msgid "Religion:"
 msgstr "Religion:"
 
-#: ../../include/channel.php:1319
+#: ../../include/channel.php:1442
 msgid "Hobbies/Interests:"
 msgstr "Hobbys/Interessen:"
 
-#: ../../include/channel.php:1321
+#: ../../include/channel.php:1444
 msgid "Likes:"
 msgstr "Gefällt:"
 
-#: ../../include/channel.php:1323
+#: ../../include/channel.php:1446
 msgid "Dislikes:"
 msgstr "Gefällt nicht:"
 
-#: ../../include/channel.php:1325
+#: ../../include/channel.php:1448
 msgid "Contact information and Social Networks:"
 msgstr "Kontaktinformation und soziale Netzwerke:"
 
-#: ../../include/channel.php:1327
+#: ../../include/channel.php:1450
 msgid "My other channels:"
 msgstr "Meine anderen Kanäle:"
 
-#: ../../include/channel.php:1329
+#: ../../include/channel.php:1452
 msgid "Musical interests:"
 msgstr "Musikalische Interessen:"
 
-#: ../../include/channel.php:1331
+#: ../../include/channel.php:1454
 msgid "Books, literature:"
 msgstr "Bücher, Literatur:"
 
-#: ../../include/channel.php:1333
+#: ../../include/channel.php:1456
 msgid "Television:"
 msgstr "Fernsehen:"
 
-#: ../../include/channel.php:1335
+#: ../../include/channel.php:1458
 msgid "Film/dance/culture/entertainment:"
 msgstr "Film/Tanz/Kultur/Unterhaltung:"
 
-#: ../../include/channel.php:1337
+#: ../../include/channel.php:1460
 msgid "Love/Romance:"
 msgstr "Liebe/Romantik:"
 
-#: ../../include/channel.php:1339
+#: ../../include/channel.php:1462
 msgid "Work/employment:"
 msgstr "Arbeit/Anstellung:"
 
-#: ../../include/channel.php:1341
+#: ../../include/channel.php:1464
 msgid "School/education:"
 msgstr "Schule/Ausbildung:"
 
-#: ../../include/channel.php:1364
+#: ../../include/channel.php:1487
 msgid "Like this thing"
 msgstr "Gefällt mir"
 
-#: ../../include/channel.php:2139
+#: ../../include/channel.php:2256
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Benutzer '%s' gelöscht"
 
-#: ../../include/event.php:1004
+#: ../../include/event.php:22 ../../include/event.php:69
+msgid "l F d, Y \\@ g:i A"
+msgstr "l, d. F Y, H:i"
+
+#: ../../include/event.php:30 ../../include/event.php:73
+msgid "Starts:"
+msgstr "Beginnt:"
+
+#: ../../include/event.php:40 ../../include/event.php:77
+msgid "Finishes:"
+msgstr "Endet:"
+
+#: ../../include/event.php:1008
 msgid "This event has been added to your calendar."
 msgstr "Dieser Termin wurde zu Deinem Kalender hinzugefügt"
 
-#: ../../include/event.php:1204
+#: ../../include/event.php:1208
 msgid "Not specified"
 msgstr "Keine Angabe"
 
-#: ../../include/event.php:1205
+#: ../../include/event.php:1209
 msgid "Needs Action"
 msgstr "Aktion erforderlich"
 
-#: ../../include/event.php:1206
+#: ../../include/event.php:1210
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: ../../include/event.php:1207
+#: ../../include/event.php:1211
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: ../../include/event.php:1208
+#: ../../include/event.php:1212
 msgid "Cancelled"
 msgstr "gestrichen"
 
-#: ../../include/network.php:776
+#: ../../include/event.php:1292 ../../include/connections.php:676
+msgid "Home, Voice"
+msgstr "Zuhause, Sprache"
+
+#: ../../include/event.php:1293 ../../include/connections.php:677
+msgid "Home, Fax"
+msgstr "Zuhause, Fax"
+
+#: ../../include/event.php:1295 ../../include/connections.php:679
+msgid "Work, Voice"
+msgstr "Arbeit, Sprache"
+
+#: ../../include/event.php:1296 ../../include/connections.php:680
+msgid "Work, Fax"
+msgstr "Arbeit, Fax"
+
+#: ../../include/network.php:751
 msgid "view full size"
 msgstr "In Vollbildansicht anschauen"
 
-#: ../../include/network.php:2042
-msgid "No Subject"
-msgstr "Kein Betreff"
-
-#: ../../include/network.php:2310 ../../include/network.php:2311
+#: ../../include/network.php:1691 ../../include/network.php:1692
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../include/network.php:2312
+#: ../../include/network.php:1693
 msgid "OStatus"
 msgstr "OStatus"
 
-#: ../../include/network.php:2313
+#: ../../include/network.php:1694
 msgid "GNU-Social"
 msgstr "GNU-Social"
 
-#: ../../include/network.php:2314
+#: ../../include/network.php:1695
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/network.php:2316
+#: ../../include/network.php:1696
+msgid "ActivityPub"
+msgstr "ActivityPub"
+
+#: ../../include/network.php:1698
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../include/network.php:2317
+#: ../../include/network.php:1699
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../../include/network.php:2318
+#: ../../include/network.php:1700
 msgid "Zot"
 msgstr "Zot!"
 
-#: ../../include/network.php:2319
+#: ../../include/network.php:1701
 msgid "LinkedIn"
 msgstr "LinkedIn"
 
-#: ../../include/network.php:2320
+#: ../../include/network.php:1702
 msgid "XMPP/IM"
 msgstr "XMPP/IM"
 
-#: ../../include/network.php:2321
+#: ../../include/network.php:1703
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/page_widgets.php:7
-msgid "New Page"
-msgstr "Neue Seite"
-
 #: ../../include/language.php:380
 msgid "Select an alternate language"
 msgstr "Wähle eine alternative Sprache"
@@ -12535,404 +12552,399 @@ msgid ""
 " permissions set who is allowed to view the post."
 msgstr "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.<br />Diese Berechtigungen bestimmen, wer den Beitrag sehen kann."
 
-#: ../../include/dba/dba_driver.php:189
+#: ../../include/dba/dba_driver.php:190
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"
 
-#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
-#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
-#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
-#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062
-#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070
-#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076
-#: ../../include/bbcode.php:1079
+#: ../../include/bbcode.php:194 ../../include/bbcode.php:1097
+#: ../../include/bbcode.php:1100 ../../include/bbcode.php:1105
+#: ../../include/bbcode.php:1108 ../../include/bbcode.php:1111
+#: ../../include/bbcode.php:1114 ../../include/bbcode.php:1119
+#: ../../include/bbcode.php:1122 ../../include/bbcode.php:1127
+#: ../../include/bbcode.php:1130 ../../include/bbcode.php:1133
+#: ../../include/bbcode.php:1136
 msgid "Image/photo"
 msgstr "Bild/Foto"
 
-#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
+#: ../../include/bbcode.php:233 ../../include/bbcode.php:1147
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
-#: ../../include/bbcode.php:189
+#: ../../include/bbcode.php:249
 #, php-format
 msgid "Install %s element: "
 msgstr "Element %s installieren: "
 
-#: ../../include/bbcode.php:193
+#: ../../include/bbcode.php:253
 #, php-format
 msgid ""
 "This post contains an installable %s element, however you lack permissions "
 "to install it on this site."
 msgstr "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren."
 
-#: ../../include/bbcode.php:272
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schrieb den folgenden %2$s %3$s"
-
-#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
+#: ../../include/bbcode.php:409 ../../include/bbcode.php:417
 msgid "Click to open/close"
 msgstr "Klicke zum Öffnen/Schließen"
 
-#: ../../include/bbcode.php:357
+#: ../../include/bbcode.php:417
 msgid "spoiler"
 msgstr "Spoiler"
 
-#: ../../include/bbcode.php:1028
+#: ../../include/bbcode.php:1085
 msgid "$1 wrote:"
 msgstr "$1 schrieb:"
 
-#: ../../include/oembed.php:315
+#: ../../include/oembed.php:317
 msgid " by "
 msgstr "von"
 
-#: ../../include/oembed.php:316
+#: ../../include/oembed.php:318
 msgid " on "
 msgstr "am"
 
-#: ../../include/oembed.php:345
+#: ../../include/oembed.php:347
 msgid "Embedded content"
 msgstr "Eingebetteter Inhalt"
 
-#: ../../include/oembed.php:354
+#: ../../include/oembed.php:356
 msgid "Embedding disabled"
 msgstr "Einbetten deaktiviert"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:54
 msgid "General Features"
 msgstr "Allgemeine Funktionen"
 
-#: ../../include/features.php:63
+#: ../../include/features.php:59
 msgid "Multiple Profiles"
 msgstr "Mehrfachprofile"
 
-#: ../../include/features.php:64
+#: ../../include/features.php:60
 msgid "Ability to create multiple profiles"
 msgstr "Ermöglicht das Anlegen mehrerer Profile pro Kanal"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:68
 msgid "Advanced Profiles"
 msgstr "Erweiterte Profile"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:69
 msgid "Additional profile sections and selections"
 msgstr "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:77
 msgid "Profile Import/Export"
 msgstr "Profil-Import/Export"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:78
 msgid "Save and load profile details across sites/channels"
 msgstr "Ermöglicht das Speichern von Profilen, um sie in einen anderen Kanal zu importieren"
 
-#: ../../include/features.php:90
+#: ../../include/features.php:86
 msgid "Web Pages"
 msgstr "Webseiten"
 
-#: ../../include/features.php:91
+#: ../../include/features.php:87
 msgid "Provide managed web pages on your channel"
 msgstr "Ermöglicht das Erstellen von Webseiten in Deinem Kanal"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:96
 msgid "Provide a wiki for your channel"
 msgstr "Stelle ein Wiki in Deinem Kanal zur Verfügung"
 
-#: ../../include/features.php:117
+#: ../../include/features.php:113
 msgid "Private Notes"
 msgstr "Private Notizen"
 
-#: ../../include/features.php:118
+#: ../../include/features.php:114
 msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr "Aktiviert ein Werkzeug mit dem Notizen und Erinnerungen gespeichert werden können (Hinweis: nicht verschlüsselt)"
 
-#: ../../include/features.php:126
+#: ../../include/features.php:122
 msgid "Navigation Channel Select"
 msgstr "Kanal-Auswahl in der Navigationsleiste"
 
-#: ../../include/features.php:127
+#: ../../include/features.php:123
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr "Ermöglicht den direkten Wechsel zu anderen Kanälen über das Navigationsmenü"
 
-#: ../../include/features.php:135
+#: ../../include/features.php:131
 msgid "Photo Location"
 msgstr "Aufnahmeort"
 
-#: ../../include/features.php:136
+#: ../../include/features.php:132
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr "Verlinkt den Aufnahmeort von Fotos (falls verfügbar) auf einer Karte"
 
-#: ../../include/features.php:144
+#: ../../include/features.php:140
 msgid "Access Controlled Chatrooms"
 msgstr "Zugriffskontrollierte Chaträume"
 
-#: ../../include/features.php:145
+#: ../../include/features.php:141
 msgid "Provide chatrooms and chat services with access control."
 msgstr "Bieten Sie Chaträume und Chatdienste mit Zugriffskontrolle an."
 
-#: ../../include/features.php:154
+#: ../../include/features.php:150
 msgid "Provide alternate connection permission roles."
 msgstr "Stelle benutzerdefinierte Berechtigungsrollen für Verbindungen zur Verfügung."
 
-#: ../../include/features.php:162
+#: ../../include/features.php:158
 msgid "Smart Birthdays"
 msgstr "Smarte Geburtstage"
 
-#: ../../include/features.php:163
+#: ../../include/features.php:159
 msgid ""
 "Make birthday events timezone aware in case your friends are scattered "
 "across the planet."
 msgstr "Stellt für Geburtstage einen Zeitzonenbezug her, falls deine Freunde über den ganzen Planeten verstreut sind."
 
-#: ../../include/features.php:171
+#: ../../include/features.php:167
 msgid "Event Timezone Selection"
 msgstr "Termin-Zeitzonenauswahl"
 
-#: ../../include/features.php:172
+#: ../../include/features.php:168
 msgid "Allow event creation in timezones other than your own."
 msgstr "Ermögliche das Erstellen von Terminen in anderen Zeitzonen als Deiner eigenen."
 
-#: ../../include/features.php:180
+#: ../../include/features.php:176
 msgid "Advanced Directory Search"
 msgstr "Erweiterte Verzeichnissuche"
 
-#: ../../include/features.php:181
+#: ../../include/features.php:177
 msgid "Allows creation of complex directory search queries"
 msgstr "Ermöglicht die Erstellung komplexer Verzeichnis-Suchabfragen"
 
-#: ../../include/features.php:189
+#: ../../include/features.php:185
 msgid "Advanced Theme and Layout Settings"
 msgstr "Erweiterte Design- und Layout-Einstellungen"
 
-#: ../../include/features.php:190
+#: ../../include/features.php:186
 msgid "Allows fine tuning of themes and page layouts"
 msgstr "Erlaubt die Feineinstellung von Designs und Seitenlayouts"
 
-#: ../../include/features.php:200
+#: ../../include/features.php:196
 msgid "Post Composition Features"
 msgstr "Nachbearbeitungsfunktionen"
 
-#: ../../include/features.php:204
+#: ../../include/features.php:200
 msgid "Large Photos"
 msgstr "Große Fotos"
 
-#: ../../include/features.php:205
+#: ../../include/features.php:201
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr "Große Vorschaubilder (1024px) in Beiträgen anzeigen. Falls nicht aktiviert, werden kleine Vorschaubilder (640px) verwendet."
 
-#: ../../include/features.php:214
+#: ../../include/features.php:210
 msgid "Automatically import channel content from other channels or feeds"
 msgstr "Ermöglicht den automatischen Import von Inhalten für diesen Kanal von anderen Kanälen oder Feeds"
 
-#: ../../include/features.php:222
+#: ../../include/features.php:218
 msgid "Even More Encryption"
 msgstr "Noch mehr Verschlüsselung"
 
-#: ../../include/features.php:223
+#: ../../include/features.php:219
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr "Ermöglicht optional die zusätzliche Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Schlüssel)"
 
-#: ../../include/features.php:231
+#: ../../include/features.php:227
 msgid "Enable Voting Tools"
 msgstr "Umfragewerkzeuge aktivieren"
 
-#: ../../include/features.php:232
+#: ../../include/features.php:228
 msgid "Provide a class of post which others can vote on"
 msgstr "Aktiviert die Umfragewerkzeuge, um anderen die Möglichkeit zu geben, einem Beitrag zuzustimmen, ihn abzulehnen oder sich zu enthalten. (Muss im Beitrag selbst noch aktiviert werden.)"
 
-#: ../../include/features.php:240
+#: ../../include/features.php:236
 msgid "Disable Comments"
 msgstr "Kommentare deaktivieren"
 
-#: ../../include/features.php:241
+#: ../../include/features.php:237
 msgid "Provide the option to disable comments for a post"
 msgstr "Ermöglicht, die Kommentarfunktion für einzelne Beiträge abzuschalten"
 
-#: ../../include/features.php:249
+#: ../../include/features.php:245
 msgid "Delayed Posting"
 msgstr "Verzögertes Senden"
 
-#: ../../include/features.php:250
+#: ../../include/features.php:246
 msgid "Allow posts to be published at a later date"
 msgstr "Ermöglicht es, Beiträge zu einem späteren Zeitpunkt zu veröffentlichen"
 
-#: ../../include/features.php:258
+#: ../../include/features.php:254
 msgid "Content Expiration"
 msgstr "Verfall von Inhalten"
 
-#: ../../include/features.php:259
+#: ../../include/features.php:255
 msgid "Remove posts/comments and/or private messages at a future time"
 msgstr "Ermöglicht das automatische Löschen von Beiträgen, Kommentaren und/oder privaten Nachrichten zu einem zukünftigen Datum."
 
-#: ../../include/features.php:267
+#: ../../include/features.php:263
 msgid "Suppress Duplicate Posts/Comments"
 msgstr "Doppelte Beiträge unterdrücken"
 
-#: ../../include/features.php:268
+#: ../../include/features.php:264
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr "Verhindert, dass innerhalb von zwei Minuten Beiträge mit identischem Inhalt veröffentlicht werden."
 
-#: ../../include/features.php:279
+#: ../../include/features.php:275
 msgid "Network and Stream Filtering"
 msgstr "Netzwerk- und Stream-Filter"
 
-#: ../../include/features.php:283
+#: ../../include/features.php:279
 msgid "Search by Date"
 msgstr "Suche nach Datum"
 
-#: ../../include/features.php:284
+#: ../../include/features.php:280
 msgid "Ability to select posts by date ranges"
 msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"
 
-#: ../../include/features.php:292 ../../include/group.php:331
+#: ../../include/features.php:288 ../../include/group.php:332
 msgid "Privacy Groups"
 msgstr "Gruppen"
 
-#: ../../include/features.php:293
+#: ../../include/features.php:289
 msgid "Enable management and selection of privacy groups"
 msgstr "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren"
 
-#: ../../include/features.php:302
+#: ../../include/features.php:298
 msgid "Save search terms for re-use"
 msgstr "Ermöglicht das Abspeichern von Suchbegriffen zur Wiederverwendung"
 
-#: ../../include/features.php:310
+#: ../../include/features.php:306
 msgid "Network Personal Tab"
 msgstr "Persönlicher Netzwerkreiter"
 
-#: ../../include/features.php:311
+#: ../../include/features.php:307
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Aktiviert einen Reiter in der Grid-Ansicht, der nur Netzwerk-Beiträge anzeigt, mit denen Du interagiert hast"
 
-#: ../../include/features.php:319
+#: ../../include/features.php:315
 msgid "Network New Tab"
 msgstr "Netzwerkreiter Neu"
 
-#: ../../include/features.php:320
+#: ../../include/features.php:316
 msgid "Enable tab to display all new Network activity"
 msgstr "Aktiviert einen Reiter in der Grid-Ansicht, der alle neuen Netzwerkaktivitäten anzeigt"
 
-#: ../../include/features.php:328
+#: ../../include/features.php:324
 msgid "Affinity Tool"
 msgstr "Beziehungs-Tool"
 
-#: ../../include/features.php:329
+#: ../../include/features.php:325
 msgid "Filter stream activity by depth of relationships"
 msgstr "Aktiviert ein Werkzeug in der Grid-Ansicht, das den Stream nach Grad der Beziehung filtern kann"
 
-#: ../../include/features.php:338
+#: ../../include/features.php:334
 msgid "Show friend and connection suggestions"
 msgstr "Freund- und Verbindungsvorschläge anzeigen"
 
-#: ../../include/features.php:346
+#: ../../include/features.php:342
 msgid "Connection Filtering"
 msgstr "Filter für Verbindungen"
 
-#: ../../include/features.php:347
+#: ../../include/features.php:343
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Ermöglicht die Filterung eingehender Beiträge anhand von Schlüsselwörtern (muss an der Verbindung konfiguriert werden)"
 
-#: ../../include/features.php:359
+#: ../../include/features.php:355
 msgid "Post/Comment Tools"
 msgstr "Beitrag-/Kommentar-Tools"
 
-#: ../../include/features.php:363
+#: ../../include/features.php:359
 msgid "Community Tagging"
 msgstr "Gemeinschaftliches Verschlagworten"
 
-#: ../../include/features.php:364
+#: ../../include/features.php:360
 msgid "Ability to tag existing posts"
 msgstr "Ermöglicht das Verschlagworten existierender Beiträge"
 
-#: ../../include/features.php:372
+#: ../../include/features.php:368
 msgid "Post Categories"
 msgstr "Beitrags-Kategorien"
 
-#: ../../include/features.php:373
+#: ../../include/features.php:369
 msgid "Add categories to your posts"
 msgstr "Aktiviert Kategorien für Beiträge"
 
-#: ../../include/features.php:381
+#: ../../include/features.php:377
 msgid "Emoji Reactions"
 msgstr "Emoji Reaktionen"
 
-#: ../../include/features.php:382
+#: ../../include/features.php:378
 msgid "Add emoji reaction ability to posts"
 msgstr "Aktiviert Emoji-Reaktionen für Beiträge"
 
-#: ../../include/features.php:391
+#: ../../include/features.php:387
 msgid "Ability to file posts under folders"
 msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"
 
-#: ../../include/features.php:399
+#: ../../include/features.php:395
 msgid "Dislike Posts"
 msgstr "Gefällt-mir-nicht-Beiträge"
 
-#: ../../include/features.php:400
+#: ../../include/features.php:396
 msgid "Ability to dislike posts/comments"
 msgstr "Aktiviert die „Gefällt mir nicht“-Schaltfläche"
 
-#: ../../include/features.php:408
+#: ../../include/features.php:404
 msgid "Star Posts"
 msgstr "Beiträge mit Sternchen versehen"
 
-#: ../../include/features.php:409
+#: ../../include/features.php:405
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Ermöglicht die lokale Markierung spezieller Beiträge mit einem Sternchen-Symbol"
 
-#: ../../include/features.php:417
+#: ../../include/features.php:413
 msgid "Tag Cloud"
 msgstr "Schlagwort-Wolke"
 
-#: ../../include/features.php:418
+#: ../../include/features.php:414
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Aktiviert die Anzeige einer Schlagwort-Wolke (Tag Cloud) auf Deiner Kanal-Seite"
 
-#: ../../include/features.php:430
+#: ../../include/features.php:425
 msgid "Premium Channel"
 msgstr "Premium-Kanal"
 
-#: ../../include/features.php:431
+#: ../../include/features.php:426
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
 msgstr "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen"
 
-#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
+#: ../../include/taxonomy.php:267 ../../include/taxonomy.php:288
 msgid "Tags"
 msgstr "Schlagwörter"
 
-#: ../../include/taxonomy.php:293
+#: ../../include/taxonomy.php:332
 msgid "Keywords"
 msgstr "Schlüsselwörter"
 
-#: ../../include/taxonomy.php:314
+#: ../../include/taxonomy.php:353
 msgid "have"
 msgstr "habe"
 
-#: ../../include/taxonomy.php:314
+#: ../../include/taxonomy.php:353
 msgid "has"
 msgstr "hat"
 
-#: ../../include/taxonomy.php:315
+#: ../../include/taxonomy.php:354
 msgid "want"
 msgstr "will"
 
-#: ../../include/taxonomy.php:315
+#: ../../include/taxonomy.php:354
 msgid "wants"
 msgstr "will"
 
-#: ../../include/taxonomy.php:316
+#: ../../include/taxonomy.php:355
 msgid "likes"
 msgstr "gefällt"
 
-#: ../../include/taxonomy.php:317
+#: ../../include/taxonomy.php:356
 msgid "dislikes"
 msgstr "missfällt"
 
@@ -12956,51 +12968,51 @@ msgstr "Eine Einladung wird benötigt."
 msgid "Invitation could not be verified."
 msgstr "Die Einladung konnte nicht bestätigt werden."
 
-#: ../../include/account.php:130
+#: ../../include/account.php:157
 msgid "Please enter the required information."
 msgstr "Bitte gib die benötigten Informationen ein."
 
-#: ../../include/account.php:198
+#: ../../include/account.php:224
 msgid "Failed to store account information."
 msgstr "Speichern der Nutzerkontodaten fehlgeschlagen."
 
-#: ../../include/account.php:263
+#: ../../include/account.php:291
 #, php-format
 msgid "Registration confirmation for %s"
 msgstr "Registrierungsbestätigung für %s"
 
-#: ../../include/account.php:330
+#: ../../include/account.php:360
 #, php-format
 msgid "Registration request at %s"
 msgstr "Registrierungsanfrage auf %s"
 
-#: ../../include/account.php:352
+#: ../../include/account.php:382
 msgid "your registration password"
 msgstr "Dein Registrierungspasswort"
 
-#: ../../include/account.php:358 ../../include/account.php:420
+#: ../../include/account.php:388 ../../include/account.php:450
 #, php-format
 msgid "Registration details for %s"
 msgstr "Registrierungsdetails für %s"
 
-#: ../../include/account.php:431
+#: ../../include/account.php:461
 msgid "Account approved."
 msgstr "Nutzerkonto bestätigt."
 
-#: ../../include/account.php:471
+#: ../../include/account.php:501
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registrierung für %s wurde widerrufen"
 
-#: ../../include/account.php:756 ../../include/account.php:758
+#: ../../include/account.php:780 ../../include/account.php:782
 msgid "Click here to upgrade."
 msgstr "Klicke hier, um das Upgrade durchzuführen."
 
-#: ../../include/account.php:764
+#: ../../include/account.php:788
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
 
-#: ../../include/account.php:769
+#: ../../include/account.php:793
 msgid "This action is not available under your subscription plan."
 msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
 
@@ -13085,183 +13097,211 @@ msgstr "%1$ss Geburtstag"
 msgid "Happy Birthday %1$s"
 msgstr "Alles Gute zum Geburtstag, %1$s"
 
-#: ../../include/nav.php:92
+#: ../../include/nav.php:90
 msgid "Remote authentication"
 msgstr "Über Konto auf anderem Server einloggen"
 
-#: ../../include/nav.php:92
+#: ../../include/nav.php:90
 msgid "Click to authenticate to your home hub"
 msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
 
-#: ../../include/nav.php:103 ../../include/nav.php:127
+#: ../../include/nav.php:99 ../../include/nav.php:123
 msgid "End this session"
 msgstr "Beende diese Sitzung"
 
-#: ../../include/nav.php:106
+#: ../../include/nav.php:102
 msgid "Your profile page"
 msgstr "Deine Profilseite"
 
-#: ../../include/nav.php:109
+#: ../../include/nav.php:105
 msgid "Manage/Edit profiles"
 msgstr "Profile verwalten"
 
-#: ../../include/nav.php:111
+#: ../../include/nav.php:107
 msgid "Edit your profile"
 msgstr "Profil bearbeiten"
 
-#: ../../include/nav.php:117
+#: ../../include/nav.php:113
 msgid "Sign in"
 msgstr "Anmelden"
 
-#: ../../include/nav.php:142
+#: ../../include/nav.php:138
 msgid "Take me home"
 msgstr "Bringe mich nach Hause (eigener Kanal)"
 
-#: ../../include/nav.php:144
+#: ../../include/nav.php:140
 msgid "Log me out of this site"
 msgstr "Logge mich von dieser Seite aus"
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:145
 msgid "Create an account"
 msgstr "Erzeuge ein Konto"
 
-#: ../../include/nav.php:161
+#: ../../include/nav.php:157
 msgid "Help and documentation"
 msgstr "Hilfe und Dokumentation"
 
-#: ../../include/nav.php:164
+#: ../../include/nav.php:160
 msgid "Search site @name, #tag, ?docs, content"
 msgstr "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt"
 
-#: ../../include/nav.php:176
+#: ../../include/nav.php:171
 msgid "Grid"
 msgstr "Grid"
 
-#: ../../include/nav.php:176
+#: ../../include/nav.php:171
 msgid "Your grid"
 msgstr "Dein Grid"
 
-#: ../../include/nav.php:177
+#: ../../include/nav.php:172
 msgid "View your network/grid"
 msgstr "Zeige Dein Netzwerk/Grid an"
 
-#: ../../include/nav.php:178
+#: ../../include/nav.php:173
 msgid "Mark all grid notifications seen"
 msgstr "Alle Grid-Benachrichtigungen als angesehen markieren"
 
-#: ../../include/nav.php:180
+#: ../../include/nav.php:175
 msgid "Channel home"
 msgstr "Mein Kanal"
 
-#: ../../include/nav.php:181
+#: ../../include/nav.php:176
 msgid "View your channel home"
 msgstr "Zeige Deine Kanalseite an"
 
-#: ../../include/nav.php:182
+#: ../../include/nav.php:177
 msgid "Mark all channel notifications seen"
 msgstr "Markiere alle Kanal-Benachrichtigungen als angesehen"
 
-#: ../../include/nav.php:188
+#: ../../include/nav.php:183
 msgid "Notices"
 msgstr "Benachrichtigungen"
 
-#: ../../include/nav.php:188
+#: ../../include/nav.php:183
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../../include/nav.php:189
+#: ../../include/nav.php:184
 msgid "View all notifications"
 msgstr "Alle Benachrichtigungen ansehen"
 
-#: ../../include/nav.php:192
+#: ../../include/nav.php:185
+msgid "Mark all system notifications seen"
+msgstr "Markiere alle System-Benachrichtigungen als gesehen"
+
+#: ../../include/nav.php:187
 msgid "Private mail"
 msgstr "Persönliche Mail"
 
-#: ../../include/nav.php:193
+#: ../../include/nav.php:188
 msgid "View your private messages"
 msgstr "Zeige Deine persönlichen Nachrichten an"
 
-#: ../../include/nav.php:194
+#: ../../include/nav.php:189
 msgid "Mark all private messages seen"
 msgstr "Markiere alle persönlichen Nachrichten als gesehen"
 
-#: ../../include/nav.php:200
+#: ../../include/nav.php:195
 msgid "Event Calendar"
 msgstr "Terminkalender"
 
-#: ../../include/nav.php:201
+#: ../../include/nav.php:196
 msgid "View events"
 msgstr "Termine ansehen"
 
-#: ../../include/nav.php:202
+#: ../../include/nav.php:197
 msgid "Mark all events seen"
 msgstr "Markiere alle Termine als gesehen"
 
-#: ../../include/nav.php:205
+#: ../../include/nav.php:199
 msgid "Manage Your Channels"
 msgstr "Verwalte Deine Kanäle"
 
-#: ../../include/nav.php:207
+#: ../../include/nav.php:201
 msgid "Account/Channel Settings"
 msgstr "Konto-/Kanal-Einstellungen"
 
+#: ../../include/nav.php:203
+msgid "Shared Files"
+msgstr "Geteilte Dateien"
+
+#: ../../include/nav.php:203
+msgid "New files shared with me"
+msgstr "Neue Dateien, die mit mir geteilt wurden"
+
+#: ../../include/nav.php:208
+msgid "Public stream"
+msgstr "Öffentlicher Beitrags-Stream"
+
+#: ../../include/nav.php:208
+msgid "Public stream activities"
+msgstr "Öffentliche Netzwerk-Aktivitäten"
+
 #: ../../include/nav.php:215
 msgid "Site Setup and Configuration"
 msgstr "Seiten-Einrichtung und -Konfiguration"
 
-#: ../../include/nav.php:277
+#: ../../include/nav.php:274
 msgid "@name, #tag, ?doc, content"
 msgstr "@Name, #Schlagwort, ?Dokumentation, Inhalt"
 
-#: ../../include/nav.php:278
+#: ../../include/nav.php:275
 msgid "Please wait..."
 msgstr "Bitte warten..."
 
-#: ../../include/nav.php:280
+#: ../../include/nav.php:278
 msgid "Add Apps"
 msgstr "Apps hinzufügen"
 
-#: ../../include/photos.php:115
+#: ../../include/nav.php:279
+msgid "Arrange Apps"
+msgstr "Apps anordnen"
+
+#: ../../include/nav.php:280
+msgid "Toggle System Apps"
+msgstr "System-Apps umschalten"
+
+#: ../../include/photos.php:111
 #, php-format
 msgid "Image exceeds website size limit of %lu bytes"
 msgstr "Bild überschreitet das Webseitenlimit von %lu Bytes"
 
-#: ../../include/photos.php:122
+#: ../../include/photos.php:118
 msgid "Image file is empty."
 msgstr "Bilddatei ist leer."
 
-#: ../../include/photos.php:261
+#: ../../include/photos.php:257
 msgid "Photo storage failed."
 msgstr "Fotospeicherung fehlgeschlagen."
 
-#: ../../include/photos.php:301
+#: ../../include/photos.php:297
 msgid "a new photo"
 msgstr "ein neues Foto"
 
-#: ../../include/photos.php:305
+#: ../../include/photos.php:301
 #, php-format
 msgctxt "photo_upload"
 msgid "%1$s posted %2$s to %3$s"
 msgstr "%1$s hat %2$s auf %3$s veröffentlicht"
 
-#: ../../include/photos.php:533
+#: ../../include/photos.php:530
 msgid "Upload New Photos"
 msgstr "Neue Fotos hochladen"
 
-#: ../../include/zot.php:646
+#: ../../include/zot.php:653
 msgid "Invalid data packet"
 msgstr "Ungültiges Datenpaket"
 
-#: ../../include/zot.php:662
+#: ../../include/zot.php:680
 msgid "Unable to verify channel signature"
 msgstr "Konnte die Signatur des Kanals nicht verifizieren"
 
-#: ../../include/zot.php:2313
+#: ../../include/zot.php:2338
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
 
-#: ../../include/zot.php:3764
+#: ../../include/zot.php:3946
 msgid "invalid target signature"
 msgstr "Ungültige Signatur des Ziels"
 
@@ -13276,27 +13316,27 @@ msgstr "Es hat früher schon einmal eine Gruppe mit diesem Namen existiert, die
 msgid "Add new connections to this privacy group"
 msgstr "Neue Verbindung zu dieser Gruppe hinzufügen"
 
-#: ../../include/group.php:309
+#: ../../include/group.php:310
 msgid "edit"
 msgstr "Bearbeiten"
 
-#: ../../include/group.php:332
+#: ../../include/group.php:333
 msgid "Edit group"
 msgstr "Gruppe ändern"
 
-#: ../../include/group.php:333
+#: ../../include/group.php:334
 msgid "Add privacy group"
 msgstr "Gruppe hinzufügen"
 
-#: ../../include/group.php:334
+#: ../../include/group.php:335
 msgid "Channels not in any privacy group"
 msgstr "Kanäle, die in keiner Gruppe sind"
 
-#: ../../include/connections.php:127
+#: ../../include/connections.php:128
 msgid "New window"
 msgstr "Neues Fenster"
 
-#: ../../include/connections.php:128
+#: ../../include/connections.php:129
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Öffne die markierte Adresse in einem neuen Browserfenster oder Tab"
 
diff --git a/view/de/hstrings.php b/view/de/hstrings.php
index adeceacb9..2ee8d8a89 100644
--- a/view/de/hstrings.php
+++ b/view/de/hstrings.php
@@ -60,6 +60,7 @@ App::$strings["%d message sent."] = array(
 	0 => "%d Nachricht gesendet.",
 	1 => "%d Nachrichten gesendet.",
 );
+App::$strings["Invite"] = "Einladen";
 App::$strings["You have no more invitations available"] = "Du hast keine weiteren verfügbare Einladungen";
 App::$strings["Send invitations"] = "Einladungen senden";
 App::$strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
@@ -82,11 +83,67 @@ App::$strings["Profile"] = "Profil";
 App::$strings["Click on a contact to add or remove."] = "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen.";
 App::$strings["Visible To"] = "Sichtbar für";
 App::$strings["All Connections"] = "Alle Verbindungen";
+App::$strings["INVALID EVENT DISMISSED!"] = "UNGÜLTIGEN TERMIN ABGELEHNT!";
+App::$strings["Summary: "] = "Zusammenfassung:";
+App::$strings["Unknown"] = "Unbekannt";
+App::$strings["Date: "] = "Datum:";
+App::$strings["Reason: "] = "Grund:";
+App::$strings["INVALID CARD DISMISSED!"] = "UNGÜLTIGE KARTE ABGELEHNT!";
+App::$strings["Name: "] = "Name: ";
+App::$strings["CalDAV"] = "CalDAV";
+App::$strings["Event title"] = "Termintitel";
+App::$strings["Start date and time"] = "Startdatum und -zeit";
+App::$strings["Example: YYYY-MM-DD HH:mm"] = "Beispiel: JJJJ-MM-TT HH:mm";
+App::$strings["End date and time"] = "Enddatum und -zeit";
+App::$strings["Description"] = "Beschreibung";
+App::$strings["Location"] = "Ort";
+App::$strings["Previous"] = "Voriges";
+App::$strings["Next"] = "Nächste";
+App::$strings["Today"] = "Heute";
+App::$strings["Month"] = "Monat";
+App::$strings["Week"] = "Woche";
+App::$strings["Day"] = "Tag";
+App::$strings["List month"] = "Liste Monat";
+App::$strings["List week"] = "Liste Woche";
+App::$strings["List day"] = "Liste Tag";
+App::$strings["More"] = "Mehr";
+App::$strings["Less"] = "Weniger";
+App::$strings["Select calendar"] = "Kalender auswählen";
+App::$strings["Delete all"] = "Alles löschen";
+App::$strings["Cancel"] = "Abbrechen";
+App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "Entschuldigung, aber das Bearbeiten von wiederkehrenden Veranstaltungen ist leider noch nicht implementiert.";
+App::$strings["CardDAV"] = "CardDAV";
+App::$strings["Name"] = "Name";
+App::$strings["Organisation"] = "Organisation";
+App::$strings["Title"] = "Titel";
+App::$strings["Phone"] = "Telefon";
+App::$strings["Email"] = "E-Mail";
+App::$strings["Instant messenger"] = "Sofortnachrichtendienst";
+App::$strings["Website"] = "Webseite";
+App::$strings["Address"] = "Adresse";
+App::$strings["Note"] = "Hinweis";
+App::$strings["Mobile"] = "Mobil";
+App::$strings["Home"] = "Home";
+App::$strings["Work"] = "Arbeit";
+App::$strings["Add Contact"] = "Kontakt hinzufügen";
+App::$strings["Add Field"] = "Feld hinzufügen";
+App::$strings["Update"] = "Aktualisieren";
+App::$strings["P.O. Box"] = "Postfach";
+App::$strings["Additional"] = "Zusätzlich";
+App::$strings["Street"] = "Straße";
+App::$strings["Locality"] = "Ortschaft";
+App::$strings["Region"] = "Region";
+App::$strings["ZIP Code"] = "Postleitzahl";
+App::$strings["Country"] = "Land";
+App::$strings["Default Calendar"] = "Standardkalender";
+App::$strings["Default Addressbook"] = "Standardadressbuch";
 App::$strings["This site is not a directory server"] = "Diese Webseite ist kein Verzeichnisserver";
 App::$strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können.";
 App::$strings["Posts and comments"] = "Beiträge und Kommentare";
 App::$strings["Only posts"] = "Nur Beiträge";
+App::$strings["Channel Home"] = "Mein Kanal";
 App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
+App::$strings["Language"] = "Sprache";
 App::$strings["Export Channel"] = "Kanal exportieren";
 App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält.";
 App::$strings["Export Content"] = "Kanal und Inhalte exportieren";
@@ -106,14 +163,14 @@ App::$strings["Please select another location to become primary before removing
 App::$strings["Syncing locations"] = "Synchronisiere Klone";
 App::$strings["No locations found."] = "Keine Klon-Adressen gefunden.";
 App::$strings["Manage Channel Locations"] = "Klon-Adressen verwalten";
-App::$strings["Location"] = "Ort";
-App::$strings["Address"] = "Adresse";
 App::$strings["Primary"] = "Primär";
 App::$strings["Drop"] = "Löschen";
 App::$strings["Sync Now"] = "Jetzt synchronisieren";
 App::$strings["Please wait several minutes between consecutive operations."] = "Bitte warte mehrere Minuten zwischen dem Ausführen zweier Operationen!";
 App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub einloggst und den Kanal dort löschst.";
 App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt.";
+App::$strings["Change Order of Navigation Apps"] = "App-Reihenfolge in der Navigation ändern";
+App::$strings["Use arrows to move the corresponding app up or down in the display list"] = "Benutze die Pfeiltasten, um die jeweilige App in der Anzeigeliste auf- oder abwärts zu bewegen.";
 App::$strings["Menu not found."] = "Menü nicht gefunden";
 App::$strings["Unable to create element."] = "Element konnte nicht erstellt werden.";
 App::$strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren.";
@@ -154,21 +211,19 @@ App::$strings["Unable to generate preview."] = "Vorschau konnte nicht erzeugt we
 App::$strings["Event title and start time are required."] = "Titel und Startzeit des Termins sind erforderlich.";
 App::$strings["Event not found."] = "Termin nicht gefunden.";
 App::$strings["event"] = "Termin";
+App::$strings["Events"] = "Termine";
 App::$strings["Edit event title"] = "Termintitel bearbeiten";
-App::$strings["Event title"] = "Termintitel";
 App::$strings["Required"] = "Benötigt";
 App::$strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
 App::$strings["Edit Category"] = "Kategorie bearbeiten";
 App::$strings["Category"] = "Kategorie";
 App::$strings["Edit start date and time"] = "Startdatum und -zeit bearbeiten";
-App::$strings["Start date and time"] = "Startdatum und -zeit";
 App::$strings["Finish date and time are not known or not relevant"] = "Enddatum und -zeit sind unbekannt oder irrelevant";
 App::$strings["Edit finish date and time"] = "Enddatum und -zeit bearbeiten";
 App::$strings["Finish date and time"] = "Enddatum und -zeit";
 App::$strings["Adjust for viewer timezone"] = "An die Zeitzone des Betrachters anpassen";
 App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien.";
 App::$strings["Edit Description"] = "Beschreibung bearbeiten";
-App::$strings["Description"] = "Beschreibung";
 App::$strings["Edit Location"] = "Ort bearbeiten";
 App::$strings["Preview"] = "Vorschau";
 App::$strings["Permission settings"] = "Berechtigungs-Einstellungen";
@@ -181,13 +236,7 @@ App::$strings["Link to Source"] = "Link zur Quelle";
 App::$strings["calendar"] = "Kalender";
 App::$strings["Edit Event"] = "Termin bearbeiten";
 App::$strings["Create Event"] = "Termin anlegen";
-App::$strings["Previous"] = "Voriges";
-App::$strings["Next"] = "Nächste";
 App::$strings["Export"] = "Exportieren";
-App::$strings["Month"] = "Monat";
-App::$strings["Week"] = "Woche";
-App::$strings["Day"] = "Tag";
-App::$strings["Today"] = "Heute";
 App::$strings["Event removed"] = "Termin gelöscht";
 App::$strings["Failed to remove event"] = "Termin konnte nicht gelöscht werden";
 App::$strings["App installed."] = "App installiert.";
@@ -238,7 +287,6 @@ App::$strings["Remove this channel and all its clones from the network"] = "Lös
 App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk";
 App::$strings["Remove Channel"] = "Kanal löschen";
 App::$strings["Files: shared with me"] = "Dateien, die mit mir geteilt wurden";
-App::$strings["Name"] = "Name";
 App::$strings["NEW"] = "NEU";
 App::$strings["Size"] = "Größe";
 App::$strings["Last Modified"] = "Zuletzt geändert";
@@ -270,11 +318,7 @@ App::$strings["Your account email address must match this in order to use the we
 App::$strings["Website URL"] = "Webseiten-URL";
 App::$strings["Please use SSL (https) URL if available."] = "Nutze wenn möglich eine SSL-URL (https).";
 App::$strings["Please select a default timezone for your website"] = "Standard-Zeitzone für Deinen Server";
-App::$strings["Basic/Minimal Social Networking"] = "Einfaches/minimales soziales Netzwerken";
-App::$strings["Standard Configuration (default)"] = "Standardkonfiguration (Standard)";
-App::$strings["Professional"] = "Professionell";
 App::$strings["Site settings"] = "Seiteneinstellungen";
-App::$strings["Server Configuration/Role"] = "Serverkonfiguration/Rolle";
 App::$strings["PHP version 5.5 or greater is required."] = "PHP-Version 5.5 oder höher ist erforderlich.";
 App::$strings["PHP version"] = "PHP-Version";
 App::$strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden.";
@@ -298,6 +342,7 @@ App::$strings["OpenSSL PHP module"] = "OpenSSL-PHP-Modul";
 App::$strings["PDO database PHP module"] = "PDO-Datenbank-PHP-Modul";
 App::$strings["mb_string PHP module"] = "mb_string-PHP-Modul";
 App::$strings["xml PHP module"] = "xml-PHP-Modul";
+App::$strings["zip PHP module"] = "zip PHP Modul";
 App::$strings["Apache mod_rewrite module"] = "Apache-mod_rewrite-Modul";
 App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert.";
 App::$strings["exec"] = "exec";
@@ -310,6 +355,7 @@ App::$strings["Error: openssl PHP module required but not installed."] = "Fehler
 App::$strings["Error: PDO database PHP module required but not installed."] = "Fehler: PDO-Datenbank-PHP-Modul ist erforderlich, aber nicht installiert.";
 App::$strings["Error: mb_string PHP module required but not installed."] = "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert.";
 App::$strings["Error: xml PHP module required for DAV but not installed."] = "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert.";
+App::$strings["Error: zip PHP module required but not installed."] = "Fehler: Das zip PHP Modul ist erforderlich, ist aber nicht installiert.";
 App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht.";
 App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst.";
 App::$strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Hubzilla-Installation speichern musst.";
@@ -334,7 +380,7 @@ App::$strings["Url rewrite in .htaccess is not working. Check your server config
 App::$strings["Url rewrite is working"] = "Url rewrite funktioniert";
 App::$strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen.";
 App::$strings["Errors encountered creating database tables."] = "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten.";
-App::$strings["<h1>What next</h1>"] = "<h1>Was als Nächstes</h1>";
+App::$strings["<h1>What next?</h1>"] = "<h1>Wie geht es jetzt weiter?</h1>";
 App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten.";
 App::$strings["Continue"] = "Fortfahren";
 App::$strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung";
@@ -389,11 +435,9 @@ App::$strings["(optional)"] = "(optional)";
 App::$strings["Download Plugin Repo"] = "Plugin-Repository herunterladen";
 App::$strings["Install new repo"] = "Neues Repository installieren";
 App::$strings["Install"] = "Installieren";
-App::$strings["Cancel"] = "Abbrechen";
 App::$strings["Manage Repos"] = "Repositorien verwalten";
 App::$strings["Installed Plugin Repositories"] = "Installierte Plugin-Repositorien";
 App::$strings["Install a New Plugin Repository"] = "Ein neues Plugin-Repository installieren";
-App::$strings["Update"] = "Aktualisieren";
 App::$strings["Switch branch"] = "Zweig/Branch wechseln";
 App::$strings["Remove"] = "Entfernen";
 App::$strings["%s account blocked/unblocked"] = array(
@@ -412,7 +456,6 @@ App::$strings["Accounts"] = "Konten";
 App::$strings["select all"] = "Alle auswählen";
 App::$strings["Registrations waiting for confirm"] = "Registrierungen warten auf Bestätigung";
 App::$strings["Request date"] = "Antragsdatum";
-App::$strings["Email"] = "E-Mail";
 App::$strings["No registrations."] = "Keine Registrierungen.";
 App::$strings["Approve"] = "Genehmigen";
 App::$strings["Deny"] = "Verweigern";
@@ -460,10 +503,10 @@ App::$strings["Channel"] = "Kanal";
 App::$strings["UID"] = "UID";
 App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?";
 App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?";
-App::$strings["Theme settings updated."] = "Theme-Einstellungen aktualisiert.";
-App::$strings["No themes found."] = "Keine Theme gefunden.";
+App::$strings["Theme settings updated."] = "Design-Einstellungen aktualisiert.";
+App::$strings["No themes found."] = "Keine Designs gefunden.";
 App::$strings["Screenshot"] = "Bildschirmfoto";
-App::$strings["Themes"] = "Themes";
+App::$strings["Themes"] = "Designs";
 App::$strings["[Experimental]"] = "[Experimentell]";
 App::$strings["[Unsupported]"] = "[Nicht unterstützt]";
 App::$strings["Site settings updated."] = "Site-Einstellungen aktualisiert.";
@@ -499,9 +542,9 @@ App::$strings["Contact information for site administrators.  Displayed on sitein
 App::$strings["Site Information"] = "Seiteninformationen";
 App::$strings["Publicly visible description of this site.  Displayed on siteinfo page.  BBCode can be used here"] = "Öffentlich sichtbare Beschreibung dieses Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann hier verwendet werden.";
 App::$strings["System language"] = "System-Sprache";
-App::$strings["System theme"] = "System-Theme";
-App::$strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>";
-App::$strings["Mobile system theme"] = "Mobile System-Theme:";
+App::$strings["System theme"] = "System-Design";
+App::$strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Standard-System-Design – kann durch Nutzerprofile überschieben werden – <a href='#' id='cnftheme'>Design-Einstellungen ändern</a>";
+App::$strings["Mobile system theme"] = "System-Design für mobile Geräte:";
 App::$strings["Theme for mobile devices"] = "Theme für mobile Geräte";
 App::$strings["Allow Feeds as Connections"] = "Feeds als Verbindungen erlauben";
 App::$strings["(Heavy system resource usage)"] = "(führt zu hoher Systemlast)";
@@ -603,6 +646,8 @@ App::$strings["Block embedded HTML from these domains"] = "Eingebettete HTML Inh
 App::$strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar.";
 App::$strings["Visible to:"] = "Sichtbar für:";
 App::$strings["__ctx:acl__ Profile"] = "Profil";
+App::$strings["Comment approved"] = "Kommentar bestätigt";
+App::$strings["Comment deleted"] = "Kommentar gelöscht";
 App::$strings["Permission category saved."] = "Berechtigungsrolle gespeichert.";
 App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Verwende dieses Formular, um Berechtigungsrollen für verschiedene Gruppen von Personen oder Verbindungen zu erstellen.";
 App::$strings["Permission Categories"] = "Berechtigungsrollen";
@@ -684,12 +729,14 @@ App::$strings["Recommended"] = "Empfohlen";
 App::$strings["Upcoming events"] = "Baldige Termine";
 App::$strings["Events today"] = "Heutige Termine";
 App::$strings["Upcoming birthdays"] = "Baldige Geburtstage";
-App::$strings["Not available in all themes"] = "Nicht in allen Themes verfügbar";
+App::$strings["Not available in all themes"] = "Nicht in allen Designs verfügbar";
 App::$strings["System (personal) notifications"] = "System – (persönliche) Benachrichtigungen";
 App::$strings["System info messages"] = "System – Info-Nachrichten";
 App::$strings["System critical alerts"] = "System – kritische Warnungen";
 App::$strings["New connections"] = "Neue Verbindungen";
 App::$strings["System Registrations"] = "System – Registrierungen";
+App::$strings["Unseen shared files"] = "Ungesehene geteilte Dateien";
+App::$strings["Unseen public activity"] = "Ungesehene öffentliche Aktivität";
 App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen anzeigen";
 App::$strings["Notify me of events this many days in advance"] = "Benachrichtige mich zu Terminen so viele Tage im Voraus";
 App::$strings["Must be greater than 0"] = "Muss größer als 0 sein";
@@ -738,15 +785,15 @@ App::$strings["Default maximum affinity level"] = "Voreinstellung für maximalen
 App::$strings["Default minimum affinity level"] = "Voreinstellung für minimalen Beziehungsgrad";
 App::$strings["Affinity Slider Settings"] = "Beziehungsgrad-Schieberegler-Einstellungen";
 App::$strings["Feature/Addon Settings"] = "Funktions-/Addon-Einstellungen";
-App::$strings["No special theme for mobile devices"] = "Keine spezielle Theme für mobile Geräte";
+App::$strings["No special theme for mobile devices"] = "Kein spezielles Design für mobile Geräte";
 App::$strings["%s - (Experimental)"] = "%s – (experimentell)";
 App::$strings["Display Settings"] = "Anzeige-Einstellungen";
-App::$strings["Theme Settings"] = "Theme-Einstellungen";
-App::$strings["Custom Theme Settings"] = "Benutzerdefinierte Theme-Einstellungen";
+App::$strings["Theme Settings"] = "Design-Einstellungen";
+App::$strings["Custom Theme Settings"] = "Benutzerdefinierte Design-Einstellungen";
 App::$strings["Content Settings"] = "Inhaltseinstellungen";
-App::$strings["Display Theme:"] = "Anzeige-Theme:";
+App::$strings["Display Theme:"] = "Anzeige-Design:";
 App::$strings["Select scheme"] = "Schema wählen";
-App::$strings["Mobile Theme:"] = "Mobile Theme:";
+App::$strings["Mobile Theme:"] = "Design für mobile Geräte:";
 App::$strings["Preload images before rendering the page"] = "Bilder im voraus laden, bevor die Seite angezeigt wird";
 App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "Die empfundene Ladezeit wird sich erhöhen, aber dafür ist das Layout stabil, sobald eine Seite angezeigt wird";
 App::$strings["Enable user zoom on mobile devices"] = "Zoom auf Mobilgeräten aktivieren";
@@ -782,7 +829,6 @@ App::$strings["Client key starts with"] = "Client Key beginnt mit";
 App::$strings["No name"] = "Kein Name";
 App::$strings["Remove authorization"] = "Authorisierung aufheben";
 App::$strings["View Photo"] = "Foto ansehen";
-App::$strings["Unknown"] = "Unbekannt";
 App::$strings["Edit Album"] = "Album bearbeiten";
 App::$strings["Upload"] = "Hochladen";
 App::$strings["Some blurb about what to do when you're new here"] = "Ein Hinweis, was man tun kann, wenn man neu hier ist";
@@ -841,10 +887,11 @@ App::$strings["Create new app"] = "Neue App erstellen";
 App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s ist %2\$s";
 App::$strings["Mood"] = "Laune";
 App::$strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden";
+App::$strings["Connections"] = "Verbindungen";
 App::$strings["Blocked"] = "Blockiert";
 App::$strings["Ignored"] = "Ignoriert";
 App::$strings["Hidden"] = "Versteckt";
-App::$strings["Archived"] = "Archiviert";
+App::$strings["Archived/Unreachable"] = "Archiviert/Unerreichbar";
 App::$strings["New"] = "Neu";
 App::$strings["All"] = "Alle";
 App::$strings["New Connections"] = "Neue Verbindungen";
@@ -852,9 +899,11 @@ App::$strings["Show pending (new) connections"] = "Ausstehende (neue) Verbindung
 App::$strings["Show all connections"] = "Alle Verbindungen anzeigen";
 App::$strings["Only show blocked connections"] = "Nur blockierte Verbindungen anzeigen";
 App::$strings["Only show ignored connections"] = "Nur ignorierte Verbindungen anzeigen";
-App::$strings["Only show archived connections"] = "Nur archivierte Verbindungen anzeigen";
+App::$strings["Only show archived/unreachable connections"] = "Nur archivierte/unerreichbare Verbindungen anzeigen";
 App::$strings["Only show hidden connections"] = "Nur versteckte Verbindungen anzeigen";
 App::$strings["Pending approval"] = "Wartet auf Genehmigung";
+App::$strings["Archived"] = "Archiviert";
+App::$strings["Not connected at this location"] = "An diesem Ort nicht verbunden";
 App::$strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
 App::$strings["Edit connection"] = "Verbindung bearbeiten";
 App::$strings["Delete connection"] = "Verbindung löschen";
@@ -867,12 +916,12 @@ App::$strings["Approve connection"] = "Verbindung genehmigen";
 App::$strings["Ignore connection"] = "Verbindung ignorieren";
 App::$strings["Ignore"] = "Ignorieren";
 App::$strings["Recent activity"] = "Kürzliche Aktivitäten";
-App::$strings["Connections"] = "Verbindungen";
 App::$strings["Search your connections"] = "Verbindungen durchsuchen";
 App::$strings["Connections search"] = "Verbindung suchen";
 App::$strings["Find"] = "Finde";
-App::$strings["item"] = "";
+App::$strings["item"] = "Beitrag";
 App::$strings["Source of Item"] = "Quelle des Elements";
+App::$strings["View Bookmarks"] = "Lesezeichen ansehen";
 App::$strings["Bookmark added"] = "Lesezeichen hinzugefügt";
 App::$strings["My Bookmarks"] = "Meine Lesezeichen";
 App::$strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
@@ -887,6 +936,7 @@ App::$strings["Delete Album"] = "Album löschen";
 App::$strings["Delete Photo"] = "Foto löschen";
 App::$strings["No photos selected"] = "Keine Fotos ausgewählt";
 App::$strings["Access to this item is restricted."] = "Der Zugriff auf dieses Foto ist eingeschränkt.";
+App::$strings["Photos"] = "Fotos";
 App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB von %2$.2f MB Foto-Speicher belegt.";
 App::$strings["%1$.2f MB photo storage used."] = "%1$.2f MB Foto-Speicher belegt.";
 App::$strings["Upload Photos"] = "Fotos hochladen";
@@ -945,6 +995,7 @@ App::$strings["Recent Photos"] = "Neueste Fotos";
 App::$strings["Profile Unavailable."] = "Profil nicht verfügbar.";
 App::$strings["Not found"] = "Nicht gefunden";
 App::$strings["Invalid channel"] = "Ungültiger Kanal";
+App::$strings["Wiki"] = "Wiki";
 App::$strings["Wikis"] = "Wikis";
 App::$strings["Download"] = "Herunterladen";
 App::$strings["Create New"] = "Neu anlegen";
@@ -1019,6 +1070,7 @@ App::$strings["Unable to locate original post."] = "Originalbeitrag nicht gefund
 App::$strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
 App::$strings["Duplicate post suppressed."] = "Doppelter Beitrag unterdrückt.";
 App::$strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
+App::$strings["Your comment is awaiting approval."] = "Dein Kommentar muss noch bestätigt werden.";
 App::$strings["Unable to obtain post information from database."] = "Beitragsinformationen können nicht aus der Datenbank abgerufen werden.";
 App::$strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
 App::$strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
@@ -1076,7 +1128,10 @@ App::$strings["Accept connection to allow communication"] = "Akzeptiere die Verb
 App::$strings["Set Affinity"] = "Beziehung festlegen";
 App::$strings["Set Profile"] = "Profil festlegen";
 App::$strings["Set Affinity & Profile"] = "Beziehung und Profile festlegen";
-App::$strings["none"] = "Keine";
+App::$strings["This connection is unreachable from this location."] = "Diese Verbindung ist von diesem Ort unerreichbar.";
+App::$strings["This connection may be unreachable from other channel locations."] = "Diese Verbindung könnte von anderen Standpunkten des Kanals nicht erreichbar sein.";
+App::$strings["Location independence is not supported by their network."] = "Standort Unabhängigkeit wird vom anderen Netzwerk nicht unterstützt.";
+App::$strings["This connection is unreachable from this location. Location independence is not supported by their network."] = "Diese Verbindung ist von diesem Standort aus unerreichbar. Standort Unabhängigkeit wird vom anderen Netzwerk nicht unterstützt.";
 App::$strings["Connection Default Permissions"] = "Standardzugriffsrechte für neue Verbindungen:";
 App::$strings["Connection: %s"] = "Verbindung: %s";
 App::$strings["Apply these permissions automatically"] = "Diese Berechtigungen automatisch anwenden";
@@ -1101,24 +1156,7 @@ App::$strings["Please choose the profile you would like to display to %s when vi
 App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung. Werden geerbte Einstellungen hier geändert, hat dies keine Auswirkungen.";
 App::$strings["Last update:"] = "Letzte Aktualisierung:";
 App::$strings["Details"] = "Details";
-App::$strings["Organisation"] = "Organisation";
-App::$strings["Title"] = "Titel";
-App::$strings["Phone"] = "Telefon";
-App::$strings["Instant messenger"] = "Sofortnachrichtendienst";
-App::$strings["Website"] = "Webseite";
-App::$strings["Note"] = "Hinweis";
-App::$strings["Mobile"] = "Mobil";
-App::$strings["Home"] = "Home";
-App::$strings["Work"] = "Arbeit";
-App::$strings["Add Contact"] = "Kontakt hinzufügen";
-App::$strings["Add Field"] = "Feld hinzufügen";
-App::$strings["P.O. Box"] = "Postfach";
-App::$strings["Additional"] = "Zusätzlich";
-App::$strings["Street"] = "Straße";
-App::$strings["Locality"] = "Ortschaft";
-App::$strings["Region"] = "Region";
-App::$strings["ZIP Code"] = "Postleitzahl";
-App::$strings["Country"] = "Land";
+App::$strings["My Chatrooms"] = "Meine Chaträume";
 App::$strings["Room not found"] = "Chatraum nicht gefunden";
 App::$strings["Leave Room"] = "Raum verlassen";
 App::$strings["Delete Room"] = "Raum löschen";
@@ -1134,7 +1172,6 @@ App::$strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume";
 App::$strings["No chatrooms available"] = "Keine Chaträume verfügbar";
 App::$strings["Expiration"] = "Verfall";
 App::$strings["min"] = "min";
-App::$strings["Photos"] = "Fotos";
 App::$strings["Files"] = "Dateien";
 App::$strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
 App::$strings["Unable to create menu."] = "Kann Menü nicht erstellen.";
@@ -1277,11 +1314,11 @@ App::$strings["Ratings"] = "Bewertungen";
 App::$strings["Rating: "] = "Bewertung: ";
 App::$strings["Website: "] = "Webseite: ";
 App::$strings["Description: "] = "Beschreibung: ";
+App::$strings["Webpages"] = "Webseiten";
 App::$strings["Import Webpage Elements"] = "Webseitenelemente importieren";
 App::$strings["Import selected"] = "Import ausgewählt";
 App::$strings["Export Webpage Elements"] = "Webseitenelemente exportieren";
 App::$strings["Export selected"] = "Exportieren ausgewählt";
-App::$strings["Webpages"] = "Webseiten";
 App::$strings["Actions"] = "Aktionen";
 App::$strings["Page Link"] = "Seiten-Link";
 App::$strings["Page Title"] = "Seitentitel";
@@ -1325,6 +1362,7 @@ App::$strings["Edit Source"] = "Quelle bearbeiten";
 App::$strings["Delete Source"] = "Quelle löschen";
 App::$strings["Source removed"] = "Quelle gelöscht";
 App::$strings["Unable to remove source."] = "Konnte die Quelle nicht löschen.";
+App::$strings["Post"] = "Beitrag schreiben";
 App::$strings["Like/Dislike"] = "Mögen/Nicht mögen";
 App::$strings["This action is restricted to members."] = "Diese Aktion kann nur von Mitgliedern ausgeführt werden.";
 App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Um fortzufahren <a href=\"rmagic\">melde Dich bitte mit Deiner \$Projectname-ID an</a> oder <a href=\"register\">registriere Dich als neues \$Projectname-Mitglied</a>.";
@@ -1343,6 +1381,7 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %
 App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt vielleicht an %2\$ss %3\$s teil";
 App::$strings["Action completed."] = "Aktion durchgeführt.";
 App::$strings["Thank you."] = "Vielen Dank.";
+App::$strings["Directory"] = "Verzeichnis";
 App::$strings["%d rating"] = array(
 	0 => "%d Bewertung",
 	1 => "%d Bewertungen",
@@ -1374,6 +1413,7 @@ App::$strings["Oldest to Newest"] = "Älteste zuerst";
 App::$strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
 App::$strings["Xchan Lookup"] = "Xchan-Suche";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:";
+App::$strings["Suggest Channels"] = "Kanäle vorschlagen";
 App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal.";
 App::$strings["Ignore/Hide"] = "Ignorieren/Verstecken";
 App::$strings["Unable to find your hub."] = "Konnte Deinen Server nicht finden.";
@@ -1382,6 +1422,7 @@ App::$strings["Unable to lookup recipient."] = "Konnte den Empfänger nicht find
 App::$strings["Unable to communicate with requested channel."] = "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen.";
 App::$strings["Cannot verify requested channel."] = "Verifizierung des angeforderten Kanals fehlgeschlagen.";
 App::$strings["Selected channel has private message restrictions. Send failed."] = "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen.";
+App::$strings["Mail"] = "Mail";
 App::$strings["Messages"] = "Nachrichten";
 App::$strings["message"] = "Nachricht";
 App::$strings["Message recalled."] = "Nachricht widerrufen.";
@@ -1423,6 +1464,7 @@ App::$strings["Or enter new bookmark folder name"] = "Oder gib einen neuen Namen
 App::$strings["Enter a folder name"] = "Gib einen Ordnernamen ein";
 App::$strings["or select an existing folder (doubleclick)"] = "oder wähle einen vorhanden Ordner aus (Doppelklick)";
 App::$strings["Save to Folder"] = "In Ordner speichern";
+App::$strings["Remote Diagnostics"] = "Ferndiagnose";
 App::$strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen Fehler zurück: %1\$s";
 App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
 App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen.";
@@ -1467,6 +1509,7 @@ App::$strings["No such group"] = "Gruppe nicht gefunden";
 App::$strings["No such channel"] = "Kanal nicht gefunden";
 App::$strings["forum"] = "Forum";
 App::$strings["Search Results For:"] = "Suchergebnisse für:";
+App::$strings["Activity"] = "Aktivität";
 App::$strings["Privacy group is empty"] = "Gruppe ist leer";
 App::$strings["Privacy group: "] = "Gruppe:";
 App::$strings["Invalid connection."] = "Ungültige Verbindung.";
@@ -1485,20 +1528,17 @@ App::$strings["Copy/paste this code to attach file to a post"] = "Diesen Code ko
 App::$strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken";
 App::$strings["Share this file"] = "Diese Datei freigeben";
 App::$strings["Show URL to this file"] = "URL zu dieser Datei anzeigen";
-App::$strings["Notify your contacts about this file"] = "Meine Kontakte über diese Datei benachrichtigen";
+App::$strings["Show in your contacts shared folder"] = "Im geteilten Ordner Deiner Kontakte anzeigen";
 App::$strings["No channel."] = "Kein Kanal.";
 App::$strings["Common connections"] = "Gemeinsame Verbindungen";
 App::$strings["No connections in common."] = "Keine gemeinsamen Verbindungen.";
 App::$strings["No connections."] = "Keine Verbindungen.";
 App::$strings["Visit %s's profile [%s]"] = "%ss Profil [%s] besuchen";
 App::$strings["View Connections"] = "Verbindungen anzeigen";
-App::$strings["# Accounts"] = "Anzahl der Konten";
-App::$strings["# blocked accounts"] = "Anzahl der blockierten Konten";
-App::$strings["# expired accounts"] = "Anzahl der abgelaufenen Konten";
-App::$strings["# expiring accounts"] = "Anzahl der ablaufenden Konten";
-App::$strings["# Channels"] = "Anzahl der Kanäle";
-App::$strings["# primary"] = "Anzahl der primären Kanäle";
-App::$strings["# clones"] = "Anzahl der Klone";
+App::$strings["Blocked accounts"] = "Blockierte Benutzerkonten";
+App::$strings["Expired accounts"] = "Abgelaufene Benutzerkonten";
+App::$strings["Expiring accounts"] = "Ablaufende Benutzerkonten";
+App::$strings["Clones"] = "Klone";
 App::$strings["Message queues"] = "Nachrichten-Warteschlangen";
 App::$strings["Your software should be updated"] = "Die installierte Software sollte aktualisiert werden";
 App::$strings["Summary"] = "Zusammenfassung";
@@ -1530,29 +1570,22 @@ App::$strings["Forgot your Password?"] = "Kennwort vergessen?";
 App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail.";
 App::$strings["Email Address"] = "E-Mail Adresse";
 App::$strings["Reset"] = "Zurücksetzen";
-App::$strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gesehen";
+App::$strings["Mark all seen"] = "Alle als gelesen markieren";
+App::$strings["0. Beginner/Basic"] = "0. Einsteiger/Basis";
+App::$strings["1. Novice - not skilled but willing to learn"] = "1. Anfänger - unerfahren, aber bereit zu lernen";
+App::$strings["2. Intermediate - somewhat comfortable"] = "2. Fortgeschritten - relativ komfortabel";
+App::$strings["3. Advanced - very comfortable"] = "3. Fortgeschritten - sehr komfortabel";
+App::$strings["4. Expert - I can write computer code"] = "4. Experte - Ich kann Computercode schreiben";
+App::$strings["5. Wizard - I probably know more than you do"] = "5. Zauberer - ich kann wahrscheinlich mehr als Du";
 App::$strings["Site Admin"] = "Hub-Administration";
 App::$strings["Report Bug"] = "Fehler melden";
-App::$strings["View Bookmarks"] = "Lesezeichen ansehen";
-App::$strings["My Chatrooms"] = "Meine Chaträume";
 App::$strings["Firefox Share"] = "Teilen-Knopf für Firefox";
-App::$strings["Remote Diagnostics"] = "Ferndiagnose";
-App::$strings["Suggest Channels"] = "Kanäle vorschlagen";
 App::$strings["Login"] = "Anmelden";
-App::$strings["Activity"] = "Aktivität";
-App::$strings["Wiki"] = "Wiki";
-App::$strings["Channel Home"] = "Mein Kanal";
-App::$strings["Events"] = "Termine";
-App::$strings["Directory"] = "Verzeichnis";
-App::$strings["Mail"] = "Mail";
 App::$strings["Chat"] = "Chat";
 App::$strings["Probe"] = "Testen";
 App::$strings["Suggest"] = "Empfehlen";
 App::$strings["Random Channel"] = "Zufälliger Kanal";
-App::$strings["Invite"] = "Einladen";
 App::$strings["Features"] = "Funktionen";
-App::$strings["Language"] = "Sprache";
-App::$strings["Post"] = "Beitrag schreiben";
 App::$strings["Profile Photo"] = "Profilfoto";
 App::$strings["Purchase"] = "Kaufen";
 App::$strings["Undelete"] = "Wieder hergestellt";
@@ -1609,9 +1642,11 @@ App::$strings["Please visit %s to view and/or reply to your private messages."]
 App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]einen %4\$s[/zrl] kommentiert";
 App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]%4\$ss %5\$s[/zrl] kommentiert";
 App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen %4\$s[/zrl] kommentiert";
+App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Benachrichtigung] Moderierter Kommantar in Unterhaltung #%1\$d von %2\$s";
 App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s";
 App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat eine Unterhaltung kommentiert, der Du folgst.";
 App::$strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren.";
+App::$strings["Please visit %s to approve or reject this comment."] = "Bitte besuche %s, um diesen Kommentar anzunehmen oder abzulehnen.";
 App::$strings["%1\$s, %2\$s liked [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s gefällt [zrl=%3\$s]dein %4\$s[/zrl]";
 App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Benachrichtigung] Gefällt mir in Unterhaltung #%1\$d von %2\$s erhalten";
 App::$strings["%1\$s, %2\$s liked an item/conversation you created."] = "%1\$s, %2\$s gefällt ein Beitrag oder eine Unterhaltung von Dir";
@@ -1682,7 +1717,6 @@ App::$strings["Vote"] = "Abstimmen";
 App::$strings["Voting Options"] = "Abstimmungsoptionen";
 App::$strings["Save Bookmarks"] = "Favoriten speichern";
 App::$strings["Add to Calendar"] = "Zum Kalender hinzufügen";
-App::$strings["Mark all seen"] = "Alle als gelesen markieren";
 App::$strings["%s show all"] = "%s mehr anzeigen";
 App::$strings["Bold"] = "Fett";
 App::$strings["Italic"] = "Kursiv";
@@ -1692,6 +1726,9 @@ App::$strings["Code"] = "Code";
 App::$strings["Image"] = "Bild";
 App::$strings["Insert Link"] = "Link einfügen";
 App::$strings["Video"] = "Video";
+App::$strings["Your full name (required)"] = "Ihr vollständiger Name (erforderlich)";
+App::$strings["Your email address (required)"] = "Ihre E-Mail-Adresse (erforderlich)";
+App::$strings["Your website URL (optional)"] = "Ihre Webseiten-URL (optional)";
 App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut.";
 App::$strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
 App::$strings["parent"] = "Übergeordnetes Verzeichnis";
@@ -1711,6 +1748,25 @@ App::$strings["Create new folder"] = "Neuen Ordner anlegen";
 App::$strings["Upload file"] = "Datei hochladen";
 App::$strings["Drop files here to immediately upload"] = "Dateien zum sofortigen Hochladen hier fallen lassen";
 App::$strings["Forums"] = "Foren";
+App::$strings["Select Channel"] = "Kanal auswählen";
+App::$strings["Read-write"] = "Lesen-schreiben";
+App::$strings["Read-only"] = "Nur Lesen";
+App::$strings["My Calendars"] = "Meine Kalender";
+App::$strings["Shared Calendars"] = "Geteilte Kalender";
+App::$strings["Share this calendar"] = "Diesen Kalender teilen";
+App::$strings["Calendar name and color"] = "Kalendername und -farbe";
+App::$strings["Create new calendar"] = "Neuen Kalender erstellen";
+App::$strings["Calendar Name"] = "Kalendername";
+App::$strings["Calendar Tools"] = "Kalenderwerkzeuge";
+App::$strings["Import calendar"] = "Kalender importieren";
+App::$strings["Select a calendar to import to"] = "Kalender zum Hineinimportieren auswählen";
+App::$strings["Addressbooks"] = "Adressbücher";
+App::$strings["Addressbook name"] = "Adressbuchname";
+App::$strings["Create new addressbook"] = "Neues Adressbuch erstellen";
+App::$strings["Addressbook Name"] = "Adressbuchname";
+App::$strings["Addressbook Tools"] = "Adressbuchwerkzeuge";
+App::$strings["Import addressbook"] = "Adressbuch importieren";
+App::$strings["Select an addressbook to import to"] = "Adressbuch zum Hineinimportieren auswählen";
 App::$strings["Categories"] = "Kategorien";
 App::$strings["Everything"] = "Alles";
 App::$strings["Events Tools"] = "Kalenderwerkzeuge";
@@ -1734,9 +1790,9 @@ App::$strings["Enter channel address"] = "Adresse des Kanals eingeben";
 App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Beispiele: bob@beispiel.com, http://beispiel.com/barbara";
 App::$strings["Wiki List"] = "Wikiliste";
 App::$strings["Archives"] = "Archive";
-App::$strings["Conversations"] = "Konversationen";
 App::$strings["Received Messages"] = "Erhaltene Nachrichten";
 App::$strings["Sent Messages"] = "Gesendete Nachrichten";
+App::$strings["Conversations"] = "Konversationen";
 App::$strings["No messages."] = "Keine Nachrichten.";
 App::$strings["Delete conversation"] = "Unterhaltung löschen";
 App::$strings["Chat Members"] = "Chatmitglieder";
@@ -1771,8 +1827,6 @@ App::$strings["Permission Groups"] = "Berechtigungsrollen";
 App::$strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen";
 App::$strings["Bookmarked Chatrooms"] = "Gespeicherte Chatrooms";
 App::$strings["Source channel not found."] = "Quellkanal nicht gefunden.";
-App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Suche %1\$s (%2\$s)";
-App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
 App::$strings["Create an account to access services and applications"] = "Erstelle ein Konto, um auf Dienste und Anwendungen zugreifen zu können.";
 App::$strings["Logout"] = "Abmelden";
 App::$strings["Login/Email"] = "Anmelden/E-Mail";
@@ -1786,7 +1840,7 @@ App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname]
 App::$strings["Cron/Scheduled tasks not running."] = "Cron-Aufgaben laufen nicht.";
 App::$strings["never"] = "Nie";
 App::$strings["Focus (Hubzilla default)"] = "Focus (Voreinstellung für Hubzilla)";
-App::$strings["Theme settings"] = "Theme-Einstellungen";
+App::$strings["Theme settings"] = "Design-Einstellungen";
 App::$strings["Narrow navbar"] = "Schmale Navigationsleiste";
 App::$strings["Navigation bar background color"] = "Hintergrundfarbe der Navigationsleiste";
 App::$strings["Navigation bar icon color "] = "Farbe für die Icons der Navigationsleiste";
@@ -1838,58 +1892,11 @@ App::$strings["Some setting"] = "Einige Einstellungen";
 App::$strings["A setting"] = "Eine Einstellung";
 App::$strings["Skeleton Settings"] = "Skeleton Einstellungen";
 App::$strings["GNU-Social Protocol Settings updated."] = "GNU social Protokoll Einstellungen aktualisiert";
+App::$strings["The GNU-Social protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Das GNU-Social-Protokoll unterstützt keine Server-unabhängigen Identitäten. Verbindungen, die Du mit diesem Netzwerk eingehst, können von anderen Orten (Klonen) dieses Kanals aus unerreichbar sein.";
 App::$strings["Enable the GNU-Social protocol for this channel"] = "Aktiviere das GNU social Protokoll für diesen Kanal";
 App::$strings["GNU-Social Protocol Settings"] = "GNU social Protokoll Einstellungen";
 App::$strings["Follow"] = "Folgen";
 App::$strings["%1\$s is now following %2\$s"] = "%1\$s folgt nun %2\$s";
-App::$strings["INVALID EVENT DISMISSED!"] = "UNGÜLTIGEN TERMIN ABGELEHNT!";
-App::$strings["Summary: "] = "Zusammenfassung:";
-App::$strings["Date: "] = "Datum:";
-App::$strings["Reason: "] = "Grund:";
-App::$strings["INVALID CARD DISMISSED!"] = "UNGÜLTIGE KARTE ABGELEHNT!";
-App::$strings["Name: "] = "Name: ";
-App::$strings["You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV Settings before you can use it."] = "Du musst dieses Plugin zunächst in Einstellungen > Plugin-Einstellungen > CalDAV/CardDAV-Einstellungen aktivieren, bevor Du es verwenden kannst.";
-App::$strings["Example: YYYY-MM-DD HH:mm"] = "Beispiel: JJJJ-MM-TT HH:mm";
-App::$strings["End date and time"] = "Enddatum und -zeit";
-App::$strings["List month"] = "Liste Monat";
-App::$strings["List week"] = "Liste Woche";
-App::$strings["List day"] = "Liste Tag";
-App::$strings["More"] = "Mehr";
-App::$strings["Less"] = "Weniger";
-App::$strings["Select calendar"] = "Kalender auswählen";
-App::$strings["Delete all"] = "Alles löschen";
-App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "Entschuldigung, aber das Bearbeiten von wiederkehrenden Veranstaltungen ist leider noch nicht implementiert.";
-App::$strings["Errors encountered creating database table: "] = "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten.";
-App::$strings["Default Calendar"] = "Standardkalender";
-App::$strings["Default Addressbook"] = "Standardadressbuch";
-App::$strings["CalDAV/CardDAV Settings saved."] = "CalDAV/CardDAV-Einstellungen gespeichert.";
-App::$strings["Enable CalDAV/CardDAV Server for this channel"] = "Aktiviere den CalDAV/CardDAV Server für diesen Kanal";
-App::$strings["Your CalDAV resources are located at %s "] = "Deine CalDAV Resourcen sind unter %s verfügbar";
-App::$strings["Your CardDAV resources are located at %s "] = "Deine CardDAV Ressourcen sind unter %s verfügbar";
-App::$strings["CalDAV/CardDAV Settings"] = "CalDAV/CardDAV-Einstellungen";
-App::$strings["Home, Voice"] = "Zuhause, Sprache";
-App::$strings["Home, Fax"] = "Zuhause, Fax";
-App::$strings["Work, Voice"] = "Arbeit, Sprache";
-App::$strings["Work, Fax"] = "Arbeit, Fax";
-App::$strings["Select Channel"] = "Kanal auswählen";
-App::$strings["Read-write"] = "Lesen-schreiben";
-App::$strings["Read-only"] = "Nur Lesen";
-App::$strings["My Calendars"] = "Meine Kalender";
-App::$strings["Shared Calendars"] = "Geteilte Kalender";
-App::$strings["Share this calendar"] = "Diesen Kalender teilen";
-App::$strings["Calendar name and color"] = "Kalendername und -farbe";
-App::$strings["Create new calendar"] = "Neuen Kalender erstellen";
-App::$strings["Calendar Name"] = "Kalendername";
-App::$strings["Calendar Tools"] = "Kalenderwerkzeuge";
-App::$strings["Import calendar"] = "Kalender importieren";
-App::$strings["Select a calendar to import to"] = "Kalender zum Hineinimportieren auswählen";
-App::$strings["Addressbooks"] = "Adressbücher";
-App::$strings["Addressbook name"] = "Adressbuchname";
-App::$strings["Create new addressbook"] = "Neues Adressbuch erstellen";
-App::$strings["Addressbook Name"] = "Adressbuchname";
-App::$strings["Addressbook Tools"] = "Adressbuchwerkzeuge";
-App::$strings["Import addressbook"] = "Adressbuch importieren";
-App::$strings["Select an addressbook to import to"] = "Adressbuch zum Hineinimportieren auswählen";
 App::$strings["Planets Settings updated."] = "Planeten Einstellungen aktualisiert";
 App::$strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin";
 App::$strings["Planets Settings"] = "Planeten Einstellungen";
@@ -1932,10 +1939,10 @@ App::$strings["Post to WordPress by default"] = "Standardmäßig auf auf WordPre
 App::$strings["Forward comments (requires hubzilla_wp plugin)"] = "Kommentare weiterleiten (benötigt hubzilla_wp Plugin)";
 App::$strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen";
 App::$strings["Wordpress Settings saved."] = "Wordpress-Einstellungen gespeichert.";
-App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "";
+App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbausteinen, die Du hier unterhalb einträgst, und faltet alle Beiträge zusammen, in denen es diese Bausteine findet. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Es gilt als höflich und empfohlen, den #NSFW Tag für Beiträge zu verwenden, bei denen Du davon ausgehen kannst, dass andere sie anstößig finden könnten. Du kannst aber auch beliebige andere Wörter in der Liste angeben und das Plugin so als allgemeinen Inhaltsfilter verwenden.";
 App::$strings["Enable Content filter"] = "Inhaltsfilter aktivieren";
 App::$strings["Comma separated list of keywords to hide"] = "Kommaseparierte Liste von Schlüsselworten die verborgen werden sollen.";
-App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "";
+App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "Wort, /regular-expression/, lang=xx, lang!=xx";
 App::$strings["Not Safe For Work Settings"] = "Not Safe For Work Einstellungen";
 App::$strings["General Purpose Content Filter"] = "Allzweck-Inhaltsfilter";
 App::$strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert.";
@@ -1962,9 +1969,9 @@ App::$strings["Dreamwidth username"] = "Dreamwidth-Benutzername";
 App::$strings["Dreamwidth password"] = "Dreamwidth-Passwort";
 App::$strings["Post to Dreamwidth by default"] = "Standardmäßig auf auf Dreamwidth posten";
 App::$strings["Dreamwidth Post Settings"] = "Dreamwidth-Beitragseinstellungen";
-App::$strings["Install Firefox Sharing Tools"] = "";
+App::$strings["Install Firefox Sharing Tools"] = "Installiere das Firefox Sharing Werkzeug";
 App::$strings["Share content from Firefox to \$Projectname"] = "Inhalte von Firefox nach \$Projectname teilen";
-App::$strings["Install Firefox Sharing Tools to this web browser"] = "";
+App::$strings["Install Firefox Sharing Tools to this web browser"] = "Installiere das Firefox Sharing Werkzeug in diesen Webbrowser";
 App::$strings["Hubzilla Directory Stats"] = "Hubzilla-Verzeichnisstatistiken";
 App::$strings["Total Hubs"] = "Hubs insgesamt";
 App::$strings["Hubzilla Hubs"] = "Hubzilla Hubs";
@@ -2077,13 +2084,15 @@ App::$strings["bonk"] = "";
 App::$strings["bonked"] = "";
 App::$strings["declare undying love for"] = "";
 App::$strings["declared undying love for"] = "";
-App::$strings["Diaspora Protocol Settings updated."] = "";
-App::$strings["Enable the Diaspora protocol for this channel"] = "";
-App::$strings["Allow any Diaspora member to comment on your public posts"] = "";
-App::$strings["Prevent your hashtags from being redirected to other sites"] = "";
-App::$strings["Followed hashtags (comma separated, do not include the #)"] = "";
-App::$strings["Diaspora Protocol Settings"] = "";
-App::$strings["No username found in import file."] = "";
+App::$strings["Diaspora Protocol Settings updated."] = "Diaspora Protokoll Einstellungen aktualisiert";
+App::$strings["The Diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Das Diaspora-Protokoll unterstützt keine Server-unabhängigen Identitäten. Verbindungen, die Du mit diesem Netzwerk eingehst, können von anderen Orten (Klonen) dieses Kanals aus unerreichbar sein.";
+App::$strings["Enable the Diaspora protocol for this channel"] = "Das Diaspora Protokoll für diesen Kanal aktivieren";
+App::$strings["Allow any Diaspora member to comment on your public posts"] = "Erlaube jedem Diaspora Nutzer deine öffentlichen Beiträge zu kommentieren";
+App::$strings["Prevent your hashtags from being redirected to other sites"] = "Verhindern, dass Deine Hashtags zu anderen Seiten umgeleitet werden";
+App::$strings["Sign and forward posts and comments with no existing Diaspora signature"] = "Signieren und Weiterleiten von Beiträgen und Kommentaren ohne vorhandene Diaspora-Signatur";
+App::$strings["Followed hashtags (comma separated, do not include the #)"] = "Verfolgte Hashtags (Komma separierte Liste, ohne die #)";
+App::$strings["Diaspora Protocol Settings"] = "Diaspora Protokoll Einstellungen";
+App::$strings["No username found in import file."] = "Es wurde kein Nutzername in der importierten Datei gefunden.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Import ist fehlgeschlagen.";
 App::$strings["Error retrieving wiki"] = "Fehler beim Abrufen des Wiki";
 App::$strings["Error creating zip file export folder"] = "Fehler bei der Erzeugung des Zip-Datei Export-Verzeichnisses ";
@@ -2113,10 +2122,6 @@ App::$strings["Mail sent."] = "Mail gesendet.";
 App::$strings["Sending of mail failed."] = "Senden der E-Mail fehlgeschlagen.";
 App::$strings["Mail Test"] = "Mail Test";
 App::$strings["Message subject"] = "Betreff der Nachricht";
-App::$strings["Reconnecting %d connections"] = "";
-App::$strings["Diaspora Reconnect"] = "";
-App::$strings["Use this form to re-establish Diaspora connections which were initially made from a different hub."] = "";
-App::$strings["Reconnect"] = "";
 App::$strings["View Larger"] = "Größer anzeigen";
 App::$strings["Tile Server URL"] = "Kachelserver-URL";
 App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Kachelserver</a>";
@@ -2136,7 +2141,7 @@ App::$strings["Friendica API Path"] = "Friendica-API-Pfad";
 App::$strings["https://{sitename}/api"] = "https://{sitename}/api";
 App::$strings["Friendica login name"] = "Friendica-Anmeldename";
 App::$strings["Friendica password"] = "Friendica-Passwort";
-App::$strings["Hubzilla to Friendica Post Settings"] = "";
+App::$strings["Hubzilla to Friendica Post Settings"] = "Hubzilla-zu-Friendica Beitragseinstellungen";
 App::$strings["Status:"] = "Status:";
 App::$strings["Activate addon"] = "Addon aktiviren";
 App::$strings["Hide Jappixmini Chat-Widget from the webinterface"] = "Jappix Mini Chat-Widget von der Weboberfläche verbergen";
@@ -2146,7 +2151,7 @@ App::$strings["Jabber BOSH host URL"] = "Jabber BOSH Host URL";
 App::$strings["Jabber password"] = "Jabber-Passwort";
 App::$strings["Encrypt Jabber password with Hubzilla password"] = "Jabber-Passwort mit Hubzilla-Passwort verschlüsseln";
 App::$strings["Hubzilla password"] = "Hubzilla-Passwort";
-App::$strings["Approve subscription requests from Hubzilla contacts automatically"] = "";
+App::$strings["Approve subscription requests from Hubzilla contacts automatically"] = "Verbindungsanfragen von Hubzilla-Kontakten automatisch annehmen";
 App::$strings["Purge internal list of jabber addresses of contacts"] = "Interne Liste der Jabber Adressen von Kontakten löschen";
 App::$strings["Configuration Help"] = "Konfigurationshilfe";
 App::$strings["Jappix Mini Settings"] = "Jappix Mini Einstellungen";
@@ -2155,10 +2160,10 @@ App::$strings["No channels currently blocked"] = "Momentan sind keine Kanäle bl
 App::$strings["\"Superblock\" Settings"] = "\"Superblock\"-Einstellungen";
 App::$strings["Block Completely"] = "Vollständig blockieren";
 App::$strings["superblock settings updated"] = "Superblock Einstellungen aktualisiert";
-App::$strings["Federate"] = "";
+App::$strings["Federate"] = "Beitrag verteilen";
 App::$strings["nofed Settings saved."] = "nofed Einstellungen gespeichert";
-App::$strings["Allow Federation Toggle"] = "";
-App::$strings["Federate posts by default"] = "";
+App::$strings["Allow Federation Toggle"] = "Umschalter zur Beitragsverteilung bereitstellen";
+App::$strings["Federate posts by default"] = "Beiträge standardmäßig verteilen";
 App::$strings["NoFed Settings"] = "NoFed-Einstellungen";
 App::$strings["Post to Red"] = "";
 App::$strings["Channel is required."] = "Kanal ist erforderlich.";
@@ -2269,10 +2274,10 @@ App::$strings["Enable notifications"] = "Benachrichtigungen aktivieren";
 App::$strings["Post to Twitter"] = "Bei Twitter veröffentlichen";
 App::$strings["Twitter settings updated."] = "Twitter-Einstellungen aktualisiert.";
 App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Es wurde kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte kontaktiere deinen Seiten-Administrator.";
-App::$strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "";
+App::$strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Auf diesem Hubzilla-Server ist das Twitter-Plugin aktiviert, aber Du hast Dich hier noch nicht mit Deinem Twitter-Konto verbunden. Um dies zu tun, klicke die Schaltfläche unten, um eine PIN von Twitter zu erhalten, die Du dann in das Eingabefeld darunter einfügen und das Formular bestätigen musst. Nur Deine <strong>öffentlichen</strong> Beiträge werden auf Twitter geteilt.";
 App::$strings["Log in with Twitter"] = "Mit Twitter anmelden";
 App::$strings["Copy the PIN from Twitter here"] = "PIN von Twitter hier her kopieren";
-App::$strings["<strong>Note:</strong> Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
+App::$strings["<strong>Note:</strong> Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis:</strong> Entsprechend Deiner Privatsphären-Einstellungen (<em>Profil-Details vor nicht angemeldeten Besuchern verbergen?</em>) kann ein ggf. zu Twitter geteilter Link Besucher auf eine leere Seite führen, die darüber informiert, dass der Zugriff zu Deinem Profil eingeschränkt ist.";
 App::$strings["Allow posting to Twitter"] = "Erlaube die Veröffentlichung bei Twitter";
 App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden.";
 App::$strings["Send public postings to Twitter by default"] = "Standardmäßig öffentliche Beiträge bei Twitter veröffentlichen";
@@ -2326,7 +2331,7 @@ App::$strings["If you see this icon you can be sure that the sender is who it sa
 App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "Vorsicht! Es kann sein, dass jemand versucht, eine Nachricht zu fälschen! Diese Nachricht muss nicht unbedingt vom angegebenen Absender stammen!";
 App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.</p><p>You can also advance by pressing the return key"] = "Willkommen zu Hubzilla! Möchtest Du eine Tour der Benutzeroberfläche angezeigt bekommen?</p><p>Du kannst zu jeder Zeit pausieren und fortsetzen, wo Du aufgehört hast, indem Du die Seite neu lädtst, oder zu einer anderen Seite springst.</p><p>Du kannst auc durch das Drücken der Enter-Taste weitergehen.";
 App::$strings["Extended Identity Sharing"] = "Erweitertes Teilen von Identitäten";
-App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "";
+App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Hubzilla-Servern geteilt.";
 App::$strings["Three Dimensional Tic-Tac-Toe"] = "Dreidimensionales Tic-Tac-Toe";
 App::$strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
 App::$strings["New game"] = "Neues Spiel";
@@ -2342,6 +2347,10 @@ App::$strings["I won!"] = "Ich habe gewonnen!";
 App::$strings["Message to display on every page on this server"] = "Nachricht, die auf jeder Seite dieses Servers angezeigt werden soll";
 App::$strings["Pageheader Settings"] = "Nachrichtenkopf-Einstellungen";
 App::$strings["pageheader Settings saved."] = "Nachrichtenkopf-Einstellungen gespeichert.";
+App::$strings["Only authenticate automatically to sites of your friends"] = "Authentifiziere Dich nur auf Seiten deiner Freunde automatisch";
+App::$strings["By default you are automatically authenticated anywhere in the network"] = "Authentifiziere Dich standardmäßig bei allen Seiten im Netzwerk automatisch";
+App::$strings["Authchoose Settings"] = "Einstellungen für automatische Authentifizierung";
+App::$strings["Atuhchoose Settings updated."] = "Einstellungen für automatische Authentifizierung aktualisiert.";
 App::$strings["lonely"] = "einsam";
 App::$strings["drunk"] = "betrunken";
 App::$strings["horny"] = "geil";
@@ -2390,6 +2399,8 @@ App::$strings["Pump.io Post Settings"] = "Pump.io-Beitragseinstellungen";
 App::$strings["PumpIO Settings saved."] = "PumpIO-Einstellungen gespeichert.";
 App::$strings["An account has been created for you."] = "Ein Konto wurde für Sie erstellt.";
 App::$strings["Authentication successful but rejected: account creation is disabled."] = "Authentifizierung war erfolgreich wurde aber abgewiesen! Das Anlegen von Accounts wurde deaktiviert.";
+App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Suche %1\$s (%2\$s)";
+App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
 App::$strings["Search \$Projectname"] = "\$Projectname suchen";
 App::$strings["Redmatrix File Storage Import"] = "";
 App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Hiermit werden alle deine Daten aus der Redmatrix Cloud in diesen Kanal importiert.";
@@ -2551,19 +2562,6 @@ App::$strings["__ctx:noun__ Abstain"] = array(
 	0 => "Enthaltung",
 	1 => "Enthaltungen",
 );
-App::$strings["Can view my normal stream and posts"] = "Kann meine normalen Beiträge sehen";
-App::$strings["Can view my webpages"] = "Kann meine Webseiten sehen";
-App::$strings["Can post on my channel page (\"wall\")"] = "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen";
-App::$strings["Can like/dislike stuff"] = "Kann andere Elemente mögen/nicht mögen";
-App::$strings["Profiles and things other than posts/comments"] = "Profile und alles außer Beiträge und Kommentare";
-App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten";
-App::$strings["Advanced - useful for creating group forum channels"] = "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen";
-App::$strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
-App::$strings["Can write to my file storage and photos"] = "Kann in meine Datei- und Bilderordner schreiben";
-App::$strings["Can edit my webpages"] = "Kann meine Webseiten bearbeiten";
-App::$strings["Somewhat advanced - very useful in open communities"] = "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften";
-App::$strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
-App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust";
 App::$strings["Directory Options"] = "Verzeichnisoptionen";
 App::$strings["Safe Mode"] = "Sicherer Modus";
 App::$strings["Public Forums Only"] = "Nur öffentliche Foren";
@@ -2634,11 +2632,13 @@ App::$strings["Unknown Attachment"] = "Unbekannter Anhang";
 App::$strings["unknown"] = "unbekannt";
 App::$strings["remove category"] = "Kategorie entfernen";
 App::$strings["remove from file"] = "aus der Datei entfernen";
+App::$strings["Download binary/encrypted content"] = "Binären/verschlüsselten Inhalt herunterladen";
 App::$strings["default"] = "Standard";
 App::$strings["Page layout"] = "Seiten-Layout";
 App::$strings["You can create your own with the layouts tool"] = "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen";
 App::$strings["Page content type"] = "Art des Seiteninhalts";
 App::$strings["activity"] = "Aktivität";
+App::$strings["a-z, 0-9, -, _, and . only"] = "nur a-z, 0-9, -, _, und .";
 App::$strings["Design Tools"] = "Gestaltungswerkzeuge";
 App::$strings["Pages"] = "Seiten";
 App::$strings["Import website..."] = "Webseite importieren...";
@@ -2672,11 +2672,7 @@ App::$strings["%d connection in common"] = array(
 	1 => "%d gemeinsame Verbindungen",
 );
 App::$strings["show more"] = "mehr zeigen";
-App::$strings["Attachments:"] = "Anhänge:";
-App::$strings["l F d, Y \\@ g:i A"] = "l, d. F Y, H:i";
-App::$strings["\$Projectname event notification:"] = "";
-App::$strings["Starts:"] = "Beginnt:";
-App::$strings["Finishes:"] = "Endet:";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
 App::$strings["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert ";
 App::$strings["Channel location missing."] = "Adresse des Kanals fehlt.";
 App::$strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
@@ -2711,7 +2707,7 @@ App::$strings["about an hour"] = "ungefähr eine Stunde";
 App::$strings["about %d hours"] = "ungefähr %d Stunden";
 App::$strings["a day"] = "ein Tag";
 App::$strings["%d days"] = "%d Tage";
-App::$strings["about a month"] = "ungefähr ein Monat";
+App::$strings["about a month"] = "ungefähr einen Monat";
 App::$strings["%d months"] = "%d Monate";
 App::$strings["about a year"] = "ungefähr ein Jahr";
 App::$strings["%d years"] = "%d Jahre";
@@ -2793,11 +2789,13 @@ App::$strings["Reserved nickname. Please choose another."] = "Reservierter Kurzn
 App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
 App::$strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
 App::$strings["Default Profile"] = "Standard-Profil";
+App::$strings["Unable to retrieve modified identity"] = "Geänderte Identität kann nicht empfangen werden";
 App::$strings["Create New Profile"] = "Neues Profil erstellen";
 App::$strings["Visible to everybody"] = "Für jeden sichtbar";
 App::$strings["Gender:"] = "Geschlecht:";
 App::$strings["Homepage:"] = "Homepage:";
 App::$strings["Online Now"] = "gerade online";
+App::$strings["Trans"] = "";
 App::$strings["Like this channel"] = "Dieser Kanal gefällt mir";
 App::$strings["j F, Y"] = "j. F Y";
 App::$strings["j F"] = "j. F";
@@ -2821,25 +2819,31 @@ App::$strings["Work/employment:"] = "Arbeit/Anstellung:";
 App::$strings["School/education:"] = "Schule/Ausbildung:";
 App::$strings["Like this thing"] = "Gefällt mir";
 App::$strings["User '%s' deleted"] = "Benutzer '%s' gelöscht";
+App::$strings["l F d, Y \\@ g:i A"] = "l, d. F Y, H:i";
+App::$strings["Starts:"] = "Beginnt:";
+App::$strings["Finishes:"] = "Endet:";
 App::$strings["This event has been added to your calendar."] = "Dieser Termin wurde zu Deinem Kalender hinzugefügt";
 App::$strings["Not specified"] = "Keine Angabe";
 App::$strings["Needs Action"] = "Aktion erforderlich";
 App::$strings["Completed"] = "Abgeschlossen";
 App::$strings["In Process"] = "In Bearbeitung";
 App::$strings["Cancelled"] = "gestrichen";
+App::$strings["Home, Voice"] = "Zuhause, Sprache";
+App::$strings["Home, Fax"] = "Zuhause, Fax";
+App::$strings["Work, Voice"] = "Arbeit, Sprache";
+App::$strings["Work, Fax"] = "Arbeit, Fax";
 App::$strings["view full size"] = "In Vollbildansicht anschauen";
-App::$strings["No Subject"] = "Kein Betreff";
 App::$strings["Friendica"] = "Friendica";
 App::$strings["OStatus"] = "OStatus";
 App::$strings["GNU-Social"] = "GNU-Social";
 App::$strings["RSS/Atom"] = "RSS/Atom";
+App::$strings["ActivityPub"] = "ActivityPub";
 App::$strings["Diaspora"] = "Diaspora";
 App::$strings["Facebook"] = "Facebook";
 App::$strings["Zot"] = "Zot!";
 App::$strings["LinkedIn"] = "LinkedIn";
 App::$strings["XMPP/IM"] = "XMPP/IM";
 App::$strings["MySpace"] = "MySpace";
-App::$strings["New Page"] = "Neue Seite";
 App::$strings["Select an alternate language"] = "Wähle eine alternative Sprache";
 App::$strings["Who can see this?"] = "Wer kann das sehen?";
 App::$strings["Custom selection"] = "Benutzerdefinierte Auswahl";
@@ -2852,7 +2856,6 @@ App::$strings["Image/photo"] = "Bild/Foto";
 App::$strings["Encrypted content"] = "Verschlüsselter Inhalt";
 App::$strings["Install %s element: "] = "Element %s installieren: ";
 App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
 App::$strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
 App::$strings["spoiler"] = "Spoiler";
 App::$strings["$1 wrote:"] = "$1 schrieb:";
@@ -3015,6 +3018,7 @@ App::$strings["Mark all channel notifications seen"] = "Markiere alle Kanal-Bena
 App::$strings["Notices"] = "Benachrichtigungen";
 App::$strings["Notifications"] = "Benachrichtigungen";
 App::$strings["View all notifications"] = "Alle Benachrichtigungen ansehen";
+App::$strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gesehen";
 App::$strings["Private mail"] = "Persönliche Mail";
 App::$strings["View your private messages"] = "Zeige Deine persönlichen Nachrichten an";
 App::$strings["Mark all private messages seen"] = "Markiere alle persönlichen Nachrichten als gesehen";
@@ -3023,10 +3027,16 @@ App::$strings["View events"] = "Termine ansehen";
 App::$strings["Mark all events seen"] = "Markiere alle Termine als gesehen";
 App::$strings["Manage Your Channels"] = "Verwalte Deine Kanäle";
 App::$strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen";
+App::$strings["Shared Files"] = "Geteilte Dateien";
+App::$strings["New files shared with me"] = "Neue Dateien, die mit mir geteilt wurden";
+App::$strings["Public stream"] = "Öffentlicher Beitrags-Stream";
+App::$strings["Public stream activities"] = "Öffentliche Netzwerk-Aktivitäten";
 App::$strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
 App::$strings["@name, #tag, ?doc, content"] = "@Name, #Schlagwort, ?Dokumentation, Inhalt";
 App::$strings["Please wait..."] = "Bitte warten...";
 App::$strings["Add Apps"] = "Apps hinzufügen";
+App::$strings["Arrange Apps"] = "Apps anordnen";
+App::$strings["Toggle System Apps"] = "System-Apps umschalten";
 App::$strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Webseitenlimit von %lu Bytes";
 App::$strings["Image file is empty."] = "Bilddatei ist leer.";
 App::$strings["Photo storage failed."] = "Fotospeicherung fehlgeschlagen.";
-- 
cgit v1.2.3


From 57602647efe1a3f8ae22651366eaa59b1b1334e8 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sat, 12 Aug 2017 22:29:57 +0200
Subject: minor js and css changes

---
 view/js/main.js          | 16 +++++++++++-----
 view/tpl/search_item.tpl |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index 61a37aa99..8f981fe31 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -21,15 +21,20 @@ function commentOpenUI(obj, id) {
 }
 
 function commentCloseUI(obj, id) {
-	$(document).unbind( "click.commentClose", handler );
+	var form_id = $(obj)[0].form.id;
+
+	$('#' + form_id).on('click', function(e) {
+		$(document).unbind( "click.commentClose", handler );
+	});
 
 	var handler = function() {
-		if(obj.value === '') {
-		obj.value = aStr.comment;
+		if($('#comment-edit-text-' + id).val() === '') {
+			$('#comment-edit-text-' + id).val(aStr.comment);
 			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty");
 			$("#comment-edit-text-" + id).removeAttr('tabindex');
 			$("#comment-edit-submit-" + id).removeAttr('tabindex');
 			$("#comment-tools-" + id).hide();
+			$("#comment-edit-anon-" + id).hide();
 		}
 	};
 
@@ -42,8 +47,8 @@ function commentOpen(obj, id) {
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 		$("#mod-cmnt-wrap-" + id).show();
+		$("#comment-tools-" + id).show();
 		$("#comment-edit-anon-" + id).show();
-		openMenu("comment-tools-" + id);
 		return true;
 	}
 	return false;
@@ -55,7 +60,8 @@ function commentClose(obj, id) {
 		$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
 		$("#mod-cmnt-wrap-" + id).hide();
-		closeMenu("comment-tools-" + id);
+		$("#comment-tools-" + id).hide();
+		$("#comment-edit-anon-" + id).hide();
 		return true;
 	}
 	return false;
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 4ca6378b8..aaafe9797 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -105,8 +105,8 @@
 				{{if $item.mode === 'moderate'}}
 
 				<div class="wall-item-tools-left btn-group">
-					<a href="moderate/{{$item.id}}/approve" class="btn btn-outline-secondary btn-small">{{$item.approve}}</a>
-					<a href="moderate/{{$item.id}}/drop" class="btn btn-outline-secondary btn-small">{{$item.delete}}</a>
+					<a href="moderate/{{$item.id}}/approve" class="btn btn-success btn-sm">{{$item.approve}}</a>
+					<a href="moderate/{{$item.id}}/drop" class="btn btn-danger btn-sm">{{$item.delete}}</a>
 
 				</div>
 
-- 
cgit v1.2.3


From 289161aad140623be21933aaf90214129f1b027c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 13 Aug 2017 19:44:26 -0700
Subject: contact_slider.tpl didn't get updated with one of the bootstrap
 changes where 'in' was renamed to 'show'

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

(limited to 'view')

diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl
index 550abc147..0848df673 100755
--- a/view/tpl/contact_slider.tpl
+++ b/view/tpl/contact_slider.tpl
@@ -4,10 +4,10 @@ $(document).ready(function() {
 	// The slider does not render correct if width is given in % and
 	// the slider container is hidden (display: none) during rendering.
 	// So let's unhide it to render and hide again afterwards.
-	if(!$("#affinity-tool-collapse").hasClass("in")) {
-		$("#affinity-tool-collapse").addClass("in");
+	if(!$("#affinity-tool-collapse").hasClass("show")) {
+		$("#affinity-tool-collapse").addClass("show");
 		makeContactSlider();
-		$("#affinity-tool-collapse").removeClass("in");
+		$("#affinity-tool-collapse").removeClass("show");
 	}
 	else {
 		makeContactSlider();
-- 
cgit v1.2.3