From c8a7c95279a94223efe80a2e0fb19f1a2584a108 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 14 Feb 2019 22:11:00 -0500
Subject: [PATCH 001/145] Unescape $ispublic variable for jot display

---
 view/templates/jot-header.tpl                | 2 +-
 view/templates/photos_head.tpl               | 2 +-
 view/templates/settings/head.tpl             | 2 +-
 view/theme/frio/templates/jot-header.tpl     | 2 +-
 view/theme/frio/templates/photos_head.tpl    | 2 +-
 view/theme/smoothly/templates/jot-header.tpl | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/view/templates/jot-header.tpl b/view/templates/jot-header.tpl
index bf0c99d3a..f169b0921 100644
--- a/view/templates/jot-header.tpl
+++ b/view/templates/jot-header.tpl
@@ -42,7 +42,7 @@ function enableOnUser(){
 </script>
 <script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>
 <script>
-	var ispublic = '{{$ispublic}}';
+	var ispublic = '{{$ispublic nofilter}}';
 
 
 	$(document).ready(function() {
diff --git a/view/templates/photos_head.tpl b/view/templates/photos_head.tpl
index 16fcb568d..88fd067c8 100644
--- a/view/templates/photos_head.tpl
+++ b/view/templates/photos_head.tpl
@@ -2,7 +2,7 @@
 
 <script>
 
-	var ispublic = "{{$ispublic}}";
+	var ispublic = "{{$ispublic nofilter}}";
 
 
 	$(document).ready(function() {
diff --git a/view/templates/settings/head.tpl b/view/templates/settings/head.tpl
index a5558ddce..f1229a5aa 100644
--- a/view/templates/settings/head.tpl
+++ b/view/templates/settings/head.tpl
@@ -1,7 +1,7 @@
 
 
 <script>
-	var ispublic = "{{$ispublic}}";
+	var ispublic = "{{$ispublic nofilter}}";
 
 
 	$(document).ready(function() {
diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl
index ac59caed8..db2c9afeb 100644
--- a/view/theme/frio/templates/jot-header.tpl
+++ b/view/theme/frio/templates/jot-header.tpl
@@ -40,7 +40,7 @@
 </script>
 
 <script type="text/javascript">
-	var ispublic = '{{$ispublic}}';
+	var ispublic = '{{$ispublic nofilter}}';
 	aStr.linkurl = '{{$linkurl}}';
 
 
diff --git a/view/theme/frio/templates/photos_head.tpl b/view/theme/frio/templates/photos_head.tpl
index 37a8e0496..965245aea 100644
--- a/view/theme/frio/templates/photos_head.tpl
+++ b/view/theme/frio/templates/photos_head.tpl
@@ -1,5 +1,5 @@
 
 <script type="text/javascript" src="view/theme/frio/js/mod_photos.js"></script>
 <script type="text/javascript">
-	var ispublic = "{{$ispublic}}";
+	var ispublic = "{{$ispublic nofilter}}";
 </script>
diff --git a/view/theme/smoothly/templates/jot-header.tpl b/view/theme/smoothly/templates/jot-header.tpl
index 632481ce5..b549f1840 100644
--- a/view/theme/smoothly/templates/jot-header.tpl
+++ b/view/theme/smoothly/templates/jot-header.tpl
@@ -52,7 +52,7 @@ function enableOnUser(){
 </script>
 
 <script>
-	var ispublic = '{{$ispublic}}';
+	var ispublic = '{{$ispublic nofilter}}';
 
 	$(document).ready(function() {
 

From 642f9409a77e839cd23a6aec7de5965d617f3e68 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 14 Feb 2019 22:17:08 -0500
Subject: [PATCH 002/145] Switch tag of expanded like list to paragraph

---
 include/conversation.php                      | 3 +--
 view/global.css                               | 9 +++++++++
 view/theme/frio/templates/voting_fakelink.tpl | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 view/theme/frio/templates/voting_fakelink.tpl

diff --git a/include/conversation.php b/include/conversation.php
index d7e3d5480..23a0dcbf2 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1082,10 +1082,9 @@ function format_like($cnt, array $arr, $type, $id) {
 				break;
 		}
 
-		$expanded .= "\t" . '<div class="wall-item-' . $type . '-expanded" id="' . $type . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</div>';
+		$expanded .= "\t" . '<p class="wall-item-' . $type . '-expanded" id="' . $type . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</p>';
 	}
 
-	$phrase .= EOL;
 	$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
 		'$phrase' => $phrase,
 		'$type' => $type,
diff --git a/view/global.css b/view/global.css
index 6b0f38a07..afab5d903 100644
--- a/view/global.css
+++ b/view/global.css
@@ -90,6 +90,15 @@ span.connector {
   margin-right: 0px;
 }
 
+
+.wall-item-like-expanded,
+.wall-item-dislike-expanded,
+.wall-item-attendyes-expanded,
+.wall-item-attendno-expanded,
+.wall-item-attendmaybe-expanded {
+  margin: 0;
+}
+
 .type-link blockquote, .type-video blockquote {
   margin-left: 0px;
   max-height: 160px;
diff --git a/view/theme/frio/templates/voting_fakelink.tpl b/view/theme/frio/templates/voting_fakelink.tpl
new file mode 100644
index 000000000..b55f8fa04
--- /dev/null
+++ b/view/theme/frio/templates/voting_fakelink.tpl
@@ -0,0 +1,2 @@
+
+<p>{{$phrase nofilter}}</p>

From d7dbc632f8dba9b9f4f3e5c8dbf54bd69e8e67ab Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 14 Feb 2019 22:24:34 -0500
Subject: [PATCH 003/145] Improved comment hiding interaction

- Remove global window.showMore and window.showFewer
- Improve global showHideComments function
- Remove frio-specific showHideComments function
---
 src/App.php                                   |  2 --
 src/Object/Post.php                           |  7 ++++---
 view/js/main.js                               | 12 ++++++-----
 view/templates/head.tpl                       |  3 ---
 view/templates/wall_thread.tpl                |  9 +++++++--
 view/theme/frio/js/theme.js                   | 13 ------------
 view/theme/frio/templates/head.tpl            |  5 -----
 view/theme/frio/templates/wall_thread.tpl     | 13 +++++++-----
 view/theme/quattro/templates/wall_thread.tpl  | 20 +++++++------------
 view/theme/smoothly/templates/wall_thread.tpl | 10 +++++++---
 view/theme/vier/templates/wall_thread.tpl     | 13 ++++++------
 11 files changed, 47 insertions(+), 60 deletions(-)

diff --git a/src/App.php b/src/App.php
index 8068a1530..b9e22dd1b 100644
--- a/src/App.php
+++ b/src/App.php
@@ -663,8 +663,6 @@ class App
 			'$local_user'      => local_user(),
 			'$generator'       => 'Friendica' . ' ' . FRIENDICA_VERSION,
 			'$delitem'         => Core\L10n::t('Delete this item?'),
-			'$showmore'        => Core\L10n::t('show more'),
-			'$showfewer'       => Core\L10n::t('show fewer'),
 			'$update_interval' => $interval,
 			'$shortcut_icon'   => $shortcut_icon,
 			'$touch_icon'      => $touch_icon,
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 9fa9fcb50..05ffeb52b 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -415,6 +415,7 @@ class Post extends BaseObject
 			'dislike'         => $responses['dislike']['output'],
 			'responses'       => $responses,
 			'switchcomment'   => L10n::t('Comment'),
+			'reply_label'     => L10n::t('Reply to %s', $name_e),
 			'comment'         => $comment,
 			'previewing'      => $conv->isPreview() ? ' preview ' : '',
 			'wait'            => L10n::t('Please wait'),
@@ -449,13 +450,13 @@ class Post extends BaseObject
 			foreach ($children as $child) {
 				$result['children'][] = $child->getTemplateData($conv_responses, $thread_level + 1);
 			}
+
 			// Collapse
 			if (($nb_children > 2) || ($thread_level > 1)) {
 				$result['children'][0]['comment_firstcollapsed'] = true;
 				$result['children'][0]['num_comments'] = L10n::tt('%d comment', '%d comments', $total_children);
-				$result['children'][0]['hidden_comments_num'] = $total_children;
-				$result['children'][0]['hidden_comments_text'] = L10n::tt('comment', 'comments', $total_children);
-				$result['children'][0]['hide_text'] = L10n::t('show more');
+				$result['children'][0]['show_text'] = L10n::t('Show more');
+				$result['children'][0]['hide_text'] = L10n::t('Show fewer');
 				if ($thread_level > 1) {
 					$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
 				} else {
diff --git a/view/js/main.js b/view/js/main.js
index f81d7a423..c3d9cbed5 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -656,12 +656,14 @@ function preview_comment(id) {
 }
 
 function showHideComments(id) {
-	if ($("#collapsed-comments-" + id).is(":visible")) {
-		$("#collapsed-comments-" + id).hide();
-		$("#hide-comments-" + id).html(window.showMore);
+	if ($('#collapsed-comments-' + id).is(':visible')) {
+		$('#collapsed-comments-' + id).slideUp();
+		$('#hide-comments-' + id).hide();
+		$('#hide-comments-total-' + id).show();
 	} else {
-		$("#collapsed-comments-" + id).show();
-		$("#hide-comments-" + id).html(window.showFewer);
+		$('#collapsed-comments-' + id).slideDown();
+		$('#hide-comments-' + id).show();
+		$('#hide-comments-total-' + id).hide();
 	}
 }
 
diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index fa0088b8b..6f7ddffb2 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -146,9 +146,6 @@
 		$(obj).val("");
 	}
 
-	window.showMore = "{{$showmore}}";
-	window.showFewer = "{{$showfewer}}";
-
 	function showHideCommentBox(id) {
 		if ($("#comment-edit-form-" + id).is(":visible")) {
 			$("#comment-edit-form-" + id).hide();
diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl
index b3ed2af02..01cd7559f 100644
--- a/view/templates/wall_thread.tpl
+++ b/view/templates/wall_thread.tpl
@@ -1,7 +1,12 @@
 
 {{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+		<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
+			{{$item.num_comments}} - {{$item.show_text}}
+		</span>
+		<span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
+			{{$item.num_comments}} - {{$item.hide_text}}
+		</span>
 	</div>
 	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 {{/if}}
diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 0965f3a3e..83623bf34 100644
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -388,19 +388,6 @@ function showHide(theID) {
 	}
 }
 
-function showHideComments(id) {
-	if( $('#collapsed-comments-' + id).is(':visible')) {
-		$('#collapsed-comments-' + id).slideUp();
-		$('#hide-comments-' + id).html(window.showMore);
-		$('#hide-comments-total-' + id).show();
-	}
-	else {
-		$('#collapsed-comments-' + id).slideDown();
-		$('#hide-comments-' + id).html(window.showFewer);
-		$('#hide-comments-total-' + id).hide();
-	}
-}
-
 // Show & hide event map in the network stream by button click.
 function showHideEventMap(elm) {
 	// Get the id of the map element - it should be provided through
diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index e1805f744..b3c632b3d 100644
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -87,11 +87,6 @@
 {{/if}}
 <script type="text/javascript" src="view/theme/frio/js/textedit.js"></script>
 
-<script type="text/javascript">
-	window.showMore = "{{$showmore}}";
-	window.showFewer = "{{$showfewer}}";
-</script>
-
 {{* Include the strings which are needed for some js functions (e.g. translation)
 They are loaded into the html <head> so that js functions can use them *}}
 {{include file="js_strings.tpl"}}
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index c149b58a5..068f98136 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -41,12 +41,15 @@ as the value of $top_child_total (this is done at the end of this file)
 	{{if $item.thread_level<3}}
 		<div class="hide-comments-outer-wrapper">
 			<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
-				<span id="hide-comments-total-{{$item.id}}"
-					class="hide-comments-total">{{$item.num_comments}}</span>
-				<span id="hide-comments-{{$item.id}}"
-					class="hide-comments">{{$item.hide_text}}</span>
+				<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
+					<i class="fa fa-plus-square" aria-hidden="true"></i>
+					{{$item.num_comments}} - {{$item.show_text}}
+				</span>
+				<span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
+					<i class="fa fa-minus-square" aria-hidden="true"></i>
+					{{$item.num_comments}} - {{$item.hide_text}}
+				</span>
 			</div>
-			<hr />
 		</div>
 		<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 	{{else}}
diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl
index 1d2295278..a80aabf4b 100644
--- a/view/theme/quattro/templates/wall_thread.tpl
+++ b/view/theme/quattro/templates/wall_thread.tpl
@@ -1,19 +1,13 @@
 {{if $mode == display}}
 {{else}}
 {{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-		<span id="hide-comments-total-{{$item.id}}"
-			class="hide-comments-total">{{$item.num_comments}}</span>
-			<span id="hide-comments-{{$item.id}}"
-				class="hide-comments fakelink"
-				onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
-			{{if $item.thread_level==3}} -
-			<span id="hide-thread-{{$item}}-id"
-				class="fakelink"
-				onclick="showThread({{$item.id}});">expand</span> /
-			<span id="hide-thread-{{$item}}-id"
-				class="fakelink"
-				onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}}
+	<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+		<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
+			{{$item.num_comments}} - {{$item.show_text}}
+		</span>
+		<span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
+			{{$item.num_comments}} - {{$item.hide_text}}
+		</span>
 	</div>
 	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 {{/if}}
diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl
index a7e0f2010..08ff55767 100644
--- a/view/theme/smoothly/templates/wall_thread.tpl
+++ b/view/theme/smoothly/templates/wall_thread.tpl
@@ -1,8 +1,12 @@
 
 {{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-		<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
-		<span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+		<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
+			{{$item.num_comments}} - {{$item.show_text}}
+		</span>
+		<span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
+			{{$item.num_comments}} - {{$item.hide_text}}
+		</span>
 	</div>
 	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 {{/if}}
diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index 21ebcea38..37e01f75a 100644
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -2,12 +2,13 @@
 {{else}}
 {{if $item.comment_firstcollapsed}}
 	{{if $item.thread_level<3}}
-		<div class="hide-comments-outer">
-			<span id="hide-comments-total-{{$item.id}}"
-				class="hide-comments-total">{{$item.num_comments}}</span>
-			<span id="hide-comments-{{$item.id}}"
-				class="hide-comments fakelink"
-				onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+		<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+			<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
+				{{$item.num_comments}} - {{$item.show_text}}
+			</span>
+			<span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
+				{{$item.num_comments}} - {{$item.hide_text}}
+			</span>
 		</div>
 		<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 	{{else}}

From 281d6fe0559713949e5ec6c6f49e69bd8a38d319 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 14 Feb 2019 22:25:42 -0500
Subject: [PATCH 004/145] Remove superfluous call to focus() in global
 commentExpand() function

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

diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index 6f7ddffb2..e02e4e4da 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -88,7 +88,6 @@
 		$("#comment-edit-text-" + id).putCursorAtEnd();
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		$("#comment-edit-text-" + id).focus();
 		$("#mod-cmnt-wrap-" + id).show();
 		openMenu("comment-edit-submit-wrapper-" + id);
 		return true;

From ae3bf47019faf51422c80303e000643c8d655531 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 14 Feb 2019 22:26:18 -0500
Subject: [PATCH 005/145] Improve global open/close functions in main.js

---
 view/js/main.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/view/js/main.js b/view/js/main.js
index c3d9cbed5..3370d7ccd 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -17,25 +17,30 @@ function _resizeIframe(obj, desth) {
 }
 
 function openClose(theID) {
-	if (document.getElementById(theID).style.display == "block") {
-		document.getElementById(theID).style.display = "none"
-	} else {
-		document.getElementById(theID).style.display = "block"
+	var el = document.getElementById(theID);
+	if (el) {
+		if (window.getComputedStyle(el).display === "none") {
+			openMenu(theID);
+		} else {
+			closeMenu(theID);
+		}
 	}
 }
 
 function openMenu(theID) {
 	var el = document.getElementById(theID);
-
 	if (el) {
-		el.style.display = "block";
+		if (!el.dataset.display) {
+			el.dataset.display = 'block';
+		}
+		el.style.display = el.dataset.display;
 	}
 }
 
 function closeMenu(theID) {
-	var el = document.getElementById(theID)
-
+	var el = document.getElementById(theID);
 	if (el) {
+		el.dataset.display = window.getComputedStyle(el).display;
 		el.style.display = "none";
 	}
 }

From 2dd7a52b17d3aef36aec06669dfe42c1014adaf1 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 14 Feb 2019 22:28:38 -0500
Subject: [PATCH 006/145] [frio] Thread display redesign

- Add fake form at end of comment list
- Shuffle comment box buttons around using flex display
- Convert divs into paragraphs
- Remove unused commentInsert() and qCommentInsert() function from textedit.js
---
 view/theme/frio/css/style.css              |  56 ++++++----
 view/theme/frio/js/textedit.js             | 117 +++++++++------------
 view/theme/frio/templates/comment_item.tpl | 100 ++++++++----------
 view/theme/frio/templates/search_item.tpl  |  29 +++--
 view/theme/frio/templates/wall_thread.tpl  |  73 ++++++-------
 5 files changed, 178 insertions(+), 197 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index f213123fb..1caaba9b9 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1669,7 +1669,13 @@ aside .panel-body {
 
 /* wall items */
 .wall-item-container {
-    position: relative;
+    background-color: rgba(0, 0, 0, 0.03);
+    padding: 0.5em;
+    border-top: 1px solid rgba(255, 255, 255, 0.8);
+}
+
+.wall-item-container .media {
+    margin-top: 0;
 }
 
 /* wall items contact photo */
@@ -1914,12 +1920,13 @@ code > .hl-main {
 
 /* item social action buttons */
 .wall-item-actions {
-    margin-top: 15px;
+    display: flex;
+    margin: .5em 0;
+    justify-content: space-between;
 }
-.wall-item-actions, .wall-item-actions a, .wall-item-actions button {
+.wall-item-actions a, .wall-item-actions button {
     font-size: 13px;
     color: #555;
-    margin-bottom: 0;
 }
 .wall-item-actions .active {
     font-weight: bold;
@@ -2013,9 +2020,10 @@ code > .hl-main {
     position: relative!important;
     margin-top: 0;
 }
-.hide-comments-outer-wrapper {
-/*    text-align: center;
-    margin-top: -18px;*/
+.hide-comments-outer {
+    background-color: rgba(0, 0, 0, 0.03);
+    padding: 0.5em;
+    border-radius: 0.5em 0.5em 0 0;
 }
 .hide-comments-total {
     cursor: pointer;
@@ -2024,21 +2032,31 @@ code > .hl-main {
 /*
 * Comment Box
 */
-.thread_level_2 .wall-item-comment-wrapper {
-    padding-right: 5px;
+
+.comment-fake-form,
+.wall-item-comment-wrapper {
+    padding: 10px;
+    border-top: 1px solid rgba(255, 255, 255, 0.8);
+    background-color: rgba(0, 0, 0, 0.03);
+    border-radius: 0 0 10px 10px;
 }
+
+.comment-fake-form {
+    border-color: #d9d9d9;
+}
+
+.comment-container .wall-item-comment-wrapper {
+    margin-top: 0.5em;
+}
+
 .comment-edit-submit-wrapper {
-    margin-bottom: 25px;
+    display: flex;
+    justify-content: flex-end;
 }
-.comment-edit-submit-wrapper a,
-.comment-edit-submit-wrapper a:hover {
-    padding-top: 5px !important;
-    padding-bottom: 5px !important;
-}
-.comment-icon-list > li > .icon,
-.comment-icon-list > li > .icon:hover {
-    color: #555;
-    background-color: transparent;
+
+.comment-icon-list {
+    display: flex;
+    justify-content: space-between;
 }
 
 /* acpopup  + textcompletion*/
diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js
index e0c06af58..93d7fe8ce 100644
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@@ -82,7 +82,8 @@ function insertFormatting(BBcode, id) {
 	if (tmpStr == '') {
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		openMenu("comment-edit-submit-wrapper-" + id);
+		closeMenu("comment-fake-form-" + id);
+		openMenu("item-comments-" + id);
 	}
 
 	textarea = document.getElementById("comment-edit-text-" + id);
@@ -134,115 +135,99 @@ function cmtBbClose(id) {
 	$("#comment-edit-bb-" + id).hide();
 }
 
-function commentExpand(id) {
-	$("#comment-edit-text-" + id).putCursorAtEnd();
-	$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-	$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-	$("#comment-edit-text-" + id).focus();
+function commentExpand(id)
+{
 	$("#mod-cmnt-wrap-" + id).show();
-	openMenu("comment-edit-submit-wrapper-" + id);
+	closeMenu("comment-fake-form-" + id);
+	openMenu("item-comments-" + id);
+	$("#comment-edit-text-" + id)
+		.putCursorAtEnd()
+		.addClass("comment-edit-text-full")
+		.removeClass("comment-edit-text-empty");
+
 	return true;
 }
 
-function commentClose(obj, id) {
-	if (obj.value == '') {
-		$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
-		$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+function commentClose(obj, id)
+{
+	if (obj.value === '' || obj.value === obj.dataset.default) {
+		$("#comment-edit-text-" + id)
+			.removeClass("comment-edit-text-full")
+			.addClass("comment-edit-text-empty");
 		$("#mod-cmnt-wrap-" + id).hide();
-		closeMenu("comment-edit-submit-wrapper-" + id);
+		openMenu("comment-fake-form-" + id);
+		closeMenu("item-comments-" + id);
 		return true;
 	}
 	return false;
 }
 
 function showHideCommentBox(id) {
-	if ($('#comment-edit-form-' + id).is(':visible')) {
-		$('#comment-edit-form-' + id).hide();
+	var $el = $('#comment-edit-form-' + id);
+	if ($el.is(':visible')) {
+		$el.hide();
 	} else {
-		$('#comment-edit-form-' + id).show();
+		$el.show();
 	}
 }
 
 function commentOpenUI(obj, id) {
-	$("#comment-edit-text-" + id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty");
-	// Choose an arbitrary tab index that's greater than what we're using in jot (3 of them)
-	// The submit button gets tabindex + 1
-	$("#comment-edit-text-" + id).attr('tabindex', '9');
-	$("#comment-edit-submit-" + id).attr('tabindex', '10');
-	$("#comment-edit-submit-wrapper-" + id).show();
+	closeMenu("comment-fake-form-" + id);
+	openMenu("item-comments-" + id);
+	$("#comment-edit-text-" + id)
+		.putCursorAtEnd()
+		.addClass("comment-edit-text-full").removeClass("comment-edit-text-empty")
+		.attr('tabindex', '9'); 	// Choose an arbitrary tab index that's greater than what we're using in jot (3 of them)
+	$("#comment-edit-submit-" + id).attr('tabindex', '10'); // The submit button gets tabindex + 1
 	// initialize autosize for this comment
 	autosize($("#comment-edit-text-" + id + ".text-autosize"));
 }
 
 function commentCloseUI(obj, id) {
-	if (obj.value === '') {
-		$("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty");
-		$("#comment-edit-text-" + id).removeAttr('tabindex');
+	if (obj.value === '' || obj.value === obj.dataset.default) {
+		$("#comment-edit-text-" + id)
+			.removeClass("comment-edit-text-full").addClass("comment-edit-text-empty")
+			.removeAttr('tabindex');
 		$("#comment-edit-submit-" + id).removeAttr('tabindex');
-		$("#comment-edit-submit-wrapper-" + id).hide();
+		openMenu("comment-fake-form-" + id);
+		closeMenu("item-comments-" + id);
 		// destroy the automatic textarea resizing
 		autosize.destroy($("#comment-edit-text-" + id + ".text-autosize"));
 	}
 }
 
 function jotTextOpenUI(obj) {
-	if (obj.value == '') {
-		$(".modal-body #profile-jot-text").addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
+	if (obj.value === '' || obj.value === obj.dataset.default) {
+		var $el = $(".modal-body #profile-jot-text");
+		$el.addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
 		// initiale autosize for the jot
-		autosize($(".modal-body #profile-jot-text"));
+		autosize($el);
 	}
 }
 
 function jotTextCloseUI(obj) {
-	if (obj.value === '') {
-		$(".modal-body #profile-jot-text").removeClass("profile-jot-text-full").addClass("profile-jot-text-empty");
+	if (obj.value === '' || obj.value === obj.dataset.default) {
+		var $el = $(".modal-body #profile-jot-text");
+		$el.removeClass("profile-jot-text-full").addClass("profile-jot-text-empty");
 		// destroy the automatic textarea resizing
-		autosize.destroy($(".modal-body #profile-jot-text"));
+		autosize.destroy($el);
 	}
 }
 
 function commentOpen(obj, id) {
-	if (obj.value == '') {
-		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+	if (obj.value === '' || obj.value === obj.dataset.default) {
+		$("#comment-edit-text-" + id)
+			.putCursorAtEnd()
+			.addClass("comment-edit-text-full")
+			.removeClass("comment-edit-text-empty");
 		$("#mod-cmnt-wrap-" + id).show();
-		openMenu("comment-edit-submit-wrapper-" + id);
+		closeMenu("comment-fake-form-" + id);
+		openMenu("item-comments-" + id);
 		return true;
 	}
 	return false;
 }
 
-function commentInsert(obj, id) {
-	var tmpStr = $("#comment-edit-text-" + id).val();
-	if (tmpStr == '') {
-		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		openMenu("comment-edit-submit-wrapper-" + id);
-	}
-	var ins = $(obj).html();
-	ins = ins.replace('&lt;', '<');
-	ins = ins.replace('&gt;', '>');
-	ins = ins.replace('&amp;', '&');
-	ins = ins.replace('&quot;', '"');
-	$("#comment-edit-text-" + id).val(tmpStr + ins);
-}
-
-function qCommentInsert(obj, id) {
-	var tmpStr = $("#comment-edit-text-" + id).val();
-	if (tmpStr == '') {
-		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		openMenu("comment-edit-submit-wrapper-" + id);
-	}
-	var ins = $(obj).val();
-	ins = ins.replace('&lt;', '<');
-	ins = ins.replace('&gt;', '>');
-	ins = ins.replace('&amp;', '&');
-	ins = ins.replace('&quot;', '"');
-	$("#comment-edit-text-" + id).val(tmpStr + ins);
-	$(obj).val('');
-}
-
 function confirmDelete() {
 	return confirm(aStr.delitem);
 }
diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index 4edc8f473..903eb1346 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -1,10 +1,10 @@
 
 {{if $threaded}}
-<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}">
 {{else}}
-<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}">
 {{/if}}
-	<form class="comment-edit-form" style="display: block;" data-item-id="{{$id}}" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+	<form class="comment-edit-form" data-item-id="{{$id}}" 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}}" />
@@ -13,64 +13,56 @@
 		<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
-		<div class="bb form-group">
-			<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" onFocus="commentOpenUI(this,{{$id}});">{{$default}}</textarea>
-		</div>
-		{{if $qcomment}}
+		<p class="comment-edit-bb-{{$id}} comment-icon-list">
+			<span>
+				<button type="button" class="btn btn-sm icon bb-img" style="cursor: pointer;" aria-label="{{$edimg}}" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
+					<i class="fa fa-picture-o"></i>
+				</button>
+				<button type="button" class="btn btn-sm icon bb-attach" style="cursor: pointer;" aria-label="{{$edattach}}" title="{{$edattach}}" ondragenter="return commentLinkDrop(event, {{$id}});" ondragover="return commentLinkDrop(event, {{$id}});" ondrop="commentLinkDropper(event);" onclick="commentGetLink({{$id}}, '{{$prompttext}}');">
+					<i class="fa fa-paperclip"></i>
+				</button>
+			</span>
+			<span>
+				<button type="button" class="btn btn-sm icon bb-url" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
+					<i class="fa fa-link"></i>
+				</button>
+				<button type="button" class="btn btn-sm icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
+					<i class="fa fa-underline"></i>
+				</button>
+				<button type="button" class="btn btn-sm icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
+					<i class="fa fa-italic"></i>
+				</button>
+				<button type="button" class="btn btn-sm icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
+					<i class="fa fa-bold"></i>
+				</button>
+				<button type="button" class="btn btn-sm icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
+					<i class="fa fa-quote-left"></i>
+				</button>
+			</span>
+		</p>
+		<p>
+			<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" rows="3" data-default="{{$default}}">{{$default}}</textarea>
+		</p>
+{{if $qcomment}}
+		<p>
 			<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}}
+				<option value=""></option>
+	{{foreach $qcomment as $qc}}
+				<option value="{{$qc}}">{{$qc}}</option>
+	{{/foreach}}
 			</select>
-		{{/if}}
+		</p>
+{{/if}}
 
-		<div class="comment-edit-text-end clear"></div>
-		<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
+		<div class="comment-edit-submit-wrapper">
+{{if $preview}}
+			<button type="button" class="btn btn-defaul btn-sm" onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}"><i class="fa fa-eye"></i> {{$preview}}</button>
+{{/if}}
 			<button type="submit" class="btn btn-primary btn-sm" id="comment-edit-submit-{{$id}}" name="submit"><i class="fa fa-envelope"></i> {{$submit}}</button>
-			{{if $preview}}
-				<button type="button" class="btn btn-defaul btn-sm" onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}"><i class="fa fa-eye"></i> {{$preview}}</button>
-			{{/if}}
-			<ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
-				<li>
-					<button type="button" class="btn-link icon bb-img" style="cursor: pointer;" aria-label="{{$edimg}}" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
-						<i class="fa fa-picture-o"></i>
-					</button>
-				</li>
-				<li>
-					<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
-						<i class="fa fa-link"></i>
-					</button>
-				</li>
-				<li>
-					<button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edattach}}" title="{{$edattach}}" ondragenter="return commentLinkDrop(event, {{$id}});" ondragover="return commentLinkDrop(event, {{$id}});" ondrop="commentLinkDropper(event);" onclick="commentGetLink({{$id}}, '{{$prompttext}}');">
-						<i class="fa fa-paperclip"></i>
-					</button>
-				</li>
-				<li>
-					<button type="button" class="btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
-						<i class="fa fa-underline"></i>
-					</button>
-				</li>
-				<li>
-					<button type="button" class="btn-link icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
-						<i class="fa fa-italic"></i>
-					</button>
-				</li>
-				<li>
-					<button type="button" class="btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
-						<i class="fa fa-bold"></i>
-					</button>
-				</li>
-				<li>
-					<button type="button" class="btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
-						<i class="fa fa-quote-left"></i>
-					</button>
-				</li>
-			</ul>
 		</div>
 
 		<div class="comment-edit-end clear"></div>
 	</form>
 	<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
 </div>
+
diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index c6f90ac05..3b3f64a0d 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -161,9 +161,9 @@
 			</div>
 			<!-- ./TODO -->
 
-			<div class="wall-item-actions">
+			<p class="wall-item-actions">
 				{{* Action buttons to interact with the item (like: like, dislike, share and so on *}}
-				<div class="wall-item-actions-left pull-left">
+				<span class="wall-item-actions-left">
 					<!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
 					<div id="button-reply" class="pull-left">
 						<button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
@@ -204,28 +204,27 @@
 						{{/if}}
 					{{/if}}
 					<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-				</div>
+				</span>
 
 
-				<div class="wall-item-actions-right pull-right">
+				<span class="wall-item-actions-right">
 					{{* Event attendance buttons *}}
-					{{if $item.isevent}}
-					<div class="vote-event">
+				{{if $item.isevent}}
+					<span class="vote-event">
 						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}}, 'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
 						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}}, 'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
 						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}}, 'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
-					</div>
-					{{/if}}
+					</span>
+				{{/if}}
 
-					<div class="pull-right checkbox">
-						{{if $item.drop.pagedrop}}
+					<span class="pull-right checkbox">
+				{{if $item.drop.pagedrop}}
 						<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
 						<label for="checkbox-{{$item.id}}"></label>
-						{{/if}}
-					</div>
-				</div>
-				<div class="clearfix"></div>
-			</div><!--./wall-item-actions-->
+				{{/if}}
+					</span>
+				</span>
+			</p><!--./wall-item-actions-->
 
 					{{* Display likes, dislike and attendance stats *}}
 			{{if $item.responses}}
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 068f98136..0fcb84bad 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -20,7 +20,7 @@ as the value of $top_child_total (this is done at the end of this file)
 {{/if}}
 
 {{if $item.thread_level==2 && $top_child_nr==1}}
-<div class="comment-container well well-sm"> <!--top-child-begin-->
+<div class="comment-container"> <!--top-child-begin-->
 {{/if}}
 {{* end of hacky part to count childrens *}}
 
@@ -308,9 +308,9 @@ as the value of $top_child_total (this is done at the end of this file)
 		<!-- ./TODO -->
 
 		<!-- <hr /> -->
-		<div class="wall-item-actions">
+		<p class="wall-item-actions">
 			{{* Action buttons to interact with the item (like: like, dislike, share and so on *}}
-			<div class="wall-item-actions-left pull-left">
+			<span class="wall-item-actions-left">
 				<!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
 				<div id="button-reply" class="pull-left">
 					<button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
@@ -338,7 +338,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
 				{{* Button to open the comment text field *}}
 				{{if $item.comment}}
-				<button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.switchcomment}}</button>
+				<button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.switchcomment}}</button>
 				{{/if}}
 
 				{{* Button for sharing the item *}}
@@ -351,27 +351,26 @@ as the value of $top_child_total (this is done at the end of this file)
 					{{/if}}
 				{{/if}}
 				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-			</div>
+			</span>
 
-			<div class="wall-item-actions-right pull-right">
+			<span class="wall-item-actions-right">
 				{{* Event attendance buttons *}}
-				{{if $item.isevent}}
-				<div class="vote-event">
+			{{if $item.isevent}}
+				<span class="vote-event">
 					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}},'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
 					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}},'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
 					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}},'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
-				</div>
-				{{/if}}
+				</span>
+			{{/if}}
 
-				<div class="pull-right checkbox">
-					{{if $item.drop.pagedrop}}
+				<span class="pull-right checkbox">
+			{{if $item.drop.pagedrop}}
 					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
 					<label for="checkbox-{{$item.id}}"></label>
-				{{/if}}
-				</div>
-			</div>
-			<div class="clearfix"></div>
-		</div><!--./wall-item-actions-->
+			{{/if}}
+				</span>
+			</span>
+		</p><!--./wall-item-actions-->
 
 		<div class="wall-item-links"></div>
 
@@ -384,19 +383,16 @@ as the value of $top_child_total (this is done at the end of this file)
 			</div>
 		{{/if}}
 
-		{{if $item.thread_level!=1}}
-		</div><!--./media-body from for comments-->
-		<hr />
+		{{* Insert comment box of threaded children *}}
+		{{if $item.threaded && $item.comment && $item.indent==comment}}
+			<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" data-display="block" style="display: none;">
+				{{$item.comment nofilter}}
+			</div>
 		{{/if}}
 
-
-		{{* Insert comment box of threaded children *}}
-		{{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}}
-		<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">
-			{{$item.comment nofilter}}
-		</div>
-		{{/if}}{{/if}}{{/if}}
-
+		{{if $item.thread_level!=1}}
+		</div><!--./media-body from for comments-->
+		{{/if}}
 
 		{{foreach $item.children as $child}}
 			{{*
@@ -413,21 +409,12 @@ as the value of $top_child_total (this is done at the end of this file)
 			Display this comment box if there are any comments. If not hide it. In this
 			case it could be opend with the "comment" button *}}
 		{{if $item.total_comments_num}}
-			{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-				<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div>
-			{{/if}}{{/if}}{{/if}}
-
-			{{if $item.flatten}}
-				<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div>
-			{{/if}}
-		{{else}}
-			{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-				<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div>
-			{{/if}}{{/if}}{{/if}}
-
-			{{if $item.flatten}}
-				<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div>
-			{{/if}}
+			<div class="comment-fake-form" id="comment-fake-form-{{$item.id}}">
+				<textarea id="comment-fake-text-{{$item.id}}" class="comment-fake-text-empty form-control" placeholder="{{$item.reply_label}}" onFocus="commentOpenUI(this, {{$item.id}});"  rows="1"></textarea>
+			</div>
+		{{/if}}
+		{{if $item.comment && $item.thread_level==1}}
+			<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" data-display="block" style="display: none">{{$item.comment nofilter}}</div>
 		{{/if}}
 	</div><!-- /media -->
 </div><!-- ./panel-body or ./wall-item-container -->

From 3e1e5fc986d1ca0b06cce9cc893f8b212465f4e2 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 14 Feb 2019 22:49:13 -0500
Subject: [PATCH 007/145] [frio] Use text-align instead of flex display for
 submit buttons

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

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 1caaba9b9..83e180498 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2050,8 +2050,7 @@ code > .hl-main {
 }
 
 .comment-edit-submit-wrapper {
-    display: flex;
-    justify-content: flex-end;
+    text-align: right;
 }
 
 .comment-icon-list {

From 25ba78d0d8bae95f1401e78c38ac45cd49c56d58 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 15 Feb 2019 09:15:39 -0500
Subject: [PATCH 008/145] [frio] Prevent unwanted textaera resizing in comment
 forms

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

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 83e180498..6759195ee 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2044,11 +2044,18 @@ code > .hl-main {
 .comment-fake-form {
     border-color: #d9d9d9;
 }
+.comment-fake-form textarea {
+    resize: none;
+}
 
 .comment-container .wall-item-comment-wrapper {
     margin-top: 0.5em;
 }
 
+.comment-edit-form textarea {
+    resize: vertical;
+}
+
 .comment-edit-submit-wrapper {
     text-align: right;
 }

From dc9522bd98e91392518a2e6d7e413527d9b1a5a0 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 15 Feb 2019 09:36:25 -0500
Subject: [PATCH 009/145] Update translation strings

---
 view/lang/C/messages.po | 3016 ++++++++++++++++++++-------------------
 1 file changed, 1512 insertions(+), 1504 deletions(-)

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 525a29c69..b0a1cf3f0 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-10 08:14+0100\n"
+"POT-Creation-Date: 2019-02-15 09:33-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,13 +41,13 @@ msgstr ""
 #: mod/photos.php:1126 mod/photos.php:1143 mod/photos.php:1636
 #: mod/profile_photo.php:85 mod/profile_photo.php:94 mod/profile_photo.php:103
 #: mod/profile_photo.php:217 mod/profile_photo.php:305
-#: mod/profile_photo.php:315 src/Model/User.php:735 src/Model/User.php:743
-#: src/Model/User.php:751
+#: mod/profile_photo.php:315 src/Model/User.php:736 src/Model/User.php:744
+#: src/Model/User.php:752
 msgid "Profile Photos"
 msgstr ""
 
 #: include/conversation.php:160 include/conversation.php:297
-#: src/Model/Item.php:3265
+#: src/Model/Item.php:3283
 msgid "event"
 msgstr ""
 
@@ -58,7 +58,7 @@ msgid "status"
 msgstr ""
 
 #: include/conversation.php:168 include/conversation.php:305
-#: mod/subthread.php:88 mod/tagger.php:70 src/Model/Item.php:3267
+#: mod/subthread.php:88 mod/tagger.php:70 src/Model/Item.php:3285
 msgid "photo"
 msgstr ""
 
@@ -119,7 +119,7 @@ msgstr ""
 msgid "Dislikes"
 msgstr ""
 
-#: include/conversation.php:569 include/conversation.php:1506
+#: include/conversation.php:569 include/conversation.php:1505
 #: mod/photos.php:1468
 msgid "Attending"
 msgid_plural "Attending"
@@ -165,9 +165,9 @@ msgstr ""
 msgid "View in context"
 msgstr ""
 
-#: include/conversation.php:721 include/conversation.php:1172
+#: include/conversation.php:721 include/conversation.php:1171
 #: mod/editpost.php:88 mod/message.php:260 mod/message.php:442
-#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:420
+#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:421
 msgid "Please wait"
 msgstr ""
 
@@ -183,43 +183,43 @@ msgstr ""
 msgid "Follow Thread"
 msgstr ""
 
-#: include/conversation.php:894 src/Model/Contact.php:1032
+#: include/conversation.php:894 src/Model/Contact.php:1049
 msgid "View Status"
 msgstr ""
 
 #: include/conversation.php:895 include/conversation.php:911
 #: mod/allfriends.php:72 mod/directory.php:167 mod/dirfind.php:226
-#: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:972
-#: src/Model/Contact.php:1025 src/Model/Contact.php:1033
+#: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:989
+#: src/Model/Contact.php:1042 src/Model/Contact.php:1050
 msgid "View Profile"
 msgstr ""
 
-#: include/conversation.php:896 src/Model/Contact.php:1034
+#: include/conversation.php:896 src/Model/Contact.php:1051
 msgid "View Photos"
 msgstr ""
 
-#: include/conversation.php:897 src/Model/Contact.php:1026
-#: src/Model/Contact.php:1035
+#: include/conversation.php:897 src/Model/Contact.php:1043
+#: src/Model/Contact.php:1052
 msgid "Network Posts"
 msgstr ""
 
-#: include/conversation.php:898 src/Model/Contact.php:1027
-#: src/Model/Contact.php:1036
+#: include/conversation.php:898 src/Model/Contact.php:1044
+#: src/Model/Contact.php:1053
 msgid "View Contact"
 msgstr ""
 
-#: include/conversation.php:899 src/Model/Contact.php:1038
+#: include/conversation.php:899 src/Model/Contact.php:1055
 msgid "Send PM"
 msgstr ""
 
-#: include/conversation.php:903 src/Model/Contact.php:1039
+#: include/conversation.php:903 src/Model/Contact.php:1056
 msgid "Poke"
 msgstr ""
 
 #: include/conversation.php:908 mod/allfriends.php:73 mod/dirfind.php:227
 #: mod/follow.php:147 mod/match.php:88 mod/suggest.php:88
-#: view/theme/vier/theme.php:201 src/Content/Widget.php:63
-#: src/Model/Contact.php:1028 src/Module/Contact.php:574
+#: src/Content/Widget.php:63 src/Model/Contact.php:1045
+#: src/Module/Contact.php:574 view/theme/vier/theme.php:201
 msgid "Connect/Follow"
 msgstr ""
 
@@ -307,130 +307,130 @@ msgstr ""
 msgid "%s attend maybe."
 msgstr ""
 
-#: include/conversation.php:1111
+#: include/conversation.php:1110
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: include/conversation.php:1112 src/Object/Post.php:882
+#: include/conversation.php:1111 src/Object/Post.php:883
 msgid "Please enter a image/video/audio/webpage URL:"
 msgstr ""
 
-#: include/conversation.php:1113
+#: include/conversation.php:1112
 msgid "Tag term:"
 msgstr ""
 
-#: include/conversation.php:1114 mod/filer.php:35
+#: include/conversation.php:1113 mod/filer.php:35
 msgid "Save to Folder:"
 msgstr ""
 
-#: include/conversation.php:1115
+#: include/conversation.php:1114
 msgid "Where are you right now?"
 msgstr ""
 
-#: include/conversation.php:1116
+#: include/conversation.php:1115
 msgid "Delete item(s)?"
 msgstr ""
 
-#: include/conversation.php:1148
+#: include/conversation.php:1147
 msgid "New Post"
 msgstr ""
 
-#: include/conversation.php:1151
+#: include/conversation.php:1150
 msgid "Share"
 msgstr ""
 
-#: include/conversation.php:1152 mod/editpost.php:74 mod/message.php:258
+#: include/conversation.php:1151 mod/editpost.php:74 mod/message.php:258
 #: mod/message.php:439 mod/wallmessage.php:139
 msgid "Upload photo"
 msgstr ""
 
-#: include/conversation.php:1153 mod/editpost.php:75
+#: include/conversation.php:1152 mod/editpost.php:75
 msgid "upload photo"
 msgstr ""
 
-#: include/conversation.php:1154 mod/editpost.php:76
+#: include/conversation.php:1153 mod/editpost.php:76
 msgid "Attach file"
 msgstr ""
 
-#: include/conversation.php:1155 mod/editpost.php:77
+#: include/conversation.php:1154 mod/editpost.php:77
 msgid "attach file"
 msgstr ""
 
-#: include/conversation.php:1156 src/Object/Post.php:874
+#: include/conversation.php:1155 src/Object/Post.php:875
 msgid "Bold"
 msgstr ""
 
-#: include/conversation.php:1157 src/Object/Post.php:875
+#: include/conversation.php:1156 src/Object/Post.php:876
 msgid "Italic"
 msgstr ""
 
-#: include/conversation.php:1158 src/Object/Post.php:876
+#: include/conversation.php:1157 src/Object/Post.php:877
 msgid "Underline"
 msgstr ""
 
-#: include/conversation.php:1159 src/Object/Post.php:877
+#: include/conversation.php:1158 src/Object/Post.php:878
 msgid "Quote"
 msgstr ""
 
-#: include/conversation.php:1160 src/Object/Post.php:878
+#: include/conversation.php:1159 src/Object/Post.php:879
 msgid "Code"
 msgstr ""
 
-#: include/conversation.php:1161 src/Object/Post.php:879
+#: include/conversation.php:1160 src/Object/Post.php:880
 msgid "Image"
 msgstr ""
 
-#: include/conversation.php:1162 src/Object/Post.php:880
+#: include/conversation.php:1161 src/Object/Post.php:881
 msgid "Link"
 msgstr ""
 
-#: include/conversation.php:1163 src/Object/Post.php:881
+#: include/conversation.php:1162 src/Object/Post.php:882
 msgid "Link or Media"
 msgstr ""
 
-#: include/conversation.php:1164 mod/editpost.php:84
+#: include/conversation.php:1163 mod/editpost.php:84
 msgid "Set your location"
 msgstr ""
 
-#: include/conversation.php:1165 mod/editpost.php:85
+#: include/conversation.php:1164 mod/editpost.php:85
 msgid "set location"
 msgstr ""
 
-#: include/conversation.php:1166 mod/editpost.php:86
+#: include/conversation.php:1165 mod/editpost.php:86
 msgid "Clear browser location"
 msgstr ""
 
-#: include/conversation.php:1167 mod/editpost.php:87
+#: include/conversation.php:1166 mod/editpost.php:87
 msgid "clear location"
 msgstr ""
 
-#: include/conversation.php:1169 mod/editpost.php:102
+#: include/conversation.php:1168 mod/editpost.php:102
 msgid "Set title"
 msgstr ""
 
-#: include/conversation.php:1171 mod/editpost.php:104
+#: include/conversation.php:1170 mod/editpost.php:104
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: include/conversation.php:1173 mod/editpost.php:89
+#: include/conversation.php:1172 mod/editpost.php:89
 msgid "Permission settings"
 msgstr ""
 
-#: include/conversation.php:1174 mod/editpost.php:119
+#: include/conversation.php:1173 mod/editpost.php:119
 msgid "permissions"
 msgstr ""
 
-#: include/conversation.php:1183 mod/editpost.php:99
+#: include/conversation.php:1182 mod/editpost.php:99
 msgid "Public post"
 msgstr ""
 
-#: include/conversation.php:1187 mod/editpost.php:110 mod/events.php:551
+#: include/conversation.php:1186 mod/editpost.php:110 mod/events.php:551
 #: mod/photos.php:1458 mod/photos.php:1497 mod/photos.php:1557
-#: src/Object/Post.php:883
+#: src/Object/Post.php:884
 msgid "Preview"
 msgstr ""
 
-#: include/conversation.php:1191 include/items.php:396 mod/dfrn_request.php:650
+#: include/conversation.php:1190 include/items.php:396 mod/dfrn_request.php:650
 #: mod/editpost.php:113 mod/fbrowser.php:104 mod/fbrowser.php:134
 #: mod/follow.php:161 mod/message.php:153 mod/photos.php:257 mod/photos.php:325
 #: mod/settings.php:666 mod/settings.php:692 mod/suggest.php:44
@@ -439,49 +439,49 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: include/conversation.php:1196
+#: include/conversation.php:1195
 msgid "Post to Groups"
 msgstr ""
 
-#: include/conversation.php:1197
+#: include/conversation.php:1196
 msgid "Post to Contacts"
 msgstr ""
 
-#: include/conversation.php:1198
+#: include/conversation.php:1197
 msgid "Private post"
 msgstr ""
 
-#: include/conversation.php:1203 mod/editpost.php:117 src/Model/Profile.php:370
+#: include/conversation.php:1202 mod/editpost.php:117 src/Model/Profile.php:370
 msgid "Message"
 msgstr ""
 
-#: include/conversation.php:1204 mod/editpost.php:118
+#: include/conversation.php:1203 mod/editpost.php:118
 msgid "Browser"
 msgstr ""
 
-#: include/conversation.php:1476
+#: include/conversation.php:1475
 msgid "View all"
 msgstr ""
 
-#: include/conversation.php:1500
+#: include/conversation.php:1499
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:1503
+#: include/conversation.php:1502
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:1509
+#: include/conversation.php:1508
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:1512 src/Content/ContactSelector.php:167
+#: include/conversation.php:1511 src/Content/ContactSelector.php:167
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] ""
@@ -829,16 +829,17 @@ msgstr ""
 #: mod/invite.php:111 mod/item.php:167 mod/manage.php:129 mod/message.php:56
 #: mod/message.php:101 mod/network.php:35 mod/nogroup.php:18 mod/notes.php:27
 #: mod/notifications.php:70 mod/ostatus_subscribe.php:18 mod/photos.php:186
-#: mod/photos.php:1020 mod/poke.php:141 mod/profile_photo.php:32
-#: mod/profile_photo.php:177 mod/profile_photo.php:204 mod/profiles.php:182
-#: mod/profiles.php:499 mod/regmod.php:89 mod/repair_ostatus.php:16
+#: mod/photos.php:1020 mod/poke.php:141 mod/profiles.php:182
+#: mod/profiles.php:499 mod/profile_photo.php:32 mod/profile_photo.php:177
+#: mod/profile_photo.php:204 mod/regmod.php:89 mod/repair_ostatus.php:16
 #: mod/settings.php:48 mod/settings.php:154 mod/settings.php:655
 #: mod/suggest.php:62 mod/uimport.php:17 mod/unfollow.php:22
 #: mod/unfollow.php:77 mod/unfollow.php:109 mod/viewcontacts.php:56
-#: mod/wall_attach.php:76 mod/wall_attach.php:79 mod/wall_upload.php:107
-#: mod/wall_upload.php:110 mod/wallmessage.php:19 mod/wallmessage.php:43
-#: mod/wallmessage.php:82 mod/wallmessage.php:106 src/Module/Attach.php:42
-#: src/Module/Contact.php:360 src/Module/Register.php:193 src/App.php:1482
+#: mod/wallmessage.php:19 mod/wallmessage.php:43 mod/wallmessage.php:82
+#: mod/wallmessage.php:106 mod/wall_attach.php:76 mod/wall_attach.php:79
+#: mod/wall_upload.php:107 mod/wall_upload.php:110 src/App.php:1480
+#: src/Module/Attach.php:42 src/Module/Contact.php:360
+#: src/Module/Register.php:193
 msgid "Permission denied."
 msgstr ""
 
@@ -846,28 +847,11 @@ msgstr ""
 msgid "Archives"
 msgstr ""
 
-#: include/items.php:520 view/theme/vier/theme.php:255
-#: src/Content/ForumManager.php:135 src/Content/Widget.php:329
-#: src/Object/Post.php:458 src/App.php:666
+#: include/items.php:520 src/Content/ForumManager.php:135
+#: src/Content/Widget.php:329 view/theme/vier/theme.php:255
 msgid "show more"
 msgstr ""
 
-#: mod/apps.php:15 src/App.php:1351
-msgid "You must be logged in to use addons. "
-msgstr ""
-
-#: mod/apps.php:20
-msgid "Applications"
-msgstr ""
-
-#: mod/apps.php:25
-msgid "No installed applications."
-msgstr ""
-
-#: mod/maintenance.php:26
-msgid "System down for maintenance"
-msgstr ""
-
 #: mod/admin.php:122
 msgid "Theme settings updated."
 msgstr ""
@@ -1035,7 +1019,7 @@ msgid "Save Settings"
 msgstr ""
 
 #: mod/admin.php:386 mod/admin.php:404 mod/dfrn_request.php:346
-#: mod/friendica.php:131 src/Model/Contact.php:1702
+#: mod/friendica.php:131 src/Model/Contact.php:1719
 msgid "Blocked domain"
 msgstr ""
 
@@ -1275,8 +1259,8 @@ msgstr ""
 msgid "Recipient Profile"
 msgstr ""
 
-#: mod/admin.php:828 view/theme/frio/theme.php:269
-#: src/Core/NotificationsManager.php:182 src/Content/Nav.php:239
+#: mod/admin.php:828 src/Content/Nav.php:239
+#: src/Core/NotificationsManager.php:182 view/theme/frio/theme.php:269
 msgid "Network"
 msgstr ""
 
@@ -2525,7 +2509,7 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: mod/admin.php:1871 src/Model/User.php:858
+#: mod/admin.php:1871 src/Model/User.php:859
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
@@ -2727,7 +2711,7 @@ msgid "Toggle"
 msgstr ""
 
 #: mod/admin.php:2181 mod/admin.php:2438 mod/newmember.php:20
-#: mod/settings.php:136 view/theme/frio/theme.php:272 src/Content/Nav.php:263
+#: mod/settings.php:136 src/Content/Nav.php:263 view/theme/frio/theme.php:272
 msgid "Settings"
 msgstr ""
 
@@ -2891,6 +2875,18 @@ msgstr ""
 msgid "No"
 msgstr ""
 
+#: mod/apps.php:15 src/App.php:1349
+msgid "You must be logged in to use addons. "
+msgstr ""
+
+#: mod/apps.php:20
+msgid "Applications"
+msgstr ""
+
+#: mod/apps.php:25
+msgid "No installed applications."
+msgstr ""
+
 #: mod/babel.php:25
 msgid "Source input"
 msgstr ""
@@ -3013,7 +3009,7 @@ msgid "Access denied."
 msgstr ""
 
 #: mod/cal.php:46 mod/dfrn_poll.php:486 mod/help.php:68 mod/viewcontacts.php:34
-#: src/App.php:1402
+#: src/App.php:1400
 msgid "Page not found."
 msgstr ""
 
@@ -3021,9 +3017,9 @@ msgstr ""
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: mod/cal.php:273 mod/events.php:384 view/theme/frio/theme.php:266
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:160
+#: mod/cal.php:273 mod/events.php:384 src/Content/Nav.php:160
 #: src/Content/Nav.php:226 src/Model/Profile.php:937 src/Model/Profile.php:948
+#: view/theme/frio/theme.php:266 view/theme/frio/theme.php:270
 msgid "Events"
 msgstr ""
 
@@ -3039,22 +3035,22 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: mod/cal.php:279 mod/events.php:393 src/Model/Event.php:429
+#: mod/cal.php:279 mod/events.php:393 src/Model/Event.php:428
 msgid "today"
 msgstr ""
 
-#: mod/cal.php:280 mod/events.php:394 src/Util/Temporal.php:314
-#: src/Model/Event.php:430
+#: mod/cal.php:280 mod/events.php:394 src/Model/Event.php:429
+#: src/Util/Temporal.php:314
 msgid "month"
 msgstr ""
 
-#: mod/cal.php:281 mod/events.php:395 src/Util/Temporal.php:315
-#: src/Model/Event.php:431
+#: mod/cal.php:281 mod/events.php:395 src/Model/Event.php:430
+#: src/Util/Temporal.php:315
 msgid "week"
 msgstr ""
 
-#: mod/cal.php:282 mod/events.php:396 src/Util/Temporal.php:316
-#: src/Model/Event.php:432
+#: mod/cal.php:282 mod/events.php:396 src/Model/Event.php:431
+#: src/Util/Temporal.php:316
 msgid "day"
 msgstr ""
 
@@ -3062,7 +3058,7 @@ msgstr ""
 msgid "list"
 msgstr ""
 
-#: mod/cal.php:296 src/Core/Console/NewPassword.php:67 src/Model/User.php:323
+#: mod/cal.php:296 src/Core/Console/NewPassword.php:67 src/Model/User.php:324
 msgid "User not found"
 msgstr ""
 
@@ -3188,11 +3184,10 @@ msgstr ""
 #: mod/message.php:261 mod/message.php:441 mod/photos.php:1049
 #: mod/photos.php:1137 mod/photos.php:1412 mod/photos.php:1457
 #: mod/photos.php:1496 mod/photos.php:1556 mod/poke.php:188
-#: mod/profiles.php:562 view/theme/duepuntozero/config.php:72
-#: view/theme/frio/config.php:119 view/theme/quattro/config.php:74
-#: view/theme/vier/config.php:120 src/Module/Contact.php:594
-#: src/Module/Install.php:187 src/Module/Install.php:222
-#: src/Object/Post.php:873
+#: mod/profiles.php:562 src/Module/Contact.php:594 src/Module/Install.php:187
+#: src/Module/Install.php:222 src/Object/Post.php:874
+#: view/theme/duepuntozero/config.php:72 view/theme/frio/config.php:119
+#: view/theme/quattro/config.php:74 view/theme/vier/config.php:120
 msgid "Submit"
 msgstr ""
 
@@ -3383,7 +3378,7 @@ msgstr ""
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: mod/dfrn_confirm.php:612 mod/dfrn_request.php:560 src/Model/Contact.php:2026
+#: mod/dfrn_confirm.php:612 mod/dfrn_request.php:560 src/Model/Contact.php:2043
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -3457,7 +3452,7 @@ msgstr ""
 msgid "Invalid profile URL."
 msgstr ""
 
-#: mod/dfrn_request.php:340 src/Model/Contact.php:1697
+#: mod/dfrn_request.php:340 src/Model/Contact.php:1714
 msgid "Disallowed profile URL."
 msgstr ""
 
@@ -3567,8 +3562,8 @@ msgid "Submit Request"
 msgstr ""
 
 #: mod/directory.php:154 mod/events.php:541 mod/notifications.php:253
-#: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:438
-#: src/Model/Event.php:934 src/Model/Profile.php:443 src/Module/Contact.php:643
+#: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:437
+#: src/Model/Event.php:933 src/Model/Profile.php:443 src/Module/Contact.php:643
 msgid "Location:"
 msgstr ""
 
@@ -3590,8 +3585,8 @@ msgstr ""
 msgid "About:"
 msgstr ""
 
-#: mod/directory.php:210 view/theme/vier/theme.php:208
-#: src/Content/Widget.php:70
+#: mod/directory.php:210 src/Content/Widget.php:70
+#: view/theme/vier/theme.php:208
 msgid "Global Directory"
 msgstr ""
 
@@ -3607,8 +3602,8 @@ msgstr ""
 msgid "Site Directory"
 msgstr ""
 
-#: mod/directory.php:217 view/theme/vier/theme.php:203
-#: src/Content/Widget.php:65 src/Module/Contact.php:817
+#: mod/directory.php:217 src/Content/Widget.php:65 src/Module/Contact.php:817
+#: view/theme/vier/theme.php:203
 msgid "Find"
 msgstr ""
 
@@ -3745,8 +3740,8 @@ msgstr ""
 msgid "Event removed"
 msgstr ""
 
-#: mod/fbrowser.php:36 view/theme/frio/theme.php:264 src/Content/Nav.php:158
-#: src/Model/Profile.php:917
+#: mod/fbrowser.php:36 src/Content/Nav.php:158 src/Model/Profile.php:917
+#: view/theme/frio/theme.php:264
 msgid "Photos"
 msgstr ""
 
@@ -3879,7 +3874,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: mod/group.php:85 mod/profperm.php:30 src/App.php:1481
+#: mod/group.php:85 mod/profperm.php:30 src/App.php:1479
 msgid "Permission denied"
 msgstr ""
 
@@ -3952,11 +3947,11 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
-#: mod/help.php:59 view/theme/vier/theme.php:294 src/Content/Nav.php:190
+#: mod/help.php:59 src/Content/Nav.php:190 view/theme/vier/theme.php:294
 msgid "Help"
 msgstr ""
 
-#: mod/help.php:65 src/App.php:1399
+#: mod/help.php:65 src/App.php:1397
 msgid "Not Found"
 msgstr ""
 
@@ -4104,7 +4099,7 @@ msgstr ""
 msgid "%s posted an update."
 msgstr ""
 
-#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:848
+#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:847
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -4279,6 +4274,10 @@ msgstr ""
 msgid "Your password has been changed at %s"
 msgstr ""
 
+#: mod/maintenance.php:26
+msgid "System down for maintenance"
+msgstr ""
+
 #: mod/manage.php:178
 msgid "Manage Identities and/or Pages"
 msgstr ""
@@ -4338,7 +4337,7 @@ msgstr ""
 msgid "Discard"
 msgstr ""
 
-#: mod/message.php:123 view/theme/frio/theme.php:271 src/Content/Nav.php:252
+#: mod/message.php:123 src/Content/Nav.php:252 view/theme/frio/theme.php:271
 msgid "Messages"
 msgstr ""
 
@@ -4569,13 +4568,14 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr ""
 
-#: mod/newmember.php:25 mod/profperm.php:117 view/theme/frio/theme.php:263
-#: src/Content/Nav.php:157 src/Model/Profile.php:876 src/Model/Profile.php:909
+#: mod/newmember.php:25 mod/profperm.php:117 src/Content/Nav.php:157
+#: src/Model/Profile.php:876 src/Model/Profile.php:909
 #: src/Module/Contact.php:654 src/Module/Contact.php:869
+#: view/theme/frio/theme.php:263
 msgid "Profile"
 msgstr ""
 
-#: mod/newmember.php:27 mod/profile_photo.php:253 mod/profiles.php:583
+#: mod/newmember.php:27 mod/profiles.php:583 mod/profile_photo.php:253
 msgid "Upload Profile Photo"
 msgstr ""
 
@@ -5083,12 +5083,12 @@ msgid "I don't like this (toggle)"
 msgstr ""
 
 #: mod/photos.php:1454 mod/photos.php:1493 mod/photos.php:1553
-#: src/Module/Contact.php:1018 src/Object/Post.php:870
+#: src/Module/Contact.php:1018 src/Object/Post.php:871
 msgid "This is you"
 msgstr ""
 
 #: mod/photos.php:1456 mod/photos.php:1495 mod/photos.php:1555
-#: src/Object/Post.php:417 src/Object/Post.php:872
+#: src/Object/Post.php:417 src/Object/Post.php:873
 msgid "Comment"
 msgstr ""
 
@@ -5132,62 +5132,6 @@ msgstr ""
 msgid "Only logged in users are permitted to perform a probing."
 msgstr ""
 
-#: mod/profile_photo.php:58
-msgid "Image uploaded but image cropping failed."
-msgstr ""
-
-#: mod/profile_photo.php:88 mod/profile_photo.php:97 mod/profile_photo.php:106
-#: mod/profile_photo.php:318
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr ""
-
-#: mod/profile_photo.php:125
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr ""
-
-#: mod/profile_photo.php:133
-msgid "Unable to process image"
-msgstr ""
-
-#: mod/profile_photo.php:251
-msgid "Upload File:"
-msgstr ""
-
-#: mod/profile_photo.php:252
-msgid "Select a profile:"
-msgstr ""
-
-#: mod/profile_photo.php:257
-msgid "or"
-msgstr ""
-
-#: mod/profile_photo.php:258
-msgid "skip this step"
-msgstr ""
-
-#: mod/profile_photo.php:258
-msgid "select a photo from your photo albums"
-msgstr ""
-
-#: mod/profile_photo.php:271
-msgid "Crop Image"
-msgstr ""
-
-#: mod/profile_photo.php:272
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr ""
-
-#: mod/profile_photo.php:274
-msgid "Done Editing"
-msgstr ""
-
-#: mod/profile_photo.php:308
-msgid "Image uploaded successfully."
-msgstr ""
-
 #: mod/profiles.php:62
 msgid "Profile deleted."
 msgstr ""
@@ -5512,6 +5456,62 @@ msgstr ""
 msgid "Create New Profile"
 msgstr ""
 
+#: mod/profile_photo.php:58
+msgid "Image uploaded but image cropping failed."
+msgstr ""
+
+#: mod/profile_photo.php:88 mod/profile_photo.php:97 mod/profile_photo.php:106
+#: mod/profile_photo.php:318
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr ""
+
+#: mod/profile_photo.php:125
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr ""
+
+#: mod/profile_photo.php:133
+msgid "Unable to process image"
+msgstr ""
+
+#: mod/profile_photo.php:251
+msgid "Upload File:"
+msgstr ""
+
+#: mod/profile_photo.php:252
+msgid "Select a profile:"
+msgstr ""
+
+#: mod/profile_photo.php:257
+msgid "or"
+msgstr ""
+
+#: mod/profile_photo.php:258
+msgid "skip this step"
+msgstr ""
+
+#: mod/profile_photo.php:258
+msgid "select a photo from your photo albums"
+msgstr ""
+
+#: mod/profile_photo.php:271
+msgid "Crop Image"
+msgstr ""
+
+#: mod/profile_photo.php:272
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr ""
+
+#: mod/profile_photo.php:274
+msgid "Done Editing"
+msgstr ""
+
+#: mod/profile_photo.php:308
+msgid "Image uploaded successfully."
+msgstr ""
+
 #: mod/profperm.php:36 mod/profperm.php:69
 msgid "Invalid profile identifier."
 msgstr ""
@@ -5590,7 +5590,7 @@ msgstr ""
 msgid "Only one search per minute is permitted for not logged in users."
 msgstr ""
 
-#: mod/search.php:149 src/Content/Text/HTML.php:900 src/Content/Nav.php:198
+#: mod/search.php:149 src/Content/Nav.php:198 src/Content/Text/HTML.php:900
 msgid "Search"
 msgstr ""
 
@@ -5918,11 +5918,11 @@ msgstr ""
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:396
+#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:395
 msgid "Sunday"
 msgstr ""
 
-#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:397
+#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:396
 msgid "Monday"
 msgstr ""
 
@@ -6451,7 +6451,7 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: mod/suggest.php:119 view/theme/vier/theme.php:204 src/Content/Widget.php:66
+#: mod/suggest.php:119 src/Content/Widget.php:66 view/theme/vier/theme.php:204
 msgid "Friend Suggestions"
 msgstr ""
 
@@ -6567,7 +6567,7 @@ msgstr ""
 msgid "No videos selected"
 msgstr ""
 
-#: mod/videos.php:309 src/Model/Item.php:3435
+#: mod/videos.php:309 src/Model/Item.php:3453
 msgid "View Video"
 msgstr ""
 
@@ -6589,13 +6589,33 @@ msgstr ""
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: mod/viewcontacts.php:114 view/theme/frio/theme.php:273
-#: src/Content/Text/HTML.php:911 src/Content/Nav.php:203
-#: src/Content/Nav.php:269 src/Model/Profile.php:980 src/Model/Profile.php:983
-#: src/Module/Contact.php:811 src/Module/Contact.php:881
+#: mod/viewcontacts.php:114 src/Content/Nav.php:203 src/Content/Nav.php:269
+#: src/Content/Text/HTML.php:911 src/Model/Profile.php:980
+#: src/Model/Profile.php:983 src/Module/Contact.php:811
+#: src/Module/Contact.php:881 view/theme/frio/theme.php:273
 msgid "Contacts"
 msgstr ""
 
+#: mod/wallmessage.php:52 mod/wallmessage.php:115
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr ""
+
+#: mod/wallmessage.php:63
+msgid "Unable to check your home location."
+msgstr ""
+
+#: mod/wallmessage.php:89 mod/wallmessage.php:98
+msgid "No recipient."
+msgstr ""
+
+#: mod/wallmessage.php:129
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr ""
+
 #: mod/wall_attach.php:26 mod/wall_attach.php:33 mod/wall_attach.php:85
 #: mod/wall_upload.php:42 mod/wall_upload.php:58 mod/wall_upload.php:116
 #: mod/wall_upload.php:167 mod/wall_upload.php:170
@@ -6624,1180 +6644,22 @@ msgstr ""
 msgid "Wall Photos"
 msgstr ""
 
-#: mod/wallmessage.php:52 mod/wallmessage.php:115
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
+#: src/App.php:665
+msgid "Delete this item?"
 msgstr ""
 
-#: mod/wallmessage.php:63
-msgid "Unable to check your home location."
+#: src/App.php:707
+msgid "toggle mobile"
 msgstr ""
 
-#: mod/wallmessage.php:89 mod/wallmessage.php:98
-msgid "No recipient."
+#: src/App.php:1075
+msgid "No system theme config value set."
 msgstr ""
 
-#: mod/wallmessage.php:129
-#, php-format
+#: src/BaseModule.php:133
 msgid ""
-"If you wish for %s to respond, please check that the privacy settings on "
-"your site allow private mail from unknown senders."
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:55 src/Model/User.php:684
-msgid "default"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:56
-msgid "greenzero"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:57
-msgid "purplezero"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:58
-msgid "easterbunny"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:59
-msgid "darkzero"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:60
-msgid "comix"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:61
-msgid "slackr"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:75
-msgid "Variations"
-msgstr ""
-
-#: view/theme/frio/php/Image.php:24
-msgid "Top Banner"
-msgstr ""
-
-#: view/theme/frio/php/Image.php:24
-msgid ""
-"Resize image to the width of the screen and show background color below on "
-"long pages."
-msgstr ""
-
-#: view/theme/frio/php/Image.php:25
-msgid "Full screen"
-msgstr ""
-
-#: view/theme/frio/php/Image.php:25
-msgid ""
-"Resize image to fill entire screen, clipping either the right or the bottom."
-msgstr ""
-
-#: view/theme/frio/php/Image.php:26
-msgid "Single row mosaic"
-msgstr ""
-
-#: view/theme/frio/php/Image.php:26
-msgid ""
-"Resize image to repeat it on a single row, either vertical or horizontal."
-msgstr ""
-
-#: view/theme/frio/php/Image.php:27
-msgid "Mosaic"
-msgstr ""
-
-#: view/theme/frio/php/Image.php:27
-msgid "Repeat image to fill the screen."
-msgstr ""
-
-#: view/theme/frio/config.php:103
-msgid "Custom"
-msgstr ""
-
-#: view/theme/frio/config.php:115
-msgid "Note"
-msgstr ""
-
-#: view/theme/frio/config.php:115
-msgid "Check image permissions if all users are allowed to see the image"
-msgstr ""
-
-#: view/theme/frio/config.php:122
-msgid "Select color scheme"
-msgstr ""
-
-#: view/theme/frio/config.php:123
-msgid "Navigation bar background color"
-msgstr ""
-
-#: view/theme/frio/config.php:124
-msgid "Navigation bar icon color "
-msgstr ""
-
-#: view/theme/frio/config.php:125
-msgid "Link color"
-msgstr ""
-
-#: view/theme/frio/config.php:126
-msgid "Set the background color"
-msgstr ""
-
-#: view/theme/frio/config.php:127
-msgid "Content background opacity"
-msgstr ""
-
-#: view/theme/frio/config.php:128
-msgid "Set the background image"
-msgstr ""
-
-#: view/theme/frio/config.php:129
-msgid "Background image style"
-msgstr ""
-
-#: view/theme/frio/config.php:134
-msgid "Login page background image"
-msgstr ""
-
-#: view/theme/frio/config.php:138
-msgid "Login page background color"
-msgstr ""
-
-#: view/theme/frio/config.php:138
-msgid "Leave background image and color empty for theme defaults"
-msgstr ""
-
-#: view/theme/frio/theme.php:239
-msgid "Guest"
-msgstr ""
-
-#: view/theme/frio/theme.php:244
-msgid "Visitor"
-msgstr ""
-
-#: view/theme/frio/theme.php:259 src/Content/Nav.php:153
-#: src/Module/Login.php:321
-msgid "Logout"
-msgstr ""
-
-#: view/theme/frio/theme.php:259 src/Content/Nav.php:153
-msgid "End this session"
-msgstr ""
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:156
-#: src/Model/Profile.php:901 src/Module/Contact.php:652
-#: src/Module/Contact.php:853
-msgid "Status"
-msgstr ""
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:156
-#: src/Content/Nav.php:242
-msgid "Your posts and conversations"
-msgstr ""
-
-#: view/theme/frio/theme.php:263 src/Content/Nav.php:157
-msgid "Your profile page"
-msgstr ""
-
-#: view/theme/frio/theme.php:264 src/Content/Nav.php:158
-msgid "Your photos"
-msgstr ""
-
-#: view/theme/frio/theme.php:265 src/Content/Nav.php:159
-#: src/Model/Profile.php:925 src/Model/Profile.php:928
-msgid "Videos"
-msgstr ""
-
-#: view/theme/frio/theme.php:265 src/Content/Nav.php:159
-msgid "Your videos"
-msgstr ""
-
-#: view/theme/frio/theme.php:266 src/Content/Nav.php:160
-msgid "Your events"
-msgstr ""
-
-#: view/theme/frio/theme.php:269 src/Content/Nav.php:239
-msgid "Conversations from your friends"
-msgstr ""
-
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:226
-#: src/Model/Profile.php:940 src/Model/Profile.php:951
-msgid "Events and Calendar"
-msgstr ""
-
-#: view/theme/frio/theme.php:271 src/Content/Nav.php:252
-msgid "Private mail"
-msgstr ""
-
-#: view/theme/frio/theme.php:272 src/Content/Nav.php:263
-msgid "Account settings"
-msgstr ""
-
-#: view/theme/frio/theme.php:273 src/Content/Nav.php:269
-msgid "Manage/edit friends and contacts"
-msgstr ""
-
-#: view/theme/quattro/config.php:77
-msgid "Alignment"
-msgstr ""
-
-#: view/theme/quattro/config.php:77
-msgid "Left"
-msgstr ""
-
-#: view/theme/quattro/config.php:77
-msgid "Center"
-msgstr ""
-
-#: view/theme/quattro/config.php:78
-msgid "Color scheme"
-msgstr ""
-
-#: view/theme/quattro/config.php:79
-msgid "Posts font size"
-msgstr ""
-
-#: view/theme/quattro/config.php:80
-msgid "Textareas font size"
-msgstr ""
-
-#: view/theme/vier/config.php:76
-msgid "Comma separated list of helper forums"
-msgstr ""
-
-#: view/theme/vier/config.php:116 src/Core/ACL.php:301
-msgid "don't show"
-msgstr ""
-
-#: view/theme/vier/config.php:116 src/Core/ACL.php:300
-msgid "show"
-msgstr ""
-
-#: view/theme/vier/config.php:123
-msgid "Set style"
-msgstr ""
-
-#: view/theme/vier/config.php:124
-msgid "Community Pages"
-msgstr ""
-
-#: view/theme/vier/config.php:125 view/theme/vier/theme.php:151
-msgid "Community Profiles"
-msgstr ""
-
-#: view/theme/vier/config.php:126
-msgid "Help or @NewHere ?"
-msgstr ""
-
-#: view/theme/vier/config.php:127 view/theme/vier/theme.php:373
-msgid "Connect Services"
-msgstr ""
-
-#: view/theme/vier/config.php:128
-msgid "Find Friends"
-msgstr ""
-
-#: view/theme/vier/config.php:129 view/theme/vier/theme.php:181
-msgid "Last users"
-msgstr ""
-
-#: view/theme/vier/theme.php:199 src/Content/Widget.php:61
-msgid "Find People"
-msgstr ""
-
-#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
-msgid "Enter name or interest"
-msgstr ""
-
-#: view/theme/vier/theme.php:202 src/Content/Widget.php:64
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr ""
-
-#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
-msgid "Similar Interests"
-msgstr ""
-
-#: view/theme/vier/theme.php:206 src/Content/Widget.php:68
-msgid "Random Profile"
-msgstr ""
-
-#: view/theme/vier/theme.php:207 src/Content/Widget.php:69
-msgid "Invite Friends"
-msgstr ""
-
-#: view/theme/vier/theme.php:210 src/Content/Widget.php:72
-msgid "Local Directory"
-msgstr ""
-
-#: view/theme/vier/theme.php:250 src/Content/Text/HTML.php:914
-#: src/Content/ForumManager.php:130 src/Content/Nav.php:207
-msgid "Forums"
-msgstr ""
-
-#: view/theme/vier/theme.php:252 src/Content/ForumManager.php:132
-msgid "External link to forum"
-msgstr ""
-
-#: view/theme/vier/theme.php:288
-msgid "Quick Start"
-msgstr ""
-
-#: src/Core/Console/ArchiveContact.php:65
-#, php-format
-msgid "Could not find any unarchived contact entry for this URL (%s)"
-msgstr ""
-
-#: src/Core/Console/ArchiveContact.php:70
-msgid "The contact entries have been archived"
-msgstr ""
-
-#: src/Core/Console/NewPassword.php:72
-msgid "Enter new password: "
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:50
-#, php-format
-msgid "Post update version number has been set to %s."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:58
-msgid "Check for pending update actions."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:60
-msgid "Done."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:62
-msgid "Execute pending post updates."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:68
-msgid "All pending post updates are done."
-msgstr ""
-
-#: src/Core/ACL.php:287
-msgid "Post to Email"
-msgstr ""
-
-#: src/Core/ACL.php:293
-msgid "Hide your profile details from unknown viewers?"
-msgstr ""
-
-#: src/Core/ACL.php:292
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr ""
-
-#: src/Core/ACL.php:299
-msgid "Visible to everybody"
-msgstr ""
-
-#: src/Core/ACL.php:311
-msgid "Close"
-msgstr ""
-
-#: src/Core/Authentication.php:87
-msgid "Welcome "
-msgstr ""
-
-#: src/Core/Authentication.php:88
-msgid "Please upload a profile photo."
-msgstr ""
-
-#: src/Core/Authentication.php:90
-msgid "Welcome back "
-msgstr ""
-
-#: src/Core/Installer.php:162
-msgid ""
-"The database configuration file \"config/local.config.php\" could not be "
-"written. Please use the enclosed text to create a configuration file in your "
-"web server root."
-msgstr ""
-
-#: src/Core/Installer.php:181
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr ""
-
-#: src/Core/Installer.php:182 src/Module/Install.php:132
-#: src/Module/Install.php:263
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr ""
-
-#: src/Core/Installer.php:243
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr ""
-
-#: src/Core/Installer.php:244
-msgid ""
-"If you don't have a command line version of PHP installed on your server, "
-"you will not be able to run the background processing. See <a href='https://"
-"github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-"
-"worker'>'Setup the worker'</a>"
-msgstr ""
-
-#: src/Core/Installer.php:248
-msgid "PHP executable path"
-msgstr ""
-
-#: src/Core/Installer.php:248
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr ""
-
-#: src/Core/Installer.php:253
-msgid "Command line PHP"
-msgstr ""
-
-#: src/Core/Installer.php:262
-msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
-msgstr ""
-
-#: src/Core/Installer.php:263
-msgid "Found PHP version: "
-msgstr ""
-
-#: src/Core/Installer.php:265
-msgid "PHP cli binary"
-msgstr ""
-
-#: src/Core/Installer.php:278
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr ""
-
-#: src/Core/Installer.php:279
-msgid "This is required for message delivery to work."
-msgstr ""
-
-#: src/Core/Installer.php:284
-msgid "PHP register_argc_argv"
-msgstr ""
-
-#: src/Core/Installer.php:316
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr ""
-
-#: src/Core/Installer.php:317
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
-msgstr ""
-
-#: src/Core/Installer.php:320
-msgid "Generate encryption keys"
-msgstr ""
-
-#: src/Core/Installer.php:371
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:376
-msgid "Apache mod_rewrite module"
-msgstr ""
-
-#: src/Core/Installer.php:382
-msgid "Error: PDO or MySQLi PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:387
-msgid "Error: The MySQL driver for PDO is not installed."
-msgstr ""
-
-#: src/Core/Installer.php:391
-msgid "PDO or MySQLi PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:399
-msgid "Error, XML PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:403
-msgid "XML PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:406
-msgid "libCurl PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:407
-msgid "Error: libCURL PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:413
-msgid "GD graphics PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:414
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:420
-msgid "OpenSSL PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:421
-msgid "Error: openssl PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:427
-msgid "mb_string PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:428
-msgid "Error: mb_string PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:434
-msgid "iconv PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:435
-msgid "Error: iconv PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:441
-msgid "POSIX PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:442
-msgid "Error: POSIX PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:448
-msgid "JSON PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:449
-msgid "Error: JSON PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:472
-msgid ""
-"The web installer needs to be able to create a file called \"local.config.php"
-"\" in the \"config\" folder of your web server and it is unable to do so."
-msgstr ""
-
-#: src/Core/Installer.php:473
-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 ""
-
-#: src/Core/Installer.php:474
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named local.config.php in your Friendica \"config\" folder."
-msgstr ""
-
-#: src/Core/Installer.php:475
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"INSTALL.txt\" for instructions."
-msgstr ""
-
-#: src/Core/Installer.php:478
-msgid "config/local.config.php is writable"
-msgstr ""
-
-#: src/Core/Installer.php:498
-msgid ""
-"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr ""
-
-#: src/Core/Installer.php:499
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/smarty3/ under the Friendica top level "
-"folder."
-msgstr ""
-
-#: src/Core/Installer.php:500
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
-msgstr ""
-
-#: src/Core/Installer.php:501
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr ""
-
-#: src/Core/Installer.php:504
-msgid "view/smarty3 is writable"
-msgstr ""
-
-#: src/Core/Installer.php:533
-msgid ""
-"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist "
-"to .htaccess."
-msgstr ""
-
-#: src/Core/Installer.php:535
-msgid "Error message from Curl when fetching"
-msgstr ""
-
-#: src/Core/Installer.php:540
-msgid "Url rewrite is working"
-msgstr ""
-
-#: src/Core/Installer.php:569
-msgid "ImageMagick PHP extension is not installed"
-msgstr ""
-
-#: src/Core/Installer.php:571
-msgid "ImageMagick PHP extension is installed"
-msgstr ""
-
-#: src/Core/Installer.php:573 tests/src/Core/InstallerTest.php:329
-#: tests/src/Core/InstallerTest.php:355
-msgid "ImageMagick supports GIF"
-msgstr ""
-
-#: src/Core/Installer.php:595
-msgid "Could not connect to database."
-msgstr ""
-
-#: src/Core/Installer.php:602
-msgid "Database already in use."
-msgstr ""
-
-#: src/Core/L10n.php:368 src/Model/Event.php:398
-msgid "Tuesday"
-msgstr ""
-
-#: src/Core/L10n.php:368 src/Model/Event.php:399
-msgid "Wednesday"
-msgstr ""
-
-#: src/Core/L10n.php:368 src/Model/Event.php:400
-msgid "Thursday"
-msgstr ""
-
-#: src/Core/L10n.php:368 src/Model/Event.php:401
-msgid "Friday"
-msgstr ""
-
-#: src/Core/L10n.php:368 src/Model/Event.php:402
-msgid "Saturday"
-msgstr ""
-
-#: src/Core/L10n.php:372 src/Model/Event.php:417
-msgid "January"
-msgstr ""
-
-#: src/Core/L10n.php:372 src/Model/Event.php:418
-msgid "February"
-msgstr ""
-
-#: src/Core/L10n.php:372 src/Model/Event.php:419
-msgid "March"
-msgstr ""
-
-#: src/Core/L10n.php:372 src/Model/Event.php:420
-msgid "April"
-msgstr ""
-
-#: src/Core/L10n.php:372 src/Core/L10n.php:391 src/Model/Event.php:408
-msgid "May"
-msgstr ""
-
-#: src/Core/L10n.php:372 src/Model/Event.php:421
-msgid "June"
-msgstr ""
-
-#: src/Core/L10n.php:372 src/Model/Event.php:422
-msgid "July"
-msgstr ""
-
-#: src/Core/L10n.php:372 src/Model/Event.php:423
-msgid "August"
-msgstr ""
-
-#: src/Core/L10n.php:372 src/Model/Event.php:424
-msgid "September"
-msgstr ""
-
-#: src/Core/L10n.php:372 src/Model/Event.php:425
-msgid "October"
-msgstr ""
-
-#: src/Core/L10n.php:372 src/Model/Event.php:426
-msgid "November"
-msgstr ""
-
-#: src/Core/L10n.php:372 src/Model/Event.php:427
-msgid "December"
-msgstr ""
-
-#: src/Core/L10n.php:387 src/Model/Event.php:389
-msgid "Mon"
-msgstr ""
-
-#: src/Core/L10n.php:387 src/Model/Event.php:390
-msgid "Tue"
-msgstr ""
-
-#: src/Core/L10n.php:387 src/Model/Event.php:391
-msgid "Wed"
-msgstr ""
-
-#: src/Core/L10n.php:387 src/Model/Event.php:392
-msgid "Thu"
-msgstr ""
-
-#: src/Core/L10n.php:387 src/Model/Event.php:393
-msgid "Fri"
-msgstr ""
-
-#: src/Core/L10n.php:387 src/Model/Event.php:394
-msgid "Sat"
-msgstr ""
-
-#: src/Core/L10n.php:387 src/Model/Event.php:388
-msgid "Sun"
-msgstr ""
-
-#: src/Core/L10n.php:391 src/Model/Event.php:404
-msgid "Jan"
-msgstr ""
-
-#: src/Core/L10n.php:391 src/Model/Event.php:405
-msgid "Feb"
-msgstr ""
-
-#: src/Core/L10n.php:391 src/Model/Event.php:406
-msgid "Mar"
-msgstr ""
-
-#: src/Core/L10n.php:391 src/Model/Event.php:407
-msgid "Apr"
-msgstr ""
-
-#: src/Core/L10n.php:391 src/Model/Event.php:410
-msgid "Jul"
-msgstr ""
-
-#: src/Core/L10n.php:391 src/Model/Event.php:411
-msgid "Aug"
-msgstr ""
-
-#: src/Core/L10n.php:391
-msgid "Sep"
-msgstr ""
-
-#: src/Core/L10n.php:391 src/Model/Event.php:413
-msgid "Oct"
-msgstr ""
-
-#: src/Core/L10n.php:391 src/Model/Event.php:414
-msgid "Nov"
-msgstr ""
-
-#: src/Core/L10n.php:391 src/Model/Event.php:415
-msgid "Dec"
-msgstr ""
-
-#: src/Core/L10n.php:410
-msgid "poke"
-msgstr ""
-
-#: src/Core/L10n.php:410
-msgid "poked"
-msgstr ""
-
-#: src/Core/L10n.php:411
-msgid "ping"
-msgstr ""
-
-#: src/Core/L10n.php:411
-msgid "pinged"
-msgstr ""
-
-#: src/Core/L10n.php:412
-msgid "prod"
-msgstr ""
-
-#: src/Core/L10n.php:412
-msgid "prodded"
-msgstr ""
-
-#: src/Core/L10n.php:413
-msgid "slap"
-msgstr ""
-
-#: src/Core/L10n.php:413
-msgid "slapped"
-msgstr ""
-
-#: src/Core/L10n.php:414
-msgid "finger"
-msgstr ""
-
-#: src/Core/L10n.php:414
-msgid "fingered"
-msgstr ""
-
-#: src/Core/L10n.php:415
-msgid "rebuff"
-msgstr ""
-
-#: src/Core/L10n.php:415
-msgid "rebuffed"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:175
-msgid "System"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:196 src/Content/Nav.php:180
-#: src/Content/Nav.php:242
-msgid "Home"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:203 src/Content/Nav.php:246
-msgid "Introductions"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:265 src/Core/NotificationsManager.php:277
-#, php-format
-msgid "%s commented on %s's post"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:276
-#, php-format
-msgid "%s created a new post"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:290
-#, php-format
-msgid "%s liked %s's post"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:303
-#, php-format
-msgid "%s disliked %s's post"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:316
-#, php-format
-msgid "%s is attending %s's event"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:329
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:342
-#, php-format
-msgid "%s may attend %s's event"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:375
-#, php-format
-msgid "%s is now friends with %s"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:651
-msgid "Friend Suggestion"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:685
-msgid "Friend/Connect Request"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:685
-msgid "New Follower"
-msgstr ""
-
-#: src/Core/System.php:137
-msgid "Error 400 - Bad Request"
-msgstr ""
-
-#: src/Core/System.php:138
-msgid "Error 401 - Unauthorized"
-msgstr ""
-
-#: src/Core/System.php:139
-msgid "Error 403 - Forbidden"
-msgstr ""
-
-#: src/Core/System.php:140
-msgid "Error 404 - Not Found"
-msgstr ""
-
-#: src/Core/System.php:141
-msgid "Error 500 - Internal Server Error"
-msgstr ""
-
-#: src/Core/System.php:142
-msgid "Error 503 - Service Unavailable"
-msgstr ""
-
-#: src/Core/System.php:150
-msgid ""
-"The server cannot or will not process the request due to an apparent client "
-"error."
-msgstr ""
-
-#: src/Core/System.php:151
-msgid "Authentication is required and has failed or has not yet been provided."
-msgstr ""
-
-#: src/Core/System.php:152
-msgid ""
-"The request was valid, but the server is refusing action. The user might not "
-"have the necessary permissions for a resource, or may need an account."
-msgstr ""
-
-#: src/Core/System.php:153
-msgid ""
-"The requested resource could not be found but may be available in the future."
-msgstr ""
-
-#: src/Core/System.php:154
-msgid ""
-"An unexpected condition was encountered and no more specific message is "
-"suitable."
-msgstr ""
-
-#: src/Core/System.php:155
-msgid ""
-"The server is currently unavailable (because it is overloaded or down for "
-"maintenance). Please try again later."
-msgstr ""
-
-#: src/Core/Update.php:168
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr ""
-
-#: src/Core/Update.php:225
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact "
-"a\n"
-"\t\t\t\tfriendica developer if you can not help me on your own. My database "
-"might be invalid."
-msgstr ""
-
-#: src/Core/Update.php:231
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr ""
-
-#: src/Core/Update.php:260
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
-msgstr ""
-
-#: src/Core/UserImport.php:103
-msgid "Error decoding account file"
-msgstr ""
-
-#: src/Core/UserImport.php:109
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr ""
-
-#: src/Core/UserImport.php:117
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr ""
-
-#: src/Core/UserImport.php:153
-msgid "User creation error"
-msgstr ""
-
-#: src/Core/UserImport.php:171
-msgid "User profile creation error"
-msgstr ""
-
-#: src/Core/UserImport.php:215
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Core/UserImport.php:280
-msgid "Done. You can now login with your username and password"
-msgstr ""
-
-#: src/Util/Temporal.php:147 src/Model/Profile.php:771
-msgid "Birthday:"
-msgstr ""
-
-#: src/Util/Temporal.php:151
-msgid "YYYY-MM-DD or MM-DD"
-msgstr ""
-
-#: src/Util/Temporal.php:298
-msgid "never"
-msgstr ""
-
-#: src/Util/Temporal.php:305
-msgid "less than a second ago"
-msgstr ""
-
-#: src/Util/Temporal.php:313
-msgid "year"
-msgstr ""
-
-#: src/Util/Temporal.php:313
-msgid "years"
-msgstr ""
-
-#: src/Util/Temporal.php:314
-msgid "months"
-msgstr ""
-
-#: src/Util/Temporal.php:315
-msgid "weeks"
-msgstr ""
-
-#: src/Util/Temporal.php:316
-msgid "days"
-msgstr ""
-
-#: src/Util/Temporal.php:317
-msgid "hour"
-msgstr ""
-
-#: src/Util/Temporal.php:317
-msgid "hours"
-msgstr ""
-
-#: src/Util/Temporal.php:318
-msgid "minute"
-msgstr ""
-
-#: src/Util/Temporal.php:318
-msgid "minutes"
-msgstr ""
-
-#: src/Util/Temporal.php:319
-msgid "second"
-msgstr ""
-
-#: src/Util/Temporal.php:319
-msgid "seconds"
-msgstr ""
-
-#: src/Util/Temporal.php:329
-#, php-format
-msgid "in %1$d %2$s"
-msgstr ""
-
-#: src/Util/Temporal.php:332
-#, php-format
-msgid "%1$d %2$s ago"
-msgstr ""
-
-#: src/Content/Text/BBCode.php:429
-msgid "view full size"
-msgstr ""
-
-#: src/Content/Text/BBCode.php:863 src/Content/Text/BBCode.php:1596
-#: src/Content/Text/BBCode.php:1597
-msgid "Image/photo"
-msgstr ""
-
-#: src/Content/Text/BBCode.php:967
-#, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
-msgstr ""
-
-#: src/Content/Text/BBCode.php:1523 src/Content/Text/BBCode.php:1545
-msgid "$1 wrote:"
-msgstr ""
-
-#: src/Content/Text/BBCode.php:1607 src/Content/Text/BBCode.php:1608
-msgid "Encrypted content"
-msgstr ""
-
-#: src/Content/Text/BBCode.php:1715
-msgid "Invalid source protocol"
-msgstr ""
-
-#: src/Content/Text/BBCode.php:1726
-msgid "Invalid link protocol"
-msgstr ""
-
-#: src/Content/Text/HTML.php:800
-msgid "Loading more entries..."
-msgstr ""
-
-#: src/Content/Text/HTML.php:801
-msgid "The end"
-msgstr ""
-
-#: src/Content/Text/HTML.php:894
-msgid "Follow"
-msgstr ""
-
-#: src/Content/Text/HTML.php:903 src/Content/Nav.php:79
-msgid "@name, !forum, #tags, content"
-msgstr ""
-
-#: src/Content/Text/HTML.php:909 src/Content/Nav.php:201
-msgid "Full Text"
-msgstr ""
-
-#: src/Content/Text/HTML.php:910 src/Content/Widget/TagCloud.php:54
-#: src/Content/Nav.php:202
-msgid "Tags"
-msgstr ""
-
-#: src/Content/Text/HTML.php:951 src/Model/Item.php:3485
-#: src/Model/Item.php:3496
-msgid "Click to open/close"
-msgstr ""
-
-#: src/Content/Widget/CalendarExport.php:64
-msgid "Export"
-msgstr ""
-
-#: src/Content/Widget/CalendarExport.php:65
-msgid "Export calendar as ical"
-msgstr ""
-
-#: src/Content/Widget/CalendarExport.php:66
-msgid "Export calendar as csv"
-msgstr ""
-
-#: src/Content/Widget/ContactBlock.php:58
-msgid "No contacts"
-msgstr ""
-
-#: src/Content/Widget/ContactBlock.php:90
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Content/Widget/ContactBlock.php:109
-msgid "View Contacts"
+"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 ""
 
 #: src/Content/ContactSelector.php:58
@@ -8020,7 +6882,7 @@ msgstr ""
 msgid "Sex Addict"
 msgstr ""
 
-#: src/Content/ContactSelector.php:241 src/Model/User.php:701
+#: src/Content/ContactSelector.php:241 src/Model/User.php:702
 msgid "Friends"
 msgstr ""
 
@@ -8237,6 +7099,15 @@ msgstr ""
 msgid "Display membership date in profile"
 msgstr ""
 
+#: src/Content/ForumManager.php:130 src/Content/Nav.php:207
+#: src/Content/Text/HTML.php:914 view/theme/vier/theme.php:250
+msgid "Forums"
+msgstr ""
+
+#: src/Content/ForumManager.php:132 view/theme/vier/theme.php:252
+msgid "External link to forum"
+msgstr ""
+
 #: src/Content/Nav.php:74
 msgid "Nothing new here"
 msgstr ""
@@ -8245,6 +7116,50 @@ msgstr ""
 msgid "Clear notifications"
 msgstr ""
 
+#: src/Content/Nav.php:79 src/Content/Text/HTML.php:903
+msgid "@name, !forum, #tags, content"
+msgstr ""
+
+#: src/Content/Nav.php:153 src/Module/Login.php:321
+#: view/theme/frio/theme.php:259
+msgid "Logout"
+msgstr ""
+
+#: src/Content/Nav.php:153 view/theme/frio/theme.php:259
+msgid "End this session"
+msgstr ""
+
+#: src/Content/Nav.php:156 src/Model/Profile.php:901 src/Module/Contact.php:652
+#: src/Module/Contact.php:853 view/theme/frio/theme.php:262
+msgid "Status"
+msgstr ""
+
+#: src/Content/Nav.php:156 src/Content/Nav.php:242
+#: view/theme/frio/theme.php:262
+msgid "Your posts and conversations"
+msgstr ""
+
+#: src/Content/Nav.php:157 view/theme/frio/theme.php:263
+msgid "Your profile page"
+msgstr ""
+
+#: src/Content/Nav.php:158 view/theme/frio/theme.php:264
+msgid "Your photos"
+msgstr ""
+
+#: src/Content/Nav.php:159 src/Model/Profile.php:925 src/Model/Profile.php:928
+#: view/theme/frio/theme.php:265
+msgid "Videos"
+msgstr ""
+
+#: src/Content/Nav.php:159 view/theme/frio/theme.php:265
+msgid "Your videos"
+msgstr ""
+
+#: src/Content/Nav.php:160 view/theme/frio/theme.php:266
+msgid "Your events"
+msgstr ""
+
 #: src/Content/Nav.php:161
 msgid "Personal notes"
 msgstr ""
@@ -8257,6 +7172,11 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
+#: src/Content/Nav.php:180 src/Content/Nav.php:242
+#: src/Core/NotificationsManager.php:196
+msgid "Home"
+msgstr ""
+
 #: src/Content/Nav.php:180
 msgid "Home Page"
 msgstr ""
@@ -8285,6 +7205,15 @@ msgstr ""
 msgid "Search site content"
 msgstr ""
 
+#: src/Content/Nav.php:201 src/Content/Text/HTML.php:909
+msgid "Full Text"
+msgstr ""
+
+#: src/Content/Nav.php:202 src/Content/Text/HTML.php:910
+#: src/Content/Widget/TagCloud.php:54
+msgid "Tags"
+msgstr ""
+
 #: src/Content/Nav.php:222
 msgid "Community"
 msgstr ""
@@ -8293,6 +7222,11 @@ msgstr ""
 msgid "Conversations on this and other servers"
 msgstr ""
 
+#: src/Content/Nav.php:226 src/Model/Profile.php:940 src/Model/Profile.php:951
+#: view/theme/frio/theme.php:270
+msgid "Events and Calendar"
+msgstr ""
+
 #: src/Content/Nav.php:229
 msgid "Directory"
 msgstr ""
@@ -8309,6 +7243,10 @@ msgstr ""
 msgid "Terms of Service of this Friendica instance"
 msgstr ""
 
+#: src/Content/Nav.php:239 view/theme/frio/theme.php:269
+msgid "Conversations from your friends"
+msgstr ""
+
 #: src/Content/Nav.php:240
 msgid "Network Reset"
 msgstr ""
@@ -8317,6 +7255,10 @@ msgstr ""
 msgid "Load Network page with no filters"
 msgstr ""
 
+#: src/Content/Nav.php:246 src/Core/NotificationsManager.php:203
+msgid "Introductions"
+msgstr ""
+
 #: src/Content/Nav.php:246
 msgid "Friend Requests"
 msgstr ""
@@ -8329,6 +7271,10 @@ msgstr ""
 msgid "Mark all system notifications seen"
 msgstr ""
 
+#: src/Content/Nav.php:252 view/theme/frio/theme.php:271
+msgid "Private mail"
+msgstr ""
+
 #: src/Content/Nav.php:253
 msgid "Inbox"
 msgstr ""
@@ -8345,10 +7291,18 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
+#: src/Content/Nav.php:263 view/theme/frio/theme.php:272
+msgid "Account settings"
+msgstr ""
+
 #: src/Content/Nav.php:266
 msgid "Manage/Edit Profiles"
 msgstr ""
 
+#: src/Content/Nav.php:269 view/theme/frio/theme.php:273
+msgid "Manage/edit friends and contacts"
+msgstr ""
+
 #: src/Content/Nav.php:274
 msgid "Site setup and configuration"
 msgstr ""
@@ -8385,6 +7339,80 @@ msgstr ""
 msgid "last"
 msgstr ""
 
+#: src/Content/Text/BBCode.php:429
+msgid "view full size"
+msgstr ""
+
+#: src/Content/Text/BBCode.php:863 src/Content/Text/BBCode.php:1596
+#: src/Content/Text/BBCode.php:1597
+msgid "Image/photo"
+msgstr ""
+
+#: src/Content/Text/BBCode.php:967
+#, php-format
+msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+msgstr ""
+
+#: src/Content/Text/BBCode.php:1523 src/Content/Text/BBCode.php:1545
+msgid "$1 wrote:"
+msgstr ""
+
+#: src/Content/Text/BBCode.php:1607 src/Content/Text/BBCode.php:1608
+msgid "Encrypted content"
+msgstr ""
+
+#: src/Content/Text/BBCode.php:1715
+msgid "Invalid source protocol"
+msgstr ""
+
+#: src/Content/Text/BBCode.php:1726
+msgid "Invalid link protocol"
+msgstr ""
+
+#: src/Content/Text/HTML.php:800
+msgid "Loading more entries..."
+msgstr ""
+
+#: src/Content/Text/HTML.php:801
+msgid "The end"
+msgstr ""
+
+#: src/Content/Text/HTML.php:894
+msgid "Follow"
+msgstr ""
+
+#: src/Content/Text/HTML.php:951 src/Model/Item.php:3503
+#: src/Model/Item.php:3514
+msgid "Click to open/close"
+msgstr ""
+
+#: src/Content/Widget/CalendarExport.php:64
+msgid "Export"
+msgstr ""
+
+#: src/Content/Widget/CalendarExport.php:65
+msgid "Export calendar as ical"
+msgstr ""
+
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export calendar as csv"
+msgstr ""
+
+#: src/Content/Widget/ContactBlock.php:58
+msgid "No contacts"
+msgstr ""
+
+#: src/Content/Widget/ContactBlock.php:90
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Content/Widget/ContactBlock.php:109
+msgid "View Contacts"
+msgstr ""
+
 #: src/Content/Widget.php:35
 msgid "Add New Contact"
 msgstr ""
@@ -8404,6 +7432,34 @@ msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
+#: src/Content/Widget.php:61 view/theme/vier/theme.php:199
+msgid "Find People"
+msgstr ""
+
+#: src/Content/Widget.php:62 view/theme/vier/theme.php:200
+msgid "Enter name or interest"
+msgstr ""
+
+#: src/Content/Widget.php:64 view/theme/vier/theme.php:202
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr ""
+
+#: src/Content/Widget.php:67 view/theme/vier/theme.php:205
+msgid "Similar Interests"
+msgstr ""
+
+#: src/Content/Widget.php:68 view/theme/vier/theme.php:206
+msgid "Random Profile"
+msgstr ""
+
+#: src/Content/Widget.php:69 view/theme/vier/theme.php:207
+msgid "Invite Friends"
+msgstr ""
+
+#: src/Content/Widget.php:72 view/theme/vier/theme.php:210
+msgid "Local Directory"
+msgstr ""
+
 #: src/Content/Widget.php:158
 msgid "Protocols"
 msgstr ""
@@ -8431,6 +7487,705 @@ msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 
+#: src/Core/ACL.php:287
+msgid "Post to Email"
+msgstr ""
+
+#: src/Core/ACL.php:293
+msgid "Hide your profile details from unknown viewers?"
+msgstr ""
+
+#: src/Core/ACL.php:292
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr ""
+
+#: src/Core/ACL.php:299
+msgid "Visible to everybody"
+msgstr ""
+
+#: src/Core/ACL.php:300 view/theme/vier/config.php:116
+msgid "show"
+msgstr ""
+
+#: src/Core/ACL.php:301 view/theme/vier/config.php:116
+msgid "don't show"
+msgstr ""
+
+#: src/Core/ACL.php:311
+msgid "Close"
+msgstr ""
+
+#: src/Core/Authentication.php:87
+msgid "Welcome "
+msgstr ""
+
+#: src/Core/Authentication.php:88
+msgid "Please upload a profile photo."
+msgstr ""
+
+#: src/Core/Authentication.php:90
+msgid "Welcome back "
+msgstr ""
+
+#: src/Core/Console/ArchiveContact.php:65
+#, php-format
+msgid "Could not find any unarchived contact entry for this URL (%s)"
+msgstr ""
+
+#: src/Core/Console/ArchiveContact.php:70
+msgid "The contact entries have been archived"
+msgstr ""
+
+#: src/Core/Console/NewPassword.php:72
+msgid "Enter new password: "
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:50
+#, php-format
+msgid "Post update version number has been set to %s."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:58
+msgid "Check for pending update actions."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:60
+msgid "Done."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:62
+msgid "Execute pending post updates."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:68
+msgid "All pending post updates are done."
+msgstr ""
+
+#: src/Core/Installer.php:163
+msgid ""
+"The database configuration file \"config/local.config.php\" could not be "
+"written. Please use the enclosed text to create a configuration file in your "
+"web server root."
+msgstr ""
+
+#: src/Core/Installer.php:182
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr ""
+
+#: src/Core/Installer.php:183 src/Module/Install.php:132
+#: src/Module/Install.php:263
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr ""
+
+#: src/Core/Installer.php:244
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr ""
+
+#: src/Core/Installer.php:245
+msgid ""
+"If you don't have a command line version of PHP installed on your server, "
+"you will not be able to run the background processing. See <a href='https://"
+"github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-"
+"worker'>'Setup the worker'</a>"
+msgstr ""
+
+#: src/Core/Installer.php:249
+msgid "PHP executable path"
+msgstr ""
+
+#: src/Core/Installer.php:249
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr ""
+
+#: src/Core/Installer.php:254
+msgid "Command line PHP"
+msgstr ""
+
+#: src/Core/Installer.php:263
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+msgstr ""
+
+#: src/Core/Installer.php:264
+msgid "Found PHP version: "
+msgstr ""
+
+#: src/Core/Installer.php:266
+msgid "PHP cli binary"
+msgstr ""
+
+#: src/Core/Installer.php:279
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr ""
+
+#: src/Core/Installer.php:280
+msgid "This is required for message delivery to work."
+msgstr ""
+
+#: src/Core/Installer.php:285
+msgid "PHP register_argc_argv"
+msgstr ""
+
+#: src/Core/Installer.php:317
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr ""
+
+#: src/Core/Installer.php:318
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
+msgstr ""
+
+#: src/Core/Installer.php:321
+msgid "Generate encryption keys"
+msgstr ""
+
+#: src/Core/Installer.php:372
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:377
+msgid "Apache mod_rewrite module"
+msgstr ""
+
+#: src/Core/Installer.php:383
+msgid "Error: PDO or MySQLi PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:388
+msgid "Error: The MySQL driver for PDO is not installed."
+msgstr ""
+
+#: src/Core/Installer.php:392
+msgid "PDO or MySQLi PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:400
+msgid "Error, XML PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:404
+msgid "XML PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:407
+msgid "libCurl PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:408
+msgid "Error: libCURL PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:414
+msgid "GD graphics PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:415
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:421
+msgid "OpenSSL PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:422
+msgid "Error: openssl PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:428
+msgid "mb_string PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:429
+msgid "Error: mb_string PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:435
+msgid "iconv PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:436
+msgid "Error: iconv PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:442
+msgid "POSIX PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:443
+msgid "Error: POSIX PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:449
+msgid "JSON PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:450
+msgid "Error: JSON PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:473
+msgid ""
+"The web installer needs to be able to create a file called \"local.config.php"
+"\" in the \"config\" folder of your web server and it is unable to do so."
+msgstr ""
+
+#: src/Core/Installer.php:474
+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 ""
+
+#: src/Core/Installer.php:475
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named local.config.php in your Friendica \"config\" folder."
+msgstr ""
+
+#: src/Core/Installer.php:476
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"INSTALL.txt\" for instructions."
+msgstr ""
+
+#: src/Core/Installer.php:479
+msgid "config/local.config.php is writable"
+msgstr ""
+
+#: src/Core/Installer.php:499
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr ""
+
+#: src/Core/Installer.php:500
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
+msgstr ""
+
+#: src/Core/Installer.php:501
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
+msgstr ""
+
+#: src/Core/Installer.php:502
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr ""
+
+#: src/Core/Installer.php:505
+msgid "view/smarty3 is writable"
+msgstr ""
+
+#: src/Core/Installer.php:534
+msgid ""
+"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist "
+"to .htaccess."
+msgstr ""
+
+#: src/Core/Installer.php:536
+msgid "Error message from Curl when fetching"
+msgstr ""
+
+#: src/Core/Installer.php:541
+msgid "Url rewrite is working"
+msgstr ""
+
+#: src/Core/Installer.php:570
+msgid "ImageMagick PHP extension is not installed"
+msgstr ""
+
+#: src/Core/Installer.php:572
+msgid "ImageMagick PHP extension is installed"
+msgstr ""
+
+#: src/Core/Installer.php:574 tests/src/Core/InstallerTest.php:329
+#: tests/src/Core/InstallerTest.php:355
+msgid "ImageMagick supports GIF"
+msgstr ""
+
+#: src/Core/Installer.php:597
+msgid "Could not connect to database."
+msgstr ""
+
+#: src/Core/Installer.php:604
+msgid "Database already in use."
+msgstr ""
+
+#: src/Core/L10n.php:368 src/Model/Event.php:397
+msgid "Tuesday"
+msgstr ""
+
+#: src/Core/L10n.php:368 src/Model/Event.php:398
+msgid "Wednesday"
+msgstr ""
+
+#: src/Core/L10n.php:368 src/Model/Event.php:399
+msgid "Thursday"
+msgstr ""
+
+#: src/Core/L10n.php:368 src/Model/Event.php:400
+msgid "Friday"
+msgstr ""
+
+#: src/Core/L10n.php:368 src/Model/Event.php:401
+msgid "Saturday"
+msgstr ""
+
+#: src/Core/L10n.php:372 src/Model/Event.php:416
+msgid "January"
+msgstr ""
+
+#: src/Core/L10n.php:372 src/Model/Event.php:417
+msgid "February"
+msgstr ""
+
+#: src/Core/L10n.php:372 src/Model/Event.php:418
+msgid "March"
+msgstr ""
+
+#: src/Core/L10n.php:372 src/Model/Event.php:419
+msgid "April"
+msgstr ""
+
+#: src/Core/L10n.php:372 src/Core/L10n.php:391 src/Model/Event.php:407
+msgid "May"
+msgstr ""
+
+#: src/Core/L10n.php:372 src/Model/Event.php:420
+msgid "June"
+msgstr ""
+
+#: src/Core/L10n.php:372 src/Model/Event.php:421
+msgid "July"
+msgstr ""
+
+#: src/Core/L10n.php:372 src/Model/Event.php:422
+msgid "August"
+msgstr ""
+
+#: src/Core/L10n.php:372 src/Model/Event.php:423
+msgid "September"
+msgstr ""
+
+#: src/Core/L10n.php:372 src/Model/Event.php:424
+msgid "October"
+msgstr ""
+
+#: src/Core/L10n.php:372 src/Model/Event.php:425
+msgid "November"
+msgstr ""
+
+#: src/Core/L10n.php:372 src/Model/Event.php:426
+msgid "December"
+msgstr ""
+
+#: src/Core/L10n.php:387 src/Model/Event.php:388
+msgid "Mon"
+msgstr ""
+
+#: src/Core/L10n.php:387 src/Model/Event.php:389
+msgid "Tue"
+msgstr ""
+
+#: src/Core/L10n.php:387 src/Model/Event.php:390
+msgid "Wed"
+msgstr ""
+
+#: src/Core/L10n.php:387 src/Model/Event.php:391
+msgid "Thu"
+msgstr ""
+
+#: src/Core/L10n.php:387 src/Model/Event.php:392
+msgid "Fri"
+msgstr ""
+
+#: src/Core/L10n.php:387 src/Model/Event.php:393
+msgid "Sat"
+msgstr ""
+
+#: src/Core/L10n.php:387 src/Model/Event.php:387
+msgid "Sun"
+msgstr ""
+
+#: src/Core/L10n.php:391 src/Model/Event.php:403
+msgid "Jan"
+msgstr ""
+
+#: src/Core/L10n.php:391 src/Model/Event.php:404
+msgid "Feb"
+msgstr ""
+
+#: src/Core/L10n.php:391 src/Model/Event.php:405
+msgid "Mar"
+msgstr ""
+
+#: src/Core/L10n.php:391 src/Model/Event.php:406
+msgid "Apr"
+msgstr ""
+
+#: src/Core/L10n.php:391 src/Model/Event.php:409
+msgid "Jul"
+msgstr ""
+
+#: src/Core/L10n.php:391 src/Model/Event.php:410
+msgid "Aug"
+msgstr ""
+
+#: src/Core/L10n.php:391
+msgid "Sep"
+msgstr ""
+
+#: src/Core/L10n.php:391 src/Model/Event.php:412
+msgid "Oct"
+msgstr ""
+
+#: src/Core/L10n.php:391 src/Model/Event.php:413
+msgid "Nov"
+msgstr ""
+
+#: src/Core/L10n.php:391 src/Model/Event.php:414
+msgid "Dec"
+msgstr ""
+
+#: src/Core/L10n.php:410
+msgid "poke"
+msgstr ""
+
+#: src/Core/L10n.php:410
+msgid "poked"
+msgstr ""
+
+#: src/Core/L10n.php:411
+msgid "ping"
+msgstr ""
+
+#: src/Core/L10n.php:411
+msgid "pinged"
+msgstr ""
+
+#: src/Core/L10n.php:412
+msgid "prod"
+msgstr ""
+
+#: src/Core/L10n.php:412
+msgid "prodded"
+msgstr ""
+
+#: src/Core/L10n.php:413
+msgid "slap"
+msgstr ""
+
+#: src/Core/L10n.php:413
+msgid "slapped"
+msgstr ""
+
+#: src/Core/L10n.php:414
+msgid "finger"
+msgstr ""
+
+#: src/Core/L10n.php:414
+msgid "fingered"
+msgstr ""
+
+#: src/Core/L10n.php:415
+msgid "rebuff"
+msgstr ""
+
+#: src/Core/L10n.php:415
+msgid "rebuffed"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:175
+msgid "System"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:265 src/Core/NotificationsManager.php:277
+#, php-format
+msgid "%s commented on %s's post"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:276
+#, php-format
+msgid "%s created a new post"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:290
+#, php-format
+msgid "%s liked %s's post"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:303
+#, php-format
+msgid "%s disliked %s's post"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:316
+#, php-format
+msgid "%s is attending %s's event"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:329
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:342
+#, php-format
+msgid "%s may attend %s's event"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:375
+#, php-format
+msgid "%s is now friends with %s"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:651
+msgid "Friend Suggestion"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:685
+msgid "Friend/Connect Request"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:685
+msgid "New Follower"
+msgstr ""
+
+#: src/Core/System.php:137
+msgid "Error 400 - Bad Request"
+msgstr ""
+
+#: src/Core/System.php:138
+msgid "Error 401 - Unauthorized"
+msgstr ""
+
+#: src/Core/System.php:139
+msgid "Error 403 - Forbidden"
+msgstr ""
+
+#: src/Core/System.php:140
+msgid "Error 404 - Not Found"
+msgstr ""
+
+#: src/Core/System.php:141
+msgid "Error 500 - Internal Server Error"
+msgstr ""
+
+#: src/Core/System.php:142
+msgid "Error 503 - Service Unavailable"
+msgstr ""
+
+#: src/Core/System.php:150
+msgid ""
+"The server cannot or will not process the request due to an apparent client "
+"error."
+msgstr ""
+
+#: src/Core/System.php:151
+msgid "Authentication is required and has failed or has not yet been provided."
+msgstr ""
+
+#: src/Core/System.php:152
+msgid ""
+"The request was valid, but the server is refusing action. The user might not "
+"have the necessary permissions for a resource, or may need an account."
+msgstr ""
+
+#: src/Core/System.php:153
+msgid ""
+"The requested resource could not be found but may be available in the future."
+msgstr ""
+
+#: src/Core/System.php:154
+msgid ""
+"An unexpected condition was encountered and no more specific message is "
+"suitable."
+msgstr ""
+
+#: src/Core/System.php:155
+msgid ""
+"The server is currently unavailable (because it is overloaded or down for "
+"maintenance). Please try again later."
+msgstr ""
+
+#: src/Core/Update.php:168
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr ""
+
+#: src/Core/Update.php:225
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact "
+"a\n"
+"\t\t\t\tfriendica developer if you can not help me on your own. My database "
+"might be invalid."
+msgstr ""
+
+#: src/Core/Update.php:231
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr ""
+
+#: src/Core/Update.php:260
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
+msgstr ""
+
+#: src/Core/UserImport.php:103
+msgid "Error decoding account file"
+msgstr ""
+
+#: src/Core/UserImport.php:109
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr ""
+
+#: src/Core/UserImport.php:117
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr ""
+
+#: src/Core/UserImport.php:153
+msgid "User creation error"
+msgstr ""
+
+#: src/Core/UserImport.php:171
+msgid "User profile creation error"
+msgstr ""
+
+#: src/Core/UserImport.php:215
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Core/UserImport.php:280
+msgid "Done. You can now login with your username and password"
+msgstr ""
+
 #: src/Database/DBStructure.php:47
 msgid "There are no tables on MyISAM."
 msgstr ""
@@ -8457,147 +8212,152 @@ msgstr ""
 msgid "%s: updating %s table."
 msgstr ""
 
-#: src/Model/Contact.php:1037
+#: src/LegacyModule.php:30
+#, php-format
+msgid "Legacy module file not found: %s"
+msgstr ""
+
+#: src/Model/Contact.php:1054
 msgid "Drop Contact"
 msgstr ""
 
-#: src/Model/Contact.php:1509
+#: src/Model/Contact.php:1526
 msgid "Organisation"
 msgstr ""
 
-#: src/Model/Contact.php:1513
+#: src/Model/Contact.php:1530
 msgid "News"
 msgstr ""
 
-#: src/Model/Contact.php:1517
+#: src/Model/Contact.php:1534
 msgid "Forum"
 msgstr ""
 
-#: src/Model/Contact.php:1707
+#: src/Model/Contact.php:1724
 msgid "Connect URL missing."
 msgstr ""
 
-#: src/Model/Contact.php:1716
+#: src/Model/Contact.php:1733
 msgid ""
 "The contact could not be added. Please check the relevant network "
 "credentials in your Settings -> Social Networks page."
 msgstr ""
 
-#: src/Model/Contact.php:1755
+#: src/Model/Contact.php:1772
 msgid ""
 "This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: src/Model/Contact.php:1756 src/Model/Contact.php:1769
+#: src/Model/Contact.php:1773 src/Model/Contact.php:1786
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: src/Model/Contact.php:1767
+#: src/Model/Contact.php:1784
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: src/Model/Contact.php:1772
+#: src/Model/Contact.php:1789
 msgid "An author or name was not found."
 msgstr ""
 
-#: src/Model/Contact.php:1775
+#: src/Model/Contact.php:1792
 msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: src/Model/Contact.php:1778
+#: src/Model/Contact.php:1795
 msgid ""
 "Unable to match @-style Identity Address with a known protocol or email "
 "contact."
 msgstr ""
 
-#: src/Model/Contact.php:1779
+#: src/Model/Contact.php:1796
 msgid "Use mailto: in front of address to force email check."
 msgstr ""
 
-#: src/Model/Contact.php:1785
+#: src/Model/Contact.php:1802
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr ""
 
-#: src/Model/Contact.php:1790
+#: src/Model/Contact.php:1807
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 
-#: src/Model/Contact.php:1843
+#: src/Model/Contact.php:1860
 msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: src/Model/Event.php:61 src/Model/Event.php:78 src/Model/Event.php:436
-#: src/Model/Event.php:916
+#: src/Model/Event.php:61 src/Model/Event.php:78 src/Model/Event.php:435
+#: src/Model/Event.php:915
 msgid "Starts:"
 msgstr ""
 
-#: src/Model/Event.php:64 src/Model/Event.php:84 src/Model/Event.php:437
-#: src/Model/Event.php:920
+#: src/Model/Event.php:64 src/Model/Event.php:84 src/Model/Event.php:436
+#: src/Model/Event.php:919
 msgid "Finishes:"
 msgstr ""
 
-#: src/Model/Event.php:386
+#: src/Model/Event.php:385
 msgid "all-day"
 msgstr ""
 
-#: src/Model/Event.php:409
+#: src/Model/Event.php:408
 msgid "Jun"
 msgstr ""
 
-#: src/Model/Event.php:412
+#: src/Model/Event.php:411
 msgid "Sept"
 msgstr ""
 
-#: src/Model/Event.php:434
+#: src/Model/Event.php:433
 msgid "No events to display"
 msgstr ""
 
-#: src/Model/Event.php:562
+#: src/Model/Event.php:561
 msgid "l, F j"
 msgstr ""
 
-#: src/Model/Event.php:593
+#: src/Model/Event.php:592
 msgid "Edit event"
 msgstr ""
 
-#: src/Model/Event.php:594
+#: src/Model/Event.php:593
 msgid "Duplicate event"
 msgstr ""
 
-#: src/Model/Event.php:595
+#: src/Model/Event.php:594
 msgid "Delete event"
 msgstr ""
 
-#: src/Model/Event.php:627 src/Model/Item.php:3536 src/Model/Item.php:3543
+#: src/Model/Event.php:626 src/Model/Item.php:3554 src/Model/Item.php:3561
 msgid "link to source"
 msgstr ""
 
-#: src/Model/Event.php:849
+#: src/Model/Event.php:848
 msgid "D g:i A"
 msgstr ""
 
-#: src/Model/Event.php:850
+#: src/Model/Event.php:849
 msgid "g:i A"
 msgstr ""
 
-#: src/Model/Event.php:935 src/Model/Event.php:937
+#: src/Model/Event.php:934 src/Model/Event.php:936
 msgid "Show map"
 msgstr ""
 
-#: src/Model/Event.php:936
+#: src/Model/Event.php:935
 msgid "Hide map"
 msgstr ""
 
-#: src/Model/Event.php:1028
+#: src/Model/Event.php:1027
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: src/Model/Event.php:1029
+#: src/Model/Event.php:1028
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
@@ -8637,34 +8397,34 @@ msgstr ""
 msgid "Edit groups"
 msgstr ""
 
-#: src/Model/Item.php:3269
+#: src/Model/Item.php:3287
 msgid "activity"
 msgstr ""
 
-#: src/Model/Item.php:3271 src/Object/Post.php:457 src/Object/Post.php:469
+#: src/Model/Item.php:3289 src/Object/Post.php:470
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/Item.php:3274
+#: src/Model/Item.php:3292
 msgid "post"
 msgstr ""
 
-#: src/Model/Item.php:3373
+#: src/Model/Item.php:3391
 #, php-format
 msgid "Content warning: %s"
 msgstr ""
 
-#: src/Model/Item.php:3452
+#: src/Model/Item.php:3470
 msgid "bytes"
 msgstr ""
 
-#: src/Model/Item.php:3530
+#: src/Model/Item.php:3548
 msgid "View on separate page"
 msgstr ""
 
-#: src/Model/Item.php:3531
+#: src/Model/Item.php:3549
 msgid "view on separate page"
 msgstr ""
 
@@ -8741,6 +8501,10 @@ msgstr ""
 msgid "j F"
 msgstr ""
 
+#: src/Model/Profile.php:771 src/Util/Temporal.php:147
+msgid "Birthday:"
+msgstr ""
+
 #: src/Model/Profile.php:778
 msgid "Age:"
 msgstr ""
@@ -8847,134 +8611,138 @@ msgstr ""
 msgid "Enter a valid existing folder"
 msgstr ""
 
-#: src/Model/User.php:270
+#: src/Model/User.php:271
 msgid "Login failed"
 msgstr ""
 
-#: src/Model/User.php:301
+#: src/Model/User.php:302
 msgid "Not enough information to authenticate"
 msgstr ""
 
-#: src/Model/User.php:379
+#: src/Model/User.php:380
 msgid "Password can't be empty"
 msgstr ""
 
-#: src/Model/User.php:398
+#: src/Model/User.php:399
 msgid "Empty passwords are not allowed."
 msgstr ""
 
-#: src/Model/User.php:402
+#: src/Model/User.php:403
 msgid ""
 "The new password has been exposed in a public data dump, please choose "
 "another."
 msgstr ""
 
-#: src/Model/User.php:408
+#: src/Model/User.php:409
 msgid ""
 "The password can't contain accentuated letters, white spaces or colons (:)"
 msgstr ""
 
-#: src/Model/User.php:508
+#: src/Model/User.php:509
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: src/Model/User.php:515
+#: src/Model/User.php:516
 msgid "An invitation is required."
 msgstr ""
 
-#: src/Model/User.php:519
+#: src/Model/User.php:520
 msgid "Invitation could not be verified."
 msgstr ""
 
-#: src/Model/User.php:526
+#: src/Model/User.php:527
 msgid "Invalid OpenID url"
 msgstr ""
 
-#: src/Model/User.php:539 src/Module/Login.php:106
+#: src/Model/User.php:540 src/Module/Login.php:106
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: src/Model/User.php:539 src/Module/Login.php:106
+#: src/Model/User.php:540 src/Module/Login.php:106
 msgid "The error message was:"
 msgstr ""
 
-#: src/Model/User.php:545
+#: src/Model/User.php:546
 msgid "Please enter the required information."
 msgstr ""
 
-#: src/Model/User.php:559
+#: src/Model/User.php:560
 #, php-format
 msgid ""
 "system.username_min_length (%s) and system.username_max_length (%s) are "
 "excluding each other, swapping values."
 msgstr ""
 
-#: src/Model/User.php:566
+#: src/Model/User.php:567
 #, php-format
 msgid "Username should be at least %s character."
 msgid_plural "Username should be at least %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/User.php:570
+#: src/Model/User.php:571
 #, php-format
 msgid "Username should be at most %s character."
 msgid_plural "Username should be at most %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/User.php:578
+#: src/Model/User.php:579
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: src/Model/User.php:583
+#: src/Model/User.php:584
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: src/Model/User.php:587
+#: src/Model/User.php:588
 msgid "Not a valid email address."
 msgstr ""
 
-#: src/Model/User.php:590
+#: src/Model/User.php:591
 msgid "The nickname was blocked from registration by the nodes admin."
 msgstr ""
 
-#: src/Model/User.php:594 src/Model/User.php:602
+#: src/Model/User.php:595 src/Model/User.php:603
 msgid "Cannot use that email."
 msgstr ""
 
-#: src/Model/User.php:609
+#: src/Model/User.php:610
 msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr ""
 
-#: src/Model/User.php:616 src/Model/User.php:673
+#: src/Model/User.php:617 src/Model/User.php:674
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: src/Model/User.php:626
+#: src/Model/User.php:627
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: src/Model/User.php:660 src/Model/User.php:664
+#: src/Model/User.php:661 src/Model/User.php:665
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: src/Model/User.php:689
+#: src/Model/User.php:685 view/theme/duepuntozero/config.php:55
+msgid "default"
+msgstr ""
+
+#: src/Model/User.php:690
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: src/Model/User.php:696
+#: src/Model/User.php:697
 msgid "An error occurred creating your self contact. Please try again."
 msgstr ""
 
-#: src/Model/User.php:705
+#: src/Model/User.php:706
 msgid ""
 "An error occurred creating your default contact group. Please try again."
 msgstr ""
 
-#: src/Model/User.php:781
+#: src/Model/User.php:782
 #, php-format
 msgid ""
 "\n"
@@ -8990,12 +8758,12 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: src/Model/User.php:798
+#: src/Model/User.php:799
 #, php-format
 msgid "Registration at %s"
 msgstr ""
 
-#: src/Model/User.php:817
+#: src/Model/User.php:818
 #, php-format
 msgid ""
 "\n"
@@ -9004,7 +8772,7 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: src/Model/User.php:823
+#: src/Model/User.php:824
 #, php-format
 msgid ""
 "\n"
@@ -9043,52 +8811,6 @@ msgid ""
 "\t\t\tThank you and welcome to %2$s."
 msgstr ""
 
-#: src/Protocol/Diaspora.php:2496
-msgid "Sharing notification from Diaspora network"
-msgstr ""
-
-#: src/Protocol/Diaspora.php:3613
-msgid "Attachments:"
-msgstr ""
-
-#: src/Protocol/OStatus.php:1302 src/Module/Profile.php:102
-#: src/Module/Profile.php:105
-#, php-format
-msgid "%s's timeline"
-msgstr ""
-
-#: src/Protocol/OStatus.php:1306 src/Module/Profile.php:103
-#, php-format
-msgid "%s's posts"
-msgstr ""
-
-#: src/Protocol/OStatus.php:1309 src/Module/Profile.php:104
-#, php-format
-msgid "%s's comments"
-msgstr ""
-
-#: src/Protocol/OStatus.php:1866
-#, php-format
-msgid "%s is now following %s."
-msgstr ""
-
-#: src/Protocol/OStatus.php:1867
-msgid "following"
-msgstr ""
-
-#: src/Protocol/OStatus.php:1870
-#, php-format
-msgid "%s stopped following %s."
-msgstr ""
-
-#: src/Protocol/OStatus.php:1871
-msgid "stopped following"
-msgstr ""
-
-#: src/Worker/Delivery.php:453
-msgid "(no subject)"
-msgstr ""
-
 #: src/Module/Attach.php:36 src/Module/Attach.php:48
 msgid "Item was not found."
 msgstr ""
@@ -9597,6 +9319,22 @@ msgstr ""
 msgid "Logged out."
 msgstr ""
 
+#: src/Module/Profile.php:102 src/Module/Profile.php:105
+#: src/Protocol/OStatus.php:1302
+#, php-format
+msgid "%s's timeline"
+msgstr ""
+
+#: src/Module/Profile.php:103 src/Protocol/OStatus.php:1306
+#, php-format
+msgid "%s's posts"
+msgstr ""
+
+#: src/Module/Profile.php:104 src/Protocol/OStatus.php:1309
+#, php-format
+msgid "%s's comments"
+msgstr ""
+
 #: src/Module/Proxy.php:73
 msgid "Bad Request."
 msgstr ""
@@ -9824,58 +9562,140 @@ msgstr ""
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: src/Object/Post.php:432
-msgid "Notifier task is pending"
+#: src/Object/Post.php:418
+#, php-format
+msgid "Reply to %s"
 msgstr ""
 
 #: src/Object/Post.php:433
-msgid "Delivery to remote servers is pending"
+msgid "Notifier task is pending"
 msgstr ""
 
 #: src/Object/Post.php:434
-msgid "Delivery to remote servers is underway"
+msgid "Delivery to remote servers is pending"
 msgstr ""
 
 #: src/Object/Post.php:435
-msgid "Delivery to remote servers is mostly done"
+msgid "Delivery to remote servers is underway"
 msgstr ""
 
 #: src/Object/Post.php:436
+msgid "Delivery to remote servers is mostly done"
+msgstr ""
+
+#: src/Object/Post.php:437
 msgid "Delivery to remote servers is done"
 msgstr ""
 
-#: src/Object/Post.php:455
+#: src/Object/Post.php:457
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/App.php:665
-msgid "Delete this item?"
+#: src/Object/Post.php:458
+msgid "Show more"
 msgstr ""
 
-#: src/App.php:667
-msgid "show fewer"
+#: src/Object/Post.php:459
+msgid "Show fewer"
 msgstr ""
 
-#: src/App.php:709
-msgid "toggle mobile"
+#: src/Protocol/Diaspora.php:2496
+msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: src/App.php:1077
-msgid "No system theme config value set."
+#: src/Protocol/Diaspora.php:3613
+msgid "Attachments:"
 msgstr ""
 
-#: src/BaseModule.php:133
-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 ""
-
-#: src/LegacyModule.php:30
+#: src/Protocol/OStatus.php:1866
 #, php-format
-msgid "Legacy module file not found: %s"
+msgid "%s is now following %s."
+msgstr ""
+
+#: src/Protocol/OStatus.php:1867
+msgid "following"
+msgstr ""
+
+#: src/Protocol/OStatus.php:1870
+#, php-format
+msgid "%s stopped following %s."
+msgstr ""
+
+#: src/Protocol/OStatus.php:1871
+msgid "stopped following"
+msgstr ""
+
+#: src/Util/Temporal.php:151
+msgid "YYYY-MM-DD or MM-DD"
+msgstr ""
+
+#: src/Util/Temporal.php:298
+msgid "never"
+msgstr ""
+
+#: src/Util/Temporal.php:305
+msgid "less than a second ago"
+msgstr ""
+
+#: src/Util/Temporal.php:313
+msgid "year"
+msgstr ""
+
+#: src/Util/Temporal.php:313
+msgid "years"
+msgstr ""
+
+#: src/Util/Temporal.php:314
+msgid "months"
+msgstr ""
+
+#: src/Util/Temporal.php:315
+msgid "weeks"
+msgstr ""
+
+#: src/Util/Temporal.php:316
+msgid "days"
+msgstr ""
+
+#: src/Util/Temporal.php:317
+msgid "hour"
+msgstr ""
+
+#: src/Util/Temporal.php:317
+msgid "hours"
+msgstr ""
+
+#: src/Util/Temporal.php:318
+msgid "minute"
+msgstr ""
+
+#: src/Util/Temporal.php:318
+msgid "minutes"
+msgstr ""
+
+#: src/Util/Temporal.php:319
+msgid "second"
+msgstr ""
+
+#: src/Util/Temporal.php:319
+msgid "seconds"
+msgstr ""
+
+#: src/Util/Temporal.php:329
+#, php-format
+msgid "in %1$d %2$s"
+msgstr ""
+
+#: src/Util/Temporal.php:332
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr ""
+
+#: src/Worker/Delivery.php:453
+msgid "(no subject)"
 msgstr ""
 
 #: update.php:217
@@ -9887,3 +9707,191 @@ msgstr ""
 #, php-format
 msgid "%s: Updating post-type."
 msgstr ""
+
+#: view/theme/duepuntozero/config.php:56
+msgid "greenzero"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:57
+msgid "purplezero"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:58
+msgid "easterbunny"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:59
+msgid "darkzero"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:60
+msgid "comix"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:61
+msgid "slackr"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:75
+msgid "Variations"
+msgstr ""
+
+#: view/theme/frio/config.php:103
+msgid "Custom"
+msgstr ""
+
+#: view/theme/frio/config.php:115
+msgid "Note"
+msgstr ""
+
+#: view/theme/frio/config.php:115
+msgid "Check image permissions if all users are allowed to see the image"
+msgstr ""
+
+#: view/theme/frio/config.php:122
+msgid "Select color scheme"
+msgstr ""
+
+#: view/theme/frio/config.php:123
+msgid "Navigation bar background color"
+msgstr ""
+
+#: view/theme/frio/config.php:124
+msgid "Navigation bar icon color "
+msgstr ""
+
+#: view/theme/frio/config.php:125
+msgid "Link color"
+msgstr ""
+
+#: view/theme/frio/config.php:126
+msgid "Set the background color"
+msgstr ""
+
+#: view/theme/frio/config.php:127
+msgid "Content background opacity"
+msgstr ""
+
+#: view/theme/frio/config.php:128
+msgid "Set the background image"
+msgstr ""
+
+#: view/theme/frio/config.php:129
+msgid "Background image style"
+msgstr ""
+
+#: view/theme/frio/config.php:134
+msgid "Login page background image"
+msgstr ""
+
+#: view/theme/frio/config.php:138
+msgid "Login page background color"
+msgstr ""
+
+#: view/theme/frio/config.php:138
+msgid "Leave background image and color empty for theme defaults"
+msgstr ""
+
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
+msgstr ""
+
+#: view/theme/frio/php/Image.php:24
+msgid ""
+"Resize image to the width of the screen and show background color below on "
+"long pages."
+msgstr ""
+
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
+msgstr ""
+
+#: view/theme/frio/php/Image.php:25
+msgid ""
+"Resize image to fill entire screen, clipping either the right or the bottom."
+msgstr ""
+
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
+msgstr ""
+
+#: view/theme/frio/php/Image.php:26
+msgid ""
+"Resize image to repeat it on a single row, either vertical or horizontal."
+msgstr ""
+
+#: view/theme/frio/php/Image.php:27
+msgid "Mosaic"
+msgstr ""
+
+#: view/theme/frio/php/Image.php:27
+msgid "Repeat image to fill the screen."
+msgstr ""
+
+#: view/theme/frio/theme.php:239
+msgid "Guest"
+msgstr ""
+
+#: view/theme/frio/theme.php:244
+msgid "Visitor"
+msgstr ""
+
+#: view/theme/quattro/config.php:77
+msgid "Alignment"
+msgstr ""
+
+#: view/theme/quattro/config.php:77
+msgid "Left"
+msgstr ""
+
+#: view/theme/quattro/config.php:77
+msgid "Center"
+msgstr ""
+
+#: view/theme/quattro/config.php:78
+msgid "Color scheme"
+msgstr ""
+
+#: view/theme/quattro/config.php:79
+msgid "Posts font size"
+msgstr ""
+
+#: view/theme/quattro/config.php:80
+msgid "Textareas font size"
+msgstr ""
+
+#: view/theme/vier/config.php:76
+msgid "Comma separated list of helper forums"
+msgstr ""
+
+#: view/theme/vier/config.php:123
+msgid "Set style"
+msgstr ""
+
+#: view/theme/vier/config.php:124
+msgid "Community Pages"
+msgstr ""
+
+#: view/theme/vier/config.php:125 view/theme/vier/theme.php:151
+msgid "Community Profiles"
+msgstr ""
+
+#: view/theme/vier/config.php:126
+msgid "Help or @NewHere ?"
+msgstr ""
+
+#: view/theme/vier/config.php:127 view/theme/vier/theme.php:373
+msgid "Connect Services"
+msgstr ""
+
+#: view/theme/vier/config.php:128
+msgid "Find Friends"
+msgstr ""
+
+#: view/theme/vier/config.php:129 view/theme/vier/theme.php:181
+msgid "Last users"
+msgstr ""
+
+#: view/theme/vier/theme.php:288
+msgid "Quick Start"
+msgstr ""

From 3a2af5bcd0648ea67dfb43df08e824d8b637395d Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 16 Feb 2019 09:39:31 +0100
Subject: [PATCH 010/145] DE translation update THX Ulf Rompe

---
 view/lang/de/messages.po | 543 ++++++++++++++++++++-------------------
 view/lang/de/strings.php | 536 +++++++++++++++++++-------------------
 2 files changed, 540 insertions(+), 539 deletions(-)

diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po
index c3fdb5be8..60aab3021 100644
--- a/view/lang/de/messages.po
+++ b/view/lang/de/messages.po
@@ -28,7 +28,7 @@
 # Matthias Moritz <matthias@matthiasmoritz.de>, 2012
 # Oliver <post@toktan.org>, 2015
 # Oliver <post@toktan.org>, 2012
-# rabuzarus <rabuzarus@t-online.de>, 2016-2018
+# rabuzarus <rabuzarus@t-online.de>, 2016-2019
 # Sennewood <sebastian@sebsen.net>, 2013
 # Sennewood <sebastian@sebsen.net>, 2012-2013
 # silke m <silke@silkemeyer.net>, 2015
@@ -38,14 +38,15 @@
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016-2019
 # zottel <transifex@zottel.net>, 2011-2012
 # tschlotfeldt <ts+transifex@ml.tschlotfeldt.de>, 2011
+# Ulf Rompe <transifex.com@rompe.org>, 2019
 # Vinzenz Vietzke <vinz@vinzv.de>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-02-10 08:14+0100\n"
-"PO-Revision-Date: 2019-02-10 18:15+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
+"PO-Revision-Date: 2019-02-15 09:51+0000\n"
+"Last-Translator: Ulf Rompe <transifex.com@rompe.org>\n"
 "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -551,7 +552,7 @@ msgstr "[Friendica-Meldung] Neue Email erhalten um %s"
 #: include/enotify.php:136
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$s hat Dir eine neue private Nachricht um %2$s geschickt."
+msgstr "%1$s hat Dir eine neue, private Nachricht um %2$s geschickt."
 
 #: include/enotify.php:137
 msgid "a private message"
@@ -590,7 +591,7 @@ msgstr "%1$s kommentierte [url=%2$s]%3$ss %4$s[/url]"
 #: include/enotify.php:207
 #, php-format
 msgid "%1$s tagged you on [url=%2$s]your %3$s[/url]"
-msgstr "%1$s erwähnte dich auf [url=%2$s] deinem %3$s[/url]"
+msgstr "%1$s erwähnte dich auf [url=%2$s]deinem %3$s[/url]"
 
 #: include/enotify.php:213
 #, php-format
@@ -605,7 +606,7 @@ msgstr "%1$s erwähnte dich im [url=%2$s]eigenen %3$s[/url]"
 #: include/enotify.php:230
 #, php-format
 msgid "%1$s commented on [url=%2$s]their %3$s[/url]"
-msgstr "%1$s kommentierte den [url=%2$s] eigenen %3$s[/url]"
+msgstr "%1$s kommentierte den [url=%2$s]eigenen %3$s[/url]"
 
 #: include/enotify.php:243
 #, php-format
@@ -728,7 +729,7 @@ msgstr "%1$s teilt mit Dir auf %2$s"
 
 #: include/enotify.php:353
 msgid "[Friendica:Notify] You have a new follower"
-msgstr "[Friendica Benachrichtigung] Du hast einen neuen Kontakt auf "
+msgstr "[Friendica-Benachrichtigung] Du hast einen neuen Kontakt"
 
 #: include/enotify.php:355 include/enotify.php:356
 #, php-format
@@ -781,7 +782,7 @@ msgstr "%2$s hat Deine [url=%1$s]Kontaktanfrage[/url] akzeptiert."
 msgid ""
 "You are now mutual friends and may exchange status updates, photos, and "
 "email without restriction."
-msgstr "Ihr seid nun beidseitige Kontakte und könnt Statusmitteilungen, Bilder und Emails ohne Einschränkungen austauschen."
+msgstr "Ihr seid nun beidseitige Kontakte und könnt Statusmitteilungen, Bilder und E-Mails ohne Einschränkungen austauschen."
 
 #: include/enotify.php:400
 #, php-format
@@ -811,7 +812,7 @@ msgstr "Bitte besuche %s, wenn Du Änderungen an eurer Beziehung vornehmen wills
 
 #: include/enotify.php:427 mod/removeme.php:46
 msgid "[Friendica System Notify]"
-msgstr "[Friendica System Benachrichtigung]"
+msgstr "[Friendica-Systembenachrichtigung]"
 
 #: include/enotify.php:427
 msgid "registration request"
@@ -838,7 +839,7 @@ msgstr "Kompletter Name: %s\nURL der Seite: %s\nLogin Name: %s(%s)"
 #: include/enotify.php:441
 #, php-format
 msgid "Please visit %s to approve or reject the request."
-msgstr "Bitte besuche %s um die Anfrage zu bearbeiten."
+msgstr "Bitte besuche %s, um die Anfrage zu bearbeiten."
 
 #: include/items.php:353 mod/admin.php:302 mod/admin.php:2131
 #: mod/admin.php:2378 mod/notice.php:20 mod/viewsrc.php:22
@@ -1002,7 +1003,7 @@ msgstr "Diagnostik"
 
 #: mod/admin.php:220
 msgid "PHP Info"
-msgstr "PHP Info"
+msgstr "PHP-Info"
 
 #: mod/admin.php:221
 msgid "probe address"
@@ -1022,7 +1023,7 @@ msgstr "Addon Features"
 
 #: mod/admin.php:244
 msgid "User registrations waiting for confirmation"
-msgstr "Nutzeranmeldungen die auf Bestätigung warten"
+msgstr "Nutzeranmeldungen, die auf Bestätigung warten"
 
 #: mod/admin.php:328 mod/admin.php:394 mod/admin.php:514 mod/admin.php:557
 #: mod/admin.php:778 mod/admin.php:822 mod/admin.php:875 mod/admin.php:998
@@ -1039,7 +1040,7 @@ msgstr "Nutzungsbedingungen anzeigen"
 msgid ""
 "Enable the Terms of Service page. If this is enabled a link to the terms "
 "will be added to the registration form and the general information page."
-msgstr "Aktiviert die Seite für die Nutzungsbedingungen. Ist dies der Fall werden sie auch von der Registrierungsseite und der allgemeinen Informationsseite verlinkt."
+msgstr "Aktiviert die Seite für die Nutzungsbedingungen. Ist dies der Fall, werden sie auch von der Registrierungsseite und der allgemeinen Informationsseite verlinkt."
 
 #: mod/admin.php:331
 msgid "Display Privacy Statement"
@@ -1050,7 +1051,7 @@ msgstr "Datenschutzerklärung anzeigen"
 msgid ""
 "Show some informations regarding the needed information to operate the node "
 "according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."
-msgstr "Zeige Informationen über die zum Betrieb der Seite notwendigen personenbezogenen Daten an, wie es z.B. die <a href=\"%s\" target=\"_blank\">EU-DSGVO</a> verlangt."
+msgstr "Zeige Informationen über die zum Betrieb der Seite notwendigen, personenbezogenen Daten an, wie es z.B. die <a href=\"%s\" target=\"_blank\">EU-DSGVO</a> verlangt."
 
 #: mod/admin.php:332
 msgid "Privacy Statement Preview"
@@ -1104,14 +1105,14 @@ msgid ""
 "network that are not allowed to interact with your node. For all entered "
 "domains you should also give a reason why you have blocked the remote "
 "server."
-msgstr "Auf dieser Seite kannst du die Liste der blockierten Domains aus dem föderalen Netzwerk verwalten, denen es untersagt ist mit deinem Knoten zu interagieren. Für jede der blockierten Domains musst du außerdem einen Grund für die Sperrung angeben."
+msgstr "Auf dieser Seite kannst du die Liste der blockierten Domains aus dem föderalen Netzwerk verwalten, denen es untersagt ist, mit deinem Knoten zu interagieren. Für jede der blockierten Domains musst du außerdem einen Grund für die Sperrung angeben."
 
 #: mod/admin.php:397
 msgid ""
 "The list of blocked servers will be made publically available on the "
 "/friendica page so that your users and people investigating communication "
 "problems can find the reason easily."
-msgstr "Die Liste der blockierten Domains wird auf der /friendica Seite öffentlich einsehbar gemacht, damit deine Nutzer und Personen die Kommunikationsprobleme erkunden, die Ursachen einfach finden können."
+msgstr "Die Liste der blockierten Domains wird auf der /friendica Seite öffentlich einsehbar gemacht, damit deine Nutzer und Personen, die Kommunikationsprobleme erkunden, die Ursachen einfach finden können."
 
 #: mod/admin.php:398
 msgid "Add new entry to block list"
@@ -1125,7 +1126,7 @@ msgstr "Domain des Servers"
 msgid ""
 "The domain of the new server to add to the block list. Do not include the "
 "protocol."
-msgstr "Der Domain-Name des Servers der geblockt werden soll. Gib das Protokoll nicht mit an!"
+msgstr "Der Domain-Name des Servers, der geblockt werden soll. Gib das Protokoll nicht mit an!"
 
 #: mod/admin.php:400
 msgid "Block reason"
@@ -1248,7 +1249,7 @@ msgstr[1] "Insgesamt %s blockierte Kontakte"
 
 #: mod/admin.php:536
 msgid "URL of the remote contact to block."
-msgstr "Die URL des Kontakts, vom entfernten Server, der blockiert werden soll."
+msgstr "Die URL des entfernten Kontakts, der blockiert werden soll."
 
 #: mod/admin.php:559
 msgid "Delete this Item"
@@ -1265,7 +1266,7 @@ msgid ""
 "You need to know the GUID of the item. You can find it e.g. by looking at "
 "the display URL. The last part of http://example.com/display/123456 is the "
 "GUID, here 123456."
-msgstr "Zur Löschung musst du die GUID des Eintrags kennen. Diese findest du z.B. durch die /display URL des Eintrags. Der letzte Teil der URL ist die GUID. Lautet die URL beispielsweise http://example.com/display/123456 ist die GUID 123456."
+msgstr "Zur Löschung musst du die GUID des Eintrags kennen. Diese findest du z.B. durch die /display URL des Eintrags. Der letzte Teil der URL ist die GUID. Lautet die URL beispielsweise http://example.com/display/123456, ist die GUID 123456."
 
 #: mod/admin.php:562
 msgid "GUID"
@@ -1294,7 +1295,7 @@ msgstr "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des födera
 msgid ""
 "The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
 "will improve the data displayed here."
-msgstr "Die Funktion um <em>Regelmäßig globale Kontakte überprüfen</em> ist nicht aktiv. Es wird die hier angezeigten Daten verbessern."
+msgstr "Die Funktion <em>\"Regelmäßig globale Kontakte überprüfen\"</em> ist nicht aktiv. Sie wird die hier angezeigten Daten verbessern."
 
 #: mod/admin.php:785
 #, php-format
@@ -1309,11 +1310,11 @@ msgstr "ID"
 
 #: mod/admin.php:826
 msgid "Recipient Name"
-msgstr "Empfänger Name"
+msgstr "Empfänger-Name"
 
 #: mod/admin.php:827
 msgid "Recipient Profile"
-msgstr "Empfänger Profil"
+msgstr "Empfänger-Profil"
 
 #: mod/admin.php:828 view/theme/frio/theme.php:269
 #: src/Core/NotificationsManager.php:182 src/Content/Nav.php:239
@@ -1333,7 +1334,7 @@ msgid ""
 "This page lists the content of the queue for outgoing postings. These are "
 "postings the initial delivery failed for. They will be resend later and "
 "eventually deleted if the delivery fails permanently."
-msgstr "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht die Beiträge zuzustellen, bis sie schließlich gelöscht werden."
+msgstr "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht, die Beiträge zuzustellen, bis sie schließlich gelöscht werden."
 
 #: mod/admin.php:854
 msgid "Inspect Deferred Worker Queue"
@@ -1347,13 +1348,13 @@ msgstr "Auf dieser Seite werden die aufgeschobenen Worker-Jobs aufgelistet. Dies
 
 #: mod/admin.php:858
 msgid "Inspect Worker Queue"
-msgstr "Worker Warteschlange inspizieren"
+msgstr "Worker-Warteschlange inspizieren"
 
 #: mod/admin.php:859
 msgid ""
 "This page lists the currently queued worker jobs. These jobs are handled by "
 "the worker cronjob you've set up during install."
-msgstr "Auf dieser Seite werden die derzeit in der Warteschlange befindlichen Worker-Jobs aufgelistet. Diese Jobs werden vom Cronjob verarbeitet, den Sie während der Installation eingerichtet haben."
+msgstr "Auf dieser Seite werden die derzeit in der Warteschlange befindlichen Worker-Jobs aufgelistet. Diese Jobs werden vom Cronjob verarbeitet, den du während der Installation eingerichtet hast."
 
 #: mod/admin.php:879
 msgid "Job Parameters"
@@ -1372,7 +1373,7 @@ msgid ""
 "converting the table engines. You may also use the command <tt>php "
 "bin/console.php dbstructure toinnodb</tt> of your Friendica installation for"
 " an automatic conversion.<br />"
-msgstr "Deine DB verwendet derzeit noch MyISAM Tabellen. Du solltest die Datenbank Engine auf InnoDB umstellen, da Friendica in Zukunft InnoDB Features verwenden wird. Eine Anleitung zur Umstellung der Datenbank kannst du  <a href=\"%s\">hier</a>  finden. Du kannst außerdem mit dem Befehl <tt>php bin/console.php dbstructure toinnodb</tt> auf der Kommandozeile die Umstellung automatisch vornehmen lassen."
+msgstr "Deine DB verwendet derzeit noch MyISAM Tabellen. Du solltest die Datenbank Engine auf InnoDB umstellen, da Friendica in Zukunft InnoDB-Features verwenden wird. Eine Anleitung zur Umstellung der Datenbank kannst du  <a href=\"%s\">hier</a>  finden. Du kannst außerdem mit dem Befehl <tt>php bin/console.php dbstructure toinnodb</tt> auf der Kommandozeile die Umstellung automatisch vornehmen lassen."
 
 #: mod/admin.php:914
 #, php-format
@@ -1397,7 +1398,7 @@ msgstr "Der Hintergrundprozess (worker) wurde noch nie gestartet. Bitte überpr
 msgid ""
 "The last worker execution was on %s UTC. This is older than one hour. Please"
 " check your crontab settings."
-msgstr "Der Hintergrundprozess (worker) wurde zuletzt um %s UTC ausgeführt. Das war vor mehr als einer Stunde. Bitte überprüfe deine crontab Einstellungen."
+msgstr "Der Hintergrundprozess (worker) wurde zuletzt um %s UTC ausgeführt. Das war vor mehr als einer Stunde. Bitte überprüfe deine crontab-Einstellungen."
 
 #: mod/admin.php:939
 #, php-format
@@ -1406,7 +1407,7 @@ msgid ""
 "copy config/local-sample.config.php and move your config from "
 "<code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for "
 "help with the transition."
-msgstr "Die Konfiguration von Friendica befindet sich ab jetzt in der 'config/local.ini.php' Datei. Kopiere bitte die Datei  'config/local-sample.config.php' nach 'config/local.config.php' und setze die Konfigurationvariablen so wie in der alten <code>.htconfig.php</code>. Wie die Übertragung der Werte aussehen muss kannst du der <a href=\"%s\">Konfiguration Hilfeseite</a> entnehmen."
+msgstr "Die Konfiguration von Friendica befindet sich ab jetzt in der 'config/local.ini.php' Datei. Kopiere bitte die Datei  'config/local-sample.config.php' nach 'config/local.config.php' und setze die Konfigurationvariablen so wie in der alten <code>.htconfig.php</code>. Wie die Übertragung der Werte aussehen muss, kannst du der <a href=\"%s\">Konfiguration Hilfeseite</a> entnehmen."
 
 #: mod/admin.php:943
 #, php-format
@@ -1415,7 +1416,7 @@ msgid ""
 "copy config/local-sample.config.php and move your config from "
 "<code>config/local.ini.php</code>. See <a href=\"%s\">the Config help "
 "page</a> for help with the transition."
-msgstr "Die Konfiguration von Friendica befindet sich ab jetzt in der 'config/local.config.php' Datei. Kopiere bitte die Datei  'config/local-sample.config.php' nach 'config/local.config.php' und setze die Konfigurationvariablen so wie in der alten <code>config/local.ini.php</code>. Wie die Übertragung der Werte aussehen muss kannst du der <a href=\"%s\">Konfiguration Hilfeseite</a> entnehmen."
+msgstr "Die Konfiguration von Friendica befindet sich ab jetzt in der 'config/local.config.php' Datei. Kopiere bitte die Datei  'config/local-sample.config.php' nach 'config/local.config.php' und setze die Konfigurationvariablen so wie in der alten <code>config/local.ini.php</code>. Wie die Übertragung der Werte aussehen muss, kannst du der <a href=\"%s\">Konfiguration Hilfeseite</a> entnehmen."
 
 #: mod/admin.php:950
 #, php-format
@@ -1423,7 +1424,7 @@ msgid ""
 "<a href=\"%s\">%s</a> is not reachable on your system. This is a severe "
 "configuration issue that prevents server to server communication. See <a "
 "href=\"%s\">the installation page</a> for help."
-msgstr "<a href=\"%s\">%s</a> konnte von deinem System nicht aufgerufen werden. Dies deitet auf ein schwerwiegendes Problem deiner Konfiguration hin. Bitte konsultiere <a href=\"%s\">die Installations-Dokumentation</a> zum Beheben des Problems."
+msgstr "<a href=\"%s\">%s</a> konnte von deinem System nicht aufgerufen werden. Dies deutet auf ein schwerwiegendes Problem deiner Konfiguration hin. Bitte konsultiere <a href=\"%s\">die Installations-Dokumentation</a> zum Beheben des Problems."
 
 #: mod/admin.php:956
 msgid "Normal Account"
@@ -1435,11 +1436,11 @@ msgstr "Automatisch folgendes Konto (Marktschreier)"
 
 #: mod/admin.php:958
 msgid "Public Forum Account"
-msgstr "Öffentliches Forum Konto"
+msgstr "Öffentliches Forum-Konto"
 
 #: mod/admin.php:959
 msgid "Automatic Friend Account"
-msgstr "Automatische Freunde Seite"
+msgstr "Automatische Freunde-Seite"
 
 #: mod/admin.php:960
 msgid "Blog Account"
@@ -1447,7 +1448,7 @@ msgstr "Blog-Konto"
 
 #: mod/admin.php:961
 msgid "Private Forum Account"
-msgstr "Privates Forum Konto"
+msgstr "Privates Forum-Konto"
 
 #: mod/admin.php:984
 msgid "Message queues"
@@ -1540,7 +1541,7 @@ msgstr "ein Jahr"
 
 #: mod/admin.php:1496
 msgid "Multi user instance"
-msgstr "Mehrbenutzer Instanz"
+msgstr "Mehrbenutzer-Instanz"
 
 #: mod/admin.php:1520
 msgid "Closed"
@@ -1556,7 +1557,7 @@ msgstr "Offen"
 
 #: mod/admin.php:1526
 msgid "No SSL policy, links will track page SSL state"
-msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
+msgstr "Keine SSL-Richtlinie, Links werden das verwendete Protokoll beibehalten"
 
 #: mod/admin.php:1527
 msgid "Force all links to use SSL"
@@ -1617,7 +1618,7 @@ msgstr "Worker"
 
 #: mod/admin.php:1591
 msgid "Message Relay"
-msgstr "Nachrichten Relais"
+msgstr "Nachrichten-Relais"
 
 #: mod/admin.php:1592
 msgid "Relocate Instance"
@@ -1642,7 +1643,7 @@ msgstr "Absender für Emails"
 #: mod/admin.php:1599
 msgid ""
 "The email address your server shall use to send notification emails from."
-msgstr "Die E-Mail Adresse die dein Server zum Versenden von Benachrichtigungen verwenden soll."
+msgstr "Die E-Mail Adresse, die dein Server zum Versenden von Benachrichtigungen verwenden soll."
 
 #: mod/admin.php:1600
 msgid "Banner/Logo"
@@ -1662,7 +1663,7 @@ msgstr "Touch Icon"
 
 #: mod/admin.php:1602
 msgid "Link to an icon that will be used for tablets and mobiles."
-msgstr "Link zu einem Icon das Tablets und Handies verwenden sollen."
+msgstr "Link zu einem Icon, das Tablets und Mobiltelefone verwenden sollen."
 
 #: mod/admin.php:1603
 msgid "Additional Info"
@@ -1695,7 +1696,7 @@ msgstr "Systemweites mobiles Theme"
 
 #: mod/admin.php:1606
 msgid "Theme for mobile devices"
-msgstr "Thema für mobile Geräte"
+msgstr "Theme für mobile Geräte"
 
 #: mod/admin.php:1607
 msgid "SSL link policy"
@@ -1713,11 +1714,11 @@ msgstr "Erzwinge SSL"
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
-msgstr "Erzinge alle Nicht-SSL Anfragen auf SSL - Achtung: auf manchen Systemen verursacht dies eine Endlosschleife."
+msgstr "Erzwinge SSL für alle Nicht-SSL-Anfragen - Achtung: auf manchen Systemen verursacht dies eine Endlosschleife."
 
 #: mod/admin.php:1609
 msgid "Hide help entry from navigation menu"
-msgstr "Verberge den Menüeintrag für die Hilfe im Navigationsmenü"
+msgstr "Verberge den Hilfe-Eintrag im Navigationsmenü"
 
 #: mod/admin.php:1609
 msgid ""
@@ -1731,11 +1732,11 @@ msgstr "Ein-Nutzer Instanz"
 
 #: mod/admin.php:1610
 msgid "Make this instance multi-user or single-user for the named user"
-msgstr "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt."
+msgstr "Bestimmt, ob es sich bei dieser Instanz um eine Installation mit nur einen Nutzer oder mit mehreren Nutzern handelt."
 
 #: mod/admin.php:1612
 msgid "File storage backend"
-msgstr "Datenspeicher Backend"
+msgstr "Datenspeicher-Backend"
 
 #: mod/admin.php:1612
 msgid ""
@@ -1744,7 +1745,7 @@ msgid ""
 "uploaded before the change will still be available at the old backend. "
 "Please see <a href=\"/help/Settings#1_2_3_1\">the settings documentation</a>"
 " for more information about the choices and the moving procedure."
-msgstr "Das zu verwendende Datenspeicher Backend, wenn Dateien hochgeladen werden. Wenn du das Datenspeicher Backend änderst, kannst du die bestehenden Dateien zum neuen Backend verschieben. Machst du dies nicht, verbleiben sie im alten Backend und werden weiterhin von dort geladen. Für weitere Informationen zu den verfügbaren Alternativen und der Prozedur zum Verschieben der Daten, schaue bitte in <a href=\"/help/Settings#1_2_3_1\">die Dokumentation zu den Einstellungen</a>."
+msgstr "Das zu verwendende Datenspeicher-Backend, wenn Dateien hochgeladen werden. Wenn du das Datenspeicher-Backend änderst, kannst du die bestehenden Dateien zum neuen Backend verschieben. Machst du dies nicht, verbleiben sie im alten Backend und werden weiterhin von dort geladen. Für weitere Informationen zu den verfügbaren Alternativen und der Prozedur zum Verschieben der Daten schaue bitte in <a href=\"/help/Settings#1_2_3_1\">die Dokumentation zu den Einstellungen</a>."
 
 #: mod/admin.php:1614
 msgid "Maximum image size"
@@ -1764,7 +1765,7 @@ msgstr "Maximale Bildlänge"
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
-msgstr "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet."
+msgstr "Maximale Länge in Pixeln der längsten Seite eines hochgeladenen Bildes. Grundeinstellung ist -1, was keine Einschränkung bedeutet."
 
 #: mod/admin.php:1616
 msgid "JPEG image quality"
@@ -1774,7 +1775,7 @@ msgstr "Qualität des JPEG Bildes"
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
-msgstr "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust."
+msgstr "Hochgeladene JPEG-Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust."
 
 #: mod/admin.php:1618
 msgid "Register policy"
@@ -1850,17 +1851,17 @@ msgstr "OEmbed nicht verwenden"
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
-msgstr "Verhindert das Einbetten von reichhaltigen Inhalten (z.B. eingebettete PDF Dateien). Ausgenommen von dieser Regel werden Domänen die unten aufgeführt werden."
+msgstr "Verhindert das Einbetten von reichhaltigen Inhalten (z.B. eingebettete PDF Dateien). Ausgenommen von dieser Regel werden Domänen, die unten aufgeführt werden."
 
 #: mod/admin.php:1626
 msgid "Allowed OEmbed domains"
-msgstr "Erlaubte OEmbed Domänen"
+msgstr "Erlaubte OEmbed-Domänen"
 
 #: mod/admin.php:1626
 msgid ""
 "Comma separated list of domains which oembed content is allowed to be "
 "displayed. Wildcards are accepted."
-msgstr "Komma separierte Liste von Domänen für die das einbetten reichhaltiger Inhalte erlaubt sind. Platzhalter können verwendet werden."
+msgstr "Durch Kommas getrennte Liste von Domänen, für die das Einbetten reichhaltiger Inhalte erlaubt ist. Platzhalter können verwendet werden."
 
 #: mod/admin.php:1627
 msgid "Block public"
@@ -1913,7 +1914,7 @@ msgstr "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden"
 msgid ""
 "Don't include the content of a post/comment/private message/etc. in the "
 "email notifications that are sent out from this site, as a privacy measure."
-msgstr "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden."
+msgstr "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw. zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden."
 
 #: mod/admin.php:1632
 msgid "Disallow public access to addons listed in the apps menu."
@@ -1923,7 +1924,7 @@ msgstr "Öffentlichen Zugriff auf Addons im Apps Menü verbieten."
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
-msgstr "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt."
+msgstr "Wenn ausgewählt, werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt."
 
 #: mod/admin.php:1633
 msgid "Don't embed private images in posts"
@@ -1935,7 +1936,7 @@ msgid ""
 "of the image. This means that contacts who receive posts containing private "
 "photos will have to authenticate and load each image, which may take a "
 "while."
-msgstr "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert."
+msgstr "Ersetze lokal gehostete, private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten, sich zunächst auf den jeweiligen Servern authentifizieren müssen, bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert."
 
 #: mod/admin.php:1634
 msgid "Explicit Content"
@@ -1948,18 +1949,18 @@ msgid ""
 "node information and might be used, e.g. by the global directory, to filter "
 "your node from listings of nodes to join. Additionally a note about this "
 "will be shown at the user registration page."
-msgstr "Wählen Sie das um anzuzeigen, dass Ihr Knoten hauptsächlich für explizite Inhalte verwendet wird, die möglicherweise nicht für Minderjährige geeignet sind. Diese Info wird in der Knoteninformation veröffentlicht und kann durch das Globale Verzeichnis genutzt werden, um Ihren Knoten von den Auflistungen auszuschließen. Zusätzlich wird auf der Registrierungsseite ein Hinweis darüber angezeigt."
+msgstr "Wählen Sie dies, um anzuzeigen, dass Ihr Knoten hauptsächlich für explizite Inhalte verwendet wird, die möglicherweise nicht für Minderjährige geeignet sind. Diese Info wird in der Knoteninformation veröffentlicht und kann durch das Globale Verzeichnis genutzt werden, um Ihren Knoten von den Auflistungen auszuschließen. Zusätzlich wird auf der Registrierungsseite ein Hinweis darüber angezeigt."
 
 #: mod/admin.php:1635
 msgid "Allow Users to set remote_self"
-msgstr "Nutzern erlauben das remote_self Flag zu setzen"
+msgstr "Nutzern erlauben, das remote_self Flag zu setzen"
 
 #: mod/admin.php:1635
 msgid ""
 "With checking this, every user is allowed to mark every contact as a "
 "remote_self in the repair contact dialog. Setting this flag on a contact "
 "causes mirroring every posting of that contact in the users stream."
-msgstr "Ist dies ausgewählt kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im Kontakt reparieren Dialog markieren. Nach dem setzten dieses Flags werden alle Top-Level Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet."
+msgstr "Ist dies ausgewählt, kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im \"Kontakt reparieren\"-Dialog markieren. Nach dem Setzen dieses Flags werden alle Top-Level-Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet."
 
 #: mod/admin.php:1636
 msgid "Block multiple registrations"
@@ -1967,7 +1968,7 @@ msgstr "Unterbinde Mehrfachregistrierung"
 
 #: mod/admin.php:1636
 msgid "Disallow users to register additional accounts for use as pages."
-msgstr "Benutzern nicht erlauben, weitere Konten für Organisationsseiten o.ä. mit der gleichen E-Mail Adresse anzulegen, um diese als ."
+msgstr "Benutzern nicht erlauben, weitere Konten für Organisationsseiten o. ä. mit der gleichen E-Mail-Adresse anzulegen."
 
 #: mod/admin.php:1637
 msgid "Disable OpenID"
@@ -1985,7 +1986,7 @@ msgstr "Namen nicht auf Vollständigkeit überprüfen"
 msgid ""
 "Allow users to register without a space between the first name and the last "
 "name in their full name."
-msgstr "Erlaubt es Nutzerkonten zu registrieren, bei denen im Namensfeld kein Leerzeichen als Trennung von Vor- und Nachname verwendet wird."
+msgstr "Erlaubt Nutzern, Konten zu registrieren, bei denen im Namensfeld kein Leerzeichen zur Trennung von Vor- und Nachnamen verwendet wird."
 
 #: mod/admin.php:1639
 msgid "Community pages for visitors"
@@ -1995,7 +1996,7 @@ msgstr "Für Besucher verfügbare Gemeinschaftsseite"
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
-msgstr "Welche Gemeinschaftsseiten sollen für Besucher dieses Knotens verfügbar sein? Lokale Nutzer können grundsätzlich beide Gemeinschaftsseiten verwenden."
+msgstr "Welche Gemeinschaftsseiten sollen für Besucher dieses Knotens verfügbar sein? Lokale Nutzer können grundsätzlich beide Seiten verwenden."
 
 #: mod/admin.php:1640
 msgid "Posts per user on community page"
@@ -2005,43 +2006,43 @@ msgstr "Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite"
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
-msgstr "Die Anzahl der Beiträge die von jedem Nutzer maximal auf der Gemeinschaftsseite angezeigt werden sollen. Dieser Parameter wird nicht für die Globale Gemeinschaftsseite genutzt."
+msgstr "Die Anzahl der Beiträge, die von jedem Nutzer maximal auf der Gemeinschaftsseite angezeigt werden sollen. Dieser Parameter wird nicht für die Globale Gemeinschaftsseite genutzt."
 
 #: mod/admin.php:1641
 msgid "Disable OStatus support"
-msgstr "OStatus Unterstützung deaktivieren"
+msgstr "OStatus-Unterstützung deaktivieren"
 
 #: mod/admin.php:1641
 msgid ""
 "Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
-msgstr "Die eingebaute OStatus (StatusNet, GNU Social, etc.) Unterstützung deaktivieren. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre Warnungen werden nur bei Bedarf angezeigt."
+msgstr "Die eingebaute OStatus-Unterstützung (StatusNet, GNU Social, etc.) deaktivieren. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre-Warnungen werden nur bei Bedarf angezeigt."
 
 #: mod/admin.php:1642
 msgid "Only import OStatus/ActivityPub threads from our contacts"
-msgstr "Nur OStatus/ActivityPub Konversationen unserer Kontakte importieren"
+msgstr "Nur OStatus/ActivityPub-Konversationen unserer Kontakte importieren"
 
 #: mod/admin.php:1642
 msgid ""
 "Normally we import every content from our OStatus and ActivityPub contacts. "
 "With this option we only store threads that are started by a contact that is"
 " known on our system."
-msgstr "Normalerweise werden alle Inhalte von OStatus und ActivityPub Kontakten importiert. Mit dieser Option werden nur solche Konversationen gespeichert, die von Kontakten der Nutzer dieses Knotens gestartet wurden."
+msgstr "Normalerweise werden alle Inhalte von OStatus- und ActivityPub-Kontakten importiert. Mit dieser Option werden nur solche Konversationen gespeichert, die von Kontakten der Nutzer dieses Knotens gestartet wurden."
 
 #: mod/admin.php:1643
 msgid "OStatus support can only be enabled if threading is enabled."
-msgstr "OStatus Unterstützung kann nur aktiviert werden wenn \"Threading\" aktiviert ist. "
+msgstr "OStatus Unterstützung kann nur aktiviert werden, wenn \"Threading\" aktiviert ist. "
 
 #: mod/admin.php:1645
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub"
 " directory."
-msgstr "Diaspora Unterstützung kann nicht aktiviert werden da Friendica in ein Unterverzeichnis installiert ist."
+msgstr "Diaspora Unterstützung kann nicht aktiviert werden, da Friendica in ein Unterverzeichnis installiert ist."
 
 #: mod/admin.php:1646
 msgid "Enable Diaspora support"
-msgstr "Diaspora Unterstützung aktivieren"
+msgstr "Diaspora-Unterstützung aktivieren"
 
 #: mod/admin.php:1646
 msgid "Provide built-in Diaspora network compatibility."
@@ -2055,7 +2056,7 @@ msgstr "Nur Friendica-Kontakte erlauben"
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
-msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."
+msgstr "Alle Kontakte müssen das Friendica-Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."
 
 #: mod/admin.php:1648
 msgid "Verify SSL"
@@ -2065,19 +2066,19 @@ msgstr "SSL Überprüfen"
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
-msgstr "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann."
+msgstr "Wenn gewollt, kann man hier eine strenge Zertifikatskontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL-Zertifikat eine Verbindung herstellen kann."
 
 #: mod/admin.php:1649
 msgid "Proxy user"
-msgstr "Proxy Nutzer"
+msgstr "Proxy-Nutzer"
 
 #: mod/admin.php:1650
 msgid "Proxy URL"
-msgstr "Proxy URL"
+msgstr "Proxy-URL"
 
 #: mod/admin.php:1651
 msgid "Network timeout"
-msgstr "Netzwerk Wartezeit"
+msgstr "Netzwerk-Wartezeit"
 
 #: mod/admin.php:1651
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
@@ -2091,7 +2092,7 @@ msgstr "Maximum Load Average"
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
-msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"
+msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"
 
 #: mod/admin.php:1653
 msgid "Maximum Load Average (Frontend)"
@@ -2099,7 +2100,7 @@ msgstr "Maximum Load Average (Frontend)"
 
 #: mod/admin.php:1653
 msgid "Maximum system load before the frontend quits service - default 50."
-msgstr "Maximale Systemlast bevor Vordergrundprozesse pausiert werden - Standard 50."
+msgstr "Maximale Systemlast, bevor Vordergrundprozesse pausiert werden - Standard 50."
 
 #: mod/admin.php:1654
 msgid "Minimal Memory"
@@ -2129,7 +2130,7 @@ msgstr "Minimaler Fragmentationsgrad"
 msgid ""
 "Minimum fragmenation level to start the automatic optimization - default "
 "value is 30%."
-msgstr "Minimales Fragmentationsgrad von Datenbanktabellen um die automatische Optimierung einzuleiten - Standardwert ist 30%"
+msgstr "Minimaler Fragmentationsgrad von Datenbanktabellen, um die automatische Optimierung einzuleiten - Standardwert ist 30%"
 
 #: mod/admin.php:1658
 msgid "Periodical check of global contacts"
@@ -2147,7 +2148,7 @@ msgstr "Tage zwischen erneuten Abfragen"
 
 #: mod/admin.php:1659
 msgid "Number of days after which a server is requeried for his contacts."
-msgstr "Legt das Abfrageintervall fest, nachdem ein Server erneut nach Kontakten abgefragt werden soll."
+msgstr "Legt das Abfrageintervall fest, nach dem ein Server erneut nach Kontakten abgefragt werden soll."
 
 #: mod/admin.php:1660
 msgid "Discover contacts from other servers"
@@ -2161,7 +2162,7 @@ msgid ""
 "and older friendica servers, where global contacts weren't available. The "
 "fallback increases the server load, so the recommended setting is 'Users, "
 "Global Contacts'."
-msgstr "Regelmäßig andere Server nach potentiellen Kontakten absuchen. Du kannst zwischen 'Nutzern', den tatsächlichen Nutzern des anderen Systems und 'globalen Kontakten', aktiven Kontakten die auf dem System bekannt sind, wählen. Der Fallback-Mechanismus ist für ältere Friendica und Redmatrix Server gedacht, bei denen globale Kontakte noch nicht verfügbar sind. Durch den Fallbackmodus entsteht auf deinem Server eine wesentlich höhere Last, empfohlen wird der Modus 'Nutzer, globale Kontakte'."
+msgstr "Regelmäßig andere Server nach potentiellen Kontakten absuchen. Du kannst zwischen 'Nutzern', also den tatsächlichen Nutzern des anderen Systems, und 'globalen Kontakten', also aktiven Kontakten, die auf dem System bekannt sind, wählen. Der Fallback-Mechanismus ist für ältere Friendica- und Redmatrix-Server gedacht, bei denen globale Kontakte noch nicht verfügbar sind. Durch den Fallback-Modus entsteht auf deinem Server eine wesentlich höhere Last, empfohlen wird der Modus 'Nutzer, globale Kontakte'."
 
 #: mod/admin.php:1661
 msgid "Timeframe for fetching global contacts"
@@ -2171,7 +2172,7 @@ msgstr "Zeitfenster für globale Kontakte"
 msgid ""
 "When the discovery is activated, this value defines the timeframe for the "
 "activity of the global contacts that are fetched from other servers."
-msgstr "Wenn die Entdeckung neuer Kontakte aktiv ist, definiert dieses Zeitfenster den Zeitraum in dem globale Kontakte als aktiv gelten und von anderen Servern importiert werden."
+msgstr "Wenn die Entdeckung neuer Kontakte aktiv ist, definiert dieses Zeitfenster den Zeitraum, in dem globale Kontakte als aktiv gelten und von anderen Servern importiert werden."
 
 #: mod/admin.php:1662
 msgid "Search the local directory"
@@ -2182,11 +2183,11 @@ msgid ""
 "Search the local directory instead of the global directory. When searching "
 "locally, every search will be executed on the global directory in the "
 "background. This improves the search results when the search is repeated."
-msgstr "Suche im lokalen Verzeichnis anstelle des globalen Verzeichnisses durchführen. Jede Suche wird im Hintergrund auch im globalen Verzeichnis durchgeführt um die Suchresultate zu verbessern, wenn diese Suche wiederholt wird."
+msgstr "Suche im lokalen Verzeichnis anstelle des globalen Verzeichnisses durchführen. Jede Suche wird im Hintergrund auch im globalen Verzeichnis durchgeführt, um die Suchresultate zu verbessern, wenn die Suche wiederholt wird."
 
 #: mod/admin.php:1664
 msgid "Publish server information"
-msgstr "Server Informationen veröffentlichen"
+msgstr "Server-Informationen veröffentlichen"
 
 #: mod/admin.php:1664
 msgid ""
@@ -2194,7 +2195,7 @@ msgid ""
 "contains the name and version of the server, number of users with public "
 "profiles, number of posts and the activated protocols and connectors. See <a"
 " href='http://the-federation.info/'>the-federation.info</a> for details."
-msgstr "Wenn aktiviert, werden allgemeine Informationen über den Server und Nutzungsdaten veröffentlicht. Die Daten beinhalten den Namen sowie die Version des Servers, die Anzahl der Personen mit öffentlichen Profilen, die Anzahl der Beiträge sowie aktivierte Protokolle und Connectoren. Für Details bitte <a href='http://the-federation.info/'>the-federation.info</a> aufrufen."
+msgstr "Wenn aktiviert, werden allgemeine Informationen über den Server und Nutzungsdaten veröffentlicht. Die Daten beinhalten den Namen sowie die Version des Servers, die Anzahl der Personen mit öffentlichen Profilen, die Anzahl der Beiträge sowie aktivierte Protokolle und Konnektoren. Für Details bitte <a href='http://the-federation.info/'>the-federation.info</a> aufrufen."
 
 #: mod/admin.php:1666
 msgid "Check upstream version"
@@ -2204,11 +2205,11 @@ msgstr "Suche nach Updates"
 msgid ""
 "Enables checking for new Friendica versions at github. If there is a new "
 "version, you will be informed in the admin panel overview."
-msgstr "Wenn diese Option aktiviert ist wird regelmäßig nach neuen Friendica Versionen auf github überprüft. Wenn es eine neue Version gibt, wird dies auf der Übersichtsseite im Admin-Panel angezeigt."
+msgstr "Wenn diese Option aktiviert ist, wird regelmäßig nach neuen Friendica-Versionen auf github gesucht. Wenn es eine neue Version gibt, wird dies auf der Übersichtsseite im Admin-Panel angezeigt."
 
 #: mod/admin.php:1667
 msgid "Suppress Tags"
-msgstr "Tags Unterdrücken"
+msgstr "Tags unterdrücken"
 
 #: mod/admin.php:1667
 msgid "Suppress showing a list of hashtags at the end of the posting."
@@ -2233,7 +2234,7 @@ msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "remote items will be deleted. Own items, and marked or filed items are "
 "always kept. 0 disables this behaviour."
-msgstr "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl in Tagen nach der Beiträge die auf anderen Knoten des Netzwerks verfasst wurden, gelöscht werden sollen. Eigene Beiträge sowie markierte oder abgespeicherte Beiträge werden nicht gelöscht. Ein Wert von 0 deaktiviert das automatische löschen von Beiträgen."
+msgstr "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl in Tagen, nach der Beiträge, die auf anderen Knoten des Netzwerks verfasst wurden, gelöscht werden sollen. Eigene Beiträge sowie markierte oder abgespeicherte Beiträge werden nicht gelöscht. Ein Wert von 0 deaktiviert das automatische Löschen von Beiträgen."
 
 #: mod/admin.php:1670
 msgid "Lifespan of unclaimed items"
@@ -2245,7 +2246,7 @@ msgid ""
 "unclaimed remote items (mostly content from the relay) will be deleted. "
 "Default value is 90 days. Defaults to the general lifespan value of remote "
 "items if set to 0."
-msgstr "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl von Tagen nach denen nicht angeforderte Beiträge (hauptsächlich sole die über das Relais eintreffen) gelöscht werden. Der Standardwert beträgt 90 Tage. Wird dieser Wert auf 0 gesetzt, wird die Lebenszeit von Beiträgen anderer Knoten verwendet."
+msgstr "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl von Tagen, nach denen nicht angeforderte Beiträge (hauptsächlich solche, die über das Relais eintreffen) gelöscht werden. Der Standardwert beträgt 90 Tage. Wird dieser Wert auf 0 gesetzt, wird die Lebensdauer von Beiträgen anderer Knoten verwendet."
 
 #: mod/admin.php:1671
 msgid "Lifespan of raw conversation data"
@@ -2256,11 +2257,11 @@ msgid ""
 "The conversation data is used for ActivityPub and OStatus, as well as for "
 "debug purposes. It should be safe to remove it after 14 days, default is 90 "
 "days."
-msgstr "Die Konversationsdaten werden für ActivityPub und OStatus sowie für Debug-Zwecke verwendet. Sie können gefahrlos nach 14 Tagen zu entfernt werden, der Standardwert beträgt 90 Tage."
+msgstr "Die Konversationsdaten werden für ActivityPub und OStatus sowie für Debug-Zwecke verwendet. Sie sollten gefahrlos nach 14 Tagen entfernt werden können, der Standardwert beträgt 90 Tage."
 
 #: mod/admin.php:1672
 msgid "Path to item cache"
-msgstr "Pfad zum Eintrag Cache"
+msgstr "Pfad zum Item-Cache"
 
 #: mod/admin.php:1672
 msgid "The item caches buffers generated bbcode and external images."
@@ -2274,7 +2275,7 @@ msgstr "Cache-Dauer in Sekunden"
 msgid ""
 "How long should the cache files be hold? Default value is 86400 seconds (One"
 " day). To disable the item cache, set the value to -1."
-msgstr "Wie lange sollen die gecachedten Dateien vorgehalten werden? Grundeinstellung sind 86400 Sekunden (ein Tag). Um den Item Cache zu deaktivieren, setze diesen Wert auf -1."
+msgstr "Wie lange sollen die zwischengespeicherten Dateien vorgehalten werden? Grundeinstellung sind 86400 Sekunden (ein Tag). Um den Item-Cache zu deaktivieren, setze diesen Wert auf -1."
 
 #: mod/admin.php:1674
 msgid "Maximum numbers of comments per post"
@@ -2286,13 +2287,13 @@ msgstr "Wie viele Kommentare sollen pro Beitrag angezeigt werden? Standardwert s
 
 #: mod/admin.php:1675
 msgid "Temp path"
-msgstr "Temp Pfad"
+msgstr "Temp-Pfad"
 
 #: mod/admin.php:1675
 msgid ""
 "If you have a restricted system where the webserver can't access the system "
 "temp path, enter another path here."
-msgstr "Solltest du ein eingeschränktes System haben, auf dem der Webserver nicht auf das temp Verzeichnis des Systems zugreifen kann, setze hier einen anderen Pfad."
+msgstr "Solltest du ein eingeschränktes System haben, auf dem der Webserver nicht auf das temp-Verzeichnis des Systems zugreifen kann, setze hier einen anderen Pfad."
 
 #: mod/admin.php:1676
 msgid "Base path to installation"
@@ -2307,7 +2308,7 @@ msgstr "Falls das System nicht den korrekten Pfad zu deiner Installation gefunde
 
 #: mod/admin.php:1677
 msgid "Disable picture proxy"
-msgstr "Bilder Proxy deaktivieren"
+msgstr "Bilder-Proxy deaktivieren"
 
 #: mod/admin.php:1677
 msgid ""
@@ -2331,15 +2332,15 @@ msgstr "Neue Basis-URL"
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and"
 " Diaspora* contacts of all users."
-msgstr "Ändert die Basis-URL dieses Servers und sendet eine Umzugsmitteilung an alle Friendica und Diaspora* Kontakte deiner NutzerInnen."
+msgstr "Ändert die Basis-URL dieses Servers und sendet eine Umzugsmitteilung an alle Friendica- und Diaspora*-Kontakte deiner NutzerInnen."
 
 #: mod/admin.php:1682
 msgid "RINO Encryption"
-msgstr "RINO Verschlüsselung"
+msgstr "RINO-Verschlüsselung"
 
 #: mod/admin.php:1682
 msgid "Encryption layer between nodes."
-msgstr "Verschlüsselung zwischen Friendica Instanzen"
+msgstr "Verschlüsselung zwischen Friendica-Instanzen"
 
 #: mod/admin.php:1682
 msgid "Enabled"
@@ -2354,7 +2355,7 @@ msgstr "Maximale Anzahl parallel laufender Worker"
 msgid ""
 "On shared hosters set this to %d. On larger systems, values of %d are great."
 " Default value is %d."
-msgstr "Wenn dein Knoten bei einem Shared Hoster ist, setzte diesen Wert auf %d. Auf größeren Systemen funktioniert ein Wert von %d recht gut. Standardeinstellung sind %d."
+msgstr "Wenn dein Knoten bei einem Shared Hoster ist, setze diesen Wert auf %d. Auf größeren Systemen funktioniert ein Wert von %d recht gut. Standardeinstellung sind %d."
 
 #: mod/admin.php:1685
 msgid "Don't use 'proc_open' with the worker"
@@ -2365,7 +2366,7 @@ msgid ""
 "Enable this if your system doesn't allow the use of 'proc_open'. This can "
 "happen on shared hosters. If this is enabled you should increase the "
 "frequency of worker calls in your crontab."
-msgstr "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der poller Aufrufe in deiner crontab erhöhen."
+msgstr "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der worker-Aufrufe in deiner crontab erhöhen."
 
 #: mod/admin.php:1686
 msgid "Enable fastlane"
@@ -2375,11 +2376,11 @@ msgstr "Aktiviere Fastlane"
 msgid ""
 "When enabed, the fastlane mechanism starts an additional worker if processes"
 " with higher priority are blocked by processes of lower priority."
-msgstr "Wenn aktiviert, wird der Fastlane-Mechanismus einen weiteren Worker-Prozeß starten wenn Prozesse mit höherer Priorität von Prozessen mit niedrigerer Priorität blockiert werden."
+msgstr "Wenn aktiviert, wird der Fastlane-Mechanismus einen weiteren Worker-Prozeß starten, wenn Prozesse mit höherer Priorität von Prozessen mit niedrigerer Priorität blockiert werden."
 
 #: mod/admin.php:1687
 msgid "Enable frontend worker"
-msgstr "Aktiviere den Frontend Worker"
+msgstr "Aktiviere den Frontend-Worker"
 
 #: mod/admin.php:1687
 #, php-format
@@ -2389,7 +2390,7 @@ msgid ""
 "might want to call %s/worker on a regular basis via an external cron job. "
 "You should only enable this option if you cannot utilize cron/scheduled jobs"
 " on your server."
-msgstr "Ist diese Option aktiv, wird der Worker Prozess durch Aktionen am Frontend gestartet (z.B. wenn Nachrichten zugestellt werden). Auf kleineren Seiten sollte %s/worker regelmäßig, beispielsweise durch einen externen Cron Anbieter, aufgerufen werden. Du solltest dies Option nur dann aktivieren, wenn du keinen Cron Job auf deinem eigenen Server starten kannst."
+msgstr "Ist diese Option aktiv, wird der Worker-Prozess durch Aktionen am Frontend gestartet (z.B. wenn Nachrichten zugestellt werden). Auf kleineren Seiten sollte %s/worker regelmäßig, beispielsweise durch einen externen Cron-Anbieter, aufgerufen werden. Du solltest diese Option nur dann aktivieren, wenn du keinen zeitgesteuerten Job auf deinem eigenen Server starten kannst."
 
 #: mod/admin.php:1689
 msgid "Subscribe to relay"
@@ -2403,22 +2404,22 @@ msgstr "Aktiviert den Empfang von öffentlichen Beiträgen vom Relais-Server. Di
 
 #: mod/admin.php:1690
 msgid "Relay server"
-msgstr "Relais Server"
+msgstr "Relais-Server"
 
 #: mod/admin.php:1690
 msgid ""
 "Address of the relay server where public posts should be send to. For "
 "example https://relay.diasp.org"
-msgstr "Adresse des Relais Servers an den die öffentlichen Beiträge gesendet werden sollen. Zum Beispiel https://relay.diasp.org"
+msgstr "Adresse des Relais-Servers, an den die öffentlichen Beiträge gesendet werden sollen. Zum Beispiel https://relay.diasp.org"
 
 #: mod/admin.php:1691
 msgid "Direct relay transfer"
-msgstr "Direkte Relais Übertragung"
+msgstr "Direkte Relais-Übertragung"
 
 #: mod/admin.php:1691
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
-msgstr "Aktiviert das direkte Verteilen an andere Server, ohne dass ein Relais Server verwendet wird."
+msgstr "Aktiviert das direkte Verteilen an andere Server, ohne dass ein Relais-Server verwendet wird."
 
 #: mod/admin.php:1692
 msgid "Relay scope"
@@ -2441,11 +2442,11 @@ msgstr "Schlagwörter"
 
 #: mod/admin.php:1693
 msgid "Server tags"
-msgstr "Server Schlagworte"
+msgstr "Server-Schlagworte"
 
 #: mod/admin.php:1693
 msgid "Comma separated list of tags for the 'tags' subscription."
-msgstr "Liste von Schlagworten die abonniert werden sollen, mit Komma getrennt."
+msgstr "Liste von Schlagworten, die abonniert werden sollen, mit Komma getrennt."
 
 #: mod/admin.php:1694
 msgid "Allow user tags"
@@ -2455,7 +2456,7 @@ msgstr "Verwende Schlagworte der Nutzer"
 msgid ""
 "If enabled, the tags from the saved searches will used for the 'tags' "
 "subscription in addition to the 'relay_server_tags'."
-msgstr "Ist dies aktiviert, werden die Schlagwörter der gespeicherten Suchen zusätzlich zu den oben  definierten Server Schlagworte abonniert."
+msgstr "Ist dies aktiviert, werden die Schlagwörter der gespeicherten Suchen zusätzlich zu den oben definierten Server-Schlagworten abonniert."
 
 #: mod/admin.php:1697
 msgid "Start Relocation"
@@ -2501,7 +2502,7 @@ msgstr "Keine fehlgeschlagenen Updates."
 
 #: mod/admin.php:1783
 msgid "Check database structure"
-msgstr "Datenbank Struktur überprüfen"
+msgstr "Datenbankstruktur überprüfen"
 
 #: mod/admin.php:1788
 msgid "Failed Updates"
@@ -2558,7 +2559,7 @@ msgid ""
 "\t\t\tIf you ever want to delete your account, you can do so at %1$s/removeme\n"
 "\n"
 "\t\t\tThank you and welcome to %4$s."
-msgstr "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1$s\n\tBenutzername:\t%2$s\n\tPasswort:\t%3$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %1$s/removeme  jederzeit tun.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4$s."
+msgstr "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1$s\n\tBenutzername:\t%2$s\n\tPasswort:\t%3$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %1$s/removeme  jederzeit tun.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4$s."
 
 #: mod/admin.php:1871 src/Model/User.php:858
 #, php-format
@@ -2612,7 +2613,7 @@ msgstr "Öffentliches Forum"
 
 #: mod/admin.php:2002 mod/settings.php:1061
 msgid "Automatic Friend Page"
-msgstr "Automatische Freunde Seite"
+msgstr "Automatische Freunde-Seite"
 
 #: mod/admin.php:2003
 msgid "Private Forum"
@@ -2721,7 +2722,7 @@ msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese N
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist Du sicher?"
+msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist Du sicher?"
 
 #: mod/admin.php:2097
 msgid "Name of the new user."
@@ -2788,7 +2789,7 @@ msgstr "Es sind derzeit keine Addons auf diesem Knoten verfügbar. Du findest da
 
 #: mod/admin.php:2367
 msgid "No themes found."
-msgstr "Keine Themen gefunden."
+msgstr "Keine Themes gefunden."
 
 #: mod/admin.php:2428
 msgid "Screenshot"
@@ -2908,13 +2909,13 @@ msgstr "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscod
 
 #: mod/api.php:94
 msgid "Please login to continue."
-msgstr "Bitte melde Dich an um fortzufahren."
+msgstr "Bitte melde Dich an, um fortzufahren."
 
 #: mod/api.php:108
 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 den Zugriff auf Deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?"
+msgstr "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontakte sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?"
 
 #: mod/api.php:110 mod/dfrn_request.php:640 mod/follow.php:150
 #: mod/profiles.php:526 mod/profiles.php:530 mod/profiles.php:551
@@ -2976,7 +2977,7 @@ msgstr "Originaltext (Diaspora Format): "
 
 #: mod/babel.php:100
 msgid "Markdown::convert (raw HTML)"
-msgstr "Markdown::convert (raw HTML)"
+msgstr "Markdown::convert (pures HTML)"
 
 #: mod/babel.php:105
 msgid "Markdown::convert"
@@ -3243,7 +3244,7 @@ msgstr "Spiegle Beiträge dieses Kontakts"
 msgid ""
 "Mark this contact as remote_self, this will cause friendica to repost new "
 "entries from this contact."
-msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden."
+msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica, alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden."
 
 #: mod/crepair.php:160
 msgid "Account Nickname"
@@ -3438,7 +3439,7 @@ msgstr "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung
 
 #: mod/dfrn_request.php:120 mod/dfrn_request.php:358
 msgid "Warning: profile location has no identifiable owner name."
-msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden."
+msgstr "Warnung: Es konnte kein Name des Besitzers an der angegebenen Profiladresse gefunden werden."
 
 #: mod/dfrn_request.php:123 mod/dfrn_request.php:361
 msgid "Warning: profile location has no profile photo."
@@ -3509,7 +3510,7 @@ msgstr "Deine Kontaktanfrage wurde gesendet."
 msgid ""
 "Remote subscription can't be done for your network. Please subscribe "
 "directly on your system."
-msgstr "Entferntes abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems.   "
+msgstr "Entferntes Abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems.   "
 
 #: mod/dfrn_request.php:487
 msgid "Please login to confirm introduction."
@@ -3550,7 +3551,7 @@ msgstr "Bitte gib die Adresse Deines Profils in einem der unterstützten soziale
 msgid ""
 "If you are not yet a member of the free social web, <a href=\"%s\">follow "
 "this link to find a public Friendica site and join us today</a>."
-msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"%s\">folge diesem Link</a> um einen öffentlichen Friendica Server zu finden und beizutreten."
+msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"%s\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten."
 
 #: mod/dfrn_request.php:637
 msgid "Friend/Connection Request"
@@ -3592,7 +3593,7 @@ msgstr "Diaspora (Socialhome, Hubzilla)"
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
-msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste."
+msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora-Suchleiste."
 
 #: mod/dfrn_request.php:647 mod/follow.php:157 mod/unfollow.php:128
 msgid "Your Identity Address:"
@@ -3715,7 +3716,7 @@ msgstr "Z.B.: bob@example.com, mary@example.com"
 
 #: mod/events.php:117 mod/events.php:119
 msgid "Event can not end before it has started."
-msgstr "Die Veranstaltung kann nicht enden bevor sie beginnt."
+msgstr "Die Veranstaltung kann nicht enden, bevor sie beginnt."
 
 #: mod/events.php:126 mod/events.php:128
 msgid "Event title and start time are required."
@@ -3804,7 +3805,7 @@ msgstr "Dateien"
 
 #: mod/feedtest.php:18
 msgid "You must be logged in to use this module"
-msgstr "Du musst eingeloggt sein um dieses Modul benutzen zu können."
+msgstr "Du musst eingeloggt sein, um dieses Modul benutzen zu können."
 
 #: mod/feedtest.php:45
 msgid "Source URL"
@@ -3824,15 +3825,15 @@ msgstr "Du hast den Kontakt bereits hinzugefügt."
 
 #: mod/follow.php:86
 msgid "Diaspora support isn't enabled. Contact can't be added."
-msgstr "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."
+msgstr "Diaspora-Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."
 
 #: mod/follow.php:93
 msgid "OStatus support is disabled. Contact can't be added."
-msgstr "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."
+msgstr "OStatus-Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."
 
 #: mod/follow.php:100
 msgid "The network type couldn't be detected. Contact can't be added."
-msgstr "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden."
+msgstr "Der Netzwerktyp wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden."
 
 #: mod/follow.php:170 mod/notifications.php:257 src/Model/Profile.php:807
 #: src/Module/Contact.php:649
@@ -3849,13 +3850,13 @@ msgstr "Statusnachrichten und Beiträge"
 msgid ""
 "This is Friendica, version %s that is running at the web location %s. The "
 "database version is %s, the post update version is %s."
-msgstr "Diese Friendica Instanz verwendet die Version %s, sie ist unter der folgenden Adresse im Web zu finden %s. Die Datenbank Version ist %s und die Post-Update Version %s."
+msgstr "Diese Friendica-Instanz verwendet die Version %s, sie ist unter der folgenden Adresse im Web zu finden %s. Die Datenbankversion ist %s und die Post-Update-Version %s."
 
 #: mod/friendica.php:94
 msgid ""
 "Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
 "about the Friendica project."
-msgstr "Bitte besuche <a href=\"https://friendi.ca\">Friendi.ca</a> um mehr über das Friendica Projekt zu erfahren."
+msgstr "Bitte besuche <a href=\"https://friendi.ca\">Friendi.ca</a>, um mehr über das Friendica-Projekt zu erfahren."
 
 #: mod/friendica.php:98
 msgid "Bug reports and issues: please visit"
@@ -3884,7 +3885,7 @@ msgstr "Erfahre mehr über die <a href=\"%1$s/tos\">Nutzungsbedingungen</a> dies
 
 #: mod/friendica.php:130
 msgid "On this server the following remote servers are blocked."
-msgstr "Auf diesem Server werden die folgenden entfernten Server blockiert."
+msgstr "Auf diesem Server werden die folgenden, entfernten Server blockiert."
 
 #: mod/fsuggest.php:69
 msgid "Friend suggestion sent."
@@ -4040,14 +4041,14 @@ msgid ""
 "Visit %s for a list of public sites that you can join. Friendica members on "
 "other sites can all connect with each other, as well as with members of many"
 " other social networks."
-msgstr "Besuche %s für eine Liste der öffentlichen Server, denen Du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke."
+msgstr "Besuche %s für eine Liste der öffentlichen Server, denen Du beitreten kannst. Friendica-Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer sozialer Netzwerke."
 
 #: mod/invite.php:132
 #, php-format
 msgid ""
 "To accept this invitation, please visit and register at %s or any other "
 "public Friendica website."
-msgstr "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s oder einer anderen öffentlichen Friendica Website."
+msgstr "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s oder einer anderen öffentlichen Friendica-Website."
 
 #: mod/invite.php:133
 #, php-format
@@ -4056,7 +4057,7 @@ msgid ""
 "web that is owned and controlled by its members. They can also connect with "
 "many traditional social networks. See %s for a list of alternate Friendica "
 "sites you can join."
-msgstr "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen Du beitreten kannst."
+msgstr "Friendica Server verbinden sich alle untereinander, um ein großes, datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica-Server, denen Du beitreten kannst."
 
 #: mod/invite.php:137
 msgid ""
@@ -4069,7 +4070,7 @@ msgid ""
 "Friendica sites all inter-connect to create a huge privacy-enhanced social "
 "web that is owned and controlled by its members. They can also connect with "
 "many traditional social networks."
-msgstr "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden."
+msgstr "Friendica Server verbinden sich alle untereinander, um ein großes, datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden."
 
 #: mod/invite.php:140
 #, php-format
@@ -4108,7 +4109,7 @@ msgstr "Sobald Du registriert bist, kontaktiere mich bitte auf meiner Profilseit
 msgid ""
 "For more information about the Friendica project and why we feel it is "
 "important, please visit http://friendi.ca"
-msgstr "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendi.ca."
+msgstr "Für weitere Informationen über das Friendica-Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendi.ca."
 
 #: mod/item.php:120
 msgid "Unable to locate original post."
@@ -4204,7 +4205,7 @@ msgid ""
 "\n"
 "\t\tYour password will not be changed unless we can verify that you\n"
 "\t\tissued this request."
-msgstr "\nHallo %1$s,\n\nAuf \"%2$s\" ist eine Anfrage auf das Zurücksetzen Deines Passworts gestellt\nworden. Um diese Anfrage zu verifizieren, folge bitte dem unten stehenden\nLink oder kopiere und füge ihn in die Adressleiste Deines Browsers ein.\n\nSolltest Du die Anfrage NICHT gemacht haben, ignoriere und/oder lösche diese\nE-Mail bitte.\n\nDein Passwort wird nicht geändert, solange wir nicht verifiziert haben, dass\nDu diese Änderung angefragt hast."
+msgstr "\nHallo %1$s,\n\nAuf \"%2$s\" ist eine Anfrage auf das Zurücksetzen Deines Passworts gestellt\nworden. Um diese Anfrage zu verifizieren, folge bitte dem unten stehenden\nLink oder kopiere und füge ihn in die Adressleiste Deines Browsers ein.\n\nSolltest Du die Anfrage NICHT gestellt haben, ignoriere und/oder lösche diese\nE-Mail bitte.\n\nDein Passwort wird nicht geändert, solange wir nicht verifiziert haben, dass\nDu diese Änderung angefragt hast."
 
 #: mod/lostpass.php:55
 #, php-format
@@ -4221,7 +4222,7 @@ msgid ""
 "\n"
 "\t\tSite Location:\t%2$s\n"
 "\t\tLogin Name:\t%3$s"
-msgstr "\nUm Deine Identität zu verifizieren, folge bitte dem folgenden Link:\n\n%1$s\n\nDu wirst eine weitere E-Mail mit Deinem neuen Passwort erhalten. Sobald Du Dich\nangemeldet hast, kannst Du Dein Passwort in den Einstellungen ändern.\n\nDie Anmeldedetails sind die folgenden:\n\nAdresse der Seite:\t%2$s\nBenutzername:\t%3$s"
+msgstr "\nUm Deine Identität zu verifizieren, folge bitte diesem Link:\n\n%1$s\n\nDu wirst eine weitere E-Mail mit Deinem neuen Passwort erhalten. Sobald Du Dich\nangemeldet hast, kannst Du Dein Passwort in den Einstellungen ändern.\n\nDie Anmeldedetails sind die folgenden:\n\nAdresse der Seite:\t%2$s\nBenutzername:\t%3$s"
 
 #: mod/lostpass.php:74
 #, php-format
@@ -4377,7 +4378,7 @@ msgstr "Nachrichten"
 
 #: mod/message.php:148
 msgid "Do you really want to delete this message?"
-msgstr "Möchtest Du wirklich diese Nachricht löschen?"
+msgstr "Möchtest Du diese Nachricht wirklich löschen?"
 
 #: mod/message.php:166
 msgid "Conversation not found."
@@ -4440,7 +4441,7 @@ msgstr "Antwort senden"
 #: mod/message.php:512
 #, php-format
 msgid "Unknown sender - %s"
-msgstr "'Unbekannter Absender - %s"
+msgstr "Unbekannter Absender - %s"
 
 #: mod/message.php:514
 #, php-format
@@ -4480,7 +4481,7 @@ msgid_plural ""
 "Warning: This group contains %s members from a network that doesn't allow "
 "non public messages."
 msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann."
-msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können."
+msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken, die keine nicht-öffentlichen Beiträge empfangen können."
 
 #: mod/network.php:566
 msgid "Messages in this group won't be send to these receivers."
@@ -4581,7 +4582,7 @@ msgid ""
 "On your <em>Quick Start</em> page - find a brief introduction to your "
 "profile and network tabs, make some new connections, and find some groups to"
 " join."
-msgstr "Auf der <em>Quick Start</em> Seite findest Du eine kurze Einleitung in die einzelnen Funktionen Deines Profils und die Netzwerk-Reiter, wo Du interessante Foren findest und neue Kontakte knüpfst."
+msgstr "Auf der <em>Quick Start</em>-Seite findest Du eine kurze Einleitung in die einzelnen Funktionen Deines Profils und die Netzwerk-Reiter, wo Du interessante Foren findest und neue Kontakte knüpfst."
 
 #: mod/newmember.php:22
 msgid "Go to Your Settings"
@@ -4600,7 +4601,7 @@ msgid ""
 " directory listing is like having an unlisted phone number. In general, you "
 "should probably publish your listing - unless all of your friends and "
 "potential friends know exactly how to find you."
-msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können."
+msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das, als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können."
 
 #: mod/newmember.php:25 mod/profperm.php:117 view/theme/frio/theme.php:263
 #: src/Content/Nav.php:157 src/Model/Profile.php:876 src/Model/Profile.php:909
@@ -4617,7 +4618,7 @@ msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make"
 " friends than people who do not."
-msgstr "Lade ein Profilbild hoch, falls Du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Kontakte zu finden, wenn Du ein Bild von Dir selbst verwendest, als wenn Du dies nicht tust."
+msgstr "Lade ein Profilbild hoch, falls Du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist, neue Kontakte zu finden, wenn Du ein Bild von Dir selbst verwendest, als wenn Du dies nicht tust."
 
 #: mod/newmember.php:28
 msgid "Edit Your Profile"
@@ -4628,18 +4629,18 @@ msgid ""
 "Edit your <strong>default</strong> profile to your liking. Review the "
 "settings for hiding your list of friends and hiding the profile from unknown"
 " visitors."
-msgstr "Editiere Dein <strong>Standard</strong> Profil nach Deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen Deiner Kontaktliste vor unbekannten Betrachtern des Profils."
+msgstr "Editiere Dein <strong>Standard</strong>-Profil nach Deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen Deiner Kontaktliste vor unbekannten Betrachtern des Profils."
 
 #: mod/newmember.php:29
 msgid "Profile Keywords"
-msgstr "Profil Schlüsselbegriffe"
+msgstr "Profil-Schlüsselbegriffe"
 
 #: mod/newmember.php:29
 msgid ""
 "Set some public keywords for your default profile which describe your "
 "interests. We may be able to find other people with similar interests and "
 "suggest friendships."
-msgstr "Trage ein paar öffentliche Stichwörter in Dein Standardprofil ein, die Deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die Deine Interessen teilen und können Dir dann Kontakte vorschlagen."
+msgstr "Trage ein paar öffentliche Stichwörter in Dein Standardprofil ein, die Deine Interessen beschreiben. Eventuell sind wir in der Lage, Leute zu finden, die Deine Interessen teilen, und können Dir dann Kontakte vorschlagen."
 
 #: mod/newmember.php:31
 msgid "Connecting"
@@ -4669,14 +4670,14 @@ msgstr "Die Kontakte-Seite ist die Einstiegsseite, von der aus Du Kontakte verwa
 
 #: mod/newmember.php:41
 msgid "Go to Your Site's Directory"
-msgstr "Gehe zum Verzeichnis Deiner Friendica Instanz"
+msgstr "Gehe zum Verzeichnis Deiner Friendica-Instanz"
 
 #: mod/newmember.php:41
 msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
-msgstr "Über die Verzeichnisseite kannst Du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem <em>Verbinden</em> oder <em>Folgen</em> Link auf deren Profilseiten Ausschau und gib Deine eigene Profiladresse an, falls Du danach gefragt wirst."
+msgstr "Über die Verzeichnisseite kannst Du andere Personen auf diesem Server oder anderen, verknüpften Seiten finden. Halte nach einem <em>Verbinden</em>- oder <em>Folgen</em>-Link auf deren Profilseiten Ausschau und gib Deine eigene Profiladresse an, falls Du danach gefragt wirst."
 
 #: mod/newmember.php:42
 msgid "Finding New People"
@@ -4729,7 +4730,7 @@ msgstr "Zum Hilfe Abschnitt gehen"
 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program"
 " features and resources."
-msgstr "Unsere <strong>Hilfe</strong> Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten."
+msgstr "Unsere <strong>Hilfe</strong>-Seiten können herangezogen werden, um weitere Einzelheiten zu anderen Programm-Features zu erhalten."
 
 #: mod/notes.php:34 src/Model/Profile.php:959
 msgid "Personal Notes"
@@ -4751,7 +4752,7 @@ msgstr "Benachrichtigungen"
 
 #: mod/notifications.php:107
 msgid "Network Notifications"
-msgstr "Netzwerk Benachrichtigungen"
+msgstr "Netzwerkbenachrichtigungen"
 
 #: mod/notifications.php:112 mod/notify.php:84
 msgid "System Notifications"
@@ -4763,7 +4764,7 @@ msgstr "Persönliche Benachrichtigungen"
 
 #: mod/notifications.php:122
 msgid "Home Notifications"
-msgstr "Pinnwand Benachrichtigungen"
+msgstr "Pinnwandbenachrichtigungen"
 
 #: mod/notifications.php:142
 msgid "Show unread"
@@ -4829,7 +4830,7 @@ msgstr "Wenn du %s als Abonnent akzeptierst, erlaubst du damit das Lesen deiner
 msgid ""
 "Accepting %s as a sharer allows them to subscribe to your posts, but you "
 "will not receive updates from them in your news feed."
-msgstr "Wenn du %s als Teilenden akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten."
+msgstr "Wenn du %s als Teilender akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten."
 
 #: mod/notifications.php:222
 msgid "Friend"
@@ -4837,7 +4838,7 @@ msgstr "Kontakt"
 
 #: mod/notifications.php:223
 msgid "Sharer"
-msgstr "Teilenden"
+msgstr "Teilender"
 
 #: mod/notifications.php:223
 msgid "Subscriber"
@@ -4855,7 +4856,7 @@ msgstr "Keine Kontaktanfragen."
 #: mod/notifications.php:313
 #, php-format
 msgid "No more %s notifications."
-msgstr "Keine weiteren %s Benachrichtigungen"
+msgstr "Keine weiteren %s-Benachrichtigungen"
 
 #: mod/notify.php:80
 msgid "No more system notifications."
@@ -4880,7 +4881,7 @@ msgstr "Anmeldung fehlgeschlagen."
 
 #: mod/ostatus_subscribe.php:23
 msgid "Subscribing to OStatus contacts"
-msgstr "OStatus Kontakten folgen"
+msgstr "OStatus-Kontakten folgen"
 
 #: mod/ostatus_subscribe.php:35
 msgid "No contact provided."
@@ -4981,7 +4982,7 @@ msgstr "Bilddatei konnte nicht gefunden werden."
 msgid ""
 "Server can't accept new file upload at this time, please contact your "
 "administrator"
-msgstr "Der Server kann derzeit keine neuen Datei Uploads akzeptieren. Bitte kontaktiere deinen Administrator."
+msgstr "Der Server kann derzeit keine neuen Datei-Uploads akzeptieren. Bitte kontaktiere deinen Administrator."
 
 #: mod/photos.php:778
 msgid "Image file is empty."
@@ -5352,7 +5353,7 @@ msgstr "Vorlieben"
 
 #: mod/profiles.php:576
 msgid "Status information"
-msgstr "Status Informationen"
+msgstr "Status-Informationen"
 
 #: mod/profiles.php:577
 msgid "Additional information"
@@ -5583,7 +5584,7 @@ msgstr "Gelöschter Nutzeraccount"
 msgid ""
 "On your Friendica node an user deleted their account. Please ensure that "
 "their data is removed from the backups."
-msgstr "Ein Nutzer deiner Friendica Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass deren Daten aus deinen Backups entfernt werden."
+msgstr "Ein Nutzer deiner Friendica-Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass dessen Daten aus deinen Backups entfernt werden."
 
 #: mod/removeme.php:48
 #, php-format
@@ -5606,7 +5607,7 @@ msgstr "Bitte gib Dein Passwort zur Verifikation ein:"
 
 #: mod/repair_ostatus.php:21
 msgid "Resubscribing to OStatus contacts"
-msgstr "Erneuern der OStatus Abonements"
+msgstr "Erneuern der OStatus-Abonements"
 
 #: mod/repair_ostatus.php:37
 msgid "Error"
@@ -5631,7 +5632,7 @@ msgstr "Suche"
 #: mod/search.php:235
 #, php-format
 msgid "Items tagged with: %s"
-msgstr "Beiträge die mit %s getaggt sind"
+msgstr "Beiträge, die mit %s getaggt sind"
 
 #: mod/search.php:237 src/Module/Contact.php:816
 #, php-format
@@ -5841,14 +5842,14 @@ msgstr "Benutzer in Netzwerken wie Mastodon oder Pleroma können ein Inhaltswarn
 
 #: mod/settings.php:837
 msgid "Disable intelligent shortening"
-msgstr "Intelligentes Link kürzen ausschalten"
+msgstr "Intelligentes Link-Kürzen ausschalten"
 
 #: mod/settings.php:837
 msgid ""
 "Normally the system tries to find the best link to add to shortened posts. "
 "If this option is enabled then every shortened post will always point to the"
 " original friendica post."
-msgstr "Normalerweise versucht das System den besten Link zu finden um ihn zu gekürzten Postings hinzu zu fügen. Wird diese Option ausgewählt wird stets ein Link auf die originale Friendica Nachricht beigefügt."
+msgstr "Normalerweise versucht das System, den besten Link zu finden, um ihn zu gekürzten Postings hinzuzufügen. Wird diese Option ausgewählt, wird stets ein Link auf die originale Friendica-Nachricht beigefügt."
 
 #: mod/settings.php:838
 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
@@ -5859,26 +5860,26 @@ msgid ""
 "If you receive a message from an unknown OStatus user, this option decides "
 "what to do. If it is checked, a new contact will be created for every "
 "unknown user."
-msgstr "Wenn du eine Nachricht eines unbekannten OStatus Nutzers bekommst, entscheidet diese Option wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,."
+msgstr "Wenn du eine Nachricht eines unbekannten OStatus-Nutzers bekommst, entscheidet diese Option, wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,."
 
 #: mod/settings.php:839
 msgid "Default group for OStatus contacts"
-msgstr "Voreingestellte Gruppe für OStatus Kontakte"
+msgstr "Voreingestellte Gruppe für OStatus-Kontakte"
 
 #: mod/settings.php:840
 msgid "Your legacy GNU Social account"
-msgstr "Dein alter GNU Social Account"
+msgstr "Dein alter GNU Social-Account"
 
 #: mod/settings.php:840
 msgid ""
 "If you enter your old GNU Social/Statusnet account name here (in the format "
 "user@domain.tld), your contacts will be added automatically. The field will "
 "be emptied when done."
-msgstr "Wenn du deinen alten GNU Social/Statusnet Accountnamen hier angibst (Format name@domain.tld) werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden."
+msgstr "Wenn du deinen alten GNU Social/Statusnet-Account-Namen hier angibst (Format name@domain.tld), werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden."
 
 #: mod/settings.php:843
 msgid "Repair OStatus subscriptions"
-msgstr "OStatus Abonnements reparieren"
+msgstr "OStatus-Abonnements reparieren"
 
 #: mod/settings.php:847
 msgid "Email/Mailbox Setup"
@@ -5892,7 +5893,7 @@ msgstr "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtes
 
 #: mod/settings.php:849
 msgid "Last successful email check:"
-msgstr "Letzter erfolgreicher E-Mail Check"
+msgstr "Letzter erfolgreicher E-Mail-Check"
 
 #: mod/settings.php:851
 msgid "IMAP server name:"
@@ -5980,7 +5981,7 @@ msgstr "Warnung vor unsicheren Netzwerken unterdrücken"
 msgid ""
 "Should the system suppress the warning that the current group contains "
 "members of networks that can't receive non public postings."
-msgstr "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können."
+msgstr "Soll das System Warnungen unterdrücken, die angezeigt werden, weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können."
 
 #: mod/settings.php:956
 msgid "Update browser every xx seconds"
@@ -5988,7 +5989,7 @@ msgstr "Browser alle xx Sekunden aktualisieren"
 
 #: mod/settings.php:956
 msgid "Minimum of 10 seconds. Enter -1 to disable it."
-msgstr "Minimum sind 10 Sekunden. Gib -1 ein um abzuschalten."
+msgstr "Minimum sind 10 Sekunden. Gib -1 ein, um abzuschalten."
 
 #: mod/settings.php:957
 msgid "Number of items to display per page:"
@@ -6004,7 +6005,7 @@ msgstr "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt
 
 #: mod/settings.php:959
 msgid "Don't show emoticons"
-msgstr "Keine Smilies anzeigen"
+msgstr "Keine Smileys anzeigen"
 
 #: mod/settings.php:960
 msgid "Calendar"
@@ -6030,7 +6031,7 @@ msgstr "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist."
 msgid ""
 "When disabled, the network page is updated all the time, which could be "
 "confusing while reading."
-msgstr "Wenn dies deaktiviert ist, wird die Netzwerk Seite aktualisiert, wann immer neue Beiträge eintreffen, egal an welcher Stelle gerade gelesen wird."
+msgstr "Wenn dies deaktiviert ist, wird die Netzwerk-Seite aktualisiert, wann immer neue Beiträge eintreffen, egal an welcher Stelle gerade gelesen wird."
 
 #: mod/settings.php:965
 msgid "Bandwidth Saver Mode"
@@ -6050,15 +6051,15 @@ msgstr "Intelligentes Threading"
 msgid ""
 "When enabled, suppress extraneous thread indentation while keeping it where "
 "it matters. Only works if threading is available and enabled."
-msgstr "Ist dies aktiviert, werden Einrückungen in Unterhaltungen unterdrückt wo sie nicht benötigt werden. Werden sie benötigt, werden die Threads weiterhin eingerückt."
+msgstr "Ist dies aktiviert, werden Einrückungen in Unterhaltungen unterdrückt, wo sie nicht benötigt werden. Werden sie benötigt, werden die Threads weiterhin eingerückt."
 
 #: mod/settings.php:968
 msgid "General Theme Settings"
-msgstr "Allgemeine Themeneinstellungen"
+msgstr "Allgemeine Theme-Einstellungen"
 
 #: mod/settings.php:969
 msgid "Custom Theme Settings"
-msgstr "Benutzerdefinierte Theme Einstellungen"
+msgstr "Benutzerdefinierte Theme-Einstellungen"
 
 #: mod/settings.php:970
 msgid "Content Settings"
@@ -6068,7 +6069,7 @@ msgstr "Einstellungen zum Inhalt"
 #: view/theme/frio/config.php:121 view/theme/quattro/config.php:76
 #: view/theme/vier/config.php:122
 msgid "Theme settings"
-msgstr "Themeneinstellungen"
+msgstr "Theme-Einstellungen"
 
 #: mod/settings.php:985
 msgid "Unable to find your profile. Please contact your admin."
@@ -6110,7 +6111,7 @@ msgstr "Konto für Diskussionsforen. "
 msgid ""
 "Account for a regular personal profile that requires manual approval of "
 "\"Friends\" and \"Followers\"."
-msgstr "Konto für ein normales persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden."
+msgstr "Konto für ein normales, persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden."
 
 #: mod/settings.php:1054
 msgid ""
@@ -6165,7 +6166,7 @@ msgstr "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werde
 msgid ""
 "Your profile will be published in the global friendica directories (e.g. <a "
 "href=\"%s\">%s</a>). Your profile will be visible in public."
-msgstr "Dein Profil wird in den globalen Friendica Verzeichnissen (z.B. <a href=\"%s\">%s</a>) veröffentlicht. Dein Profil wird öffentlich auffindbar sein."
+msgstr "Dein Profil wird in den globalen Friendica-Verzeichnissen (z.B. <a href=\"%s\">%s</a>) veröffentlicht. Dein Profil wird öffentlich auffindbar sein."
 
 #: mod/settings.php:1098
 msgid "Hide your contact/friend list from viewers of your default profile?"
@@ -6187,11 +6188,11 @@ msgid ""
 "Anonymous visitors will only see your profile picture, your display name and"
 " the nickname you are using on your profile page. Your public posts and "
 "replies will still be accessible by other means."
-msgstr "Anonyme Besucher deines Profils werden ausschließlich dein Profilbild, deinen Namen sowie deinen Spitznamen sehen. Deine lffentlichen Beiträge und Kommentare werden weiterhin sichtbar sein."
+msgstr "Anonyme Besucher deines Profils werden ausschließlich dein Profilbild, deinen Namen sowie deinen Spitznamen sehen. Deine öffentlichen Beiträge und Kommentare werden weiterhin sichtbar sein."
 
 #: mod/settings.php:1106
 msgid "Allow friends to post to your profile page?"
-msgstr "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?"
+msgstr "Dürfen deine Kontakte auf deine Pinnwand schreiben?"
 
 #: mod/settings.php:1106
 msgid ""
@@ -6201,7 +6202,7 @@ msgstr "Deine Kontakte können Beiträge auf deiner Pinnwand hinterlassen. Diese
 
 #: mod/settings.php:1110
 msgid "Allow friends to tag your posts?"
-msgstr "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?"
+msgstr "Dürfen deine Kontakte deine Beiträge mit Schlagwörtern versehen?"
 
 #: mod/settings.php:1110
 msgid "Your contacts can add additional tags to your posts."
@@ -6209,7 +6210,7 @@ msgstr "Deine Kontakte dürfen deine Beiträge mit zusätzlichen Schlagworten ve
 
 #: mod/settings.php:1114
 msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
+msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
 #: mod/settings.php:1114
 msgid ""
@@ -6218,7 +6219,7 @@ msgstr "Wenn du magst, kann Friendica dich neuen Mitgliedern als Kontakt vorschl
 
 #: mod/settings.php:1118
 msgid "Permit unknown people to send you private mail?"
-msgstr "Dürfen Dir Unbekannte private Nachrichten schicken?"
+msgstr "Dürfen dir Unbekannte private Nachrichten schicken?"
 
 #: mod/settings.php:1118
 msgid ""
@@ -6241,7 +6242,7 @@ msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"
 
 #: mod/settings.php:1135
 msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."
+msgstr "Wenn leer, verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."
 
 #: mod/settings.php:1136
 msgid "Advanced expiration settings"
@@ -6287,7 +6288,7 @@ msgstr "Neues Passwort:"
 msgid ""
 "Allowed characters are a-z, A-Z, 0-9 and special characters except white "
 "spaces, accentuated letters and colon (:)."
-msgstr "Erlaubte Zeichen sind a-z, A-Z, 0-9 und Sonderzeichen, abgesehen von Leerzeichen, Doppelpunkten (:) und akzentuierte Buchstaben."
+msgstr "Erlaubte Zeichen sind a-z, A-Z, 0-9 und Sonderzeichen, abgesehen von Leerzeichen, Doppelpunkten (:) und akzentuierten Buchstaben."
 
 #: mod/settings.php:1182 src/Module/Register.php:131
 msgid "Confirm:"
@@ -6333,7 +6334,7 @@ msgstr "Deine Sprache:"
 msgid ""
 "Set the language we use to show you friendica interface and to send you "
 "emails"
-msgstr "Wähle die Sprache, in der wir Dir die Friendica-Oberfläche präsentieren sollen und Dir E-Mail schicken"
+msgstr "Wähle die Sprache, in der wir dir die Friendica-Oberfläche präsentieren sollen und dir E-Mail schicken"
 
 #: mod/settings.php:1193
 msgid "Default Post Location:"
@@ -6349,7 +6350,7 @@ msgstr "Sicherheits- und Privatsphäre-Einstellungen"
 
 #: mod/settings.php:1199
 msgid "Maximum Friend Requests/Day:"
-msgstr "Maximale Anzahl vonKontaktanfragen/Tag:"
+msgstr "Maximale Anzahl von Kontaktanfragen/Tag:"
 
 #: mod/settings.php:1199 mod/settings.php:1228
 msgid "(to prevent spam abuse)"
@@ -6361,7 +6362,7 @@ msgstr "Standard-Zugriffsrechte für Beiträge"
 
 #: mod/settings.php:1201
 msgid "(click to open/close)"
-msgstr "(klicke zum öffnen/schließen)"
+msgstr "(klicke zum Öffnen/Schließen)"
 
 #: mod/settings.php:1211
 msgid "Default Private Post"
@@ -6385,7 +6386,7 @@ msgstr "Benachrichtigungseinstellungen"
 
 #: mod/settings.php:1232
 msgid "Send a notification email when:"
-msgstr "Benachrichtigungs-E-Mail senden wenn:"
+msgstr "Benachrichtigungs-E-Mail senden, wenn:"
 
 #: mod/settings.php:1233
 msgid "You receive an introduction"
@@ -6421,19 +6422,19 @@ msgstr "– Du von jemandem angestupst oder sonstwie behandelt wirst"
 
 #: mod/settings.php:1242
 msgid "Activate desktop notifications"
-msgstr "Desktop Benachrichtigungen einschalten"
+msgstr "Desktop-Benachrichtigungen einschalten"
 
 #: mod/settings.php:1242
 msgid "Show desktop popup on new notifications"
-msgstr "Desktop Benachrichtigungen einschalten"
+msgstr "Desktop-Benachrichtigungen einschalten"
 
 #: mod/settings.php:1244
 msgid "Text-only notification emails"
-msgstr "Benachrichtigungs E-Mail als Rein-Text."
+msgstr "Benachrichtigungs-E-Mail als Rein-Text."
 
 #: mod/settings.php:1246
 msgid "Send text only notification emails, without the html part"
-msgstr "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil"
+msgstr "Sende Benachrichtigungs-E-Mail als Rein-Text - ohne HTML-Teil"
 
 #: mod/settings.php:1248
 msgid "Show detailled notifications"
@@ -6443,7 +6444,7 @@ msgstr "Detaillierte Benachrichtigungen anzeigen"
 msgid ""
 "Per default, notifications are condensed to a single notification per item. "
 "When enabled every notification is displayed."
-msgstr "Normalerweise werde alle Benachrichtigungen zu einem Thema zusammengefasst in einer einzigen Mitteilung. Wenn diese Option aktiviert ist, wird jede Mitteilung angezeigt."
+msgstr "Normalerweise werden alle Benachrichtigungen zu einem Thema in einer einzigen Benachrichtigung zusammengefasst. Wenn diese Option aktiviert ist, wird jede Benachrichtigung einzeln angezeigt."
 
 #: mod/settings.php:1252
 msgid "Advanced Account/Page Type Settings"
@@ -6510,7 +6511,7 @@ msgstr "Account exportieren"
 msgid ""
 "Export your account info and contacts. Use this to make a backup of your "
 "account and/or to move it to another server."
-msgstr "Exportiere Deine Accountinformationen und Kontakte. Verwende dies um ein Backup Deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen."
+msgstr "Exportiere Deine Account-Informationen und Kontakte. Verwende dies, um ein Backup Deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen."
 
 #: mod/uexport.php:46
 msgid "Export all"
@@ -6521,7 +6522,7 @@ msgid ""
 "Export your accout info, contacts and all your items as json. Could be a "
 "very big file, and could take a lot of time. Use this to make a full backup "
 "of your account (photos are not exported)"
-msgstr "Exportiere Deine Accountinformationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies, um ein komplettes Backup Deines Accounts anzulegen (Fotos werden nicht exportiert)."
+msgstr "Exportiere Deine Account-Informationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies, um ein komplettes Backup Deines Accounts anzulegen (Fotos werden nicht exportiert)."
 
 #: mod/uimport.php:30
 msgid "User imports on closed servers can only be done by an administrator."
@@ -6556,11 +6557,11 @@ msgstr "Du musst Deinen Account vom alten Server exportieren und hier hochladen.
 msgid ""
 "This feature is experimental. We can't import contacts from the OStatus "
 "network (GNU Social/Statusnet) or from Diaspora"
-msgstr "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren"
+msgstr "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus-Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren"
 
 #: mod/uimport.php:60
 msgid "Account file"
-msgstr "Account Datei"
+msgstr "Account-Datei"
 
 #: mod/uimport.php:60
 msgid ""
@@ -6639,7 +6640,7 @@ msgstr "Ungültige Anfrage"
 
 #: mod/wall_attach.php:103
 msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt."
+msgstr "Entschuldige, die Datei scheint größer zu sein, als es die PHP-Konfiguration erlaubt."
 
 #: mod/wall_attach.php:103
 msgid "Or - did you try to upload an empty file?"
@@ -6662,7 +6663,7 @@ msgstr "Pinnwand-Bilder"
 #: mod/wallmessage.php:52 mod/wallmessage.php:115
 #, php-format
 msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."
+msgstr "Maximale Anzahl der täglichen Pinnwand-Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."
 
 #: mod/wallmessage.php:63
 msgid "Unable to check your home location."
@@ -6719,7 +6720,7 @@ msgstr "Top Banner"
 msgid ""
 "Resize image to the width of the screen and show background color below on "
 "long pages."
-msgstr "Skaliere das Hintergrundbild so, dass es die Breite der Seite einnimmt und fülle den Rest der Seite mit der Hintergrundfarbe bei langen Seiten."
+msgstr "Skaliere das Hintergrundbild so, dass es die Breite der Seite einnimmt, und fülle den Rest der Seite mit der Hintergrundfarbe bei langen Seiten."
 
 #: view/theme/frio/php/Image.php:25
 msgid "Full screen"
@@ -6745,7 +6746,7 @@ msgstr "Mosaik"
 
 #: view/theme/frio/php/Image.php:27
 msgid "Repeat image to fill the screen."
-msgstr "Wiederhole das Bild um den Bildschirm zu füllen."
+msgstr "Wiederhole das Bild, um den Bildschirm zu füllen."
 
 #: view/theme/frio/config.php:103
 msgid "Custom"
@@ -6801,7 +6802,7 @@ msgstr "Hintergrundfarbe der Login-Seite"
 
 #: view/theme/frio/config.php:138
 msgid "Leave background image and color empty for theme defaults"
-msgstr "Wenn die Theme Vorgaben verwendet werden sollen, lass bitte die Felder für die Hintergrundfarbe und das Hintergrundbild leer."
+msgstr "Wenn die Theme-Vorgaben verwendet werden sollen, lass bitte die Felder für die Hintergrundfarbe und das Hintergrundbild leer."
 
 #: view/theme/frio/theme.php:239
 msgid "Guest"
@@ -6899,7 +6900,7 @@ msgstr "Schriftgröße in Eingabefeldern"
 
 #: view/theme/vier/config.php:76
 msgid "Comma separated list of helper forums"
-msgstr "Komma-Separierte Liste der Helfer-Foren"
+msgstr "Komma-separierte Liste der Helfer-Foren"
 
 #: view/theme/vier/config.php:116 src/Core/ACL.php:301
 msgid "don't show"
@@ -6994,11 +6995,11 @@ msgstr "Neues Passwort eingeben:"
 #: src/Core/Console/PostUpdate.php:50
 #, php-format
 msgid "Post update version number has been set to %s."
-msgstr "Die Post-Update Versionsnummer wurde auf %s gesetzt."
+msgstr "Die Post-Update-Versionsnummer wurde auf %s gesetzt."
 
 #: src/Core/Console/PostUpdate.php:58
 msgid "Check for pending update actions."
-msgstr "Überprüfe ausstehende Update Aktionen"
+msgstr "Überprüfe ausstehende Update-Aktionen"
 
 #: src/Core/Console/PostUpdate.php:60
 msgid "Done."
@@ -7050,7 +7051,7 @@ msgid ""
 "The database configuration file \"config/local.config.php\" could not be "
 "written. Please use the enclosed text to create a configuration file in your"
 " web server root."
-msgstr "Die Datenbankkonfigurationsdatei \"config/local.config.php\" konnte nicht erstellt werden. Um eine Konfigurationsdatei in Ihrem Webserver-Verzeichnis zu erstellen, Gehen Sie wie folgt vor."
+msgstr "Die Datenbankkonfigurationsdatei \"config/local.config.php\" konnte nicht erstellt werden. Um eine Konfigurationsdatei in Ihrem Webserver-Verzeichnis zu erstellen, gehen Sie wie folgt vor."
 
 #: src/Core/Installer.php:181
 msgid ""
@@ -7073,7 +7074,7 @@ msgid ""
 "you will not be able to run the background processing. See <a "
 "href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
 "up-the-worker'>'Setup the worker'</a>"
-msgstr "Wenn auf deinem Server keine Kommandozeilenversion von PHP installiert ist, kannst du den Hintergrundprozess nicht einrichten. Hier findest du alternative Möglichkeiten<a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'für das Worker Setup'</a>"
+msgstr "Wenn auf deinem Server keine Kommandozeilenversion von PHP installiert ist, kannst du den Hintergrundprozess nicht einrichten. Hier findest du alternative Möglichkeiten<a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'für das Worker-Setup'</a>"
 
 #: src/Core/Installer.php:248
 msgid "PHP executable path"
@@ -7191,7 +7192,7 @@ msgstr "PHP: mb_string-Modul"
 
 #: src/Core/Installer.php:428
 msgid "Error: mb_string PHP module required but not installed."
-msgstr "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert."
+msgstr "Fehler: mb_string PHP Module wird benötigt, ist aber nicht installiert."
 
 #: src/Core/Installer.php:434
 msgid "iconv PHP module"
@@ -7207,7 +7208,7 @@ msgstr "PHP POSIX Modul"
 
 #: src/Core/Installer.php:442
 msgid "Error: POSIX PHP module required but not installed."
-msgstr "Fehler POSIX PHP Modul erforderlich aber nicht installiert."
+msgstr "Fehler POSIX PHP Modul erforderlich, aber nicht installiert."
 
 #: src/Core/Installer.php:448
 msgid "JSON PHP module"
@@ -7222,7 +7223,7 @@ msgid ""
 "The web installer needs to be able to create a file called "
 "\"local.config.php\" in the \"config\" folder of your web server and it is "
 "unable to do so."
-msgstr "Das Installationsprogramm muss in der Lage sein, eine Datei namens \"local.config.php\" im Ordner \"config\" Ihres Webservers zu erstellen, ist aber nicht in der Lager dazu."
+msgstr "Das Installationsprogramm muss in der Lage sein, eine Datei namens \"local.config.php\" im Ordner \"config\" Ihres Webservers zu erstellen, ist aber nicht in der Lage dazu."
 
 #: src/Core/Installer.php:473
 msgid ""
@@ -7234,7 +7235,7 @@ msgstr "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named local.config.php in your Friendica \"config\" folder."
-msgstr "Am Ende dieser Prozedur bekommst du einen Text der in der local.config.php im Friendica \"config\" Ordner gespeichert werden muss."
+msgstr "Am Ende dieser Prozedur bekommst du einen Text, der in der local.config.php im Friendica \"config\" Ordner gespeichert werden muss."
 
 #: src/Core/Installer.php:475
 msgid ""
@@ -7250,20 +7251,20 @@ msgstr "config/local.config.php ist schreibbar"
 msgid ""
 "Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
-msgstr "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen."
+msgstr "Friendica nutzt die Smarty3-Template-Engine, um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP, um das Rendern zu beschleunigen."
 
 #: src/Core/Installer.php:499
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory view/smarty3/ under the Friendica top level "
 "folder."
-msgstr "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica."
+msgstr "Um diese kompilierten Templates zu speichern, benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica."
 
 #: src/Core/Installer.php:500
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
-msgstr "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat."
+msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Webserver läuft (z.B. www-data), Schreibrechte zu diesem Verzeichnis hat."
 
 #: src/Core/Installer.php:501
 msgid ""
@@ -7587,7 +7588,7 @@ msgstr "Error 503 - Service Unavailable"
 msgid ""
 "The server cannot or will not process the request due to an apparent client "
 "error."
-msgstr "Aufgrund eines offensichtlichen Fehlers auf der Seite des Clients kann oder wird die Anfrage nicht bearbeitet."
+msgstr "Aufgrund eines offensichtlichen Fehlers auf der Seite des Clients kann oder wird der Server die Anfrage nicht bearbeiten."
 
 #: src/Core/System.php:151
 msgid ""
@@ -7598,7 +7599,7 @@ msgstr "Die erforderliche Authentifizierung ist fehlgeschlagen oder noch nicht e
 msgid ""
 "The request was valid, but the server is refusing action. The user might not"
 " have the necessary permissions for a resource, or may need an account."
-msgstr "Die Anfrage war gültig aber der Server verweigert die Ausführung. Der Benutzer verfügt möglicherweise nicht über die erforderlichen Berechtigungen oder benötigt ein Nutzerkonto."
+msgstr "Die Anfrage war gültig, aber der Server verweigert die Ausführung. Der Benutzer verfügt möglicherweise nicht über die erforderlichen Berechtigungen oder benötigt ein Nutzerkonto."
 
 #: src/Core/System.php:153
 msgid ""
@@ -7610,13 +7611,13 @@ msgstr "Die angeforderte Ressource konnte nicht gefunden werden, sie könnte all
 msgid ""
 "An unexpected condition was encountered and no more specific message is "
 "suitable."
-msgstr "Eine unerwartete Situation ist eingetreten zu der keine detailliertere Nachricht vorliegt."
+msgstr "Eine unerwartete Situation ist eingetreten, zu der keine detailliertere Nachricht vorliegt."
 
 #: src/Core/System.php:155
 msgid ""
 "The server is currently unavailable (because it is overloaded or down for "
 "maintenance). Please try again later."
-msgstr "Der Server ist derzeit nicht Verfügbar (wegen Überlastung oder Wartungsarbeiten). Bitte versuchen Sie es später noch einmal."
+msgstr "Der Server ist derzeit nicht verfügbar (wegen Überlastung oder Wartungsarbeiten). Bitte versuche es später noch einmal."
 
 #: src/Core/Update.php:168
 #, php-format
@@ -7631,7 +7632,7 @@ msgid ""
 "\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
 "\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
 "\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
-msgstr "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."
+msgstr "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler, falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."
 
 #: src/Core/Update.php:231
 #, php-format
@@ -7649,11 +7650,11 @@ msgstr "\n \t\t\t\t\tDie Friendica Datenbank wurde erfolgreich von %s auf %s akt
 
 #: src/Core/UserImport.php:103
 msgid "Error decoding account file"
-msgstr "Fehler beim Verarbeiten der Account Datei"
+msgstr "Fehler beim Verarbeiten der Account-Datei"
 
 #: src/Core/UserImport.php:109
 msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"
+msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica-Account-Datei?"
 
 #: src/Core/UserImport.php:117
 #, php-format
@@ -7662,11 +7663,11 @@ msgstr "Nutzer '%s' existiert bereits auf diesem Server!"
 
 #: src/Core/UserImport.php:153
 msgid "User creation error"
-msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten"
+msgstr "Fehler beim Anlegen des Nutzer-Accounts aufgetreten"
 
 #: src/Core/UserImport.php:171
 msgid "User profile creation error"
-msgstr "Fehler beim Anlegen des Nutzerkontos"
+msgstr "Fehler beim Anlegen des Nutzer-Profils"
 
 #: src/Core/UserImport.php:215
 #, php-format
@@ -7807,7 +7808,7 @@ msgstr "Tags"
 #: src/Content/Text/HTML.php:951 src/Model/Item.php:3485
 #: src/Model/Item.php:3496
 msgid "Click to open/close"
-msgstr "Zum öffnen/schließen klicken"
+msgstr "Zum Öffnen/Schließen klicken"
 
 #: src/Content/Widget/CalendarExport.php:64
 msgid "Export"
@@ -7994,7 +7995,7 @@ msgstr "Bisexuell"
 
 #: src/Content/ContactSelector.php:200
 msgid "Autosexual"
-msgstr "Autosexual"
+msgstr "Autosexuell"
 
 #: src/Content/ContactSelector.php:201
 msgid "Abstinent"
@@ -8122,7 +8123,7 @@ msgstr "Geschieden"
 
 #: src/Content/ContactSelector.php:257
 msgid "Imaginarily divorced"
-msgstr "imaginär geschieden"
+msgstr "Imaginär geschieden"
 
 #: src/Content/ContactSelector.php:258
 msgid "Widowed"
@@ -8154,7 +8155,7 @@ msgstr "Mehrere Profile"
 
 #: src/Content/Feature.php:84
 msgid "Ability to create multiple profiles"
-msgstr "Möglichkeit mehrere Profile zu erstellen"
+msgstr "Möglichkeit, mehrere Profile zu erstellen"
 
 #: src/Content/Feature.php:85
 msgid "Photo Location"
@@ -8172,11 +8173,11 @@ msgstr "Öffentlichen Kalender exportieren"
 
 #: src/Content/Feature.php:86
 msgid "Ability for visitors to download the public calendar"
-msgstr "Möglichkeit für Besucher den öffentlichen Kalender herunter zu laden"
+msgstr "Möglichkeit für Besucher, den öffentlichen Kalender herunter zu laden"
 
 #: src/Content/Feature.php:91
 msgid "Post Composition Features"
-msgstr "Beitragserstellung Features"
+msgstr "Beitragserstellung-Features"
 
 #: src/Content/Feature.php:92
 msgid "Auto-mention Forums"
@@ -8199,23 +8200,23 @@ msgstr "Füge Erwähnungen zum Kommentarfeld hinzu, um manuell über die explizi
 
 #: src/Content/Feature.php:98
 msgid "Network Sidebar"
-msgstr "Netzwerk Seitenleiste"
+msgstr "Netzwerk-Seitenleiste"
 
 #: src/Content/Feature.php:99
 msgid "Ability to select posts by date ranges"
-msgstr "Möglichkeit die Beiträge nach Datumsbereichen zu sortieren"
+msgstr "Möglichkeit, die Beiträge nach Datumsbereichen zu sortieren"
 
 #: src/Content/Feature.php:100
 msgid "Protocol Filter"
-msgstr "Protokoll Filter"
+msgstr "Protokoll-Filter"
 
 #: src/Content/Feature.php:100
 msgid "Enable widget to display Network posts only from selected protocols"
-msgstr "Aktiviere Widget um Netzwerkbeiträge nur von ausgesuchten Protokollen anzuzeigen"
+msgstr "Aktiviere Widget, um Netzwerkbeiträge nur von ausgesuchten Protokollen anzuzeigen"
 
 #: src/Content/Feature.php:105
 msgid "Network Tabs"
-msgstr "Netzwerk Reiter"
+msgstr "Netzwerk-Reiter"
 
 #: src/Content/Feature.php:106
 msgid "Network New Tab"
@@ -8223,7 +8224,7 @@ msgstr "Netzwerk-Reiter: Neue"
 
 #: src/Content/Feature.php:106
 msgid "Enable tab to display only new Network posts (from the last 12 hours)"
-msgstr "Aktiviert einen Netzwerk-Reiter in dem ausschließlich neue Beiträge (der letzten 12 Stunden) angezeigt werden"
+msgstr "Aktiviert einen Netzwerk-Reiter, in dem ausschließlich neue Beiträge (der letzten 12 Stunden) angezeigt werden"
 
 #: src/Content/Feature.php:107
 msgid "Network Shared Links Tab"
@@ -8231,7 +8232,7 @@ msgstr "Netzwerk-Reiter: Geteilte Links"
 
 #: src/Content/Feature.php:107
 msgid "Enable tab to display only Network posts with links in them"
-msgstr "Aktiviert einen Netzwerk-Reiter der ausschließlich Nachrichten mit Links enthält"
+msgstr "Aktiviert einen Netzwerk-Reiter, der ausschließlich Nachrichten mit Links enthält"
 
 #: src/Content/Feature.php:112
 msgid "Post/Comment Tools"
@@ -8259,11 +8260,11 @@ msgstr "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Pro
 
 #: src/Content/Feature.php:120
 msgid "Tag Cloud"
-msgstr "Schlagwort Wolke"
+msgstr "Schlagwortwolke"
 
 #: src/Content/Feature.php:120
 msgid "Provide a personal tag cloud on your profile page"
-msgstr "Wortwolke aus den von dir verwendeten Schlagwörtern im Profil anzeigen."
+msgstr "Wortwolke aus den von dir verwendeten Schlagwörtern im Profil anzeigen"
 
 #: src/Content/Feature.php:121
 msgid "Display Membership Date"
@@ -8271,7 +8272,7 @@ msgstr "Mitgliedschaftsdatum anzeigen"
 
 #: src/Content/Feature.php:121
 msgid "Display membership date in profile"
-msgstr "Soll das Datum der Registrierung deines Accounts im Profil angezeigt werden."
+msgstr "Das Datum der Registrierung deines Accounts im Profil anzeigen"
 
 #: src/Content/Nav.php:74
 msgid "Nothing new here"
@@ -8316,7 +8317,7 @@ msgstr "Apps"
 
 #: src/Content/Nav.php:194
 msgid "Addon applications, utilities, games"
-msgstr "Addon Anwendungen, Dienstprogramme, Spiele"
+msgstr "Zusätzliche Anwendungen, Dienstprogramme, Spiele"
 
 #: src/Content/Nav.php:198
 msgid "Search site content"
@@ -8328,7 +8329,7 @@ msgstr "Gemeinschaft"
 
 #: src/Content/Nav.php:222
 msgid "Conversations on this and other servers"
-msgstr "Unterhaltungen auf diesem und anderer Server"
+msgstr "Unterhaltungen auf diesem und anderen Servern"
 
 #: src/Content/Nav.php:229
 msgid "Directory"
@@ -8340,11 +8341,11 @@ msgstr "Nutzerverzeichnis"
 
 #: src/Content/Nav.php:231
 msgid "Information about this friendica instance"
-msgstr "Informationen zu dieser Friendica Instanz"
+msgstr "Informationen zu dieser Friendica-Instanz"
 
 #: src/Content/Nav.php:234
 msgid "Terms of Service of this Friendica instance"
-msgstr "Die Nutzungsbedingungen dieser Friendica Instanz"
+msgstr "Die Nutzungsbedingungen dieser Friendica-Instanz"
 
 #: src/Content/Nav.php:240
 msgid "Network Reset"
@@ -8384,7 +8385,7 @@ msgstr "Andere Seiten verwalten"
 
 #: src/Content/Nav.php:266
 msgid "Manage/Edit Profiles"
-msgstr "Profile Verwalten/Editieren"
+msgstr "Profile verwalten/editieren"
 
 #: src/Content/Nav.php:274
 msgid "Site setup and configuration"
@@ -8470,7 +8471,7 @@ msgstr[1] "%d gemeinsame Kontakte"
 
 #: src/Database/DBStructure.php:47
 msgid "There are no tables on MyISAM."
-msgstr "Es gibt keine MyISAM Tabellen."
+msgstr "Es gibt keine MyISAM-Tabellen."
 
 #: src/Database/DBStructure.php:71
 #, php-format
@@ -8539,7 +8540,7 @@ msgstr "Es wurde kein Autor oder Name gefunden."
 
 #: src/Model/Contact.php:1775
 msgid "No browser URL could be matched to this address."
-msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."
+msgstr "Zu dieser Adresse konnte keine passende Browser-URL gefunden werden."
 
 #: src/Model/Contact.php:1778
 msgid ""
@@ -8549,7 +8550,7 @@ msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kont
 
 #: src/Model/Contact.php:1779
 msgid "Use mailto: in front of address to force email check."
-msgstr "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."
+msgstr "Verwende mailto: vor der E-Mail-Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."
 
 #: src/Model/Contact.php:1785
 msgid ""
@@ -8637,7 +8638,7 @@ msgstr "%ss Geburtstag"
 #: src/Model/Event.php:1029
 #, php-format
 msgid "Happy Birthday %s"
-msgstr "Herzlichen Glückwunsch %s"
+msgstr "Herzlichen Glückwunsch, %s"
 
 #: src/Model/FileTag.php:256
 msgid "Item filed"
@@ -8846,7 +8847,7 @@ msgstr "Tipps für neue Nutzer"
 #: src/Model/Profile.php:1150
 #, php-format
 msgid "OpenWebAuth: %1$s welcomes %2$s"
-msgstr "OpenWebAuth: %1$s heißt %2$sherzlich willkommen"
+msgstr "OpenWebAuth: %1$s heißt %2$s herzlich willkommen"
 
 #: src/Model/Storage/Database.php:36
 #, php-format
@@ -8867,7 +8868,7 @@ msgstr "Dateisystemspeicher konnte nicht erstellt werden \"%s\". Überprüfen Si
 msgid ""
 "Filesystem storage failed to save data to \"%s\". Check your write "
 "permissions"
-msgstr "Der Dateisystemspeicher konnte die Daten nicht in \"%s\", speichern. Überprüfen Sie Ihre Schreibberechtigungen"
+msgstr "Der Dateisystemspeicher konnte die Daten nicht in \"%s\" speichern. Überprüfen Sie Ihre Schreibberechtigungen"
 
 #: src/Model/Storage/Filesystem.php:126
 msgid "Storage base path"
@@ -8877,7 +8878,7 @@ msgstr "Dateipfad zum Speicher"
 msgid ""
 "Folder where uploaded files are saved. For maximum security, This should be "
 "a path outside web server folder tree"
-msgstr "Verzeichnis in das Dateien hochgeladen werden. Für maximale Sicherheit sollte dies ein Pfad außerhalb der Webserver-Verzeichnisstruktur sein"
+msgstr "Verzeichnis, in das Dateien hochgeladen werden. Für maximale Sicherheit sollte dies ein Pfad außerhalb der Webserver-Verzeichnisstruktur sein"
 
 #: src/Model/Storage/Filesystem.php:138
 msgid "Enter a valid existing folder"
@@ -8903,7 +8904,7 @@ msgstr "Leere Passwörter sind nicht erlaubt."
 msgid ""
 "The new password has been exposed in a public data dump, please choose "
 "another."
-msgstr "Das neuer Passwort wurde in einem öffentlichen Daten-Dump veröffentlicht. Bitte verwende ein anderes Passwort."
+msgstr "Das neue Passwort wurde in einem öffentlichen Daten-Dump veröffentlicht. Bitte verwende ein anderes Passwort."
 
 #: src/Model/User.php:408
 msgid ""
@@ -8930,7 +8931,7 @@ msgstr "Ungültige OpenID URL"
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
-msgstr "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast."
+msgstr "Beim Versuch, Dich mit der von Dir angegebenen OpenID anzumelden, trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast."
 
 #: src/Model/User.php:539 src/Module/Login.php:106
 msgid "The error message was:"
@@ -8967,7 +8968,7 @@ msgstr "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein."
 
 #: src/Model/User.php:583
 msgid "Your email domain is not among those allowed on this site."
-msgstr "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."
+msgstr "Die Domain Deiner E-Mail-Adresse ist auf dieser Seite nicht erlaubt."
 
 #: src/Model/User.php:587
 msgid "Not a valid email address."
@@ -9003,7 +9004,7 @@ msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte
 
 #: src/Model/User.php:696
 msgid "An error occurred creating your self contact. Please try again."
-msgstr "Bei der Erstellung deines self Kontakts ist ein Fehler aufgetreten. Bitte versuche es erneut."
+msgstr "Bei der Erstellung deines self-Kontakts ist ein Fehler aufgetreten. Bitte versuche es erneut."
 
 #: src/Model/User.php:705
 msgid ""
@@ -9069,7 +9070,7 @@ msgid ""
 "\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n"
 "\n"
 "\t\t\tThank you and welcome to %2$s."
-msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s."
+msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s."
 
 #: src/Protocol/Diaspora.php:2496
 msgid "Sharing notification from Diaspora network"
@@ -9107,7 +9108,7 @@ msgstr "folgen"
 #: src/Protocol/OStatus.php:1870
 #, php-format
 msgid "%s stopped following %s."
-msgstr "%s hat aufgehört %s zu folgen"
+msgstr "%s hat aufgehört %s, zu folgen"
 
 #: src/Protocol/OStatus.php:1871
 msgid "stopped following"
@@ -9229,7 +9230,7 @@ msgid ""
 "Fetch information like preview pictures, title and teaser from the feed "
 "item. You can activate this if the feed doesn't contain much text. Keywords "
 "are taken from the meta header in the feed item and are posted as hash tags."
-msgstr "Zusätzliche Informationen wie Vorschaubilder, Titel und Zusammenfassungen vom Feed-Eintrag laden. Du kannst diese Option aktivieren, wenn der Feed nicht all zu viel Text beinhaltet. Schlagwörter werden auf den Meta-Informationen des Feed-Headers bezogen und als Hash-Tags verwendet."
+msgstr "Zusätzliche Informationen wie Vorschaubilder, Titel und Zusammenfassungen vom Feed-Eintrag laden. Du kannst diese Option aktivieren, wenn der Feed nicht allzu viel Text beinhaltet. Schlagwörter werden aus den Meta-Informationen des Feed-Headers bezogen und als Hash-Tags verwendet."
 
 #: src/Module/Contact.php:547
 msgid "Fetch information"
@@ -9249,7 +9250,7 @@ msgstr "Profil-Sichtbarkeit"
 
 #: src/Module/Contact.php:582
 msgid "Contact Information / Notes"
-msgstr "Kontakt Informationen / Notizen"
+msgstr "Kontakt-Informationen / -Notizen"
 
 #: src/Module/Contact.php:583
 msgid "Contact Settings"
@@ -9284,7 +9285,7 @@ msgstr "Ignoriere den Kontakt"
 
 #: src/Module/Contact.php:606
 msgid "Repair URL settings"
-msgstr "URL Einstellungen reparieren"
+msgstr "URL-Einstellungen reparieren"
 
 #: src/Module/Contact.php:607
 msgid "View conversations"
@@ -9338,7 +9339,7 @@ msgstr "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitr
 
 #: src/Module/Contact.php:633
 msgid "Blacklisted keywords"
-msgstr "Blacklistete Schlüsselworte "
+msgstr "Unterdrückte Schlüsselworte "
 
 #: src/Module/Contact.php:633
 msgid ""
@@ -9500,13 +9501,13 @@ msgstr "Um Friendica installieren zu können, müssen wir wissen, wie wir mit De
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
-msgstr "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest."
+msgstr "Bitte kontaktiere den Hosting-Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest."
 
 #: src/Module/Install.php:154
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
-msgstr "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst."
+msgstr "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte, bevor Du mit der Installation fortfährst."
 
 #: src/Module/Install.php:157
 msgid "Database Server Name"
@@ -9558,7 +9559,7 @@ msgstr "Wähle die Standardsprache für deine Friendica-Installations-Oberfläch
 
 #: src/Module/Install.php:231
 msgid "Your Friendica site database has been installed."
-msgstr "Die Datenbank Deiner Friendicaseite wurde installiert."
+msgstr "Die Datenbank Deiner Friendica-Seite wurde installiert."
 
 #: src/Module/Install.php:239
 msgid "Installation finished"
@@ -9580,7 +9581,7 @@ msgid ""
 "Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
 "and register as new user. Remember to use the same email you have entered as"
 " administrator email. This will allow you to enter the site admin panel."
-msgstr "Du solltest nun die Seite zur <a href=\"%s/register\">Nutzerregistrierung</a> deiner neuen Friendica Instanz besuchen und einen neuen Nutzer einrichten. Bitte denke daran die selbe E-Mail Adresse anzugeben, die du auch als Administrator E-Mail angegeben hast, damit du das Admin-Panel verwenden kannst."
+msgstr "Du solltest nun die Seite zur <a href=\"%s/register\">Nutzerregistrierung</a> deiner neuen Friendica Instanz besuchen und einen neuen Nutzer einrichten. Bitte denke daran, dieselbe E-Mail Adresse anzugeben, die du auch als Administrator-E-Mail angegeben hast, damit du das Admin-Panel verwenden kannst."
 
 #: src/Module/Itemsource.php:41
 msgid "Item Guid"
@@ -9608,7 +9609,7 @@ msgstr "Passwort vergessen?"
 
 #: src/Module/Login.php:338
 msgid "Website Terms of Service"
-msgstr "Website Nutzungsbedingungen"
+msgstr "Website-Nutzungsbedingungen"
 
 #: src/Module/Login.php:339
 msgid "terms of service"
@@ -9616,7 +9617,7 @@ msgstr "Nutzungsbedingungen"
 
 #: src/Module/Login.php:341
 msgid "Website Privacy Policy"
-msgstr "Website Datenschutzerklärung"
+msgstr "Website-Datenschutzerklärung"
 
 #: src/Module/Login.php:342
 msgid "privacy policy"
@@ -9678,7 +9679,7 @@ msgstr "Deine E-Mail Adresse (Informationen zur Registrierung werden an diese Ad
 
 #: src/Module/Register.php:130
 msgid "Leave empty for an auto generated password."
-msgstr "Leer lassen um das Passwort automatisch zu generieren."
+msgstr "Leer lassen, um das Passwort automatisch zu generieren."
 
 #: src/Module/Register.php:132
 #, php-format
@@ -9693,7 +9694,7 @@ msgstr "Spitznamen wählen: "
 
 #: src/Module/Register.php:142
 msgid "Import your profile to this friendica instance"
-msgstr "Importiere Dein Profil auf diese Friendica Instanz"
+msgstr "Importiere Dein Profil auf diese Friendica-Instanz"
 
 #: src/Module/Register.php:150
 msgid "Note: This node explicitly contains adult content"
@@ -9709,7 +9710,7 @@ msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an
 msgid ""
 "Failed to send email message. Here your accout details:<br> login: %s<br> "
 "password: %s<br><br>You can change your password after login."
-msgstr "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern."
+msgstr "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account-Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern."
 
 #: src/Module/Register.php:254
 msgid "Registration successful."
@@ -9741,7 +9742,7 @@ msgid ""
 "This data is required for communication and is passed on to the nodes of the"
 " communication partners and is stored there. Users can enter additional "
 "private data that may be transmitted to the communication partners accounts."
-msgstr "Diese Daten sind für die Kommunikation notwendig und werden an die Knoten der Kommunikationspartner übermittelt. und werden dort gespeichert Nutzer können weitere private Angaben machen, die ebenfalls an die verwendeten Server der Kommunikationspartner übermittelt werden können."
+msgstr "Diese Daten sind für die Kommunikation notwendig und werden an die Knoten der Kommunikationspartner übermittelt und dort gespeichert. Nutzer können weitere, private Angaben machen, die ebenfalls an die verwendeten Server der Kommunikationspartner übermittelt werden können."
 
 #: src/Module/Tos.php:37 src/Module/Tos.php:79
 #, php-format
@@ -9872,7 +9873,7 @@ msgstr "Die Zustellung an Remote-Server ist fast erledigt"
 
 #: src/Object/Post.php:436
 msgid "Delivery to remote servers is done"
-msgstr "Die Zustellung an die Remote-Server ist erledigt."
+msgstr "Die Zustellung an die Remote-Server ist erledigt"
 
 #: src/Object/Post.php:455
 #, php-format
@@ -9895,13 +9896,13 @@ msgstr "mobile Ansicht umschalten"
 
 #: src/App.php:1077
 msgid "No system theme config value set."
-msgstr "Es wurde kein Konfigurationswert für das Systemweite Theme gesetzt."
+msgstr "Es wurde kein Konfigurationswert für das systemweite Theme gesetzt."
 
 #: src/BaseModule.php:133
 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 Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
+msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens, wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
 
 #: src/LegacyModule.php:30
 #, php-format
diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php
index c18095580..b5bfc9b52 100644
--- a/view/lang/de/strings.php
+++ b/view/lang/de/strings.php
@@ -131,7 +131,7 @@ $a->strings["Thank You,"] = "Danke,";
 $a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrator";
 $a->strings["%s Administrator"] = "der Administrator von %s";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica-Meldung] Neue Email erhalten um %s";
-$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat Dir eine neue private Nachricht um %2\$s geschickt.";
+$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat Dir eine neue, private Nachricht um %2\$s geschickt.";
 $a->strings["a private message"] = "eine private Nachricht";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s schickte Dir %2\$s.";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um Deine privaten Nachrichten anzusehen und/oder zu beantworten.";
@@ -139,10 +139,10 @@ $a->strings["%1\$s tagged you on [url=%2\$s]a %3\$s[/url]"] = "%1\$s erwähnte d
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]a %3\$s[/url]";
 $a->strings["%1\$s tagged you on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s erwähnte dich auf  [url=%2\$s]%3\$s's %4\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]%3\$ss %4\$s[/url]";
-$a->strings["%1\$s tagged you on [url=%2\$s]your %3\$s[/url]"] = "%1\$s erwähnte dich auf [url=%2\$s] deinem %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]your %3\$s[/url]"] = "%1\$s erwähnte dich auf [url=%2\$s]deinem %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]deinen %3\$s[/url]";
 $a->strings["%1\$s tagged you on [url=%2\$s]their %3\$s[/url]"] = "%1\$s erwähnte dich im [url=%2\$s]eigenen %3\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]their %3\$s[/url]"] = "%1\$s kommentierte den [url=%2\$s] eigenen %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]their %3\$s[/url]"] = "%1\$s kommentierte den [url=%2\$s]eigenen %3\$s[/url]";
 $a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica-Meldung] %s hat Dich erwähnt";
 $a->strings["%1\$s tagged you at %2\$s"] = "%1\$s erwähnte Dich auf %2\$s";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica-Meldung] Kommentar zum Beitrag #%1\$d von %2\$s";
@@ -167,7 +167,7 @@ $a->strings["You may visit their profile at %s"] = "Hier kannst Du das Profil be
 $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen.";
 $a->strings["[Friendica:Notify] A new person is sharing with you"] = "[Friendica Benachrichtigung] Eine neue Person teilt mit Dir";
 $a->strings["%1\$s is sharing with you at %2\$s"] = "%1\$s teilt mit Dir auf %2\$s";
-$a->strings["[Friendica:Notify] You have a new follower"] = "[Friendica Benachrichtigung] Du hast einen neuen Kontakt auf ";
+$a->strings["[Friendica:Notify] You have a new follower"] = "[Friendica-Benachrichtigung] Du hast einen neuen Kontakt";
 $a->strings["You have a new follower at %2\$s : %1\$s"] = "Du hast einen neuen Kontakt auf %2\$s: %1\$s";
 $a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica-Meldung] Kontaktvorschlag erhalten";
 $a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Du hast einen Kontakt-Vorschlag von '%1\$s' auf %2\$s erhalten";
@@ -178,17 +178,17 @@ $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte bes
 $a->strings["[Friendica:Notify] Connection accepted"] = "[Friendica-Benachrichtigung] Kontaktanfrage bestätigt";
 $a->strings["'%1\$s' has accepted your connection request at %2\$s"] = "'%1\$s' hat Deine Kontaktanfrage auf  %2\$s bestätigt";
 $a->strings["%2\$s has accepted your [url=%1\$s]connection request[/url]."] = "%2\$s hat Deine [url=%1\$s]Kontaktanfrage[/url] akzeptiert.";
-$a->strings["You are now mutual friends and may exchange status updates, photos, and email without restriction."] = "Ihr seid nun beidseitige Kontakte und könnt Statusmitteilungen, Bilder und Emails ohne Einschränkungen austauschen.";
+$a->strings["You are now mutual friends and may exchange status updates, photos, and email without restriction."] = "Ihr seid nun beidseitige Kontakte und könnt Statusmitteilungen, Bilder und E-Mails ohne Einschränkungen austauschen.";
 $a->strings["Please visit %s if you wish to make any changes to this relationship."] = "Bitte besuche %s, wenn Du Änderungen an eurer Beziehung vornehmen willst.";
 $a->strings["'%1\$s' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically."] = "'%1\$s' hat sich entschieden Dich als Fan zu akzeptieren, dies schränkt einige Kommunikationswege - wie private Nachrichten und einige Interaktionsmöglichkeiten auf der Profilseite - ein. Wenn dies eine Berühmtheiten- oder Gemeinschaftsseite ist, werden diese Einstellungen automatisch vorgenommen.";
 $a->strings["'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future."] = "'%1\$s' kann den Kontaktstatus zu einem späteren Zeitpunkt erweitern und diese Einschränkungen aufheben. ";
 $a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "Bitte besuche %s, wenn Du Änderungen an eurer Beziehung vornehmen willst.";
-$a->strings["[Friendica System Notify]"] = "[Friendica System Benachrichtigung]";
+$a->strings["[Friendica System Notify]"] = "[Friendica-Systembenachrichtigung]";
 $a->strings["registration request"] = "Registrierungsanfrage";
 $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Du hast eine Registrierungsanfrage von %2\$s auf '%1\$s' erhalten";
 $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Registrierungsanfrage[/url] von %2\$s erhalten.";
 $a->strings["Full Name:\t%s\nSite Location:\t%s\nLogin Name:\t%s (%s)"] = "Kompletter Name: %s\nURL der Seite: %s\nLogin Name: %s(%s)";
-$a->strings["Please visit %s to approve or reject the request."] = "Bitte besuche %s um die Anfrage zu bearbeiten.";
+$a->strings["Please visit %s to approve or reject the request."] = "Bitte besuche %s, um die Anfrage zu bearbeiten.";
 $a->strings["Item not found."] = "Beitrag nicht gefunden.";
 $a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?";
 $a->strings["Yes"] = "Ja";
@@ -222,17 +222,17 @@ $a->strings["Delete Item"] = "Eintrag löschen";
 $a->strings["Logs"] = "Protokolle";
 $a->strings["View Logs"] = "Protokolle anzeigen";
 $a->strings["Diagnostics"] = "Diagnostik";
-$a->strings["PHP Info"] = "PHP Info";
+$a->strings["PHP Info"] = "PHP-Info";
 $a->strings["probe address"] = "Adresse untersuchen";
 $a->strings["check webfinger"] = "Webfinger überprüfen";
 $a->strings["Admin"] = "Administration";
 $a->strings["Addon Features"] = "Addon Features";
-$a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten";
+$a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen, die auf Bestätigung warten";
 $a->strings["Administration"] = "Administration";
 $a->strings["Display Terms of Service"] = "Nutzungsbedingungen anzeigen";
-$a->strings["Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page."] = "Aktiviert die Seite für die Nutzungsbedingungen. Ist dies der Fall werden sie auch von der Registrierungsseite und der allgemeinen Informationsseite verlinkt.";
+$a->strings["Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page."] = "Aktiviert die Seite für die Nutzungsbedingungen. Ist dies der Fall, werden sie auch von der Registrierungsseite und der allgemeinen Informationsseite verlinkt.";
 $a->strings["Display Privacy Statement"] = "Datenschutzerklärung anzeigen";
-$a->strings["Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."] = "Zeige Informationen über die zum Betrieb der Seite notwendigen personenbezogenen Daten an, wie es z.B. die <a href=\"%s\" target=\"_blank\">EU-DSGVO</a> verlangt.";
+$a->strings["Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."] = "Zeige Informationen über die zum Betrieb der Seite notwendigen, personenbezogenen Daten an, wie es z.B. die <a href=\"%s\" target=\"_blank\">EU-DSGVO</a> verlangt.";
 $a->strings["Privacy Statement Preview"] = "Vorschau: Datenschutzerklärung";
 $a->strings["The Terms of Service"] = "Die Nutzungsbedingungen";
 $a->strings["Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below."] = "Füge hier die Nutzungsbedingungen deines Knotens ein. Du kannst BBCode zur Formatierung verwenden. Überschriften sollten [h2] oder darunter sein.";
@@ -243,11 +243,11 @@ $a->strings["Reason for the block"] = "Begründung für die Blockierung";
 $a->strings["The reason why you blocked this domain."] = "Die Begründung warum du diese Domain blockiert hast.";
 $a->strings["Delete domain"] = "Domain löschen";
 $a->strings["Check to delete this entry from the blocklist"] = "Markieren, um diesen Eintrag von der Blocklist zu entfernen";
-$a->strings["This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server."] = "Auf dieser Seite kannst du die Liste der blockierten Domains aus dem föderalen Netzwerk verwalten, denen es untersagt ist mit deinem Knoten zu interagieren. Für jede der blockierten Domains musst du außerdem einen Grund für die Sperrung angeben.";
-$a->strings["The list of blocked servers will be made publically available on the /friendica page so that your users and people investigating communication problems can find the reason easily."] = "Die Liste der blockierten Domains wird auf der /friendica Seite öffentlich einsehbar gemacht, damit deine Nutzer und Personen die Kommunikationsprobleme erkunden, die Ursachen einfach finden können.";
+$a->strings["This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server."] = "Auf dieser Seite kannst du die Liste der blockierten Domains aus dem föderalen Netzwerk verwalten, denen es untersagt ist, mit deinem Knoten zu interagieren. Für jede der blockierten Domains musst du außerdem einen Grund für die Sperrung angeben.";
+$a->strings["The list of blocked servers will be made publically available on the /friendica page so that your users and people investigating communication problems can find the reason easily."] = "Die Liste der blockierten Domains wird auf der /friendica Seite öffentlich einsehbar gemacht, damit deine Nutzer und Personen, die Kommunikationsprobleme erkunden, die Ursachen einfach finden können.";
 $a->strings["Add new entry to block list"] = "Neuen Eintrag in die Blockliste";
 $a->strings["Server Domain"] = "Domain des Servers";
-$a->strings["The domain of the new server to add to the block list. Do not include the protocol."] = "Der Domain-Name des Servers der geblockt werden soll. Gib das Protokoll nicht mit an!";
+$a->strings["The domain of the new server to add to the block list. Do not include the protocol."] = "Der Domain-Name des Servers, der geblockt werden soll. Gib das Protokoll nicht mit an!";
 $a->strings["Block reason"] = "Begründung der Blockierung";
 $a->strings["Add Entry"] = "Eintrag hinzufügen";
 $a->strings["Save changes to the blocklist"] = "Änderungen der Blockliste speichern";
@@ -280,44 +280,44 @@ $a->strings["%s total blocked contact"] = [
 	0 => "Insgesamt %s blockierter Kontakt",
 	1 => "Insgesamt %s blockierte Kontakte",
 ];
-$a->strings["URL of the remote contact to block."] = "Die URL des Kontakts, vom entfernten Server, der blockiert werden soll.";
+$a->strings["URL of the remote contact to block."] = "Die URL des entfernten Kontakts, der blockiert werden soll.";
 $a->strings["Delete this Item"] = "Diesen Eintrag löschen";
 $a->strings["On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted."] = "Auf dieser Seite kannst du Einträge von deinem Knoten löschen. Wenn der Eintrag der Anfang einer Diskussion ist, wird der gesamte Diskussionsverlauf gelöscht.";
-$a->strings["You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456."] = "Zur Löschung musst du die GUID des Eintrags kennen. Diese findest du z.B. durch die /display URL des Eintrags. Der letzte Teil der URL ist die GUID. Lautet die URL beispielsweise http://example.com/display/123456 ist die GUID 123456.";
+$a->strings["You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456."] = "Zur Löschung musst du die GUID des Eintrags kennen. Diese findest du z.B. durch die /display URL des Eintrags. Der letzte Teil der URL ist die GUID. Lautet die URL beispielsweise http://example.com/display/123456, ist die GUID 123456.";
 $a->strings["GUID"] = "GUID";
 $a->strings["The GUID of the item you want to delete."] = "Die GUID des zu löschenden Eintrags";
 $a->strings["Item marked for deletion."] = "Eintrag wurden zur Löschung markiert";
 $a->strings["unknown"] = "Unbekannt";
 $a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt.";
-$a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "Die Funktion um <em>Regelmäßig globale Kontakte überprüfen</em> ist nicht aktiv. Es wird die hier angezeigten Daten verbessern.";
+$a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "Die Funktion <em>\"Regelmäßig globale Kontakte überprüfen\"</em> ist nicht aktiv. Sie wird die hier angezeigten Daten verbessern.";
 $a->strings["Currently this node is aware of %d nodes with %d registered users from the following platforms:"] = "Momentan kennt dieser Knoten %d Knoten mit insgesamt %d registrierten Nutzern, die die folgenden Plattformen verwenden:";
 $a->strings["ID"] = "ID";
-$a->strings["Recipient Name"] = "Empfänger Name";
-$a->strings["Recipient Profile"] = "Empfänger Profil";
+$a->strings["Recipient Name"] = "Empfänger-Name";
+$a->strings["Recipient Profile"] = "Empfänger-Profil";
 $a->strings["Network"] = "Netzwerk";
 $a->strings["Created"] = "Erstellt";
 $a->strings["Last Tried"] = "Zuletzt versucht";
-$a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht die Beiträge zuzustellen, bis sie schließlich gelöscht werden.";
+$a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht, die Beiträge zuzustellen, bis sie schließlich gelöscht werden.";
 $a->strings["Inspect Deferred Worker Queue"] = "Verzögerte Worker-Warteschlange inspizieren";
 $a->strings["This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time."] = "Auf dieser Seite werden die aufgeschobenen Worker-Jobs aufgelistet. Dies sind Jobs, die beim ersten Mal nicht ausgeführt werden konnten.";
-$a->strings["Inspect Worker Queue"] = "Worker Warteschlange inspizieren";
-$a->strings["This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you've set up during install."] = "Auf dieser Seite werden die derzeit in der Warteschlange befindlichen Worker-Jobs aufgelistet. Diese Jobs werden vom Cronjob verarbeitet, den Sie während der Installation eingerichtet haben.";
+$a->strings["Inspect Worker Queue"] = "Worker-Warteschlange inspizieren";
+$a->strings["This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you've set up during install."] = "Auf dieser Seite werden die derzeit in der Warteschlange befindlichen Worker-Jobs aufgelistet. Diese Jobs werden vom Cronjob verarbeitet, den du während der Installation eingerichtet hast.";
 $a->strings["Job Parameters"] = "Parameter der Aufgabe";
 $a->strings["Priority"] = "Priorität";
-$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"] = "Deine DB verwendet derzeit noch MyISAM Tabellen. Du solltest die Datenbank Engine auf InnoDB umstellen, da Friendica in Zukunft InnoDB Features verwenden wird. Eine Anleitung zur Umstellung der Datenbank kannst du  <a href=\"%s\">hier</a>  finden. Du kannst außerdem mit dem Befehl <tt>php bin/console.php dbstructure toinnodb</tt> auf der Kommandozeile die Umstellung automatisch vornehmen lassen.";
+$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"] = "Deine DB verwendet derzeit noch MyISAM Tabellen. Du solltest die Datenbank Engine auf InnoDB umstellen, da Friendica in Zukunft InnoDB-Features verwenden wird. Eine Anleitung zur Umstellung der Datenbank kannst du  <a href=\"%s\">hier</a>  finden. Du kannst außerdem mit dem Befehl <tt>php bin/console.php dbstructure toinnodb</tt> auf der Kommandozeile die Umstellung automatisch vornehmen lassen.";
 $a->strings["There is a new version of Friendica available for download. Your current version is %1\$s, upstream version is %2\$s"] = "Es gibt eine neue Version von Friendica. Du verwendest derzeit die Version %1\$s, die aktuelle Version ist %2\$s.";
 $a->strings["The database update failed. Please run \"php bin/console.php dbstructure update\" from the command line and have a look at the errors that might appear."] = "Das Update der Datenbank ist fehlgeschlagen. Bitte führe 'php bin/console.php dbstructure update' in der Kommandozeile aus und achte auf eventuell auftretende Fehlermeldungen.";
 $a->strings["The worker was never executed. Please check your database structure!"] = "Der Hintergrundprozess (worker) wurde noch nie gestartet. Bitte überprüfe deine Datenbankstruktur.";
-$a->strings["The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings."] = "Der Hintergrundprozess (worker) wurde zuletzt um %s UTC ausgeführt. Das war vor mehr als einer Stunde. Bitte überprüfe deine crontab Einstellungen.";
-$a->strings["Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "Die Konfiguration von Friendica befindet sich ab jetzt in der 'config/local.ini.php' Datei. Kopiere bitte die Datei  'config/local-sample.config.php' nach 'config/local.config.php' und setze die Konfigurationvariablen so wie in der alten <code>.htconfig.php</code>. Wie die Übertragung der Werte aussehen muss kannst du der <a href=\"%s\">Konfiguration Hilfeseite</a> entnehmen.";
-$a->strings["Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>config/local.ini.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "Die Konfiguration von Friendica befindet sich ab jetzt in der 'config/local.config.php' Datei. Kopiere bitte die Datei  'config/local-sample.config.php' nach 'config/local.config.php' und setze die Konfigurationvariablen so wie in der alten <code>config/local.ini.php</code>. Wie die Übertragung der Werte aussehen muss kannst du der <a href=\"%s\">Konfiguration Hilfeseite</a> entnehmen.";
-$a->strings["<a href=\"%s\">%s</a> is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See <a href=\"%s\">the installation page</a> for help."] = "<a href=\"%s\">%s</a> konnte von deinem System nicht aufgerufen werden. Dies deitet auf ein schwerwiegendes Problem deiner Konfiguration hin. Bitte konsultiere <a href=\"%s\">die Installations-Dokumentation</a> zum Beheben des Problems.";
+$a->strings["The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings."] = "Der Hintergrundprozess (worker) wurde zuletzt um %s UTC ausgeführt. Das war vor mehr als einer Stunde. Bitte überprüfe deine crontab-Einstellungen.";
+$a->strings["Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "Die Konfiguration von Friendica befindet sich ab jetzt in der 'config/local.ini.php' Datei. Kopiere bitte die Datei  'config/local-sample.config.php' nach 'config/local.config.php' und setze die Konfigurationvariablen so wie in der alten <code>.htconfig.php</code>. Wie die Übertragung der Werte aussehen muss, kannst du der <a href=\"%s\">Konfiguration Hilfeseite</a> entnehmen.";
+$a->strings["Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>config/local.ini.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "Die Konfiguration von Friendica befindet sich ab jetzt in der 'config/local.config.php' Datei. Kopiere bitte die Datei  'config/local-sample.config.php' nach 'config/local.config.php' und setze die Konfigurationvariablen so wie in der alten <code>config/local.ini.php</code>. Wie die Übertragung der Werte aussehen muss, kannst du der <a href=\"%s\">Konfiguration Hilfeseite</a> entnehmen.";
+$a->strings["<a href=\"%s\">%s</a> is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See <a href=\"%s\">the installation page</a> for help."] = "<a href=\"%s\">%s</a> konnte von deinem System nicht aufgerufen werden. Dies deutet auf ein schwerwiegendes Problem deiner Konfiguration hin. Bitte konsultiere <a href=\"%s\">die Installations-Dokumentation</a> zum Beheben des Problems.";
 $a->strings["Normal Account"] = "Normales Konto";
 $a->strings["Automatic Follower Account"] = "Automatisch folgendes Konto (Marktschreier)";
-$a->strings["Public Forum Account"] = "Öffentliches Forum Konto";
-$a->strings["Automatic Friend Account"] = "Automatische Freunde Seite";
+$a->strings["Public Forum Account"] = "Öffentliches Forum-Konto";
+$a->strings["Automatic Friend Account"] = "Automatische Freunde-Seite";
 $a->strings["Blog Account"] = "Blog-Konto";
-$a->strings["Private Forum Account"] = "Privates Forum Konto";
+$a->strings["Private Forum Account"] = "Privates Forum-Konto";
 $a->strings["Message queues"] = "Nachrichten-Warteschlangen";
 $a->strings["Server Settings"] = "Servereinstellungen";
 $a->strings["Summary"] = "Zusammenfassung";
@@ -340,11 +340,11 @@ $a->strings["One month"] = "ein Monat";
 $a->strings["Three months"] = "drei Monate";
 $a->strings["Half a year"] = "ein halbes Jahr";
 $a->strings["One year"] = "ein Jahr";
-$a->strings["Multi user instance"] = "Mehrbenutzer Instanz";
+$a->strings["Multi user instance"] = "Mehrbenutzer-Instanz";
 $a->strings["Closed"] = "Geschlossen";
 $a->strings["Requires approval"] = "Bedarf der Zustimmung";
 $a->strings["Open"] = "Offen";
-$a->strings["No SSL policy, links will track page SSL state"] = "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten";
+$a->strings["No SSL policy, links will track page SSL state"] = "Keine SSL-Richtlinie, Links werden das verwendete Protokoll beibehalten";
 $a->strings["Force all links to use SSL"] = "SSL für alle Links erzwingen";
 $a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)";
 $a->strings["Don't check"] = "Nicht überprüfen";
@@ -359,41 +359,41 @@ $a->strings["Advanced"] = "Erweitert";
 $a->strings["Auto Discovered Contact Directory"] = "Automatisch ein Kontaktverzeichnis erstellen";
 $a->strings["Performance"] = "Performance";
 $a->strings["Worker"] = "Worker";
-$a->strings["Message Relay"] = "Nachrichten Relais";
+$a->strings["Message Relay"] = "Nachrichten-Relais";
 $a->strings["Relocate Instance"] = "Instanz Umziehen";
 $a->strings["Warning! Advanced function. Could make this server unreachable."] = "WARNUNG: Funktion für Fortgeschrittene. Könnte diesen Server unerreichbar machen.";
 $a->strings["Site name"] = "Seitenname";
 $a->strings["Host name"] = "Host Name";
 $a->strings["Sender Email"] = "Absender für Emails";
-$a->strings["The email address your server shall use to send notification emails from."] = "Die E-Mail Adresse die dein Server zum Versenden von Benachrichtigungen verwenden soll.";
+$a->strings["The email address your server shall use to send notification emails from."] = "Die E-Mail Adresse, die dein Server zum Versenden von Benachrichtigungen verwenden soll.";
 $a->strings["Banner/Logo"] = "Banner/Logo";
 $a->strings["Shortcut icon"] = "Shortcut Icon";
 $a->strings["Link to an icon that will be used for browsers."] = "Link zu einem Icon, das Browser verwenden werden.";
 $a->strings["Touch icon"] = "Touch Icon";
-$a->strings["Link to an icon that will be used for tablets and mobiles."] = "Link zu einem Icon das Tablets und Handies verwenden sollen.";
+$a->strings["Link to an icon that will be used for tablets and mobiles."] = "Link zu einem Icon, das Tablets und Mobiltelefone verwenden sollen.";
 $a->strings["Additional Info"] = "Zusätzliche Informationen";
 $a->strings["For public servers: you can add additional information here that will be listed at %s/servers."] = "Für öffentliche Server kannst Du hier zusätzliche Informationen angeben, die dann auf %s/servers angezeigt werden.";
 $a->strings["System language"] = "Systemsprache";
 $a->strings["System theme"] = "Systemweites Theme";
 $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>";
 $a->strings["Mobile system theme"] = "Systemweites mobiles Theme";
-$a->strings["Theme for mobile devices"] = "Thema für mobile Geräte";
+$a->strings["Theme for mobile devices"] = "Theme für mobile Geräte";
 $a->strings["SSL link policy"] = "Regeln für SSL Links";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen";
 $a->strings["Force SSL"] = "Erzwinge SSL";
-$a->strings["Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."] = "Erzinge alle Nicht-SSL Anfragen auf SSL - Achtung: auf manchen Systemen verursacht dies eine Endlosschleife.";
-$a->strings["Hide help entry from navigation menu"] = "Verberge den Menüeintrag für die Hilfe im Navigationsmenü";
+$a->strings["Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."] = "Erzwinge SSL für alle Nicht-SSL-Anfragen - Achtung: auf manchen Systemen verursacht dies eine Endlosschleife.";
+$a->strings["Hide help entry from navigation menu"] = "Verberge den Hilfe-Eintrag im Navigationsmenü";
 $a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden.";
 $a->strings["Single user instance"] = "Ein-Nutzer Instanz";
-$a->strings["Make this instance multi-user or single-user for the named user"] = "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt.";
-$a->strings["File storage backend"] = "Datenspeicher Backend";
-$a->strings["The backend used to store uploaded data. If you change the storage backend, you can manually move the existing files. If you do not do so, the files uploaded before the change will still be available at the old backend. Please see <a href=\"/help/Settings#1_2_3_1\">the settings documentation</a> for more information about the choices and the moving procedure."] = "Das zu verwendende Datenspeicher Backend, wenn Dateien hochgeladen werden. Wenn du das Datenspeicher Backend änderst, kannst du die bestehenden Dateien zum neuen Backend verschieben. Machst du dies nicht, verbleiben sie im alten Backend und werden weiterhin von dort geladen. Für weitere Informationen zu den verfügbaren Alternativen und der Prozedur zum Verschieben der Daten, schaue bitte in <a href=\"/help/Settings#1_2_3_1\">die Dokumentation zu den Einstellungen</a>.";
+$a->strings["Make this instance multi-user or single-user for the named user"] = "Bestimmt, ob es sich bei dieser Instanz um eine Installation mit nur einen Nutzer oder mit mehreren Nutzern handelt.";
+$a->strings["File storage backend"] = "Datenspeicher-Backend";
+$a->strings["The backend used to store uploaded data. If you change the storage backend, you can manually move the existing files. If you do not do so, the files uploaded before the change will still be available at the old backend. Please see <a href=\"/help/Settings#1_2_3_1\">the settings documentation</a> for more information about the choices and the moving procedure."] = "Das zu verwendende Datenspeicher-Backend, wenn Dateien hochgeladen werden. Wenn du das Datenspeicher-Backend änderst, kannst du die bestehenden Dateien zum neuen Backend verschieben. Machst du dies nicht, verbleiben sie im alten Backend und werden weiterhin von dort geladen. Für weitere Informationen zu den verfügbaren Alternativen und der Prozedur zum Verschieben der Daten schaue bitte in <a href=\"/help/Settings#1_2_3_1\">die Dokumentation zu den Einstellungen</a>.";
 $a->strings["Maximum image size"] = "Maximale Bildgröße";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Uploadgröße von Bildern in Bytes. Standard ist 0, d.h. ohne Limit.";
 $a->strings["Maximum image length"] = "Maximale Bildlänge";
-$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet.";
+$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maximale Länge in Pixeln der längsten Seite eines hochgeladenen Bildes. Grundeinstellung ist -1, was keine Einschränkung bedeutet.";
 $a->strings["JPEG image quality"] = "Qualität des JPEG Bildes";
-$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust.";
+$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Hochgeladene JPEG-Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust.";
 $a->strings["Register policy"] = "Registrierungsmethode";
 $a->strings["Maximum Daily Registrations"] = "Maximum täglicher Registrierungen";
 $a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect."] = "Wenn die Registrierung weiter oben erlaubt ist, regelt dies die maximale Anzahl von Neuanmeldungen pro Tag. Wenn die Registrierung geschlossen ist, hat diese Einstellung keinen Effekt.";
@@ -408,9 +408,9 @@ $a->strings["Comma separated list of domains which are allowed to establish frie
 $a->strings["Allowed email domains"] = "Erlaubte Domains für E-Mails";
 $a->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.";
 $a->strings["No OEmbed rich content"] = "OEmbed nicht verwenden";
-$a->strings["Don't show the rich content (e.g. embedded PDF), except from the domains listed below."] = "Verhindert das Einbetten von reichhaltigen Inhalten (z.B. eingebettete PDF Dateien). Ausgenommen von dieser Regel werden Domänen die unten aufgeführt werden.";
-$a->strings["Allowed OEmbed domains"] = "Erlaubte OEmbed Domänen";
-$a->strings["Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted."] = "Komma separierte Liste von Domänen für die das einbetten reichhaltiger Inhalte erlaubt sind. Platzhalter können verwendet werden.";
+$a->strings["Don't show the rich content (e.g. embedded PDF), except from the domains listed below."] = "Verhindert das Einbetten von reichhaltigen Inhalten (z.B. eingebettete PDF Dateien). Ausgenommen von dieser Regel werden Domänen, die unten aufgeführt werden.";
+$a->strings["Allowed OEmbed domains"] = "Erlaubte OEmbed-Domänen";
+$a->strings["Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted."] = "Durch Kommas getrennte Liste von Domänen, für die das Einbetten reichhaltiger Inhalte erlaubt ist. Platzhalter können verwendet werden.";
 $a->strings["Block public"] = "Öffentlichen Zugriff blockieren";
 $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist.";
 $a->strings["Force publish"] = "Erzwinge Veröffentlichung";
@@ -421,116 +421,116 @@ $a->strings["URL to the global directory. If this is not set, the global directo
 $a->strings["Private posts by default for new users"] = "Private Beiträge als Standard für neue Nutzer";
 $a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen.";
 $a->strings["Don't include post content in email notifications"] = "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden";
-$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden.";
+$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw. zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden.";
 $a->strings["Disallow public access to addons listed in the apps menu."] = "Öffentlichen Zugriff auf Addons im Apps Menü verbieten.";
-$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt.";
+$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Wenn ausgewählt, werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt.";
 $a->strings["Don't embed private images in posts"] = "Private Bilder nicht in Beiträgen einbetten.";
-$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert.";
+$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "Ersetze lokal gehostete, private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten, sich zunächst auf den jeweiligen Servern authentifizieren müssen, bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert.";
 $a->strings["Explicit Content"] = "Sensibler Inhalt";
-$a->strings["Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page."] = "Wählen Sie das um anzuzeigen, dass Ihr Knoten hauptsächlich für explizite Inhalte verwendet wird, die möglicherweise nicht für Minderjährige geeignet sind. Diese Info wird in der Knoteninformation veröffentlicht und kann durch das Globale Verzeichnis genutzt werden, um Ihren Knoten von den Auflistungen auszuschließen. Zusätzlich wird auf der Registrierungsseite ein Hinweis darüber angezeigt.";
-$a->strings["Allow Users to set remote_self"] = "Nutzern erlauben das remote_self Flag zu setzen";
-$a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "Ist dies ausgewählt kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im Kontakt reparieren Dialog markieren. Nach dem setzten dieses Flags werden alle Top-Level Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet.";
+$a->strings["Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page."] = "Wählen Sie dies, um anzuzeigen, dass Ihr Knoten hauptsächlich für explizite Inhalte verwendet wird, die möglicherweise nicht für Minderjährige geeignet sind. Diese Info wird in der Knoteninformation veröffentlicht und kann durch das Globale Verzeichnis genutzt werden, um Ihren Knoten von den Auflistungen auszuschließen. Zusätzlich wird auf der Registrierungsseite ein Hinweis darüber angezeigt.";
+$a->strings["Allow Users to set remote_self"] = "Nutzern erlauben, das remote_self Flag zu setzen";
+$a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "Ist dies ausgewählt, kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im \"Kontakt reparieren\"-Dialog markieren. Nach dem Setzen dieses Flags werden alle Top-Level-Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet.";
 $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
-$a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten für Organisationsseiten o.ä. mit der gleichen E-Mail Adresse anzulegen, um diese als .";
+$a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten für Organisationsseiten o. ä. mit der gleichen E-Mail-Adresse anzulegen.";
 $a->strings["Disable OpenID"] = "OpenID deaktivieren";
 $a->strings["Disable OpenID support for registration and logins."] = "OpenID-Unterstützung für Registrierung und Login.";
 $a->strings["No Fullname check"] = "Namen nicht auf Vollständigkeit überprüfen";
-$a->strings["Allow users to register without a space between the first name and the last name in their full name."] = "Erlaubt es Nutzerkonten zu registrieren, bei denen im Namensfeld kein Leerzeichen als Trennung von Vor- und Nachname verwendet wird.";
+$a->strings["Allow users to register without a space between the first name and the last name in their full name."] = "Erlaubt Nutzern, Konten zu registrieren, bei denen im Namensfeld kein Leerzeichen zur Trennung von Vor- und Nachnamen verwendet wird.";
 $a->strings["Community pages for visitors"] = "Für Besucher verfügbare Gemeinschaftsseite";
-$a->strings["Which community pages should be available for visitors. Local users always see both pages."] = "Welche Gemeinschaftsseiten sollen für Besucher dieses Knotens verfügbar sein? Lokale Nutzer können grundsätzlich beide Gemeinschaftsseiten verwenden.";
+$a->strings["Which community pages should be available for visitors. Local users always see both pages."] = "Welche Gemeinschaftsseiten sollen für Besucher dieses Knotens verfügbar sein? Lokale Nutzer können grundsätzlich beide Seiten verwenden.";
 $a->strings["Posts per user on community page"] = "Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite";
-$a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "Die Anzahl der Beiträge die von jedem Nutzer maximal auf der Gemeinschaftsseite angezeigt werden sollen. Dieser Parameter wird nicht für die Globale Gemeinschaftsseite genutzt.";
-$a->strings["Disable OStatus support"] = "OStatus Unterstützung deaktivieren";
-$a->strings["Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Die eingebaute OStatus (StatusNet, GNU Social, etc.) Unterstützung deaktivieren. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre Warnungen werden nur bei Bedarf angezeigt.";
-$a->strings["Only import OStatus/ActivityPub threads from our contacts"] = "Nur OStatus/ActivityPub Konversationen unserer Kontakte importieren";
-$a->strings["Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system."] = "Normalerweise werden alle Inhalte von OStatus und ActivityPub Kontakten importiert. Mit dieser Option werden nur solche Konversationen gespeichert, die von Kontakten der Nutzer dieses Knotens gestartet wurden.";
-$a->strings["OStatus support can only be enabled if threading is enabled."] = "OStatus Unterstützung kann nur aktiviert werden wenn \"Threading\" aktiviert ist. ";
-$a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "Diaspora Unterstützung kann nicht aktiviert werden da Friendica in ein Unterverzeichnis installiert ist.";
-$a->strings["Enable Diaspora support"] = "Diaspora Unterstützung aktivieren";
+$a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "Die Anzahl der Beiträge, die von jedem Nutzer maximal auf der Gemeinschaftsseite angezeigt werden sollen. Dieser Parameter wird nicht für die Globale Gemeinschaftsseite genutzt.";
+$a->strings["Disable OStatus support"] = "OStatus-Unterstützung deaktivieren";
+$a->strings["Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Die eingebaute OStatus-Unterstützung (StatusNet, GNU Social, etc.) deaktivieren. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre-Warnungen werden nur bei Bedarf angezeigt.";
+$a->strings["Only import OStatus/ActivityPub threads from our contacts"] = "Nur OStatus/ActivityPub-Konversationen unserer Kontakte importieren";
+$a->strings["Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system."] = "Normalerweise werden alle Inhalte von OStatus- und ActivityPub-Kontakten importiert. Mit dieser Option werden nur solche Konversationen gespeichert, die von Kontakten der Nutzer dieses Knotens gestartet wurden.";
+$a->strings["OStatus support can only be enabled if threading is enabled."] = "OStatus Unterstützung kann nur aktiviert werden, wenn \"Threading\" aktiviert ist. ";
+$a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "Diaspora Unterstützung kann nicht aktiviert werden, da Friendica in ein Unterverzeichnis installiert ist.";
+$a->strings["Enable Diaspora support"] = "Diaspora-Unterstützung aktivieren";
 $a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die eingebaute Diaspora-Verknüpfung.";
 $a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben";
-$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert.";
+$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle Kontakte müssen das Friendica-Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert.";
 $a->strings["Verify SSL"] = "SSL Überprüfen";
-$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann.";
-$a->strings["Proxy user"] = "Proxy Nutzer";
-$a->strings["Proxy URL"] = "Proxy URL";
-$a->strings["Network timeout"] = "Netzwerk Wartezeit";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikatskontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL-Zertifikat eine Verbindung herstellen kann.";
+$a->strings["Proxy user"] = "Proxy-Nutzer";
+$a->strings["Proxy URL"] = "Proxy-URL";
+$a->strings["Network timeout"] = "Netzwerk-Wartezeit";
 $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen).";
 $a->strings["Maximum Load Average"] = "Maximum Load Average";
-$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50";
 $a->strings["Maximum Load Average (Frontend)"] = "Maximum Load Average (Frontend)";
-$a->strings["Maximum system load before the frontend quits service - default 50."] = "Maximale Systemlast bevor Vordergrundprozesse pausiert werden - Standard 50.";
+$a->strings["Maximum system load before the frontend quits service - default 50."] = "Maximale Systemlast, bevor Vordergrundprozesse pausiert werden - Standard 50.";
 $a->strings["Minimal Memory"] = "Minimaler Speicher";
 $a->strings["Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated)."] = "Minimal freier Speicher in MB für den Worker Prozess. Benötigt Zugriff auf /proc/meminfo - Standardwert ist 0 (deaktiviert)";
 $a->strings["Maximum table size for optimization"] = "Maximale Tabellengröße zur Optimierung";
 $a->strings["Maximum table size (in MB) for the automatic optimization. Enter -1 to disable it."] = "Maximale Tabellengröße (in MB) für die automatische Optimierung - Gib -1 für Deaktivierung ein.";
 $a->strings["Minimum level of fragmentation"] = "Minimaler Fragmentationsgrad";
-$a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "Minimales Fragmentationsgrad von Datenbanktabellen um die automatische Optimierung einzuleiten - Standardwert ist 30%";
+$a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "Minimaler Fragmentationsgrad von Datenbanktabellen, um die automatische Optimierung einzuleiten - Standardwert ist 30%";
 $a->strings["Periodical check of global contacts"] = "Regelmäßig globale Kontakte überprüfen";
 $a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "Wenn diese Option aktiviert ist, werden die globalen Kontakte regelmäßig auf fehlende oder veraltete Daten sowie auf Erreichbarkeit des Kontakts und des Servers überprüft.";
 $a->strings["Days between requery"] = "Tage zwischen erneuten Abfragen";
-$a->strings["Number of days after which a server is requeried for his contacts."] = "Legt das Abfrageintervall fest, nachdem ein Server erneut nach Kontakten abgefragt werden soll.";
+$a->strings["Number of days after which a server is requeried for his contacts."] = "Legt das Abfrageintervall fest, nach dem ein Server erneut nach Kontakten abgefragt werden soll.";
 $a->strings["Discover contacts from other servers"] = "Neue Kontakte auf anderen Servern entdecken";
-$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommended setting is 'Users, Global Contacts'."] = "Regelmäßig andere Server nach potentiellen Kontakten absuchen. Du kannst zwischen 'Nutzern', den tatsächlichen Nutzern des anderen Systems und 'globalen Kontakten', aktiven Kontakten die auf dem System bekannt sind, wählen. Der Fallback-Mechanismus ist für ältere Friendica und Redmatrix Server gedacht, bei denen globale Kontakte noch nicht verfügbar sind. Durch den Fallbackmodus entsteht auf deinem Server eine wesentlich höhere Last, empfohlen wird der Modus 'Nutzer, globale Kontakte'.";
+$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommended setting is 'Users, Global Contacts'."] = "Regelmäßig andere Server nach potentiellen Kontakten absuchen. Du kannst zwischen 'Nutzern', also den tatsächlichen Nutzern des anderen Systems, und 'globalen Kontakten', also aktiven Kontakten, die auf dem System bekannt sind, wählen. Der Fallback-Mechanismus ist für ältere Friendica- und Redmatrix-Server gedacht, bei denen globale Kontakte noch nicht verfügbar sind. Durch den Fallback-Modus entsteht auf deinem Server eine wesentlich höhere Last, empfohlen wird der Modus 'Nutzer, globale Kontakte'.";
 $a->strings["Timeframe for fetching global contacts"] = "Zeitfenster für globale Kontakte";
-$a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "Wenn die Entdeckung neuer Kontakte aktiv ist, definiert dieses Zeitfenster den Zeitraum in dem globale Kontakte als aktiv gelten und von anderen Servern importiert werden.";
+$a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "Wenn die Entdeckung neuer Kontakte aktiv ist, definiert dieses Zeitfenster den Zeitraum, in dem globale Kontakte als aktiv gelten und von anderen Servern importiert werden.";
 $a->strings["Search the local directory"] = "Lokales Verzeichnis durchsuchen";
-$a->strings["Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."] = "Suche im lokalen Verzeichnis anstelle des globalen Verzeichnisses durchführen. Jede Suche wird im Hintergrund auch im globalen Verzeichnis durchgeführt um die Suchresultate zu verbessern, wenn diese Suche wiederholt wird.";
-$a->strings["Publish server information"] = "Server Informationen veröffentlichen";
-$a->strings["If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."] = "Wenn aktiviert, werden allgemeine Informationen über den Server und Nutzungsdaten veröffentlicht. Die Daten beinhalten den Namen sowie die Version des Servers, die Anzahl der Personen mit öffentlichen Profilen, die Anzahl der Beiträge sowie aktivierte Protokolle und Connectoren. Für Details bitte <a href='http://the-federation.info/'>the-federation.info</a> aufrufen.";
+$a->strings["Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."] = "Suche im lokalen Verzeichnis anstelle des globalen Verzeichnisses durchführen. Jede Suche wird im Hintergrund auch im globalen Verzeichnis durchgeführt, um die Suchresultate zu verbessern, wenn die Suche wiederholt wird.";
+$a->strings["Publish server information"] = "Server-Informationen veröffentlichen";
+$a->strings["If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."] = "Wenn aktiviert, werden allgemeine Informationen über den Server und Nutzungsdaten veröffentlicht. Die Daten beinhalten den Namen sowie die Version des Servers, die Anzahl der Personen mit öffentlichen Profilen, die Anzahl der Beiträge sowie aktivierte Protokolle und Konnektoren. Für Details bitte <a href='http://the-federation.info/'>the-federation.info</a> aufrufen.";
 $a->strings["Check upstream version"] = "Suche nach Updates";
-$a->strings["Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."] = "Wenn diese Option aktiviert ist wird regelmäßig nach neuen Friendica Versionen auf github überprüft. Wenn es eine neue Version gibt, wird dies auf der Übersichtsseite im Admin-Panel angezeigt.";
-$a->strings["Suppress Tags"] = "Tags Unterdrücken";
+$a->strings["Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."] = "Wenn diese Option aktiviert ist, wird regelmäßig nach neuen Friendica-Versionen auf github gesucht. Wenn es eine neue Version gibt, wird dies auf der Übersichtsseite im Admin-Panel angezeigt.";
+$a->strings["Suppress Tags"] = "Tags unterdrücken";
 $a->strings["Suppress showing a list of hashtags at the end of the posting."] = "Unterdrückt die Anzeige von Tags am Ende eines Beitrags.";
 $a->strings["Clean database"] = "Datenbank aufräumen";
 $a->strings["Remove old remote items, orphaned database records and old content from some other helper tables."] = "Entferne alte Beiträge von anderen Knoten, verwaiste Einträge und alten Inhalt einiger Hilfstabellen.";
 $a->strings["Lifespan of remote items"] = "Lebensdauer von Beiträgen anderer Knoten";
-$a->strings["When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour."] = "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl in Tagen nach der Beiträge die auf anderen Knoten des Netzwerks verfasst wurden, gelöscht werden sollen. Eigene Beiträge sowie markierte oder abgespeicherte Beiträge werden nicht gelöscht. Ein Wert von 0 deaktiviert das automatische löschen von Beiträgen.";
+$a->strings["When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour."] = "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl in Tagen, nach der Beiträge, die auf anderen Knoten des Netzwerks verfasst wurden, gelöscht werden sollen. Eigene Beiträge sowie markierte oder abgespeicherte Beiträge werden nicht gelöscht. Ein Wert von 0 deaktiviert das automatische Löschen von Beiträgen.";
 $a->strings["Lifespan of unclaimed items"] = "Lebensdauer nicht angeforderter Beiträge";
-$a->strings["When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0."] = "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl von Tagen nach denen nicht angeforderte Beiträge (hauptsächlich sole die über das Relais eintreffen) gelöscht werden. Der Standardwert beträgt 90 Tage. Wird dieser Wert auf 0 gesetzt, wird die Lebenszeit von Beiträgen anderer Knoten verwendet.";
+$a->strings["When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0."] = "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl von Tagen, nach denen nicht angeforderte Beiträge (hauptsächlich solche, die über das Relais eintreffen) gelöscht werden. Der Standardwert beträgt 90 Tage. Wird dieser Wert auf 0 gesetzt, wird die Lebensdauer von Beiträgen anderer Knoten verwendet.";
 $a->strings["Lifespan of raw conversation data"] = "Lebensdauer der Beiträge";
-$a->strings["The conversation data is used for ActivityPub and OStatus, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days."] = "Die Konversationsdaten werden für ActivityPub und OStatus sowie für Debug-Zwecke verwendet. Sie können gefahrlos nach 14 Tagen zu entfernt werden, der Standardwert beträgt 90 Tage.";
-$a->strings["Path to item cache"] = "Pfad zum Eintrag Cache";
+$a->strings["The conversation data is used for ActivityPub and OStatus, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days."] = "Die Konversationsdaten werden für ActivityPub und OStatus sowie für Debug-Zwecke verwendet. Sie sollten gefahrlos nach 14 Tagen entfernt werden können, der Standardwert beträgt 90 Tage.";
+$a->strings["Path to item cache"] = "Pfad zum Item-Cache";
 $a->strings["The item caches buffers generated bbcode and external images."] = "Im Item-Cache werden externe Bilder und geparster BBCode zwischen gespeichert.";
 $a->strings["Cache duration in seconds"] = "Cache-Dauer in Sekunden";
-$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "Wie lange sollen die gecachedten Dateien vorgehalten werden? Grundeinstellung sind 86400 Sekunden (ein Tag). Um den Item Cache zu deaktivieren, setze diesen Wert auf -1.";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "Wie lange sollen die zwischengespeicherten Dateien vorgehalten werden? Grundeinstellung sind 86400 Sekunden (ein Tag). Um den Item-Cache zu deaktivieren, setze diesen Wert auf -1.";
 $a->strings["Maximum numbers of comments per post"] = "Maximale Anzahl von Kommentaren pro Beitrag";
 $a->strings["How much comments should be shown for each post? Default value is 100."] = "Wie viele Kommentare sollen pro Beitrag angezeigt werden? Standardwert sind 100.";
-$a->strings["Temp path"] = "Temp Pfad";
-$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "Solltest du ein eingeschränktes System haben, auf dem der Webserver nicht auf das temp Verzeichnis des Systems zugreifen kann, setze hier einen anderen Pfad.";
+$a->strings["Temp path"] = "Temp-Pfad";
+$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "Solltest du ein eingeschränktes System haben, auf dem der Webserver nicht auf das temp-Verzeichnis des Systems zugreifen kann, setze hier einen anderen Pfad.";
 $a->strings["Base path to installation"] = "Basis-Pfad zur Installation";
 $a->strings["If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."] = "Falls das System nicht den korrekten Pfad zu deiner Installation gefunden hat, gib den richtigen Pfad bitte hier ein. Du solltest hier den Pfad nur auf einem eingeschränkten System angeben müssen, bei dem du mit symbolischen Links auf dein Webverzeichnis verweist.";
-$a->strings["Disable picture proxy"] = "Bilder Proxy deaktivieren";
+$a->strings["Disable picture proxy"] = "Bilder-Proxy deaktivieren";
 $a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth."] = "Der Proxy für Bilder verbessert die Leistung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen.";
 $a->strings["Only search in tags"] = "Nur in Tags suchen";
 $a->strings["On large systems the text search can slow down the system extremely."] = "Auf großen Knoten kann die Volltext-Suche das System ausbremsen.";
 $a->strings["New base url"] = "Neue Basis-URL";
-$a->strings["Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."] = "Ändert die Basis-URL dieses Servers und sendet eine Umzugsmitteilung an alle Friendica und Diaspora* Kontakte deiner NutzerInnen.";
-$a->strings["RINO Encryption"] = "RINO Verschlüsselung";
-$a->strings["Encryption layer between nodes."] = "Verschlüsselung zwischen Friendica Instanzen";
+$a->strings["Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."] = "Ändert die Basis-URL dieses Servers und sendet eine Umzugsmitteilung an alle Friendica- und Diaspora*-Kontakte deiner NutzerInnen.";
+$a->strings["RINO Encryption"] = "RINO-Verschlüsselung";
+$a->strings["Encryption layer between nodes."] = "Verschlüsselung zwischen Friendica-Instanzen";
 $a->strings["Enabled"] = "Aktiv";
 $a->strings["Maximum number of parallel workers"] = "Maximale Anzahl parallel laufender Worker";
-$a->strings["On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d."] = "Wenn dein Knoten bei einem Shared Hoster ist, setzte diesen Wert auf %d. Auf größeren Systemen funktioniert ein Wert von %d recht gut. Standardeinstellung sind %d.";
+$a->strings["On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d."] = "Wenn dein Knoten bei einem Shared Hoster ist, setze diesen Wert auf %d. Auf größeren Systemen funktioniert ein Wert von %d recht gut. Standardeinstellung sind %d.";
 $a->strings["Don't use 'proc_open' with the worker"] = "'proc_open' nicht mit den Workern verwenden";
-$a->strings["Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of worker calls in your crontab."] = "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der poller Aufrufe in deiner crontab erhöhen.";
+$a->strings["Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of worker calls in your crontab."] = "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der worker-Aufrufe in deiner crontab erhöhen.";
 $a->strings["Enable fastlane"] = "Aktiviere Fastlane";
-$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "Wenn aktiviert, wird der Fastlane-Mechanismus einen weiteren Worker-Prozeß starten wenn Prozesse mit höherer Priorität von Prozessen mit niedrigerer Priorität blockiert werden.";
-$a->strings["Enable frontend worker"] = "Aktiviere den Frontend Worker";
-$a->strings["When enabled the Worker process is triggered when backend access is performed \\x28e.g. messages being delivered\\x29. On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server."] = "Ist diese Option aktiv, wird der Worker Prozess durch Aktionen am Frontend gestartet (z.B. wenn Nachrichten zugestellt werden). Auf kleineren Seiten sollte %s/worker regelmäßig, beispielsweise durch einen externen Cron Anbieter, aufgerufen werden. Du solltest dies Option nur dann aktivieren, wenn du keinen Cron Job auf deinem eigenen Server starten kannst.";
+$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "Wenn aktiviert, wird der Fastlane-Mechanismus einen weiteren Worker-Prozeß starten, wenn Prozesse mit höherer Priorität von Prozessen mit niedrigerer Priorität blockiert werden.";
+$a->strings["Enable frontend worker"] = "Aktiviere den Frontend-Worker";
+$a->strings["When enabled the Worker process is triggered when backend access is performed \\x28e.g. messages being delivered\\x29. On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server."] = "Ist diese Option aktiv, wird der Worker-Prozess durch Aktionen am Frontend gestartet (z.B. wenn Nachrichten zugestellt werden). Auf kleineren Seiten sollte %s/worker regelmäßig, beispielsweise durch einen externen Cron-Anbieter, aufgerufen werden. Du solltest diese Option nur dann aktivieren, wenn du keinen zeitgesteuerten Job auf deinem eigenen Server starten kannst.";
 $a->strings["Subscribe to relay"] = "Relais abonnieren";
 $a->strings["Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page."] = "Aktiviert den Empfang von öffentlichen Beiträgen vom Relais-Server. Diese Beiträge werden in der Suche, den abonnierten Hashtags sowie der globalen Gemeinschaftsseite verfügbar sein.";
-$a->strings["Relay server"] = "Relais Server";
-$a->strings["Address of the relay server where public posts should be send to. For example https://relay.diasp.org"] = "Adresse des Relais Servers an den die öffentlichen Beiträge gesendet werden sollen. Zum Beispiel https://relay.diasp.org";
-$a->strings["Direct relay transfer"] = "Direkte Relais Übertragung";
-$a->strings["Enables the direct transfer to other servers without using the relay servers"] = "Aktiviert das direkte Verteilen an andere Server, ohne dass ein Relais Server verwendet wird.";
+$a->strings["Relay server"] = "Relais-Server";
+$a->strings["Address of the relay server where public posts should be send to. For example https://relay.diasp.org"] = "Adresse des Relais-Servers, an den die öffentlichen Beiträge gesendet werden sollen. Zum Beispiel https://relay.diasp.org";
+$a->strings["Direct relay transfer"] = "Direkte Relais-Übertragung";
+$a->strings["Enables the direct transfer to other servers without using the relay servers"] = "Aktiviert das direkte Verteilen an andere Server, ohne dass ein Relais-Server verwendet wird.";
 $a->strings["Relay scope"] = "Geltungsbereich des Relais";
 $a->strings["Can be 'all' or 'tags'. 'all' means that every public post should be received. 'tags' means that only posts with selected tags should be received."] = "Der Wert kann entweder 'Alle' oder 'Schlagwörter' sein. 'Alle' bedeutet, dass alle öffentliche Beiträge empfangen werden sollen. 'Schlagwörter' schränkt dem Empfang auf Beiträge ein, die bestimmte Schlagwörter beinhalten.";
 $a->strings["all"] = "Alle";
 $a->strings["tags"] = "Schlagwörter";
-$a->strings["Server tags"] = "Server Schlagworte";
-$a->strings["Comma separated list of tags for the 'tags' subscription."] = "Liste von Schlagworten die abonniert werden sollen, mit Komma getrennt.";
+$a->strings["Server tags"] = "Server-Schlagworte";
+$a->strings["Comma separated list of tags for the 'tags' subscription."] = "Liste von Schlagworten, die abonniert werden sollen, mit Komma getrennt.";
 $a->strings["Allow user tags"] = "Verwende Schlagworte der Nutzer";
-$a->strings["If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'."] = "Ist dies aktiviert, werden die Schlagwörter der gespeicherten Suchen zusätzlich zu den oben  definierten Server Schlagworte abonniert.";
+$a->strings["If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'."] = "Ist dies aktiviert, werden die Schlagwörter der gespeicherten Suchen zusätzlich zu den oben definierten Server-Schlagworten abonniert.";
 $a->strings["Start Relocation"] = "Umsiedlung starten";
 $a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert";
 $a->strings["Database structure update %s was successfully applied."] = "Das Update %s der Struktur der Datenbank wurde erfolgreich angewandt.";
@@ -540,13 +540,13 @@ $a->strings["Update %s was successfully applied."] = "Update %s war erfolgreich.
 $a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s hat keinen Status zurückgegeben. Unbekannter Status.";
 $a->strings["There was no additional update function %s that needed to be called."] = "Es gab keine weitere Update-Funktion, die von %s ausgeführt werden musste.";
 $a->strings["No failed updates."] = "Keine fehlgeschlagenen Updates.";
-$a->strings["Check database structure"] = "Datenbank Struktur überprüfen";
+$a->strings["Check database structure"] = "Datenbankstruktur überprüfen";
 $a->strings["Failed Updates"] = "Fehlgeschlagene Updates";
 $a->strings["This does not include updates prior to 1139, which did not return a status."] = "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben.";
 $a->strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (falls das Update manuell installiert wurde)";
 $a->strings["Attempt to execute this update step automatically"] = "Versuchen, diesen Schritt automatisch auszuführen";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tthe administrator of %2\$s has set up an account for you."] = "\nHallo %1\$s,\n\nauf %2\$s wurde ein Account für Dich angelegt.";
-$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t\t%2\$s\n\t\t\tPassword:\t\t%3\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %1\$s/removeme\n\n\t\t\tThank you and welcome to %4\$s."] = "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1\$s\n\tBenutzername:\t%2\$s\n\tPasswort:\t%3\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %1\$s/removeme  jederzeit tun.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4\$s.";
+$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t\t%2\$s\n\t\t\tPassword:\t\t%3\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %1\$s/removeme\n\n\t\t\tThank you and welcome to %4\$s."] = "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1\$s\n\tBenutzername:\t%2\$s\n\tPasswort:\t%3\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %1\$s/removeme  jederzeit tun.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4\$s.";
 $a->strings["Registration details for %s"] = "Details der Registration von %s";
 $a->strings["%s user blocked/unblocked"] = [
 	0 => "%s Benutzer geblockt/freigegeben",
@@ -563,7 +563,7 @@ $a->strings["User '%s' blocked"] = "Nutzer '%s' gesperrt";
 $a->strings["Normal Account Page"] = "Normales Konto";
 $a->strings["Soapbox Page"] = "Marktschreier-Konto";
 $a->strings["Public Forum"] = "Öffentliches Forum";
-$a->strings["Automatic Friend Page"] = "Automatische Freunde Seite";
+$a->strings["Automatic Friend Page"] = "Automatische Freunde-Seite";
 $a->strings["Private Forum"] = "Privates Forum";
 $a->strings["Personal Page"] = "Persönliche Seite";
 $a->strings["Organisation Page"] = "Organisationsseite";
@@ -589,7 +589,7 @@ $a->strings["Account expired"] = "Account ist abgelaufen";
 $a->strings["New User"] = "Neuer Nutzer";
 $a->strings["Permanent deletion"] = "Permanent löschen";
 $a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist Du sicher?";
-$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist Du sicher?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist Du sicher?";
 $a->strings["Name of the new user."] = "Name des neuen Nutzers";
 $a->strings["Nickname"] = "Spitzname";
 $a->strings["Nickname of the new user."] = "Spitznamen für den neuen Nutzer";
@@ -604,7 +604,7 @@ $a->strings["Author: "] = "Autor:";
 $a->strings["Maintainer: "] = "Betreuer:";
 $a->strings["Reload active addons"] = "Aktivierte Addons neu laden";
 $a->strings["There are currently no addons available on your node. You can find the official addon repository at %1\$s and might find other interesting addons in the open addon registry at %2\$s"] = "Es sind derzeit keine Addons auf diesem Knoten verfügbar. Du findest das offizielle Addon-Repository unter %1\$s und weitere eventuell interessante Addons im offenen Addon-Verzeichnis auf %2\$s.";
-$a->strings["No themes found."] = "Keine Themen gefunden.";
+$a->strings["No themes found."] = "Keine Themes gefunden.";
 $a->strings["Screenshot"] = "Bildschirmfoto";
 $a->strings["Reload active themes"] = "Aktives Theme neu laden";
 $a->strings["No themes found on the system. They should be placed in %1\$s"] = "Es wurden keine Themes auf dem System gefunden. Diese sollten in %1\$s platziert werden.";
@@ -630,8 +630,8 @@ $a->strings["No friends to display."] = "Keine Kontakte zum Anzeigen.";
 $a->strings["Connect"] = "Verbinden";
 $a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren";
 $a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:";
-$a->strings["Please login to continue."] = "Bitte melde Dich an um fortzufahren.";
-$a->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 den Zugriff auf Deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?";
+$a->strings["Please login to continue."] = "Bitte melde Dich an, um fortzufahren.";
+$a->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 den Zugriff auf Deine Beiträge und Kontakte sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?";
 $a->strings["No"] = "Nein";
 $a->strings["Source input"] = "Originaltext:";
 $a->strings["BBCode::toPlaintext"] = "BBCode::toPlaintext";
@@ -645,7 +645,7 @@ $a->strings["BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"] = "BBC
 $a->strings["Item Body"] = "Beitragskörper";
 $a->strings["Item Tags"] = "Tags des Beitrags";
 $a->strings["Source input (Diaspora format)"] = "Originaltext (Diaspora Format): ";
-$a->strings["Markdown::convert (raw HTML)"] = "Markdown::convert (raw HTML)";
+$a->strings["Markdown::convert (raw HTML)"] = "Markdown::convert (pures HTML)";
 $a->strings["Markdown::convert"] = "Markdown::convert";
 $a->strings["Markdown::toBBCode"] = "Markdown::toBBCode";
 $a->strings["Raw HTML input"] = "Reine  HTML  Eingabe";
@@ -704,7 +704,7 @@ $a->strings["Refetch contact data"] = "Kontaktdaten neu laden";
 $a->strings["Submit"] = "Senden";
 $a->strings["Remote Self"] = "Entfernte Konten";
 $a->strings["Mirror postings from this contact"] = "Spiegle Beiträge dieses Kontakts";
-$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden.";
+$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica, alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden.";
 $a->strings["Account Nickname"] = "Konto-Spitzname";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname";
 $a->strings["Account URL"] = "Konto-URL";
@@ -749,7 +749,7 @@ $a->strings["[Name Withheld]"] = "[Name unterdrückt]";
 $a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen";
 $a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert.";
 $a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung.";
-$a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden.";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers an der angegebenen Profiladresse gefunden werden.";
 $a->strings["Warning: profile location has no profile photo."] = "Warnung: Es gibt kein Profilbild an der angegebenen Profiladresse.";
 $a->strings["%d required parameter was not found at the given location"] = [
 	0 => "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden",
@@ -768,7 +768,7 @@ $a->strings["Invalid profile URL."] = "Ungültige Profil-URL.";
 $a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL.";
 $a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen.";
 $a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
-$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Entferntes abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems.   ";
+$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Entferntes Abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems.   ";
 $a->strings["Please login to confirm introduction."] = "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
 $a->strings["Confirm"] = "Bestätigen";
@@ -776,7 +776,7 @@ $a->strings["Hide this contact"] = "Verberge diesen Kontakt";
 $a->strings["Welcome home %s."] = "Willkommen zurück %s.";
 $a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige Deine Kontaktanfrage bei %s.";
 $a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse Deines Profils in einem der unterstützten sozialen Netzwerke an:";
-$a->strings["If you are not yet a member of the free social web, <a href=\"%s\">follow this link to find a public Friendica site and join us today</a>."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"%s\">folge diesem Link</a> um einen öffentlichen Friendica Server zu finden und beizutreten.";
+$a->strings["If you are not yet a member of the free social web, <a href=\"%s\">follow this link to find a public Friendica site and join us today</a>."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"%s\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten.";
 $a->strings["Friend/Connection Request"] = "Kontaktanfrage";
 $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de";
 $a->strings["Please answer the following:"] = "Bitte beantworte folgendes:";
@@ -785,7 +785,7 @@ $a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:";
 $a->strings["Friendica"] = "Friendica";
 $a->strings["GNU Social (Pleroma, Mastodon)"] = "GNU Social (Pleroma, Mastodon)";
 $a->strings["Diaspora (Socialhome, Hubzilla)"] = "Diaspora (Socialhome, Hubzilla)";
-$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste.";
+$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora-Suchleiste.";
 $a->strings["Your Identity Address:"] = "Adresse Deines Profils:";
 $a->strings["Submit Request"] = "Anfrage abschicken";
 $a->strings["Location:"] = "Ort:";
@@ -813,7 +813,7 @@ $a->strings["Insert audio link"] = "Audio-Adresse einfügen";
 $a->strings["audio link"] = "Audio-Link";
 $a->strings["CC: email addresses"] = "Cc: E-Mail-Addressen";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com";
-$a->strings["Event can not end before it has started."] = "Die Veranstaltung kann nicht enden bevor sie beginnt.";
+$a->strings["Event can not end before it has started."] = "Die Veranstaltung kann nicht enden, bevor sie beginnt.";
 $a->strings["Event title and start time are required."] = "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden.";
 $a->strings["Create New Event"] = "Neue Veranstaltung erstellen";
 $a->strings["Event details"] = "Veranstaltungsdetails";
@@ -834,25 +834,25 @@ $a->strings["Photos"] = "Bilder";
 $a->strings["Contact Photos"] = "Kontaktbilder";
 $a->strings["Upload"] = "Hochladen";
 $a->strings["Files"] = "Dateien";
-$a->strings["You must be logged in to use this module"] = "Du musst eingeloggt sein um dieses Modul benutzen zu können.";
+$a->strings["You must be logged in to use this module"] = "Du musst eingeloggt sein, um dieses Modul benutzen zu können.";
 $a->strings["Source URL"] = "URL der Quelle";
 $a->strings["- select -"] = "- auswählen -";
 $a->strings["The contact could not be added."] = "Der Kontakt konnte nicht hinzugefügt werden.";
 $a->strings["You already added this contact."] = "Du hast den Kontakt bereits hinzugefügt.";
-$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden.";
-$a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden.";
-$a->strings["The network type couldn't be detected. Contact can't be added."] = "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden.";
+$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora-Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden.";
+$a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus-Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden.";
+$a->strings["The network type couldn't be detected. Contact can't be added."] = "Der Netzwerktyp wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden.";
 $a->strings["Tags:"] = "Tags:";
 $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
-$a->strings["This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s."] = "Diese Friendica Instanz verwendet die Version %s, sie ist unter der folgenden Adresse im Web zu finden %s. Die Datenbank Version ist %s und die Post-Update Version %s.";
-$a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"https://friendi.ca\">Friendi.ca</a> um mehr über das Friendica Projekt zu erfahren.";
+$a->strings["This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s."] = "Diese Friendica-Instanz verwendet die Version %s, sie ist unter der folgenden Adresse im Web zu finden %s. Die Datenbankversion ist %s und die Post-Update-Version %s.";
+$a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"https://friendi.ca\">Friendi.ca</a>, um mehr über das Friendica-Projekt zu erfahren.";
 $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
 $a->strings["the bugtracker at github"] = "den Bugtracker auf github";
 $a->strings["Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"] = "Vorschläge, Lob usw.: E-Mail an \"Info\" at \"Friendi - dot ca\"";
 $a->strings["Installed addons/apps:"] = "Installierte Apps und Addons";
 $a->strings["No installed addons/apps"] = "Es sind keine Addons oder Apps installiert";
 $a->strings["Read about the <a href=\"%1\$s/tos\">Terms of Service</a> of this node."] = "Erfahre mehr über die <a href=\"%1\$s/tos\">Nutzungsbedingungen</a> dieses Knotens.";
-$a->strings["On this server the following remote servers are blocked."] = "Auf diesem Server werden die folgenden entfernten Server blockiert.";
+$a->strings["On this server the following remote servers are blocked."] = "Auf diesem Server werden die folgenden, entfernten Server blockiert.";
 $a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet.";
 $a->strings["Suggest Friends"] = "Kontakte vorschlagen";
 $a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor";
@@ -891,11 +891,11 @@ $a->strings["%d message sent."] = [
 	1 => "%d Nachrichten gesendet.",
 ];
 $a->strings["You have no more invitations available"] = "Du hast keine weiteren Einladungen";
-$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Besuche %s für eine Liste der öffentlichen Server, denen Du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke.";
-$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s oder einer anderen öffentlichen Friendica Website.";
-$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen Du beitreten kannst.";
+$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Besuche %s für eine Liste der öffentlichen Server, denen Du beitreten kannst. Friendica-Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer sozialer Netzwerke.";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s oder einer anderen öffentlichen Friendica-Website.";
+$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica Server verbinden sich alle untereinander, um ein großes, datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica-Server, denen Du beitreten kannst.";
 $a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen.";
-$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks."] = "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden.";
+$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks."] = "Friendica Server verbinden sich alle untereinander, um ein großes, datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden.";
 $a->strings["To accept this invitation, please visit and register at %s."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s.";
 $a->strings["Send invitations"] = "Einladungen senden";
 $a->strings["Enter email addresses, one per line:"] = "E-Mail-Adressen eingeben, eine pro Zeile:";
@@ -903,7 +903,7 @@ $a->strings["Your message:"] = "Deine Nachricht:";
 $a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Du bist herzlich dazu eingeladen, Dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen.";
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code";
 $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald Du registriert bist, kontaktiere mich bitte auf meiner Profilseite:";
-$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendi.ca.";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "Für weitere Informationen über das Friendica-Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendi.ca.";
 $a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden.";
 $a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen.";
 $a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica.";
@@ -921,8 +921,8 @@ $a->strings["Remote privacy information not available."] = "Entfernte Privatsph
 $a->strings["Visible to:"] = "Sichtbar für:";
 $a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
 $a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe Deine E-Mail.";
-$a->strings["\n\t\tDear %1\$s,\n\t\t\tA request was recently received at \"%2\$s\" to reset your account\n\t\tpassword. In order to confirm this request, please select the verification link\n\t\tbelow or paste it into your web browser address bar.\n\n\t\tIf you did NOT request this change, please DO NOT follow the link\n\t\tprovided and ignore and/or delete this email, the request will expire shortly.\n\n\t\tYour password will not be changed unless we can verify that you\n\t\tissued this request."] = "\nHallo %1\$s,\n\nAuf \"%2\$s\" ist eine Anfrage auf das Zurücksetzen Deines Passworts gestellt\nworden. Um diese Anfrage zu verifizieren, folge bitte dem unten stehenden\nLink oder kopiere und füge ihn in die Adressleiste Deines Browsers ein.\n\nSolltest Du die Anfrage NICHT gemacht haben, ignoriere und/oder lösche diese\nE-Mail bitte.\n\nDein Passwort wird nicht geändert, solange wir nicht verifiziert haben, dass\nDu diese Änderung angefragt hast.";
-$a->strings["\n\t\tFollow this link soon to verify your identity:\n\n\t\t%1\$s\n\n\t\tYou will then receive a follow-up message containing the new password.\n\t\tYou may change that password from your account settings page after logging in.\n\n\t\tThe login details are as follows:\n\n\t\tSite Location:\t%2\$s\n\t\tLogin Name:\t%3\$s"] = "\nUm Deine Identität zu verifizieren, folge bitte dem folgenden Link:\n\n%1\$s\n\nDu wirst eine weitere E-Mail mit Deinem neuen Passwort erhalten. Sobald Du Dich\nangemeldet hast, kannst Du Dein Passwort in den Einstellungen ändern.\n\nDie Anmeldedetails sind die folgenden:\n\nAdresse der Seite:\t%2\$s\nBenutzername:\t%3\$s";
+$a->strings["\n\t\tDear %1\$s,\n\t\t\tA request was recently received at \"%2\$s\" to reset your account\n\t\tpassword. In order to confirm this request, please select the verification link\n\t\tbelow or paste it into your web browser address bar.\n\n\t\tIf you did NOT request this change, please DO NOT follow the link\n\t\tprovided and ignore and/or delete this email, the request will expire shortly.\n\n\t\tYour password will not be changed unless we can verify that you\n\t\tissued this request."] = "\nHallo %1\$s,\n\nAuf \"%2\$s\" ist eine Anfrage auf das Zurücksetzen Deines Passworts gestellt\nworden. Um diese Anfrage zu verifizieren, folge bitte dem unten stehenden\nLink oder kopiere und füge ihn in die Adressleiste Deines Browsers ein.\n\nSolltest Du die Anfrage NICHT gestellt haben, ignoriere und/oder lösche diese\nE-Mail bitte.\n\nDein Passwort wird nicht geändert, solange wir nicht verifiziert haben, dass\nDu diese Änderung angefragt hast.";
+$a->strings["\n\t\tFollow this link soon to verify your identity:\n\n\t\t%1\$s\n\n\t\tYou will then receive a follow-up message containing the new password.\n\t\tYou may change that password from your account settings page after logging in.\n\n\t\tThe login details are as follows:\n\n\t\tSite Location:\t%2\$s\n\t\tLogin Name:\t%3\$s"] = "\nUm Deine Identität zu verifizieren, folge bitte diesem Link:\n\n%1\$s\n\nDu wirst eine weitere E-Mail mit Deinem neuen Passwort erhalten. Sobald Du Dich\nangemeldet hast, kannst Du Dein Passwort in den Einstellungen ändern.\n\nDie Anmeldedetails sind die folgenden:\n\nAdresse der Seite:\t%2\$s\nBenutzername:\t%3\$s";
 $a->strings["Password reset requested at %s"] = "Anfrage zum Zurücksetzen des Passworts auf %s erhalten";
 $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Anfrage konnte nicht verifiziert werden. (Eventuell hast Du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert.";
 $a->strings["Request has expired, please make a new one."] = "Die Anfrage ist abgelaufen. Bitte stelle eine erneute.";
@@ -954,7 +954,7 @@ $a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen."
 $a->strings["Message sent."] = "Nachricht gesendet.";
 $a->strings["Discard"] = "Verwerfen";
 $a->strings["Messages"] = "Nachrichten";
-$a->strings["Do you really want to delete this message?"] = "Möchtest Du wirklich diese Nachricht löschen?";
+$a->strings["Do you really want to delete this message?"] = "Möchtest Du diese Nachricht wirklich löschen?";
 $a->strings["Conversation not found."] = "Unterhaltung nicht gefunden.";
 $a->strings["Message deleted."] = "Nachricht gelöscht.";
 $a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
@@ -969,7 +969,7 @@ $a->strings["D, d M Y - g:i A"] = "D, d. M Y - H:i";
 $a->strings["Delete conversation"] = "Unterhaltung löschen";
 $a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten.";
 $a->strings["Send Reply"] = "Antwort senden";
-$a->strings["Unknown sender - %s"] = "'Unbekannter Absender - %s";
+$a->strings["Unknown sender - %s"] = "Unbekannter Absender - %s";
 $a->strings["You and %s"] = "Du und %s";
 $a->strings["%s and You"] = "%s und Du";
 $a->strings["%d message"] = [
@@ -981,7 +981,7 @@ $a->strings["Saved Searches"] = "Gespeicherte Suchen";
 $a->strings["add"] = "hinzufügen";
 $a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
 	0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann.",
-	1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können.",
+	1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken, die keine nicht-öffentlichen Beiträge empfangen können.",
 ];
 $a->strings["Messages in this group won't be send to these receivers."] = "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden.";
 $a->strings["No such group"] = "Es gibt keine solche Gruppe";
@@ -1005,24 +1005,24 @@ $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder";
 $a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden.";
 $a->strings["Getting Started"] = "Einstieg";
 $a->strings["Friendica Walk-Through"] = "Friendica Rundgang";
-$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em> Seite findest Du eine kurze Einleitung in die einzelnen Funktionen Deines Profils und die Netzwerk-Reiter, wo Du interessante Foren findest und neue Kontakte knüpfst.";
+$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em>-Seite findest Du eine kurze Einleitung in die einzelnen Funktionen Deines Profils und die Netzwerk-Reiter, wo Du interessante Foren findest und neue Kontakte knüpfst.";
 $a->strings["Go to Your Settings"] = "Gehe zu deinen Einstellungen";
 $a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter <em>Einstellungen</em> dein Passwort. Außerdem merke dir deine Identifikationsadresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Kontakte mit anderen im Friendica Netzwerk zu knüpfen..";
-$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können.";
+$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das, als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können.";
 $a->strings["Profile"] = "Profil";
 $a->strings["Upload Profile Photo"] = "Profilbild hochladen";
-$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch, falls Du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Kontakte zu finden, wenn Du ein Bild von Dir selbst verwendest, als wenn Du dies nicht tust.";
+$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch, falls Du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist, neue Kontakte zu finden, wenn Du ein Bild von Dir selbst verwendest, als wenn Du dies nicht tust.";
 $a->strings["Edit Your Profile"] = "Editiere dein Profil";
-$a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editiere Dein <strong>Standard</strong> Profil nach Deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen Deiner Kontaktliste vor unbekannten Betrachtern des Profils.";
-$a->strings["Profile Keywords"] = "Profil Schlüsselbegriffe";
-$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Trage ein paar öffentliche Stichwörter in Dein Standardprofil ein, die Deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die Deine Interessen teilen und können Dir dann Kontakte vorschlagen.";
+$a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editiere Dein <strong>Standard</strong>-Profil nach Deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen Deiner Kontaktliste vor unbekannten Betrachtern des Profils.";
+$a->strings["Profile Keywords"] = "Profil-Schlüsselbegriffe";
+$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Trage ein paar öffentliche Stichwörter in Dein Standardprofil ein, die Deine Interessen beschreiben. Eventuell sind wir in der Lage, Leute zu finden, die Deine Interessen teilen, und können Dir dann Kontakte vorschlagen.";
 $a->strings["Connecting"] = "Verbindungen knüpfen";
 $a->strings["Importing Emails"] = "Emails Importieren";
 $a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Gib Deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls Du E-Mails aus Deinem Posteingang importieren und mit Kontakten und Mailinglisten interagieren willst.";
 $a->strings["Go to Your Contacts Page"] = "Gehe zu deiner Kontakt-Seite";
 $a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog."] = "Die Kontakte-Seite ist die Einstiegsseite, von der aus Du Kontakte verwalten und Dich mit Personen in anderen Netzwerken verbinden kannst. Normalerweise gibst Du dazu einfach ihre Adresse oder die URL der Seite im Kasten <em>Neuen Kontakt hinzufügen</em> ein.";
-$a->strings["Go to Your Site's Directory"] = "Gehe zum Verzeichnis Deiner Friendica Instanz";
-$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "Über die Verzeichnisseite kannst Du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem <em>Verbinden</em> oder <em>Folgen</em> Link auf deren Profilseiten Ausschau und gib Deine eigene Profiladresse an, falls Du danach gefragt wirst.";
+$a->strings["Go to Your Site's Directory"] = "Gehe zum Verzeichnis Deiner Friendica-Instanz";
+$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "Über die Verzeichnisseite kannst Du andere Personen auf diesem Server oder anderen, verknüpften Seiten finden. Halte nach einem <em>Verbinden</em>- oder <em>Folgen</em>-Link auf deren Profilseiten Ausschau und gib Deine eigene Profiladresse an, falls Du danach gefragt wirst.";
 $a->strings["Finding New People"] = "Neue Leute kennenlernen";
 $a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Im seitlichen Bedienfeld der Kontakteseite gibt es diverse Werkzeuge, um neue Personen zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Leute vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden.";
 $a->strings["Groups"] = "Gruppen";
@@ -1032,15 +1032,15 @@ $a->strings["Why Aren't My Posts Public?"] = "Warum sind meine Beiträge nicht 
 $a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respektiert Deine Privatsphäre. Mit der Grundeinstellung werden Deine Beiträge ausschließlich Deinen Kontakten angezeigt. Für weitere Informationen diesbezüglich lies Dir bitte den entsprechenden Abschnitt in der Hilfe unter dem obigen Link durch.";
 $a->strings["Getting Help"] = "Hilfe bekommen";
 $a->strings["Go to the Help Section"] = "Zum Hilfe Abschnitt gehen";
-$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Unsere <strong>Hilfe</strong> Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten.";
+$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Unsere <strong>Hilfe</strong>-Seiten können herangezogen werden, um weitere Einzelheiten zu anderen Programm-Features zu erhalten.";
 $a->strings["Personal Notes"] = "Persönliche Notizen";
 $a->strings["Invalid request identifier."] = "Invalid request identifier.";
 $a->strings["Ignore"] = "Ignorieren";
 $a->strings["Notifications"] = "Benachrichtigungen";
-$a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen";
+$a->strings["Network Notifications"] = "Netzwerkbenachrichtigungen";
 $a->strings["System Notifications"] = "Systembenachrichtigungen";
 $a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen";
-$a->strings["Home Notifications"] = "Pinnwand Benachrichtigungen";
+$a->strings["Home Notifications"] = "Pinnwandbenachrichtigungen";
 $a->strings["Show unread"] = "Ungelesene anzeigen";
 $a->strings["Show all"] = "Alle anzeigen";
 $a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen";
@@ -1054,19 +1054,19 @@ $a->strings["no"] = "nein";
 $a->strings["Shall your connection be bidirectional or not?"] = "Soll die Verbindung beidseitig sein oder nicht?";
 $a->strings["Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed."] = "Akzeptierst du %s als Kontakt, erlaubst du damit das Lesen deiner Beiträge und abonnierst selbst auch die Beiträge von %s.";
 $a->strings["Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Wenn du %s als Abonnent akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten.";
-$a->strings["Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Wenn du %s als Teilenden akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten.";
+$a->strings["Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Wenn du %s als Teilender akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten.";
 $a->strings["Friend"] = "Kontakt";
-$a->strings["Sharer"] = "Teilenden";
+$a->strings["Sharer"] = "Teilender";
 $a->strings["Subscriber"] = "Abonnent";
 $a->strings["Network:"] = "Netzwerk:";
 $a->strings["No introductions."] = "Keine Kontaktanfragen.";
-$a->strings["No more %s notifications."] = "Keine weiteren %s Benachrichtigungen";
+$a->strings["No more %s notifications."] = "Keine weiteren %s-Benachrichtigungen";
 $a->strings["No more system notifications."] = "Keine weiteren Systembenachrichtigungen.";
 $a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Nutzerkonto wurde nicht gefunden und OpenID-Registrierung ist auf diesem Server nicht gestattet.";
 $a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
-$a->strings["Subscribing to OStatus contacts"] = "OStatus Kontakten folgen";
+$a->strings["Subscribing to OStatus contacts"] = "OStatus-Kontakten folgen";
 $a->strings["No contact provided."] = "Keine Kontakte gefunden.";
 $a->strings["Couldn't fetch information for contact."] = "Konnte die Kontaktinformationen nicht einholen.";
 $a->strings["Couldn't fetch friends for contact."] = "Konnte die Kontaktliste des Kontakts nicht abfragen.";
@@ -1090,7 +1090,7 @@ $a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s wurde von %3\$s in %2
 $a->strings["Image exceeds size limit of %s"] = "Bildgröße überschreitet das Limit von %s";
 $a->strings["Image upload didn't complete, please try again"] = "Der Upload des Bildes war nicht vollständig. Bitte versuche es erneut.";
 $a->strings["Image file is missing"] = "Bilddatei konnte nicht gefunden werden.";
-$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "Der Server kann derzeit keine neuen Datei Uploads akzeptieren. Bitte kontaktiere deinen Administrator.";
+$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "Der Server kann derzeit keine neuen Datei-Uploads akzeptieren. Bitte kontaktiere deinen Administrator.";
 $a->strings["Image file is empty."] = "Bilddatei ist leer.";
 $a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten.";
 $a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert.";
@@ -1181,7 +1181,7 @@ $a->strings["Delete this profile"] = "Dieses Profil löschen";
 $a->strings["Basic information"] = "Grundinformationen";
 $a->strings["Profile picture"] = "Profilbild";
 $a->strings["Preferences"] = "Vorlieben";
-$a->strings["Status information"] = "Status Informationen";
+$a->strings["Status information"] = "Status-Informationen";
 $a->strings["Additional information"] = "Zusätzliche Informationen";
 $a->strings["Relation"] = "Beziehung";
 $a->strings["Miscellaneous"] = "Verschiedenes";
@@ -1237,18 +1237,18 @@ $a->strings["Account approved."] = "Konto freigegeben.";
 $a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen";
 $a->strings["Please login."] = "Bitte melde Dich an.";
 $a->strings["User deleted their account"] = "Gelöschter Nutzeraccount";
-$a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "Ein Nutzer deiner Friendica Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass deren Daten aus deinen Backups entfernt werden.";
+$a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "Ein Nutzer deiner Friendica-Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass dessen Daten aus deinen Backups entfernt werden.";
 $a->strings["The user id is %d"] = "Die ID des Users lautet %d";
 $a->strings["Remove My Account"] = "Konto löschen";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen.";
 $a->strings["Please enter your password for verification:"] = "Bitte gib Dein Passwort zur Verifikation ein:";
-$a->strings["Resubscribing to OStatus contacts"] = "Erneuern der OStatus Abonements";
+$a->strings["Resubscribing to OStatus contacts"] = "Erneuern der OStatus-Abonements";
 $a->strings["Error"] = "Fehler";
 $a->strings["Only logged in users are permitted to perform a search."] = "Nur eingeloggten Benutzern ist das Suchen gestattet.";
 $a->strings["Too Many Requests"] = "Zu viele Abfragen";
 $a->strings["Only one search per minute is permitted for not logged in users."] = "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet.";
 $a->strings["Search"] = "Suche";
-$a->strings["Items tagged with: %s"] = "Beiträge die mit %s getaggt sind";
+$a->strings["Items tagged with: %s"] = "Beiträge, die mit %s getaggt sind";
 $a->strings["Results for: %s"] = "Ergebnisse für: %s";
 $a->strings["Account"] = "Nutzerkonto";
 $a->strings["Profiles"] = "Profile";
@@ -1299,17 +1299,17 @@ $a->strings["Email access is disabled on this site."] = "Zugriff auf E-Mails fü
 $a->strings["General Social Media Settings"] = "Allgemeine Einstellungen zu Sozialen Medien";
 $a->strings["Disable Content Warning"] = "Inhaltswarnung ausschalten";
 $a->strings["Users on networks like Mastodon or Pleroma are able to set a content warning field which collapse their post by default. This disables the automatic collapsing and sets the content warning as the post title. Doesn't affect any other content filtering you eventually set up."] = "Benutzer in Netzwerken wie Mastodon oder Pleroma können ein Inhaltswarnfeld einstellen, das ihren Beitrag standardmäßig ausblendet. Dies deaktiviert das automatische Zusammenklappen und setzt die Inhaltswarnung als Beitragstitel. Beeinflusst keine anderen Inhaltsfilterungen, die du eventuell eingerichtet hast.";
-$a->strings["Disable intelligent shortening"] = "Intelligentes Link kürzen ausschalten";
-$a->strings["Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post."] = "Normalerweise versucht das System den besten Link zu finden um ihn zu gekürzten Postings hinzu zu fügen. Wird diese Option ausgewählt wird stets ein Link auf die originale Friendica Nachricht beigefügt.";
+$a->strings["Disable intelligent shortening"] = "Intelligentes Link-Kürzen ausschalten";
+$a->strings["Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post."] = "Normalerweise versucht das System, den besten Link zu finden, um ihn zu gekürzten Postings hinzuzufügen. Wird diese Option ausgewählt, wird stets ein Link auf die originale Friendica-Nachricht beigefügt.";
 $a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Automatisch allen GNU Social (OStatus) Followern/Erwähnern folgen";
-$a->strings["If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user."] = "Wenn du eine Nachricht eines unbekannten OStatus Nutzers bekommst, entscheidet diese Option wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,.";
-$a->strings["Default group for OStatus contacts"] = "Voreingestellte Gruppe für OStatus Kontakte";
-$a->strings["Your legacy GNU Social account"] = "Dein alter GNU Social Account";
-$a->strings["If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done."] = "Wenn du deinen alten GNU Social/Statusnet Accountnamen hier angibst (Format name@domain.tld) werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden.";
-$a->strings["Repair OStatus subscriptions"] = "OStatus Abonnements reparieren";
+$a->strings["If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user."] = "Wenn du eine Nachricht eines unbekannten OStatus-Nutzers bekommst, entscheidet diese Option, wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,.";
+$a->strings["Default group for OStatus contacts"] = "Voreingestellte Gruppe für OStatus-Kontakte";
+$a->strings["Your legacy GNU Social account"] = "Dein alter GNU Social-Account";
+$a->strings["If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done."] = "Wenn du deinen alten GNU Social/Statusnet-Account-Namen hier angibst (Format name@domain.tld), werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden.";
+$a->strings["Repair OStatus subscriptions"] = "OStatus-Abonnements reparieren";
 $a->strings["Email/Mailbox Setup"] = "E-Mail/Postfach-Einstellungen";
 $a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für Dein Postfach an.";
-$a->strings["Last successful email check:"] = "Letzter erfolgreicher E-Mail Check";
+$a->strings["Last successful email check:"] = "Letzter erfolgreicher E-Mail-Check";
 $a->strings["IMAP server name:"] = "IMAP-Server-Name:";
 $a->strings["IMAP port:"] = "IMAP-Port:";
 $a->strings["Security:"] = "Sicherheit:";
@@ -1330,27 +1330,27 @@ $a->strings["Display Settings"] = "Anzeige-Einstellungen";
 $a->strings["Display Theme:"] = "Theme:";
 $a->strings["Mobile Theme:"] = "Mobiles Theme";
 $a->strings["Suppress warning of insecure networks"] = "Warnung vor unsicheren Netzwerken unterdrücken";
-$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können.";
+$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Soll das System Warnungen unterdrücken, die angezeigt werden, weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können.";
 $a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
-$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum sind 10 Sekunden. Gib -1 ein um abzuschalten.";
+$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum sind 10 Sekunden. Gib -1 ein, um abzuschalten.";
 $a->strings["Number of items to display per page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: ";
 $a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge";
 $a->strings["Number of items to display per page when viewed from mobile device:"] = "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:";
-$a->strings["Don't show emoticons"] = "Keine Smilies anzeigen";
+$a->strings["Don't show emoticons"] = "Keine Smileys anzeigen";
 $a->strings["Calendar"] = "Kalender";
 $a->strings["Beginning of week:"] = "Wochenbeginn:";
 $a->strings["Don't show notices"] = "Info-Popups nicht anzeigen";
 $a->strings["Infinite scroll"] = "Endloses Scrollen";
 $a->strings["Automatic updates only at the top of the network page"] = "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist.";
-$a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "Wenn dies deaktiviert ist, wird die Netzwerk Seite aktualisiert, wann immer neue Beiträge eintreffen, egal an welcher Stelle gerade gelesen wird.";
+$a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "Wenn dies deaktiviert ist, wird die Netzwerk-Seite aktualisiert, wann immer neue Beiträge eintreffen, egal an welcher Stelle gerade gelesen wird.";
 $a->strings["Bandwidth Saver Mode"] = "Bandbreiten-Spar-Modus";
 $a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden.";
 $a->strings["Smart Threading"] = "Intelligentes Threading";
-$a->strings["When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."] = "Ist dies aktiviert, werden Einrückungen in Unterhaltungen unterdrückt wo sie nicht benötigt werden. Werden sie benötigt, werden die Threads weiterhin eingerückt.";
-$a->strings["General Theme Settings"] = "Allgemeine Themeneinstellungen";
-$a->strings["Custom Theme Settings"] = "Benutzerdefinierte Theme Einstellungen";
+$a->strings["When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."] = "Ist dies aktiviert, werden Einrückungen in Unterhaltungen unterdrückt, wo sie nicht benötigt werden. Werden sie benötigt, werden die Threads weiterhin eingerückt.";
+$a->strings["General Theme Settings"] = "Allgemeine Theme-Einstellungen";
+$a->strings["Custom Theme Settings"] = "Benutzerdefinierte Theme-Einstellungen";
 $a->strings["Content Settings"] = "Einstellungen zum Inhalt";
-$a->strings["Theme settings"] = "Themeneinstellungen";
+$a->strings["Theme settings"] = "Theme-Einstellungen";
 $a->strings["Unable to find your profile. Please contact your admin."] = "Konnte dein Profil nicht finden. Bitte kontaktiere den Admin.";
 $a->strings["Account Types"] = "Kontenarten";
 $a->strings["Personal Page Subtypes"] = "Unterarten der persönlichen Seite";
@@ -1359,7 +1359,7 @@ $a->strings["Account for a personal profile."] = "Konto für ein persönliches P
 $a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt.";
 $a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt.";
 $a->strings["Account for community discussions."] = "Konto für Diskussionsforen. ";
-$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Konto für ein normales persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden.";
+$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Konto für ein normales, persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden.";
 $a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt.";
 $a->strings["Automatically approves all contact requests."] = "Bestätigt alle Kontaktanfragen automatisch.";
 $a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt.";
@@ -1370,23 +1370,23 @@ $a->strings["(Optional) Allow this OpenID to login to this account."] = "(Option
 $a->strings["Publish your default profile in your local site directory?"] = "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?";
 $a->strings["Your profile will be published in this node's <a href=\"%s\">local directory</a>. Your profile details may be publicly visible depending on the system settings."] = "Dein Profil wird im <a href=\"%s\">lokalen Verzeichnis</a> dieses Knotens veröffentlicht. Je nach Systemeinstellungen kann es öffentlich auffindbar sein.";
 $a->strings["Publish your default profile in the global social directory?"] = "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?";
-$a->strings["Your profile will be published in the global friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be visible in public."] = "Dein Profil wird in den globalen Friendica Verzeichnissen (z.B. <a href=\"%s\">%s</a>) veröffentlicht. Dein Profil wird öffentlich auffindbar sein.";
+$a->strings["Your profile will be published in the global friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be visible in public."] = "Dein Profil wird in den globalen Friendica-Verzeichnissen (z.B. <a href=\"%s\">%s</a>) veröffentlicht. Dein Profil wird öffentlich auffindbar sein.";
 $a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?";
 $a->strings["Your contact list won't be shown in your default profile page. You can decide to show your contact list separately for each additional profile you create"] = "Die Liste deiner Kontakte wird nicht in deinem Standard-Profil angezeigt werden. Du kannst für jedes weitere Profil diese Entscheidung separat einstellen.";
 $a->strings["Hide your profile details from anonymous viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?";
-$a->strings["Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means."] = "Anonyme Besucher deines Profils werden ausschließlich dein Profilbild, deinen Namen sowie deinen Spitznamen sehen. Deine lffentlichen Beiträge und Kommentare werden weiterhin sichtbar sein.";
-$a->strings["Allow friends to post to your profile page?"] = "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?";
+$a->strings["Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means."] = "Anonyme Besucher deines Profils werden ausschließlich dein Profilbild, deinen Namen sowie deinen Spitznamen sehen. Deine öffentlichen Beiträge und Kommentare werden weiterhin sichtbar sein.";
+$a->strings["Allow friends to post to your profile page?"] = "Dürfen deine Kontakte auf deine Pinnwand schreiben?";
 $a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "Deine Kontakte können Beiträge auf deiner Pinnwand hinterlassen. Diese werden an deine Kontakte verteilt.";
-$a->strings["Allow friends to tag your posts?"] = "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?";
+$a->strings["Allow friends to tag your posts?"] = "Dürfen deine Kontakte deine Beiträge mit Schlagwörtern versehen?";
 $a->strings["Your contacts can add additional tags to your posts."] = "Deine Kontakte dürfen deine Beiträge mit zusätzlichen Schlagworten versehen.";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
 $a->strings["If you like, Friendica may suggest new members to add you as a contact."] = "Wenn du magst, kann Friendica dich neuen Mitgliedern als Kontakt vorschlagen.";
-$a->strings["Permit unknown people to send you private mail?"] = "Dürfen Dir Unbekannte private Nachrichten schicken?";
+$a->strings["Permit unknown people to send you private mail?"] = "Dürfen dir Unbekannte private Nachrichten schicken?";
 $a->strings["Friendica network users may send you private messages even if they are not in your contact list."] = "Nutzer des Friendica Netzwerks können dir private Nachrichten senden, selbst wenn sie nicht in deine Kontaktliste sind.";
 $a->strings["Profile is <strong>not published</strong>."] = "Profil ist <strong>nicht veröffentlicht</strong>.";
 $a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "Die Adresse deines Profils lautet <strong>'%s'</strong> oder '%s'.";
 $a->strings["Automatically expire posts after this many days:"] = "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:";
-$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht.";
+$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Wenn leer, verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht.";
 $a->strings["Advanced expiration settings"] = "Erweiterte Verfallseinstellungen";
 $a->strings["Advanced Expiration"] = "Erweitertes Verfallen";
 $a->strings["Expire posts:"] = "Beiträge verfallen lassen:";
@@ -1397,7 +1397,7 @@ $a->strings["Only expire posts by others:"] = "Nur Beiträge anderer verfallen:"
 $a->strings["Account Settings"] = "Kontoeinstellungen";
 $a->strings["Password Settings"] = "Passwort-Einstellungen";
 $a->strings["New Password:"] = "Neues Passwort:";
-$a->strings["Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:)."] = "Erlaubte Zeichen sind a-z, A-Z, 0-9 und Sonderzeichen, abgesehen von Leerzeichen, Doppelpunkten (:) und akzentuierte Buchstaben.";
+$a->strings["Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:)."] = "Erlaubte Zeichen sind a-z, A-Z, 0-9 und Sonderzeichen, abgesehen von Leerzeichen, Doppelpunkten (:) und akzentuierten Buchstaben.";
 $a->strings["Confirm:"] = "Bestätigen:";
 $a->strings["Leave password fields blank unless changing"] = "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern";
 $a->strings["Current Password:"] = "Aktuelles Passwort:";
@@ -1408,20 +1408,20 @@ $a->strings["Full Name:"] = "Kompletter Name:";
 $a->strings["Email Address:"] = "E-Mail-Adresse:";
 $a->strings["Your Timezone:"] = "Deine Zeitzone:";
 $a->strings["Your Language:"] = "Deine Sprache:";
-$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Wähle die Sprache, in der wir Dir die Friendica-Oberfläche präsentieren sollen und Dir E-Mail schicken";
+$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Wähle die Sprache, in der wir dir die Friendica-Oberfläche präsentieren sollen und dir E-Mail schicken";
 $a->strings["Default Post Location:"] = "Standardstandort:";
 $a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
 $a->strings["Security and Privacy Settings"] = "Sicherheits- und Privatsphäre-Einstellungen";
-$a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl vonKontaktanfragen/Tag:";
+$a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl von Kontaktanfragen/Tag:";
 $a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)";
 $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträge";
-$a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)";
+$a->strings["(click to open/close)"] = "(klicke zum Öffnen/Schließen)";
 $a->strings["Default Private Post"] = "Privater Standardbeitrag";
 $a->strings["Default Public Post"] = "Öffentlicher Standardbeitrag";
 $a->strings["Default Permissions for New Posts"] = "Standardberechtigungen für neue Beiträge";
 $a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:";
 $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
-$a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:";
+$a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden, wenn:";
 $a->strings["You receive an introduction"] = "– Du eine Kontaktanfrage erhältst";
 $a->strings["Your introductions are confirmed"] = "– eine Deiner Kontaktanfragen akzeptiert wurde";
 $a->strings["Someone writes on your profile wall"] = "– jemand etwas auf Deine Pinnwand schreibt";
@@ -1430,12 +1430,12 @@ $a->strings["You receive a private message"] = "– Du eine private Nachricht er
 $a->strings["You receive a friend suggestion"] = "– Du eine Empfehlung erhältst";
 $a->strings["You are tagged in a post"] = "– Du in einem Beitrag erwähnt wirst";
 $a->strings["You are poked/prodded/etc. in a post"] = "– Du von jemandem angestupst oder sonstwie behandelt wirst";
-$a->strings["Activate desktop notifications"] = "Desktop Benachrichtigungen einschalten";
-$a->strings["Show desktop popup on new notifications"] = "Desktop Benachrichtigungen einschalten";
-$a->strings["Text-only notification emails"] = "Benachrichtigungs E-Mail als Rein-Text.";
-$a->strings["Send text only notification emails, without the html part"] = "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil";
+$a->strings["Activate desktop notifications"] = "Desktop-Benachrichtigungen einschalten";
+$a->strings["Show desktop popup on new notifications"] = "Desktop-Benachrichtigungen einschalten";
+$a->strings["Text-only notification emails"] = "Benachrichtigungs-E-Mail als Rein-Text.";
+$a->strings["Send text only notification emails, without the html part"] = "Sende Benachrichtigungs-E-Mail als Rein-Text - ohne HTML-Teil";
 $a->strings["Show detailled notifications"] = "Detaillierte Benachrichtigungen anzeigen";
-$a->strings["Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed."] = "Normalerweise werde alle Benachrichtigungen zu einem Thema zusammengefasst in einer einzigen Mitteilung. Wenn diese Option aktiviert ist, wird jede Mitteilung angezeigt.";
+$a->strings["Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed."] = "Normalerweise werden alle Benachrichtigungen zu einem Thema in einer einzigen Benachrichtigung zusammengefasst. Wenn diese Option aktiviert ist, wird jede Benachrichtigung einzeln angezeigt.";
 $a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Konto-/Seitentyp-Einstellungen";
 $a->strings["Change the behaviour of this account for special situations"] = "Verhalten dieses Kontos in bestimmten Situationen:";
 $a->strings["Relocate"] = "Umziehen";
@@ -1450,17 +1450,17 @@ $a->strings["Tag(s) removed"] = "Tag(s) entfernt";
 $a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen";
 $a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: ";
 $a->strings["Export account"] = "Account exportieren";
-$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportiere Deine Accountinformationen und Kontakte. Verwende dies um ein Backup Deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen.";
+$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportiere Deine Account-Informationen und Kontakte. Verwende dies, um ein Backup Deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen.";
 $a->strings["Export all"] = "Alles exportieren";
-$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportiere Deine Accountinformationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies, um ein komplettes Backup Deines Accounts anzulegen (Fotos werden nicht exportiert).";
+$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportiere Deine Account-Informationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies, um ein komplettes Backup Deines Accounts anzulegen (Fotos werden nicht exportiert).";
 $a->strings["User imports on closed servers can only be done by an administrator."] = "Auf geschlossenen Servern können ausschließlich die Administratoren Benutzerkonten importieren.";
 $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal.";
 $a->strings["Import"] = "Import";
 $a->strings["Move account"] = "Account umziehen";
 $a->strings["You can import an account from another Friendica server."] = "Du kannst einen Account von einem anderen Friendica Server importieren.";
 $a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist.";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren";
-$a->strings["Account file"] = "Account Datei";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus-Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren";
+$a->strings["Account file"] = "Account-Datei";
 $a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"";
 $a->strings["You aren't following this contact."] = "Du folgst diesem Kontakt.";
 $a->strings["Unfollowing is currently not supported by your network."] = "Bei diesem Netzwerk wird das Entfolgen derzeit nicht unterstützt.";
@@ -1477,12 +1477,12 @@ $a->strings["No contacts."] = "Keine Kontakte.";
 $a->strings["Visit %s's profile [%s]"] = "Besuche %ss Profil [%s]";
 $a->strings["Contacts"] = "Kontakte";
 $a->strings["Invalid request."] = "Ungültige Anfrage";
-$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt.";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Entschuldige, die Datei scheint größer zu sein, als es die PHP-Konfiguration erlaubt.";
 $a->strings["Or - did you try to upload an empty file?"] = "Oder - hast Du versucht, eine leere Datei hochzuladen?";
 $a->strings["File exceeds size limit of %s"] = "Die Datei ist größer als das erlaubte Limit von %s";
 $a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
 $a->strings["Wall Photos"] = "Pinnwand-Bilder";
-$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand-Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.";
 $a->strings["Unable to check your home location."] = "Konnte Deinen Heimatort nicht bestimmen.";
 $a->strings["No recipient."] = "Kein Empfänger.";
 $a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern.";
@@ -1495,13 +1495,13 @@ $a->strings["comix"] = "comix";
 $a->strings["slackr"] = "slackr";
 $a->strings["Variations"] = "Variationen";
 $a->strings["Top Banner"] = "Top Banner";
-$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Skaliere das Hintergrundbild so, dass es die Breite der Seite einnimmt und fülle den Rest der Seite mit der Hintergrundfarbe bei langen Seiten.";
+$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Skaliere das Hintergrundbild so, dass es die Breite der Seite einnimmt, und fülle den Rest der Seite mit der Hintergrundfarbe bei langen Seiten.";
 $a->strings["Full screen"] = "Vollbildmodus";
 $a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Skaliere das Bild so, dass es den gesamten Bildschirm füllt. Hierfür wird entweder die Breite oder die Höhe des Bildes automatisch abgeschnitten.";
 $a->strings["Single row mosaic"] = "Mosaik in einer Zeile";
 $a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Skaliere das Bild so, dass es in einer einzelnen Reihe, entweder horizontal oder vertikal, wiederholt wird.";
 $a->strings["Mosaic"] = "Mosaik";
-$a->strings["Repeat image to fill the screen."] = "Wiederhole das Bild um den Bildschirm zu füllen.";
+$a->strings["Repeat image to fill the screen."] = "Wiederhole das Bild, um den Bildschirm zu füllen.";
 $a->strings["Custom"] = "Benutzerdefiniert";
 $a->strings["Note"] = "Hinweis";
 $a->strings["Check image permissions if all users are allowed to see the image"] = "Überprüfe, dass alle Benutzer die Berechtigung haben dieses Bild anzusehen";
@@ -1515,7 +1515,7 @@ $a->strings["Set the background image"] = "Hintergrundbild festlegen";
 $a->strings["Background image style"] = "Stil des Hintergrundbildes";
 $a->strings["Login page background image"] = "Hintergrundbild der Login-Seite";
 $a->strings["Login page background color"] = "Hintergrundfarbe der Login-Seite";
-$a->strings["Leave background image and color empty for theme defaults"] = "Wenn die Theme Vorgaben verwendet werden sollen, lass bitte die Felder für die Hintergrundfarbe und das Hintergrundbild leer.";
+$a->strings["Leave background image and color empty for theme defaults"] = "Wenn die Theme-Vorgaben verwendet werden sollen, lass bitte die Felder für die Hintergrundfarbe und das Hintergrundbild leer.";
 $a->strings["Guest"] = "Gast";
 $a->strings["Visitor"] = "Besucher";
 $a->strings["Logout"] = "Abmelden";
@@ -1538,7 +1538,7 @@ $a->strings["Center"] = "Mitte";
 $a->strings["Color scheme"] = "Farbschema";
 $a->strings["Posts font size"] = "Schriftgröße in Beiträgen";
 $a->strings["Textareas font size"] = "Schriftgröße in Eingabefeldern";
-$a->strings["Comma separated list of helper forums"] = "Komma-Separierte Liste der Helfer-Foren";
+$a->strings["Comma separated list of helper forums"] = "Komma-separierte Liste der Helfer-Foren";
 $a->strings["don't show"] = "nicht zeigen";
 $a->strings["show"] = "zeigen";
 $a->strings["Set style"] = "Stil auswählen";
@@ -1561,8 +1561,8 @@ $a->strings["Quick Start"] = "Schnell-Start";
 $a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Für die URL (%s) konnte kein nicht-archivierter Kontakt gefunden werden";
 $a->strings["The contact entries have been archived"] = "Die Kontakteinträge wurden archiviert.";
 $a->strings["Enter new password: "] = "Neues Passwort eingeben:";
-$a->strings["Post update version number has been set to %s."] = "Die Post-Update Versionsnummer wurde auf %s gesetzt.";
-$a->strings["Check for pending update actions."] = "Überprüfe ausstehende Update Aktionen";
+$a->strings["Post update version number has been set to %s."] = "Die Post-Update-Versionsnummer wurde auf %s gesetzt.";
+$a->strings["Check for pending update actions."] = "Überprüfe ausstehende Update-Aktionen";
 $a->strings["Done."] = "Erledigt.";
 $a->strings["Execute pending post updates."] = "Ausstehende Post-Updates ausführen";
 $a->strings["All pending post updates are done."] = "Alle ausstehenden Post-Updates wurden ausgeführt.";
@@ -1574,11 +1574,11 @@ $a->strings["Close"] = "Schließen";
 $a->strings["Welcome "] = "Willkommen ";
 $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
 $a->strings["Welcome back "] = "Willkommen zurück ";
-$a->strings["The database configuration file \"config/local.config.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbankkonfigurationsdatei \"config/local.config.php\" konnte nicht erstellt werden. Um eine Konfigurationsdatei in Ihrem Webserver-Verzeichnis zu erstellen, Gehen Sie wie folgt vor.";
+$a->strings["The database configuration file \"config/local.config.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbankkonfigurationsdatei \"config/local.config.php\" konnte nicht erstellt werden. Um eine Konfigurationsdatei in Ihrem Webserver-Verzeichnis zu erstellen, gehen Sie wie folgt vor.";
 $a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
 $a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
-$a->strings["If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"] = "Wenn auf deinem Server keine Kommandozeilenversion von PHP installiert ist, kannst du den Hintergrundprozess nicht einrichten. Hier findest du alternative Möglichkeiten<a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'für das Worker Setup'</a>";
+$a->strings["If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"] = "Wenn auf deinem Server keine Kommandozeilenversion von PHP installiert ist, kannst du den Hintergrundprozess nicht einrichten. Hier findest du alternative Möglichkeiten<a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'für das Worker-Setup'</a>";
 $a->strings["PHP executable path"] = "Pfad zu PHP";
 $a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren.";
 $a->strings["Command line PHP"] = "Kommandozeilen-PHP";
@@ -1605,21 +1605,21 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul";
 $a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl-Modul von PHP ist nicht installiert.";
 $a->strings["mb_string PHP module"] = "PHP: mb_string-Modul";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt, ist aber nicht installiert.";
 $a->strings["iconv PHP module"] = "PHP iconv Modul";
 $a->strings["Error: iconv PHP module required but not installed."] = "Fehler: Das iconv-Modul von PHP ist nicht installiert.";
 $a->strings["POSIX PHP module"] = "PHP POSIX Modul";
-$a->strings["Error: POSIX PHP module required but not installed."] = "Fehler POSIX PHP Modul erforderlich aber nicht installiert.";
+$a->strings["Error: POSIX PHP module required but not installed."] = "Fehler POSIX PHP Modul erforderlich, aber nicht installiert.";
 $a->strings["JSON PHP module"] = "PHP JASON Modul";
 $a->strings["Error: JSON PHP module required but not installed."] = "Fehler: Das JSON PHP Modul wird benötigt, ist aber nicht installiert.";
-$a->strings["The web installer needs to be able to create a file called \"local.config.php\" in the \"config\" folder of your web server and it is unable to do so."] = "Das Installationsprogramm muss in der Lage sein, eine Datei namens \"local.config.php\" im Ordner \"config\" Ihres Webservers zu erstellen, ist aber nicht in der Lager dazu.";
+$a->strings["The web installer needs to be able to create a file called \"local.config.php\" in the \"config\" folder of your web server and it is unable to do so."] = "Das Installationsprogramm muss in der Lage sein, eine Datei namens \"local.config.php\" im Ordner \"config\" Ihres Webservers zu erstellen, ist aber nicht in der Lage dazu.";
 $a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder."] = "Am Ende dieser Prozedur bekommst du einen Text der in der local.config.php im Friendica \"config\" Ordner gespeichert werden muss.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder."] = "Am Ende dieser Prozedur bekommst du einen Text, der in der local.config.php im Friendica \"config\" Ordner gespeichert werden muss.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt.";
 $a->strings["config/local.config.php is writable"] = "config/local.config.php ist schreibbar";
-$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica.";
-$a->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 Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat.";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3-Template-Engine, um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP, um das Rendern zu beschleunigen.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Um diese kompilierten Templates zu speichern, benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica.";
+$a->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 Webserver läuft (z.B. www-data), Schreibrechte zu diesem Verzeichnis hat.";
 $a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten.";
 $a->strings["view/smarty3 is writable"] = "view/smarty3 ist schreibbar";
 $a->strings["Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Vergewissere dich, dass du .htaccess-dist nach.htaccess kopiert hast.";
@@ -1696,21 +1696,21 @@ $a->strings["Error 403 - Forbidden"] = "Error 403 - Forbidden";
 $a->strings["Error 404 - Not Found"] = "Error 404 - Not Found";
 $a->strings["Error 500 - Internal Server Error"] = "Error 500 - Internal Server Error";
 $a->strings["Error 503 - Service Unavailable"] = "Error 503 - Service Unavailable";
-$a->strings["The server cannot or will not process the request due to an apparent client error."] = "Aufgrund eines offensichtlichen Fehlers auf der Seite des Clients kann oder wird die Anfrage nicht bearbeitet.";
+$a->strings["The server cannot or will not process the request due to an apparent client error."] = "Aufgrund eines offensichtlichen Fehlers auf der Seite des Clients kann oder wird der Server die Anfrage nicht bearbeiten.";
 $a->strings["Authentication is required and has failed or has not yet been provided."] = "Die erforderliche Authentifizierung ist fehlgeschlagen oder noch nicht erfolgt.";
-$a->strings["The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account."] = "Die Anfrage war gültig aber der Server verweigert die Ausführung. Der Benutzer verfügt möglicherweise nicht über die erforderlichen Berechtigungen oder benötigt ein Nutzerkonto.";
+$a->strings["The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account."] = "Die Anfrage war gültig, aber der Server verweigert die Ausführung. Der Benutzer verfügt möglicherweise nicht über die erforderlichen Berechtigungen oder benötigt ein Nutzerkonto.";
 $a->strings["The requested resource could not be found but may be available in the future."] = "Die angeforderte Ressource konnte nicht gefunden werden, sie könnte allerdings zu einem späteren Zeitpunkt verfügbar sein.";
-$a->strings["An unexpected condition was encountered and no more specific message is suitable."] = "Eine unerwartete Situation ist eingetreten zu der keine detailliertere Nachricht vorliegt.";
-$a->strings["The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later."] = "Der Server ist derzeit nicht Verfügbar (wegen Überlastung oder Wartungsarbeiten). Bitte versuchen Sie es später noch einmal.";
+$a->strings["An unexpected condition was encountered and no more specific message is suitable."] = "Eine unerwartete Situation ist eingetreten, zu der keine detailliertere Nachricht vorliegt.";
+$a->strings["The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later."] = "Der Server ist derzeit nicht verfügbar (wegen Überlastung oder Wartungsarbeiten). Bitte versuche es später noch einmal.";
 $a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen.";
-$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein.";
+$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler, falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein.";
 $a->strings["The error message is\n[pre]%s[/pre]"] = "Die Fehlermeldung lautet\n[pre]%s[/pre]";
 $a->strings["\n\t\t\t\t\tThe friendica database was successfully updated from %s to %s."] = "\n \t\t\t\t\tDie Friendica Datenbank wurde erfolgreich von %s auf %s aktualisiert.";
-$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?";
+$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account-Datei";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica-Account-Datei?";
 $a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!";
-$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten";
-$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos";
+$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzer-Accounts aufgetreten";
+$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzer-Profils";
 $a->strings["%d contact not imported"] = [
 	0 => "%d Kontakt nicht importiert",
 	1 => "%d Kontakte nicht importiert",
@@ -1746,7 +1746,7 @@ $a->strings["Follow"] = "Folge";
 $a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content";
 $a->strings["Full Text"] = "Volltext";
 $a->strings["Tags"] = "Tags";
-$a->strings["Click to open/close"] = "Zum öffnen/schließen klicken";
+$a->strings["Click to open/close"] = "Zum Öffnen/Schließen klicken";
 $a->strings["Export"] = "Exportieren";
 $a->strings["Export calendar as ical"] = "Kalender als ical exportieren";
 $a->strings["Export calendar as csv"] = "Kalender als csv exportieren";
@@ -1795,7 +1795,7 @@ $a->strings["Gay"] = "Schwul";
 $a->strings["Lesbian"] = "Lesbisch";
 $a->strings["No Preference"] = "Keine Vorlieben";
 $a->strings["Bisexual"] = "Bisexuell";
-$a->strings["Autosexual"] = "Autosexual";
+$a->strings["Autosexual"] = "Autosexuell";
 $a->strings["Abstinent"] = "Abstinent";
 $a->strings["Virgin"] = "Jungfrauen";
 $a->strings["Deviant"] = "Deviant";
@@ -1827,7 +1827,7 @@ $a->strings["Betrayed"] = "Betrogen";
 $a->strings["Separated"] = "Getrennt";
 $a->strings["Unstable"] = "Unstabil";
 $a->strings["Divorced"] = "Geschieden";
-$a->strings["Imaginarily divorced"] = "imaginär geschieden";
+$a->strings["Imaginarily divorced"] = "Imaginär geschieden";
 $a->strings["Widowed"] = "Verwitwet";
 $a->strings["Uncertain"] = "Unsicher";
 $a->strings["It's complicated"] = "Ist kompliziert";
@@ -1835,35 +1835,35 @@ $a->strings["Don't care"] = "Ist mir nicht wichtig";
 $a->strings["Ask me"] = "Frag mich";
 $a->strings["General Features"] = "Allgemeine Features";
 $a->strings["Multiple Profiles"] = "Mehrere Profile";
-$a->strings["Ability to create multiple profiles"] = "Möglichkeit mehrere Profile zu erstellen";
+$a->strings["Ability to create multiple profiles"] = "Möglichkeit, mehrere Profile zu erstellen";
 $a->strings["Photo Location"] = "Aufnahmeort";
 $a->strings["Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map."] = "Die Foto-Metadaten werden ausgelesen. Dadurch kann der Aufnahmeort (wenn vorhanden) in einer Karte angezeigt werden.";
 $a->strings["Export Public Calendar"] = "Öffentlichen Kalender exportieren";
-$a->strings["Ability for visitors to download the public calendar"] = "Möglichkeit für Besucher den öffentlichen Kalender herunter zu laden";
-$a->strings["Post Composition Features"] = "Beitragserstellung Features";
+$a->strings["Ability for visitors to download the public calendar"] = "Möglichkeit für Besucher, den öffentlichen Kalender herunter zu laden";
+$a->strings["Post Composition Features"] = "Beitragserstellung-Features";
 $a->strings["Auto-mention Forums"] = "Foren automatisch erwähnen";
 $a->strings["Add/remove mention when a forum page is selected/deselected in ACL window."] = "Automatisch eine @-Erwähnung eines Forums einfügen/entfehrnen, wenn dieses im ACL Fenster de-/markiert  wurde.";
 $a->strings["Explicit Mentions"] = "Explizite Erwähnungen";
 $a->strings["Add explicit mentions to comment box for manual control over who gets mentioned in replies."] = "Füge Erwähnungen zum Kommentarfeld hinzu, um manuell über die explizite Erwähnung von Gesprächsteilnehmern zu entscheiden.";
-$a->strings["Network Sidebar"] = "Netzwerk Seitenleiste";
-$a->strings["Ability to select posts by date ranges"] = "Möglichkeit die Beiträge nach Datumsbereichen zu sortieren";
-$a->strings["Protocol Filter"] = "Protokoll Filter";
-$a->strings["Enable widget to display Network posts only from selected protocols"] = "Aktiviere Widget um Netzwerkbeiträge nur von ausgesuchten Protokollen anzuzeigen";
-$a->strings["Network Tabs"] = "Netzwerk Reiter";
+$a->strings["Network Sidebar"] = "Netzwerk-Seitenleiste";
+$a->strings["Ability to select posts by date ranges"] = "Möglichkeit, die Beiträge nach Datumsbereichen zu sortieren";
+$a->strings["Protocol Filter"] = "Protokoll-Filter";
+$a->strings["Enable widget to display Network posts only from selected protocols"] = "Aktiviere Widget, um Netzwerkbeiträge nur von ausgesuchten Protokollen anzuzeigen";
+$a->strings["Network Tabs"] = "Netzwerk-Reiter";
 $a->strings["Network New Tab"] = "Netzwerk-Reiter: Neue";
-$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Aktiviert einen Netzwerk-Reiter in dem ausschließlich neue Beiträge (der letzten 12 Stunden) angezeigt werden";
+$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Aktiviert einen Netzwerk-Reiter, in dem ausschließlich neue Beiträge (der letzten 12 Stunden) angezeigt werden";
 $a->strings["Network Shared Links Tab"] = "Netzwerk-Reiter: Geteilte Links";
-$a->strings["Enable tab to display only Network posts with links in them"] = "Aktiviert einen Netzwerk-Reiter der ausschließlich Nachrichten mit Links enthält";
+$a->strings["Enable tab to display only Network posts with links in them"] = "Aktiviert einen Netzwerk-Reiter, der ausschließlich Nachrichten mit Links enthält";
 $a->strings["Post/Comment Tools"] = "Werkzeuge für Beiträge und Kommentare";
 $a->strings["Post Categories"] = "Beitragskategorien";
 $a->strings["Add categories to your posts"] = "Eigene Beiträge mit Kategorien versehen";
 $a->strings["Advanced Profile Settings"] = "Erweiterte Profil-Einstellungen";
 $a->strings["List Forums"] = "Zeige Foren";
 $a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Profil-Seite";
-$a->strings["Tag Cloud"] = "Schlagwort Wolke";
-$a->strings["Provide a personal tag cloud on your profile page"] = "Wortwolke aus den von dir verwendeten Schlagwörtern im Profil anzeigen.";
+$a->strings["Tag Cloud"] = "Schlagwortwolke";
+$a->strings["Provide a personal tag cloud on your profile page"] = "Wortwolke aus den von dir verwendeten Schlagwörtern im Profil anzeigen";
 $a->strings["Display Membership Date"] = "Mitgliedschaftsdatum anzeigen";
-$a->strings["Display membership date in profile"] = "Soll das Datum der Registrierung deines Accounts im Profil angezeigt werden.";
+$a->strings["Display membership date in profile"] = "Das Datum der Registrierung deines Accounts im Profil anzeigen";
 $a->strings["Nothing new here"] = "Keine Neuigkeiten";
 $a->strings["Clear notifications"] = "Bereinige Benachrichtigungen";
 $a->strings["Personal notes"] = "Persönliche Notizen";
@@ -1874,14 +1874,14 @@ $a->strings["Register"] = "Registrieren";
 $a->strings["Create an account"] = "Nutzerkonto erstellen";
 $a->strings["Help and documentation"] = "Hilfe und Dokumentation";
 $a->strings["Apps"] = "Apps";
-$a->strings["Addon applications, utilities, games"] = "Addon Anwendungen, Dienstprogramme, Spiele";
+$a->strings["Addon applications, utilities, games"] = "Zusätzliche Anwendungen, Dienstprogramme, Spiele";
 $a->strings["Search site content"] = "Inhalt der Seite durchsuchen";
 $a->strings["Community"] = "Gemeinschaft";
-$a->strings["Conversations on this and other servers"] = "Unterhaltungen auf diesem und anderer Server";
+$a->strings["Conversations on this and other servers"] = "Unterhaltungen auf diesem und anderen Servern";
 $a->strings["Directory"] = "Verzeichnis";
 $a->strings["People directory"] = "Nutzerverzeichnis";
-$a->strings["Information about this friendica instance"] = "Informationen zu dieser Friendica Instanz";
-$a->strings["Terms of Service of this Friendica instance"] = "Die Nutzungsbedingungen dieser Friendica Instanz";
+$a->strings["Information about this friendica instance"] = "Informationen zu dieser Friendica-Instanz";
+$a->strings["Terms of Service of this Friendica instance"] = "Die Nutzungsbedingungen dieser Friendica-Instanz";
 $a->strings["Network Reset"] = "Netzwerk zurücksetzen";
 $a->strings["Load Network page with no filters"] = "Netzwerk-Seite ohne Filter laden";
 $a->strings["Friend Requests"] = "Kontaktanfragen";
@@ -1891,7 +1891,7 @@ $a->strings["Inbox"] = "Eingang";
 $a->strings["Outbox"] = "Ausgang";
 $a->strings["Manage"] = "Verwalten";
 $a->strings["Manage other pages"] = "Andere Seiten verwalten";
-$a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren";
+$a->strings["Manage/Edit Profiles"] = "Profile verwalten/editieren";
 $a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration";
 $a->strings["Navigation"] = "Navigation";
 $a->strings["Site map"] = "Sitemap";
@@ -1917,7 +1917,7 @@ $a->strings["%d contact in common"] = [
 	0 => "%d gemeinsamer Kontakt",
 	1 => "%d gemeinsame Kontakte",
 ];
-$a->strings["There are no tables on MyISAM."] = "Es gibt keine MyISAM Tabellen.";
+$a->strings["There are no tables on MyISAM."] = "Es gibt keine MyISAM-Tabellen.";
 $a->strings["\nError %d occurred during database update:\n%s\n"] = "\nFehler %d beim Update der Datenbank aufgetreten\n%s\n";
 $a->strings["Errors encountered performing database changes: "] = "Fehler beim Ändern der Datenbank aufgetreten";
 $a->strings["%s: Database update"] = "%s: Datenbank Aktualisierung";
@@ -1932,9 +1932,9 @@ $a->strings["This site is not configured to allow communications with other netw
 $a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden.";
 $a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen.";
 $a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden.";
-$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden.";
+$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser-URL gefunden werden.";
 $a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen.";
-$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen.";
+$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der E-Mail-Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen.";
 $a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde.";
 $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können.";
 $a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen.";
@@ -1954,7 +1954,7 @@ $a->strings["g:i A"] = "H:i";
 $a->strings["Show map"] = "Karte anzeigen";
 $a->strings["Hide map"] = "Karte verbergen";
 $a->strings["%s's birthday"] = "%ss Geburtstag";
-$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
+$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch, %s";
 $a->strings["Item filed"] = "Beitrag abgelegt";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
 $a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte";
@@ -2007,25 +2007,25 @@ $a->strings["Forums:"] = "Foren:";
 $a->strings["Profile Details"] = "Profildetails";
 $a->strings["Only You Can See This"] = "Nur Du kannst das sehen";
 $a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
-$a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s heißt %2\$sherzlich willkommen";
+$a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s heißt %2\$s herzlich willkommen";
 $a->strings["Database storage failed to update %s"] = "Datenbankspeicher konnte nicht aktualisiert werden %s";
 $a->strings["Database storage failed to insert data"] = "Der Datenbankspeicher konnte keine Daten einfügen";
 $a->strings["Filesystem storage failed to create \"%s\". Check you write permissions."] = "Dateisystemspeicher konnte nicht erstellt werden \"%s\". Überprüfen Sie, ob Sie Schreibberechtigungen haben.";
-$a->strings["Filesystem storage failed to save data to \"%s\". Check your write permissions"] = "Der Dateisystemspeicher konnte die Daten nicht in \"%s\", speichern. Überprüfen Sie Ihre Schreibberechtigungen";
+$a->strings["Filesystem storage failed to save data to \"%s\". Check your write permissions"] = "Der Dateisystemspeicher konnte die Daten nicht in \"%s\" speichern. Überprüfen Sie Ihre Schreibberechtigungen";
 $a->strings["Storage base path"] = "Dateipfad zum Speicher";
-$a->strings["Folder where uploaded files are saved. For maximum security, This should be a path outside web server folder tree"] = "Verzeichnis in das Dateien hochgeladen werden. Für maximale Sicherheit sollte dies ein Pfad außerhalb der Webserver-Verzeichnisstruktur sein";
+$a->strings["Folder where uploaded files are saved. For maximum security, This should be a path outside web server folder tree"] = "Verzeichnis, in das Dateien hochgeladen werden. Für maximale Sicherheit sollte dies ein Pfad außerhalb der Webserver-Verzeichnisstruktur sein";
 $a->strings["Enter a valid existing folder"] = "Geben Sie einen gültigen, existierenden Ordner ein";
 $a->strings["Login failed"] = "Anmeldung fehlgeschlagen";
 $a->strings["Not enough information to authenticate"] = "Nicht genügend Informationen für die Authentifizierung";
 $a->strings["Password can't be empty"] = "Das Passwort kann nicht leer sein";
 $a->strings["Empty passwords are not allowed."] = "Leere Passwörter sind nicht erlaubt.";
-$a->strings["The new password has been exposed in a public data dump, please choose another."] = "Das neuer Passwort wurde in einem öffentlichen Daten-Dump veröffentlicht. Bitte verwende ein anderes Passwort.";
+$a->strings["The new password has been exposed in a public data dump, please choose another."] = "Das neue Passwort wurde in einem öffentlichen Daten-Dump veröffentlicht. Bitte verwende ein anderes Passwort.";
 $a->strings["The password can't contain accentuated letters, white spaces or colons (:)"] = "Das Passwort darf keine akzentuierten Buchstaben, Leerzeichen oder Doppelpunkte (:) beinhalten";
 $a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.";
 $a->strings["An invitation is required."] = "Du benötigst eine Einladung.";
 $a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden.";
 $a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch, Dich mit der von Dir angegebenen OpenID anzumelden, trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast.";
 $a->strings["The error message was:"] = "Die Fehlermeldung lautete:";
 $a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein.";
 $a->strings["system.username_min_length (%s) and system.username_max_length (%s) are excluding each other, swapping values."] = "system.username_min_length (%s) and system.username_max_length (%s) schließen sich gegenseitig aus, tausche Werte aus.";
@@ -2038,7 +2038,7 @@ $a->strings["Username should be at most %s character."] = [
 	1 => "Der Benutzername sollte aus maximal %s Zeichen bestehen.",
 ];
 $a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein.";
-$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt.";
+$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail-Adresse ist auf dieser Seite nicht erlaubt.";
 $a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse.";
 $a->strings["The nickname was blocked from registration by the nodes admin."] = "Der Admin des Knotens hat den Spitznamen für die Registrierung gesperrt.";
 $a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden.";
@@ -2047,12 +2047,12 @@ $a->strings["Nickname is already registered. Please choose another."] = "Dieser
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
 $a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
 $a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
-$a->strings["An error occurred creating your self contact. Please try again."] = "Bei der Erstellung deines self Kontakts ist ein Fehler aufgetreten. Bitte versuche es erneut.";
+$a->strings["An error occurred creating your self contact. Please try again."] = "Bei der Erstellung deines self-Kontakts ist ein Fehler aufgetreten. Bitte versuche es erneut.";
 $a->strings["An error occurred creating your default contact group. Please try again."] = "Bei der Erstellung deiner Standardgruppe für Kontakte ist ein Fehler aufgetreten. Bitte versuche es erneut.";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\n\t\t\tYour login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%4\$s\n\t\t\tPassword:\t\t%5\$s\n\t\t"] = "\n\t\t\tHallo %1\$s,\n\t\t\t\tdanke für Deine Registrierung auf %2\$s. Dein Account muss noch vom Admin des Knotens freigeschaltet werden.\n\n\t\t\tDeine Zugangsdaten lauten wie folgt:\n\n\t\t\tSeitenadresse:\t%3\$s\n\t\t\tAnmeldename:\t\t%4\$s\n\t\t\tPasswort:\t\t%5\$s\n\t\t";
 $a->strings["Registration at %s"] = "Registrierung als %s";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet.";
-$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3\$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s.";
+$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3\$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s.";
 $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
 $a->strings["Attachments:"] = "Anhänge:";
 $a->strings["%s's timeline"] = "Timeline von %s";
@@ -2060,7 +2060,7 @@ $a->strings["%s's posts"] = "Beiträge von %s";
 $a->strings["%s's comments"] = "Kommentare von %s";
 $a->strings["%s is now following %s."] = "%s folgt nun %s";
 $a->strings["following"] = "folgen";
-$a->strings["%s stopped following %s."] = "%s hat aufgehört %s zu folgen";
+$a->strings["%s stopped following %s."] = "%s hat aufgehört %s, zu folgen";
 $a->strings["stopped following"] = "wird nicht mehr gefolgt";
 $a->strings["(no subject)"] = "(kein Betreff)";
 $a->strings["Item was not found."] = "Beitrag konnte nicht gefunden werden.";
@@ -2091,12 +2091,12 @@ $a->strings["Suggest friends"] = "Kontakte vorschlagen";
 $a->strings["Network type: %s"] = "Netzwerktyp: %s";
 $a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!";
 $a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen";
-$a->strings["Fetch information like preview pictures, title and teaser from the feed item. You can activate this if the feed doesn't contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags."] = "Zusätzliche Informationen wie Vorschaubilder, Titel und Zusammenfassungen vom Feed-Eintrag laden. Du kannst diese Option aktivieren, wenn der Feed nicht all zu viel Text beinhaltet. Schlagwörter werden auf den Meta-Informationen des Feed-Headers bezogen und als Hash-Tags verwendet.";
+$a->strings["Fetch information like preview pictures, title and teaser from the feed item. You can activate this if the feed doesn't contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags."] = "Zusätzliche Informationen wie Vorschaubilder, Titel und Zusammenfassungen vom Feed-Eintrag laden. Du kannst diese Option aktivieren, wenn der Feed nicht allzu viel Text beinhaltet. Schlagwörter werden aus den Meta-Informationen des Feed-Headers bezogen und als Hash-Tags verwendet.";
 $a->strings["Fetch information"] = "Beziehe Information";
 $a->strings["Fetch keywords"] = "Schlüsselwörter abrufen";
 $a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte";
 $a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
-$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen";
+$a->strings["Contact Information / Notes"] = "Kontakt-Informationen / -Notizen";
 $a->strings["Contact Settings"] = "Kontakteinstellungen";
 $a->strings["Contact"] = "Kontakt";
 $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft.";
@@ -2104,7 +2104,7 @@ $a->strings["Their personal note"] = "Die persönliche Mitteilung";
 $a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten";
 $a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten";
 $a->strings["Ignore contact"] = "Ignoriere den Kontakt";
-$a->strings["Repair URL settings"] = "URL Einstellungen reparieren";
+$a->strings["Repair URL settings"] = "URL-Einstellungen reparieren";
 $a->strings["View conversations"] = "Unterhaltungen anzeigen";
 $a->strings["Last update:"] = "Letzte Aktualisierung: ";
 $a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
@@ -2117,7 +2117,7 @@ $a->strings["Awaiting connection acknowledge"] = "Bedarf der Bestätigung des Ko
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein";
 $a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen";
 $a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt.";
-$a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte ";
+$a->strings["Blacklisted keywords"] = "Unterdrückte Schlüsselworte ";
 $a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde";
 $a->strings["Actions"] = "Aktionen";
 $a->strings["Suggestions"] = "Kontaktvorschläge";
@@ -2156,8 +2156,8 @@ $a->strings["System check"] = "Systemtest";
 $a->strings["Check again"] = "Noch einmal testen";
 $a->strings["Database connection"] = "Datenbankverbindung";
 $a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting-Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte, bevor Du mit der Installation fortfährst.";
 $a->strings["Database Server Name"] = "Datenbank-Server";
 $a->strings["Database Login Name"] = "Datenbank-Nutzer";
 $a->strings["Database Login Password"] = "Datenbank-Passwort";
@@ -2169,20 +2169,20 @@ $a->strings["Please select a default timezone for your website"] = "Bitte wähle
 $a->strings["Site settings"] = "Server-Einstellungen";
 $a->strings["System Language:"] = "Systemsprache:";
 $a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand";
-$a->strings["Your Friendica site database has been installed."] = "Die Datenbank Deiner Friendicaseite wurde installiert.";
+$a->strings["Your Friendica site database has been installed."] = "Die Datenbank Deiner Friendica-Seite wurde installiert.";
 $a->strings["Installation finished"] = "Installation abgeschlossen";
 $a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "Wichtig: Du musst [manuell] einen Cronjob (o.ä.) für den Worker einrichten.";
-$a->strings["Go to your new Friendica node <a href=\"%s/register\">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel."] = "Du solltest nun die Seite zur <a href=\"%s/register\">Nutzerregistrierung</a> deiner neuen Friendica Instanz besuchen und einen neuen Nutzer einrichten. Bitte denke daran die selbe E-Mail Adresse anzugeben, die du auch als Administrator E-Mail angegeben hast, damit du das Admin-Panel verwenden kannst.";
+$a->strings["Go to your new Friendica node <a href=\"%s/register\">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel."] = "Du solltest nun die Seite zur <a href=\"%s/register\">Nutzerregistrierung</a> deiner neuen Friendica Instanz besuchen und einen neuen Nutzer einrichten. Bitte denke daran, dieselbe E-Mail Adresse anzugeben, die du auch als Administrator-E-Mail angegeben hast, damit du das Admin-Panel verwenden kannst.";
 $a->strings["Item Guid"] = "Beitrags-Guid";
 $a->strings["Create a New Account"] = "Neues Konto erstellen";
 $a->strings["Password: "] = "Passwort: ";
 $a->strings["Remember me"] = "Anmeldedaten merken";
 $a->strings["Or login using OpenID: "] = "Oder melde Dich mit Deiner OpenID an: ";
 $a->strings["Forgot your password?"] = "Passwort vergessen?";
-$a->strings["Website Terms of Service"] = "Website Nutzungsbedingungen";
+$a->strings["Website Terms of Service"] = "Website-Nutzungsbedingungen";
 $a->strings["terms of service"] = "Nutzungsbedingungen";
-$a->strings["Website Privacy Policy"] = "Website Datenschutzerklärung";
+$a->strings["Website Privacy Policy"] = "Website-Datenschutzerklärung";
 $a->strings["privacy policy"] = "Datenschutzerklärung";
 $a->strings["Logged out."] = "Abgemeldet.";
 $a->strings["Bad Request."] = "Ungültige Anfrage.";
@@ -2196,18 +2196,18 @@ $a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft
 $a->strings["Your invitation code: "] = "Dein Ein­la­dungs­code";
 $a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):";
 $a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Deine E-Mail Adresse (Informationen zur Registrierung werden an diese Adresse gesendet, darum muss sie existieren.)";
-$a->strings["Leave empty for an auto generated password."] = "Leer lassen um das Passwort automatisch zu generieren.";
+$a->strings["Leave empty for an auto generated password."] = "Leer lassen, um das Passwort automatisch zu generieren.";
 $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \"<strong>nickname@%s</strong>\"."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@%s</strong>' sein.";
 $a->strings["Choose a nickname: "] = "Spitznamen wählen: ";
-$a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz";
+$a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica-Instanz";
 $a->strings["Note: This node explicitly contains adult content"] = "Hinweis: Dieser Knoten enthält explizit Inhalte für Erwachsene";
 $a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
-$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern.";
+$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account-Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern.";
 $a->strings["Registration successful."] = "Registrierung erfolgreich.";
 $a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
 $a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
 $a->strings["At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication."] = "Zum Zwecke der Registrierung und um die Kommunikation zwischen dem Nutzer und seinen Kontakten zu gewährleisten, muß der Nutzer einen Namen (auch Pseudonym) und einen Nutzernamen (Spitzname) sowie eine funktionierende E-Mail-Adresse angeben. Der Name ist auf der Profilseite für alle Nutzer sichtbar, auch wenn die Profildetails nicht angezeigt werden.\nDie E-Mail-Adresse wird nur zur Benachrichtigung des Nutzers verwendet, sie wird nirgends angezeigt. Die Anzeige des Nutzerkontos im Server-Verzeichnis bzw. dem weltweiten Verzeichnis erfolgt gemäß den Einstellungen des Nutzers, sie ist zur Kommunikation nicht zwingend notwendig.";
-$a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "Diese Daten sind für die Kommunikation notwendig und werden an die Knoten der Kommunikationspartner übermittelt. und werden dort gespeichert Nutzer können weitere private Angaben machen, die ebenfalls an die verwendeten Server der Kommunikationspartner übermittelt werden können.";
+$a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "Diese Daten sind für die Kommunikation notwendig und werden an die Knoten der Kommunikationspartner übermittelt und dort gespeichert. Nutzer können weitere, private Angaben machen, die ebenfalls an die verwendeten Server der Kommunikationspartner übermittelt werden können.";
 $a->strings["At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners."] = "Angemeldete Nutzer können ihre Nutzerdaten jederzeit von den <a href=\"%1\$s/settings/uexport\">Kontoeinstellungen</a> aus exportieren. Wenn ein Nutzer wünscht das Nutzerkonto zu löschen, so ist dies jederzeit unter <a href=\"%1\$s/removeme\">%1\$s/removeme</a> möglich. Die Löschung des Nutzerkontos ist permanent. Die Löschung der Daten wird auch von den Knoten der Kommunikationspartner angefordert.";
 $a->strings["Privacy Statement"] = "Datenschutzerklärung";
 $a->strings["This entry was edited"] = "Dieser Beitrag wurde bearbeitet.";
@@ -2238,7 +2238,7 @@ $a->strings["Notifier task is pending"] = "Die Benachrichtigungsaufgabe ist auss
 $a->strings["Delivery to remote servers is pending"] = "Die Auslieferung an Remote-Server steht noch aus";
 $a->strings["Delivery to remote servers is underway"] = "Die Auslieferung an Remote-Server ist unterwegs";
 $a->strings["Delivery to remote servers is mostly done"] = "Die Zustellung an Remote-Server ist fast erledigt";
-$a->strings["Delivery to remote servers is done"] = "Die Zustellung an die Remote-Server ist erledigt.";
+$a->strings["Delivery to remote servers is done"] = "Die Zustellung an die Remote-Server ist erledigt";
 $a->strings["%d comment"] = [
 	0 => "%d Kommentar",
 	1 => "%d Kommentare",
@@ -2246,8 +2246,8 @@ $a->strings["%d comment"] = [
 $a->strings["Delete this item?"] = "Diesen Beitrag löschen?";
 $a->strings["show fewer"] = "weniger anzeigen";
 $a->strings["toggle mobile"] = "mobile Ansicht umschalten";
-$a->strings["No system theme config value set."] = "Es wurde kein Konfigurationswert für das Systemweite Theme gesetzt.";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
+$a->strings["No system theme config value set."] = "Es wurde kein Konfigurationswert für das systemweite Theme gesetzt.";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens, wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
 $a->strings["Legacy module file not found: %s"] = "Legacy-Moduldatei nicht gefunden: %s";
 $a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Aktualisiere die author-id und owner-id in der Thread Tabelle";
 $a->strings["%s: Updating post-type."] = "%s: Aktualisiere Beitrags-Typ";

From 54f3b2300bbb1af072d66e3e127541f703427ec9 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 16 Feb 2019 09:42:38 +0100
Subject: [PATCH 011/145] EN US translation update THX hypolite

---
 view/lang/en-us/messages.po | 9741 ++++++++++++++++++-----------------
 view/lang/en-us/strings.php |  728 +--
 2 files changed, 5352 insertions(+), 5117 deletions(-)

diff --git a/view/lang/en-us/messages.po b/view/lang/en-us/messages.po
index 293c8977d..f33c5684b 100644
--- a/view/lang/en-us/messages.po
+++ b/view/lang/en-us/messages.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the Friendica package.
 # 
 # Translators:
-# Andy H3 <andy@hubup.pro>, 2017-2018
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2018
+# Andy H3 <andy@hubup.pro>, 2017-2019
+# Hypolite Petovan <hypolite@mrpetovan.com>, 2018-2019
 # R C <miqrogroove@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-27 02:39-0500\n"
-"PO-Revision-Date: 2018-12-30 01:13+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"POT-Creation-Date: 2019-02-10 08:14+0100\n"
+"PO-Revision-Date: 2019-02-15 14:22+0000\n"
+"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>\n"
 "Language-Team: English (United States) (http://www.transifex.com/Friendica/friendica/language/en_US/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,14 +20,14 @@ msgstr ""
 "Language: en_US\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/api.php:1142
+#: include/api.php:1179
 #, php-format
 msgid "Daily posting limit of %d post reached. The post was rejected."
 msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
 msgstr[0] "Daily posting limit of %d post reached. The post was rejected."
 msgstr[1] "Daily posting limit of %d posts reached. This post was rejected."
 
-#: include/api.php:1156
+#: include/api.php:1193
 #, php-format
 msgid "Weekly posting limit of %d post reached. The post was rejected."
 msgid_plural ""
@@ -35,707 +35,727 @@ msgid_plural ""
 msgstr[0] "Weekly posting limit of %d post reached. The post was rejected."
 msgstr[1] "Weekly posting limit of %d posts reached. This post was rejected."
 
-#: include/api.php:1170
+#: include/api.php:1207
 #, php-format
 msgid "Monthly posting limit of %d post reached. The post was rejected."
 msgstr "Monthly posting limit of %d posts reached. This post was rejected."
 
-#: include/api.php:4335 mod/photos.php:96 mod/photos.php:204
-#: mod/photos.php:737 mod/photos.php:1170 mod/photos.php:1187
-#: mod/photos.php:1680 mod/profile_photo.php:88 mod/profile_photo.php:97
-#: mod/profile_photo.php:106 mod/profile_photo.php:215
-#: mod/profile_photo.php:304 mod/profile_photo.php:314 src/Model/User.php:652
-#: src/Model/User.php:660 src/Model/User.php:668
+#: include/api.php:4578 mod/photos.php:93 mod/photos.php:201
+#: mod/photos.php:695 mod/photos.php:1126 mod/photos.php:1143
+#: mod/photos.php:1636 mod/profile_photo.php:85 mod/profile_photo.php:94
+#: mod/profile_photo.php:103 mod/profile_photo.php:217
+#: mod/profile_photo.php:305 mod/profile_photo.php:315 src/Model/User.php:735
+#: src/Model/User.php:743 src/Model/User.php:751
 msgid "Profile Photos"
 msgstr "Profile photos"
 
-#: include/conversation.php:156 include/conversation.php:292
-#: src/Model/Item.php:3263
+#: include/conversation.php:160 include/conversation.php:297
+#: src/Model/Item.php:3265
 msgid "event"
 msgstr "event"
 
-#: include/conversation.php:159 include/conversation.php:169
-#: include/conversation.php:295 include/conversation.php:304
-#: mod/subthread.php:90 mod/tagger.php:72
+#: include/conversation.php:163 include/conversation.php:173
+#: include/conversation.php:300 include/conversation.php:309
+#: mod/subthread.php:88 mod/tagger.php:70
 msgid "status"
 msgstr "status"
 
-#: include/conversation.php:164 include/conversation.php:300
-#: mod/subthread.php:90 mod/tagger.php:72 src/Model/Item.php:3265
+#: include/conversation.php:168 include/conversation.php:305
+#: mod/subthread.php:88 mod/tagger.php:70 src/Model/Item.php:3267
 msgid "photo"
 msgstr "photo"
 
-#: include/conversation.php:176
+#: include/conversation.php:181
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s likes %2$s's %3$s"
 
-#: include/conversation.php:178
+#: include/conversation.php:183
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s doesn't like %2$s's %3$s"
 
-#: include/conversation.php:180
+#: include/conversation.php:185
 #, php-format
 msgid "%1$s attends %2$s's %3$s"
 msgstr "%1$s goes to %2$s's %3$s"
 
-#: include/conversation.php:182
+#: include/conversation.php:187
 #, php-format
 msgid "%1$s doesn't attend %2$s's %3$s"
 msgstr "%1$s won’t attend %2$s's %3$s"
 
-#: include/conversation.php:184
+#: include/conversation.php:189
 #, php-format
 msgid "%1$s attends maybe %2$s's %3$s"
 msgstr "%1$s might go to %2$s's %3$s"
 
-#: include/conversation.php:219
+#: include/conversation.php:224
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s is now friends with %2$s"
 
-#: include/conversation.php:260
+#: include/conversation.php:265
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr "%1$s poked %2$s"
 
-#: include/conversation.php:314 mod/tagger.php:110
+#: include/conversation.php:319 mod/tagger.php:108
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s tagged %2$s's %3$s with %4$s"
 
-#: include/conversation.php:336
+#: include/conversation.php:341
 msgid "post/item"
 msgstr "Post/Item"
 
-#: include/conversation.php:337
+#: include/conversation.php:342
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s marked %2$s's %3$s as favorite"
 
-#: include/conversation.php:551 mod/photos.php:1511 mod/profiles.php:356
+#: include/conversation.php:568 mod/photos.php:1467 mod/profiles.php:352
 msgid "Likes"
 msgstr "Likes"
 
-#: include/conversation.php:551 mod/photos.php:1511 mod/profiles.php:360
+#: include/conversation.php:568 mod/photos.php:1467 mod/profiles.php:355
 msgid "Dislikes"
 msgstr "Dislikes"
 
-#: include/conversation.php:552 include/conversation.php:1483
-#: mod/photos.php:1512
+#: include/conversation.php:569 include/conversation.php:1506
+#: mod/photos.php:1468
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Attending"
 msgstr[1] "Attending"
 
-#: include/conversation.php:552 mod/photos.php:1512
+#: include/conversation.php:569 mod/photos.php:1468
 msgid "Not attending"
 msgstr "Not attending"
 
-#: include/conversation.php:552 mod/photos.php:1512
+#: include/conversation.php:569 mod/photos.php:1468
 msgid "Might attend"
 msgstr "Might attend"
 
-#: include/conversation.php:632 mod/photos.php:1568 src/Object/Post.php:206
+#: include/conversation.php:649 mod/photos.php:1524 src/Object/Post.php:207
 msgid "Select"
 msgstr "Select"
 
-#: include/conversation.php:633 mod/admin.php:1971 mod/photos.php:1569
-#: mod/settings.php:741 src/Module/Contact.php:832 src/Module/Contact.php:1107
+#: include/conversation.php:650 mod/admin.php:2072 mod/photos.php:1525
+#: mod/settings.php:726 src/Module/Contact.php:827 src/Module/Contact.php:1102
 msgid "Delete"
 msgstr "Delete"
 
-#: include/conversation.php:667 src/Object/Post.php:379
-#: src/Object/Post.php:380
+#: include/conversation.php:684 src/Object/Post.php:380
+#: src/Object/Post.php:381
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "View %s's profile @ %s"
 
-#: include/conversation.php:679 src/Object/Post.php:367
+#: include/conversation.php:696 src/Object/Post.php:368
 msgid "Categories:"
 msgstr "Categories:"
 
-#: include/conversation.php:680 src/Object/Post.php:368
+#: include/conversation.php:697 src/Object/Post.php:369
 msgid "Filed under:"
 msgstr "Filed under:"
 
-#: include/conversation.php:687 src/Object/Post.php:393
+#: include/conversation.php:704 src/Object/Post.php:394
 #, php-format
 msgid "%s from %s"
 msgstr "%s from %s"
 
-#: include/conversation.php:702
+#: include/conversation.php:719
 msgid "View in context"
 msgstr "View in context"
 
-#: include/conversation.php:704 include/conversation.php:1151
-#: mod/editpost.php:109 mod/message.php:264 mod/message.php:427
-#: mod/photos.php:1484 mod/wallmessage.php:141 src/Object/Post.php:418
+#: include/conversation.php:721 include/conversation.php:1172
+#: mod/editpost.php:88 mod/message.php:260 mod/message.php:442
+#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:420
 msgid "Please wait"
 msgstr "Please wait"
 
-#: include/conversation.php:768
+#: include/conversation.php:785
 msgid "remove"
 msgstr "Remove"
 
-#: include/conversation.php:772
+#: include/conversation.php:789
 msgid "Delete Selected Items"
 msgstr "Delete selected items"
 
-#: include/conversation.php:872 view/theme/frio/theme.php:369
+#: include/conversation.php:893 view/theme/frio/theme.php:358
 msgid "Follow Thread"
 msgstr "Follow thread"
 
-#: include/conversation.php:873 src/Model/Contact.php:950
+#: include/conversation.php:894 src/Model/Contact.php:1032
 msgid "View Status"
 msgstr "View status"
 
-#: include/conversation.php:874 include/conversation.php:890
-#: mod/allfriends.php:76 mod/directory.php:167 mod/dirfind.php:228
-#: mod/match.php:91 mod/suggest.php:86 src/Model/Contact.php:890
-#: src/Model/Contact.php:943 src/Model/Contact.php:951
+#: include/conversation.php:895 include/conversation.php:911
+#: mod/allfriends.php:72 mod/directory.php:167 mod/dirfind.php:226
+#: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:972
+#: src/Model/Contact.php:1025 src/Model/Contact.php:1033
 msgid "View Profile"
 msgstr "View profile"
 
-#: include/conversation.php:875 src/Model/Contact.php:952
+#: include/conversation.php:896 src/Model/Contact.php:1034
 msgid "View Photos"
 msgstr "View photos"
 
-#: include/conversation.php:876 src/Model/Contact.php:944
-#: src/Model/Contact.php:953
+#: include/conversation.php:897 src/Model/Contact.php:1026
+#: src/Model/Contact.php:1035
 msgid "Network Posts"
 msgstr "Network posts"
 
-#: include/conversation.php:877 src/Model/Contact.php:945
-#: src/Model/Contact.php:954
+#: include/conversation.php:898 src/Model/Contact.php:1027
+#: src/Model/Contact.php:1036
 msgid "View Contact"
 msgstr "View contact"
 
-#: include/conversation.php:878 src/Model/Contact.php:956
+#: include/conversation.php:899 src/Model/Contact.php:1038
 msgid "Send PM"
 msgstr "Send PM"
 
-#: include/conversation.php:882 src/Model/Contact.php:957
+#: include/conversation.php:903 src/Model/Contact.php:1039
 msgid "Poke"
 msgstr "Poke"
 
-#: include/conversation.php:887 mod/allfriends.php:77 mod/dirfind.php:229
-#: mod/follow.php:147 mod/match.php:92 mod/suggest.php:87
-#: src/Content/Widget.php:65 src/Model/Contact.php:946
-#: src/Module/Contact.php:580 view/theme/vier/theme.php:201
+#: include/conversation.php:908 mod/allfriends.php:73 mod/dirfind.php:227
+#: mod/follow.php:147 mod/match.php:88 mod/suggest.php:88
+#: view/theme/vier/theme.php:201 src/Content/Widget.php:63
+#: src/Model/Contact.php:1028 src/Module/Contact.php:574
 msgid "Connect/Follow"
 msgstr "Connect/Follow"
 
-#: include/conversation.php:1005
+#: include/conversation.php:1030
 #, php-format
 msgid "%s likes this."
 msgstr "%s likes this."
 
-#: include/conversation.php:1008
+#: include/conversation.php:1033
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s doesn't like this."
 
-#: include/conversation.php:1011
+#: include/conversation.php:1036
 #, php-format
 msgid "%s attends."
 msgstr "%s attends."
 
-#: include/conversation.php:1014
+#: include/conversation.php:1039
 #, php-format
 msgid "%s doesn't attend."
 msgstr "%s won't attend."
 
-#: include/conversation.php:1017
+#: include/conversation.php:1042
 #, php-format
 msgid "%s attends maybe."
 msgstr "%s might attend."
 
-#: include/conversation.php:1028
+#: include/conversation.php:1050
 msgid "and"
 msgstr "and"
 
-#: include/conversation.php:1034
+#: include/conversation.php:1056
 #, php-format
 msgid "and %d other people"
 msgstr "and %d other people"
 
-#: include/conversation.php:1043
+#: include/conversation.php:1064
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr "<span  %1$s>%2$d people</span> like this"
 
-#: include/conversation.php:1044
+#: include/conversation.php:1065
 #, php-format
 msgid "%s like this."
 msgstr "%s like this."
 
-#: include/conversation.php:1047
+#: include/conversation.php:1068
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr "<span  %1$s>%2$d people</span> don't like this"
 
-#: include/conversation.php:1048
+#: include/conversation.php:1069
 #, php-format
 msgid "%s don't like this."
 msgstr "%s don't like this."
 
-#: include/conversation.php:1051
+#: include/conversation.php:1072
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend"
 msgstr "<span  %1$s>%2$d people</span> attend"
 
-#: include/conversation.php:1052
+#: include/conversation.php:1073
 #, php-format
 msgid "%s attend."
 msgstr "%s attend."
 
-#: include/conversation.php:1055
+#: include/conversation.php:1076
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't attend"
 msgstr "<span  %1$s>%2$d people</span> won't attend"
 
-#: include/conversation.php:1056
+#: include/conversation.php:1077
 #, php-format
 msgid "%s don't attend."
 msgstr "%s won't attend."
 
-#: include/conversation.php:1059
+#: include/conversation.php:1080
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend maybe"
 msgstr "<span  %1$s>%2$d people</span> might attend"
 
-#: include/conversation.php:1060
+#: include/conversation.php:1081
 #, php-format
 msgid "%s attend maybe."
 msgstr "%s may be attending."
 
-#: include/conversation.php:1090
+#: include/conversation.php:1111
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Visible to <strong>everybody</strong>"
 
-#: include/conversation.php:1091 src/Object/Post.php:822
+#: include/conversation.php:1112 src/Object/Post.php:882
 msgid "Please enter a image/video/audio/webpage URL:"
 msgstr ""
 
-#: include/conversation.php:1092
+#: include/conversation.php:1113
 msgid "Tag term:"
 msgstr "Tag term:"
 
-#: include/conversation.php:1093 mod/filer.php:37
+#: include/conversation.php:1114 mod/filer.php:35
 msgid "Save to Folder:"
 msgstr "Save to folder:"
 
-#: include/conversation.php:1094
+#: include/conversation.php:1115
 msgid "Where are you right now?"
 msgstr "Where are you right now?"
 
-#: include/conversation.php:1095
+#: include/conversation.php:1116
 msgid "Delete item(s)?"
 msgstr "Delete item(s)?"
 
-#: include/conversation.php:1127
+#: include/conversation.php:1148
 msgid "New Post"
 msgstr "New post"
 
-#: include/conversation.php:1130
+#: include/conversation.php:1151
 msgid "Share"
 msgstr "Share"
 
-#: include/conversation.php:1131 mod/editpost.php:95 mod/message.php:262
-#: mod/message.php:424 mod/wallmessage.php:139
+#: include/conversation.php:1152 mod/editpost.php:74 mod/message.php:258
+#: mod/message.php:439 mod/wallmessage.php:139
 msgid "Upload photo"
 msgstr "Upload photo"
 
-#: include/conversation.php:1132 mod/editpost.php:96
+#: include/conversation.php:1153 mod/editpost.php:75
 msgid "upload photo"
 msgstr "upload photo"
 
-#: include/conversation.php:1133 mod/editpost.php:97
+#: include/conversation.php:1154 mod/editpost.php:76
 msgid "Attach file"
 msgstr "Attach file"
 
-#: include/conversation.php:1134 mod/editpost.php:98
+#: include/conversation.php:1155 mod/editpost.php:77
 msgid "attach file"
 msgstr "attach file"
 
-#: include/conversation.php:1135 src/Object/Post.php:814
+#: include/conversation.php:1156 src/Object/Post.php:874
 msgid "Bold"
 msgstr "Bold"
 
-#: include/conversation.php:1136 src/Object/Post.php:815
+#: include/conversation.php:1157 src/Object/Post.php:875
 msgid "Italic"
 msgstr "Italic"
 
-#: include/conversation.php:1137 src/Object/Post.php:816
+#: include/conversation.php:1158 src/Object/Post.php:876
 msgid "Underline"
 msgstr "Underline"
 
-#: include/conversation.php:1138 src/Object/Post.php:817
+#: include/conversation.php:1159 src/Object/Post.php:877
 msgid "Quote"
 msgstr "Quote"
 
-#: include/conversation.php:1139 src/Object/Post.php:818
+#: include/conversation.php:1160 src/Object/Post.php:878
 msgid "Code"
 msgstr "Code"
 
-#: include/conversation.php:1140 src/Object/Post.php:819
+#: include/conversation.php:1161 src/Object/Post.php:879
 msgid "Image"
 msgstr "Image"
 
-#: include/conversation.php:1141 src/Object/Post.php:820
+#: include/conversation.php:1162 src/Object/Post.php:880
 msgid "Link"
 msgstr "Link"
 
-#: include/conversation.php:1142 src/Object/Post.php:821
+#: include/conversation.php:1163 src/Object/Post.php:881
 msgid "Link or Media"
 msgstr ""
 
-#: include/conversation.php:1143 mod/editpost.php:105
+#: include/conversation.php:1164 mod/editpost.php:84
 msgid "Set your location"
 msgstr "Set your location"
 
-#: include/conversation.php:1144 mod/editpost.php:106
+#: include/conversation.php:1165 mod/editpost.php:85
 msgid "set location"
 msgstr "set location"
 
-#: include/conversation.php:1145 mod/editpost.php:107
+#: include/conversation.php:1166 mod/editpost.php:86
 msgid "Clear browser location"
 msgstr "Clear browser location"
 
-#: include/conversation.php:1146 mod/editpost.php:108
+#: include/conversation.php:1167 mod/editpost.php:87
 msgid "clear location"
 msgstr "clear location"
 
-#: include/conversation.php:1148 mod/editpost.php:123
+#: include/conversation.php:1169 mod/editpost.php:102
 msgid "Set title"
 msgstr "Set title"
 
-#: include/conversation.php:1150 mod/editpost.php:125
+#: include/conversation.php:1171 mod/editpost.php:104
 msgid "Categories (comma-separated list)"
 msgstr "Categories (comma-separated list)"
 
-#: include/conversation.php:1152 mod/editpost.php:110
+#: include/conversation.php:1173 mod/editpost.php:89
 msgid "Permission settings"
 msgstr "Permission settings"
 
-#: include/conversation.php:1153 mod/editpost.php:140
+#: include/conversation.php:1174 mod/editpost.php:119
 msgid "permissions"
 msgstr "permissions"
 
-#: include/conversation.php:1162 mod/editpost.php:120
+#: include/conversation.php:1183 mod/editpost.php:99
 msgid "Public post"
 msgstr "Public post"
 
-#: include/conversation.php:1166 mod/editpost.php:131 mod/events.php:557
-#: mod/photos.php:1502 mod/photos.php:1541 mod/photos.php:1601
-#: src/Object/Post.php:823
+#: include/conversation.php:1187 mod/editpost.php:110 mod/events.php:551
+#: mod/photos.php:1458 mod/photos.php:1497 mod/photos.php:1557
+#: src/Object/Post.php:883
 msgid "Preview"
 msgstr "Preview"
 
-#: include/conversation.php:1170 include/items.php:402
-#: mod/dfrn_request.php:658 mod/editpost.php:134 mod/fbrowser.php:105
-#: mod/fbrowser.php:136 mod/follow.php:165 mod/message.php:155
-#: mod/photos.php:260 mod/photos.php:332 mod/settings.php:681
-#: mod/settings.php:707 mod/suggest.php:44 mod/tagrm.php:20 mod/tagrm.php:113
-#: mod/unfollow.php:134 mod/videos.php:142 src/Module/Contact.php:452
+#: include/conversation.php:1191 include/items.php:396
+#: mod/dfrn_request.php:650 mod/editpost.php:113 mod/fbrowser.php:104
+#: mod/fbrowser.php:134 mod/follow.php:161 mod/message.php:153
+#: mod/photos.php:257 mod/photos.php:325 mod/settings.php:666
+#: mod/settings.php:692 mod/suggest.php:44 mod/tagrm.php:20 mod/tagrm.php:115
+#: mod/unfollow.php:132 mod/videos.php:105 src/Module/Contact.php:447
 msgid "Cancel"
 msgstr "Cancel"
 
-#: include/conversation.php:1175
+#: include/conversation.php:1196
 msgid "Post to Groups"
 msgstr "Post to groups"
 
-#: include/conversation.php:1176
+#: include/conversation.php:1197
 msgid "Post to Contacts"
 msgstr "Post to contacts"
 
-#: include/conversation.php:1177
+#: include/conversation.php:1198
 msgid "Private post"
 msgstr "Private post"
 
-#: include/conversation.php:1182 mod/editpost.php:138
-#: src/Model/Profile.php:361
+#: include/conversation.php:1203 mod/editpost.php:117
+#: src/Model/Profile.php:370
 msgid "Message"
 msgstr "Message"
 
-#: include/conversation.php:1183 mod/editpost.php:139
+#: include/conversation.php:1204 mod/editpost.php:118
 msgid "Browser"
 msgstr "Browser"
 
-#: include/conversation.php:1454
+#: include/conversation.php:1476
 msgid "View all"
 msgstr "View all"
 
-#: include/conversation.php:1477
+#: include/conversation.php:1500
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Like"
 msgstr[1] "Likes"
 
-#: include/conversation.php:1480
+#: include/conversation.php:1503
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "Dislike"
 msgstr[1] "Dislikes"
 
-#: include/conversation.php:1486
+#: include/conversation.php:1509
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Not attending"
 msgstr[1] "Not attending"
 
-#: include/conversation.php:1489 src/Content/ContactSelector.php:148
+#: include/conversation.php:1512 src/Content/ContactSelector.php:167
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Undecided"
 msgstr[1] "Undecided"
 
-#: include/enotify.php:55
+#: include/enotify.php:57
 msgid "Friendica Notification"
 msgstr "Friendica notification"
 
-#: include/enotify.php:58
+#: include/enotify.php:60
 msgid "Thank You,"
 msgstr "Thank you"
 
-#: include/enotify.php:61
+#: include/enotify.php:63
 #, php-format
 msgid "%1$s, %2$s Administrator"
 msgstr "%1$s, %2$s Administrator"
 
-#: include/enotify.php:63
+#: include/enotify.php:65
 #, php-format
 msgid "%s Administrator"
 msgstr "%s Administrator"
 
-#: include/enotify.php:126
+#: include/enotify.php:134
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr "[Friendica:Notify] New mail received at %s"
 
-#: include/enotify.php:128
+#: include/enotify.php:136
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$s sent you a new private message at %2$s."
 
-#: include/enotify.php:129
+#: include/enotify.php:137
 msgid "a private message"
 msgstr "a private message"
 
-#: include/enotify.php:129
+#: include/enotify.php:137
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s sent you %2$s."
 
-#: include/enotify.php:131
+#: include/enotify.php:139
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Please visit %s to view or reply to your private messages."
 
-#: include/enotify.php:165
+#: include/enotify.php:172
+#, php-format
+msgid "%1$s tagged you on [url=%2$s]a %3$s[/url]"
+msgstr ""
+
+#: include/enotify.php:178
 #, php-format
 msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 msgstr "%1$s commented on [url=%2$s]a %3$s[/url]"
 
-#: include/enotify.php:173
+#: include/enotify.php:188
+#, php-format
+msgid "%1$s tagged you on [url=%2$s]%3$s's %4$s[/url]"
+msgstr ""
+
+#: include/enotify.php:195
 #, php-format
 msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 msgstr "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 
-#: include/enotify.php:183
+#: include/enotify.php:207
+#, php-format
+msgid "%1$s tagged you on [url=%2$s]your %3$s[/url]"
+msgstr ""
+
+#: include/enotify.php:213
 #, php-format
 msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 msgstr "%1$s commented on [url=%2$s]your %3$s[/url]"
 
-#: include/enotify.php:195
+#: include/enotify.php:224
 #, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgid "%1$s tagged you on [url=%2$s]their %3$s[/url]"
+msgstr ""
 
-#: include/enotify.php:197
+#: include/enotify.php:230
 #, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "%s commented on an item/conversation you have been following."
+msgid "%1$s commented on [url=%2$s]their %3$s[/url]"
+msgstr ""
 
-#: include/enotify.php:200 include/enotify.php:215 include/enotify.php:230
-#: include/enotify.php:245 include/enotify.php:264 include/enotify.php:280
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Please visit %s to view or reply to the conversation."
-
-#: include/enotify.php:207
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr "[Friendica:Notify] %s posted to your profile wall"
-
-#: include/enotify.php:209
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "%1$s posted to your profile wall at %2$s"
-
-#: include/enotify.php:210
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr "%1$s posted to [url=%2$s]your wall[/url]"
-
-#: include/enotify.php:222
+#: include/enotify.php:243
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
 msgstr "[Friendica:Notify] %s tagged you"
 
-#: include/enotify.php:224
+#: include/enotify.php:245
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s tagged you at %2$s"
 
-#: include/enotify.php:225
+#: include/enotify.php:247
 #, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
-msgstr "%1$s [url=%2$s]tagged you[/url]."
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
 
-#: include/enotify.php:237
+#: include/enotify.php:249
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s commented on an item/conversation you have been following."
+
+#: include/enotify.php:254 include/enotify.php:269 include/enotify.php:284
+#: include/enotify.php:303 include/enotify.php:319
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Please visit %s to view or reply to the conversation."
+
+#: include/enotify.php:261
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica:Notify] %s posted to your profile wall"
+
+#: include/enotify.php:263
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$s posted to your profile wall at %2$s"
+
+#: include/enotify.php:264
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr "%1$s posted to [url=%2$s]your wall[/url]"
+
+#: include/enotify.php:276
 #, php-format
 msgid "[Friendica:Notify] %s shared a new post"
 msgstr "[Friendica:Notify] %s shared a new post"
 
-#: include/enotify.php:239
+#: include/enotify.php:278
 #, php-format
 msgid "%1$s shared a new post at %2$s"
 msgstr "%1$s shared a new post at %2$s"
 
-#: include/enotify.php:240
+#: include/enotify.php:279
 #, php-format
 msgid "%1$s [url=%2$s]shared a post[/url]."
 msgstr "%1$s [url=%2$s]shared a post[/url]."
 
-#: include/enotify.php:252
+#: include/enotify.php:291
 #, php-format
 msgid "[Friendica:Notify] %1$s poked you"
 msgstr "[Friendica:Notify] %1$s poked you"
 
-#: include/enotify.php:254
+#: include/enotify.php:293
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "%1$s poked you at %2$s"
 
-#: include/enotify.php:255
+#: include/enotify.php:294
 #, php-format
 msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr "%1$s [url=%2$s]poked you[/url]."
 
-#: include/enotify.php:272
+#: include/enotify.php:311
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr "[Friendica:Notify] %s tagged your post"
 
-#: include/enotify.php:274
+#: include/enotify.php:313
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$s tagged your post at %2$s"
 
-#: include/enotify.php:275
+#: include/enotify.php:314
 #, php-format
 msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr "%1$s tagged [url=%2$s]your post[/url]"
 
-#: include/enotify.php:287
+#: include/enotify.php:326
 msgid "[Friendica:Notify] Introduction received"
 msgstr "[Friendica:Notify] Introduction received"
 
-#: include/enotify.php:289
+#: include/enotify.php:328
 #, php-format
 msgid "You've received an introduction from '%1$s' at %2$s"
 msgstr "You've received an introduction from '%1$s' at %2$s"
 
-#: include/enotify.php:290
+#: include/enotify.php:329
 #, php-format
 msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 msgstr "You've received [url=%1$s]an introduction[/url] from %2$s."
 
-#: include/enotify.php:295 include/enotify.php:341
+#: include/enotify.php:334 include/enotify.php:380
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "You may visit their profile at %s"
 
-#: include/enotify.php:297
+#: include/enotify.php:336
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr "Please visit %s to approve or reject the introduction."
 
-#: include/enotify.php:304
+#: include/enotify.php:343
 msgid "[Friendica:Notify] A new person is sharing with you"
 msgstr "[Friendica:Notify] A new person is sharing with you"
 
-#: include/enotify.php:306 include/enotify.php:307
+#: include/enotify.php:345 include/enotify.php:346
 #, php-format
 msgid "%1$s is sharing with you at %2$s"
 msgstr "%1$s is sharing with you at %2$s"
 
-#: include/enotify.php:314
+#: include/enotify.php:353
 msgid "[Friendica:Notify] You have a new follower"
 msgstr "[Friendica:Notify] You have a new follower"
 
-#: include/enotify.php:316 include/enotify.php:317
+#: include/enotify.php:355 include/enotify.php:356
 #, php-format
 msgid "You have a new follower at %2$s : %1$s"
 msgstr "You have a new follower at %2$s : %1$s"
 
-#: include/enotify.php:330
+#: include/enotify.php:369
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr "[Friendica:Notify] Friend suggestion received"
 
-#: include/enotify.php:332
+#: include/enotify.php:371
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "You've received a friend suggestion from '%1$s' at %2$s"
 
-#: include/enotify.php:333
+#: include/enotify.php:372
 #, php-format
 msgid ""
 "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 
-#: include/enotify.php:339
+#: include/enotify.php:378
 msgid "Name:"
 msgstr "Name:"
 
-#: include/enotify.php:340
+#: include/enotify.php:379
 msgid "Photo:"
 msgstr "Photo:"
 
-#: include/enotify.php:343
+#: include/enotify.php:382
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Please visit %s to approve or reject the suggestion."
 
-#: include/enotify.php:351 include/enotify.php:366
+#: include/enotify.php:390 include/enotify.php:405
 msgid "[Friendica:Notify] Connection accepted"
 msgstr "[Friendica:Notify] Connection accepted"
 
-#: include/enotify.php:353 include/enotify.php:368
+#: include/enotify.php:392 include/enotify.php:407
 #, php-format
 msgid "'%1$s' has accepted your connection request at %2$s"
 msgstr "'%1$s' has accepted your connection request at %2$s"
 
-#: include/enotify.php:354 include/enotify.php:369
+#: include/enotify.php:393 include/enotify.php:408
 #, php-format
 msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
 msgstr "%2$s has accepted your [url=%1$s]connection request[/url]."
 
-#: include/enotify.php:359
+#: include/enotify.php:398
 msgid ""
 "You are now mutual friends and may exchange status updates, photos, and "
 "email without restriction."
 msgstr "You are now mutual friends and may exchange status updates, photos, and email without restriction."
 
-#: include/enotify.php:361
+#: include/enotify.php:400
 #, php-format
 msgid "Please visit %s if you wish to make any changes to this relationship."
 msgstr "Please visit %s if you wish to make any changes to this relationship."
 
-#: include/enotify.php:374
+#: include/enotify.php:413
 #, php-format
 msgid ""
 "'%1$s' has chosen to accept you a fan, which restricts some forms of "
@@ -744,37 +764,37 @@ msgid ""
 "automatically."
 msgstr "'%1$s' has chosen to accept you as a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically."
 
-#: include/enotify.php:376
+#: include/enotify.php:415
 #, php-format
 msgid ""
 "'%1$s' may choose to extend this into a two-way or more permissive "
 "relationship in the future."
 msgstr "'%1$s' may choose to extend this into a two-way or more permissive relationship in the future."
 
-#: include/enotify.php:378
+#: include/enotify.php:417
 #, php-format
 msgid "Please visit %s  if you wish to make any changes to this relationship."
 msgstr "Please visit %s  if you wish to make any changes to this relationship."
 
-#: include/enotify.php:388 mod/removeme.php:49
+#: include/enotify.php:427 mod/removeme.php:46
 msgid "[Friendica System Notify]"
 msgstr "[Friendica System Notify]"
 
-#: include/enotify.php:388
+#: include/enotify.php:427
 msgid "registration request"
 msgstr "registration request"
 
-#: include/enotify.php:390
+#: include/enotify.php:429
 #, php-format
 msgid "You've received a registration request from '%1$s' at %2$s"
 msgstr "You've received a registration request from '%1$s' at %2$s."
 
-#: include/enotify.php:391
+#: include/enotify.php:430
 #, php-format
 msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
 msgstr "You've received a [url=%1$s]registration request[/url] from %2$s."
 
-#: include/enotify.php:396
+#: include/enotify.php:435
 #, php-format
 msgid ""
 "Full Name:\t%s\n"
@@ -782,256 +802,270 @@ msgid ""
 "Login Name:\t%s (%s)"
 msgstr ""
 
-#: include/enotify.php:402
+#: include/enotify.php:441
 #, php-format
 msgid "Please visit %s to approve or reject the request."
 msgstr "Please visit %s to approve or reject the request."
 
-#: include/items.php:359 mod/admin.php:295 mod/admin.php:2029
-#: mod/admin.php:2275 mod/display.php:75 mod/display.php:253
-#: mod/display.php:349 mod/notice.php:21 mod/viewsrc.php:22
+#: include/items.php:353 mod/admin.php:302 mod/admin.php:2131
+#: mod/admin.php:2378 mod/notice.php:20 mod/viewsrc.php:22
 msgid "Item not found."
 msgstr "Item not found."
 
-#: include/items.php:397
+#: include/items.php:391
 msgid "Do you really want to delete this item?"
 msgstr "Do you really want to delete this item?"
 
-#: include/items.php:399 mod/api.php:112 mod/dfrn_request.php:648
-#: mod/follow.php:154 mod/message.php:152 mod/profiles.php:542
-#: mod/profiles.php:545 mod/profiles.php:567 mod/register.php:239
-#: mod/settings.php:1100 mod/settings.php:1106 mod/settings.php:1113
-#: mod/settings.php:1117 mod/settings.php:1121 mod/settings.php:1125
-#: mod/settings.php:1129 mod/settings.php:1133 mod/settings.php:1153
-#: mod/settings.php:1154 mod/settings.php:1155 mod/settings.php:1156
-#: mod/settings.php:1157 mod/suggest.php:41 src/Module/Contact.php:449
+#: include/items.php:393 mod/api.php:109 mod/dfrn_request.php:640
+#: mod/follow.php:150 mod/message.php:150 mod/profiles.php:526
+#: mod/profiles.php:529 mod/profiles.php:551 mod/settings.php:1085
+#: mod/settings.php:1091 mod/settings.php:1098 mod/settings.php:1102
+#: mod/settings.php:1106 mod/settings.php:1110 mod/settings.php:1114
+#: mod/settings.php:1118 mod/settings.php:1138 mod/settings.php:1139
+#: mod/settings.php:1140 mod/settings.php:1141 mod/settings.php:1142
+#: mod/suggest.php:41 src/Module/Contact.php:444 src/Module/Register.php:97
 msgid "Yes"
 msgstr "Yes"
 
-#: include/items.php:449 mod/allfriends.php:24 mod/api.php:37 mod/api.php:42
-#: mod/attach.php:39 mod/cal.php:304 mod/common.php:29 mod/crepair.php:101
-#: mod/delegate.php:31 mod/delegate.php:49 mod/delegate.php:60
-#: mod/dfrn_confirm.php:69 mod/dirfind.php:29 mod/editpost.php:22
-#: mod/events.php:199 mod/follow.php:58 mod/follow.php:122 mod/fsuggest.php:81
-#: mod/group.php:30 mod/invite.php:25 mod/invite.php:111 mod/item.php:169
-#: mod/manage.php:132 mod/message.php:58 mod/message.php:103
-#: mod/network.php:39 mod/nogroup.php:23 mod/notes.php:33
-#: mod/notifications.php:70 mod/ostatus_subscribe.php:18 mod/photos.php:189
-#: mod/photos.php:1064 mod/poke.php:144 mod/profiles.php:183
-#: mod/profiles.php:515 mod/profile_photo.php:33 mod/profile_photo.php:180
-#: mod/profile_photo.php:202 mod/register.php:55 mod/regmod.php:91
-#: mod/repair_ostatus.php:16 mod/settings.php:48 mod/settings.php:154
-#: mod/settings.php:670 mod/suggest.php:62 mod/uimport.php:17
-#: mod/unfollow.php:22 mod/unfollow.php:77 mod/unfollow.php:109
-#: mod/viewcontacts.php:63 mod/wallmessage.php:19 mod/wallmessage.php:43
-#: mod/wallmessage.php:82 mod/wallmessage.php:106 mod/wall_attach.php:81
-#: mod/wall_attach.php:84 mod/wall_upload.php:106 mod/wall_upload.php:109
-#: src/App.php:1786 src/Module/Contact.php:365
+#: include/items.php:443 mod/allfriends.php:22 mod/api.php:34 mod/api.php:39
+#: mod/cal.php:303 mod/common.php:27 mod/crepair.php:90 mod/delegate.php:30
+#: mod/delegate.php:48 mod/delegate.php:59 mod/dfrn_confirm.php:66
+#: mod/dirfind.php:29 mod/editpost.php:22 mod/events.php:207 mod/follow.php:57
+#: mod/follow.php:121 mod/fsuggest.php:77 mod/group.php:28 mod/invite.php:23
+#: mod/invite.php:111 mod/item.php:167 mod/manage.php:129 mod/message.php:56
+#: mod/message.php:101 mod/network.php:35 mod/nogroup.php:18 mod/notes.php:27
+#: mod/notifications.php:70 mod/ostatus_subscribe.php:18 mod/photos.php:186
+#: mod/photos.php:1020 mod/poke.php:141 mod/profile_photo.php:32
+#: mod/profile_photo.php:177 mod/profile_photo.php:204 mod/profiles.php:182
+#: mod/profiles.php:499 mod/regmod.php:89 mod/repair_ostatus.php:16
+#: mod/settings.php:48 mod/settings.php:154 mod/settings.php:655
+#: mod/suggest.php:62 mod/uimport.php:17 mod/unfollow.php:22
+#: mod/unfollow.php:77 mod/unfollow.php:109 mod/viewcontacts.php:56
+#: mod/wall_attach.php:76 mod/wall_attach.php:79 mod/wall_upload.php:107
+#: mod/wall_upload.php:110 mod/wallmessage.php:19 mod/wallmessage.php:43
+#: mod/wallmessage.php:82 mod/wallmessage.php:106 src/Module/Attach.php:42
+#: src/Module/Contact.php:360 src/Module/Register.php:193 src/App.php:1482
 msgid "Permission denied."
 msgstr "Permission denied."
 
-#: include/items.php:520 src/Content/Feature.php:95
+#: include/items.php:514 src/Content/Feature.php:99
 msgid "Archives"
 msgstr "Archives"
 
-#: include/items.php:526 src/App.php:791 src/Content/ForumManager.php:133
-#: src/Content/Widget.php:308 src/Object/Post.php:447
-#: view/theme/vier/theme.php:258
+#: include/items.php:520 view/theme/vier/theme.php:255
+#: src/Content/ForumManager.php:135 src/Content/Widget.php:329
+#: src/Object/Post.php:458 src/App.php:666
 msgid "show more"
-msgstr "Show more..."
+msgstr "show more"
 
-#: mod/admin.php:116
+#: mod/apps.php:15 src/App.php:1351
+msgid "You must be logged in to use addons. "
+msgstr "You must be logged in to use addons. "
+
+#: mod/apps.php:20
+msgid "Applications"
+msgstr "Applications"
+
+#: mod/apps.php:25
+msgid "No installed applications."
+msgstr "No installed applications."
+
+#: mod/maintenance.php:26
+msgid "System down for maintenance"
+msgstr "Sorry, the system is currently down for maintenance."
+
+#: mod/admin.php:122
 msgid "Theme settings updated."
 msgstr "Theme settings updated."
 
-#: mod/admin.php:189 src/Content/Nav.php:228
+#: mod/admin.php:196 src/Content/Nav.php:231
 msgid "Information"
 msgstr "Information"
 
-#: mod/admin.php:190
+#: mod/admin.php:197
 msgid "Overview"
 msgstr "Overview"
 
-#: mod/admin.php:191 mod/admin.php:761
+#: mod/admin.php:198 mod/admin.php:779
 msgid "Federation Statistics"
 msgstr "Federation statistics"
 
-#: mod/admin.php:192
+#: mod/admin.php:199
 msgid "Configuration"
 msgstr "Configuration"
 
-#: mod/admin.php:193 mod/admin.php:1488
+#: mod/admin.php:200 mod/admin.php:1581
 msgid "Site"
 msgstr "Site"
 
-#: mod/admin.php:194 mod/admin.php:1417 mod/admin.php:1961 mod/admin.php:1978
+#: mod/admin.php:201 mod/admin.php:1482 mod/admin.php:2062 mod/admin.php:2079
 msgid "Users"
 msgstr "Users"
 
-#: mod/admin.php:195 mod/admin.php:2077 mod/admin.php:2137 mod/settings.php:99
+#: mod/admin.php:202 mod/admin.php:2179 mod/admin.php:2239 mod/settings.php:99
 msgid "Addons"
 msgstr "Addons"
 
-#: mod/admin.php:196 mod/admin.php:2347 mod/admin.php:2391
+#: mod/admin.php:203 mod/admin.php:2436 mod/admin.php:2480
 msgid "Themes"
 msgstr "Theme selection"
 
-#: mod/admin.php:197 mod/settings.php:77
+#: mod/admin.php:204 mod/settings.php:77
 msgid "Additional features"
 msgstr "Additional features"
 
-#: mod/admin.php:198 mod/admin.php:322 mod/register.php:292
-#: src/Content/Nav.php:231 src/Module/Tos.php:71
+#: mod/admin.php:205 mod/admin.php:329 src/Content/Nav.php:234
+#: src/Module/Register.php:144 src/Module/Tos.php:73
 msgid "Terms of Service"
 msgstr "Terms of Service"
 
-#: mod/admin.php:199
+#: mod/admin.php:206
 msgid "Database"
 msgstr "Database"
 
-#: mod/admin.php:200
+#: mod/admin.php:207
 msgid "DB updates"
 msgstr "DB updates"
 
-#: mod/admin.php:201 mod/admin.php:804
+#: mod/admin.php:208 mod/admin.php:823
 msgid "Inspect Queue"
 msgstr "Inspect queue"
 
-#: mod/admin.php:202
+#: mod/admin.php:209
 msgid "Inspect Deferred Workers"
 msgstr ""
 
-#: mod/admin.php:203
+#: mod/admin.php:210
 msgid "Inspect worker Queue"
 msgstr ""
 
-#: mod/admin.php:204
+#: mod/admin.php:211
 msgid "Tools"
 msgstr "Tools"
 
-#: mod/admin.php:205
+#: mod/admin.php:212
 msgid "Contact Blocklist"
 msgstr "Contact blocklist"
 
-#: mod/admin.php:206 mod/admin.php:384
+#: mod/admin.php:213 mod/admin.php:395
 msgid "Server Blocklist"
 msgstr "Server blocklist"
 
-#: mod/admin.php:207 mod/admin.php:542
+#: mod/admin.php:214 mod/admin.php:558
 msgid "Delete Item"
 msgstr "Delete item"
 
-#: mod/admin.php:208 mod/admin.php:209 mod/admin.php:2466
+#: mod/admin.php:215 mod/admin.php:216 mod/admin.php:2556
 msgid "Logs"
 msgstr "Logs"
 
-#: mod/admin.php:210 mod/admin.php:2533
+#: mod/admin.php:217 mod/admin.php:2624
 msgid "View Logs"
 msgstr "View logs"
 
-#: mod/admin.php:212
+#: mod/admin.php:219
 msgid "Diagnostics"
 msgstr "Diagnostics"
 
-#: mod/admin.php:213
+#: mod/admin.php:220
 msgid "PHP Info"
 msgstr "PHP info"
 
-#: mod/admin.php:214
+#: mod/admin.php:221
 msgid "probe address"
 msgstr "Probe address"
 
-#: mod/admin.php:215
+#: mod/admin.php:222
 msgid "check webfinger"
 msgstr "Check webfinger"
 
-#: mod/admin.php:235 src/Content/Nav.php:271
+#: mod/admin.php:242 src/Content/Nav.php:274
 msgid "Admin"
 msgstr "Admin"
 
-#: mod/admin.php:236
+#: mod/admin.php:243
 msgid "Addon Features"
 msgstr "Addon features"
 
-#: mod/admin.php:237
+#: mod/admin.php:244
 msgid "User registrations waiting for confirmation"
 msgstr "User registrations awaiting confirmation"
 
-#: mod/admin.php:321 mod/admin.php:383 mod/admin.php:499 mod/admin.php:541
-#: mod/admin.php:760 mod/admin.php:803 mod/admin.php:854 mod/admin.php:972
-#: mod/admin.php:1487 mod/admin.php:1960 mod/admin.php:2076 mod/admin.php:2136
-#: mod/admin.php:2346 mod/admin.php:2390 mod/admin.php:2465 mod/admin.php:2532
+#: mod/admin.php:328 mod/admin.php:394 mod/admin.php:514 mod/admin.php:557
+#: mod/admin.php:778 mod/admin.php:822 mod/admin.php:875 mod/admin.php:998
+#: mod/admin.php:1580 mod/admin.php:2061 mod/admin.php:2178 mod/admin.php:2238
+#: mod/admin.php:2435 mod/admin.php:2479 mod/admin.php:2555 mod/admin.php:2623
 msgid "Administration"
 msgstr "Administration"
 
-#: mod/admin.php:323
+#: mod/admin.php:330
 msgid "Display Terms of Service"
 msgstr "Display Terms of Service"
 
-#: mod/admin.php:323
+#: mod/admin.php:330
 msgid ""
 "Enable the Terms of Service page. If this is enabled a link to the terms "
 "will be added to the registration form and the general information page."
 msgstr "Enable the Terms of Service page. If this is enabled, a link to the terms will be added to the registration form and to the general information page."
 
-#: mod/admin.php:324
+#: mod/admin.php:331
 msgid "Display Privacy Statement"
 msgstr "Display Privacy Statement"
 
-#: mod/admin.php:324
+#: mod/admin.php:331
 #, php-format
 msgid ""
 "Show some informations regarding the needed information to operate the node "
 "according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."
 msgstr "Show some information needed, for example, to comply with <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."
 
-#: mod/admin.php:325
+#: mod/admin.php:332
 msgid "Privacy Statement Preview"
 msgstr "Privacy Statement Preview"
 
-#: mod/admin.php:327
+#: mod/admin.php:334
 msgid "The Terms of Service"
 msgstr "Terms of Service"
 
-#: mod/admin.php:327
+#: mod/admin.php:334
 msgid ""
 "Enter the Terms of Service for your node here. You can use BBCode. Headers "
 "of sections should be [h2] and below."
 msgstr "Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] or less."
 
-#: mod/admin.php:329 mod/admin.php:1489 mod/admin.php:2138 mod/admin.php:2392
-#: mod/admin.php:2467 mod/admin.php:2614 mod/delegate.php:174
-#: mod/settings.php:680 mod/settings.php:787 mod/settings.php:875
-#: mod/settings.php:964 mod/settings.php:1189
+#: mod/admin.php:336 mod/admin.php:1582 mod/admin.php:2240 mod/admin.php:2481
+#: mod/admin.php:2557 mod/admin.php:2707 mod/delegate.php:175
+#: mod/settings.php:665 mod/settings.php:772 mod/settings.php:860
+#: mod/settings.php:949 mod/settings.php:1174
 msgid "Save Settings"
 msgstr "Save settings"
 
-#: mod/admin.php:375 mod/admin.php:393 mod/dfrn_request.php:348
-#: mod/friendica.php:122 src/Model/Contact.php:1603
+#: mod/admin.php:386 mod/admin.php:404 mod/dfrn_request.php:346
+#: mod/friendica.php:131 src/Model/Contact.php:1702
 msgid "Blocked domain"
 msgstr "Blocked domain"
 
-#: mod/admin.php:375
+#: mod/admin.php:386
 msgid "The blocked domain"
 msgstr "Blocked domain"
 
-#: mod/admin.php:376 mod/admin.php:394 mod/friendica.php:122
+#: mod/admin.php:387 mod/admin.php:405 mod/friendica.php:131
 msgid "Reason for the block"
 msgstr "Reason for the block"
 
-#: mod/admin.php:376 mod/admin.php:389
+#: mod/admin.php:387 mod/admin.php:400
 msgid "The reason why you blocked this domain."
 msgstr "Reason why you blocked this domain."
 
-#: mod/admin.php:377
+#: mod/admin.php:388
 msgid "Delete domain"
 msgstr "Delete domain"
 
-#: mod/admin.php:377
+#: mod/admin.php:388
 msgid "Check to delete this entry from the blocklist"
 msgstr "Check to delete this entry from the blocklist"
 
-#: mod/admin.php:385
+#: mod/admin.php:396
 msgid ""
 "This page can be used to define a black list of servers from the federated "
 "network that are not allowed to interact with your node. For all entered "
@@ -1039,264 +1073,264 @@ msgid ""
 "server."
 msgstr "This page can be used to define a blacklist of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server."
 
-#: mod/admin.php:386
+#: mod/admin.php:397
 msgid ""
 "The list of blocked servers will be made publically available on the "
 "/friendica page so that your users and people investigating communication "
 "problems can find the reason easily."
 msgstr "The list of blocked servers will be available publicly on the Friendica page so that your users and people investigating communication problems can find the reason."
 
-#: mod/admin.php:387
+#: mod/admin.php:398
 msgid "Add new entry to block list"
 msgstr "Add new entry to block list"
 
-#: mod/admin.php:388
+#: mod/admin.php:399
 msgid "Server Domain"
 msgstr "Server domain"
 
-#: mod/admin.php:388
+#: mod/admin.php:399
 msgid ""
 "The domain of the new server to add to the block list. Do not include the "
 "protocol."
 msgstr "The domain of the new server to add to the block list. Do not include the protocol."
 
-#: mod/admin.php:389
+#: mod/admin.php:400
 msgid "Block reason"
 msgstr "Block reason"
 
-#: mod/admin.php:390
+#: mod/admin.php:401
 msgid "Add Entry"
 msgstr "Add entry"
 
-#: mod/admin.php:391
+#: mod/admin.php:402
 msgid "Save changes to the blocklist"
 msgstr "Save changes to the blocklist"
 
-#: mod/admin.php:392
+#: mod/admin.php:403
 msgid "Current Entries in the Blocklist"
 msgstr "Current entries in the blocklist"
 
-#: mod/admin.php:395
+#: mod/admin.php:406
 msgid "Delete entry from blocklist"
 msgstr "Delete entry from blocklist"
 
-#: mod/admin.php:398
+#: mod/admin.php:409
 msgid "Delete entry from blocklist?"
 msgstr "Delete entry from blocklist?"
 
-#: mod/admin.php:424
+#: mod/admin.php:436
 msgid "Server added to blocklist."
 msgstr "Server added to blocklist."
 
-#: mod/admin.php:440
+#: mod/admin.php:452
 msgid "Site blocklist updated."
 msgstr "Site blocklist updated."
 
-#: mod/admin.php:463 src/Core/Console/GlobalCommunityBlock.php:68
+#: mod/admin.php:477 src/Core/Console/GlobalCommunityBlock.php:68
 msgid "The contact has been blocked from the node"
 msgstr "This contact has been blocked from the node"
 
-#: mod/admin.php:465 src/Core/Console/GlobalCommunityBlock.php:65
+#: mod/admin.php:479 src/Core/Console/GlobalCommunityBlock.php:65
 #, php-format
 msgid "Could not find any contact entry for this URL (%s)"
 msgstr "Could not find any contact entry for this URL (%s)"
 
-#: mod/admin.php:472
+#: mod/admin.php:486
 #, php-format
 msgid "%s contact unblocked"
 msgid_plural "%s contacts unblocked"
 msgstr[0] "%s contact unblocked"
 msgstr[1] "%s contacts unblocked"
 
-#: mod/admin.php:500
+#: mod/admin.php:515
 msgid "Remote Contact Blocklist"
 msgstr "Remote contact blocklist"
 
-#: mod/admin.php:501
+#: mod/admin.php:516
 msgid ""
 "This page allows you to prevent any message from a remote contact to reach "
 "your node."
 msgstr "This page allows you to prevent any message from a remote contact to reach your node."
 
-#: mod/admin.php:502
+#: mod/admin.php:517
 msgid "Block Remote Contact"
 msgstr "Block remote contact"
 
-#: mod/admin.php:503 mod/admin.php:1963
+#: mod/admin.php:518 mod/admin.php:2064
 msgid "select all"
 msgstr "select all"
 
-#: mod/admin.php:504
+#: mod/admin.php:519
 msgid "select none"
 msgstr "select none"
 
-#: mod/admin.php:505 mod/admin.php:1972 src/Module/Contact.php:627
-#: src/Module/Contact.php:829 src/Module/Contact.php:1082
+#: mod/admin.php:520 mod/admin.php:2073 src/Module/Contact.php:621
+#: src/Module/Contact.php:824 src/Module/Contact.php:1077
 msgid "Block"
 msgstr "Block"
 
-#: mod/admin.php:506 mod/admin.php:1974 src/Module/Contact.php:627
-#: src/Module/Contact.php:829 src/Module/Contact.php:1082
+#: mod/admin.php:521 mod/admin.php:2075 src/Module/Contact.php:621
+#: src/Module/Contact.php:824 src/Module/Contact.php:1077
 msgid "Unblock"
 msgstr "Unblock"
 
-#: mod/admin.php:507
+#: mod/admin.php:522
 msgid "No remote contact is blocked from this node."
 msgstr "No remote contact is blocked from this node."
 
-#: mod/admin.php:509
+#: mod/admin.php:524
 msgid "Blocked Remote Contacts"
 msgstr "Blocked remote contacts"
 
-#: mod/admin.php:510
+#: mod/admin.php:525
 msgid "Block New Remote Contact"
 msgstr "Block new remote contact"
 
-#: mod/admin.php:511
+#: mod/admin.php:526
 msgid "Photo"
 msgstr "Photo"
 
-#: mod/admin.php:511 mod/admin.php:1955 mod/admin.php:1966 mod/admin.php:1980
-#: mod/admin.php:1996 mod/crepair.php:161 mod/settings.php:682
-#: mod/settings.php:708
+#: mod/admin.php:526 mod/admin.php:2056 mod/admin.php:2067 mod/admin.php:2081
+#: mod/admin.php:2097 mod/crepair.php:159 mod/settings.php:667
+#: mod/settings.php:693
 msgid "Name"
 msgstr "Name:"
 
-#: mod/admin.php:511 mod/profiles.php:395
+#: mod/admin.php:526 mod/profiles.php:382
 msgid "Address"
 msgstr "Address"
 
-#: mod/admin.php:511 mod/admin.php:521 mod/follow.php:170
-#: mod/notifications.php:177 mod/notifications.php:261 mod/unfollow.php:139
-#: src/Module/Contact.php:646
+#: mod/admin.php:526 mod/admin.php:536 mod/follow.php:166
+#: mod/notifications.php:179 mod/notifications.php:263 mod/unfollow.php:137
+#: src/Module/Contact.php:639
 msgid "Profile URL"
 msgstr "Profile URL:"
 
-#: mod/admin.php:519
+#: mod/admin.php:534
 #, php-format
 msgid "%s total blocked contact"
 msgid_plural "%s total blocked contacts"
 msgstr[0] "%s total blocked contact"
 msgstr[1] "%s blocked contacts"
 
-#: mod/admin.php:521
+#: mod/admin.php:536
 msgid "URL of the remote contact to block."
 msgstr "URL of the remote contact to block."
 
-#: mod/admin.php:543
+#: mod/admin.php:559
 msgid "Delete this Item"
 msgstr "Delete"
 
-#: mod/admin.php:544
+#: mod/admin.php:560
 msgid ""
 "On this page you can delete an item from your node. If the item is a top "
 "level posting, the entire thread will be deleted."
 msgstr "Here you can delete an item from this node. If the item is a top-level posting, the entire thread will be deleted."
 
-#: mod/admin.php:545
+#: mod/admin.php:561
 msgid ""
 "You need to know the GUID of the item. You can find it e.g. by looking at "
 "the display URL. The last part of http://example.com/display/123456 is the "
 "GUID, here 123456."
 msgstr "You need to know the global unique identifier (GUID) of the item, which you can find by looking at the display URL. The last part of http://example.com/display/123456 is the GUID: i.e. 123456."
 
-#: mod/admin.php:546
+#: mod/admin.php:562
 msgid "GUID"
 msgstr "GUID"
 
-#: mod/admin.php:546
+#: mod/admin.php:562
 msgid "The GUID of the item you want to delete."
 msgstr "GUID of item to be deleted."
 
-#: mod/admin.php:580
+#: mod/admin.php:597
 msgid "Item marked for deletion."
 msgstr "Item marked for deletion."
 
-#: mod/admin.php:651
+#: mod/admin.php:669
 msgid "unknown"
 msgstr "unknown"
 
-#: mod/admin.php:754
+#: mod/admin.php:772
 msgid ""
 "This page offers you some numbers to the known part of the federated social "
 "network your Friendica node is part of. These numbers are not complete but "
 "only reflect the part of the network your node is aware of."
 msgstr "This page offers statistics about the federated social network, of which your Friendica node is one part. These numbers do not represent the entire network, but merely the parts that are connected to your node.\""
 
-#: mod/admin.php:755
+#: mod/admin.php:773
 msgid ""
 "The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
 "will improve the data displayed here."
 msgstr "The <em>Auto Discovered Contact Directory</em> feature is not enabled; enabling it will improve the data displayed here."
 
-#: mod/admin.php:767
+#: mod/admin.php:785
 #, php-format
 msgid ""
 "Currently this node is aware of %d nodes with %d registered users from the "
 "following platforms:"
 msgstr "Currently, this node is aware of %d nodes with %d registered users from the following platforms:"
 
-#: mod/admin.php:806 mod/admin.php:857
+#: mod/admin.php:825 mod/admin.php:878
 msgid "ID"
 msgstr "ID"
 
-#: mod/admin.php:807
+#: mod/admin.php:826
 msgid "Recipient Name"
 msgstr "Recipient name"
 
-#: mod/admin.php:808
+#: mod/admin.php:827
 msgid "Recipient Profile"
 msgstr "Recipient profile"
 
-#: mod/admin.php:809 src/Content/Nav.php:236
-#: src/Core/NotificationsManager.php:180 view/theme/frio/theme.php:280
+#: mod/admin.php:828 view/theme/frio/theme.php:269
+#: src/Core/NotificationsManager.php:182 src/Content/Nav.php:239
 msgid "Network"
 msgstr "Network"
 
-#: mod/admin.php:810 mod/admin.php:859
+#: mod/admin.php:829 mod/admin.php:880
 msgid "Created"
 msgstr "Created"
 
-#: mod/admin.php:811
+#: mod/admin.php:830
 msgid "Last Tried"
 msgstr "Last Tried"
 
-#: mod/admin.php:812
+#: mod/admin.php:831
 msgid ""
 "This page lists the content of the queue for outgoing postings. These are "
 "postings the initial delivery failed for. They will be resend later and "
 "eventually deleted if the delivery fails permanently."
 msgstr "This page lists the content of the queue for outgoing postings. These are postings for which the initial delivery failed. They will be resent later, and eventually deleted if the delivery fails permanently."
 
-#: mod/admin.php:833
+#: mod/admin.php:854
 msgid "Inspect Deferred Worker Queue"
 msgstr ""
 
-#: mod/admin.php:834
+#: mod/admin.php:855
 msgid ""
 "This page lists the deferred worker jobs. This are jobs that couldn't be "
 "executed at the first time."
 msgstr ""
 
-#: mod/admin.php:837
+#: mod/admin.php:858
 msgid "Inspect Worker Queue"
 msgstr ""
 
-#: mod/admin.php:838
+#: mod/admin.php:859
 msgid ""
 "This page lists the currently queued worker jobs. These jobs are handled by "
 "the worker cronjob you've set up during install."
 msgstr ""
 
-#: mod/admin.php:858
+#: mod/admin.php:879
 msgid "Job Parameters"
 msgstr ""
 
-#: mod/admin.php:860
+#: mod/admin.php:881
 msgid "Priority"
 msgstr ""
 
-#: mod/admin.php:885
+#: mod/admin.php:907
 #, php-format
 msgid ""
 "Your DB still runs with MyISAM tables. You should change the engine type to "
@@ -1307,32 +1341,32 @@ msgid ""
 " an automatic conversion.<br />"
 msgstr "Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB-only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"
 
-#: mod/admin.php:892
+#: mod/admin.php:914
 #, php-format
 msgid ""
 "There is a new version of Friendica available for download. Your current "
 "version is %1$s, upstream version is %2$s"
 msgstr "A new Friendica version is available now. Your current version is %1$s, upstream version is %2$s"
 
-#: mod/admin.php:902
+#: mod/admin.php:924
 msgid ""
 "The database update failed. Please run \"php bin/console.php dbstructure "
 "update\" from the command line and have a look at the errors that might "
 "appear."
 msgstr "The database update failed. Please run \"php bin/console.php dbstructure update\" from the command line and check for errors that may appear."
 
-#: mod/admin.php:908
+#: mod/admin.php:930
 msgid "The worker was never executed. Please check your database structure!"
 msgstr "The worker process has never been executed. Please check your database structure!"
 
-#: mod/admin.php:911
+#: mod/admin.php:933
 #, php-format
 msgid ""
 "The last worker execution was on %s UTC. This is older than one hour. Please"
 " check your crontab settings."
 msgstr "The last worker process started at %s UTC. This is more than one hour ago. Please adjust your crontab settings."
 
-#: mod/admin.php:917
+#: mod/admin.php:939
 #, php-format
 msgid ""
 "Friendica's configuration now is stored in config/local.config.php, please "
@@ -1341,7 +1375,16 @@ msgid ""
 "help with the transition."
 msgstr ""
 
-#: mod/admin.php:924
+#: mod/admin.php:943
+#, php-format
+msgid ""
+"Friendica's configuration now is stored in config/local.config.php, please "
+"copy config/local-sample.config.php and move your config from "
+"<code>config/local.ini.php</code>. See <a href=\"%s\">the Config help "
+"page</a> for help with the transition."
+msgstr ""
+
+#: mod/admin.php:950
 #, php-format
 msgid ""
 "<a href=\"%s\">%s</a> is not reachable on your system. This is a severe "
@@ -1349,494 +1392,511 @@ msgid ""
 "href=\"%s\">the installation page</a> for help."
 msgstr ""
 
-#: mod/admin.php:930
+#: mod/admin.php:956
 msgid "Normal Account"
 msgstr "Standard account"
 
-#: mod/admin.php:931
+#: mod/admin.php:957
 msgid "Automatic Follower Account"
 msgstr "Automatic follower account"
 
-#: mod/admin.php:932
+#: mod/admin.php:958
 msgid "Public Forum Account"
 msgstr "Public forum account"
 
-#: mod/admin.php:933
+#: mod/admin.php:959
 msgid "Automatic Friend Account"
 msgstr "Automatic friend account"
 
-#: mod/admin.php:934
+#: mod/admin.php:960
 msgid "Blog Account"
 msgstr "Blog account"
 
-#: mod/admin.php:935
+#: mod/admin.php:961
 msgid "Private Forum Account"
 msgstr "Private forum account"
 
-#: mod/admin.php:958
+#: mod/admin.php:984
 msgid "Message queues"
 msgstr "Message queues"
 
-#: mod/admin.php:964
+#: mod/admin.php:990
 msgid "Server Settings"
 msgstr ""
 
-#: mod/admin.php:973
+#: mod/admin.php:999
 msgid "Summary"
 msgstr "Summary"
 
-#: mod/admin.php:975
+#: mod/admin.php:1001
 msgid "Registered users"
 msgstr "Signed up users"
 
-#: mod/admin.php:977
+#: mod/admin.php:1003
 msgid "Pending registrations"
 msgstr "Pending registrations"
 
-#: mod/admin.php:978
+#: mod/admin.php:1004
 msgid "Version"
 msgstr "Version"
 
-#: mod/admin.php:983
+#: mod/admin.php:1009
 msgid "Active addons"
 msgstr "Active addons"
 
-#: mod/admin.php:1015
+#: mod/admin.php:1042
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr "Can not parse base URL. Must have at least <scheme>://<domain>"
 
-#: mod/admin.php:1351
+#: mod/admin.php:1415
 msgid "Site settings updated."
 msgstr "Site settings updated."
 
-#: mod/admin.php:1379 mod/settings.php:908
+#: mod/admin.php:1444 mod/settings.php:893
 msgid "No special theme for mobile devices"
 msgstr "No special theme for mobile devices"
 
-#: mod/admin.php:1408
+#: mod/admin.php:1473
 msgid "No community page for local users"
 msgstr "No community page for local users"
 
-#: mod/admin.php:1409
+#: mod/admin.php:1474
 msgid "No community page"
 msgstr "No community page"
 
-#: mod/admin.php:1410
+#: mod/admin.php:1475
 msgid "Public postings from users of this site"
 msgstr "Public postings from users of this site"
 
-#: mod/admin.php:1411
+#: mod/admin.php:1476
 msgid "Public postings from the federated network"
 msgstr "Public postings from the federated network"
 
-#: mod/admin.php:1412
+#: mod/admin.php:1477
 msgid "Public postings from local users and the federated network"
 msgstr "Public postings from local users and the federated network"
 
-#: mod/admin.php:1416 mod/admin.php:1585 mod/admin.php:1595
-#: src/Module/Contact.php:552
+#: mod/admin.php:1481 mod/admin.php:1682 mod/admin.php:1692
+#: src/Module/Contact.php:546
 msgid "Disabled"
 msgstr "Disabled"
 
-#: mod/admin.php:1418
+#: mod/admin.php:1483
 msgid "Users, Global Contacts"
 msgstr "Users, Global Contacts"
 
-#: mod/admin.php:1419
+#: mod/admin.php:1484
 msgid "Users, Global Contacts/fallback"
 msgstr "Users, Global Contacts/fallback"
 
-#: mod/admin.php:1423
+#: mod/admin.php:1488
 msgid "One month"
 msgstr "One month"
 
-#: mod/admin.php:1424
+#: mod/admin.php:1489
 msgid "Three months"
 msgstr "Three months"
 
-#: mod/admin.php:1425
+#: mod/admin.php:1490
 msgid "Half a year"
 msgstr "Half a year"
 
-#: mod/admin.php:1426
+#: mod/admin.php:1491
 msgid "One year"
 msgstr "One a year"
 
-#: mod/admin.php:1431
+#: mod/admin.php:1496
 msgid "Multi user instance"
 msgstr "Multi user instance"
 
-#: mod/admin.php:1457
+#: mod/admin.php:1520
 msgid "Closed"
 msgstr "Closed"
 
-#: mod/admin.php:1458
+#: mod/admin.php:1521
 msgid "Requires approval"
 msgstr "Requires approval"
 
-#: mod/admin.php:1459
+#: mod/admin.php:1522
 msgid "Open"
 msgstr "Open"
 
-#: mod/admin.php:1463
+#: mod/admin.php:1526
 msgid "No SSL policy, links will track page SSL state"
 msgstr "No SSL policy, links will track page SSL state"
 
-#: mod/admin.php:1464
+#: mod/admin.php:1527
 msgid "Force all links to use SSL"
 msgstr "Force all links to use SSL"
 
-#: mod/admin.php:1465
+#: mod/admin.php:1528
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Self-signed certificate, use SSL for local links only (discouraged)"
 
-#: mod/admin.php:1469
+#: mod/admin.php:1532
 msgid "Don't check"
 msgstr "Don't check"
 
-#: mod/admin.php:1470
+#: mod/admin.php:1533
 msgid "check the stable version"
 msgstr "check for stable version updates"
 
-#: mod/admin.php:1471
+#: mod/admin.php:1534
 msgid "check the development version"
 msgstr "check for development version updates"
 
-#: mod/admin.php:1490
+#: mod/admin.php:1556
+msgid "Database (legacy)"
+msgstr ""
+
+#: mod/admin.php:1583
 msgid "Republish users to directory"
 msgstr "Republish users to directory"
 
-#: mod/admin.php:1491 mod/register.php:268
+#: mod/admin.php:1584 src/Module/Register.php:121
 msgid "Registration"
 msgstr "Registration"
 
-#: mod/admin.php:1492
+#: mod/admin.php:1585
 msgid "File upload"
 msgstr "File upload"
 
-#: mod/admin.php:1493
+#: mod/admin.php:1586
 msgid "Policies"
 msgstr "Policies"
 
-#: mod/admin.php:1494 mod/events.php:561 src/Model/Profile.php:878
-#: src/Module/Contact.php:907
+#: mod/admin.php:1587 mod/events.php:555 src/Model/Profile.php:878
+#: src/Module/Contact.php:902
 msgid "Advanced"
 msgstr "Advanced"
 
-#: mod/admin.php:1495
+#: mod/admin.php:1588
 msgid "Auto Discovered Contact Directory"
 msgstr "Auto-discovered contact directory"
 
-#: mod/admin.php:1496
+#: mod/admin.php:1589
 msgid "Performance"
 msgstr "Performance"
 
-#: mod/admin.php:1497
+#: mod/admin.php:1590
 msgid "Worker"
 msgstr "Worker"
 
-#: mod/admin.php:1498
+#: mod/admin.php:1591
 msgid "Message Relay"
 msgstr "Message relay"
 
-#: mod/admin.php:1499
+#: mod/admin.php:1592
 msgid "Relocate Instance"
 msgstr ""
 
-#: mod/admin.php:1500
+#: mod/admin.php:1593
 msgid "Warning! Advanced function. Could make this server unreachable."
 msgstr ""
 
-#: mod/admin.php:1503
+#: mod/admin.php:1597
 msgid "Site name"
 msgstr "Site name"
 
-#: mod/admin.php:1504
+#: mod/admin.php:1598
 msgid "Host name"
 msgstr "Host name"
 
-#: mod/admin.php:1505
+#: mod/admin.php:1599
 msgid "Sender Email"
 msgstr "Sender email"
 
-#: mod/admin.php:1505
+#: mod/admin.php:1599
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr "The email address your server shall use to send notification emails from."
 
-#: mod/admin.php:1506
+#: mod/admin.php:1600
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: mod/admin.php:1507
+#: mod/admin.php:1601
 msgid "Shortcut icon"
 msgstr "Shortcut icon"
 
-#: mod/admin.php:1507
+#: mod/admin.php:1601
 msgid "Link to an icon that will be used for browsers."
 msgstr "Link to an icon that will be used for browsers."
 
-#: mod/admin.php:1508
+#: mod/admin.php:1602
 msgid "Touch icon"
 msgstr "Touch icon"
 
-#: mod/admin.php:1508
+#: mod/admin.php:1602
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr "Link to an icon that will be used for tablets and mobiles."
 
-#: mod/admin.php:1509
+#: mod/admin.php:1603
 msgid "Additional Info"
 msgstr "Additional Info"
 
-#: mod/admin.php:1509
+#: mod/admin.php:1603
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
 msgstr "For public servers: You can add additional information here that will be listed at %s/servers."
 
-#: mod/admin.php:1510
+#: mod/admin.php:1604
 msgid "System language"
 msgstr "System language"
 
-#: mod/admin.php:1511
+#: mod/admin.php:1605
 msgid "System theme"
 msgstr "System theme"
 
-#: mod/admin.php:1511
+#: mod/admin.php:1605
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Default system theme - may be overridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"
 
-#: mod/admin.php:1512
+#: mod/admin.php:1606
 msgid "Mobile system theme"
 msgstr "Mobile system theme"
 
-#: mod/admin.php:1512
+#: mod/admin.php:1606
 msgid "Theme for mobile devices"
 msgstr "Theme for mobile devices"
 
-#: mod/admin.php:1513
+#: mod/admin.php:1607
 msgid "SSL link policy"
 msgstr "SSL link policy"
 
-#: mod/admin.php:1513
+#: mod/admin.php:1607
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Determines whether generated links should be forced to use SSL"
 
-#: mod/admin.php:1514
+#: mod/admin.php:1608
 msgid "Force SSL"
 msgstr "Force SSL"
 
-#: mod/admin.php:1514
+#: mod/admin.php:1608
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr "Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."
 
-#: mod/admin.php:1515
+#: mod/admin.php:1609
 msgid "Hide help entry from navigation menu"
 msgstr "Hide help entry from navigation menu"
 
-#: mod/admin.php:1515
+#: mod/admin.php:1609
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr "Hides the menu entry for the Help pages from the navigation menu. Help pages can still be accessed by calling ../help directly via its URL."
 
-#: mod/admin.php:1516
+#: mod/admin.php:1610
 msgid "Single user instance"
 msgstr "Single user instance"
 
-#: mod/admin.php:1516
+#: mod/admin.php:1610
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "Make this instance multi-user or single-user for the named user"
 
-#: mod/admin.php:1517
+#: mod/admin.php:1612
+msgid "File storage backend"
+msgstr ""
+
+#: mod/admin.php:1612
+msgid ""
+"The backend used to store uploaded data. If you change the storage backend, "
+"you can manually move the existing files. If you do not do so, the files "
+"uploaded before the change will still be available at the old backend. "
+"Please see <a href=\"/help/Settings#1_2_3_1\">the settings documentation</a>"
+" for more information about the choices and the moving procedure."
+msgstr ""
+
+#: mod/admin.php:1614
 msgid "Maximum image size"
 msgstr "Maximum image size"
 
-#: mod/admin.php:1517
+#: mod/admin.php:1614
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximum size in bytes of uploaded images. Default is 0, which means no limits."
 
-#: mod/admin.php:1518
+#: mod/admin.php:1615
 msgid "Maximum image length"
 msgstr "Maximum image length"
 
-#: mod/admin.php:1518
+#: mod/admin.php:1615
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."
 
-#: mod/admin.php:1519
+#: mod/admin.php:1616
 msgid "JPEG image quality"
 msgstr "JPEG image quality"
 
-#: mod/admin.php:1519
+#: mod/admin.php:1616
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "Uploaded JPEGs will be saved at this quality setting [0-100]. Default is 100, which is the original quality level."
 
-#: mod/admin.php:1521
+#: mod/admin.php:1618
 msgid "Register policy"
 msgstr "Registration policy"
 
-#: mod/admin.php:1522
+#: mod/admin.php:1619
 msgid "Maximum Daily Registrations"
 msgstr "Maximum daily registrations"
 
-#: mod/admin.php:1522
+#: mod/admin.php:1619
 msgid ""
 "If registration is permitted above, this sets the maximum number of new user"
 " registrations to accept per day.  If register is set to closed, this "
 "setting has no effect."
 msgstr "If open registration is permitted, this sets the maximum number of new registrations per day.  This setting has no effect for registrations by approval."
 
-#: mod/admin.php:1523
+#: mod/admin.php:1620
 msgid "Register text"
 msgstr "Registration text"
 
-#: mod/admin.php:1523
+#: mod/admin.php:1620
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr "Will be displayed prominently on the registration page. You may use BBCode here."
 
-#: mod/admin.php:1524
+#: mod/admin.php:1621
 msgid "Forbidden Nicknames"
 msgstr ""
 
-#: mod/admin.php:1524
+#: mod/admin.php:1621
 msgid ""
 "Comma separated list of nicknames that are forbidden from registration. "
 "Preset is a list of role names according RFC 2142."
 msgstr ""
 
-#: mod/admin.php:1525
+#: mod/admin.php:1622
 msgid "Accounts abandoned after x days"
 msgstr "Accounts abandoned after so many days"
 
-#: mod/admin.php:1525
+#: mod/admin.php:1622
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."
 
-#: mod/admin.php:1526
+#: mod/admin.php:1623
 msgid "Allowed friend domains"
 msgstr "Allowed friend domains"
 
-#: mod/admin.php:1526
+#: mod/admin.php:1623
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Comma-separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Leave empty to allow any domains"
 
-#: mod/admin.php:1527
+#: mod/admin.php:1624
 msgid "Allowed email domains"
 msgstr "Allowed email domains"
 
-#: mod/admin.php:1527
+#: mod/admin.php:1624
 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 "Comma-separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Leave empty to allow any domains"
 
-#: mod/admin.php:1528
+#: mod/admin.php:1625
 msgid "No OEmbed rich content"
 msgstr "No OEmbed rich content"
 
-#: mod/admin.php:1528
+#: mod/admin.php:1625
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
 msgstr "Don't show rich content (e.g. embedded PDF), except from the domains listed below."
 
-#: mod/admin.php:1529
+#: mod/admin.php:1626
 msgid "Allowed OEmbed domains"
 msgstr "Allowed OEmbed domains"
 
-#: mod/admin.php:1529
+#: mod/admin.php:1626
 msgid ""
 "Comma separated list of domains which oembed content is allowed to be "
 "displayed. Wildcards are accepted."
 msgstr "Comma-separated list of domains from where OEmbed content is allowed. Wildcards are possible."
 
-#: mod/admin.php:1530
+#: mod/admin.php:1627
 msgid "Block public"
 msgstr "Block public"
 
-#: mod/admin.php:1530
+#: mod/admin.php:1627
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Block public access to all otherwise public personal pages on this site, except for local users when logged in."
 
-#: mod/admin.php:1531
+#: mod/admin.php:1628
 msgid "Force publish"
 msgstr "Mandatory directory listing"
 
-#: mod/admin.php:1531
+#: mod/admin.php:1628
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Force all profiles on this site to be listed in the site directory."
 
-#: mod/admin.php:1531
+#: mod/admin.php:1628
 msgid "Enabling this may violate privacy laws like the GDPR"
 msgstr ""
 
-#: mod/admin.php:1532
+#: mod/admin.php:1629
 msgid "Global directory URL"
 msgstr "Global directory URL"
 
-#: mod/admin.php:1532
+#: mod/admin.php:1629
 msgid ""
 "URL to the global directory. If this is not set, the global directory is "
 "completely unavailable to the application."
 msgstr "URL to the global directory: If this is not set, the global directory is completely unavailable to the application."
 
-#: mod/admin.php:1533
+#: mod/admin.php:1630
 msgid "Private posts by default for new users"
 msgstr "Private posts by default for new users"
 
-#: mod/admin.php:1533
+#: mod/admin.php:1630
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "Set default post permissions for all new members to the default privacy group rather than public."
 
-#: mod/admin.php:1534
+#: mod/admin.php:1631
 msgid "Don't include post content in email notifications"
 msgstr "Don't include post content in email notifications"
 
-#: mod/admin.php:1534
+#: mod/admin.php:1631
 msgid ""
 "Don't include the content of a post/comment/private message/etc. in the "
 "email notifications that are sent out from this site, as a privacy measure."
 msgstr "Don't include the content of a post/comment/private message in the email notifications sent from this site, as a privacy measure."
 
-#: mod/admin.php:1535
+#: mod/admin.php:1632
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr "Disallow public access to addons listed in the apps menu."
 
-#: mod/admin.php:1535
+#: mod/admin.php:1632
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr "Checking this box will restrict addons listed in the apps menu to members only."
 
-#: mod/admin.php:1536
+#: mod/admin.php:1633
 msgid "Don't embed private images in posts"
 msgstr "Don't embed private images in posts"
 
-#: mod/admin.php:1536
+#: mod/admin.php:1633
 msgid ""
 "Don't replace locally-hosted private photos in posts with an embedded copy "
 "of the image. This means that contacts who receive posts containing private "
@@ -1844,11 +1904,11 @@ msgid ""
 "while."
 msgstr "Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."
 
-#: mod/admin.php:1537
+#: mod/admin.php:1634
 msgid "Explicit Content"
 msgstr ""
 
-#: mod/admin.php:1537
+#: mod/admin.php:1634
 msgid ""
 "Set this to announce that your node is used mostly for explicit content that"
 " might not be suited for minors. This information will be published in the "
@@ -1857,245 +1917,245 @@ msgid ""
 "will be shown at the user registration page."
 msgstr ""
 
-#: mod/admin.php:1538
+#: mod/admin.php:1635
 msgid "Allow Users to set remote_self"
 msgstr "Allow users to set \"Remote self\""
 
-#: mod/admin.php:1538
+#: mod/admin.php:1635
 msgid ""
 "With checking this, every user is allowed to mark every contact as a "
 "remote_self in the repair contact dialog. Setting this flag on a contact "
 "causes mirroring every posting of that contact in the users stream."
 msgstr "This allows every user to mark contacts as a \"Remote self\" in the repair contact dialogue. Setting this flag on a contact will mirror every posting of that contact in the users stream."
 
-#: mod/admin.php:1539
+#: mod/admin.php:1636
 msgid "Block multiple registrations"
 msgstr "Block multiple registrations"
 
-#: mod/admin.php:1539
+#: mod/admin.php:1636
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Disallow users to sign up for additional accounts."
 
-#: mod/admin.php:1540
-msgid "OpenID support"
-msgstr "OpenID support"
+#: mod/admin.php:1637
+msgid "Disable OpenID"
+msgstr ""
 
-#: mod/admin.php:1540
-msgid "OpenID support for registration and logins."
-msgstr "OpenID support for registration and logins."
+#: mod/admin.php:1637
+msgid "Disable OpenID support for registration and logins."
+msgstr ""
 
-#: mod/admin.php:1541
-msgid "Fullname check"
-msgstr "Full name check"
+#: mod/admin.php:1638
+msgid "No Fullname check"
+msgstr ""
 
-#: mod/admin.php:1541
+#: mod/admin.php:1638
 msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr "Force users to sign up with a space between first name and last name in the full name field; it may reduce spam and abuse registrations."
+"Allow users to register without a space between the first name and the last "
+"name in their full name."
+msgstr ""
 
-#: mod/admin.php:1542
+#: mod/admin.php:1639
 msgid "Community pages for visitors"
 msgstr "Community pages for visitors"
 
-#: mod/admin.php:1542
+#: mod/admin.php:1639
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
 msgstr "Which community pages should be available for visitors. Local users always see both pages."
 
-#: mod/admin.php:1543
+#: mod/admin.php:1640
 msgid "Posts per user on community page"
 msgstr "Posts per user on community page"
 
-#: mod/admin.php:1543
+#: mod/admin.php:1640
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr "Maximum number of posts per user on the community page (not valid for 'Global Community')."
 
-#: mod/admin.php:1544
-msgid "Enable OStatus support"
-msgstr "Enable OStatus support"
+#: mod/admin.php:1641
+msgid "Disable OStatus support"
+msgstr ""
 
-#: mod/admin.php:1544
+#: mod/admin.php:1641
 msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
+"Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
-msgstr "Provide built-in OStatus (StatusNet, GNU Social, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."
+msgstr ""
 
-#: mod/admin.php:1545
+#: mod/admin.php:1642
 msgid "Only import OStatus/ActivityPub threads from our contacts"
 msgstr ""
 
-#: mod/admin.php:1545
+#: mod/admin.php:1642
 msgid ""
 "Normally we import every content from our OStatus and ActivityPub contacts. "
 "With this option we only store threads that are started by a contact that is"
 " known on our system."
 msgstr ""
 
-#: mod/admin.php:1546
+#: mod/admin.php:1643
 msgid "OStatus support can only be enabled if threading is enabled."
 msgstr "OStatus support can only be enabled if threading is enabled."
 
-#: mod/admin.php:1548
+#: mod/admin.php:1645
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub"
 " directory."
 msgstr "Diaspora support can't be enabled because Friendica was installed into a sub directory."
 
-#: mod/admin.php:1549
+#: mod/admin.php:1646
 msgid "Enable Diaspora support"
 msgstr "Enable Diaspora support"
 
-#: mod/admin.php:1549
+#: mod/admin.php:1646
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Provide built-in Diaspora network compatibility."
 
-#: mod/admin.php:1550
+#: mod/admin.php:1647
 msgid "Only allow Friendica contacts"
 msgstr "Only allow Friendica contacts"
 
-#: mod/admin.php:1550
+#: mod/admin.php:1647
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "All contacts must use Friendica protocols. All other built-in communication protocols will be disabled."
 
-#: mod/admin.php:1551
+#: mod/admin.php:1648
 msgid "Verify SSL"
 msgstr "Verify SSL"
 
-#: mod/admin.php:1551
+#: mod/admin.php:1648
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
 msgstr "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."
 
-#: mod/admin.php:1552
+#: mod/admin.php:1649
 msgid "Proxy user"
 msgstr "Proxy user"
 
-#: mod/admin.php:1553
+#: mod/admin.php:1650
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: mod/admin.php:1554
+#: mod/admin.php:1651
 msgid "Network timeout"
 msgstr "Network timeout"
 
-#: mod/admin.php:1554
+#: mod/admin.php:1651
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Value is in seconds. Set to 0 for unlimited (not recommended)."
 
-#: mod/admin.php:1555
+#: mod/admin.php:1652
 msgid "Maximum Load Average"
 msgstr "Maximum load average"
 
-#: mod/admin.php:1555
+#: mod/admin.php:1652
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximum system load before delivery and poll processes are deferred (default 50)."
 
-#: mod/admin.php:1556
+#: mod/admin.php:1653
 msgid "Maximum Load Average (Frontend)"
 msgstr "Maximum load average (frontend)"
 
-#: mod/admin.php:1556
+#: mod/admin.php:1653
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr "Maximum system load before the frontend quits service (default 50)."
 
-#: mod/admin.php:1557
+#: mod/admin.php:1654
 msgid "Minimal Memory"
 msgstr "Minimal memory"
 
-#: mod/admin.php:1557
+#: mod/admin.php:1654
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
 msgstr "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated)."
 
-#: mod/admin.php:1558
+#: mod/admin.php:1655
 msgid "Maximum table size for optimization"
 msgstr "Maximum table size for optimization"
 
-#: mod/admin.php:1558
+#: mod/admin.php:1655
 msgid ""
 "Maximum table size (in MB) for the automatic optimization. Enter -1 to "
 "disable it."
 msgstr "Maximum table size (in MB) for automatic optimization. Enter -1 to disable it."
 
-#: mod/admin.php:1559
+#: mod/admin.php:1656
 msgid "Minimum level of fragmentation"
 msgstr "Minimum level of fragmentation"
 
-#: mod/admin.php:1559
+#: mod/admin.php:1656
 msgid ""
 "Minimum fragmenation level to start the automatic optimization - default "
 "value is 30%."
 msgstr "Minimum fragmentation level to start the automatic optimization (default 30%)."
 
-#: mod/admin.php:1561
+#: mod/admin.php:1658
 msgid "Periodical check of global contacts"
 msgstr "Periodical check of global contacts"
 
-#: mod/admin.php:1561
+#: mod/admin.php:1658
 msgid ""
 "If enabled, the global contacts are checked periodically for missing or "
 "outdated data and the vitality of the contacts and servers."
 msgstr "This checks global contacts periodically for missing or outdated data and the vitality of the contacts and servers."
 
-#: mod/admin.php:1562
+#: mod/admin.php:1659
 msgid "Days between requery"
 msgstr "Days between enquiry"
 
-#: mod/admin.php:1562
+#: mod/admin.php:1659
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr "Number of days after which a server is rechecked for contacts."
 
-#: mod/admin.php:1563
+#: mod/admin.php:1660
 msgid "Discover contacts from other servers"
 msgstr "Discover contacts from other servers"
 
-#: mod/admin.php:1563
+#: mod/admin.php:1660
 msgid ""
 "Periodically query other servers for contacts. You can choose between "
 "'users': the users on the remote system, 'Global Contacts': active contacts "
 "that are known on the system. The fallback is meant for Redmatrix servers "
 "and older friendica servers, where global contacts weren't available. The "
-"fallback increases the server load, so the recommened setting is 'Users, "
+"fallback increases the server load, so the recommended setting is 'Users, "
 "Global Contacts'."
-msgstr "Periodically query other servers for contacts. You can choose between 'Users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older Friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommend setting is 'Users, Global Contacts'."
+msgstr ""
 
-#: mod/admin.php:1564
+#: mod/admin.php:1661
 msgid "Timeframe for fetching global contacts"
 msgstr "Time-frame for fetching global contacts"
 
-#: mod/admin.php:1564
+#: mod/admin.php:1661
 msgid ""
 "When the discovery is activated, this value defines the timeframe for the "
 "activity of the global contacts that are fetched from other servers."
 msgstr "If discovery is activated, this value defines the time-frame for the activity of the global contacts that are fetched from other servers."
 
-#: mod/admin.php:1565
+#: mod/admin.php:1662
 msgid "Search the local directory"
 msgstr "Search the local directory"
 
-#: mod/admin.php:1565
+#: mod/admin.php:1662
 msgid ""
 "Search the local directory instead of the global directory. When searching "
 "locally, every search will be executed on the global directory in the "
 "background. This improves the search results when the search is repeated."
 msgstr "Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."
 
-#: mod/admin.php:1567
+#: mod/admin.php:1664
 msgid "Publish server information"
 msgstr "Publish server information"
 
-#: mod/admin.php:1567
+#: mod/admin.php:1664
 msgid ""
 "If enabled, general server and usage data will be published. The data "
 "contains the name and version of the server, number of users with public "
@@ -2103,50 +2163,50 @@ msgid ""
 " href='http://the-federation.info/'>the-federation.info</a> for details."
 msgstr "This publishes generic data about the server and its usage. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."
 
-#: mod/admin.php:1569
+#: mod/admin.php:1666
 msgid "Check upstream version"
 msgstr "Check upstream version"
 
-#: mod/admin.php:1569
+#: mod/admin.php:1666
 msgid ""
 "Enables checking for new Friendica versions at github. If there is a new "
 "version, you will be informed in the admin panel overview."
 msgstr "Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."
 
-#: mod/admin.php:1570
+#: mod/admin.php:1667
 msgid "Suppress Tags"
 msgstr "Suppress tags"
 
-#: mod/admin.php:1570
+#: mod/admin.php:1667
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr "Suppress listed hashtags at the end of posts."
 
-#: mod/admin.php:1571
+#: mod/admin.php:1668
 msgid "Clean database"
 msgstr "Clean database"
 
-#: mod/admin.php:1571
+#: mod/admin.php:1668
 msgid ""
 "Remove old remote items, orphaned database records and old content from some"
 " other helper tables."
 msgstr "Remove old remote items, orphaned database records, and old content from some other helper tables."
 
-#: mod/admin.php:1572
+#: mod/admin.php:1669
 msgid "Lifespan of remote items"
 msgstr "Lifespan of remote items"
 
-#: mod/admin.php:1572
+#: mod/admin.php:1669
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "remote items will be deleted. Own items, and marked or filed items are "
 "always kept. 0 disables this behaviour."
 msgstr "When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items, are always kept. 0 disables this behavior."
 
-#: mod/admin.php:1573
+#: mod/admin.php:1670
 msgid "Lifespan of unclaimed items"
 msgstr "Lifespan of unclaimed items"
 
-#: mod/admin.php:1573
+#: mod/admin.php:1670
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "unclaimed remote items (mostly content from the relay) will be deleted. "
@@ -2154,141 +2214,141 @@ msgid ""
 "items if set to 0."
 msgstr "When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0."
 
-#: mod/admin.php:1574
+#: mod/admin.php:1671
 msgid "Lifespan of raw conversation data"
 msgstr ""
 
-#: mod/admin.php:1574
+#: mod/admin.php:1671
 msgid ""
 "The conversation data is used for ActivityPub and OStatus, as well as for "
 "debug purposes. It should be safe to remove it after 14 days, default is 90 "
 "days."
 msgstr ""
 
-#: mod/admin.php:1575
+#: mod/admin.php:1672
 msgid "Path to item cache"
 msgstr "Path to item cache"
 
-#: mod/admin.php:1575
+#: mod/admin.php:1672
 msgid "The item caches buffers generated bbcode and external images."
 msgstr "The item cache retains expanded bbcode and external images."
 
-#: mod/admin.php:1576
+#: mod/admin.php:1673
 msgid "Cache duration in seconds"
 msgstr "Cache duration in seconds"
 
-#: mod/admin.php:1576
+#: mod/admin.php:1673
 msgid ""
 "How long should the cache files be hold? Default value is 86400 seconds (One"
 " day). To disable the item cache, set the value to -1."
 msgstr "How long should cache files be held? (Default 86400 seconds - one day;  -1 disables item cache)"
 
-#: mod/admin.php:1577
+#: mod/admin.php:1674
 msgid "Maximum numbers of comments per post"
 msgstr "Maximum number of comments per post"
 
-#: mod/admin.php:1577
+#: mod/admin.php:1674
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr "How many comments should be shown for each post? (Default 100)"
 
-#: mod/admin.php:1578
+#: mod/admin.php:1675
 msgid "Temp path"
 msgstr "Temp path"
 
-#: mod/admin.php:1578
+#: mod/admin.php:1675
 msgid ""
 "If you have a restricted system where the webserver can't access the system "
 "temp path, enter another path here."
 msgstr "Enter a different temp path if your system restricts the webserver's access to the system temp path."
 
-#: mod/admin.php:1579
+#: mod/admin.php:1676
 msgid "Base path to installation"
 msgstr "Base path to installation"
 
-#: mod/admin.php:1579
+#: mod/admin.php:1676
 msgid ""
 "If the system cannot detect the correct path to your installation, enter the"
 " correct path here. This setting should only be set if you are using a "
 "restricted system and symbolic links to your webroot."
 msgstr "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."
 
-#: mod/admin.php:1580
+#: mod/admin.php:1677
 msgid "Disable picture proxy"
 msgstr "Disable picture proxy"
 
-#: mod/admin.php:1580
+#: mod/admin.php:1677
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
 " systems with very low bandwidth."
 msgstr ""
 
-#: mod/admin.php:1581
+#: mod/admin.php:1678
 msgid "Only search in tags"
 msgstr "Only search in tags"
 
-#: mod/admin.php:1581
+#: mod/admin.php:1678
 msgid "On large systems the text search can slow down the system extremely."
 msgstr "On large systems, the text search can slow down the system significantly."
 
-#: mod/admin.php:1583
+#: mod/admin.php:1680
 msgid "New base url"
 msgstr "New base URL"
 
-#: mod/admin.php:1583
+#: mod/admin.php:1680
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and"
 " Diaspora* contacts of all users."
 msgstr "Change base URL for this server. Sends a relocate message to all Friendica and Diaspora* contacts, for all users."
 
-#: mod/admin.php:1585
+#: mod/admin.php:1682
 msgid "RINO Encryption"
 msgstr "RINO Encryption"
 
-#: mod/admin.php:1585
+#: mod/admin.php:1682
 msgid "Encryption layer between nodes."
 msgstr "Encryption layer between nodes."
 
-#: mod/admin.php:1585
+#: mod/admin.php:1682
 msgid "Enabled"
 msgstr "Enabled"
 
-#: mod/admin.php:1587
+#: mod/admin.php:1684
 msgid "Maximum number of parallel workers"
 msgstr "Maximum number of parallel workers"
 
-#: mod/admin.php:1587
+#: mod/admin.php:1684
 #, php-format
 msgid ""
 "On shared hosters set this to %d. On larger systems, values of %d are great."
 " Default value is %d."
 msgstr ""
 
-#: mod/admin.php:1588
+#: mod/admin.php:1685
 msgid "Don't use 'proc_open' with the worker"
 msgstr "Don't use 'proc_open' with the worker"
 
-#: mod/admin.php:1588
+#: mod/admin.php:1685
 msgid ""
 "Enable this if your system doesn't allow the use of 'proc_open'. This can "
 "happen on shared hosters. If this is enabled you should increase the "
 "frequency of worker calls in your crontab."
 msgstr "Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosts. If this is enabled, you should increase the frequency of worker calls in your crontab."
 
-#: mod/admin.php:1589
+#: mod/admin.php:1686
 msgid "Enable fastlane"
 msgstr "Enable fast-lane"
 
-#: mod/admin.php:1589
+#: mod/admin.php:1686
 msgid ""
 "When enabed, the fastlane mechanism starts an additional worker if processes"
 " with higher priority are blocked by processes of lower priority."
 msgstr "The fast-lane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."
 
-#: mod/admin.php:1590
+#: mod/admin.php:1687
 msgid "Enable frontend worker"
 msgstr "Enable frontend worker"
 
-#: mod/admin.php:1590
+#: mod/admin.php:1687
 #, php-format
 msgid ""
 "When enabled the Worker process is triggered when backend access is "
@@ -2298,136 +2358,136 @@ msgid ""
 " on your server."
 msgstr "When enabled, the Worker process is triggered when backend access is performed \\x28e.g. messages being delivered\\x29. On smaller sites, you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server."
 
-#: mod/admin.php:1592
+#: mod/admin.php:1689
 msgid "Subscribe to relay"
 msgstr "Subscribe to relay"
 
-#: mod/admin.php:1592
+#: mod/admin.php:1689
 msgid ""
 "Enables the receiving of public posts from the relay. They will be included "
 "in the search, subscribed tags and on the global community page."
 msgstr "Receive public posts from the specified relay. Post will be included in searches, subscribed tags, and on the global community page."
 
-#: mod/admin.php:1593
+#: mod/admin.php:1690
 msgid "Relay server"
 msgstr "Relay server"
 
-#: mod/admin.php:1593
+#: mod/admin.php:1690
 msgid ""
 "Address of the relay server where public posts should be send to. For "
 "example https://relay.diasp.org"
 msgstr "Address of the relay server where public posts should be sent. For example https://relay.diasp.org"
 
-#: mod/admin.php:1594
+#: mod/admin.php:1691
 msgid "Direct relay transfer"
 msgstr "Direct relay transfer"
 
-#: mod/admin.php:1594
+#: mod/admin.php:1691
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr "Enables direct transfer to other servers without using a relay server."
 
-#: mod/admin.php:1595
+#: mod/admin.php:1692
 msgid "Relay scope"
 msgstr "Relay scope"
 
-#: mod/admin.php:1595
+#: mod/admin.php:1692
 msgid ""
 "Can be 'all' or 'tags'. 'all' means that every public post should be "
 "received. 'tags' means that only posts with selected tags should be "
 "received."
 msgstr "Set to 'all' or 'tags'. 'all' means receive every public post; 'tags' receive public posts only with specified tags."
 
-#: mod/admin.php:1595
+#: mod/admin.php:1692
 msgid "all"
 msgstr "all"
 
-#: mod/admin.php:1595
+#: mod/admin.php:1692
 msgid "tags"
 msgstr "tags"
 
-#: mod/admin.php:1596
+#: mod/admin.php:1693
 msgid "Server tags"
 msgstr "Server tags"
 
-#: mod/admin.php:1596
+#: mod/admin.php:1693
 msgid "Comma separated list of tags for the 'tags' subscription."
 msgstr "Comma-separated tags for subscription."
 
-#: mod/admin.php:1597
+#: mod/admin.php:1694
 msgid "Allow user tags"
 msgstr "Allow user tags"
 
-#: mod/admin.php:1597
+#: mod/admin.php:1694
 msgid ""
 "If enabled, the tags from the saved searches will used for the 'tags' "
 "subscription in addition to the 'relay_server_tags'."
 msgstr "Use user-generated tags from saved searches for 'tags' subscription in addition to 'relay_server_tags'."
 
-#: mod/admin.php:1600
+#: mod/admin.php:1697
 msgid "Start Relocation"
 msgstr ""
 
-#: mod/admin.php:1626
+#: mod/admin.php:1724
 msgid "Update has been marked successful"
 msgstr "Update has been marked successful"
 
-#: mod/admin.php:1633
+#: mod/admin.php:1731
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr "Database structure update %s was successfully applied."
 
-#: mod/admin.php:1637
+#: mod/admin.php:1735
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr "Execution of database structure update %s failed with error: %s"
 
-#: mod/admin.php:1653
+#: mod/admin.php:1751
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr "Execution of %s failed with error: %s"
 
-#: mod/admin.php:1655
+#: mod/admin.php:1753
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Update %s was successfully applied."
 
-#: mod/admin.php:1658
+#: mod/admin.php:1756
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Update %s did not return a status. Unknown if it succeeded."
 
-#: mod/admin.php:1661
+#: mod/admin.php:1759
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr "There was no additional update function %s that needed to be called."
 
-#: mod/admin.php:1684
+#: mod/admin.php:1782
 msgid "No failed updates."
 msgstr "No failed updates."
 
-#: mod/admin.php:1685
+#: mod/admin.php:1783
 msgid "Check database structure"
 msgstr "Check database structure"
 
-#: mod/admin.php:1690
+#: mod/admin.php:1788
 msgid "Failed Updates"
 msgstr "Failed updates"
 
-#: mod/admin.php:1691
+#: mod/admin.php:1789
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "This does not include updates prior to 1139, which did not return a status."
 
-#: mod/admin.php:1692
+#: mod/admin.php:1790
 msgid "Mark success (if update was manually applied)"
 msgstr "Mark success (if update was manually applied)"
 
-#: mod/admin.php:1693
+#: mod/admin.php:1791
 msgid "Attempt to execute this update step automatically"
 msgstr "Attempt to execute this update step automatically"
 
-#: mod/admin.php:1732
+#: mod/admin.php:1831
 #, php-format
 msgid ""
 "\n"
@@ -2435,7 +2495,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr "\n\t\t\tDear %1$s,\n\t\t\t\tThe administrator of %2$s has set up an account for you."
 
-#: mod/admin.php:1735
+#: mod/admin.php:1834
 #, php-format
 msgid ""
 "\n"
@@ -2467,221 +2527,225 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr "\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%1$s\n\t\t\tLogin Name:\t\t%2$s\n\t\t\tPassword:\t\t%3$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %1$s/removeme\n\n\t\t\tThank you and welcome to %4$s."
 
-#: mod/admin.php:1772 src/Model/User.php:773
+#: mod/admin.php:1871 src/Model/User.php:858
 #, php-format
 msgid "Registration details for %s"
 msgstr "Registration details for %s"
 
-#: mod/admin.php:1782
+#: mod/admin.php:1881
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s user blocked/unblocked"
 msgstr[1] "%s users blocked/unblocked"
 
-#: mod/admin.php:1789 mod/admin.php:1842
+#: mod/admin.php:1888 mod/admin.php:1942
 msgid "You can't remove yourself"
 msgstr ""
 
-#: mod/admin.php:1792
+#: mod/admin.php:1891
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s user deleted"
 msgstr[1] "%s users deleted"
 
-#: mod/admin.php:1840
+#: mod/admin.php:1940
 #, php-format
 msgid "User '%s' deleted"
 msgstr "User '%s' deleted"
 
-#: mod/admin.php:1851
+#: mod/admin.php:1951
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "User '%s' unblocked"
 
-#: mod/admin.php:1851
+#: mod/admin.php:1951
 #, php-format
 msgid "User '%s' blocked"
 msgstr "User '%s' blocked"
 
-#: mod/admin.php:1899 mod/settings.php:1064
+#: mod/admin.php:1999 mod/settings.php:1049
 msgid "Normal Account Page"
 msgstr "Standard"
 
-#: mod/admin.php:1900 mod/settings.php:1068
+#: mod/admin.php:2000 mod/settings.php:1053
 msgid "Soapbox Page"
 msgstr "Soapbox"
 
-#: mod/admin.php:1901 mod/settings.php:1072
+#: mod/admin.php:2001 mod/settings.php:1057
 msgid "Public Forum"
 msgstr "Public forum"
 
-#: mod/admin.php:1902 mod/settings.php:1076
+#: mod/admin.php:2002 mod/settings.php:1061
 msgid "Automatic Friend Page"
 msgstr "Love-all"
 
-#: mod/admin.php:1903
+#: mod/admin.php:2003
 msgid "Private Forum"
 msgstr "Private Forum"
 
-#: mod/admin.php:1906 mod/settings.php:1048
+#: mod/admin.php:2006 mod/settings.php:1033
 msgid "Personal Page"
 msgstr "Personal Page"
 
-#: mod/admin.php:1907 mod/settings.php:1052
+#: mod/admin.php:2007 mod/settings.php:1037
 msgid "Organisation Page"
 msgstr "Organization Page"
 
-#: mod/admin.php:1908 mod/settings.php:1056
+#: mod/admin.php:2008 mod/settings.php:1041
 msgid "News Page"
 msgstr "News Page"
 
-#: mod/admin.php:1909 mod/settings.php:1060
+#: mod/admin.php:2009 mod/settings.php:1045
 msgid "Community Forum"
 msgstr "Community Forum"
 
-#: mod/admin.php:1955 mod/admin.php:1966 mod/admin.php:1980 mod/admin.php:1998
-#: src/Content/ContactSelector.php:84
+#: mod/admin.php:2010
+msgid "Relay"
+msgstr ""
+
+#: mod/admin.php:2056 mod/admin.php:2067 mod/admin.php:2081 mod/admin.php:2099
+#: src/Content/ContactSelector.php:86
 msgid "Email"
 msgstr "Email"
 
-#: mod/admin.php:1955 mod/admin.php:1980
+#: mod/admin.php:2056 mod/admin.php:2081
 msgid "Register date"
 msgstr "Registration date"
 
-#: mod/admin.php:1955 mod/admin.php:1980
+#: mod/admin.php:2056 mod/admin.php:2081
 msgid "Last login"
 msgstr "Last login"
 
-#: mod/admin.php:1955 mod/admin.php:1980
+#: mod/admin.php:2056 mod/admin.php:2081
 msgid "Last item"
 msgstr "Last item"
 
-#: mod/admin.php:1955
+#: mod/admin.php:2056
 msgid "Type"
 msgstr "Type"
 
-#: mod/admin.php:1962
+#: mod/admin.php:2063
 msgid "Add User"
 msgstr "Add user"
 
-#: mod/admin.php:1964
+#: mod/admin.php:2065
 msgid "User registrations waiting for confirm"
 msgstr "User registrations awaiting confirmation"
 
-#: mod/admin.php:1965
+#: mod/admin.php:2066
 msgid "User waiting for permanent deletion"
 msgstr "User awaiting permanent deletion"
 
-#: mod/admin.php:1966
+#: mod/admin.php:2067
 msgid "Request date"
 msgstr "Request date"
 
-#: mod/admin.php:1967
+#: mod/admin.php:2068
 msgid "No registrations."
 msgstr "No registrations."
 
-#: mod/admin.php:1968
+#: mod/admin.php:2069
 msgid "Note from the user"
 msgstr "Note from the user"
 
-#: mod/admin.php:1969 mod/notifications.php:181 mod/notifications.php:267
+#: mod/admin.php:2070 mod/notifications.php:183 mod/notifications.php:269
 msgid "Approve"
 msgstr "Approve"
 
-#: mod/admin.php:1970
+#: mod/admin.php:2071
 msgid "Deny"
 msgstr "Deny"
 
-#: mod/admin.php:1973
+#: mod/admin.php:2074
 msgid "User blocked"
 msgstr ""
 
-#: mod/admin.php:1975
+#: mod/admin.php:2076
 msgid "Site admin"
 msgstr "Site admin"
 
-#: mod/admin.php:1976
+#: mod/admin.php:2077
 msgid "Account expired"
 msgstr "Account expired"
 
-#: mod/admin.php:1979
+#: mod/admin.php:2080
 msgid "New User"
 msgstr "New user"
 
-#: mod/admin.php:1980
-msgid "Delete in"
+#: mod/admin.php:2081
+msgid "Permanent deletion"
 msgstr ""
 
-#: mod/admin.php:1985
+#: mod/admin.php:2086
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Selected users will be deleted!\\n\\nEverything these users have posted on this site will be permanently deleted!\\n\\nAre you sure?"
 
-#: mod/admin.php:1986
+#: mod/admin.php:2087
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"
 
-#: mod/admin.php:1996
+#: mod/admin.php:2097
 msgid "Name of the new user."
 msgstr "Name of the new user."
 
-#: mod/admin.php:1997
+#: mod/admin.php:2098
 msgid "Nickname"
 msgstr "Nickname"
 
-#: mod/admin.php:1997
+#: mod/admin.php:2098
 msgid "Nickname of the new user."
 msgstr "Nickname of the new user."
 
-#: mod/admin.php:1998
+#: mod/admin.php:2099
 msgid "Email address of the new user."
 msgstr "Email address of the new user."
 
-#: mod/admin.php:2039
+#: mod/admin.php:2141
 #, php-format
 msgid "Addon %s disabled."
 msgstr "Addon %s disabled."
 
-#: mod/admin.php:2042
+#: mod/admin.php:2144
 #, php-format
 msgid "Addon %s enabled."
 msgstr "Addon %s enabled."
 
-#: mod/admin.php:2053 mod/admin.php:2302
+#: mod/admin.php:2155 mod/admin.php:2405
 msgid "Disable"
 msgstr "Disable"
 
-#: mod/admin.php:2056 mod/admin.php:2305
+#: mod/admin.php:2158 mod/admin.php:2408
 msgid "Enable"
 msgstr "Enable"
 
-#: mod/admin.php:2078 mod/admin.php:2348
+#: mod/admin.php:2180 mod/admin.php:2437
 msgid "Toggle"
 msgstr "Toggle"
 
-#: mod/admin.php:2079 mod/admin.php:2349 mod/newmember.php:19
-#: mod/settings.php:136 src/Content/Nav.php:260 view/theme/frio/theme.php:283
+#: mod/admin.php:2181 mod/admin.php:2438 mod/newmember.php:20
+#: mod/settings.php:136 view/theme/frio/theme.php:272 src/Content/Nav.php:263
 msgid "Settings"
 msgstr "Settings"
 
-#: mod/admin.php:2086 mod/admin.php:2357
+#: mod/admin.php:2188 mod/admin.php:2446
 msgid "Author: "
 msgstr "Author: "
 
-#: mod/admin.php:2087 mod/admin.php:2358
+#: mod/admin.php:2189 mod/admin.php:2447
 msgid "Maintainer: "
 msgstr "Maintainer: "
 
-#: mod/admin.php:2139
+#: mod/admin.php:2241
 msgid "Reload active addons"
 msgstr "Reload active addons"
 
-#: mod/admin.php:2144
+#: mod/admin.php:2246
 #, php-format
 msgid ""
 "There are currently no addons available on your node. You can find the "
@@ -2689,70 +2753,70 @@ msgid ""
 " the open addon registry at %2$s"
 msgstr "There are currently no addons available on your node. You can find the official addon repository at %1$s and might find other interesting addons in the open addon registry at %2$s"
 
-#: mod/admin.php:2264
+#: mod/admin.php:2367
 msgid "No themes found."
 msgstr "No themes found."
 
-#: mod/admin.php:2339
+#: mod/admin.php:2428
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: mod/admin.php:2393
+#: mod/admin.php:2482
 msgid "Reload active themes"
 msgstr "Reload active themes"
 
-#: mod/admin.php:2398
+#: mod/admin.php:2487
 #, php-format
 msgid "No themes found on the system. They should be placed in %1$s"
 msgstr "No themes found on the system. They should be placed in %1$s"
 
-#: mod/admin.php:2399
+#: mod/admin.php:2488
 msgid "[Experimental]"
 msgstr "[Experimental]"
 
-#: mod/admin.php:2400
+#: mod/admin.php:2489
 msgid "[Unsupported]"
 msgstr "[Unsupported]"
 
-#: mod/admin.php:2424
+#: mod/admin.php:2514
 msgid "Log settings updated."
 msgstr "Log settings updated."
 
-#: mod/admin.php:2457
+#: mod/admin.php:2547
 msgid "PHP log currently enabled."
 msgstr "PHP log currently enabled."
 
-#: mod/admin.php:2459
+#: mod/admin.php:2549
 msgid "PHP log currently disabled."
 msgstr "PHP log currently disabled."
 
-#: mod/admin.php:2468
+#: mod/admin.php:2558
 msgid "Clear"
 msgstr "Clear"
 
-#: mod/admin.php:2472
+#: mod/admin.php:2562
 msgid "Enable Debugging"
 msgstr "Enable debugging"
 
-#: mod/admin.php:2473
+#: mod/admin.php:2563
 msgid "Log file"
 msgstr "Log file"
 
-#: mod/admin.php:2473
+#: mod/admin.php:2563
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Must be writable by web server and relative to your Friendica top-level directory."
 
-#: mod/admin.php:2474
+#: mod/admin.php:2564
 msgid "Log level"
 msgstr "Log level"
 
-#: mod/admin.php:2476
+#: mod/admin.php:2566
 msgid "PHP logging"
 msgstr "PHP logging"
 
-#: mod/admin.php:2477
+#: mod/admin.php:2567
 msgid ""
 "To temporarily enable logging of PHP errors and warnings you can prepend the"
 " following to the index.php file of your installation. The filename set in "
@@ -2761,94 +2825,74 @@ msgid ""
 "'display_errors' is to enable these options, set to '0' to disable them."
 msgstr ""
 
-#: mod/admin.php:2508
+#: mod/admin.php:2599
 #, php-format
 msgid ""
 "Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see "
 "if file %1$s exist and is readable."
 msgstr "Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file %1$s exist and is readable."
 
-#: mod/admin.php:2512
+#: mod/admin.php:2603
 #, php-format
 msgid ""
 "Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file"
 " %1$s is readable."
 msgstr "Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check if file %1$s is readable."
 
-#: mod/admin.php:2603 mod/admin.php:2604 mod/settings.php:778
+#: mod/admin.php:2696 mod/admin.php:2697 mod/settings.php:763
 msgid "Off"
 msgstr "Off"
 
-#: mod/admin.php:2603 mod/admin.php:2604 mod/settings.php:778
+#: mod/admin.php:2696 mod/admin.php:2697 mod/settings.php:763
 msgid "On"
 msgstr "On"
 
-#: mod/admin.php:2604
+#: mod/admin.php:2697
 #, php-format
 msgid "Lock feature %s"
 msgstr "Lock feature %s"
 
-#: mod/admin.php:2612
+#: mod/admin.php:2705
 msgid "Manage Additional Features"
 msgstr "Manage additional features"
 
-#: mod/allfriends.php:54
+#: mod/allfriends.php:52
 msgid "No friends to display."
 msgstr "No friends to display."
 
-#: mod/allfriends.php:93 mod/dirfind.php:219 mod/match.php:107
-#: mod/suggest.php:105 src/Content/Widget.php:41 src/Model/Profile.php:309
+#: mod/allfriends.php:89 mod/dirfind.php:217 mod/match.php:102
+#: mod/suggest.php:106 src/Content/Widget.php:39 src/Model/Profile.php:313
 msgid "Connect"
 msgstr "Connect"
 
-#: mod/api.php:87 mod/api.php:109
+#: mod/api.php:84 mod/api.php:106
 msgid "Authorize application connection"
 msgstr "Authorize application connection"
 
-#: mod/api.php:88
+#: mod/api.php:85
 msgid "Return to your app and insert this Securty Code:"
 msgstr "Return to your app and insert this security code:"
 
-#: mod/api.php:97
+#: mod/api.php:94
 msgid "Please login to continue."
 msgstr "Please login to continue."
 
-#: mod/api.php:111
+#: mod/api.php:108
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
 msgstr "Do you want to authorize this application to access your posts and contacts and create new posts for you?"
 
-#: mod/api.php:113 mod/dfrn_request.php:648 mod/follow.php:154
-#: mod/profiles.php:542 mod/profiles.php:546 mod/profiles.php:567
-#: mod/register.php:240 mod/settings.php:1100 mod/settings.php:1106
-#: mod/settings.php:1113 mod/settings.php:1117 mod/settings.php:1121
-#: mod/settings.php:1125 mod/settings.php:1129 mod/settings.php:1133
-#: mod/settings.php:1153 mod/settings.php:1154 mod/settings.php:1155
-#: mod/settings.php:1156 mod/settings.php:1157
+#: mod/api.php:110 mod/dfrn_request.php:640 mod/follow.php:150
+#: mod/profiles.php:526 mod/profiles.php:530 mod/profiles.php:551
+#: mod/settings.php:1085 mod/settings.php:1091 mod/settings.php:1098
+#: mod/settings.php:1102 mod/settings.php:1106 mod/settings.php:1110
+#: mod/settings.php:1114 mod/settings.php:1118 mod/settings.php:1138
+#: mod/settings.php:1139 mod/settings.php:1140 mod/settings.php:1141
+#: mod/settings.php:1142 src/Module/Register.php:98
 msgid "No"
 msgstr "No"
 
-#: mod/apps.php:15 src/App.php:1656
-msgid "You must be logged in to use addons. "
-msgstr "You must be logged in to use addons. "
-
-#: mod/apps.php:20
-msgid "Applications"
-msgstr "Applications"
-
-#: mod/apps.php:25
-msgid "No installed applications."
-msgstr "No installed applications."
-
-#: mod/attach.php:16
-msgid "Item not available."
-msgstr "Item not available."
-
-#: mod/attach.php:26
-msgid "Item was not found."
-msgstr "Item was not found."
-
 #: mod/babel.php:25
 msgid "Source input"
 msgstr "Source input"
@@ -2885,193 +2929,201 @@ msgstr "BBCode::toMarkdown => Markdown::toBBCode"
 msgid "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
 msgstr "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
 
-#: mod/babel.php:79
+#: mod/babel.php:83
+msgid "Item Body"
+msgstr ""
+
+#: mod/babel.php:87
+msgid "Item Tags"
+msgstr ""
+
+#: mod/babel.php:94
 msgid "Source input (Diaspora format)"
 msgstr ""
 
-#: mod/babel.php:85
+#: mod/babel.php:100
 msgid "Markdown::convert (raw HTML)"
 msgstr ""
 
-#: mod/babel.php:90
+#: mod/babel.php:105
 msgid "Markdown::convert"
 msgstr ""
 
-#: mod/babel.php:96
+#: mod/babel.php:111
 msgid "Markdown::toBBCode"
 msgstr "Markdown::toBBCode"
 
-#: mod/babel.php:103
+#: mod/babel.php:118
 msgid "Raw HTML input"
 msgstr "Raw HTML input"
 
-#: mod/babel.php:108
+#: mod/babel.php:123
 msgid "HTML Input"
 msgstr "HTML input"
 
-#: mod/babel.php:114
+#: mod/babel.php:129
 msgid "HTML::toBBCode"
 msgstr "HTML::toBBCode"
 
-#: mod/babel.php:120
+#: mod/babel.php:135
 msgid "HTML::toBBCode => BBCode::convert"
 msgstr ""
 
-#: mod/babel.php:125
+#: mod/babel.php:140
 msgid "HTML::toBBCode => BBCode::convert (raw HTML)"
 msgstr ""
 
-#: mod/babel.php:131
+#: mod/babel.php:146
 msgid "HTML::toMarkdown"
 msgstr ""
 
-#: mod/babel.php:137
+#: mod/babel.php:152
 msgid "HTML::toPlaintext"
 msgstr "HTML::toPlaintext"
 
-#: mod/babel.php:145
+#: mod/babel.php:160
 msgid "Source text"
 msgstr "Source text"
 
-#: mod/babel.php:146
+#: mod/babel.php:161
 msgid "BBCode"
 msgstr "BBCode"
 
-#: mod/babel.php:147
+#: mod/babel.php:162
 msgid "Markdown"
 msgstr "Markdown"
 
-#: mod/babel.php:148
+#: mod/babel.php:163
 msgid "HTML"
 msgstr "HTML"
 
-#: mod/bookmarklet.php:25 src/Content/Nav.php:167 src/Module/Login.php:322
+#: mod/bookmarklet.php:22 src/Content/Nav.php:170 src/Module/Login.php:322
 msgid "Login"
 msgstr "Login"
 
-#: mod/bookmarklet.php:35
+#: mod/bookmarklet.php:32
 msgid "Bad Request"
 msgstr ""
 
-#: mod/bookmarklet.php:57
+#: mod/bookmarklet.php:54
 msgid "The post was created"
 msgstr "The post was created"
 
-#: mod/cal.php:35 mod/cal.php:39 mod/community.php:38 mod/follow.php:21
+#: mod/cal.php:34 mod/cal.php:38 mod/community.php:39 mod/follow.php:20
 #: mod/viewcontacts.php:23 mod/viewcontacts.php:27 mod/viewsrc.php:13
 msgid "Access denied."
 msgstr "Access denied."
 
-#: mod/cal.php:47 mod/dfrn_poll.php:493 mod/help.php:67
-#: mod/viewcontacts.php:38 src/App.php:1707
+#: mod/cal.php:46 mod/dfrn_poll.php:486 mod/help.php:68
+#: mod/viewcontacts.php:34 src/App.php:1402
 msgid "Page not found."
 msgstr "Page not found"
 
-#: mod/cal.php:142 mod/display.php:311 mod/profile.php:190
+#: mod/cal.php:141 mod/display.php:309 src/Module/Profile.php:168
 msgid "Access to this profile has been restricted."
 msgstr "Access to this profile has been restricted."
 
-#: mod/cal.php:274 mod/events.php:390 src/Content/Nav.php:157
-#: src/Content/Nav.php:223 src/Model/Profile.php:937 src/Model/Profile.php:948
-#: view/theme/frio/theme.php:277 view/theme/frio/theme.php:281
+#: mod/cal.php:273 mod/events.php:384 view/theme/frio/theme.php:266
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:160
+#: src/Content/Nav.php:226 src/Model/Profile.php:937 src/Model/Profile.php:948
 msgid "Events"
 msgstr "Events"
 
-#: mod/cal.php:275 mod/events.php:391
+#: mod/cal.php:274 mod/events.php:385
 msgid "View"
 msgstr "View"
 
-#: mod/cal.php:276 mod/events.php:393
+#: mod/cal.php:275 mod/events.php:387
 msgid "Previous"
 msgstr "Previous"
 
-#: mod/cal.php:277 mod/events.php:394 src/Module/Install.php:135
+#: mod/cal.php:276 mod/events.php:388 src/Module/Install.php:133
 msgid "Next"
 msgstr "Next"
 
-#: mod/cal.php:280 mod/events.php:399 src/Model/Event.php:430
+#: mod/cal.php:279 mod/events.php:393 src/Model/Event.php:429
 msgid "today"
 msgstr "today"
 
-#: mod/cal.php:281 mod/events.php:400 src/Model/Event.php:431
-#: src/Util/Temporal.php:312
+#: mod/cal.php:280 mod/events.php:394 src/Util/Temporal.php:314
+#: src/Model/Event.php:430
 msgid "month"
 msgstr "month"
 
-#: mod/cal.php:282 mod/events.php:401 src/Model/Event.php:432
-#: src/Util/Temporal.php:313
+#: mod/cal.php:281 mod/events.php:395 src/Util/Temporal.php:315
+#: src/Model/Event.php:431
 msgid "week"
 msgstr "week"
 
-#: mod/cal.php:283 mod/events.php:402 src/Model/Event.php:433
-#: src/Util/Temporal.php:314
+#: mod/cal.php:282 mod/events.php:396 src/Util/Temporal.php:316
+#: src/Model/Event.php:432
 msgid "day"
 msgstr "day"
 
-#: mod/cal.php:284 mod/events.php:403
+#: mod/cal.php:283 mod/events.php:397
 msgid "list"
 msgstr "List"
 
-#: mod/cal.php:297 src/Core/Console/NewPassword.php:68 src/Model/User.php:260
+#: mod/cal.php:296 src/Core/Console/NewPassword.php:67 src/Model/User.php:323
 msgid "User not found"
 msgstr "User not found"
 
-#: mod/cal.php:313
+#: mod/cal.php:312
 msgid "This calendar format is not supported"
 msgstr "This calendar format is not supported"
 
-#: mod/cal.php:315
+#: mod/cal.php:314
 msgid "No exportable data found"
 msgstr "No exportable data found"
 
-#: mod/cal.php:332
+#: mod/cal.php:331
 msgid "calendar"
 msgstr "calendar"
 
-#: mod/common.php:92
+#: mod/common.php:90
 msgid "No contacts in common."
 msgstr "No contacts in common."
 
-#: mod/common.php:143 src/Module/Contact.php:897
+#: mod/common.php:141 src/Module/Contact.php:892
 msgid "Common Friends"
 msgstr "Common friends"
 
-#: mod/community.php:31 mod/dfrn_request.php:602 mod/directory.php:43
-#: mod/display.php:203 mod/photos.php:945 mod/probe.php:13 mod/search.php:106
-#: mod/search.php:112 mod/videos.php:194 mod/viewcontacts.php:51
+#: mod/community.php:32 mod/dfrn_request.php:597 mod/directory.php:43
+#: mod/display.php:209 mod/photos.php:903 mod/probe.php:13 mod/search.php:96
+#: mod/search.php:102 mod/videos.php:147 mod/viewcontacts.php:46
 #: mod/webfinger.php:16
 msgid "Public access denied."
 msgstr "Public access denied."
 
-#: mod/community.php:74
+#: mod/community.php:75
 msgid "Community option not available."
 msgstr "Community option not available."
 
-#: mod/community.php:91
+#: mod/community.php:92
 msgid "Not available."
 msgstr "Not available."
 
-#: mod/community.php:103
+#: mod/community.php:102
 msgid "Local Community"
 msgstr "Local community"
 
-#: mod/community.php:106
+#: mod/community.php:105
 msgid "Posts from local users on this server"
 msgstr "Posts from local users on this server"
 
-#: mod/community.php:114
+#: mod/community.php:113
 msgid "Global Community"
 msgstr "Global community"
 
-#: mod/community.php:117
+#: mod/community.php:116
 msgid "Posts from users of the whole federated network"
 msgstr "Posts from users of the whole federated network"
 
-#: mod/community.php:163 mod/search.php:243
+#: mod/community.php:162 mod/search.php:229
 msgid "No results."
 msgstr "No results."
 
-#: mod/community.php:207
+#: mod/community.php:206
 msgid ""
 "This community stream shows all public posts received by this node. They may"
 " not reflect the opinions of this node’s users."
@@ -3088,288 +3140,293 @@ msgid ""
 "code or the translation of Friendica. Thank you all!"
 msgstr "Friendica is a community project that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!"
 
-#: mod/crepair.php:90
+#: mod/crepair.php:79
 msgid "Contact settings applied."
 msgstr "Contact settings applied."
 
-#: mod/crepair.php:92
+#: mod/crepair.php:81
 msgid "Contact update failed."
 msgstr "Contact update failed."
 
-#: mod/crepair.php:113 mod/dfrn_confirm.php:130 mod/fsuggest.php:31
-#: mod/fsuggest.php:97 mod/redir.php:31 mod/redir.php:129
+#: mod/crepair.php:102 mod/dfrn_confirm.php:127 mod/fsuggest.php:28
+#: mod/fsuggest.php:89 mod/redir.php:31 mod/redir.php:137
 msgid "Contact not found."
 msgstr "Contact not found."
 
-#: mod/crepair.php:117
+#: mod/crepair.php:115
 msgid ""
 "<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
 " information your communications with this contact may stop working."
 msgstr "<strong>Warning: These are highly advanced settings.</strong> If you enter incorrect information, your communications with this contact might be disrupted."
 
-#: mod/crepair.php:118
+#: mod/crepair.php:116
 msgid ""
 "Please use your browser 'Back' button <strong>now</strong> if you are "
 "uncertain what to do on this page."
 msgstr "Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."
 
-#: mod/crepair.php:132 mod/crepair.php:134
+#: mod/crepair.php:130 mod/crepair.php:132
 msgid "No mirroring"
 msgstr "No mirroring"
 
-#: mod/crepair.php:132
+#: mod/crepair.php:130
 msgid "Mirror as forwarded posting"
 msgstr "Mirror as forwarded posting"
 
-#: mod/crepair.php:132 mod/crepair.php:134
+#: mod/crepair.php:130 mod/crepair.php:132
 msgid "Mirror as my own posting"
 msgstr "Mirror as my own posting"
 
-#: mod/crepair.php:147
+#: mod/crepair.php:145
 msgid "Return to contact editor"
 msgstr "Return to contact editor"
 
-#: mod/crepair.php:149
+#: mod/crepair.php:147
 msgid "Refetch contact data"
 msgstr "Re-fetch contact data."
 
-#: mod/crepair.php:151 mod/events.php:559 mod/fsuggest.php:115
-#: mod/invite.php:154 mod/localtime.php:56 mod/manage.php:185
-#: mod/message.php:265 mod/message.php:426 mod/photos.php:1093
-#: mod/photos.php:1181 mod/photos.php:1456 mod/photos.php:1501
-#: mod/photos.php:1540 mod/photos.php:1600 mod/poke.php:194
-#: mod/profiles.php:578 src/Module/Contact.php:600 src/Module/Install.php:189
-#: src/Module/Install.php:224 src/Object/Post.php:813
-#: view/theme/duepuntozero/config.php:72 view/theme/frio/config.php:119
-#: view/theme/quattro/config.php:74 view/theme/vier/config.php:120
+#: mod/crepair.php:149 mod/events.php:553 mod/fsuggest.php:106
+#: mod/invite.php:154 mod/localtime.php:56 mod/manage.php:182
+#: mod/message.php:261 mod/message.php:441 mod/photos.php:1049
+#: mod/photos.php:1137 mod/photos.php:1412 mod/photos.php:1457
+#: mod/photos.php:1496 mod/photos.php:1556 mod/poke.php:188
+#: mod/profiles.php:562 view/theme/duepuntozero/config.php:72
+#: view/theme/frio/config.php:119 view/theme/quattro/config.php:74
+#: view/theme/vier/config.php:120 src/Module/Contact.php:594
+#: src/Module/Install.php:187 src/Module/Install.php:222
+#: src/Object/Post.php:873
 msgid "Submit"
 msgstr "Submit"
 
-#: mod/crepair.php:152
+#: mod/crepair.php:150
 msgid "Remote Self"
 msgstr "Remote self"
 
-#: mod/crepair.php:155
+#: mod/crepair.php:153
 msgid "Mirror postings from this contact"
 msgstr "Mirror postings from this contact:"
 
-#: mod/crepair.php:157
+#: mod/crepair.php:155
 msgid ""
 "Mark this contact as remote_self, this will cause friendica to repost new "
 "entries from this contact."
 msgstr "This will cause Friendica to repost new entries from this contact."
 
-#: mod/crepair.php:162
+#: mod/crepair.php:160
 msgid "Account Nickname"
 msgstr "Account nickname:"
 
-#: mod/crepair.php:163
+#: mod/crepair.php:161
 msgid "@Tagname - overrides Name/Nickname"
 msgstr "@Tag name - overrides name/nickname:"
 
-#: mod/crepair.php:164
+#: mod/crepair.php:162
 msgid "Account URL"
 msgstr "Account URL:"
 
-#: mod/crepair.php:165
+#: mod/crepair.php:163
+msgid "Account URL Alias"
+msgstr ""
+
+#: mod/crepair.php:164
 msgid "Friend Request URL"
 msgstr "Friend request URL:"
 
-#: mod/crepair.php:166
+#: mod/crepair.php:165
 msgid "Friend Confirm URL"
 msgstr "Friend confirm URL:"
 
-#: mod/crepair.php:167
+#: mod/crepair.php:166
 msgid "Notification Endpoint URL"
 msgstr "Notification endpoint URL"
 
-#: mod/crepair.php:168
+#: mod/crepair.php:167
 msgid "Poll/Feed URL"
 msgstr "Poll/Feed URL:"
 
-#: mod/crepair.php:169
+#: mod/crepair.php:168
 msgid "New photo from this URL"
 msgstr "New photo from this URL:"
 
-#: mod/delegate.php:43
+#: mod/delegate.php:42
 msgid "Parent user not found."
 msgstr "Parent user not found."
 
-#: mod/delegate.php:150
+#: mod/delegate.php:149
 msgid "No parent user"
 msgstr "No parent user"
 
-#: mod/delegate.php:165
+#: mod/delegate.php:164
 msgid "Parent Password:"
 msgstr "Parent Password:"
 
-#: mod/delegate.php:165
+#: mod/delegate.php:164
 msgid ""
 "Please enter the password of the parent account to legitimize your request."
 msgstr "Please enter the password of the parent account to authorize this request."
 
-#: mod/delegate.php:170
+#: mod/delegate.php:171
 msgid "Parent User"
 msgstr "Parent user"
 
-#: mod/delegate.php:173
+#: mod/delegate.php:174
 msgid ""
 "Parent users have total control about this account, including the account "
 "settings. Please double check whom you give this access."
 msgstr "Parent users have total control of this account, including core settings. Please double-check whom you grant such access."
 
-#: mod/delegate.php:175 src/Content/Nav.php:258
+#: mod/delegate.php:176 src/Content/Nav.php:261
 msgid "Delegate Page Management"
 msgstr "Delegate Page Management"
 
-#: mod/delegate.php:176
+#: mod/delegate.php:177
 msgid "Delegates"
 msgstr "Delegates"
 
-#: mod/delegate.php:178
+#: mod/delegate.php:179
 msgid ""
 "Delegates are able to manage all aspects of this account/page except for "
 "basic account settings. Please do not delegate your personal account to "
 "anybody that you do not trust completely."
 msgstr "Delegates are able to manage all aspects of this account except for key setting features. Please do not delegate your personal account to anybody that you do not trust completely."
 
-#: mod/delegate.php:179
+#: mod/delegate.php:180
 msgid "Existing Page Delegates"
 msgstr "Existing page delegates"
 
-#: mod/delegate.php:181
+#: mod/delegate.php:182
 msgid "Potential Delegates"
 msgstr "Potential delegates"
 
-#: mod/delegate.php:183 mod/tagrm.php:112
+#: mod/delegate.php:184 mod/tagrm.php:114
 msgid "Remove"
 msgstr "Remove"
 
-#: mod/delegate.php:184
+#: mod/delegate.php:185
 msgid "Add"
 msgstr "Add"
 
-#: mod/delegate.php:185
+#: mod/delegate.php:186
 msgid "No entries."
 msgstr "No entries."
 
-#: mod/dfrn_confirm.php:75 mod/profiles.php:42 mod/profiles.php:152
-#: mod/profiles.php:197 mod/profiles.php:527
+#: mod/dfrn_confirm.php:72 mod/profiles.php:43 mod/profiles.php:152
+#: mod/profiles.php:196 mod/profiles.php:511
 msgid "Profile not found."
 msgstr "Profile not found."
 
-#: mod/dfrn_confirm.php:131
+#: mod/dfrn_confirm.php:128
 msgid ""
 "This may occasionally happen if contact was requested by both persons and it"
 " has already been approved."
 msgstr "This may occasionally happen if contact was requested by both persons and it has already been approved."
 
-#: mod/dfrn_confirm.php:241
+#: mod/dfrn_confirm.php:238
 msgid "Response from remote site was not understood."
 msgstr "Response from remote site was not understood."
 
-#: mod/dfrn_confirm.php:248 mod/dfrn_confirm.php:254
+#: mod/dfrn_confirm.php:245 mod/dfrn_confirm.php:251
 msgid "Unexpected response from remote site: "
 msgstr "Unexpected response from remote site: "
 
-#: mod/dfrn_confirm.php:263
+#: mod/dfrn_confirm.php:260
 msgid "Confirmation completed successfully."
 msgstr "Confirmation completed successfully."
 
-#: mod/dfrn_confirm.php:275
+#: mod/dfrn_confirm.php:272
 msgid "Temporary failure. Please wait and try again."
 msgstr "Temporary failure. Please wait and try again."
 
-#: mod/dfrn_confirm.php:278
+#: mod/dfrn_confirm.php:275
 msgid "Introduction failed or was revoked."
 msgstr "Introduction failed or was revoked."
 
-#: mod/dfrn_confirm.php:283
+#: mod/dfrn_confirm.php:280
 msgid "Remote site reported: "
 msgstr "Remote site reported: "
 
-#: mod/dfrn_confirm.php:384
+#: mod/dfrn_confirm.php:386
 msgid "Unable to set contact photo."
 msgstr "Unable to set contact photo."
 
-#: mod/dfrn_confirm.php:446
+#: mod/dfrn_confirm.php:448
 #, php-format
 msgid "No user record found for '%s' "
 msgstr "No user record found for '%s' "
 
-#: mod/dfrn_confirm.php:456
+#: mod/dfrn_confirm.php:458
 msgid "Our site encryption key is apparently messed up."
 msgstr "Our site encryption key is apparently messed up."
 
-#: mod/dfrn_confirm.php:467
+#: mod/dfrn_confirm.php:469
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr "An empty URL was provided, or the URL could not be decrypted by us."
 
-#: mod/dfrn_confirm.php:483
+#: mod/dfrn_confirm.php:485
 msgid "Contact record was not found for you on our site."
 msgstr "Contact record was not found for you on our site."
 
-#: mod/dfrn_confirm.php:497
+#: mod/dfrn_confirm.php:499
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr "Site public key not available in contact record for URL %s."
 
-#: mod/dfrn_confirm.php:513
+#: mod/dfrn_confirm.php:515
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr "The ID provided by your system is a duplicate on our system. It should work if you try again."
 
-#: mod/dfrn_confirm.php:524
+#: mod/dfrn_confirm.php:526
 msgid "Unable to set your contact credentials on our system."
 msgstr "Unable to set your contact credentials on our system."
 
-#: mod/dfrn_confirm.php:580
+#: mod/dfrn_confirm.php:582
 msgid "Unable to update your contact profile details on our system"
 msgstr "Unable to update your contact profile details on our system"
 
-#: mod/dfrn_confirm.php:610 mod/dfrn_request.php:564
-#: src/Model/Contact.php:1919
+#: mod/dfrn_confirm.php:612 mod/dfrn_request.php:560
+#: src/Model/Contact.php:2026
 msgid "[Name Withheld]"
 msgstr "[Name Withheld]"
 
-#: mod/dfrn_poll.php:128 mod/dfrn_poll.php:537
+#: mod/dfrn_poll.php:125 mod/dfrn_poll.php:530
 #, php-format
 msgid "%1$s welcomes %2$s"
 msgstr "%1$s welcomes %2$s"
 
-#: mod/dfrn_request.php:97
+#: mod/dfrn_request.php:98
 msgid "This introduction has already been accepted."
 msgstr "This introduction has already been accepted."
 
-#: mod/dfrn_request.php:115 mod/dfrn_request.php:356
+#: mod/dfrn_request.php:116 mod/dfrn_request.php:354
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "Profile location is not valid or does not contain profile information."
 
-#: mod/dfrn_request.php:119 mod/dfrn_request.php:360
+#: mod/dfrn_request.php:120 mod/dfrn_request.php:358
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "Warning: profile location has no identifiable owner name."
 
-#: mod/dfrn_request.php:122 mod/dfrn_request.php:363
+#: mod/dfrn_request.php:123 mod/dfrn_request.php:361
 msgid "Warning: profile location has no profile photo."
 msgstr "Warning: profile location has no profile photo."
 
-#: mod/dfrn_request.php:126 mod/dfrn_request.php:367
+#: mod/dfrn_request.php:127 mod/dfrn_request.php:365
 #, 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] "%d required parameter was not found at the given location"
 msgstr[1] "%d required parameters were not found at the given location"
 
-#: mod/dfrn_request.php:164
+#: mod/dfrn_request.php:165
 msgid "Introduction complete."
 msgstr "Introduction complete."
 
-#: mod/dfrn_request.php:200
+#: mod/dfrn_request.php:201
 msgid "Unrecoverable protocol error."
 msgstr "Unrecoverable protocol error."
 
-#: mod/dfrn_request.php:227
+#: mod/dfrn_request.php:228
 msgid "Profile unavailable."
 msgstr "Profile unavailable."
 
@@ -3386,159 +3443,159 @@ msgstr "Spam protection measures have been invoked."
 msgid "Friends are advised to please try again in 24 hours."
 msgstr "Friends are advised to please try again in 24 hours."
 
-#: mod/dfrn_request.php:277
+#: mod/dfrn_request.php:275
 msgid "Invalid locator"
 msgstr "Invalid locator"
 
-#: mod/dfrn_request.php:313
+#: mod/dfrn_request.php:311
 msgid "You have already introduced yourself here."
 msgstr "You have already introduced yourself here."
 
-#: mod/dfrn_request.php:316
+#: mod/dfrn_request.php:314
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "Apparently you are already friends with %s."
 
-#: mod/dfrn_request.php:336
+#: mod/dfrn_request.php:334
 msgid "Invalid profile URL."
 msgstr "Invalid profile URL."
 
-#: mod/dfrn_request.php:342 src/Model/Contact.php:1598
+#: mod/dfrn_request.php:340 src/Model/Contact.php:1697
 msgid "Disallowed profile URL."
 msgstr "Disallowed profile URL."
 
-#: mod/dfrn_request.php:415 src/Module/Contact.php:240
+#: mod/dfrn_request.php:413 src/Module/Contact.php:235
 msgid "Failed to update contact record."
 msgstr "Failed to update contact record."
 
-#: mod/dfrn_request.php:435
+#: mod/dfrn_request.php:433
 msgid "Your introduction has been sent."
 msgstr "Your introduction has been sent."
 
-#: mod/dfrn_request.php:473
+#: mod/dfrn_request.php:471
 msgid ""
 "Remote subscription can't be done for your network. Please subscribe "
 "directly on your system."
 msgstr "Remote subscription can't be done for your network. Please subscribe directly on your system."
 
-#: mod/dfrn_request.php:489
+#: mod/dfrn_request.php:487
 msgid "Please login to confirm introduction."
 msgstr "Please login to confirm introduction."
 
-#: mod/dfrn_request.php:497
+#: mod/dfrn_request.php:495
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "Incorrect identity currently logged in. Please login to <strong>this</strong> profile."
 
-#: mod/dfrn_request.php:511 mod/dfrn_request.php:528
+#: mod/dfrn_request.php:509 mod/dfrn_request.php:524
 msgid "Confirm"
 msgstr "Confirm"
 
-#: mod/dfrn_request.php:523
+#: mod/dfrn_request.php:520
 msgid "Hide this contact"
 msgstr "Hide this contact"
 
-#: mod/dfrn_request.php:526
+#: mod/dfrn_request.php:522
 #, php-format
 msgid "Welcome home %s."
 msgstr "Welcome home %s."
 
-#: mod/dfrn_request.php:527
+#: mod/dfrn_request.php:523
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "Please confirm your introduction/connection request to %s."
 
-#: mod/dfrn_request.php:637
+#: mod/dfrn_request.php:632
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr "Please enter your 'Identity address' from one of the following supported communications networks:"
 
-#: mod/dfrn_request.php:640
+#: mod/dfrn_request.php:634
 #, php-format
 msgid ""
 "If you are not yet a member of the free social web, <a href=\"%s\">follow "
 "this link to find a public Friendica site and join us today</a>."
 msgstr "If you are not yet part of the free social web, <a href=\"%s\">follow this link to find a public Friendica site and join us today</a>."
 
-#: mod/dfrn_request.php:645
+#: mod/dfrn_request.php:637
 msgid "Friend/Connection Request"
 msgstr "Friend/Connection request"
 
-#: mod/dfrn_request.php:646
+#: mod/dfrn_request.php:638
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@gnusocial.de"
 msgstr "Examples: jojo@demo.friendi.ca, http://demo.friendi.ca/profile/jojo, user@gnusocial.de"
 
-#: mod/dfrn_request.php:647 mod/follow.php:153
+#: mod/dfrn_request.php:639 mod/follow.php:149
 msgid "Please answer the following:"
 msgstr "Please answer the following:"
 
-#: mod/dfrn_request.php:648 mod/follow.php:154
+#: mod/dfrn_request.php:640 mod/follow.php:150
 #, php-format
 msgid "Does %s know you?"
 msgstr "Does %s know you?"
 
-#: mod/dfrn_request.php:649 mod/follow.php:155
+#: mod/dfrn_request.php:641 mod/follow.php:151
 msgid "Add a personal note:"
 msgstr "Add a personal note:"
 
-#: mod/dfrn_request.php:651
+#: mod/dfrn_request.php:643
 msgid "Friendica"
 msgstr "Friendica"
 
-#: mod/dfrn_request.php:652
+#: mod/dfrn_request.php:644
 msgid "GNU Social (Pleroma, Mastodon)"
 msgstr "GNU Social (Pleroma, Mastodon)"
 
-#: mod/dfrn_request.php:653
+#: mod/dfrn_request.php:645
 msgid "Diaspora (Socialhome, Hubzilla)"
 msgstr "Diaspora (Socialhome, Hubzilla)"
 
-#: mod/dfrn_request.php:654
+#: mod/dfrn_request.php:646
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
 msgstr " - please do not use this form.  Instead, enter %s into your Diaspora search bar."
 
-#: mod/dfrn_request.php:655 mod/follow.php:161 mod/unfollow.php:130
+#: mod/dfrn_request.php:647 mod/follow.php:157 mod/unfollow.php:128
 msgid "Your Identity Address:"
 msgstr "My identity address:"
 
-#: mod/dfrn_request.php:657 mod/follow.php:66 mod/unfollow.php:133
+#: mod/dfrn_request.php:649 mod/follow.php:65 mod/unfollow.php:131
 msgid "Submit Request"
 msgstr "Submit request"
 
-#: mod/directory.php:154 mod/events.php:547 mod/notifications.php:251
-#: src/Model/Event.php:70 src/Model/Event.php:97 src/Model/Event.php:439
-#: src/Model/Event.php:930 src/Model/Profile.php:434
-#: src/Module/Contact.php:650
+#: mod/directory.php:154 mod/events.php:541 mod/notifications.php:253
+#: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:438
+#: src/Model/Event.php:934 src/Model/Profile.php:443
+#: src/Module/Contact.php:643
 msgid "Location:"
 msgstr "Location:"
 
-#: mod/directory.php:159 mod/notifications.php:257 src/Model/Profile.php:437
+#: mod/directory.php:159 mod/notifications.php:259 src/Model/Profile.php:446
 #: src/Model/Profile.php:758
 msgid "Gender:"
 msgstr "Gender:"
 
-#: mod/directory.php:160 src/Model/Profile.php:438 src/Model/Profile.php:782
+#: mod/directory.php:160 src/Model/Profile.php:447 src/Model/Profile.php:782
 msgid "Status:"
 msgstr "Status:"
 
-#: mod/directory.php:161 src/Model/Profile.php:439 src/Model/Profile.php:799
+#: mod/directory.php:161 src/Model/Profile.php:448 src/Model/Profile.php:799
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: mod/directory.php:162 mod/notifications.php:253 src/Model/Profile.php:440
-#: src/Model/Profile.php:819 src/Module/Contact.php:654
+#: mod/directory.php:162 mod/notifications.php:255 src/Model/Profile.php:449
+#: src/Model/Profile.php:819 src/Module/Contact.php:647
 msgid "About:"
 msgstr "About:"
 
-#: mod/directory.php:210 src/Content/Widget.php:72
-#: view/theme/vier/theme.php:208
+#: mod/directory.php:210 view/theme/vier/theme.php:208
+#: src/Content/Widget.php:70
 msgid "Global Directory"
 msgstr "Global Directory"
 
@@ -3554,8 +3611,8 @@ msgstr "Results for:"
 msgid "Site Directory"
 msgstr "Site directory"
 
-#: mod/directory.php:217 src/Content/Widget.php:67 src/Module/Contact.php:822
-#: view/theme/vier/theme.php:203
+#: mod/directory.php:217 view/theme/vier/theme.php:203
+#: src/Content/Widget.php:65 src/Module/Contact.php:817
 msgid "Find"
 msgstr "Find"
 
@@ -3573,7 +3630,7 @@ msgstr "People search - %s"
 msgid "Forum Search - %s"
 msgstr "Forum search - %s"
 
-#: mod/dirfind.php:261 mod/match.php:125
+#: mod/dirfind.php:259 mod/match.php:130
 msgid "No matches"
 msgstr "No matches"
 
@@ -3585,334 +3642,333 @@ msgstr "Item not found"
 msgid "Edit post"
 msgstr "Edit post"
 
-#: mod/editpost.php:94 mod/filer.php:38 mod/notes.php:54
-#: src/Content/Text/HTML.php:961
+#: mod/editpost.php:73 mod/filer.php:36 mod/notes.php:46
+#: src/Content/Text/HTML.php:894
 msgid "Save"
 msgstr "Save"
 
-#: mod/editpost.php:99 mod/message.php:263 mod/message.php:425
+#: mod/editpost.php:78 mod/message.php:259 mod/message.php:440
 #: mod/wallmessage.php:140
 msgid "Insert web link"
 msgstr "Insert web link"
 
-#: mod/editpost.php:100
+#: mod/editpost.php:79
 msgid "web link"
 msgstr "web link"
 
-#: mod/editpost.php:101
+#: mod/editpost.php:80
 msgid "Insert video link"
 msgstr "Insert video link"
 
-#: mod/editpost.php:102
+#: mod/editpost.php:81
 msgid "video link"
 msgstr "video link"
 
-#: mod/editpost.php:103
+#: mod/editpost.php:82
 msgid "Insert audio link"
 msgstr "Insert audio link"
 
-#: mod/editpost.php:104
+#: mod/editpost.php:83
 msgid "audio link"
 msgstr "audio link"
 
-#: mod/editpost.php:119 src/Core/ACL.php:305
+#: mod/editpost.php:98 src/Core/ACL.php:307
 msgid "CC: email addresses"
 msgstr "CC: email addresses"
 
-#: mod/editpost.php:126 src/Core/ACL.php:306
+#: mod/editpost.php:105 src/Core/ACL.php:308
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Example: bob@example.com, mary@example.com"
 
-#: mod/events.php:109 mod/events.php:111
+#: mod/events.php:117 mod/events.php:119
 msgid "Event can not end before it has started."
 msgstr "Event cannot end before it has started."
 
-#: mod/events.php:118 mod/events.php:120
+#: mod/events.php:126 mod/events.php:128
 msgid "Event title and start time are required."
 msgstr "Event title and starting time are required."
 
-#: mod/events.php:392
+#: mod/events.php:386
 msgid "Create New Event"
 msgstr "Create new event"
 
-#: mod/events.php:515
+#: mod/events.php:509
 msgid "Event details"
 msgstr "Event details"
 
-#: mod/events.php:516
+#: mod/events.php:510
 msgid "Starting date and Title are required."
 msgstr "Starting date and title are required."
 
-#: mod/events.php:517 mod/events.php:522
+#: mod/events.php:511 mod/events.php:516
 msgid "Event Starts:"
 msgstr "Event starts:"
 
-#: mod/events.php:517 mod/events.php:549 mod/profiles.php:608
+#: mod/events.php:511 mod/events.php:543 mod/profiles.php:592
 msgid "Required"
 msgstr "Required"
 
-#: mod/events.php:530 mod/events.php:555
+#: mod/events.php:524 mod/events.php:549
 msgid "Finish date/time is not known or not relevant"
 msgstr "Finish date/time is not known or not relevant"
 
-#: mod/events.php:532 mod/events.php:537
+#: mod/events.php:526 mod/events.php:531
 msgid "Event Finishes:"
 msgstr "Event finishes:"
 
-#: mod/events.php:543 mod/events.php:556
+#: mod/events.php:537 mod/events.php:550
 msgid "Adjust for viewer timezone"
 msgstr "Adjust for viewer's time zone"
 
-#: mod/events.php:545
+#: mod/events.php:539
 msgid "Description:"
 msgstr "Description:"
 
-#: mod/events.php:549 mod/events.php:551
+#: mod/events.php:543 mod/events.php:545
 msgid "Title:"
 msgstr "Title:"
 
-#: mod/events.php:552 mod/events.php:553
+#: mod/events.php:546 mod/events.php:547
 msgid "Share this event"
 msgstr "Share this event"
 
-#: mod/events.php:560 src/Model/Profile.php:877
+#: mod/events.php:554 src/Model/Profile.php:877
 msgid "Basic"
 msgstr "Basic"
 
-#: mod/events.php:562 mod/photos.php:1111 mod/photos.php:1452
-#: src/Core/ACL.php:308
+#: mod/events.php:556 mod/photos.php:1067 mod/photos.php:1408
+#: src/Core/ACL.php:310
 msgid "Permissions"
 msgstr "Permissions"
 
-#: mod/events.php:578
+#: mod/events.php:572
 msgid "Failed to remove event"
 msgstr "Failed to remove event"
 
-#: mod/events.php:580
+#: mod/events.php:574
 msgid "Event removed"
 msgstr "Event removed"
 
-#: mod/fbrowser.php:36 src/Content/Nav.php:155 src/Model/Profile.php:917
-#: view/theme/frio/theme.php:275
+#: mod/fbrowser.php:36 view/theme/frio/theme.php:264 src/Content/Nav.php:158
+#: src/Model/Profile.php:917
 msgid "Photos"
 msgstr "Photos"
 
-#: mod/fbrowser.php:45 mod/fbrowser.php:70 mod/photos.php:204
-#: mod/photos.php:1075 mod/photos.php:1170 mod/photos.php:1187
-#: mod/photos.php:1654 mod/photos.php:1669 src/Model/Photo.php:244
-#: src/Model/Photo.php:253
+#: mod/fbrowser.php:45 mod/fbrowser.php:69 mod/photos.php:201
+#: mod/photos.php:1031 mod/photos.php:1126 mod/photos.php:1143
+#: mod/photos.php:1610 mod/photos.php:1625 src/Model/Photo.php:547
+#: src/Model/Photo.php:556
 msgid "Contact Photos"
 msgstr "Contact photos"
 
-#: mod/fbrowser.php:107 mod/fbrowser.php:138 mod/profile_photo.php:251
+#: mod/fbrowser.php:106 mod/fbrowser.php:136 mod/profile_photo.php:254
 msgid "Upload"
 msgstr "Upload"
 
-#: mod/fbrowser.php:133
+#: mod/fbrowser.php:131
 msgid "Files"
 msgstr "Files"
 
-#: mod/feedtest.php:22
+#: mod/feedtest.php:18
 msgid "You must be logged in to use this module"
 msgstr "You must be logged in to use this module"
 
-#: mod/feedtest.php:49
+#: mod/feedtest.php:45
 msgid "Source URL"
 msgstr "Source URL"
 
-#: mod/fetch.php:21 mod/fetch.php:48 mod/fetch.php:55 mod/help.php:64
-#: src/App.php:1704
-msgid "Not Found"
-msgstr "Not found"
-
-#: mod/filer.php:37
+#: mod/filer.php:35
 msgid "- select -"
 msgstr "- select -"
 
-#: mod/follow.php:47
+#: mod/follow.php:46
 msgid "The contact could not be added."
 msgstr "Contact could not be added."
 
-#: mod/follow.php:77
+#: mod/follow.php:76
 msgid "You already added this contact."
 msgstr "You already added this contact."
 
-#: mod/follow.php:87
+#: mod/follow.php:86
 msgid "Diaspora support isn't enabled. Contact can't be added."
 msgstr "Diaspora support isn't enabled. Contact can't be added."
 
-#: mod/follow.php:94
+#: mod/follow.php:93
 msgid "OStatus support is disabled. Contact can't be added."
 msgstr "OStatus support is disabled. Contact can't be added."
 
-#: mod/follow.php:101
+#: mod/follow.php:100
 msgid "The network type couldn't be detected. Contact can't be added."
 msgstr "The network type couldn't be detected. Contact can't be added."
 
-#: mod/follow.php:181 mod/notifications.php:255 src/Model/Profile.php:807
-#: src/Module/Contact.php:656
+#: mod/follow.php:170 mod/notifications.php:257 src/Model/Profile.php:807
+#: src/Module/Contact.php:649
 msgid "Tags:"
 msgstr "Tags:"
 
-#: mod/follow.php:193 mod/unfollow.php:149 src/Model/Profile.php:904
-#: src/Module/Contact.php:869
+#: mod/follow.php:182 mod/unfollow.php:147 src/Model/Profile.php:904
+#: src/Module/Contact.php:864
 msgid "Status Messages and Posts"
 msgstr "Status Messages and Posts"
 
-#: mod/friendica.php:79
+#: mod/friendica.php:88
 #, php-format
 msgid ""
 "This is Friendica, version %s that is running at the web location %s. The "
 "database version is %s, the post update version is %s."
 msgstr ""
 
-#: mod/friendica.php:85
+#: mod/friendica.php:94
 msgid ""
 "Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
 "about the Friendica project."
 msgstr "Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."
 
-#: mod/friendica.php:89
+#: mod/friendica.php:98
 msgid "Bug reports and issues: please visit"
 msgstr "Bug reports and issues: please visit"
 
-#: mod/friendica.php:89
+#: mod/friendica.php:98
 msgid "the bugtracker at github"
 msgstr "the bugtracker at github"
 
-#: mod/friendica.php:92
+#: mod/friendica.php:101
 msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
 msgstr "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
 
-#: mod/friendica.php:97
+#: mod/friendica.php:106
 msgid "Installed addons/apps:"
 msgstr "Installed addons/apps:"
 
-#: mod/friendica.php:111
+#: mod/friendica.php:120
 msgid "No installed addons/apps"
 msgstr "No installed addons/apps"
 
-#: mod/friendica.php:116
+#: mod/friendica.php:125
 #, php-format
 msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
 msgstr "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
 
-#: mod/friendica.php:121
+#: mod/friendica.php:130
 msgid "On this server the following remote servers are blocked."
 msgstr "On this server the following remote servers are blocked."
 
-#: mod/fsuggest.php:73
+#: mod/fsuggest.php:69
 msgid "Friend suggestion sent."
 msgstr "Friend suggestion sent"
 
-#: mod/fsuggest.php:102
+#: mod/fsuggest.php:93
 msgid "Suggest Friends"
 msgstr "Suggest friends"
 
-#: mod/fsuggest.php:104
+#: mod/fsuggest.php:95
 #, php-format
 msgid "Suggest a friend for %s"
 msgstr "Suggest a friend for %s"
 
-#: mod/group.php:40
+#: mod/group.php:38
 msgid "Group created."
 msgstr "Group created."
 
-#: mod/group.php:46
+#: mod/group.php:44
 msgid "Could not create group."
 msgstr "Could not create group."
 
-#: mod/group.php:60 mod/group.php:187
+#: mod/group.php:58 mod/group.php:184
 msgid "Group not found."
 msgstr "Group not found."
 
-#: mod/group.php:74
+#: mod/group.php:72
 msgid "Group name changed."
 msgstr "Group name changed."
 
-#: mod/group.php:87 mod/profperm.php:30 src/App.php:1785
+#: mod/group.php:85 mod/profperm.php:30 src/App.php:1481
 msgid "Permission denied"
 msgstr "Permission denied"
 
-#: mod/group.php:105
+#: mod/group.php:103
 msgid "Save Group"
 msgstr "Save group"
 
-#: mod/group.php:106
+#: mod/group.php:104
 msgid "Filter"
 msgstr ""
 
-#: mod/group.php:111
+#: mod/group.php:109
 msgid "Create a group of contacts/friends."
 msgstr "Create a group of contacts/friends."
 
-#: mod/group.php:112 mod/group.php:136 mod/group.php:229
-#: src/Model/Group.php:419
+#: mod/group.php:110 mod/group.php:133 mod/group.php:224
+#: src/Model/Group.php:423
 msgid "Group Name: "
 msgstr "Group name: "
 
-#: mod/group.php:127 src/Model/Group.php:416
+#: mod/group.php:125 src/Model/Group.php:420
 msgid "Contacts not in any group"
 msgstr "Contacts not in any group"
 
-#: mod/group.php:159
+#: mod/group.php:156
 msgid "Group removed."
 msgstr "Group removed."
 
-#: mod/group.php:161
+#: mod/group.php:158
 msgid "Unable to remove group."
 msgstr "Unable to remove group."
 
-#: mod/group.php:222
+#: mod/group.php:217
 msgid "Delete Group"
 msgstr "Delete group"
 
-#: mod/group.php:233
+#: mod/group.php:228
 msgid "Edit Group Name"
 msgstr "Edit group name"
 
-#: mod/group.php:244
+#: mod/group.php:239
 msgid "Members"
 msgstr "Members"
 
-#: mod/group.php:246 src/Module/Contact.php:711
+#: mod/group.php:241 src/Module/Contact.php:704
 msgid "All Contacts"
 msgstr "All contacts"
 
-#: mod/group.php:247 mod/network.php:659
+#: mod/group.php:242 mod/network.php:654
 msgid "Group is empty"
 msgstr "Group is empty"
 
-#: mod/group.php:260
+#: mod/group.php:255
 msgid "Remove contact from group"
 msgstr "Remove contact from group"
 
-#: mod/group.php:278 mod/profperm.php:119
+#: mod/group.php:273 mod/profperm.php:119
 msgid "Click on a contact to add or remove."
 msgstr "Click on a contact to add or remove it."
 
-#: mod/group.php:292
+#: mod/group.php:287
 msgid "Add contact to group"
 msgstr "Add contact to group"
 
-#: mod/hcard.php:19
+#: mod/hcard.php:20
 msgid "No profile"
 msgstr "No profile"
 
-#: mod/help.php:51
+#: mod/help.php:52
 msgid "Help:"
 msgstr "Help:"
 
-#: mod/help.php:58 src/Content/Nav.php:187 view/theme/vier/theme.php:297
+#: mod/help.php:59 view/theme/vier/theme.php:294 src/Content/Nav.php:190
 msgid "Help"
 msgstr "Help"
 
+#: mod/help.php:65 src/App.php:1399
+msgid "Not Found"
+msgstr "Not found"
+
 #: mod/home.php:40
 #, php-format
 msgid "Welcome to %s"
 msgstr "Welcome to %s"
 
-#: mod/invite.php:38
+#: mod/invite.php:36
 msgid "Total invitation limit exceeded."
 msgstr "Total invitation limit exceeded"
 
@@ -3995,7 +4051,7 @@ msgstr "Send invitations"
 msgid "Enter email addresses, one per line:"
 msgstr "Enter email addresses, one per line:"
 
-#: mod/invite.php:149 mod/message.php:259 mod/message.php:420
+#: mod/invite.php:149 mod/message.php:255 mod/message.php:435
 #: mod/wallmessage.php:137
 msgid "Your message:"
 msgstr "Your message:"
@@ -4025,34 +4081,34 @@ msgstr "For more information about the Friendica project and why we feel it is i
 msgid "Unable to locate original post."
 msgstr "Unable to locate original post."
 
-#: mod/item.php:288
+#: mod/item.php:320
 msgid "Empty post discarded."
 msgstr "Empty post discarded."
 
-#: mod/item.php:810
+#: mod/item.php:841
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "This message was sent to you by %s, a member of the Friendica social network."
 
-#: mod/item.php:812
+#: mod/item.php:843
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "You may visit them online at %s"
 
-#: mod/item.php:813
+#: mod/item.php:844
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "Please contact the sender by replying to this post if you do not wish to receive these messages."
 
-#: mod/item.php:817
+#: mod/item.php:848
 #, php-format
 msgid "%s posted an update."
 msgstr "%s posted an update."
 
-#: mod/localtime.php:19 src/Model/Event.php:38 src/Model/Event.php:844
+#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:848
 msgid "l F d, Y \\@ g:i A"
 msgstr "l F d, Y \\@ g:i A"
 
@@ -4093,15 +4149,15 @@ msgstr "Remote privacy information not available."
 msgid "Visible to:"
 msgstr "Visible to:"
 
-#: mod/lostpass.php:30
+#: mod/lostpass.php:26
 msgid "No valid account found."
 msgstr "No valid account found."
 
-#: mod/lostpass.php:42
+#: mod/lostpass.php:38
 msgid "Password reset request issued. Check your email."
 msgstr "Password reset request issued. Please check your email."
 
-#: mod/lostpass.php:48
+#: mod/lostpass.php:44
 #, php-format
 msgid ""
 "\n"
@@ -4117,7 +4173,7 @@ msgid ""
 "\t\tissued this request."
 msgstr "\n\t\tDear %1$s,\n\t\t\tA request was received at \"%2$s\" to reset your account password\n\t\tTo confirm this request, please select the verification link\n\t\tbelow or paste it into your web browser's address bar.\n\n\t\tIf you did NOT request this change, please DO NOT follow the link\n\t\tprovided; ignore or delete this email, as the request will expire shortly.\n\n\t\tYour password will not be changed unless we can verify that you\n\t\tissued this request."
 
-#: mod/lostpass.php:59
+#: mod/lostpass.php:55
 #, php-format
 msgid ""
 "\n"
@@ -4134,66 +4190,66 @@ msgid ""
 "\t\tLogin Name:\t%3$s"
 msgstr "\n\t\tFollow this link soon to verify your identity:\n\n\t\t%1$s\n\n\t\tYou will then receive a follow-up message containing the new password.\n\t\tYou may change that password from your account settings page after logging in.\n\n\t\tThe login details are as follows:\n\n\t\tSite Location:\t%2$s\n\t\tLogin Name:\t%3$s"
 
-#: mod/lostpass.php:78
+#: mod/lostpass.php:74
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Password reset requested at %s"
 
-#: mod/lostpass.php:94
+#: mod/lostpass.php:89
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "Request could not be verified. (You may have previously submitted it.) Password reset failed."
 
-#: mod/lostpass.php:107
+#: mod/lostpass.php:102
 msgid "Request has expired, please make a new one."
 msgstr "Request has expired, please make a new one."
 
-#: mod/lostpass.php:122
+#: mod/lostpass.php:117
 msgid "Forgot your Password?"
 msgstr "Reset My Password"
 
-#: mod/lostpass.php:123
+#: mod/lostpass.php:118
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Enter email address or nickname to reset your password. You will receive further instruction via email."
 
-#: mod/lostpass.php:124 src/Module/Login.php:324
+#: mod/lostpass.php:119 src/Module/Login.php:324
 msgid "Nickname or Email: "
 msgstr "Nickname or email: "
 
-#: mod/lostpass.php:125
+#: mod/lostpass.php:120
 msgid "Reset"
 msgstr "Reset"
 
-#: mod/lostpass.php:141 src/Module/Login.php:336
+#: mod/lostpass.php:135 src/Module/Login.php:336
 msgid "Password Reset"
 msgstr "Forgotten password?"
 
-#: mod/lostpass.php:142
+#: mod/lostpass.php:136
 msgid "Your password has been reset as requested."
 msgstr "Your password has been reset as requested."
 
-#: mod/lostpass.php:143
+#: mod/lostpass.php:137
 msgid "Your new password is"
 msgstr "Your new password is"
 
-#: mod/lostpass.php:144
+#: mod/lostpass.php:138
 msgid "Save or copy your new password - and then"
 msgstr "Save or copy your new password - and then"
 
-#: mod/lostpass.php:145
+#: mod/lostpass.php:139
 msgid "click here to login"
 msgstr "click here to login"
 
-#: mod/lostpass.php:146
+#: mod/lostpass.php:140
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "Your password may be changed from the <em>Settings</em> page after successful login."
 
-#: mod/lostpass.php:154
+#: mod/lostpass.php:148
 #, php-format
 msgid ""
 "\n"
@@ -4204,7 +4260,7 @@ msgid ""
 "\t\t"
 msgstr "\n\t\t\tDear %1$s,\n\t\t\t\tYour password has been changed as requested. Please retain this\n\t\t\tinformation for your records (or change your password immediately to\n\t\t\tsomething that you will remember).\n\t\t"
 
-#: mod/lostpass.php:160
+#: mod/lostpass.php:154
 #, php-format
 msgid ""
 "\n"
@@ -4218,171 +4274,171 @@ msgid ""
 "\t\t"
 msgstr "\n\t\t\tYour login details are as follows:\n\n\t\t\tSite Location:\t%1$s\n\t\t\tLogin Name:\t%2$s\n\t\t\tPassword:\t%3$s\n\n\t\t\tYou may change that password from your account settings page after logging in.\n\t\t"
 
-#: mod/lostpass.php:176
+#: mod/lostpass.php:170
 #, php-format
 msgid "Your password has been changed at %s"
 msgstr "Your password has been changed at %s"
 
-#: mod/maintenance.php:26
-msgid "System down for maintenance"
-msgstr "Sorry, the system is currently down for maintenance."
-
-#: mod/manage.php:181
+#: mod/manage.php:178
 msgid "Manage Identities and/or Pages"
 msgstr "Manage Identities and Pages"
 
-#: mod/manage.php:182
+#: mod/manage.php:179
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
 msgstr "Accounts that I manage or own."
 
-#: mod/manage.php:183
+#: mod/manage.php:180
 msgid "Select an identity to manage: "
 msgstr "Select identity:"
 
-#: mod/match.php:51
+#: mod/match.php:49
 msgid "No keywords to match. Please add keywords to your default profile."
 msgstr "No keywords to match. Please add keywords to your default profile."
 
-#: mod/match.php:106
-msgid "is interested in:"
-msgstr "is interested in:"
+#: mod/match.php:115 src/Content/Pager.php:198
+msgid "first"
+msgstr "first"
 
-#: mod/match.php:120
+#: mod/match.php:120 src/Content/Pager.php:258
+msgid "next"
+msgstr "next"
+
+#: mod/match.php:135
 msgid "Profile Match"
 msgstr "Profile Match"
 
-#: mod/message.php:35 mod/message.php:118 src/Content/Nav.php:252
+#: mod/message.php:33 mod/message.php:116 src/Content/Nav.php:255
 msgid "New Message"
 msgstr "New Message"
 
-#: mod/message.php:72 mod/wallmessage.php:60
+#: mod/message.php:70 mod/wallmessage.php:60
 msgid "No recipient selected."
 msgstr "No recipient selected."
 
-#: mod/message.php:76
+#: mod/message.php:74
 msgid "Unable to locate contact information."
 msgstr "Unable to locate contact information."
 
-#: mod/message.php:79 mod/wallmessage.php:66
+#: mod/message.php:77 mod/wallmessage.php:66
 msgid "Message could not be sent."
 msgstr "Message could not be sent."
 
-#: mod/message.php:82 mod/wallmessage.php:69
+#: mod/message.php:80 mod/wallmessage.php:69
 msgid "Message collection failure."
 msgstr "Message collection failure."
 
-#: mod/message.php:85 mod/wallmessage.php:72
+#: mod/message.php:83 mod/wallmessage.php:72
 msgid "Message sent."
 msgstr "Message sent."
 
-#: mod/message.php:112 mod/notifications.php:47 mod/notifications.php:185
-#: mod/notifications.php:233
+#: mod/message.php:110 mod/notifications.php:47 mod/notifications.php:187
+#: mod/notifications.php:235
 msgid "Discard"
 msgstr "Discard"
 
-#: mod/message.php:125 src/Content/Nav.php:249 view/theme/frio/theme.php:282
+#: mod/message.php:123 view/theme/frio/theme.php:271 src/Content/Nav.php:252
 msgid "Messages"
 msgstr "Messages"
 
-#: mod/message.php:150
+#: mod/message.php:148
 msgid "Do you really want to delete this message?"
 msgstr "Do you really want to delete this message?"
 
-#: mod/message.php:168
+#: mod/message.php:166
 msgid "Conversation not found."
 msgstr ""
 
-#: mod/message.php:173
+#: mod/message.php:171
 msgid "Message deleted."
 msgstr "Message deleted."
 
-#: mod/message.php:178 mod/message.php:193
+#: mod/message.php:176 mod/message.php:190
 msgid "Conversation removed."
 msgstr "Conversation removed."
 
-#: mod/message.php:207 mod/message.php:347 mod/wallmessage.php:123
+#: mod/message.php:204 mod/message.php:360 mod/wallmessage.php:123
 msgid "Please enter a link URL:"
 msgstr "Please enter a link URL:"
 
-#: mod/message.php:250 mod/wallmessage.php:128
+#: mod/message.php:246 mod/wallmessage.php:128
 msgid "Send Private Message"
 msgstr "Send private message"
 
-#: mod/message.php:251 mod/message.php:415 mod/wallmessage.php:130
+#: mod/message.php:247 mod/message.php:430 mod/wallmessage.php:130
 msgid "To:"
 msgstr "To:"
 
-#: mod/message.php:255 mod/message.php:417 mod/wallmessage.php:131
+#: mod/message.php:251 mod/message.php:432 mod/wallmessage.php:131
 msgid "Subject:"
 msgstr "Subject:"
 
-#: mod/message.php:293
+#: mod/message.php:289
 msgid "No messages."
 msgstr "No messages."
 
-#: mod/message.php:334
+#: mod/message.php:352
 msgid "Message not available."
 msgstr "Message not available."
 
-#: mod/message.php:391
+#: mod/message.php:406
 msgid "Delete message"
 msgstr "Delete message"
 
-#: mod/message.php:393 mod/message.php:494
+#: mod/message.php:408 mod/message.php:540
 msgid "D, d M Y - g:i A"
 msgstr "D, d M Y - g:i A"
 
-#: mod/message.php:408 mod/message.php:491
+#: mod/message.php:423 mod/message.php:537
 msgid "Delete conversation"
 msgstr "Delete conversation"
 
-#: mod/message.php:410
+#: mod/message.php:425
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."
 
-#: mod/message.php:414
+#: mod/message.php:429
 msgid "Send Reply"
 msgstr "Send reply"
 
-#: mod/message.php:465
+#: mod/message.php:512
 #, php-format
 msgid "Unknown sender - %s"
 msgstr "Unknown sender - %s"
 
-#: mod/message.php:467
+#: mod/message.php:514
 #, php-format
 msgid "You and %s"
 msgstr "Me and %s"
 
-#: mod/message.php:469
+#: mod/message.php:516
 #, php-format
 msgid "%s and You"
 msgstr "%s and me"
 
-#: mod/message.php:497
+#: mod/message.php:543
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] "%d message"
 msgstr[1] "%d messages"
 
-#: mod/network.php:192 mod/search.php:40
+#: mod/network.php:183 mod/search.php:38
 msgid "Remove term"
 msgstr "Remove term"
 
-#: mod/network.php:199 mod/search.php:49
+#: mod/network.php:190 mod/search.php:47
 msgid "Saved Searches"
 msgstr "Saved searches"
 
-#: mod/network.php:200 src/Model/Group.php:410
+#: mod/network.php:191 src/Model/Group.php:414
 msgid "add"
 msgstr "add"
 
-#: mod/network.php:567
+#: mod/network.php:563
 #, php-format
 msgid ""
 "Warning: This group contains %s member from a network that doesn't allow non"
@@ -4393,85 +4449,85 @@ msgid_plural ""
 msgstr[0] "Warning: This group contains %s member from a network that doesn't allow non public messages."
 msgstr[1] "Warning: This group contains %s members from a network that doesn't allow non-public messages."
 
-#: mod/network.php:570
+#: mod/network.php:566
 msgid "Messages in this group won't be send to these receivers."
 msgstr "Messages in this group won't be sent to these receivers."
 
-#: mod/network.php:638
+#: mod/network.php:633
 msgid "No such group"
 msgstr "No such group"
 
-#: mod/network.php:663
+#: mod/network.php:658
 #, php-format
 msgid "Group: %s"
 msgstr "Group: %s"
 
-#: mod/network.php:689
+#: mod/network.php:684
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "Private messages to this person are at risk of public disclosure."
 
-#: mod/network.php:692
+#: mod/network.php:687
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: mod/network.php:970
+#: mod/network.php:966
 msgid "Commented Order"
 msgstr "Commented last"
 
-#: mod/network.php:973
+#: mod/network.php:969
 msgid "Sort by Comment Date"
 msgstr "Sort by comment date"
 
-#: mod/network.php:978
+#: mod/network.php:974
 msgid "Posted Order"
 msgstr "Posted last"
 
-#: mod/network.php:981
+#: mod/network.php:977
 msgid "Sort by Post Date"
 msgstr "Sort by post date"
 
-#: mod/network.php:988 mod/profiles.php:595
-#: src/Core/NotificationsManager.php:187
+#: mod/network.php:984 mod/profiles.php:579
+#: src/Core/NotificationsManager.php:189
 msgid "Personal"
 msgstr "Personal"
 
-#: mod/network.php:991
+#: mod/network.php:987
 msgid "Posts that mention or involve you"
 msgstr "Posts mentioning or involving me"
 
-#: mod/network.php:998
+#: mod/network.php:994
 msgid "New"
 msgstr "New"
 
-#: mod/network.php:1001
+#: mod/network.php:997
 msgid "Activity Stream - by date"
 msgstr "Activity Stream - by date"
 
-#: mod/network.php:1009
+#: mod/network.php:1005
 msgid "Shared Links"
 msgstr "Shared links"
 
-#: mod/network.php:1012
+#: mod/network.php:1008
 msgid "Interesting Links"
 msgstr "Interesting links"
 
-#: mod/network.php:1019
+#: mod/network.php:1015
 msgid "Starred"
 msgstr "Starred"
 
-#: mod/network.php:1022
+#: mod/network.php:1018
 msgid "Favourite Posts"
 msgstr "My favorite posts"
 
-#: mod/newmember.php:11
+#: mod/newmember.php:12
 msgid "Welcome to Friendica"
 msgstr "Welcome to Friendica"
 
-#: mod/newmember.php:12
+#: mod/newmember.php:13
 msgid "New Member Checklist"
 msgstr "New Member Checklist"
 
-#: mod/newmember.php:14
+#: mod/newmember.php:15
 msgid ""
 "We would like to offer some tips and links to help make your experience "
 "enjoyable. Click any item to visit the relevant page. A link to this page "
@@ -4479,33 +4535,33 @@ msgid ""
 "registration and then will quietly disappear."
 msgstr "We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."
 
-#: mod/newmember.php:15
+#: mod/newmember.php:16
 msgid "Getting Started"
 msgstr "Getting started"
 
-#: mod/newmember.php:17
+#: mod/newmember.php:18
 msgid "Friendica Walk-Through"
 msgstr "Friendica walk-through"
 
-#: mod/newmember.php:17
+#: mod/newmember.php:18
 msgid ""
 "On your <em>Quick Start</em> page - find a brief introduction to your "
 "profile and network tabs, make some new connections, and find some groups to"
 " join."
 msgstr "On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."
 
-#: mod/newmember.php:21
+#: mod/newmember.php:22
 msgid "Go to Your Settings"
 msgstr "Go to your settings"
 
-#: mod/newmember.php:21
+#: mod/newmember.php:22
 msgid ""
 "On your <em>Settings</em> page -  change your initial password. Also make a "
 "note of your Identity Address. This looks just like an email address - and "
 "will be useful in making friends on the free social web."
 msgstr "On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."
 
-#: mod/newmember.php:22
+#: mod/newmember.php:23
 msgid ""
 "Review the other settings, particularly the privacy settings. An unpublished"
 " directory listing is like having an unlisted phone number. In general, you "
@@ -4513,88 +4569,87 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr "Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."
 
-#: mod/newmember.php:24 mod/profperm.php:117 src/Content/Nav.php:154
-#: src/Model/Profile.php:743 src/Model/Profile.php:876
-#: src/Model/Profile.php:909 src/Module/Contact.php:661
-#: src/Module/Contact.php:874 view/theme/frio/theme.php:274
+#: mod/newmember.php:25 mod/profperm.php:117 view/theme/frio/theme.php:263
+#: src/Content/Nav.php:157 src/Model/Profile.php:876 src/Model/Profile.php:909
+#: src/Module/Contact.php:654 src/Module/Contact.php:869
 msgid "Profile"
 msgstr "Profile"
 
-#: mod/newmember.php:26 mod/profiles.php:599 mod/profile_photo.php:250
+#: mod/newmember.php:27 mod/profile_photo.php:253 mod/profiles.php:583
 msgid "Upload Profile Photo"
 msgstr "Upload profile photo"
 
-#: mod/newmember.php:26
+#: mod/newmember.php:27
 msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make"
 " friends than people who do not."
 msgstr "Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."
 
-#: mod/newmember.php:27
+#: mod/newmember.php:28
 msgid "Edit Your Profile"
 msgstr "Edit your profile"
 
-#: mod/newmember.php:27
+#: mod/newmember.php:28
 msgid ""
 "Edit your <strong>default</strong> profile to your liking. Review the "
 "settings for hiding your list of friends and hiding the profile from unknown"
 " visitors."
 msgstr "Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."
 
-#: mod/newmember.php:28
+#: mod/newmember.php:29
 msgid "Profile Keywords"
 msgstr "Profile keywords"
 
-#: mod/newmember.php:28
+#: mod/newmember.php:29
 msgid ""
 "Set some public keywords for your default profile which describe your "
 "interests. We may be able to find other people with similar interests and "
 "suggest friendships."
 msgstr "Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."
 
-#: mod/newmember.php:30
+#: mod/newmember.php:31
 msgid "Connecting"
 msgstr "Connecting"
 
-#: mod/newmember.php:36
+#: mod/newmember.php:37
 msgid "Importing Emails"
 msgstr "Importing emails"
 
-#: mod/newmember.php:36
+#: mod/newmember.php:37
 msgid ""
 "Enter your email access information on your Connector Settings page if you "
 "wish to import and interact with friends or mailing lists from your email "
 "INBOX"
 msgstr "Enter your email access information on your Connector Settings if you wish to import and interact with friends or mailing lists from your email INBOX"
 
-#: mod/newmember.php:39
+#: mod/newmember.php:40
 msgid "Go to Your Contacts Page"
 msgstr "Go to your contacts page"
 
-#: mod/newmember.php:39
+#: mod/newmember.php:40
 msgid ""
 "Your Contacts page is your gateway to managing friendships and connecting "
 "with friends on other networks. Typically you enter their address or site "
 "URL in the <em>Add New Contact</em> dialog."
 msgstr "Your contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add new contact</em> dialog."
 
-#: mod/newmember.php:40
+#: mod/newmember.php:41
 msgid "Go to Your Site's Directory"
 msgstr "Go to your site's directory"
 
-#: mod/newmember.php:40
+#: mod/newmember.php:41
 msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
 msgstr "The directory lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own identity address when requested."
 
-#: mod/newmember.php:41
+#: mod/newmember.php:42
 msgid "Finding New People"
 msgstr "Finding new people"
 
-#: mod/newmember.php:41
+#: mod/newmember.php:42
 msgid ""
 "On the side panel of the Contacts page are several tools to find new "
 "friends. We can match people by interest, look up people by name or "
@@ -4603,47 +4658,47 @@ msgid ""
 "hours."
 msgstr "On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."
 
-#: mod/newmember.php:43 src/Model/Group.php:411 src/Module/Contact.php:759
+#: mod/newmember.php:44 src/Model/Group.php:415 src/Module/Contact.php:752
 msgid "Groups"
 msgstr "Groups"
 
-#: mod/newmember.php:45
+#: mod/newmember.php:46
 msgid "Group Your Contacts"
 msgstr "Group your contacts"
 
-#: mod/newmember.php:45
+#: mod/newmember.php:46
 msgid ""
 "Once you have made some friends, organize them into private conversation "
 "groups from the sidebar of your Contacts page and then you can interact with"
 " each group privately on your Network page."
 msgstr "Once you have made some friends, organize them into private conversation groups from the sidebar of your contacts page and then you can interact with each group privately on your network page."
 
-#: mod/newmember.php:48
+#: mod/newmember.php:49
 msgid "Why Aren't My Posts Public?"
 msgstr "Why aren't my posts public?"
 
-#: mod/newmember.php:48
+#: mod/newmember.php:49
 msgid ""
 "Friendica respects your privacy. By default, your posts will only show up to"
 " people you've added as friends. For more information, see the help section "
 "from the link above."
 msgstr "Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."
 
-#: mod/newmember.php:52
+#: mod/newmember.php:53
 msgid "Getting Help"
 msgstr "Getting help"
 
-#: mod/newmember.php:54
+#: mod/newmember.php:55
 msgid "Go to the Help Section"
 msgstr "Go to the help section"
 
-#: mod/newmember.php:54
+#: mod/newmember.php:55
 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program"
 " features and resources."
 msgstr "Our <strong>help</strong> pages may be consulted for detail on other program features and resources."
 
-#: mod/notes.php:42 src/Model/Profile.php:959
+#: mod/notes.php:34 src/Model/Profile.php:959
 msgid "Personal Notes"
 msgstr "Personal notes"
 
@@ -4651,125 +4706,125 @@ msgstr "Personal notes"
 msgid "Invalid request identifier."
 msgstr "Invalid request identifier."
 
-#: mod/notifications.php:60 mod/notifications.php:184
-#: mod/notifications.php:269 src/Module/Contact.php:628
-#: src/Module/Contact.php:830 src/Module/Contact.php:1090
+#: mod/notifications.php:60 mod/notifications.php:186
+#: mod/notifications.php:271 src/Module/Contact.php:622
+#: src/Module/Contact.php:825 src/Module/Contact.php:1085
 msgid "Ignore"
 msgstr "Ignore"
 
-#: mod/notifications.php:93 src/Content/Nav.php:244
+#: mod/notifications.php:93 src/Content/Nav.php:247
 msgid "Notifications"
 msgstr "Notifications"
 
-#: mod/notifications.php:105
+#: mod/notifications.php:107
 msgid "Network Notifications"
 msgstr "Network notifications"
 
-#: mod/notifications.php:110 mod/notify.php:82
+#: mod/notifications.php:112 mod/notify.php:84
 msgid "System Notifications"
 msgstr "System notifications"
 
-#: mod/notifications.php:115
+#: mod/notifications.php:117
 msgid "Personal Notifications"
 msgstr "Personal notifications"
 
-#: mod/notifications.php:120
+#: mod/notifications.php:122
 msgid "Home Notifications"
 msgstr "Home notifications"
 
-#: mod/notifications.php:140
+#: mod/notifications.php:142
 msgid "Show unread"
 msgstr "Show unread"
 
-#: mod/notifications.php:140
+#: mod/notifications.php:142
 msgid "Show all"
 msgstr "Show all"
 
-#: mod/notifications.php:151
+#: mod/notifications.php:153
 msgid "Show Ignored Requests"
 msgstr "Show ignored requests."
 
-#: mod/notifications.php:151
+#: mod/notifications.php:153
 msgid "Hide Ignored Requests"
 msgstr "Hide ignored requests"
 
-#: mod/notifications.php:164 mod/notifications.php:241
+#: mod/notifications.php:166 mod/notifications.php:243
 msgid "Notification type:"
 msgstr ""
 
-#: mod/notifications.php:167
+#: mod/notifications.php:169
 msgid "Suggested by:"
 msgstr ""
 
-#: mod/notifications.php:179 mod/notifications.php:258
-#: src/Module/Contact.php:636
+#: mod/notifications.php:181 mod/notifications.php:260
+#: src/Module/Contact.php:630
 msgid "Hide this contact from others"
 msgstr "Hide this contact from others"
 
-#: mod/notifications.php:201
+#: mod/notifications.php:203
 msgid "Claims to be known to you: "
 msgstr "Says they know me:"
 
-#: mod/notifications.php:202
+#: mod/notifications.php:204
 msgid "yes"
 msgstr "yes"
 
-#: mod/notifications.php:202
+#: mod/notifications.php:204
 msgid "no"
 msgstr "no"
 
-#: mod/notifications.php:203 mod/notifications.php:207
+#: mod/notifications.php:205 mod/notifications.php:209
 msgid "Shall your connection be bidirectional or not?"
 msgstr "Shall your connection be in both directions or not?"
 
-#: mod/notifications.php:204 mod/notifications.php:208
+#: mod/notifications.php:206 mod/notifications.php:210
 #, php-format
 msgid ""
 "Accepting %s as a friend allows %s to subscribe to your posts, and you will "
 "also receive updates from them in your news feed."
 msgstr "Accepting %s as a friend allows %s to subscribe to your posts. You will also receive updates from them in your news feed."
 
-#: mod/notifications.php:205
+#: mod/notifications.php:207
 #, php-format
 msgid ""
 "Accepting %s as a subscriber allows them to subscribe to your posts, but you"
 " will not receive updates from them in your news feed."
 msgstr "Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed."
 
-#: mod/notifications.php:209
+#: mod/notifications.php:211
 #, php-format
 msgid ""
 "Accepting %s as a sharer allows them to subscribe to your posts, but you "
 "will not receive updates from them in your news feed."
 msgstr "Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed."
 
-#: mod/notifications.php:220
+#: mod/notifications.php:222
 msgid "Friend"
 msgstr "Friend"
 
-#: mod/notifications.php:221
+#: mod/notifications.php:223
 msgid "Sharer"
 msgstr "Sharer"
 
-#: mod/notifications.php:221
+#: mod/notifications.php:223
 msgid "Subscriber"
 msgstr "Subscriber"
 
-#: mod/notifications.php:264 src/Model/Profile.php:537
-#: src/Module/Contact.php:93
+#: mod/notifications.php:266 src/Model/Profile.php:543
+#: src/Module/Contact.php:88
 msgid "Network:"
 msgstr "Network:"
 
-#: mod/notifications.php:277
+#: mod/notifications.php:279
 msgid "No introductions."
 msgstr "No introductions."
 
-#: mod/notifications.php:311
+#: mod/notifications.php:313
 #, php-format
 msgid "No more %s notifications."
 msgstr "No more %s notifications."
 
-#: mod/notify.php:78
+#: mod/notify.php:80
 msgid "No more system notifications."
 msgstr "No more system notifications."
 
@@ -4777,16 +4832,16 @@ msgstr "No more system notifications."
 msgid "Post successful."
 msgstr "Post successful."
 
-#: mod/openid.php:32
+#: mod/openid.php:31
 msgid "OpenID protocol error. No ID returned."
 msgstr "OpenID protocol error. No ID returned."
 
-#: mod/openid.php:68
+#: mod/openid.php:67
 msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr "Account not found and OpenID registration is not permitted on this site."
 
-#: mod/openid.php:118 src/Module/Login.php:94 src/Module/Login.php:144
+#: mod/openid.php:117 src/Module/Login.php:92 src/Module/Login.php:143
 msgid "Login failed."
 msgstr "Login failed."
 
@@ -4818,7 +4873,7 @@ msgstr "success"
 msgid "failed"
 msgstr "failed"
 
-#: mod/ostatus_subscribe.php:89 src/Object/Post.php:282
+#: mod/ostatus_subscribe.php:89 src/Object/Post.php:283
 msgid "ignored"
 msgstr "Ignored"
 
@@ -4826,255 +4881,251 @@ msgstr "Ignored"
 msgid "Keep this window open until done."
 msgstr "Keep this window open until done."
 
-#: mod/photos.php:118 src/Model/Profile.php:920
+#: mod/photos.php:115 src/Model/Profile.php:920
 msgid "Photo Albums"
 msgstr "Photo Albums"
 
-#: mod/photos.php:119 mod/photos.php:1710
+#: mod/photos.php:116 mod/photos.php:1665
 msgid "Recent Photos"
 msgstr "Recent photos"
 
-#: mod/photos.php:122 mod/photos.php:1231 mod/photos.php:1712
+#: mod/photos.php:119 mod/photos.php:1187 mod/photos.php:1667
 msgid "Upload New Photos"
 msgstr "Upload new photos"
 
-#: mod/photos.php:140 mod/settings.php:56
+#: mod/photos.php:137 mod/settings.php:56
 msgid "everybody"
 msgstr "everybody"
 
-#: mod/photos.php:196
+#: mod/photos.php:193
 msgid "Contact information unavailable"
 msgstr "Contact information unavailable"
 
-#: mod/photos.php:215
+#: mod/photos.php:212
 msgid "Album not found."
 msgstr "Album not found."
 
-#: mod/photos.php:244 mod/photos.php:257 mod/photos.php:1182
+#: mod/photos.php:241 mod/photos.php:254 mod/photos.php:1138
 msgid "Delete Album"
 msgstr "Delete album"
 
-#: mod/photos.php:255
+#: mod/photos.php:252
 msgid "Do you really want to delete this photo album and all its photos?"
 msgstr "Do you really want to delete this photo album and all its photos?"
 
-#: mod/photos.php:317 mod/photos.php:329 mod/photos.php:1457
+#: mod/photos.php:310 mod/photos.php:322 mod/photos.php:1413
 msgid "Delete Photo"
 msgstr "Delete photo"
 
-#: mod/photos.php:327
+#: mod/photos.php:320
 msgid "Do you really want to delete this photo?"
 msgstr "Do you really want to delete this photo?"
 
-#: mod/photos.php:684
+#: mod/photos.php:645
 msgid "a photo"
 msgstr "a photo"
 
-#: mod/photos.php:684
+#: mod/photos.php:645
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr "%1$s was tagged in %2$s by %3$s"
 
-#: mod/photos.php:780 mod/photos.php:783 mod/photos.php:812
-#: mod/profile_photo.php:155 mod/wall_upload.php:197
+#: mod/photos.php:738 mod/photos.php:741 mod/photos.php:770
+#: mod/profile_photo.php:152 mod/wall_upload.php:198
 #, php-format
 msgid "Image exceeds size limit of %s"
 msgstr "Image exceeds size limit of %s"
 
-#: mod/photos.php:786
+#: mod/photos.php:744
 msgid "Image upload didn't complete, please try again"
 msgstr "Image upload didn't complete. Please try again."
 
-#: mod/photos.php:789
+#: mod/photos.php:747
 msgid "Image file is missing"
 msgstr "Image file is missing"
 
-#: mod/photos.php:794
+#: mod/photos.php:752
 msgid ""
 "Server can't accept new file upload at this time, please contact your "
 "administrator"
 msgstr "Server can't accept new file uploads at this time. Please contact your administrator."
 
-#: mod/photos.php:820
+#: mod/photos.php:778
 msgid "Image file is empty."
 msgstr "Image file is empty."
 
-#: mod/photos.php:835 mod/profile_photo.php:164 mod/wall_upload.php:211
+#: mod/photos.php:793 mod/profile_photo.php:161 mod/wall_upload.php:212
 msgid "Unable to process image."
 msgstr "Unable to process image."
 
-#: mod/photos.php:864 mod/profile_photo.php:309 mod/wall_upload.php:250
+#: mod/photos.php:822 mod/profile_photo.php:310 mod/wall_upload.php:251
 msgid "Image upload failed."
 msgstr "Image upload failed."
 
-#: mod/photos.php:952
+#: mod/photos.php:908
 msgid "No photos selected"
 msgstr "No photos selected"
 
-#: mod/photos.php:1049 mod/videos.php:302
+#: mod/photos.php:1005 mod/videos.php:239
 msgid "Access to this item is restricted."
 msgstr "Access to this item is restricted."
 
-#: mod/photos.php:1103
+#: mod/photos.php:1059
 msgid "Upload Photos"
 msgstr "Upload photos"
 
-#: mod/photos.php:1107 mod/photos.php:1177
+#: mod/photos.php:1063 mod/photos.php:1133
 msgid "New album name: "
 msgstr "New album name: "
 
-#: mod/photos.php:1108
+#: mod/photos.php:1064
 msgid "or select existing album:"
 msgstr ""
 
-#: mod/photos.php:1109
+#: mod/photos.php:1065
 msgid "Do not show a status post for this upload"
 msgstr "Do not show a status post for this upload"
 
-#: mod/photos.php:1125 mod/photos.php:1460 mod/settings.php:1224
+#: mod/photos.php:1081 mod/photos.php:1416 mod/settings.php:1209
 msgid "Show to Groups"
 msgstr "Show to groups"
 
-#: mod/photos.php:1126 mod/photos.php:1461 mod/settings.php:1225
+#: mod/photos.php:1082 mod/photos.php:1417 mod/settings.php:1210
 msgid "Show to Contacts"
 msgstr "Show to contacts"
 
-#: mod/photos.php:1188
+#: mod/photos.php:1144
 msgid "Edit Album"
 msgstr "Edit album"
 
-#: mod/photos.php:1193
+#: mod/photos.php:1149
 msgid "Show Newest First"
 msgstr "Show newest first"
 
-#: mod/photos.php:1195
+#: mod/photos.php:1151
 msgid "Show Oldest First"
 msgstr "Show oldest first"
 
-#: mod/photos.php:1216 mod/photos.php:1695
+#: mod/photos.php:1172 mod/photos.php:1650
 msgid "View Photo"
 msgstr "View photo"
 
-#: mod/photos.php:1257
+#: mod/photos.php:1213
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Permission denied. Access to this item may be restricted."
 
-#: mod/photos.php:1259
+#: mod/photos.php:1215
 msgid "Photo not available"
 msgstr "Photo not available"
 
-#: mod/photos.php:1334
+#: mod/photos.php:1290
 msgid "View photo"
 msgstr "View photo"
 
-#: mod/photos.php:1334
+#: mod/photos.php:1290
 msgid "Edit photo"
 msgstr "Edit photo"
 
-#: mod/photos.php:1335
+#: mod/photos.php:1291
 msgid "Use as profile photo"
 msgstr "Use as profile photo"
 
-#: mod/photos.php:1341 src/Object/Post.php:155
+#: mod/photos.php:1297 src/Object/Post.php:156
 msgid "Private Message"
 msgstr "Private message"
 
-#: mod/photos.php:1361
+#: mod/photos.php:1317
 msgid "View Full Size"
 msgstr "View full size"
 
-#: mod/photos.php:1425
+#: mod/photos.php:1381
 msgid "Tags: "
 msgstr "Tags: "
 
-#: mod/photos.php:1428
+#: mod/photos.php:1384
 msgid "[Select tags to remove]"
 msgstr ""
 
-#: mod/photos.php:1443
+#: mod/photos.php:1399
 msgid "New album name"
 msgstr "New album name"
 
-#: mod/photos.php:1444
+#: mod/photos.php:1400
 msgid "Caption"
 msgstr "Caption"
 
-#: mod/photos.php:1445
+#: mod/photos.php:1401
 msgid "Add a Tag"
 msgstr "Add Tag"
 
-#: mod/photos.php:1445
+#: mod/photos.php:1401
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Example: @bob, @jojo@example.com, #California, #camping"
 
-#: mod/photos.php:1446
+#: mod/photos.php:1402
 msgid "Do not rotate"
 msgstr "Do not rotate"
 
-#: mod/photos.php:1447
+#: mod/photos.php:1403
 msgid "Rotate CW (right)"
 msgstr "Rotate right (CW)"
 
-#: mod/photos.php:1448
+#: mod/photos.php:1404
 msgid "Rotate CCW (left)"
 msgstr "Rotate left (CCW)"
 
-#: mod/photos.php:1482 src/Object/Post.php:310
+#: mod/photos.php:1438 src/Object/Post.php:311
 msgid "I like this (toggle)"
 msgstr "I like this (toggle)"
 
-#: mod/photos.php:1483 src/Object/Post.php:311
+#: mod/photos.php:1439 src/Object/Post.php:312
 msgid "I don't like this (toggle)"
 msgstr "I don't like this (toggle)"
 
-#: mod/photos.php:1498 mod/photos.php:1537 mod/photos.php:1597
-#: src/Module/Contact.php:1023 src/Object/Post.php:810
+#: mod/photos.php:1454 mod/photos.php:1493 mod/photos.php:1553
+#: src/Module/Contact.php:1018 src/Object/Post.php:870
 msgid "This is you"
 msgstr "This is me"
 
-#: mod/photos.php:1500 mod/photos.php:1539 mod/photos.php:1599
-#: src/Object/Post.php:415 src/Object/Post.php:812
+#: mod/photos.php:1456 mod/photos.php:1495 mod/photos.php:1555
+#: src/Object/Post.php:417 src/Object/Post.php:872
 msgid "Comment"
 msgstr "Comment"
 
-#: mod/photos.php:1629
+#: mod/photos.php:1585
 msgid "Map"
 msgstr "Map"
 
-#: mod/photos.php:1701 mod/videos.php:379
+#: mod/photos.php:1656 mod/videos.php:316
 msgid "View Album"
 msgstr "View album"
 
-#: mod/ping.php:281
+#: mod/ping.php:272
 msgid "{0} wants to be your friend"
 msgstr "{0} wants to be your friend"
 
-#: mod/ping.php:297
-msgid "{0} sent you a message"
-msgstr "{0} sent you a message"
-
-#: mod/ping.php:313
+#: mod/ping.php:288
 msgid "{0} requested registration"
 msgstr "{0} requested registration"
 
-#: mod/poke.php:187
+#: mod/poke.php:181
 msgid "Poke/Prod"
 msgstr "Poke/Prod"
 
-#: mod/poke.php:188
+#: mod/poke.php:182
 msgid "poke, prod or do other things to somebody"
 msgstr "Poke, prod or do other things to somebody"
 
-#: mod/poke.php:189
+#: mod/poke.php:183
 msgid "Recipient"
 msgstr "Recipient:"
 
-#: mod/poke.php:190
+#: mod/poke.php:184
 msgid "Choose what you wish to do to recipient"
 msgstr "Choose what you wish to do:"
 
-#: mod/poke.php:193
+#: mod/poke.php:187
 msgid "Make this post private"
 msgstr "Make this post private"
 
@@ -5082,405 +5133,386 @@ msgstr "Make this post private"
 msgid "Only logged in users are permitted to perform a probing."
 msgstr "Only logged in users are permitted to use the Probe feature."
 
-#: mod/profile.php:44 src/Model/Profile.php:132
-msgid "Requested profile is not available."
-msgstr "Requested profile is unavailable."
-
-#: mod/profile.php:95 mod/profile.php:98 src/Protocol/OStatus.php:1290
-#, php-format
-msgid "%s's timeline"
-msgstr "%s's timeline"
-
-#: mod/profile.php:96 src/Protocol/OStatus.php:1294
-#, php-format
-msgid "%s's posts"
-msgstr "%s's posts"
-
-#: mod/profile.php:97 src/Protocol/OStatus.php:1297
-#, php-format
-msgid "%s's comments"
-msgstr "%s's comments"
-
-#: mod/profiles.php:61
-msgid "Profile deleted."
-msgstr "Profile deleted."
-
-#: mod/profiles.php:77 mod/profiles.php:113
-msgid "Profile-"
-msgstr "Profile-"
-
-#: mod/profiles.php:96 mod/profiles.php:135
-msgid "New profile created."
-msgstr "New profile created."
-
-#: mod/profiles.php:119
-msgid "Profile unavailable to clone."
-msgstr "Profile unavailable to clone."
-
-#: mod/profiles.php:207
-msgid "Profile Name is required."
-msgstr "Profile name is required."
-
-#: mod/profiles.php:348
-msgid "Marital Status"
-msgstr "Marital status"
-
-#: mod/profiles.php:352
-msgid "Romantic Partner"
-msgstr "Romantic partner"
-
-#: mod/profiles.php:364
-msgid "Work/Employment"
-msgstr "Work/Employment:"
-
-#: mod/profiles.php:367
-msgid "Religion"
-msgstr "Religion"
-
-#: mod/profiles.php:371
-msgid "Political Views"
-msgstr "Political views"
-
-#: mod/profiles.php:375
-msgid "Gender"
-msgstr "Gender"
-
-#: mod/profiles.php:379
-msgid "Sexual Preference"
-msgstr "Sexual preference"
-
-#: mod/profiles.php:383
-msgid "XMPP"
-msgstr "XMPP"
-
-#: mod/profiles.php:387
-msgid "Homepage"
-msgstr "Homepage"
-
-#: mod/profiles.php:391 mod/profiles.php:594
-msgid "Interests"
-msgstr "Interests"
-
-#: mod/profiles.php:402 mod/profiles.php:590
-msgid "Location"
-msgstr "Location"
-
-#: mod/profiles.php:485
-msgid "Profile updated."
-msgstr "Profile updated."
-
-#: mod/profiles.php:539
-msgid "Hide contacts and friends:"
-msgstr "Hide contacts and friends:"
-
-#: mod/profiles.php:544
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Hide your contact/friend list from viewers of this profile?"
-
-#: mod/profiles.php:564
-msgid "Show more profile fields:"
-msgstr "Show more profile fields:"
-
-#: mod/profiles.php:576
-msgid "Profile Actions"
-msgstr "Profile actions"
-
-#: mod/profiles.php:577
-msgid "Edit Profile Details"
-msgstr "Edit Profile Details"
-
-#: mod/profiles.php:579
-msgid "Change Profile Photo"
-msgstr "Change profile photo"
-
-#: mod/profiles.php:581
-msgid "View this profile"
-msgstr "View this profile"
-
-#: mod/profiles.php:582
-msgid "View all profiles"
-msgstr ""
-
-#: mod/profiles.php:583 mod/profiles.php:678 src/Model/Profile.php:410
-msgid "Edit visibility"
-msgstr "Edit visibility"
-
-#: mod/profiles.php:584
-msgid "Create a new profile using these settings"
-msgstr "Create a new profile using these settings"
-
-#: mod/profiles.php:585
-msgid "Clone this profile"
-msgstr "Clone this profile"
-
-#: mod/profiles.php:586
-msgid "Delete this profile"
-msgstr "Delete this profile"
-
-#: mod/profiles.php:588
-msgid "Basic information"
-msgstr "Basic information"
-
-#: mod/profiles.php:589
-msgid "Profile picture"
-msgstr "Profile picture"
-
-#: mod/profiles.php:591
-msgid "Preferences"
-msgstr "Preferences"
-
-#: mod/profiles.php:592
-msgid "Status information"
-msgstr "Status information"
-
-#: mod/profiles.php:593
-msgid "Additional information"
-msgstr "Additional information"
-
-#: mod/profiles.php:596
-msgid "Relation"
-msgstr "Relation"
-
-#: mod/profiles.php:597 src/Util/Temporal.php:83 src/Util/Temporal.php:85
-msgid "Miscellaneous"
-msgstr "Miscellaneous"
-
-#: mod/profiles.php:600
-msgid "Your Gender:"
-msgstr "Gender:"
-
-#: mod/profiles.php:601
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr "<span class=\"heart\">&hearts;</span> Marital status:"
-
-#: mod/profiles.php:602 src/Model/Profile.php:795
-msgid "Sexual Preference:"
-msgstr "Sexual preference:"
-
-#: mod/profiles.php:603
-msgid "Example: fishing photography software"
-msgstr "Example: fishing photography software"
-
-#: mod/profiles.php:608
-msgid "Profile Name:"
-msgstr "Profile name:"
-
-#: mod/profiles.php:610
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
-msgstr "This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."
-
-#: mod/profiles.php:611
-msgid "Your Full Name:"
-msgstr "My full name:"
-
-#: mod/profiles.php:612
-msgid "Title/Description:"
-msgstr "Title/Description:"
-
-#: mod/profiles.php:615
-msgid "Street Address:"
-msgstr "Street address:"
-
-#: mod/profiles.php:616
-msgid "Locality/City:"
-msgstr "Locality/City:"
-
-#: mod/profiles.php:617
-msgid "Region/State:"
-msgstr "Region/State:"
-
-#: mod/profiles.php:618
-msgid "Postal/Zip Code:"
-msgstr "Postcode:"
-
-#: mod/profiles.php:619
-msgid "Country:"
-msgstr "Country:"
-
-#: mod/profiles.php:620 src/Util/Temporal.php:151
-msgid "Age: "
-msgstr "Age: "
-
-#: mod/profiles.php:623
-msgid "Who: (if applicable)"
-msgstr "Who: (if applicable)"
-
-#: mod/profiles.php:623
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Examples: cathy123, Cathy Williams, cathy@example.com"
-
-#: mod/profiles.php:624
-msgid "Since [date]:"
-msgstr "Since when:"
-
-#: mod/profiles.php:626
-msgid "Tell us about yourself..."
-msgstr "About myself:"
-
-#: mod/profiles.php:627
-msgid "XMPP (Jabber) address:"
-msgstr "XMPP (Jabber) address:"
-
-#: mod/profiles.php:627
-msgid ""
-"The XMPP address will be propagated to your contacts so that they can follow"
-" you."
-msgstr "The XMPP address will be propagated to your contacts so that they can follow you."
-
-#: mod/profiles.php:628
-msgid "Homepage URL:"
-msgstr "Homepage URL:"
-
-#: mod/profiles.php:629 src/Model/Profile.php:803
-msgid "Hometown:"
-msgstr "Home town:"
-
-#: mod/profiles.php:630 src/Model/Profile.php:811
-msgid "Political Views:"
-msgstr "Political views:"
-
-#: mod/profiles.php:631
-msgid "Religious Views:"
-msgstr "Religious views:"
-
-#: mod/profiles.php:632
-msgid "Public Keywords:"
-msgstr "Public keywords:"
-
-#: mod/profiles.php:632
-msgid "(Used for suggesting potential friends, can be seen by others)"
-msgstr "Used for suggesting potential friends, can be seen by others."
-
-#: mod/profiles.php:633
-msgid "Private Keywords:"
-msgstr "Private keywords:"
-
-#: mod/profiles.php:633
-msgid "(Used for searching profiles, never shown to others)"
-msgstr "Used for searching profiles, never shown to others."
-
-#: mod/profiles.php:634 src/Model/Profile.php:827
-msgid "Likes:"
-msgstr "Likes:"
-
-#: mod/profiles.php:635 src/Model/Profile.php:831
-msgid "Dislikes:"
-msgstr "Dislikes:"
-
-#: mod/profiles.php:636
-msgid "Musical interests"
-msgstr "Music:"
-
-#: mod/profiles.php:637
-msgid "Books, literature"
-msgstr "Books, literature, poetry:"
-
-#: mod/profiles.php:638
-msgid "Television"
-msgstr "Television:"
-
-#: mod/profiles.php:639
-msgid "Film/dance/culture/entertainment"
-msgstr "Film, dance, culture, entertainment"
-
-#: mod/profiles.php:640
-msgid "Hobbies/Interests"
-msgstr "Hobbies/Interests:"
-
-#: mod/profiles.php:641
-msgid "Love/romance"
-msgstr "Love/Romance:"
-
-#: mod/profiles.php:642
-msgid "Work/employment"
-msgstr "Work/Employment:"
-
-#: mod/profiles.php:643
-msgid "School/education"
-msgstr "School/Education:"
-
-#: mod/profiles.php:644
-msgid "Contact information and Social Networks"
-msgstr "Contact information and other social networks:"
-
-#: mod/profiles.php:675 src/Model/Profile.php:406
-msgid "Profile Image"
-msgstr "Profile image"
-
-#: mod/profiles.php:677 src/Model/Profile.php:409
-msgid "visible to everybody"
-msgstr "Visible to everybody"
-
-#: mod/profiles.php:684
-msgid "Edit/Manage Profiles"
-msgstr "Edit/Manage Profiles"
-
-#: mod/profiles.php:685 src/Model/Profile.php:396 src/Model/Profile.php:418
-msgid "Change profile photo"
-msgstr "Change profile photo"
-
-#: mod/profiles.php:686 src/Model/Profile.php:397
-msgid "Create New Profile"
-msgstr "Create new profile"
-
-#: mod/profile_photo.php:59
+#: mod/profile_photo.php:58
 msgid "Image uploaded but image cropping failed."
 msgstr "Image uploaded but image cropping failed."
 
-#: mod/profile_photo.php:91 mod/profile_photo.php:100
-#: mod/profile_photo.php:109 mod/profile_photo.php:317
+#: mod/profile_photo.php:88 mod/profile_photo.php:97 mod/profile_photo.php:106
+#: mod/profile_photo.php:318
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr "Image size reduction [%s] failed."
 
-#: mod/profile_photo.php:128
+#: mod/profile_photo.php:125
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Shift-reload the page or clear browser cache if the new photo does not display immediately."
 
-#: mod/profile_photo.php:136
+#: mod/profile_photo.php:133
 msgid "Unable to process image"
 msgstr "Unable to process image"
 
-#: mod/profile_photo.php:248
+#: mod/profile_photo.php:251
 msgid "Upload File:"
 msgstr "Upload File:"
 
-#: mod/profile_photo.php:249
+#: mod/profile_photo.php:252
 msgid "Select a profile:"
 msgstr "Select a profile:"
 
-#: mod/profile_photo.php:254
+#: mod/profile_photo.php:257
 msgid "or"
 msgstr "or"
 
-#: mod/profile_photo.php:255
+#: mod/profile_photo.php:258
 msgid "skip this step"
 msgstr "skip this step"
 
-#: mod/profile_photo.php:255
+#: mod/profile_photo.php:258
 msgid "select a photo from your photo albums"
 msgstr "select a photo from your photo albums"
 
-#: mod/profile_photo.php:268
+#: mod/profile_photo.php:271
 msgid "Crop Image"
 msgstr "Crop Image"
 
-#: mod/profile_photo.php:269
+#: mod/profile_photo.php:272
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Please adjust the image cropping for optimum viewing."
 
-#: mod/profile_photo.php:271
+#: mod/profile_photo.php:274
 msgid "Done Editing"
 msgstr "Done editing"
 
-#: mod/profile_photo.php:307
+#: mod/profile_photo.php:308
 msgid "Image uploaded successfully."
 msgstr "Image uploaded successfully."
 
+#: mod/profiles.php:62
+msgid "Profile deleted."
+msgstr "Profile deleted."
+
+#: mod/profiles.php:78 mod/profiles.php:114
+msgid "Profile-"
+msgstr "Profile-"
+
+#: mod/profiles.php:97 mod/profiles.php:135
+msgid "New profile created."
+msgstr "New profile created."
+
+#: mod/profiles.php:120
+msgid "Profile unavailable to clone."
+msgstr "Profile unavailable to clone."
+
+#: mod/profiles.php:206
+msgid "Profile Name is required."
+msgstr "Profile name is required."
+
+#: mod/profiles.php:346
+msgid "Marital Status"
+msgstr "Marital status"
+
+#: mod/profiles.php:349
+msgid "Romantic Partner"
+msgstr "Romantic partner"
+
+#: mod/profiles.php:358
+msgid "Work/Employment"
+msgstr "Work/Employment:"
+
+#: mod/profiles.php:361
+msgid "Religion"
+msgstr "Religion"
+
+#: mod/profiles.php:364
+msgid "Political Views"
+msgstr "Political views"
+
+#: mod/profiles.php:367
+msgid "Gender"
+msgstr "Gender"
+
+#: mod/profiles.php:370
+msgid "Sexual Preference"
+msgstr "Sexual preference"
+
+#: mod/profiles.php:373
+msgid "XMPP"
+msgstr "XMPP"
+
+#: mod/profiles.php:376
+msgid "Homepage"
+msgstr "Homepage"
+
+#: mod/profiles.php:379 mod/profiles.php:578
+msgid "Interests"
+msgstr "Interests"
+
+#: mod/profiles.php:389 mod/profiles.php:574
+msgid "Location"
+msgstr "Location"
+
+#: mod/profiles.php:469
+msgid "Profile updated."
+msgstr "Profile updated."
+
+#: mod/profiles.php:523
+msgid "Hide contacts and friends:"
+msgstr "Hide contacts and friends:"
+
+#: mod/profiles.php:528
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Hide your contact/friend list from viewers of this profile?"
+
+#: mod/profiles.php:548
+msgid "Show more profile fields:"
+msgstr "Show more profile fields:"
+
+#: mod/profiles.php:560
+msgid "Profile Actions"
+msgstr "Profile actions"
+
+#: mod/profiles.php:561
+msgid "Edit Profile Details"
+msgstr "Edit Profile Details"
+
+#: mod/profiles.php:563
+msgid "Change Profile Photo"
+msgstr "Change profile photo"
+
+#: mod/profiles.php:565
+msgid "View this profile"
+msgstr "View this profile"
+
+#: mod/profiles.php:566
+msgid "View all profiles"
+msgstr ""
+
+#: mod/profiles.php:567 mod/profiles.php:662 src/Model/Profile.php:419
+msgid "Edit visibility"
+msgstr "Edit visibility"
+
+#: mod/profiles.php:568
+msgid "Create a new profile using these settings"
+msgstr "Create a new profile using these settings"
+
+#: mod/profiles.php:569
+msgid "Clone this profile"
+msgstr "Clone this profile"
+
+#: mod/profiles.php:570
+msgid "Delete this profile"
+msgstr "Delete this profile"
+
+#: mod/profiles.php:572
+msgid "Basic information"
+msgstr "Basic information"
+
+#: mod/profiles.php:573
+msgid "Profile picture"
+msgstr "Profile picture"
+
+#: mod/profiles.php:575
+msgid "Preferences"
+msgstr "Preferences"
+
+#: mod/profiles.php:576
+msgid "Status information"
+msgstr "Status information"
+
+#: mod/profiles.php:577
+msgid "Additional information"
+msgstr "Additional information"
+
+#: mod/profiles.php:580
+msgid "Relation"
+msgstr "Relation"
+
+#: mod/profiles.php:581 src/Util/Temporal.php:79 src/Util/Temporal.php:81
+msgid "Miscellaneous"
+msgstr "Miscellaneous"
+
+#: mod/profiles.php:584
+msgid "Your Gender:"
+msgstr "Gender:"
+
+#: mod/profiles.php:585
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Marital status:"
+
+#: mod/profiles.php:586 src/Model/Profile.php:795
+msgid "Sexual Preference:"
+msgstr "Sexual preference:"
+
+#: mod/profiles.php:587
+msgid "Example: fishing photography software"
+msgstr "Example: fishing photography software"
+
+#: mod/profiles.php:592
+msgid "Profile Name:"
+msgstr "Profile name:"
+
+#: mod/profiles.php:594
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
+msgstr "This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."
+
+#: mod/profiles.php:595
+msgid "Your Full Name:"
+msgstr "My full name:"
+
+#: mod/profiles.php:596
+msgid "Title/Description:"
+msgstr "Title/Description:"
+
+#: mod/profiles.php:599
+msgid "Street Address:"
+msgstr "Street address:"
+
+#: mod/profiles.php:600
+msgid "Locality/City:"
+msgstr "Locality/City:"
+
+#: mod/profiles.php:601
+msgid "Region/State:"
+msgstr "Region/State:"
+
+#: mod/profiles.php:602
+msgid "Postal/Zip Code:"
+msgstr "Postcode:"
+
+#: mod/profiles.php:603
+msgid "Country:"
+msgstr "Country:"
+
+#: mod/profiles.php:604 src/Util/Temporal.php:149
+msgid "Age: "
+msgstr "Age: "
+
+#: mod/profiles.php:607
+msgid "Who: (if applicable)"
+msgstr "Who: (if applicable)"
+
+#: mod/profiles.php:607
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Examples: cathy123, Cathy Williams, cathy@example.com"
+
+#: mod/profiles.php:608
+msgid "Since [date]:"
+msgstr "Since when:"
+
+#: mod/profiles.php:610
+msgid "Tell us about yourself..."
+msgstr "About myself:"
+
+#: mod/profiles.php:611
+msgid "XMPP (Jabber) address:"
+msgstr "XMPP (Jabber) address:"
+
+#: mod/profiles.php:611
+msgid ""
+"The XMPP address will be propagated to your contacts so that they can follow"
+" you."
+msgstr "The XMPP address will be propagated to your contacts so that they can follow you."
+
+#: mod/profiles.php:612
+msgid "Homepage URL:"
+msgstr "Homepage URL:"
+
+#: mod/profiles.php:613 src/Model/Profile.php:803
+msgid "Hometown:"
+msgstr "Home town:"
+
+#: mod/profiles.php:614 src/Model/Profile.php:811
+msgid "Political Views:"
+msgstr "Political views:"
+
+#: mod/profiles.php:615
+msgid "Religious Views:"
+msgstr "Religious views:"
+
+#: mod/profiles.php:616
+msgid "Public Keywords:"
+msgstr "Public keywords:"
+
+#: mod/profiles.php:616
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr "Used for suggesting potential friends, can be seen by others."
+
+#: mod/profiles.php:617
+msgid "Private Keywords:"
+msgstr "Private keywords:"
+
+#: mod/profiles.php:617
+msgid "(Used for searching profiles, never shown to others)"
+msgstr "Used for searching profiles, never shown to others."
+
+#: mod/profiles.php:618 src/Model/Profile.php:827
+msgid "Likes:"
+msgstr "Likes:"
+
+#: mod/profiles.php:619 src/Model/Profile.php:831
+msgid "Dislikes:"
+msgstr "Dislikes:"
+
+#: mod/profiles.php:620
+msgid "Musical interests"
+msgstr "Music:"
+
+#: mod/profiles.php:621
+msgid "Books, literature"
+msgstr "Books, literature, poetry:"
+
+#: mod/profiles.php:622
+msgid "Television"
+msgstr "Television:"
+
+#: mod/profiles.php:623
+msgid "Film/dance/culture/entertainment"
+msgstr "Film, dance, culture, entertainment"
+
+#: mod/profiles.php:624
+msgid "Hobbies/Interests"
+msgstr "Hobbies/Interests:"
+
+#: mod/profiles.php:625
+msgid "Love/romance"
+msgstr "Love/Romance:"
+
+#: mod/profiles.php:626
+msgid "Work/employment"
+msgstr "Work/Employment:"
+
+#: mod/profiles.php:627
+msgid "School/education"
+msgstr "School/Education:"
+
+#: mod/profiles.php:628
+msgid "Contact information and Social Networks"
+msgstr "Contact information and other social networks:"
+
+#: mod/profiles.php:659 src/Model/Profile.php:415
+msgid "Profile Image"
+msgstr "Profile image"
+
+#: mod/profiles.php:661 src/Model/Profile.php:418
+msgid "visible to everybody"
+msgstr "Visible to everybody"
+
+#: mod/profiles.php:668
+msgid "Edit/Manage Profiles"
+msgstr "Edit/Manage Profiles"
+
+#: mod/profiles.php:669 src/Model/Profile.php:405 src/Model/Profile.php:427
+msgid "Change profile photo"
+msgstr "Change profile photo"
+
+#: mod/profiles.php:670 src/Model/Profile.php:406
+msgid "Create New Profile"
+msgstr "Create new profile"
+
 #: mod/profperm.php:36 mod/profperm.php:69
 msgid "Invalid profile identifier."
 msgstr "Invalid profile identifier."
@@ -5497,160 +5529,45 @@ msgstr "Visible to"
 msgid "All Contacts (with secure profile access)"
 msgstr "All contacts with secure profile access"
 
-#: mod/register.php:105
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr "Registration successful. Please check your email for further instructions."
-
-#: mod/register.php:109
-#, php-format
-msgid ""
-"Failed to send email message. Here your accout details:<br> login: %s<br> "
-"password: %s<br><br>You can change your password after login."
-msgstr "Failed to send email message. Here are your account details:<br> login: %s<br> password: %s<br><br>You can change your password after login."
-
-#: mod/register.php:116
-msgid "Registration successful."
-msgstr "Registration successful."
-
-#: mod/register.php:121
-msgid "Your registration can not be processed."
-msgstr "Your registration cannot be processed."
-
-#: mod/register.php:164
-msgid "Your registration is pending approval by the site owner."
-msgstr "Your registration is pending approval by the site administrator."
-
-#: mod/register.php:193 mod/uimport.php:39
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."
-
-#: mod/register.php:222
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Sign up now'."
-
-#: mod/register.php:223
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr "If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."
-
-#: mod/register.php:224
-msgid "Your OpenID (optional): "
-msgstr "Your OpenID (optional): "
-
-#: mod/register.php:236
-msgid "Include your profile in member directory?"
-msgstr "Include your profile in member directory?"
-
-#: mod/register.php:263
-msgid "Note for the admin"
-msgstr "Note for the admin"
-
-#: mod/register.php:263
-msgid "Leave a message for the admin, why you want to join this node"
-msgstr "Leave a message for the admin. Why do you want to join this node?"
-
-#: mod/register.php:264
-msgid "Membership on this site is by invitation only."
-msgstr "Membership on this site is by invitation only."
-
-#: mod/register.php:265
-msgid "Your invitation code: "
-msgstr "Your invitation code: "
-
-#: mod/register.php:274
-msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
-msgstr "Your full name: "
-
-#: mod/register.php:275
-msgid ""
-"Your Email Address: (Initial information will be send there, so this has to "
-"be an existing address.)"
-msgstr "Your Email Address: (Initial information will be sent there, so this must be an existing address.)"
-
-#: mod/register.php:277 mod/settings.php:1196
-msgid "New Password:"
-msgstr "New password:"
-
-#: mod/register.php:277
-msgid "Leave empty for an auto generated password."
-msgstr "Leave empty for an auto generated password."
-
-#: mod/register.php:278 mod/settings.php:1197
-msgid "Confirm:"
-msgstr "Confirm new password:"
-
-#: mod/register.php:279
-#, php-format
-msgid ""
-"Choose a profile nickname. This must begin with a text character. Your "
-"profile address on this site will then be '<strong>nickname@%s</strong>'."
-msgstr "Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@%s</strong>'."
-
-#: mod/register.php:280
-msgid "Choose a nickname: "
-msgstr "Choose a nickname: "
-
-#: mod/register.php:283 src/Content/Nav.php:181 src/Module/Login.php:293
-msgid "Register"
-msgstr "Sign up now >>"
-
-#: mod/register.php:289 mod/uimport.php:54
-msgid "Import"
-msgstr "Import profile"
-
-#: mod/register.php:290
-msgid "Import your profile to this friendica instance"
-msgstr "Import an existing Friendica profile to this node."
-
-#: mod/register.php:298
-msgid "Note: This node explicitly contains adult content"
-msgstr ""
-
-#: mod/regmod.php:55
+#: mod/regmod.php:53
 msgid "Account approved."
 msgstr "Account approved."
 
-#: mod/regmod.php:79
+#: mod/regmod.php:77
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registration revoked for %s"
 
-#: mod/regmod.php:86
+#: mod/regmod.php:84
 msgid "Please login."
 msgstr "Please login."
 
-#: mod/removeme.php:49
+#: mod/removeme.php:46
 msgid "User deleted their account"
 msgstr "User deleted their account"
 
-#: mod/removeme.php:50
+#: mod/removeme.php:47
 msgid ""
 "On your Friendica node an user deleted their account. Please ensure that "
 "their data is removed from the backups."
 msgstr "A user deleted his or her account on your Friendica node. Please ensure these data are removed from the backups."
 
-#: mod/removeme.php:51
+#: mod/removeme.php:48
 #, php-format
 msgid "The user id is %d"
 msgstr "The user id is %d"
 
-#: mod/removeme.php:87 mod/removeme.php:90
+#: mod/removeme.php:84 mod/removeme.php:87
 msgid "Remove My Account"
 msgstr "Remove My Account"
 
-#: mod/removeme.php:88
+#: mod/removeme.php:85
 msgid ""
 "This will completely remove your account. Once this has been done it is not "
 "recoverable."
 msgstr "This will completely remove your account. Once this has been done it is not recoverable."
 
-#: mod/removeme.php:89
+#: mod/removeme.php:86
 msgid "Please enter your password for verification:"
 msgstr "Please enter your password for verification:"
 
@@ -5662,28 +5579,28 @@ msgstr "Resubscribing to OStatus contacts"
 msgid "Error"
 msgstr "Error"
 
-#: mod/search.php:113
+#: mod/search.php:103
 msgid "Only logged in users are permitted to perform a search."
 msgstr "Only logged in users are permitted to perform a search."
 
-#: mod/search.php:137
+#: mod/search.php:127
 msgid "Too Many Requests"
 msgstr "Too many requests"
 
-#: mod/search.php:138
+#: mod/search.php:128
 msgid "Only one search per minute is permitted for not logged in users."
 msgstr "Only one search per minute is permitted for not-logged-in users."
 
-#: mod/search.php:163 src/Content/Nav.php:195 src/Content/Text/HTML.php:967
+#: mod/search.php:149 src/Content/Text/HTML.php:900 src/Content/Nav.php:198
 msgid "Search"
 msgstr "Search"
 
-#: mod/search.php:249
+#: mod/search.php:235
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Items tagged with: %s"
 
-#: mod/search.php:251 src/Module/Contact.php:821
+#: mod/search.php:237 src/Module/Contact.php:816
 #, php-format
 msgid "Results for: %s"
 msgstr "Results for: %s"
@@ -5692,7 +5609,7 @@ msgstr "Results for: %s"
 msgid "Account"
 msgstr "Account"
 
-#: mod/settings.php:69 src/Content/Nav.php:263 src/Model/Profile.php:389
+#: mod/settings.php:69 src/Content/Nav.php:266 src/Model/Profile.php:398
 msgid "Profiles"
 msgstr "Profiles"
 
@@ -5700,11 +5617,11 @@ msgstr "Profiles"
 msgid "Display"
 msgstr "Display"
 
-#: mod/settings.php:92 mod/settings.php:845
+#: mod/settings.php:92 mod/settings.php:830
 msgid "Social Networks"
 msgstr "Social networks"
 
-#: mod/settings.php:106 src/Content/Nav.php:258
+#: mod/settings.php:106 src/Content/Nav.php:261
 msgid "Delegations"
 msgstr "Delegations"
 
@@ -5724,7 +5641,7 @@ msgstr "Remove account"
 msgid "Missing some important data!"
 msgstr "Missing some important data!"
 
-#: mod/settings.php:181 mod/settings.php:706 src/Module/Contact.php:828
+#: mod/settings.php:181 mod/settings.php:691 src/Module/Contact.php:823
 msgid "Update"
 msgstr "Update"
 
@@ -5744,154 +5661,144 @@ msgstr "Features updated"
 msgid "Relocate message has been send to your contacts"
 msgstr "Relocate message has been sent to your contacts"
 
-#: mod/settings.php:396 src/Model/User.php:423
-msgid "Passwords do not match. Password unchanged."
-msgstr "Passwords do not match. Password unchanged."
+#: mod/settings.php:396
+msgid "Passwords do not match."
+msgstr ""
 
-#: mod/settings.php:401
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Empty passwords are not allowed. Password unchanged."
-
-#: mod/settings.php:406 src/Core/Console/NewPassword.php:82
-msgid ""
-"The new password has been exposed in a public data dump, please choose "
-"another."
-msgstr "The new password has been exposed in a public data dump; please choose another."
-
-#: mod/settings.php:412
-msgid "Wrong password."
-msgstr "Wrong password."
-
-#: mod/settings.php:419 src/Core/Console/NewPassword.php:89
-msgid "Password changed."
-msgstr "Password changed."
-
-#: mod/settings.php:421 src/Core/Console/NewPassword.php:86
+#: mod/settings.php:404 src/Core/Console/NewPassword.php:80
 msgid "Password update failed. Please try again."
 msgstr "Password update failed. Please try again."
 
-#: mod/settings.php:505
+#: mod/settings.php:407 src/Core/Console/NewPassword.php:83
+msgid "Password changed."
+msgstr "Password changed."
+
+#: mod/settings.php:410
+msgid "Password unchanged."
+msgstr ""
+
+#: mod/settings.php:491
 msgid " Please use a shorter name."
 msgstr " Please use a shorter name."
 
-#: mod/settings.php:508
+#: mod/settings.php:494
 msgid " Name too short."
 msgstr " Name too short."
 
-#: mod/settings.php:516
+#: mod/settings.php:501
 msgid "Wrong Password"
 msgstr "Wrong password"
 
-#: mod/settings.php:521
+#: mod/settings.php:506
 msgid "Invalid email."
 msgstr "Invalid email."
 
-#: mod/settings.php:527
+#: mod/settings.php:512
 msgid "Cannot change to that email."
 msgstr "Cannot change to that email."
 
-#: mod/settings.php:577
+#: mod/settings.php:562
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr "Private forum has no privacy permissions. Using default privacy group."
 
-#: mod/settings.php:580
+#: mod/settings.php:565
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr "Private forum has no privacy permissions and no default privacy group."
 
-#: mod/settings.php:620
+#: mod/settings.php:605
 msgid "Settings updated."
 msgstr "Settings updated."
 
-#: mod/settings.php:679 mod/settings.php:705 mod/settings.php:739
+#: mod/settings.php:664 mod/settings.php:690 mod/settings.php:724
 msgid "Add application"
 msgstr "Add application"
 
-#: mod/settings.php:683 mod/settings.php:709
+#: mod/settings.php:668 mod/settings.php:694
 msgid "Consumer Key"
 msgstr "Consumer key"
 
-#: mod/settings.php:684 mod/settings.php:710
+#: mod/settings.php:669 mod/settings.php:695
 msgid "Consumer Secret"
 msgstr "Consumer secret"
 
-#: mod/settings.php:685 mod/settings.php:711
+#: mod/settings.php:670 mod/settings.php:696
 msgid "Redirect"
 msgstr "Redirect"
 
-#: mod/settings.php:686 mod/settings.php:712
+#: mod/settings.php:671 mod/settings.php:697
 msgid "Icon url"
 msgstr "Icon URL"
 
-#: mod/settings.php:697
+#: mod/settings.php:682
 msgid "You can't edit this application."
 msgstr "You cannot edit this application."
 
-#: mod/settings.php:738
+#: mod/settings.php:723
 msgid "Connected Apps"
 msgstr "Connected Apps"
 
-#: mod/settings.php:740 src/Object/Post.php:165 src/Object/Post.php:167
+#: mod/settings.php:725 src/Object/Post.php:166 src/Object/Post.php:168
 msgid "Edit"
 msgstr "Edit"
 
-#: mod/settings.php:742
+#: mod/settings.php:727
 msgid "Client key starts with"
 msgstr "Client key starts with"
 
-#: mod/settings.php:743
+#: mod/settings.php:728
 msgid "No name"
 msgstr "No name"
 
-#: mod/settings.php:744
+#: mod/settings.php:729
 msgid "Remove authorization"
 msgstr "Remove authorization"
 
-#: mod/settings.php:755
+#: mod/settings.php:740
 msgid "No Addon settings configured"
 msgstr "No addon settings configured"
 
-#: mod/settings.php:764
+#: mod/settings.php:749
 msgid "Addon Settings"
 msgstr "Addon Settings"
 
-#: mod/settings.php:785
+#: mod/settings.php:770
 msgid "Additional Features"
 msgstr "Additional Features"
 
-#: mod/settings.php:808 src/Content/ContactSelector.php:85
+#: mod/settings.php:793 src/Content/ContactSelector.php:87
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: mod/settings.php:808 mod/settings.php:809
+#: mod/settings.php:793 mod/settings.php:794
 msgid "enabled"
 msgstr "enabled"
 
-#: mod/settings.php:808 mod/settings.php:809
+#: mod/settings.php:793 mod/settings.php:794
 msgid "disabled"
 msgstr "disabled"
 
-#: mod/settings.php:808 mod/settings.php:809
+#: mod/settings.php:793 mod/settings.php:794
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "Built-in support for %s connectivity is %s"
 
-#: mod/settings.php:809
+#: mod/settings.php:794
 msgid "GNU Social (OStatus)"
 msgstr "GNU Social (OStatus)"
 
-#: mod/settings.php:840
+#: mod/settings.php:825
 msgid "Email access is disabled on this site."
 msgstr "Email access is disabled on this site."
 
-#: mod/settings.php:850
+#: mod/settings.php:835
 msgid "General Social Media Settings"
 msgstr "General Social Media Settings"
 
-#: mod/settings.php:851
+#: mod/settings.php:836
 msgid "Disable Content Warning"
 msgstr "Disable content warning"
 
-#: mod/settings.php:851
+#: mod/settings.php:836
 msgid ""
 "Users on networks like Mastodon or Pleroma are able to set a content warning"
 " field which collapse their post by default. This disables the automatic "
@@ -5899,316 +5806,316 @@ msgid ""
 "any other content filtering you eventually set up."
 msgstr "Users on networks like Mastodon or Pleroma are able to set a content warning field which collapses their post by default. This disables the automatic collapsing and sets the content warning as the post title. It doesn't affect any other content filtering you may set up."
 
-#: mod/settings.php:852
+#: mod/settings.php:837
 msgid "Disable intelligent shortening"
 msgstr "Disable intelligent shortening"
 
-#: mod/settings.php:852
+#: mod/settings.php:837
 msgid ""
 "Normally the system tries to find the best link to add to shortened posts. "
 "If this option is enabled then every shortened post will always point to the"
 " original friendica post."
 msgstr "Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original Friendica post."
 
-#: mod/settings.php:853
+#: mod/settings.php:838
 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
 msgstr "Automatically follow any GNU Social (OStatus) followers/mentioners"
 
-#: mod/settings.php:853
+#: mod/settings.php:838
 msgid ""
 "If you receive a message from an unknown OStatus user, this option decides "
 "what to do. If it is checked, a new contact will be created for every "
 "unknown user."
 msgstr "Create a new contact for every unknown OStatus user from whom you receive a message."
 
-#: mod/settings.php:854
+#: mod/settings.php:839
 msgid "Default group for OStatus contacts"
 msgstr "Default group for OStatus contacts"
 
-#: mod/settings.php:855
+#: mod/settings.php:840
 msgid "Your legacy GNU Social account"
 msgstr "Your legacy GNU Social account"
 
-#: mod/settings.php:855
+#: mod/settings.php:840
 msgid ""
 "If you enter your old GNU Social/Statusnet account name here (in the format "
 "user@domain.tld), your contacts will be added automatically. The field will "
 "be emptied when done."
 msgstr "Entering your old GNU Social/Statusnet account name here (format: user@domain.tld), will automatically added your contacts. The field will be emptied when done."
 
-#: mod/settings.php:858
+#: mod/settings.php:843
 msgid "Repair OStatus subscriptions"
 msgstr "Repair OStatus subscriptions"
 
-#: mod/settings.php:862
+#: mod/settings.php:847
 msgid "Email/Mailbox Setup"
 msgstr "Email/Mailbox setup"
 
-#: mod/settings.php:863
+#: mod/settings.php:848
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "Specify how to connect to your mailbox, if you wish to communicate with existing email contacts."
 
-#: mod/settings.php:864
+#: mod/settings.php:849
 msgid "Last successful email check:"
 msgstr "Last successful email check:"
 
-#: mod/settings.php:866
+#: mod/settings.php:851
 msgid "IMAP server name:"
 msgstr "IMAP server name:"
 
-#: mod/settings.php:867
+#: mod/settings.php:852
 msgid "IMAP port:"
 msgstr "IMAP port:"
 
-#: mod/settings.php:868
+#: mod/settings.php:853
 msgid "Security:"
 msgstr "Security:"
 
-#: mod/settings.php:868 mod/settings.php:873
+#: mod/settings.php:853 mod/settings.php:858
 msgid "None"
 msgstr "None"
 
-#: mod/settings.php:869
+#: mod/settings.php:854
 msgid "Email login name:"
 msgstr "Email login name:"
 
-#: mod/settings.php:870
+#: mod/settings.php:855
 msgid "Email password:"
 msgstr "Email password:"
 
-#: mod/settings.php:871
+#: mod/settings.php:856
 msgid "Reply-to address:"
 msgstr "Reply-to address:"
 
-#: mod/settings.php:872
+#: mod/settings.php:857
 msgid "Send public posts to all email contacts:"
 msgstr "Send public posts to all email contacts:"
 
-#: mod/settings.php:873
+#: mod/settings.php:858
 msgid "Action after import:"
 msgstr "Action after import:"
 
-#: mod/settings.php:873 src/Content/Nav.php:246
+#: mod/settings.php:858 src/Content/Nav.php:249
 msgid "Mark as seen"
 msgstr "Mark as seen"
 
-#: mod/settings.php:873
+#: mod/settings.php:858
 msgid "Move to folder"
 msgstr "Move to folder"
 
-#: mod/settings.php:874
+#: mod/settings.php:859
 msgid "Move to folder:"
 msgstr "Move to folder:"
 
-#: mod/settings.php:917
+#: mod/settings.php:902
 #, php-format
 msgid "%s - (Unsupported)"
 msgstr "%s - (Unsupported)"
 
-#: mod/settings.php:919
+#: mod/settings.php:904
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Experimental)"
 
-#: mod/settings.php:946 src/Core/L10n.php:359 src/Model/Event.php:396
+#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:396
 msgid "Sunday"
 msgstr "Sunday"
 
-#: mod/settings.php:946 src/Core/L10n.php:359 src/Model/Event.php:397
+#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:397
 msgid "Monday"
 msgstr "Monday"
 
-#: mod/settings.php:962
+#: mod/settings.php:947
 msgid "Display Settings"
 msgstr "Display Settings"
 
-#: mod/settings.php:968
+#: mod/settings.php:953
 msgid "Display Theme:"
 msgstr "Display theme:"
 
-#: mod/settings.php:969
+#: mod/settings.php:954
 msgid "Mobile Theme:"
 msgstr "Mobile theme:"
 
-#: mod/settings.php:970
+#: mod/settings.php:955
 msgid "Suppress warning of insecure networks"
 msgstr "Suppress warning of insecure networks"
 
-#: mod/settings.php:970
+#: mod/settings.php:955
 msgid ""
 "Should the system suppress the warning that the current group contains "
 "members of networks that can't receive non public postings."
 msgstr "Suppresses warnings if groups contain members whose networks cannot receive non-public postings."
 
-#: mod/settings.php:971
+#: mod/settings.php:956
 msgid "Update browser every xx seconds"
 msgstr "Update browser every so many seconds:"
 
-#: mod/settings.php:971
+#: mod/settings.php:956
 msgid "Minimum of 10 seconds. Enter -1 to disable it."
 msgstr "Minimum 10 seconds; to disable -1."
 
-#: mod/settings.php:972
+#: mod/settings.php:957
 msgid "Number of items to display per page:"
 msgstr "Number of items displayed per page:"
 
-#: mod/settings.php:972 mod/settings.php:973
+#: mod/settings.php:957 mod/settings.php:958
 msgid "Maximum of 100 items"
 msgstr "Maximum of 100 items"
 
-#: mod/settings.php:973
+#: mod/settings.php:958
 msgid "Number of items to display per page when viewed from mobile device:"
 msgstr "Number of items displayed per page on mobile devices:"
 
-#: mod/settings.php:974
+#: mod/settings.php:959
 msgid "Don't show emoticons"
 msgstr "Don't show emoticons"
 
-#: mod/settings.php:975
+#: mod/settings.php:960
 msgid "Calendar"
 msgstr "Calendar"
 
-#: mod/settings.php:976
+#: mod/settings.php:961
 msgid "Beginning of week:"
 msgstr "Week begins: "
 
-#: mod/settings.php:977
+#: mod/settings.php:962
 msgid "Don't show notices"
 msgstr "Don't show notices"
 
-#: mod/settings.php:978
+#: mod/settings.php:963
 msgid "Infinite scroll"
 msgstr "Infinite scroll"
 
-#: mod/settings.php:979
+#: mod/settings.php:964
 msgid "Automatic updates only at the top of the network page"
 msgstr "Automatically updates only top of the network page"
 
-#: mod/settings.php:979
+#: mod/settings.php:964
 msgid ""
 "When disabled, the network page is updated all the time, which could be "
 "confusing while reading."
 msgstr "When disabled, the network page is updated all the time, which could be confusing while reading."
 
-#: mod/settings.php:980
+#: mod/settings.php:965
 msgid "Bandwidth Saver Mode"
 msgstr ""
 
-#: mod/settings.php:980
+#: mod/settings.php:965
 msgid ""
 "When enabled, embedded content is not displayed on automatic updates, they "
 "only show on page reload."
 msgstr "If enabled, embedded content is not displayed on automatic updates; it is only shown on page reload."
 
-#: mod/settings.php:981
+#: mod/settings.php:966
 msgid "Smart Threading"
 msgstr "Smart Threading"
 
-#: mod/settings.php:981
+#: mod/settings.php:966
 msgid ""
 "When enabled, suppress extraneous thread indentation while keeping it where "
 "it matters. Only works if threading is available and enabled."
 msgstr "Suppresses extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."
 
-#: mod/settings.php:983
+#: mod/settings.php:968
 msgid "General Theme Settings"
 msgstr "Themes"
 
-#: mod/settings.php:984
+#: mod/settings.php:969
 msgid "Custom Theme Settings"
 msgstr "Theme customization"
 
-#: mod/settings.php:985
+#: mod/settings.php:970
 msgid "Content Settings"
 msgstr "Content/Layout"
 
-#: mod/settings.php:986 view/theme/duepuntozero/config.php:74
+#: mod/settings.php:971 view/theme/duepuntozero/config.php:74
 #: view/theme/frio/config.php:121 view/theme/quattro/config.php:76
 #: view/theme/vier/config.php:122
 msgid "Theme settings"
 msgstr "Theme settings"
 
-#: mod/settings.php:1000
+#: mod/settings.php:985
 msgid "Unable to find your profile. Please contact your admin."
 msgstr "Unable to find your profile. Please contact your admin."
 
-#: mod/settings.php:1039
+#: mod/settings.php:1024
 msgid "Account Types"
 msgstr "Account types:"
 
-#: mod/settings.php:1040
+#: mod/settings.php:1025
 msgid "Personal Page Subtypes"
 msgstr "Personal Page subtypes"
 
-#: mod/settings.php:1041
+#: mod/settings.php:1026
 msgid "Community Forum Subtypes"
 msgstr "Community forum subtypes"
 
-#: mod/settings.php:1049
+#: mod/settings.php:1034
 msgid "Account for a personal profile."
 msgstr "Account for a personal profile."
 
-#: mod/settings.php:1053
+#: mod/settings.php:1038
 msgid ""
 "Account for an organisation that automatically approves contact requests as "
 "\"Followers\"."
 msgstr "Account for an organization that automatically approves contact requests as \"Followers\"."
 
-#: mod/settings.php:1057
+#: mod/settings.php:1042
 msgid ""
 "Account for a news reflector that automatically approves contact requests as"
 " \"Followers\"."
 msgstr "Account for a news reflector that automatically approves contact requests as \"Followers\"."
 
-#: mod/settings.php:1061
+#: mod/settings.php:1046
 msgid "Account for community discussions."
 msgstr "Account for community discussions."
 
-#: mod/settings.php:1065
+#: mod/settings.php:1050
 msgid ""
 "Account for a regular personal profile that requires manual approval of "
 "\"Friends\" and \"Followers\"."
 msgstr "Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."
 
-#: mod/settings.php:1069
+#: mod/settings.php:1054
 msgid ""
 "Account for a public profile that automatically approves contact requests as"
 " \"Followers\"."
 msgstr "Account for a public profile that automatically approves contact requests as \"Followers\"."
 
-#: mod/settings.php:1073
+#: mod/settings.php:1058
 msgid "Automatically approves all contact requests."
 msgstr "Automatically approves all contact requests."
 
-#: mod/settings.php:1077
+#: mod/settings.php:1062
 msgid ""
 "Account for a popular profile that automatically approves contact requests "
 "as \"Friends\"."
 msgstr "Account for a popular profile that automatically approves contact requests as \"Friends\"."
 
-#: mod/settings.php:1080
+#: mod/settings.php:1065
 msgid "Private Forum [Experimental]"
 msgstr "Private forum [Experimental]"
 
-#: mod/settings.php:1081
+#: mod/settings.php:1066
 msgid "Requires manual approval of contact requests."
 msgstr "Requires manual approval of contact requests."
 
-#: mod/settings.php:1092
+#: mod/settings.php:1077
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: mod/settings.php:1092
+#: mod/settings.php:1077
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Optional) Allow this OpenID to login to this account."
 
-#: mod/settings.php:1100
+#: mod/settings.php:1085
 msgid "Publish your default profile in your local site directory?"
 msgstr "Publish default profile in local site directory?"
 
-#: mod/settings.php:1100
+#: mod/settings.php:1085
 #, php-format
 msgid ""
 "Your profile will be published in this node's <a href=\"%s\">local "
@@ -6216,304 +6123,318 @@ msgid ""
 " system settings."
 msgstr "Your profile will be published in this node's <a href=\"%s\">local directory</a>. Your profile details may be publicly visible depending on the system settings."
 
-#: mod/settings.php:1106
+#: mod/settings.php:1091
 msgid "Publish your default profile in the global social directory?"
 msgstr "Publish default profile in global directory?"
 
-#: mod/settings.php:1106
+#: mod/settings.php:1091
 #, php-format
 msgid ""
 "Your profile will be published in the global friendica directories (e.g. <a "
 "href=\"%s\">%s</a>). Your profile will be visible in public."
 msgstr "Your profile will be published in the global Friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be publicly visible."
 
-#: mod/settings.php:1113
+#: mod/settings.php:1098
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Hide my contact list from others?"
 
-#: mod/settings.php:1113
+#: mod/settings.php:1098
 msgid ""
 "Your contact list won't be shown in your default profile page. You can "
 "decide to show your contact list separately for each additional profile you "
 "create"
 msgstr "Your contact list won't be shown in your default profile page. You can decide to display your contact list separately for each additional profile you create"
 
-#: mod/settings.php:1117
+#: mod/settings.php:1102
 msgid "Hide your profile details from anonymous viewers?"
 msgstr "Hide your profile details from anonymous viewers?"
 
-#: mod/settings.php:1117
+#: mod/settings.php:1102
 msgid ""
 "Anonymous visitors will only see your profile picture, your display name and"
 " the nickname you are using on your profile page. Your public posts and "
 "replies will still be accessible by other means."
 msgstr ""
 
-#: mod/settings.php:1121
+#: mod/settings.php:1106
 msgid "Allow friends to post to your profile page?"
 msgstr "Allow friends to post to my wall?"
 
-#: mod/settings.php:1121
+#: mod/settings.php:1106
 msgid ""
 "Your contacts may write posts on your profile wall. These posts will be "
 "distributed to your contacts"
 msgstr "Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"
 
-#: mod/settings.php:1125
+#: mod/settings.php:1110
 msgid "Allow friends to tag your posts?"
 msgstr "Allow friends to tag my post?"
 
-#: mod/settings.php:1125
+#: mod/settings.php:1110
 msgid "Your contacts can add additional tags to your posts."
 msgstr "Your contacts can add additional tags to your posts."
 
-#: mod/settings.php:1129
+#: mod/settings.php:1114
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Allow us to suggest you as a potential friend to new members?"
 
-#: mod/settings.php:1129
+#: mod/settings.php:1114
 msgid ""
 "If you like, Friendica may suggest new members to add you as a contact."
 msgstr "If you like, Friendica may suggest new members to add you as a contact."
 
-#: mod/settings.php:1133
+#: mod/settings.php:1118
 msgid "Permit unknown people to send you private mail?"
 msgstr "Allow unknown people to send me private messages?"
 
-#: mod/settings.php:1133
+#: mod/settings.php:1118
 msgid ""
 "Friendica network users may send you private messages even if they are not "
 "in your contact list."
 msgstr "Friendica network users may send you private messages even if they are not in your contact list."
 
-#: mod/settings.php:1137
+#: mod/settings.php:1122
 msgid "Profile is <strong>not published</strong>."
 msgstr "Profile is <strong>not published</strong>."
 
-#: mod/settings.php:1143
+#: mod/settings.php:1128
 #, php-format
 msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
 msgstr "My identity address: <strong>'%s'</strong> or '%s'"
 
-#: mod/settings.php:1150
+#: mod/settings.php:1135
 msgid "Automatically expire posts after this many days:"
 msgstr "Automatically expire posts after this many days:"
 
-#: mod/settings.php:1150
+#: mod/settings.php:1135
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Posts will not expire if empty;  expired posts will be deleted"
 
-#: mod/settings.php:1151
+#: mod/settings.php:1136
 msgid "Advanced expiration settings"
 msgstr "Advanced expiration settings"
 
-#: mod/settings.php:1152
+#: mod/settings.php:1137
 msgid "Advanced Expiration"
 msgstr "Advanced expiration"
 
-#: mod/settings.php:1153
+#: mod/settings.php:1138
 msgid "Expire posts:"
 msgstr "Expire posts:"
 
-#: mod/settings.php:1154
+#: mod/settings.php:1139
 msgid "Expire personal notes:"
 msgstr "Expire personal notes:"
 
-#: mod/settings.php:1155
+#: mod/settings.php:1140
 msgid "Expire starred posts:"
 msgstr "Expire starred posts:"
 
-#: mod/settings.php:1156
+#: mod/settings.php:1141
 msgid "Expire photos:"
 msgstr "Expire photos:"
 
-#: mod/settings.php:1157
+#: mod/settings.php:1142
 msgid "Only expire posts by others:"
 msgstr "Only expire posts by others:"
 
-#: mod/settings.php:1187
+#: mod/settings.php:1172
 msgid "Account Settings"
 msgstr "Account Settings"
 
-#: mod/settings.php:1195
+#: mod/settings.php:1180
 msgid "Password Settings"
 msgstr "Password change"
 
-#: mod/settings.php:1197
+#: mod/settings.php:1181 src/Module/Register.php:130
+msgid "New Password:"
+msgstr "New password:"
+
+#: mod/settings.php:1181
+msgid ""
+"Allowed characters are a-z, A-Z, 0-9 and special characters except white "
+"spaces, accentuated letters and colon (:)."
+msgstr ""
+
+#: mod/settings.php:1182 src/Module/Register.php:131
+msgid "Confirm:"
+msgstr "Confirm new password:"
+
+#: mod/settings.php:1182
 msgid "Leave password fields blank unless changing"
 msgstr "Leave password fields blank unless changing"
 
-#: mod/settings.php:1198
+#: mod/settings.php:1183
 msgid "Current Password:"
 msgstr "Current password:"
 
-#: mod/settings.php:1198 mod/settings.php:1199
+#: mod/settings.php:1183 mod/settings.php:1184
 msgid "Your current password to confirm the changes"
 msgstr "Current password to confirm change"
 
-#: mod/settings.php:1199
+#: mod/settings.php:1184
 msgid "Password:"
 msgstr "Password:"
 
-#: mod/settings.php:1203
+#: mod/settings.php:1188
 msgid "Basic Settings"
 msgstr "Basic information"
 
-#: mod/settings.php:1204 src/Model/Profile.php:751
+#: mod/settings.php:1189 src/Model/Profile.php:751
 msgid "Full Name:"
 msgstr "Full name:"
 
-#: mod/settings.php:1205
+#: mod/settings.php:1190
 msgid "Email Address:"
 msgstr "Email address:"
 
-#: mod/settings.php:1206
+#: mod/settings.php:1191
 msgid "Your Timezone:"
 msgstr "Time zone:"
 
-#: mod/settings.php:1207
+#: mod/settings.php:1192
 msgid "Your Language:"
 msgstr "Language:"
 
-#: mod/settings.php:1207
+#: mod/settings.php:1192
 msgid ""
 "Set the language we use to show you friendica interface and to send you "
 "emails"
 msgstr "Set the language of your Friendica interface and emails sent to you."
 
-#: mod/settings.php:1208
+#: mod/settings.php:1193
 msgid "Default Post Location:"
 msgstr "Posting location:"
 
-#: mod/settings.php:1209
+#: mod/settings.php:1194
 msgid "Use Browser Location:"
 msgstr "Use browser location:"
 
-#: mod/settings.php:1212
+#: mod/settings.php:1197
 msgid "Security and Privacy Settings"
 msgstr "Security and privacy"
 
-#: mod/settings.php:1214
+#: mod/settings.php:1199
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximum friend requests per day:"
 
-#: mod/settings.php:1214 mod/settings.php:1243
+#: mod/settings.php:1199 mod/settings.php:1228
 msgid "(to prevent spam abuse)"
 msgstr "May prevent spam and abusive registrations"
 
-#: mod/settings.php:1215
+#: mod/settings.php:1200
 msgid "Default Post Permissions"
 msgstr "Default post permissions"
 
-#: mod/settings.php:1216
+#: mod/settings.php:1201
 msgid "(click to open/close)"
 msgstr "(reveal/hide)"
 
-#: mod/settings.php:1226
+#: mod/settings.php:1211
 msgid "Default Private Post"
 msgstr "Default private post"
 
-#: mod/settings.php:1227
+#: mod/settings.php:1212
 msgid "Default Public Post"
 msgstr "Default public post"
 
-#: mod/settings.php:1231
+#: mod/settings.php:1216
 msgid "Default Permissions for New Posts"
 msgstr "Default permissions for new posts"
 
-#: mod/settings.php:1243
+#: mod/settings.php:1228
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximum private messages per day from unknown people:"
 
-#: mod/settings.php:1246
+#: mod/settings.php:1231
 msgid "Notification Settings"
 msgstr "Notification"
 
-#: mod/settings.php:1247
+#: mod/settings.php:1232
 msgid "Send a notification email when:"
 msgstr "Send notification email when:"
 
-#: mod/settings.php:1248
+#: mod/settings.php:1233
 msgid "You receive an introduction"
 msgstr "Receiving an introduction"
 
-#: mod/settings.php:1249
+#: mod/settings.php:1234
 msgid "Your introductions are confirmed"
 msgstr "My introductions are confirmed"
 
-#: mod/settings.php:1250
+#: mod/settings.php:1235
 msgid "Someone writes on your profile wall"
 msgstr "Someone writes on my wall"
 
-#: mod/settings.php:1251
+#: mod/settings.php:1236
 msgid "Someone writes a followup comment"
 msgstr "A follow up comment is posted"
 
-#: mod/settings.php:1252
+#: mod/settings.php:1237
 msgid "You receive a private message"
 msgstr "receiving a private message"
 
-#: mod/settings.php:1253
+#: mod/settings.php:1238
 msgid "You receive a friend suggestion"
 msgstr "Receiving a friend suggestion"
 
-#: mod/settings.php:1254
+#: mod/settings.php:1239
 msgid "You are tagged in a post"
 msgstr "Tagged in a post"
 
-#: mod/settings.php:1255
+#: mod/settings.php:1240
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Poked in a post"
 
-#: mod/settings.php:1257
+#: mod/settings.php:1242
 msgid "Activate desktop notifications"
 msgstr "Activate desktop notifications"
 
-#: mod/settings.php:1257
+#: mod/settings.php:1242
 msgid "Show desktop popup on new notifications"
 msgstr "Show desktop pop-up on new notifications"
 
-#: mod/settings.php:1259
+#: mod/settings.php:1244
 msgid "Text-only notification emails"
 msgstr "Text-only notification emails"
 
-#: mod/settings.php:1261
+#: mod/settings.php:1246
 msgid "Send text only notification emails, without the html part"
 msgstr "Receive text only emails without HTML "
 
-#: mod/settings.php:1263
+#: mod/settings.php:1248
 msgid "Show detailled notifications"
 msgstr "Show detailled notifications"
 
-#: mod/settings.php:1265
+#: mod/settings.php:1250
 msgid ""
 "Per default, notifications are condensed to a single notification per item. "
 "When enabled every notification is displayed."
 msgstr "By default, notifications are condensed into a single notification for each item. When enabled, every notification is displayed."
 
-#: mod/settings.php:1267
+#: mod/settings.php:1252
 msgid "Advanced Account/Page Type Settings"
 msgstr "Advanced account types"
 
-#: mod/settings.php:1268
+#: mod/settings.php:1253
 msgid "Change the behaviour of this account for special situations"
 msgstr "Change behavior of this account for special situations"
 
-#: mod/settings.php:1271
+#: mod/settings.php:1256
 msgid "Relocate"
 msgstr "Recent relocation"
 
-#: mod/settings.php:1272
+#: mod/settings.php:1257
 msgid ""
 "If you have moved this profile from another server, and some of your "
 "contacts don't receive your updates, try pushing this button."
 msgstr "If you have moved this profile from another server and some of your contacts don't receive your updates:"
 
-#: mod/settings.php:1273
+#: mod/settings.php:1258
 msgid "Resend relocate message to contacts"
 msgstr "Resend relocation message to contacts"
 
-#: mod/subthread.php:106
+#: mod/subthread.php:104
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s is following %2$s's %3$s"
@@ -6528,11 +6449,11 @@ msgid ""
 "hours."
 msgstr "No suggestions available. If this is a new site, please try again in 24 hours."
 
-#: mod/suggest.php:88 mod/suggest.php:108
+#: mod/suggest.php:89 mod/suggest.php:109
 msgid "Ignore/Hide"
 msgstr "Ignore/Hide"
 
-#: mod/suggest.php:118 src/Content/Widget.php:68 view/theme/vier/theme.php:204
+#: mod/suggest.php:119 view/theme/vier/theme.php:204 src/Content/Widget.php:66
 msgid "Friend Suggestions"
 msgstr "Friend suggestions"
 
@@ -6540,11 +6461,11 @@ msgstr "Friend suggestions"
 msgid "Tag(s) removed"
 msgstr ""
 
-#: mod/tagrm.php:99
+#: mod/tagrm.php:101
 msgid "Remove Item Tag"
 msgstr "Remove Item tag"
 
-#: mod/tagrm.php:101
+#: mod/tagrm.php:103
 msgid "Select a tag to remove: "
 msgstr "Select a tag to remove: "
 
@@ -6573,6 +6494,16 @@ msgstr "Export your account info, contacts and all your items as JSON. This coul
 msgid "User imports on closed servers can only be done by an administrator."
 msgstr ""
 
+#: mod/uimport.php:39 src/Module/Register.php:59
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."
+
+#: mod/uimport.php:54 src/Module/Register.php:141
+msgid "Import"
+msgstr "Import profile"
+
 #: mod/uimport.php:56
 msgid "Move account"
 msgstr "Move Existing Friendica Account"
@@ -6616,57 +6547,85 @@ msgstr "Unfollowing is currently not supported by your network."
 msgid "Contact unfollowed"
 msgstr "Contact unfollowed"
 
-#: mod/unfollow.php:117 src/Module/Contact.php:576
+#: mod/unfollow.php:118 src/Module/Contact.php:570
 msgid "Disconnect/Unfollow"
 msgstr "Disconnect/Unfollow"
 
 #: mod/update_community.php:23 mod/update_contact.php:23
 #: mod/update_display.php:24 mod/update_network.php:33 mod/update_notes.php:36
-#: mod/update_profile.php:35
+#: mod/update_profile.php:34
 msgid "[Embedded content - reload page to view]"
 msgstr "[Embedded content - reload page to view]"
 
-#: mod/videos.php:134
+#: mod/videos.php:97
 msgid "Do you really want to delete this video?"
 msgstr "Do you really want to delete this video?"
 
-#: mod/videos.php:139
+#: mod/videos.php:102
 msgid "Delete Video"
 msgstr "Delete video"
 
-#: mod/videos.php:201
+#: mod/videos.php:152
 msgid "No videos selected"
 msgstr "No videos selected"
 
-#: mod/videos.php:372 src/Model/Item.php:3430
+#: mod/videos.php:309 src/Model/Item.php:3435
 msgid "View Video"
 msgstr "View video"
 
-#: mod/videos.php:387
+#: mod/videos.php:324
 msgid "Recent Videos"
 msgstr "Recent videos"
 
-#: mod/videos.php:389
+#: mod/videos.php:326
 msgid "Upload New Videos"
 msgstr "Upload new videos"
 
-#: mod/viewcontacts.php:97
+#: mod/viewcontacts.php:78
 msgid "No contacts."
 msgstr "No contacts."
 
-#: mod/viewcontacts.php:113 src/Module/Contact.php:609
-#: src/Module/Contact.php:1029
+#: mod/viewcontacts.php:94 src/Module/Contact.php:603
+#: src/Module/Contact.php:1024
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Visit %s's profile [%s]"
 
-#: mod/viewcontacts.php:132 src/Content/Nav.php:200 src/Content/Nav.php:266
-#: src/Content/Text/HTML.php:978 src/Model/Profile.php:980
-#: src/Model/Profile.php:983 src/Module/Contact.php:816
-#: src/Module/Contact.php:886 view/theme/frio/theme.php:284
+#: mod/viewcontacts.php:114 view/theme/frio/theme.php:273
+#: src/Content/Text/HTML.php:911 src/Content/Nav.php:203
+#: src/Content/Nav.php:269 src/Model/Profile.php:980 src/Model/Profile.php:983
+#: src/Module/Contact.php:811 src/Module/Contact.php:881
 msgid "Contacts"
 msgstr "Contacts"
 
+#: mod/wall_attach.php:26 mod/wall_attach.php:33 mod/wall_attach.php:85
+#: mod/wall_upload.php:42 mod/wall_upload.php:58 mod/wall_upload.php:116
+#: mod/wall_upload.php:167 mod/wall_upload.php:170
+msgid "Invalid request."
+msgstr "Invalid request."
+
+#: mod/wall_attach.php:103
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr "Sorry, maybe your upload is bigger than the PHP configuration allows"
+
+#: mod/wall_attach.php:103
+msgid "Or - did you try to upload an empty file?"
+msgstr "Or did you try to upload an empty file?"
+
+#: mod/wall_attach.php:114
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr "File exceeds size limit of %s"
+
+#: mod/wall_attach.php:129
+msgid "File upload failed."
+msgstr "File upload failed."
+
+#: mod/wall_upload.php:243 src/Object/Image.php:967 src/Object/Image.php:983
+#: src/Object/Image.php:991 src/Object/Image.php:1016
+msgid "Wall Photos"
+msgstr "Wall photos"
+
 #: mod/wallmessage.php:52 mod/wallmessage.php:115
 #, php-format
 msgid "Number of daily wall messages for %s exceeded. Message failed."
@@ -6687,2821 +6646,10 @@ msgid ""
 "your site allow private mail from unknown senders."
 msgstr "If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."
 
-#: mod/wall_attach.php:28 mod/wall_attach.php:35 mod/wall_attach.php:90
-#: mod/wall_upload.php:41 mod/wall_upload.php:57 mod/wall_upload.php:115
-#: mod/wall_upload.php:166 mod/wall_upload.php:169
-msgid "Invalid request."
-msgstr "Invalid request."
-
-#: mod/wall_attach.php:108
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "Sorry, maybe your upload is bigger than the PHP configuration allows"
-
-#: mod/wall_attach.php:108
-msgid "Or - did you try to upload an empty file?"
-msgstr "Or did you try to upload an empty file?"
-
-#: mod/wall_attach.php:119
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr "File exceeds size limit of %s"
-
-#: mod/wall_attach.php:143 mod/wall_attach.php:159
-msgid "File upload failed."
-msgstr "File upload failed."
-
-#: mod/wall_upload.php:242 src/Object/Image.php:968 src/Object/Image.php:984
-#: src/Object/Image.php:992 src/Object/Image.php:1017
-msgid "Wall Photos"
-msgstr "Wall photos"
-
-#: src/App.php:790
-msgid "Delete this item?"
-msgstr "Delete this item?"
-
-#: src/App.php:792
-msgid "show fewer"
-msgstr "Show fewer."
-
-#: src/App.php:834
-msgid "toggle mobile"
-msgstr "Toggle mobile"
-
-#: src/App.php:1383
-msgid "No system theme config value set."
-msgstr "No system theme configuration value set."
-
-#: src/BaseModule.php:133
-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 "The form security token was incorrect. This probably happened because the form has not been submitted within 3 hours."
-
-#: src/Content/ContactSelector.php:57
-msgid "Frequently"
-msgstr "Frequently"
-
-#: src/Content/ContactSelector.php:58
-msgid "Hourly"
-msgstr "Hourly"
-
-#: src/Content/ContactSelector.php:59
-msgid "Twice daily"
-msgstr "Twice daily"
-
-#: src/Content/ContactSelector.php:60
-msgid "Daily"
-msgstr "Daily"
-
-#: src/Content/ContactSelector.php:61
-msgid "Weekly"
-msgstr "Weekly"
-
-#: src/Content/ContactSelector.php:62
-msgid "Monthly"
-msgstr "Monthly"
-
-#: src/Content/ContactSelector.php:81
-msgid "DFRN"
-msgstr ""
-
-#: src/Content/ContactSelector.php:82
-msgid "OStatus"
-msgstr "OStatus"
-
-#: src/Content/ContactSelector.php:83
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: src/Content/ContactSelector.php:86
-msgid "Zot!"
-msgstr "Zot!"
-
-#: src/Content/ContactSelector.php:87
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: src/Content/ContactSelector.php:88
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: src/Content/ContactSelector.php:89
-msgid "MySpace"
-msgstr "MySpace"
-
-#: src/Content/ContactSelector.php:90
-msgid "Google+"
-msgstr "Google+"
-
-#: src/Content/ContactSelector.php:91
-msgid "pump.io"
-msgstr "pump.io"
-
-#: src/Content/ContactSelector.php:92
-msgid "Twitter"
-msgstr "Twitter"
-
-#: src/Content/ContactSelector.php:93
-msgid "Diaspora Connector"
-msgstr "Diaspora Connector"
-
-#: src/Content/ContactSelector.php:94
-msgid "GNU Social Connector"
-msgstr "GNU Social Connector"
-
-#: src/Content/ContactSelector.php:95
-msgid "ActivityPub"
-msgstr ""
-
-#: src/Content/ContactSelector.php:96
-msgid "pnut"
-msgstr "pnut"
-
-#: src/Content/ContactSelector.php:148
-msgid "Male"
-msgstr "Male"
-
-#: src/Content/ContactSelector.php:148
-msgid "Female"
-msgstr "Female"
-
-#: src/Content/ContactSelector.php:148
-msgid "Currently Male"
-msgstr "Currently male"
-
-#: src/Content/ContactSelector.php:148
-msgid "Currently Female"
-msgstr "Currently female"
-
-#: src/Content/ContactSelector.php:148
-msgid "Mostly Male"
-msgstr "Mostly male"
-
-#: src/Content/ContactSelector.php:148
-msgid "Mostly Female"
-msgstr "Mostly female"
-
-#: src/Content/ContactSelector.php:148
-msgid "Transgender"
-msgstr "Transgender"
-
-#: src/Content/ContactSelector.php:148
-msgid "Intersex"
-msgstr "Intersex"
-
-#: src/Content/ContactSelector.php:148
-msgid "Transsexual"
-msgstr "Transsexual"
-
-#: src/Content/ContactSelector.php:148
-msgid "Hermaphrodite"
-msgstr "Hermaphrodite"
-
-#: src/Content/ContactSelector.php:148
-msgid "Neuter"
-msgstr "Neuter"
-
-#: src/Content/ContactSelector.php:148
-msgid "Non-specific"
-msgstr "Non-specific"
-
-#: src/Content/ContactSelector.php:148
-msgid "Other"
-msgstr "Other"
-
-#: src/Content/ContactSelector.php:170
-msgid "Males"
-msgstr "Males"
-
-#: src/Content/ContactSelector.php:170
-msgid "Females"
-msgstr "Females"
-
-#: src/Content/ContactSelector.php:170
-msgid "Gay"
-msgstr "Gay"
-
-#: src/Content/ContactSelector.php:170
-msgid "Lesbian"
-msgstr "Lesbian"
-
-#: src/Content/ContactSelector.php:170
-msgid "No Preference"
-msgstr "No Preference"
-
-#: src/Content/ContactSelector.php:170
-msgid "Bisexual"
-msgstr "Bisexual"
-
-#: src/Content/ContactSelector.php:170
-msgid "Autosexual"
-msgstr "Auto-sexual"
-
-#: src/Content/ContactSelector.php:170
-msgid "Abstinent"
-msgstr "Abstinent"
-
-#: src/Content/ContactSelector.php:170
-msgid "Virgin"
-msgstr "Virgin"
-
-#: src/Content/ContactSelector.php:170
-msgid "Deviant"
-msgstr "Deviant"
-
-#: src/Content/ContactSelector.php:170
-msgid "Fetish"
-msgstr "Fetish"
-
-#: src/Content/ContactSelector.php:170
-msgid "Oodles"
-msgstr "Oodles"
-
-#: src/Content/ContactSelector.php:170
-msgid "Nonsexual"
-msgstr "Asexual"
-
-#: src/Content/ContactSelector.php:192
-msgid "Single"
-msgstr "Single"
-
-#: src/Content/ContactSelector.php:192
-msgid "Lonely"
-msgstr "Lonely"
-
-#: src/Content/ContactSelector.php:192
-msgid "Available"
-msgstr "Available"
-
-#: src/Content/ContactSelector.php:192
-msgid "Unavailable"
-msgstr "Unavailable"
-
-#: src/Content/ContactSelector.php:192
-msgid "Has crush"
-msgstr "Having a crush"
-
-#: src/Content/ContactSelector.php:192
-msgid "Infatuated"
-msgstr "Infatuated"
-
-#: src/Content/ContactSelector.php:192
-msgid "Dating"
-msgstr "Dating"
-
-#: src/Content/ContactSelector.php:192
-msgid "Unfaithful"
-msgstr "Unfaithful"
-
-#: src/Content/ContactSelector.php:192
-msgid "Sex Addict"
-msgstr "Sex addict"
-
-#: src/Content/ContactSelector.php:192 src/Model/User.php:618
-msgid "Friends"
-msgstr "Friends"
-
-#: src/Content/ContactSelector.php:192
-msgid "Friends/Benefits"
-msgstr "Friends with benefits"
-
-#: src/Content/ContactSelector.php:192
-msgid "Casual"
-msgstr "Casual"
-
-#: src/Content/ContactSelector.php:192
-msgid "Engaged"
-msgstr "Engaged"
-
-#: src/Content/ContactSelector.php:192
-msgid "Married"
-msgstr "Married"
-
-#: src/Content/ContactSelector.php:192
-msgid "Imaginarily married"
-msgstr "Imaginarily married"
-
-#: src/Content/ContactSelector.php:192
-msgid "Partners"
-msgstr "Partners"
-
-#: src/Content/ContactSelector.php:192
-msgid "Cohabiting"
-msgstr "Cohabiting"
-
-#: src/Content/ContactSelector.php:192
-msgid "Common law"
-msgstr "Common law spouse"
-
-#: src/Content/ContactSelector.php:192
-msgid "Happy"
-msgstr "Happy"
-
-#: src/Content/ContactSelector.php:192
-msgid "Not looking"
-msgstr "Not looking"
-
-#: src/Content/ContactSelector.php:192
-msgid "Swinger"
-msgstr "Swinger"
-
-#: src/Content/ContactSelector.php:192
-msgid "Betrayed"
-msgstr "Betrayed"
-
-#: src/Content/ContactSelector.php:192
-msgid "Separated"
-msgstr "Separated"
-
-#: src/Content/ContactSelector.php:192
-msgid "Unstable"
-msgstr "Unstable"
-
-#: src/Content/ContactSelector.php:192
-msgid "Divorced"
-msgstr "Divorced"
-
-#: src/Content/ContactSelector.php:192
-msgid "Imaginarily divorced"
-msgstr "Imaginarily divorced"
-
-#: src/Content/ContactSelector.php:192
-msgid "Widowed"
-msgstr "Widowed"
-
-#: src/Content/ContactSelector.php:192
-msgid "Uncertain"
-msgstr "Uncertain"
-
-#: src/Content/ContactSelector.php:192
-msgid "It's complicated"
-msgstr "It's complicated"
-
-#: src/Content/ContactSelector.php:192
-msgid "Don't care"
-msgstr "Don't care"
-
-#: src/Content/ContactSelector.php:192
-msgid "Ask me"
-msgstr "Ask me"
-
-#: src/Content/Feature.php:79
-msgid "General Features"
-msgstr "General"
-
-#: src/Content/Feature.php:81
-msgid "Multiple Profiles"
-msgstr "Multiple profiles"
-
-#: src/Content/Feature.php:81
-msgid "Ability to create multiple profiles"
-msgstr "Ability to create multiple profiles"
-
-#: src/Content/Feature.php:82
-msgid "Photo Location"
-msgstr "Photo location"
-
-#: src/Content/Feature.php:82
-msgid ""
-"Photo metadata is normally stripped. This extracts the location (if present)"
-" prior to stripping metadata and links it to a map."
-msgstr "Photo metadata is normally removed. This saves the geo tag (if present) and links it to a map prior to removing other metadata."
-
-#: src/Content/Feature.php:83
-msgid "Export Public Calendar"
-msgstr "Export public calendar"
-
-#: src/Content/Feature.php:83
-msgid "Ability for visitors to download the public calendar"
-msgstr "Ability for visitors to download the public calendar"
-
-#: src/Content/Feature.php:88
-msgid "Post Composition Features"
-msgstr "Post composition"
-
-#: src/Content/Feature.php:89
-msgid "Auto-mention Forums"
-msgstr "Auto-mention forums"
-
-#: src/Content/Feature.php:89
-msgid ""
-"Add/remove mention when a forum page is selected/deselected in ACL window."
-msgstr "Add/Remove mention when a forum page is selected or deselected in the ACL window."
-
-#: src/Content/Feature.php:94
-msgid "Network Sidebar"
-msgstr "Network sidebar"
-
-#: src/Content/Feature.php:95
-msgid "Ability to select posts by date ranges"
-msgstr "Ability to select posts by date ranges"
-
-#: src/Content/Feature.php:96
-msgid "Protocol Filter"
-msgstr ""
-
-#: src/Content/Feature.php:96
-msgid "Enable widget to display Network posts only from selected protocols"
-msgstr ""
-
-#: src/Content/Feature.php:101
-msgid "Network Tabs"
-msgstr "Network tabs"
-
-#: src/Content/Feature.php:102
-msgid "Network New Tab"
-msgstr "Network new tab"
-
-#: src/Content/Feature.php:102
-msgid "Enable tab to display only new Network posts (from the last 12 hours)"
-msgstr "Enable tab to display only new network posts (last 12 hours)"
-
-#: src/Content/Feature.php:103
-msgid "Network Shared Links Tab"
-msgstr "Network shared links tab"
-
-#: src/Content/Feature.php:103
-msgid "Enable tab to display only Network posts with links in them"
-msgstr "Enable tab to display only network posts with links in them"
-
-#: src/Content/Feature.php:108
-msgid "Post/Comment Tools"
-msgstr "Post/Comment tools"
-
-#: src/Content/Feature.php:109
-msgid "Post Categories"
-msgstr "Post categories"
-
-#: src/Content/Feature.php:109
-msgid "Add categories to your posts"
-msgstr "Add categories to your posts"
-
-#: src/Content/Feature.php:114
-msgid "Advanced Profile Settings"
-msgstr "Advanced profiles"
-
-#: src/Content/Feature.php:115
-msgid "List Forums"
-msgstr "List forums"
-
-#: src/Content/Feature.php:115
-msgid "Show visitors public community forums at the Advanced Profile Page"
-msgstr "Show visitors of public community forums at the advanced profile page"
-
-#: src/Content/Feature.php:116
-msgid "Tag Cloud"
-msgstr "Tag cloud"
-
-#: src/Content/Feature.php:116
-msgid "Provide a personal tag cloud on your profile page"
-msgstr "Provide a personal tag cloud on your profile page"
-
-#: src/Content/Feature.php:117
-msgid "Display Membership Date"
-msgstr "Display membership date"
-
-#: src/Content/Feature.php:117
-msgid "Display membership date in profile"
-msgstr "Display membership date in profile"
-
-#: src/Content/ForumManager.php:128 src/Content/Nav.php:204
-#: src/Content/Text/HTML.php:981 view/theme/vier/theme.php:253
-msgid "Forums"
-msgstr "Forums"
-
-#: src/Content/ForumManager.php:130 view/theme/vier/theme.php:255
-msgid "External link to forum"
-msgstr "External link to forum"
-
-#: src/Content/Nav.php:72
-msgid "Nothing new here"
-msgstr "Nothing new here"
-
-#: src/Content/Nav.php:76
-msgid "Clear notifications"
-msgstr "Clear notifications"
-
-#: src/Content/Nav.php:77 src/Content/Text/HTML.php:970
-msgid "@name, !forum, #tags, content"
-msgstr "@name, !forum, #tags, content"
-
-#: src/Content/Nav.php:150 src/Module/Login.php:321
-#: view/theme/frio/theme.php:270
-msgid "Logout"
-msgstr "Logout"
-
-#: src/Content/Nav.php:150 view/theme/frio/theme.php:270
-msgid "End this session"
-msgstr "End this session"
-
-#: src/Content/Nav.php:153 src/Model/Profile.php:901
-#: src/Module/Contact.php:659 src/Module/Contact.php:858
-#: view/theme/frio/theme.php:273
-msgid "Status"
-msgstr "Status"
-
-#: src/Content/Nav.php:153 src/Content/Nav.php:239
-#: view/theme/frio/theme.php:273
-msgid "Your posts and conversations"
-msgstr "My posts and conversations"
-
-#: src/Content/Nav.php:154 view/theme/frio/theme.php:274
-msgid "Your profile page"
-msgstr "My profile page"
-
-#: src/Content/Nav.php:155 view/theme/frio/theme.php:275
-msgid "Your photos"
-msgstr "My photos"
-
-#: src/Content/Nav.php:156 src/Model/Profile.php:925 src/Model/Profile.php:928
-#: view/theme/frio/theme.php:276
-msgid "Videos"
-msgstr "Videos"
-
-#: src/Content/Nav.php:156 view/theme/frio/theme.php:276
-msgid "Your videos"
-msgstr "My videos"
-
-#: src/Content/Nav.php:157 view/theme/frio/theme.php:277
-msgid "Your events"
-msgstr "My events"
-
-#: src/Content/Nav.php:158
-msgid "Personal notes"
-msgstr "Personal notes"
-
-#: src/Content/Nav.php:158
-msgid "Your personal notes"
-msgstr "My personal notes"
-
-#: src/Content/Nav.php:167
-msgid "Sign in"
-msgstr "Sign in"
-
-#: src/Content/Nav.php:177 src/Content/Nav.php:239
-#: src/Core/NotificationsManager.php:194
-msgid "Home"
-msgstr "Home"
-
-#: src/Content/Nav.php:177
-msgid "Home Page"
-msgstr "Home page"
-
-#: src/Content/Nav.php:181
-msgid "Create an account"
-msgstr "Create account"
-
-#: src/Content/Nav.php:187
-msgid "Help and documentation"
-msgstr "Help and documentation"
-
-#: src/Content/Nav.php:191
-msgid "Apps"
-msgstr "Apps"
-
-#: src/Content/Nav.php:191
-msgid "Addon applications, utilities, games"
-msgstr "Addon applications, utilities, games"
-
-#: src/Content/Nav.php:195
-msgid "Search site content"
-msgstr "Search site content"
-
-#: src/Content/Nav.php:198 src/Content/Text/HTML.php:976
-msgid "Full Text"
-msgstr "Full text"
-
-#: src/Content/Nav.php:199 src/Content/Text/HTML.php:977
-#: src/Content/Widget/TagCloud.php:55
-msgid "Tags"
-msgstr "Tags"
-
-#: src/Content/Nav.php:219
-msgid "Community"
-msgstr "Community"
-
-#: src/Content/Nav.php:219
-msgid "Conversations on this and other servers"
-msgstr "Conversations on this and other servers"
-
-#: src/Content/Nav.php:223 src/Model/Profile.php:940 src/Model/Profile.php:951
-#: view/theme/frio/theme.php:281
-msgid "Events and Calendar"
-msgstr "Events and calendar"
-
-#: src/Content/Nav.php:226
-msgid "Directory"
-msgstr "Directory"
-
-#: src/Content/Nav.php:226
-msgid "People directory"
-msgstr "People directory"
-
-#: src/Content/Nav.php:228
-msgid "Information about this friendica instance"
-msgstr "Information about this Friendica instance"
-
-#: src/Content/Nav.php:231
-msgid "Terms of Service of this Friendica instance"
-msgstr "Terms of Service of this Friendica instance"
-
-#: src/Content/Nav.php:236 view/theme/frio/theme.php:280
-msgid "Conversations from your friends"
-msgstr "My friends' conversations"
-
-#: src/Content/Nav.php:237
-msgid "Network Reset"
-msgstr "Network reset"
-
-#: src/Content/Nav.php:237
-msgid "Load Network page with no filters"
-msgstr "Load network page without filters"
-
-#: src/Content/Nav.php:243 src/Core/NotificationsManager.php:201
-msgid "Introductions"
-msgstr "Introductions"
-
-#: src/Content/Nav.php:243
-msgid "Friend Requests"
-msgstr "Friend requests"
-
-#: src/Content/Nav.php:245
-msgid "See all notifications"
-msgstr "See all notifications"
-
-#: src/Content/Nav.php:246
-msgid "Mark all system notifications seen"
-msgstr "Mark notifications as seen"
-
-#: src/Content/Nav.php:249 view/theme/frio/theme.php:282
-msgid "Private mail"
-msgstr "Private messages"
-
-#: src/Content/Nav.php:250
-msgid "Inbox"
-msgstr "Inbox"
-
-#: src/Content/Nav.php:251
-msgid "Outbox"
-msgstr "Outbox"
-
-#: src/Content/Nav.php:255
-msgid "Manage"
-msgstr "Manage"
-
-#: src/Content/Nav.php:255
-msgid "Manage other pages"
-msgstr "Manage other pages"
-
-#: src/Content/Nav.php:260 view/theme/frio/theme.php:283
-msgid "Account settings"
-msgstr "Account settings"
-
-#: src/Content/Nav.php:263
-msgid "Manage/Edit Profiles"
-msgstr "Manage/Edit profiles"
-
-#: src/Content/Nav.php:266 view/theme/frio/theme.php:284
-msgid "Manage/edit friends and contacts"
-msgstr "Manage/Edit friends and contacts"
-
-#: src/Content/Nav.php:271
-msgid "Site setup and configuration"
-msgstr "Site setup and configuration"
-
-#: src/Content/Nav.php:274
-msgid "Navigation"
-msgstr "Navigation"
-
-#: src/Content/Nav.php:274
-msgid "Site map"
-msgstr "Site map"
-
-#: src/Content/OEmbed.php:257
-msgid "Embedding disabled"
-msgstr "Embedding disabled"
-
-#: src/Content/OEmbed.php:377
-msgid "Embedded content"
-msgstr "Embedded content"
-
-#: src/Content/Pager.php:166
-msgid "newer"
-msgstr "Later posts"
-
-#: src/Content/Pager.php:171
-msgid "older"
-msgstr "Earlier posts"
-
-#: src/Content/Pager.php:210
-msgid "first"
-msgstr "first"
-
-#: src/Content/Pager.php:215
-msgid "prev"
-msgstr "prev"
-
-#: src/Content/Pager.php:270
-msgid "next"
-msgstr "next"
-
-#: src/Content/Pager.php:275
-msgid "last"
-msgstr "last"
-
-#: src/Content/Text/BBCode.php:426
-msgid "view full size"
-msgstr "view full size"
-
-#: src/Content/Text/BBCode.php:858 src/Content/Text/BBCode.php:1583
-#: src/Content/Text/BBCode.php:1584
-msgid "Image/photo"
-msgstr "Image/Photo"
-
-#: src/Content/Text/BBCode.php:961
-#, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
-msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
-
-#: src/Content/Text/BBCode.php:1510 src/Content/Text/BBCode.php:1532
-msgid "$1 wrote:"
-msgstr "$1 wrote:"
-
-#: src/Content/Text/BBCode.php:1594 src/Content/Text/BBCode.php:1595
-msgid "Encrypted content"
-msgstr "Encrypted content"
-
-#: src/Content/Text/BBCode.php:1702
-msgid "Invalid source protocol"
-msgstr "Invalid source protocol"
-
-#: src/Content/Text/BBCode.php:1713
-msgid "Invalid link protocol"
-msgstr "Invalid link protocol"
-
-#: src/Content/Text/HTML.php:797
-msgid "Loading more entries..."
-msgstr "Loading more entries..."
-
-#: src/Content/Text/HTML.php:798
-msgid "The end"
-msgstr "The end"
-
-#: src/Content/Text/HTML.php:838
-msgid "No contacts"
-msgstr "No contacts"
-
-#: src/Content/Text/HTML.php:865
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] "%d contact"
-msgstr[1] "%d contacts"
-
-#: src/Content/Text/HTML.php:878
-msgid "View Contacts"
-msgstr "View contacts"
-
-#: src/Content/Text/HTML.php:961
-msgid "Follow"
-msgstr "Follow"
-
-#: src/Content/Text/HTML.php:1016 src/Model/Item.php:3480
-#: src/Model/Item.php:3491
-msgid "Click to open/close"
-msgstr "Reveal/hide"
-
-#: src/Content/Widget/CalendarExport.php:66
-msgid "Export"
-msgstr "Export"
-
-#: src/Content/Widget/CalendarExport.php:67
-msgid "Export calendar as ical"
-msgstr "Export calendar as ical"
-
-#: src/Content/Widget/CalendarExport.php:68
-msgid "Export calendar as csv"
-msgstr "Export calendar as csv"
-
-#: src/Content/Widget.php:37
-msgid "Add New Contact"
-msgstr "Add new contact"
-
-#: src/Content/Widget.php:38
-msgid "Enter address or web location"
-msgstr "Enter address or web location"
-
-#: src/Content/Widget.php:39
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Example: jo@example.com, http://example.com/jo"
-
-#: src/Content/Widget.php:57
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invitation available"
-msgstr[1] "%d invitations available"
-
-#: src/Content/Widget.php:63 view/theme/vier/theme.php:199
-msgid "Find People"
-msgstr "Find people"
-
-#: src/Content/Widget.php:64 view/theme/vier/theme.php:200
-msgid "Enter name or interest"
-msgstr "Enter name or interest"
-
-#: src/Content/Widget.php:66 view/theme/vier/theme.php:202
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Examples: Robert Morgenstein, fishing"
-
-#: src/Content/Widget.php:69 view/theme/vier/theme.php:205
-msgid "Similar Interests"
-msgstr "Similar interests"
-
-#: src/Content/Widget.php:70 view/theme/vier/theme.php:206
-msgid "Random Profile"
-msgstr "Random profile"
-
-#: src/Content/Widget.php:71 view/theme/vier/theme.php:207
-msgid "Invite Friends"
-msgstr "Invite friends"
-
-#: src/Content/Widget.php:74 view/theme/vier/theme.php:210
-msgid "Local Directory"
-msgstr "Local directory"
-
-#: src/Content/Widget.php:158
-msgid "Protocols"
-msgstr ""
-
-#: src/Content/Widget.php:161
-msgid "All Protocols"
-msgstr ""
-
-#: src/Content/Widget.php:196
-msgid "Saved Folders"
-msgstr "Saved Folders"
-
-#: src/Content/Widget.php:199 src/Content/Widget.php:239
-msgid "Everything"
-msgstr "Everything"
-
-#: src/Content/Widget.php:236
-msgid "Categories"
-msgstr "Categories"
-
-#: src/Content/Widget.php:303
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] "%d contact in common"
-msgstr[1] "%d contacts in common"
-
-#: src/Core/ACL.php:285
-msgid "Post to Email"
-msgstr "Post to email"
-
-#: src/Core/ACL.php:291
-msgid "Hide your profile details from unknown viewers?"
-msgstr "Hide profile details from unknown viewers?"
-
-#: src/Core/ACL.php:290
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr "Connectors are disabled since \"%s\" is enabled."
-
-#: src/Core/ACL.php:297
-msgid "Visible to everybody"
-msgstr "Visible to everybody"
-
-#: src/Core/ACL.php:298 view/theme/vier/config.php:116
-msgid "show"
-msgstr "show"
-
-#: src/Core/ACL.php:299 view/theme/vier/config.php:116
-msgid "don't show"
-msgstr "don't show"
-
-#: src/Core/ACL.php:309
-msgid "Close"
-msgstr "Close"
-
-#: src/Core/Authentication.php:89
-msgid "Welcome "
-msgstr "Welcome "
-
-#: src/Core/Authentication.php:90
-msgid "Please upload a profile photo."
-msgstr "Please upload a profile photo."
-
-#: src/Core/Authentication.php:92
-msgid "Welcome back "
-msgstr "Welcome back "
-
-#: src/Core/Console/ArchiveContact.php:66
-#, php-format
-msgid "Could not find any unarchived contact entry for this URL (%s)"
-msgstr "Could not find any unarchived contact entry for this URL (%s)"
-
-#: src/Core/Console/ArchiveContact.php:71
-msgid "The contact entries have been archived"
-msgstr "The contact entries have been archived"
-
-#: src/Core/Console/NewPassword.php:73
-msgid "Enter new password: "
-msgstr "Enter new password: "
-
-#: src/Core/Console/NewPassword.php:78 src/Model/User.php:315
-msgid "Password can't be empty"
-msgstr "Password can't be empty"
-
-#: src/Core/Console/PostUpdate.php:50
-#, php-format
-msgid "Post update version number has been set to %s."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:58
-msgid "Check for pending update actions."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:60
-msgid "Done."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:62
-msgid "Execute pending post updates."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:68
-msgid "All pending post updates are done."
-msgstr ""
-
-#: src/Core/Installer.php:160
-msgid ""
-"The database configuration file \"config/local.config.php\" could not be "
-"written. Please use the enclosed text to create a configuration file in your"
-" web server root."
-msgstr ""
-
-#: src/Core/Installer.php:176
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."
-
-#: src/Core/Installer.php:177 src/Module/Install.php:134
-#: src/Module/Install.php:264
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Please see the file \"INSTALL.txt\"."
-
-#: src/Core/Installer.php:239
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Could not find a command line version of PHP in the web server PATH."
-
-#: src/Core/Installer.php:240
-msgid ""
-"If you don't have a command line version of PHP installed on your server, "
-"you will not be able to run the background processing. See <a "
-"href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
-"up-the-worker'>'Setup the worker'</a>"
-msgstr "If your server doesn't have a command line version of PHP installed, you won't be able to run background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"
-
-#: src/Core/Installer.php:244
-msgid "PHP executable path"
-msgstr "PHP executable path"
-
-#: src/Core/Installer.php:244
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Enter full path to php executable. You can leave this blank to continue the installation."
-
-#: src/Core/Installer.php:249
-msgid "Command line PHP"
-msgstr "Command line PHP"
-
-#: src/Core/Installer.php:258
-msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
-msgstr "PHP executable is not a php cli binary; it could possibly be a cgi-fgci version."
-
-#: src/Core/Installer.php:259
-msgid "Found PHP version: "
-msgstr "Found PHP version: "
-
-#: src/Core/Installer.php:261
-msgid "PHP cli binary"
-msgstr "PHP cli binary"
-
-#: src/Core/Installer.php:274
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "The command line version of PHP on your system does not have \"register_argc_argv\" enabled."
-
-#: src/Core/Installer.php:275
-msgid "This is required for message delivery to work."
-msgstr "This is required for message delivery to work."
-
-#: src/Core/Installer.php:280
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
-
-#: src/Core/Installer.php:312
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"
-
-#: src/Core/Installer.php:313
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "If running under Windows OS, please see \"http://www.php.net/manual/en/openssl.installation.php\"."
-
-#: src/Core/Installer.php:316
-msgid "Generate encryption keys"
-msgstr "Generate encryption keys"
-
-#: src/Core/Installer.php:367
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Error: Apache web server mod-rewrite module is required but not installed."
-
-#: src/Core/Installer.php:372
-msgid "Apache mod_rewrite module"
-msgstr "Apache mod_rewrite module"
-
-#: src/Core/Installer.php:378
-msgid "Error: PDO or MySQLi PHP module required but not installed."
-msgstr "Error: PDO or MySQLi PHP module required but not installed."
-
-#: src/Core/Installer.php:383
-msgid "Error: The MySQL driver for PDO is not installed."
-msgstr "Error: MySQL driver for PDO is not installed."
-
-#: src/Core/Installer.php:387
-msgid "PDO or MySQLi PHP module"
-msgstr "PDO or MySQLi PHP module"
-
-#: src/Core/Installer.php:395
-msgid "Error, XML PHP module required but not installed."
-msgstr "Error, XML PHP module required but not installed."
-
-#: src/Core/Installer.php:399
-msgid "XML PHP module"
-msgstr "XML PHP module"
-
-#: src/Core/Installer.php:402
-msgid "libCurl PHP module"
-msgstr "libCurl PHP module"
-
-#: src/Core/Installer.php:403
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Error: libCURL PHP module required but not installed."
-
-#: src/Core/Installer.php:409
-msgid "GD graphics PHP module"
-msgstr "GD graphics PHP module"
-
-#: src/Core/Installer.php:410
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Error: GD graphics PHP module with JPEG support required but not installed."
-
-#: src/Core/Installer.php:416
-msgid "OpenSSL PHP module"
-msgstr "OpenSSL PHP module"
-
-#: src/Core/Installer.php:417
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Error: openssl PHP module required but not installed."
-
-#: src/Core/Installer.php:423
-msgid "mb_string PHP module"
-msgstr "mb_string PHP module"
-
-#: src/Core/Installer.php:424
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Error: mb_string PHP module required but not installed."
-
-#: src/Core/Installer.php:430
-msgid "iconv PHP module"
-msgstr "iconv PHP module"
-
-#: src/Core/Installer.php:431
-msgid "Error: iconv PHP module required but not installed."
-msgstr "Error: iconv PHP module required but not installed."
-
-#: src/Core/Installer.php:437
-msgid "POSIX PHP module"
-msgstr "POSIX PHP module"
-
-#: src/Core/Installer.php:438
-msgid "Error: POSIX PHP module required but not installed."
-msgstr "Error: POSIX PHP module required but not installed."
-
-#: src/Core/Installer.php:461
-msgid ""
-"The web installer needs to be able to create a file called "
-"\"local.config.php\" in the \"config\" folder of your web server and it is "
-"unable to do so."
-msgstr ""
-
-#: src/Core/Installer.php:462
-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 "This is most often a permission setting issue, as the web server may not be able to write files in your directory - even if you can."
-
-#: src/Core/Installer.php:463
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named local.config.php in your Friendica \"config\" folder."
-msgstr ""
-
-#: src/Core/Installer.php:464
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"INSTALL.txt\" for instructions."
-msgstr "Alternatively, you may skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."
-
-#: src/Core/Installer.php:467
-msgid "config/local.config.php is writable"
-msgstr ""
-
-#: src/Core/Installer.php:487
-msgid ""
-"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."
-
-#: src/Core/Installer.php:488
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/smarty3/ under the Friendica top level "
-"folder."
-msgstr "In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top-level directory."
-
-#: src/Core/Installer.php:489
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Please ensure the user that your web server runs as (e.g. www-data) has write access to this directory."
-
-#: src/Core/Installer.php:490
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr "Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."
-
-#: src/Core/Installer.php:493
-msgid "view/smarty3 is writable"
-msgstr "view/smarty3 is writable"
-
-#: src/Core/Installer.php:521
-msgid ""
-"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist"
-" to .htaccess."
-msgstr ""
-
-#: src/Core/Installer.php:523
-msgid "Error message from Curl when fetching"
-msgstr "Error message from Curl while fetching"
-
-#: src/Core/Installer.php:528
-msgid "Url rewrite is working"
-msgstr "URL rewrite is working"
-
-#: src/Core/Installer.php:557
-msgid "ImageMagick PHP extension is not installed"
-msgstr "ImageMagick PHP extension is not installed"
-
-#: src/Core/Installer.php:559
-msgid "ImageMagick PHP extension is installed"
-msgstr "ImageMagick PHP extension is installed"
-
-#: src/Core/Installer.php:561 tests/src/Core/InstallerTest.php:308
-#: tests/src/Core/InstallerTest.php:332
-msgid "ImageMagick supports GIF"
-msgstr "ImageMagick supports GIF"
-
-#: src/Core/Installer.php:583
-msgid "Could not connect to database."
-msgstr "Could not connect to database."
-
-#: src/Core/Installer.php:590
-msgid "Database already in use."
-msgstr "Database already in use."
-
-#: src/Core/L10n.php:359 src/Model/Event.php:398
-msgid "Tuesday"
-msgstr "Tuesday"
-
-#: src/Core/L10n.php:359 src/Model/Event.php:399
-msgid "Wednesday"
-msgstr "Wednesday"
-
-#: src/Core/L10n.php:359 src/Model/Event.php:400
-msgid "Thursday"
-msgstr "Thursday"
-
-#: src/Core/L10n.php:359 src/Model/Event.php:401
-msgid "Friday"
-msgstr "Friday"
-
-#: src/Core/L10n.php:359 src/Model/Event.php:402
-msgid "Saturday"
-msgstr "Saturday"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:417
-msgid "January"
-msgstr "January"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:418
-msgid "February"
-msgstr "February"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:419
-msgid "March"
-msgstr "March"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:420
-msgid "April"
-msgstr "April"
-
-#: src/Core/L10n.php:363 src/Core/L10n.php:382 src/Model/Event.php:408
-#: src/Model/Event.php:421
-msgid "May"
-msgstr "May"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:422
-msgid "June"
-msgstr "June"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:423
-msgid "July"
-msgstr "July"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:424
-msgid "August"
-msgstr "August"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:425
-msgid "September"
-msgstr "September"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:426
-msgid "October"
-msgstr "October"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:427
-msgid "November"
-msgstr "November"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:428
-msgid "December"
-msgstr "December"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:389
-msgid "Mon"
-msgstr "Mon"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:390
-msgid "Tue"
-msgstr "Tue"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:391
-msgid "Wed"
-msgstr "Wed"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:392
-msgid "Thu"
-msgstr "Thu"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:393
-msgid "Fri"
-msgstr "Fri"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:394
-msgid "Sat"
-msgstr "Sat"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:388
-msgid "Sun"
-msgstr "Sun"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:404
-msgid "Jan"
-msgstr "Jan"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:405
-msgid "Feb"
-msgstr "Feb"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:406
-msgid "Mar"
-msgstr "Mar"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:407
-msgid "Apr"
-msgstr "Apr"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:410
-msgid "Jul"
-msgstr "Jul"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:411
-msgid "Aug"
-msgstr "Aug"
-
-#: src/Core/L10n.php:382
-msgid "Sep"
-msgstr "Sep"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:413
-msgid "Oct"
-msgstr "Oct"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:414
-msgid "Nov"
-msgstr "Nov"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:415
-msgid "Dec"
-msgstr "Dec"
-
-#: src/Core/L10n.php:400
-msgid "poke"
-msgstr "poke"
-
-#: src/Core/L10n.php:400
-msgid "poked"
-msgstr "poked"
-
-#: src/Core/L10n.php:401
-msgid "ping"
-msgstr "ping"
-
-#: src/Core/L10n.php:401
-msgid "pinged"
-msgstr "pinged"
-
-#: src/Core/L10n.php:402
-msgid "prod"
-msgstr "prod"
-
-#: src/Core/L10n.php:402
-msgid "prodded"
-msgstr "prodded"
-
-#: src/Core/L10n.php:403
-msgid "slap"
-msgstr "slap"
-
-#: src/Core/L10n.php:403
-msgid "slapped"
-msgstr "slapped"
-
-#: src/Core/L10n.php:404
-msgid "finger"
-msgstr "finger"
-
-#: src/Core/L10n.php:404
-msgid "fingered"
-msgstr "fingered"
-
-#: src/Core/L10n.php:405
-msgid "rebuff"
-msgstr "rebuff"
-
-#: src/Core/L10n.php:405
-msgid "rebuffed"
-msgstr "rebuffed"
-
-#: src/Core/NotificationsManager.php:173
-msgid "System"
-msgstr "System"
-
-#: src/Core/NotificationsManager.php:263 src/Core/NotificationsManager.php:275
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s commented on %s's post"
-
-#: src/Core/NotificationsManager.php:274
-#, php-format
-msgid "%s created a new post"
-msgstr "%s posted something new"
-
-#: src/Core/NotificationsManager.php:288
-#, php-format
-msgid "%s liked %s's post"
-msgstr "%s liked %s's post"
-
-#: src/Core/NotificationsManager.php:301
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "%s disliked %s's post"
-
-#: src/Core/NotificationsManager.php:314
-#, php-format
-msgid "%s is attending %s's event"
-msgstr "%s is going to %s's event"
-
-#: src/Core/NotificationsManager.php:327
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr "%s is not going to %s's event"
-
-#: src/Core/NotificationsManager.php:340
-#, php-format
-msgid "%s may attend %s's event"
-msgstr "%s may go to %s's event"
-
-#: src/Core/NotificationsManager.php:373
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s is now friends with %s"
-
-#: src/Core/NotificationsManager.php:639
-msgid "Friend Suggestion"
-msgstr "Friend suggestion"
-
-#: src/Core/NotificationsManager.php:673
-msgid "Friend/Connect Request"
-msgstr "Friend/Contact request"
-
-#: src/Core/NotificationsManager.php:673
-msgid "New Follower"
-msgstr "New follower"
-
-#: src/Core/Update.php:157
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Update %s failed. See error logs."
-
-#: src/Core/Update.php:213
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
-msgstr "\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
-
-#: src/Core/Update.php:219
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "The error message is\n[pre]%s[/pre]"
-
-#: src/Core/Update.php:248
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
-msgstr ""
-
-#: src/Core/UserImport.php:103
-msgid "Error decoding account file"
-msgstr "Error decoding account file"
-
-#: src/Core/UserImport.php:109
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "Error! No version data in file! Is this a Friendica account file?"
-
-#: src/Core/UserImport.php:117
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "User '%s' already exists on this server!"
-
-#: src/Core/UserImport.php:153
-msgid "User creation error"
-msgstr "User creation error"
-
-#: src/Core/UserImport.php:171
-msgid "User profile creation error"
-msgstr "User profile creation error"
-
-#: src/Core/UserImport.php:215
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "%d contact not imported"
-msgstr[1] "%d contacts not imported"
-
-#: src/Core/UserImport.php:280
-msgid "Done. You can now login with your username and password"
-msgstr "Done. You can now login with your username and password"
-
-#: src/Database/DBStructure.php:45
-msgid "There are no tables on MyISAM."
-msgstr "There are no tables on MyISAM."
-
-#: src/Database/DBStructure.php:153
-#, php-format
-msgid ""
-"\n"
-"Error %d occurred during database update:\n"
-"%s\n"
-msgstr "\nError %d occurred during database update:\n%s\n"
-
-#: src/Database/DBStructure.php:156
-msgid "Errors encountered performing database changes: "
-msgstr "Errors encountered performing database changes: "
-
-#: src/Database/DBStructure.php:172
-#, php-format
-msgid "%s: Database update"
-msgstr "%s: Database update"
-
-#: src/Database/DBStructure.php:435
-#, php-format
-msgid "%s: updating %s table."
-msgstr "%s: updating %s table."
-
-#: src/LegacyModule.php:29
-#, php-format
-msgid "Legacy module file not found: %s"
-msgstr ""
-
-#: src/Model/Contact.php:955
-msgid "Drop Contact"
-msgstr "Drop contact"
-
-#: src/Model/Contact.php:1418
-msgid "Organisation"
-msgstr "Organization"
-
-#: src/Model/Contact.php:1422
-msgid "News"
-msgstr "News"
-
-#: src/Model/Contact.php:1426
-msgid "Forum"
-msgstr "Forum"
-
-#: src/Model/Contact.php:1608
-msgid "Connect URL missing."
-msgstr "Connect URL missing."
-
-#: src/Model/Contact.php:1617
-msgid ""
-"The contact could not be added. Please check the relevant network "
-"credentials in your Settings -> Social Networks page."
-msgstr "The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."
-
-#: src/Model/Contact.php:1656
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "This site is not configured to allow communications with other networks."
-
-#: src/Model/Contact.php:1657 src/Model/Contact.php:1671
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "No compatible communication protocols or feeds were discovered."
-
-#: src/Model/Contact.php:1669
-msgid "The profile address specified does not provide adequate information."
-msgstr "The profile address specified does not provide adequate information."
-
-#: src/Model/Contact.php:1674
-msgid "An author or name was not found."
-msgstr "An author or name was not found."
-
-#: src/Model/Contact.php:1677
-msgid "No browser URL could be matched to this address."
-msgstr "No browser URL could be matched to this address."
-
-#: src/Model/Contact.php:1680
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr "Unable to match @-style identity address with a known protocol or email contact."
-
-#: src/Model/Contact.php:1681
-msgid "Use mailto: in front of address to force email check."
-msgstr "Use mailto: in front of address to force email check."
-
-#: src/Model/Contact.php:1687
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "The profile address specified belongs to a network which has been disabled on this site."
-
-#: src/Model/Contact.php:1692
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "Limited profile: This person will be unable to receive direct/private messages from you."
-
-#: src/Model/Contact.php:1743
-msgid "Unable to retrieve contact information."
-msgstr "Unable to retrieve contact information."
-
-#: src/Model/Event.php:63 src/Model/Event.php:80 src/Model/Event.php:437
-#: src/Model/Event.php:912
-msgid "Starts:"
-msgstr "Starts:"
-
-#: src/Model/Event.php:66 src/Model/Event.php:86 src/Model/Event.php:438
-#: src/Model/Event.php:916
-msgid "Finishes:"
-msgstr "Finishes:"
-
-#: src/Model/Event.php:386
-msgid "all-day"
-msgstr "All-day"
-
-#: src/Model/Event.php:409
-msgid "Jun"
-msgstr "Jun"
-
-#: src/Model/Event.php:412
-msgid "Sept"
-msgstr "Sep"
-
-#: src/Model/Event.php:435
-msgid "No events to display"
-msgstr "No events to display"
-
-#: src/Model/Event.php:559
-msgid "l, F j"
-msgstr "l, F j"
-
-#: src/Model/Event.php:590
-msgid "Edit event"
-msgstr "Edit event"
-
-#: src/Model/Event.php:591
-msgid "Duplicate event"
-msgstr "Duplicate event"
-
-#: src/Model/Event.php:592
-msgid "Delete event"
-msgstr "Delete event"
-
-#: src/Model/Event.php:624 src/Model/Item.php:3529 src/Model/Item.php:3536
-msgid "link to source"
-msgstr "Link to source"
-
-#: src/Model/Event.php:845
-msgid "D g:i A"
-msgstr "D g:i A"
-
-#: src/Model/Event.php:846
-msgid "g:i A"
-msgstr "g:i A"
-
-#: src/Model/Event.php:931 src/Model/Event.php:933
-msgid "Show map"
-msgstr "Show map"
-
-#: src/Model/Event.php:932
-msgid "Hide map"
-msgstr "Hide map"
-
-#: src/Model/Event.php:1022
-#, php-format
-msgid "%s's birthday"
-msgstr "%s's birthday"
-
-#: src/Model/Event.php:1023
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "Happy Birthday, %s!"
-
-#: src/Model/FileTag.php:255
-msgid "Item filed"
-msgstr "Item filed"
-
-#: src/Model/Group.php:47
-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 "A deleted group with this name has been 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."
-
-#: src/Model/Group.php:333
-msgid "Default privacy group for new contacts"
-msgstr "Default privacy group for new contacts"
-
-#: src/Model/Group.php:366
-msgid "Everybody"
-msgstr "Everybody"
-
-#: src/Model/Group.php:386
-msgid "edit"
-msgstr "edit"
-
-#: src/Model/Group.php:415
-msgid "Edit group"
-msgstr "Edit group"
-
-#: src/Model/Group.php:418
-msgid "Create a new group"
-msgstr "Create new group"
-
-#: src/Model/Group.php:420
-msgid "Edit groups"
-msgstr "Edit groups"
-
-#: src/Model/Item.php:3267
-msgid "activity"
-msgstr "activity"
-
-#: src/Model/Item.php:3269 src/Object/Post.php:446 src/Object/Post.php:458
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "comment"
-msgstr[1] "comments"
-
-#: src/Model/Item.php:3272
-msgid "post"
-msgstr "post"
-
-#: src/Model/Item.php:3368
-#, php-format
-msgid "Content warning: %s"
-msgstr "Content warning: %s"
-
-#: src/Model/Item.php:3447
-msgid "bytes"
-msgstr "bytes"
-
-#: src/Model/Item.php:3523
-msgid "View on separate page"
-msgstr "View on separate page"
-
-#: src/Model/Item.php:3524
-msgid "view on separate page"
-msgstr "view on separate page"
-
-#: src/Model/Mail.php:40 src/Model/Mail.php:172
-msgid "[no subject]"
-msgstr "[no subject]"
-
-#: src/Model/Profile.php:114
-msgid "Requested account is not available."
-msgstr "Requested account is unavailable."
-
-#: src/Model/Profile.php:180 src/Model/Profile.php:416
-#: src/Model/Profile.php:872
-msgid "Edit profile"
-msgstr "Edit profile"
-
-#: src/Model/Profile.php:350
-msgid "Atom feed"
-msgstr "Atom feed"
-
-#: src/Model/Profile.php:389
-msgid "Manage/edit profiles"
-msgstr "Manage/Edit profiles"
-
-#: src/Model/Profile.php:441 src/Module/Contact.php:652
-msgid "XMPP:"
-msgstr "XMPP:"
-
-#: src/Model/Profile.php:567 src/Model/Profile.php:665
-msgid "g A l F d"
-msgstr "g A l F d"
-
-#: src/Model/Profile.php:568
-msgid "F d"
-msgstr "F d"
-
-#: src/Model/Profile.php:630 src/Model/Profile.php:716
-msgid "[today]"
-msgstr "[today]"
-
-#: src/Model/Profile.php:641
-msgid "Birthday Reminders"
-msgstr "Birthday reminders"
-
-#: src/Model/Profile.php:642
-msgid "Birthdays this week:"
-msgstr "Birthdays this week:"
-
-#: src/Model/Profile.php:703
-msgid "[No description]"
-msgstr "[No description]"
-
-#: src/Model/Profile.php:730
-msgid "Event Reminders"
-msgstr "Event reminders"
-
-#: src/Model/Profile.php:731
-msgid "Upcoming events the next 7 days:"
-msgstr ""
-
-#: src/Model/Profile.php:754
-msgid "Member since:"
-msgstr "Member since:"
-
-#: src/Model/Profile.php:762
-msgid "j F, Y"
-msgstr "j F, Y"
-
-#: src/Model/Profile.php:763
-msgid "j F"
-msgstr "j F"
-
-#: src/Model/Profile.php:771 src/Util/Temporal.php:149
-msgid "Birthday:"
-msgstr "Birthday:"
-
-#: src/Model/Profile.php:778
-msgid "Age:"
-msgstr "Age:"
-
-#: src/Model/Profile.php:791
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "for %1$d %2$s"
-
-#: src/Model/Profile.php:815
-msgid "Religion:"
-msgstr "Religion:"
-
-#: src/Model/Profile.php:823
-msgid "Hobbies/Interests:"
-msgstr "Hobbies/Interests:"
-
-#: src/Model/Profile.php:835
-msgid "Contact information and Social Networks:"
-msgstr "Contact information and social networks:"
-
-#: src/Model/Profile.php:839
-msgid "Musical interests:"
-msgstr "Music:"
-
-#: src/Model/Profile.php:843
-msgid "Books, literature:"
-msgstr "Books/Literature:"
-
-#: src/Model/Profile.php:847
-msgid "Television:"
-msgstr "Television:"
-
-#: src/Model/Profile.php:851
-msgid "Film/dance/culture/entertainment:"
-msgstr "Arts, culture, entertainment:"
-
-#: src/Model/Profile.php:855
-msgid "Love/Romance:"
-msgstr "Love/Romance:"
-
-#: src/Model/Profile.php:859
-msgid "Work/employment:"
-msgstr "Work/Employment:"
-
-#: src/Model/Profile.php:863
-msgid "School/education:"
-msgstr "School/Education:"
-
-#: src/Model/Profile.php:868
-msgid "Forums:"
-msgstr "Forums:"
-
-#: src/Model/Profile.php:912 src/Module/Contact.php:877
-msgid "Profile Details"
-msgstr "Profile Details"
-
-#: src/Model/Profile.php:962
-msgid "Only You Can See This"
-msgstr "Only you can see this."
-
-#: src/Model/Profile.php:970 src/Model/Profile.php:973
-msgid "Tips for New Members"
-msgstr "Tips for New Members"
-
-#: src/Model/Profile.php:1135
-#, php-format
-msgid "OpenWebAuth: %1$s welcomes %2$s"
-msgstr ""
-
-#: src/Model/User.php:207
-msgid "Login failed"
-msgstr "Login failed"
-
-#: src/Model/User.php:238
-msgid "Not enough information to authenticate"
-msgstr "Not enough information to authenticate"
-
-#: src/Model/User.php:430
-msgid "An invitation is required."
-msgstr "An invitation is required."
-
-#: src/Model/User.php:434
-msgid "Invitation could not be verified."
-msgstr "Invitation could not be verified."
-
-#: src/Model/User.php:441
-msgid "Invalid OpenID url"
-msgstr "Invalid OpenID URL"
-
-#: src/Model/User.php:454 src/Module/Login.php:108
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."
-
-#: src/Model/User.php:454 src/Module/Login.php:108
-msgid "The error message was:"
-msgstr "The error message was:"
-
-#: src/Model/User.php:460
-msgid "Please enter the required information."
-msgstr "Please enter the required information."
-
-#: src/Model/User.php:476
-#, php-format
-msgid ""
-"system.username_min_length (%s) and system.username_max_length (%s) are "
-"excluding each other, swapping values."
-msgstr ""
-
-#: src/Model/User.php:483
-#, php-format
-msgid "Username should be at least %s character."
-msgid_plural "Username should be at least %s characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Model/User.php:487
-#, php-format
-msgid "Username should be at most %s character."
-msgid_plural "Username should be at most %s characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Model/User.php:495
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "That doesn't appear to be your full (i.e first and last) name."
-
-#: src/Model/User.php:500
-msgid "Your email domain is not among those allowed on this site."
-msgstr "Your email domain is not allowed on this site."
-
-#: src/Model/User.php:504
-msgid "Not a valid email address."
-msgstr "Not a valid email address."
-
-#: src/Model/User.php:507
-msgid "The nickname was blocked from registration by the nodes admin."
-msgstr ""
-
-#: src/Model/User.php:511 src/Model/User.php:519
-msgid "Cannot use that email."
-msgstr "Cannot use that email."
-
-#: src/Model/User.php:526
-msgid "Your nickname can only contain a-z, 0-9 and _."
-msgstr "Your nickname can only contain a-z, 0-9 and _."
-
-#: src/Model/User.php:533 src/Model/User.php:590
-msgid "Nickname is already registered. Please choose another."
-msgstr "Nickname is already registered. Please choose another."
-
-#: src/Model/User.php:543
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "SERIOUS ERROR: Generation of security keys failed."
-
-#: src/Model/User.php:577 src/Model/User.php:581
-msgid "An error occurred during registration. Please try again."
-msgstr "An error occurred during registration. Please try again."
-
-#: src/Model/User.php:601 view/theme/duepuntozero/config.php:55
+#: view/theme/duepuntozero/config.php:55 src/Model/User.php:684
 msgid "default"
 msgstr "default"
 
-#: src/Model/User.php:606
-msgid "An error occurred creating your default profile. Please try again."
-msgstr "An error occurred creating your default profile. Please try again."
-
-#: src/Model/User.php:613
-msgid "An error occurred creating your self contact. Please try again."
-msgstr "An error occurred creating your self contact. Please try again."
-
-#: src/Model/User.php:622
-msgid ""
-"An error occurred creating your default contact group. Please try again."
-msgstr "An error occurred while creating your default contact group. Please try again."
-
-#: src/Model/User.php:697
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tThank you for registering at %2$s. Your account is pending for approval by the administrator.\n"
-"\n"
-"\t\t\tYour login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t\t%4$s\n"
-"\t\t\tPassword:\t\t%5$s\n"
-"\t\t"
-msgstr ""
-
-#: src/Model/User.php:714
-#, php-format
-msgid "Registration at %s"
-msgstr "Registration at %s"
-
-#: src/Model/User.php:732
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
-"\t\t"
-msgstr "\n\t\t\tDear %1$s,\n\t\t\t\tThank you for registering at %2$s. Your account has been created.\n\t\t"
-
-#: src/Model/User.php:738
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t\t%1$s\n"
-"\t\t\tPassword:\t\t%5$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n"
-"\n"
-"\t\t\tThank you and welcome to %2$s."
-msgstr "\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3$s\n\t\t\tLogin Name:\t\t%1$s\n\t\t\tPassword:\t\t%5$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n\n\t\t\tThank you and welcome to %2$s."
-
-#: src/Module/Contact.php:171
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] "%d contact edited."
-msgstr[1] "%d contacts edited."
-
-#: src/Module/Contact.php:196 src/Module/Contact.php:379
-msgid "Could not access contact record."
-msgstr "Could not access contact record."
-
-#: src/Module/Contact.php:206
-msgid "Could not locate selected profile."
-msgstr "Could not locate selected profile."
-
-#: src/Module/Contact.php:238
-msgid "Contact updated."
-msgstr "Contact updated."
-
-#: src/Module/Contact.php:400
-msgid "Contact has been blocked"
-msgstr "Contact has been blocked"
-
-#: src/Module/Contact.php:400
-msgid "Contact has been unblocked"
-msgstr "Contact has been unblocked"
-
-#: src/Module/Contact.php:410
-msgid "Contact has been ignored"
-msgstr "Contact has been ignored"
-
-#: src/Module/Contact.php:410
-msgid "Contact has been unignored"
-msgstr "Contact has been unignored"
-
-#: src/Module/Contact.php:420
-msgid "Contact has been archived"
-msgstr "Contact has been archived"
-
-#: src/Module/Contact.php:420
-msgid "Contact has been unarchived"
-msgstr "Contact has been unarchived"
-
-#: src/Module/Contact.php:444
-msgid "Drop contact"
-msgstr "Drop contact"
-
-#: src/Module/Contact.php:447 src/Module/Contact.php:825
-msgid "Do you really want to delete this contact?"
-msgstr "Do you really want to delete this contact?"
-
-#: src/Module/Contact.php:461
-msgid "Contact has been removed."
-msgstr "Contact has been removed."
-
-#: src/Module/Contact.php:492
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr "You are mutual friends with %s"
-
-#: src/Module/Contact.php:497
-#, php-format
-msgid "You are sharing with %s"
-msgstr "You are sharing with %s"
-
-#: src/Module/Contact.php:502
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s is sharing with you"
-
-#: src/Module/Contact.php:526
-msgid "Private communications are not available for this contact."
-msgstr "Private communications are not available for this contact."
-
-#: src/Module/Contact.php:528
-msgid "Never"
-msgstr "Never"
-
-#: src/Module/Contact.php:531
-msgid "(Update was successful)"
-msgstr "(Update was successful)"
-
-#: src/Module/Contact.php:531
-msgid "(Update was not successful)"
-msgstr "(Update was not successful)"
-
-#: src/Module/Contact.php:533 src/Module/Contact.php:1063
-msgid "Suggest friends"
-msgstr "Suggest friends"
-
-#: src/Module/Contact.php:537
-#, php-format
-msgid "Network type: %s"
-msgstr "Network type: %s"
-
-#: src/Module/Contact.php:542
-msgid "Communications lost with this contact!"
-msgstr "Communications lost with this contact!"
-
-#: src/Module/Contact.php:548
-msgid "Fetch further information for feeds"
-msgstr "Fetch further information for feeds"
-
-#: src/Module/Contact.php:550
-msgid ""
-"Fetch information like preview pictures, title and teaser from the feed "
-"item. You can activate this if the feed doesn't contain much text. Keywords "
-"are taken from the meta header in the feed item and are posted as hash tags."
-msgstr "Fetch information like preview pictures, title, and teaser from the feed item. You can activate this if the feed doesn't contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags."
-
-#: src/Module/Contact.php:553
-msgid "Fetch information"
-msgstr "Fetch information"
-
-#: src/Module/Contact.php:554
-msgid "Fetch keywords"
-msgstr "Fetch keywords"
-
-#: src/Module/Contact.php:555
-msgid "Fetch information and keywords"
-msgstr "Fetch information and keywords"
-
-#: src/Module/Contact.php:587
-msgid "Profile Visibility"
-msgstr "Profile visibility"
-
-#: src/Module/Contact.php:588
-msgid "Contact Information / Notes"
-msgstr "Personal note"
-
-#: src/Module/Contact.php:589
-msgid "Contact Settings"
-msgstr "Notification and privacy "
-
-#: src/Module/Contact.php:598
-msgid "Contact"
-msgstr "Contact"
-
-#: src/Module/Contact.php:602
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Please choose the profile you would like to display to %s when viewing your profile securely."
-
-#: src/Module/Contact.php:604
-msgid "Their personal note"
-msgstr "Their personal note"
-
-#: src/Module/Contact.php:606
-msgid "Edit contact notes"
-msgstr "Edit contact notes"
-
-#: src/Module/Contact.php:610
-msgid "Block/Unblock contact"
-msgstr "Block/Unblock contact"
-
-#: src/Module/Contact.php:611
-msgid "Ignore contact"
-msgstr "Ignore contact"
-
-#: src/Module/Contact.php:612
-msgid "Repair URL settings"
-msgstr "Repair URL settings"
-
-#: src/Module/Contact.php:613
-msgid "View conversations"
-msgstr "View conversations"
-
-#: src/Module/Contact.php:618
-msgid "Last update:"
-msgstr "Last update:"
-
-#: src/Module/Contact.php:620
-msgid "Update public posts"
-msgstr "Update public posts"
-
-#: src/Module/Contact.php:622 src/Module/Contact.php:1073
-msgid "Update now"
-msgstr "Update now"
-
-#: src/Module/Contact.php:628 src/Module/Contact.php:830
-#: src/Module/Contact.php:1090
-msgid "Unignore"
-msgstr "Unignore"
-
-#: src/Module/Contact.php:632
-msgid "Currently blocked"
-msgstr "Currently blocked"
-
-#: src/Module/Contact.php:633
-msgid "Currently ignored"
-msgstr "Currently ignored"
-
-#: src/Module/Contact.php:634
-msgid "Currently archived"
-msgstr "Currently archived"
-
-#: src/Module/Contact.php:635
-msgid "Awaiting connection acknowledge"
-msgstr "Awaiting connection acknowledgement"
-
-#: src/Module/Contact.php:636
-msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
-msgstr "Replies/Likes to your public posts <strong>may</strong> still be visible"
-
-#: src/Module/Contact.php:637
-msgid "Notification for new posts"
-msgstr "Notification for new posts"
-
-#: src/Module/Contact.php:637
-msgid "Send a notification of every new post of this contact"
-msgstr "Send notification for every new post from this contact"
-
-#: src/Module/Contact.php:640
-msgid "Blacklisted keywords"
-msgstr "Blacklisted keywords"
-
-#: src/Module/Contact.php:640
-msgid ""
-"Comma separated list of keywords that should not be converted to hashtags, "
-"when \"Fetch information and keywords\" is selected"
-msgstr "Comma-separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"
-
-#: src/Module/Contact.php:657
-msgid "Actions"
-msgstr "Actions"
-
-#: src/Module/Contact.php:703
-msgid "Suggestions"
-msgstr "Suggestions"
-
-#: src/Module/Contact.php:706
-msgid "Suggest potential friends"
-msgstr "Suggest potential friends"
-
-#: src/Module/Contact.php:714
-msgid "Show all contacts"
-msgstr "Show all contacts"
-
-#: src/Module/Contact.php:719
-msgid "Unblocked"
-msgstr "Unblocked"
-
-#: src/Module/Contact.php:722
-msgid "Only show unblocked contacts"
-msgstr "Only show unblocked contacts"
-
-#: src/Module/Contact.php:727
-msgid "Blocked"
-msgstr "Blocked"
-
-#: src/Module/Contact.php:730
-msgid "Only show blocked contacts"
-msgstr "Only show blocked contacts"
-
-#: src/Module/Contact.php:735
-msgid "Ignored"
-msgstr "Ignored"
-
-#: src/Module/Contact.php:738
-msgid "Only show ignored contacts"
-msgstr "Only show ignored contacts"
-
-#: src/Module/Contact.php:743
-msgid "Archived"
-msgstr "Archived"
-
-#: src/Module/Contact.php:746
-msgid "Only show archived contacts"
-msgstr "Only show archived contacts"
-
-#: src/Module/Contact.php:751
-msgid "Hidden"
-msgstr "Hidden"
-
-#: src/Module/Contact.php:754
-msgid "Only show hidden contacts"
-msgstr "Only show hidden contacts"
-
-#: src/Module/Contact.php:762
-msgid "Organize your contact groups"
-msgstr ""
-
-#: src/Module/Contact.php:820
-msgid "Search your contacts"
-msgstr "Search your contacts"
-
-#: src/Module/Contact.php:831 src/Module/Contact.php:1099
-msgid "Archive"
-msgstr "Archive"
-
-#: src/Module/Contact.php:831 src/Module/Contact.php:1099
-msgid "Unarchive"
-msgstr "Unarchive"
-
-#: src/Module/Contact.php:834
-msgid "Batch Actions"
-msgstr "Batch actions"
-
-#: src/Module/Contact.php:861
-msgid "Conversations started by this contact"
-msgstr ""
-
-#: src/Module/Contact.php:866
-msgid "Posts and Comments"
-msgstr ""
-
-#: src/Module/Contact.php:889
-msgid "View all contacts"
-msgstr "View all contacts"
-
-#: src/Module/Contact.php:900
-msgid "View all common friends"
-msgstr "View all common friends"
-
-#: src/Module/Contact.php:910
-msgid "Advanced Contact Settings"
-msgstr "Advanced contact settings"
-
-#: src/Module/Contact.php:996
-msgid "Mutual Friendship"
-msgstr "Mutual friendship"
-
-#: src/Module/Contact.php:1001
-msgid "is a fan of yours"
-msgstr "is a fan of yours"
-
-#: src/Module/Contact.php:1006
-msgid "you are a fan of"
-msgstr "I follow them"
-
-#: src/Module/Contact.php:1030
-msgid "Edit contact"
-msgstr "Edit contact"
-
-#: src/Module/Contact.php:1084
-msgid "Toggle Blocked status"
-msgstr "Toggle blocked status"
-
-#: src/Module/Contact.php:1092
-msgid "Toggle Ignored status"
-msgstr "Toggle ignored status"
-
-#: src/Module/Contact.php:1101
-msgid "Toggle Archive status"
-msgstr "Toggle archive status"
-
-#: src/Module/Contact.php:1109
-msgid "Delete contact"
-msgstr "Delete contact"
-
-#: src/Module/Install.php:120
-msgid "Friendica Communications Server - Setup"
-msgstr ""
-
-#: src/Module/Install.php:131
-msgid "System check"
-msgstr "System check"
-
-#: src/Module/Install.php:136
-msgid "Check again"
-msgstr "Check again"
-
-#: src/Module/Install.php:153
-msgid "Database connection"
-msgstr "Database connection"
-
-#: src/Module/Install.php:154
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
-msgstr "In order to install Friendica we need to know how to connect to your database."
-
-#: src/Module/Install.php:155
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Please contact your hosting provider or site administrator if you have questions about these settings."
-
-#: src/Module/Install.php:156
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "The database you specify below should already exist. If it does not, please create it before continuing."
-
-#: src/Module/Install.php:159
-msgid "Database Server Name"
-msgstr "Database server name"
-
-#: src/Module/Install.php:164
-msgid "Database Login Name"
-msgstr "Database login name"
-
-#: src/Module/Install.php:170
-msgid "Database Login Password"
-msgstr "Database login password"
-
-#: src/Module/Install.php:172
-msgid "For security reasons the password must not be empty"
-msgstr "For security reasons the password must not be empty"
-
-#: src/Module/Install.php:175
-msgid "Database Name"
-msgstr "Database name"
-
-#: src/Module/Install.php:180 src/Module/Install.php:216
-msgid "Site administrator email address"
-msgstr "Site administrator email address"
-
-#: src/Module/Install.php:182 src/Module/Install.php:216
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "Your account email address must match this in order to use the web admin panel."
-
-#: src/Module/Install.php:186 src/Module/Install.php:217
-msgid "Please select a default timezone for your website"
-msgstr "Please select a default time zone for your website"
-
-#: src/Module/Install.php:210
-msgid "Site settings"
-msgstr "Site settings"
-
-#: src/Module/Install.php:219
-msgid "System Language:"
-msgstr "System language:"
-
-#: src/Module/Install.php:221
-msgid ""
-"Set the default language for your Friendica installation interface and to "
-"send emails."
-msgstr "Set the default language for your Friendica installation interface and email communication."
-
-#: src/Module/Install.php:233
-msgid "Your Friendica site database has been installed."
-msgstr "Your Friendica site database has been installed."
-
-#: src/Module/Install.php:241
-msgid "Installation finished"
-msgstr ""
-
-#: src/Module/Install.php:262
-msgid "<h1>What next</h1>"
-msgstr "<h1>What next</h1>"
-
-#: src/Module/Install.php:263
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"worker."
-msgstr "IMPORTANT: You will need to [manually] setup a scheduled task for the worker."
-
-#: src/Module/Install.php:266
-#, php-format
-msgid ""
-"Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
-"and register as new user. Remember to use the same email you have entered as"
-" administrator email. This will allow you to enter the site admin panel."
-msgstr "Go to your new Friendica node <a href=\"%s/register\">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel."
-
-#: src/Module/Itemsource.php:33
-msgid "Item Guid"
-msgstr ""
-
-#: src/Module/Login.php:292
-msgid "Create a New Account"
-msgstr "Create a new account"
-
-#: src/Module/Login.php:325
-msgid "Password: "
-msgstr "Password: "
-
-#: src/Module/Login.php:326
-msgid "Remember me"
-msgstr "Remember me"
-
-#: src/Module/Login.php:329
-msgid "Or login using OpenID: "
-msgstr "Or login with OpenID: "
-
-#: src/Module/Login.php:335
-msgid "Forgot your password?"
-msgstr "Forgot your password?"
-
-#: src/Module/Login.php:338
-msgid "Website Terms of Service"
-msgstr "Website Terms of Service"
-
-#: src/Module/Login.php:339
-msgid "terms of service"
-msgstr "Terms of service"
-
-#: src/Module/Login.php:341
-msgid "Website Privacy Policy"
-msgstr "Website Privacy Policy"
-
-#: src/Module/Login.php:342
-msgid "privacy policy"
-msgstr "Privacy policy"
-
-#: src/Module/Logout.php:29
-msgid "Logged out."
-msgstr "Logged out."
-
-#: src/Module/Proxy.php:136
-msgid "Bad Request."
-msgstr ""
-
-#: src/Module/Tos.php:35 src/Module/Tos.php:75
-msgid ""
-"At the time of registration, and for providing communications between the "
-"user account and their contacts, the user has to provide a display name (pen"
-" name), an username (nickname) and a working email address. The names will "
-"be accessible on the profile page of the account by any visitor of the page,"
-" even if other profile details are not displayed. The email address will "
-"only be used to send the user notifications about interactions, but wont be "
-"visibly displayed. The listing of an account in the node's user directory or"
-" the global user directory is optional and can be controlled in the user "
-"settings, it is not necessary for communication."
-msgstr "At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), a username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but won’t be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication."
-
-#: src/Module/Tos.php:36 src/Module/Tos.php:76
-msgid ""
-"This data is required for communication and is passed on to the nodes of the"
-" communication partners and is stored there. Users can enter additional "
-"private data that may be transmitted to the communication partners accounts."
-msgstr "This information is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional personal information that may be transmitted to the communication partner's accounts."
-
-#: src/Module/Tos.php:37 src/Module/Tos.php:77
-#, php-format
-msgid ""
-"At any point in time a logged in user can export their account data from the"
-" <a href=\"%1$s/settings/uexport\">account settings</a>. If the user wants "
-"to delete their account they can do so at <a "
-"href=\"%1$s/removeme\">%1$s/removeme</a>. The deletion of the account will "
-"be permanent. Deletion of the data will also be requested from the nodes of "
-"the communication partners."
-msgstr "At any point in time a logged in user can export their account data from the <a href=\"%1$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1$s/removeme\">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners."
-
-#: src/Module/Tos.php:40 src/Module/Tos.php:74
-msgid "Privacy Statement"
-msgstr "Privacy Statement"
-
-#: src/Object/Post.php:134
-msgid "This entry was edited"
-msgstr "This entry was edited"
-
-#: src/Object/Post.php:197
-msgid "Delete locally"
-msgstr ""
-
-#: src/Object/Post.php:200
-msgid "Delete globally"
-msgstr ""
-
-#: src/Object/Post.php:200
-msgid "Remove locally"
-msgstr ""
-
-#: src/Object/Post.php:214
-msgid "save to folder"
-msgstr "Save to folder"
-
-#: src/Object/Post.php:249
-msgid "I will attend"
-msgstr "I will attend"
-
-#: src/Object/Post.php:249
-msgid "I will not attend"
-msgstr "I will not attend"
-
-#: src/Object/Post.php:249
-msgid "I might attend"
-msgstr "I might attend"
-
-#: src/Object/Post.php:277
-msgid "ignore thread"
-msgstr "Ignore thread"
-
-#: src/Object/Post.php:278
-msgid "unignore thread"
-msgstr "Unignore thread"
-
-#: src/Object/Post.php:279
-msgid "toggle ignore status"
-msgstr "Toggle ignore status"
-
-#: src/Object/Post.php:290
-msgid "add star"
-msgstr "Add star"
-
-#: src/Object/Post.php:291
-msgid "remove star"
-msgstr "Remove star"
-
-#: src/Object/Post.php:292
-msgid "toggle star status"
-msgstr "Toggle star status"
-
-#: src/Object/Post.php:295
-msgid "starred"
-msgstr "Starred"
-
-#: src/Object/Post.php:299
-msgid "add tag"
-msgstr "Add tag"
-
-#: src/Object/Post.php:310
-msgid "like"
-msgstr "Like"
-
-#: src/Object/Post.php:311
-msgid "dislike"
-msgstr "Dislike"
-
-#: src/Object/Post.php:314
-msgid "Share this"
-msgstr "Share this"
-
-#: src/Object/Post.php:314
-msgid "share"
-msgstr "Share"
-
-#: src/Object/Post.php:381
-msgid "to"
-msgstr "to"
-
-#: src/Object/Post.php:382
-msgid "via"
-msgstr "via"
-
-#: src/Object/Post.php:383
-msgid "Wall-to-Wall"
-msgstr "Wall-to-wall"
-
-#: src/Object/Post.php:384
-msgid "via Wall-To-Wall:"
-msgstr "via wall-to-wall:"
-
-#: src/Object/Post.php:444
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d comment"
-msgstr[1] "%d comments -"
-
-#: src/Protocol/Diaspora.php:2434
-msgid "Sharing notification from Diaspora network"
-msgstr "Sharing notification from Diaspora network"
-
-#: src/Protocol/Diaspora.php:3528
-msgid "Attachments:"
-msgstr "Attachments:"
-
-#: src/Protocol/OStatus.php:1839
-#, php-format
-msgid "%s is now following %s."
-msgstr "%s is now following %s."
-
-#: src/Protocol/OStatus.php:1840
-msgid "following"
-msgstr "following"
-
-#: src/Protocol/OStatus.php:1843
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%s stopped following %s."
-
-#: src/Protocol/OStatus.php:1844
-msgid "stopped following"
-msgstr "stopped following"
-
-#: src/Util/Temporal.php:153
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "YYYY-MM-DD or MM-DD"
-
-#: src/Util/Temporal.php:296
-msgid "never"
-msgstr "never"
-
-#: src/Util/Temporal.php:303
-msgid "less than a second ago"
-msgstr "less than a second ago"
-
-#: src/Util/Temporal.php:311
-msgid "year"
-msgstr "year"
-
-#: src/Util/Temporal.php:311
-msgid "years"
-msgstr "years"
-
-#: src/Util/Temporal.php:312
-msgid "months"
-msgstr "months"
-
-#: src/Util/Temporal.php:313
-msgid "weeks"
-msgstr "weeks"
-
-#: src/Util/Temporal.php:314
-msgid "days"
-msgstr "days"
-
-#: src/Util/Temporal.php:315
-msgid "hour"
-msgstr "hour"
-
-#: src/Util/Temporal.php:315
-msgid "hours"
-msgstr "hours"
-
-#: src/Util/Temporal.php:316
-msgid "minute"
-msgstr "minute"
-
-#: src/Util/Temporal.php:316
-msgid "minutes"
-msgstr "minutes"
-
-#: src/Util/Temporal.php:317
-msgid "second"
-msgstr "second"
-
-#: src/Util/Temporal.php:317
-msgid "seconds"
-msgstr "seconds"
-
-#: src/Util/Temporal.php:327
-#, php-format
-msgid "in %1$d %2$s"
-msgstr ""
-
-#: src/Util/Temporal.php:330
-#, php-format
-msgid "%1$d %2$s ago"
-msgstr "%1$d %2$s ago"
-
-#: src/Worker/Delivery.php:433
-msgid "(no subject)"
-msgstr "(no subject)"
-
-#: update.php:195
-#, php-format
-msgid "%s: Updating author-id and owner-id in item and thread table. "
-msgstr "%s: Updating author-id and owner-id in item and thread table. "
-
-#: update.php:241
-#, php-format
-msgid "%s: Updating post-type."
-msgstr ""
-
 #: view/theme/duepuntozero/config.php:56
 msgid "greenzero"
 msgstr "greenzero"
@@ -9530,6 +6678,42 @@ msgstr "slackr"
 msgid "Variations"
 msgstr "Variations"
 
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
+msgstr "Top Banner"
+
+#: view/theme/frio/php/Image.php:24
+msgid ""
+"Resize image to the width of the screen and show background color below on "
+"long pages."
+msgstr "Resize image to the width of the screen and show background color below on long pages."
+
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
+msgstr "Full screen"
+
+#: view/theme/frio/php/Image.php:25
+msgid ""
+"Resize image to fill entire screen, clipping either the right or the bottom."
+msgstr "Resize image to fill entire screen, clipping either the right or the bottom."
+
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
+msgstr "Single row mosaic"
+
+#: view/theme/frio/php/Image.php:26
+msgid ""
+"Resize image to repeat it on a single row, either vertical or horizontal."
+msgstr "Resize image to repeat it on a single row, either vertical or horizontal."
+
+#: view/theme/frio/php/Image.php:27
+msgid "Mosaic"
+msgstr "Mosaic"
+
+#: view/theme/frio/php/Image.php:27
+msgid "Repeat image to fill the screen."
+msgstr "Repeat image to fill the screen."
+
 #: view/theme/frio/config.php:103
 msgid "Custom"
 msgstr "Custom"
@@ -9586,50 +6770,76 @@ msgstr "Login page background color"
 msgid "Leave background image and color empty for theme defaults"
 msgstr "Leave background image and color empty for theme defaults"
 
-#: view/theme/frio/php/Image.php:24
-msgid "Top Banner"
-msgstr "Top Banner"
-
-#: view/theme/frio/php/Image.php:24
-msgid ""
-"Resize image to the width of the screen and show background color below on "
-"long pages."
-msgstr "Resize image to the width of the screen and show background color below on long pages."
-
-#: view/theme/frio/php/Image.php:25
-msgid "Full screen"
-msgstr "Full screen"
-
-#: view/theme/frio/php/Image.php:25
-msgid ""
-"Resize image to fill entire screen, clipping either the right or the bottom."
-msgstr "Resize image to fill entire screen, clipping either the right or the bottom."
-
-#: view/theme/frio/php/Image.php:26
-msgid "Single row mosaic"
-msgstr "Single row mosaic"
-
-#: view/theme/frio/php/Image.php:26
-msgid ""
-"Resize image to repeat it on a single row, either vertical or horizontal."
-msgstr "Resize image to repeat it on a single row, either vertical or horizontal."
-
-#: view/theme/frio/php/Image.php:27
-msgid "Mosaic"
-msgstr "Mosaic"
-
-#: view/theme/frio/php/Image.php:27
-msgid "Repeat image to fill the screen."
-msgstr "Repeat image to fill the screen."
-
-#: view/theme/frio/theme.php:252
+#: view/theme/frio/theme.php:239
 msgid "Guest"
 msgstr "Guest"
 
-#: view/theme/frio/theme.php:257
+#: view/theme/frio/theme.php:244
 msgid "Visitor"
 msgstr "Visitor"
 
+#: view/theme/frio/theme.php:259 src/Content/Nav.php:153
+#: src/Module/Login.php:321
+msgid "Logout"
+msgstr "Logout"
+
+#: view/theme/frio/theme.php:259 src/Content/Nav.php:153
+msgid "End this session"
+msgstr "End this session"
+
+#: view/theme/frio/theme.php:262 src/Content/Nav.php:156
+#: src/Model/Profile.php:901 src/Module/Contact.php:652
+#: src/Module/Contact.php:853
+msgid "Status"
+msgstr "Status"
+
+#: view/theme/frio/theme.php:262 src/Content/Nav.php:156
+#: src/Content/Nav.php:242
+msgid "Your posts and conversations"
+msgstr "My posts and conversations"
+
+#: view/theme/frio/theme.php:263 src/Content/Nav.php:157
+msgid "Your profile page"
+msgstr "My profile page"
+
+#: view/theme/frio/theme.php:264 src/Content/Nav.php:158
+msgid "Your photos"
+msgstr "My photos"
+
+#: view/theme/frio/theme.php:265 src/Content/Nav.php:159
+#: src/Model/Profile.php:925 src/Model/Profile.php:928
+msgid "Videos"
+msgstr "Videos"
+
+#: view/theme/frio/theme.php:265 src/Content/Nav.php:159
+msgid "Your videos"
+msgstr "My videos"
+
+#: view/theme/frio/theme.php:266 src/Content/Nav.php:160
+msgid "Your events"
+msgstr "My events"
+
+#: view/theme/frio/theme.php:269 src/Content/Nav.php:239
+msgid "Conversations from your friends"
+msgstr "My friends' conversations"
+
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:226
+#: src/Model/Profile.php:940 src/Model/Profile.php:951
+msgid "Events and Calendar"
+msgstr "Events and calendar"
+
+#: view/theme/frio/theme.php:271 src/Content/Nav.php:252
+msgid "Private mail"
+msgstr "Private messages"
+
+#: view/theme/frio/theme.php:272 src/Content/Nav.php:263
+msgid "Account settings"
+msgstr "Account settings"
+
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:269
+msgid "Manage/edit friends and contacts"
+msgstr "Manage/Edit friends and contacts"
+
 #: view/theme/quattro/config.php:77
 msgid "Alignment"
 msgstr "Alignment"
@@ -9658,6 +6868,14 @@ msgstr "Text areas font size"
 msgid "Comma separated list of helper forums"
 msgstr "Comma-separated list of helper forums"
 
+#: view/theme/vier/config.php:116 src/Core/ACL.php:301
+msgid "don't show"
+msgstr "don't show"
+
+#: view/theme/vier/config.php:116 src/Core/ACL.php:300
+msgid "show"
+msgstr "show"
+
 #: view/theme/vier/config.php:123
 msgid "Set style"
 msgstr "Set style"
@@ -9674,7 +6892,7 @@ msgstr "Community profiles"
 msgid "Help or @NewHere ?"
 msgstr "Help or @NewHere ?"
 
-#: view/theme/vier/config.php:127 view/theme/vier/theme.php:388
+#: view/theme/vier/config.php:127 view/theme/vier/theme.php:373
 msgid "Connect Services"
 msgstr "Connect services"
 
@@ -9686,6 +6904,2983 @@ msgstr "Find friends"
 msgid "Last users"
 msgstr "Last users"
 
-#: view/theme/vier/theme.php:291
+#: view/theme/vier/theme.php:199 src/Content/Widget.php:61
+msgid "Find People"
+msgstr "Find people"
+
+#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
+msgid "Enter name or interest"
+msgstr "Enter name or interest"
+
+#: view/theme/vier/theme.php:202 src/Content/Widget.php:64
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Examples: Robert Morgenstein, fishing"
+
+#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
+msgid "Similar Interests"
+msgstr "Similar interests"
+
+#: view/theme/vier/theme.php:206 src/Content/Widget.php:68
+msgid "Random Profile"
+msgstr "Random profile"
+
+#: view/theme/vier/theme.php:207 src/Content/Widget.php:69
+msgid "Invite Friends"
+msgstr "Invite friends"
+
+#: view/theme/vier/theme.php:210 src/Content/Widget.php:72
+msgid "Local Directory"
+msgstr "Local directory"
+
+#: view/theme/vier/theme.php:250 src/Content/Text/HTML.php:914
+#: src/Content/ForumManager.php:130 src/Content/Nav.php:207
+msgid "Forums"
+msgstr "Forums"
+
+#: view/theme/vier/theme.php:252 src/Content/ForumManager.php:132
+msgid "External link to forum"
+msgstr "External link to forum"
+
+#: view/theme/vier/theme.php:288
 msgid "Quick Start"
 msgstr "Quick start"
+
+#: src/Core/Console/ArchiveContact.php:65
+#, php-format
+msgid "Could not find any unarchived contact entry for this URL (%s)"
+msgstr "Could not find any unarchived contact entry for this URL (%s)"
+
+#: src/Core/Console/ArchiveContact.php:70
+msgid "The contact entries have been archived"
+msgstr "The contact entries have been archived"
+
+#: src/Core/Console/NewPassword.php:72
+msgid "Enter new password: "
+msgstr "Enter new password: "
+
+#: src/Core/Console/PostUpdate.php:50
+#, php-format
+msgid "Post update version number has been set to %s."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:58
+msgid "Check for pending update actions."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:60
+msgid "Done."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:62
+msgid "Execute pending post updates."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:68
+msgid "All pending post updates are done."
+msgstr ""
+
+#: src/Core/ACL.php:287
+msgid "Post to Email"
+msgstr "Post to email"
+
+#: src/Core/ACL.php:293
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Hide profile details from unknown viewers?"
+
+#: src/Core/ACL.php:292
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr "Connectors are disabled since \"%s\" is enabled."
+
+#: src/Core/ACL.php:299
+msgid "Visible to everybody"
+msgstr "Visible to everybody"
+
+#: src/Core/ACL.php:311
+msgid "Close"
+msgstr "Close"
+
+#: src/Core/Authentication.php:87
+msgid "Welcome "
+msgstr "Welcome "
+
+#: src/Core/Authentication.php:88
+msgid "Please upload a profile photo."
+msgstr "Please upload a profile photo."
+
+#: src/Core/Authentication.php:90
+msgid "Welcome back "
+msgstr "Welcome back "
+
+#: src/Core/Installer.php:162
+msgid ""
+"The database configuration file \"config/local.config.php\" could not be "
+"written. Please use the enclosed text to create a configuration file in your"
+" web server root."
+msgstr ""
+
+#: src/Core/Installer.php:181
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."
+
+#: src/Core/Installer.php:182 src/Module/Install.php:132
+#: src/Module/Install.php:263
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Please see the file \"INSTALL.txt\"."
+
+#: src/Core/Installer.php:243
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Could not find a command line version of PHP in the web server PATH."
+
+#: src/Core/Installer.php:244
+msgid ""
+"If you don't have a command line version of PHP installed on your server, "
+"you will not be able to run the background processing. See <a "
+"href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
+"up-the-worker'>'Setup the worker'</a>"
+msgstr "If your server doesn't have a command line version of PHP installed, you won't be able to run background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"
+
+#: src/Core/Installer.php:248
+msgid "PHP executable path"
+msgstr "PHP executable path"
+
+#: src/Core/Installer.php:248
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Enter full path to php executable. You can leave this blank to continue the installation."
+
+#: src/Core/Installer.php:253
+msgid "Command line PHP"
+msgstr "Command line PHP"
+
+#: src/Core/Installer.php:262
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+msgstr "PHP executable is not a php cli binary; it could possibly be a cgi-fgci version."
+
+#: src/Core/Installer.php:263
+msgid "Found PHP version: "
+msgstr "Found PHP version: "
+
+#: src/Core/Installer.php:265
+msgid "PHP cli binary"
+msgstr "PHP cli binary"
+
+#: src/Core/Installer.php:278
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "The command line version of PHP on your system does not have \"register_argc_argv\" enabled."
+
+#: src/Core/Installer.php:279
+msgid "This is required for message delivery to work."
+msgstr "This is required for message delivery to work."
+
+#: src/Core/Installer.php:284
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
+
+#: src/Core/Installer.php:316
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"
+
+#: src/Core/Installer.php:317
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "If running under Windows OS, please see \"http://www.php.net/manual/en/openssl.installation.php\"."
+
+#: src/Core/Installer.php:320
+msgid "Generate encryption keys"
+msgstr "Generate encryption keys"
+
+#: src/Core/Installer.php:371
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Error: Apache web server mod-rewrite module is required but not installed."
+
+#: src/Core/Installer.php:376
+msgid "Apache mod_rewrite module"
+msgstr "Apache mod_rewrite module"
+
+#: src/Core/Installer.php:382
+msgid "Error: PDO or MySQLi PHP module required but not installed."
+msgstr "Error: PDO or MySQLi PHP module required but not installed."
+
+#: src/Core/Installer.php:387
+msgid "Error: The MySQL driver for PDO is not installed."
+msgstr "Error: MySQL driver for PDO is not installed."
+
+#: src/Core/Installer.php:391
+msgid "PDO or MySQLi PHP module"
+msgstr "PDO or MySQLi PHP module"
+
+#: src/Core/Installer.php:399
+msgid "Error, XML PHP module required but not installed."
+msgstr "Error, XML PHP module required but not installed."
+
+#: src/Core/Installer.php:403
+msgid "XML PHP module"
+msgstr "XML PHP module"
+
+#: src/Core/Installer.php:406
+msgid "libCurl PHP module"
+msgstr "libCurl PHP module"
+
+#: src/Core/Installer.php:407
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Error: libCURL PHP module required but not installed."
+
+#: src/Core/Installer.php:413
+msgid "GD graphics PHP module"
+msgstr "GD graphics PHP module"
+
+#: src/Core/Installer.php:414
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Error: GD graphics PHP module with JPEG support required but not installed."
+
+#: src/Core/Installer.php:420
+msgid "OpenSSL PHP module"
+msgstr "OpenSSL PHP module"
+
+#: src/Core/Installer.php:421
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Error: openssl PHP module required but not installed."
+
+#: src/Core/Installer.php:427
+msgid "mb_string PHP module"
+msgstr "mb_string PHP module"
+
+#: src/Core/Installer.php:428
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Error: mb_string PHP module required but not installed."
+
+#: src/Core/Installer.php:434
+msgid "iconv PHP module"
+msgstr "iconv PHP module"
+
+#: src/Core/Installer.php:435
+msgid "Error: iconv PHP module required but not installed."
+msgstr "Error: iconv PHP module required but not installed."
+
+#: src/Core/Installer.php:441
+msgid "POSIX PHP module"
+msgstr "POSIX PHP module"
+
+#: src/Core/Installer.php:442
+msgid "Error: POSIX PHP module required but not installed."
+msgstr "Error: POSIX PHP module required but not installed."
+
+#: src/Core/Installer.php:448
+msgid "JSON PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:449
+msgid "Error: JSON PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:472
+msgid ""
+"The web installer needs to be able to create a file called "
+"\"local.config.php\" in the \"config\" folder of your web server and it is "
+"unable to do so."
+msgstr ""
+
+#: src/Core/Installer.php:473
+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 "This is most often a permission setting issue, as the web server may not be able to write files in your directory - even if you can."
+
+#: src/Core/Installer.php:474
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named local.config.php in your Friendica \"config\" folder."
+msgstr ""
+
+#: src/Core/Installer.php:475
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"INSTALL.txt\" for instructions."
+msgstr "Alternatively, you may skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."
+
+#: src/Core/Installer.php:478
+msgid "config/local.config.php is writable"
+msgstr ""
+
+#: src/Core/Installer.php:498
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."
+
+#: src/Core/Installer.php:499
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
+msgstr "In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top-level directory."
+
+#: src/Core/Installer.php:500
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Please ensure the user that your web server runs as (e.g. www-data) has write access to this directory."
+
+#: src/Core/Installer.php:501
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr "Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."
+
+#: src/Core/Installer.php:504
+msgid "view/smarty3 is writable"
+msgstr "view/smarty3 is writable"
+
+#: src/Core/Installer.php:533
+msgid ""
+"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist"
+" to .htaccess."
+msgstr ""
+
+#: src/Core/Installer.php:535
+msgid "Error message from Curl when fetching"
+msgstr "Error message from Curl while fetching"
+
+#: src/Core/Installer.php:540
+msgid "Url rewrite is working"
+msgstr "URL rewrite is working"
+
+#: src/Core/Installer.php:569
+msgid "ImageMagick PHP extension is not installed"
+msgstr "ImageMagick PHP extension is not installed"
+
+#: src/Core/Installer.php:571
+msgid "ImageMagick PHP extension is installed"
+msgstr "ImageMagick PHP extension is installed"
+
+#: src/Core/Installer.php:573 tests/src/Core/InstallerTest.php:329
+#: tests/src/Core/InstallerTest.php:355
+msgid "ImageMagick supports GIF"
+msgstr "ImageMagick supports GIF"
+
+#: src/Core/Installer.php:595
+msgid "Could not connect to database."
+msgstr "Could not connect to database."
+
+#: src/Core/Installer.php:602
+msgid "Database already in use."
+msgstr "Database already in use."
+
+#: src/Core/L10n.php:368 src/Model/Event.php:398
+msgid "Tuesday"
+msgstr "Tuesday"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:399
+msgid "Wednesday"
+msgstr "Wednesday"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:400
+msgid "Thursday"
+msgstr "Thursday"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:401
+msgid "Friday"
+msgstr "Friday"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:402
+msgid "Saturday"
+msgstr "Saturday"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:417
+msgid "January"
+msgstr "January"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:418
+msgid "February"
+msgstr "February"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:419
+msgid "March"
+msgstr "March"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:420
+msgid "April"
+msgstr "April"
+
+#: src/Core/L10n.php:372 src/Core/L10n.php:391 src/Model/Event.php:408
+msgid "May"
+msgstr "May"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:421
+msgid "June"
+msgstr "June"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:422
+msgid "July"
+msgstr "July"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:423
+msgid "August"
+msgstr "August"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:424
+msgid "September"
+msgstr "September"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:425
+msgid "October"
+msgstr "October"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:426
+msgid "November"
+msgstr "November"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:427
+msgid "December"
+msgstr "December"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:389
+msgid "Mon"
+msgstr "Mon"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:390
+msgid "Tue"
+msgstr "Tue"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:391
+msgid "Wed"
+msgstr "Wed"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:392
+msgid "Thu"
+msgstr "Thu"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:393
+msgid "Fri"
+msgstr "Fri"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:394
+msgid "Sat"
+msgstr "Sat"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:388
+msgid "Sun"
+msgstr "Sun"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:404
+msgid "Jan"
+msgstr "Jan"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:405
+msgid "Feb"
+msgstr "Feb"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:406
+msgid "Mar"
+msgstr "Mar"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:407
+msgid "Apr"
+msgstr "Apr"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:410
+msgid "Jul"
+msgstr "Jul"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:411
+msgid "Aug"
+msgstr "Aug"
+
+#: src/Core/L10n.php:391
+msgid "Sep"
+msgstr "Sep"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:413
+msgid "Oct"
+msgstr "Oct"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:414
+msgid "Nov"
+msgstr "Nov"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:415
+msgid "Dec"
+msgstr "Dec"
+
+#: src/Core/L10n.php:410
+msgid "poke"
+msgstr "poke"
+
+#: src/Core/L10n.php:410
+msgid "poked"
+msgstr "poked"
+
+#: src/Core/L10n.php:411
+msgid "ping"
+msgstr "ping"
+
+#: src/Core/L10n.php:411
+msgid "pinged"
+msgstr "pinged"
+
+#: src/Core/L10n.php:412
+msgid "prod"
+msgstr "prod"
+
+#: src/Core/L10n.php:412
+msgid "prodded"
+msgstr "prodded"
+
+#: src/Core/L10n.php:413
+msgid "slap"
+msgstr "slap"
+
+#: src/Core/L10n.php:413
+msgid "slapped"
+msgstr "slapped"
+
+#: src/Core/L10n.php:414
+msgid "finger"
+msgstr "finger"
+
+#: src/Core/L10n.php:414
+msgid "fingered"
+msgstr "fingered"
+
+#: src/Core/L10n.php:415
+msgid "rebuff"
+msgstr "rebuff"
+
+#: src/Core/L10n.php:415
+msgid "rebuffed"
+msgstr "rebuffed"
+
+#: src/Core/NotificationsManager.php:175
+msgid "System"
+msgstr "System"
+
+#: src/Core/NotificationsManager.php:196 src/Content/Nav.php:180
+#: src/Content/Nav.php:242
+msgid "Home"
+msgstr "Home"
+
+#: src/Core/NotificationsManager.php:203 src/Content/Nav.php:246
+msgid "Introductions"
+msgstr "Introductions"
+
+#: src/Core/NotificationsManager.php:265 src/Core/NotificationsManager.php:277
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s commented on %s's post"
+
+#: src/Core/NotificationsManager.php:276
+#, php-format
+msgid "%s created a new post"
+msgstr "%s posted something new"
+
+#: src/Core/NotificationsManager.php:290
+#, php-format
+msgid "%s liked %s's post"
+msgstr "%s liked %s's post"
+
+#: src/Core/NotificationsManager.php:303
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "%s disliked %s's post"
+
+#: src/Core/NotificationsManager.php:316
+#, php-format
+msgid "%s is attending %s's event"
+msgstr "%s is going to %s's event"
+
+#: src/Core/NotificationsManager.php:329
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s is not going to %s's event"
+
+#: src/Core/NotificationsManager.php:342
+#, php-format
+msgid "%s may attend %s's event"
+msgstr "%s may go to %s's event"
+
+#: src/Core/NotificationsManager.php:375
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s is now friends with %s"
+
+#: src/Core/NotificationsManager.php:651
+msgid "Friend Suggestion"
+msgstr "Friend suggestion"
+
+#: src/Core/NotificationsManager.php:685
+msgid "Friend/Connect Request"
+msgstr "Friend/Contact request"
+
+#: src/Core/NotificationsManager.php:685
+msgid "New Follower"
+msgstr "New follower"
+
+#: src/Core/System.php:137
+msgid "Error 400 - Bad Request"
+msgstr ""
+
+#: src/Core/System.php:138
+msgid "Error 401 - Unauthorized"
+msgstr ""
+
+#: src/Core/System.php:139
+msgid "Error 403 - Forbidden"
+msgstr ""
+
+#: src/Core/System.php:140
+msgid "Error 404 - Not Found"
+msgstr ""
+
+#: src/Core/System.php:141
+msgid "Error 500 - Internal Server Error"
+msgstr ""
+
+#: src/Core/System.php:142
+msgid "Error 503 - Service Unavailable"
+msgstr ""
+
+#: src/Core/System.php:150
+msgid ""
+"The server cannot or will not process the request due to an apparent client "
+"error."
+msgstr ""
+
+#: src/Core/System.php:151
+msgid ""
+"Authentication is required and has failed or has not yet been provided."
+msgstr ""
+
+#: src/Core/System.php:152
+msgid ""
+"The request was valid, but the server is refusing action. The user might not"
+" have the necessary permissions for a resource, or may need an account."
+msgstr ""
+
+#: src/Core/System.php:153
+msgid ""
+"The requested resource could not be found but may be available in the "
+"future."
+msgstr ""
+
+#: src/Core/System.php:154
+msgid ""
+"An unexpected condition was encountered and no more specific message is "
+"suitable."
+msgstr "An unexpected condition was encountered and no more specific message is available."
+
+#: src/Core/System.php:155
+msgid ""
+"The server is currently unavailable (because it is overloaded or down for "
+"maintenance). Please try again later."
+msgstr ""
+
+#: src/Core/Update.php:168
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "Update %s failed. See error logs."
+
+#: src/Core/Update.php:225
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
+msgstr "\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
+
+#: src/Core/Update.php:231
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "The error message is\n[pre]%s[/pre]"
+
+#: src/Core/Update.php:260
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
+msgstr ""
+
+#: src/Core/UserImport.php:103
+msgid "Error decoding account file"
+msgstr "Error decoding account file"
+
+#: src/Core/UserImport.php:109
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Error! No version data in file! Is this a Friendica account file?"
+
+#: src/Core/UserImport.php:117
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "User '%s' already exists on this server!"
+
+#: src/Core/UserImport.php:153
+msgid "User creation error"
+msgstr "User creation error"
+
+#: src/Core/UserImport.php:171
+msgid "User profile creation error"
+msgstr "User profile creation error"
+
+#: src/Core/UserImport.php:215
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d contact not imported"
+msgstr[1] "%d contacts not imported"
+
+#: src/Core/UserImport.php:280
+msgid "Done. You can now login with your username and password"
+msgstr "Done. You can now login with your username and password"
+
+#: src/Util/Temporal.php:147 src/Model/Profile.php:771
+msgid "Birthday:"
+msgstr "Birthday:"
+
+#: src/Util/Temporal.php:151
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "YYYY-MM-DD or MM-DD"
+
+#: src/Util/Temporal.php:298
+msgid "never"
+msgstr "never"
+
+#: src/Util/Temporal.php:305
+msgid "less than a second ago"
+msgstr "less than a second ago"
+
+#: src/Util/Temporal.php:313
+msgid "year"
+msgstr "year"
+
+#: src/Util/Temporal.php:313
+msgid "years"
+msgstr "years"
+
+#: src/Util/Temporal.php:314
+msgid "months"
+msgstr "months"
+
+#: src/Util/Temporal.php:315
+msgid "weeks"
+msgstr "weeks"
+
+#: src/Util/Temporal.php:316
+msgid "days"
+msgstr "days"
+
+#: src/Util/Temporal.php:317
+msgid "hour"
+msgstr "hour"
+
+#: src/Util/Temporal.php:317
+msgid "hours"
+msgstr "hours"
+
+#: src/Util/Temporal.php:318
+msgid "minute"
+msgstr "minute"
+
+#: src/Util/Temporal.php:318
+msgid "minutes"
+msgstr "minutes"
+
+#: src/Util/Temporal.php:319
+msgid "second"
+msgstr "second"
+
+#: src/Util/Temporal.php:319
+msgid "seconds"
+msgstr "seconds"
+
+#: src/Util/Temporal.php:329
+#, php-format
+msgid "in %1$d %2$s"
+msgstr ""
+
+#: src/Util/Temporal.php:332
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr "%1$d %2$s ago"
+
+#: src/Content/Text/BBCode.php:429
+msgid "view full size"
+msgstr "view full size"
+
+#: src/Content/Text/BBCode.php:863 src/Content/Text/BBCode.php:1596
+#: src/Content/Text/BBCode.php:1597
+msgid "Image/photo"
+msgstr "Image/Photo"
+
+#: src/Content/Text/BBCode.php:967
+#, php-format
+msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+
+#: src/Content/Text/BBCode.php:1523 src/Content/Text/BBCode.php:1545
+msgid "$1 wrote:"
+msgstr "$1 wrote:"
+
+#: src/Content/Text/BBCode.php:1607 src/Content/Text/BBCode.php:1608
+msgid "Encrypted content"
+msgstr "Encrypted content"
+
+#: src/Content/Text/BBCode.php:1715
+msgid "Invalid source protocol"
+msgstr "Invalid source protocol"
+
+#: src/Content/Text/BBCode.php:1726
+msgid "Invalid link protocol"
+msgstr "Invalid link protocol"
+
+#: src/Content/Text/HTML.php:800
+msgid "Loading more entries..."
+msgstr "Loading more entries..."
+
+#: src/Content/Text/HTML.php:801
+msgid "The end"
+msgstr "The end"
+
+#: src/Content/Text/HTML.php:894
+msgid "Follow"
+msgstr "Follow"
+
+#: src/Content/Text/HTML.php:903 src/Content/Nav.php:79
+msgid "@name, !forum, #tags, content"
+msgstr "@name, !forum, #tags, content"
+
+#: src/Content/Text/HTML.php:909 src/Content/Nav.php:201
+msgid "Full Text"
+msgstr "Full text"
+
+#: src/Content/Text/HTML.php:910 src/Content/Widget/TagCloud.php:54
+#: src/Content/Nav.php:202
+msgid "Tags"
+msgstr "Tags"
+
+#: src/Content/Text/HTML.php:951 src/Model/Item.php:3485
+#: src/Model/Item.php:3496
+msgid "Click to open/close"
+msgstr "Reveal/hide"
+
+#: src/Content/Widget/CalendarExport.php:64
+msgid "Export"
+msgstr "Export"
+
+#: src/Content/Widget/CalendarExport.php:65
+msgid "Export calendar as ical"
+msgstr "Export calendar as ical"
+
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export calendar as csv"
+msgstr "Export calendar as csv"
+
+#: src/Content/Widget/ContactBlock.php:58
+msgid "No contacts"
+msgstr "No contacts"
+
+#: src/Content/Widget/ContactBlock.php:90
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d contact"
+msgstr[1] "%d contacts"
+
+#: src/Content/Widget/ContactBlock.php:109
+msgid "View Contacts"
+msgstr "View contacts"
+
+#: src/Content/ContactSelector.php:58
+msgid "Frequently"
+msgstr "Frequently"
+
+#: src/Content/ContactSelector.php:59
+msgid "Hourly"
+msgstr "Hourly"
+
+#: src/Content/ContactSelector.php:60
+msgid "Twice daily"
+msgstr "Twice daily"
+
+#: src/Content/ContactSelector.php:61
+msgid "Daily"
+msgstr "Daily"
+
+#: src/Content/ContactSelector.php:62
+msgid "Weekly"
+msgstr "Weekly"
+
+#: src/Content/ContactSelector.php:63
+msgid "Monthly"
+msgstr "Monthly"
+
+#: src/Content/ContactSelector.php:83
+msgid "DFRN"
+msgstr ""
+
+#: src/Content/ContactSelector.php:84
+msgid "OStatus"
+msgstr "OStatus"
+
+#: src/Content/ContactSelector.php:85
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: src/Content/ContactSelector.php:88
+msgid "Zot!"
+msgstr "Zot!"
+
+#: src/Content/ContactSelector.php:89
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: src/Content/ContactSelector.php:90
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: src/Content/ContactSelector.php:91
+msgid "MySpace"
+msgstr "MySpace"
+
+#: src/Content/ContactSelector.php:92
+msgid "Google+"
+msgstr "Google+"
+
+#: src/Content/ContactSelector.php:93
+msgid "pump.io"
+msgstr "pump.io"
+
+#: src/Content/ContactSelector.php:94
+msgid "Twitter"
+msgstr "Twitter"
+
+#: src/Content/ContactSelector.php:95
+msgid "Diaspora Connector"
+msgstr "Diaspora Connector"
+
+#: src/Content/ContactSelector.php:96
+msgid "GNU Social Connector"
+msgstr "GNU Social Connector"
+
+#: src/Content/ContactSelector.php:97
+msgid "ActivityPub"
+msgstr ""
+
+#: src/Content/ContactSelector.php:98
+msgid "pnut"
+msgstr "pnut"
+
+#: src/Content/ContactSelector.php:154
+msgid "Male"
+msgstr "Male"
+
+#: src/Content/ContactSelector.php:155
+msgid "Female"
+msgstr "Female"
+
+#: src/Content/ContactSelector.php:156
+msgid "Currently Male"
+msgstr "Currently male"
+
+#: src/Content/ContactSelector.php:157
+msgid "Currently Female"
+msgstr "Currently female"
+
+#: src/Content/ContactSelector.php:158
+msgid "Mostly Male"
+msgstr "Mostly male"
+
+#: src/Content/ContactSelector.php:159
+msgid "Mostly Female"
+msgstr "Mostly female"
+
+#: src/Content/ContactSelector.php:160
+msgid "Transgender"
+msgstr "Transgender"
+
+#: src/Content/ContactSelector.php:161
+msgid "Intersex"
+msgstr "Intersex"
+
+#: src/Content/ContactSelector.php:162
+msgid "Transsexual"
+msgstr "Transsexual"
+
+#: src/Content/ContactSelector.php:163
+msgid "Hermaphrodite"
+msgstr "Hermaphrodite"
+
+#: src/Content/ContactSelector.php:164
+msgid "Neuter"
+msgstr "Neuter"
+
+#: src/Content/ContactSelector.php:165
+msgid "Non-specific"
+msgstr "Non-specific"
+
+#: src/Content/ContactSelector.php:166
+msgid "Other"
+msgstr "Other"
+
+#: src/Content/ContactSelector.php:194
+msgid "Males"
+msgstr "Males"
+
+#: src/Content/ContactSelector.php:195
+msgid "Females"
+msgstr "Females"
+
+#: src/Content/ContactSelector.php:196
+msgid "Gay"
+msgstr "Gay"
+
+#: src/Content/ContactSelector.php:197
+msgid "Lesbian"
+msgstr "Lesbian"
+
+#: src/Content/ContactSelector.php:198
+msgid "No Preference"
+msgstr "No Preference"
+
+#: src/Content/ContactSelector.php:199
+msgid "Bisexual"
+msgstr "Bisexual"
+
+#: src/Content/ContactSelector.php:200
+msgid "Autosexual"
+msgstr "Auto-sexual"
+
+#: src/Content/ContactSelector.php:201
+msgid "Abstinent"
+msgstr "Abstinent"
+
+#: src/Content/ContactSelector.php:202
+msgid "Virgin"
+msgstr "Virgin"
+
+#: src/Content/ContactSelector.php:203
+msgid "Deviant"
+msgstr "Deviant"
+
+#: src/Content/ContactSelector.php:204
+msgid "Fetish"
+msgstr "Fetish"
+
+#: src/Content/ContactSelector.php:205
+msgid "Oodles"
+msgstr "Oodles"
+
+#: src/Content/ContactSelector.php:206
+msgid "Nonsexual"
+msgstr "Asexual"
+
+#: src/Content/ContactSelector.php:232
+msgid "Single"
+msgstr "Single"
+
+#: src/Content/ContactSelector.php:233
+msgid "Lonely"
+msgstr "Lonely"
+
+#: src/Content/ContactSelector.php:234
+msgid "Available"
+msgstr "Available"
+
+#: src/Content/ContactSelector.php:235
+msgid "Unavailable"
+msgstr "Unavailable"
+
+#: src/Content/ContactSelector.php:236
+msgid "Has crush"
+msgstr "Having a crush"
+
+#: src/Content/ContactSelector.php:237
+msgid "Infatuated"
+msgstr "Infatuated"
+
+#: src/Content/ContactSelector.php:238
+msgid "Dating"
+msgstr "Dating"
+
+#: src/Content/ContactSelector.php:239
+msgid "Unfaithful"
+msgstr "Unfaithful"
+
+#: src/Content/ContactSelector.php:240
+msgid "Sex Addict"
+msgstr "Sex addict"
+
+#: src/Content/ContactSelector.php:241 src/Model/User.php:701
+msgid "Friends"
+msgstr "Friends"
+
+#: src/Content/ContactSelector.php:242
+msgid "Friends/Benefits"
+msgstr "Friends with benefits"
+
+#: src/Content/ContactSelector.php:243
+msgid "Casual"
+msgstr "Casual"
+
+#: src/Content/ContactSelector.php:244
+msgid "Engaged"
+msgstr "Engaged"
+
+#: src/Content/ContactSelector.php:245
+msgid "Married"
+msgstr "Married"
+
+#: src/Content/ContactSelector.php:246
+msgid "Imaginarily married"
+msgstr "Imaginarily married"
+
+#: src/Content/ContactSelector.php:247
+msgid "Partners"
+msgstr "Partners"
+
+#: src/Content/ContactSelector.php:248
+msgid "Cohabiting"
+msgstr "Cohabiting"
+
+#: src/Content/ContactSelector.php:249
+msgid "Common law"
+msgstr "Common law spouse"
+
+#: src/Content/ContactSelector.php:250
+msgid "Happy"
+msgstr "Happy"
+
+#: src/Content/ContactSelector.php:251
+msgid "Not looking"
+msgstr "Not looking"
+
+#: src/Content/ContactSelector.php:252
+msgid "Swinger"
+msgstr "Swinger"
+
+#: src/Content/ContactSelector.php:253
+msgid "Betrayed"
+msgstr "Betrayed"
+
+#: src/Content/ContactSelector.php:254
+msgid "Separated"
+msgstr "Separated"
+
+#: src/Content/ContactSelector.php:255
+msgid "Unstable"
+msgstr "Unstable"
+
+#: src/Content/ContactSelector.php:256
+msgid "Divorced"
+msgstr "Divorced"
+
+#: src/Content/ContactSelector.php:257
+msgid "Imaginarily divorced"
+msgstr "Imaginarily divorced"
+
+#: src/Content/ContactSelector.php:258
+msgid "Widowed"
+msgstr "Widowed"
+
+#: src/Content/ContactSelector.php:259
+msgid "Uncertain"
+msgstr "Uncertain"
+
+#: src/Content/ContactSelector.php:260
+msgid "It's complicated"
+msgstr "It's complicated"
+
+#: src/Content/ContactSelector.php:261
+msgid "Don't care"
+msgstr "Don't care"
+
+#: src/Content/ContactSelector.php:262
+msgid "Ask me"
+msgstr "Ask me"
+
+#: src/Content/Feature.php:82
+msgid "General Features"
+msgstr "General"
+
+#: src/Content/Feature.php:84
+msgid "Multiple Profiles"
+msgstr "Multiple profiles"
+
+#: src/Content/Feature.php:84
+msgid "Ability to create multiple profiles"
+msgstr "Ability to create multiple profiles"
+
+#: src/Content/Feature.php:85
+msgid "Photo Location"
+msgstr "Photo location"
+
+#: src/Content/Feature.php:85
+msgid ""
+"Photo metadata is normally stripped. This extracts the location (if present)"
+" prior to stripping metadata and links it to a map."
+msgstr "Photo metadata is normally removed. This saves the geo tag (if present) and links it to a map prior to removing other metadata."
+
+#: src/Content/Feature.php:86
+msgid "Export Public Calendar"
+msgstr "Export public calendar"
+
+#: src/Content/Feature.php:86
+msgid "Ability for visitors to download the public calendar"
+msgstr "Ability for visitors to download the public calendar"
+
+#: src/Content/Feature.php:91
+msgid "Post Composition Features"
+msgstr "Post composition"
+
+#: src/Content/Feature.php:92
+msgid "Auto-mention Forums"
+msgstr "Auto-mention forums"
+
+#: src/Content/Feature.php:92
+msgid ""
+"Add/remove mention when a forum page is selected/deselected in ACL window."
+msgstr "Add/Remove mention when a forum page is selected or deselected in the ACL window."
+
+#: src/Content/Feature.php:93
+msgid "Explicit Mentions"
+msgstr ""
+
+#: src/Content/Feature.php:93
+msgid ""
+"Add explicit mentions to comment box for manual control over who gets "
+"mentioned in replies."
+msgstr ""
+
+#: src/Content/Feature.php:98
+msgid "Network Sidebar"
+msgstr "Network sidebar"
+
+#: src/Content/Feature.php:99
+msgid "Ability to select posts by date ranges"
+msgstr "Ability to select posts by date ranges"
+
+#: src/Content/Feature.php:100
+msgid "Protocol Filter"
+msgstr ""
+
+#: src/Content/Feature.php:100
+msgid "Enable widget to display Network posts only from selected protocols"
+msgstr ""
+
+#: src/Content/Feature.php:105
+msgid "Network Tabs"
+msgstr "Network tabs"
+
+#: src/Content/Feature.php:106
+msgid "Network New Tab"
+msgstr "Network new tab"
+
+#: src/Content/Feature.php:106
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+msgstr "Enable tab to display only new network posts (last 12 hours)"
+
+#: src/Content/Feature.php:107
+msgid "Network Shared Links Tab"
+msgstr "Network shared links tab"
+
+#: src/Content/Feature.php:107
+msgid "Enable tab to display only Network posts with links in them"
+msgstr "Enable tab to display only network posts with links in them"
+
+#: src/Content/Feature.php:112
+msgid "Post/Comment Tools"
+msgstr "Post/Comment tools"
+
+#: src/Content/Feature.php:113
+msgid "Post Categories"
+msgstr "Post categories"
+
+#: src/Content/Feature.php:113
+msgid "Add categories to your posts"
+msgstr "Add categories to your posts"
+
+#: src/Content/Feature.php:118
+msgid "Advanced Profile Settings"
+msgstr "Advanced profiles"
+
+#: src/Content/Feature.php:119
+msgid "List Forums"
+msgstr "List forums"
+
+#: src/Content/Feature.php:119
+msgid "Show visitors public community forums at the Advanced Profile Page"
+msgstr "Show visitors of public community forums at the advanced profile page"
+
+#: src/Content/Feature.php:120
+msgid "Tag Cloud"
+msgstr "Tag cloud"
+
+#: src/Content/Feature.php:120
+msgid "Provide a personal tag cloud on your profile page"
+msgstr "Provide a personal tag cloud on your profile page"
+
+#: src/Content/Feature.php:121
+msgid "Display Membership Date"
+msgstr "Display membership date"
+
+#: src/Content/Feature.php:121
+msgid "Display membership date in profile"
+msgstr "Display membership date in profile"
+
+#: src/Content/Nav.php:74
+msgid "Nothing new here"
+msgstr "Nothing new here"
+
+#: src/Content/Nav.php:78
+msgid "Clear notifications"
+msgstr "Clear notifications"
+
+#: src/Content/Nav.php:161
+msgid "Personal notes"
+msgstr "Personal notes"
+
+#: src/Content/Nav.php:161
+msgid "Your personal notes"
+msgstr "My personal notes"
+
+#: src/Content/Nav.php:170
+msgid "Sign in"
+msgstr "Sign in"
+
+#: src/Content/Nav.php:180
+msgid "Home Page"
+msgstr "Home page"
+
+#: src/Content/Nav.php:184 src/Module/Login.php:293
+#: src/Module/Register.php:136
+msgid "Register"
+msgstr "Sign up now >>"
+
+#: src/Content/Nav.php:184
+msgid "Create an account"
+msgstr "Create account"
+
+#: src/Content/Nav.php:190
+msgid "Help and documentation"
+msgstr "Help and documentation"
+
+#: src/Content/Nav.php:194
+msgid "Apps"
+msgstr "Apps"
+
+#: src/Content/Nav.php:194
+msgid "Addon applications, utilities, games"
+msgstr "Addon applications, utilities, games"
+
+#: src/Content/Nav.php:198
+msgid "Search site content"
+msgstr "Search site content"
+
+#: src/Content/Nav.php:222
+msgid "Community"
+msgstr "Community"
+
+#: src/Content/Nav.php:222
+msgid "Conversations on this and other servers"
+msgstr "Conversations on this and other servers"
+
+#: src/Content/Nav.php:229
+msgid "Directory"
+msgstr "Directory"
+
+#: src/Content/Nav.php:229
+msgid "People directory"
+msgstr "People directory"
+
+#: src/Content/Nav.php:231
+msgid "Information about this friendica instance"
+msgstr "Information about this Friendica instance"
+
+#: src/Content/Nav.php:234
+msgid "Terms of Service of this Friendica instance"
+msgstr "Terms of Service of this Friendica instance"
+
+#: src/Content/Nav.php:240
+msgid "Network Reset"
+msgstr "Network reset"
+
+#: src/Content/Nav.php:240
+msgid "Load Network page with no filters"
+msgstr "Load network page without filters"
+
+#: src/Content/Nav.php:246
+msgid "Friend Requests"
+msgstr "Friend requests"
+
+#: src/Content/Nav.php:248
+msgid "See all notifications"
+msgstr "See all notifications"
+
+#: src/Content/Nav.php:249
+msgid "Mark all system notifications seen"
+msgstr "Mark notifications as seen"
+
+#: src/Content/Nav.php:253
+msgid "Inbox"
+msgstr "Inbox"
+
+#: src/Content/Nav.php:254
+msgid "Outbox"
+msgstr "Outbox"
+
+#: src/Content/Nav.php:258
+msgid "Manage"
+msgstr "Manage"
+
+#: src/Content/Nav.php:258
+msgid "Manage other pages"
+msgstr "Manage other pages"
+
+#: src/Content/Nav.php:266
+msgid "Manage/Edit Profiles"
+msgstr "Manage/Edit profiles"
+
+#: src/Content/Nav.php:274
+msgid "Site setup and configuration"
+msgstr "Site setup and configuration"
+
+#: src/Content/Nav.php:277
+msgid "Navigation"
+msgstr "Navigation"
+
+#: src/Content/Nav.php:277
+msgid "Site map"
+msgstr "Site map"
+
+#: src/Content/OEmbed.php:256
+msgid "Embedding disabled"
+msgstr "Embedding disabled"
+
+#: src/Content/OEmbed.php:379
+msgid "Embedded content"
+msgstr "Embedded content"
+
+#: src/Content/Pager.php:153
+msgid "newer"
+msgstr "Later posts"
+
+#: src/Content/Pager.php:158
+msgid "older"
+msgstr "Earlier posts"
+
+#: src/Content/Pager.php:203
+msgid "prev"
+msgstr "prev"
+
+#: src/Content/Pager.php:263
+msgid "last"
+msgstr "last"
+
+#: src/Content/Widget.php:35
+msgid "Add New Contact"
+msgstr "Add new contact"
+
+#: src/Content/Widget.php:36
+msgid "Enter address or web location"
+msgstr "Enter address or web location"
+
+#: src/Content/Widget.php:37
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Example: jo@example.com, http://example.com/jo"
+
+#: src/Content/Widget.php:55
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitation available"
+msgstr[1] "%d invitations available"
+
+#: src/Content/Widget.php:158
+msgid "Protocols"
+msgstr ""
+
+#: src/Content/Widget.php:161
+msgid "All Protocols"
+msgstr ""
+
+#: src/Content/Widget.php:198
+msgid "Saved Folders"
+msgstr "Saved Folders"
+
+#: src/Content/Widget.php:201 src/Content/Widget.php:243
+msgid "Everything"
+msgstr "Everything"
+
+#: src/Content/Widget.php:240
+msgid "Categories"
+msgstr "Categories"
+
+#: src/Content/Widget.php:324
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] "%d contact in common"
+msgstr[1] "%d contacts in common"
+
+#: src/Database/DBStructure.php:47
+msgid "There are no tables on MyISAM."
+msgstr "There are no tables on MyISAM."
+
+#: src/Database/DBStructure.php:71
+#, php-format
+msgid ""
+"\n"
+"Error %d occurred during database update:\n"
+"%s\n"
+msgstr "\nError %d occurred during database update:\n%s\n"
+
+#: src/Database/DBStructure.php:74
+msgid "Errors encountered performing database changes: "
+msgstr "Errors encountered performing database changes: "
+
+#: src/Database/DBStructure.php:263
+#, php-format
+msgid "%s: Database update"
+msgstr "%s: Database update"
+
+#: src/Database/DBStructure.php:524
+#, php-format
+msgid "%s: updating %s table."
+msgstr "%s: updating %s table."
+
+#: src/Model/Contact.php:1037
+msgid "Drop Contact"
+msgstr "Drop contact"
+
+#: src/Model/Contact.php:1509
+msgid "Organisation"
+msgstr "Organization"
+
+#: src/Model/Contact.php:1513
+msgid "News"
+msgstr "News"
+
+#: src/Model/Contact.php:1517
+msgid "Forum"
+msgstr "Forum"
+
+#: src/Model/Contact.php:1707
+msgid "Connect URL missing."
+msgstr "Connect URL missing."
+
+#: src/Model/Contact.php:1716
+msgid ""
+"The contact could not be added. Please check the relevant network "
+"credentials in your Settings -> Social Networks page."
+msgstr "The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."
+
+#: src/Model/Contact.php:1755
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "This site is not configured to allow communications with other networks."
+
+#: src/Model/Contact.php:1756 src/Model/Contact.php:1769
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "No compatible communication protocols or feeds were discovered."
+
+#: src/Model/Contact.php:1767
+msgid "The profile address specified does not provide adequate information."
+msgstr "The profile address specified does not provide adequate information."
+
+#: src/Model/Contact.php:1772
+msgid "An author or name was not found."
+msgstr "An author or name was not found."
+
+#: src/Model/Contact.php:1775
+msgid "No browser URL could be matched to this address."
+msgstr "No browser URL could be matched to this address."
+
+#: src/Model/Contact.php:1778
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "Unable to match @-style identity address with a known protocol or email contact."
+
+#: src/Model/Contact.php:1779
+msgid "Use mailto: in front of address to force email check."
+msgstr "Use mailto: in front of address to force email check."
+
+#: src/Model/Contact.php:1785
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "The profile address specified belongs to a network which has been disabled on this site."
+
+#: src/Model/Contact.php:1790
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Limited profile: This person will be unable to receive direct/private messages from you."
+
+#: src/Model/Contact.php:1843
+msgid "Unable to retrieve contact information."
+msgstr "Unable to retrieve contact information."
+
+#: src/Model/Event.php:61 src/Model/Event.php:78 src/Model/Event.php:436
+#: src/Model/Event.php:916
+msgid "Starts:"
+msgstr "Starts:"
+
+#: src/Model/Event.php:64 src/Model/Event.php:84 src/Model/Event.php:437
+#: src/Model/Event.php:920
+msgid "Finishes:"
+msgstr "Finishes:"
+
+#: src/Model/Event.php:386
+msgid "all-day"
+msgstr "All-day"
+
+#: src/Model/Event.php:409
+msgid "Jun"
+msgstr "Jun"
+
+#: src/Model/Event.php:412
+msgid "Sept"
+msgstr "Sep"
+
+#: src/Model/Event.php:434
+msgid "No events to display"
+msgstr "No events to display"
+
+#: src/Model/Event.php:562
+msgid "l, F j"
+msgstr "l, F j"
+
+#: src/Model/Event.php:593
+msgid "Edit event"
+msgstr "Edit event"
+
+#: src/Model/Event.php:594
+msgid "Duplicate event"
+msgstr "Duplicate event"
+
+#: src/Model/Event.php:595
+msgid "Delete event"
+msgstr "Delete event"
+
+#: src/Model/Event.php:627 src/Model/Item.php:3536 src/Model/Item.php:3543
+msgid "link to source"
+msgstr "Link to source"
+
+#: src/Model/Event.php:849
+msgid "D g:i A"
+msgstr "D g:i A"
+
+#: src/Model/Event.php:850
+msgid "g:i A"
+msgstr "g:i A"
+
+#: src/Model/Event.php:935 src/Model/Event.php:937
+msgid "Show map"
+msgstr "Show map"
+
+#: src/Model/Event.php:936
+msgid "Hide map"
+msgstr "Hide map"
+
+#: src/Model/Event.php:1028
+#, php-format
+msgid "%s's birthday"
+msgstr "%s's birthday"
+
+#: src/Model/Event.php:1029
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Happy Birthday, %s!"
+
+#: src/Model/FileTag.php:256
+msgid "Item filed"
+msgstr "Item filed"
+
+#: src/Model/Group.php:43
+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 "A deleted group with this name has been 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."
+
+#: src/Model/Group.php:338
+msgid "Default privacy group for new contacts"
+msgstr "Default privacy group for new contacts"
+
+#: src/Model/Group.php:370
+msgid "Everybody"
+msgstr "Everybody"
+
+#: src/Model/Group.php:390
+msgid "edit"
+msgstr "edit"
+
+#: src/Model/Group.php:419
+msgid "Edit group"
+msgstr "Edit group"
+
+#: src/Model/Group.php:422
+msgid "Create a new group"
+msgstr "Create new group"
+
+#: src/Model/Group.php:424
+msgid "Edit groups"
+msgstr "Edit groups"
+
+#: src/Model/Item.php:3269
+msgid "activity"
+msgstr "activity"
+
+#: src/Model/Item.php:3271 src/Object/Post.php:457 src/Object/Post.php:469
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "comment"
+msgstr[1] "comments"
+
+#: src/Model/Item.php:3274
+msgid "post"
+msgstr "post"
+
+#: src/Model/Item.php:3373
+#, php-format
+msgid "Content warning: %s"
+msgstr "Content warning: %s"
+
+#: src/Model/Item.php:3452
+msgid "bytes"
+msgstr "bytes"
+
+#: src/Model/Item.php:3530
+msgid "View on separate page"
+msgstr "View on separate page"
+
+#: src/Model/Item.php:3531
+msgid "view on separate page"
+msgstr "view on separate page"
+
+#: src/Model/Mail.php:40 src/Model/Mail.php:175
+msgid "[no subject]"
+msgstr "[no subject]"
+
+#: src/Model/Profile.php:115
+msgid "Requested account is not available."
+msgstr "Requested account is unavailable."
+
+#: src/Model/Profile.php:133
+msgid "Requested profile is not available."
+msgstr "Requested profile is unavailable."
+
+#: src/Model/Profile.php:181 src/Model/Profile.php:425
+#: src/Model/Profile.php:872
+msgid "Edit profile"
+msgstr "Edit profile"
+
+#: src/Model/Profile.php:359
+msgid "Atom feed"
+msgstr "Atom feed"
+
+#: src/Model/Profile.php:398
+msgid "Manage/edit profiles"
+msgstr "Manage/Edit profiles"
+
+#: src/Model/Profile.php:450 src/Module/Contact.php:645
+msgid "XMPP:"
+msgstr "XMPP:"
+
+#: src/Model/Profile.php:573 src/Model/Profile.php:671
+msgid "g A l F d"
+msgstr "g A l F d"
+
+#: src/Model/Profile.php:574
+msgid "F d"
+msgstr "F d"
+
+#: src/Model/Profile.php:636 src/Model/Profile.php:722
+msgid "[today]"
+msgstr "[today]"
+
+#: src/Model/Profile.php:647
+msgid "Birthday Reminders"
+msgstr "Birthday reminders"
+
+#: src/Model/Profile.php:648
+msgid "Birthdays this week:"
+msgstr "Birthdays this week:"
+
+#: src/Model/Profile.php:709
+msgid "[No description]"
+msgstr "[No description]"
+
+#: src/Model/Profile.php:736
+msgid "Event Reminders"
+msgstr "Event reminders"
+
+#: src/Model/Profile.php:737
+msgid "Upcoming events the next 7 days:"
+msgstr ""
+
+#: src/Model/Profile.php:754
+msgid "Member since:"
+msgstr "Member since:"
+
+#: src/Model/Profile.php:762
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: src/Model/Profile.php:763
+msgid "j F"
+msgstr "j F"
+
+#: src/Model/Profile.php:778
+msgid "Age:"
+msgstr "Age:"
+
+#: src/Model/Profile.php:791
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "for %1$d %2$s"
+
+#: src/Model/Profile.php:815
+msgid "Religion:"
+msgstr "Religion:"
+
+#: src/Model/Profile.php:823
+msgid "Hobbies/Interests:"
+msgstr "Hobbies/Interests:"
+
+#: src/Model/Profile.php:835
+msgid "Contact information and Social Networks:"
+msgstr "Contact information and social networks:"
+
+#: src/Model/Profile.php:839
+msgid "Musical interests:"
+msgstr "Music:"
+
+#: src/Model/Profile.php:843
+msgid "Books, literature:"
+msgstr "Books/Literature:"
+
+#: src/Model/Profile.php:847
+msgid "Television:"
+msgstr "Television:"
+
+#: src/Model/Profile.php:851
+msgid "Film/dance/culture/entertainment:"
+msgstr "Arts, culture, entertainment:"
+
+#: src/Model/Profile.php:855
+msgid "Love/Romance:"
+msgstr "Love/Romance:"
+
+#: src/Model/Profile.php:859
+msgid "Work/employment:"
+msgstr "Work/Employment:"
+
+#: src/Model/Profile.php:863
+msgid "School/education:"
+msgstr "School/Education:"
+
+#: src/Model/Profile.php:868
+msgid "Forums:"
+msgstr "Forums:"
+
+#: src/Model/Profile.php:912 src/Module/Contact.php:872
+msgid "Profile Details"
+msgstr "Profile Details"
+
+#: src/Model/Profile.php:962
+msgid "Only You Can See This"
+msgstr "Only you can see this."
+
+#: src/Model/Profile.php:970 src/Model/Profile.php:973
+msgid "Tips for New Members"
+msgstr "Tips for New Members"
+
+#: src/Model/Profile.php:1150
+#, php-format
+msgid "OpenWebAuth: %1$s welcomes %2$s"
+msgstr ""
+
+#: src/Model/Storage/Database.php:36
+#, php-format
+msgid "Database storage failed to update %s"
+msgstr ""
+
+#: src/Model/Storage/Database.php:43
+msgid "Database storage failed to insert data"
+msgstr ""
+
+#: src/Model/Storage/Filesystem.php:63
+#, php-format
+msgid "Filesystem storage failed to create \"%s\". Check you write permissions."
+msgstr ""
+
+#: src/Model/Storage/Filesystem.php:105
+#, php-format
+msgid ""
+"Filesystem storage failed to save data to \"%s\". Check your write "
+"permissions"
+msgstr ""
+
+#: src/Model/Storage/Filesystem.php:126
+msgid "Storage base path"
+msgstr ""
+
+#: src/Model/Storage/Filesystem.php:128
+msgid ""
+"Folder where uploaded files are saved. For maximum security, This should be "
+"a path outside web server folder tree"
+msgstr ""
+
+#: src/Model/Storage/Filesystem.php:138
+msgid "Enter a valid existing folder"
+msgstr ""
+
+#: src/Model/User.php:270
+msgid "Login failed"
+msgstr "Login failed"
+
+#: src/Model/User.php:301
+msgid "Not enough information to authenticate"
+msgstr "Not enough information to authenticate"
+
+#: src/Model/User.php:379
+msgid "Password can't be empty"
+msgstr "Password can't be empty"
+
+#: src/Model/User.php:398
+msgid "Empty passwords are not allowed."
+msgstr ""
+
+#: src/Model/User.php:402
+msgid ""
+"The new password has been exposed in a public data dump, please choose "
+"another."
+msgstr "The new password has been exposed in a public data dump; please choose another."
+
+#: src/Model/User.php:408
+msgid ""
+"The password can't contain accentuated letters, white spaces or colons (:)"
+msgstr ""
+
+#: src/Model/User.php:508
+msgid "Passwords do not match. Password unchanged."
+msgstr "Passwords do not match. Password unchanged."
+
+#: src/Model/User.php:515
+msgid "An invitation is required."
+msgstr "An invitation is required."
+
+#: src/Model/User.php:519
+msgid "Invitation could not be verified."
+msgstr "Invitation could not be verified."
+
+#: src/Model/User.php:526
+msgid "Invalid OpenID url"
+msgstr "Invalid OpenID URL"
+
+#: src/Model/User.php:539 src/Module/Login.php:106
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."
+
+#: src/Model/User.php:539 src/Module/Login.php:106
+msgid "The error message was:"
+msgstr "The error message was:"
+
+#: src/Model/User.php:545
+msgid "Please enter the required information."
+msgstr "Please enter the required information."
+
+#: src/Model/User.php:559
+#, php-format
+msgid ""
+"system.username_min_length (%s) and system.username_max_length (%s) are "
+"excluding each other, swapping values."
+msgstr ""
+
+#: src/Model/User.php:566
+#, php-format
+msgid "Username should be at least %s character."
+msgid_plural "Username should be at least %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Model/User.php:570
+#, php-format
+msgid "Username should be at most %s character."
+msgid_plural "Username should be at most %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Model/User.php:578
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "That doesn't appear to be your full (i.e first and last) name."
+
+#: src/Model/User.php:583
+msgid "Your email domain is not among those allowed on this site."
+msgstr "Your email domain is not allowed on this site."
+
+#: src/Model/User.php:587
+msgid "Not a valid email address."
+msgstr "Not a valid email address."
+
+#: src/Model/User.php:590
+msgid "The nickname was blocked from registration by the nodes admin."
+msgstr ""
+
+#: src/Model/User.php:594 src/Model/User.php:602
+msgid "Cannot use that email."
+msgstr "Cannot use that email."
+
+#: src/Model/User.php:609
+msgid "Your nickname can only contain a-z, 0-9 and _."
+msgstr "Your nickname can only contain a-z, 0-9 and _."
+
+#: src/Model/User.php:616 src/Model/User.php:673
+msgid "Nickname is already registered. Please choose another."
+msgstr "Nickname is already registered. Please choose another."
+
+#: src/Model/User.php:626
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "SERIOUS ERROR: Generation of security keys failed."
+
+#: src/Model/User.php:660 src/Model/User.php:664
+msgid "An error occurred during registration. Please try again."
+msgstr "An error occurred during registration. Please try again."
+
+#: src/Model/User.php:689
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "An error occurred creating your default profile. Please try again."
+
+#: src/Model/User.php:696
+msgid "An error occurred creating your self contact. Please try again."
+msgstr "An error occurred creating your self contact. Please try again."
+
+#: src/Model/User.php:705
+msgid ""
+"An error occurred creating your default contact group. Please try again."
+msgstr "An error occurred while creating your default contact group. Please try again."
+
+#: src/Model/User.php:781
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tThank you for registering at %2$s. Your account is pending for approval by the administrator.\n"
+"\n"
+"\t\t\tYour login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t\t%4$s\n"
+"\t\t\tPassword:\t\t%5$s\n"
+"\t\t"
+msgstr ""
+
+#: src/Model/User.php:798
+#, php-format
+msgid "Registration at %s"
+msgstr "Registration at %s"
+
+#: src/Model/User.php:817
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
+"\t\t"
+msgstr "\n\t\t\tDear %1$s,\n\t\t\t\tThank you for registering at %2$s. Your account has been created.\n\t\t"
+
+#: src/Model/User.php:823
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t\t%1$s\n"
+"\t\t\tPassword:\t\t%5$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n"
+"\n"
+"\t\t\tThank you and welcome to %2$s."
+msgstr "\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3$s\n\t\t\tLogin Name:\t\t%1$s\n\t\t\tPassword:\t\t%5$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n\n\t\t\tThank you and welcome to %2$s."
+
+#: src/Protocol/Diaspora.php:2496
+msgid "Sharing notification from Diaspora network"
+msgstr "Sharing notification from Diaspora network"
+
+#: src/Protocol/Diaspora.php:3613
+msgid "Attachments:"
+msgstr "Attachments:"
+
+#: src/Protocol/OStatus.php:1302 src/Module/Profile.php:102
+#: src/Module/Profile.php:105
+#, php-format
+msgid "%s's timeline"
+msgstr "%s's timeline"
+
+#: src/Protocol/OStatus.php:1306 src/Module/Profile.php:103
+#, php-format
+msgid "%s's posts"
+msgstr "%s's posts"
+
+#: src/Protocol/OStatus.php:1309 src/Module/Profile.php:104
+#, php-format
+msgid "%s's comments"
+msgstr "%s's comments"
+
+#: src/Protocol/OStatus.php:1866
+#, php-format
+msgid "%s is now following %s."
+msgstr "%s is now following %s."
+
+#: src/Protocol/OStatus.php:1867
+msgid "following"
+msgstr "following"
+
+#: src/Protocol/OStatus.php:1870
+#, php-format
+msgid "%s stopped following %s."
+msgstr "%s stopped following %s."
+
+#: src/Protocol/OStatus.php:1871
+msgid "stopped following"
+msgstr "stopped following"
+
+#: src/Worker/Delivery.php:453
+msgid "(no subject)"
+msgstr "(no subject)"
+
+#: src/Module/Attach.php:36 src/Module/Attach.php:48
+msgid "Item was not found."
+msgstr "Item was not found."
+
+#: src/Module/Contact.php:166
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] "%d contact edited."
+msgstr[1] "%d contacts edited."
+
+#: src/Module/Contact.php:191 src/Module/Contact.php:374
+msgid "Could not access contact record."
+msgstr "Could not access contact record."
+
+#: src/Module/Contact.php:201
+msgid "Could not locate selected profile."
+msgstr "Could not locate selected profile."
+
+#: src/Module/Contact.php:233
+msgid "Contact updated."
+msgstr "Contact updated."
+
+#: src/Module/Contact.php:395
+msgid "Contact has been blocked"
+msgstr "Contact has been blocked"
+
+#: src/Module/Contact.php:395
+msgid "Contact has been unblocked"
+msgstr "Contact has been unblocked"
+
+#: src/Module/Contact.php:405
+msgid "Contact has been ignored"
+msgstr "Contact has been ignored"
+
+#: src/Module/Contact.php:405
+msgid "Contact has been unignored"
+msgstr "Contact has been unignored"
+
+#: src/Module/Contact.php:415
+msgid "Contact has been archived"
+msgstr "Contact has been archived"
+
+#: src/Module/Contact.php:415
+msgid "Contact has been unarchived"
+msgstr "Contact has been unarchived"
+
+#: src/Module/Contact.php:439
+msgid "Drop contact"
+msgstr "Drop contact"
+
+#: src/Module/Contact.php:442 src/Module/Contact.php:820
+msgid "Do you really want to delete this contact?"
+msgstr "Do you really want to delete this contact?"
+
+#: src/Module/Contact.php:456
+msgid "Contact has been removed."
+msgstr "Contact has been removed."
+
+#: src/Module/Contact.php:486
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "You are mutual friends with %s"
+
+#: src/Module/Contact.php:491
+#, php-format
+msgid "You are sharing with %s"
+msgstr "You are sharing with %s"
+
+#: src/Module/Contact.php:496
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s is sharing with you"
+
+#: src/Module/Contact.php:520
+msgid "Private communications are not available for this contact."
+msgstr "Private communications are not available for this contact."
+
+#: src/Module/Contact.php:522
+msgid "Never"
+msgstr "Never"
+
+#: src/Module/Contact.php:525
+msgid "(Update was successful)"
+msgstr "(Update was successful)"
+
+#: src/Module/Contact.php:525
+msgid "(Update was not successful)"
+msgstr "(Update was not successful)"
+
+#: src/Module/Contact.php:527 src/Module/Contact.php:1058
+msgid "Suggest friends"
+msgstr "Suggest friends"
+
+#: src/Module/Contact.php:531
+#, php-format
+msgid "Network type: %s"
+msgstr "Network type: %s"
+
+#: src/Module/Contact.php:536
+msgid "Communications lost with this contact!"
+msgstr "Communications lost with this contact!"
+
+#: src/Module/Contact.php:542
+msgid "Fetch further information for feeds"
+msgstr "Fetch further information for feeds"
+
+#: src/Module/Contact.php:544
+msgid ""
+"Fetch information like preview pictures, title and teaser from the feed "
+"item. You can activate this if the feed doesn't contain much text. Keywords "
+"are taken from the meta header in the feed item and are posted as hash tags."
+msgstr "Fetch information like preview pictures, title, and teaser from the feed item. You can activate this if the feed doesn't contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags."
+
+#: src/Module/Contact.php:547
+msgid "Fetch information"
+msgstr "Fetch information"
+
+#: src/Module/Contact.php:548
+msgid "Fetch keywords"
+msgstr "Fetch keywords"
+
+#: src/Module/Contact.php:549
+msgid "Fetch information and keywords"
+msgstr "Fetch information and keywords"
+
+#: src/Module/Contact.php:581
+msgid "Profile Visibility"
+msgstr "Profile visibility"
+
+#: src/Module/Contact.php:582
+msgid "Contact Information / Notes"
+msgstr "Personal note"
+
+#: src/Module/Contact.php:583
+msgid "Contact Settings"
+msgstr "Notification and privacy "
+
+#: src/Module/Contact.php:592
+msgid "Contact"
+msgstr "Contact"
+
+#: src/Module/Contact.php:596
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Please choose the profile you would like to display to %s when viewing your profile securely."
+
+#: src/Module/Contact.php:598
+msgid "Their personal note"
+msgstr "Their personal note"
+
+#: src/Module/Contact.php:600
+msgid "Edit contact notes"
+msgstr "Edit contact notes"
+
+#: src/Module/Contact.php:604
+msgid "Block/Unblock contact"
+msgstr "Block/Unblock contact"
+
+#: src/Module/Contact.php:605
+msgid "Ignore contact"
+msgstr "Ignore contact"
+
+#: src/Module/Contact.php:606
+msgid "Repair URL settings"
+msgstr "Repair URL settings"
+
+#: src/Module/Contact.php:607
+msgid "View conversations"
+msgstr "View conversations"
+
+#: src/Module/Contact.php:612
+msgid "Last update:"
+msgstr "Last update:"
+
+#: src/Module/Contact.php:614
+msgid "Update public posts"
+msgstr "Update public posts"
+
+#: src/Module/Contact.php:616 src/Module/Contact.php:1068
+msgid "Update now"
+msgstr "Update now"
+
+#: src/Module/Contact.php:622 src/Module/Contact.php:825
+#: src/Module/Contact.php:1085
+msgid "Unignore"
+msgstr "Unignore"
+
+#: src/Module/Contact.php:626
+msgid "Currently blocked"
+msgstr "Currently blocked"
+
+#: src/Module/Contact.php:627
+msgid "Currently ignored"
+msgstr "Currently ignored"
+
+#: src/Module/Contact.php:628
+msgid "Currently archived"
+msgstr "Currently archived"
+
+#: src/Module/Contact.php:629
+msgid "Awaiting connection acknowledge"
+msgstr "Awaiting connection acknowledgement"
+
+#: src/Module/Contact.php:630
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Replies/Likes to your public posts <strong>may</strong> still be visible"
+
+#: src/Module/Contact.php:631
+msgid "Notification for new posts"
+msgstr "Notification for new posts"
+
+#: src/Module/Contact.php:631
+msgid "Send a notification of every new post of this contact"
+msgstr "Send notification for every new post from this contact"
+
+#: src/Module/Contact.php:633
+msgid "Blacklisted keywords"
+msgstr "Blacklisted keywords"
+
+#: src/Module/Contact.php:633
+msgid ""
+"Comma separated list of keywords that should not be converted to hashtags, "
+"when \"Fetch information and keywords\" is selected"
+msgstr "Comma-separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"
+
+#: src/Module/Contact.php:650
+msgid "Actions"
+msgstr "Actions"
+
+#: src/Module/Contact.php:696
+msgid "Suggestions"
+msgstr "Suggestions"
+
+#: src/Module/Contact.php:699
+msgid "Suggest potential friends"
+msgstr "Suggest potential friends"
+
+#: src/Module/Contact.php:707
+msgid "Show all contacts"
+msgstr "Show all contacts"
+
+#: src/Module/Contact.php:712
+msgid "Unblocked"
+msgstr "Unblocked"
+
+#: src/Module/Contact.php:715
+msgid "Only show unblocked contacts"
+msgstr "Only show unblocked contacts"
+
+#: src/Module/Contact.php:720
+msgid "Blocked"
+msgstr "Blocked"
+
+#: src/Module/Contact.php:723
+msgid "Only show blocked contacts"
+msgstr "Only show blocked contacts"
+
+#: src/Module/Contact.php:728
+msgid "Ignored"
+msgstr "Ignored"
+
+#: src/Module/Contact.php:731
+msgid "Only show ignored contacts"
+msgstr "Only show ignored contacts"
+
+#: src/Module/Contact.php:736
+msgid "Archived"
+msgstr "Archived"
+
+#: src/Module/Contact.php:739
+msgid "Only show archived contacts"
+msgstr "Only show archived contacts"
+
+#: src/Module/Contact.php:744
+msgid "Hidden"
+msgstr "Hidden"
+
+#: src/Module/Contact.php:747
+msgid "Only show hidden contacts"
+msgstr "Only show hidden contacts"
+
+#: src/Module/Contact.php:755
+msgid "Organize your contact groups"
+msgstr ""
+
+#: src/Module/Contact.php:815
+msgid "Search your contacts"
+msgstr "Search your contacts"
+
+#: src/Module/Contact.php:826 src/Module/Contact.php:1094
+msgid "Archive"
+msgstr "Archive"
+
+#: src/Module/Contact.php:826 src/Module/Contact.php:1094
+msgid "Unarchive"
+msgstr "Unarchive"
+
+#: src/Module/Contact.php:829
+msgid "Batch Actions"
+msgstr "Batch actions"
+
+#: src/Module/Contact.php:856
+msgid "Conversations started by this contact"
+msgstr ""
+
+#: src/Module/Contact.php:861
+msgid "Posts and Comments"
+msgstr ""
+
+#: src/Module/Contact.php:884
+msgid "View all contacts"
+msgstr "View all contacts"
+
+#: src/Module/Contact.php:895
+msgid "View all common friends"
+msgstr "View all common friends"
+
+#: src/Module/Contact.php:905
+msgid "Advanced Contact Settings"
+msgstr "Advanced contact settings"
+
+#: src/Module/Contact.php:991
+msgid "Mutual Friendship"
+msgstr "Mutual friendship"
+
+#: src/Module/Contact.php:996
+msgid "is a fan of yours"
+msgstr "is a fan of yours"
+
+#: src/Module/Contact.php:1001
+msgid "you are a fan of"
+msgstr "I follow them"
+
+#: src/Module/Contact.php:1025
+msgid "Edit contact"
+msgstr "Edit contact"
+
+#: src/Module/Contact.php:1079
+msgid "Toggle Blocked status"
+msgstr "Toggle blocked status"
+
+#: src/Module/Contact.php:1087
+msgid "Toggle Ignored status"
+msgstr "Toggle ignored status"
+
+#: src/Module/Contact.php:1096
+msgid "Toggle Archive status"
+msgstr "Toggle archive status"
+
+#: src/Module/Contact.php:1104
+msgid "Delete contact"
+msgstr "Delete contact"
+
+#: src/Module/Install.php:118
+msgid "Friendica Communications Server - Setup"
+msgstr ""
+
+#: src/Module/Install.php:129
+msgid "System check"
+msgstr "System check"
+
+#: src/Module/Install.php:134
+msgid "Check again"
+msgstr "Check again"
+
+#: src/Module/Install.php:151
+msgid "Database connection"
+msgstr "Database connection"
+
+#: src/Module/Install.php:152
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "In order to install Friendica we need to know how to connect to your database."
+
+#: src/Module/Install.php:153
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Please contact your hosting provider or site administrator if you have questions about these settings."
+
+#: src/Module/Install.php:154
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "The database you specify below should already exist. If it does not, please create it before continuing."
+
+#: src/Module/Install.php:157
+msgid "Database Server Name"
+msgstr "Database server name"
+
+#: src/Module/Install.php:162
+msgid "Database Login Name"
+msgstr "Database login name"
+
+#: src/Module/Install.php:168
+msgid "Database Login Password"
+msgstr "Database login password"
+
+#: src/Module/Install.php:170
+msgid "For security reasons the password must not be empty"
+msgstr "For security reasons the password must not be empty"
+
+#: src/Module/Install.php:173
+msgid "Database Name"
+msgstr "Database name"
+
+#: src/Module/Install.php:178 src/Module/Install.php:214
+msgid "Site administrator email address"
+msgstr "Site administrator email address"
+
+#: src/Module/Install.php:180 src/Module/Install.php:214
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Your account email address must match this in order to use the web admin panel."
+
+#: src/Module/Install.php:184 src/Module/Install.php:215
+msgid "Please select a default timezone for your website"
+msgstr "Please select a default time zone for your website"
+
+#: src/Module/Install.php:208
+msgid "Site settings"
+msgstr "Site settings"
+
+#: src/Module/Install.php:217
+msgid "System Language:"
+msgstr "System language:"
+
+#: src/Module/Install.php:219
+msgid ""
+"Set the default language for your Friendica installation interface and to "
+"send emails."
+msgstr "Set the default language for your Friendica installation interface and email communication."
+
+#: src/Module/Install.php:231
+msgid "Your Friendica site database has been installed."
+msgstr "Your Friendica site database has been installed."
+
+#: src/Module/Install.php:239
+msgid "Installation finished"
+msgstr ""
+
+#: src/Module/Install.php:261
+msgid "<h1>What next</h1>"
+msgstr "<h1>What next</h1>"
+
+#: src/Module/Install.php:262
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"worker."
+msgstr "IMPORTANT: You will need to [manually] setup a scheduled task for the worker."
+
+#: src/Module/Install.php:265
+#, php-format
+msgid ""
+"Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
+"and register as new user. Remember to use the same email you have entered as"
+" administrator email. This will allow you to enter the site admin panel."
+msgstr "Go to your new Friendica node <a href=\"%s/register\">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel."
+
+#: src/Module/Itemsource.php:41
+msgid "Item Guid"
+msgstr ""
+
+#: src/Module/Login.php:292
+msgid "Create a New Account"
+msgstr "Create a new account"
+
+#: src/Module/Login.php:325
+msgid "Password: "
+msgstr "Password: "
+
+#: src/Module/Login.php:326
+msgid "Remember me"
+msgstr "Remember me"
+
+#: src/Module/Login.php:329
+msgid "Or login using OpenID: "
+msgstr "Or login with OpenID: "
+
+#: src/Module/Login.php:335
+msgid "Forgot your password?"
+msgstr "Forgot your password?"
+
+#: src/Module/Login.php:338
+msgid "Website Terms of Service"
+msgstr "Website Terms of Service"
+
+#: src/Module/Login.php:339
+msgid "terms of service"
+msgstr "Terms of service"
+
+#: src/Module/Login.php:341
+msgid "Website Privacy Policy"
+msgstr "Website Privacy Policy"
+
+#: src/Module/Login.php:342
+msgid "privacy policy"
+msgstr "Privacy policy"
+
+#: src/Module/Logout.php:27
+msgid "Logged out."
+msgstr "Logged out."
+
+#: src/Module/Proxy.php:73
+msgid "Bad Request."
+msgstr ""
+
+#: src/Module/Register.php:83
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking \"Register\"."
+msgstr ""
+
+#: src/Module/Register.php:84
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
+msgstr "If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."
+
+#: src/Module/Register.php:85
+msgid "Your OpenID (optional): "
+msgstr "Your OpenID (optional): "
+
+#: src/Module/Register.php:94
+msgid "Include your profile in member directory?"
+msgstr "Include your profile in member directory?"
+
+#: src/Module/Register.php:117
+msgid "Note for the admin"
+msgstr "Note for the admin"
+
+#: src/Module/Register.php:117
+msgid "Leave a message for the admin, why you want to join this node"
+msgstr "Leave a message for the admin. Why do you want to join this node?"
+
+#: src/Module/Register.php:118
+msgid "Membership on this site is by invitation only."
+msgstr "Membership on this site is by invitation only."
+
+#: src/Module/Register.php:119
+msgid "Your invitation code: "
+msgstr "Your invitation code: "
+
+#: src/Module/Register.php:127
+msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
+msgstr "Your full name: "
+
+#: src/Module/Register.php:128
+msgid ""
+"Your Email Address: (Initial information will be send there, so this has to "
+"be an existing address.)"
+msgstr "Your Email Address: (Initial information will be sent there, so this must be an existing address.)"
+
+#: src/Module/Register.php:130
+msgid "Leave empty for an auto generated password."
+msgstr "Leave empty for an auto generated password."
+
+#: src/Module/Register.php:132
+#, php-format
+msgid ""
+"Choose a profile nickname. This must begin with a text character. Your "
+"profile address on this site will then be \"<strong>nickname@%s</strong>\"."
+msgstr ""
+
+#: src/Module/Register.php:133
+msgid "Choose a nickname: "
+msgstr "Choose a nickname: "
+
+#: src/Module/Register.php:142
+msgid "Import your profile to this friendica instance"
+msgstr "Import an existing Friendica profile to this node."
+
+#: src/Module/Register.php:150
+msgid "Note: This node explicitly contains adult content"
+msgstr ""
+
+#: src/Module/Register.php:243
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr "Registration successful. Please check your email for further instructions."
+
+#: src/Module/Register.php:247
+#, php-format
+msgid ""
+"Failed to send email message. Here your accout details:<br> login: %s<br> "
+"password: %s<br><br>You can change your password after login."
+msgstr "Failed to send email message. Here are your account details:<br> login: %s<br> password: %s<br><br>You can change your password after login."
+
+#: src/Module/Register.php:254
+msgid "Registration successful."
+msgstr "Registration successful."
+
+#: src/Module/Register.php:259
+msgid "Your registration can not be processed."
+msgstr "Your registration cannot be processed."
+
+#: src/Module/Register.php:305
+msgid "Your registration is pending approval by the site owner."
+msgstr "Your registration is pending approval by the site administrator."
+
+#: src/Module/Tos.php:35 src/Module/Tos.php:77
+msgid ""
+"At the time of registration, and for providing communications between the "
+"user account and their contacts, the user has to provide a display name (pen"
+" name), an username (nickname) and a working email address. The names will "
+"be accessible on the profile page of the account by any visitor of the page,"
+" even if other profile details are not displayed. The email address will "
+"only be used to send the user notifications about interactions, but wont be "
+"visibly displayed. The listing of an account in the node's user directory or"
+" the global user directory is optional and can be controlled in the user "
+"settings, it is not necessary for communication."
+msgstr "At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), a username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but won’t be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication."
+
+#: src/Module/Tos.php:36 src/Module/Tos.php:78
+msgid ""
+"This data is required for communication and is passed on to the nodes of the"
+" communication partners and is stored there. Users can enter additional "
+"private data that may be transmitted to the communication partners accounts."
+msgstr "This information is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional personal information that may be transmitted to the communication partner's accounts."
+
+#: src/Module/Tos.php:37 src/Module/Tos.php:79
+#, php-format
+msgid ""
+"At any point in time a logged in user can export their account data from the"
+" <a href=\"%1$s/settings/uexport\">account settings</a>. If the user wants "
+"to delete their account they can do so at <a "
+"href=\"%1$s/removeme\">%1$s/removeme</a>. The deletion of the account will "
+"be permanent. Deletion of the data will also be requested from the nodes of "
+"the communication partners."
+msgstr "At any point in time a logged in user can export their account data from the <a href=\"%1$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1$s/removeme\">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners."
+
+#: src/Module/Tos.php:40 src/Module/Tos.php:76
+msgid "Privacy Statement"
+msgstr "Privacy Statement"
+
+#: src/Object/Post.php:136
+msgid "This entry was edited"
+msgstr "This entry was edited"
+
+#: src/Object/Post.php:198
+msgid "Delete locally"
+msgstr ""
+
+#: src/Object/Post.php:201
+msgid "Delete globally"
+msgstr ""
+
+#: src/Object/Post.php:201
+msgid "Remove locally"
+msgstr ""
+
+#: src/Object/Post.php:215
+msgid "save to folder"
+msgstr "Save to folder"
+
+#: src/Object/Post.php:250
+msgid "I will attend"
+msgstr "I will attend"
+
+#: src/Object/Post.php:250
+msgid "I will not attend"
+msgstr "I will not attend"
+
+#: src/Object/Post.php:250
+msgid "I might attend"
+msgstr "I might attend"
+
+#: src/Object/Post.php:278
+msgid "ignore thread"
+msgstr "Ignore thread"
+
+#: src/Object/Post.php:279
+msgid "unignore thread"
+msgstr "Unignore thread"
+
+#: src/Object/Post.php:280
+msgid "toggle ignore status"
+msgstr "Toggle ignore status"
+
+#: src/Object/Post.php:291
+msgid "add star"
+msgstr "Add star"
+
+#: src/Object/Post.php:292
+msgid "remove star"
+msgstr "Remove star"
+
+#: src/Object/Post.php:293
+msgid "toggle star status"
+msgstr "Toggle star status"
+
+#: src/Object/Post.php:296
+msgid "starred"
+msgstr "Starred"
+
+#: src/Object/Post.php:300
+msgid "add tag"
+msgstr "Add tag"
+
+#: src/Object/Post.php:311
+msgid "like"
+msgstr "Like"
+
+#: src/Object/Post.php:312
+msgid "dislike"
+msgstr "Dislike"
+
+#: src/Object/Post.php:315
+msgid "Share this"
+msgstr "Share this"
+
+#: src/Object/Post.php:315
+msgid "share"
+msgstr "Share"
+
+#: src/Object/Post.php:382
+msgid "to"
+msgstr "to"
+
+#: src/Object/Post.php:383
+msgid "via"
+msgstr "via"
+
+#: src/Object/Post.php:384
+msgid "Wall-to-Wall"
+msgstr "Wall-to-wall"
+
+#: src/Object/Post.php:385
+msgid "via Wall-To-Wall:"
+msgstr "via wall-to-wall:"
+
+#: src/Object/Post.php:432
+msgid "Notifier task is pending"
+msgstr ""
+
+#: src/Object/Post.php:433
+msgid "Delivery to remote servers is pending"
+msgstr ""
+
+#: src/Object/Post.php:434
+msgid "Delivery to remote servers is underway"
+msgstr ""
+
+#: src/Object/Post.php:435
+msgid "Delivery to remote servers is mostly done"
+msgstr ""
+
+#: src/Object/Post.php:436
+msgid "Delivery to remote servers is done"
+msgstr ""
+
+#: src/Object/Post.php:455
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d comment"
+msgstr[1] "%d comments -"
+
+#: src/App.php:665
+msgid "Delete this item?"
+msgstr "Delete this item?"
+
+#: src/App.php:667
+msgid "show fewer"
+msgstr "show fewer"
+
+#: src/App.php:709
+msgid "toggle mobile"
+msgstr "Toggle mobile"
+
+#: src/App.php:1077
+msgid "No system theme config value set."
+msgstr "No system theme configuration value set."
+
+#: src/BaseModule.php:133
+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 "The form security token was incorrect. This probably happened because the form has not been submitted within 3 hours."
+
+#: src/LegacyModule.php:30
+#, php-format
+msgid "Legacy module file not found: %s"
+msgstr ""
+
+#: update.php:217
+#, php-format
+msgid "%s: Updating author-id and owner-id in item and thread table. "
+msgstr "%s: Updating author-id and owner-id in item and thread table. "
+
+#: update.php:272
+#, php-format
+msgid "%s: Updating post-type."
+msgstr ""
diff --git a/view/lang/en-us/strings.php b/view/lang/en-us/strings.php
index 2c6a5b149..c63cd58ec 100644
--- a/view/lang/en-us/strings.php
+++ b/view/lang/en-us/strings.php
@@ -135,18 +135,22 @@ $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s sent you
 $a->strings["a private message"] = "a private message";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s sent you %2\$s.";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Please visit %s to view or reply to your private messages.";
+$a->strings["%1\$s tagged you on [url=%2\$s]a %3\$s[/url]"] = "";
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s commented on [url=%2\$s]a %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]%3\$s's %4\$s[/url]"] = "";
 $a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]your %3\$s[/url]"] = "";
 $a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s commented on [url=%2\$s]your %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]their %3\$s[/url]"] = "";
+$a->strings["%1\$s commented on [url=%2\$s]their %3\$s[/url]"] = "";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notify] %s tagged you";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s tagged you at %2\$s";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Notify] Comment to conversation #%1\$d by %2\$s";
 $a->strings["%s commented on an item/conversation you have been following."] = "%s commented on an item/conversation you have been following.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Please visit %s to view or reply to the conversation.";
 $a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notify] %s posted to your profile wall";
 $a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s posted to your profile wall at %2\$s";
 $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s posted to [url=%2\$s]your wall[/url]";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notify] %s tagged you";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s tagged you at %2\$s";
-$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]tagged you[/url].";
 $a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Notify] %s shared a new post";
 $a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s shared a new post at %2\$s";
 $a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]shared a post[/url].";
@@ -190,7 +194,11 @@ $a->strings["Do you really want to delete this item?"] = "Do you really want to
 $a->strings["Yes"] = "Yes";
 $a->strings["Permission denied."] = "Permission denied.";
 $a->strings["Archives"] = "Archives";
-$a->strings["show more"] = "Show more...";
+$a->strings["show more"] = "show more";
+$a->strings["You must be logged in to use addons. "] = "You must be logged in to use addons. ";
+$a->strings["Applications"] = "Applications";
+$a->strings["No installed applications."] = "No installed applications.";
+$a->strings["System down for maintenance"] = "Sorry, the system is currently down for maintenance.";
 $a->strings["Theme settings updated."] = "Theme settings updated.";
 $a->strings["Information"] = "Information";
 $a->strings["Overview"] = "Overview";
@@ -302,6 +310,7 @@ $a->strings["The database update failed. Please run \"php bin/console.php dbstru
 $a->strings["The worker was never executed. Please check your database structure!"] = "The worker process has never been executed. Please check your database structure!";
 $a->strings["The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings."] = "The last worker process started at %s UTC. This is more than one hour ago. Please adjust your crontab settings.";
 $a->strings["Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "";
+$a->strings["Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>config/local.ini.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "";
 $a->strings["<a href=\"%s\">%s</a> is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See <a href=\"%s\">the installation page</a> for help."] = "";
 $a->strings["Normal Account"] = "Standard account";
 $a->strings["Automatic Follower Account"] = "Automatic follower account";
@@ -341,6 +350,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
 $a->strings["Don't check"] = "Don't check";
 $a->strings["check the stable version"] = "check for stable version updates";
 $a->strings["check the development version"] = "check for development version updates";
+$a->strings["Database (legacy)"] = "";
 $a->strings["Republish users to directory"] = "Republish users to directory";
 $a->strings["Registration"] = "Registration";
 $a->strings["File upload"] = "File upload";
@@ -376,6 +386,8 @@ $a->strings["Hide help entry from navigation menu"] = "Hide help entry from navi
 $a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Hides the menu entry for the Help pages from the navigation menu. Help pages can still be accessed by calling ../help directly via its URL.";
 $a->strings["Single user instance"] = "Single user instance";
 $a->strings["Make this instance multi-user or single-user for the named user"] = "Make this instance multi-user or single-user for the named user";
+$a->strings["File storage backend"] = "";
+$a->strings["The backend used to store uploaded data. If you change the storage backend, you can manually move the existing files. If you do not do so, the files uploaded before the change will still be available at the old backend. Please see <a href=\"/help/Settings#1_2_3_1\">the settings documentation</a> for more information about the choices and the moving procedure."] = "";
 $a->strings["Maximum image size"] = "Maximum image size";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximum size in bytes of uploaded images. Default is 0, which means no limits.";
 $a->strings["Maximum image length"] = "Maximum image length";
@@ -420,16 +432,16 @@ $a->strings["Allow Users to set remote_self"] = "Allow users to set \"Remote sel
 $a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "This allows every user to mark contacts as a \"Remote self\" in the repair contact dialogue. Setting this flag on a contact will mirror every posting of that contact in the users stream.";
 $a->strings["Block multiple registrations"] = "Block multiple registrations";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Disallow users to sign up for additional accounts.";
-$a->strings["OpenID support"] = "OpenID support";
-$a->strings["OpenID support for registration and logins."] = "OpenID support for registration and logins.";
-$a->strings["Fullname check"] = "Full name check";
-$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Force users to sign up with a space between first name and last name in the full name field; it may reduce spam and abuse registrations.";
+$a->strings["Disable OpenID"] = "";
+$a->strings["Disable OpenID support for registration and logins."] = "";
+$a->strings["No Fullname check"] = "";
+$a->strings["Allow users to register without a space between the first name and the last name in their full name."] = "";
 $a->strings["Community pages for visitors"] = "Community pages for visitors";
 $a->strings["Which community pages should be available for visitors. Local users always see both pages."] = "Which community pages should be available for visitors. Local users always see both pages.";
 $a->strings["Posts per user on community page"] = "Posts per user on community page";
 $a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "Maximum number of posts per user on the community page (not valid for 'Global Community').";
-$a->strings["Enable OStatus support"] = "Enable OStatus support";
-$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Provide built-in OStatus (StatusNet, GNU Social, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.";
+$a->strings["Disable OStatus support"] = "";
+$a->strings["Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "";
 $a->strings["Only import OStatus/ActivityPub threads from our contacts"] = "";
 $a->strings["Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system."] = "";
 $a->strings["OStatus support can only be enabled if threading is enabled."] = "OStatus support can only be enabled if threading is enabled.";
@@ -459,7 +471,7 @@ $a->strings["If enabled, the global contacts are checked periodically for missin
 $a->strings["Days between requery"] = "Days between enquiry";
 $a->strings["Number of days after which a server is requeried for his contacts."] = "Number of days after which a server is rechecked for contacts.";
 $a->strings["Discover contacts from other servers"] = "Discover contacts from other servers";
-$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."] = "Periodically query other servers for contacts. You can choose between 'Users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older Friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommend setting is 'Users, Global Contacts'.";
+$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommended setting is 'Users, Global Contacts'."] = "";
 $a->strings["Timeframe for fetching global contacts"] = "Time-frame for fetching global contacts";
 $a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "If discovery is activated, this value defines the time-frame for the activity of the global contacts that are fetched from other servers.";
 $a->strings["Search the local directory"] = "Search the local directory";
@@ -557,6 +569,7 @@ $a->strings["Personal Page"] = "Personal Page";
 $a->strings["Organisation Page"] = "Organization Page";
 $a->strings["News Page"] = "News Page";
 $a->strings["Community Forum"] = "Community Forum";
+$a->strings["Relay"] = "";
 $a->strings["Email"] = "Email";
 $a->strings["Register date"] = "Registration date";
 $a->strings["Last login"] = "Last login";
@@ -574,7 +587,7 @@ $a->strings["User blocked"] = "";
 $a->strings["Site admin"] = "Site admin";
 $a->strings["Account expired"] = "Account expired";
 $a->strings["New User"] = "New user";
-$a->strings["Delete in"] = "";
+$a->strings["Permanent deletion"] = "";
 $a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Selected users will be deleted!\\n\\nEverything these users have posted on this site will be permanently deleted!\\n\\nAre you sure?";
 $a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?";
 $a->strings["Name of the new user."] = "Name of the new user.";
@@ -620,11 +633,6 @@ $a->strings["Return to your app and insert this Securty Code:"] = "Return to you
 $a->strings["Please login to continue."] = "Please login to continue.";
 $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Do you want to authorize this application to access your posts and contacts and create new posts for you?";
 $a->strings["No"] = "No";
-$a->strings["You must be logged in to use addons. "] = "You must be logged in to use addons. ";
-$a->strings["Applications"] = "Applications";
-$a->strings["No installed applications."] = "No installed applications.";
-$a->strings["Item not available."] = "Item not available.";
-$a->strings["Item was not found."] = "Item was not found.";
 $a->strings["Source input"] = "Source input";
 $a->strings["BBCode::toPlaintext"] = "BBCode::toPlaintext";
 $a->strings["BBCode::convert (raw HTML)"] = "BBCode::convert (raw HTML)";
@@ -634,6 +642,8 @@ $a->strings["BBCode::toMarkdown"] = "BBCode::toMarkdown";
 $a->strings["BBCode::toMarkdown => Markdown::convert"] = "BBCode::toMarkdown => Markdown::convert";
 $a->strings["BBCode::toMarkdown => Markdown::toBBCode"] = "BBCode::toMarkdown => Markdown::toBBCode";
 $a->strings["BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"] = "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode";
+$a->strings["Item Body"] = "";
+$a->strings["Item Tags"] = "";
 $a->strings["Source input (Diaspora format)"] = "";
 $a->strings["Markdown::convert (raw HTML)"] = "";
 $a->strings["Markdown::convert"] = "";
@@ -698,6 +708,7 @@ $a->strings["Mark this contact as remote_self, this will cause friendica to repo
 $a->strings["Account Nickname"] = "Account nickname:";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@Tag name - overrides name/nickname:";
 $a->strings["Account URL"] = "Account URL:";
+$a->strings["Account URL Alias"] = "";
 $a->strings["Friend Request URL"] = "Friend request URL:";
 $a->strings["Friend Confirm URL"] = "Friend confirm URL:";
 $a->strings["Notification Endpoint URL"] = "Notification endpoint URL";
@@ -825,7 +836,6 @@ $a->strings["Upload"] = "Upload";
 $a->strings["Files"] = "Files";
 $a->strings["You must be logged in to use this module"] = "You must be logged in to use this module";
 $a->strings["Source URL"] = "Source URL";
-$a->strings["Not Found"] = "Not found";
 $a->strings["- select -"] = "- select -";
 $a->strings["The contact could not be added."] = "Contact could not be added.";
 $a->strings["You already added this contact."] = "You already added this contact.";
@@ -869,6 +879,7 @@ $a->strings["Add contact to group"] = "Add contact to group";
 $a->strings["No profile"] = "No profile";
 $a->strings["Help:"] = "Help:";
 $a->strings["Help"] = "Help";
+$a->strings["Not Found"] = "Not found";
 $a->strings["Welcome to %s"] = "Welcome to %s";
 $a->strings["Total invitation limit exceeded."] = "Total invitation limit exceeded";
 $a->strings["%s : Not a valid email address."] = "%s : Not a valid email address";
@@ -928,12 +939,12 @@ $a->strings["Your password may be changed from the <em>Settings</em> page after
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tYour password has been changed as requested. Please retain this\n\t\t\tinformation for your records (or change your password immediately to\n\t\t\tsomething that you will remember).\n\t\t"] = "\n\t\t\tDear %1\$s,\n\t\t\t\tYour password has been changed as requested. Please retain this\n\t\t\tinformation for your records (or change your password immediately to\n\t\t\tsomething that you will remember).\n\t\t";
 $a->strings["\n\t\t\tYour login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t%2\$s\n\t\t\tPassword:\t%3\$s\n\n\t\t\tYou may change that password from your account settings page after logging in.\n\t\t"] = "\n\t\t\tYour login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t%2\$s\n\t\t\tPassword:\t%3\$s\n\n\t\t\tYou may change that password from your account settings page after logging in.\n\t\t";
 $a->strings["Your password has been changed at %s"] = "Your password has been changed at %s";
-$a->strings["System down for maintenance"] = "Sorry, the system is currently down for maintenance.";
 $a->strings["Manage Identities and/or Pages"] = "Manage Identities and Pages";
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Accounts that I manage or own.";
 $a->strings["Select an identity to manage: "] = "Select identity:";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "No keywords to match. Please add keywords to your default profile.";
-$a->strings["is interested in:"] = "is interested in:";
+$a->strings["first"] = "first";
+$a->strings["next"] = "next";
 $a->strings["Profile Match"] = "Profile Match";
 $a->strings["New Message"] = "New Message";
 $a->strings["No recipient selected."] = "No recipient selected.";
@@ -1118,7 +1129,6 @@ $a->strings["Comment"] = "Comment";
 $a->strings["Map"] = "Map";
 $a->strings["View Album"] = "View album";
 $a->strings["{0} wants to be your friend"] = "{0} wants to be your friend";
-$a->strings["{0} sent you a message"] = "{0} sent you a message";
 $a->strings["{0} requested registration"] = "{0} requested registration";
 $a->strings["Poke/Prod"] = "Poke/Prod";
 $a->strings["poke, prod or do other things to somebody"] = "Poke, prod or do other things to somebody";
@@ -1126,10 +1136,19 @@ $a->strings["Recipient"] = "Recipient:";
 $a->strings["Choose what you wish to do to recipient"] = "Choose what you wish to do:";
 $a->strings["Make this post private"] = "Make this post private";
 $a->strings["Only logged in users are permitted to perform a probing."] = "Only logged in users are permitted to use the Probe feature.";
-$a->strings["Requested profile is not available."] = "Requested profile is unavailable.";
-$a->strings["%s's timeline"] = "%s's timeline";
-$a->strings["%s's posts"] = "%s's posts";
-$a->strings["%s's comments"] = "%s's comments";
+$a->strings["Image uploaded but image cropping failed."] = "Image uploaded but image cropping failed.";
+$a->strings["Image size reduction [%s] failed."] = "Image size reduction [%s] failed.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Shift-reload the page or clear browser cache if the new photo does not display immediately.";
+$a->strings["Unable to process image"] = "Unable to process image";
+$a->strings["Upload File:"] = "Upload File:";
+$a->strings["Select a profile:"] = "Select a profile:";
+$a->strings["or"] = "or";
+$a->strings["skip this step"] = "skip this step";
+$a->strings["select a photo from your photo albums"] = "select a photo from your photo albums";
+$a->strings["Crop Image"] = "Crop Image";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Please adjust the image cropping for optimum viewing.";
+$a->strings["Done Editing"] = "Done editing";
+$a->strings["Image uploaded successfully."] = "Image uploaded successfully.";
 $a->strings["Profile deleted."] = "Profile deleted.";
 $a->strings["Profile-"] = "Profile-";
 $a->strings["New profile created."] = "New profile created.";
@@ -1210,48 +1229,10 @@ $a->strings["visible to everybody"] = "Visible to everybody";
 $a->strings["Edit/Manage Profiles"] = "Edit/Manage Profiles";
 $a->strings["Change profile photo"] = "Change profile photo";
 $a->strings["Create New Profile"] = "Create new profile";
-$a->strings["Image uploaded but image cropping failed."] = "Image uploaded but image cropping failed.";
-$a->strings["Image size reduction [%s] failed."] = "Image size reduction [%s] failed.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Shift-reload the page or clear browser cache if the new photo does not display immediately.";
-$a->strings["Unable to process image"] = "Unable to process image";
-$a->strings["Upload File:"] = "Upload File:";
-$a->strings["Select a profile:"] = "Select a profile:";
-$a->strings["or"] = "or";
-$a->strings["skip this step"] = "skip this step";
-$a->strings["select a photo from your photo albums"] = "select a photo from your photo albums";
-$a->strings["Crop Image"] = "Crop Image";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Please adjust the image cropping for optimum viewing.";
-$a->strings["Done Editing"] = "Done editing";
-$a->strings["Image uploaded successfully."] = "Image uploaded successfully.";
 $a->strings["Invalid profile identifier."] = "Invalid profile identifier.";
 $a->strings["Profile Visibility Editor"] = "Profile Visibility Editor";
 $a->strings["Visible To"] = "Visible to";
 $a->strings["All Contacts (with secure profile access)"] = "All contacts with secure profile access";
-$a->strings["Registration successful. Please check your email for further instructions."] = "Registration successful. Please check your email for further instructions.";
-$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Failed to send email message. Here are your account details:<br> login: %s<br> password: %s<br><br>You can change your password after login.";
-$a->strings["Registration successful."] = "Registration successful.";
-$a->strings["Your registration can not be processed."] = "Your registration cannot be processed.";
-$a->strings["Your registration is pending approval by the site owner."] = "Your registration is pending approval by the site administrator.";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Sign up now'.";
-$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.";
-$a->strings["Your OpenID (optional): "] = "Your OpenID (optional): ";
-$a->strings["Include your profile in member directory?"] = "Include your profile in member directory?";
-$a->strings["Note for the admin"] = "Note for the admin";
-$a->strings["Leave a message for the admin, why you want to join this node"] = "Leave a message for the admin. Why do you want to join this node?";
-$a->strings["Membership on this site is by invitation only."] = "Membership on this site is by invitation only.";
-$a->strings["Your invitation code: "] = "Your invitation code: ";
-$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Your full name: ";
-$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Your Email Address: (Initial information will be sent there, so this must be an existing address.)";
-$a->strings["New Password:"] = "New password:";
-$a->strings["Leave empty for an auto generated password."] = "Leave empty for an auto generated password.";
-$a->strings["Confirm:"] = "Confirm new password:";
-$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@%s</strong>'."] = "Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@%s</strong>'.";
-$a->strings["Choose a nickname: "] = "Choose a nickname: ";
-$a->strings["Register"] = "Sign up now >>";
-$a->strings["Import"] = "Import profile";
-$a->strings["Import your profile to this friendica instance"] = "Import an existing Friendica profile to this node.";
-$a->strings["Note: This node explicitly contains adult content"] = "";
 $a->strings["Account approved."] = "Account approved.";
 $a->strings["Registration revoked for %s"] = "Registration revoked for %s";
 $a->strings["Please login."] = "Please login.";
@@ -1283,12 +1264,10 @@ $a->strings["Failed to connect with email account using the settings provided."]
 $a->strings["Email settings updated."] = "Email settings updated.";
 $a->strings["Features updated"] = "Features updated";
 $a->strings["Relocate message has been send to your contacts"] = "Relocate message has been sent to your contacts";
-$a->strings["Passwords do not match. Password unchanged."] = "Passwords do not match. Password unchanged.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Empty passwords are not allowed. Password unchanged.";
-$a->strings["The new password has been exposed in a public data dump, please choose another."] = "The new password has been exposed in a public data dump; please choose another.";
-$a->strings["Wrong password."] = "Wrong password.";
-$a->strings["Password changed."] = "Password changed.";
+$a->strings["Passwords do not match."] = "";
 $a->strings["Password update failed. Please try again."] = "Password update failed. Please try again.";
+$a->strings["Password changed."] = "Password changed.";
+$a->strings["Password unchanged."] = "";
 $a->strings[" Please use a shorter name."] = " Please use a shorter name.";
 $a->strings[" Name too short."] = " Name too short.";
 $a->strings["Wrong Password"] = "Wrong password";
@@ -1417,6 +1396,9 @@ $a->strings["Expire photos:"] = "Expire photos:";
 $a->strings["Only expire posts by others:"] = "Only expire posts by others:";
 $a->strings["Account Settings"] = "Account Settings";
 $a->strings["Password Settings"] = "Password change";
+$a->strings["New Password:"] = "New password:";
+$a->strings["Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:)."] = "";
+$a->strings["Confirm:"] = "Confirm new password:";
 $a->strings["Leave password fields blank unless changing"] = "Leave password fields blank unless changing";
 $a->strings["Current Password:"] = "Current password:";
 $a->strings["Your current password to confirm the changes"] = "Current password to confirm change";
@@ -1472,6 +1454,8 @@ $a->strings["Export your account info and contacts. Use this to make a backup of
 $a->strings["Export all"] = "Export all";
 $a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Export your account info, contacts and all your items as JSON. This could be a very big file, and could take a lot of time. Use this to make a full backup of your account. Photos are not exported.";
 $a->strings["User imports on closed servers can only be done by an administrator."] = "";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.";
+$a->strings["Import"] = "Import profile";
 $a->strings["Move account"] = "Move Existing Friendica Account";
 $a->strings["You can import an account from another Friendica server."] = "You can import an existing Friendica profile to this node.";
 $a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.";
@@ -1492,21 +1476,286 @@ $a->strings["Upload New Videos"] = "Upload new videos";
 $a->strings["No contacts."] = "No contacts.";
 $a->strings["Visit %s's profile [%s]"] = "Visit %s's profile [%s]";
 $a->strings["Contacts"] = "Contacts";
-$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Number of daily wall messages for %s exceeded. Message failed.";
-$a->strings["Unable to check your home location."] = "Unable to check your home location.";
-$a->strings["No recipient."] = "No recipient.";
-$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.";
 $a->strings["Invalid request."] = "Invalid request.";
 $a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Sorry, maybe your upload is bigger than the PHP configuration allows";
 $a->strings["Or - did you try to upload an empty file?"] = "Or did you try to upload an empty file?";
 $a->strings["File exceeds size limit of %s"] = "File exceeds size limit of %s";
 $a->strings["File upload failed."] = "File upload failed.";
 $a->strings["Wall Photos"] = "Wall photos";
-$a->strings["Delete this item?"] = "Delete this item?";
-$a->strings["show fewer"] = "Show fewer.";
-$a->strings["toggle mobile"] = "Toggle mobile";
-$a->strings["No system theme config value set."] = "No system theme configuration value set.";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "The form security token was incorrect. This probably happened because the form has not been submitted within 3 hours.";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Number of daily wall messages for %s exceeded. Message failed.";
+$a->strings["Unable to check your home location."] = "Unable to check your home location.";
+$a->strings["No recipient."] = "No recipient.";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.";
+$a->strings["default"] = "default";
+$a->strings["greenzero"] = "greenzero";
+$a->strings["purplezero"] = "purplezero";
+$a->strings["easterbunny"] = "easterbunny";
+$a->strings["darkzero"] = "darkzero";
+$a->strings["comix"] = "comix";
+$a->strings["slackr"] = "slackr";
+$a->strings["Variations"] = "Variations";
+$a->strings["Top Banner"] = "Top Banner";
+$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Resize image to the width of the screen and show background color below on long pages.";
+$a->strings["Full screen"] = "Full screen";
+$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Resize image to fill entire screen, clipping either the right or the bottom.";
+$a->strings["Single row mosaic"] = "Single row mosaic";
+$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Resize image to repeat it on a single row, either vertical or horizontal.";
+$a->strings["Mosaic"] = "Mosaic";
+$a->strings["Repeat image to fill the screen."] = "Repeat image to fill the screen.";
+$a->strings["Custom"] = "Custom";
+$a->strings["Note"] = "Note";
+$a->strings["Check image permissions if all users are allowed to see the image"] = "Check image permissions that everyone is allowed to see the image";
+$a->strings["Select color scheme"] = "Select color scheme";
+$a->strings["Navigation bar background color"] = "Navigation bar background color:";
+$a->strings["Navigation bar icon color "] = "Navigation bar icon color:";
+$a->strings["Link color"] = "Link color:";
+$a->strings["Set the background color"] = "Background color:";
+$a->strings["Content background opacity"] = "Content background opacity";
+$a->strings["Set the background image"] = "Background image:";
+$a->strings["Background image style"] = "Background image style";
+$a->strings["Login page background image"] = "Login page background image";
+$a->strings["Login page background color"] = "Login page background color";
+$a->strings["Leave background image and color empty for theme defaults"] = "Leave background image and color empty for theme defaults";
+$a->strings["Guest"] = "Guest";
+$a->strings["Visitor"] = "Visitor";
+$a->strings["Logout"] = "Logout";
+$a->strings["End this session"] = "End this session";
+$a->strings["Status"] = "Status";
+$a->strings["Your posts and conversations"] = "My posts and conversations";
+$a->strings["Your profile page"] = "My profile page";
+$a->strings["Your photos"] = "My photos";
+$a->strings["Videos"] = "Videos";
+$a->strings["Your videos"] = "My videos";
+$a->strings["Your events"] = "My events";
+$a->strings["Conversations from your friends"] = "My friends' conversations";
+$a->strings["Events and Calendar"] = "Events and calendar";
+$a->strings["Private mail"] = "Private messages";
+$a->strings["Account settings"] = "Account settings";
+$a->strings["Manage/edit friends and contacts"] = "Manage/Edit friends and contacts";
+$a->strings["Alignment"] = "Alignment";
+$a->strings["Left"] = "Left";
+$a->strings["Center"] = "Center";
+$a->strings["Color scheme"] = "Color scheme";
+$a->strings["Posts font size"] = "Posts font size";
+$a->strings["Textareas font size"] = "Text areas font size";
+$a->strings["Comma separated list of helper forums"] = "Comma-separated list of helper forums";
+$a->strings["don't show"] = "don't show";
+$a->strings["show"] = "show";
+$a->strings["Set style"] = "Set style";
+$a->strings["Community Pages"] = "Community pages";
+$a->strings["Community Profiles"] = "Community profiles";
+$a->strings["Help or @NewHere ?"] = "Help or @NewHere ?";
+$a->strings["Connect Services"] = "Connect services";
+$a->strings["Find Friends"] = "Find friends";
+$a->strings["Last users"] = "Last users";
+$a->strings["Find People"] = "Find people";
+$a->strings["Enter name or interest"] = "Enter name or interest";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Examples: Robert Morgenstein, fishing";
+$a->strings["Similar Interests"] = "Similar interests";
+$a->strings["Random Profile"] = "Random profile";
+$a->strings["Invite Friends"] = "Invite friends";
+$a->strings["Local Directory"] = "Local directory";
+$a->strings["Forums"] = "Forums";
+$a->strings["External link to forum"] = "External link to forum";
+$a->strings["Quick Start"] = "Quick start";
+$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Could not find any unarchived contact entry for this URL (%s)";
+$a->strings["The contact entries have been archived"] = "The contact entries have been archived";
+$a->strings["Enter new password: "] = "Enter new password: ";
+$a->strings["Post update version number has been set to %s."] = "";
+$a->strings["Check for pending update actions."] = "";
+$a->strings["Done."] = "";
+$a->strings["Execute pending post updates."] = "";
+$a->strings["All pending post updates are done."] = "";
+$a->strings["Post to Email"] = "Post to email";
+$a->strings["Hide your profile details from unknown viewers?"] = "Hide profile details from unknown viewers?";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Connectors are disabled since \"%s\" is enabled.";
+$a->strings["Visible to everybody"] = "Visible to everybody";
+$a->strings["Close"] = "Close";
+$a->strings["Welcome "] = "Welcome ";
+$a->strings["Please upload a profile photo."] = "Please upload a profile photo.";
+$a->strings["Welcome back "] = "Welcome back ";
+$a->strings["The database configuration file \"config/local.config.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "You may need to import the file \"database.sql\" manually using phpmyadmin or mysql.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Please see the file \"INSTALL.txt\".";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Could not find a command line version of PHP in the web server PATH.";
+$a->strings["If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"] = "If your server doesn't have a command line version of PHP installed, you won't be able to run background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>";
+$a->strings["PHP executable path"] = "PHP executable path";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Enter full path to php executable. You can leave this blank to continue the installation.";
+$a->strings["Command line PHP"] = "Command line PHP";
+$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "PHP executable is not a php cli binary; it could possibly be a cgi-fgci version.";
+$a->strings["Found PHP version: "] = "Found PHP version: ";
+$a->strings["PHP cli binary"] = "PHP cli binary";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "The command line version of PHP on your system does not have \"register_argc_argv\" enabled.";
+$a->strings["This is required for message delivery to work."] = "This is required for message delivery to work.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "If running under Windows OS, please see \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Generate encryption keys";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: Apache web server mod-rewrite module is required but not installed.";
+$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
+$a->strings["Error: PDO or MySQLi PHP module required but not installed."] = "Error: PDO or MySQLi PHP module required but not installed.";
+$a->strings["Error: The MySQL driver for PDO is not installed."] = "Error: MySQL driver for PDO is not installed.";
+$a->strings["PDO or MySQLi PHP module"] = "PDO or MySQLi PHP module";
+$a->strings["Error, XML PHP module required but not installed."] = "Error, XML PHP module required but not installed.";
+$a->strings["XML PHP module"] = "XML PHP module";
+$a->strings["libCurl PHP module"] = "libCurl PHP module";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Error: libCURL PHP module required but not installed.";
+$a->strings["GD graphics PHP module"] = "GD graphics PHP module";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: GD graphics PHP module with JPEG support required but not installed.";
+$a->strings["OpenSSL PHP module"] = "OpenSSL PHP module";
+$a->strings["Error: openssl PHP module required but not installed."] = "Error: openssl PHP module required but not installed.";
+$a->strings["mb_string PHP module"] = "mb_string PHP module";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Error: mb_string PHP module required but not installed.";
+$a->strings["iconv PHP module"] = "iconv PHP module";
+$a->strings["Error: iconv PHP module required but not installed."] = "Error: iconv PHP module required but not installed.";
+$a->strings["POSIX PHP module"] = "POSIX PHP module";
+$a->strings["Error: POSIX PHP module required but not installed."] = "Error: POSIX PHP module required but not installed.";
+$a->strings["JSON PHP module"] = "";
+$a->strings["Error: JSON PHP module required but not installed."] = "";
+$a->strings["The web installer needs to be able to create a file called \"local.config.php\" in the \"config\" folder of your web server and it is unable to do so."] = "";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "This is most often a permission setting issue, as the web server may not be able to write files in your directory - even if you can.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder."] = "";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternatively, you may skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions.";
+$a->strings["config/local.config.php is writable"] = "";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top-level directory.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Please ensure the user that your web server runs as (e.g. www-data) has write access to this directory.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains.";
+$a->strings["view/smarty3 is writable"] = "view/smarty3 is writable";
+$a->strings["Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess."] = "";
+$a->strings["Error message from Curl when fetching"] = "Error message from Curl while fetching";
+$a->strings["Url rewrite is working"] = "URL rewrite is working";
+$a->strings["ImageMagick PHP extension is not installed"] = "ImageMagick PHP extension is not installed";
+$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP extension is installed";
+$a->strings["ImageMagick supports GIF"] = "ImageMagick supports GIF";
+$a->strings["Could not connect to database."] = "Could not connect to database.";
+$a->strings["Database already in use."] = "Database already in use.";
+$a->strings["Tuesday"] = "Tuesday";
+$a->strings["Wednesday"] = "Wednesday";
+$a->strings["Thursday"] = "Thursday";
+$a->strings["Friday"] = "Friday";
+$a->strings["Saturday"] = "Saturday";
+$a->strings["January"] = "January";
+$a->strings["February"] = "February";
+$a->strings["March"] = "March";
+$a->strings["April"] = "April";
+$a->strings["May"] = "May";
+$a->strings["June"] = "June";
+$a->strings["July"] = "July";
+$a->strings["August"] = "August";
+$a->strings["September"] = "September";
+$a->strings["October"] = "October";
+$a->strings["November"] = "November";
+$a->strings["December"] = "December";
+$a->strings["Mon"] = "Mon";
+$a->strings["Tue"] = "Tue";
+$a->strings["Wed"] = "Wed";
+$a->strings["Thu"] = "Thu";
+$a->strings["Fri"] = "Fri";
+$a->strings["Sat"] = "Sat";
+$a->strings["Sun"] = "Sun";
+$a->strings["Jan"] = "Jan";
+$a->strings["Feb"] = "Feb";
+$a->strings["Mar"] = "Mar";
+$a->strings["Apr"] = "Apr";
+$a->strings["Jul"] = "Jul";
+$a->strings["Aug"] = "Aug";
+$a->strings["Sep"] = "Sep";
+$a->strings["Oct"] = "Oct";
+$a->strings["Nov"] = "Nov";
+$a->strings["Dec"] = "Dec";
+$a->strings["poke"] = "poke";
+$a->strings["poked"] = "poked";
+$a->strings["ping"] = "ping";
+$a->strings["pinged"] = "pinged";
+$a->strings["prod"] = "prod";
+$a->strings["prodded"] = "prodded";
+$a->strings["slap"] = "slap";
+$a->strings["slapped"] = "slapped";
+$a->strings["finger"] = "finger";
+$a->strings["fingered"] = "fingered";
+$a->strings["rebuff"] = "rebuff";
+$a->strings["rebuffed"] = "rebuffed";
+$a->strings["System"] = "System";
+$a->strings["Home"] = "Home";
+$a->strings["Introductions"] = "Introductions";
+$a->strings["%s commented on %s's post"] = "%s commented on %s's post";
+$a->strings["%s created a new post"] = "%s posted something new";
+$a->strings["%s liked %s's post"] = "%s liked %s's post";
+$a->strings["%s disliked %s's post"] = "%s disliked %s's post";
+$a->strings["%s is attending %s's event"] = "%s is going to %s's event";
+$a->strings["%s is not attending %s's event"] = "%s is not going to %s's event";
+$a->strings["%s may attend %s's event"] = "%s may go to %s's event";
+$a->strings["%s is now friends with %s"] = "%s is now friends with %s";
+$a->strings["Friend Suggestion"] = "Friend suggestion";
+$a->strings["Friend/Connect Request"] = "Friend/Contact request";
+$a->strings["New Follower"] = "New follower";
+$a->strings["Error 400 - Bad Request"] = "";
+$a->strings["Error 401 - Unauthorized"] = "";
+$a->strings["Error 403 - Forbidden"] = "";
+$a->strings["Error 404 - Not Found"] = "";
+$a->strings["Error 500 - Internal Server Error"] = "";
+$a->strings["Error 503 - Service Unavailable"] = "";
+$a->strings["The server cannot or will not process the request due to an apparent client error."] = "";
+$a->strings["Authentication is required and has failed or has not yet been provided."] = "";
+$a->strings["The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account."] = "";
+$a->strings["The requested resource could not be found but may be available in the future."] = "";
+$a->strings["An unexpected condition was encountered and no more specific message is suitable."] = "An unexpected condition was encountered and no more specific message is available.";
+$a->strings["The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later."] = "";
+$a->strings["Update %s failed. See error logs."] = "Update %s failed. See error logs.";
+$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid.";
+$a->strings["The error message is\n[pre]%s[/pre]"] = "The error message is\n[pre]%s[/pre]";
+$a->strings["\n\t\t\t\t\tThe friendica database was successfully updated from %s to %s."] = "";
+$a->strings["Error decoding account file"] = "Error decoding account file";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Error! No version data in file! Is this a Friendica account file?";
+$a->strings["User '%s' already exists on this server!"] = "User '%s' already exists on this server!";
+$a->strings["User creation error"] = "User creation error";
+$a->strings["User profile creation error"] = "User profile creation error";
+$a->strings["%d contact not imported"] = [
+	0 => "%d contact not imported",
+	1 => "%d contacts not imported",
+];
+$a->strings["Done. You can now login with your username and password"] = "Done. You can now login with your username and password";
+$a->strings["Birthday:"] = "Birthday:";
+$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD or MM-DD";
+$a->strings["never"] = "never";
+$a->strings["less than a second ago"] = "less than a second ago";
+$a->strings["year"] = "year";
+$a->strings["years"] = "years";
+$a->strings["months"] = "months";
+$a->strings["weeks"] = "weeks";
+$a->strings["days"] = "days";
+$a->strings["hour"] = "hour";
+$a->strings["hours"] = "hours";
+$a->strings["minute"] = "minute";
+$a->strings["minutes"] = "minutes";
+$a->strings["second"] = "second";
+$a->strings["seconds"] = "seconds";
+$a->strings["in %1\$d %2\$s"] = "";
+$a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s ago";
+$a->strings["view full size"] = "view full size";
+$a->strings["Image/photo"] = "Image/Photo";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
+$a->strings["$1 wrote:"] = "$1 wrote:";
+$a->strings["Encrypted content"] = "Encrypted content";
+$a->strings["Invalid source protocol"] = "Invalid source protocol";
+$a->strings["Invalid link protocol"] = "Invalid link protocol";
+$a->strings["Loading more entries..."] = "Loading more entries...";
+$a->strings["The end"] = "The end";
+$a->strings["Follow"] = "Follow";
+$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content";
+$a->strings["Full Text"] = "Full text";
+$a->strings["Tags"] = "Tags";
+$a->strings["Click to open/close"] = "Reveal/hide";
+$a->strings["Export"] = "Export";
+$a->strings["Export calendar as ical"] = "Export calendar as ical";
+$a->strings["Export calendar as csv"] = "Export calendar as csv";
+$a->strings["No contacts"] = "No contacts";
+$a->strings["%d Contact"] = [
+	0 => "%d contact",
+	1 => "%d contacts",
+];
+$a->strings["View Contacts"] = "View contacts";
 $a->strings["Frequently"] = "Frequently";
 $a->strings["Hourly"] = "Hourly";
 $a->strings["Twice daily"] = "Twice daily";
@@ -1594,6 +1843,8 @@ $a->strings["Ability for visitors to download the public calendar"] = "Ability f
 $a->strings["Post Composition Features"] = "Post composition";
 $a->strings["Auto-mention Forums"] = "Auto-mention forums";
 $a->strings["Add/remove mention when a forum page is selected/deselected in ACL window."] = "Add/Remove mention when a forum page is selected or deselected in the ACL window.";
+$a->strings["Explicit Mentions"] = "";
+$a->strings["Add explicit mentions to comment box for manual control over who gets mentioned in replies."] = "";
 $a->strings["Network Sidebar"] = "Network sidebar";
 $a->strings["Ability to select posts by date ranges"] = "Ability to select posts by date ranges";
 $a->strings["Protocol Filter"] = "";
@@ -1613,54 +1864,34 @@ $a->strings["Tag Cloud"] = "Tag cloud";
 $a->strings["Provide a personal tag cloud on your profile page"] = "Provide a personal tag cloud on your profile page";
 $a->strings["Display Membership Date"] = "Display membership date";
 $a->strings["Display membership date in profile"] = "Display membership date in profile";
-$a->strings["Forums"] = "Forums";
-$a->strings["External link to forum"] = "External link to forum";
 $a->strings["Nothing new here"] = "Nothing new here";
 $a->strings["Clear notifications"] = "Clear notifications";
-$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content";
-$a->strings["Logout"] = "Logout";
-$a->strings["End this session"] = "End this session";
-$a->strings["Status"] = "Status";
-$a->strings["Your posts and conversations"] = "My posts and conversations";
-$a->strings["Your profile page"] = "My profile page";
-$a->strings["Your photos"] = "My photos";
-$a->strings["Videos"] = "Videos";
-$a->strings["Your videos"] = "My videos";
-$a->strings["Your events"] = "My events";
 $a->strings["Personal notes"] = "Personal notes";
 $a->strings["Your personal notes"] = "My personal notes";
 $a->strings["Sign in"] = "Sign in";
-$a->strings["Home"] = "Home";
 $a->strings["Home Page"] = "Home page";
+$a->strings["Register"] = "Sign up now >>";
 $a->strings["Create an account"] = "Create account";
 $a->strings["Help and documentation"] = "Help and documentation";
 $a->strings["Apps"] = "Apps";
 $a->strings["Addon applications, utilities, games"] = "Addon applications, utilities, games";
 $a->strings["Search site content"] = "Search site content";
-$a->strings["Full Text"] = "Full text";
-$a->strings["Tags"] = "Tags";
 $a->strings["Community"] = "Community";
 $a->strings["Conversations on this and other servers"] = "Conversations on this and other servers";
-$a->strings["Events and Calendar"] = "Events and calendar";
 $a->strings["Directory"] = "Directory";
 $a->strings["People directory"] = "People directory";
 $a->strings["Information about this friendica instance"] = "Information about this Friendica instance";
 $a->strings["Terms of Service of this Friendica instance"] = "Terms of Service of this Friendica instance";
-$a->strings["Conversations from your friends"] = "My friends' conversations";
 $a->strings["Network Reset"] = "Network reset";
 $a->strings["Load Network page with no filters"] = "Load network page without filters";
-$a->strings["Introductions"] = "Introductions";
 $a->strings["Friend Requests"] = "Friend requests";
 $a->strings["See all notifications"] = "See all notifications";
 $a->strings["Mark all system notifications seen"] = "Mark notifications as seen";
-$a->strings["Private mail"] = "Private messages";
 $a->strings["Inbox"] = "Inbox";
 $a->strings["Outbox"] = "Outbox";
 $a->strings["Manage"] = "Manage";
 $a->strings["Manage other pages"] = "Manage other pages";
-$a->strings["Account settings"] = "Account settings";
 $a->strings["Manage/Edit Profiles"] = "Manage/Edit profiles";
-$a->strings["Manage/edit friends and contacts"] = "Manage/Edit friends and contacts";
 $a->strings["Site setup and configuration"] = "Site setup and configuration";
 $a->strings["Navigation"] = "Navigation";
 $a->strings["Site map"] = "Site map";
@@ -1668,30 +1899,8 @@ $a->strings["Embedding disabled"] = "Embedding disabled";
 $a->strings["Embedded content"] = "Embedded content";
 $a->strings["newer"] = "Later posts";
 $a->strings["older"] = "Earlier posts";
-$a->strings["first"] = "first";
 $a->strings["prev"] = "prev";
-$a->strings["next"] = "next";
 $a->strings["last"] = "last";
-$a->strings["view full size"] = "view full size";
-$a->strings["Image/photo"] = "Image/Photo";
-$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
-$a->strings["$1 wrote:"] = "$1 wrote:";
-$a->strings["Encrypted content"] = "Encrypted content";
-$a->strings["Invalid source protocol"] = "Invalid source protocol";
-$a->strings["Invalid link protocol"] = "Invalid link protocol";
-$a->strings["Loading more entries..."] = "Loading more entries...";
-$a->strings["The end"] = "The end";
-$a->strings["No contacts"] = "No contacts";
-$a->strings["%d Contact"] = [
-	0 => "%d contact",
-	1 => "%d contacts",
-];
-$a->strings["View Contacts"] = "View contacts";
-$a->strings["Follow"] = "Follow";
-$a->strings["Click to open/close"] = "Reveal/hide";
-$a->strings["Export"] = "Export";
-$a->strings["Export calendar as ical"] = "Export calendar as ical";
-$a->strings["Export calendar as csv"] = "Export calendar as csv";
 $a->strings["Add New Contact"] = "Add new contact";
 $a->strings["Enter address or web location"] = "Enter address or web location";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Example: jo@example.com, http://example.com/jo";
@@ -1699,13 +1908,6 @@ $a->strings["%d invitation available"] = [
 	0 => "%d invitation available",
 	1 => "%d invitations available",
 ];
-$a->strings["Find People"] = "Find people";
-$a->strings["Enter name or interest"] = "Enter name or interest";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Examples: Robert Morgenstein, fishing";
-$a->strings["Similar Interests"] = "Similar interests";
-$a->strings["Random Profile"] = "Random profile";
-$a->strings["Invite Friends"] = "Invite friends";
-$a->strings["Local Directory"] = "Local directory";
 $a->strings["Protocols"] = "";
 $a->strings["All Protocols"] = "";
 $a->strings["Saved Folders"] = "Saved Folders";
@@ -1715,157 +1917,11 @@ $a->strings["%d contact in common"] = [
 	0 => "%d contact in common",
 	1 => "%d contacts in common",
 ];
-$a->strings["Post to Email"] = "Post to email";
-$a->strings["Hide your profile details from unknown viewers?"] = "Hide profile details from unknown viewers?";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Connectors are disabled since \"%s\" is enabled.";
-$a->strings["Visible to everybody"] = "Visible to everybody";
-$a->strings["show"] = "show";
-$a->strings["don't show"] = "don't show";
-$a->strings["Close"] = "Close";
-$a->strings["Welcome "] = "Welcome ";
-$a->strings["Please upload a profile photo."] = "Please upload a profile photo.";
-$a->strings["Welcome back "] = "Welcome back ";
-$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Could not find any unarchived contact entry for this URL (%s)";
-$a->strings["The contact entries have been archived"] = "The contact entries have been archived";
-$a->strings["Enter new password: "] = "Enter new password: ";
-$a->strings["Password can't be empty"] = "Password can't be empty";
-$a->strings["Post update version number has been set to %s."] = "";
-$a->strings["Check for pending update actions."] = "";
-$a->strings["Done."] = "";
-$a->strings["Execute pending post updates."] = "";
-$a->strings["All pending post updates are done."] = "";
-$a->strings["The database configuration file \"config/local.config.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "You may need to import the file \"database.sql\" manually using phpmyadmin or mysql.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Please see the file \"INSTALL.txt\".";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Could not find a command line version of PHP in the web server PATH.";
-$a->strings["If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"] = "If your server doesn't have a command line version of PHP installed, you won't be able to run background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>";
-$a->strings["PHP executable path"] = "PHP executable path";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Enter full path to php executable. You can leave this blank to continue the installation.";
-$a->strings["Command line PHP"] = "Command line PHP";
-$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "PHP executable is not a php cli binary; it could possibly be a cgi-fgci version.";
-$a->strings["Found PHP version: "] = "Found PHP version: ";
-$a->strings["PHP cli binary"] = "PHP cli binary";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "The command line version of PHP on your system does not have \"register_argc_argv\" enabled.";
-$a->strings["This is required for message delivery to work."] = "This is required for message delivery to work.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "If running under Windows OS, please see \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Generate encryption keys"] = "Generate encryption keys";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: Apache web server mod-rewrite module is required but not installed.";
-$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
-$a->strings["Error: PDO or MySQLi PHP module required but not installed."] = "Error: PDO or MySQLi PHP module required but not installed.";
-$a->strings["Error: The MySQL driver for PDO is not installed."] = "Error: MySQL driver for PDO is not installed.";
-$a->strings["PDO or MySQLi PHP module"] = "PDO or MySQLi PHP module";
-$a->strings["Error, XML PHP module required but not installed."] = "Error, XML PHP module required but not installed.";
-$a->strings["XML PHP module"] = "XML PHP module";
-$a->strings["libCurl PHP module"] = "libCurl PHP module";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Error: libCURL PHP module required but not installed.";
-$a->strings["GD graphics PHP module"] = "GD graphics PHP module";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: GD graphics PHP module with JPEG support required but not installed.";
-$a->strings["OpenSSL PHP module"] = "OpenSSL PHP module";
-$a->strings["Error: openssl PHP module required but not installed."] = "Error: openssl PHP module required but not installed.";
-$a->strings["mb_string PHP module"] = "mb_string PHP module";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Error: mb_string PHP module required but not installed.";
-$a->strings["iconv PHP module"] = "iconv PHP module";
-$a->strings["Error: iconv PHP module required but not installed."] = "Error: iconv PHP module required but not installed.";
-$a->strings["POSIX PHP module"] = "POSIX PHP module";
-$a->strings["Error: POSIX PHP module required but not installed."] = "Error: POSIX PHP module required but not installed.";
-$a->strings["The web installer needs to be able to create a file called \"local.config.php\" in the \"config\" folder of your web server and it is unable to do so."] = "";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "This is most often a permission setting issue, as the web server may not be able to write files in your directory - even if you can.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder."] = "";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternatively, you may skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions.";
-$a->strings["config/local.config.php is writable"] = "";
-$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top-level directory.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Please ensure the user that your web server runs as (e.g. www-data) has write access to this directory.";
-$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains.";
-$a->strings["view/smarty3 is writable"] = "view/smarty3 is writable";
-$a->strings["Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess."] = "";
-$a->strings["Error message from Curl when fetching"] = "Error message from Curl while fetching";
-$a->strings["Url rewrite is working"] = "URL rewrite is working";
-$a->strings["ImageMagick PHP extension is not installed"] = "ImageMagick PHP extension is not installed";
-$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP extension is installed";
-$a->strings["ImageMagick supports GIF"] = "ImageMagick supports GIF";
-$a->strings["Could not connect to database."] = "Could not connect to database.";
-$a->strings["Database already in use."] = "Database already in use.";
-$a->strings["Tuesday"] = "Tuesday";
-$a->strings["Wednesday"] = "Wednesday";
-$a->strings["Thursday"] = "Thursday";
-$a->strings["Friday"] = "Friday";
-$a->strings["Saturday"] = "Saturday";
-$a->strings["January"] = "January";
-$a->strings["February"] = "February";
-$a->strings["March"] = "March";
-$a->strings["April"] = "April";
-$a->strings["May"] = "May";
-$a->strings["June"] = "June";
-$a->strings["July"] = "July";
-$a->strings["August"] = "August";
-$a->strings["September"] = "September";
-$a->strings["October"] = "October";
-$a->strings["November"] = "November";
-$a->strings["December"] = "December";
-$a->strings["Mon"] = "Mon";
-$a->strings["Tue"] = "Tue";
-$a->strings["Wed"] = "Wed";
-$a->strings["Thu"] = "Thu";
-$a->strings["Fri"] = "Fri";
-$a->strings["Sat"] = "Sat";
-$a->strings["Sun"] = "Sun";
-$a->strings["Jan"] = "Jan";
-$a->strings["Feb"] = "Feb";
-$a->strings["Mar"] = "Mar";
-$a->strings["Apr"] = "Apr";
-$a->strings["Jul"] = "Jul";
-$a->strings["Aug"] = "Aug";
-$a->strings["Sep"] = "Sep";
-$a->strings["Oct"] = "Oct";
-$a->strings["Nov"] = "Nov";
-$a->strings["Dec"] = "Dec";
-$a->strings["poke"] = "poke";
-$a->strings["poked"] = "poked";
-$a->strings["ping"] = "ping";
-$a->strings["pinged"] = "pinged";
-$a->strings["prod"] = "prod";
-$a->strings["prodded"] = "prodded";
-$a->strings["slap"] = "slap";
-$a->strings["slapped"] = "slapped";
-$a->strings["finger"] = "finger";
-$a->strings["fingered"] = "fingered";
-$a->strings["rebuff"] = "rebuff";
-$a->strings["rebuffed"] = "rebuffed";
-$a->strings["System"] = "System";
-$a->strings["%s commented on %s's post"] = "%s commented on %s's post";
-$a->strings["%s created a new post"] = "%s posted something new";
-$a->strings["%s liked %s's post"] = "%s liked %s's post";
-$a->strings["%s disliked %s's post"] = "%s disliked %s's post";
-$a->strings["%s is attending %s's event"] = "%s is going to %s's event";
-$a->strings["%s is not attending %s's event"] = "%s is not going to %s's event";
-$a->strings["%s may attend %s's event"] = "%s may go to %s's event";
-$a->strings["%s is now friends with %s"] = "%s is now friends with %s";
-$a->strings["Friend Suggestion"] = "Friend suggestion";
-$a->strings["Friend/Connect Request"] = "Friend/Contact request";
-$a->strings["New Follower"] = "New follower";
-$a->strings["Update %s failed. See error logs."] = "Update %s failed. See error logs.";
-$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid.";
-$a->strings["The error message is\n[pre]%s[/pre]"] = "The error message is\n[pre]%s[/pre]";
-$a->strings["\n\t\t\t\t\tThe friendica database was successfully updated from %s to %s."] = "";
-$a->strings["Error decoding account file"] = "Error decoding account file";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Error! No version data in file! Is this a Friendica account file?";
-$a->strings["User '%s' already exists on this server!"] = "User '%s' already exists on this server!";
-$a->strings["User creation error"] = "User creation error";
-$a->strings["User profile creation error"] = "User profile creation error";
-$a->strings["%d contact not imported"] = [
-	0 => "%d contact not imported",
-	1 => "%d contacts not imported",
-];
-$a->strings["Done. You can now login with your username and password"] = "Done. You can now login with your username and password";
 $a->strings["There are no tables on MyISAM."] = "There are no tables on MyISAM.";
 $a->strings["\nError %d occurred during database update:\n%s\n"] = "\nError %d occurred during database update:\n%s\n";
 $a->strings["Errors encountered performing database changes: "] = "Errors encountered performing database changes: ";
 $a->strings["%s: Database update"] = "%s: Database update";
 $a->strings["%s: updating %s table."] = "%s: updating %s table.";
-$a->strings["Legacy module file not found: %s"] = "";
 $a->strings["Drop Contact"] = "Drop contact";
 $a->strings["Organisation"] = "Organization";
 $a->strings["News"] = "News";
@@ -1919,6 +1975,7 @@ $a->strings["View on separate page"] = "View on separate page";
 $a->strings["view on separate page"] = "view on separate page";
 $a->strings["[no subject]"] = "[no subject]";
 $a->strings["Requested account is not available."] = "Requested account is unavailable.";
+$a->strings["Requested profile is not available."] = "Requested profile is unavailable.";
 $a->strings["Edit profile"] = "Edit profile";
 $a->strings["Atom feed"] = "Atom feed";
 $a->strings["Manage/edit profiles"] = "Manage/Edit profiles";
@@ -1934,7 +1991,6 @@ $a->strings["Upcoming events the next 7 days:"] = "";
 $a->strings["Member since:"] = "Member since:";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
-$a->strings["Birthday:"] = "Birthday:";
 $a->strings["Age:"] = "Age:";
 $a->strings["for %1\$d %2\$s"] = "for %1\$d %2\$s";
 $a->strings["Religion:"] = "Religion:";
@@ -1952,8 +2008,20 @@ $a->strings["Profile Details"] = "Profile Details";
 $a->strings["Only You Can See This"] = "Only you can see this.";
 $a->strings["Tips for New Members"] = "Tips for New Members";
 $a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "";
+$a->strings["Database storage failed to update %s"] = "";
+$a->strings["Database storage failed to insert data"] = "";
+$a->strings["Filesystem storage failed to create \"%s\". Check you write permissions."] = "";
+$a->strings["Filesystem storage failed to save data to \"%s\". Check your write permissions"] = "";
+$a->strings["Storage base path"] = "";
+$a->strings["Folder where uploaded files are saved. For maximum security, This should be a path outside web server folder tree"] = "";
+$a->strings["Enter a valid existing folder"] = "";
 $a->strings["Login failed"] = "Login failed";
 $a->strings["Not enough information to authenticate"] = "Not enough information to authenticate";
+$a->strings["Password can't be empty"] = "Password can't be empty";
+$a->strings["Empty passwords are not allowed."] = "";
+$a->strings["The new password has been exposed in a public data dump, please choose another."] = "The new password has been exposed in a public data dump; please choose another.";
+$a->strings["The password can't contain accentuated letters, white spaces or colons (:)"] = "";
+$a->strings["Passwords do not match. Password unchanged."] = "Passwords do not match. Password unchanged.";
 $a->strings["An invitation is required."] = "An invitation is required.";
 $a->strings["Invitation could not be verified."] = "Invitation could not be verified.";
 $a->strings["Invalid OpenID url"] = "Invalid OpenID URL";
@@ -1978,7 +2046,6 @@ $a->strings["Your nickname can only contain a-z, 0-9 and _."] = "Your nickname c
 $a->strings["Nickname is already registered. Please choose another."] = "Nickname is already registered. Please choose another.";
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "SERIOUS ERROR: Generation of security keys failed.";
 $a->strings["An error occurred during registration. Please try again."] = "An error occurred during registration. Please try again.";
-$a->strings["default"] = "default";
 $a->strings["An error occurred creating your default profile. Please try again."] = "An error occurred creating your default profile. Please try again.";
 $a->strings["An error occurred creating your self contact. Please try again."] = "An error occurred creating your self contact. Please try again.";
 $a->strings["An error occurred creating your default contact group. Please try again."] = "An error occurred while creating your default contact group. Please try again.";
@@ -1986,6 +2053,17 @@ $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Yo
 $a->strings["Registration at %s"] = "Registration at %s";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t";
 $a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s.";
+$a->strings["Sharing notification from Diaspora network"] = "Sharing notification from Diaspora network";
+$a->strings["Attachments:"] = "Attachments:";
+$a->strings["%s's timeline"] = "%s's timeline";
+$a->strings["%s's posts"] = "%s's posts";
+$a->strings["%s's comments"] = "%s's comments";
+$a->strings["%s is now following %s."] = "%s is now following %s.";
+$a->strings["following"] = "following";
+$a->strings["%s stopped following %s."] = "%s stopped following %s.";
+$a->strings["stopped following"] = "stopped following";
+$a->strings["(no subject)"] = "(no subject)";
+$a->strings["Item was not found."] = "Item was not found.";
 $a->strings["%d contact edited."] = [
 	0 => "%d contact edited.",
 	1 => "%d contacts edited.",
@@ -2108,6 +2186,26 @@ $a->strings["Website Privacy Policy"] = "Website Privacy Policy";
 $a->strings["privacy policy"] = "Privacy policy";
 $a->strings["Logged out."] = "Logged out.";
 $a->strings["Bad Request."] = "";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking \"Register\"."] = "";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.";
+$a->strings["Your OpenID (optional): "] = "Your OpenID (optional): ";
+$a->strings["Include your profile in member directory?"] = "Include your profile in member directory?";
+$a->strings["Note for the admin"] = "Note for the admin";
+$a->strings["Leave a message for the admin, why you want to join this node"] = "Leave a message for the admin. Why do you want to join this node?";
+$a->strings["Membership on this site is by invitation only."] = "Membership on this site is by invitation only.";
+$a->strings["Your invitation code: "] = "Your invitation code: ";
+$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Your full name: ";
+$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Your Email Address: (Initial information will be sent there, so this must be an existing address.)";
+$a->strings["Leave empty for an auto generated password."] = "Leave empty for an auto generated password.";
+$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \"<strong>nickname@%s</strong>\"."] = "";
+$a->strings["Choose a nickname: "] = "Choose a nickname: ";
+$a->strings["Import your profile to this friendica instance"] = "Import an existing Friendica profile to this node.";
+$a->strings["Note: This node explicitly contains adult content"] = "";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Registration successful. Please check your email for further instructions.";
+$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Failed to send email message. Here are your account details:<br> login: %s<br> password: %s<br><br>You can change your password after login.";
+$a->strings["Registration successful."] = "Registration successful.";
+$a->strings["Your registration can not be processed."] = "Your registration cannot be processed.";
+$a->strings["Your registration is pending approval by the site owner."] = "Your registration is pending approval by the site administrator.";
 $a->strings["At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication."] = "At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), a username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but won’t be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.";
 $a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "This information is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional personal information that may be transmitted to the communication partner's accounts.";
 $a->strings["At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners."] = "At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.";
@@ -2136,78 +2234,20 @@ $a->strings["to"] = "to";
 $a->strings["via"] = "via";
 $a->strings["Wall-to-Wall"] = "Wall-to-wall";
 $a->strings["via Wall-To-Wall:"] = "via wall-to-wall:";
+$a->strings["Notifier task is pending"] = "";
+$a->strings["Delivery to remote servers is pending"] = "";
+$a->strings["Delivery to remote servers is underway"] = "";
+$a->strings["Delivery to remote servers is mostly done"] = "";
+$a->strings["Delivery to remote servers is done"] = "";
 $a->strings["%d comment"] = [
 	0 => "%d comment",
 	1 => "%d comments -",
 ];
-$a->strings["Sharing notification from Diaspora network"] = "Sharing notification from Diaspora network";
-$a->strings["Attachments:"] = "Attachments:";
-$a->strings["%s is now following %s."] = "%s is now following %s.";
-$a->strings["following"] = "following";
-$a->strings["%s stopped following %s."] = "%s stopped following %s.";
-$a->strings["stopped following"] = "stopped following";
-$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD or MM-DD";
-$a->strings["never"] = "never";
-$a->strings["less than a second ago"] = "less than a second ago";
-$a->strings["year"] = "year";
-$a->strings["years"] = "years";
-$a->strings["months"] = "months";
-$a->strings["weeks"] = "weeks";
-$a->strings["days"] = "days";
-$a->strings["hour"] = "hour";
-$a->strings["hours"] = "hours";
-$a->strings["minute"] = "minute";
-$a->strings["minutes"] = "minutes";
-$a->strings["second"] = "second";
-$a->strings["seconds"] = "seconds";
-$a->strings["in %1\$d %2\$s"] = "";
-$a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s ago";
-$a->strings["(no subject)"] = "(no subject)";
+$a->strings["Delete this item?"] = "Delete this item?";
+$a->strings["show fewer"] = "show fewer";
+$a->strings["toggle mobile"] = "Toggle mobile";
+$a->strings["No system theme config value set."] = "No system theme configuration value set.";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "The form security token was incorrect. This probably happened because the form has not been submitted within 3 hours.";
+$a->strings["Legacy module file not found: %s"] = "";
 $a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Updating author-id and owner-id in item and thread table. ";
 $a->strings["%s: Updating post-type."] = "";
-$a->strings["greenzero"] = "greenzero";
-$a->strings["purplezero"] = "purplezero";
-$a->strings["easterbunny"] = "easterbunny";
-$a->strings["darkzero"] = "darkzero";
-$a->strings["comix"] = "comix";
-$a->strings["slackr"] = "slackr";
-$a->strings["Variations"] = "Variations";
-$a->strings["Custom"] = "Custom";
-$a->strings["Note"] = "Note";
-$a->strings["Check image permissions if all users are allowed to see the image"] = "Check image permissions that everyone is allowed to see the image";
-$a->strings["Select color scheme"] = "Select color scheme";
-$a->strings["Navigation bar background color"] = "Navigation bar background color:";
-$a->strings["Navigation bar icon color "] = "Navigation bar icon color:";
-$a->strings["Link color"] = "Link color:";
-$a->strings["Set the background color"] = "Background color:";
-$a->strings["Content background opacity"] = "Content background opacity";
-$a->strings["Set the background image"] = "Background image:";
-$a->strings["Background image style"] = "Background image style";
-$a->strings["Login page background image"] = "Login page background image";
-$a->strings["Login page background color"] = "Login page background color";
-$a->strings["Leave background image and color empty for theme defaults"] = "Leave background image and color empty for theme defaults";
-$a->strings["Top Banner"] = "Top Banner";
-$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Resize image to the width of the screen and show background color below on long pages.";
-$a->strings["Full screen"] = "Full screen";
-$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Resize image to fill entire screen, clipping either the right or the bottom.";
-$a->strings["Single row mosaic"] = "Single row mosaic";
-$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Resize image to repeat it on a single row, either vertical or horizontal.";
-$a->strings["Mosaic"] = "Mosaic";
-$a->strings["Repeat image to fill the screen."] = "Repeat image to fill the screen.";
-$a->strings["Guest"] = "Guest";
-$a->strings["Visitor"] = "Visitor";
-$a->strings["Alignment"] = "Alignment";
-$a->strings["Left"] = "Left";
-$a->strings["Center"] = "Center";
-$a->strings["Color scheme"] = "Color scheme";
-$a->strings["Posts font size"] = "Posts font size";
-$a->strings["Textareas font size"] = "Text areas font size";
-$a->strings["Comma separated list of helper forums"] = "Comma-separated list of helper forums";
-$a->strings["Set style"] = "Set style";
-$a->strings["Community Pages"] = "Community pages";
-$a->strings["Community Profiles"] = "Community profiles";
-$a->strings["Help or @NewHere ?"] = "Help or @NewHere ?";
-$a->strings["Connect Services"] = "Connect services";
-$a->strings["Find Friends"] = "Find friends";
-$a->strings["Last users"] = "Last users";
-$a->strings["Quick Start"] = "Quick start";

From edffb7e24b11e3af7b50e2769aae9815d4f92063 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 16 Feb 2019 09:43:27 +0100
Subject: [PATCH 012/145] update FR translations THX hypolite

---
 view/lang/fr/messages.po | 9870 +++++++++++++++++++-------------------
 view/lang/fr/strings.php |  860 ++--
 2 files changed, 5483 insertions(+), 5247 deletions(-)

diff --git a/view/lang/fr/messages.po b/view/lang/fr/messages.po
index bd273cafe..f433d12a2 100644
--- a/view/lang/fr/messages.po
+++ b/view/lang/fr/messages.po
@@ -8,6 +8,7 @@
 # Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015-2016
 # Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015
 # Domovoy <domovoy@errlock.org>, 2012
+# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 # Jak <inactive+Jak@transifex.com>, 2014
 # Lionel Triay <zapimax38@free.fr>, 2013
@@ -22,14 +23,14 @@
 # tomamplius <thomas@lgy.fr>, 2014
 # Tubuntu <tubuntu@testimonium.be>, 2013-2015
 # Vincent Vindarel <vindarel@mailz.org>, 2018
-# vladimir N <lapoubelle111@gmail.com>, 2018
+# Vladimir Núñez <lapoubelle111@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-27 02:39-0500\n"
-"PO-Revision-Date: 2018-12-30 14:24+0000\n"
-"Last-Translator: vladimir N <lapoubelle111@gmail.com>\n"
+"POT-Creation-Date: 2019-02-10 08:14+0100\n"
+"PO-Revision-Date: 2019-02-15 20:23+0000\n"
+"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,722 +38,742 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: include/api.php:1142
+#: include/api.php:1179
 #, php-format
 msgid "Daily posting limit of %d post reached. The post was rejected."
 msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
 msgstr[0] "Limite quotidienne de publications de%d atteinte. La publication a été rejetée."
 msgstr[1] "Limite quotidienne de %dpublications atteinte.  La publication a été rejetée."
 
-#: include/api.php:1156
+#: include/api.php:1193
 #, php-format
 msgid "Weekly posting limit of %d post reached. The post was rejected."
 msgid_plural ""
 "Weekly posting limit of %d posts reached. The post was rejected."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Limite hebdomadaire d'%d unique publication atteinte, votre soumission a été rejetée."
+msgstr[1] "Limite hebdomadaire de %d publications atteinte, votre soumission a été rejetée."
 
-#: include/api.php:1170
+#: include/api.php:1207
 #, php-format
 msgid "Monthly posting limit of %d post reached. The post was rejected."
 msgstr "La limite mensuelle de%d publication est atteinte. Votre publication a été rejetée."
 
-#: include/api.php:4335 mod/photos.php:96 mod/photos.php:204
-#: mod/photos.php:737 mod/photos.php:1170 mod/photos.php:1187
-#: mod/photos.php:1680 mod/profile_photo.php:88 mod/profile_photo.php:97
-#: mod/profile_photo.php:106 mod/profile_photo.php:215
-#: mod/profile_photo.php:304 mod/profile_photo.php:314 src/Model/User.php:652
-#: src/Model/User.php:660 src/Model/User.php:668
+#: include/api.php:4578 mod/photos.php:93 mod/photos.php:201
+#: mod/photos.php:695 mod/photos.php:1126 mod/photos.php:1143
+#: mod/photos.php:1636 mod/profile_photo.php:85 mod/profile_photo.php:94
+#: mod/profile_photo.php:103 mod/profile_photo.php:217
+#: mod/profile_photo.php:305 mod/profile_photo.php:315 src/Model/User.php:735
+#: src/Model/User.php:743 src/Model/User.php:751
 msgid "Profile Photos"
 msgstr "Photos du profil"
 
-#: include/conversation.php:156 include/conversation.php:292
-#: src/Model/Item.php:3263
+#: include/conversation.php:160 include/conversation.php:297
+#: src/Model/Item.php:3265
 msgid "event"
 msgstr "événement"
 
-#: include/conversation.php:159 include/conversation.php:169
-#: include/conversation.php:295 include/conversation.php:304
-#: mod/subthread.php:90 mod/tagger.php:72
+#: include/conversation.php:163 include/conversation.php:173
+#: include/conversation.php:300 include/conversation.php:309
+#: mod/subthread.php:88 mod/tagger.php:70
 msgid "status"
 msgstr "le statut"
 
-#: include/conversation.php:164 include/conversation.php:300
-#: mod/subthread.php:90 mod/tagger.php:72 src/Model/Item.php:3265
+#: include/conversation.php:168 include/conversation.php:305
+#: mod/subthread.php:88 mod/tagger.php:70 src/Model/Item.php:3267
 msgid "photo"
 msgstr "photo"
 
-#: include/conversation.php:176
+#: include/conversation.php:181
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s aime %3$s de %2$s"
 
-#: include/conversation.php:178
+#: include/conversation.php:183
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s n'aime pas %3$s de %2$s"
 
-#: include/conversation.php:180
+#: include/conversation.php:185
 #, php-format
 msgid "%1$s attends %2$s's %3$s"
 msgstr "%1$s participe à %3$s de %2$s"
 
-#: include/conversation.php:182
+#: include/conversation.php:187
 #, php-format
 msgid "%1$s doesn't attend %2$s's %3$s"
 msgstr "%1$s ne participe pas à %3$s de %2$s"
 
-#: include/conversation.php:184
+#: include/conversation.php:189
 #, php-format
 msgid "%1$s attends maybe %2$s's %3$s"
 msgstr "%1$s participe peut-être à %3$s de %2$s"
 
-#: include/conversation.php:219
+#: include/conversation.php:224
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s est désormais lié à %2$s"
 
-#: include/conversation.php:260
+#: include/conversation.php:265
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr "%1$s a sollicité %2$s"
 
-#: include/conversation.php:314 mod/tagger.php:110
+#: include/conversation.php:319 mod/tagger.php:108
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s a étiqueté %3$s de %2$s avec %4$s"
 
-#: include/conversation.php:336
+#: include/conversation.php:341
 msgid "post/item"
 msgstr "publication/élément"
 
-#: include/conversation.php:337
+#: include/conversation.php:342
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s a marqué le %3$s de %2$s comme favori"
 
-#: include/conversation.php:551 mod/photos.php:1511 mod/profiles.php:356
+#: include/conversation.php:568 mod/photos.php:1467 mod/profiles.php:352
 msgid "Likes"
 msgstr "Derniers \"J'aime\""
 
-#: include/conversation.php:551 mod/photos.php:1511 mod/profiles.php:360
+#: include/conversation.php:568 mod/photos.php:1467 mod/profiles.php:355
 msgid "Dislikes"
 msgstr "Derniers \"Je n'aime pas\""
 
-#: include/conversation.php:552 include/conversation.php:1483
-#: mod/photos.php:1512
+#: include/conversation.php:569 include/conversation.php:1506
+#: mod/photos.php:1468
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Participe"
 msgstr[1] "Participent"
 
-#: include/conversation.php:552 mod/photos.php:1512
+#: include/conversation.php:569 mod/photos.php:1468
 msgid "Not attending"
 msgstr "Ne participe pas"
 
-#: include/conversation.php:552 mod/photos.php:1512
+#: include/conversation.php:569 mod/photos.php:1468
 msgid "Might attend"
 msgstr "Participera peut-être"
 
-#: include/conversation.php:632 mod/photos.php:1568 src/Object/Post.php:206
+#: include/conversation.php:649 mod/photos.php:1524 src/Object/Post.php:207
 msgid "Select"
 msgstr "Sélectionner"
 
-#: include/conversation.php:633 mod/admin.php:1971 mod/photos.php:1569
-#: mod/settings.php:741 src/Module/Contact.php:832 src/Module/Contact.php:1107
+#: include/conversation.php:650 mod/admin.php:2072 mod/photos.php:1525
+#: mod/settings.php:726 src/Module/Contact.php:827 src/Module/Contact.php:1102
 msgid "Delete"
 msgstr "Supprimer"
 
-#: include/conversation.php:667 src/Object/Post.php:379
-#: src/Object/Post.php:380
+#: include/conversation.php:684 src/Object/Post.php:380
+#: src/Object/Post.php:381
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Voir le profil de %s @ %s"
 
-#: include/conversation.php:679 src/Object/Post.php:367
+#: include/conversation.php:696 src/Object/Post.php:368
 msgid "Categories:"
 msgstr "Catégories :"
 
-#: include/conversation.php:680 src/Object/Post.php:368
+#: include/conversation.php:697 src/Object/Post.php:369
 msgid "Filed under:"
 msgstr "Rangé sous :"
 
-#: include/conversation.php:687 src/Object/Post.php:393
+#: include/conversation.php:704 src/Object/Post.php:394
 #, php-format
 msgid "%s from %s"
 msgstr "%s de %s"
 
-#: include/conversation.php:702
+#: include/conversation.php:719
 msgid "View in context"
 msgstr "Voir dans le contexte"
 
-#: include/conversation.php:704 include/conversation.php:1151
-#: mod/editpost.php:109 mod/message.php:264 mod/message.php:427
-#: mod/photos.php:1484 mod/wallmessage.php:141 src/Object/Post.php:418
+#: include/conversation.php:721 include/conversation.php:1172
+#: mod/editpost.php:88 mod/message.php:260 mod/message.php:442
+#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:420
 msgid "Please wait"
 msgstr "Patientez"
 
-#: include/conversation.php:768
+#: include/conversation.php:785
 msgid "remove"
 msgstr "enlever"
 
-#: include/conversation.php:772
+#: include/conversation.php:789
 msgid "Delete Selected Items"
 msgstr "Supprimer les éléments sélectionnés"
 
-#: include/conversation.php:872 view/theme/frio/theme.php:369
+#: include/conversation.php:893 view/theme/frio/theme.php:358
 msgid "Follow Thread"
 msgstr "Suivre le fil"
 
-#: include/conversation.php:873 src/Model/Contact.php:950
+#: include/conversation.php:894 src/Model/Contact.php:1032
 msgid "View Status"
 msgstr "Voir les statuts"
 
-#: include/conversation.php:874 include/conversation.php:890
-#: mod/allfriends.php:76 mod/directory.php:167 mod/dirfind.php:228
-#: mod/match.php:91 mod/suggest.php:86 src/Model/Contact.php:890
-#: src/Model/Contact.php:943 src/Model/Contact.php:951
+#: include/conversation.php:895 include/conversation.php:911
+#: mod/allfriends.php:72 mod/directory.php:167 mod/dirfind.php:226
+#: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:972
+#: src/Model/Contact.php:1025 src/Model/Contact.php:1033
 msgid "View Profile"
 msgstr "Voir le profil"
 
-#: include/conversation.php:875 src/Model/Contact.php:952
+#: include/conversation.php:896 src/Model/Contact.php:1034
 msgid "View Photos"
 msgstr "Voir les photos"
 
-#: include/conversation.php:876 src/Model/Contact.php:944
-#: src/Model/Contact.php:953
+#: include/conversation.php:897 src/Model/Contact.php:1026
+#: src/Model/Contact.php:1035
 msgid "Network Posts"
 msgstr "Publications du réseau"
 
-#: include/conversation.php:877 src/Model/Contact.php:945
-#: src/Model/Contact.php:954
+#: include/conversation.php:898 src/Model/Contact.php:1027
+#: src/Model/Contact.php:1036
 msgid "View Contact"
 msgstr "Voir Contact"
 
-#: include/conversation.php:878 src/Model/Contact.php:956
+#: include/conversation.php:899 src/Model/Contact.php:1038
 msgid "Send PM"
 msgstr "Message privé"
 
-#: include/conversation.php:882 src/Model/Contact.php:957
+#: include/conversation.php:903 src/Model/Contact.php:1039
 msgid "Poke"
 msgstr "Sollicitations (pokes)"
 
-#: include/conversation.php:887 mod/allfriends.php:77 mod/dirfind.php:229
-#: mod/follow.php:147 mod/match.php:92 mod/suggest.php:87
-#: src/Content/Widget.php:65 src/Model/Contact.php:946
-#: src/Module/Contact.php:580 view/theme/vier/theme.php:201
+#: include/conversation.php:908 mod/allfriends.php:73 mod/dirfind.php:227
+#: mod/follow.php:147 mod/match.php:88 mod/suggest.php:88
+#: view/theme/vier/theme.php:201 src/Content/Widget.php:63
+#: src/Model/Contact.php:1028 src/Module/Contact.php:574
 msgid "Connect/Follow"
 msgstr "Se connecter/Suivre"
 
-#: include/conversation.php:1005
+#: include/conversation.php:1030
 #, php-format
 msgid "%s likes this."
 msgstr "%s aime ça."
 
-#: include/conversation.php:1008
+#: include/conversation.php:1033
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s n'aime pas ça."
 
-#: include/conversation.php:1011
+#: include/conversation.php:1036
 #, php-format
 msgid "%s attends."
 msgstr "%s participe"
 
-#: include/conversation.php:1014
+#: include/conversation.php:1039
 #, php-format
 msgid "%s doesn't attend."
 msgstr "%s ne participe pas"
 
-#: include/conversation.php:1017
+#: include/conversation.php:1042
 #, php-format
 msgid "%s attends maybe."
 msgstr "%s participe peut-être"
 
-#: include/conversation.php:1028
+#: include/conversation.php:1050
 msgid "and"
 msgstr "et"
 
-#: include/conversation.php:1034
+#: include/conversation.php:1056
 #, php-format
 msgid "and %d other people"
 msgstr "et %dautres personnes"
 
-#: include/conversation.php:1043
+#: include/conversation.php:1064
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr "<span  %1$s>%2$d personnes</span> aiment ça"
 
-#: include/conversation.php:1044
+#: include/conversation.php:1065
 #, php-format
 msgid "%s like this."
 msgstr "%s aime ça."
 
-#: include/conversation.php:1047
+#: include/conversation.php:1068
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr "<span  %1$s>%2$d personnes</span> n'aiment pas ça"
 
-#: include/conversation.php:1048
+#: include/conversation.php:1069
 #, php-format
 msgid "%s don't like this."
 msgstr "%s n'aiment pas ça."
 
-#: include/conversation.php:1051
+#: include/conversation.php:1072
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend"
 msgstr "<span %1$s>%2$d personnes</span> participent"
 
-#: include/conversation.php:1052
+#: include/conversation.php:1073
 #, php-format
 msgid "%s attend."
 msgstr "%s participent."
 
-#: include/conversation.php:1055
+#: include/conversation.php:1076
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't attend"
 msgstr "<span  %1$s>%2$d personnes</span> ne participent pas"
 
-#: include/conversation.php:1056
+#: include/conversation.php:1077
 #, php-format
 msgid "%s don't attend."
 msgstr "%s ne participent pas."
 
-#: include/conversation.php:1059
+#: include/conversation.php:1080
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend maybe"
 msgstr "<span  %1$s>%2$d personnes</span> vont peut-être participer"
 
-#: include/conversation.php:1060
+#: include/conversation.php:1081
 #, php-format
 msgid "%s attend maybe."
 msgstr "%sparticipent peut-être"
 
-#: include/conversation.php:1090
+#: include/conversation.php:1111
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Visible par <strong>tout le monde</strong>"
 
-#: include/conversation.php:1091 src/Object/Post.php:822
+#: include/conversation.php:1112 src/Object/Post.php:882
 msgid "Please enter a image/video/audio/webpage URL:"
 msgstr "Veuillez entrer une URL d'image/vidéo/page web."
 
-#: include/conversation.php:1092
+#: include/conversation.php:1113
 msgid "Tag term:"
 msgstr "Étiquette :"
 
-#: include/conversation.php:1093 mod/filer.php:37
+#: include/conversation.php:1114 mod/filer.php:35
 msgid "Save to Folder:"
 msgstr "Sauver dans le Dossier :"
 
-#: include/conversation.php:1094
+#: include/conversation.php:1115
 msgid "Where are you right now?"
 msgstr "Où êtes-vous actuellement ?"
 
-#: include/conversation.php:1095
+#: include/conversation.php:1116
 msgid "Delete item(s)?"
 msgstr "Supprimer les élément(s) ?"
 
-#: include/conversation.php:1127
+#: include/conversation.php:1148
 msgid "New Post"
 msgstr "Nouvelle publication"
 
-#: include/conversation.php:1130
+#: include/conversation.php:1151
 msgid "Share"
 msgstr "Partager"
 
-#: include/conversation.php:1131 mod/editpost.php:95 mod/message.php:262
-#: mod/message.php:424 mod/wallmessage.php:139
+#: include/conversation.php:1152 mod/editpost.php:74 mod/message.php:258
+#: mod/message.php:439 mod/wallmessage.php:139
 msgid "Upload photo"
 msgstr "Joindre photo"
 
-#: include/conversation.php:1132 mod/editpost.php:96
+#: include/conversation.php:1153 mod/editpost.php:75
 msgid "upload photo"
 msgstr "envoi image"
 
-#: include/conversation.php:1133 mod/editpost.php:97
+#: include/conversation.php:1154 mod/editpost.php:76
 msgid "Attach file"
 msgstr "Joindre fichier"
 
-#: include/conversation.php:1134 mod/editpost.php:98
+#: include/conversation.php:1155 mod/editpost.php:77
 msgid "attach file"
 msgstr "ajout fichier"
 
-#: include/conversation.php:1135 src/Object/Post.php:814
+#: include/conversation.php:1156 src/Object/Post.php:874
 msgid "Bold"
 msgstr "Gras"
 
-#: include/conversation.php:1136 src/Object/Post.php:815
+#: include/conversation.php:1157 src/Object/Post.php:875
 msgid "Italic"
 msgstr "Italique"
 
-#: include/conversation.php:1137 src/Object/Post.php:816
+#: include/conversation.php:1158 src/Object/Post.php:876
 msgid "Underline"
 msgstr "Souligné"
 
-#: include/conversation.php:1138 src/Object/Post.php:817
+#: include/conversation.php:1159 src/Object/Post.php:877
 msgid "Quote"
 msgstr "Citation"
 
-#: include/conversation.php:1139 src/Object/Post.php:818
+#: include/conversation.php:1160 src/Object/Post.php:878
 msgid "Code"
 msgstr "Code"
 
-#: include/conversation.php:1140 src/Object/Post.php:819
+#: include/conversation.php:1161 src/Object/Post.php:879
 msgid "Image"
 msgstr "Image"
 
-#: include/conversation.php:1141 src/Object/Post.php:820
+#: include/conversation.php:1162 src/Object/Post.php:880
 msgid "Link"
 msgstr "Lien"
 
-#: include/conversation.php:1142 src/Object/Post.php:821
+#: include/conversation.php:1163 src/Object/Post.php:881
 msgid "Link or Media"
 msgstr "Lien ou média"
 
-#: include/conversation.php:1143 mod/editpost.php:105
+#: include/conversation.php:1164 mod/editpost.php:84
 msgid "Set your location"
 msgstr "Définir votre localisation"
 
-#: include/conversation.php:1144 mod/editpost.php:106
+#: include/conversation.php:1165 mod/editpost.php:85
 msgid "set location"
 msgstr "spéc. localisation"
 
-#: include/conversation.php:1145 mod/editpost.php:107
+#: include/conversation.php:1166 mod/editpost.php:86
 msgid "Clear browser location"
 msgstr "Effacer la localisation du navigateur"
 
-#: include/conversation.php:1146 mod/editpost.php:108
+#: include/conversation.php:1167 mod/editpost.php:87
 msgid "clear location"
 msgstr "supp. localisation"
 
-#: include/conversation.php:1148 mod/editpost.php:123
+#: include/conversation.php:1169 mod/editpost.php:102
 msgid "Set title"
 msgstr "Définir un titre"
 
-#: include/conversation.php:1150 mod/editpost.php:125
+#: include/conversation.php:1171 mod/editpost.php:104
 msgid "Categories (comma-separated list)"
 msgstr "Catégories (séparées par des virgules)"
 
-#: include/conversation.php:1152 mod/editpost.php:110
+#: include/conversation.php:1173 mod/editpost.php:89
 msgid "Permission settings"
 msgstr "Réglages des permissions"
 
-#: include/conversation.php:1153 mod/editpost.php:140
+#: include/conversation.php:1174 mod/editpost.php:119
 msgid "permissions"
 msgstr "permissions"
 
-#: include/conversation.php:1162 mod/editpost.php:120
+#: include/conversation.php:1183 mod/editpost.php:99
 msgid "Public post"
 msgstr "Publication publique"
 
-#: include/conversation.php:1166 mod/editpost.php:131 mod/events.php:557
-#: mod/photos.php:1502 mod/photos.php:1541 mod/photos.php:1601
-#: src/Object/Post.php:823
+#: include/conversation.php:1187 mod/editpost.php:110 mod/events.php:551
+#: mod/photos.php:1458 mod/photos.php:1497 mod/photos.php:1557
+#: src/Object/Post.php:883
 msgid "Preview"
 msgstr "Aperçu"
 
-#: include/conversation.php:1170 include/items.php:402
-#: mod/dfrn_request.php:658 mod/editpost.php:134 mod/fbrowser.php:105
-#: mod/fbrowser.php:136 mod/follow.php:165 mod/message.php:155
-#: mod/photos.php:260 mod/photos.php:332 mod/settings.php:681
-#: mod/settings.php:707 mod/suggest.php:44 mod/tagrm.php:20 mod/tagrm.php:113
-#: mod/unfollow.php:134 mod/videos.php:142 src/Module/Contact.php:452
+#: include/conversation.php:1191 include/items.php:396
+#: mod/dfrn_request.php:650 mod/editpost.php:113 mod/fbrowser.php:104
+#: mod/fbrowser.php:134 mod/follow.php:161 mod/message.php:153
+#: mod/photos.php:257 mod/photos.php:325 mod/settings.php:666
+#: mod/settings.php:692 mod/suggest.php:44 mod/tagrm.php:20 mod/tagrm.php:115
+#: mod/unfollow.php:132 mod/videos.php:105 src/Module/Contact.php:447
 msgid "Cancel"
 msgstr "Annuler"
 
-#: include/conversation.php:1175
+#: include/conversation.php:1196
 msgid "Post to Groups"
 msgstr "Publier aux groupes"
 
-#: include/conversation.php:1176
+#: include/conversation.php:1197
 msgid "Post to Contacts"
 msgstr "Publier aux contacts"
 
-#: include/conversation.php:1177
+#: include/conversation.php:1198
 msgid "Private post"
 msgstr "Message privé"
 
-#: include/conversation.php:1182 mod/editpost.php:138
-#: src/Model/Profile.php:361
+#: include/conversation.php:1203 mod/editpost.php:117
+#: src/Model/Profile.php:370
 msgid "Message"
 msgstr "Message"
 
-#: include/conversation.php:1183 mod/editpost.php:139
+#: include/conversation.php:1204 mod/editpost.php:118
 msgid "Browser"
 msgstr "Navigateur"
 
-#: include/conversation.php:1454
+#: include/conversation.php:1476
 msgid "View all"
 msgstr "Voir tout"
 
-#: include/conversation.php:1477
+#: include/conversation.php:1500
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Like"
 msgstr[1] "Likes"
 
-#: include/conversation.php:1480
+#: include/conversation.php:1503
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "Dislike"
 msgstr[1] "Dislikes"
 
-#: include/conversation.php:1486
+#: include/conversation.php:1509
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Ne participe pas"
 msgstr[1] "Ne participent pas"
 
-#: include/conversation.php:1489 src/Content/ContactSelector.php:148
+#: include/conversation.php:1512 src/Content/ContactSelector.php:167
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Indécis"
 msgstr[1] "Indécis"
 
-#: include/enotify.php:55
+#: include/enotify.php:57
 msgid "Friendica Notification"
 msgstr "Notification Friendica"
 
-#: include/enotify.php:58
+#: include/enotify.php:60
 msgid "Thank You,"
 msgstr "Merci, "
 
-#: include/enotify.php:61
+#: include/enotify.php:63
 #, php-format
 msgid "%1$s, %2$s Administrator"
 msgstr "%1$s,, l'administrateur de %2$s"
 
-#: include/enotify.php:63
+#: include/enotify.php:65
 #, php-format
 msgid "%s Administrator"
 msgstr "L'administrateur de %s"
 
-#: include/enotify.php:126
+#: include/enotify.php:134
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr "[Friendica:Notification] Nouveau courriel reçu sur %s"
 
-#: include/enotify.php:128
+#: include/enotify.php:136
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$s vous a envoyé un nouveau message privé sur %2$s."
 
-#: include/enotify.php:129
+#: include/enotify.php:137
 msgid "a private message"
 msgstr "un message privé"
 
-#: include/enotify.php:129
+#: include/enotify.php:137
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s vous a envoyé %2$s."
 
-#: include/enotify.php:131
+#: include/enotify.php:139
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Merci de visiter %s pour voir vos messages privés et/ou y répondre."
 
-#: include/enotify.php:165
+#: include/enotify.php:172
+#, php-format
+msgid "%1$s tagged you on [url=%2$s]a %3$s[/url]"
+msgstr "%1$s vous a mentionné•e sur [url=%2$s]un•e %3$s[/url]"
+
+#: include/enotify.php:178
 #, php-format
 msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 msgstr "%1$s a commenté sur [url=%2$s]un %3$s[/url]"
 
-#: include/enotify.php:173
+#: include/enotify.php:188
+#, php-format
+msgid "%1$s tagged you on [url=%2$s]%3$s's %4$s[/url]"
+msgstr "%1$s vous a mentionné•e sur [url=%2$s]un•e %4$s de %3$s [/url]"
+
+#: include/enotify.php:195
 #, php-format
 msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 msgstr "%1$s a commenté sur [url=%2$s]le %4$s de %3$s[/url]"
 
-#: include/enotify.php:183
+#: include/enotify.php:207
+#, php-format
+msgid "%1$s tagged you on [url=%2$s]your %3$s[/url]"
+msgstr "%1$s vous a mentionné•e sur [url=%2$s]votre %3$s[/url]"
+
+#: include/enotify.php:213
 #, php-format
 msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 msgstr "%1$s commented on [url=%2$s]your %3$s[/url]"
 
-#: include/enotify.php:195
+#: include/enotify.php:224
 #, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Friendica:Notification] Commentaire de %2$s sur la conversation #%1$d"
+msgid "%1$s tagged you on [url=%2$s]their %3$s[/url]"
+msgstr "%1$s vous a mentionné•e sur [url=%2$s]leur %3$s[/url]"
 
-#: include/enotify.php:197
+#: include/enotify.php:230
 #, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "%s a commenté un élément que vous suivez."
+msgid "%1$s commented on [url=%2$s]their %3$s[/url]"
+msgstr "%1$s a commenté sur [url=%2$s]leur %3$s[/url]"
 
-#: include/enotify.php:200 include/enotify.php:215 include/enotify.php:230
-#: include/enotify.php:245 include/enotify.php:264 include/enotify.php:280
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Merci de visiter %s pour voir la conversation et/ou y répondre."
-
-#: include/enotify.php:207
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr "[Friendica:Notification] %s a posté sur votre mur"
-
-#: include/enotify.php:209
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "%1$s a publié sur votre mur à %2$s"
-
-#: include/enotify.php:210
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr "%1$s a posté sur [url=%2$s]votre mur[/url]"
-
-#: include/enotify.php:222
+#: include/enotify.php:243
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
 msgstr "[Friendica:Notification] %s vous a étiqueté"
 
-#: include/enotify.php:224
+#: include/enotify.php:245
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s vous a étiqueté sur %2$s"
 
-#: include/enotify.php:225
+#: include/enotify.php:247
 #, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
-msgstr "%1$s [url=%2$s]vous a étiqueté[/url]."
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Friendica:Notification] Commentaire de %2$s sur la conversation #%1$d"
 
-#: include/enotify.php:237
+#: include/enotify.php:249
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s a commenté un élément que vous suivez."
+
+#: include/enotify.php:254 include/enotify.php:269 include/enotify.php:284
+#: include/enotify.php:303 include/enotify.php:319
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Merci de visiter %s pour voir la conversation et/ou y répondre."
+
+#: include/enotify.php:261
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica:Notification] %s a posté sur votre mur"
+
+#: include/enotify.php:263
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$s a publié sur votre mur à %2$s"
+
+#: include/enotify.php:264
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr "%1$s a posté sur [url=%2$s]votre mur[/url]"
+
+#: include/enotify.php:276
 #, php-format
 msgid "[Friendica:Notify] %s shared a new post"
 msgstr "[Friendica:Notification] %s partage une nouvelle publication"
 
-#: include/enotify.php:239
+#: include/enotify.php:278
 #, php-format
 msgid "%1$s shared a new post at %2$s"
 msgstr "%1$s a partagé une nouvelle publication sur %2$s"
 
-#: include/enotify.php:240
+#: include/enotify.php:279
 #, php-format
 msgid "%1$s [url=%2$s]shared a post[/url]."
 msgstr "%1$s [url=%2$s]partage une publication[/url]."
 
-#: include/enotify.php:252
+#: include/enotify.php:291
 #, php-format
 msgid "[Friendica:Notify] %1$s poked you"
 msgstr "[Friendica:Notify] %1$s vous a sollicité"
 
-#: include/enotify.php:254
+#: include/enotify.php:293
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "%1$s vous a sollicité via %2$s"
 
-#: include/enotify.php:255
+#: include/enotify.php:294
 #, php-format
 msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr "%1$s vous a [url=%2$s]sollicité[/url]."
 
-#: include/enotify.php:272
+#: include/enotify.php:311
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr "[Friendica:Notification] %s a étiqueté votre publication"
 
-#: include/enotify.php:274
+#: include/enotify.php:313
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$s a étiqueté votre publication sur %2$s"
 
-#: include/enotify.php:275
+#: include/enotify.php:314
 #, php-format
 msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr "%1$s a étiqueté [url=%2$s]votre publication[/url]"
 
-#: include/enotify.php:287
+#: include/enotify.php:326
 msgid "[Friendica:Notify] Introduction received"
 msgstr "[Friendica:Notification] Introduction reçue"
 
-#: include/enotify.php:289
+#: include/enotify.php:328
 #, php-format
 msgid "You've received an introduction from '%1$s' at %2$s"
 msgstr "Vous avez reçu une introduction de '%1$s' sur %2$s"
 
-#: include/enotify.php:290
+#: include/enotify.php:329
 #, php-format
 msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 msgstr "Vous avez reçu [url=%1$s]une introduction[/url] de %2$s."
 
-#: include/enotify.php:295 include/enotify.php:341
+#: include/enotify.php:334 include/enotify.php:380
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Vous pouvez visiter son profil sur %s"
 
-#: include/enotify.php:297
+#: include/enotify.php:336
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr "Merci de visiter %s pour approuver ou rejeter l'introduction."
 
-#: include/enotify.php:304
+#: include/enotify.php:343
 msgid "[Friendica:Notify] A new person is sharing with you"
 msgstr "[Notification Friendica] Une nouvelle personne partage avec vous"
 
-#: include/enotify.php:306 include/enotify.php:307
+#: include/enotify.php:345 include/enotify.php:346
 #, php-format
 msgid "%1$s is sharing with you at %2$s"
 msgstr "%1$s partage avec vous sur %2$s"
 
-#: include/enotify.php:314
+#: include/enotify.php:353
 msgid "[Friendica:Notify] You have a new follower"
 msgstr "[Friendica:Notification] Vous avez un nouvel abonné"
 
-#: include/enotify.php:316 include/enotify.php:317
+#: include/enotify.php:355 include/enotify.php:356
 #, php-format
 msgid "You have a new follower at %2$s : %1$s"
 msgstr "Vous avez un nouvel abonné à %2$s : %1$s"
 
-#: include/enotify.php:330
+#: include/enotify.php:369
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr "[Friendica:Notification] Nouvelle suggestion d'amitié"
 
-#: include/enotify.php:332
+#: include/enotify.php:371
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "Vous avez reçu une suggestion de '%1$s' sur %2$s"
 
-#: include/enotify.php:333
+#: include/enotify.php:372
 #, php-format
 msgid ""
 "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr "Vous avez reçu [url=%1$s]une suggestion[/url] de %3$s pour %2$s."
 
-#: include/enotify.php:339
+#: include/enotify.php:378
 msgid "Name:"
 msgstr "Nom :"
 
-#: include/enotify.php:340
+#: include/enotify.php:379
 msgid "Photo:"
 msgstr "Photo :"
 
-#: include/enotify.php:343
+#: include/enotify.php:382
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Merci de visiter %s pour approuver ou rejeter la suggestion."
 
-#: include/enotify.php:351 include/enotify.php:366
+#: include/enotify.php:390 include/enotify.php:405
 msgid "[Friendica:Notify] Connection accepted"
 msgstr "[Friendica:Notification] Connexion acceptée"
 
-#: include/enotify.php:353 include/enotify.php:368
+#: include/enotify.php:392 include/enotify.php:407
 #, php-format
 msgid "'%1$s' has accepted your connection request at %2$s"
 msgstr "'%1$s' a accepté votre demande de connexion à %2$s"
 
-#: include/enotify.php:354 include/enotify.php:369
+#: include/enotify.php:393 include/enotify.php:408
 #, php-format
 msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
 msgstr "%2$s a accepté votre [url=%1$s]demande de connexion[/url]."
 
-#: include/enotify.php:359
+#: include/enotify.php:398
 msgid ""
 "You are now mutual friends and may exchange status updates, photos, and "
 "email without restriction."
 msgstr "Vous êtes désormais mutuellement amis, et pouvez échanger des mises-à-jour d'état, des photos, et des messages sans restriction."
 
-#: include/enotify.php:361
+#: include/enotify.php:400
 #, php-format
 msgid "Please visit %s if you wish to make any changes to this relationship."
 msgstr "Veuillez visiter %s si vous souhaitez modifier cette relation."
 
-#: include/enotify.php:374
+#: include/enotify.php:413
 #, php-format
 msgid ""
 "'%1$s' has chosen to accept you a fan, which restricts some forms of "
@@ -761,294 +782,308 @@ msgid ""
 "automatically."
 msgstr "'%1$s' a choisi de vous accepter comme fan ce qui empêche certains canaux de communication tel les messages privés et certaines interactions de profil. Ceci est une page de célébrité ou de communauté, ces paramètres ont été appliqués automatiquement."
 
-#: include/enotify.php:376
+#: include/enotify.php:415
 #, php-format
 msgid ""
 "'%1$s' may choose to extend this into a two-way or more permissive "
 "relationship in the future."
 msgstr "%1$s peut choisir à l'avenir de rendre cette relation réciproque ou au moins plus permissive."
 
-#: include/enotify.php:378
+#: include/enotify.php:417
 #, php-format
 msgid "Please visit %s  if you wish to make any changes to this relationship."
 msgstr "Veuillez visiter %s si vous souhaitez modifier cette relation."
 
-#: include/enotify.php:388 mod/removeme.php:49
+#: include/enotify.php:427 mod/removeme.php:46
 msgid "[Friendica System Notify]"
 msgstr "[Friendica Notification Sytème]"
 
-#: include/enotify.php:388
+#: include/enotify.php:427
 msgid "registration request"
 msgstr "demande d'inscription"
 
-#: include/enotify.php:390
+#: include/enotify.php:429
 #, php-format
 msgid "You've received a registration request from '%1$s' at %2$s"
 msgstr "Vous avez reçu une demande d'inscription de %1$s sur %2$s"
 
-#: include/enotify.php:391
+#: include/enotify.php:430
 #, php-format
 msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
 msgstr "%2$s vous a envoyé une [url=%1$s]demande de création de compte[/url]."
 
-#: include/enotify.php:396
+#: include/enotify.php:435
 #, php-format
 msgid ""
 "Full Name:\t%s\n"
 "Site Location:\t%s\n"
 "Login Name:\t%s (%s)"
-msgstr ""
+msgstr "Nom complet :\t%s\nAdresse du site :\t%s\nIdentifiant :\t%s (%s)"
 
-#: include/enotify.php:402
+#: include/enotify.php:441
 #, php-format
 msgid "Please visit %s to approve or reject the request."
 msgstr "Veuillez visiter %s pour approuver ou rejeter la demande."
 
-#: include/items.php:359 mod/admin.php:295 mod/admin.php:2029
-#: mod/admin.php:2275 mod/display.php:75 mod/display.php:253
-#: mod/display.php:349 mod/notice.php:21 mod/viewsrc.php:22
+#: include/items.php:353 mod/admin.php:302 mod/admin.php:2131
+#: mod/admin.php:2378 mod/notice.php:20 mod/viewsrc.php:22
 msgid "Item not found."
 msgstr "Élément introuvable."
 
-#: include/items.php:397
+#: include/items.php:391
 msgid "Do you really want to delete this item?"
 msgstr "Voulez-vous vraiment supprimer cet élément ?"
 
-#: include/items.php:399 mod/api.php:112 mod/dfrn_request.php:648
-#: mod/follow.php:154 mod/message.php:152 mod/profiles.php:542
-#: mod/profiles.php:545 mod/profiles.php:567 mod/register.php:239
-#: mod/settings.php:1100 mod/settings.php:1106 mod/settings.php:1113
-#: mod/settings.php:1117 mod/settings.php:1121 mod/settings.php:1125
-#: mod/settings.php:1129 mod/settings.php:1133 mod/settings.php:1153
-#: mod/settings.php:1154 mod/settings.php:1155 mod/settings.php:1156
-#: mod/settings.php:1157 mod/suggest.php:41 src/Module/Contact.php:449
+#: include/items.php:393 mod/api.php:109 mod/dfrn_request.php:640
+#: mod/follow.php:150 mod/message.php:150 mod/profiles.php:526
+#: mod/profiles.php:529 mod/profiles.php:551 mod/settings.php:1085
+#: mod/settings.php:1091 mod/settings.php:1098 mod/settings.php:1102
+#: mod/settings.php:1106 mod/settings.php:1110 mod/settings.php:1114
+#: mod/settings.php:1118 mod/settings.php:1138 mod/settings.php:1139
+#: mod/settings.php:1140 mod/settings.php:1141 mod/settings.php:1142
+#: mod/suggest.php:41 src/Module/Contact.php:444 src/Module/Register.php:97
 msgid "Yes"
 msgstr "Oui"
 
-#: include/items.php:449 mod/allfriends.php:24 mod/api.php:37 mod/api.php:42
-#: mod/attach.php:39 mod/cal.php:304 mod/common.php:29 mod/crepair.php:101
-#: mod/delegate.php:31 mod/delegate.php:49 mod/delegate.php:60
-#: mod/dfrn_confirm.php:69 mod/dirfind.php:29 mod/editpost.php:22
-#: mod/events.php:199 mod/follow.php:58 mod/follow.php:122 mod/fsuggest.php:81
-#: mod/group.php:30 mod/invite.php:25 mod/invite.php:111 mod/item.php:169
-#: mod/manage.php:132 mod/message.php:58 mod/message.php:103
-#: mod/network.php:39 mod/nogroup.php:23 mod/notes.php:33
-#: mod/notifications.php:70 mod/ostatus_subscribe.php:18 mod/photos.php:189
-#: mod/photos.php:1064 mod/poke.php:144 mod/profiles.php:183
-#: mod/profiles.php:515 mod/profile_photo.php:33 mod/profile_photo.php:180
-#: mod/profile_photo.php:202 mod/register.php:55 mod/regmod.php:91
-#: mod/repair_ostatus.php:16 mod/settings.php:48 mod/settings.php:154
-#: mod/settings.php:670 mod/suggest.php:62 mod/uimport.php:17
-#: mod/unfollow.php:22 mod/unfollow.php:77 mod/unfollow.php:109
-#: mod/viewcontacts.php:63 mod/wallmessage.php:19 mod/wallmessage.php:43
-#: mod/wallmessage.php:82 mod/wallmessage.php:106 mod/wall_attach.php:81
-#: mod/wall_attach.php:84 mod/wall_upload.php:106 mod/wall_upload.php:109
-#: src/App.php:1786 src/Module/Contact.php:365
+#: include/items.php:443 mod/allfriends.php:22 mod/api.php:34 mod/api.php:39
+#: mod/cal.php:303 mod/common.php:27 mod/crepair.php:90 mod/delegate.php:30
+#: mod/delegate.php:48 mod/delegate.php:59 mod/dfrn_confirm.php:66
+#: mod/dirfind.php:29 mod/editpost.php:22 mod/events.php:207 mod/follow.php:57
+#: mod/follow.php:121 mod/fsuggest.php:77 mod/group.php:28 mod/invite.php:23
+#: mod/invite.php:111 mod/item.php:167 mod/manage.php:129 mod/message.php:56
+#: mod/message.php:101 mod/network.php:35 mod/nogroup.php:18 mod/notes.php:27
+#: mod/notifications.php:70 mod/ostatus_subscribe.php:18 mod/photos.php:186
+#: mod/photos.php:1020 mod/poke.php:141 mod/profile_photo.php:32
+#: mod/profile_photo.php:177 mod/profile_photo.php:204 mod/profiles.php:182
+#: mod/profiles.php:499 mod/regmod.php:89 mod/repair_ostatus.php:16
+#: mod/settings.php:48 mod/settings.php:154 mod/settings.php:655
+#: mod/suggest.php:62 mod/uimport.php:17 mod/unfollow.php:22
+#: mod/unfollow.php:77 mod/unfollow.php:109 mod/viewcontacts.php:56
+#: mod/wall_attach.php:76 mod/wall_attach.php:79 mod/wall_upload.php:107
+#: mod/wall_upload.php:110 mod/wallmessage.php:19 mod/wallmessage.php:43
+#: mod/wallmessage.php:82 mod/wallmessage.php:106 src/Module/Attach.php:42
+#: src/Module/Contact.php:360 src/Module/Register.php:193 src/App.php:1482
 msgid "Permission denied."
 msgstr "Permission refusée."
 
-#: include/items.php:520 src/Content/Feature.php:95
+#: include/items.php:514 src/Content/Feature.php:99
 msgid "Archives"
 msgstr "Archives"
 
-#: include/items.php:526 src/App.php:791 src/Content/ForumManager.php:133
-#: src/Content/Widget.php:308 src/Object/Post.php:447
-#: view/theme/vier/theme.php:258
+#: include/items.php:520 view/theme/vier/theme.php:255
+#: src/Content/ForumManager.php:135 src/Content/Widget.php:329
+#: src/Object/Post.php:458 src/App.php:666
 msgid "show more"
 msgstr "montrer plus"
 
-#: mod/admin.php:116
+#: mod/apps.php:15 src/App.php:1351
+msgid "You must be logged in to use addons. "
+msgstr "Vous devez être connecté pour utiliser les greffons."
+
+#: mod/apps.php:20
+msgid "Applications"
+msgstr "Applications"
+
+#: mod/apps.php:25
+msgid "No installed applications."
+msgstr "Pas d'application installée."
+
+#: mod/maintenance.php:26
+msgid "System down for maintenance"
+msgstr "Système indisponible pour cause de maintenance"
+
+#: mod/admin.php:122
 msgid "Theme settings updated."
 msgstr "Réglages du thème sauvés."
 
-#: mod/admin.php:189 src/Content/Nav.php:228
+#: mod/admin.php:196 src/Content/Nav.php:231
 msgid "Information"
 msgstr "Information"
 
-#: mod/admin.php:190
+#: mod/admin.php:197
 msgid "Overview"
-msgstr ""
+msgstr "Synthèse"
 
-#: mod/admin.php:191 mod/admin.php:761
+#: mod/admin.php:198 mod/admin.php:779
 msgid "Federation Statistics"
 msgstr "Statistiques Federation"
 
-#: mod/admin.php:192
+#: mod/admin.php:199
 msgid "Configuration"
 msgstr "Configuration"
 
-#: mod/admin.php:193 mod/admin.php:1488
+#: mod/admin.php:200 mod/admin.php:1581
 msgid "Site"
 msgstr "Site"
 
-#: mod/admin.php:194 mod/admin.php:1417 mod/admin.php:1961 mod/admin.php:1978
+#: mod/admin.php:201 mod/admin.php:1482 mod/admin.php:2062 mod/admin.php:2079
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: mod/admin.php:195 mod/admin.php:2077 mod/admin.php:2137 mod/settings.php:99
+#: mod/admin.php:202 mod/admin.php:2179 mod/admin.php:2239 mod/settings.php:99
 msgid "Addons"
 msgstr "Extensions"
 
-#: mod/admin.php:196 mod/admin.php:2347 mod/admin.php:2391
+#: mod/admin.php:203 mod/admin.php:2436 mod/admin.php:2480
 msgid "Themes"
 msgstr "Thèmes"
 
-#: mod/admin.php:197 mod/settings.php:77
+#: mod/admin.php:204 mod/settings.php:77
 msgid "Additional features"
 msgstr "Fonctions supplémentaires"
 
-#: mod/admin.php:198 mod/admin.php:322 mod/register.php:292
-#: src/Content/Nav.php:231 src/Module/Tos.php:71
+#: mod/admin.php:205 mod/admin.php:329 src/Content/Nav.php:234
+#: src/Module/Register.php:144 src/Module/Tos.php:73
 msgid "Terms of Service"
 msgstr "Conditions de service"
 
-#: mod/admin.php:199
+#: mod/admin.php:206
 msgid "Database"
 msgstr "Base de données"
 
-#: mod/admin.php:200
+#: mod/admin.php:207
 msgid "DB updates"
 msgstr "Mise-à-jour de la base"
 
-#: mod/admin.php:201 mod/admin.php:804
+#: mod/admin.php:208 mod/admin.php:823
 msgid "Inspect Queue"
 msgstr "Inspecter la file d'attente"
 
-#: mod/admin.php:202
+#: mod/admin.php:209
 msgid "Inspect Deferred Workers"
-msgstr ""
+msgstr "Tâches de fond reportées"
 
-#: mod/admin.php:203
+#: mod/admin.php:210
 msgid "Inspect worker Queue"
-msgstr ""
+msgstr "Tâches de fond en attente"
 
-#: mod/admin.php:204
+#: mod/admin.php:211
 msgid "Tools"
 msgstr "Outils"
 
-#: mod/admin.php:205
+#: mod/admin.php:212
 msgid "Contact Blocklist"
 msgstr "Liste de contacts bloqués"
 
-#: mod/admin.php:206 mod/admin.php:384
+#: mod/admin.php:213 mod/admin.php:395
 msgid "Server Blocklist"
 msgstr "Serveurs bloqués"
 
-#: mod/admin.php:207 mod/admin.php:542
+#: mod/admin.php:214 mod/admin.php:558
 msgid "Delete Item"
 msgstr "Supprimer un élément"
 
-#: mod/admin.php:208 mod/admin.php:209 mod/admin.php:2466
+#: mod/admin.php:215 mod/admin.php:216 mod/admin.php:2556
 msgid "Logs"
 msgstr "Journaux"
 
-#: mod/admin.php:210 mod/admin.php:2533
+#: mod/admin.php:217 mod/admin.php:2624
 msgid "View Logs"
 msgstr "Voir les logs"
 
-#: mod/admin.php:212
+#: mod/admin.php:219
 msgid "Diagnostics"
-msgstr ""
+msgstr "Diagnostics"
 
-#: mod/admin.php:213
+#: mod/admin.php:220
 msgid "PHP Info"
-msgstr ""
+msgstr "PHP Info"
 
-#: mod/admin.php:214
+#: mod/admin.php:221
 msgid "probe address"
 msgstr "Tester une adresse"
 
-#: mod/admin.php:215
+#: mod/admin.php:222
 msgid "check webfinger"
 msgstr "vérification de webfinger"
 
-#: mod/admin.php:235 src/Content/Nav.php:271
+#: mod/admin.php:242 src/Content/Nav.php:274
 msgid "Admin"
 msgstr "Admin"
 
-#: mod/admin.php:236
+#: mod/admin.php:243
 msgid "Addon Features"
-msgstr ""
+msgstr "Fonctionnalités des addons"
 
-#: mod/admin.php:237
+#: mod/admin.php:244
 msgid "User registrations waiting for confirmation"
 msgstr "Inscriptions en attente de confirmation"
 
-#: mod/admin.php:321 mod/admin.php:383 mod/admin.php:499 mod/admin.php:541
-#: mod/admin.php:760 mod/admin.php:803 mod/admin.php:854 mod/admin.php:972
-#: mod/admin.php:1487 mod/admin.php:1960 mod/admin.php:2076 mod/admin.php:2136
-#: mod/admin.php:2346 mod/admin.php:2390 mod/admin.php:2465 mod/admin.php:2532
+#: mod/admin.php:328 mod/admin.php:394 mod/admin.php:514 mod/admin.php:557
+#: mod/admin.php:778 mod/admin.php:822 mod/admin.php:875 mod/admin.php:998
+#: mod/admin.php:1580 mod/admin.php:2061 mod/admin.php:2178 mod/admin.php:2238
+#: mod/admin.php:2435 mod/admin.php:2479 mod/admin.php:2555 mod/admin.php:2623
 msgid "Administration"
 msgstr "Administration"
 
-#: mod/admin.php:323
+#: mod/admin.php:330
 msgid "Display Terms of Service"
-msgstr ""
+msgstr "Afficher les Conditions d'Utilisation"
 
-#: mod/admin.php:323
+#: mod/admin.php:330
 msgid ""
 "Enable the Terms of Service page. If this is enabled a link to the terms "
 "will be added to the registration form and the general information page."
-msgstr ""
+msgstr "Active la page de Conditions d'Utilisation. Un lien vers cette page est ajouté dans le formulaire d'inscription et la page A Propos."
 
-#: mod/admin.php:324
+#: mod/admin.php:331
 msgid "Display Privacy Statement"
-msgstr ""
+msgstr "Afficher la Politique de Confidentialité"
 
-#: mod/admin.php:324
+#: mod/admin.php:331
 #, php-format
 msgid ""
 "Show some informations regarding the needed information to operate the node "
 "according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."
-msgstr ""
+msgstr "Affiche les informations légales nécessaires pour publier un site Friendica en accord avec le <a href=\"%s\" target=\"_blank\">RGPD européen</a> par exemple."
 
-#: mod/admin.php:325
+#: mod/admin.php:332
 msgid "Privacy Statement Preview"
-msgstr ""
+msgstr "Aperçu de la Politique de Confidentialité"
 
-#: mod/admin.php:327
+#: mod/admin.php:334
 msgid "The Terms of Service"
-msgstr ""
+msgstr "Conditions d'Utilisation"
 
-#: mod/admin.php:327
+#: mod/admin.php:334
 msgid ""
 "Enter the Terms of Service for your node here. You can use BBCode. Headers "
 "of sections should be [h2] and below."
-msgstr ""
+msgstr "Saisissez les Conditions d'Utilisations de votre site. Les BBCodes sont disponibles, les titres commencent à [h2]."
 
-#: mod/admin.php:329 mod/admin.php:1489 mod/admin.php:2138 mod/admin.php:2392
-#: mod/admin.php:2467 mod/admin.php:2614 mod/delegate.php:174
-#: mod/settings.php:680 mod/settings.php:787 mod/settings.php:875
-#: mod/settings.php:964 mod/settings.php:1189
+#: mod/admin.php:336 mod/admin.php:1582 mod/admin.php:2240 mod/admin.php:2481
+#: mod/admin.php:2557 mod/admin.php:2707 mod/delegate.php:175
+#: mod/settings.php:665 mod/settings.php:772 mod/settings.php:860
+#: mod/settings.php:949 mod/settings.php:1174
 msgid "Save Settings"
 msgstr "Sauvegarder les paramètres"
 
-#: mod/admin.php:375 mod/admin.php:393 mod/dfrn_request.php:348
-#: mod/friendica.php:122 src/Model/Contact.php:1603
+#: mod/admin.php:386 mod/admin.php:404 mod/dfrn_request.php:346
+#: mod/friendica.php:131 src/Model/Contact.php:1702
 msgid "Blocked domain"
 msgstr "Domaine bloqué"
 
-#: mod/admin.php:375
+#: mod/admin.php:386
 msgid "The blocked domain"
 msgstr "Domaine bloqué"
 
-#: mod/admin.php:376 mod/admin.php:394 mod/friendica.php:122
+#: mod/admin.php:387 mod/admin.php:405 mod/friendica.php:131
 msgid "Reason for the block"
 msgstr "Raison du blocage."
 
-#: mod/admin.php:376 mod/admin.php:389
+#: mod/admin.php:387 mod/admin.php:400
 msgid "The reason why you blocked this domain."
 msgstr "Raison pour laquelle vous souhaitez bloquer ce domaine."
 
-#: mod/admin.php:377
+#: mod/admin.php:388
 msgid "Delete domain"
 msgstr "Supprimer le domaine."
 
-#: mod/admin.php:377
+#: mod/admin.php:388
 msgid "Check to delete this entry from the blocklist"
 msgstr "Cochez la case pour retirer cette entrée de la liste noire"
 
-#: mod/admin.php:385
+#: mod/admin.php:396
 msgid ""
 "This page can be used to define a black list of servers from the federated "
 "network that are not allowed to interact with your node. For all entered "
@@ -1056,264 +1091,264 @@ msgid ""
 "server."
 msgstr "Cette page permet de créer une liste noire des serveurs de la fédération qui ne sont pas autorisés à interagir avec votre serveur. Pour chaque serveur bloqué, vous devez fournir la raison du blocage."
 
-#: mod/admin.php:386
+#: mod/admin.php:397
 msgid ""
 "The list of blocked servers will be made publically available on the "
 "/friendica page so that your users and people investigating communication "
 "problems can find the reason easily."
 msgstr "La liste des serveurs bloqués sera publiée sur la page /friendica pour que les utilisateurs rencontrant des problèmes de communication puissent en comprendre la raison."
 
-#: mod/admin.php:387
+#: mod/admin.php:398
 msgid "Add new entry to block list"
 msgstr "Ajouter une nouvelle entrée à la liste noire"
 
-#: mod/admin.php:388
+#: mod/admin.php:399
 msgid "Server Domain"
 msgstr "Adresse du serveur"
 
-#: mod/admin.php:388
+#: mod/admin.php:399
 msgid ""
 "The domain of the new server to add to the block list. Do not include the "
 "protocol."
 msgstr "Adresse du serveur à ajouter à la liste noire. Ne pas mettre le protocole."
 
-#: mod/admin.php:389
+#: mod/admin.php:400
 msgid "Block reason"
 msgstr "Raison du blocage."
 
-#: mod/admin.php:390
+#: mod/admin.php:401
 msgid "Add Entry"
 msgstr "Ajouter"
 
-#: mod/admin.php:391
+#: mod/admin.php:402
 msgid "Save changes to the blocklist"
 msgstr "Sauvegarder la liste noire"
 
-#: mod/admin.php:392
+#: mod/admin.php:403
 msgid "Current Entries in the Blocklist"
 msgstr "Entrées de la liste noire"
 
-#: mod/admin.php:395
+#: mod/admin.php:406
 msgid "Delete entry from blocklist"
 msgstr "Supprimer l'entrée de la liste noire"
 
-#: mod/admin.php:398
+#: mod/admin.php:409
 msgid "Delete entry from blocklist?"
 msgstr "Supprimer l'entrée de la liste noire ?"
 
-#: mod/admin.php:424
+#: mod/admin.php:436
 msgid "Server added to blocklist."
 msgstr "Serveur ajouté à la liste noire."
 
-#: mod/admin.php:440
+#: mod/admin.php:452
 msgid "Site blocklist updated."
 msgstr "Liste noire mise à jour."
 
-#: mod/admin.php:463 src/Core/Console/GlobalCommunityBlock.php:68
+#: mod/admin.php:477 src/Core/Console/GlobalCommunityBlock.php:68
 msgid "The contact has been blocked from the node"
-msgstr ""
+msgstr "Le profile distant a été bloqué"
 
-#: mod/admin.php:465 src/Core/Console/GlobalCommunityBlock.php:65
+#: mod/admin.php:479 src/Core/Console/GlobalCommunityBlock.php:65
 #, php-format
 msgid "Could not find any contact entry for this URL (%s)"
-msgstr ""
+msgstr "Aucun profil distant n'a été trouvé à cette URL (%s)"
 
-#: mod/admin.php:472
+#: mod/admin.php:486
 #, php-format
 msgid "%s contact unblocked"
 msgid_plural "%s contacts unblocked"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s contact débloqué"
+msgstr[1] "%s profiles distants débloqués"
 
-#: mod/admin.php:500
+#: mod/admin.php:515
 msgid "Remote Contact Blocklist"
-msgstr ""
+msgstr "Liste des profiles distants bloqués"
 
-#: mod/admin.php:501
+#: mod/admin.php:516
 msgid ""
 "This page allows you to prevent any message from a remote contact to reach "
 "your node."
-msgstr ""
+msgstr "Cette page vous permet de refuser toutes les publications d'un profile distant sur votre site."
 
-#: mod/admin.php:502
+#: mod/admin.php:517
 msgid "Block Remote Contact"
-msgstr ""
+msgstr "Bloquer le profile distant"
 
-#: mod/admin.php:503 mod/admin.php:1963
+#: mod/admin.php:518 mod/admin.php:2064
 msgid "select all"
 msgstr "tout sélectionner"
 
-#: mod/admin.php:504
+#: mod/admin.php:519
 msgid "select none"
-msgstr ""
+msgstr "Sélectionner tous"
 
-#: mod/admin.php:505 mod/admin.php:1972 src/Module/Contact.php:627
-#: src/Module/Contact.php:829 src/Module/Contact.php:1082
+#: mod/admin.php:520 mod/admin.php:2073 src/Module/Contact.php:621
+#: src/Module/Contact.php:824 src/Module/Contact.php:1077
 msgid "Block"
 msgstr "Bloquer"
 
-#: mod/admin.php:506 mod/admin.php:1974 src/Module/Contact.php:627
-#: src/Module/Contact.php:829 src/Module/Contact.php:1082
+#: mod/admin.php:521 mod/admin.php:2075 src/Module/Contact.php:621
+#: src/Module/Contact.php:824 src/Module/Contact.php:1077
 msgid "Unblock"
 msgstr "Débloquer"
 
-#: mod/admin.php:507
+#: mod/admin.php:522
 msgid "No remote contact is blocked from this node."
-msgstr ""
+msgstr "Aucun profil distant n'est bloqué"
 
-#: mod/admin.php:509
+#: mod/admin.php:524
 msgid "Blocked Remote Contacts"
-msgstr ""
+msgstr "Profils distants bloqués"
 
-#: mod/admin.php:510
+#: mod/admin.php:525
 msgid "Block New Remote Contact"
-msgstr ""
+msgstr "Bloquer un nouveau profil distant"
 
-#: mod/admin.php:511
+#: mod/admin.php:526
 msgid "Photo"
-msgstr ""
+msgstr "Photo"
 
-#: mod/admin.php:511 mod/admin.php:1955 mod/admin.php:1966 mod/admin.php:1980
-#: mod/admin.php:1996 mod/crepair.php:161 mod/settings.php:682
-#: mod/settings.php:708
+#: mod/admin.php:526 mod/admin.php:2056 mod/admin.php:2067 mod/admin.php:2081
+#: mod/admin.php:2097 mod/crepair.php:159 mod/settings.php:667
+#: mod/settings.php:693
 msgid "Name"
 msgstr "Nom"
 
-#: mod/admin.php:511 mod/profiles.php:395
+#: mod/admin.php:526 mod/profiles.php:382
 msgid "Address"
 msgstr "Adresse"
 
-#: mod/admin.php:511 mod/admin.php:521 mod/follow.php:170
-#: mod/notifications.php:177 mod/notifications.php:261 mod/unfollow.php:139
-#: src/Module/Contact.php:646
+#: mod/admin.php:526 mod/admin.php:536 mod/follow.php:166
+#: mod/notifications.php:179 mod/notifications.php:263 mod/unfollow.php:137
+#: src/Module/Contact.php:639
 msgid "Profile URL"
 msgstr "URL du Profil"
 
-#: mod/admin.php:519
+#: mod/admin.php:534
 #, php-format
 msgid "%s total blocked contact"
 msgid_plural "%s total blocked contacts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s profil distant bloqué"
+msgstr[1] "%s profils distans bloqués"
 
-#: mod/admin.php:521
+#: mod/admin.php:536
 msgid "URL of the remote contact to block."
-msgstr ""
+msgstr "URL du profil distant à bloquer."
 
-#: mod/admin.php:543
+#: mod/admin.php:559
 msgid "Delete this Item"
 msgstr "Supprimer l'élément"
 
-#: mod/admin.php:544
+#: mod/admin.php:560
 msgid ""
 "On this page you can delete an item from your node. If the item is a top "
 "level posting, the entire thread will be deleted."
 msgstr "Sur cette page, vous pouvez supprimer un élément de votre noeud. Si cet élément est le premier post d'un fil de discussion, le fil de discussion entier sera supprimé."
 
-#: mod/admin.php:545
+#: mod/admin.php:561
 msgid ""
 "You need to know the GUID of the item. You can find it e.g. by looking at "
 "the display URL. The last part of http://example.com/display/123456 is the "
 "GUID, here 123456."
 msgstr "Vous devez connaître le GUID de l'élément. Vous pouvez le trouver en sélectionnant l'élément puis en lisant l'URL. La dernière partie de l'URL est le GUID. Exemple: http://example.com/display/123456 a pour GUID: 123456."
 
-#: mod/admin.php:546
+#: mod/admin.php:562
 msgid "GUID"
 msgstr "GUID"
 
-#: mod/admin.php:546
+#: mod/admin.php:562
 msgid "The GUID of the item you want to delete."
 msgstr "GUID de l'élément à supprimer."
 
-#: mod/admin.php:580
+#: mod/admin.php:597
 msgid "Item marked for deletion."
 msgstr "L'élément va être supprimé."
 
-#: mod/admin.php:651
+#: mod/admin.php:669
 msgid "unknown"
 msgstr "inconnu"
 
-#: mod/admin.php:754
+#: mod/admin.php:772
 msgid ""
 "This page offers you some numbers to the known part of the federated social "
 "network your Friendica node is part of. These numbers are not complete but "
 "only reflect the part of the network your node is aware of."
 msgstr "Cette page montre quelques statistiques de la partie connue du réseau social fédéré dont votre instance Friendica fait partie. Ces chiffres sont partiels et ne reflètent que la portion du réseau dont votre instance a connaissance."
 
-#: mod/admin.php:755
+#: mod/admin.php:773
 msgid ""
 "The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
 "will improve the data displayed here."
 msgstr "En activant la fonctionnalité <em>Répertoire de Contacts Découverts Automatiquement</em>, cela améliorera la qualité des chiffres présentés ici."
 
-#: mod/admin.php:767
+#: mod/admin.php:785
 #, php-format
 msgid ""
 "Currently this node is aware of %d nodes with %d registered users from the "
 "following platforms:"
-msgstr ""
+msgstr "Ce site a connaissance de %d sites distants totalisant %d utilisateurs répartis entre les plate-formes suivantes :"
 
-#: mod/admin.php:806 mod/admin.php:857
+#: mod/admin.php:825 mod/admin.php:878
 msgid "ID"
 msgstr "ID"
 
-#: mod/admin.php:807
+#: mod/admin.php:826
 msgid "Recipient Name"
 msgstr "Nom du destinataire"
 
-#: mod/admin.php:808
+#: mod/admin.php:827
 msgid "Recipient Profile"
 msgstr "Profil du destinataire"
 
-#: mod/admin.php:809 src/Content/Nav.php:236
-#: src/Core/NotificationsManager.php:180 view/theme/frio/theme.php:280
+#: mod/admin.php:828 view/theme/frio/theme.php:269
+#: src/Core/NotificationsManager.php:182 src/Content/Nav.php:239
 msgid "Network"
 msgstr "Réseau"
 
-#: mod/admin.php:810 mod/admin.php:859
+#: mod/admin.php:829 mod/admin.php:880
 msgid "Created"
 msgstr "Créé"
 
-#: mod/admin.php:811
+#: mod/admin.php:830
 msgid "Last Tried"
 msgstr "Dernier essai"
 
-#: mod/admin.php:812
+#: mod/admin.php:831
 msgid ""
 "This page lists the content of the queue for outgoing postings. These are "
 "postings the initial delivery failed for. They will be resend later and "
 "eventually deleted if the delivery fails permanently."
 msgstr "Cette page présente le contenu de la file d'attente pour les publications sortantes. Ce sont des messages dont la première livraison a échoué. Ils seront réenvoyés plus tard et éventuellement supprimés si l'envoi échoue de façon permanente."
 
-#: mod/admin.php:833
+#: mod/admin.php:854
 msgid "Inspect Deferred Worker Queue"
-msgstr ""
+msgstr "Détail des tâches de fond reportées"
 
-#: mod/admin.php:834
+#: mod/admin.php:855
 msgid ""
 "This page lists the deferred worker jobs. This are jobs that couldn't be "
 "executed at the first time."
-msgstr ""
+msgstr "Cette page détaille les tâches de fond reportées après avoir échoué une première fois."
 
-#: mod/admin.php:837
+#: mod/admin.php:858
 msgid "Inspect Worker Queue"
-msgstr ""
+msgstr "Détail des tâches de fond en attente"
 
-#: mod/admin.php:838
+#: mod/admin.php:859
 msgid ""
 "This page lists the currently queued worker jobs. These jobs are handled by "
 "the worker cronjob you've set up during install."
-msgstr ""
+msgstr "Cette page détaille les tâches de fond en attente. Elles seront traitées lors de la prochaine exécution de la tâche planifiée que vous avez définie lors de l'installation."
 
-#: mod/admin.php:858
+#: mod/admin.php:879
 msgid "Job Parameters"
-msgstr ""
+msgstr "Paramètres de la tâche"
 
-#: mod/admin.php:860
+#: mod/admin.php:881
 msgid "Priority"
-msgstr ""
+msgstr "Priorité"
 
-#: mod/admin.php:885
+#: mod/admin.php:907
 #, php-format
 msgid ""
 "Your DB still runs with MyISAM tables. You should change the engine type to "
@@ -1322,538 +1357,564 @@ msgid ""
 "converting the table engines. You may also use the command <tt>php "
 "bin/console.php dbstructure toinnodb</tt> of your Friendica installation for"
 " an automatic conversion.<br />"
-msgstr ""
+msgstr "<br />Votre base de donnée comporte des tables MYISAM. Vous devriez changer pour InnoDB car il est prévu d'utiliser des fonctionnalités spécifiques à InnoDB à l'avenir. Veuillez consulter <a href=\"%s\">ce guide de conversion</a> pour mettre à jour votre base de donnée. Vous pouvez également exécuter la commande <tt>php bin/console.php dbstructure toinnodb</tt> à la racine de votre répertoire Friendica pour une conversion automatique."
 
-#: mod/admin.php:892
+#: mod/admin.php:914
 #, php-format
 msgid ""
 "There is a new version of Friendica available for download. Your current "
 "version is %1$s, upstream version is %2$s"
 msgstr "Une nouvelle version de Friendica est disponible. Votre version est %1$s, la nouvelle version est %2$s"
 
-#: mod/admin.php:902
+#: mod/admin.php:924
 msgid ""
 "The database update failed. Please run \"php bin/console.php dbstructure "
 "update\" from the command line and have a look at the errors that might "
 "appear."
-msgstr ""
+msgstr "La mise à jour automatique de la base de donnée a échoué. Veuillez exécuter la commande <code>php bin/console.php dbstructure update</code> depuis votre répertoire Friendica et noter les erreurs potentielles."
 
-#: mod/admin.php:908
+#: mod/admin.php:930
 msgid "The worker was never executed. Please check your database structure!"
 msgstr "Le 'worker' n'a pas encore été exécuté. Vérifiez la structure de votre base de données."
 
-#: mod/admin.php:911
+#: mod/admin.php:933
 #, php-format
 msgid ""
 "The last worker execution was on %s UTC. This is older than one hour. Please"
 " check your crontab settings."
 msgstr "La dernière exécution du 'worker' s'est déroulée à %s, c'est-à-dire il y a plus d'une heure. Vérifiez les réglages de crontab."
 
-#: mod/admin.php:917
+#: mod/admin.php:939
 #, php-format
 msgid ""
 "Friendica's configuration now is stored in config/local.config.php, please "
 "copy config/local-sample.config.php and move your config from "
 "<code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for "
 "help with the transition."
-msgstr ""
+msgstr "La configuration de votre site Friendica est maintenant stockée dans le fichier <code>config/local.config.php</code>, veuillez copier le fichier <code>config/local-sample.config.php</code> et transférer votre configuration depuis le fichier <code>.htconfig.php</code>. Veuillez consulter <a href=\"%s\">la page d'aide de configuration (en anglais)</a> pour vous aider dans la transition."
 
-#: mod/admin.php:924
+#: mod/admin.php:943
+#, php-format
+msgid ""
+"Friendica's configuration now is stored in config/local.config.php, please "
+"copy config/local-sample.config.php and move your config from "
+"<code>config/local.ini.php</code>. See <a href=\"%s\">the Config help "
+"page</a> for help with the transition."
+msgstr "La configuration de votre site Friendica est maintenant stockée dans le fichier <code>config/local.config.php</code>, veuillez copier le fichier <code>config/local-sample.config.php</code> et transférer votre configuration depuis le fichier <code>config/local.ini.php</code>. Veuillez consulter <a href=\"%s\">la page d'aide de configuration (en anglais)</a> pour vous aider dans la transition."
+
+#: mod/admin.php:950
 #, php-format
 msgid ""
 "<a href=\"%s\">%s</a> is not reachable on your system. This is a severe "
 "configuration issue that prevents server to server communication. See <a "
 "href=\"%s\">the installation page</a> for help."
-msgstr ""
+msgstr "<a href=\"%s\">%s</a> n'est pas accessible sur votre site. C'est un problème de configuration sévère qui empêche toute communication avec les serveurs distants. Veuillez consulter <a href=\"%s\">la page d'aide à l'installation</a> (en anglais) pour plus d'information."
 
-#: mod/admin.php:930
+#: mod/admin.php:956
 msgid "Normal Account"
 msgstr "Compte normal"
 
-#: mod/admin.php:931
+#: mod/admin.php:957
 msgid "Automatic Follower Account"
-msgstr ""
+msgstr "Profile Resuivant"
 
-#: mod/admin.php:932
+#: mod/admin.php:958
 msgid "Public Forum Account"
-msgstr ""
+msgstr "Forum public"
 
-#: mod/admin.php:933
+#: mod/admin.php:959
 msgid "Automatic Friend Account"
 msgstr "Compte auto-amical"
 
-#: mod/admin.php:934
+#: mod/admin.php:960
 msgid "Blog Account"
 msgstr "Compte de blog"
 
-#: mod/admin.php:935
+#: mod/admin.php:961
 msgid "Private Forum Account"
-msgstr ""
+msgstr "Forum privé"
 
-#: mod/admin.php:958
+#: mod/admin.php:984
 msgid "Message queues"
 msgstr "Files d'attente des messages"
 
-#: mod/admin.php:964
+#: mod/admin.php:990
 msgid "Server Settings"
-msgstr ""
+msgstr "Paramètres du site"
 
-#: mod/admin.php:973
+#: mod/admin.php:999
 msgid "Summary"
 msgstr "Résumé"
 
-#: mod/admin.php:975
+#: mod/admin.php:1001
 msgid "Registered users"
 msgstr "Utilisateurs inscrits"
 
-#: mod/admin.php:977
+#: mod/admin.php:1003
 msgid "Pending registrations"
 msgstr "Inscriptions en attente"
 
-#: mod/admin.php:978
+#: mod/admin.php:1004
 msgid "Version"
 msgstr "Version"
 
-#: mod/admin.php:983
+#: mod/admin.php:1009
 msgid "Active addons"
-msgstr ""
+msgstr "Add-ons actifs"
 
-#: mod/admin.php:1015
+#: mod/admin.php:1042
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr "Impossible d'analyser l'URL de base. Doit contenir au moins <scheme>://<domain>"
 
-#: mod/admin.php:1351
+#: mod/admin.php:1415
 msgid "Site settings updated."
 msgstr "Réglages du site mis-à-jour."
 
-#: mod/admin.php:1379 mod/settings.php:908
+#: mod/admin.php:1444 mod/settings.php:893
 msgid "No special theme for mobile devices"
 msgstr "Pas de thème particulier pour les terminaux mobiles"
 
-#: mod/admin.php:1408
+#: mod/admin.php:1473
 msgid "No community page for local users"
-msgstr ""
+msgstr "Pas de page communauté pour les utilisateurs enregistrés"
 
-#: mod/admin.php:1409
+#: mod/admin.php:1474
 msgid "No community page"
 msgstr "Aucune page de communauté"
 
-#: mod/admin.php:1410
+#: mod/admin.php:1475
 msgid "Public postings from users of this site"
 msgstr "Publications publiques des utilisateurs de ce site"
 
-#: mod/admin.php:1411
+#: mod/admin.php:1476
 msgid "Public postings from the federated network"
-msgstr ""
+msgstr "Publications publiques du réseau fédéré"
 
-#: mod/admin.php:1412
+#: mod/admin.php:1477
 msgid "Public postings from local users and the federated network"
-msgstr ""
+msgstr "Publications publiques des utilisateurs du site et du réseau fédéré"
 
-#: mod/admin.php:1416 mod/admin.php:1585 mod/admin.php:1595
-#: src/Module/Contact.php:552
+#: mod/admin.php:1481 mod/admin.php:1682 mod/admin.php:1692
+#: src/Module/Contact.php:546
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: mod/admin.php:1418
+#: mod/admin.php:1483
 msgid "Users, Global Contacts"
 msgstr "Utilisateurs, Contacts Globaux"
 
-#: mod/admin.php:1419
+#: mod/admin.php:1484
 msgid "Users, Global Contacts/fallback"
 msgstr "Utilisateurs, Contacts Globaux/alternative"
 
-#: mod/admin.php:1423
+#: mod/admin.php:1488
 msgid "One month"
 msgstr "Un mois"
 
-#: mod/admin.php:1424
+#: mod/admin.php:1489
 msgid "Three months"
 msgstr "Trois mois"
 
-#: mod/admin.php:1425
+#: mod/admin.php:1490
 msgid "Half a year"
 msgstr "Six mois"
 
-#: mod/admin.php:1426
+#: mod/admin.php:1491
 msgid "One year"
 msgstr "Un an"
 
-#: mod/admin.php:1431
+#: mod/admin.php:1496
 msgid "Multi user instance"
 msgstr "Instance multi-utilisateurs"
 
-#: mod/admin.php:1457
+#: mod/admin.php:1520
 msgid "Closed"
 msgstr "Fermé"
 
-#: mod/admin.php:1458
+#: mod/admin.php:1521
 msgid "Requires approval"
 msgstr "Demande une apptrobation"
 
-#: mod/admin.php:1459
+#: mod/admin.php:1522
 msgid "Open"
 msgstr "Ouvert"
 
-#: mod/admin.php:1463
+#: mod/admin.php:1526
 msgid "No SSL policy, links will track page SSL state"
 msgstr "Pas de politique SSL, le liens conserveront l'état SSL de la page"
 
-#: mod/admin.php:1464
+#: mod/admin.php:1527
 msgid "Force all links to use SSL"
 msgstr "Forcer tous les liens à utiliser SSL"
 
-#: mod/admin.php:1465
+#: mod/admin.php:1528
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Certificat auto-signé, n'utiliser SSL que pour les liens locaux (non recommandé)"
 
-#: mod/admin.php:1469
+#: mod/admin.php:1532
 msgid "Don't check"
 msgstr "Ne pas rechercher"
 
-#: mod/admin.php:1470
+#: mod/admin.php:1533
 msgid "check the stable version"
 msgstr "Rechercher les versions stables"
 
-#: mod/admin.php:1471
+#: mod/admin.php:1534
 msgid "check the development version"
 msgstr "Rechercher les versions de développement"
 
-#: mod/admin.php:1490
-msgid "Republish users to directory"
-msgstr ""
+#: mod/admin.php:1556
+msgid "Database (legacy)"
+msgstr "Base de donnée (historique)"
 
-#: mod/admin.php:1491 mod/register.php:268
+#: mod/admin.php:1583
+msgid "Republish users to directory"
+msgstr "Republier les utilisateurs sur le répertoire"
+
+#: mod/admin.php:1584 src/Module/Register.php:121
 msgid "Registration"
 msgstr "Inscription"
 
-#: mod/admin.php:1492
+#: mod/admin.php:1585
 msgid "File upload"
 msgstr "Téléversement de fichier"
 
-#: mod/admin.php:1493
+#: mod/admin.php:1586
 msgid "Policies"
 msgstr "Politiques"
 
-#: mod/admin.php:1494 mod/events.php:561 src/Model/Profile.php:878
-#: src/Module/Contact.php:907
+#: mod/admin.php:1587 mod/events.php:555 src/Model/Profile.php:878
+#: src/Module/Contact.php:902
 msgid "Advanced"
 msgstr "Avancé"
 
-#: mod/admin.php:1495
+#: mod/admin.php:1588
 msgid "Auto Discovered Contact Directory"
 msgstr "Répertoire de Contacts Découverts Automatiquement"
 
-#: mod/admin.php:1496
+#: mod/admin.php:1589
 msgid "Performance"
 msgstr "Performance"
 
-#: mod/admin.php:1497
+#: mod/admin.php:1590
 msgid "Worker"
 msgstr "Worker"
 
-#: mod/admin.php:1498
+#: mod/admin.php:1591
 msgid "Message Relay"
-msgstr ""
+msgstr "Relai de publication"
 
-#: mod/admin.php:1499
+#: mod/admin.php:1592
 msgid "Relocate Instance"
-msgstr ""
+msgstr "Déménager le site"
 
-#: mod/admin.php:1500
+#: mod/admin.php:1593
 msgid "Warning! Advanced function. Could make this server unreachable."
-msgstr ""
+msgstr "Attention! Cette fonctionnalité avancée peut rendre votre site inaccessible."
 
-#: mod/admin.php:1503
+#: mod/admin.php:1597
 msgid "Site name"
 msgstr "Nom du site"
 
-#: mod/admin.php:1504
+#: mod/admin.php:1598
 msgid "Host name"
 msgstr "Nom de la machine hôte"
 
-#: mod/admin.php:1505
+#: mod/admin.php:1599
 msgid "Sender Email"
 msgstr "Courriel de l'émetteur"
 
-#: mod/admin.php:1505
+#: mod/admin.php:1599
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr "L'adresse courriel à partir de laquelle votre serveur enverra des courriels."
 
-#: mod/admin.php:1506
+#: mod/admin.php:1600
 msgid "Banner/Logo"
 msgstr "Bannière/Logo"
 
-#: mod/admin.php:1507
+#: mod/admin.php:1601
 msgid "Shortcut icon"
 msgstr "Icône de raccourci"
 
-#: mod/admin.php:1507
+#: mod/admin.php:1601
 msgid "Link to an icon that will be used for browsers."
 msgstr "Lien vers une icône qui sera utilisée pour les navigateurs."
 
-#: mod/admin.php:1508
+#: mod/admin.php:1602
 msgid "Touch icon"
 msgstr "Icône pour systèmes tactiles"
 
-#: mod/admin.php:1508
+#: mod/admin.php:1602
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr "Lien vers une icône qui sera utilisée pour les tablettes et les mobiles."
 
-#: mod/admin.php:1509
+#: mod/admin.php:1603
 msgid "Additional Info"
 msgstr "Informations supplémentaires"
 
-#: mod/admin.php:1509
+#: mod/admin.php:1603
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
-msgstr ""
+msgstr "Description publique destinée au <a href=\"%s\">répertoire global de sites Friendica</a>."
 
-#: mod/admin.php:1510
+#: mod/admin.php:1604
 msgid "System language"
 msgstr "Langue du système"
 
-#: mod/admin.php:1511
+#: mod/admin.php:1605
 msgid "System theme"
 msgstr "Thème du système"
 
-#: mod/admin.php:1511
+#: mod/admin.php:1605
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Thème par défaut sur ce site - peut être changé au niveau du profile utilisateur - <a href='#' id='cnftheme'>changer les réglages du thème</a>"
 
-#: mod/admin.php:1512
+#: mod/admin.php:1606
 msgid "Mobile system theme"
 msgstr "Thème mobile"
 
-#: mod/admin.php:1512
+#: mod/admin.php:1606
 msgid "Theme for mobile devices"
 msgstr "Thème pour les terminaux mobiles"
 
-#: mod/admin.php:1513
+#: mod/admin.php:1607
 msgid "SSL link policy"
 msgstr "Politique SSL pour les liens"
 
-#: mod/admin.php:1513
+#: mod/admin.php:1607
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Détermine si les liens générés doivent forcer l'utilisation de SSL"
 
-#: mod/admin.php:1514
+#: mod/admin.php:1608
 msgid "Force SSL"
 msgstr "SSL obligatoire"
 
-#: mod/admin.php:1514
+#: mod/admin.php:1608
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr "Redirige toutes les requêtes en clair vers des requêtes SSL. Attention : sur certains systèmes cela peut conduire à des boucles de redirection infinies."
 
-#: mod/admin.php:1515
+#: mod/admin.php:1609
 msgid "Hide help entry from navigation menu"
 msgstr "Cacher l'aide du menu de navigation"
 
-#: mod/admin.php:1515
+#: mod/admin.php:1609
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr "Cacher du menu de navigation l'entrée vers les pages d'aide. Vous pouvez toujours y accéder en tapant directement /help."
 
-#: mod/admin.php:1516
+#: mod/admin.php:1610
 msgid "Single user instance"
 msgstr "Instance mono-utilisateur"
 
-#: mod/admin.php:1516
+#: mod/admin.php:1610
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "Transformer cette en instance en multi-utilisateur ou mono-utilisateur pour cet l'utilisateur."
 
-#: mod/admin.php:1517
+#: mod/admin.php:1612
+msgid "File storage backend"
+msgstr "Destination du stockage de fichier"
+
+#: mod/admin.php:1612
+msgid ""
+"The backend used to store uploaded data. If you change the storage backend, "
+"you can manually move the existing files. If you do not do so, the files "
+"uploaded before the change will still be available at the old backend. "
+"Please see <a href=\"/help/Settings#1_2_3_1\">the settings documentation</a>"
+" for more information about the choices and the moving procedure."
+msgstr "La destination du stockage des fichiers. Si vous changez cette destination, vous pouvez migrer les fichiers existants. Si vous ne le faites pas, ils resteront accessibles à leur emplacement actuel. Veuillez consulter <a href=\"/help/Settings#1_2_3_1\">la page d'aide à la Configuration</a> (en anglais) pour plus d'information sur les choix possibles et la procédure de migration."
+
+#: mod/admin.php:1614
 msgid "Maximum image size"
 msgstr "Taille maximale des images"
 
-#: mod/admin.php:1517
+#: mod/admin.php:1614
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Taille maximale des images envoyées (en octets). 0 par défaut, c'est à dire \"aucune limite\"."
 
-#: mod/admin.php:1518
+#: mod/admin.php:1615
 msgid "Maximum image length"
 msgstr "Longueur maximale des images"
 
-#: mod/admin.php:1518
+#: mod/admin.php:1615
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Longueur maximale en pixels du plus long côté des images téléversées. La valeur par défaut est -1 : absence de limite."
 
-#: mod/admin.php:1519
+#: mod/admin.php:1616
 msgid "JPEG image quality"
 msgstr "Qualité JPEG des images"
 
-#: mod/admin.php:1519
+#: mod/admin.php:1616
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "Les JPEGs téléversés seront sauvegardés avec ce niveau de qualité [0-100]. La valeur par défaut est 100, soit la qualité maximale."
 
-#: mod/admin.php:1521
+#: mod/admin.php:1618
 msgid "Register policy"
 msgstr "Politique d'inscription"
 
-#: mod/admin.php:1522
+#: mod/admin.php:1619
 msgid "Maximum Daily Registrations"
 msgstr "Inscriptions maximum par jour"
 
-#: mod/admin.php:1522
+#: mod/admin.php:1619
 msgid ""
 "If registration is permitted above, this sets the maximum number of new user"
 " registrations to accept per day.  If register is set to closed, this "
 "setting has no effect."
 msgstr "Si les inscriptions sont permises ci-dessus, ceci fixe le nombre maximum d'inscriptions de nouveaux utilisateurs acceptées par jour. Si les inscriptions ne sont pas ouvertes, ce paramètre n'a aucun effet."
 
-#: mod/admin.php:1523
+#: mod/admin.php:1620
 msgid "Register text"
 msgstr "Texte d'inscription"
 
-#: mod/admin.php:1523
+#: mod/admin.php:1620
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
-msgstr ""
+msgstr "Ce texte est affiché sur la page d'inscription. Les BBCodes sont autorisés."
 
-#: mod/admin.php:1524
+#: mod/admin.php:1621
 msgid "Forbidden Nicknames"
-msgstr ""
+msgstr "Identifiants réservés"
 
-#: mod/admin.php:1524
+#: mod/admin.php:1621
 msgid ""
 "Comma separated list of nicknames that are forbidden from registration. "
 "Preset is a list of role names according RFC 2142."
-msgstr ""
+msgstr "Liste d'identifiants réservés séparés par des virgules. Ces identifiants ne peuvent pas être utilisés pour s'enregistrer. La liste de base provient de la RFC 2142."
 
-#: mod/admin.php:1525
+#: mod/admin.php:1622
 msgid "Accounts abandoned after x days"
 msgstr "Les comptes sont abandonnés après x jours"
 
-#: mod/admin.php:1525
+#: mod/admin.php:1622
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Pour ne pas gaspiller les ressources système, on cesse d'interroger les sites distants pour les comptes abandonnés. Mettre 0 pour désactiver cette fonction."
 
-#: mod/admin.php:1526
+#: mod/admin.php:1623
 msgid "Allowed friend domains"
 msgstr "Domaines autorisés"
 
-#: mod/admin.php:1526
+#: mod/admin.php:1623
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Une liste de domaines, séparés par des virgules, autorisés à établir des relations avec les utilisateurs de ce site. Les '*' sont acceptés. Laissez vide pour autoriser tous les domaines"
 
-#: mod/admin.php:1527
+#: mod/admin.php:1624
 msgid "Allowed email domains"
 msgstr "Domaines courriel autorisés"
 
-#: mod/admin.php:1527
+#: mod/admin.php:1624
 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 de domaines - séparés par des virgules - dont les adresses e-mail sont autorisées à s'inscrire sur ce site. Les '*' sont acceptées. Laissez vide pour autoriser tous les domaines"
 
-#: mod/admin.php:1528
+#: mod/admin.php:1625
 msgid "No OEmbed rich content"
-msgstr ""
+msgstr "Désactiver le texte riche avec OEmbed"
 
-#: mod/admin.php:1528
+#: mod/admin.php:1625
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
-msgstr ""
+msgstr "Evite le contenu riche avec OEmbed (comme un document PDF incrusté), sauf provenant des domaines autorisés listés ci-après."
 
-#: mod/admin.php:1529
+#: mod/admin.php:1626
 msgid "Allowed OEmbed domains"
-msgstr ""
+msgstr "Domaines autorisés pour OEmbed"
 
-#: mod/admin.php:1529
+#: mod/admin.php:1626
 msgid ""
 "Comma separated list of domains which oembed content is allowed to be "
 "displayed. Wildcards are accepted."
-msgstr ""
+msgstr "Liste de noms de domaine séparés par des virgules. Ces domaines peuvent afficher du contenu riche avec OEmbed."
 
-#: mod/admin.php:1530
+#: mod/admin.php:1627
 msgid "Block public"
 msgstr "Interdire la publication globale"
 
-#: mod/admin.php:1530
+#: mod/admin.php:1627
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Cocher pour bloquer les accès anonymes (non-connectés) à tout sauf aux pages personnelles publiques."
 
-#: mod/admin.php:1531
+#: mod/admin.php:1628
 msgid "Force publish"
 msgstr "Forcer la publication globale"
 
-#: mod/admin.php:1531
+#: mod/admin.php:1628
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Cocher pour publier obligatoirement tous les profils locaux dans l'annuaire du site."
 
-#: mod/admin.php:1531
+#: mod/admin.php:1628
 msgid "Enabling this may violate privacy laws like the GDPR"
-msgstr ""
+msgstr "Activer cette option peut potentiellement enfreindre les lois sur la protection de la vie privée comme le RGPD."
 
-#: mod/admin.php:1532
+#: mod/admin.php:1629
 msgid "Global directory URL"
 msgstr "URL de l'annuaire global"
 
-#: mod/admin.php:1532
+#: mod/admin.php:1629
 msgid ""
 "URL to the global directory. If this is not set, the global directory is "
 "completely unavailable to the application."
 msgstr "URL de l'annuaire global. Si ce champ n'est pas défini, l'annuaire global sera complètement indisponible pour l'application."
 
-#: mod/admin.php:1533
+#: mod/admin.php:1630
 msgid "Private posts by default for new users"
 msgstr "Publications privées par défaut pour les nouveaux utilisateurs"
 
-#: mod/admin.php:1533
+#: mod/admin.php:1630
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "Rendre les publications de tous les nouveaux utilisateurs accessibles seulement par le groupe de contacts par défaut, et non par tout le monde."
 
-#: mod/admin.php:1534
+#: mod/admin.php:1631
 msgid "Don't include post content in email notifications"
 msgstr "Ne pas inclure le contenu posté dans l'e-mail de notification"
 
-#: mod/admin.php:1534
+#: mod/admin.php:1631
 msgid ""
 "Don't include the content of a post/comment/private message/etc. in the "
 "email notifications that are sent out from this site, as a privacy measure."
 msgstr "Ne pas inclure le contenu de publication/commentaire/message privé/etc dans l'e-mail de notification qui est envoyé à partir du site, par mesure de confidentialité."
 
-#: mod/admin.php:1535
+#: mod/admin.php:1632
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr "Interdire l’accès public pour les greffons listées dans le menu apps."
 
-#: mod/admin.php:1535
+#: mod/admin.php:1632
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr "Cocher cette case restreint la liste des greffons dans le menu des applications seulement aux membres."
 
-#: mod/admin.php:1536
+#: mod/admin.php:1633
 msgid "Don't embed private images in posts"
 msgstr "Ne pas miniaturiser les images privées dans les publications"
 
-#: mod/admin.php:1536
+#: mod/admin.php:1633
 msgid ""
 "Don't replace locally-hosted private photos in posts with an embedded copy "
 "of the image. This means that contacts who receive posts containing private "
@@ -1861,258 +1922,258 @@ msgid ""
 "while."
 msgstr "Ne remplacez pas les images privées hébergées localement dans les publications avec une image attaché en copie, car cela signifie que le contact qui reçoit les publications contenant ces photos privées devra s’authentifier pour charger chaque image, ce qui peut prendre du temps."
 
-#: mod/admin.php:1537
+#: mod/admin.php:1634
 msgid "Explicit Content"
-msgstr ""
+msgstr "Contenu adulte"
 
-#: mod/admin.php:1537
+#: mod/admin.php:1634
 msgid ""
 "Set this to announce that your node is used mostly for explicit content that"
 " might not be suited for minors. This information will be published in the "
 "node information and might be used, e.g. by the global directory, to filter "
 "your node from listings of nodes to join. Additionally a note about this "
 "will be shown at the user registration page."
-msgstr ""
+msgstr "Activez cette option si votre site est principalement utilisé pour publier du contenu adulte. Cette information est publique et peut être utilisée pour filtrer votre site dans le répertoire de site global. Elle est également affichée sur la page d'inscription."
 
-#: mod/admin.php:1538
+#: mod/admin.php:1635
 msgid "Allow Users to set remote_self"
 msgstr "Autoriser les utilisateurs à définir remote_self"
 
-#: mod/admin.php:1538
+#: mod/admin.php:1635
 msgid ""
 "With checking this, every user is allowed to mark every contact as a "
 "remote_self in the repair contact dialog. Setting this flag on a contact "
 "causes mirroring every posting of that contact in the users stream."
 msgstr "Cocher cette case, permet à chaque utilisateur de marquer chaque contact comme un remote_self dans la boîte de dialogue de réparation des contacts. Activer cette fonction à un contact engendre la réplique de toutes les publications d'un contact dans le flux d'activités des utilisateurs."
 
-#: mod/admin.php:1539
+#: mod/admin.php:1636
 msgid "Block multiple registrations"
 msgstr "Interdire les inscriptions multiples"
 
-#: mod/admin.php:1539
+#: mod/admin.php:1636
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Ne pas permettre l'inscription de comptes multiples comme des pages."
 
-#: mod/admin.php:1540
-msgid "OpenID support"
-msgstr "Support OpenID"
+#: mod/admin.php:1637
+msgid "Disable OpenID"
+msgstr "Désactiver OpenID"
 
-#: mod/admin.php:1540
-msgid "OpenID support for registration and logins."
-msgstr "Supporter OpenID pour les inscriptions et connexions."
+#: mod/admin.php:1637
+msgid "Disable OpenID support for registration and logins."
+msgstr "Désactive OpenID pour l'inscription et l'identification."
 
-#: mod/admin.php:1541
-msgid "Fullname check"
-msgstr "Vérification du \"Prénom Nom\""
+#: mod/admin.php:1638
+msgid "No Fullname check"
+msgstr "Désactiver l'obligation de nom complet"
 
-#: mod/admin.php:1541
+#: mod/admin.php:1638
 msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr "Imposer l'utilisation d'un espace entre le prénom et le nom (dans le Nom complet), pour limiter les abus"
+"Allow users to register without a space between the first name and the last "
+"name in their full name."
+msgstr "Supprime l'obligation d'avoir au moins un espace dans le nom complet des utilisateurs pour séparer leur prénom et nom de famille."
 
-#: mod/admin.php:1542
+#: mod/admin.php:1639
 msgid "Community pages for visitors"
-msgstr ""
+msgstr "Affichage de la page communauté pour les utilisateurs anonymes"
 
-#: mod/admin.php:1542
+#: mod/admin.php:1639
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
-msgstr ""
+msgstr "Quelles pages communauté sont disponibles pour les utilisateurs anonymes."
 
-#: mod/admin.php:1543
+#: mod/admin.php:1640
 msgid "Posts per user on community page"
 msgstr "Nombre de publications par utilisateur sur la page de la communauté (n'est pas valide pour "
 
-#: mod/admin.php:1543
+#: mod/admin.php:1640
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr "Nombre maximal de publications par utilisateurs sur la page de la communauté (ne s'applique pas pour « Communauté globale »)."
 
-#: mod/admin.php:1544
-msgid "Enable OStatus support"
-msgstr "Activer le support d'OStatus"
+#: mod/admin.php:1641
+msgid "Disable OStatus support"
+msgstr "Désactiver OStatus"
 
-#: mod/admin.php:1544
+#: mod/admin.php:1641
 msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
+"Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
-msgstr "Fourni nativement la compatibilité avec OStatus (StatusNet, GNU Social etc.). Touts les communications utilisant OStatus sont public, des avertissements liés à la vie privée seront affichés si utile."
+msgstr "Désactive le support natif d'OStatus (StatusNet, GNU Social, etc...). Toutes les communications via OStatus sont publiques, donc des avertissements de protection de vie privée sont régulièrement affichés."
 
-#: mod/admin.php:1545
+#: mod/admin.php:1642
 msgid "Only import OStatus/ActivityPub threads from our contacts"
 msgstr ""
 
-#: mod/admin.php:1545
+#: mod/admin.php:1642
 msgid ""
 "Normally we import every content from our OStatus and ActivityPub contacts. "
 "With this option we only store threads that are started by a contact that is"
 " known on our system."
 msgstr ""
 
-#: mod/admin.php:1546
+#: mod/admin.php:1643
 msgid "OStatus support can only be enabled if threading is enabled."
 msgstr "Le support OStatus ne peut être activé que si l'imbrication des commentaires est activée."
 
-#: mod/admin.php:1548
+#: mod/admin.php:1645
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub"
 " directory."
 msgstr "Le support de Diaspora ne peut pas être activé parce que Friendica a été installé dans un sous-répertoire."
 
-#: mod/admin.php:1549
+#: mod/admin.php:1646
 msgid "Enable Diaspora support"
 msgstr "Activer le support de Diaspora"
 
-#: mod/admin.php:1549
+#: mod/admin.php:1646
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Fournir une compatibilité Diaspora intégrée."
 
-#: mod/admin.php:1550
+#: mod/admin.php:1647
 msgid "Only allow Friendica contacts"
 msgstr "N'autoriser que les contacts Friendica"
 
-#: mod/admin.php:1550
+#: mod/admin.php:1647
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "Tous les contacts doivent utiliser les protocoles de Friendica. Tous les autres protocoles de communication intégrés sont désactivés."
 
-#: mod/admin.php:1551
+#: mod/admin.php:1648
 msgid "Verify SSL"
 msgstr "Vérifier SSL"
 
-#: mod/admin.php:1551
+#: mod/admin.php:1648
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
 msgstr "Si vous le souhaitez, vous pouvez activier la vérification stricte des certificats. Cela signifie que vous ne pourrez pas vous connecter (du tout) aux sites SSL munis d'un certificat auto-signé."
 
-#: mod/admin.php:1552
+#: mod/admin.php:1649
 msgid "Proxy user"
 msgstr "Utilisateur du proxy"
 
-#: mod/admin.php:1553
+#: mod/admin.php:1650
 msgid "Proxy URL"
 msgstr "URL du proxy"
 
-#: mod/admin.php:1554
+#: mod/admin.php:1651
 msgid "Network timeout"
 msgstr "Dépassement du délai d'attente du réseau"
 
-#: mod/admin.php:1554
+#: mod/admin.php:1651
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Valeur en secondes. Mettre à 0 pour 'illimité' (pas recommandé)."
 
-#: mod/admin.php:1555
+#: mod/admin.php:1652
 msgid "Maximum Load Average"
 msgstr "Plafond de la charge moyenne"
 
-#: mod/admin.php:1555
+#: mod/admin.php:1652
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Charge système maximale à partir de laquelle l'émission et la réception seront soumises à un délai supplémentaire. Par défaut, 50."
 
-#: mod/admin.php:1556
+#: mod/admin.php:1653
 msgid "Maximum Load Average (Frontend)"
 msgstr "Plafond de la charge moyenne (frontale)"
 
-#: mod/admin.php:1556
+#: mod/admin.php:1653
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr "Limite de charge système pour le rendu des pages - défaut 50."
 
-#: mod/admin.php:1557
+#: mod/admin.php:1654
 msgid "Minimal Memory"
 msgstr ""
 
-#: mod/admin.php:1557
+#: mod/admin.php:1654
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
 msgstr ""
 
-#: mod/admin.php:1558
+#: mod/admin.php:1655
 msgid "Maximum table size for optimization"
 msgstr "Limite de taille de table pour l'optimisation"
 
-#: mod/admin.php:1558
+#: mod/admin.php:1655
 msgid ""
 "Maximum table size (in MB) for the automatic optimization. Enter -1 to "
 "disable it."
 msgstr ""
 
-#: mod/admin.php:1559
+#: mod/admin.php:1656
 msgid "Minimum level of fragmentation"
 msgstr "Seuil de fragmentation"
 
-#: mod/admin.php:1559
+#: mod/admin.php:1656
 msgid ""
 "Minimum fragmenation level to start the automatic optimization - default "
 "value is 30%."
 msgstr "Seuil de fragmentation pour que l'optimisation automatique se déclenche - défaut 30%."
 
-#: mod/admin.php:1561
+#: mod/admin.php:1658
 msgid "Periodical check of global contacts"
 msgstr "Vérification périodique des contacts globaux"
 
-#: mod/admin.php:1561
+#: mod/admin.php:1658
 msgid ""
 "If enabled, the global contacts are checked periodically for missing or "
 "outdated data and the vitality of the contacts and servers."
 msgstr "Si activé, les données manquantes et obsolètes et la vitalité des contacts et des serveurs seront vérifiées périodiquement dans les contacts globaux."
 
-#: mod/admin.php:1562
+#: mod/admin.php:1659
 msgid "Days between requery"
 msgstr "Nombre de jours entre les requêtes"
 
-#: mod/admin.php:1562
+#: mod/admin.php:1659
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr "Nombre de jours avant qu'une requête de contacts soient envoyée à nouveau à un serveur."
 
-#: mod/admin.php:1563
+#: mod/admin.php:1660
 msgid "Discover contacts from other servers"
 msgstr "Découvrir des contacts des autres serveurs"
 
-#: mod/admin.php:1563
+#: mod/admin.php:1660
 msgid ""
 "Periodically query other servers for contacts. You can choose between "
 "'users': the users on the remote system, 'Global Contacts': active contacts "
 "that are known on the system. The fallback is meant for Redmatrix servers "
 "and older friendica servers, where global contacts weren't available. The "
-"fallback increases the server load, so the recommened setting is 'Users, "
+"fallback increases the server load, so the recommended setting is 'Users, "
 "Global Contacts'."
 msgstr ""
 
-#: mod/admin.php:1564
+#: mod/admin.php:1661
 msgid "Timeframe for fetching global contacts"
 msgstr "Fréquence de récupération des contacts globaux"
 
-#: mod/admin.php:1564
+#: mod/admin.php:1661
 msgid ""
 "When the discovery is activated, this value defines the timeframe for the "
 "activity of the global contacts that are fetched from other servers."
 msgstr "Quand la découverte de contacts est activée, cette valeur détermine la fréquence de récupération des données des contacts globaux présents sur d'autres serveurs."
 
-#: mod/admin.php:1565
+#: mod/admin.php:1662
 msgid "Search the local directory"
 msgstr "Chercher dans le répertoire local"
 
-#: mod/admin.php:1565
+#: mod/admin.php:1662
 msgid ""
 "Search the local directory instead of the global directory. When searching "
 "locally, every search will be executed on the global directory in the "
 "background. This improves the search results when the search is repeated."
 msgstr "Cherche dans le répertoire local au lieu du répertoire local. Quand une recherche locale est effectuée, la même recherche est effectuée dans le répertoire global en tâche de fond. Cela améliore les résultats de la recherche si elle est réitérée."
 
-#: mod/admin.php:1567
+#: mod/admin.php:1664
 msgid "Publish server information"
 msgstr "Publier les informations du serveur"
 
-#: mod/admin.php:1567
+#: mod/admin.php:1664
 msgid ""
 "If enabled, general server and usage data will be published. The data "
 "contains the name and version of the server, number of users with public "
@@ -2120,50 +2181,50 @@ msgid ""
 " href='http://the-federation.info/'>the-federation.info</a> for details."
 msgstr "Si cette option est activée, des informations sur le serveur et son utilisation seront publiées. Ces informations incluent le nom et la version du serveur, le nombre d’utilisateurs avec des profils publics, le nombre de messages, les protocoles supportés et les connecteurs disponibles. Plus de détails sur <a href='http://the-federation.info/'>the-federation.info</a>."
 
-#: mod/admin.php:1569
+#: mod/admin.php:1666
 msgid "Check upstream version"
 msgstr "Mises à jour"
 
-#: mod/admin.php:1569
+#: mod/admin.php:1666
 msgid ""
 "Enables checking for new Friendica versions at github. If there is a new "
 "version, you will be informed in the admin panel overview."
 msgstr "Permet de vérifier la présence de nouvelles versions de Friendica sur github. Si une nouvelle version est disponible, vous recevrez une notification dans l'interface d'administration."
 
-#: mod/admin.php:1570
+#: mod/admin.php:1667
 msgid "Suppress Tags"
 msgstr "Masquer les tags"
 
-#: mod/admin.php:1570
+#: mod/admin.php:1667
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr "Ne pas afficher la liste des hashtags à la fin d’un message."
 
-#: mod/admin.php:1571
+#: mod/admin.php:1668
 msgid "Clean database"
 msgstr ""
 
-#: mod/admin.php:1571
+#: mod/admin.php:1668
 msgid ""
 "Remove old remote items, orphaned database records and old content from some"
 " other helper tables."
 msgstr ""
 
-#: mod/admin.php:1572
+#: mod/admin.php:1669
 msgid "Lifespan of remote items"
 msgstr ""
 
-#: mod/admin.php:1572
+#: mod/admin.php:1669
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "remote items will be deleted. Own items, and marked or filed items are "
 "always kept. 0 disables this behaviour."
 msgstr ""
 
-#: mod/admin.php:1573
+#: mod/admin.php:1670
 msgid "Lifespan of unclaimed items"
 msgstr ""
 
-#: mod/admin.php:1573
+#: mod/admin.php:1670
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "unclaimed remote items (mostly content from the relay) will be deleted. "
@@ -2171,141 +2232,141 @@ msgid ""
 "items if set to 0."
 msgstr ""
 
-#: mod/admin.php:1574
+#: mod/admin.php:1671
 msgid "Lifespan of raw conversation data"
 msgstr ""
 
-#: mod/admin.php:1574
+#: mod/admin.php:1671
 msgid ""
 "The conversation data is used for ActivityPub and OStatus, as well as for "
 "debug purposes. It should be safe to remove it after 14 days, default is 90 "
 "days."
 msgstr ""
 
-#: mod/admin.php:1575
+#: mod/admin.php:1672
 msgid "Path to item cache"
 msgstr "Chemin vers le cache des objets."
 
-#: mod/admin.php:1575
+#: mod/admin.php:1672
 msgid "The item caches buffers generated bbcode and external images."
 msgstr ""
 
-#: mod/admin.php:1576
+#: mod/admin.php:1673
 msgid "Cache duration in seconds"
 msgstr "Durée du cache en secondes"
 
-#: mod/admin.php:1576
+#: mod/admin.php:1673
 msgid ""
 "How long should the cache files be hold? Default value is 86400 seconds (One"
 " day). To disable the item cache, set the value to -1."
 msgstr "Combien de temps les fichiers de cache doivent être maintenu? La valeur par défaut est 86400 secondes (une journée). Pour désactiver le cache de l'item, définissez la valeur à -1."
 
-#: mod/admin.php:1577
+#: mod/admin.php:1674
 msgid "Maximum numbers of comments per post"
 msgstr "Nombre maximum de commentaires par publication"
 
-#: mod/admin.php:1577
+#: mod/admin.php:1674
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr "Combien de commentaires doivent être affichés pour chaque publication? Valeur par défaut: 100."
 
-#: mod/admin.php:1578
+#: mod/admin.php:1675
 msgid "Temp path"
 msgstr "Chemin des fichiers temporaires"
 
-#: mod/admin.php:1578
+#: mod/admin.php:1675
 msgid ""
 "If you have a restricted system where the webserver can't access the system "
 "temp path, enter another path here."
 msgstr "Si vous n'avez pas la possibilité d'avoir accès au répertoire temp, entrez un autre répertoire ici."
 
-#: mod/admin.php:1579
+#: mod/admin.php:1676
 msgid "Base path to installation"
 msgstr "Chemin de base de l'installation"
 
-#: mod/admin.php:1579
+#: mod/admin.php:1676
 msgid ""
 "If the system cannot detect the correct path to your installation, enter the"
 " correct path here. This setting should only be set if you are using a "
 "restricted system and symbolic links to your webroot."
 msgstr "Si le système ne peut pas détecter le chemin de l'installation, entrez le bon chemin ici. Ce paramètre doit être utilisé uniquement si vous avez des accès restreints à votre système et que vous n'avez qu'un lien symbolique vers le répertoire web."
 
-#: mod/admin.php:1580
+#: mod/admin.php:1677
 msgid "Disable picture proxy"
 msgstr "Désactiver le proxy image "
 
-#: mod/admin.php:1580
+#: mod/admin.php:1677
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
 " systems with very low bandwidth."
 msgstr ""
 
-#: mod/admin.php:1581
+#: mod/admin.php:1678
 msgid "Only search in tags"
 msgstr "Rechercher seulement dans les étiquettes"
 
-#: mod/admin.php:1581
+#: mod/admin.php:1678
 msgid "On large systems the text search can slow down the system extremely."
 msgstr "La recherche textuelle peut ralentir considérablement les systèmes de grande taille."
 
-#: mod/admin.php:1583
+#: mod/admin.php:1680
 msgid "New base url"
 msgstr "Nouvelle URL de base"
 
-#: mod/admin.php:1583
+#: mod/admin.php:1680
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and"
 " Diaspora* contacts of all users."
 msgstr ""
 
-#: mod/admin.php:1585
+#: mod/admin.php:1682
 msgid "RINO Encryption"
 msgstr "Chiffrement RINO"
 
-#: mod/admin.php:1585
+#: mod/admin.php:1682
 msgid "Encryption layer between nodes."
 msgstr "Couche de chiffrement entre les nœuds du réseau."
 
-#: mod/admin.php:1585
+#: mod/admin.php:1682
 msgid "Enabled"
 msgstr ""
 
-#: mod/admin.php:1587
+#: mod/admin.php:1684
 msgid "Maximum number of parallel workers"
 msgstr "Nombre maximum de processus simultanés"
 
-#: mod/admin.php:1587
+#: mod/admin.php:1684
 #, php-format
 msgid ""
 "On shared hosters set this to %d. On larger systems, values of %d are great."
 " Default value is %d."
 msgstr ""
 
-#: mod/admin.php:1588
+#: mod/admin.php:1685
 msgid "Don't use 'proc_open' with the worker"
 msgstr "Ne pas utiliser 'proc_open' pour les tâches de fond"
 
-#: mod/admin.php:1588
+#: mod/admin.php:1685
 msgid ""
 "Enable this if your system doesn't allow the use of 'proc_open'. This can "
 "happen on shared hosters. If this is enabled you should increase the "
 "frequency of worker calls in your crontab."
 msgstr "Activez cette option si votre système ne permet pas d'utiliser 'proc_open'. Cela peut être le cas sur les hébergements partagés. Si vous activez cette option, vous devriez augmenter la fréquence d'appel du \"worker\" dans crontab."
 
-#: mod/admin.php:1589
+#: mod/admin.php:1686
 msgid "Enable fastlane"
 msgstr ""
 
-#: mod/admin.php:1589
+#: mod/admin.php:1686
 msgid ""
 "When enabed, the fastlane mechanism starts an additional worker if processes"
 " with higher priority are blocked by processes of lower priority."
 msgstr ""
 
-#: mod/admin.php:1590
+#: mod/admin.php:1687
 msgid "Enable frontend worker"
 msgstr ""
 
-#: mod/admin.php:1590
+#: mod/admin.php:1687
 #, php-format
 msgid ""
 "When enabled the Worker process is triggered when backend access is "
@@ -2315,136 +2376,136 @@ msgid ""
 " on your server."
 msgstr ""
 
-#: mod/admin.php:1592
+#: mod/admin.php:1689
 msgid "Subscribe to relay"
 msgstr ""
 
-#: mod/admin.php:1592
+#: mod/admin.php:1689
 msgid ""
 "Enables the receiving of public posts from the relay. They will be included "
 "in the search, subscribed tags and on the global community page."
 msgstr ""
 
-#: mod/admin.php:1593
+#: mod/admin.php:1690
 msgid "Relay server"
 msgstr ""
 
-#: mod/admin.php:1593
+#: mod/admin.php:1690
 msgid ""
 "Address of the relay server where public posts should be send to. For "
 "example https://relay.diasp.org"
 msgstr ""
 
-#: mod/admin.php:1594
+#: mod/admin.php:1691
 msgid "Direct relay transfer"
 msgstr ""
 
-#: mod/admin.php:1594
+#: mod/admin.php:1691
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr ""
 
-#: mod/admin.php:1595
+#: mod/admin.php:1692
 msgid "Relay scope"
 msgstr ""
 
-#: mod/admin.php:1595
+#: mod/admin.php:1692
 msgid ""
 "Can be 'all' or 'tags'. 'all' means that every public post should be "
 "received. 'tags' means that only posts with selected tags should be "
 "received."
 msgstr ""
 
-#: mod/admin.php:1595
+#: mod/admin.php:1692
 msgid "all"
 msgstr ""
 
-#: mod/admin.php:1595
+#: mod/admin.php:1692
 msgid "tags"
 msgstr ""
 
-#: mod/admin.php:1596
+#: mod/admin.php:1693
 msgid "Server tags"
 msgstr ""
 
-#: mod/admin.php:1596
+#: mod/admin.php:1693
 msgid "Comma separated list of tags for the 'tags' subscription."
 msgstr ""
 
-#: mod/admin.php:1597
+#: mod/admin.php:1694
 msgid "Allow user tags"
 msgstr ""
 
-#: mod/admin.php:1597
+#: mod/admin.php:1694
 msgid ""
 "If enabled, the tags from the saved searches will used for the 'tags' "
 "subscription in addition to the 'relay_server_tags'."
 msgstr ""
 
-#: mod/admin.php:1600
+#: mod/admin.php:1697
 msgid "Start Relocation"
 msgstr ""
 
-#: mod/admin.php:1626
+#: mod/admin.php:1724
 msgid "Update has been marked successful"
 msgstr "Mise-à-jour validée comme 'réussie'"
 
-#: mod/admin.php:1633
+#: mod/admin.php:1731
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr "La structure de base de données pour la mise à jour %s a été appliquée avec succès."
 
-#: mod/admin.php:1637
+#: mod/admin.php:1735
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr "L'exécution de la mise à jour %s pour la structure de base de données a échoué avec l'erreur: %s"
 
-#: mod/admin.php:1653
+#: mod/admin.php:1751
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr "L'exécution %s a échoué avec l'erreur: %s"
 
-#: mod/admin.php:1655
+#: mod/admin.php:1753
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Mise-à-jour %s appliquée avec succès."
 
-#: mod/admin.php:1658
+#: mod/admin.php:1756
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "La mise-à-jour %s n'a pas retourné de détails. Impossible de savoir si elle a réussi."
 
-#: mod/admin.php:1661
+#: mod/admin.php:1759
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr "Il n'y avait aucune fonction supplémentaire de mise à jour %s qui devait être appelé"
 
-#: mod/admin.php:1684
+#: mod/admin.php:1782
 msgid "No failed updates."
 msgstr "Pas de mises-à-jour échouées."
 
-#: mod/admin.php:1685
+#: mod/admin.php:1783
 msgid "Check database structure"
 msgstr "Vérifier la structure de la base de données"
 
-#: mod/admin.php:1690
+#: mod/admin.php:1788
 msgid "Failed Updates"
 msgstr "Mises-à-jour échouées"
 
-#: mod/admin.php:1691
+#: mod/admin.php:1789
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "Ceci n'inclut pas les versions antérieures à la 1139, qui ne retournaient jamais de détails."
 
-#: mod/admin.php:1692
+#: mod/admin.php:1790
 msgid "Mark success (if update was manually applied)"
 msgstr "Marquer comme 'réussie' (dans le cas d'une mise-à-jour manuelle)"
 
-#: mod/admin.php:1693
+#: mod/admin.php:1791
 msgid "Attempt to execute this update step automatically"
 msgstr "Tenter d'éxecuter cette étape automatiquement"
 
-#: mod/admin.php:1732
+#: mod/admin.php:1831
 #, php-format
 msgid ""
 "\n"
@@ -2452,7 +2513,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr "\n\t\t\tChère/Cher %1$s,\n\t\t\t\tL’administrateur de %2$s vous a ouvert un compte."
 
-#: mod/admin.php:1735
+#: mod/admin.php:1834
 #, php-format
 msgid ""
 "\n"
@@ -2484,221 +2545,225 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: mod/admin.php:1772 src/Model/User.php:773
+#: mod/admin.php:1871 src/Model/User.php:858
 #, php-format
 msgid "Registration details for %s"
 msgstr "Détails d'inscription pour %s"
 
-#: mod/admin.php:1782
+#: mod/admin.php:1881
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s utilisateur a (dé)bloqué"
 msgstr[1] "%s utilisateurs ont (dé)bloqué"
 
-#: mod/admin.php:1789 mod/admin.php:1842
+#: mod/admin.php:1888 mod/admin.php:1942
 msgid "You can't remove yourself"
 msgstr ""
 
-#: mod/admin.php:1792
+#: mod/admin.php:1891
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s utilisateur supprimé"
 msgstr[1] "%s utilisateurs supprimés"
 
-#: mod/admin.php:1840
+#: mod/admin.php:1940
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Utilisateur '%s' supprimé"
 
-#: mod/admin.php:1851
+#: mod/admin.php:1951
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Utilisateur '%s' débloqué"
 
-#: mod/admin.php:1851
+#: mod/admin.php:1951
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Utilisateur '%s' bloqué"
 
-#: mod/admin.php:1899 mod/settings.php:1064
+#: mod/admin.php:1999 mod/settings.php:1049
 msgid "Normal Account Page"
 msgstr "Compte normal"
 
-#: mod/admin.php:1900 mod/settings.php:1068
+#: mod/admin.php:2000 mod/settings.php:1053
 msgid "Soapbox Page"
 msgstr "Compte \"boîte à savon\""
 
-#: mod/admin.php:1901 mod/settings.php:1072
+#: mod/admin.php:2001 mod/settings.php:1057
 msgid "Public Forum"
 msgstr "Forum public"
 
-#: mod/admin.php:1902 mod/settings.php:1076
+#: mod/admin.php:2002 mod/settings.php:1061
 msgid "Automatic Friend Page"
 msgstr "Compte d' \"amitié automatique\""
 
-#: mod/admin.php:1903
+#: mod/admin.php:2003
 msgid "Private Forum"
 msgstr ""
 
-#: mod/admin.php:1906 mod/settings.php:1048
+#: mod/admin.php:2006 mod/settings.php:1033
 msgid "Personal Page"
 msgstr "Page personnelle"
 
-#: mod/admin.php:1907 mod/settings.php:1052
+#: mod/admin.php:2007 mod/settings.php:1037
 msgid "Organisation Page"
 msgstr ""
 
-#: mod/admin.php:1908 mod/settings.php:1056
+#: mod/admin.php:2008 mod/settings.php:1041
 msgid "News Page"
 msgstr "Page d'informations"
 
-#: mod/admin.php:1909 mod/settings.php:1060
+#: mod/admin.php:2009 mod/settings.php:1045
 msgid "Community Forum"
 msgstr ""
 
-#: mod/admin.php:1955 mod/admin.php:1966 mod/admin.php:1980 mod/admin.php:1998
-#: src/Content/ContactSelector.php:84
+#: mod/admin.php:2010
+msgid "Relay"
+msgstr ""
+
+#: mod/admin.php:2056 mod/admin.php:2067 mod/admin.php:2081 mod/admin.php:2099
+#: src/Content/ContactSelector.php:86
 msgid "Email"
 msgstr "Courriel"
 
-#: mod/admin.php:1955 mod/admin.php:1980
+#: mod/admin.php:2056 mod/admin.php:2081
 msgid "Register date"
 msgstr "Date d'inscription"
 
-#: mod/admin.php:1955 mod/admin.php:1980
+#: mod/admin.php:2056 mod/admin.php:2081
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: mod/admin.php:1955 mod/admin.php:1980
+#: mod/admin.php:2056 mod/admin.php:2081
 msgid "Last item"
 msgstr "Dernier élément"
 
-#: mod/admin.php:1955
+#: mod/admin.php:2056
 msgid "Type"
 msgstr ""
 
-#: mod/admin.php:1962
+#: mod/admin.php:2063
 msgid "Add User"
 msgstr "Ajouter l'utilisateur"
 
-#: mod/admin.php:1964
+#: mod/admin.php:2065
 msgid "User registrations waiting for confirm"
 msgstr "Inscriptions d'utilisateurs en attente de confirmation"
 
-#: mod/admin.php:1965
+#: mod/admin.php:2066
 msgid "User waiting for permanent deletion"
 msgstr "Utilisateur en attente de suppression définitive"
 
-#: mod/admin.php:1966
+#: mod/admin.php:2067
 msgid "Request date"
 msgstr "Date de la demande"
 
-#: mod/admin.php:1967
+#: mod/admin.php:2068
 msgid "No registrations."
 msgstr "Pas d'inscriptions."
 
-#: mod/admin.php:1968
+#: mod/admin.php:2069
 msgid "Note from the user"
 msgstr ""
 
-#: mod/admin.php:1969 mod/notifications.php:181 mod/notifications.php:267
+#: mod/admin.php:2070 mod/notifications.php:183 mod/notifications.php:269
 msgid "Approve"
 msgstr "Approuver"
 
-#: mod/admin.php:1970
+#: mod/admin.php:2071
 msgid "Deny"
 msgstr "Rejetter"
 
-#: mod/admin.php:1973
+#: mod/admin.php:2074
 msgid "User blocked"
 msgstr ""
 
-#: mod/admin.php:1975
+#: mod/admin.php:2076
 msgid "Site admin"
 msgstr "Administration du Site"
 
-#: mod/admin.php:1976
+#: mod/admin.php:2077
 msgid "Account expired"
 msgstr "Compte expiré"
 
-#: mod/admin.php:1979
+#: mod/admin.php:2080
 msgid "New User"
 msgstr "Nouvel utilisateur"
 
-#: mod/admin.php:1980
-msgid "Delete in"
+#: mod/admin.php:2081
+msgid "Permanent deletion"
 msgstr ""
 
-#: mod/admin.php:1985
+#: mod/admin.php:2086
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Les utilisateurs sélectionnés vont être supprimés!\\n\\nTout ce qu'ils ont posté sur ce site sera définitivement effacé!\\n\\nÊtes-vous certain?"
 
-#: mod/admin.php:1986
+#: mod/admin.php:2087
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "L'utilisateur {0} va être supprimé!\\n\\nTout ce qu'il a posté sur ce site sera définitivement perdu!\\n\\nÊtes-vous certain?"
 
-#: mod/admin.php:1996
+#: mod/admin.php:2097
 msgid "Name of the new user."
 msgstr "Nom du nouvel utilisateur."
 
-#: mod/admin.php:1997
+#: mod/admin.php:2098
 msgid "Nickname"
 msgstr "Pseudo"
 
-#: mod/admin.php:1997
+#: mod/admin.php:2098
 msgid "Nickname of the new user."
 msgstr "Pseudo du nouvel utilisateur."
 
-#: mod/admin.php:1998
+#: mod/admin.php:2099
 msgid "Email address of the new user."
 msgstr "Adresse mail du nouvel utilisateur."
 
-#: mod/admin.php:2039
+#: mod/admin.php:2141
 #, php-format
 msgid "Addon %s disabled."
 msgstr ""
 
-#: mod/admin.php:2042
+#: mod/admin.php:2144
 #, php-format
 msgid "Addon %s enabled."
 msgstr ""
 
-#: mod/admin.php:2053 mod/admin.php:2302
+#: mod/admin.php:2155 mod/admin.php:2405
 msgid "Disable"
 msgstr "Désactiver"
 
-#: mod/admin.php:2056 mod/admin.php:2305
+#: mod/admin.php:2158 mod/admin.php:2408
 msgid "Enable"
 msgstr "Activer"
 
-#: mod/admin.php:2078 mod/admin.php:2348
+#: mod/admin.php:2180 mod/admin.php:2437
 msgid "Toggle"
 msgstr "Activer/Désactiver"
 
-#: mod/admin.php:2079 mod/admin.php:2349 mod/newmember.php:19
-#: mod/settings.php:136 src/Content/Nav.php:260 view/theme/frio/theme.php:283
+#: mod/admin.php:2181 mod/admin.php:2438 mod/newmember.php:20
+#: mod/settings.php:136 view/theme/frio/theme.php:272 src/Content/Nav.php:263
 msgid "Settings"
 msgstr "Réglages"
 
-#: mod/admin.php:2086 mod/admin.php:2357
+#: mod/admin.php:2188 mod/admin.php:2446
 msgid "Author: "
 msgstr "Auteur : "
 
-#: mod/admin.php:2087 mod/admin.php:2358
+#: mod/admin.php:2189 mod/admin.php:2447
 msgid "Maintainer: "
 msgstr "Mainteneur : "
 
-#: mod/admin.php:2139
+#: mod/admin.php:2241
 msgid "Reload active addons"
 msgstr ""
 
-#: mod/admin.php:2144
+#: mod/admin.php:2246
 #, php-format
 msgid ""
 "There are currently no addons available on your node. You can find the "
@@ -2706,70 +2771,70 @@ msgid ""
 " the open addon registry at %2$s"
 msgstr ""
 
-#: mod/admin.php:2264
+#: mod/admin.php:2367
 msgid "No themes found."
 msgstr "Aucun thème trouvé."
 
-#: mod/admin.php:2339
+#: mod/admin.php:2428
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
-#: mod/admin.php:2393
+#: mod/admin.php:2482
 msgid "Reload active themes"
 msgstr "Recharger les thèmes actifs"
 
-#: mod/admin.php:2398
+#: mod/admin.php:2487
 #, php-format
 msgid "No themes found on the system. They should be placed in %1$s"
 msgstr ""
 
-#: mod/admin.php:2399
+#: mod/admin.php:2488
 msgid "[Experimental]"
 msgstr "[Expérimental]"
 
-#: mod/admin.php:2400
+#: mod/admin.php:2489
 msgid "[Unsupported]"
 msgstr "[Non supporté]"
 
-#: mod/admin.php:2424
+#: mod/admin.php:2514
 msgid "Log settings updated."
 msgstr "Réglages des journaux mis-à-jour."
 
-#: mod/admin.php:2457
+#: mod/admin.php:2547
 msgid "PHP log currently enabled."
 msgstr "Log PHP actuellement activé."
 
-#: mod/admin.php:2459
+#: mod/admin.php:2549
 msgid "PHP log currently disabled."
 msgstr "Log PHP actuellement desactivé."
 
-#: mod/admin.php:2468
+#: mod/admin.php:2558
 msgid "Clear"
 msgstr "Effacer"
 
-#: mod/admin.php:2472
+#: mod/admin.php:2562
 msgid "Enable Debugging"
 msgstr "Activer le déboggage"
 
-#: mod/admin.php:2473
+#: mod/admin.php:2563
 msgid "Log file"
 msgstr "Fichier de journaux"
 
-#: mod/admin.php:2473
+#: mod/admin.php:2563
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Accès en écriture par le serveur web requis. Relatif à la racine de votre installation de Friendica."
 
-#: mod/admin.php:2474
+#: mod/admin.php:2564
 msgid "Log level"
 msgstr "Niveau de journalisaton"
 
-#: mod/admin.php:2476
+#: mod/admin.php:2566
 msgid "PHP logging"
 msgstr "Log PHP"
 
-#: mod/admin.php:2477
+#: mod/admin.php:2567
 msgid ""
 "To temporarily enable logging of PHP errors and warnings you can prepend the"
 " following to the index.php file of your installation. The filename set in "
@@ -2778,94 +2843,74 @@ msgid ""
 "'display_errors' is to enable these options, set to '0' to disable them."
 msgstr ""
 
-#: mod/admin.php:2508
+#: mod/admin.php:2599
 #, php-format
 msgid ""
 "Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see "
 "if file %1$s exist and is readable."
 msgstr ""
 
-#: mod/admin.php:2512
+#: mod/admin.php:2603
 #, php-format
 msgid ""
 "Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file"
 " %1$s is readable."
 msgstr ""
 
-#: mod/admin.php:2603 mod/admin.php:2604 mod/settings.php:778
+#: mod/admin.php:2696 mod/admin.php:2697 mod/settings.php:763
 msgid "Off"
 msgstr "Éteint"
 
-#: mod/admin.php:2603 mod/admin.php:2604 mod/settings.php:778
+#: mod/admin.php:2696 mod/admin.php:2697 mod/settings.php:763
 msgid "On"
 msgstr "Allumé"
 
-#: mod/admin.php:2604
+#: mod/admin.php:2697
 #, php-format
 msgid "Lock feature %s"
 msgstr "Verouiller la fonctionnalité %s"
 
-#: mod/admin.php:2612
+#: mod/admin.php:2705
 msgid "Manage Additional Features"
 msgstr "Gérer les fonctionnalités avancées"
 
-#: mod/allfriends.php:54
+#: mod/allfriends.php:52
 msgid "No friends to display."
 msgstr "Pas d'amis à afficher."
 
-#: mod/allfriends.php:93 mod/dirfind.php:219 mod/match.php:107
-#: mod/suggest.php:105 src/Content/Widget.php:41 src/Model/Profile.php:309
+#: mod/allfriends.php:89 mod/dirfind.php:217 mod/match.php:102
+#: mod/suggest.php:106 src/Content/Widget.php:39 src/Model/Profile.php:313
 msgid "Connect"
 msgstr "Se connecter"
 
-#: mod/api.php:87 mod/api.php:109
+#: mod/api.php:84 mod/api.php:106
 msgid "Authorize application connection"
 msgstr "Autoriser l'application à se connecter"
 
-#: mod/api.php:88
+#: mod/api.php:85
 msgid "Return to your app and insert this Securty Code:"
 msgstr "Retournez à votre application et saisissez ce Code de Sécurité : "
 
-#: mod/api.php:97
+#: mod/api.php:94
 msgid "Please login to continue."
 msgstr "Merci de vous connecter pour continuer."
 
-#: mod/api.php:111
+#: mod/api.php:108
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
 msgstr "Voulez-vous autoriser cette application à accéder à vos publications et contacts, et/ou à créer des billets à votre place?"
 
-#: mod/api.php:113 mod/dfrn_request.php:648 mod/follow.php:154
-#: mod/profiles.php:542 mod/profiles.php:546 mod/profiles.php:567
-#: mod/register.php:240 mod/settings.php:1100 mod/settings.php:1106
-#: mod/settings.php:1113 mod/settings.php:1117 mod/settings.php:1121
-#: mod/settings.php:1125 mod/settings.php:1129 mod/settings.php:1133
-#: mod/settings.php:1153 mod/settings.php:1154 mod/settings.php:1155
-#: mod/settings.php:1156 mod/settings.php:1157
+#: mod/api.php:110 mod/dfrn_request.php:640 mod/follow.php:150
+#: mod/profiles.php:526 mod/profiles.php:530 mod/profiles.php:551
+#: mod/settings.php:1085 mod/settings.php:1091 mod/settings.php:1098
+#: mod/settings.php:1102 mod/settings.php:1106 mod/settings.php:1110
+#: mod/settings.php:1114 mod/settings.php:1118 mod/settings.php:1138
+#: mod/settings.php:1139 mod/settings.php:1140 mod/settings.php:1141
+#: mod/settings.php:1142 src/Module/Register.php:98
 msgid "No"
 msgstr "Non"
 
-#: mod/apps.php:15 src/App.php:1656
-msgid "You must be logged in to use addons. "
-msgstr "Vous devez être connecté pour utiliser les greffons."
-
-#: mod/apps.php:20
-msgid "Applications"
-msgstr "Applications"
-
-#: mod/apps.php:25
-msgid "No installed applications."
-msgstr "Pas d'application installée."
-
-#: mod/attach.php:16
-msgid "Item not available."
-msgstr "Elément non disponible."
-
-#: mod/attach.php:26
-msgid "Item was not found."
-msgstr "Element introuvable."
-
 #: mod/babel.php:25
 msgid "Source input"
 msgstr ""
@@ -2902,193 +2947,201 @@ msgstr ""
 msgid "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
 msgstr ""
 
-#: mod/babel.php:79
+#: mod/babel.php:83
+msgid "Item Body"
+msgstr ""
+
+#: mod/babel.php:87
+msgid "Item Tags"
+msgstr ""
+
+#: mod/babel.php:94
 msgid "Source input (Diaspora format)"
 msgstr ""
 
-#: mod/babel.php:85
+#: mod/babel.php:100
 msgid "Markdown::convert (raw HTML)"
 msgstr ""
 
-#: mod/babel.php:90
+#: mod/babel.php:105
 msgid "Markdown::convert"
 msgstr ""
 
-#: mod/babel.php:96
+#: mod/babel.php:111
 msgid "Markdown::toBBCode"
 msgstr ""
 
-#: mod/babel.php:103
+#: mod/babel.php:118
 msgid "Raw HTML input"
 msgstr ""
 
-#: mod/babel.php:108
+#: mod/babel.php:123
 msgid "HTML Input"
 msgstr ""
 
-#: mod/babel.php:114
+#: mod/babel.php:129
 msgid "HTML::toBBCode"
 msgstr ""
 
-#: mod/babel.php:120
+#: mod/babel.php:135
 msgid "HTML::toBBCode => BBCode::convert"
 msgstr ""
 
-#: mod/babel.php:125
+#: mod/babel.php:140
 msgid "HTML::toBBCode => BBCode::convert (raw HTML)"
 msgstr ""
 
-#: mod/babel.php:131
+#: mod/babel.php:146
 msgid "HTML::toMarkdown"
 msgstr ""
 
-#: mod/babel.php:137
+#: mod/babel.php:152
 msgid "HTML::toPlaintext"
 msgstr ""
 
-#: mod/babel.php:145
+#: mod/babel.php:160
 msgid "Source text"
 msgstr ""
 
-#: mod/babel.php:146
+#: mod/babel.php:161
 msgid "BBCode"
 msgstr ""
 
-#: mod/babel.php:147
+#: mod/babel.php:162
 msgid "Markdown"
 msgstr ""
 
-#: mod/babel.php:148
+#: mod/babel.php:163
 msgid "HTML"
 msgstr ""
 
-#: mod/bookmarklet.php:25 src/Content/Nav.php:167 src/Module/Login.php:322
+#: mod/bookmarklet.php:22 src/Content/Nav.php:170 src/Module/Login.php:322
 msgid "Login"
 msgstr "Connexion"
 
-#: mod/bookmarklet.php:35
+#: mod/bookmarklet.php:32
 msgid "Bad Request"
 msgstr ""
 
-#: mod/bookmarklet.php:57
+#: mod/bookmarklet.php:54
 msgid "The post was created"
 msgstr "La publication a été créée"
 
-#: mod/cal.php:35 mod/cal.php:39 mod/community.php:38 mod/follow.php:21
+#: mod/cal.php:34 mod/cal.php:38 mod/community.php:39 mod/follow.php:20
 #: mod/viewcontacts.php:23 mod/viewcontacts.php:27 mod/viewsrc.php:13
 msgid "Access denied."
 msgstr "Accès refusé."
 
-#: mod/cal.php:47 mod/dfrn_poll.php:493 mod/help.php:67
-#: mod/viewcontacts.php:38 src/App.php:1707
+#: mod/cal.php:46 mod/dfrn_poll.php:486 mod/help.php:68
+#: mod/viewcontacts.php:34 src/App.php:1402
 msgid "Page not found."
 msgstr "Page introuvable."
 
-#: mod/cal.php:142 mod/display.php:311 mod/profile.php:190
+#: mod/cal.php:141 mod/display.php:309 src/Module/Profile.php:168
 msgid "Access to this profile has been restricted."
 msgstr "L'accès au profil a été restreint."
 
-#: mod/cal.php:274 mod/events.php:390 src/Content/Nav.php:157
-#: src/Content/Nav.php:223 src/Model/Profile.php:937 src/Model/Profile.php:948
-#: view/theme/frio/theme.php:277 view/theme/frio/theme.php:281
+#: mod/cal.php:273 mod/events.php:384 view/theme/frio/theme.php:266
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:160
+#: src/Content/Nav.php:226 src/Model/Profile.php:937 src/Model/Profile.php:948
 msgid "Events"
 msgstr "Événements"
 
-#: mod/cal.php:275 mod/events.php:391
+#: mod/cal.php:274 mod/events.php:385
 msgid "View"
 msgstr "Vue"
 
-#: mod/cal.php:276 mod/events.php:393
+#: mod/cal.php:275 mod/events.php:387
 msgid "Previous"
 msgstr "Précédent"
 
-#: mod/cal.php:277 mod/events.php:394 src/Module/Install.php:135
+#: mod/cal.php:276 mod/events.php:388 src/Module/Install.php:133
 msgid "Next"
 msgstr "Suivant"
 
-#: mod/cal.php:280 mod/events.php:399 src/Model/Event.php:430
+#: mod/cal.php:279 mod/events.php:393 src/Model/Event.php:429
 msgid "today"
 msgstr "aujourd'hui"
 
-#: mod/cal.php:281 mod/events.php:400 src/Model/Event.php:431
-#: src/Util/Temporal.php:312
+#: mod/cal.php:280 mod/events.php:394 src/Util/Temporal.php:314
+#: src/Model/Event.php:430
 msgid "month"
 msgstr "mois"
 
-#: mod/cal.php:282 mod/events.php:401 src/Model/Event.php:432
-#: src/Util/Temporal.php:313
+#: mod/cal.php:281 mod/events.php:395 src/Util/Temporal.php:315
+#: src/Model/Event.php:431
 msgid "week"
 msgstr "semaine"
 
-#: mod/cal.php:283 mod/events.php:402 src/Model/Event.php:433
-#: src/Util/Temporal.php:314
+#: mod/cal.php:282 mod/events.php:396 src/Util/Temporal.php:316
+#: src/Model/Event.php:432
 msgid "day"
 msgstr "jour"
 
-#: mod/cal.php:284 mod/events.php:403
+#: mod/cal.php:283 mod/events.php:397
 msgid "list"
 msgstr ""
 
-#: mod/cal.php:297 src/Core/Console/NewPassword.php:68 src/Model/User.php:260
+#: mod/cal.php:296 src/Core/Console/NewPassword.php:67 src/Model/User.php:323
 msgid "User not found"
 msgstr "Utilisateur introuvable"
 
-#: mod/cal.php:313
+#: mod/cal.php:312
 msgid "This calendar format is not supported"
 msgstr "Format de calendrier inconnu"
 
-#: mod/cal.php:315
+#: mod/cal.php:314
 msgid "No exportable data found"
 msgstr "Rien à exporter"
 
-#: mod/cal.php:332
+#: mod/cal.php:331
 msgid "calendar"
 msgstr "calendrier"
 
-#: mod/common.php:92
+#: mod/common.php:90
 msgid "No contacts in common."
 msgstr "Pas de contacts en commun."
 
-#: mod/common.php:143 src/Module/Contact.php:897
+#: mod/common.php:141 src/Module/Contact.php:892
 msgid "Common Friends"
 msgstr "Amis communs"
 
-#: mod/community.php:31 mod/dfrn_request.php:602 mod/directory.php:43
-#: mod/display.php:203 mod/photos.php:945 mod/probe.php:13 mod/search.php:106
-#: mod/search.php:112 mod/videos.php:194 mod/viewcontacts.php:51
+#: mod/community.php:32 mod/dfrn_request.php:597 mod/directory.php:43
+#: mod/display.php:209 mod/photos.php:903 mod/probe.php:13 mod/search.php:96
+#: mod/search.php:102 mod/videos.php:147 mod/viewcontacts.php:46
 #: mod/webfinger.php:16
 msgid "Public access denied."
 msgstr "Accès public refusé."
 
-#: mod/community.php:74
+#: mod/community.php:75
 msgid "Community option not available."
 msgstr ""
 
-#: mod/community.php:91
+#: mod/community.php:92
 msgid "Not available."
 msgstr "Indisponible."
 
-#: mod/community.php:103
+#: mod/community.php:102
 msgid "Local Community"
 msgstr ""
 
-#: mod/community.php:106
+#: mod/community.php:105
 msgid "Posts from local users on this server"
 msgstr ""
 
-#: mod/community.php:114
+#: mod/community.php:113
 msgid "Global Community"
 msgstr ""
 
-#: mod/community.php:117
+#: mod/community.php:116
 msgid "Posts from users of the whole federated network"
 msgstr ""
 
-#: mod/community.php:163 mod/search.php:243
+#: mod/community.php:162 mod/search.php:229
 msgid "No results."
 msgstr "Aucun résultat."
 
-#: mod/community.php:207
+#: mod/community.php:206
 msgid ""
 "This community stream shows all public posts received by this node. They may"
 " not reflect the opinions of this node’s users."
@@ -3105,288 +3158,293 @@ msgid ""
 "code or the translation of Friendica. Thank you all!"
 msgstr "Friendica est un projet communautaire, qui ne serait pas possible sans l'aide de beaucoup de gens. Voici une liste de ceux qui ont contribué au code ou à la traduction de Friendica. Merci à tous!"
 
-#: mod/crepair.php:90
+#: mod/crepair.php:79
 msgid "Contact settings applied."
 msgstr "Réglages du contact appliqués."
 
-#: mod/crepair.php:92
+#: mod/crepair.php:81
 msgid "Contact update failed."
 msgstr "Impossible d'appliquer les réglages."
 
-#: mod/crepair.php:113 mod/dfrn_confirm.php:130 mod/fsuggest.php:31
-#: mod/fsuggest.php:97 mod/redir.php:31 mod/redir.php:129
+#: mod/crepair.php:102 mod/dfrn_confirm.php:127 mod/fsuggest.php:28
+#: mod/fsuggest.php:89 mod/redir.php:31 mod/redir.php:137
 msgid "Contact not found."
 msgstr "Contact introuvable."
 
-#: mod/crepair.php:117
+#: mod/crepair.php:115
 msgid ""
 "<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
 " information your communications with this contact may stop working."
 msgstr "<strong>ATTENTION: Manipulation réservée aux experts</strong>, toute information incorrecte pourrait empêcher la communication avec ce contact."
 
-#: mod/crepair.php:118
+#: mod/crepair.php:116
 msgid ""
 "Please use your browser 'Back' button <strong>now</strong> if you are "
 "uncertain what to do on this page."
 msgstr "une photo"
 
-#: mod/crepair.php:132 mod/crepair.php:134
+#: mod/crepair.php:130 mod/crepair.php:132
 msgid "No mirroring"
 msgstr "Pas de miroir"
 
-#: mod/crepair.php:132
+#: mod/crepair.php:130
 msgid "Mirror as forwarded posting"
 msgstr ""
 
-#: mod/crepair.php:132 mod/crepair.php:134
+#: mod/crepair.php:130 mod/crepair.php:132
 msgid "Mirror as my own posting"
 msgstr ""
 
-#: mod/crepair.php:147
+#: mod/crepair.php:145
 msgid "Return to contact editor"
 msgstr "Retour à l'éditeur de contact"
 
-#: mod/crepair.php:149
+#: mod/crepair.php:147
 msgid "Refetch contact data"
 msgstr "Récupérer à nouveau les données de contact"
 
-#: mod/crepair.php:151 mod/events.php:559 mod/fsuggest.php:115
-#: mod/invite.php:154 mod/localtime.php:56 mod/manage.php:185
-#: mod/message.php:265 mod/message.php:426 mod/photos.php:1093
-#: mod/photos.php:1181 mod/photos.php:1456 mod/photos.php:1501
-#: mod/photos.php:1540 mod/photos.php:1600 mod/poke.php:194
-#: mod/profiles.php:578 src/Module/Contact.php:600 src/Module/Install.php:189
-#: src/Module/Install.php:224 src/Object/Post.php:813
-#: view/theme/duepuntozero/config.php:72 view/theme/frio/config.php:119
-#: view/theme/quattro/config.php:74 view/theme/vier/config.php:120
+#: mod/crepair.php:149 mod/events.php:553 mod/fsuggest.php:106
+#: mod/invite.php:154 mod/localtime.php:56 mod/manage.php:182
+#: mod/message.php:261 mod/message.php:441 mod/photos.php:1049
+#: mod/photos.php:1137 mod/photos.php:1412 mod/photos.php:1457
+#: mod/photos.php:1496 mod/photos.php:1556 mod/poke.php:188
+#: mod/profiles.php:562 view/theme/duepuntozero/config.php:72
+#: view/theme/frio/config.php:119 view/theme/quattro/config.php:74
+#: view/theme/vier/config.php:120 src/Module/Contact.php:594
+#: src/Module/Install.php:187 src/Module/Install.php:222
+#: src/Object/Post.php:873
 msgid "Submit"
 msgstr "Envoyer"
 
-#: mod/crepair.php:152
+#: mod/crepair.php:150
 msgid "Remote Self"
 msgstr "Identité à distance"
 
-#: mod/crepair.php:155
+#: mod/crepair.php:153
 msgid "Mirror postings from this contact"
 msgstr "Copier les publications de ce contact"
 
-#: mod/crepair.php:157
+#: mod/crepair.php:155
 msgid ""
 "Mark this contact as remote_self, this will cause friendica to repost new "
 "entries from this contact."
 msgstr "Marquer ce contact comme étant remote_self, friendica republiera alors les nouvelles entrées de ce contact."
 
-#: mod/crepair.php:162
+#: mod/crepair.php:160
 msgid "Account Nickname"
 msgstr "Pseudo du compte"
 
-#: mod/crepair.php:163
+#: mod/crepair.php:161
 msgid "@Tagname - overrides Name/Nickname"
 msgstr "@NomEtiquette - prend le pas sur Nom/Pseudo"
 
-#: mod/crepair.php:164
+#: mod/crepair.php:162
 msgid "Account URL"
 msgstr "URL du compte"
 
-#: mod/crepair.php:165
+#: mod/crepair.php:163
+msgid "Account URL Alias"
+msgstr ""
+
+#: mod/crepair.php:164
 msgid "Friend Request URL"
 msgstr "Echec du téléversement de l'image."
 
-#: mod/crepair.php:166
+#: mod/crepair.php:165
 msgid "Friend Confirm URL"
 msgstr "Accès public refusé."
 
-#: mod/crepair.php:167
+#: mod/crepair.php:166
 msgid "Notification Endpoint URL"
 msgstr "Aucune photo sélectionnée"
 
-#: mod/crepair.php:168
+#: mod/crepair.php:167
 msgid "Poll/Feed URL"
 msgstr "Téléverser des photos"
 
-#: mod/crepair.php:169
+#: mod/crepair.php:168
 msgid "New photo from this URL"
 msgstr "Nouvelle photo depuis cette URL"
 
-#: mod/delegate.php:43
+#: mod/delegate.php:42
 msgid "Parent user not found."
 msgstr ""
 
-#: mod/delegate.php:150
+#: mod/delegate.php:149
 msgid "No parent user"
 msgstr ""
 
-#: mod/delegate.php:165
+#: mod/delegate.php:164
 msgid "Parent Password:"
 msgstr ""
 
-#: mod/delegate.php:165
+#: mod/delegate.php:164
 msgid ""
 "Please enter the password of the parent account to legitimize your request."
 msgstr ""
 
-#: mod/delegate.php:170
+#: mod/delegate.php:171
 msgid "Parent User"
 msgstr ""
 
-#: mod/delegate.php:173
+#: mod/delegate.php:174
 msgid ""
 "Parent users have total control about this account, including the account "
 "settings. Please double check whom you give this access."
 msgstr ""
 
-#: mod/delegate.php:175 src/Content/Nav.php:258
+#: mod/delegate.php:176 src/Content/Nav.php:261
 msgid "Delegate Page Management"
 msgstr "Déléguer la gestion de la page"
 
-#: mod/delegate.php:176
+#: mod/delegate.php:177
 msgid "Delegates"
 msgstr ""
 
-#: mod/delegate.php:178
+#: mod/delegate.php:179
 msgid ""
 "Delegates are able to manage all aspects of this account/page except for "
 "basic account settings. Please do not delegate your personal account to "
 "anybody that you do not trust completely."
 msgstr "Les délégataires seront capables de gérer tous les aspects de ce compte ou de cette page, à l'exception des réglages de compte. Merci de ne pas déléguer votre compte principal à quelqu'un en qui vous n'avez pas une confiance absolue."
 
-#: mod/delegate.php:179
+#: mod/delegate.php:180
 msgid "Existing Page Delegates"
 msgstr "Délégataires existants"
 
-#: mod/delegate.php:181
+#: mod/delegate.php:182
 msgid "Potential Delegates"
 msgstr "Délégataires potentiels"
 
-#: mod/delegate.php:183 mod/tagrm.php:112
+#: mod/delegate.php:184 mod/tagrm.php:114
 msgid "Remove"
 msgstr "Utiliser comme photo de profil"
 
-#: mod/delegate.php:184
+#: mod/delegate.php:185
 msgid "Add"
 msgstr "Ajouter"
 
-#: mod/delegate.php:185
+#: mod/delegate.php:186
 msgid "No entries."
 msgstr "Aucune entrée."
 
-#: mod/dfrn_confirm.php:75 mod/profiles.php:42 mod/profiles.php:152
-#: mod/profiles.php:197 mod/profiles.php:527
+#: mod/dfrn_confirm.php:72 mod/profiles.php:43 mod/profiles.php:152
+#: mod/profiles.php:196 mod/profiles.php:511
 msgid "Profile not found."
 msgstr "Profil introuvable."
 
-#: mod/dfrn_confirm.php:131
+#: mod/dfrn_confirm.php:128
 msgid ""
 "This may occasionally happen if contact was requested by both persons and it"
 " has already been approved."
 msgstr "Ceci peut se produire lorsque le contact a été requis par les deux personnes et a déjà été approuvé."
 
-#: mod/dfrn_confirm.php:241
+#: mod/dfrn_confirm.php:238
 msgid "Response from remote site was not understood."
 msgstr "Réponse du site distant incomprise."
 
-#: mod/dfrn_confirm.php:248 mod/dfrn_confirm.php:254
+#: mod/dfrn_confirm.php:245 mod/dfrn_confirm.php:251
 msgid "Unexpected response from remote site: "
 msgstr "Réponse inattendue du site distant : "
 
-#: mod/dfrn_confirm.php:263
+#: mod/dfrn_confirm.php:260
 msgid "Confirmation completed successfully."
 msgstr "Confirmation achevée avec succès."
 
-#: mod/dfrn_confirm.php:275
+#: mod/dfrn_confirm.php:272
 msgid "Temporary failure. Please wait and try again."
 msgstr "Échec temporaire. Merci de recommencer ultérieurement."
 
-#: mod/dfrn_confirm.php:278
+#: mod/dfrn_confirm.php:275
 msgid "Introduction failed or was revoked."
 msgstr "Introduction échouée ou annulée."
 
-#: mod/dfrn_confirm.php:283
+#: mod/dfrn_confirm.php:280
 msgid "Remote site reported: "
 msgstr "Alerte du site distant : "
 
-#: mod/dfrn_confirm.php:384
+#: mod/dfrn_confirm.php:386
 msgid "Unable to set contact photo."
 msgstr "Impossible de définir la photo du contact."
 
-#: mod/dfrn_confirm.php:446
+#: mod/dfrn_confirm.php:448
 #, php-format
 msgid "No user record found for '%s' "
 msgstr "Pas d'utilisateur trouvé pour '%s' "
 
-#: mod/dfrn_confirm.php:456
+#: mod/dfrn_confirm.php:458
 msgid "Our site encryption key is apparently messed up."
 msgstr "Notre clé de chiffrement de site est apparemment corrompue."
 
-#: mod/dfrn_confirm.php:467
+#: mod/dfrn_confirm.php:469
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr "URL de site absente ou indéchiffrable."
 
-#: mod/dfrn_confirm.php:483
+#: mod/dfrn_confirm.php:485
 msgid "Contact record was not found for you on our site."
 msgstr "Pas d'entrée pour ce contact sur notre site."
 
-#: mod/dfrn_confirm.php:497
+#: mod/dfrn_confirm.php:499
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr "La clé publique du site ne se trouve pas dans l'enregistrement du contact pour l'URL %s."
 
-#: mod/dfrn_confirm.php:513
+#: mod/dfrn_confirm.php:515
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr "L'identifiant fourni par votre système fait doublon sur le notre. Cela peut fonctionner si vous réessayez."
 
-#: mod/dfrn_confirm.php:524
+#: mod/dfrn_confirm.php:526
 msgid "Unable to set your contact credentials on our system."
 msgstr "Impossible de vous définir des permissions sur notre système."
 
-#: mod/dfrn_confirm.php:580
+#: mod/dfrn_confirm.php:582
 msgid "Unable to update your contact profile details on our system"
 msgstr "Impossible de mettre les détails de votre profil à jour sur notre système"
 
-#: mod/dfrn_confirm.php:610 mod/dfrn_request.php:564
-#: src/Model/Contact.php:1919
+#: mod/dfrn_confirm.php:612 mod/dfrn_request.php:560
+#: src/Model/Contact.php:2026
 msgid "[Name Withheld]"
 msgstr "[Nom non-publié]"
 
-#: mod/dfrn_poll.php:128 mod/dfrn_poll.php:537
+#: mod/dfrn_poll.php:125 mod/dfrn_poll.php:530
 #, php-format
 msgid "%1$s welcomes %2$s"
 msgstr "%1$s accueille %2$s"
 
-#: mod/dfrn_request.php:97
+#: mod/dfrn_request.php:98
 msgid "This introduction has already been accepted."
 msgstr "Cette introduction a déjà été acceptée."
 
-#: mod/dfrn_request.php:115 mod/dfrn_request.php:356
+#: mod/dfrn_request.php:116 mod/dfrn_request.php:354
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "L'emplacement du profil est invalide ou ne contient pas de profil valide."
 
-#: mod/dfrn_request.php:119 mod/dfrn_request.php:360
+#: mod/dfrn_request.php:120 mod/dfrn_request.php:358
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "Attention: l'emplacement du profil n'a pas de nom identifiable."
 
-#: mod/dfrn_request.php:122 mod/dfrn_request.php:363
+#: mod/dfrn_request.php:123 mod/dfrn_request.php:361
 msgid "Warning: profile location has no profile photo."
 msgstr "Attention: l'emplacement du profil n'a pas de photo de profil."
 
-#: mod/dfrn_request.php:126 mod/dfrn_request.php:367
+#: mod/dfrn_request.php:127 mod/dfrn_request.php:365
 #, 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] "%d paramètre requis n'a pas été trouvé à l'endroit indiqué"
 msgstr[1] "%d paramètres requis n'ont pas été trouvés à l'endroit indiqué"
 
-#: mod/dfrn_request.php:164
+#: mod/dfrn_request.php:165
 msgid "Introduction complete."
 msgstr "Phase d'introduction achevée."
 
-#: mod/dfrn_request.php:200
+#: mod/dfrn_request.php:201
 msgid "Unrecoverable protocol error."
 msgstr "Erreur de protocole non-récupérable."
 
-#: mod/dfrn_request.php:227
+#: mod/dfrn_request.php:228
 msgid "Profile unavailable."
 msgstr "Profil indisponible."
 
@@ -3403,159 +3461,159 @@ msgstr "Des mesures de protection contre le spam ont été déclenchées."
 msgid "Friends are advised to please try again in 24 hours."
 msgstr "Les relations sont encouragées à attendre 24 heures pour recommencer."
 
-#: mod/dfrn_request.php:277
+#: mod/dfrn_request.php:275
 msgid "Invalid locator"
 msgstr "Localisateur invalide"
 
-#: mod/dfrn_request.php:313
+#: mod/dfrn_request.php:311
 msgid "You have already introduced yourself here."
 msgstr "Vous vous êtes déjà présenté ici."
 
-#: mod/dfrn_request.php:316
+#: mod/dfrn_request.php:314
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "Il semblerait que vous soyez déjà ami avec %s."
 
-#: mod/dfrn_request.php:336
+#: mod/dfrn_request.php:334
 msgid "Invalid profile URL."
 msgstr "URL de profil invalide."
 
-#: mod/dfrn_request.php:342 src/Model/Contact.php:1598
+#: mod/dfrn_request.php:340 src/Model/Contact.php:1697
 msgid "Disallowed profile URL."
 msgstr "URL de profil interdite."
 
-#: mod/dfrn_request.php:415 src/Module/Contact.php:240
+#: mod/dfrn_request.php:413 src/Module/Contact.php:235
 msgid "Failed to update contact record."
 msgstr "Échec de mise à jour du contact."
 
-#: mod/dfrn_request.php:435
+#: mod/dfrn_request.php:433
 msgid "Your introduction has been sent."
 msgstr "Votre introduction a été envoyée."
 
-#: mod/dfrn_request.php:473
+#: mod/dfrn_request.php:471
 msgid ""
 "Remote subscription can't be done for your network. Please subscribe "
 "directly on your system."
 msgstr ""
 
-#: mod/dfrn_request.php:489
+#: mod/dfrn_request.php:487
 msgid "Please login to confirm introduction."
 msgstr "Connectez-vous pour confirmer l'introduction."
 
-#: mod/dfrn_request.php:497
+#: mod/dfrn_request.php:495
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "Identité incorrecte actuellement connectée. Merci de vous connecter à <strong>ce</strong> profil."
 
-#: mod/dfrn_request.php:511 mod/dfrn_request.php:528
+#: mod/dfrn_request.php:509 mod/dfrn_request.php:524
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: mod/dfrn_request.php:523
+#: mod/dfrn_request.php:520
 msgid "Hide this contact"
 msgstr "Cacher ce contact"
 
-#: mod/dfrn_request.php:526
+#: mod/dfrn_request.php:522
 #, php-format
 msgid "Welcome home %s."
 msgstr "Bienvenue chez vous, %s."
 
-#: mod/dfrn_request.php:527
+#: mod/dfrn_request.php:523
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "Merci de confirmer votre demande d'introduction auprès de %s."
 
-#: mod/dfrn_request.php:637
+#: mod/dfrn_request.php:632
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr "Merci d'entrer votre \"adresse d'identité\" de l'un des réseaux de communication suivant:"
 
-#: mod/dfrn_request.php:640
+#: mod/dfrn_request.php:634
 #, php-format
 msgid ""
 "If you are not yet a member of the free social web, <a href=\"%s\">follow "
 "this link to find a public Friendica site and join us today</a>."
 msgstr ""
 
-#: mod/dfrn_request.php:645
+#: mod/dfrn_request.php:637
 msgid "Friend/Connection Request"
 msgstr "Requête de relation/amitié"
 
-#: mod/dfrn_request.php:646
+#: mod/dfrn_request.php:638
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@gnusocial.de"
 msgstr ""
 
-#: mod/dfrn_request.php:647 mod/follow.php:153
+#: mod/dfrn_request.php:639 mod/follow.php:149
 msgid "Please answer the following:"
 msgstr "Merci de répondre à ce qui suit :"
 
-#: mod/dfrn_request.php:648 mod/follow.php:154
+#: mod/dfrn_request.php:640 mod/follow.php:150
 #, php-format
 msgid "Does %s know you?"
 msgstr "Est-ce que %s vous connaît?"
 
-#: mod/dfrn_request.php:649 mod/follow.php:155
+#: mod/dfrn_request.php:641 mod/follow.php:151
 msgid "Add a personal note:"
 msgstr "Ajouter une note personnelle :"
 
-#: mod/dfrn_request.php:651
+#: mod/dfrn_request.php:643
 msgid "Friendica"
 msgstr "Friendica"
 
-#: mod/dfrn_request.php:652
+#: mod/dfrn_request.php:644
 msgid "GNU Social (Pleroma, Mastodon)"
 msgstr ""
 
-#: mod/dfrn_request.php:653
+#: mod/dfrn_request.php:645
 msgid "Diaspora (Socialhome, Hubzilla)"
 msgstr ""
 
-#: mod/dfrn_request.php:654
+#: mod/dfrn_request.php:646
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
 msgstr " - merci de ne pas utiliser ce formulaire.   Entrez plutôt %s dans votre barre de recherche Diaspora."
 
-#: mod/dfrn_request.php:655 mod/follow.php:161 mod/unfollow.php:130
+#: mod/dfrn_request.php:647 mod/follow.php:157 mod/unfollow.php:128
 msgid "Your Identity Address:"
 msgstr "Votre adresse d'identité :"
 
-#: mod/dfrn_request.php:657 mod/follow.php:66 mod/unfollow.php:133
+#: mod/dfrn_request.php:649 mod/follow.php:65 mod/unfollow.php:131
 msgid "Submit Request"
 msgstr "Envoyer la requête"
 
-#: mod/directory.php:154 mod/events.php:547 mod/notifications.php:251
-#: src/Model/Event.php:70 src/Model/Event.php:97 src/Model/Event.php:439
-#: src/Model/Event.php:930 src/Model/Profile.php:434
-#: src/Module/Contact.php:650
+#: mod/directory.php:154 mod/events.php:541 mod/notifications.php:253
+#: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:438
+#: src/Model/Event.php:934 src/Model/Profile.php:443
+#: src/Module/Contact.php:643
 msgid "Location:"
 msgstr "Localisation :"
 
-#: mod/directory.php:159 mod/notifications.php:257 src/Model/Profile.php:437
+#: mod/directory.php:159 mod/notifications.php:259 src/Model/Profile.php:446
 #: src/Model/Profile.php:758
 msgid "Gender:"
 msgstr "Genre :"
 
-#: mod/directory.php:160 src/Model/Profile.php:438 src/Model/Profile.php:782
+#: mod/directory.php:160 src/Model/Profile.php:447 src/Model/Profile.php:782
 msgid "Status:"
 msgstr "Statut :"
 
-#: mod/directory.php:161 src/Model/Profile.php:439 src/Model/Profile.php:799
+#: mod/directory.php:161 src/Model/Profile.php:448 src/Model/Profile.php:799
 msgid "Homepage:"
 msgstr "Page personnelle :"
 
-#: mod/directory.php:162 mod/notifications.php:253 src/Model/Profile.php:440
-#: src/Model/Profile.php:819 src/Module/Contact.php:654
+#: mod/directory.php:162 mod/notifications.php:255 src/Model/Profile.php:449
+#: src/Model/Profile.php:819 src/Module/Contact.php:647
 msgid "About:"
 msgstr "À propos :"
 
-#: mod/directory.php:210 src/Content/Widget.php:72
-#: view/theme/vier/theme.php:208
+#: mod/directory.php:210 view/theme/vier/theme.php:208
+#: src/Content/Widget.php:70
 msgid "Global Directory"
 msgstr "Annuaire global"
 
@@ -3571,8 +3629,8 @@ msgstr "Résultats pour :"
 msgid "Site Directory"
 msgstr "Annuaire local"
 
-#: mod/directory.php:217 src/Content/Widget.php:67 src/Module/Contact.php:822
-#: view/theme/vier/theme.php:203
+#: mod/directory.php:217 view/theme/vier/theme.php:203
+#: src/Content/Widget.php:65 src/Module/Contact.php:817
 msgid "Find"
 msgstr "Trouver"
 
@@ -3590,7 +3648,7 @@ msgstr "Recherche de personne - %s"
 msgid "Forum Search - %s"
 msgstr "Recherche de Forum - %s"
 
-#: mod/dirfind.php:261 mod/match.php:125
+#: mod/dirfind.php:259 mod/match.php:130
 msgid "No matches"
 msgstr "Aucune correspondance"
 
@@ -3602,334 +3660,333 @@ msgstr "Élément introuvable"
 msgid "Edit post"
 msgstr "Éditer la publication"
 
-#: mod/editpost.php:94 mod/filer.php:38 mod/notes.php:54
-#: src/Content/Text/HTML.php:961
+#: mod/editpost.php:73 mod/filer.php:36 mod/notes.php:46
+#: src/Content/Text/HTML.php:894
 msgid "Save"
 msgstr "Sauver"
 
-#: mod/editpost.php:99 mod/message.php:263 mod/message.php:425
+#: mod/editpost.php:78 mod/message.php:259 mod/message.php:440
 #: mod/wallmessage.php:140
 msgid "Insert web link"
 msgstr "Insérer lien web"
 
-#: mod/editpost.php:100
+#: mod/editpost.php:79
 msgid "web link"
 msgstr "lien web"
 
-#: mod/editpost.php:101
+#: mod/editpost.php:80
 msgid "Insert video link"
 msgstr "Insérer un lien video"
 
-#: mod/editpost.php:102
+#: mod/editpost.php:81
 msgid "video link"
 msgstr "lien vidéo"
 
-#: mod/editpost.php:103
+#: mod/editpost.php:82
 msgid "Insert audio link"
 msgstr "Insérer un lien audio"
 
-#: mod/editpost.php:104
+#: mod/editpost.php:83
 msgid "audio link"
 msgstr "lien audio"
 
-#: mod/editpost.php:119 src/Core/ACL.php:305
+#: mod/editpost.php:98 src/Core/ACL.php:307
 msgid "CC: email addresses"
 msgstr "CC: adresses de courriel"
 
-#: mod/editpost.php:126 src/Core/ACL.php:306
+#: mod/editpost.php:105 src/Core/ACL.php:308
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Exemple : bob@exemple.com, mary@exemple.com"
 
-#: mod/events.php:109 mod/events.php:111
+#: mod/events.php:117 mod/events.php:119
 msgid "Event can not end before it has started."
 msgstr "L'événement ne peut pas se terminer avant d'avoir commencé."
 
-#: mod/events.php:118 mod/events.php:120
+#: mod/events.php:126 mod/events.php:128
 msgid "Event title and start time are required."
 msgstr "Vous devez donner un nom et un horaire de début à l'événement."
 
-#: mod/events.php:392
+#: mod/events.php:386
 msgid "Create New Event"
 msgstr "Créer un nouvel événement"
 
-#: mod/events.php:515
+#: mod/events.php:509
 msgid "Event details"
 msgstr "Détails de l'événement"
 
-#: mod/events.php:516
+#: mod/events.php:510
 msgid "Starting date and Title are required."
 msgstr "La date de début et le titre sont requis."
 
-#: mod/events.php:517 mod/events.php:522
+#: mod/events.php:511 mod/events.php:516
 msgid "Event Starts:"
 msgstr "Début de l'événement :"
 
-#: mod/events.php:517 mod/events.php:549 mod/profiles.php:608
+#: mod/events.php:511 mod/events.php:543 mod/profiles.php:592
 msgid "Required"
 msgstr "Requis"
 
-#: mod/events.php:530 mod/events.php:555
+#: mod/events.php:524 mod/events.php:549
 msgid "Finish date/time is not known or not relevant"
 msgstr "Date / heure de fin inconnue ou sans objet"
 
-#: mod/events.php:532 mod/events.php:537
+#: mod/events.php:526 mod/events.php:531
 msgid "Event Finishes:"
 msgstr "Fin de l'événement :"
 
-#: mod/events.php:543 mod/events.php:556
+#: mod/events.php:537 mod/events.php:550
 msgid "Adjust for viewer timezone"
 msgstr "Ajuster à la zone horaire du visiteur"
 
-#: mod/events.php:545
+#: mod/events.php:539
 msgid "Description:"
 msgstr "Description :"
 
-#: mod/events.php:549 mod/events.php:551
+#: mod/events.php:543 mod/events.php:545
 msgid "Title:"
 msgstr "Titre :"
 
-#: mod/events.php:552 mod/events.php:553
+#: mod/events.php:546 mod/events.php:547
 msgid "Share this event"
 msgstr "Partager cet événement"
 
-#: mod/events.php:560 src/Model/Profile.php:877
+#: mod/events.php:554 src/Model/Profile.php:877
 msgid "Basic"
 msgstr "Simple"
 
-#: mod/events.php:562 mod/photos.php:1111 mod/photos.php:1452
-#: src/Core/ACL.php:308
+#: mod/events.php:556 mod/photos.php:1067 mod/photos.php:1408
+#: src/Core/ACL.php:310
 msgid "Permissions"
 msgstr "Permissions"
 
-#: mod/events.php:578
+#: mod/events.php:572
 msgid "Failed to remove event"
 msgstr "La suppression de l'événement a échoué."
 
-#: mod/events.php:580
+#: mod/events.php:574
 msgid "Event removed"
 msgstr "Événement supprimé."
 
-#: mod/fbrowser.php:36 src/Content/Nav.php:155 src/Model/Profile.php:917
-#: view/theme/frio/theme.php:275
+#: mod/fbrowser.php:36 view/theme/frio/theme.php:264 src/Content/Nav.php:158
+#: src/Model/Profile.php:917
 msgid "Photos"
 msgstr "Photos"
 
-#: mod/fbrowser.php:45 mod/fbrowser.php:70 mod/photos.php:204
-#: mod/photos.php:1075 mod/photos.php:1170 mod/photos.php:1187
-#: mod/photos.php:1654 mod/photos.php:1669 src/Model/Photo.php:244
-#: src/Model/Photo.php:253
+#: mod/fbrowser.php:45 mod/fbrowser.php:69 mod/photos.php:201
+#: mod/photos.php:1031 mod/photos.php:1126 mod/photos.php:1143
+#: mod/photos.php:1610 mod/photos.php:1625 src/Model/Photo.php:547
+#: src/Model/Photo.php:556
 msgid "Contact Photos"
 msgstr "Photos du contact"
 
-#: mod/fbrowser.php:107 mod/fbrowser.php:138 mod/profile_photo.php:251
+#: mod/fbrowser.php:106 mod/fbrowser.php:136 mod/profile_photo.php:254
 msgid "Upload"
 msgstr "Téléverser"
 
-#: mod/fbrowser.php:133
+#: mod/fbrowser.php:131
 msgid "Files"
 msgstr "Fichiers"
 
-#: mod/feedtest.php:22
+#: mod/feedtest.php:18
 msgid "You must be logged in to use this module"
 msgstr ""
 
-#: mod/feedtest.php:49
+#: mod/feedtest.php:45
 msgid "Source URL"
 msgstr ""
 
-#: mod/fetch.php:21 mod/fetch.php:48 mod/fetch.php:55 mod/help.php:64
-#: src/App.php:1704
-msgid "Not Found"
-msgstr "Non trouvé"
-
-#: mod/filer.php:37
+#: mod/filer.php:35
 msgid "- select -"
 msgstr "- choisir -"
 
-#: mod/follow.php:47
+#: mod/follow.php:46
 msgid "The contact could not be added."
 msgstr ""
 
-#: mod/follow.php:77
+#: mod/follow.php:76
 msgid "You already added this contact."
 msgstr "Vous avez déjà ajouté ce contact."
 
-#: mod/follow.php:87
+#: mod/follow.php:86
 msgid "Diaspora support isn't enabled. Contact can't be added."
 msgstr "Le support de Diaspora est désactivé. Le contact ne peut pas être ajouté."
 
-#: mod/follow.php:94
+#: mod/follow.php:93
 msgid "OStatus support is disabled. Contact can't be added."
 msgstr "Le support d'OStatus est désactivé. Le contact ne peut pas être ajouté."
 
-#: mod/follow.php:101
+#: mod/follow.php:100
 msgid "The network type couldn't be detected. Contact can't be added."
 msgstr "Impossible de détecter le type de réseau. Le contact ne peut pas être ajouté."
 
-#: mod/follow.php:181 mod/notifications.php:255 src/Model/Profile.php:807
-#: src/Module/Contact.php:656
+#: mod/follow.php:170 mod/notifications.php:257 src/Model/Profile.php:807
+#: src/Module/Contact.php:649
 msgid "Tags:"
 msgstr "Étiquette :"
 
-#: mod/follow.php:193 mod/unfollow.php:149 src/Model/Profile.php:904
-#: src/Module/Contact.php:869
+#: mod/follow.php:182 mod/unfollow.php:147 src/Model/Profile.php:904
+#: src/Module/Contact.php:864
 msgid "Status Messages and Posts"
 msgstr "Messages d'état et publications"
 
-#: mod/friendica.php:79
+#: mod/friendica.php:88
 #, php-format
 msgid ""
 "This is Friendica, version %s that is running at the web location %s. The "
 "database version is %s, the post update version is %s."
 msgstr ""
 
-#: mod/friendica.php:85
+#: mod/friendica.php:94
 msgid ""
 "Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
 "about the Friendica project."
 msgstr "Rendez-vous sur <a href=\"https://friendi.ca\">Friendi.ca</a> pour en savoir plus sur le projet Friendica."
 
-#: mod/friendica.php:89
+#: mod/friendica.php:98
 msgid "Bug reports and issues: please visit"
 msgstr "Pour les rapports de bugs : rendez vous sur"
 
-#: mod/friendica.php:89
+#: mod/friendica.php:98
 msgid "the bugtracker at github"
 msgstr "le bugtracker sur GitHub"
 
-#: mod/friendica.php:92
+#: mod/friendica.php:101
 msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
 msgstr ""
 
-#: mod/friendica.php:97
+#: mod/friendica.php:106
 msgid "Installed addons/apps:"
 msgstr ""
 
-#: mod/friendica.php:111
+#: mod/friendica.php:120
 msgid "No installed addons/apps"
 msgstr ""
 
-#: mod/friendica.php:116
+#: mod/friendica.php:125
 #, php-format
 msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
 msgstr ""
 
-#: mod/friendica.php:121
+#: mod/friendica.php:130
 msgid "On this server the following remote servers are blocked."
 msgstr "Sur ce serveur, les serveurs suivants sont sur liste noire."
 
-#: mod/fsuggest.php:73
+#: mod/fsuggest.php:69
 msgid "Friend suggestion sent."
 msgstr "Suggestion d'amitié/contact envoyée."
 
-#: mod/fsuggest.php:102
+#: mod/fsuggest.php:93
 msgid "Suggest Friends"
 msgstr "Suggérer des amis/contacts"
 
-#: mod/fsuggest.php:104
+#: mod/fsuggest.php:95
 #, php-format
 msgid "Suggest a friend for %s"
 msgstr "Suggérer un ami/contact pour %s"
 
-#: mod/group.php:40
+#: mod/group.php:38
 msgid "Group created."
 msgstr "Groupe créé."
 
-#: mod/group.php:46
+#: mod/group.php:44
 msgid "Could not create group."
 msgstr "Impossible de créer le groupe."
 
-#: mod/group.php:60 mod/group.php:187
+#: mod/group.php:58 mod/group.php:184
 msgid "Group not found."
 msgstr "Groupe introuvable."
 
-#: mod/group.php:74
+#: mod/group.php:72
 msgid "Group name changed."
 msgstr "Groupe renommé."
 
-#: mod/group.php:87 mod/profperm.php:30 src/App.php:1785
+#: mod/group.php:85 mod/profperm.php:30 src/App.php:1481
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: mod/group.php:105
+#: mod/group.php:103
 msgid "Save Group"
 msgstr "Sauvegarder le groupe"
 
-#: mod/group.php:106
+#: mod/group.php:104
 msgid "Filter"
 msgstr ""
 
-#: mod/group.php:111
+#: mod/group.php:109
 msgid "Create a group of contacts/friends."
 msgstr "Créez un groupe de contacts/amis."
 
-#: mod/group.php:112 mod/group.php:136 mod/group.php:229
-#: src/Model/Group.php:419
+#: mod/group.php:110 mod/group.php:133 mod/group.php:224
+#: src/Model/Group.php:423
 msgid "Group Name: "
 msgstr "Nom du groupe : "
 
-#: mod/group.php:127 src/Model/Group.php:416
+#: mod/group.php:125 src/Model/Group.php:420
 msgid "Contacts not in any group"
 msgstr "Contacts n'appartenant à aucun groupe"
 
-#: mod/group.php:159
+#: mod/group.php:156
 msgid "Group removed."
 msgstr "Groupe enlevé."
 
-#: mod/group.php:161
+#: mod/group.php:158
 msgid "Unable to remove group."
 msgstr "Impossible d'enlever le groupe."
 
-#: mod/group.php:222
+#: mod/group.php:217
 msgid "Delete Group"
 msgstr "Supprimer le groupe"
 
-#: mod/group.php:233
+#: mod/group.php:228
 msgid "Edit Group Name"
 msgstr "Éditer le nom du groupe"
 
-#: mod/group.php:244
+#: mod/group.php:239
 msgid "Members"
 msgstr "Membres"
 
-#: mod/group.php:246 src/Module/Contact.php:711
+#: mod/group.php:241 src/Module/Contact.php:704
 msgid "All Contacts"
 msgstr "Tous les contacts"
 
-#: mod/group.php:247 mod/network.php:659
+#: mod/group.php:242 mod/network.php:654
 msgid "Group is empty"
 msgstr "Groupe vide"
 
-#: mod/group.php:260
+#: mod/group.php:255
 msgid "Remove contact from group"
 msgstr ""
 
-#: mod/group.php:278 mod/profperm.php:119
+#: mod/group.php:273 mod/profperm.php:119
 msgid "Click on a contact to add or remove."
 msgstr "Cliquez sur un contact pour l'ajouter ou le supprimer."
 
-#: mod/group.php:292
+#: mod/group.php:287
 msgid "Add contact to group"
 msgstr ""
 
-#: mod/hcard.php:19
+#: mod/hcard.php:20
 msgid "No profile"
 msgstr "Aucun profil"
 
-#: mod/help.php:51
+#: mod/help.php:52
 msgid "Help:"
 msgstr "Aide :"
 
-#: mod/help.php:58 src/Content/Nav.php:187 view/theme/vier/theme.php:297
+#: mod/help.php:59 view/theme/vier/theme.php:294 src/Content/Nav.php:190
 msgid "Help"
 msgstr "Aide"
 
+#: mod/help.php:65 src/App.php:1399
+msgid "Not Found"
+msgstr "Non trouvé"
+
 #: mod/home.php:40
 #, php-format
 msgid "Welcome to %s"
 msgstr "Bienvenue sur %s"
 
-#: mod/invite.php:38
+#: mod/invite.php:36
 msgid "Total invitation limit exceeded."
 msgstr "La limite d'invitation totale est éxédée."
 
@@ -4012,7 +4069,7 @@ msgstr "Envoyer des invitations"
 msgid "Enter email addresses, one per line:"
 msgstr "Entrez les adresses email, une par ligne :"
 
-#: mod/invite.php:149 mod/message.php:259 mod/message.php:420
+#: mod/invite.php:149 mod/message.php:255 mod/message.php:435
 #: mod/wallmessage.php:137
 msgid "Your message:"
 msgstr "Votre message :"
@@ -4042,34 +4099,34 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr "Impossible de localiser la publication originale."
 
-#: mod/item.php:288
+#: mod/item.php:320
 msgid "Empty post discarded."
 msgstr "Publication vide rejetée."
 
-#: mod/item.php:810
+#: mod/item.php:841
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "Ce message vous a été envoyé par %s, membre du réseau social Friendica."
 
-#: mod/item.php:812
+#: mod/item.php:843
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "Vous pouvez leur rendre visite sur %s"
 
-#: mod/item.php:813
+#: mod/item.php:844
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "Merci de contacter l’émetteur en répondant à cette publication si vous ne souhaitez pas recevoir ces messages."
 
-#: mod/item.php:817
+#: mod/item.php:848
 #, php-format
 msgid "%s posted an update."
 msgstr "%s a publié une mise à jour."
 
-#: mod/localtime.php:19 src/Model/Event.php:38 src/Model/Event.php:844
+#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:848
 msgid "l F d, Y \\@ g:i A"
 msgstr "l F d, Y \\@ g:i A"
 
@@ -4110,15 +4167,15 @@ msgstr "Informations de confidentialité indisponibles."
 msgid "Visible to:"
 msgstr "Visible par :"
 
-#: mod/lostpass.php:30
+#: mod/lostpass.php:26
 msgid "No valid account found."
 msgstr "Impossible de trouver un compte valide."
 
-#: mod/lostpass.php:42
+#: mod/lostpass.php:38
 msgid "Password reset request issued. Check your email."
 msgstr "Réinitialisation du mot de passe en cours. Vérifiez votre courriel."
 
-#: mod/lostpass.php:48
+#: mod/lostpass.php:44
 #, php-format
 msgid ""
 "\n"
@@ -4134,7 +4191,7 @@ msgid ""
 "\t\tissued this request."
 msgstr ""
 
-#: mod/lostpass.php:59
+#: mod/lostpass.php:55
 #, php-format
 msgid ""
 "\n"
@@ -4151,66 +4208,66 @@ msgid ""
 "\t\tLogin Name:\t%3$s"
 msgstr ""
 
-#: mod/lostpass.php:78
+#: mod/lostpass.php:74
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Requête de réinitialisation de mot de passe à %s"
 
-#: mod/lostpass.php:94
+#: mod/lostpass.php:89
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "Impossible d'honorer cette demande. (Vous l'avez peut-être déjà utilisée par le passé.) La réinitialisation a échoué."
 
-#: mod/lostpass.php:107
+#: mod/lostpass.php:102
 msgid "Request has expired, please make a new one."
 msgstr ""
 
-#: mod/lostpass.php:122
+#: mod/lostpass.php:117
 msgid "Forgot your Password?"
 msgstr "Mot de passe oublié ?"
 
-#: mod/lostpass.php:123
+#: mod/lostpass.php:118
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Entrez votre adresse de courriel et validez pour réinitialiser votre mot de passe. Vous recevrez la suite des instructions par courriel."
 
-#: mod/lostpass.php:124 src/Module/Login.php:324
+#: mod/lostpass.php:119 src/Module/Login.php:324
 msgid "Nickname or Email: "
 msgstr "Pseudo ou eMail : "
 
-#: mod/lostpass.php:125
+#: mod/lostpass.php:120
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: mod/lostpass.php:141 src/Module/Login.php:336
+#: mod/lostpass.php:135 src/Module/Login.php:336
 msgid "Password Reset"
 msgstr "Réinitialiser le mot de passe"
 
-#: mod/lostpass.php:142
+#: mod/lostpass.php:136
 msgid "Your password has been reset as requested."
 msgstr "Votre mot de passe a bien été réinitialisé."
 
-#: mod/lostpass.php:143
+#: mod/lostpass.php:137
 msgid "Your new password is"
 msgstr "Votre nouveau mot de passe est "
 
-#: mod/lostpass.php:144
+#: mod/lostpass.php:138
 msgid "Save or copy your new password - and then"
 msgstr "Sauvez ou copiez ce nouveau mot de passe - puis"
 
-#: mod/lostpass.php:145
+#: mod/lostpass.php:139
 msgid "click here to login"
 msgstr "cliquez ici pour vous connecter"
 
-#: mod/lostpass.php:146
+#: mod/lostpass.php:140
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "Votre mot de passe peut être changé depuis la page &lt;em&gt;Réglages&lt;/em&gt;, une fois que vous serez connecté."
 
-#: mod/lostpass.php:154
+#: mod/lostpass.php:148
 #, php-format
 msgid ""
 "\n"
@@ -4221,7 +4278,7 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: mod/lostpass.php:160
+#: mod/lostpass.php:154
 #, php-format
 msgid ""
 "\n"
@@ -4235,171 +4292,171 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: mod/lostpass.php:176
+#: mod/lostpass.php:170
 #, php-format
 msgid "Your password has been changed at %s"
 msgstr "Votre mot de passe a été modifié à %s"
 
-#: mod/maintenance.php:26
-msgid "System down for maintenance"
-msgstr "Système indisponible pour cause de maintenance"
-
-#: mod/manage.php:181
+#: mod/manage.php:178
 msgid "Manage Identities and/or Pages"
 msgstr "Gérer les identités et/ou les pages"
 
-#: mod/manage.php:182
+#: mod/manage.php:179
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
 msgstr "Basculez entre les différentes identités ou pages (groupes/communautés) qui se partagent votre compte ou que vous avez été autorisé à gérer."
 
-#: mod/manage.php:183
+#: mod/manage.php:180
 msgid "Select an identity to manage: "
 msgstr "Choisir une identité à gérer: "
 
-#: mod/match.php:51
+#: mod/match.php:49
 msgid "No keywords to match. Please add keywords to your default profile."
 msgstr "Aucun mot-clé en correspondance. Merci d'ajouter des mots-clés à votre profil par défaut."
 
-#: mod/match.php:106
-msgid "is interested in:"
-msgstr "s'intéresse à :"
+#: mod/match.php:115 src/Content/Pager.php:198
+msgid "first"
+msgstr "premier"
 
-#: mod/match.php:120
+#: mod/match.php:120 src/Content/Pager.php:258
+msgid "next"
+msgstr "suivant"
+
+#: mod/match.php:135
 msgid "Profile Match"
 msgstr "Correpondance de profils"
 
-#: mod/message.php:35 mod/message.php:118 src/Content/Nav.php:252
+#: mod/message.php:33 mod/message.php:116 src/Content/Nav.php:255
 msgid "New Message"
 msgstr "Nouveau message"
 
-#: mod/message.php:72 mod/wallmessage.php:60
+#: mod/message.php:70 mod/wallmessage.php:60
 msgid "No recipient selected."
 msgstr "Pas de destinataire sélectionné."
 
-#: mod/message.php:76
+#: mod/message.php:74
 msgid "Unable to locate contact information."
 msgstr "Impossible de localiser les informations du contact."
 
-#: mod/message.php:79 mod/wallmessage.php:66
+#: mod/message.php:77 mod/wallmessage.php:66
 msgid "Message could not be sent."
 msgstr "Impossible d'envoyer le message."
 
-#: mod/message.php:82 mod/wallmessage.php:69
+#: mod/message.php:80 mod/wallmessage.php:69
 msgid "Message collection failure."
 msgstr "Récupération des messages infructueuse."
 
-#: mod/message.php:85 mod/wallmessage.php:72
+#: mod/message.php:83 mod/wallmessage.php:72
 msgid "Message sent."
 msgstr "Message envoyé."
 
-#: mod/message.php:112 mod/notifications.php:47 mod/notifications.php:185
-#: mod/notifications.php:233
+#: mod/message.php:110 mod/notifications.php:47 mod/notifications.php:187
+#: mod/notifications.php:235
 msgid "Discard"
 msgstr "Rejeter"
 
-#: mod/message.php:125 src/Content/Nav.php:249 view/theme/frio/theme.php:282
+#: mod/message.php:123 view/theme/frio/theme.php:271 src/Content/Nav.php:252
 msgid "Messages"
 msgstr "Messages"
 
-#: mod/message.php:150
+#: mod/message.php:148
 msgid "Do you really want to delete this message?"
 msgstr "Voulez-vous vraiment supprimer ce message ?"
 
-#: mod/message.php:168
+#: mod/message.php:166
 msgid "Conversation not found."
 msgstr ""
 
-#: mod/message.php:173
+#: mod/message.php:171
 msgid "Message deleted."
 msgstr "Message supprimé."
 
-#: mod/message.php:178 mod/message.php:193
+#: mod/message.php:176 mod/message.php:190
 msgid "Conversation removed."
 msgstr "Conversation supprimée."
 
-#: mod/message.php:207 mod/message.php:347 mod/wallmessage.php:123
+#: mod/message.php:204 mod/message.php:360 mod/wallmessage.php:123
 msgid "Please enter a link URL:"
 msgstr "Entrez un lien web :"
 
-#: mod/message.php:250 mod/wallmessage.php:128
+#: mod/message.php:246 mod/wallmessage.php:128
 msgid "Send Private Message"
 msgstr "Envoyer un message privé"
 
-#: mod/message.php:251 mod/message.php:415 mod/wallmessage.php:130
+#: mod/message.php:247 mod/message.php:430 mod/wallmessage.php:130
 msgid "To:"
 msgstr "À:"
 
-#: mod/message.php:255 mod/message.php:417 mod/wallmessage.php:131
+#: mod/message.php:251 mod/message.php:432 mod/wallmessage.php:131
 msgid "Subject:"
 msgstr "Sujet:"
 
-#: mod/message.php:293
+#: mod/message.php:289
 msgid "No messages."
 msgstr "Aucun message."
 
-#: mod/message.php:334
+#: mod/message.php:352
 msgid "Message not available."
 msgstr "Message indisponible."
 
-#: mod/message.php:391
+#: mod/message.php:406
 msgid "Delete message"
 msgstr "Effacer message"
 
-#: mod/message.php:393 mod/message.php:494
+#: mod/message.php:408 mod/message.php:540
 msgid "D, d M Y - g:i A"
 msgstr "D, d M Y - g:i A"
 
-#: mod/message.php:408 mod/message.php:491
+#: mod/message.php:423 mod/message.php:537
 msgid "Delete conversation"
 msgstr "Effacer conversation"
 
-#: mod/message.php:410
+#: mod/message.php:425
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Pas de communications sécurisées possibles. Vous serez <strong>peut-être</strong> en mesure de répondre depuis la page de profil de l'émetteur."
 
-#: mod/message.php:414
+#: mod/message.php:429
 msgid "Send Reply"
 msgstr "Répondre"
 
-#: mod/message.php:465
+#: mod/message.php:512
 #, php-format
 msgid "Unknown sender - %s"
 msgstr "Émetteur inconnu - %s"
 
-#: mod/message.php:467
+#: mod/message.php:514
 #, php-format
 msgid "You and %s"
 msgstr "Vous et %s"
 
-#: mod/message.php:469
+#: mod/message.php:516
 #, php-format
 msgid "%s and You"
 msgstr "%s et vous"
 
-#: mod/message.php:497
+#: mod/message.php:543
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] "%d message"
 msgstr[1] "%d messages"
 
-#: mod/network.php:192 mod/search.php:40
+#: mod/network.php:183 mod/search.php:38
 msgid "Remove term"
 msgstr "Retirer le terme"
 
-#: mod/network.php:199 mod/search.php:49
+#: mod/network.php:190 mod/search.php:47
 msgid "Saved Searches"
 msgstr "Recherches"
 
-#: mod/network.php:200 src/Model/Group.php:410
+#: mod/network.php:191 src/Model/Group.php:414
 msgid "add"
 msgstr "ajouter"
 
-#: mod/network.php:567
+#: mod/network.php:563
 #, php-format
 msgid ""
 "Warning: This group contains %s member from a network that doesn't allow non"
@@ -4410,85 +4467,85 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/network.php:570
+#: mod/network.php:566
 msgid "Messages in this group won't be send to these receivers."
 msgstr "Les messages dans ce groupe ne seront pas envoyés à ces destinataires."
 
-#: mod/network.php:638
+#: mod/network.php:633
 msgid "No such group"
 msgstr "Groupe inexistant"
 
-#: mod/network.php:663
+#: mod/network.php:658
 #, php-format
 msgid "Group: %s"
 msgstr "Group : %s"
 
-#: mod/network.php:689
+#: mod/network.php:684
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "Les messages privés envoyés à ce contact s'exposent à une diffusion incontrôlée."
 
-#: mod/network.php:692
+#: mod/network.php:687
 msgid "Invalid contact."
 msgstr "Contact invalide."
 
-#: mod/network.php:970
+#: mod/network.php:966
 msgid "Commented Order"
 msgstr "Tri par commentaires"
 
-#: mod/network.php:973
+#: mod/network.php:969
 msgid "Sort by Comment Date"
 msgstr "Trier par date de commentaire"
 
-#: mod/network.php:978
+#: mod/network.php:974
 msgid "Posted Order"
 msgstr "Tri des publications"
 
-#: mod/network.php:981
+#: mod/network.php:977
 msgid "Sort by Post Date"
 msgstr "Trier par date de publication"
 
-#: mod/network.php:988 mod/profiles.php:595
-#: src/Core/NotificationsManager.php:187
+#: mod/network.php:984 mod/profiles.php:579
+#: src/Core/NotificationsManager.php:189
 msgid "Personal"
 msgstr "Personnel"
 
-#: mod/network.php:991
+#: mod/network.php:987
 msgid "Posts that mention or involve you"
 msgstr "Publications qui vous concernent"
 
-#: mod/network.php:998
+#: mod/network.php:994
 msgid "New"
 msgstr "Nouveau"
 
-#: mod/network.php:1001
+#: mod/network.php:997
 msgid "Activity Stream - by date"
 msgstr "Flux d'activités - par date"
 
-#: mod/network.php:1009
+#: mod/network.php:1005
 msgid "Shared Links"
 msgstr "Liens partagés"
 
-#: mod/network.php:1012
+#: mod/network.php:1008
 msgid "Interesting Links"
 msgstr "Liens intéressants"
 
-#: mod/network.php:1019
+#: mod/network.php:1015
 msgid "Starred"
 msgstr "Mis en avant"
 
-#: mod/network.php:1022
+#: mod/network.php:1018
 msgid "Favourite Posts"
 msgstr "Publications favorites"
 
-#: mod/newmember.php:11
+#: mod/newmember.php:12
 msgid "Welcome to Friendica"
 msgstr "Bienvenue sur Friendica"
 
-#: mod/newmember.php:12
+#: mod/newmember.php:13
 msgid "New Member Checklist"
 msgstr "Checklist du nouvel utilisateur"
 
-#: mod/newmember.php:14
+#: mod/newmember.php:15
 msgid ""
 "We would like to offer some tips and links to help make your experience "
 "enjoyable. Click any item to visit the relevant page. A link to this page "
@@ -4496,33 +4553,33 @@ msgid ""
 "registration and then will quietly disappear."
 msgstr "Nous souhaiterions vous donner quelques astuces et ressources pour rendre votre expérience la plus agréable possible. Cliquez sur n'importe lequel de ces éléments pour visiter la page correspondante. Un lien vers cette page restera visible sur votre page d'accueil pendant les deux semaines qui suivent votre inscription initiale, puis disparaîtra silencieusement."
 
-#: mod/newmember.php:15
+#: mod/newmember.php:16
 msgid "Getting Started"
 msgstr "Bien démarrer"
 
-#: mod/newmember.php:17
+#: mod/newmember.php:18
 msgid "Friendica Walk-Through"
 msgstr "Friendica pas-à-pas"
 
-#: mod/newmember.php:17
+#: mod/newmember.php:18
 msgid ""
 "On your <em>Quick Start</em> page - find a brief introduction to your "
 "profile and network tabs, make some new connections, and find some groups to"
 " join."
 msgstr "Sur votre page d'accueil, dans <em>Conseils aux nouveaux venus</em> - vous trouverez une rapide introduction aux onglets Profil et Réseau, pourrez vous connecter à Facebook, établir de nouvelles relations, et choisir des groupes à rejoindre."
 
-#: mod/newmember.php:21
+#: mod/newmember.php:22
 msgid "Go to Your Settings"
 msgstr "Éditer vos Réglages"
 
-#: mod/newmember.php:21
+#: mod/newmember.php:22
 msgid ""
 "On your <em>Settings</em> page -  change your initial password. Also make a "
 "note of your Identity Address. This looks just like an email address - and "
 "will be useful in making friends on the free social web."
 msgstr "Sur la page des <em>Réglages</em> -     changez votre mot de passe initial. Notez bien votre Identité. Elle ressemble à une adresse de courriel - et vous sera utile pour vous faire des amis dans le web social libre."
 
-#: mod/newmember.php:22
+#: mod/newmember.php:23
 msgid ""
 "Review the other settings, particularly the privacy settings. An unpublished"
 " directory listing is like having an unlisted phone number. In general, you "
@@ -4530,88 +4587,87 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr "Vérifiez les autres réglages, tout particulièrement ceux liés à la vie privée. Un profil non listé, c'est un peu comme un numéro sur liste rouge. En général, vous devriez probablement publier votre profil - à moins que tous vos amis (potentiels) sachent déjà comment vous trouver."
 
-#: mod/newmember.php:24 mod/profperm.php:117 src/Content/Nav.php:154
-#: src/Model/Profile.php:743 src/Model/Profile.php:876
-#: src/Model/Profile.php:909 src/Module/Contact.php:661
-#: src/Module/Contact.php:874 view/theme/frio/theme.php:274
+#: mod/newmember.php:25 mod/profperm.php:117 view/theme/frio/theme.php:263
+#: src/Content/Nav.php:157 src/Model/Profile.php:876 src/Model/Profile.php:909
+#: src/Module/Contact.php:654 src/Module/Contact.php:869
 msgid "Profile"
 msgstr "Profil"
 
-#: mod/newmember.php:26 mod/profiles.php:599 mod/profile_photo.php:250
+#: mod/newmember.php:27 mod/profile_photo.php:253 mod/profiles.php:583
 msgid "Upload Profile Photo"
 msgstr "Téléverser une photo de profil"
 
-#: mod/newmember.php:26
+#: mod/newmember.php:27
 msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make"
 " friends than people who do not."
 msgstr "Téléversez (envoyez) une photo de profil si vous n'en avez pas déjà une. Les études montrent que les gens qui affichent de vraies photos d'eux sont dix fois plus susceptibles de se faire des amis."
 
-#: mod/newmember.php:27
+#: mod/newmember.php:28
 msgid "Edit Your Profile"
 msgstr "Éditer votre Profil"
 
-#: mod/newmember.php:27
+#: mod/newmember.php:28
 msgid ""
 "Edit your <strong>default</strong> profile to your liking. Review the "
 "settings for hiding your list of friends and hiding the profile from unknown"
 " visitors."
 msgstr "Éditez votre profil <strong>par défaut</strong> à votre convenance. Vérifiez les réglages concernant la visibilité de votre liste d'amis par les visiteurs inconnus."
 
-#: mod/newmember.php:28
+#: mod/newmember.php:29
 msgid "Profile Keywords"
 msgstr "Mots-clés du profil"
 
-#: mod/newmember.php:28
+#: mod/newmember.php:29
 msgid ""
 "Set some public keywords for your default profile which describe your "
 "interests. We may be able to find other people with similar interests and "
 "suggest friendships."
 msgstr "Choisissez quelques mots-clé publics pour votre profil par défaut. Ils pourront ainsi décrire vos centres d'intérêt, et nous pourrons vous proposer des contacts qui les partagent."
 
-#: mod/newmember.php:30
+#: mod/newmember.php:31
 msgid "Connecting"
 msgstr "Connexions"
 
-#: mod/newmember.php:36
+#: mod/newmember.php:37
 msgid "Importing Emails"
 msgstr "Importer courriels"
 
-#: mod/newmember.php:36
+#: mod/newmember.php:37
 msgid ""
 "Enter your email access information on your Connector Settings page if you "
 "wish to import and interact with friends or mailing lists from your email "
 "INBOX"
 msgstr "Entrez vos paramètres de courriel dans les Réglages des connecteurs si vous souhaitez importer et interagir avec des amis ou des listes venant de votre Boîte de Réception."
 
-#: mod/newmember.php:39
+#: mod/newmember.php:40
 msgid "Go to Your Contacts Page"
 msgstr "Consulter vos Contacts"
 
-#: mod/newmember.php:39
+#: mod/newmember.php:40
 msgid ""
 "Your Contacts page is your gateway to managing friendships and connecting "
 "with friends on other networks. Typically you enter their address or site "
 "URL in the <em>Add New Contact</em> dialog."
 msgstr "Votre page Contacts est le point d'entrée vers la gestion de vos amitiés/relations et la connexion à des amis venant d'autres réseaux. Typiquement, vous pourrez y rentrer leur adresse d'Identité ou l'URL de leur site dans le formulaire <em>Ajouter un nouveau contact</em>."
 
-#: mod/newmember.php:40
+#: mod/newmember.php:41
 msgid "Go to Your Site's Directory"
 msgstr "Consulter l'Annuaire de votre Site"
 
-#: mod/newmember.php:40
+#: mod/newmember.php:41
 msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
 msgstr "La page Annuaire vous permet de trouver d'autres personnes au sein de ce réseaux ou parmi d'autres sites fédérés. Cherchez un lien <em>Relier</em> ou <em>Suivre</em> sur leur profil. Vous pourrez avoir besoin d'indiquer votre adresse d'identité."
 
-#: mod/newmember.php:41
+#: mod/newmember.php:42
 msgid "Finding New People"
 msgstr "Trouver de nouvelles personnes"
 
-#: mod/newmember.php:41
+#: mod/newmember.php:42
 msgid ""
 "On the side panel of the Contacts page are several tools to find new "
 "friends. We can match people by interest, look up people by name or "
@@ -4620,47 +4676,47 @@ msgid ""
 "hours."
 msgstr "Sur le panneau latéral de la page Contacts, il y a plusieurs moyens de trouver de nouveaux amis. Nous pouvons mettre les gens en relation selon leurs intérêts, rechercher des amis par nom ou intérêt, et fournir des suggestions en fonction de la topologie du réseau. Sur un site tout neuf, les suggestions d'amitié devraient commencer à apparaître au bout de 24 heures."
 
-#: mod/newmember.php:43 src/Model/Group.php:411 src/Module/Contact.php:759
+#: mod/newmember.php:44 src/Model/Group.php:415 src/Module/Contact.php:752
 msgid "Groups"
 msgstr "Groupes"
 
-#: mod/newmember.php:45
+#: mod/newmember.php:46
 msgid "Group Your Contacts"
 msgstr "Grouper vos contacts"
 
-#: mod/newmember.php:45
+#: mod/newmember.php:46
 msgid ""
 "Once you have made some friends, organize them into private conversation "
 "groups from the sidebar of your Contacts page and then you can interact with"
 " each group privately on your Network page."
 msgstr "Une fois que vous avez trouvé quelques amis, organisez-les en groupes de conversation privés depuis le panneau latéral de la page Contacts. Vous pourrez ensuite interagir avec chaque groupe de manière privée depuis la page Réseau."
 
-#: mod/newmember.php:48
+#: mod/newmember.php:49
 msgid "Why Aren't My Posts Public?"
 msgstr "Pourquoi mes éléments ne sont pas publics ?"
 
-#: mod/newmember.php:48
+#: mod/newmember.php:49
 msgid ""
 "Friendica respects your privacy. By default, your posts will only show up to"
 " people you've added as friends. For more information, see the help section "
 "from the link above."
 msgstr "Friendica respecte votre vie privée. Par défaut, toutes vos publications seront seulement montrés à vos amis. Pour plus d'information, consultez la section \"aide\" du lien ci-dessus."
 
-#: mod/newmember.php:52
+#: mod/newmember.php:53
 msgid "Getting Help"
 msgstr "Obtenir de l'aide"
 
-#: mod/newmember.php:54
+#: mod/newmember.php:55
 msgid "Go to the Help Section"
 msgstr "Aller à la section Aide"
 
-#: mod/newmember.php:54
+#: mod/newmember.php:55
 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program"
 " features and resources."
 msgstr "Nos pages d'<strong>aide</strong> peuvent être consultées pour davantage de détails sur les fonctionnalités ou les ressources."
 
-#: mod/notes.php:42 src/Model/Profile.php:959
+#: mod/notes.php:34 src/Model/Profile.php:959
 msgid "Personal Notes"
 msgstr "Notes personnelles"
 
@@ -4668,125 +4724,125 @@ msgstr "Notes personnelles"
 msgid "Invalid request identifier."
 msgstr "Identifiant de demande invalide."
 
-#: mod/notifications.php:60 mod/notifications.php:184
-#: mod/notifications.php:269 src/Module/Contact.php:628
-#: src/Module/Contact.php:830 src/Module/Contact.php:1090
+#: mod/notifications.php:60 mod/notifications.php:186
+#: mod/notifications.php:271 src/Module/Contact.php:622
+#: src/Module/Contact.php:825 src/Module/Contact.php:1085
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: mod/notifications.php:93 src/Content/Nav.php:244
+#: mod/notifications.php:93 src/Content/Nav.php:247
 msgid "Notifications"
 msgstr "Notifications"
 
-#: mod/notifications.php:105
+#: mod/notifications.php:107
 msgid "Network Notifications"
 msgstr "Notifications du réseau"
 
-#: mod/notifications.php:110 mod/notify.php:82
+#: mod/notifications.php:112 mod/notify.php:84
 msgid "System Notifications"
 msgstr "Notifications du système"
 
-#: mod/notifications.php:115
+#: mod/notifications.php:117
 msgid "Personal Notifications"
 msgstr "Notifications personnelles"
 
-#: mod/notifications.php:120
+#: mod/notifications.php:122
 msgid "Home Notifications"
 msgstr "Notifications de page d'accueil"
 
-#: mod/notifications.php:140
+#: mod/notifications.php:142
 msgid "Show unread"
 msgstr "Afficher non-lus"
 
-#: mod/notifications.php:140
+#: mod/notifications.php:142
 msgid "Show all"
 msgstr "Tout afficher"
 
-#: mod/notifications.php:151
+#: mod/notifications.php:153
 msgid "Show Ignored Requests"
 msgstr "Voir les demandes ignorées"
 
-#: mod/notifications.php:151
+#: mod/notifications.php:153
 msgid "Hide Ignored Requests"
 msgstr "Cacher les demandes ignorées"
 
-#: mod/notifications.php:164 mod/notifications.php:241
+#: mod/notifications.php:166 mod/notifications.php:243
 msgid "Notification type:"
 msgstr ""
 
-#: mod/notifications.php:167
+#: mod/notifications.php:169
 msgid "Suggested by:"
 msgstr ""
 
-#: mod/notifications.php:179 mod/notifications.php:258
-#: src/Module/Contact.php:636
+#: mod/notifications.php:181 mod/notifications.php:260
+#: src/Module/Contact.php:630
 msgid "Hide this contact from others"
 msgstr "Cacher ce contact aux autres"
 
-#: mod/notifications.php:201
+#: mod/notifications.php:203
 msgid "Claims to be known to you: "
 msgstr "Prétend que vous le connaissez : "
 
-#: mod/notifications.php:202
+#: mod/notifications.php:204
 msgid "yes"
 msgstr "oui"
 
-#: mod/notifications.php:202
+#: mod/notifications.php:204
 msgid "no"
 msgstr "non"
 
-#: mod/notifications.php:203 mod/notifications.php:207
+#: mod/notifications.php:205 mod/notifications.php:209
 msgid "Shall your connection be bidirectional or not?"
 msgstr "Souhaitez vous que votre connexion soit bi-directionnelle ?"
 
-#: mod/notifications.php:204 mod/notifications.php:208
+#: mod/notifications.php:206 mod/notifications.php:210
 #, php-format
 msgid ""
 "Accepting %s as a friend allows %s to subscribe to your posts, and you will "
 "also receive updates from them in your news feed."
 msgstr ""
 
-#: mod/notifications.php:205
+#: mod/notifications.php:207
 #, php-format
 msgid ""
 "Accepting %s as a subscriber allows them to subscribe to your posts, but you"
 " will not receive updates from them in your news feed."
 msgstr ""
 
-#: mod/notifications.php:209
+#: mod/notifications.php:211
 #, php-format
 msgid ""
 "Accepting %s as a sharer allows them to subscribe to your posts, but you "
 "will not receive updates from them in your news feed."
 msgstr ""
 
-#: mod/notifications.php:220
+#: mod/notifications.php:222
 msgid "Friend"
 msgstr "Ami"
 
-#: mod/notifications.php:221
+#: mod/notifications.php:223
 msgid "Sharer"
 msgstr "Initiateur du partage"
 
-#: mod/notifications.php:221
+#: mod/notifications.php:223
 msgid "Subscriber"
 msgstr ""
 
-#: mod/notifications.php:264 src/Model/Profile.php:537
-#: src/Module/Contact.php:93
+#: mod/notifications.php:266 src/Model/Profile.php:543
+#: src/Module/Contact.php:88
 msgid "Network:"
 msgstr "Réseau"
 
-#: mod/notifications.php:277
+#: mod/notifications.php:279
 msgid "No introductions."
 msgstr "Aucune demande d'introduction."
 
-#: mod/notifications.php:311
+#: mod/notifications.php:313
 #, php-format
 msgid "No more %s notifications."
 msgstr "Aucune notification de %s"
 
-#: mod/notify.php:78
+#: mod/notify.php:80
 msgid "No more system notifications."
 msgstr "Pas plus de notifications système."
 
@@ -4794,16 +4850,16 @@ msgstr "Pas plus de notifications système."
 msgid "Post successful."
 msgstr "Publication réussie."
 
-#: mod/openid.php:32
+#: mod/openid.php:31
 msgid "OpenID protocol error. No ID returned."
 msgstr "Erreur de protocole OpenID. Pas d'ID en retour."
 
-#: mod/openid.php:68
+#: mod/openid.php:67
 msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr "Compte introuvable, et l'inscription OpenID n'est pas autorisée sur ce site."
 
-#: mod/openid.php:118 src/Module/Login.php:94 src/Module/Login.php:144
+#: mod/openid.php:117 src/Module/Login.php:92 src/Module/Login.php:143
 msgid "Login failed."
 msgstr "Échec de connexion."
 
@@ -4835,7 +4891,7 @@ msgstr "réussite"
 msgid "failed"
 msgstr "échec"
 
-#: mod/ostatus_subscribe.php:89 src/Object/Post.php:282
+#: mod/ostatus_subscribe.php:89 src/Object/Post.php:283
 msgid "ignored"
 msgstr "ignoré"
 
@@ -4843,255 +4899,251 @@ msgstr "ignoré"
 msgid "Keep this window open until done."
 msgstr "Veuillez garder cette fenêtre ouverte jusqu'à la fin."
 
-#: mod/photos.php:118 src/Model/Profile.php:920
+#: mod/photos.php:115 src/Model/Profile.php:920
 msgid "Photo Albums"
 msgstr "Albums photo"
 
-#: mod/photos.php:119 mod/photos.php:1710
+#: mod/photos.php:116 mod/photos.php:1665
 msgid "Recent Photos"
 msgstr "Photos récentes"
 
-#: mod/photos.php:122 mod/photos.php:1231 mod/photos.php:1712
+#: mod/photos.php:119 mod/photos.php:1187 mod/photos.php:1667
 msgid "Upload New Photos"
 msgstr "Téléverser de nouvelles photos"
 
-#: mod/photos.php:140 mod/settings.php:56
+#: mod/photos.php:137 mod/settings.php:56
 msgid "everybody"
 msgstr "tout le monde"
 
-#: mod/photos.php:196
+#: mod/photos.php:193
 msgid "Contact information unavailable"
 msgstr "Informations de contact indisponibles"
 
-#: mod/photos.php:215
+#: mod/photos.php:212
 msgid "Album not found."
 msgstr "Album introuvable."
 
-#: mod/photos.php:244 mod/photos.php:257 mod/photos.php:1182
+#: mod/photos.php:241 mod/photos.php:254 mod/photos.php:1138
 msgid "Delete Album"
 msgstr "Effacer l'album"
 
-#: mod/photos.php:255
+#: mod/photos.php:252
 msgid "Do you really want to delete this photo album and all its photos?"
 msgstr "Voulez-vous vraiment supprimer cet album photo et toutes ses photos ?"
 
-#: mod/photos.php:317 mod/photos.php:329 mod/photos.php:1457
+#: mod/photos.php:310 mod/photos.php:322 mod/photos.php:1413
 msgid "Delete Photo"
 msgstr "Effacer la photo"
 
-#: mod/photos.php:327
+#: mod/photos.php:320
 msgid "Do you really want to delete this photo?"
 msgstr "Voulez-vous vraiment supprimer cette photo ?"
 
-#: mod/photos.php:684
+#: mod/photos.php:645
 msgid "a photo"
 msgstr "une photo"
 
-#: mod/photos.php:684
+#: mod/photos.php:645
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr "%1$s a été étiqueté dans %2$s par %3$s"
 
-#: mod/photos.php:780 mod/photos.php:783 mod/photos.php:812
-#: mod/profile_photo.php:155 mod/wall_upload.php:197
+#: mod/photos.php:738 mod/photos.php:741 mod/photos.php:770
+#: mod/profile_photo.php:152 mod/wall_upload.php:198
 #, php-format
 msgid "Image exceeds size limit of %s"
 msgstr "L'image dépasse la taille limite de %s"
 
-#: mod/photos.php:786
+#: mod/photos.php:744
 msgid "Image upload didn't complete, please try again"
 msgstr ""
 
-#: mod/photos.php:789
+#: mod/photos.php:747
 msgid "Image file is missing"
 msgstr ""
 
-#: mod/photos.php:794
+#: mod/photos.php:752
 msgid ""
 "Server can't accept new file upload at this time, please contact your "
 "administrator"
 msgstr ""
 
-#: mod/photos.php:820
+#: mod/photos.php:778
 msgid "Image file is empty."
 msgstr "Fichier image vide."
 
-#: mod/photos.php:835 mod/profile_photo.php:164 mod/wall_upload.php:211
+#: mod/photos.php:793 mod/profile_photo.php:161 mod/wall_upload.php:212
 msgid "Unable to process image."
 msgstr "Impossible de traiter l'image."
 
-#: mod/photos.php:864 mod/profile_photo.php:309 mod/wall_upload.php:250
+#: mod/photos.php:822 mod/profile_photo.php:310 mod/wall_upload.php:251
 msgid "Image upload failed."
 msgstr "Le téléversement de l'image a échoué."
 
-#: mod/photos.php:952
+#: mod/photos.php:908
 msgid "No photos selected"
 msgstr "Aucune photo sélectionnée"
 
-#: mod/photos.php:1049 mod/videos.php:302
+#: mod/photos.php:1005 mod/videos.php:239
 msgid "Access to this item is restricted."
 msgstr "Accès restreint à cet élément."
 
-#: mod/photos.php:1103
+#: mod/photos.php:1059
 msgid "Upload Photos"
 msgstr "Téléverser des photos"
 
-#: mod/photos.php:1107 mod/photos.php:1177
+#: mod/photos.php:1063 mod/photos.php:1133
 msgid "New album name: "
 msgstr "Nom du nouvel album : "
 
-#: mod/photos.php:1108
+#: mod/photos.php:1064
 msgid "or select existing album:"
 msgstr ""
 
-#: mod/photos.php:1109
+#: mod/photos.php:1065
 msgid "Do not show a status post for this upload"
 msgstr "Ne pas publier de notice de statut pour cet envoi"
 
-#: mod/photos.php:1125 mod/photos.php:1460 mod/settings.php:1224
+#: mod/photos.php:1081 mod/photos.php:1416 mod/settings.php:1209
 msgid "Show to Groups"
 msgstr "Montrer aux groupes"
 
-#: mod/photos.php:1126 mod/photos.php:1461 mod/settings.php:1225
+#: mod/photos.php:1082 mod/photos.php:1417 mod/settings.php:1210
 msgid "Show to Contacts"
 msgstr "Montrer aux Contacts"
 
-#: mod/photos.php:1188
+#: mod/photos.php:1144
 msgid "Edit Album"
 msgstr "Éditer l'album"
 
-#: mod/photos.php:1193
+#: mod/photos.php:1149
 msgid "Show Newest First"
 msgstr "Plus récent d'abord"
 
-#: mod/photos.php:1195
+#: mod/photos.php:1151
 msgid "Show Oldest First"
 msgstr "Plus ancien d'abord"
 
-#: mod/photos.php:1216 mod/photos.php:1695
+#: mod/photos.php:1172 mod/photos.php:1650
 msgid "View Photo"
 msgstr "Voir la photo"
 
-#: mod/photos.php:1257
+#: mod/photos.php:1213
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Interdit. L'accès à cet élément peut avoir été restreint."
 
-#: mod/photos.php:1259
+#: mod/photos.php:1215
 msgid "Photo not available"
 msgstr "Photo indisponible"
 
-#: mod/photos.php:1334
+#: mod/photos.php:1290
 msgid "View photo"
 msgstr "Voir photo"
 
-#: mod/photos.php:1334
+#: mod/photos.php:1290
 msgid "Edit photo"
 msgstr "Éditer la photo"
 
-#: mod/photos.php:1335
+#: mod/photos.php:1291
 msgid "Use as profile photo"
 msgstr "Utiliser comme photo de profil"
 
-#: mod/photos.php:1341 src/Object/Post.php:155
+#: mod/photos.php:1297 src/Object/Post.php:156
 msgid "Private Message"
 msgstr "Message privé"
 
-#: mod/photos.php:1361
+#: mod/photos.php:1317
 msgid "View Full Size"
 msgstr "Voir en taille réelle"
 
-#: mod/photos.php:1425
+#: mod/photos.php:1381
 msgid "Tags: "
 msgstr "Étiquettes :"
 
-#: mod/photos.php:1428
+#: mod/photos.php:1384
 msgid "[Select tags to remove]"
 msgstr ""
 
-#: mod/photos.php:1443
+#: mod/photos.php:1399
 msgid "New album name"
 msgstr "Nom du nouvel album"
 
-#: mod/photos.php:1444
+#: mod/photos.php:1400
 msgid "Caption"
 msgstr "Titre"
 
-#: mod/photos.php:1445
+#: mod/photos.php:1401
 msgid "Add a Tag"
 msgstr "Ajouter une étiquette"
 
-#: mod/photos.php:1445
+#: mod/photos.php:1401
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Exemples : @bob, @Barbara_Jensen, @jim@example.com, #Californie, #vacances"
 
-#: mod/photos.php:1446
+#: mod/photos.php:1402
 msgid "Do not rotate"
 msgstr "Pas de rotation"
 
-#: mod/photos.php:1447
+#: mod/photos.php:1403
 msgid "Rotate CW (right)"
 msgstr "Tourner dans le sens des aiguilles d'une montre (vers la droite)"
 
-#: mod/photos.php:1448
+#: mod/photos.php:1404
 msgid "Rotate CCW (left)"
 msgstr "Tourner dans le sens contraire des aiguilles d'une montre (vers la gauche)"
 
-#: mod/photos.php:1482 src/Object/Post.php:310
+#: mod/photos.php:1438 src/Object/Post.php:311
 msgid "I like this (toggle)"
 msgstr "J'aime"
 
-#: mod/photos.php:1483 src/Object/Post.php:311
+#: mod/photos.php:1439 src/Object/Post.php:312
 msgid "I don't like this (toggle)"
 msgstr "Je n'aime pas"
 
-#: mod/photos.php:1498 mod/photos.php:1537 mod/photos.php:1597
-#: src/Module/Contact.php:1023 src/Object/Post.php:810
+#: mod/photos.php:1454 mod/photos.php:1493 mod/photos.php:1553
+#: src/Module/Contact.php:1018 src/Object/Post.php:870
 msgid "This is you"
 msgstr "C'est vous"
 
-#: mod/photos.php:1500 mod/photos.php:1539 mod/photos.php:1599
-#: src/Object/Post.php:415 src/Object/Post.php:812
+#: mod/photos.php:1456 mod/photos.php:1495 mod/photos.php:1555
+#: src/Object/Post.php:417 src/Object/Post.php:872
 msgid "Comment"
 msgstr "Commenter"
 
-#: mod/photos.php:1629
+#: mod/photos.php:1585
 msgid "Map"
 msgstr "Carte"
 
-#: mod/photos.php:1701 mod/videos.php:379
+#: mod/photos.php:1656 mod/videos.php:316
 msgid "View Album"
 msgstr "Voir l'album"
 
-#: mod/ping.php:281
+#: mod/ping.php:272
 msgid "{0} wants to be your friend"
 msgstr "{0} souhaite être votre ami(e)"
 
-#: mod/ping.php:297
-msgid "{0} sent you a message"
-msgstr "{0} vous a envoyé un message"
-
-#: mod/ping.php:313
+#: mod/ping.php:288
 msgid "{0} requested registration"
 msgstr "{0} a demandé à s'inscrire"
 
-#: mod/poke.php:187
+#: mod/poke.php:181
 msgid "Poke/Prod"
 msgstr "Solliciter"
 
-#: mod/poke.php:188
+#: mod/poke.php:182
 msgid "poke, prod or do other things to somebody"
 msgstr "solliciter (poke/...) quelqu'un"
 
-#: mod/poke.php:189
+#: mod/poke.php:183
 msgid "Recipient"
 msgstr "Destinataire"
 
-#: mod/poke.php:190
+#: mod/poke.php:184
 msgid "Choose what you wish to do to recipient"
 msgstr "Choisissez ce que vous voulez faire au destinataire"
 
-#: mod/poke.php:193
+#: mod/poke.php:187
 msgid "Make this post private"
 msgstr "Rendez ce message privé"
 
@@ -5099,405 +5151,386 @@ msgstr "Rendez ce message privé"
 msgid "Only logged in users are permitted to perform a probing."
 msgstr ""
 
-#: mod/profile.php:44 src/Model/Profile.php:132
-msgid "Requested profile is not available."
-msgstr "Le profil demandé n'est pas disponible."
-
-#: mod/profile.php:95 mod/profile.php:98 src/Protocol/OStatus.php:1290
-#, php-format
-msgid "%s's timeline"
-msgstr ""
-
-#: mod/profile.php:96 src/Protocol/OStatus.php:1294
-#, php-format
-msgid "%s's posts"
-msgstr ""
-
-#: mod/profile.php:97 src/Protocol/OStatus.php:1297
-#, php-format
-msgid "%s's comments"
-msgstr ""
-
-#: mod/profiles.php:61
-msgid "Profile deleted."
-msgstr "Profil supprimé."
-
-#: mod/profiles.php:77 mod/profiles.php:113
-msgid "Profile-"
-msgstr "Profil-"
-
-#: mod/profiles.php:96 mod/profiles.php:135
-msgid "New profile created."
-msgstr "Nouveau profil créé."
-
-#: mod/profiles.php:119
-msgid "Profile unavailable to clone."
-msgstr "Ce profil ne peut être cloné."
-
-#: mod/profiles.php:207
-msgid "Profile Name is required."
-msgstr "Le nom du profil est requis."
-
-#: mod/profiles.php:348
-msgid "Marital Status"
-msgstr "Statut marital"
-
-#: mod/profiles.php:352
-msgid "Romantic Partner"
-msgstr "Partenaire / conjoint"
-
-#: mod/profiles.php:364
-msgid "Work/Employment"
-msgstr "Travail / Occupation"
-
-#: mod/profiles.php:367
-msgid "Religion"
-msgstr "Religion"
-
-#: mod/profiles.php:371
-msgid "Political Views"
-msgstr "Tendance politique"
-
-#: mod/profiles.php:375
-msgid "Gender"
-msgstr "Sexe"
-
-#: mod/profiles.php:379
-msgid "Sexual Preference"
-msgstr "Préférence sexuelle"
-
-#: mod/profiles.php:383
-msgid "XMPP"
-msgstr "XMPP"
-
-#: mod/profiles.php:387
-msgid "Homepage"
-msgstr "Site internet"
-
-#: mod/profiles.php:391 mod/profiles.php:594
-msgid "Interests"
-msgstr "Centres d'intérêt"
-
-#: mod/profiles.php:402 mod/profiles.php:590
-msgid "Location"
-msgstr "Localisation"
-
-#: mod/profiles.php:485
-msgid "Profile updated."
-msgstr "Profil mis à jour."
-
-#: mod/profiles.php:539
-msgid "Hide contacts and friends:"
-msgstr "Cacher mes contacts et amis :"
-
-#: mod/profiles.php:544
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Cacher ma liste d'amis / contacts des visiteurs de ce profil ?"
-
-#: mod/profiles.php:564
-msgid "Show more profile fields:"
-msgstr "Afficher plus d'infos de profil :"
-
-#: mod/profiles.php:576
-msgid "Profile Actions"
-msgstr "Actions de Profil"
-
-#: mod/profiles.php:577
-msgid "Edit Profile Details"
-msgstr "Éditer les détails du profil"
-
-#: mod/profiles.php:579
-msgid "Change Profile Photo"
-msgstr "Changer la photo du profil"
-
-#: mod/profiles.php:581
-msgid "View this profile"
-msgstr "Voir ce profil"
-
-#: mod/profiles.php:582
-msgid "View all profiles"
-msgstr ""
-
-#: mod/profiles.php:583 mod/profiles.php:678 src/Model/Profile.php:410
-msgid "Edit visibility"
-msgstr "Changer la visibilité"
-
-#: mod/profiles.php:584
-msgid "Create a new profile using these settings"
-msgstr "Créer un nouveau profil en utilisant ces réglages"
-
-#: mod/profiles.php:585
-msgid "Clone this profile"
-msgstr "Cloner ce profil"
-
-#: mod/profiles.php:586
-msgid "Delete this profile"
-msgstr "Supprimer ce profil"
-
-#: mod/profiles.php:588
-msgid "Basic information"
-msgstr "Information de base"
-
-#: mod/profiles.php:589
-msgid "Profile picture"
-msgstr "Image de profil"
-
-#: mod/profiles.php:591
-msgid "Preferences"
-msgstr "Préférences"
-
-#: mod/profiles.php:592
-msgid "Status information"
-msgstr "Information sur le statut"
-
-#: mod/profiles.php:593
-msgid "Additional information"
-msgstr "Information additionnelle"
-
-#: mod/profiles.php:596
-msgid "Relation"
-msgstr "Relation"
-
-#: mod/profiles.php:597 src/Util/Temporal.php:83 src/Util/Temporal.php:85
-msgid "Miscellaneous"
-msgstr "Divers"
-
-#: mod/profiles.php:600
-msgid "Your Gender:"
-msgstr "Votre genre :"
-
-#: mod/profiles.php:601
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr "<span class=\"heart\">&hearts;</span> Statut marital :"
-
-#: mod/profiles.php:602 src/Model/Profile.php:795
-msgid "Sexual Preference:"
-msgstr "Préférence sexuelle :"
-
-#: mod/profiles.php:603
-msgid "Example: fishing photography software"
-msgstr "Exemple : football dessin programmation"
-
-#: mod/profiles.php:608
-msgid "Profile Name:"
-msgstr "Nom du profil :"
-
-#: mod/profiles.php:610
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
-msgstr "Ceci est votre profil <strong>public</strong>.<br />Il <strong>peut</strong> être visible par n'importe quel utilisateur d'Internet."
-
-#: mod/profiles.php:611
-msgid "Your Full Name:"
-msgstr "Votre nom complet :"
-
-#: mod/profiles.php:612
-msgid "Title/Description:"
-msgstr "Titre / Description :"
-
-#: mod/profiles.php:615
-msgid "Street Address:"
-msgstr "Adresse postale :"
-
-#: mod/profiles.php:616
-msgid "Locality/City:"
-msgstr "Ville :"
-
-#: mod/profiles.php:617
-msgid "Region/State:"
-msgstr "Région / État :"
-
-#: mod/profiles.php:618
-msgid "Postal/Zip Code:"
-msgstr "Code postal :"
-
-#: mod/profiles.php:619
-msgid "Country:"
-msgstr "Pays :"
-
-#: mod/profiles.php:620 src/Util/Temporal.php:151
-msgid "Age: "
-msgstr "Age : "
-
-#: mod/profiles.php:623
-msgid "Who: (if applicable)"
-msgstr "Qui : (si pertinent)"
-
-#: mod/profiles.php:623
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Exemples: cathy123, Cathy Williams, cathy@example.com"
-
-#: mod/profiles.php:624
-msgid "Since [date]:"
-msgstr "Depuis [date]  :"
-
-#: mod/profiles.php:626
-msgid "Tell us about yourself..."
-msgstr "Parlez-nous de vous..."
-
-#: mod/profiles.php:627
-msgid "XMPP (Jabber) address:"
-msgstr "Adresse XMPP (Jabber) :"
-
-#: mod/profiles.php:627
-msgid ""
-"The XMPP address will be propagated to your contacts so that they can follow"
-" you."
-msgstr "Votre adresse XMPP sera transmise à vos contacts pour qu'ils puissent vous suivre."
-
-#: mod/profiles.php:628
-msgid "Homepage URL:"
-msgstr "Page personnelle :"
-
-#: mod/profiles.php:629 src/Model/Profile.php:803
-msgid "Hometown:"
-msgstr " Ville d'origine :"
-
-#: mod/profiles.php:630 src/Model/Profile.php:811
-msgid "Political Views:"
-msgstr "Opinions politiques :"
-
-#: mod/profiles.php:631
-msgid "Religious Views:"
-msgstr "Opinions religieuses :"
-
-#: mod/profiles.php:632
-msgid "Public Keywords:"
-msgstr "Mots-clés publics :"
-
-#: mod/profiles.php:632
-msgid "(Used for suggesting potential friends, can be seen by others)"
-msgstr "(Utilisés pour vous suggérer des amis potentiels. Ils peuvent être vus par autrui)"
-
-#: mod/profiles.php:633
-msgid "Private Keywords:"
-msgstr "Mots-clés privés :"
-
-#: mod/profiles.php:633
-msgid "(Used for searching profiles, never shown to others)"
-msgstr "(Utilisés pour rechercher des profils. Ils ne seront jamais montrés à autrui)"
-
-#: mod/profiles.php:634 src/Model/Profile.php:827
-msgid "Likes:"
-msgstr "J'aime :"
-
-#: mod/profiles.php:635 src/Model/Profile.php:831
-msgid "Dislikes:"
-msgstr "Je n'aime pas :"
-
-#: mod/profiles.php:636
-msgid "Musical interests"
-msgstr "Goûts musicaux"
-
-#: mod/profiles.php:637
-msgid "Books, literature"
-msgstr "Lectures"
-
-#: mod/profiles.php:638
-msgid "Television"
-msgstr "Télévision"
-
-#: mod/profiles.php:639
-msgid "Film/dance/culture/entertainment"
-msgstr "Cinéma / Danse / Culture / Divertissement"
-
-#: mod/profiles.php:640
-msgid "Hobbies/Interests"
-msgstr "Passe-temps / Centres d'intérêt"
-
-#: mod/profiles.php:641
-msgid "Love/romance"
-msgstr "Amour / Romance"
-
-#: mod/profiles.php:642
-msgid "Work/employment"
-msgstr "Activité professionnelle / Occupation"
-
-#: mod/profiles.php:643
-msgid "School/education"
-msgstr "Études / Formation"
-
-#: mod/profiles.php:644
-msgid "Contact information and Social Networks"
-msgstr "Coordonnées / Réseaux sociaux"
-
-#: mod/profiles.php:675 src/Model/Profile.php:406
-msgid "Profile Image"
-msgstr "Image du profil"
-
-#: mod/profiles.php:677 src/Model/Profile.php:409
-msgid "visible to everybody"
-msgstr "visible par tous"
-
-#: mod/profiles.php:684
-msgid "Edit/Manage Profiles"
-msgstr "Editer / gérer les profils"
-
-#: mod/profiles.php:685 src/Model/Profile.php:396 src/Model/Profile.php:418
-msgid "Change profile photo"
-msgstr "Changer de photo de profil"
-
-#: mod/profiles.php:686 src/Model/Profile.php:397
-msgid "Create New Profile"
-msgstr "Créer un nouveau profil"
-
-#: mod/profile_photo.php:59
+#: mod/profile_photo.php:58
 msgid "Image uploaded but image cropping failed."
 msgstr "Image envoyée, mais impossible de la retailler."
 
-#: mod/profile_photo.php:91 mod/profile_photo.php:100
-#: mod/profile_photo.php:109 mod/profile_photo.php:317
+#: mod/profile_photo.php:88 mod/profile_photo.php:97 mod/profile_photo.php:106
+#: mod/profile_photo.php:318
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr "Réduction de la taille de l'image [%s] échouée."
 
-#: mod/profile_photo.php:128
+#: mod/profile_photo.php:125
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Rechargez la page avec la touche Maj pressée, ou bien effacez le cache du navigateur, si d'aventure la nouvelle photo n'apparaissait pas immédiatement."
 
-#: mod/profile_photo.php:136
+#: mod/profile_photo.php:133
 msgid "Unable to process image"
 msgstr "Impossible de traiter l'image"
 
-#: mod/profile_photo.php:248
+#: mod/profile_photo.php:251
 msgid "Upload File:"
 msgstr "Fichier à téléverser :"
 
-#: mod/profile_photo.php:249
+#: mod/profile_photo.php:252
 msgid "Select a profile:"
 msgstr "Choisir un profil :"
 
-#: mod/profile_photo.php:254
+#: mod/profile_photo.php:257
 msgid "or"
 msgstr "ou"
 
-#: mod/profile_photo.php:255
+#: mod/profile_photo.php:258
 msgid "skip this step"
 msgstr "ignorer cette étape"
 
-#: mod/profile_photo.php:255
+#: mod/profile_photo.php:258
 msgid "select a photo from your photo albums"
 msgstr "choisissez une photo depuis vos albums"
 
-#: mod/profile_photo.php:268
+#: mod/profile_photo.php:271
 msgid "Crop Image"
 msgstr "(Re)cadrer l'image"
 
-#: mod/profile_photo.php:269
+#: mod/profile_photo.php:272
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Ajustez le cadre de l'image pour une visualisation optimale."
 
-#: mod/profile_photo.php:271
+#: mod/profile_photo.php:274
 msgid "Done Editing"
 msgstr "Édition terminée"
 
-#: mod/profile_photo.php:307
+#: mod/profile_photo.php:308
 msgid "Image uploaded successfully."
 msgstr "Image téléversée avec succès."
 
+#: mod/profiles.php:62
+msgid "Profile deleted."
+msgstr "Profil supprimé."
+
+#: mod/profiles.php:78 mod/profiles.php:114
+msgid "Profile-"
+msgstr "Profil-"
+
+#: mod/profiles.php:97 mod/profiles.php:135
+msgid "New profile created."
+msgstr "Nouveau profil créé."
+
+#: mod/profiles.php:120
+msgid "Profile unavailable to clone."
+msgstr "Ce profil ne peut être cloné."
+
+#: mod/profiles.php:206
+msgid "Profile Name is required."
+msgstr "Le nom du profil est requis."
+
+#: mod/profiles.php:346
+msgid "Marital Status"
+msgstr "Statut marital"
+
+#: mod/profiles.php:349
+msgid "Romantic Partner"
+msgstr "Partenaire / conjoint"
+
+#: mod/profiles.php:358
+msgid "Work/Employment"
+msgstr "Travail / Occupation"
+
+#: mod/profiles.php:361
+msgid "Religion"
+msgstr "Religion"
+
+#: mod/profiles.php:364
+msgid "Political Views"
+msgstr "Tendance politique"
+
+#: mod/profiles.php:367
+msgid "Gender"
+msgstr "Sexe"
+
+#: mod/profiles.php:370
+msgid "Sexual Preference"
+msgstr "Préférence sexuelle"
+
+#: mod/profiles.php:373
+msgid "XMPP"
+msgstr "XMPP"
+
+#: mod/profiles.php:376
+msgid "Homepage"
+msgstr "Site internet"
+
+#: mod/profiles.php:379 mod/profiles.php:578
+msgid "Interests"
+msgstr "Centres d'intérêt"
+
+#: mod/profiles.php:389 mod/profiles.php:574
+msgid "Location"
+msgstr "Localisation"
+
+#: mod/profiles.php:469
+msgid "Profile updated."
+msgstr "Profil mis à jour."
+
+#: mod/profiles.php:523
+msgid "Hide contacts and friends:"
+msgstr "Cacher mes contacts et amis :"
+
+#: mod/profiles.php:528
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Cacher ma liste d'amis / contacts des visiteurs de ce profil ?"
+
+#: mod/profiles.php:548
+msgid "Show more profile fields:"
+msgstr "Afficher plus d'infos de profil :"
+
+#: mod/profiles.php:560
+msgid "Profile Actions"
+msgstr "Actions de Profil"
+
+#: mod/profiles.php:561
+msgid "Edit Profile Details"
+msgstr "Éditer les détails du profil"
+
+#: mod/profiles.php:563
+msgid "Change Profile Photo"
+msgstr "Changer la photo du profil"
+
+#: mod/profiles.php:565
+msgid "View this profile"
+msgstr "Voir ce profil"
+
+#: mod/profiles.php:566
+msgid "View all profiles"
+msgstr ""
+
+#: mod/profiles.php:567 mod/profiles.php:662 src/Model/Profile.php:419
+msgid "Edit visibility"
+msgstr "Changer la visibilité"
+
+#: mod/profiles.php:568
+msgid "Create a new profile using these settings"
+msgstr "Créer un nouveau profil en utilisant ces réglages"
+
+#: mod/profiles.php:569
+msgid "Clone this profile"
+msgstr "Cloner ce profil"
+
+#: mod/profiles.php:570
+msgid "Delete this profile"
+msgstr "Supprimer ce profil"
+
+#: mod/profiles.php:572
+msgid "Basic information"
+msgstr "Information de base"
+
+#: mod/profiles.php:573
+msgid "Profile picture"
+msgstr "Image de profil"
+
+#: mod/profiles.php:575
+msgid "Preferences"
+msgstr "Préférences"
+
+#: mod/profiles.php:576
+msgid "Status information"
+msgstr "Information sur le statut"
+
+#: mod/profiles.php:577
+msgid "Additional information"
+msgstr "Information additionnelle"
+
+#: mod/profiles.php:580
+msgid "Relation"
+msgstr "Relation"
+
+#: mod/profiles.php:581 src/Util/Temporal.php:79 src/Util/Temporal.php:81
+msgid "Miscellaneous"
+msgstr "Divers"
+
+#: mod/profiles.php:584
+msgid "Your Gender:"
+msgstr "Votre genre :"
+
+#: mod/profiles.php:585
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Statut marital :"
+
+#: mod/profiles.php:586 src/Model/Profile.php:795
+msgid "Sexual Preference:"
+msgstr "Préférence sexuelle :"
+
+#: mod/profiles.php:587
+msgid "Example: fishing photography software"
+msgstr "Exemple : football dessin programmation"
+
+#: mod/profiles.php:592
+msgid "Profile Name:"
+msgstr "Nom du profil :"
+
+#: mod/profiles.php:594
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
+msgstr "Ceci est votre profil <strong>public</strong>.<br />Il <strong>peut</strong> être visible par n'importe quel utilisateur d'Internet."
+
+#: mod/profiles.php:595
+msgid "Your Full Name:"
+msgstr "Votre nom complet :"
+
+#: mod/profiles.php:596
+msgid "Title/Description:"
+msgstr "Titre / Description :"
+
+#: mod/profiles.php:599
+msgid "Street Address:"
+msgstr "Adresse postale :"
+
+#: mod/profiles.php:600
+msgid "Locality/City:"
+msgstr "Ville :"
+
+#: mod/profiles.php:601
+msgid "Region/State:"
+msgstr "Région / État :"
+
+#: mod/profiles.php:602
+msgid "Postal/Zip Code:"
+msgstr "Code postal :"
+
+#: mod/profiles.php:603
+msgid "Country:"
+msgstr "Pays :"
+
+#: mod/profiles.php:604 src/Util/Temporal.php:149
+msgid "Age: "
+msgstr "Age : "
+
+#: mod/profiles.php:607
+msgid "Who: (if applicable)"
+msgstr "Qui : (si pertinent)"
+
+#: mod/profiles.php:607
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Exemples: cathy123, Cathy Williams, cathy@example.com"
+
+#: mod/profiles.php:608
+msgid "Since [date]:"
+msgstr "Depuis [date]  :"
+
+#: mod/profiles.php:610
+msgid "Tell us about yourself..."
+msgstr "Parlez-nous de vous..."
+
+#: mod/profiles.php:611
+msgid "XMPP (Jabber) address:"
+msgstr "Adresse XMPP (Jabber) :"
+
+#: mod/profiles.php:611
+msgid ""
+"The XMPP address will be propagated to your contacts so that they can follow"
+" you."
+msgstr "Votre adresse XMPP sera transmise à vos contacts pour qu'ils puissent vous suivre."
+
+#: mod/profiles.php:612
+msgid "Homepage URL:"
+msgstr "Page personnelle :"
+
+#: mod/profiles.php:613 src/Model/Profile.php:803
+msgid "Hometown:"
+msgstr " Ville d'origine :"
+
+#: mod/profiles.php:614 src/Model/Profile.php:811
+msgid "Political Views:"
+msgstr "Opinions politiques :"
+
+#: mod/profiles.php:615
+msgid "Religious Views:"
+msgstr "Opinions religieuses :"
+
+#: mod/profiles.php:616
+msgid "Public Keywords:"
+msgstr "Mots-clés publics :"
+
+#: mod/profiles.php:616
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr "(Utilisés pour vous suggérer des amis potentiels. Ils peuvent être vus par autrui)"
+
+#: mod/profiles.php:617
+msgid "Private Keywords:"
+msgstr "Mots-clés privés :"
+
+#: mod/profiles.php:617
+msgid "(Used for searching profiles, never shown to others)"
+msgstr "(Utilisés pour rechercher des profils. Ils ne seront jamais montrés à autrui)"
+
+#: mod/profiles.php:618 src/Model/Profile.php:827
+msgid "Likes:"
+msgstr "J'aime :"
+
+#: mod/profiles.php:619 src/Model/Profile.php:831
+msgid "Dislikes:"
+msgstr "Je n'aime pas :"
+
+#: mod/profiles.php:620
+msgid "Musical interests"
+msgstr "Goûts musicaux"
+
+#: mod/profiles.php:621
+msgid "Books, literature"
+msgstr "Lectures"
+
+#: mod/profiles.php:622
+msgid "Television"
+msgstr "Télévision"
+
+#: mod/profiles.php:623
+msgid "Film/dance/culture/entertainment"
+msgstr "Cinéma / Danse / Culture / Divertissement"
+
+#: mod/profiles.php:624
+msgid "Hobbies/Interests"
+msgstr "Passe-temps / Centres d'intérêt"
+
+#: mod/profiles.php:625
+msgid "Love/romance"
+msgstr "Amour / Romance"
+
+#: mod/profiles.php:626
+msgid "Work/employment"
+msgstr "Activité professionnelle / Occupation"
+
+#: mod/profiles.php:627
+msgid "School/education"
+msgstr "Études / Formation"
+
+#: mod/profiles.php:628
+msgid "Contact information and Social Networks"
+msgstr "Coordonnées / Réseaux sociaux"
+
+#: mod/profiles.php:659 src/Model/Profile.php:415
+msgid "Profile Image"
+msgstr "Image du profil"
+
+#: mod/profiles.php:661 src/Model/Profile.php:418
+msgid "visible to everybody"
+msgstr "visible par tous"
+
+#: mod/profiles.php:668
+msgid "Edit/Manage Profiles"
+msgstr "Editer / gérer les profils"
+
+#: mod/profiles.php:669 src/Model/Profile.php:405 src/Model/Profile.php:427
+msgid "Change profile photo"
+msgstr "Changer de photo de profil"
+
+#: mod/profiles.php:670 src/Model/Profile.php:406
+msgid "Create New Profile"
+msgstr "Créer un nouveau profil"
+
 #: mod/profperm.php:36 mod/profperm.php:69
 msgid "Invalid profile identifier."
 msgstr "Identifiant de profil invalide."
@@ -5514,160 +5547,45 @@ msgstr "Visible par"
 msgid "All Contacts (with secure profile access)"
 msgstr "Tous les contacts (ayant un accès sécurisé)"
 
-#: mod/register.php:105
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr "Inscription réussie. Vérifiez vos emails pour la suite des instructions."
-
-#: mod/register.php:109
-#, php-format
-msgid ""
-"Failed to send email message. Here your accout details:<br> login: %s<br> "
-"password: %s<br><br>You can change your password after login."
-msgstr "Impossible d’envoyer le courriel de confirmation. Voici vos informations de connexion:<br> identifiant : %s<br> mot de passe : %s<br><br>Vous pourrez changer votre mot de passe une fois connecté."
-
-#: mod/register.php:116
-msgid "Registration successful."
-msgstr "Inscription réussie."
-
-#: mod/register.php:121
-msgid "Your registration can not be processed."
-msgstr "Votre inscription ne peut être traitée."
-
-#: mod/register.php:164
-msgid "Your registration is pending approval by the site owner."
-msgstr "Votre inscription attend une validation du propriétaire du site."
-
-#: mod/register.php:193 mod/uimport.php:39
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "Le nombre d'inscriptions quotidiennes pour ce site a été dépassé. Merci de réessayer demain."
-
-#: mod/register.php:222
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr "Vous pouvez (si vous le souhaitez) remplir ce formulaire via OpenID. Fournissez votre OpenID et cliquez \"S'inscrire\"."
-
-#: mod/register.php:223
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr "Si vous n'êtes pas familier avec OpenID, laissez ce champ vide et remplissez le reste."
-
-#: mod/register.php:224
-msgid "Your OpenID (optional): "
-msgstr "Votre OpenID (facultatif): "
-
-#: mod/register.php:236
-msgid "Include your profile in member directory?"
-msgstr "Inclure votre profil dans l'annuaire des membres?"
-
-#: mod/register.php:263
-msgid "Note for the admin"
-msgstr "Commentaire pour l'administrateur"
-
-#: mod/register.php:263
-msgid "Leave a message for the admin, why you want to join this node"
-msgstr "Indiquez à l'administrateur les raisons de votre inscription à cette instance."
-
-#: mod/register.php:264
-msgid "Membership on this site is by invitation only."
-msgstr "L'inscription à ce site se fait uniquement sur invitation."
-
-#: mod/register.php:265
-msgid "Your invitation code: "
-msgstr ""
-
-#: mod/register.php:274
-msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
-msgstr "Votre nom complet (p. ex. Michel Dupont):"
-
-#: mod/register.php:275
-msgid ""
-"Your Email Address: (Initial information will be send there, so this has to "
-"be an existing address.)"
-msgstr "Votre courriel : (Des informations de connexion vont être envoyées à cette adresse; elle doit exister)."
-
-#: mod/register.php:277 mod/settings.php:1196
-msgid "New Password:"
-msgstr "Nouveau mot de passe :"
-
-#: mod/register.php:277
-msgid "Leave empty for an auto generated password."
-msgstr "Laisser ce champ libre pour obtenir un mot de passe généré automatiquement."
-
-#: mod/register.php:278 mod/settings.php:1197
-msgid "Confirm:"
-msgstr "Confirmer :"
-
-#: mod/register.php:279
-#, php-format
-msgid ""
-"Choose a profile nickname. This must begin with a text character. Your "
-"profile address on this site will then be '<strong>nickname@%s</strong>'."
-msgstr ""
-
-#: mod/register.php:280
-msgid "Choose a nickname: "
-msgstr "Choisir un pseudo : "
-
-#: mod/register.php:283 src/Content/Nav.php:181 src/Module/Login.php:293
-msgid "Register"
-msgstr "S'inscrire"
-
-#: mod/register.php:289 mod/uimport.php:54
-msgid "Import"
-msgstr "Importer"
-
-#: mod/register.php:290
-msgid "Import your profile to this friendica instance"
-msgstr "Importer votre profile dans cette instance de friendica"
-
-#: mod/register.php:298
-msgid "Note: This node explicitly contains adult content"
-msgstr ""
-
-#: mod/regmod.php:55
+#: mod/regmod.php:53
 msgid "Account approved."
 msgstr "Inscription validée."
 
-#: mod/regmod.php:79
+#: mod/regmod.php:77
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Inscription révoquée pour %s"
 
-#: mod/regmod.php:86
+#: mod/regmod.php:84
 msgid "Please login."
 msgstr "Merci de vous connecter."
 
-#: mod/removeme.php:49
+#: mod/removeme.php:46
 msgid "User deleted their account"
 msgstr ""
 
-#: mod/removeme.php:50
+#: mod/removeme.php:47
 msgid ""
 "On your Friendica node an user deleted their account. Please ensure that "
 "their data is removed from the backups."
 msgstr ""
 
-#: mod/removeme.php:51
+#: mod/removeme.php:48
 #, php-format
 msgid "The user id is %d"
 msgstr ""
 
-#: mod/removeme.php:87 mod/removeme.php:90
+#: mod/removeme.php:84 mod/removeme.php:87
 msgid "Remove My Account"
 msgstr "Supprimer mon compte"
 
-#: mod/removeme.php:88
+#: mod/removeme.php:85
 msgid ""
 "This will completely remove your account. Once this has been done it is not "
 "recoverable."
 msgstr "Ceci supprimera totalement votre compte. Cette opération est irréversible."
 
-#: mod/removeme.php:89
+#: mod/removeme.php:86
 msgid "Please enter your password for verification:"
 msgstr "Merci de saisir votre mot de passe pour vérification :"
 
@@ -5679,28 +5597,28 @@ msgstr "Réinscription aux contacts OStatus"
 msgid "Error"
 msgstr "Erreur"
 
-#: mod/search.php:113
+#: mod/search.php:103
 msgid "Only logged in users are permitted to perform a search."
 msgstr "Seuls les utilisateurs inscrits sont autorisés à lancer une recherche."
 
-#: mod/search.php:137
+#: mod/search.php:127
 msgid "Too Many Requests"
 msgstr "Trop de requêtes"
 
-#: mod/search.php:138
+#: mod/search.php:128
 msgid "Only one search per minute is permitted for not logged in users."
 msgstr "Une seule recherche par minute pour les utilisateurs qui ne sont pas connectés."
 
-#: mod/search.php:163 src/Content/Nav.php:195 src/Content/Text/HTML.php:967
+#: mod/search.php:149 src/Content/Text/HTML.php:900 src/Content/Nav.php:198
 msgid "Search"
 msgstr "Recherche"
 
-#: mod/search.php:249
+#: mod/search.php:235
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Éléments taggés %s"
 
-#: mod/search.php:251 src/Module/Contact.php:821
+#: mod/search.php:237 src/Module/Contact.php:816
 #, php-format
 msgid "Results for: %s"
 msgstr "Résultats pour : %s"
@@ -5709,7 +5627,7 @@ msgstr "Résultats pour : %s"
 msgid "Account"
 msgstr "Compte"
 
-#: mod/settings.php:69 src/Content/Nav.php:263 src/Model/Profile.php:389
+#: mod/settings.php:69 src/Content/Nav.php:266 src/Model/Profile.php:398
 msgid "Profiles"
 msgstr "Profils"
 
@@ -5717,11 +5635,11 @@ msgstr "Profils"
 msgid "Display"
 msgstr "Afficher"
 
-#: mod/settings.php:92 mod/settings.php:845
+#: mod/settings.php:92 mod/settings.php:830
 msgid "Social Networks"
 msgstr "Réseaux sociaux"
 
-#: mod/settings.php:106 src/Content/Nav.php:258
+#: mod/settings.php:106 src/Content/Nav.php:261
 msgid "Delegations"
 msgstr "Délégations"
 
@@ -5741,7 +5659,7 @@ msgstr "Supprimer le compte"
 msgid "Missing some important data!"
 msgstr "Il manque certaines informations importantes !"
 
-#: mod/settings.php:181 mod/settings.php:706 src/Module/Contact.php:828
+#: mod/settings.php:181 mod/settings.php:691 src/Module/Contact.php:823
 msgid "Update"
 msgstr "Mises à jour"
 
@@ -5761,154 +5679,144 @@ msgstr "Fonctionnalités mises à jour"
 msgid "Relocate message has been send to your contacts"
 msgstr "Un message de relocalisation a été envoyé à vos contacts."
 
-#: mod/settings.php:396 src/Model/User.php:423
-msgid "Passwords do not match. Password unchanged."
-msgstr "Les mots de passe ne correspondent pas. Aucun changement appliqué."
-
-#: mod/settings.php:401
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Les mots de passe vides sont interdits. Aucun changement appliqué."
-
-#: mod/settings.php:406 src/Core/Console/NewPassword.php:82
-msgid ""
-"The new password has been exposed in a public data dump, please choose "
-"another."
+#: mod/settings.php:396
+msgid "Passwords do not match."
 msgstr ""
 
-#: mod/settings.php:412
-msgid "Wrong password."
-msgstr "Mauvais mot de passe."
-
-#: mod/settings.php:419 src/Core/Console/NewPassword.php:89
-msgid "Password changed."
-msgstr "Mot de passe changé."
-
-#: mod/settings.php:421 src/Core/Console/NewPassword.php:86
+#: mod/settings.php:404 src/Core/Console/NewPassword.php:80
 msgid "Password update failed. Please try again."
 msgstr "Le changement de mot de passe a échoué. Merci de recommencer."
 
-#: mod/settings.php:505
+#: mod/settings.php:407 src/Core/Console/NewPassword.php:83
+msgid "Password changed."
+msgstr "Mot de passe changé."
+
+#: mod/settings.php:410
+msgid "Password unchanged."
+msgstr ""
+
+#: mod/settings.php:491
 msgid " Please use a shorter name."
 msgstr " Merci d'utiliser un nom plus court."
 
-#: mod/settings.php:508
+#: mod/settings.php:494
 msgid " Name too short."
 msgstr " Nom trop court."
 
-#: mod/settings.php:516
+#: mod/settings.php:501
 msgid "Wrong Password"
 msgstr "Mauvais mot de passe"
 
-#: mod/settings.php:521
+#: mod/settings.php:506
 msgid "Invalid email."
 msgstr ""
 
-#: mod/settings.php:527
+#: mod/settings.php:512
 msgid "Cannot change to that email."
 msgstr ""
 
-#: mod/settings.php:577
+#: mod/settings.php:562
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr "Ce forum privé n'a pas de paramètres de vie privée. Utilisation des paramètres de confidentialité par défaut."
 
-#: mod/settings.php:580
+#: mod/settings.php:565
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr "Ce forum privé n'a pas de paramètres de vie privée ni de paramètres de confidentialité par défaut."
 
-#: mod/settings.php:620
+#: mod/settings.php:605
 msgid "Settings updated."
 msgstr "Réglages mis à jour."
 
-#: mod/settings.php:679 mod/settings.php:705 mod/settings.php:739
+#: mod/settings.php:664 mod/settings.php:690 mod/settings.php:724
 msgid "Add application"
 msgstr "Ajouter une application"
 
-#: mod/settings.php:683 mod/settings.php:709
+#: mod/settings.php:668 mod/settings.php:694
 msgid "Consumer Key"
 msgstr "Clé utilisateur"
 
-#: mod/settings.php:684 mod/settings.php:710
+#: mod/settings.php:669 mod/settings.php:695
 msgid "Consumer Secret"
 msgstr "Secret utilisateur"
 
-#: mod/settings.php:685 mod/settings.php:711
+#: mod/settings.php:670 mod/settings.php:696
 msgid "Redirect"
 msgstr "Rediriger"
 
-#: mod/settings.php:686 mod/settings.php:712
+#: mod/settings.php:671 mod/settings.php:697
 msgid "Icon url"
 msgstr "URL de l'icône"
 
-#: mod/settings.php:697
+#: mod/settings.php:682
 msgid "You can't edit this application."
 msgstr "Vous ne pouvez pas éditer cette application."
 
-#: mod/settings.php:738
+#: mod/settings.php:723
 msgid "Connected Apps"
 msgstr "Applications connectées"
 
-#: mod/settings.php:740 src/Object/Post.php:165 src/Object/Post.php:167
+#: mod/settings.php:725 src/Object/Post.php:166 src/Object/Post.php:168
 msgid "Edit"
 msgstr "Éditer"
 
-#: mod/settings.php:742
+#: mod/settings.php:727
 msgid "Client key starts with"
 msgstr "La clé cliente commence par"
 
-#: mod/settings.php:743
+#: mod/settings.php:728
 msgid "No name"
 msgstr "Sans nom"
 
-#: mod/settings.php:744
+#: mod/settings.php:729
 msgid "Remove authorization"
 msgstr "Révoquer l'autorisation"
 
-#: mod/settings.php:755
+#: mod/settings.php:740
 msgid "No Addon settings configured"
 msgstr ""
 
-#: mod/settings.php:764
+#: mod/settings.php:749
 msgid "Addon Settings"
 msgstr ""
 
-#: mod/settings.php:785
+#: mod/settings.php:770
 msgid "Additional Features"
 msgstr "Fonctions supplémentaires"
 
-#: mod/settings.php:808 src/Content/ContactSelector.php:85
+#: mod/settings.php:793 src/Content/ContactSelector.php:87
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: mod/settings.php:808 mod/settings.php:809
+#: mod/settings.php:793 mod/settings.php:794
 msgid "enabled"
 msgstr "activé"
 
-#: mod/settings.php:808 mod/settings.php:809
+#: mod/settings.php:793 mod/settings.php:794
 msgid "disabled"
 msgstr "désactivé"
 
-#: mod/settings.php:808 mod/settings.php:809
+#: mod/settings.php:793 mod/settings.php:794
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "Le support natif pour la connectivité %s est %s"
 
-#: mod/settings.php:809
+#: mod/settings.php:794
 msgid "GNU Social (OStatus)"
 msgstr "GNU Social (OStatus)"
 
-#: mod/settings.php:840
+#: mod/settings.php:825
 msgid "Email access is disabled on this site."
 msgstr "L'accès courriel est désactivé sur ce site."
 
-#: mod/settings.php:850
+#: mod/settings.php:835
 msgid "General Social Media Settings"
 msgstr "Paramètres généraux des réseaux sociaux"
 
-#: mod/settings.php:851
+#: mod/settings.php:836
 msgid "Disable Content Warning"
 msgstr ""
 
-#: mod/settings.php:851
+#: mod/settings.php:836
 msgid ""
 "Users on networks like Mastodon or Pleroma are able to set a content warning"
 " field which collapse their post by default. This disables the automatic "
@@ -5916,316 +5824,316 @@ msgid ""
 "any other content filtering you eventually set up."
 msgstr ""
 
-#: mod/settings.php:852
+#: mod/settings.php:837
 msgid "Disable intelligent shortening"
 msgstr "Désactiver la réduction d'URL"
 
-#: mod/settings.php:852
+#: mod/settings.php:837
 msgid ""
 "Normally the system tries to find the best link to add to shortened posts. "
 "If this option is enabled then every shortened post will always point to the"
 " original friendica post."
 msgstr "Normalement, le système tente de trouver le meilleur lien à ajouter aux publications raccourcies. Si cette option est activée, les publications raccourcies dirigeront toujours vers leur publication d'origine sur Friendica."
 
-#: mod/settings.php:853
+#: mod/settings.php:838
 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
 msgstr "Suivre automatiquement ceux qui me suivent ou me mentionnent sur GNU Social (OStatus)"
 
-#: mod/settings.php:853
+#: mod/settings.php:838
 msgid ""
 "If you receive a message from an unknown OStatus user, this option decides "
 "what to do. If it is checked, a new contact will be created for every "
 "unknown user."
 msgstr "Si vous recevez un message d'un utilisateur OStatus inconnu, cette option détermine ce qui sera fait. Si elle est cochée, un nouveau contact sera créé pour chaque utilisateur inconnu."
 
-#: mod/settings.php:854
+#: mod/settings.php:839
 msgid "Default group for OStatus contacts"
 msgstr "Groupe par défaut pour les contacts OStatus"
 
-#: mod/settings.php:855
+#: mod/settings.php:840
 msgid "Your legacy GNU Social account"
 msgstr "Le compte GNU Social que vous avez déjà"
 
-#: mod/settings.php:855
+#: mod/settings.php:840
 msgid ""
 "If you enter your old GNU Social/Statusnet account name here (in the format "
 "user@domain.tld), your contacts will be added automatically. The field will "
 "be emptied when done."
 msgstr "Si vous entrez le nom de votre ancien compte GNU Social / StatusNet ici (utiliser le format utilisateur@domaine.tld), vos contacts seront ajoutés automatiquement. Le champ sera vidé lorsque ce sera terminé."
 
-#: mod/settings.php:858
+#: mod/settings.php:843
 msgid "Repair OStatus subscriptions"
 msgstr "Réparer les abonnements OStatus"
 
-#: mod/settings.php:862
+#: mod/settings.php:847
 msgid "Email/Mailbox Setup"
 msgstr "Réglages de courriel/boîte à lettre"
 
-#: mod/settings.php:863
+#: mod/settings.php:848
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "Si vous souhaitez communiquer avec vos contacts \"courriel\" (facultatif), merci de nous indiquer comment vous connecter à votre boîte."
 
-#: mod/settings.php:864
+#: mod/settings.php:849
 msgid "Last successful email check:"
 msgstr "Dernière vérification réussie des courriels :"
 
-#: mod/settings.php:866
+#: mod/settings.php:851
 msgid "IMAP server name:"
 msgstr "Nom du serveur IMAP :"
 
-#: mod/settings.php:867
+#: mod/settings.php:852
 msgid "IMAP port:"
 msgstr "Port IMAP :"
 
-#: mod/settings.php:868
+#: mod/settings.php:853
 msgid "Security:"
 msgstr "Sécurité :"
 
-#: mod/settings.php:868 mod/settings.php:873
+#: mod/settings.php:853 mod/settings.php:858
 msgid "None"
 msgstr "Aucun(e)"
 
-#: mod/settings.php:869
+#: mod/settings.php:854
 msgid "Email login name:"
 msgstr "Nom de connexion :"
 
-#: mod/settings.php:870
+#: mod/settings.php:855
 msgid "Email password:"
 msgstr "Mot de passe :"
 
-#: mod/settings.php:871
+#: mod/settings.php:856
 msgid "Reply-to address:"
 msgstr "Adresse de réponse :"
 
-#: mod/settings.php:872
+#: mod/settings.php:857
 msgid "Send public posts to all email contacts:"
 msgstr "Envoyer les publications publiques à tous les contacts courriels :"
 
-#: mod/settings.php:873
+#: mod/settings.php:858
 msgid "Action after import:"
 msgstr "Action après import :"
 
-#: mod/settings.php:873 src/Content/Nav.php:246
+#: mod/settings.php:858 src/Content/Nav.php:249
 msgid "Mark as seen"
 msgstr "Marquer comme vu"
 
-#: mod/settings.php:873
+#: mod/settings.php:858
 msgid "Move to folder"
 msgstr "Déplacer vers"
 
-#: mod/settings.php:874
+#: mod/settings.php:859
 msgid "Move to folder:"
 msgstr "Déplacer vers :"
 
-#: mod/settings.php:917
+#: mod/settings.php:902
 #, php-format
 msgid "%s - (Unsupported)"
 msgstr ""
 
-#: mod/settings.php:919
+#: mod/settings.php:904
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: mod/settings.php:946 src/Core/L10n.php:359 src/Model/Event.php:396
+#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:396
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: mod/settings.php:946 src/Core/L10n.php:359 src/Model/Event.php:397
+#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:397
 msgid "Monday"
 msgstr "Lundi"
 
-#: mod/settings.php:962
+#: mod/settings.php:947
 msgid "Display Settings"
 msgstr "Affichage"
 
-#: mod/settings.php:968
+#: mod/settings.php:953
 msgid "Display Theme:"
 msgstr "Thème d'affichage:"
 
-#: mod/settings.php:969
+#: mod/settings.php:954
 msgid "Mobile Theme:"
 msgstr "Thème mobile:"
 
-#: mod/settings.php:970
+#: mod/settings.php:955
 msgid "Suppress warning of insecure networks"
 msgstr ""
 
-#: mod/settings.php:970
+#: mod/settings.php:955
 msgid ""
 "Should the system suppress the warning that the current group contains "
 "members of networks that can't receive non public postings."
 msgstr ""
 
-#: mod/settings.php:971
+#: mod/settings.php:956
 msgid "Update browser every xx seconds"
 msgstr "Mettre à jour l'affichage toutes les xx secondes"
 
-#: mod/settings.php:971
+#: mod/settings.php:956
 msgid "Minimum of 10 seconds. Enter -1 to disable it."
 msgstr "Minimum de 10 secondes. Saisir -1 pour désactiver."
 
-#: mod/settings.php:972
+#: mod/settings.php:957
 msgid "Number of items to display per page:"
 msgstr "Nombre d’éléments par page :"
 
-#: mod/settings.php:972 mod/settings.php:973
+#: mod/settings.php:957 mod/settings.php:958
 msgid "Maximum of 100 items"
 msgstr "Maximum de 100 éléments"
 
-#: mod/settings.php:973
+#: mod/settings.php:958
 msgid "Number of items to display per page when viewed from mobile device:"
 msgstr "Nombre d'éléments à afficher par page pour un appareil mobile"
 
-#: mod/settings.php:974
+#: mod/settings.php:959
 msgid "Don't show emoticons"
 msgstr "Ne pas afficher les émoticônes"
 
-#: mod/settings.php:975
+#: mod/settings.php:960
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: mod/settings.php:976
+#: mod/settings.php:961
 msgid "Beginning of week:"
 msgstr "Début de la semaine :"
 
-#: mod/settings.php:977
+#: mod/settings.php:962
 msgid "Don't show notices"
 msgstr "Ne plus afficher les avis"
 
-#: mod/settings.php:978
+#: mod/settings.php:963
 msgid "Infinite scroll"
 msgstr "Défilement infini"
 
-#: mod/settings.php:979
+#: mod/settings.php:964
 msgid "Automatic updates only at the top of the network page"
 msgstr "Mises à jour automatiques seulement en haut de la page Réseau"
 
-#: mod/settings.php:979
+#: mod/settings.php:964
 msgid ""
 "When disabled, the network page is updated all the time, which could be "
 "confusing while reading."
 msgstr "Si désactivé, la page Réseau est mise à jour en permanence, ce qui peut rendre la lecture difficile."
 
-#: mod/settings.php:980
+#: mod/settings.php:965
 msgid "Bandwidth Saver Mode"
 msgstr ""
 
-#: mod/settings.php:980
+#: mod/settings.php:965
 msgid ""
 "When enabled, embedded content is not displayed on automatic updates, they "
 "only show on page reload."
 msgstr "Si activé, le contenu intégré aux pages est mis à jour uniquement lors du rafraîchissement manuel des pages : il n'est plus mis à jour lors des rafraîchissements automatiques."
 
-#: mod/settings.php:981
+#: mod/settings.php:966
 msgid "Smart Threading"
 msgstr ""
 
-#: mod/settings.php:981
+#: mod/settings.php:966
 msgid ""
 "When enabled, suppress extraneous thread indentation while keeping it where "
 "it matters. Only works if threading is available and enabled."
 msgstr ""
 
-#: mod/settings.php:983
+#: mod/settings.php:968
 msgid "General Theme Settings"
 msgstr "Paramètres généraux de thème"
 
-#: mod/settings.php:984
+#: mod/settings.php:969
 msgid "Custom Theme Settings"
 msgstr "Paramètres personnalisés de thème"
 
-#: mod/settings.php:985
+#: mod/settings.php:970
 msgid "Content Settings"
 msgstr "Paramètres de contenu"
 
-#: mod/settings.php:986 view/theme/duepuntozero/config.php:74
+#: mod/settings.php:971 view/theme/duepuntozero/config.php:74
 #: view/theme/frio/config.php:121 view/theme/quattro/config.php:76
 #: view/theme/vier/config.php:122
 msgid "Theme settings"
 msgstr "Réglages du thème graphique"
 
-#: mod/settings.php:1000
+#: mod/settings.php:985
 msgid "Unable to find your profile. Please contact your admin."
 msgstr ""
 
-#: mod/settings.php:1039
+#: mod/settings.php:1024
 msgid "Account Types"
 msgstr "Type de compte"
 
-#: mod/settings.php:1040
+#: mod/settings.php:1025
 msgid "Personal Page Subtypes"
 msgstr "Sous-catégories de page personnelle"
 
-#: mod/settings.php:1041
+#: mod/settings.php:1026
 msgid "Community Forum Subtypes"
 msgstr "Sous-catégories de forums communautaires"
 
-#: mod/settings.php:1049
+#: mod/settings.php:1034
 msgid "Account for a personal profile."
 msgstr "Compte pour profil personnel."
 
-#: mod/settings.php:1053
+#: mod/settings.php:1038
 msgid ""
 "Account for an organisation that automatically approves contact requests as "
 "\"Followers\"."
 msgstr ""
 
-#: mod/settings.php:1057
+#: mod/settings.php:1042
 msgid ""
 "Account for a news reflector that automatically approves contact requests as"
 " \"Followers\"."
 msgstr ""
 
-#: mod/settings.php:1061
+#: mod/settings.php:1046
 msgid "Account for community discussions."
 msgstr ""
 
-#: mod/settings.php:1065
+#: mod/settings.php:1050
 msgid ""
 "Account for a regular personal profile that requires manual approval of "
 "\"Friends\" and \"Followers\"."
 msgstr ""
 
-#: mod/settings.php:1069
+#: mod/settings.php:1054
 msgid ""
 "Account for a public profile that automatically approves contact requests as"
 " \"Followers\"."
 msgstr ""
 
-#: mod/settings.php:1073
+#: mod/settings.php:1058
 msgid "Automatically approves all contact requests."
 msgstr "Les demandes de participation au forum sont automatiquement acceptées."
 
-#: mod/settings.php:1077
+#: mod/settings.php:1062
 msgid ""
 "Account for a popular profile that automatically approves contact requests "
 "as \"Friends\"."
 msgstr "Compte qui accepte automatiquement les demandes d'ajout en tant qu'ami."
 
-#: mod/settings.php:1080
+#: mod/settings.php:1065
 msgid "Private Forum [Experimental]"
 msgstr "Forum privé [expérimental]"
 
-#: mod/settings.php:1081
+#: mod/settings.php:1066
 msgid "Requires manual approval of contact requests."
 msgstr "Les demandes de participation au forum nécessitent une approbation."
 
-#: mod/settings.php:1092
+#: mod/settings.php:1077
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: mod/settings.php:1092
+#: mod/settings.php:1077
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "&amp;nbsp;(Facultatif) Autoriser cet OpenID à se connecter à ce compte."
 
-#: mod/settings.php:1100
+#: mod/settings.php:1085
 msgid "Publish your default profile in your local site directory?"
 msgstr "Publier votre profil par défaut sur l'annuaire local de ce site ?"
 
-#: mod/settings.php:1100
+#: mod/settings.php:1085
 #, php-format
 msgid ""
 "Your profile will be published in this node's <a href=\"%s\">local "
@@ -6233,304 +6141,318 @@ msgid ""
 " system settings."
 msgstr ""
 
-#: mod/settings.php:1106
+#: mod/settings.php:1091
 msgid "Publish your default profile in the global social directory?"
 msgstr "Publier votre profil par défaut sur l'annuaire global ?"
 
-#: mod/settings.php:1106
+#: mod/settings.php:1091
 #, php-format
 msgid ""
 "Your profile will be published in the global friendica directories (e.g. <a "
 "href=\"%s\">%s</a>). Your profile will be visible in public."
 msgstr ""
 
-#: mod/settings.php:1113
+#: mod/settings.php:1098
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Cacher votre liste de contacts/amis des visiteurs de votre profil par défaut?"
 
-#: mod/settings.php:1113
+#: mod/settings.php:1098
 msgid ""
 "Your contact list won't be shown in your default profile page. You can "
 "decide to show your contact list separately for each additional profile you "
 "create"
 msgstr ""
 
-#: mod/settings.php:1117
+#: mod/settings.php:1102
 msgid "Hide your profile details from anonymous viewers?"
 msgstr ""
 
-#: mod/settings.php:1117
+#: mod/settings.php:1102
 msgid ""
 "Anonymous visitors will only see your profile picture, your display name and"
 " the nickname you are using on your profile page. Your public posts and "
 "replies will still be accessible by other means."
 msgstr ""
 
-#: mod/settings.php:1121
+#: mod/settings.php:1106
 msgid "Allow friends to post to your profile page?"
 msgstr "Autoriser vos amis à publier sur votre profil ?"
 
-#: mod/settings.php:1121
+#: mod/settings.php:1106
 msgid ""
 "Your contacts may write posts on your profile wall. These posts will be "
 "distributed to your contacts"
 msgstr ""
 
-#: mod/settings.php:1125
+#: mod/settings.php:1110
 msgid "Allow friends to tag your posts?"
 msgstr "Autoriser vos amis à étiqueter vos publications?"
 
-#: mod/settings.php:1125
+#: mod/settings.php:1110
 msgid "Your contacts can add additional tags to your posts."
 msgstr ""
 
-#: mod/settings.php:1129
+#: mod/settings.php:1114
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Autoriser les suggestions d'amis potentiels aux nouveaux arrivants?"
 
-#: mod/settings.php:1129
+#: mod/settings.php:1114
 msgid ""
 "If you like, Friendica may suggest new members to add you as a contact."
 msgstr ""
 
-#: mod/settings.php:1133
+#: mod/settings.php:1118
 msgid "Permit unknown people to send you private mail?"
 msgstr "Autoriser les messages privés d'inconnus?"
 
-#: mod/settings.php:1133
+#: mod/settings.php:1118
 msgid ""
 "Friendica network users may send you private messages even if they are not "
 "in your contact list."
 msgstr ""
 
-#: mod/settings.php:1137
+#: mod/settings.php:1122
 msgid "Profile is <strong>not published</strong>."
 msgstr "Ce profil n'est <strong>pas publié</strong>."
 
-#: mod/settings.php:1143
+#: mod/settings.php:1128
 #, php-format
 msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
 msgstr "L’adresse de votre profil est <strong>'%s'</strong> ou '%s'."
 
-#: mod/settings.php:1150
+#: mod/settings.php:1135
 msgid "Automatically expire posts after this many days:"
 msgstr "Les publications expirent automatiquement après (en jours) :"
 
-#: mod/settings.php:1150
+#: mod/settings.php:1135
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Si ce champ est vide, les publications n'expireront pas. Les publications expirées seront supprimées"
 
-#: mod/settings.php:1151
+#: mod/settings.php:1136
 msgid "Advanced expiration settings"
 msgstr "Réglages avancés de l'expiration"
 
-#: mod/settings.php:1152
+#: mod/settings.php:1137
 msgid "Advanced Expiration"
 msgstr "Expiration (avancé)"
 
-#: mod/settings.php:1153
+#: mod/settings.php:1138
 msgid "Expire posts:"
 msgstr "Faire expirer les publications :"
 
-#: mod/settings.php:1154
+#: mod/settings.php:1139
 msgid "Expire personal notes:"
 msgstr "Faire expirer les notes personnelles :"
 
-#: mod/settings.php:1155
+#: mod/settings.php:1140
 msgid "Expire starred posts:"
 msgstr "Faire expirer les publications marqués :"
 
-#: mod/settings.php:1156
+#: mod/settings.php:1141
 msgid "Expire photos:"
 msgstr "Faire expirer les photos :"
 
-#: mod/settings.php:1157
+#: mod/settings.php:1142
 msgid "Only expire posts by others:"
 msgstr "Faire expirer seulement les publications des autres:"
 
-#: mod/settings.php:1187
+#: mod/settings.php:1172
 msgid "Account Settings"
 msgstr "Compte"
 
-#: mod/settings.php:1195
+#: mod/settings.php:1180
 msgid "Password Settings"
 msgstr "Réglages de mot de passe"
 
-#: mod/settings.php:1197
+#: mod/settings.php:1181 src/Module/Register.php:130
+msgid "New Password:"
+msgstr "Nouveau mot de passe :"
+
+#: mod/settings.php:1181
+msgid ""
+"Allowed characters are a-z, A-Z, 0-9 and special characters except white "
+"spaces, accentuated letters and colon (:)."
+msgstr ""
+
+#: mod/settings.php:1182 src/Module/Register.php:131
+msgid "Confirm:"
+msgstr "Confirmer :"
+
+#: mod/settings.php:1182
 msgid "Leave password fields blank unless changing"
 msgstr "Laissez les champs de mot de passe vierges, sauf si vous désirez les changer"
 
-#: mod/settings.php:1198
+#: mod/settings.php:1183
 msgid "Current Password:"
 msgstr "Mot de passe actuel :"
 
-#: mod/settings.php:1198 mod/settings.php:1199
+#: mod/settings.php:1183 mod/settings.php:1184
 msgid "Your current password to confirm the changes"
 msgstr "Votre mot de passe actuel pour confirmer les modifications"
 
-#: mod/settings.php:1199
+#: mod/settings.php:1184
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: mod/settings.php:1203
+#: mod/settings.php:1188
 msgid "Basic Settings"
 msgstr "Réglages de base"
 
-#: mod/settings.php:1204 src/Model/Profile.php:751
+#: mod/settings.php:1189 src/Model/Profile.php:751
 msgid "Full Name:"
 msgstr "Nom complet :"
 
-#: mod/settings.php:1205
+#: mod/settings.php:1190
 msgid "Email Address:"
 msgstr "Adresse courriel :"
 
-#: mod/settings.php:1206
+#: mod/settings.php:1191
 msgid "Your Timezone:"
 msgstr "Votre fuseau horaire :"
 
-#: mod/settings.php:1207
+#: mod/settings.php:1192
 msgid "Your Language:"
 msgstr "Votre langue :"
 
-#: mod/settings.php:1207
+#: mod/settings.php:1192
 msgid ""
 "Set the language we use to show you friendica interface and to send you "
 "emails"
 msgstr "Détermine la langue que nous utilisons pour afficher votre interface Friendica et pour vous envoyer des courriels"
 
-#: mod/settings.php:1208
+#: mod/settings.php:1193
 msgid "Default Post Location:"
 msgstr "Emplacement de publication par défaut:"
 
-#: mod/settings.php:1209
+#: mod/settings.php:1194
 msgid "Use Browser Location:"
 msgstr "Utiliser la localisation géographique du navigateur:"
 
-#: mod/settings.php:1212
+#: mod/settings.php:1197
 msgid "Security and Privacy Settings"
 msgstr "Réglages de sécurité et vie privée"
 
-#: mod/settings.php:1214
+#: mod/settings.php:1199
 msgid "Maximum Friend Requests/Day:"
 msgstr "Nombre maximal de requêtes d'amitié par jour :"
 
-#: mod/settings.php:1214 mod/settings.php:1243
+#: mod/settings.php:1199 mod/settings.php:1228
 msgid "(to prevent spam abuse)"
 msgstr "(pour limiter l'impact du spam)"
 
-#: mod/settings.php:1215
+#: mod/settings.php:1200
 msgid "Default Post Permissions"
 msgstr "Permissions de publication par défaut"
 
-#: mod/settings.php:1216
+#: mod/settings.php:1201
 msgid "(click to open/close)"
 msgstr "(cliquer pour ouvrir/fermer)"
 
-#: mod/settings.php:1226
+#: mod/settings.php:1211
 msgid "Default Private Post"
 msgstr "Message privé par défaut"
 
-#: mod/settings.php:1227
+#: mod/settings.php:1212
 msgid "Default Public Post"
 msgstr "Message publique par défaut"
 
-#: mod/settings.php:1231
+#: mod/settings.php:1216
 msgid "Default Permissions for New Posts"
 msgstr "Permissions par défaut pour les nouvelles publications"
 
-#: mod/settings.php:1243
+#: mod/settings.php:1228
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximum de messages privés d'inconnus par jour :"
 
-#: mod/settings.php:1246
+#: mod/settings.php:1231
 msgid "Notification Settings"
 msgstr "Réglages de notification"
 
-#: mod/settings.php:1247
+#: mod/settings.php:1232
 msgid "Send a notification email when:"
 msgstr "Envoyer un courriel de notification quand:"
 
-#: mod/settings.php:1248
+#: mod/settings.php:1233
 msgid "You receive an introduction"
 msgstr "Vous recevez une introduction"
 
-#: mod/settings.php:1249
+#: mod/settings.php:1234
 msgid "Your introductions are confirmed"
 msgstr "Vos introductions sont confirmées"
 
-#: mod/settings.php:1250
+#: mod/settings.php:1235
 msgid "Someone writes on your profile wall"
 msgstr "Quelqu'un écrit sur votre mur"
 
-#: mod/settings.php:1251
+#: mod/settings.php:1236
 msgid "Someone writes a followup comment"
 msgstr "Quelqu'un vous commente"
 
-#: mod/settings.php:1252
+#: mod/settings.php:1237
 msgid "You receive a private message"
 msgstr "Vous recevez un message privé"
 
-#: mod/settings.php:1253
+#: mod/settings.php:1238
 msgid "You receive a friend suggestion"
 msgstr "Vous avez reçu une suggestion d'ami"
 
-#: mod/settings.php:1254
+#: mod/settings.php:1239
 msgid "You are tagged in a post"
 msgstr "Vous avez été étiqueté dans une publication"
 
-#: mod/settings.php:1255
+#: mod/settings.php:1240
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Vous avez été sollicité dans une publication"
 
-#: mod/settings.php:1257
+#: mod/settings.php:1242
 msgid "Activate desktop notifications"
 msgstr "Activer les notifications de bureau"
 
-#: mod/settings.php:1257
+#: mod/settings.php:1242
 msgid "Show desktop popup on new notifications"
 msgstr "Afficher dans des pop-ups les nouvelles notifications"
 
-#: mod/settings.php:1259
+#: mod/settings.php:1244
 msgid "Text-only notification emails"
 msgstr "Courriels de notification en format texte"
 
-#: mod/settings.php:1261
+#: mod/settings.php:1246
 msgid "Send text only notification emails, without the html part"
 msgstr "Envoyer le texte des courriels de notification, sans la composante html"
 
-#: mod/settings.php:1263
+#: mod/settings.php:1248
 msgid "Show detailled notifications"
 msgstr "Notifications détaillées"
 
-#: mod/settings.php:1265
+#: mod/settings.php:1250
 msgid ""
 "Per default, notifications are condensed to a single notification per item. "
 "When enabled every notification is displayed."
 msgstr ""
 
-#: mod/settings.php:1267
+#: mod/settings.php:1252
 msgid "Advanced Account/Page Type Settings"
 msgstr "Paramètres avancés de compte/page"
 
-#: mod/settings.php:1268
+#: mod/settings.php:1253
 msgid "Change the behaviour of this account for special situations"
 msgstr "Modifier le comportement de ce compte dans certaines situations"
 
-#: mod/settings.php:1271
+#: mod/settings.php:1256
 msgid "Relocate"
 msgstr "Relocaliser"
 
-#: mod/settings.php:1272
+#: mod/settings.php:1257
 msgid ""
 "If you have moved this profile from another server, and some of your "
 "contacts don't receive your updates, try pushing this button."
 msgstr "Si vous avez migré ce profil depuis un autre serveur et que vos contacts ne reçoivent plus vos mises à jour, essayez ce bouton."
 
-#: mod/settings.php:1273
+#: mod/settings.php:1258
 msgid "Resend relocate message to contacts"
 msgstr "Renvoyer un message de relocalisation aux contacts."
 
-#: mod/subthread.php:106
+#: mod/subthread.php:104
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s suit les %3$s de %2$s"
@@ -6545,11 +6467,11 @@ msgid ""
 "hours."
 msgstr "Aucune suggestion. Si ce site est récent, merci de recommencer dans 24h."
 
-#: mod/suggest.php:88 mod/suggest.php:108
+#: mod/suggest.php:89 mod/suggest.php:109
 msgid "Ignore/Hide"
 msgstr "Ignorer/cacher"
 
-#: mod/suggest.php:118 src/Content/Widget.php:68 view/theme/vier/theme.php:204
+#: mod/suggest.php:119 view/theme/vier/theme.php:204 src/Content/Widget.php:66
 msgid "Friend Suggestions"
 msgstr "Suggestions d'amitiés/contacts"
 
@@ -6557,11 +6479,11 @@ msgstr "Suggestions d'amitiés/contacts"
 msgid "Tag(s) removed"
 msgstr ""
 
-#: mod/tagrm.php:99
+#: mod/tagrm.php:101
 msgid "Remove Item Tag"
 msgstr "Enlever l'étiquette de l'élément"
 
-#: mod/tagrm.php:101
+#: mod/tagrm.php:103
 msgid "Select a tag to remove: "
 msgstr "Sélectionner une étiquette à supprimer :"
 
@@ -6590,6 +6512,16 @@ msgstr "Exportez votre compte, vos infos, vos contacts et toutes vos publication
 msgid "User imports on closed servers can only be done by an administrator."
 msgstr ""
 
+#: mod/uimport.php:39 src/Module/Register.php:59
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Le nombre d'inscriptions quotidiennes pour ce site a été dépassé. Merci de réessayer demain."
+
+#: mod/uimport.php:54 src/Module/Register.php:141
+msgid "Import"
+msgstr "Importer"
+
 #: mod/uimport.php:56
 msgid "Move account"
 msgstr "Migrer le compte"
@@ -6633,57 +6565,85 @@ msgstr ""
 msgid "Contact unfollowed"
 msgstr ""
 
-#: mod/unfollow.php:117 src/Module/Contact.php:576
+#: mod/unfollow.php:118 src/Module/Contact.php:570
 msgid "Disconnect/Unfollow"
 msgstr "Se déconnecter/Ne plus suivre"
 
 #: mod/update_community.php:23 mod/update_contact.php:23
 #: mod/update_display.php:24 mod/update_network.php:33 mod/update_notes.php:36
-#: mod/update_profile.php:35
+#: mod/update_profile.php:34
 msgid "[Embedded content - reload page to view]"
 msgstr "[Ccontenu incorporé - rechargez la page pour le voir]"
 
-#: mod/videos.php:134
+#: mod/videos.php:97
 msgid "Do you really want to delete this video?"
 msgstr "Voulez-vous vraiment supprimer cette vidéo?"
 
-#: mod/videos.php:139
+#: mod/videos.php:102
 msgid "Delete Video"
 msgstr "Supprimer la vidéo"
 
-#: mod/videos.php:201
+#: mod/videos.php:152
 msgid "No videos selected"
 msgstr "Pas de vidéo sélectionné"
 
-#: mod/videos.php:372 src/Model/Item.php:3430
+#: mod/videos.php:309 src/Model/Item.php:3435
 msgid "View Video"
 msgstr "Regarder la vidéo"
 
-#: mod/videos.php:387
+#: mod/videos.php:324
 msgid "Recent Videos"
 msgstr "Vidéos récente"
 
-#: mod/videos.php:389
+#: mod/videos.php:326
 msgid "Upload New Videos"
 msgstr "Téléversé une nouvelle vidéo"
 
-#: mod/viewcontacts.php:97
+#: mod/viewcontacts.php:78
 msgid "No contacts."
 msgstr "Aucun contact."
 
-#: mod/viewcontacts.php:113 src/Module/Contact.php:609
-#: src/Module/Contact.php:1029
+#: mod/viewcontacts.php:94 src/Module/Contact.php:603
+#: src/Module/Contact.php:1024
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Visiter le profil de %s [%s]"
 
-#: mod/viewcontacts.php:132 src/Content/Nav.php:200 src/Content/Nav.php:266
-#: src/Content/Text/HTML.php:978 src/Model/Profile.php:980
-#: src/Model/Profile.php:983 src/Module/Contact.php:816
-#: src/Module/Contact.php:886 view/theme/frio/theme.php:284
+#: mod/viewcontacts.php:114 view/theme/frio/theme.php:273
+#: src/Content/Text/HTML.php:911 src/Content/Nav.php:203
+#: src/Content/Nav.php:269 src/Model/Profile.php:980 src/Model/Profile.php:983
+#: src/Module/Contact.php:811 src/Module/Contact.php:881
 msgid "Contacts"
 msgstr "Contacts"
 
+#: mod/wall_attach.php:26 mod/wall_attach.php:33 mod/wall_attach.php:85
+#: mod/wall_upload.php:42 mod/wall_upload.php:58 mod/wall_upload.php:116
+#: mod/wall_upload.php:167 mod/wall_upload.php:170
+msgid "Invalid request."
+msgstr "Requête invalide."
+
+#: mod/wall_attach.php:103
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr "Désolé, il semble que votre fichier est plus important que ce que la configuration de PHP autorise"
+
+#: mod/wall_attach.php:103
+msgid "Or - did you try to upload an empty file?"
+msgstr "Ou — auriez-vous essayé de télécharger un fichier vide ?"
+
+#: mod/wall_attach.php:114
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr "La taille du fichier dépasse la limite de %s"
+
+#: mod/wall_attach.php:129
+msgid "File upload failed."
+msgstr "Le téléversement a échoué."
+
+#: mod/wall_upload.php:243 src/Object/Image.php:967 src/Object/Image.php:983
+#: src/Object/Image.php:991 src/Object/Image.php:1016
+msgid "Wall Photos"
+msgstr "Photos du mur"
+
 #: mod/wallmessage.php:52 mod/wallmessage.php:115
 #, php-format
 msgid "Number of daily wall messages for %s exceeded. Message failed."
@@ -6704,2821 +6664,10 @@ msgid ""
 "your site allow private mail from unknown senders."
 msgstr "Si vous souhaitez que %s réponde, merci de vérifier vos réglages pour autoriser les messages privés venant d'inconnus."
 
-#: mod/wall_attach.php:28 mod/wall_attach.php:35 mod/wall_attach.php:90
-#: mod/wall_upload.php:41 mod/wall_upload.php:57 mod/wall_upload.php:115
-#: mod/wall_upload.php:166 mod/wall_upload.php:169
-msgid "Invalid request."
-msgstr "Requête invalide."
-
-#: mod/wall_attach.php:108
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "Désolé, il semble que votre fichier est plus important que ce que la configuration de PHP autorise"
-
-#: mod/wall_attach.php:108
-msgid "Or - did you try to upload an empty file?"
-msgstr "Ou — auriez-vous essayé de télécharger un fichier vide ?"
-
-#: mod/wall_attach.php:119
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr "La taille du fichier dépasse la limite de %s"
-
-#: mod/wall_attach.php:143 mod/wall_attach.php:159
-msgid "File upload failed."
-msgstr "Le téléversement a échoué."
-
-#: mod/wall_upload.php:242 src/Object/Image.php:968 src/Object/Image.php:984
-#: src/Object/Image.php:992 src/Object/Image.php:1017
-msgid "Wall Photos"
-msgstr "Photos du mur"
-
-#: src/App.php:790
-msgid "Delete this item?"
-msgstr "Effacer cet élément?"
-
-#: src/App.php:792
-msgid "show fewer"
-msgstr "montrer moins"
-
-#: src/App.php:834
-msgid "toggle mobile"
-msgstr "activ. mobile"
-
-#: src/App.php:1383
-msgid "No system theme config value set."
-msgstr ""
-
-#: src/BaseModule.php:133
-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 "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probablement dire que le formulaire est resté ouvert trop longtemps (plus de 3 heures) avant d'être validé."
-
-#: src/Content/ContactSelector.php:57
-msgid "Frequently"
-msgstr ""
-
-#: src/Content/ContactSelector.php:58
-msgid "Hourly"
-msgstr ""
-
-#: src/Content/ContactSelector.php:59
-msgid "Twice daily"
-msgstr ""
-
-#: src/Content/ContactSelector.php:60
-msgid "Daily"
-msgstr ""
-
-#: src/Content/ContactSelector.php:61
-msgid "Weekly"
-msgstr ""
-
-#: src/Content/ContactSelector.php:62
-msgid "Monthly"
-msgstr ""
-
-#: src/Content/ContactSelector.php:81
-msgid "DFRN"
-msgstr ""
-
-#: src/Content/ContactSelector.php:82
-msgid "OStatus"
-msgstr ""
-
-#: src/Content/ContactSelector.php:83
-msgid "RSS/Atom"
-msgstr ""
-
-#: src/Content/ContactSelector.php:86
-msgid "Zot!"
-msgstr ""
-
-#: src/Content/ContactSelector.php:87
-msgid "LinkedIn"
-msgstr ""
-
-#: src/Content/ContactSelector.php:88
-msgid "XMPP/IM"
-msgstr ""
-
-#: src/Content/ContactSelector.php:89
-msgid "MySpace"
-msgstr ""
-
-#: src/Content/ContactSelector.php:90
-msgid "Google+"
-msgstr ""
-
-#: src/Content/ContactSelector.php:91
-msgid "pump.io"
-msgstr ""
-
-#: src/Content/ContactSelector.php:92
-msgid "Twitter"
-msgstr ""
-
-#: src/Content/ContactSelector.php:93
-msgid "Diaspora Connector"
-msgstr ""
-
-#: src/Content/ContactSelector.php:94
-msgid "GNU Social Connector"
-msgstr ""
-
-#: src/Content/ContactSelector.php:95
-msgid "ActivityPub"
-msgstr ""
-
-#: src/Content/ContactSelector.php:96
-msgid "pnut"
-msgstr ""
-
-#: src/Content/ContactSelector.php:148
-msgid "Male"
-msgstr ""
-
-#: src/Content/ContactSelector.php:148
-msgid "Female"
-msgstr ""
-
-#: src/Content/ContactSelector.php:148
-msgid "Currently Male"
-msgstr ""
-
-#: src/Content/ContactSelector.php:148
-msgid "Currently Female"
-msgstr ""
-
-#: src/Content/ContactSelector.php:148
-msgid "Mostly Male"
-msgstr ""
-
-#: src/Content/ContactSelector.php:148
-msgid "Mostly Female"
-msgstr ""
-
-#: src/Content/ContactSelector.php:148
-msgid "Transgender"
-msgstr ""
-
-#: src/Content/ContactSelector.php:148
-msgid "Intersex"
-msgstr ""
-
-#: src/Content/ContactSelector.php:148
-msgid "Transsexual"
-msgstr ""
-
-#: src/Content/ContactSelector.php:148
-msgid "Hermaphrodite"
-msgstr ""
-
-#: src/Content/ContactSelector.php:148
-msgid "Neuter"
-msgstr ""
-
-#: src/Content/ContactSelector.php:148
-msgid "Non-specific"
-msgstr "Non-spécifique"
-
-#: src/Content/ContactSelector.php:148
-msgid "Other"
-msgstr "Autre"
-
-#: src/Content/ContactSelector.php:170
-msgid "Males"
-msgstr "Hommes"
-
-#: src/Content/ContactSelector.php:170
-msgid "Females"
-msgstr "Femmes"
-
-#: src/Content/ContactSelector.php:170
-msgid "Gay"
-msgstr "Gay"
-
-#: src/Content/ContactSelector.php:170
-msgid "Lesbian"
-msgstr "Lesbienne"
-
-#: src/Content/ContactSelector.php:170
-msgid "No Preference"
-msgstr "Sans préférence"
-
-#: src/Content/ContactSelector.php:170
-msgid "Bisexual"
-msgstr "Bisexuel"
-
-#: src/Content/ContactSelector.php:170
-msgid "Autosexual"
-msgstr "Auto-sexuel"
-
-#: src/Content/ContactSelector.php:170
-msgid "Abstinent"
-msgstr "Abstinent"
-
-#: src/Content/ContactSelector.php:170
-msgid "Virgin"
-msgstr "Vierge"
-
-#: src/Content/ContactSelector.php:170
-msgid "Deviant"
-msgstr "Déviant"
-
-#: src/Content/ContactSelector.php:170
-msgid "Fetish"
-msgstr "Fétichiste"
-
-#: src/Content/ContactSelector.php:170
-msgid "Oodles"
-msgstr "Oodles"
-
-#: src/Content/ContactSelector.php:170
-msgid "Nonsexual"
-msgstr "Non-sexuel"
-
-#: src/Content/ContactSelector.php:192
-msgid "Single"
-msgstr "Célibataire"
-
-#: src/Content/ContactSelector.php:192
-msgid "Lonely"
-msgstr "Esseulé"
-
-#: src/Content/ContactSelector.php:192
-msgid "Available"
-msgstr "Disponible"
-
-#: src/Content/ContactSelector.php:192
-msgid "Unavailable"
-msgstr "Indisponible"
-
-#: src/Content/ContactSelector.php:192
-msgid "Has crush"
-msgstr "Attiré par quelqu'un"
-
-#: src/Content/ContactSelector.php:192
-msgid "Infatuated"
-msgstr "Entiché"
-
-#: src/Content/ContactSelector.php:192
-msgid "Dating"
-msgstr "Dans une relation"
-
-#: src/Content/ContactSelector.php:192
-msgid "Unfaithful"
-msgstr "Infidèle"
-
-#: src/Content/ContactSelector.php:192
-msgid "Sex Addict"
-msgstr "Accro au sexe"
-
-#: src/Content/ContactSelector.php:192 src/Model/User.php:618
-msgid "Friends"
-msgstr "Amis"
-
-#: src/Content/ContactSelector.php:192
-msgid "Friends/Benefits"
-msgstr "Amis par intérêt"
-
-#: src/Content/ContactSelector.php:192
-msgid "Casual"
-msgstr "Casual"
-
-#: src/Content/ContactSelector.php:192
-msgid "Engaged"
-msgstr "Fiancé"
-
-#: src/Content/ContactSelector.php:192
-msgid "Married"
-msgstr "Marié"
-
-#: src/Content/ContactSelector.php:192
-msgid "Imaginarily married"
-msgstr "Se croit marié"
-
-#: src/Content/ContactSelector.php:192
-msgid "Partners"
-msgstr "Partenaire"
-
-#: src/Content/ContactSelector.php:192
-msgid "Cohabiting"
-msgstr "En cohabitation"
-
-#: src/Content/ContactSelector.php:192
-msgid "Common law"
-msgstr "Marié \"de fait\"/\"sui juris\" (concubin)"
-
-#: src/Content/ContactSelector.php:192
-msgid "Happy"
-msgstr "Heureux"
-
-#: src/Content/ContactSelector.php:192
-msgid "Not looking"
-msgstr "Pas intéressé"
-
-#: src/Content/ContactSelector.php:192
-msgid "Swinger"
-msgstr "Échangiste"
-
-#: src/Content/ContactSelector.php:192
-msgid "Betrayed"
-msgstr "Trahi(e)"
-
-#: src/Content/ContactSelector.php:192
-msgid "Separated"
-msgstr "Séparé"
-
-#: src/Content/ContactSelector.php:192
-msgid "Unstable"
-msgstr "Instable"
-
-#: src/Content/ContactSelector.php:192
-msgid "Divorced"
-msgstr "Divorcé"
-
-#: src/Content/ContactSelector.php:192
-msgid "Imaginarily divorced"
-msgstr "Se croit divorcé"
-
-#: src/Content/ContactSelector.php:192
-msgid "Widowed"
-msgstr "Veuf/Veuve"
-
-#: src/Content/ContactSelector.php:192
-msgid "Uncertain"
-msgstr "Incertain"
-
-#: src/Content/ContactSelector.php:192
-msgid "It's complicated"
-msgstr "C'est compliqué"
-
-#: src/Content/ContactSelector.php:192
-msgid "Don't care"
-msgstr "S'en désintéresse"
-
-#: src/Content/ContactSelector.php:192
-msgid "Ask me"
-msgstr "Me demander"
-
-#: src/Content/Feature.php:79
-msgid "General Features"
-msgstr "Fonctions générales"
-
-#: src/Content/Feature.php:81
-msgid "Multiple Profiles"
-msgstr "Profils multiples"
-
-#: src/Content/Feature.php:81
-msgid "Ability to create multiple profiles"
-msgstr "Possibilité de créer plusieurs profils"
-
-#: src/Content/Feature.php:82
-msgid "Photo Location"
-msgstr "Lieu de prise de la photo"
-
-#: src/Content/Feature.php:82
-msgid ""
-"Photo metadata is normally stripped. This extracts the location (if present)"
-" prior to stripping metadata and links it to a map."
-msgstr "Les métadonnées des photos sont normalement retirées. Ceci permet de sauver l'emplacement (si présent) et de positionner la photo sur une carte."
-
-#: src/Content/Feature.php:83
-msgid "Export Public Calendar"
-msgstr "Exporter le Calendrier Public"
-
-#: src/Content/Feature.php:83
-msgid "Ability for visitors to download the public calendar"
-msgstr "Les visiteurs peuvent télécharger le calendrier public"
-
-#: src/Content/Feature.php:88
-msgid "Post Composition Features"
-msgstr "Caractéristiques de composition de publication"
-
-#: src/Content/Feature.php:89
-msgid "Auto-mention Forums"
-msgstr "Mentionner automatiquement les Forums"
-
-#: src/Content/Feature.php:89
-msgid ""
-"Add/remove mention when a forum page is selected/deselected in ACL window."
-msgstr "Ajoute/retire une mention quand une page forum est sélectionnée/désélectionnée lors du choix des destinataires d'une publication."
-
-#: src/Content/Feature.php:94
-msgid "Network Sidebar"
-msgstr ""
-
-#: src/Content/Feature.php:95
-msgid "Ability to select posts by date ranges"
-msgstr "Capacité de sélectionner les publications par intervalles de dates"
-
-#: src/Content/Feature.php:96
-msgid "Protocol Filter"
-msgstr ""
-
-#: src/Content/Feature.php:96
-msgid "Enable widget to display Network posts only from selected protocols"
-msgstr ""
-
-#: src/Content/Feature.php:101
-msgid "Network Tabs"
-msgstr "Onglets Réseau"
-
-#: src/Content/Feature.php:102
-msgid "Network New Tab"
-msgstr "Nouvel onglet réseaux"
-
-#: src/Content/Feature.php:102
-msgid "Enable tab to display only new Network posts (from the last 12 hours)"
-msgstr "Activer l'onglet pour afficher seulement les publications du réseau (dans les 12 dernières heures)"
-
-#: src/Content/Feature.php:103
-msgid "Network Shared Links Tab"
-msgstr "Onglet réseau partagé"
-
-#: src/Content/Feature.php:103
-msgid "Enable tab to display only Network posts with links in them"
-msgstr "Activer l'onglet pour afficher seulement les publications du réseau contenant des liens"
-
-#: src/Content/Feature.php:108
-msgid "Post/Comment Tools"
-msgstr "Outils de publication/commentaire"
-
-#: src/Content/Feature.php:109
-msgid "Post Categories"
-msgstr "Catégories des publications"
-
-#: src/Content/Feature.php:109
-msgid "Add categories to your posts"
-msgstr "Ajouter des catégories à vos publications"
-
-#: src/Content/Feature.php:114
-msgid "Advanced Profile Settings"
-msgstr "Paramètres Avancés du Profil"
-
-#: src/Content/Feature.php:115
-msgid "List Forums"
-msgstr "Liste des forums"
-
-#: src/Content/Feature.php:115
-msgid "Show visitors public community forums at the Advanced Profile Page"
-msgstr "Montrer les forums communautaires aux visiteurs sur la Page de profil avancé"
-
-#: src/Content/Feature.php:116
-msgid "Tag Cloud"
-msgstr ""
-
-#: src/Content/Feature.php:116
-msgid "Provide a personal tag cloud on your profile page"
-msgstr ""
-
-#: src/Content/Feature.php:117
-msgid "Display Membership Date"
-msgstr ""
-
-#: src/Content/Feature.php:117
-msgid "Display membership date in profile"
-msgstr ""
-
-#: src/Content/ForumManager.php:128 src/Content/Nav.php:204
-#: src/Content/Text/HTML.php:981 view/theme/vier/theme.php:253
-msgid "Forums"
-msgstr "Forums"
-
-#: src/Content/ForumManager.php:130 view/theme/vier/theme.php:255
-msgid "External link to forum"
-msgstr "Lien sortant vers le forum"
-
-#: src/Content/Nav.php:72
-msgid "Nothing new here"
-msgstr "Rien de neuf ici"
-
-#: src/Content/Nav.php:76
-msgid "Clear notifications"
-msgstr "Effacer les notifications"
-
-#: src/Content/Nav.php:77 src/Content/Text/HTML.php:970
-msgid "@name, !forum, #tags, content"
-msgstr "@nom, !forum, #tags, contenu"
-
-#: src/Content/Nav.php:150 src/Module/Login.php:321
-#: view/theme/frio/theme.php:270
-msgid "Logout"
-msgstr "Se déconnecter"
-
-#: src/Content/Nav.php:150 view/theme/frio/theme.php:270
-msgid "End this session"
-msgstr "Mettre fin à cette session"
-
-#: src/Content/Nav.php:153 src/Model/Profile.php:901
-#: src/Module/Contact.php:659 src/Module/Contact.php:858
-#: view/theme/frio/theme.php:273
-msgid "Status"
-msgstr "Statut"
-
-#: src/Content/Nav.php:153 src/Content/Nav.php:239
-#: view/theme/frio/theme.php:273
-msgid "Your posts and conversations"
-msgstr "Vos publications et conversations"
-
-#: src/Content/Nav.php:154 view/theme/frio/theme.php:274
-msgid "Your profile page"
-msgstr "Votre page de profil"
-
-#: src/Content/Nav.php:155 view/theme/frio/theme.php:275
-msgid "Your photos"
-msgstr "Vos photos"
-
-#: src/Content/Nav.php:156 src/Model/Profile.php:925 src/Model/Profile.php:928
-#: view/theme/frio/theme.php:276
-msgid "Videos"
-msgstr "Vidéos"
-
-#: src/Content/Nav.php:156 view/theme/frio/theme.php:276
-msgid "Your videos"
-msgstr "Vos vidéos"
-
-#: src/Content/Nav.php:157 view/theme/frio/theme.php:277
-msgid "Your events"
-msgstr "Vos événements"
-
-#: src/Content/Nav.php:158
-msgid "Personal notes"
-msgstr "Notes personnelles"
-
-#: src/Content/Nav.php:158
-msgid "Your personal notes"
-msgstr "Vos notes personnelles"
-
-#: src/Content/Nav.php:167
-msgid "Sign in"
-msgstr "Se connecter"
-
-#: src/Content/Nav.php:177 src/Content/Nav.php:239
-#: src/Core/NotificationsManager.php:194
-msgid "Home"
-msgstr "Profil"
-
-#: src/Content/Nav.php:177
-msgid "Home Page"
-msgstr "Page d'accueil"
-
-#: src/Content/Nav.php:181
-msgid "Create an account"
-msgstr "Créer un compte"
-
-#: src/Content/Nav.php:187
-msgid "Help and documentation"
-msgstr "Aide et documentation"
-
-#: src/Content/Nav.php:191
-msgid "Apps"
-msgstr "Applications"
-
-#: src/Content/Nav.php:191
-msgid "Addon applications, utilities, games"
-msgstr "Applications supplémentaires, utilitaires, jeux"
-
-#: src/Content/Nav.php:195
-msgid "Search site content"
-msgstr "Rechercher dans le contenu du site"
-
-#: src/Content/Nav.php:198 src/Content/Text/HTML.php:976
-msgid "Full Text"
-msgstr "Texte Entier"
-
-#: src/Content/Nav.php:199 src/Content/Text/HTML.php:977
-#: src/Content/Widget/TagCloud.php:55
-msgid "Tags"
-msgstr "Tags"
-
-#: src/Content/Nav.php:219
-msgid "Community"
-msgstr "Communauté"
-
-#: src/Content/Nav.php:219
-msgid "Conversations on this and other servers"
-msgstr ""
-
-#: src/Content/Nav.php:223 src/Model/Profile.php:940 src/Model/Profile.php:951
-#: view/theme/frio/theme.php:281
-msgid "Events and Calendar"
-msgstr "Événements et agenda"
-
-#: src/Content/Nav.php:226
-msgid "Directory"
-msgstr "Annuaire"
-
-#: src/Content/Nav.php:226
-msgid "People directory"
-msgstr "Annuaire des utilisateurs"
-
-#: src/Content/Nav.php:228
-msgid "Information about this friendica instance"
-msgstr "Information au sujet de cette instance de friendica"
-
-#: src/Content/Nav.php:231
-msgid "Terms of Service of this Friendica instance"
-msgstr ""
-
-#: src/Content/Nav.php:236 view/theme/frio/theme.php:280
-msgid "Conversations from your friends"
-msgstr "Conversations de vos amis"
-
-#: src/Content/Nav.php:237
-msgid "Network Reset"
-msgstr "Réinitialiser le réseau"
-
-#: src/Content/Nav.php:237
-msgid "Load Network page with no filters"
-msgstr "Chargement des pages du réseau sans filtre"
-
-#: src/Content/Nav.php:243 src/Core/NotificationsManager.php:201
-msgid "Introductions"
-msgstr "Introductions"
-
-#: src/Content/Nav.php:243
-msgid "Friend Requests"
-msgstr "Demande d'amitié"
-
-#: src/Content/Nav.php:245
-msgid "See all notifications"
-msgstr "Voir toutes les notifications"
-
-#: src/Content/Nav.php:246
-msgid "Mark all system notifications seen"
-msgstr "Marquer toutes les notifications système comme 'vues'"
-
-#: src/Content/Nav.php:249 view/theme/frio/theme.php:282
-msgid "Private mail"
-msgstr "Messages privés"
-
-#: src/Content/Nav.php:250
-msgid "Inbox"
-msgstr "Messages entrants"
-
-#: src/Content/Nav.php:251
-msgid "Outbox"
-msgstr "Messages sortants"
-
-#: src/Content/Nav.php:255
-msgid "Manage"
-msgstr "Gérer"
-
-#: src/Content/Nav.php:255
-msgid "Manage other pages"
-msgstr "Gérer les autres pages"
-
-#: src/Content/Nav.php:260 view/theme/frio/theme.php:283
-msgid "Account settings"
-msgstr "Compte"
-
-#: src/Content/Nav.php:263
-msgid "Manage/Edit Profiles"
-msgstr "Gérer/Éditer les profiles"
-
-#: src/Content/Nav.php:266 view/theme/frio/theme.php:284
-msgid "Manage/edit friends and contacts"
-msgstr "Gérer/éditer les amitiés et contacts"
-
-#: src/Content/Nav.php:271
-msgid "Site setup and configuration"
-msgstr "Démarrage et configuration du site"
-
-#: src/Content/Nav.php:274
-msgid "Navigation"
-msgstr "Navigation"
-
-#: src/Content/Nav.php:274
-msgid "Site map"
-msgstr "Carte du site"
-
-#: src/Content/OEmbed.php:257
-msgid "Embedding disabled"
-msgstr "Incorporation désactivée"
-
-#: src/Content/OEmbed.php:377
-msgid "Embedded content"
-msgstr "Contenu incorporé"
-
-#: src/Content/Pager.php:166
-msgid "newer"
-msgstr "Plus récent"
-
-#: src/Content/Pager.php:171
-msgid "older"
-msgstr "Plus ancien"
-
-#: src/Content/Pager.php:210
-msgid "first"
-msgstr "premier"
-
-#: src/Content/Pager.php:215
-msgid "prev"
-msgstr "précédent"
-
-#: src/Content/Pager.php:270
-msgid "next"
-msgstr "suivant"
-
-#: src/Content/Pager.php:275
-msgid "last"
-msgstr "dernier"
-
-#: src/Content/Text/BBCode.php:426
-msgid "view full size"
-msgstr "voir en pleine taille"
-
-#: src/Content/Text/BBCode.php:858 src/Content/Text/BBCode.php:1583
-#: src/Content/Text/BBCode.php:1584
-msgid "Image/photo"
-msgstr "Image/photo"
-
-#: src/Content/Text/BBCode.php:961
-#, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
-msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
-
-#: src/Content/Text/BBCode.php:1510 src/Content/Text/BBCode.php:1532
-msgid "$1 wrote:"
-msgstr "$1 a écrit :"
-
-#: src/Content/Text/BBCode.php:1594 src/Content/Text/BBCode.php:1595
-msgid "Encrypted content"
-msgstr "Contenu chiffré"
-
-#: src/Content/Text/BBCode.php:1702
-msgid "Invalid source protocol"
-msgstr ""
-
-#: src/Content/Text/BBCode.php:1713
-msgid "Invalid link protocol"
-msgstr ""
-
-#: src/Content/Text/HTML.php:797
-msgid "Loading more entries..."
-msgstr "Chargement de résultats supplémentaires..."
-
-#: src/Content/Text/HTML.php:798
-msgid "The end"
-msgstr "Fin"
-
-#: src/Content/Text/HTML.php:838
-msgid "No contacts"
-msgstr "Aucun contact"
-
-#: src/Content/Text/HTML.php:865
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] "%d contact"
-msgstr[1] "%d contacts"
-
-#: src/Content/Text/HTML.php:878
-msgid "View Contacts"
-msgstr "Voir les contacts"
-
-#: src/Content/Text/HTML.php:961
-msgid "Follow"
-msgstr "S'abonner"
-
-#: src/Content/Text/HTML.php:1016 src/Model/Item.php:3480
-#: src/Model/Item.php:3491
-msgid "Click to open/close"
-msgstr "Cliquer pour ouvrir/fermer"
-
-#: src/Content/Widget/CalendarExport.php:66
-msgid "Export"
-msgstr "Exporter"
-
-#: src/Content/Widget/CalendarExport.php:67
-msgid "Export calendar as ical"
-msgstr "Exporter au format iCal"
-
-#: src/Content/Widget/CalendarExport.php:68
-msgid "Export calendar as csv"
-msgstr "Exporter au format CSV"
-
-#: src/Content/Widget.php:37
-msgid "Add New Contact"
-msgstr "Ajouter un nouveau contact"
-
-#: src/Content/Widget.php:38
-msgid "Enter address or web location"
-msgstr "Entrez son adresse ou sa localisation web"
-
-#: src/Content/Widget.php:39
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Exemple : bob@example.com, http://example.com/barbara"
-
-#: src/Content/Widget.php:57
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invitation disponible"
-msgstr[1] "%d invitations disponibles"
-
-#: src/Content/Widget.php:63 view/theme/vier/theme.php:199
-msgid "Find People"
-msgstr "Trouver des personnes"
-
-#: src/Content/Widget.php:64 view/theme/vier/theme.php:200
-msgid "Enter name or interest"
-msgstr "Entrez un nom ou un centre d'intérêt"
-
-#: src/Content/Widget.php:66 view/theme/vier/theme.php:202
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Exemples : Robert Morgenstein, Pêche"
-
-#: src/Content/Widget.php:69 view/theme/vier/theme.php:205
-msgid "Similar Interests"
-msgstr "Intérêts similaires"
-
-#: src/Content/Widget.php:70 view/theme/vier/theme.php:206
-msgid "Random Profile"
-msgstr "Profil au hasard"
-
-#: src/Content/Widget.php:71 view/theme/vier/theme.php:207
-msgid "Invite Friends"
-msgstr "Inviter des amis"
-
-#: src/Content/Widget.php:74 view/theme/vier/theme.php:210
-msgid "Local Directory"
-msgstr "Annuaire local"
-
-#: src/Content/Widget.php:158
-msgid "Protocols"
-msgstr ""
-
-#: src/Content/Widget.php:161
-msgid "All Protocols"
-msgstr ""
-
-#: src/Content/Widget.php:196
-msgid "Saved Folders"
-msgstr "Dossiers sauvegardés"
-
-#: src/Content/Widget.php:199 src/Content/Widget.php:239
-msgid "Everything"
-msgstr "Tout"
-
-#: src/Content/Widget.php:236
-msgid "Categories"
-msgstr "Catégories"
-
-#: src/Content/Widget.php:303
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] "%d contact en commun"
-msgstr[1] "%d contacts en commun"
-
-#: src/Core/ACL.php:285
-msgid "Post to Email"
-msgstr "Publier aux courriels"
-
-#: src/Core/ACL.php:291
-msgid "Hide your profile details from unknown viewers?"
-msgstr "Cacher les détails du profil aux visiteurs inconnus?"
-
-#: src/Core/ACL.php:290
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr "Les connecteurs sont désactivés parce que \"%s\" est activé."
-
-#: src/Core/ACL.php:297
-msgid "Visible to everybody"
-msgstr "Visible par tout le monde"
-
-#: src/Core/ACL.php:298 view/theme/vier/config.php:116
-msgid "show"
-msgstr "montrer"
-
-#: src/Core/ACL.php:299 view/theme/vier/config.php:116
-msgid "don't show"
-msgstr "cacher"
-
-#: src/Core/ACL.php:309
-msgid "Close"
-msgstr "Fermer"
-
-#: src/Core/Authentication.php:89
-msgid "Welcome "
-msgstr "Bienvenue "
-
-#: src/Core/Authentication.php:90
-msgid "Please upload a profile photo."
-msgstr "Merci d'illustrer votre profil d'une image."
-
-#: src/Core/Authentication.php:92
-msgid "Welcome back "
-msgstr "Bienvenue à nouveau, "
-
-#: src/Core/Console/ArchiveContact.php:66
-#, php-format
-msgid "Could not find any unarchived contact entry for this URL (%s)"
-msgstr ""
-
-#: src/Core/Console/ArchiveContact.php:71
-msgid "The contact entries have been archived"
-msgstr ""
-
-#: src/Core/Console/NewPassword.php:73
-msgid "Enter new password: "
-msgstr ""
-
-#: src/Core/Console/NewPassword.php:78 src/Model/User.php:315
-msgid "Password can't be empty"
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:50
-#, php-format
-msgid "Post update version number has been set to %s."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:58
-msgid "Check for pending update actions."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:60
-msgid "Done."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:62
-msgid "Execute pending post updates."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:68
-msgid "All pending post updates are done."
-msgstr ""
-
-#: src/Core/Installer.php:160
-msgid ""
-"The database configuration file \"config/local.config.php\" could not be "
-"written. Please use the enclosed text to create a configuration file in your"
-" web server root."
-msgstr ""
-
-#: src/Core/Installer.php:176
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "Vous pourriez avoir besoin d'importer le fichier \"database.sql\" manuellement au moyen de phpmyadmin ou de la commande mysql."
-
-#: src/Core/Installer.php:177 src/Module/Install.php:134
-#: src/Module/Install.php:264
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Référez-vous au fichier \"INSTALL.txt\"."
-
-#: src/Core/Installer.php:239
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH du serveur web."
-
-#: src/Core/Installer.php:240
-msgid ""
-"If you don't have a command line version of PHP installed on your server, "
-"you will not be able to run the background processing. See <a "
-"href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
-"up-the-worker'>'Setup the worker'</a>"
-msgstr ""
-
-#: src/Core/Installer.php:244
-msgid "PHP executable path"
-msgstr "Chemin vers l'exécutable de PHP"
-
-#: src/Core/Installer.php:244
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Entrez le chemin (absolu) vers l'exécutable 'php'. Vous pouvez laisser cette ligne vide pour continuer l'installation."
-
-#: src/Core/Installer.php:249
-msgid "Command line PHP"
-msgstr "Version \"ligne de commande\" de PHP"
-
-#: src/Core/Installer.php:258
-msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
-msgstr "L'executable PHP n'est pas le binaire php client (c'est peut être la version cgi-fcgi)"
-
-#: src/Core/Installer.php:259
-msgid "Found PHP version: "
-msgstr "Version de PHP :"
-
-#: src/Core/Installer.php:261
-msgid "PHP cli binary"
-msgstr "PHP cli binary"
-
-#: src/Core/Installer.php:274
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "La version \"ligne de commande\" de PHP de votre système n'a pas \"register_argc_argv\" d'activé."
-
-#: src/Core/Installer.php:275
-msgid "This is required for message delivery to work."
-msgstr "Ceci est requis pour que la livraison des messages fonctionne."
-
-#: src/Core/Installer.php:280
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
-
-#: src/Core/Installer.php:312
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Erreur: la fonction \"openssl_pkey_new\" de ce système ne permet pas de générer des clés de chiffrement"
-
-#: src/Core/Installer.php:313
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Si vous utilisez Windows, merci de vous réferer à \"http://www.php.net/manual/en/openssl.installation.php\"."
-
-#: src/Core/Installer.php:316
-msgid "Generate encryption keys"
-msgstr "Générer les clés de chiffrement"
-
-#: src/Core/Installer.php:367
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Erreur : Le module \"rewrite\" du serveur web Apache est requis mais pas installé."
-
-#: src/Core/Installer.php:372
-msgid "Apache mod_rewrite module"
-msgstr "Module mod_rewrite Apache"
-
-#: src/Core/Installer.php:378
-msgid "Error: PDO or MySQLi PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:383
-msgid "Error: The MySQL driver for PDO is not installed."
-msgstr ""
-
-#: src/Core/Installer.php:387
-msgid "PDO or MySQLi PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:395
-msgid "Error, XML PHP module required but not installed."
-msgstr "Erreur : le module PHP XML requis est absent."
-
-#: src/Core/Installer.php:399
-msgid "XML PHP module"
-msgstr "Module PHP XML"
-
-#: src/Core/Installer.php:402
-msgid "libCurl PHP module"
-msgstr "Module libCurl de PHP"
-
-#: src/Core/Installer.php:403
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Erreur : Le module PHP \"libCURL\" est requis mais pas installé."
-
-#: src/Core/Installer.php:409
-msgid "GD graphics PHP module"
-msgstr "Module GD (graphiques) de PHP"
-
-#: src/Core/Installer.php:410
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Erreur : Le module PHP \"GD\" disposant du support JPEG est requis mais pas installé."
-
-#: src/Core/Installer.php:416
-msgid "OpenSSL PHP module"
-msgstr "Module OpenSSL de PHP"
-
-#: src/Core/Installer.php:417
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Erreur : Le module PHP \"openssl\" est requis mais pas installé."
-
-#: src/Core/Installer.php:423
-msgid "mb_string PHP module"
-msgstr "Module mb_string de PHP"
-
-#: src/Core/Installer.php:424
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Erreur : le module PHP mb_string est requis mais pas installé."
-
-#: src/Core/Installer.php:430
-msgid "iconv PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:431
-msgid "Error: iconv PHP module required but not installed."
-msgstr "Erreur : Le module PHP iconv requis est absent."
-
-#: src/Core/Installer.php:437
-msgid "POSIX PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:438
-msgid "Error: POSIX PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:461
-msgid ""
-"The web installer needs to be able to create a file called "
-"\"local.config.php\" in the \"config\" folder of your web server and it is "
-"unable to do so."
-msgstr ""
-
-#: src/Core/Installer.php:462
-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 "Le plus souvent, il s'agit d'un problème de permission. Le serveur web peut ne pas être capable d'écrire dans votre répertoire - alors que vous-même le pouvez."
-
-#: src/Core/Installer.php:463
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named local.config.php in your Friendica \"config\" folder."
-msgstr ""
-
-#: src/Core/Installer.php:464
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"INSTALL.txt\" for instructions."
-msgstr "Vous pouvez également sauter cette étape et procéder à une installation manuelle. Pour cela, merci de lire le fichier \"INSTALL.txt\"."
-
-#: src/Core/Installer.php:467
-msgid "config/local.config.php is writable"
-msgstr ""
-
-#: src/Core/Installer.php:487
-msgid ""
-"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Friendica utilise le moteur de modèles Smarty3 pour le rendu d'affichage web. Smarty3 compile les modèles en PHP pour accélérer le rendu."
-
-#: src/Core/Installer.php:488
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/smarty3/ under the Friendica top level "
-"folder."
-msgstr "Pour pouvoir stocker ces modèles compilés, le serveur internet doit avoir accès au droit d'écriture pour le répertoire view/smarty3/ sous le dossier racine de Friendica."
-
-#: src/Core/Installer.php:489
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Veuillez vous assurer que l'utilisateur qui exécute votre serveur internet (p. ex. www-data) détient le droit d'accès en écriture sur ce dossier."
-
-#: src/Core/Installer.php:490
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr "Note: pour plus de sécurité, vous devriez ne donner le droit d'accès en écriture qu'à view/smarty3/ et pas aux fichiers modèles (.tpl) qu'il contient."
-
-#: src/Core/Installer.php:493
-msgid "view/smarty3 is writable"
-msgstr "view/smarty3 est autorisé à l écriture"
-
-#: src/Core/Installer.php:521
-msgid ""
-"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist"
-" to .htaccess."
-msgstr ""
-
-#: src/Core/Installer.php:523
-msgid "Error message from Curl when fetching"
-msgstr ""
-
-#: src/Core/Installer.php:528
-msgid "Url rewrite is working"
-msgstr "La réécriture d'URL fonctionne."
-
-#: src/Core/Installer.php:557
-msgid "ImageMagick PHP extension is not installed"
-msgstr "L'extension PHP ImageMagick n'est pas installée"
-
-#: src/Core/Installer.php:559
-msgid "ImageMagick PHP extension is installed"
-msgstr "L’extension PHP ImageMagick est installée"
-
-#: src/Core/Installer.php:561 tests/src/Core/InstallerTest.php:308
-#: tests/src/Core/InstallerTest.php:332
-msgid "ImageMagick supports GIF"
-msgstr "ImageMagick supporte le format GIF"
-
-#: src/Core/Installer.php:583
-msgid "Could not connect to database."
-msgstr "Impossible de se connecter à la base."
-
-#: src/Core/Installer.php:590
-msgid "Database already in use."
-msgstr "Base de données déjà en cours d'utilisation."
-
-#: src/Core/L10n.php:359 src/Model/Event.php:398
-msgid "Tuesday"
-msgstr "Mardi"
-
-#: src/Core/L10n.php:359 src/Model/Event.php:399
-msgid "Wednesday"
-msgstr "Mercredi"
-
-#: src/Core/L10n.php:359 src/Model/Event.php:400
-msgid "Thursday"
-msgstr "Jeudi"
-
-#: src/Core/L10n.php:359 src/Model/Event.php:401
-msgid "Friday"
-msgstr "Vendredi"
-
-#: src/Core/L10n.php:359 src/Model/Event.php:402
-msgid "Saturday"
-msgstr "Samedi"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:417
-msgid "January"
-msgstr "Janvier"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:418
-msgid "February"
-msgstr "Février"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:419
-msgid "March"
-msgstr "Mars"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:420
-msgid "April"
-msgstr "Avril"
-
-#: src/Core/L10n.php:363 src/Core/L10n.php:382 src/Model/Event.php:408
-#: src/Model/Event.php:421
-msgid "May"
-msgstr "Mai"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:422
-msgid "June"
-msgstr "Juin"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:423
-msgid "July"
-msgstr "Juillet"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:424
-msgid "August"
-msgstr "Août"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:425
-msgid "September"
-msgstr "Septembre"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:426
-msgid "October"
-msgstr "Octobre"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:427
-msgid "November"
-msgstr "Novembre"
-
-#: src/Core/L10n.php:363 src/Model/Event.php:428
-msgid "December"
-msgstr "Décembre"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:389
-msgid "Mon"
-msgstr "Lun"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:390
-msgid "Tue"
-msgstr "Mar"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:391
-msgid "Wed"
-msgstr "Mer"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:392
-msgid "Thu"
-msgstr "Jeu"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:393
-msgid "Fri"
-msgstr "Ven"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:394
-msgid "Sat"
-msgstr "Sam"
-
-#: src/Core/L10n.php:378 src/Model/Event.php:388
-msgid "Sun"
-msgstr "Dim"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:404
-msgid "Jan"
-msgstr "Jan"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:405
-msgid "Feb"
-msgstr "Fév"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:406
-msgid "Mar"
-msgstr "Mar"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:407
-msgid "Apr"
-msgstr "Avr"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:410
-msgid "Jul"
-msgstr "Jul"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:411
-msgid "Aug"
-msgstr "Aoû"
-
-#: src/Core/L10n.php:382
-msgid "Sep"
-msgstr ""
-
-#: src/Core/L10n.php:382 src/Model/Event.php:413
-msgid "Oct"
-msgstr "Oct"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:414
-msgid "Nov"
-msgstr "Nov"
-
-#: src/Core/L10n.php:382 src/Model/Event.php:415
-msgid "Dec"
-msgstr "Déc"
-
-#: src/Core/L10n.php:400
-msgid "poke"
-msgstr "titiller"
-
-#: src/Core/L10n.php:400
-msgid "poked"
-msgstr "a titillé"
-
-#: src/Core/L10n.php:401
-msgid "ping"
-msgstr "attirer l'attention"
-
-#: src/Core/L10n.php:401
-msgid "pinged"
-msgstr "a attiré l'attention de"
-
-#: src/Core/L10n.php:402
-msgid "prod"
-msgstr "aiguillonner"
-
-#: src/Core/L10n.php:402
-msgid "prodded"
-msgstr "a aiguillonné"
-
-#: src/Core/L10n.php:403
-msgid "slap"
-msgstr "gifler"
-
-#: src/Core/L10n.php:403
-msgid "slapped"
-msgstr "a giflé"
-
-#: src/Core/L10n.php:404
-msgid "finger"
-msgstr "tripoter"
-
-#: src/Core/L10n.php:404
-msgid "fingered"
-msgstr "a tripoté"
-
-#: src/Core/L10n.php:405
-msgid "rebuff"
-msgstr "rabrouer"
-
-#: src/Core/L10n.php:405
-msgid "rebuffed"
-msgstr "a rabroué"
-
-#: src/Core/NotificationsManager.php:173
-msgid "System"
-msgstr "Système"
-
-#: src/Core/NotificationsManager.php:263 src/Core/NotificationsManager.php:275
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s a commenté la publication de %s"
-
-#: src/Core/NotificationsManager.php:274
-#, php-format
-msgid "%s created a new post"
-msgstr "%s a créé une nouvelle publication"
-
-#: src/Core/NotificationsManager.php:288
-#, php-format
-msgid "%s liked %s's post"
-msgstr "%s a aimé la publication de %s"
-
-#: src/Core/NotificationsManager.php:301
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "%s n'a pas aimé la publication de %s"
-
-#: src/Core/NotificationsManager.php:314
-#, php-format
-msgid "%s is attending %s's event"
-msgstr "%s participe à l'événement de %s"
-
-#: src/Core/NotificationsManager.php:327
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr "%s ne participe pas à l'événement de %s"
-
-#: src/Core/NotificationsManager.php:340
-#, php-format
-msgid "%s may attend %s's event"
-msgstr "%s participera peut-être à l'événement de %s"
-
-#: src/Core/NotificationsManager.php:373
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s est désormais ami(e) avec %s"
-
-#: src/Core/NotificationsManager.php:639
-msgid "Friend Suggestion"
-msgstr "Suggestion d'amitié/contact"
-
-#: src/Core/NotificationsManager.php:673
-msgid "Friend/Connect Request"
-msgstr "Demande de connexion/relation"
-
-#: src/Core/NotificationsManager.php:673
-msgid "New Follower"
-msgstr "Nouvel abonné"
-
-#: src/Core/Update.php:157
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Mise-à-jour %s échouée. Voir les journaux d'erreur."
-
-#: src/Core/Update.php:213
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
-msgstr ""
-
-#: src/Core/Update.php:219
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "Le message d’erreur est\n[pre]%s[/pre]"
-
-#: src/Core/Update.php:248
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
-msgstr ""
-
-#: src/Core/UserImport.php:103
-msgid "Error decoding account file"
-msgstr "Une erreur a été détecté en décodant un fichier utilisateur"
-
-#: src/Core/UserImport.php:109
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "Erreur ! Pas de ficher de version existant ! Êtes vous sur un compte Friendica ?"
-
-#: src/Core/UserImport.php:117
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "L'utilisateur '%s' existe déjà sur ce serveur!"
-
-#: src/Core/UserImport.php:153
-msgid "User creation error"
-msgstr "Erreur de création d'utilisateur"
-
-#: src/Core/UserImport.php:171
-msgid "User profile creation error"
-msgstr "Erreur de création du profil utilisateur"
-
-#: src/Core/UserImport.php:215
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "%d contacts non importés"
-msgstr[1] "%d contacts non importés"
-
-#: src/Core/UserImport.php:280
-msgid "Done. You can now login with your username and password"
-msgstr "Action réalisée. Vous pouvez désormais vous connecter avec votre nom d'utilisateur et votre mot de passe"
-
-#: src/Database/DBStructure.php:45
-msgid "There are no tables on MyISAM."
-msgstr ""
-
-#: src/Database/DBStructure.php:153
-#, php-format
-msgid ""
-"\n"
-"Error %d occurred during database update:\n"
-"%s\n"
-msgstr "\nErreur %d survenue durant la mise à jour de la base de données :\n%s\n"
-
-#: src/Database/DBStructure.php:156
-msgid "Errors encountered performing database changes: "
-msgstr ""
-
-#: src/Database/DBStructure.php:172
-#, php-format
-msgid "%s: Database update"
-msgstr ""
-
-#: src/Database/DBStructure.php:435
-#, php-format
-msgid "%s: updating %s table."
-msgstr ""
-
-#: src/LegacyModule.php:29
-#, php-format
-msgid "Legacy module file not found: %s"
-msgstr ""
-
-#: src/Model/Contact.php:955
-msgid "Drop Contact"
-msgstr "Supprimer le contact"
-
-#: src/Model/Contact.php:1418
-msgid "Organisation"
-msgstr ""
-
-#: src/Model/Contact.php:1422
-msgid "News"
-msgstr "Nouvelles"
-
-#: src/Model/Contact.php:1426
-msgid "Forum"
-msgstr "Forum"
-
-#: src/Model/Contact.php:1608
-msgid "Connect URL missing."
-msgstr "URL de connexion manquante."
-
-#: src/Model/Contact.php:1617
-msgid ""
-"The contact could not be added. Please check the relevant network "
-"credentials in your Settings -> Social Networks page."
-msgstr ""
-
-#: src/Model/Contact.php:1656
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "Ce site n'est pas configuré pour dialoguer avec d'autres réseaux."
-
-#: src/Model/Contact.php:1657 src/Model/Contact.php:1671
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "Aucun protocole de communication ni aucun flux n'a pu être découvert."
-
-#: src/Model/Contact.php:1669
-msgid "The profile address specified does not provide adequate information."
-msgstr "L'adresse de profil indiquée ne fournit par les informations adéquates."
-
-#: src/Model/Contact.php:1674
-msgid "An author or name was not found."
-msgstr "Aucun auteur ou nom d'auteur n'a pu être trouvé."
-
-#: src/Model/Contact.php:1677
-msgid "No browser URL could be matched to this address."
-msgstr "Aucune URL de navigation ne correspond à cette adresse."
-
-#: src/Model/Contact.php:1680
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr "Impossible de faire correspondre l'adresse d'identité en \"@\" avec un protocole connu ou un contact courriel."
-
-#: src/Model/Contact.php:1681
-msgid "Use mailto: in front of address to force email check."
-msgstr "Utilisez mailto: en face d'une adresse pour l'obliger à être reconnue comme courriel."
-
-#: src/Model/Contact.php:1687
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "L'adresse de profil spécifiée correspond à un réseau qui a été désactivé sur ce site."
-
-#: src/Model/Contact.php:1692
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "Profil limité. Cette personne ne sera pas capable de recevoir des notifications directes/personnelles de votre part."
-
-#: src/Model/Contact.php:1743
-msgid "Unable to retrieve contact information."
-msgstr "Impossible de récupérer les informations du contact."
-
-#: src/Model/Event.php:63 src/Model/Event.php:80 src/Model/Event.php:437
-#: src/Model/Event.php:912
-msgid "Starts:"
-msgstr "Débute :"
-
-#: src/Model/Event.php:66 src/Model/Event.php:86 src/Model/Event.php:438
-#: src/Model/Event.php:916
-msgid "Finishes:"
-msgstr "Finit :"
-
-#: src/Model/Event.php:386
-msgid "all-day"
-msgstr "toute la journée"
-
-#: src/Model/Event.php:409
-msgid "Jun"
-msgstr "Jun"
-
-#: src/Model/Event.php:412
-msgid "Sept"
-msgstr "Sep"
-
-#: src/Model/Event.php:435
-msgid "No events to display"
-msgstr "Pas d'événement à afficher"
-
-#: src/Model/Event.php:559
-msgid "l, F j"
-msgstr "l, F j"
-
-#: src/Model/Event.php:590
-msgid "Edit event"
-msgstr "Editer l'événement"
-
-#: src/Model/Event.php:591
-msgid "Duplicate event"
-msgstr "Dupliquer l'événement"
-
-#: src/Model/Event.php:592
-msgid "Delete event"
-msgstr "Supprimer l'événement"
-
-#: src/Model/Event.php:624 src/Model/Item.php:3529 src/Model/Item.php:3536
-msgid "link to source"
-msgstr "lien original"
-
-#: src/Model/Event.php:845
-msgid "D g:i A"
-msgstr ""
-
-#: src/Model/Event.php:846
-msgid "g:i A"
-msgstr ""
-
-#: src/Model/Event.php:931 src/Model/Event.php:933
-msgid "Show map"
-msgstr "Montrer la carte"
-
-#: src/Model/Event.php:932
-msgid "Hide map"
-msgstr "Cacher la carte"
-
-#: src/Model/Event.php:1022
-#, php-format
-msgid "%s's birthday"
-msgstr "Anniversaire de %s's"
-
-#: src/Model/Event.php:1023
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "Joyeux anniversaire, %s !"
-
-#: src/Model/FileTag.php:255
-msgid "Item filed"
-msgstr "Élément classé"
-
-#: src/Model/Group.php:47
-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 "Un groupe supprimé a été recréé. Les permissions existantes <strong>pourraient</strong> s'appliquer à ce groupe et aux futurs membres. Si ce n'est pas le comportement attendu, merci de re-créer un autre groupe sous un autre nom."
-
-#: src/Model/Group.php:333
-msgid "Default privacy group for new contacts"
-msgstr "Paramètres de confidentialité par défaut pour les nouveaux contacts"
-
-#: src/Model/Group.php:366
-msgid "Everybody"
-msgstr "Tout le monde"
-
-#: src/Model/Group.php:386
-msgid "edit"
-msgstr "éditer"
-
-#: src/Model/Group.php:415
-msgid "Edit group"
-msgstr "Editer groupe"
-
-#: src/Model/Group.php:418
-msgid "Create a new group"
-msgstr "Créer un nouveau groupe"
-
-#: src/Model/Group.php:420
-msgid "Edit groups"
-msgstr "Modifier les groupes"
-
-#: src/Model/Item.php:3267
-msgid "activity"
-msgstr "activité"
-
-#: src/Model/Item.php:3269 src/Object/Post.php:446 src/Object/Post.php:458
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] "commentaire"
-
-#: src/Model/Item.php:3272
-msgid "post"
-msgstr "publication"
-
-#: src/Model/Item.php:3368
-#, php-format
-msgid "Content warning: %s"
-msgstr "Avertissement de contenu: %s"
-
-#: src/Model/Item.php:3447
-msgid "bytes"
-msgstr "octets"
-
-#: src/Model/Item.php:3523
-msgid "View on separate page"
-msgstr "Voir dans une nouvelle page"
-
-#: src/Model/Item.php:3524
-msgid "view on separate page"
-msgstr "voir dans une nouvelle page"
-
-#: src/Model/Mail.php:40 src/Model/Mail.php:172
-msgid "[no subject]"
-msgstr "[pas de sujet]"
-
-#: src/Model/Profile.php:114
-msgid "Requested account is not available."
-msgstr "Le compte demandé n'est pas disponible."
-
-#: src/Model/Profile.php:180 src/Model/Profile.php:416
-#: src/Model/Profile.php:872
-msgid "Edit profile"
-msgstr "Editer le profil"
-
-#: src/Model/Profile.php:350
-msgid "Atom feed"
-msgstr "Flux Atom"
-
-#: src/Model/Profile.php:389
-msgid "Manage/edit profiles"
-msgstr "Gérer/éditer les profils"
-
-#: src/Model/Profile.php:441 src/Module/Contact.php:652
-msgid "XMPP:"
-msgstr "XMPP"
-
-#: src/Model/Profile.php:567 src/Model/Profile.php:665
-msgid "g A l F d"
-msgstr "g A | F d"
-
-#: src/Model/Profile.php:568
-msgid "F d"
-msgstr "F d"
-
-#: src/Model/Profile.php:630 src/Model/Profile.php:716
-msgid "[today]"
-msgstr "[aujourd'hui]"
-
-#: src/Model/Profile.php:641
-msgid "Birthday Reminders"
-msgstr "Rappels d'anniversaires"
-
-#: src/Model/Profile.php:642
-msgid "Birthdays this week:"
-msgstr "Anniversaires cette semaine :"
-
-#: src/Model/Profile.php:703
-msgid "[No description]"
-msgstr "[Sans description]"
-
-#: src/Model/Profile.php:730
-msgid "Event Reminders"
-msgstr "Rappels d'événements"
-
-#: src/Model/Profile.php:731
-msgid "Upcoming events the next 7 days:"
-msgstr ""
-
-#: src/Model/Profile.php:754
-msgid "Member since:"
-msgstr ""
-
-#: src/Model/Profile.php:762
-msgid "j F, Y"
-msgstr "j F, Y"
-
-#: src/Model/Profile.php:763
-msgid "j F"
-msgstr "j F"
-
-#: src/Model/Profile.php:771 src/Util/Temporal.php:149
-msgid "Birthday:"
-msgstr "Anniversaire :"
-
-#: src/Model/Profile.php:778
-msgid "Age:"
-msgstr "Age :"
-
-#: src/Model/Profile.php:791
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "depuis %1$d %2$s"
-
-#: src/Model/Profile.php:815
-msgid "Religion:"
-msgstr "Religion :"
-
-#: src/Model/Profile.php:823
-msgid "Hobbies/Interests:"
-msgstr "Passe-temps/Centres d'intérêt :"
-
-#: src/Model/Profile.php:835
-msgid "Contact information and Social Networks:"
-msgstr "Coordonnées/Réseaux sociaux :"
-
-#: src/Model/Profile.php:839
-msgid "Musical interests:"
-msgstr "Goûts musicaux :"
-
-#: src/Model/Profile.php:843
-msgid "Books, literature:"
-msgstr "Lectures :"
-
-#: src/Model/Profile.php:847
-msgid "Television:"
-msgstr "Télévision :"
-
-#: src/Model/Profile.php:851
-msgid "Film/dance/culture/entertainment:"
-msgstr "Cinéma/Danse/Culture/Divertissement :"
-
-#: src/Model/Profile.php:855
-msgid "Love/Romance:"
-msgstr "Amour/Romance :"
-
-#: src/Model/Profile.php:859
-msgid "Work/employment:"
-msgstr "Activité professionnelle/Occupation :"
-
-#: src/Model/Profile.php:863
-msgid "School/education:"
-msgstr "Études/Formation :"
-
-#: src/Model/Profile.php:868
-msgid "Forums:"
-msgstr "Forums :"
-
-#: src/Model/Profile.php:912 src/Module/Contact.php:877
-msgid "Profile Details"
-msgstr "Détails du profil"
-
-#: src/Model/Profile.php:962
-msgid "Only You Can See This"
-msgstr "Vous seul pouvez voir ça"
-
-#: src/Model/Profile.php:970 src/Model/Profile.php:973
-msgid "Tips for New Members"
-msgstr "Conseils aux nouveaux venus"
-
-#: src/Model/Profile.php:1135
-#, php-format
-msgid "OpenWebAuth: %1$s welcomes %2$s"
-msgstr ""
-
-#: src/Model/User.php:207
-msgid "Login failed"
-msgstr ""
-
-#: src/Model/User.php:238
-msgid "Not enough information to authenticate"
-msgstr ""
-
-#: src/Model/User.php:430
-msgid "An invitation is required."
-msgstr "Une invitation est requise."
-
-#: src/Model/User.php:434
-msgid "Invitation could not be verified."
-msgstr "L'invitation fournie n'a pu être validée."
-
-#: src/Model/User.php:441
-msgid "Invalid OpenID url"
-msgstr "Adresse OpenID invalide"
-
-#: src/Model/User.php:454 src/Module/Login.php:108
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Nous avons eu un souci avec l'OpenID que vous avez fourni. Merci de vérifier qu'il est correctement écrit."
-
-#: src/Model/User.php:454 src/Module/Login.php:108
-msgid "The error message was:"
-msgstr "Le message d'erreur était :"
-
-#: src/Model/User.php:460
-msgid "Please enter the required information."
-msgstr "Entrez les informations requises."
-
-#: src/Model/User.php:476
-#, php-format
-msgid ""
-"system.username_min_length (%s) and system.username_max_length (%s) are "
-"excluding each other, swapping values."
-msgstr ""
-
-#: src/Model/User.php:483
-#, php-format
-msgid "Username should be at least %s character."
-msgid_plural "Username should be at least %s characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Model/User.php:487
-#, php-format
-msgid "Username should be at most %s character."
-msgid_plural "Username should be at most %s characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Model/User.php:495
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "Ceci ne semble pas être votre nom complet (Prénom Nom)."
-
-#: src/Model/User.php:500
-msgid "Your email domain is not among those allowed on this site."
-msgstr "Votre domaine de courriel n'est pas autorisé sur ce site."
-
-#: src/Model/User.php:504
-msgid "Not a valid email address."
-msgstr "Ceci n'est pas une adresse courriel valide."
-
-#: src/Model/User.php:507
-msgid "The nickname was blocked from registration by the nodes admin."
-msgstr ""
-
-#: src/Model/User.php:511 src/Model/User.php:519
-msgid "Cannot use that email."
-msgstr "Impossible d'utiliser ce courriel."
-
-#: src/Model/User.php:526
-msgid "Your nickname can only contain a-z, 0-9 and _."
-msgstr ""
-
-#: src/Model/User.php:533 src/Model/User.php:590
-msgid "Nickname is already registered. Please choose another."
-msgstr "Pseudo déjà utilisé. Merci d'en choisir un autre."
-
-#: src/Model/User.php:543
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "ERREUR FATALE : La génération des clés de sécurité a échoué."
-
-#: src/Model/User.php:577 src/Model/User.php:581
-msgid "An error occurred during registration. Please try again."
-msgstr "Une erreur est survenue lors de l'inscription. Merci de recommencer."
-
-#: src/Model/User.php:601 view/theme/duepuntozero/config.php:55
+#: view/theme/duepuntozero/config.php:55 src/Model/User.php:684
 msgid "default"
 msgstr "défaut"
 
-#: src/Model/User.php:606
-msgid "An error occurred creating your default profile. Please try again."
-msgstr "Une erreur est survenue lors de la création de votre profil par défaut. Merci de recommencer."
-
-#: src/Model/User.php:613
-msgid "An error occurred creating your self contact. Please try again."
-msgstr ""
-
-#: src/Model/User.php:622
-msgid ""
-"An error occurred creating your default contact group. Please try again."
-msgstr ""
-
-#: src/Model/User.php:697
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tThank you for registering at %2$s. Your account is pending for approval by the administrator.\n"
-"\n"
-"\t\t\tYour login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t\t%4$s\n"
-"\t\t\tPassword:\t\t%5$s\n"
-"\t\t"
-msgstr ""
-
-#: src/Model/User.php:714
-#, php-format
-msgid "Registration at %s"
-msgstr ""
-
-#: src/Model/User.php:732
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
-"\t\t"
-msgstr ""
-
-#: src/Model/User.php:738
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t\t%1$s\n"
-"\t\t\tPassword:\t\t%5$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n"
-"\n"
-"\t\t\tThank you and welcome to %2$s."
-msgstr ""
-
-#: src/Module/Contact.php:171
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] "%d contact mis à jour."
-msgstr[1] "%d contacts mis à jour."
-
-#: src/Module/Contact.php:196 src/Module/Contact.php:379
-msgid "Could not access contact record."
-msgstr "Impossible d'accéder à l'enregistrement du contact."
-
-#: src/Module/Contact.php:206
-msgid "Could not locate selected profile."
-msgstr "Impossible de localiser le profil séléctionné."
-
-#: src/Module/Contact.php:238
-msgid "Contact updated."
-msgstr "Contact mis à jour."
-
-#: src/Module/Contact.php:400
-msgid "Contact has been blocked"
-msgstr "Le contact a été bloqué"
-
-#: src/Module/Contact.php:400
-msgid "Contact has been unblocked"
-msgstr "Le contact n'est plus bloqué"
-
-#: src/Module/Contact.php:410
-msgid "Contact has been ignored"
-msgstr "Le contact a été ignoré"
-
-#: src/Module/Contact.php:410
-msgid "Contact has been unignored"
-msgstr "Le contact n'est plus ignoré"
-
-#: src/Module/Contact.php:420
-msgid "Contact has been archived"
-msgstr "Contact archivé"
-
-#: src/Module/Contact.php:420
-msgid "Contact has been unarchived"
-msgstr "Contact désarchivé"
-
-#: src/Module/Contact.php:444
-msgid "Drop contact"
-msgstr "Supprimer contact"
-
-#: src/Module/Contact.php:447 src/Module/Contact.php:825
-msgid "Do you really want to delete this contact?"
-msgstr "Voulez-vous vraiment supprimer ce contact?"
-
-#: src/Module/Contact.php:461
-msgid "Contact has been removed."
-msgstr "Ce contact a été retiré."
-
-#: src/Module/Contact.php:492
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr "Vous êtes ami (et réciproquement) avec %s"
-
-#: src/Module/Contact.php:497
-#, php-format
-msgid "You are sharing with %s"
-msgstr "Vous partagez avec %s"
-
-#: src/Module/Contact.php:502
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s partage avec vous"
-
-#: src/Module/Contact.php:526
-msgid "Private communications are not available for this contact."
-msgstr "Les communications privées ne sont pas disponibles pour ce contact."
-
-#: src/Module/Contact.php:528
-msgid "Never"
-msgstr "Jamais"
-
-#: src/Module/Contact.php:531
-msgid "(Update was successful)"
-msgstr "(Mise à jour effectuée avec succès)"
-
-#: src/Module/Contact.php:531
-msgid "(Update was not successful)"
-msgstr "(Échec de la mise à jour)"
-
-#: src/Module/Contact.php:533 src/Module/Contact.php:1063
-msgid "Suggest friends"
-msgstr "Suggérer amitié/contact"
-
-#: src/Module/Contact.php:537
-#, php-format
-msgid "Network type: %s"
-msgstr "Type de réseau %s"
-
-#: src/Module/Contact.php:542
-msgid "Communications lost with this contact!"
-msgstr "Communications perdues avec ce contact !"
-
-#: src/Module/Contact.php:548
-msgid "Fetch further information for feeds"
-msgstr "Chercher plus d'informations pour les flux"
-
-#: src/Module/Contact.php:550
-msgid ""
-"Fetch information like preview pictures, title and teaser from the feed "
-"item. You can activate this if the feed doesn't contain much text. Keywords "
-"are taken from the meta header in the feed item and are posted as hash tags."
-msgstr ""
-
-#: src/Module/Contact.php:553
-msgid "Fetch information"
-msgstr "Récupérer informations"
-
-#: src/Module/Contact.php:554
-msgid "Fetch keywords"
-msgstr ""
-
-#: src/Module/Contact.php:555
-msgid "Fetch information and keywords"
-msgstr "Récupérer informations"
-
-#: src/Module/Contact.php:587
-msgid "Profile Visibility"
-msgstr "Visibilité du profil"
-
-#: src/Module/Contact.php:588
-msgid "Contact Information / Notes"
-msgstr "Informations de contact / Notes"
-
-#: src/Module/Contact.php:589
-msgid "Contact Settings"
-msgstr "Paramètres du Contact"
-
-#: src/Module/Contact.php:598
-msgid "Contact"
-msgstr "Contact"
-
-#: src/Module/Contact.php:602
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Merci de choisir le profil que vous souhaitez montrer à %s lorsqu'il vous rend visite de manière sécurisée."
-
-#: src/Module/Contact.php:604
-msgid "Their personal note"
-msgstr ""
-
-#: src/Module/Contact.php:606
-msgid "Edit contact notes"
-msgstr "Éditer les notes des contacts"
-
-#: src/Module/Contact.php:610
-msgid "Block/Unblock contact"
-msgstr "Bloquer/débloquer ce contact"
-
-#: src/Module/Contact.php:611
-msgid "Ignore contact"
-msgstr "Ignorer ce contact"
-
-#: src/Module/Contact.php:612
-msgid "Repair URL settings"
-msgstr "Réglages de réparation des URL"
-
-#: src/Module/Contact.php:613
-msgid "View conversations"
-msgstr "Voir les conversations"
-
-#: src/Module/Contact.php:618
-msgid "Last update:"
-msgstr "Dernière mise-à-jour :"
-
-#: src/Module/Contact.php:620
-msgid "Update public posts"
-msgstr "Mettre à jour les publications publiques:"
-
-#: src/Module/Contact.php:622 src/Module/Contact.php:1073
-msgid "Update now"
-msgstr "Mettre à jour"
-
-#: src/Module/Contact.php:628 src/Module/Contact.php:830
-#: src/Module/Contact.php:1090
-msgid "Unignore"
-msgstr "Ne plus ignorer"
-
-#: src/Module/Contact.php:632
-msgid "Currently blocked"
-msgstr "Actuellement bloqué"
-
-#: src/Module/Contact.php:633
-msgid "Currently ignored"
-msgstr "Actuellement ignoré"
-
-#: src/Module/Contact.php:634
-msgid "Currently archived"
-msgstr "Actuellement archivé"
-
-#: src/Module/Contact.php:635
-msgid "Awaiting connection acknowledge"
-msgstr ""
-
-#: src/Module/Contact.php:636
-msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
-msgstr "Les réponses et \"j'aime\" à vos publications publiques <strong>peuvent</strong> être toujours visibles"
-
-#: src/Module/Contact.php:637
-msgid "Notification for new posts"
-msgstr "Notification des nouvelles publications"
-
-#: src/Module/Contact.php:637
-msgid "Send a notification of every new post of this contact"
-msgstr "Envoyer une notification de chaque nouveau message en provenance de ce contact"
-
-#: src/Module/Contact.php:640
-msgid "Blacklisted keywords"
-msgstr "Mots-clés sur la liste noire"
-
-#: src/Module/Contact.php:640
-msgid ""
-"Comma separated list of keywords that should not be converted to hashtags, "
-"when \"Fetch information and keywords\" is selected"
-msgstr "Liste de mots-clés separés par des virgules qui ne doivent pas être converti en mots-dièse quand  « Récupérer informations et mots-clés » est sélectionné."
-
-#: src/Module/Contact.php:657
-msgid "Actions"
-msgstr "Actions"
-
-#: src/Module/Contact.php:703
-msgid "Suggestions"
-msgstr "Suggestions"
-
-#: src/Module/Contact.php:706
-msgid "Suggest potential friends"
-msgstr "Suggérer des amis potentiels"
-
-#: src/Module/Contact.php:714
-msgid "Show all contacts"
-msgstr "Montrer tous les contacts"
-
-#: src/Module/Contact.php:719
-msgid "Unblocked"
-msgstr "Non-bloqués"
-
-#: src/Module/Contact.php:722
-msgid "Only show unblocked contacts"
-msgstr "Ne montrer que les contacts non-bloqués"
-
-#: src/Module/Contact.php:727
-msgid "Blocked"
-msgstr "Bloqués"
-
-#: src/Module/Contact.php:730
-msgid "Only show blocked contacts"
-msgstr "Ne montrer que les contacts bloqués"
-
-#: src/Module/Contact.php:735
-msgid "Ignored"
-msgstr "Ignorés"
-
-#: src/Module/Contact.php:738
-msgid "Only show ignored contacts"
-msgstr "Ne montrer que les contacts ignorés"
-
-#: src/Module/Contact.php:743
-msgid "Archived"
-msgstr "Archivés"
-
-#: src/Module/Contact.php:746
-msgid "Only show archived contacts"
-msgstr "Ne montrer que les contacts archivés"
-
-#: src/Module/Contact.php:751
-msgid "Hidden"
-msgstr "Cachés"
-
-#: src/Module/Contact.php:754
-msgid "Only show hidden contacts"
-msgstr "Ne montrer que les contacts masqués"
-
-#: src/Module/Contact.php:762
-msgid "Organize your contact groups"
-msgstr ""
-
-#: src/Module/Contact.php:820
-msgid "Search your contacts"
-msgstr "Rechercher dans vos contacts"
-
-#: src/Module/Contact.php:831 src/Module/Contact.php:1099
-msgid "Archive"
-msgstr "Archiver"
-
-#: src/Module/Contact.php:831 src/Module/Contact.php:1099
-msgid "Unarchive"
-msgstr "Désarchiver"
-
-#: src/Module/Contact.php:834
-msgid "Batch Actions"
-msgstr "Actions multiples"
-
-#: src/Module/Contact.php:861
-msgid "Conversations started by this contact"
-msgstr ""
-
-#: src/Module/Contact.php:866
-msgid "Posts and Comments"
-msgstr ""
-
-#: src/Module/Contact.php:889
-msgid "View all contacts"
-msgstr "Voir tous les contacts"
-
-#: src/Module/Contact.php:900
-msgid "View all common friends"
-msgstr "Voir tous les amis communs"
-
-#: src/Module/Contact.php:910
-msgid "Advanced Contact Settings"
-msgstr "Réglages avancés du contact"
-
-#: src/Module/Contact.php:996
-msgid "Mutual Friendship"
-msgstr "Relation réciproque"
-
-#: src/Module/Contact.php:1001
-msgid "is a fan of yours"
-msgstr "Vous suit"
-
-#: src/Module/Contact.php:1006
-msgid "you are a fan of"
-msgstr "Vous le/la suivez"
-
-#: src/Module/Contact.php:1030
-msgid "Edit contact"
-msgstr "Éditer le contact"
-
-#: src/Module/Contact.php:1084
-msgid "Toggle Blocked status"
-msgstr "(dés)activer l'état \"bloqué\""
-
-#: src/Module/Contact.php:1092
-msgid "Toggle Ignored status"
-msgstr "(dés)activer l'état \"ignoré\""
-
-#: src/Module/Contact.php:1101
-msgid "Toggle Archive status"
-msgstr "(dés)activer l'état \"archivé\""
-
-#: src/Module/Contact.php:1109
-msgid "Delete contact"
-msgstr "Effacer ce contact"
-
-#: src/Module/Install.php:120
-msgid "Friendica Communications Server - Setup"
-msgstr ""
-
-#: src/Module/Install.php:131
-msgid "System check"
-msgstr "Vérifications système"
-
-#: src/Module/Install.php:136
-msgid "Check again"
-msgstr "Vérifier à nouveau"
-
-#: src/Module/Install.php:153
-msgid "Database connection"
-msgstr "Connexion à la base de données"
-
-#: src/Module/Install.php:154
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
-msgstr "Pour installer Friendica, nous avons besoin de savoir comment contacter votre base de données."
-
-#: src/Module/Install.php:155
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Merci de vous tourner vers votre hébergeur et/ou administrateur pour toute question concernant ces réglages."
-
-#: src/Module/Install.php:156
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "La base de données que vous spécifierez doit exister. Si ce n'est pas encore le cas, merci de la créer avant de continuer."
-
-#: src/Module/Install.php:159
-msgid "Database Server Name"
-msgstr "Serveur de base de données"
-
-#: src/Module/Install.php:164
-msgid "Database Login Name"
-msgstr "Nom d'utilisateur de la base"
-
-#: src/Module/Install.php:170
-msgid "Database Login Password"
-msgstr "Mot de passe de la base"
-
-#: src/Module/Install.php:172
-msgid "For security reasons the password must not be empty"
-msgstr "Pour des raisons de sécurité, le mot de passe ne peut pas être vide."
-
-#: src/Module/Install.php:175
-msgid "Database Name"
-msgstr "Nom de la base"
-
-#: src/Module/Install.php:180 src/Module/Install.php:216
-msgid "Site administrator email address"
-msgstr "Adresse électronique de l'administrateur du site"
-
-#: src/Module/Install.php:182 src/Module/Install.php:216
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "Votre adresse électronique doit correspondre à celle-ci pour pouvoir utiliser l'interface d'administration."
-
-#: src/Module/Install.php:186 src/Module/Install.php:217
-msgid "Please select a default timezone for your website"
-msgstr "Sélectionner un fuseau horaire par défaut pour votre site"
-
-#: src/Module/Install.php:210
-msgid "Site settings"
-msgstr "Réglages du site"
-
-#: src/Module/Install.php:219
-msgid "System Language:"
-msgstr "Langue système :"
-
-#: src/Module/Install.php:221
-msgid ""
-"Set the default language for your Friendica installation interface and to "
-"send emails."
-msgstr "Définit la langue par défaut pour l'interface de votre instance Friendica et les mails envoyés."
-
-#: src/Module/Install.php:233
-msgid "Your Friendica site database has been installed."
-msgstr "La base de données de votre site Friendica a bien été installée."
-
-#: src/Module/Install.php:241
-msgid "Installation finished"
-msgstr ""
-
-#: src/Module/Install.php:262
-msgid "<h1>What next</h1>"
-msgstr "<h1>Ensuite</h1>"
-
-#: src/Module/Install.php:263
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"worker."
-msgstr "IMPORTANT: vous devrez ajouter [manuellement] une tâche planifiée pour le 'worker'."
-
-#: src/Module/Install.php:266
-#, php-format
-msgid ""
-"Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
-"and register as new user. Remember to use the same email you have entered as"
-" administrator email. This will allow you to enter the site admin panel."
-msgstr ""
-
-#: src/Module/Itemsource.php:33
-msgid "Item Guid"
-msgstr ""
-
-#: src/Module/Login.php:292
-msgid "Create a New Account"
-msgstr "Créer un nouveau compte"
-
-#: src/Module/Login.php:325
-msgid "Password: "
-msgstr "Mot de passe : "
-
-#: src/Module/Login.php:326
-msgid "Remember me"
-msgstr "Se souvenir de moi"
-
-#: src/Module/Login.php:329
-msgid "Or login using OpenID: "
-msgstr "Ou connectez-vous via OpenID : "
-
-#: src/Module/Login.php:335
-msgid "Forgot your password?"
-msgstr "Mot de passe oublié?"
-
-#: src/Module/Login.php:338
-msgid "Website Terms of Service"
-msgstr "Conditions d'utilisation du site internet"
-
-#: src/Module/Login.php:339
-msgid "terms of service"
-msgstr "conditions d'utilisation"
-
-#: src/Module/Login.php:341
-msgid "Website Privacy Policy"
-msgstr "Politique de confidentialité du site internet"
-
-#: src/Module/Login.php:342
-msgid "privacy policy"
-msgstr "politique de confidentialité"
-
-#: src/Module/Logout.php:29
-msgid "Logged out."
-msgstr "Déconnecté."
-
-#: src/Module/Proxy.php:136
-msgid "Bad Request."
-msgstr ""
-
-#: src/Module/Tos.php:35 src/Module/Tos.php:75
-msgid ""
-"At the time of registration, and for providing communications between the "
-"user account and their contacts, the user has to provide a display name (pen"
-" name), an username (nickname) and a working email address. The names will "
-"be accessible on the profile page of the account by any visitor of the page,"
-" even if other profile details are not displayed. The email address will "
-"only be used to send the user notifications about interactions, but wont be "
-"visibly displayed. The listing of an account in the node's user directory or"
-" the global user directory is optional and can be controlled in the user "
-"settings, it is not necessary for communication."
-msgstr ""
-
-#: src/Module/Tos.php:36 src/Module/Tos.php:76
-msgid ""
-"This data is required for communication and is passed on to the nodes of the"
-" communication partners and is stored there. Users can enter additional "
-"private data that may be transmitted to the communication partners accounts."
-msgstr ""
-
-#: src/Module/Tos.php:37 src/Module/Tos.php:77
-#, php-format
-msgid ""
-"At any point in time a logged in user can export their account data from the"
-" <a href=\"%1$s/settings/uexport\">account settings</a>. If the user wants "
-"to delete their account they can do so at <a "
-"href=\"%1$s/removeme\">%1$s/removeme</a>. The deletion of the account will "
-"be permanent. Deletion of the data will also be requested from the nodes of "
-"the communication partners."
-msgstr ""
-
-#: src/Module/Tos.php:40 src/Module/Tos.php:74
-msgid "Privacy Statement"
-msgstr ""
-
-#: src/Object/Post.php:134
-msgid "This entry was edited"
-msgstr "Cette entrée a été éditée"
-
-#: src/Object/Post.php:197
-msgid "Delete locally"
-msgstr ""
-
-#: src/Object/Post.php:200
-msgid "Delete globally"
-msgstr ""
-
-#: src/Object/Post.php:200
-msgid "Remove locally"
-msgstr ""
-
-#: src/Object/Post.php:214
-msgid "save to folder"
-msgstr "sauver vers dossier"
-
-#: src/Object/Post.php:249
-msgid "I will attend"
-msgstr "Je vais participer"
-
-#: src/Object/Post.php:249
-msgid "I will not attend"
-msgstr "Je ne vais pas participer"
-
-#: src/Object/Post.php:249
-msgid "I might attend"
-msgstr "Je vais peut-être participer"
-
-#: src/Object/Post.php:277
-msgid "ignore thread"
-msgstr "ignorer le fil"
-
-#: src/Object/Post.php:278
-msgid "unignore thread"
-msgstr "Ne plus ignorer le fil"
-
-#: src/Object/Post.php:279
-msgid "toggle ignore status"
-msgstr "Ignorer le statut"
-
-#: src/Object/Post.php:290
-msgid "add star"
-msgstr "mettre en avant"
-
-#: src/Object/Post.php:291
-msgid "remove star"
-msgstr "ne plus mettre en avant"
-
-#: src/Object/Post.php:292
-msgid "toggle star status"
-msgstr "mettre en avant"
-
-#: src/Object/Post.php:295
-msgid "starred"
-msgstr "mis en avant"
-
-#: src/Object/Post.php:299
-msgid "add tag"
-msgstr "ajouter une étiquette"
-
-#: src/Object/Post.php:310
-msgid "like"
-msgstr "aime"
-
-#: src/Object/Post.php:311
-msgid "dislike"
-msgstr "n'aime pas"
-
-#: src/Object/Post.php:314
-msgid "Share this"
-msgstr "Partager"
-
-#: src/Object/Post.php:314
-msgid "share"
-msgstr "partager"
-
-#: src/Object/Post.php:381
-msgid "to"
-msgstr "à"
-
-#: src/Object/Post.php:382
-msgid "via"
-msgstr "via"
-
-#: src/Object/Post.php:383
-msgid "Wall-to-Wall"
-msgstr "Inter-mur"
-
-#: src/Object/Post.php:384
-msgid "via Wall-To-Wall:"
-msgstr "en Inter-mur :"
-
-#: src/Object/Post.php:444
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d commentaire"
-msgstr[1] "%d commentaires"
-
-#: src/Protocol/Diaspora.php:2434
-msgid "Sharing notification from Diaspora network"
-msgstr "Notification de partage du réseau Diaspora"
-
-#: src/Protocol/Diaspora.php:3528
-msgid "Attachments:"
-msgstr "Pièces jointes : "
-
-#: src/Protocol/OStatus.php:1839
-#, php-format
-msgid "%s is now following %s."
-msgstr "%s suit désormais %s."
-
-#: src/Protocol/OStatus.php:1840
-msgid "following"
-msgstr "following"
-
-#: src/Protocol/OStatus.php:1843
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%s ne suit plus %s."
-
-#: src/Protocol/OStatus.php:1844
-msgid "stopped following"
-msgstr "retiré de la liste de suivi"
-
-#: src/Util/Temporal.php:153
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "AAAA-MM-JJ ou MM-JJ"
-
-#: src/Util/Temporal.php:296
-msgid "never"
-msgstr "jamais"
-
-#: src/Util/Temporal.php:303
-msgid "less than a second ago"
-msgstr "il y a moins d'une seconde"
-
-#: src/Util/Temporal.php:311
-msgid "year"
-msgstr "an"
-
-#: src/Util/Temporal.php:311
-msgid "years"
-msgstr "ans"
-
-#: src/Util/Temporal.php:312
-msgid "months"
-msgstr "mois"
-
-#: src/Util/Temporal.php:313
-msgid "weeks"
-msgstr "semaines"
-
-#: src/Util/Temporal.php:314
-msgid "days"
-msgstr "jours"
-
-#: src/Util/Temporal.php:315
-msgid "hour"
-msgstr "heure"
-
-#: src/Util/Temporal.php:315
-msgid "hours"
-msgstr "heures"
-
-#: src/Util/Temporal.php:316
-msgid "minute"
-msgstr "minute"
-
-#: src/Util/Temporal.php:316
-msgid "minutes"
-msgstr "minutes"
-
-#: src/Util/Temporal.php:317
-msgid "second"
-msgstr "seconde"
-
-#: src/Util/Temporal.php:317
-msgid "seconds"
-msgstr "secondes"
-
-#: src/Util/Temporal.php:327
-#, php-format
-msgid "in %1$d %2$s"
-msgstr ""
-
-#: src/Util/Temporal.php:330
-#, php-format
-msgid "%1$d %2$s ago"
-msgstr "il y a %1$d %2$s "
-
-#: src/Worker/Delivery.php:433
-msgid "(no subject)"
-msgstr "(sans titre)"
-
-#: update.php:195
-#, php-format
-msgid "%s: Updating author-id and owner-id in item and thread table. "
-msgstr ""
-
-#: update.php:241
-#, php-format
-msgid "%s: Updating post-type."
-msgstr ""
-
 #: view/theme/duepuntozero/config.php:56
 msgid "greenzero"
 msgstr "greenzero"
@@ -9547,6 +6696,42 @@ msgstr "slackr"
 msgid "Variations"
 msgstr "Variations"
 
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
+msgstr "Bannière du haut"
+
+#: view/theme/frio/php/Image.php:24
+msgid ""
+"Resize image to the width of the screen and show background color below on "
+"long pages."
+msgstr "Redimensionner l'image à la largeur de l'écran et combler en dessous avec la couleur d'arrière plan."
+
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
+msgstr "Plein écran"
+
+#: view/theme/frio/php/Image.php:25
+msgid ""
+"Resize image to fill entire screen, clipping either the right or the bottom."
+msgstr "Agrandir l'image pour remplir l'écran, jusqu'à toucher le bord droit ou le bas de l'écran."
+
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
+msgstr "Mosaïque sur un rang"
+
+#: view/theme/frio/php/Image.php:26
+msgid ""
+"Resize image to repeat it on a single row, either vertical or horizontal."
+msgstr "Redimensionner l'image pour la dupliquer sur un seul rang, vertical ou horizontal."
+
+#: view/theme/frio/php/Image.php:27
+msgid "Mosaic"
+msgstr "Mosaïque"
+
+#: view/theme/frio/php/Image.php:27
+msgid "Repeat image to fill the screen."
+msgstr "Dupliquer l'image pour couvrir l'écran."
+
 #: view/theme/frio/config.php:103
 msgid "Custom"
 msgstr "Personnalisé"
@@ -9603,50 +6788,76 @@ msgstr "Couleur d'arrière-plan de la page de login"
 msgid "Leave background image and color empty for theme defaults"
 msgstr "Laisser l'image et la couleur de fond vides pour les paramètres par défaut du thème"
 
-#: view/theme/frio/php/Image.php:24
-msgid "Top Banner"
-msgstr "Bannière du haut"
-
-#: view/theme/frio/php/Image.php:24
-msgid ""
-"Resize image to the width of the screen and show background color below on "
-"long pages."
-msgstr "Redimensionner l'image à la largeur de l'écran et combler en dessous avec la couleur d'arrière plan."
-
-#: view/theme/frio/php/Image.php:25
-msgid "Full screen"
-msgstr "Plein écran"
-
-#: view/theme/frio/php/Image.php:25
-msgid ""
-"Resize image to fill entire screen, clipping either the right or the bottom."
-msgstr "Agrandir l'image pour remplir l'écran, jusqu'à toucher le bord droit ou le bas de l'écran."
-
-#: view/theme/frio/php/Image.php:26
-msgid "Single row mosaic"
-msgstr "Mosaïque sur un rang"
-
-#: view/theme/frio/php/Image.php:26
-msgid ""
-"Resize image to repeat it on a single row, either vertical or horizontal."
-msgstr "Redimensionner l'image pour la dupliquer sur un seul rang, vertical ou horizontal."
-
-#: view/theme/frio/php/Image.php:27
-msgid "Mosaic"
-msgstr "Mosaïque"
-
-#: view/theme/frio/php/Image.php:27
-msgid "Repeat image to fill the screen."
-msgstr "Dupliquer l'image pour couvrir l'écran."
-
-#: view/theme/frio/theme.php:252
+#: view/theme/frio/theme.php:239
 msgid "Guest"
 msgstr "Invité"
 
-#: view/theme/frio/theme.php:257
+#: view/theme/frio/theme.php:244
 msgid "Visitor"
 msgstr "Visiteur"
 
+#: view/theme/frio/theme.php:259 src/Content/Nav.php:153
+#: src/Module/Login.php:321
+msgid "Logout"
+msgstr "Se déconnecter"
+
+#: view/theme/frio/theme.php:259 src/Content/Nav.php:153
+msgid "End this session"
+msgstr "Mettre fin à cette session"
+
+#: view/theme/frio/theme.php:262 src/Content/Nav.php:156
+#: src/Model/Profile.php:901 src/Module/Contact.php:652
+#: src/Module/Contact.php:853
+msgid "Status"
+msgstr "Statut"
+
+#: view/theme/frio/theme.php:262 src/Content/Nav.php:156
+#: src/Content/Nav.php:242
+msgid "Your posts and conversations"
+msgstr "Vos publications et conversations"
+
+#: view/theme/frio/theme.php:263 src/Content/Nav.php:157
+msgid "Your profile page"
+msgstr "Votre page de profil"
+
+#: view/theme/frio/theme.php:264 src/Content/Nav.php:158
+msgid "Your photos"
+msgstr "Vos photos"
+
+#: view/theme/frio/theme.php:265 src/Content/Nav.php:159
+#: src/Model/Profile.php:925 src/Model/Profile.php:928
+msgid "Videos"
+msgstr "Vidéos"
+
+#: view/theme/frio/theme.php:265 src/Content/Nav.php:159
+msgid "Your videos"
+msgstr "Vos vidéos"
+
+#: view/theme/frio/theme.php:266 src/Content/Nav.php:160
+msgid "Your events"
+msgstr "Vos événements"
+
+#: view/theme/frio/theme.php:269 src/Content/Nav.php:239
+msgid "Conversations from your friends"
+msgstr "Conversations de vos amis"
+
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:226
+#: src/Model/Profile.php:940 src/Model/Profile.php:951
+msgid "Events and Calendar"
+msgstr "Événements et agenda"
+
+#: view/theme/frio/theme.php:271 src/Content/Nav.php:252
+msgid "Private mail"
+msgstr "Messages privés"
+
+#: view/theme/frio/theme.php:272 src/Content/Nav.php:263
+msgid "Account settings"
+msgstr "Compte"
+
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:269
+msgid "Manage/edit friends and contacts"
+msgstr "Gérer/éditer les amitiés et contacts"
+
 #: view/theme/quattro/config.php:77
 msgid "Alignment"
 msgstr "Alignement"
@@ -9675,6 +6886,14 @@ msgstr "Taille de police des zones de texte"
 msgid "Comma separated list of helper forums"
 msgstr "Liste de forums d'aide, séparés par des virgules"
 
+#: view/theme/vier/config.php:116 src/Core/ACL.php:301
+msgid "don't show"
+msgstr "cacher"
+
+#: view/theme/vier/config.php:116 src/Core/ACL.php:300
+msgid "show"
+msgstr "montrer"
+
 #: view/theme/vier/config.php:123
 msgid "Set style"
 msgstr "Définir le style"
@@ -9691,7 +6910,7 @@ msgstr "Profils communautaires"
 msgid "Help or @NewHere ?"
 msgstr "Aide ou @NewHere?"
 
-#: view/theme/vier/config.php:127 view/theme/vier/theme.php:388
+#: view/theme/vier/config.php:127 view/theme/vier/theme.php:373
 msgid "Connect Services"
 msgstr "Connecter des services"
 
@@ -9703,6 +6922,2983 @@ msgstr "Trouver des amis"
 msgid "Last users"
 msgstr "Derniers utilisateurs"
 
-#: view/theme/vier/theme.php:291
+#: view/theme/vier/theme.php:199 src/Content/Widget.php:61
+msgid "Find People"
+msgstr "Trouver des personnes"
+
+#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
+msgid "Enter name or interest"
+msgstr "Entrez un nom ou un centre d'intérêt"
+
+#: view/theme/vier/theme.php:202 src/Content/Widget.php:64
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Exemples : Robert Morgenstein, Pêche"
+
+#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
+msgid "Similar Interests"
+msgstr "Intérêts similaires"
+
+#: view/theme/vier/theme.php:206 src/Content/Widget.php:68
+msgid "Random Profile"
+msgstr "Profil au hasard"
+
+#: view/theme/vier/theme.php:207 src/Content/Widget.php:69
+msgid "Invite Friends"
+msgstr "Inviter des amis"
+
+#: view/theme/vier/theme.php:210 src/Content/Widget.php:72
+msgid "Local Directory"
+msgstr "Annuaire local"
+
+#: view/theme/vier/theme.php:250 src/Content/Text/HTML.php:914
+#: src/Content/ForumManager.php:130 src/Content/Nav.php:207
+msgid "Forums"
+msgstr "Forums"
+
+#: view/theme/vier/theme.php:252 src/Content/ForumManager.php:132
+msgid "External link to forum"
+msgstr "Lien sortant vers le forum"
+
+#: view/theme/vier/theme.php:288
 msgid "Quick Start"
 msgstr "Démarrage rapide"
+
+#: src/Core/Console/ArchiveContact.php:65
+#, php-format
+msgid "Could not find any unarchived contact entry for this URL (%s)"
+msgstr ""
+
+#: src/Core/Console/ArchiveContact.php:70
+msgid "The contact entries have been archived"
+msgstr ""
+
+#: src/Core/Console/NewPassword.php:72
+msgid "Enter new password: "
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:50
+#, php-format
+msgid "Post update version number has been set to %s."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:58
+msgid "Check for pending update actions."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:60
+msgid "Done."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:62
+msgid "Execute pending post updates."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:68
+msgid "All pending post updates are done."
+msgstr ""
+
+#: src/Core/ACL.php:287
+msgid "Post to Email"
+msgstr "Publier aux courriels"
+
+#: src/Core/ACL.php:293
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Cacher les détails du profil aux visiteurs inconnus?"
+
+#: src/Core/ACL.php:292
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr "Les connecteurs sont désactivés parce que \"%s\" est activé."
+
+#: src/Core/ACL.php:299
+msgid "Visible to everybody"
+msgstr "Visible par tout le monde"
+
+#: src/Core/ACL.php:311
+msgid "Close"
+msgstr "Fermer"
+
+#: src/Core/Authentication.php:87
+msgid "Welcome "
+msgstr "Bienvenue "
+
+#: src/Core/Authentication.php:88
+msgid "Please upload a profile photo."
+msgstr "Merci d'illustrer votre profil d'une image."
+
+#: src/Core/Authentication.php:90
+msgid "Welcome back "
+msgstr "Bienvenue à nouveau, "
+
+#: src/Core/Installer.php:162
+msgid ""
+"The database configuration file \"config/local.config.php\" could not be "
+"written. Please use the enclosed text to create a configuration file in your"
+" web server root."
+msgstr ""
+
+#: src/Core/Installer.php:181
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Vous pourriez avoir besoin d'importer le fichier \"database.sql\" manuellement au moyen de phpmyadmin ou de la commande mysql."
+
+#: src/Core/Installer.php:182 src/Module/Install.php:132
+#: src/Module/Install.php:263
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Référez-vous au fichier \"INSTALL.txt\"."
+
+#: src/Core/Installer.php:243
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH du serveur web."
+
+#: src/Core/Installer.php:244
+msgid ""
+"If you don't have a command line version of PHP installed on your server, "
+"you will not be able to run the background processing. See <a "
+"href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
+"up-the-worker'>'Setup the worker'</a>"
+msgstr ""
+
+#: src/Core/Installer.php:248
+msgid "PHP executable path"
+msgstr "Chemin vers l'exécutable de PHP"
+
+#: src/Core/Installer.php:248
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Entrez le chemin (absolu) vers l'exécutable 'php'. Vous pouvez laisser cette ligne vide pour continuer l'installation."
+
+#: src/Core/Installer.php:253
+msgid "Command line PHP"
+msgstr "Version \"ligne de commande\" de PHP"
+
+#: src/Core/Installer.php:262
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+msgstr "L'executable PHP n'est pas le binaire php client (c'est peut être la version cgi-fcgi)"
+
+#: src/Core/Installer.php:263
+msgid "Found PHP version: "
+msgstr "Version de PHP :"
+
+#: src/Core/Installer.php:265
+msgid "PHP cli binary"
+msgstr "PHP cli binary"
+
+#: src/Core/Installer.php:278
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "La version \"ligne de commande\" de PHP de votre système n'a pas \"register_argc_argv\" d'activé."
+
+#: src/Core/Installer.php:279
+msgid "This is required for message delivery to work."
+msgstr "Ceci est requis pour que la livraison des messages fonctionne."
+
+#: src/Core/Installer.php:284
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
+
+#: src/Core/Installer.php:316
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Erreur: la fonction \"openssl_pkey_new\" de ce système ne permet pas de générer des clés de chiffrement"
+
+#: src/Core/Installer.php:317
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Si vous utilisez Windows, merci de vous réferer à \"http://www.php.net/manual/en/openssl.installation.php\"."
+
+#: src/Core/Installer.php:320
+msgid "Generate encryption keys"
+msgstr "Générer les clés de chiffrement"
+
+#: src/Core/Installer.php:371
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Erreur : Le module \"rewrite\" du serveur web Apache est requis mais pas installé."
+
+#: src/Core/Installer.php:376
+msgid "Apache mod_rewrite module"
+msgstr "Module mod_rewrite Apache"
+
+#: src/Core/Installer.php:382
+msgid "Error: PDO or MySQLi PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:387
+msgid "Error: The MySQL driver for PDO is not installed."
+msgstr ""
+
+#: src/Core/Installer.php:391
+msgid "PDO or MySQLi PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:399
+msgid "Error, XML PHP module required but not installed."
+msgstr "Erreur : le module PHP XML requis est absent."
+
+#: src/Core/Installer.php:403
+msgid "XML PHP module"
+msgstr "Module PHP XML"
+
+#: src/Core/Installer.php:406
+msgid "libCurl PHP module"
+msgstr "Module libCurl de PHP"
+
+#: src/Core/Installer.php:407
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Erreur : Le module PHP \"libCURL\" est requis mais pas installé."
+
+#: src/Core/Installer.php:413
+msgid "GD graphics PHP module"
+msgstr "Module GD (graphiques) de PHP"
+
+#: src/Core/Installer.php:414
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Erreur : Le module PHP \"GD\" disposant du support JPEG est requis mais pas installé."
+
+#: src/Core/Installer.php:420
+msgid "OpenSSL PHP module"
+msgstr "Module OpenSSL de PHP"
+
+#: src/Core/Installer.php:421
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Erreur : Le module PHP \"openssl\" est requis mais pas installé."
+
+#: src/Core/Installer.php:427
+msgid "mb_string PHP module"
+msgstr "Module mb_string de PHP"
+
+#: src/Core/Installer.php:428
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Erreur : le module PHP mb_string est requis mais pas installé."
+
+#: src/Core/Installer.php:434
+msgid "iconv PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:435
+msgid "Error: iconv PHP module required but not installed."
+msgstr "Erreur : Le module PHP iconv requis est absent."
+
+#: src/Core/Installer.php:441
+msgid "POSIX PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:442
+msgid "Error: POSIX PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:448
+msgid "JSON PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:449
+msgid "Error: JSON PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:472
+msgid ""
+"The web installer needs to be able to create a file called "
+"\"local.config.php\" in the \"config\" folder of your web server and it is "
+"unable to do so."
+msgstr ""
+
+#: src/Core/Installer.php:473
+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 "Le plus souvent, il s'agit d'un problème de permission. Le serveur web peut ne pas être capable d'écrire dans votre répertoire - alors que vous-même le pouvez."
+
+#: src/Core/Installer.php:474
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named local.config.php in your Friendica \"config\" folder."
+msgstr ""
+
+#: src/Core/Installer.php:475
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"INSTALL.txt\" for instructions."
+msgstr "Vous pouvez également sauter cette étape et procéder à une installation manuelle. Pour cela, merci de lire le fichier \"INSTALL.txt\"."
+
+#: src/Core/Installer.php:478
+msgid "config/local.config.php is writable"
+msgstr ""
+
+#: src/Core/Installer.php:498
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Friendica utilise le moteur de modèles Smarty3 pour le rendu d'affichage web. Smarty3 compile les modèles en PHP pour accélérer le rendu."
+
+#: src/Core/Installer.php:499
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
+msgstr "Pour pouvoir stocker ces modèles compilés, le serveur internet doit avoir accès au droit d'écriture pour le répertoire view/smarty3/ sous le dossier racine de Friendica."
+
+#: src/Core/Installer.php:500
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Veuillez vous assurer que l'utilisateur qui exécute votre serveur internet (p. ex. www-data) détient le droit d'accès en écriture sur ce dossier."
+
+#: src/Core/Installer.php:501
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr "Note: pour plus de sécurité, vous devriez ne donner le droit d'accès en écriture qu'à view/smarty3/ et pas aux fichiers modèles (.tpl) qu'il contient."
+
+#: src/Core/Installer.php:504
+msgid "view/smarty3 is writable"
+msgstr "view/smarty3 est autorisé à l écriture"
+
+#: src/Core/Installer.php:533
+msgid ""
+"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist"
+" to .htaccess."
+msgstr ""
+
+#: src/Core/Installer.php:535
+msgid "Error message from Curl when fetching"
+msgstr ""
+
+#: src/Core/Installer.php:540
+msgid "Url rewrite is working"
+msgstr "La réécriture d'URL fonctionne."
+
+#: src/Core/Installer.php:569
+msgid "ImageMagick PHP extension is not installed"
+msgstr "L'extension PHP ImageMagick n'est pas installée"
+
+#: src/Core/Installer.php:571
+msgid "ImageMagick PHP extension is installed"
+msgstr "L’extension PHP ImageMagick est installée"
+
+#: src/Core/Installer.php:573 tests/src/Core/InstallerTest.php:329
+#: tests/src/Core/InstallerTest.php:355
+msgid "ImageMagick supports GIF"
+msgstr "ImageMagick supporte le format GIF"
+
+#: src/Core/Installer.php:595
+msgid "Could not connect to database."
+msgstr "Impossible de se connecter à la base."
+
+#: src/Core/Installer.php:602
+msgid "Database already in use."
+msgstr "Base de données déjà en cours d'utilisation."
+
+#: src/Core/L10n.php:368 src/Model/Event.php:398
+msgid "Tuesday"
+msgstr "Mardi"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:399
+msgid "Wednesday"
+msgstr "Mercredi"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:400
+msgid "Thursday"
+msgstr "Jeudi"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:401
+msgid "Friday"
+msgstr "Vendredi"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:402
+msgid "Saturday"
+msgstr "Samedi"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:417
+msgid "January"
+msgstr "Janvier"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:418
+msgid "February"
+msgstr "Février"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:419
+msgid "March"
+msgstr "Mars"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:420
+msgid "April"
+msgstr "Avril"
+
+#: src/Core/L10n.php:372 src/Core/L10n.php:391 src/Model/Event.php:408
+msgid "May"
+msgstr "Mai"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:421
+msgid "June"
+msgstr "Juin"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:422
+msgid "July"
+msgstr "Juillet"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:423
+msgid "August"
+msgstr "Août"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:424
+msgid "September"
+msgstr "Septembre"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:425
+msgid "October"
+msgstr "Octobre"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:426
+msgid "November"
+msgstr "Novembre"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:427
+msgid "December"
+msgstr "Décembre"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:389
+msgid "Mon"
+msgstr "Lun"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:390
+msgid "Tue"
+msgstr "Mar"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:391
+msgid "Wed"
+msgstr "Mer"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:392
+msgid "Thu"
+msgstr "Jeu"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:393
+msgid "Fri"
+msgstr "Ven"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:394
+msgid "Sat"
+msgstr "Sam"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:388
+msgid "Sun"
+msgstr "Dim"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:404
+msgid "Jan"
+msgstr "Jan"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:405
+msgid "Feb"
+msgstr "Fév"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:406
+msgid "Mar"
+msgstr "Mar"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:407
+msgid "Apr"
+msgstr "Avr"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:410
+msgid "Jul"
+msgstr "Jul"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:411
+msgid "Aug"
+msgstr "Aoû"
+
+#: src/Core/L10n.php:391
+msgid "Sep"
+msgstr ""
+
+#: src/Core/L10n.php:391 src/Model/Event.php:413
+msgid "Oct"
+msgstr "Oct"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:414
+msgid "Nov"
+msgstr "Nov"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:415
+msgid "Dec"
+msgstr "Déc"
+
+#: src/Core/L10n.php:410
+msgid "poke"
+msgstr "titiller"
+
+#: src/Core/L10n.php:410
+msgid "poked"
+msgstr "a titillé"
+
+#: src/Core/L10n.php:411
+msgid "ping"
+msgstr "attirer l'attention"
+
+#: src/Core/L10n.php:411
+msgid "pinged"
+msgstr "a attiré l'attention de"
+
+#: src/Core/L10n.php:412
+msgid "prod"
+msgstr "aiguillonner"
+
+#: src/Core/L10n.php:412
+msgid "prodded"
+msgstr "a aiguillonné"
+
+#: src/Core/L10n.php:413
+msgid "slap"
+msgstr "gifler"
+
+#: src/Core/L10n.php:413
+msgid "slapped"
+msgstr "a giflé"
+
+#: src/Core/L10n.php:414
+msgid "finger"
+msgstr "tripoter"
+
+#: src/Core/L10n.php:414
+msgid "fingered"
+msgstr "a tripoté"
+
+#: src/Core/L10n.php:415
+msgid "rebuff"
+msgstr "rabrouer"
+
+#: src/Core/L10n.php:415
+msgid "rebuffed"
+msgstr "a rabroué"
+
+#: src/Core/NotificationsManager.php:175
+msgid "System"
+msgstr "Système"
+
+#: src/Core/NotificationsManager.php:196 src/Content/Nav.php:180
+#: src/Content/Nav.php:242
+msgid "Home"
+msgstr "Profil"
+
+#: src/Core/NotificationsManager.php:203 src/Content/Nav.php:246
+msgid "Introductions"
+msgstr "Introductions"
+
+#: src/Core/NotificationsManager.php:265 src/Core/NotificationsManager.php:277
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s a commenté la publication de %s"
+
+#: src/Core/NotificationsManager.php:276
+#, php-format
+msgid "%s created a new post"
+msgstr "%s a créé une nouvelle publication"
+
+#: src/Core/NotificationsManager.php:290
+#, php-format
+msgid "%s liked %s's post"
+msgstr "%s a aimé la publication de %s"
+
+#: src/Core/NotificationsManager.php:303
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "%s n'a pas aimé la publication de %s"
+
+#: src/Core/NotificationsManager.php:316
+#, php-format
+msgid "%s is attending %s's event"
+msgstr "%s participe à l'événement de %s"
+
+#: src/Core/NotificationsManager.php:329
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s ne participe pas à l'événement de %s"
+
+#: src/Core/NotificationsManager.php:342
+#, php-format
+msgid "%s may attend %s's event"
+msgstr "%s participera peut-être à l'événement de %s"
+
+#: src/Core/NotificationsManager.php:375
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s est désormais ami(e) avec %s"
+
+#: src/Core/NotificationsManager.php:651
+msgid "Friend Suggestion"
+msgstr "Suggestion d'amitié/contact"
+
+#: src/Core/NotificationsManager.php:685
+msgid "Friend/Connect Request"
+msgstr "Demande de connexion/relation"
+
+#: src/Core/NotificationsManager.php:685
+msgid "New Follower"
+msgstr "Nouvel abonné"
+
+#: src/Core/System.php:137
+msgid "Error 400 - Bad Request"
+msgstr ""
+
+#: src/Core/System.php:138
+msgid "Error 401 - Unauthorized"
+msgstr ""
+
+#: src/Core/System.php:139
+msgid "Error 403 - Forbidden"
+msgstr ""
+
+#: src/Core/System.php:140
+msgid "Error 404 - Not Found"
+msgstr ""
+
+#: src/Core/System.php:141
+msgid "Error 500 - Internal Server Error"
+msgstr ""
+
+#: src/Core/System.php:142
+msgid "Error 503 - Service Unavailable"
+msgstr ""
+
+#: src/Core/System.php:150
+msgid ""
+"The server cannot or will not process the request due to an apparent client "
+"error."
+msgstr ""
+
+#: src/Core/System.php:151
+msgid ""
+"Authentication is required and has failed or has not yet been provided."
+msgstr ""
+
+#: src/Core/System.php:152
+msgid ""
+"The request was valid, but the server is refusing action. The user might not"
+" have the necessary permissions for a resource, or may need an account."
+msgstr ""
+
+#: src/Core/System.php:153
+msgid ""
+"The requested resource could not be found but may be available in the "
+"future."
+msgstr ""
+
+#: src/Core/System.php:154
+msgid ""
+"An unexpected condition was encountered and no more specific message is "
+"suitable."
+msgstr ""
+
+#: src/Core/System.php:155
+msgid ""
+"The server is currently unavailable (because it is overloaded or down for "
+"maintenance). Please try again later."
+msgstr ""
+
+#: src/Core/Update.php:168
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "Mise-à-jour %s échouée. Voir les journaux d'erreur."
+
+#: src/Core/Update.php:225
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
+msgstr ""
+
+#: src/Core/Update.php:231
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "Le message d’erreur est\n[pre]%s[/pre]"
+
+#: src/Core/Update.php:260
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
+msgstr ""
+
+#: src/Core/UserImport.php:103
+msgid "Error decoding account file"
+msgstr "Une erreur a été détecté en décodant un fichier utilisateur"
+
+#: src/Core/UserImport.php:109
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Erreur ! Pas de ficher de version existant ! Êtes vous sur un compte Friendica ?"
+
+#: src/Core/UserImport.php:117
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "L'utilisateur '%s' existe déjà sur ce serveur!"
+
+#: src/Core/UserImport.php:153
+msgid "User creation error"
+msgstr "Erreur de création d'utilisateur"
+
+#: src/Core/UserImport.php:171
+msgid "User profile creation error"
+msgstr "Erreur de création du profil utilisateur"
+
+#: src/Core/UserImport.php:215
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d contacts non importés"
+msgstr[1] "%d contacts non importés"
+
+#: src/Core/UserImport.php:280
+msgid "Done. You can now login with your username and password"
+msgstr "Action réalisée. Vous pouvez désormais vous connecter avec votre nom d'utilisateur et votre mot de passe"
+
+#: src/Util/Temporal.php:147 src/Model/Profile.php:771
+msgid "Birthday:"
+msgstr "Anniversaire :"
+
+#: src/Util/Temporal.php:151
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "AAAA-MM-JJ ou MM-JJ"
+
+#: src/Util/Temporal.php:298
+msgid "never"
+msgstr "jamais"
+
+#: src/Util/Temporal.php:305
+msgid "less than a second ago"
+msgstr "il y a moins d'une seconde"
+
+#: src/Util/Temporal.php:313
+msgid "year"
+msgstr "an"
+
+#: src/Util/Temporal.php:313
+msgid "years"
+msgstr "ans"
+
+#: src/Util/Temporal.php:314
+msgid "months"
+msgstr "mois"
+
+#: src/Util/Temporal.php:315
+msgid "weeks"
+msgstr "semaines"
+
+#: src/Util/Temporal.php:316
+msgid "days"
+msgstr "jours"
+
+#: src/Util/Temporal.php:317
+msgid "hour"
+msgstr "heure"
+
+#: src/Util/Temporal.php:317
+msgid "hours"
+msgstr "heures"
+
+#: src/Util/Temporal.php:318
+msgid "minute"
+msgstr "minute"
+
+#: src/Util/Temporal.php:318
+msgid "minutes"
+msgstr "minutes"
+
+#: src/Util/Temporal.php:319
+msgid "second"
+msgstr "seconde"
+
+#: src/Util/Temporal.php:319
+msgid "seconds"
+msgstr "secondes"
+
+#: src/Util/Temporal.php:329
+#, php-format
+msgid "in %1$d %2$s"
+msgstr ""
+
+#: src/Util/Temporal.php:332
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr "il y a %1$d %2$s "
+
+#: src/Content/Text/BBCode.php:429
+msgid "view full size"
+msgstr "voir en pleine taille"
+
+#: src/Content/Text/BBCode.php:863 src/Content/Text/BBCode.php:1596
+#: src/Content/Text/BBCode.php:1597
+msgid "Image/photo"
+msgstr "Image/photo"
+
+#: src/Content/Text/BBCode.php:967
+#, php-format
+msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+
+#: src/Content/Text/BBCode.php:1523 src/Content/Text/BBCode.php:1545
+msgid "$1 wrote:"
+msgstr "$1 a écrit :"
+
+#: src/Content/Text/BBCode.php:1607 src/Content/Text/BBCode.php:1608
+msgid "Encrypted content"
+msgstr "Contenu chiffré"
+
+#: src/Content/Text/BBCode.php:1715
+msgid "Invalid source protocol"
+msgstr ""
+
+#: src/Content/Text/BBCode.php:1726
+msgid "Invalid link protocol"
+msgstr ""
+
+#: src/Content/Text/HTML.php:800
+msgid "Loading more entries..."
+msgstr "Chargement de résultats supplémentaires..."
+
+#: src/Content/Text/HTML.php:801
+msgid "The end"
+msgstr "Fin"
+
+#: src/Content/Text/HTML.php:894
+msgid "Follow"
+msgstr "S'abonner"
+
+#: src/Content/Text/HTML.php:903 src/Content/Nav.php:79
+msgid "@name, !forum, #tags, content"
+msgstr "@nom, !forum, #tags, contenu"
+
+#: src/Content/Text/HTML.php:909 src/Content/Nav.php:201
+msgid "Full Text"
+msgstr "Texte Entier"
+
+#: src/Content/Text/HTML.php:910 src/Content/Widget/TagCloud.php:54
+#: src/Content/Nav.php:202
+msgid "Tags"
+msgstr "Tags"
+
+#: src/Content/Text/HTML.php:951 src/Model/Item.php:3485
+#: src/Model/Item.php:3496
+msgid "Click to open/close"
+msgstr "Cliquer pour ouvrir/fermer"
+
+#: src/Content/Widget/CalendarExport.php:64
+msgid "Export"
+msgstr "Exporter"
+
+#: src/Content/Widget/CalendarExport.php:65
+msgid "Export calendar as ical"
+msgstr "Exporter au format iCal"
+
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export calendar as csv"
+msgstr "Exporter au format CSV"
+
+#: src/Content/Widget/ContactBlock.php:58
+msgid "No contacts"
+msgstr "Aucun contact"
+
+#: src/Content/Widget/ContactBlock.php:90
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d contact"
+msgstr[1] "%d contacts"
+
+#: src/Content/Widget/ContactBlock.php:109
+msgid "View Contacts"
+msgstr "Voir les contacts"
+
+#: src/Content/ContactSelector.php:58
+msgid "Frequently"
+msgstr ""
+
+#: src/Content/ContactSelector.php:59
+msgid "Hourly"
+msgstr ""
+
+#: src/Content/ContactSelector.php:60
+msgid "Twice daily"
+msgstr ""
+
+#: src/Content/ContactSelector.php:61
+msgid "Daily"
+msgstr ""
+
+#: src/Content/ContactSelector.php:62
+msgid "Weekly"
+msgstr ""
+
+#: src/Content/ContactSelector.php:63
+msgid "Monthly"
+msgstr ""
+
+#: src/Content/ContactSelector.php:83
+msgid "DFRN"
+msgstr ""
+
+#: src/Content/ContactSelector.php:84
+msgid "OStatus"
+msgstr ""
+
+#: src/Content/ContactSelector.php:85
+msgid "RSS/Atom"
+msgstr ""
+
+#: src/Content/ContactSelector.php:88
+msgid "Zot!"
+msgstr ""
+
+#: src/Content/ContactSelector.php:89
+msgid "LinkedIn"
+msgstr ""
+
+#: src/Content/ContactSelector.php:90
+msgid "XMPP/IM"
+msgstr ""
+
+#: src/Content/ContactSelector.php:91
+msgid "MySpace"
+msgstr ""
+
+#: src/Content/ContactSelector.php:92
+msgid "Google+"
+msgstr ""
+
+#: src/Content/ContactSelector.php:93
+msgid "pump.io"
+msgstr ""
+
+#: src/Content/ContactSelector.php:94
+msgid "Twitter"
+msgstr ""
+
+#: src/Content/ContactSelector.php:95
+msgid "Diaspora Connector"
+msgstr ""
+
+#: src/Content/ContactSelector.php:96
+msgid "GNU Social Connector"
+msgstr ""
+
+#: src/Content/ContactSelector.php:97
+msgid "ActivityPub"
+msgstr ""
+
+#: src/Content/ContactSelector.php:98
+msgid "pnut"
+msgstr ""
+
+#: src/Content/ContactSelector.php:154
+msgid "Male"
+msgstr ""
+
+#: src/Content/ContactSelector.php:155
+msgid "Female"
+msgstr ""
+
+#: src/Content/ContactSelector.php:156
+msgid "Currently Male"
+msgstr ""
+
+#: src/Content/ContactSelector.php:157
+msgid "Currently Female"
+msgstr ""
+
+#: src/Content/ContactSelector.php:158
+msgid "Mostly Male"
+msgstr ""
+
+#: src/Content/ContactSelector.php:159
+msgid "Mostly Female"
+msgstr ""
+
+#: src/Content/ContactSelector.php:160
+msgid "Transgender"
+msgstr ""
+
+#: src/Content/ContactSelector.php:161
+msgid "Intersex"
+msgstr ""
+
+#: src/Content/ContactSelector.php:162
+msgid "Transsexual"
+msgstr ""
+
+#: src/Content/ContactSelector.php:163
+msgid "Hermaphrodite"
+msgstr ""
+
+#: src/Content/ContactSelector.php:164
+msgid "Neuter"
+msgstr ""
+
+#: src/Content/ContactSelector.php:165
+msgid "Non-specific"
+msgstr "Non-spécifique"
+
+#: src/Content/ContactSelector.php:166
+msgid "Other"
+msgstr "Autre"
+
+#: src/Content/ContactSelector.php:194
+msgid "Males"
+msgstr "Hommes"
+
+#: src/Content/ContactSelector.php:195
+msgid "Females"
+msgstr "Femmes"
+
+#: src/Content/ContactSelector.php:196
+msgid "Gay"
+msgstr "Gay"
+
+#: src/Content/ContactSelector.php:197
+msgid "Lesbian"
+msgstr "Lesbienne"
+
+#: src/Content/ContactSelector.php:198
+msgid "No Preference"
+msgstr "Sans préférence"
+
+#: src/Content/ContactSelector.php:199
+msgid "Bisexual"
+msgstr "Bisexuel"
+
+#: src/Content/ContactSelector.php:200
+msgid "Autosexual"
+msgstr "Auto-sexuel"
+
+#: src/Content/ContactSelector.php:201
+msgid "Abstinent"
+msgstr "Abstinent"
+
+#: src/Content/ContactSelector.php:202
+msgid "Virgin"
+msgstr "Vierge"
+
+#: src/Content/ContactSelector.php:203
+msgid "Deviant"
+msgstr "Déviant"
+
+#: src/Content/ContactSelector.php:204
+msgid "Fetish"
+msgstr "Fétichiste"
+
+#: src/Content/ContactSelector.php:205
+msgid "Oodles"
+msgstr "Oodles"
+
+#: src/Content/ContactSelector.php:206
+msgid "Nonsexual"
+msgstr "Non-sexuel"
+
+#: src/Content/ContactSelector.php:232
+msgid "Single"
+msgstr "Célibataire"
+
+#: src/Content/ContactSelector.php:233
+msgid "Lonely"
+msgstr "Esseulé"
+
+#: src/Content/ContactSelector.php:234
+msgid "Available"
+msgstr "Disponible"
+
+#: src/Content/ContactSelector.php:235
+msgid "Unavailable"
+msgstr "Indisponible"
+
+#: src/Content/ContactSelector.php:236
+msgid "Has crush"
+msgstr "Attiré par quelqu'un"
+
+#: src/Content/ContactSelector.php:237
+msgid "Infatuated"
+msgstr "Entiché"
+
+#: src/Content/ContactSelector.php:238
+msgid "Dating"
+msgstr "Dans une relation"
+
+#: src/Content/ContactSelector.php:239
+msgid "Unfaithful"
+msgstr "Infidèle"
+
+#: src/Content/ContactSelector.php:240
+msgid "Sex Addict"
+msgstr "Accro au sexe"
+
+#: src/Content/ContactSelector.php:241 src/Model/User.php:701
+msgid "Friends"
+msgstr "Amis"
+
+#: src/Content/ContactSelector.php:242
+msgid "Friends/Benefits"
+msgstr "Amis par intérêt"
+
+#: src/Content/ContactSelector.php:243
+msgid "Casual"
+msgstr "Casual"
+
+#: src/Content/ContactSelector.php:244
+msgid "Engaged"
+msgstr "Fiancé"
+
+#: src/Content/ContactSelector.php:245
+msgid "Married"
+msgstr "Marié"
+
+#: src/Content/ContactSelector.php:246
+msgid "Imaginarily married"
+msgstr "Se croit marié"
+
+#: src/Content/ContactSelector.php:247
+msgid "Partners"
+msgstr "Partenaire"
+
+#: src/Content/ContactSelector.php:248
+msgid "Cohabiting"
+msgstr "En cohabitation"
+
+#: src/Content/ContactSelector.php:249
+msgid "Common law"
+msgstr "Marié \"de fait\"/\"sui juris\" (concubin)"
+
+#: src/Content/ContactSelector.php:250
+msgid "Happy"
+msgstr "Heureux"
+
+#: src/Content/ContactSelector.php:251
+msgid "Not looking"
+msgstr "Pas intéressé"
+
+#: src/Content/ContactSelector.php:252
+msgid "Swinger"
+msgstr "Échangiste"
+
+#: src/Content/ContactSelector.php:253
+msgid "Betrayed"
+msgstr "Trahi(e)"
+
+#: src/Content/ContactSelector.php:254
+msgid "Separated"
+msgstr "Séparé"
+
+#: src/Content/ContactSelector.php:255
+msgid "Unstable"
+msgstr "Instable"
+
+#: src/Content/ContactSelector.php:256
+msgid "Divorced"
+msgstr "Divorcé"
+
+#: src/Content/ContactSelector.php:257
+msgid "Imaginarily divorced"
+msgstr "Se croit divorcé"
+
+#: src/Content/ContactSelector.php:258
+msgid "Widowed"
+msgstr "Veuf/Veuve"
+
+#: src/Content/ContactSelector.php:259
+msgid "Uncertain"
+msgstr "Incertain"
+
+#: src/Content/ContactSelector.php:260
+msgid "It's complicated"
+msgstr "C'est compliqué"
+
+#: src/Content/ContactSelector.php:261
+msgid "Don't care"
+msgstr "S'en désintéresse"
+
+#: src/Content/ContactSelector.php:262
+msgid "Ask me"
+msgstr "Me demander"
+
+#: src/Content/Feature.php:82
+msgid "General Features"
+msgstr "Fonctions générales"
+
+#: src/Content/Feature.php:84
+msgid "Multiple Profiles"
+msgstr "Profils multiples"
+
+#: src/Content/Feature.php:84
+msgid "Ability to create multiple profiles"
+msgstr "Possibilité de créer plusieurs profils"
+
+#: src/Content/Feature.php:85
+msgid "Photo Location"
+msgstr "Lieu de prise de la photo"
+
+#: src/Content/Feature.php:85
+msgid ""
+"Photo metadata is normally stripped. This extracts the location (if present)"
+" prior to stripping metadata and links it to a map."
+msgstr "Les métadonnées des photos sont normalement retirées. Ceci permet de sauver l'emplacement (si présent) et de positionner la photo sur une carte."
+
+#: src/Content/Feature.php:86
+msgid "Export Public Calendar"
+msgstr "Exporter le Calendrier Public"
+
+#: src/Content/Feature.php:86
+msgid "Ability for visitors to download the public calendar"
+msgstr "Les visiteurs peuvent télécharger le calendrier public"
+
+#: src/Content/Feature.php:91
+msgid "Post Composition Features"
+msgstr "Caractéristiques de composition de publication"
+
+#: src/Content/Feature.php:92
+msgid "Auto-mention Forums"
+msgstr "Mentionner automatiquement les Forums"
+
+#: src/Content/Feature.php:92
+msgid ""
+"Add/remove mention when a forum page is selected/deselected in ACL window."
+msgstr "Ajoute/retire une mention quand une page forum est sélectionnée/désélectionnée lors du choix des destinataires d'une publication."
+
+#: src/Content/Feature.php:93
+msgid "Explicit Mentions"
+msgstr ""
+
+#: src/Content/Feature.php:93
+msgid ""
+"Add explicit mentions to comment box for manual control over who gets "
+"mentioned in replies."
+msgstr ""
+
+#: src/Content/Feature.php:98
+msgid "Network Sidebar"
+msgstr ""
+
+#: src/Content/Feature.php:99
+msgid "Ability to select posts by date ranges"
+msgstr "Capacité de sélectionner les publications par intervalles de dates"
+
+#: src/Content/Feature.php:100
+msgid "Protocol Filter"
+msgstr ""
+
+#: src/Content/Feature.php:100
+msgid "Enable widget to display Network posts only from selected protocols"
+msgstr ""
+
+#: src/Content/Feature.php:105
+msgid "Network Tabs"
+msgstr "Onglets Réseau"
+
+#: src/Content/Feature.php:106
+msgid "Network New Tab"
+msgstr "Nouvel onglet réseaux"
+
+#: src/Content/Feature.php:106
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+msgstr "Activer l'onglet pour afficher seulement les publications du réseau (dans les 12 dernières heures)"
+
+#: src/Content/Feature.php:107
+msgid "Network Shared Links Tab"
+msgstr "Onglet réseau partagé"
+
+#: src/Content/Feature.php:107
+msgid "Enable tab to display only Network posts with links in them"
+msgstr "Activer l'onglet pour afficher seulement les publications du réseau contenant des liens"
+
+#: src/Content/Feature.php:112
+msgid "Post/Comment Tools"
+msgstr "Outils de publication/commentaire"
+
+#: src/Content/Feature.php:113
+msgid "Post Categories"
+msgstr "Catégories des publications"
+
+#: src/Content/Feature.php:113
+msgid "Add categories to your posts"
+msgstr "Ajouter des catégories à vos publications"
+
+#: src/Content/Feature.php:118
+msgid "Advanced Profile Settings"
+msgstr "Paramètres Avancés du Profil"
+
+#: src/Content/Feature.php:119
+msgid "List Forums"
+msgstr "Liste des forums"
+
+#: src/Content/Feature.php:119
+msgid "Show visitors public community forums at the Advanced Profile Page"
+msgstr "Montrer les forums communautaires aux visiteurs sur la Page de profil avancé"
+
+#: src/Content/Feature.php:120
+msgid "Tag Cloud"
+msgstr ""
+
+#: src/Content/Feature.php:120
+msgid "Provide a personal tag cloud on your profile page"
+msgstr ""
+
+#: src/Content/Feature.php:121
+msgid "Display Membership Date"
+msgstr ""
+
+#: src/Content/Feature.php:121
+msgid "Display membership date in profile"
+msgstr ""
+
+#: src/Content/Nav.php:74
+msgid "Nothing new here"
+msgstr "Rien de neuf ici"
+
+#: src/Content/Nav.php:78
+msgid "Clear notifications"
+msgstr "Effacer les notifications"
+
+#: src/Content/Nav.php:161
+msgid "Personal notes"
+msgstr "Notes personnelles"
+
+#: src/Content/Nav.php:161
+msgid "Your personal notes"
+msgstr "Vos notes personnelles"
+
+#: src/Content/Nav.php:170
+msgid "Sign in"
+msgstr "Se connecter"
+
+#: src/Content/Nav.php:180
+msgid "Home Page"
+msgstr "Page d'accueil"
+
+#: src/Content/Nav.php:184 src/Module/Login.php:293
+#: src/Module/Register.php:136
+msgid "Register"
+msgstr "S'inscrire"
+
+#: src/Content/Nav.php:184
+msgid "Create an account"
+msgstr "Créer un compte"
+
+#: src/Content/Nav.php:190
+msgid "Help and documentation"
+msgstr "Aide et documentation"
+
+#: src/Content/Nav.php:194
+msgid "Apps"
+msgstr "Applications"
+
+#: src/Content/Nav.php:194
+msgid "Addon applications, utilities, games"
+msgstr "Applications supplémentaires, utilitaires, jeux"
+
+#: src/Content/Nav.php:198
+msgid "Search site content"
+msgstr "Rechercher dans le contenu du site"
+
+#: src/Content/Nav.php:222
+msgid "Community"
+msgstr "Communauté"
+
+#: src/Content/Nav.php:222
+msgid "Conversations on this and other servers"
+msgstr ""
+
+#: src/Content/Nav.php:229
+msgid "Directory"
+msgstr "Annuaire"
+
+#: src/Content/Nav.php:229
+msgid "People directory"
+msgstr "Annuaire des utilisateurs"
+
+#: src/Content/Nav.php:231
+msgid "Information about this friendica instance"
+msgstr "Information au sujet de cette instance de friendica"
+
+#: src/Content/Nav.php:234
+msgid "Terms of Service of this Friendica instance"
+msgstr ""
+
+#: src/Content/Nav.php:240
+msgid "Network Reset"
+msgstr "Réinitialiser le réseau"
+
+#: src/Content/Nav.php:240
+msgid "Load Network page with no filters"
+msgstr "Chargement des pages du réseau sans filtre"
+
+#: src/Content/Nav.php:246
+msgid "Friend Requests"
+msgstr "Demande d'amitié"
+
+#: src/Content/Nav.php:248
+msgid "See all notifications"
+msgstr "Voir toutes les notifications"
+
+#: src/Content/Nav.php:249
+msgid "Mark all system notifications seen"
+msgstr "Marquer toutes les notifications système comme 'vues'"
+
+#: src/Content/Nav.php:253
+msgid "Inbox"
+msgstr "Messages entrants"
+
+#: src/Content/Nav.php:254
+msgid "Outbox"
+msgstr "Messages sortants"
+
+#: src/Content/Nav.php:258
+msgid "Manage"
+msgstr "Gérer"
+
+#: src/Content/Nav.php:258
+msgid "Manage other pages"
+msgstr "Gérer les autres pages"
+
+#: src/Content/Nav.php:266
+msgid "Manage/Edit Profiles"
+msgstr "Gérer/Éditer les profiles"
+
+#: src/Content/Nav.php:274
+msgid "Site setup and configuration"
+msgstr "Démarrage et configuration du site"
+
+#: src/Content/Nav.php:277
+msgid "Navigation"
+msgstr "Navigation"
+
+#: src/Content/Nav.php:277
+msgid "Site map"
+msgstr "Carte du site"
+
+#: src/Content/OEmbed.php:256
+msgid "Embedding disabled"
+msgstr "Incorporation désactivée"
+
+#: src/Content/OEmbed.php:379
+msgid "Embedded content"
+msgstr "Contenu incorporé"
+
+#: src/Content/Pager.php:153
+msgid "newer"
+msgstr "Plus récent"
+
+#: src/Content/Pager.php:158
+msgid "older"
+msgstr "Plus ancien"
+
+#: src/Content/Pager.php:203
+msgid "prev"
+msgstr "précédent"
+
+#: src/Content/Pager.php:263
+msgid "last"
+msgstr "dernier"
+
+#: src/Content/Widget.php:35
+msgid "Add New Contact"
+msgstr "Ajouter un nouveau contact"
+
+#: src/Content/Widget.php:36
+msgid "Enter address or web location"
+msgstr "Entrez son adresse ou sa localisation web"
+
+#: src/Content/Widget.php:37
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Exemple : bob@example.com, http://example.com/barbara"
+
+#: src/Content/Widget.php:55
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitation disponible"
+msgstr[1] "%d invitations disponibles"
+
+#: src/Content/Widget.php:158
+msgid "Protocols"
+msgstr ""
+
+#: src/Content/Widget.php:161
+msgid "All Protocols"
+msgstr ""
+
+#: src/Content/Widget.php:198
+msgid "Saved Folders"
+msgstr "Dossiers sauvegardés"
+
+#: src/Content/Widget.php:201 src/Content/Widget.php:243
+msgid "Everything"
+msgstr "Tout"
+
+#: src/Content/Widget.php:240
+msgid "Categories"
+msgstr "Catégories"
+
+#: src/Content/Widget.php:324
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] "%d contact en commun"
+msgstr[1] "%d contacts en commun"
+
+#: src/Database/DBStructure.php:47
+msgid "There are no tables on MyISAM."
+msgstr ""
+
+#: src/Database/DBStructure.php:71
+#, php-format
+msgid ""
+"\n"
+"Error %d occurred during database update:\n"
+"%s\n"
+msgstr "\nErreur %d survenue durant la mise à jour de la base de données :\n%s\n"
+
+#: src/Database/DBStructure.php:74
+msgid "Errors encountered performing database changes: "
+msgstr ""
+
+#: src/Database/DBStructure.php:263
+#, php-format
+msgid "%s: Database update"
+msgstr ""
+
+#: src/Database/DBStructure.php:524
+#, php-format
+msgid "%s: updating %s table."
+msgstr ""
+
+#: src/Model/Contact.php:1037
+msgid "Drop Contact"
+msgstr "Supprimer le contact"
+
+#: src/Model/Contact.php:1509
+msgid "Organisation"
+msgstr ""
+
+#: src/Model/Contact.php:1513
+msgid "News"
+msgstr "Nouvelles"
+
+#: src/Model/Contact.php:1517
+msgid "Forum"
+msgstr "Forum"
+
+#: src/Model/Contact.php:1707
+msgid "Connect URL missing."
+msgstr "URL de connexion manquante."
+
+#: src/Model/Contact.php:1716
+msgid ""
+"The contact could not be added. Please check the relevant network "
+"credentials in your Settings -> Social Networks page."
+msgstr ""
+
+#: src/Model/Contact.php:1755
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Ce site n'est pas configuré pour dialoguer avec d'autres réseaux."
+
+#: src/Model/Contact.php:1756 src/Model/Contact.php:1769
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "Aucun protocole de communication ni aucun flux n'a pu être découvert."
+
+#: src/Model/Contact.php:1767
+msgid "The profile address specified does not provide adequate information."
+msgstr "L'adresse de profil indiquée ne fournit par les informations adéquates."
+
+#: src/Model/Contact.php:1772
+msgid "An author or name was not found."
+msgstr "Aucun auteur ou nom d'auteur n'a pu être trouvé."
+
+#: src/Model/Contact.php:1775
+msgid "No browser URL could be matched to this address."
+msgstr "Aucune URL de navigation ne correspond à cette adresse."
+
+#: src/Model/Contact.php:1778
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "Impossible de faire correspondre l'adresse d'identité en \"@\" avec un protocole connu ou un contact courriel."
+
+#: src/Model/Contact.php:1779
+msgid "Use mailto: in front of address to force email check."
+msgstr "Utilisez mailto: en face d'une adresse pour l'obliger à être reconnue comme courriel."
+
+#: src/Model/Contact.php:1785
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "L'adresse de profil spécifiée correspond à un réseau qui a été désactivé sur ce site."
+
+#: src/Model/Contact.php:1790
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Profil limité. Cette personne ne sera pas capable de recevoir des notifications directes/personnelles de votre part."
+
+#: src/Model/Contact.php:1843
+msgid "Unable to retrieve contact information."
+msgstr "Impossible de récupérer les informations du contact."
+
+#: src/Model/Event.php:61 src/Model/Event.php:78 src/Model/Event.php:436
+#: src/Model/Event.php:916
+msgid "Starts:"
+msgstr "Débute :"
+
+#: src/Model/Event.php:64 src/Model/Event.php:84 src/Model/Event.php:437
+#: src/Model/Event.php:920
+msgid "Finishes:"
+msgstr "Finit :"
+
+#: src/Model/Event.php:386
+msgid "all-day"
+msgstr "toute la journée"
+
+#: src/Model/Event.php:409
+msgid "Jun"
+msgstr "Jun"
+
+#: src/Model/Event.php:412
+msgid "Sept"
+msgstr "Sep"
+
+#: src/Model/Event.php:434
+msgid "No events to display"
+msgstr "Pas d'événement à afficher"
+
+#: src/Model/Event.php:562
+msgid "l, F j"
+msgstr "l, F j"
+
+#: src/Model/Event.php:593
+msgid "Edit event"
+msgstr "Editer l'événement"
+
+#: src/Model/Event.php:594
+msgid "Duplicate event"
+msgstr "Dupliquer l'événement"
+
+#: src/Model/Event.php:595
+msgid "Delete event"
+msgstr "Supprimer l'événement"
+
+#: src/Model/Event.php:627 src/Model/Item.php:3536 src/Model/Item.php:3543
+msgid "link to source"
+msgstr "lien original"
+
+#: src/Model/Event.php:849
+msgid "D g:i A"
+msgstr ""
+
+#: src/Model/Event.php:850
+msgid "g:i A"
+msgstr ""
+
+#: src/Model/Event.php:935 src/Model/Event.php:937
+msgid "Show map"
+msgstr "Montrer la carte"
+
+#: src/Model/Event.php:936
+msgid "Hide map"
+msgstr "Cacher la carte"
+
+#: src/Model/Event.php:1028
+#, php-format
+msgid "%s's birthday"
+msgstr "Anniversaire de %s's"
+
+#: src/Model/Event.php:1029
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Joyeux anniversaire, %s !"
+
+#: src/Model/FileTag.php:256
+msgid "Item filed"
+msgstr "Élément classé"
+
+#: src/Model/Group.php:43
+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 "Un groupe supprimé a été recréé. Les permissions existantes <strong>pourraient</strong> s'appliquer à ce groupe et aux futurs membres. Si ce n'est pas le comportement attendu, merci de re-créer un autre groupe sous un autre nom."
+
+#: src/Model/Group.php:338
+msgid "Default privacy group for new contacts"
+msgstr "Paramètres de confidentialité par défaut pour les nouveaux contacts"
+
+#: src/Model/Group.php:370
+msgid "Everybody"
+msgstr "Tout le monde"
+
+#: src/Model/Group.php:390
+msgid "edit"
+msgstr "éditer"
+
+#: src/Model/Group.php:419
+msgid "Edit group"
+msgstr "Editer groupe"
+
+#: src/Model/Group.php:422
+msgid "Create a new group"
+msgstr "Créer un nouveau groupe"
+
+#: src/Model/Group.php:424
+msgid "Edit groups"
+msgstr "Modifier les groupes"
+
+#: src/Model/Item.php:3269
+msgid "activity"
+msgstr "activité"
+
+#: src/Model/Item.php:3271 src/Object/Post.php:457 src/Object/Post.php:469
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] "commentaire"
+
+#: src/Model/Item.php:3274
+msgid "post"
+msgstr "publication"
+
+#: src/Model/Item.php:3373
+#, php-format
+msgid "Content warning: %s"
+msgstr "Avertissement de contenu: %s"
+
+#: src/Model/Item.php:3452
+msgid "bytes"
+msgstr "octets"
+
+#: src/Model/Item.php:3530
+msgid "View on separate page"
+msgstr "Voir dans une nouvelle page"
+
+#: src/Model/Item.php:3531
+msgid "view on separate page"
+msgstr "voir dans une nouvelle page"
+
+#: src/Model/Mail.php:40 src/Model/Mail.php:175
+msgid "[no subject]"
+msgstr "[pas de sujet]"
+
+#: src/Model/Profile.php:115
+msgid "Requested account is not available."
+msgstr "Le compte demandé n'est pas disponible."
+
+#: src/Model/Profile.php:133
+msgid "Requested profile is not available."
+msgstr "Le profil demandé n'est pas disponible."
+
+#: src/Model/Profile.php:181 src/Model/Profile.php:425
+#: src/Model/Profile.php:872
+msgid "Edit profile"
+msgstr "Editer le profil"
+
+#: src/Model/Profile.php:359
+msgid "Atom feed"
+msgstr "Flux Atom"
+
+#: src/Model/Profile.php:398
+msgid "Manage/edit profiles"
+msgstr "Gérer/éditer les profils"
+
+#: src/Model/Profile.php:450 src/Module/Contact.php:645
+msgid "XMPP:"
+msgstr "XMPP"
+
+#: src/Model/Profile.php:573 src/Model/Profile.php:671
+msgid "g A l F d"
+msgstr "g A | F d"
+
+#: src/Model/Profile.php:574
+msgid "F d"
+msgstr "F d"
+
+#: src/Model/Profile.php:636 src/Model/Profile.php:722
+msgid "[today]"
+msgstr "[aujourd'hui]"
+
+#: src/Model/Profile.php:647
+msgid "Birthday Reminders"
+msgstr "Rappels d'anniversaires"
+
+#: src/Model/Profile.php:648
+msgid "Birthdays this week:"
+msgstr "Anniversaires cette semaine :"
+
+#: src/Model/Profile.php:709
+msgid "[No description]"
+msgstr "[Sans description]"
+
+#: src/Model/Profile.php:736
+msgid "Event Reminders"
+msgstr "Rappels d'événements"
+
+#: src/Model/Profile.php:737
+msgid "Upcoming events the next 7 days:"
+msgstr ""
+
+#: src/Model/Profile.php:754
+msgid "Member since:"
+msgstr ""
+
+#: src/Model/Profile.php:762
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: src/Model/Profile.php:763
+msgid "j F"
+msgstr "j F"
+
+#: src/Model/Profile.php:778
+msgid "Age:"
+msgstr "Age :"
+
+#: src/Model/Profile.php:791
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "depuis %1$d %2$s"
+
+#: src/Model/Profile.php:815
+msgid "Religion:"
+msgstr "Religion :"
+
+#: src/Model/Profile.php:823
+msgid "Hobbies/Interests:"
+msgstr "Passe-temps/Centres d'intérêt :"
+
+#: src/Model/Profile.php:835
+msgid "Contact information and Social Networks:"
+msgstr "Coordonnées/Réseaux sociaux :"
+
+#: src/Model/Profile.php:839
+msgid "Musical interests:"
+msgstr "Goûts musicaux :"
+
+#: src/Model/Profile.php:843
+msgid "Books, literature:"
+msgstr "Lectures :"
+
+#: src/Model/Profile.php:847
+msgid "Television:"
+msgstr "Télévision :"
+
+#: src/Model/Profile.php:851
+msgid "Film/dance/culture/entertainment:"
+msgstr "Cinéma/Danse/Culture/Divertissement :"
+
+#: src/Model/Profile.php:855
+msgid "Love/Romance:"
+msgstr "Amour/Romance :"
+
+#: src/Model/Profile.php:859
+msgid "Work/employment:"
+msgstr "Activité professionnelle/Occupation :"
+
+#: src/Model/Profile.php:863
+msgid "School/education:"
+msgstr "Études/Formation :"
+
+#: src/Model/Profile.php:868
+msgid "Forums:"
+msgstr "Forums :"
+
+#: src/Model/Profile.php:912 src/Module/Contact.php:872
+msgid "Profile Details"
+msgstr "Détails du profil"
+
+#: src/Model/Profile.php:962
+msgid "Only You Can See This"
+msgstr "Vous seul pouvez voir ça"
+
+#: src/Model/Profile.php:970 src/Model/Profile.php:973
+msgid "Tips for New Members"
+msgstr "Conseils aux nouveaux venus"
+
+#: src/Model/Profile.php:1150
+#, php-format
+msgid "OpenWebAuth: %1$s welcomes %2$s"
+msgstr ""
+
+#: src/Model/Storage/Database.php:36
+#, php-format
+msgid "Database storage failed to update %s"
+msgstr ""
+
+#: src/Model/Storage/Database.php:43
+msgid "Database storage failed to insert data"
+msgstr ""
+
+#: src/Model/Storage/Filesystem.php:63
+#, php-format
+msgid "Filesystem storage failed to create \"%s\". Check you write permissions."
+msgstr ""
+
+#: src/Model/Storage/Filesystem.php:105
+#, php-format
+msgid ""
+"Filesystem storage failed to save data to \"%s\". Check your write "
+"permissions"
+msgstr ""
+
+#: src/Model/Storage/Filesystem.php:126
+msgid "Storage base path"
+msgstr ""
+
+#: src/Model/Storage/Filesystem.php:128
+msgid ""
+"Folder where uploaded files are saved. For maximum security, This should be "
+"a path outside web server folder tree"
+msgstr ""
+
+#: src/Model/Storage/Filesystem.php:138
+msgid "Enter a valid existing folder"
+msgstr ""
+
+#: src/Model/User.php:270
+msgid "Login failed"
+msgstr ""
+
+#: src/Model/User.php:301
+msgid "Not enough information to authenticate"
+msgstr ""
+
+#: src/Model/User.php:379
+msgid "Password can't be empty"
+msgstr ""
+
+#: src/Model/User.php:398
+msgid "Empty passwords are not allowed."
+msgstr ""
+
+#: src/Model/User.php:402
+msgid ""
+"The new password has been exposed in a public data dump, please choose "
+"another."
+msgstr ""
+
+#: src/Model/User.php:408
+msgid ""
+"The password can't contain accentuated letters, white spaces or colons (:)"
+msgstr ""
+
+#: src/Model/User.php:508
+msgid "Passwords do not match. Password unchanged."
+msgstr "Les mots de passe ne correspondent pas. Aucun changement appliqué."
+
+#: src/Model/User.php:515
+msgid "An invitation is required."
+msgstr "Une invitation est requise."
+
+#: src/Model/User.php:519
+msgid "Invitation could not be verified."
+msgstr "L'invitation fournie n'a pu être validée."
+
+#: src/Model/User.php:526
+msgid "Invalid OpenID url"
+msgstr "Adresse OpenID invalide"
+
+#: src/Model/User.php:539 src/Module/Login.php:106
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Nous avons eu un souci avec l'OpenID que vous avez fourni. Merci de vérifier qu'il est correctement écrit."
+
+#: src/Model/User.php:539 src/Module/Login.php:106
+msgid "The error message was:"
+msgstr "Le message d'erreur était :"
+
+#: src/Model/User.php:545
+msgid "Please enter the required information."
+msgstr "Entrez les informations requises."
+
+#: src/Model/User.php:559
+#, php-format
+msgid ""
+"system.username_min_length (%s) and system.username_max_length (%s) are "
+"excluding each other, swapping values."
+msgstr ""
+
+#: src/Model/User.php:566
+#, php-format
+msgid "Username should be at least %s character."
+msgid_plural "Username should be at least %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Model/User.php:570
+#, php-format
+msgid "Username should be at most %s character."
+msgid_plural "Username should be at most %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Model/User.php:578
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "Ceci ne semble pas être votre nom complet (Prénom Nom)."
+
+#: src/Model/User.php:583
+msgid "Your email domain is not among those allowed on this site."
+msgstr "Votre domaine de courriel n'est pas autorisé sur ce site."
+
+#: src/Model/User.php:587
+msgid "Not a valid email address."
+msgstr "Ceci n'est pas une adresse courriel valide."
+
+#: src/Model/User.php:590
+msgid "The nickname was blocked from registration by the nodes admin."
+msgstr ""
+
+#: src/Model/User.php:594 src/Model/User.php:602
+msgid "Cannot use that email."
+msgstr "Impossible d'utiliser ce courriel."
+
+#: src/Model/User.php:609
+msgid "Your nickname can only contain a-z, 0-9 and _."
+msgstr ""
+
+#: src/Model/User.php:616 src/Model/User.php:673
+msgid "Nickname is already registered. Please choose another."
+msgstr "Pseudo déjà utilisé. Merci d'en choisir un autre."
+
+#: src/Model/User.php:626
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "ERREUR FATALE : La génération des clés de sécurité a échoué."
+
+#: src/Model/User.php:660 src/Model/User.php:664
+msgid "An error occurred during registration. Please try again."
+msgstr "Une erreur est survenue lors de l'inscription. Merci de recommencer."
+
+#: src/Model/User.php:689
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Une erreur est survenue lors de la création de votre profil par défaut. Merci de recommencer."
+
+#: src/Model/User.php:696
+msgid "An error occurred creating your self contact. Please try again."
+msgstr ""
+
+#: src/Model/User.php:705
+msgid ""
+"An error occurred creating your default contact group. Please try again."
+msgstr ""
+
+#: src/Model/User.php:781
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tThank you for registering at %2$s. Your account is pending for approval by the administrator.\n"
+"\n"
+"\t\t\tYour login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t\t%4$s\n"
+"\t\t\tPassword:\t\t%5$s\n"
+"\t\t"
+msgstr ""
+
+#: src/Model/User.php:798
+#, php-format
+msgid "Registration at %s"
+msgstr ""
+
+#: src/Model/User.php:817
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
+"\t\t"
+msgstr ""
+
+#: src/Model/User.php:823
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t\t%1$s\n"
+"\t\t\tPassword:\t\t%5$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n"
+"\n"
+"\t\t\tThank you and welcome to %2$s."
+msgstr ""
+
+#: src/Protocol/Diaspora.php:2496
+msgid "Sharing notification from Diaspora network"
+msgstr "Notification de partage du réseau Diaspora"
+
+#: src/Protocol/Diaspora.php:3613
+msgid "Attachments:"
+msgstr "Pièces jointes : "
+
+#: src/Protocol/OStatus.php:1302 src/Module/Profile.php:102
+#: src/Module/Profile.php:105
+#, php-format
+msgid "%s's timeline"
+msgstr ""
+
+#: src/Protocol/OStatus.php:1306 src/Module/Profile.php:103
+#, php-format
+msgid "%s's posts"
+msgstr ""
+
+#: src/Protocol/OStatus.php:1309 src/Module/Profile.php:104
+#, php-format
+msgid "%s's comments"
+msgstr ""
+
+#: src/Protocol/OStatus.php:1866
+#, php-format
+msgid "%s is now following %s."
+msgstr "%s suit désormais %s."
+
+#: src/Protocol/OStatus.php:1867
+msgid "following"
+msgstr "following"
+
+#: src/Protocol/OStatus.php:1870
+#, php-format
+msgid "%s stopped following %s."
+msgstr "%s ne suit plus %s."
+
+#: src/Protocol/OStatus.php:1871
+msgid "stopped following"
+msgstr "retiré de la liste de suivi"
+
+#: src/Worker/Delivery.php:453
+msgid "(no subject)"
+msgstr "(sans titre)"
+
+#: src/Module/Attach.php:36 src/Module/Attach.php:48
+msgid "Item was not found."
+msgstr "Element introuvable."
+
+#: src/Module/Contact.php:166
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] "%d contact mis à jour."
+msgstr[1] "%d contacts mis à jour."
+
+#: src/Module/Contact.php:191 src/Module/Contact.php:374
+msgid "Could not access contact record."
+msgstr "Impossible d'accéder à l'enregistrement du contact."
+
+#: src/Module/Contact.php:201
+msgid "Could not locate selected profile."
+msgstr "Impossible de localiser le profil séléctionné."
+
+#: src/Module/Contact.php:233
+msgid "Contact updated."
+msgstr "Contact mis à jour."
+
+#: src/Module/Contact.php:395
+msgid "Contact has been blocked"
+msgstr "Le contact a été bloqué"
+
+#: src/Module/Contact.php:395
+msgid "Contact has been unblocked"
+msgstr "Le contact n'est plus bloqué"
+
+#: src/Module/Contact.php:405
+msgid "Contact has been ignored"
+msgstr "Le contact a été ignoré"
+
+#: src/Module/Contact.php:405
+msgid "Contact has been unignored"
+msgstr "Le contact n'est plus ignoré"
+
+#: src/Module/Contact.php:415
+msgid "Contact has been archived"
+msgstr "Contact archivé"
+
+#: src/Module/Contact.php:415
+msgid "Contact has been unarchived"
+msgstr "Contact désarchivé"
+
+#: src/Module/Contact.php:439
+msgid "Drop contact"
+msgstr "Supprimer contact"
+
+#: src/Module/Contact.php:442 src/Module/Contact.php:820
+msgid "Do you really want to delete this contact?"
+msgstr "Voulez-vous vraiment supprimer ce contact?"
+
+#: src/Module/Contact.php:456
+msgid "Contact has been removed."
+msgstr "Ce contact a été retiré."
+
+#: src/Module/Contact.php:486
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "Vous êtes ami (et réciproquement) avec %s"
+
+#: src/Module/Contact.php:491
+#, php-format
+msgid "You are sharing with %s"
+msgstr "Vous partagez avec %s"
+
+#: src/Module/Contact.php:496
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s partage avec vous"
+
+#: src/Module/Contact.php:520
+msgid "Private communications are not available for this contact."
+msgstr "Les communications privées ne sont pas disponibles pour ce contact."
+
+#: src/Module/Contact.php:522
+msgid "Never"
+msgstr "Jamais"
+
+#: src/Module/Contact.php:525
+msgid "(Update was successful)"
+msgstr "(Mise à jour effectuée avec succès)"
+
+#: src/Module/Contact.php:525
+msgid "(Update was not successful)"
+msgstr "(Échec de la mise à jour)"
+
+#: src/Module/Contact.php:527 src/Module/Contact.php:1058
+msgid "Suggest friends"
+msgstr "Suggérer amitié/contact"
+
+#: src/Module/Contact.php:531
+#, php-format
+msgid "Network type: %s"
+msgstr "Type de réseau %s"
+
+#: src/Module/Contact.php:536
+msgid "Communications lost with this contact!"
+msgstr "Communications perdues avec ce contact !"
+
+#: src/Module/Contact.php:542
+msgid "Fetch further information for feeds"
+msgstr "Chercher plus d'informations pour les flux"
+
+#: src/Module/Contact.php:544
+msgid ""
+"Fetch information like preview pictures, title and teaser from the feed "
+"item. You can activate this if the feed doesn't contain much text. Keywords "
+"are taken from the meta header in the feed item and are posted as hash tags."
+msgstr ""
+
+#: src/Module/Contact.php:547
+msgid "Fetch information"
+msgstr "Récupérer informations"
+
+#: src/Module/Contact.php:548
+msgid "Fetch keywords"
+msgstr ""
+
+#: src/Module/Contact.php:549
+msgid "Fetch information and keywords"
+msgstr "Récupérer informations"
+
+#: src/Module/Contact.php:581
+msgid "Profile Visibility"
+msgstr "Visibilité du profil"
+
+#: src/Module/Contact.php:582
+msgid "Contact Information / Notes"
+msgstr "Informations de contact / Notes"
+
+#: src/Module/Contact.php:583
+msgid "Contact Settings"
+msgstr "Paramètres du Contact"
+
+#: src/Module/Contact.php:592
+msgid "Contact"
+msgstr "Contact"
+
+#: src/Module/Contact.php:596
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Merci de choisir le profil que vous souhaitez montrer à %s lorsqu'il vous rend visite de manière sécurisée."
+
+#: src/Module/Contact.php:598
+msgid "Their personal note"
+msgstr ""
+
+#: src/Module/Contact.php:600
+msgid "Edit contact notes"
+msgstr "Éditer les notes des contacts"
+
+#: src/Module/Contact.php:604
+msgid "Block/Unblock contact"
+msgstr "Bloquer/débloquer ce contact"
+
+#: src/Module/Contact.php:605
+msgid "Ignore contact"
+msgstr "Ignorer ce contact"
+
+#: src/Module/Contact.php:606
+msgid "Repair URL settings"
+msgstr "Réglages de réparation des URL"
+
+#: src/Module/Contact.php:607
+msgid "View conversations"
+msgstr "Voir les conversations"
+
+#: src/Module/Contact.php:612
+msgid "Last update:"
+msgstr "Dernière mise-à-jour :"
+
+#: src/Module/Contact.php:614
+msgid "Update public posts"
+msgstr "Mettre à jour les publications publiques:"
+
+#: src/Module/Contact.php:616 src/Module/Contact.php:1068
+msgid "Update now"
+msgstr "Mettre à jour"
+
+#: src/Module/Contact.php:622 src/Module/Contact.php:825
+#: src/Module/Contact.php:1085
+msgid "Unignore"
+msgstr "Ne plus ignorer"
+
+#: src/Module/Contact.php:626
+msgid "Currently blocked"
+msgstr "Actuellement bloqué"
+
+#: src/Module/Contact.php:627
+msgid "Currently ignored"
+msgstr "Actuellement ignoré"
+
+#: src/Module/Contact.php:628
+msgid "Currently archived"
+msgstr "Actuellement archivé"
+
+#: src/Module/Contact.php:629
+msgid "Awaiting connection acknowledge"
+msgstr ""
+
+#: src/Module/Contact.php:630
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Les réponses et \"j'aime\" à vos publications publiques <strong>peuvent</strong> être toujours visibles"
+
+#: src/Module/Contact.php:631
+msgid "Notification for new posts"
+msgstr "Notification des nouvelles publications"
+
+#: src/Module/Contact.php:631
+msgid "Send a notification of every new post of this contact"
+msgstr "Envoyer une notification de chaque nouveau message en provenance de ce contact"
+
+#: src/Module/Contact.php:633
+msgid "Blacklisted keywords"
+msgstr "Mots-clés sur la liste noire"
+
+#: src/Module/Contact.php:633
+msgid ""
+"Comma separated list of keywords that should not be converted to hashtags, "
+"when \"Fetch information and keywords\" is selected"
+msgstr "Liste de mots-clés separés par des virgules qui ne doivent pas être converti en mots-dièse quand  « Récupérer informations et mots-clés » est sélectionné."
+
+#: src/Module/Contact.php:650
+msgid "Actions"
+msgstr "Actions"
+
+#: src/Module/Contact.php:696
+msgid "Suggestions"
+msgstr "Suggestions"
+
+#: src/Module/Contact.php:699
+msgid "Suggest potential friends"
+msgstr "Suggérer des amis potentiels"
+
+#: src/Module/Contact.php:707
+msgid "Show all contacts"
+msgstr "Montrer tous les contacts"
+
+#: src/Module/Contact.php:712
+msgid "Unblocked"
+msgstr "Non-bloqués"
+
+#: src/Module/Contact.php:715
+msgid "Only show unblocked contacts"
+msgstr "Ne montrer que les contacts non-bloqués"
+
+#: src/Module/Contact.php:720
+msgid "Blocked"
+msgstr "Bloqués"
+
+#: src/Module/Contact.php:723
+msgid "Only show blocked contacts"
+msgstr "Ne montrer que les contacts bloqués"
+
+#: src/Module/Contact.php:728
+msgid "Ignored"
+msgstr "Ignorés"
+
+#: src/Module/Contact.php:731
+msgid "Only show ignored contacts"
+msgstr "Ne montrer que les contacts ignorés"
+
+#: src/Module/Contact.php:736
+msgid "Archived"
+msgstr "Archivés"
+
+#: src/Module/Contact.php:739
+msgid "Only show archived contacts"
+msgstr "Ne montrer que les contacts archivés"
+
+#: src/Module/Contact.php:744
+msgid "Hidden"
+msgstr "Cachés"
+
+#: src/Module/Contact.php:747
+msgid "Only show hidden contacts"
+msgstr "Ne montrer que les contacts masqués"
+
+#: src/Module/Contact.php:755
+msgid "Organize your contact groups"
+msgstr ""
+
+#: src/Module/Contact.php:815
+msgid "Search your contacts"
+msgstr "Rechercher dans vos contacts"
+
+#: src/Module/Contact.php:826 src/Module/Contact.php:1094
+msgid "Archive"
+msgstr "Archiver"
+
+#: src/Module/Contact.php:826 src/Module/Contact.php:1094
+msgid "Unarchive"
+msgstr "Désarchiver"
+
+#: src/Module/Contact.php:829
+msgid "Batch Actions"
+msgstr "Actions multiples"
+
+#: src/Module/Contact.php:856
+msgid "Conversations started by this contact"
+msgstr ""
+
+#: src/Module/Contact.php:861
+msgid "Posts and Comments"
+msgstr ""
+
+#: src/Module/Contact.php:884
+msgid "View all contacts"
+msgstr "Voir tous les contacts"
+
+#: src/Module/Contact.php:895
+msgid "View all common friends"
+msgstr "Voir tous les amis communs"
+
+#: src/Module/Contact.php:905
+msgid "Advanced Contact Settings"
+msgstr "Réglages avancés du contact"
+
+#: src/Module/Contact.php:991
+msgid "Mutual Friendship"
+msgstr "Relation réciproque"
+
+#: src/Module/Contact.php:996
+msgid "is a fan of yours"
+msgstr "Vous suit"
+
+#: src/Module/Contact.php:1001
+msgid "you are a fan of"
+msgstr "Vous le/la suivez"
+
+#: src/Module/Contact.php:1025
+msgid "Edit contact"
+msgstr "Éditer le contact"
+
+#: src/Module/Contact.php:1079
+msgid "Toggle Blocked status"
+msgstr "(dés)activer l'état \"bloqué\""
+
+#: src/Module/Contact.php:1087
+msgid "Toggle Ignored status"
+msgstr "(dés)activer l'état \"ignoré\""
+
+#: src/Module/Contact.php:1096
+msgid "Toggle Archive status"
+msgstr "(dés)activer l'état \"archivé\""
+
+#: src/Module/Contact.php:1104
+msgid "Delete contact"
+msgstr "Effacer ce contact"
+
+#: src/Module/Install.php:118
+msgid "Friendica Communications Server - Setup"
+msgstr ""
+
+#: src/Module/Install.php:129
+msgid "System check"
+msgstr "Vérifications système"
+
+#: src/Module/Install.php:134
+msgid "Check again"
+msgstr "Vérifier à nouveau"
+
+#: src/Module/Install.php:151
+msgid "Database connection"
+msgstr "Connexion à la base de données"
+
+#: src/Module/Install.php:152
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "Pour installer Friendica, nous avons besoin de savoir comment contacter votre base de données."
+
+#: src/Module/Install.php:153
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Merci de vous tourner vers votre hébergeur et/ou administrateur pour toute question concernant ces réglages."
+
+#: src/Module/Install.php:154
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "La base de données que vous spécifierez doit exister. Si ce n'est pas encore le cas, merci de la créer avant de continuer."
+
+#: src/Module/Install.php:157
+msgid "Database Server Name"
+msgstr "Serveur de base de données"
+
+#: src/Module/Install.php:162
+msgid "Database Login Name"
+msgstr "Nom d'utilisateur de la base"
+
+#: src/Module/Install.php:168
+msgid "Database Login Password"
+msgstr "Mot de passe de la base"
+
+#: src/Module/Install.php:170
+msgid "For security reasons the password must not be empty"
+msgstr "Pour des raisons de sécurité, le mot de passe ne peut pas être vide."
+
+#: src/Module/Install.php:173
+msgid "Database Name"
+msgstr "Nom de la base"
+
+#: src/Module/Install.php:178 src/Module/Install.php:214
+msgid "Site administrator email address"
+msgstr "Adresse électronique de l'administrateur du site"
+
+#: src/Module/Install.php:180 src/Module/Install.php:214
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Votre adresse électronique doit correspondre à celle-ci pour pouvoir utiliser l'interface d'administration."
+
+#: src/Module/Install.php:184 src/Module/Install.php:215
+msgid "Please select a default timezone for your website"
+msgstr "Sélectionner un fuseau horaire par défaut pour votre site"
+
+#: src/Module/Install.php:208
+msgid "Site settings"
+msgstr "Réglages du site"
+
+#: src/Module/Install.php:217
+msgid "System Language:"
+msgstr "Langue système :"
+
+#: src/Module/Install.php:219
+msgid ""
+"Set the default language for your Friendica installation interface and to "
+"send emails."
+msgstr "Définit la langue par défaut pour l'interface de votre instance Friendica et les mails envoyés."
+
+#: src/Module/Install.php:231
+msgid "Your Friendica site database has been installed."
+msgstr "La base de données de votre site Friendica a bien été installée."
+
+#: src/Module/Install.php:239
+msgid "Installation finished"
+msgstr ""
+
+#: src/Module/Install.php:261
+msgid "<h1>What next</h1>"
+msgstr "<h1>Ensuite</h1>"
+
+#: src/Module/Install.php:262
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"worker."
+msgstr "IMPORTANT: vous devrez ajouter [manuellement] une tâche planifiée pour le 'worker'."
+
+#: src/Module/Install.php:265
+#, php-format
+msgid ""
+"Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
+"and register as new user. Remember to use the same email you have entered as"
+" administrator email. This will allow you to enter the site admin panel."
+msgstr ""
+
+#: src/Module/Itemsource.php:41
+msgid "Item Guid"
+msgstr ""
+
+#: src/Module/Login.php:292
+msgid "Create a New Account"
+msgstr "Créer un nouveau compte"
+
+#: src/Module/Login.php:325
+msgid "Password: "
+msgstr "Mot de passe : "
+
+#: src/Module/Login.php:326
+msgid "Remember me"
+msgstr "Se souvenir de moi"
+
+#: src/Module/Login.php:329
+msgid "Or login using OpenID: "
+msgstr "Ou connectez-vous via OpenID : "
+
+#: src/Module/Login.php:335
+msgid "Forgot your password?"
+msgstr "Mot de passe oublié?"
+
+#: src/Module/Login.php:338
+msgid "Website Terms of Service"
+msgstr "Conditions d'utilisation du site internet"
+
+#: src/Module/Login.php:339
+msgid "terms of service"
+msgstr "conditions d'utilisation"
+
+#: src/Module/Login.php:341
+msgid "Website Privacy Policy"
+msgstr "Politique de confidentialité du site internet"
+
+#: src/Module/Login.php:342
+msgid "privacy policy"
+msgstr "politique de confidentialité"
+
+#: src/Module/Logout.php:27
+msgid "Logged out."
+msgstr "Déconnecté."
+
+#: src/Module/Proxy.php:73
+msgid "Bad Request."
+msgstr ""
+
+#: src/Module/Register.php:83
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking \"Register\"."
+msgstr ""
+
+#: src/Module/Register.php:84
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
+msgstr "Si vous n'êtes pas familier avec OpenID, laissez ce champ vide et remplissez le reste."
+
+#: src/Module/Register.php:85
+msgid "Your OpenID (optional): "
+msgstr "Votre OpenID (facultatif): "
+
+#: src/Module/Register.php:94
+msgid "Include your profile in member directory?"
+msgstr "Inclure votre profil dans l'annuaire des membres?"
+
+#: src/Module/Register.php:117
+msgid "Note for the admin"
+msgstr "Commentaire pour l'administrateur"
+
+#: src/Module/Register.php:117
+msgid "Leave a message for the admin, why you want to join this node"
+msgstr "Indiquez à l'administrateur les raisons de votre inscription à cette instance."
+
+#: src/Module/Register.php:118
+msgid "Membership on this site is by invitation only."
+msgstr "L'inscription à ce site se fait uniquement sur invitation."
+
+#: src/Module/Register.php:119
+msgid "Your invitation code: "
+msgstr ""
+
+#: src/Module/Register.php:127
+msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
+msgstr "Votre nom complet (p. ex. Michel Dupont):"
+
+#: src/Module/Register.php:128
+msgid ""
+"Your Email Address: (Initial information will be send there, so this has to "
+"be an existing address.)"
+msgstr "Votre courriel : (Des informations de connexion vont être envoyées à cette adresse; elle doit exister)."
+
+#: src/Module/Register.php:130
+msgid "Leave empty for an auto generated password."
+msgstr "Laisser ce champ libre pour obtenir un mot de passe généré automatiquement."
+
+#: src/Module/Register.php:132
+#, php-format
+msgid ""
+"Choose a profile nickname. This must begin with a text character. Your "
+"profile address on this site will then be \"<strong>nickname@%s</strong>\"."
+msgstr ""
+
+#: src/Module/Register.php:133
+msgid "Choose a nickname: "
+msgstr "Choisir un pseudo : "
+
+#: src/Module/Register.php:142
+msgid "Import your profile to this friendica instance"
+msgstr "Importer votre profile dans cette instance de friendica"
+
+#: src/Module/Register.php:150
+msgid "Note: This node explicitly contains adult content"
+msgstr ""
+
+#: src/Module/Register.php:243
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr "Inscription réussie. Vérifiez vos emails pour la suite des instructions."
+
+#: src/Module/Register.php:247
+#, php-format
+msgid ""
+"Failed to send email message. Here your accout details:<br> login: %s<br> "
+"password: %s<br><br>You can change your password after login."
+msgstr "Impossible d’envoyer le courriel de confirmation. Voici vos informations de connexion:<br> identifiant : %s<br> mot de passe : %s<br><br>Vous pourrez changer votre mot de passe une fois connecté."
+
+#: src/Module/Register.php:254
+msgid "Registration successful."
+msgstr "Inscription réussie."
+
+#: src/Module/Register.php:259
+msgid "Your registration can not be processed."
+msgstr "Votre inscription ne peut être traitée."
+
+#: src/Module/Register.php:305
+msgid "Your registration is pending approval by the site owner."
+msgstr "Votre inscription attend une validation du propriétaire du site."
+
+#: src/Module/Tos.php:35 src/Module/Tos.php:77
+msgid ""
+"At the time of registration, and for providing communications between the "
+"user account and their contacts, the user has to provide a display name (pen"
+" name), an username (nickname) and a working email address. The names will "
+"be accessible on the profile page of the account by any visitor of the page,"
+" even if other profile details are not displayed. The email address will "
+"only be used to send the user notifications about interactions, but wont be "
+"visibly displayed. The listing of an account in the node's user directory or"
+" the global user directory is optional and can be controlled in the user "
+"settings, it is not necessary for communication."
+msgstr ""
+
+#: src/Module/Tos.php:36 src/Module/Tos.php:78
+msgid ""
+"This data is required for communication and is passed on to the nodes of the"
+" communication partners and is stored there. Users can enter additional "
+"private data that may be transmitted to the communication partners accounts."
+msgstr ""
+
+#: src/Module/Tos.php:37 src/Module/Tos.php:79
+#, php-format
+msgid ""
+"At any point in time a logged in user can export their account data from the"
+" <a href=\"%1$s/settings/uexport\">account settings</a>. If the user wants "
+"to delete their account they can do so at <a "
+"href=\"%1$s/removeme\">%1$s/removeme</a>. The deletion of the account will "
+"be permanent. Deletion of the data will also be requested from the nodes of "
+"the communication partners."
+msgstr ""
+
+#: src/Module/Tos.php:40 src/Module/Tos.php:76
+msgid "Privacy Statement"
+msgstr ""
+
+#: src/Object/Post.php:136
+msgid "This entry was edited"
+msgstr "Cette entrée a été éditée"
+
+#: src/Object/Post.php:198
+msgid "Delete locally"
+msgstr ""
+
+#: src/Object/Post.php:201
+msgid "Delete globally"
+msgstr ""
+
+#: src/Object/Post.php:201
+msgid "Remove locally"
+msgstr ""
+
+#: src/Object/Post.php:215
+msgid "save to folder"
+msgstr "sauver vers dossier"
+
+#: src/Object/Post.php:250
+msgid "I will attend"
+msgstr "Je vais participer"
+
+#: src/Object/Post.php:250
+msgid "I will not attend"
+msgstr "Je ne vais pas participer"
+
+#: src/Object/Post.php:250
+msgid "I might attend"
+msgstr "Je vais peut-être participer"
+
+#: src/Object/Post.php:278
+msgid "ignore thread"
+msgstr "ignorer le fil"
+
+#: src/Object/Post.php:279
+msgid "unignore thread"
+msgstr "Ne plus ignorer le fil"
+
+#: src/Object/Post.php:280
+msgid "toggle ignore status"
+msgstr "Ignorer le statut"
+
+#: src/Object/Post.php:291
+msgid "add star"
+msgstr "mettre en avant"
+
+#: src/Object/Post.php:292
+msgid "remove star"
+msgstr "ne plus mettre en avant"
+
+#: src/Object/Post.php:293
+msgid "toggle star status"
+msgstr "mettre en avant"
+
+#: src/Object/Post.php:296
+msgid "starred"
+msgstr "mis en avant"
+
+#: src/Object/Post.php:300
+msgid "add tag"
+msgstr "ajouter une étiquette"
+
+#: src/Object/Post.php:311
+msgid "like"
+msgstr "aime"
+
+#: src/Object/Post.php:312
+msgid "dislike"
+msgstr "n'aime pas"
+
+#: src/Object/Post.php:315
+msgid "Share this"
+msgstr "Partager"
+
+#: src/Object/Post.php:315
+msgid "share"
+msgstr "partager"
+
+#: src/Object/Post.php:382
+msgid "to"
+msgstr "à"
+
+#: src/Object/Post.php:383
+msgid "via"
+msgstr "via"
+
+#: src/Object/Post.php:384
+msgid "Wall-to-Wall"
+msgstr "Inter-mur"
+
+#: src/Object/Post.php:385
+msgid "via Wall-To-Wall:"
+msgstr "en Inter-mur :"
+
+#: src/Object/Post.php:432
+msgid "Notifier task is pending"
+msgstr ""
+
+#: src/Object/Post.php:433
+msgid "Delivery to remote servers is pending"
+msgstr ""
+
+#: src/Object/Post.php:434
+msgid "Delivery to remote servers is underway"
+msgstr ""
+
+#: src/Object/Post.php:435
+msgid "Delivery to remote servers is mostly done"
+msgstr ""
+
+#: src/Object/Post.php:436
+msgid "Delivery to remote servers is done"
+msgstr ""
+
+#: src/Object/Post.php:455
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d commentaire"
+msgstr[1] "%d commentaires"
+
+#: src/App.php:665
+msgid "Delete this item?"
+msgstr "Effacer cet élément?"
+
+#: src/App.php:667
+msgid "show fewer"
+msgstr "montrer moins"
+
+#: src/App.php:709
+msgid "toggle mobile"
+msgstr "activ. mobile"
+
+#: src/App.php:1077
+msgid "No system theme config value set."
+msgstr ""
+
+#: src/BaseModule.php:133
+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 "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probablement dire que le formulaire est resté ouvert trop longtemps (plus de 3 heures) avant d'être validé."
+
+#: src/LegacyModule.php:30
+#, php-format
+msgid "Legacy module file not found: %s"
+msgstr ""
+
+#: update.php:217
+#, php-format
+msgid "%s: Updating author-id and owner-id in item and thread table. "
+msgstr ""
+
+#: update.php:272
+#, php-format
+msgid "%s: Updating post-type."
+msgstr ""
diff --git a/view/lang/fr/strings.php b/view/lang/fr/strings.php
index 3e4b22afa..6f4943a97 100644
--- a/view/lang/fr/strings.php
+++ b/view/lang/fr/strings.php
@@ -11,8 +11,8 @@ $a->strings["Daily posting limit of %d post reached. The post was rejected."] =
 	1 => "Limite quotidienne de %dpublications atteinte.  La publication a été rejetée.",
 ];
 $a->strings["Weekly posting limit of %d post reached. The post was rejected."] = [
-	0 => "",
-	1 => "",
+	0 => "Limite hebdomadaire d'%d unique publication atteinte, votre soumission a été rejetée.",
+	1 => "Limite hebdomadaire de %d publications atteinte, votre soumission a été rejetée.",
 ];
 $a->strings["Monthly posting limit of %d post reached. The post was rejected."] = "La limite mensuelle de%d publication est atteinte. Votre publication a été rejetée.";
 $a->strings["Profile Photos"] = "Photos du profil";
@@ -135,18 +135,22 @@ $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s vous a en
 $a->strings["a private message"] = "un message privé";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s vous a envoyé %2\$s.";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Merci de visiter %s pour voir vos messages privés et/ou y répondre.";
+$a->strings["%1\$s tagged you on [url=%2\$s]a %3\$s[/url]"] = "%1\$s vous a mentionné•e sur [url=%2\$s]un•e %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s a commenté sur [url=%2\$s]un %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s vous a mentionné•e sur [url=%2\$s]un•e %4\$s de %3\$s [/url]";
 $a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s a commenté sur [url=%2\$s]le %4\$s de %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]your %3\$s[/url]"] = "%1\$s vous a mentionné•e sur [url=%2\$s]votre %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s commented on [url=%2\$s]your %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]their %3\$s[/url]"] = "%1\$s vous a mentionné•e sur [url=%2\$s]leur %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]their %3\$s[/url]"] = "%1\$s a commenté sur [url=%2\$s]leur %3\$s[/url]";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notification] %s vous a étiqueté";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s vous a étiqueté sur %2\$s";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Notification] Commentaire de %2\$s sur la conversation #%1\$d";
 $a->strings["%s commented on an item/conversation you have been following."] = "%s a commenté un élément que vous suivez.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Merci de visiter %s pour voir la conversation et/ou y répondre.";
 $a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notification] %s a posté sur votre mur";
 $a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s a publié sur votre mur à %2\$s";
 $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s a posté sur [url=%2\$s]votre mur[/url]";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notification] %s vous a étiqueté";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s vous a étiqueté sur %2\$s";
-$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]vous a étiqueté[/url].";
 $a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Notification] %s partage une nouvelle publication";
 $a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s a partagé une nouvelle publication sur %2\$s";
 $a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]partage une publication[/url].";
@@ -183,7 +187,7 @@ $a->strings["[Friendica System Notify]"] = "[Friendica Notification Sytème]";
 $a->strings["registration request"] = "demande d'inscription";
 $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Vous avez reçu une demande d'inscription de %1\$s sur %2\$s";
 $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "%2\$s vous a envoyé une [url=%1\$s]demande de création de compte[/url].";
-$a->strings["Full Name:\t%s\nSite Location:\t%s\nLogin Name:\t%s (%s)"] = "";
+$a->strings["Full Name:\t%s\nSite Location:\t%s\nLogin Name:\t%s (%s)"] = "Nom complet :\t%s\nAdresse du site :\t%s\nIdentifiant :\t%s (%s)";
 $a->strings["Please visit %s to approve or reject the request."] = "Veuillez visiter %s pour approuver ou rejeter la demande.";
 $a->strings["Item not found."] = "Élément introuvable.";
 $a->strings["Do you really want to delete this item?"] = "Voulez-vous vraiment supprimer cet élément ?";
@@ -191,9 +195,13 @@ $a->strings["Yes"] = "Oui";
 $a->strings["Permission denied."] = "Permission refusée.";
 $a->strings["Archives"] = "Archives";
 $a->strings["show more"] = "montrer plus";
+$a->strings["You must be logged in to use addons. "] = "Vous devez être connecté pour utiliser les greffons.";
+$a->strings["Applications"] = "Applications";
+$a->strings["No installed applications."] = "Pas d'application installée.";
+$a->strings["System down for maintenance"] = "Système indisponible pour cause de maintenance";
 $a->strings["Theme settings updated."] = "Réglages du thème sauvés.";
 $a->strings["Information"] = "Information";
-$a->strings["Overview"] = "";
+$a->strings["Overview"] = "Synthèse";
 $a->strings["Federation Statistics"] = "Statistiques Federation";
 $a->strings["Configuration"] = "Configuration";
 $a->strings["Site"] = "Site";
@@ -205,29 +213,29 @@ $a->strings["Terms of Service"] = "Conditions de service";
 $a->strings["Database"] = "Base de données";
 $a->strings["DB updates"] = "Mise-à-jour de la base";
 $a->strings["Inspect Queue"] = "Inspecter la file d'attente";
-$a->strings["Inspect Deferred Workers"] = "";
-$a->strings["Inspect worker Queue"] = "";
+$a->strings["Inspect Deferred Workers"] = "Tâches de fond reportées";
+$a->strings["Inspect worker Queue"] = "Tâches de fond en attente";
 $a->strings["Tools"] = "Outils";
 $a->strings["Contact Blocklist"] = "Liste de contacts bloqués";
 $a->strings["Server Blocklist"] = "Serveurs bloqués";
 $a->strings["Delete Item"] = "Supprimer un élément";
 $a->strings["Logs"] = "Journaux";
 $a->strings["View Logs"] = "Voir les logs";
-$a->strings["Diagnostics"] = "";
-$a->strings["PHP Info"] = "";
+$a->strings["Diagnostics"] = "Diagnostics";
+$a->strings["PHP Info"] = "PHP Info";
 $a->strings["probe address"] = "Tester une adresse";
 $a->strings["check webfinger"] = "vérification de webfinger";
 $a->strings["Admin"] = "Admin";
-$a->strings["Addon Features"] = "";
+$a->strings["Addon Features"] = "Fonctionnalités des addons";
 $a->strings["User registrations waiting for confirmation"] = "Inscriptions en attente de confirmation";
 $a->strings["Administration"] = "Administration";
-$a->strings["Display Terms of Service"] = "";
-$a->strings["Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page."] = "";
-$a->strings["Display Privacy Statement"] = "";
-$a->strings["Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."] = "";
-$a->strings["Privacy Statement Preview"] = "";
-$a->strings["The Terms of Service"] = "";
-$a->strings["Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below."] = "";
+$a->strings["Display Terms of Service"] = "Afficher les Conditions d'Utilisation";
+$a->strings["Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page."] = "Active la page de Conditions d'Utilisation. Un lien vers cette page est ajouté dans le formulaire d'inscription et la page A Propos.";
+$a->strings["Display Privacy Statement"] = "Afficher la Politique de Confidentialité";
+$a->strings["Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."] = "Affiche les informations légales nécessaires pour publier un site Friendica en accord avec le <a href=\"%s\" target=\"_blank\">RGPD européen</a> par exemple.";
+$a->strings["Privacy Statement Preview"] = "Aperçu de la Politique de Confidentialité";
+$a->strings["The Terms of Service"] = "Conditions d'Utilisation";
+$a->strings["Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below."] = "Saisissez les Conditions d'Utilisations de votre site. Les BBCodes sont disponibles, les titres commencent à [h2].";
 $a->strings["Save Settings"] = "Sauvegarder les paramètres";
 $a->strings["Blocked domain"] = "Domaine bloqué";
 $a->strings["The blocked domain"] = "Domaine bloqué";
@@ -248,31 +256,31 @@ $a->strings["Delete entry from blocklist"] = "Supprimer l'entrée de la liste no
 $a->strings["Delete entry from blocklist?"] = "Supprimer l'entrée de la liste noire ?";
 $a->strings["Server added to blocklist."] = "Serveur ajouté à la liste noire.";
 $a->strings["Site blocklist updated."] = "Liste noire mise à jour.";
-$a->strings["The contact has been blocked from the node"] = "";
-$a->strings["Could not find any contact entry for this URL (%s)"] = "";
+$a->strings["The contact has been blocked from the node"] = "Le profile distant a été bloqué";
+$a->strings["Could not find any contact entry for this URL (%s)"] = "Aucun profil distant n'a été trouvé à cette URL (%s)";
 $a->strings["%s contact unblocked"] = [
-	0 => "",
-	1 => "",
+	0 => "%s contact débloqué",
+	1 => "%s profiles distants débloqués",
 ];
-$a->strings["Remote Contact Blocklist"] = "";
-$a->strings["This page allows you to prevent any message from a remote contact to reach your node."] = "";
-$a->strings["Block Remote Contact"] = "";
+$a->strings["Remote Contact Blocklist"] = "Liste des profiles distants bloqués";
+$a->strings["This page allows you to prevent any message from a remote contact to reach your node."] = "Cette page vous permet de refuser toutes les publications d'un profile distant sur votre site.";
+$a->strings["Block Remote Contact"] = "Bloquer le profile distant";
 $a->strings["select all"] = "tout sélectionner";
-$a->strings["select none"] = "";
+$a->strings["select none"] = "Sélectionner tous";
 $a->strings["Block"] = "Bloquer";
 $a->strings["Unblock"] = "Débloquer";
-$a->strings["No remote contact is blocked from this node."] = "";
-$a->strings["Blocked Remote Contacts"] = "";
-$a->strings["Block New Remote Contact"] = "";
-$a->strings["Photo"] = "";
+$a->strings["No remote contact is blocked from this node."] = "Aucun profil distant n'est bloqué";
+$a->strings["Blocked Remote Contacts"] = "Profils distants bloqués";
+$a->strings["Block New Remote Contact"] = "Bloquer un nouveau profil distant";
+$a->strings["Photo"] = "Photo";
 $a->strings["Name"] = "Nom";
 $a->strings["Address"] = "Adresse";
 $a->strings["Profile URL"] = "URL du Profil";
 $a->strings["%s total blocked contact"] = [
-	0 => "",
-	1 => "",
+	0 => "%s profil distant bloqué",
+	1 => "%s profils distans bloqués",
 ];
-$a->strings["URL of the remote contact to block."] = "";
+$a->strings["URL of the remote contact to block."] = "URL du profil distant à bloquer.";
 $a->strings["Delete this Item"] = "Supprimer l'élément";
 $a->strings["On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted."] = "Sur cette page, vous pouvez supprimer un élément de votre noeud. Si cet élément est le premier post d'un fil de discussion, le fil de discussion entier sera supprimé.";
 $a->strings["You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456."] = "Vous devez connaître le GUID de l'élément. Vous pouvez le trouver en sélectionnant l'élément puis en lisant l'URL. La dernière partie de l'URL est le GUID. Exemple: http://example.com/display/123456 a pour GUID: 123456.";
@@ -282,7 +290,7 @@ $a->strings["Item marked for deletion."] = "L'élément va être supprimé.";
 $a->strings["unknown"] = "inconnu";
 $a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Cette page montre quelques statistiques de la partie connue du réseau social fédéré dont votre instance Friendica fait partie. Ces chiffres sont partiels et ne reflètent que la portion du réseau dont votre instance a connaissance.";
 $a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "En activant la fonctionnalité <em>Répertoire de Contacts Découverts Automatiquement</em>, cela améliorera la qualité des chiffres présentés ici.";
-$a->strings["Currently this node is aware of %d nodes with %d registered users from the following platforms:"] = "";
+$a->strings["Currently this node is aware of %d nodes with %d registered users from the following platforms:"] = "Ce site a connaissance de %d sites distants totalisant %d utilisateurs répartis entre les plate-formes suivantes :";
 $a->strings["ID"] = "ID";
 $a->strings["Recipient Name"] = "Nom du destinataire";
 $a->strings["Recipient Profile"] = "Profil du destinataire";
@@ -290,40 +298,41 @@ $a->strings["Network"] = "Réseau";
 $a->strings["Created"] = "Créé";
 $a->strings["Last Tried"] = "Dernier essai";
 $a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "Cette page présente le contenu de la file d'attente pour les publications sortantes. Ce sont des messages dont la première livraison a échoué. Ils seront réenvoyés plus tard et éventuellement supprimés si l'envoi échoue de façon permanente.";
-$a->strings["Inspect Deferred Worker Queue"] = "";
-$a->strings["This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time."] = "";
-$a->strings["Inspect Worker Queue"] = "";
-$a->strings["This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you've set up during install."] = "";
-$a->strings["Job Parameters"] = "";
-$a->strings["Priority"] = "";
-$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"] = "";
+$a->strings["Inspect Deferred Worker Queue"] = "Détail des tâches de fond reportées";
+$a->strings["This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time."] = "Cette page détaille les tâches de fond reportées après avoir échoué une première fois.";
+$a->strings["Inspect Worker Queue"] = "Détail des tâches de fond en attente";
+$a->strings["This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you've set up during install."] = "Cette page détaille les tâches de fond en attente. Elles seront traitées lors de la prochaine exécution de la tâche planifiée que vous avez définie lors de l'installation.";
+$a->strings["Job Parameters"] = "Paramètres de la tâche";
+$a->strings["Priority"] = "Priorité";
+$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"] = "<br />Votre base de donnée comporte des tables MYISAM. Vous devriez changer pour InnoDB car il est prévu d'utiliser des fonctionnalités spécifiques à InnoDB à l'avenir. Veuillez consulter <a href=\"%s\">ce guide de conversion</a> pour mettre à jour votre base de donnée. Vous pouvez également exécuter la commande <tt>php bin/console.php dbstructure toinnodb</tt> à la racine de votre répertoire Friendica pour une conversion automatique.";
 $a->strings["There is a new version of Friendica available for download. Your current version is %1\$s, upstream version is %2\$s"] = "Une nouvelle version de Friendica est disponible. Votre version est %1\$s, la nouvelle version est %2\$s";
-$a->strings["The database update failed. Please run \"php bin/console.php dbstructure update\" from the command line and have a look at the errors that might appear."] = "";
+$a->strings["The database update failed. Please run \"php bin/console.php dbstructure update\" from the command line and have a look at the errors that might appear."] = "La mise à jour automatique de la base de donnée a échoué. Veuillez exécuter la commande <code>php bin/console.php dbstructure update</code> depuis votre répertoire Friendica et noter les erreurs potentielles.";
 $a->strings["The worker was never executed. Please check your database structure!"] = "Le 'worker' n'a pas encore été exécuté. Vérifiez la structure de votre base de données.";
 $a->strings["The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings."] = "La dernière exécution du 'worker' s'est déroulée à %s, c'est-à-dire il y a plus d'une heure. Vérifiez les réglages de crontab.";
-$a->strings["Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "";
-$a->strings["<a href=\"%s\">%s</a> is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See <a href=\"%s\">the installation page</a> for help."] = "";
+$a->strings["Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "La configuration de votre site Friendica est maintenant stockée dans le fichier <code>config/local.config.php</code>, veuillez copier le fichier <code>config/local-sample.config.php</code> et transférer votre configuration depuis le fichier <code>.htconfig.php</code>. Veuillez consulter <a href=\"%s\">la page d'aide de configuration (en anglais)</a> pour vous aider dans la transition.";
+$a->strings["Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>config/local.ini.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "La configuration de votre site Friendica est maintenant stockée dans le fichier <code>config/local.config.php</code>, veuillez copier le fichier <code>config/local-sample.config.php</code> et transférer votre configuration depuis le fichier <code>config/local.ini.php</code>. Veuillez consulter <a href=\"%s\">la page d'aide de configuration (en anglais)</a> pour vous aider dans la transition.";
+$a->strings["<a href=\"%s\">%s</a> is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See <a href=\"%s\">the installation page</a> for help."] = "<a href=\"%s\">%s</a> n'est pas accessible sur votre site. C'est un problème de configuration sévère qui empêche toute communication avec les serveurs distants. Veuillez consulter <a href=\"%s\">la page d'aide à l'installation</a> (en anglais) pour plus d'information.";
 $a->strings["Normal Account"] = "Compte normal";
-$a->strings["Automatic Follower Account"] = "";
-$a->strings["Public Forum Account"] = "";
+$a->strings["Automatic Follower Account"] = "Profile Resuivant";
+$a->strings["Public Forum Account"] = "Forum public";
 $a->strings["Automatic Friend Account"] = "Compte auto-amical";
 $a->strings["Blog Account"] = "Compte de blog";
-$a->strings["Private Forum Account"] = "";
+$a->strings["Private Forum Account"] = "Forum privé";
 $a->strings["Message queues"] = "Files d'attente des messages";
-$a->strings["Server Settings"] = "";
+$a->strings["Server Settings"] = "Paramètres du site";
 $a->strings["Summary"] = "Résumé";
 $a->strings["Registered users"] = "Utilisateurs inscrits";
 $a->strings["Pending registrations"] = "Inscriptions en attente";
 $a->strings["Version"] = "Version";
-$a->strings["Active addons"] = "";
+$a->strings["Active addons"] = "Add-ons actifs";
 $a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "Impossible d'analyser l'URL de base. Doit contenir au moins <scheme>://<domain>";
 $a->strings["Site settings updated."] = "Réglages du site mis-à-jour.";
 $a->strings["No special theme for mobile devices"] = "Pas de thème particulier pour les terminaux mobiles";
-$a->strings["No community page for local users"] = "";
+$a->strings["No community page for local users"] = "Pas de page communauté pour les utilisateurs enregistrés";
 $a->strings["No community page"] = "Aucune page de communauté";
 $a->strings["Public postings from users of this site"] = "Publications publiques des utilisateurs de ce site";
-$a->strings["Public postings from the federated network"] = "";
-$a->strings["Public postings from local users and the federated network"] = "";
+$a->strings["Public postings from the federated network"] = "Publications publiques du réseau fédéré";
+$a->strings["Public postings from local users and the federated network"] = "Publications publiques des utilisateurs du site et du réseau fédéré";
 $a->strings["Disabled"] = "Désactivé";
 $a->strings["Users, Global Contacts"] = "Utilisateurs, Contacts Globaux";
 $a->strings["Users, Global Contacts/fallback"] = "Utilisateurs, Contacts Globaux/alternative";
@@ -341,7 +350,8 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
 $a->strings["Don't check"] = "Ne pas rechercher";
 $a->strings["check the stable version"] = "Rechercher les versions stables";
 $a->strings["check the development version"] = "Rechercher les versions de développement";
-$a->strings["Republish users to directory"] = "";
+$a->strings["Database (legacy)"] = "Base de donnée (historique)";
+$a->strings["Republish users to directory"] = "Republier les utilisateurs sur le répertoire";
 $a->strings["Registration"] = "Inscription";
 $a->strings["File upload"] = "Téléversement de fichier";
 $a->strings["Policies"] = "Politiques";
@@ -349,9 +359,9 @@ $a->strings["Advanced"] = "Avancé";
 $a->strings["Auto Discovered Contact Directory"] = "Répertoire de Contacts Découverts Automatiquement";
 $a->strings["Performance"] = "Performance";
 $a->strings["Worker"] = "Worker";
-$a->strings["Message Relay"] = "";
-$a->strings["Relocate Instance"] = "";
-$a->strings["Warning! Advanced function. Could make this server unreachable."] = "";
+$a->strings["Message Relay"] = "Relai de publication";
+$a->strings["Relocate Instance"] = "Déménager le site";
+$a->strings["Warning! Advanced function. Could make this server unreachable."] = "Attention! Cette fonctionnalité avancée peut rendre votre site inaccessible.";
 $a->strings["Site name"] = "Nom du site";
 $a->strings["Host name"] = "Nom de la machine hôte";
 $a->strings["Sender Email"] = "Courriel de l'émetteur";
@@ -362,7 +372,7 @@ $a->strings["Link to an icon that will be used for browsers."] = "Lien vers une
 $a->strings["Touch icon"] = "Icône pour systèmes tactiles";
 $a->strings["Link to an icon that will be used for tablets and mobiles."] = "Lien vers une icône qui sera utilisée pour les tablettes et les mobiles.";
 $a->strings["Additional Info"] = "Informations supplémentaires";
-$a->strings["For public servers: you can add additional information here that will be listed at %s/servers."] = "";
+$a->strings["For public servers: you can add additional information here that will be listed at %s/servers."] = "Description publique destinée au <a href=\"%s\">répertoire global de sites Friendica</a>.";
 $a->strings["System language"] = "Langue du système";
 $a->strings["System theme"] = "Thème du système";
 $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Thème par défaut sur ce site - peut être changé au niveau du profile utilisateur - <a href='#' id='cnftheme'>changer les réglages du thème</a>";
@@ -376,6 +386,8 @@ $a->strings["Hide help entry from navigation menu"] = "Cacher l'aide du menu de
 $a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Cacher du menu de navigation l'entrée vers les pages d'aide. Vous pouvez toujours y accéder en tapant directement /help.";
 $a->strings["Single user instance"] = "Instance mono-utilisateur";
 $a->strings["Make this instance multi-user or single-user for the named user"] = "Transformer cette en instance en multi-utilisateur ou mono-utilisateur pour cet l'utilisateur.";
+$a->strings["File storage backend"] = "Destination du stockage de fichier";
+$a->strings["The backend used to store uploaded data. If you change the storage backend, you can manually move the existing files. If you do not do so, the files uploaded before the change will still be available at the old backend. Please see <a href=\"/help/Settings#1_2_3_1\">the settings documentation</a> for more information about the choices and the moving procedure."] = "La destination du stockage des fichiers. Si vous changez cette destination, vous pouvez migrer les fichiers existants. Si vous ne le faites pas, ils resteront accessibles à leur emplacement actuel. Veuillez consulter <a href=\"/help/Settings#1_2_3_1\">la page d'aide à la Configuration</a> (en anglais) pour plus d'information sur les choix possibles et la procédure de migration.";
 $a->strings["Maximum image size"] = "Taille maximale des images";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Taille maximale des images envoyées (en octets). 0 par défaut, c'est à dire \"aucune limite\".";
 $a->strings["Maximum image length"] = "Longueur maximale des images";
@@ -386,24 +398,24 @@ $a->strings["Register policy"] = "Politique d'inscription";
 $a->strings["Maximum Daily Registrations"] = "Inscriptions maximum par jour";
 $a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect."] = "Si les inscriptions sont permises ci-dessus, ceci fixe le nombre maximum d'inscriptions de nouveaux utilisateurs acceptées par jour. Si les inscriptions ne sont pas ouvertes, ce paramètre n'a aucun effet.";
 $a->strings["Register text"] = "Texte d'inscription";
-$a->strings["Will be displayed prominently on the registration page. You can use BBCode here."] = "";
-$a->strings["Forbidden Nicknames"] = "";
-$a->strings["Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142."] = "";
+$a->strings["Will be displayed prominently on the registration page. You can use BBCode here."] = "Ce texte est affiché sur la page d'inscription. Les BBCodes sont autorisés.";
+$a->strings["Forbidden Nicknames"] = "Identifiants réservés";
+$a->strings["Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142."] = "Liste d'identifiants réservés séparés par des virgules. Ces identifiants ne peuvent pas être utilisés pour s'enregistrer. La liste de base provient de la RFC 2142.";
 $a->strings["Accounts abandoned after x days"] = "Les comptes sont abandonnés après x jours";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Pour ne pas gaspiller les ressources système, on cesse d'interroger les sites distants pour les comptes abandonnés. Mettre 0 pour désactiver cette fonction.";
 $a->strings["Allowed friend domains"] = "Domaines autorisés";
 $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Une liste de domaines, séparés par des virgules, autorisés à établir des relations avec les utilisateurs de ce site. Les '*' sont acceptés. Laissez vide pour autoriser tous les domaines";
 $a->strings["Allowed email domains"] = "Domaines courriel autorisés";
 $a->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 de domaines - séparés par des virgules - dont les adresses e-mail sont autorisées à s'inscrire sur ce site. Les '*' sont acceptées. Laissez vide pour autoriser tous les domaines";
-$a->strings["No OEmbed rich content"] = "";
-$a->strings["Don't show the rich content (e.g. embedded PDF), except from the domains listed below."] = "";
-$a->strings["Allowed OEmbed domains"] = "";
-$a->strings["Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted."] = "";
+$a->strings["No OEmbed rich content"] = "Désactiver le texte riche avec OEmbed";
+$a->strings["Don't show the rich content (e.g. embedded PDF), except from the domains listed below."] = "Evite le contenu riche avec OEmbed (comme un document PDF incrusté), sauf provenant des domaines autorisés listés ci-après.";
+$a->strings["Allowed OEmbed domains"] = "Domaines autorisés pour OEmbed";
+$a->strings["Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted."] = "Liste de noms de domaine séparés par des virgules. Ces domaines peuvent afficher du contenu riche avec OEmbed.";
 $a->strings["Block public"] = "Interdire la publication globale";
 $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Cocher pour bloquer les accès anonymes (non-connectés) à tout sauf aux pages personnelles publiques.";
 $a->strings["Force publish"] = "Forcer la publication globale";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Cocher pour publier obligatoirement tous les profils locaux dans l'annuaire du site.";
-$a->strings["Enabling this may violate privacy laws like the GDPR"] = "";
+$a->strings["Enabling this may violate privacy laws like the GDPR"] = "Activer cette option peut potentiellement enfreindre les lois sur la protection de la vie privée comme le RGPD.";
 $a->strings["Global directory URL"] = "URL de l'annuaire global";
 $a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL de l'annuaire global. Si ce champ n'est pas défini, l'annuaire global sera complètement indisponible pour l'application.";
 $a->strings["Private posts by default for new users"] = "Publications privées par défaut pour les nouveaux utilisateurs";
@@ -414,22 +426,22 @@ $a->strings["Disallow public access to addons listed in the apps menu."] = "Inte
 $a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Cocher cette case restreint la liste des greffons dans le menu des applications seulement aux membres.";
 $a->strings["Don't embed private images in posts"] = "Ne pas miniaturiser les images privées dans les publications";
 $a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "Ne remplacez pas les images privées hébergées localement dans les publications avec une image attaché en copie, car cela signifie que le contact qui reçoit les publications contenant ces photos privées devra s’authentifier pour charger chaque image, ce qui peut prendre du temps.";
-$a->strings["Explicit Content"] = "";
-$a->strings["Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page."] = "";
+$a->strings["Explicit Content"] = "Contenu adulte";
+$a->strings["Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page."] = "Activez cette option si votre site est principalement utilisé pour publier du contenu adulte. Cette information est publique et peut être utilisée pour filtrer votre site dans le répertoire de site global. Elle est également affichée sur la page d'inscription.";
 $a->strings["Allow Users to set remote_self"] = "Autoriser les utilisateurs à définir remote_self";
 $a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "Cocher cette case, permet à chaque utilisateur de marquer chaque contact comme un remote_self dans la boîte de dialogue de réparation des contacts. Activer cette fonction à un contact engendre la réplique de toutes les publications d'un contact dans le flux d'activités des utilisateurs.";
 $a->strings["Block multiple registrations"] = "Interdire les inscriptions multiples";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Ne pas permettre l'inscription de comptes multiples comme des pages.";
-$a->strings["OpenID support"] = "Support OpenID";
-$a->strings["OpenID support for registration and logins."] = "Supporter OpenID pour les inscriptions et connexions.";
-$a->strings["Fullname check"] = "Vérification du \"Prénom Nom\"";
-$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Imposer l'utilisation d'un espace entre le prénom et le nom (dans le Nom complet), pour limiter les abus";
-$a->strings["Community pages for visitors"] = "";
-$a->strings["Which community pages should be available for visitors. Local users always see both pages."] = "";
+$a->strings["Disable OpenID"] = "Désactiver OpenID";
+$a->strings["Disable OpenID support for registration and logins."] = "Désactive OpenID pour l'inscription et l'identification.";
+$a->strings["No Fullname check"] = "Désactiver l'obligation de nom complet";
+$a->strings["Allow users to register without a space between the first name and the last name in their full name."] = "Supprime l'obligation d'avoir au moins un espace dans le nom complet des utilisateurs pour séparer leur prénom et nom de famille.";
+$a->strings["Community pages for visitors"] = "Affichage de la page communauté pour les utilisateurs anonymes";
+$a->strings["Which community pages should be available for visitors. Local users always see both pages."] = "Quelles pages communauté sont disponibles pour les utilisateurs anonymes.";
 $a->strings["Posts per user on community page"] = "Nombre de publications par utilisateur sur la page de la communauté (n'est pas valide pour ";
 $a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "Nombre maximal de publications par utilisateurs sur la page de la communauté (ne s'applique pas pour « Communauté globale »).";
-$a->strings["Enable OStatus support"] = "Activer le support d'OStatus";
-$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Fourni nativement la compatibilité avec OStatus (StatusNet, GNU Social etc.). Touts les communications utilisant OStatus sont public, des avertissements liés à la vie privée seront affichés si utile.";
+$a->strings["Disable OStatus support"] = "Désactiver OStatus";
+$a->strings["Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Désactive le support natif d'OStatus (StatusNet, GNU Social, etc...). Toutes les communications via OStatus sont publiques, donc des avertissements de protection de vie privée sont régulièrement affichés.";
 $a->strings["Only import OStatus/ActivityPub threads from our contacts"] = "";
 $a->strings["Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system."] = "";
 $a->strings["OStatus support can only be enabled if threading is enabled."] = "Le support OStatus ne peut être activé que si l'imbrication des commentaires est activée.";
@@ -459,7 +471,7 @@ $a->strings["If enabled, the global contacts are checked periodically for missin
 $a->strings["Days between requery"] = "Nombre de jours entre les requêtes";
 $a->strings["Number of days after which a server is requeried for his contacts."] = "Nombre de jours avant qu'une requête de contacts soient envoyée à nouveau à un serveur.";
 $a->strings["Discover contacts from other servers"] = "Découvrir des contacts des autres serveurs";
-$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."] = "";
+$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommended setting is 'Users, Global Contacts'."] = "";
 $a->strings["Timeframe for fetching global contacts"] = "Fréquence de récupération des contacts globaux";
 $a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "Quand la découverte de contacts est activée, cette valeur détermine la fréquence de récupération des données des contacts globaux présents sur d'autres serveurs.";
 $a->strings["Search the local directory"] = "Chercher dans le répertoire local";
@@ -557,6 +569,7 @@ $a->strings["Personal Page"] = "Page personnelle";
 $a->strings["Organisation Page"] = "";
 $a->strings["News Page"] = "Page d'informations";
 $a->strings["Community Forum"] = "";
+$a->strings["Relay"] = "";
 $a->strings["Email"] = "Courriel";
 $a->strings["Register date"] = "Date d'inscription";
 $a->strings["Last login"] = "Dernière connexion";
@@ -574,7 +587,7 @@ $a->strings["User blocked"] = "";
 $a->strings["Site admin"] = "Administration du Site";
 $a->strings["Account expired"] = "Compte expiré";
 $a->strings["New User"] = "Nouvel utilisateur";
-$a->strings["Delete in"] = "";
+$a->strings["Permanent deletion"] = "";
 $a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Les utilisateurs sélectionnés vont être supprimés!\\n\\nTout ce qu'ils ont posté sur ce site sera définitivement effacé!\\n\\nÊtes-vous certain?";
 $a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'utilisateur {0} va être supprimé!\\n\\nTout ce qu'il a posté sur ce site sera définitivement perdu!\\n\\nÊtes-vous certain?";
 $a->strings["Name of the new user."] = "Nom du nouvel utilisateur.";
@@ -620,11 +633,6 @@ $a->strings["Return to your app and insert this Securty Code:"] = "Retournez à
 $a->strings["Please login to continue."] = "Merci de vous connecter pour continuer.";
 $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Voulez-vous autoriser cette application à accéder à vos publications et contacts, et/ou à créer des billets à votre place?";
 $a->strings["No"] = "Non";
-$a->strings["You must be logged in to use addons. "] = "Vous devez être connecté pour utiliser les greffons.";
-$a->strings["Applications"] = "Applications";
-$a->strings["No installed applications."] = "Pas d'application installée.";
-$a->strings["Item not available."] = "Elément non disponible.";
-$a->strings["Item was not found."] = "Element introuvable.";
 $a->strings["Source input"] = "";
 $a->strings["BBCode::toPlaintext"] = "";
 $a->strings["BBCode::convert (raw HTML)"] = "";
@@ -634,6 +642,8 @@ $a->strings["BBCode::toMarkdown"] = "";
 $a->strings["BBCode::toMarkdown => Markdown::convert"] = "";
 $a->strings["BBCode::toMarkdown => Markdown::toBBCode"] = "";
 $a->strings["BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"] = "";
+$a->strings["Item Body"] = "";
+$a->strings["Item Tags"] = "";
 $a->strings["Source input (Diaspora format)"] = "";
 $a->strings["Markdown::convert (raw HTML)"] = "";
 $a->strings["Markdown::convert"] = "";
@@ -698,6 +708,7 @@ $a->strings["Mark this contact as remote_self, this will cause friendica to repo
 $a->strings["Account Nickname"] = "Pseudo du compte";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@NomEtiquette - prend le pas sur Nom/Pseudo";
 $a->strings["Account URL"] = "URL du compte";
+$a->strings["Account URL Alias"] = "";
 $a->strings["Friend Request URL"] = "Echec du téléversement de l'image.";
 $a->strings["Friend Confirm URL"] = "Accès public refusé.";
 $a->strings["Notification Endpoint URL"] = "Aucune photo sélectionnée";
@@ -825,7 +836,6 @@ $a->strings["Upload"] = "Téléverser";
 $a->strings["Files"] = "Fichiers";
 $a->strings["You must be logged in to use this module"] = "";
 $a->strings["Source URL"] = "";
-$a->strings["Not Found"] = "Non trouvé";
 $a->strings["- select -"] = "- choisir -";
 $a->strings["The contact could not be added."] = "";
 $a->strings["You already added this contact."] = "Vous avez déjà ajouté ce contact.";
@@ -869,6 +879,7 @@ $a->strings["Add contact to group"] = "";
 $a->strings["No profile"] = "Aucun profil";
 $a->strings["Help:"] = "Aide :";
 $a->strings["Help"] = "Aide";
+$a->strings["Not Found"] = "Non trouvé";
 $a->strings["Welcome to %s"] = "Bienvenue sur %s";
 $a->strings["Total invitation limit exceeded."] = "La limite d'invitation totale est éxédée.";
 $a->strings["%s : Not a valid email address."] = "%s : Adresse de courriel invalide.";
@@ -928,12 +939,12 @@ $a->strings["Your password may be changed from the <em>Settings</em> page after
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tYour password has been changed as requested. Please retain this\n\t\t\tinformation for your records (or change your password immediately to\n\t\t\tsomething that you will remember).\n\t\t"] = "";
 $a->strings["\n\t\t\tYour login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t%2\$s\n\t\t\tPassword:\t%3\$s\n\n\t\t\tYou may change that password from your account settings page after logging in.\n\t\t"] = "";
 $a->strings["Your password has been changed at %s"] = "Votre mot de passe a été modifié à %s";
-$a->strings["System down for maintenance"] = "Système indisponible pour cause de maintenance";
 $a->strings["Manage Identities and/or Pages"] = "Gérer les identités et/ou les pages";
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Basculez entre les différentes identités ou pages (groupes/communautés) qui se partagent votre compte ou que vous avez été autorisé à gérer.";
 $a->strings["Select an identity to manage: "] = "Choisir une identité à gérer: ";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Aucun mot-clé en correspondance. Merci d'ajouter des mots-clés à votre profil par défaut.";
-$a->strings["is interested in:"] = "s'intéresse à :";
+$a->strings["first"] = "premier";
+$a->strings["next"] = "suivant";
 $a->strings["Profile Match"] = "Correpondance de profils";
 $a->strings["New Message"] = "Nouveau message";
 $a->strings["No recipient selected."] = "Pas de destinataire sélectionné.";
@@ -1118,7 +1129,6 @@ $a->strings["Comment"] = "Commenter";
 $a->strings["Map"] = "Carte";
 $a->strings["View Album"] = "Voir l'album";
 $a->strings["{0} wants to be your friend"] = "{0} souhaite être votre ami(e)";
-$a->strings["{0} sent you a message"] = "{0} vous a envoyé un message";
 $a->strings["{0} requested registration"] = "{0} a demandé à s'inscrire";
 $a->strings["Poke/Prod"] = "Solliciter";
 $a->strings["poke, prod or do other things to somebody"] = "solliciter (poke/...) quelqu'un";
@@ -1126,10 +1136,19 @@ $a->strings["Recipient"] = "Destinataire";
 $a->strings["Choose what you wish to do to recipient"] = "Choisissez ce que vous voulez faire au destinataire";
 $a->strings["Make this post private"] = "Rendez ce message privé";
 $a->strings["Only logged in users are permitted to perform a probing."] = "";
-$a->strings["Requested profile is not available."] = "Le profil demandé n'est pas disponible.";
-$a->strings["%s's timeline"] = "";
-$a->strings["%s's posts"] = "";
-$a->strings["%s's comments"] = "";
+$a->strings["Image uploaded but image cropping failed."] = "Image envoyée, mais impossible de la retailler.";
+$a->strings["Image size reduction [%s] failed."] = "Réduction de la taille de l'image [%s] échouée.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Rechargez la page avec la touche Maj pressée, ou bien effacez le cache du navigateur, si d'aventure la nouvelle photo n'apparaissait pas immédiatement.";
+$a->strings["Unable to process image"] = "Impossible de traiter l'image";
+$a->strings["Upload File:"] = "Fichier à téléverser :";
+$a->strings["Select a profile:"] = "Choisir un profil :";
+$a->strings["or"] = "ou";
+$a->strings["skip this step"] = "ignorer cette étape";
+$a->strings["select a photo from your photo albums"] = "choisissez une photo depuis vos albums";
+$a->strings["Crop Image"] = "(Re)cadrer l'image";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Ajustez le cadre de l'image pour une visualisation optimale.";
+$a->strings["Done Editing"] = "Édition terminée";
+$a->strings["Image uploaded successfully."] = "Image téléversée avec succès.";
 $a->strings["Profile deleted."] = "Profil supprimé.";
 $a->strings["Profile-"] = "Profil-";
 $a->strings["New profile created."] = "Nouveau profil créé.";
@@ -1210,48 +1229,10 @@ $a->strings["visible to everybody"] = "visible par tous";
 $a->strings["Edit/Manage Profiles"] = "Editer / gérer les profils";
 $a->strings["Change profile photo"] = "Changer de photo de profil";
 $a->strings["Create New Profile"] = "Créer un nouveau profil";
-$a->strings["Image uploaded but image cropping failed."] = "Image envoyée, mais impossible de la retailler.";
-$a->strings["Image size reduction [%s] failed."] = "Réduction de la taille de l'image [%s] échouée.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Rechargez la page avec la touche Maj pressée, ou bien effacez le cache du navigateur, si d'aventure la nouvelle photo n'apparaissait pas immédiatement.";
-$a->strings["Unable to process image"] = "Impossible de traiter l'image";
-$a->strings["Upload File:"] = "Fichier à téléverser :";
-$a->strings["Select a profile:"] = "Choisir un profil :";
-$a->strings["or"] = "ou";
-$a->strings["skip this step"] = "ignorer cette étape";
-$a->strings["select a photo from your photo albums"] = "choisissez une photo depuis vos albums";
-$a->strings["Crop Image"] = "(Re)cadrer l'image";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Ajustez le cadre de l'image pour une visualisation optimale.";
-$a->strings["Done Editing"] = "Édition terminée";
-$a->strings["Image uploaded successfully."] = "Image téléversée avec succès.";
 $a->strings["Invalid profile identifier."] = "Identifiant de profil invalide.";
 $a->strings["Profile Visibility Editor"] = "Éditer la visibilité du profil";
 $a->strings["Visible To"] = "Visible par";
 $a->strings["All Contacts (with secure profile access)"] = "Tous les contacts (ayant un accès sécurisé)";
-$a->strings["Registration successful. Please check your email for further instructions."] = "Inscription réussie. Vérifiez vos emails pour la suite des instructions.";
-$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Impossible d’envoyer le courriel de confirmation. Voici vos informations de connexion:<br> identifiant : %s<br> mot de passe : %s<br><br>Vous pourrez changer votre mot de passe une fois connecté.";
-$a->strings["Registration successful."] = "Inscription réussie.";
-$a->strings["Your registration can not be processed."] = "Votre inscription ne peut être traitée.";
-$a->strings["Your registration is pending approval by the site owner."] = "Votre inscription attend une validation du propriétaire du site.";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Le nombre d'inscriptions quotidiennes pour ce site a été dépassé. Merci de réessayer demain.";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vous pouvez (si vous le souhaitez) remplir ce formulaire via OpenID. Fournissez votre OpenID et cliquez \"S'inscrire\".";
-$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si vous n'êtes pas familier avec OpenID, laissez ce champ vide et remplissez le reste.";
-$a->strings["Your OpenID (optional): "] = "Votre OpenID (facultatif): ";
-$a->strings["Include your profile in member directory?"] = "Inclure votre profil dans l'annuaire des membres?";
-$a->strings["Note for the admin"] = "Commentaire pour l'administrateur";
-$a->strings["Leave a message for the admin, why you want to join this node"] = "Indiquez à l'administrateur les raisons de votre inscription à cette instance.";
-$a->strings["Membership on this site is by invitation only."] = "L'inscription à ce site se fait uniquement sur invitation.";
-$a->strings["Your invitation code: "] = "";
-$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Votre nom complet (p. ex. Michel Dupont):";
-$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Votre courriel : (Des informations de connexion vont être envoyées à cette adresse; elle doit exister).";
-$a->strings["New Password:"] = "Nouveau mot de passe :";
-$a->strings["Leave empty for an auto generated password."] = "Laisser ce champ libre pour obtenir un mot de passe généré automatiquement.";
-$a->strings["Confirm:"] = "Confirmer :";
-$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@%s</strong>'."] = "";
-$a->strings["Choose a nickname: "] = "Choisir un pseudo : ";
-$a->strings["Register"] = "S'inscrire";
-$a->strings["Import"] = "Importer";
-$a->strings["Import your profile to this friendica instance"] = "Importer votre profile dans cette instance de friendica";
-$a->strings["Note: This node explicitly contains adult content"] = "";
 $a->strings["Account approved."] = "Inscription validée.";
 $a->strings["Registration revoked for %s"] = "Inscription révoquée pour %s";
 $a->strings["Please login."] = "Merci de vous connecter.";
@@ -1283,12 +1264,10 @@ $a->strings["Failed to connect with email account using the settings provided."]
 $a->strings["Email settings updated."] = "Réglages de courriel mis à jour.";
 $a->strings["Features updated"] = "Fonctionnalités mises à jour";
 $a->strings["Relocate message has been send to your contacts"] = "Un message de relocalisation a été envoyé à vos contacts.";
-$a->strings["Passwords do not match. Password unchanged."] = "Les mots de passe ne correspondent pas. Aucun changement appliqué.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Les mots de passe vides sont interdits. Aucun changement appliqué.";
-$a->strings["The new password has been exposed in a public data dump, please choose another."] = "";
-$a->strings["Wrong password."] = "Mauvais mot de passe.";
-$a->strings["Password changed."] = "Mot de passe changé.";
+$a->strings["Passwords do not match."] = "";
 $a->strings["Password update failed. Please try again."] = "Le changement de mot de passe a échoué. Merci de recommencer.";
+$a->strings["Password changed."] = "Mot de passe changé.";
+$a->strings["Password unchanged."] = "";
 $a->strings[" Please use a shorter name."] = " Merci d'utiliser un nom plus court.";
 $a->strings[" Name too short."] = " Nom trop court.";
 $a->strings["Wrong Password"] = "Mauvais mot de passe";
@@ -1417,6 +1396,9 @@ $a->strings["Expire photos:"] = "Faire expirer les photos :";
 $a->strings["Only expire posts by others:"] = "Faire expirer seulement les publications des autres:";
 $a->strings["Account Settings"] = "Compte";
 $a->strings["Password Settings"] = "Réglages de mot de passe";
+$a->strings["New Password:"] = "Nouveau mot de passe :";
+$a->strings["Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:)."] = "";
+$a->strings["Confirm:"] = "Confirmer :";
 $a->strings["Leave password fields blank unless changing"] = "Laissez les champs de mot de passe vierges, sauf si vous désirez les changer";
 $a->strings["Current Password:"] = "Mot de passe actuel :";
 $a->strings["Your current password to confirm the changes"] = "Votre mot de passe actuel pour confirmer les modifications";
@@ -1472,6 +1454,8 @@ $a->strings["Export your account info and contacts. Use this to make a backup of
 $a->strings["Export all"] = "Tout exporter";
 $a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportez votre compte, vos infos, vos contacts et toutes vos publications (en JSON). Le fichier résultant peut être extrêmement volumineux, et sa production peut durer longtemps. Vous pourrez l'utiliser pour faire une sauvegarde complète (à part les photos).";
 $a->strings["User imports on closed servers can only be done by an administrator."] = "";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Le nombre d'inscriptions quotidiennes pour ce site a été dépassé. Merci de réessayer demain.";
+$a->strings["Import"] = "Importer";
 $a->strings["Move account"] = "Migrer le compte";
 $a->strings["You can import an account from another Friendica server."] = "Vous pouvez importer un compte d'un autre serveur Friendica.";
 $a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Vous devez exporter votre compte à partir de l'ancien serveur et le téléverser ici. Nous recréerons votre ancien compte ici avec tous vos contacts. Nous tenterons également d'informer vos amis que vous avez déménagé ici.";
@@ -1492,21 +1476,286 @@ $a->strings["Upload New Videos"] = "Téléversé une nouvelle vidéo";
 $a->strings["No contacts."] = "Aucun contact.";
 $a->strings["Visit %s's profile [%s]"] = "Visiter le profil de %s [%s]";
 $a->strings["Contacts"] = "Contacts";
-$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Nombre de messages de mur quotidiens pour %s dépassé. Échec du message.";
-$a->strings["Unable to check your home location."] = "Impossible de vérifier votre localisation.";
-$a->strings["No recipient."] = "Pas de destinataire.";
-$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Si vous souhaitez que %s réponde, merci de vérifier vos réglages pour autoriser les messages privés venant d'inconnus.";
 $a->strings["Invalid request."] = "Requête invalide.";
 $a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Désolé, il semble que votre fichier est plus important que ce que la configuration de PHP autorise";
 $a->strings["Or - did you try to upload an empty file?"] = "Ou — auriez-vous essayé de télécharger un fichier vide ?";
 $a->strings["File exceeds size limit of %s"] = "La taille du fichier dépasse la limite de %s";
 $a->strings["File upload failed."] = "Le téléversement a échoué.";
 $a->strings["Wall Photos"] = "Photos du mur";
-$a->strings["Delete this item?"] = "Effacer cet élément?";
-$a->strings["show fewer"] = "montrer moins";
-$a->strings["toggle mobile"] = "activ. mobile";
-$a->strings["No system theme config value set."] = "";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probablement dire que le formulaire est resté ouvert trop longtemps (plus de 3 heures) avant d'être validé.";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Nombre de messages de mur quotidiens pour %s dépassé. Échec du message.";
+$a->strings["Unable to check your home location."] = "Impossible de vérifier votre localisation.";
+$a->strings["No recipient."] = "Pas de destinataire.";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Si vous souhaitez que %s réponde, merci de vérifier vos réglages pour autoriser les messages privés venant d'inconnus.";
+$a->strings["default"] = "défaut";
+$a->strings["greenzero"] = "greenzero";
+$a->strings["purplezero"] = "purplezero";
+$a->strings["easterbunny"] = "easterbunny";
+$a->strings["darkzero"] = "darkzero";
+$a->strings["comix"] = "comix";
+$a->strings["slackr"] = "slackr";
+$a->strings["Variations"] = "Variations";
+$a->strings["Top Banner"] = "Bannière du haut";
+$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Redimensionner l'image à la largeur de l'écran et combler en dessous avec la couleur d'arrière plan.";
+$a->strings["Full screen"] = "Plein écran";
+$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Agrandir l'image pour remplir l'écran, jusqu'à toucher le bord droit ou le bas de l'écran.";
+$a->strings["Single row mosaic"] = "Mosaïque sur un rang";
+$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Redimensionner l'image pour la dupliquer sur un seul rang, vertical ou horizontal.";
+$a->strings["Mosaic"] = "Mosaïque";
+$a->strings["Repeat image to fill the screen."] = "Dupliquer l'image pour couvrir l'écran.";
+$a->strings["Custom"] = "Personnalisé";
+$a->strings["Note"] = "Remarque";
+$a->strings["Check image permissions if all users are allowed to see the image"] = "Vérifier que tous les utilisateurs du site sont autorisés à voir l'image.";
+$a->strings["Select color scheme"] = "Choisir le schéma de couleurs";
+$a->strings["Navigation bar background color"] = "Couleur d'arrière-plan de la barre de navigation";
+$a->strings["Navigation bar icon color "] = "Couleur des icônes de la barre de navigation";
+$a->strings["Link color"] = "Couleur des liens";
+$a->strings["Set the background color"] = "Couleur d'arrière-plan";
+$a->strings["Content background opacity"] = "Opacité du contenu d'arrière-plan";
+$a->strings["Set the background image"] = "Image d'arrière-plan";
+$a->strings["Background image style"] = "Style de l'image de fond";
+$a->strings["Login page background image"] = "Image de fond de la page de login";
+$a->strings["Login page background color"] = "Couleur d'arrière-plan de la page de login";
+$a->strings["Leave background image and color empty for theme defaults"] = "Laisser l'image et la couleur de fond vides pour les paramètres par défaut du thème";
+$a->strings["Guest"] = "Invité";
+$a->strings["Visitor"] = "Visiteur";
+$a->strings["Logout"] = "Se déconnecter";
+$a->strings["End this session"] = "Mettre fin à cette session";
+$a->strings["Status"] = "Statut";
+$a->strings["Your posts and conversations"] = "Vos publications et conversations";
+$a->strings["Your profile page"] = "Votre page de profil";
+$a->strings["Your photos"] = "Vos photos";
+$a->strings["Videos"] = "Vidéos";
+$a->strings["Your videos"] = "Vos vidéos";
+$a->strings["Your events"] = "Vos événements";
+$a->strings["Conversations from your friends"] = "Conversations de vos amis";
+$a->strings["Events and Calendar"] = "Événements et agenda";
+$a->strings["Private mail"] = "Messages privés";
+$a->strings["Account settings"] = "Compte";
+$a->strings["Manage/edit friends and contacts"] = "Gérer/éditer les amitiés et contacts";
+$a->strings["Alignment"] = "Alignement";
+$a->strings["Left"] = "Gauche";
+$a->strings["Center"] = "Centre";
+$a->strings["Color scheme"] = "Palette de couleurs";
+$a->strings["Posts font size"] = "Taille de texte des publications";
+$a->strings["Textareas font size"] = "Taille de police des zones de texte";
+$a->strings["Comma separated list of helper forums"] = "Liste de forums d'aide, séparés par des virgules";
+$a->strings["don't show"] = "cacher";
+$a->strings["show"] = "montrer";
+$a->strings["Set style"] = "Définir le style";
+$a->strings["Community Pages"] = "Pages de Communauté";
+$a->strings["Community Profiles"] = "Profils communautaires";
+$a->strings["Help or @NewHere ?"] = "Aide ou @NewHere?";
+$a->strings["Connect Services"] = "Connecter des services";
+$a->strings["Find Friends"] = "Trouver des amis";
+$a->strings["Last users"] = "Derniers utilisateurs";
+$a->strings["Find People"] = "Trouver des personnes";
+$a->strings["Enter name or interest"] = "Entrez un nom ou un centre d'intérêt";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Exemples : Robert Morgenstein, Pêche";
+$a->strings["Similar Interests"] = "Intérêts similaires";
+$a->strings["Random Profile"] = "Profil au hasard";
+$a->strings["Invite Friends"] = "Inviter des amis";
+$a->strings["Local Directory"] = "Annuaire local";
+$a->strings["Forums"] = "Forums";
+$a->strings["External link to forum"] = "Lien sortant vers le forum";
+$a->strings["Quick Start"] = "Démarrage rapide";
+$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "";
+$a->strings["The contact entries have been archived"] = "";
+$a->strings["Enter new password: "] = "";
+$a->strings["Post update version number has been set to %s."] = "";
+$a->strings["Check for pending update actions."] = "";
+$a->strings["Done."] = "";
+$a->strings["Execute pending post updates."] = "";
+$a->strings["All pending post updates are done."] = "";
+$a->strings["Post to Email"] = "Publier aux courriels";
+$a->strings["Hide your profile details from unknown viewers?"] = "Cacher les détails du profil aux visiteurs inconnus?";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Les connecteurs sont désactivés parce que \"%s\" est activé.";
+$a->strings["Visible to everybody"] = "Visible par tout le monde";
+$a->strings["Close"] = "Fermer";
+$a->strings["Welcome "] = "Bienvenue ";
+$a->strings["Please upload a profile photo."] = "Merci d'illustrer votre profil d'une image.";
+$a->strings["Welcome back "] = "Bienvenue à nouveau, ";
+$a->strings["The database configuration file \"config/local.config.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Vous pourriez avoir besoin d'importer le fichier \"database.sql\" manuellement au moyen de phpmyadmin ou de la commande mysql.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Référez-vous au fichier \"INSTALL.txt\".";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH du serveur web.";
+$a->strings["If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"] = "";
+$a->strings["PHP executable path"] = "Chemin vers l'exécutable de PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Entrez le chemin (absolu) vers l'exécutable 'php'. Vous pouvez laisser cette ligne vide pour continuer l'installation.";
+$a->strings["Command line PHP"] = "Version \"ligne de commande\" de PHP";
+$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "L'executable PHP n'est pas le binaire php client (c'est peut être la version cgi-fcgi)";
+$a->strings["Found PHP version: "] = "Version de PHP :";
+$a->strings["PHP cli binary"] = "PHP cli binary";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La version \"ligne de commande\" de PHP de votre système n'a pas \"register_argc_argv\" d'activé.";
+$a->strings["This is required for message delivery to work."] = "Ceci est requis pour que la livraison des messages fonctionne.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Erreur: la fonction \"openssl_pkey_new\" de ce système ne permet pas de générer des clés de chiffrement";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si vous utilisez Windows, merci de vous réferer à \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Générer les clés de chiffrement";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Erreur : Le module \"rewrite\" du serveur web Apache est requis mais pas installé.";
+$a->strings["Apache mod_rewrite module"] = "Module mod_rewrite Apache";
+$a->strings["Error: PDO or MySQLi PHP module required but not installed."] = "";
+$a->strings["Error: The MySQL driver for PDO is not installed."] = "";
+$a->strings["PDO or MySQLi PHP module"] = "";
+$a->strings["Error, XML PHP module required but not installed."] = "Erreur : le module PHP XML requis est absent.";
+$a->strings["XML PHP module"] = "Module PHP XML";
+$a->strings["libCurl PHP module"] = "Module libCurl de PHP";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Erreur : Le module PHP \"libCURL\" est requis mais pas installé.";
+$a->strings["GD graphics PHP module"] = "Module GD (graphiques) de PHP";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Erreur : Le module PHP \"GD\" disposant du support JPEG est requis mais pas installé.";
+$a->strings["OpenSSL PHP module"] = "Module OpenSSL de PHP";
+$a->strings["Error: openssl PHP module required but not installed."] = "Erreur : Le module PHP \"openssl\" est requis mais pas installé.";
+$a->strings["mb_string PHP module"] = "Module mb_string de PHP";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Erreur : le module PHP mb_string est requis mais pas installé.";
+$a->strings["iconv PHP module"] = "";
+$a->strings["Error: iconv PHP module required but not installed."] = "Erreur : Le module PHP iconv requis est absent.";
+$a->strings["POSIX PHP module"] = "";
+$a->strings["Error: POSIX PHP module required but not installed."] = "";
+$a->strings["JSON PHP module"] = "";
+$a->strings["Error: JSON PHP module required but not installed."] = "";
+$a->strings["The web installer needs to be able to create a file called \"local.config.php\" in the \"config\" folder of your web server and it is unable to do so."] = "";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Le plus souvent, il s'agit d'un problème de permission. Le serveur web peut ne pas être capable d'écrire dans votre répertoire - alors que vous-même le pouvez.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder."] = "";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Vous pouvez également sauter cette étape et procéder à une installation manuelle. Pour cela, merci de lire le fichier \"INSTALL.txt\".";
+$a->strings["config/local.config.php is writable"] = "";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica utilise le moteur de modèles Smarty3 pour le rendu d'affichage web. Smarty3 compile les modèles en PHP pour accélérer le rendu.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Pour pouvoir stocker ces modèles compilés, le serveur internet doit avoir accès au droit d'écriture pour le répertoire view/smarty3/ sous le dossier racine de Friendica.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Veuillez vous assurer que l'utilisateur qui exécute votre serveur internet (p. ex. www-data) détient le droit d'accès en écriture sur ce dossier.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Note: pour plus de sécurité, vous devriez ne donner le droit d'accès en écriture qu'à view/smarty3/ et pas aux fichiers modèles (.tpl) qu'il contient.";
+$a->strings["view/smarty3 is writable"] = "view/smarty3 est autorisé à l écriture";
+$a->strings["Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess."] = "";
+$a->strings["Error message from Curl when fetching"] = "";
+$a->strings["Url rewrite is working"] = "La réécriture d'URL fonctionne.";
+$a->strings["ImageMagick PHP extension is not installed"] = "L'extension PHP ImageMagick n'est pas installée";
+$a->strings["ImageMagick PHP extension is installed"] = "L’extension PHP ImageMagick est installée";
+$a->strings["ImageMagick supports GIF"] = "ImageMagick supporte le format GIF";
+$a->strings["Could not connect to database."] = "Impossible de se connecter à la base.";
+$a->strings["Database already in use."] = "Base de données déjà en cours d'utilisation.";
+$a->strings["Tuesday"] = "Mardi";
+$a->strings["Wednesday"] = "Mercredi";
+$a->strings["Thursday"] = "Jeudi";
+$a->strings["Friday"] = "Vendredi";
+$a->strings["Saturday"] = "Samedi";
+$a->strings["January"] = "Janvier";
+$a->strings["February"] = "Février";
+$a->strings["March"] = "Mars";
+$a->strings["April"] = "Avril";
+$a->strings["May"] = "Mai";
+$a->strings["June"] = "Juin";
+$a->strings["July"] = "Juillet";
+$a->strings["August"] = "Août";
+$a->strings["September"] = "Septembre";
+$a->strings["October"] = "Octobre";
+$a->strings["November"] = "Novembre";
+$a->strings["December"] = "Décembre";
+$a->strings["Mon"] = "Lun";
+$a->strings["Tue"] = "Mar";
+$a->strings["Wed"] = "Mer";
+$a->strings["Thu"] = "Jeu";
+$a->strings["Fri"] = "Ven";
+$a->strings["Sat"] = "Sam";
+$a->strings["Sun"] = "Dim";
+$a->strings["Jan"] = "Jan";
+$a->strings["Feb"] = "Fév";
+$a->strings["Mar"] = "Mar";
+$a->strings["Apr"] = "Avr";
+$a->strings["Jul"] = "Jul";
+$a->strings["Aug"] = "Aoû";
+$a->strings["Sep"] = "";
+$a->strings["Oct"] = "Oct";
+$a->strings["Nov"] = "Nov";
+$a->strings["Dec"] = "Déc";
+$a->strings["poke"] = "titiller";
+$a->strings["poked"] = "a titillé";
+$a->strings["ping"] = "attirer l'attention";
+$a->strings["pinged"] = "a attiré l'attention de";
+$a->strings["prod"] = "aiguillonner";
+$a->strings["prodded"] = "a aiguillonné";
+$a->strings["slap"] = "gifler";
+$a->strings["slapped"] = "a giflé";
+$a->strings["finger"] = "tripoter";
+$a->strings["fingered"] = "a tripoté";
+$a->strings["rebuff"] = "rabrouer";
+$a->strings["rebuffed"] = "a rabroué";
+$a->strings["System"] = "Système";
+$a->strings["Home"] = "Profil";
+$a->strings["Introductions"] = "Introductions";
+$a->strings["%s commented on %s's post"] = "%s a commenté la publication de %s";
+$a->strings["%s created a new post"] = "%s a créé une nouvelle publication";
+$a->strings["%s liked %s's post"] = "%s a aimé la publication de %s";
+$a->strings["%s disliked %s's post"] = "%s n'a pas aimé la publication de %s";
+$a->strings["%s is attending %s's event"] = "%s participe à l'événement de %s";
+$a->strings["%s is not attending %s's event"] = "%s ne participe pas à l'événement de %s";
+$a->strings["%s may attend %s's event"] = "%s participera peut-être à l'événement de %s";
+$a->strings["%s is now friends with %s"] = "%s est désormais ami(e) avec %s";
+$a->strings["Friend Suggestion"] = "Suggestion d'amitié/contact";
+$a->strings["Friend/Connect Request"] = "Demande de connexion/relation";
+$a->strings["New Follower"] = "Nouvel abonné";
+$a->strings["Error 400 - Bad Request"] = "";
+$a->strings["Error 401 - Unauthorized"] = "";
+$a->strings["Error 403 - Forbidden"] = "";
+$a->strings["Error 404 - Not Found"] = "";
+$a->strings["Error 500 - Internal Server Error"] = "";
+$a->strings["Error 503 - Service Unavailable"] = "";
+$a->strings["The server cannot or will not process the request due to an apparent client error."] = "";
+$a->strings["Authentication is required and has failed or has not yet been provided."] = "";
+$a->strings["The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account."] = "";
+$a->strings["The requested resource could not be found but may be available in the future."] = "";
+$a->strings["An unexpected condition was encountered and no more specific message is suitable."] = "";
+$a->strings["The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later."] = "";
+$a->strings["Update %s failed. See error logs."] = "Mise-à-jour %s échouée. Voir les journaux d'erreur.";
+$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "";
+$a->strings["The error message is\n[pre]%s[/pre]"] = "Le message d’erreur est\n[pre]%s[/pre]";
+$a->strings["\n\t\t\t\t\tThe friendica database was successfully updated from %s to %s."] = "";
+$a->strings["Error decoding account file"] = "Une erreur a été détecté en décodant un fichier utilisateur";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Erreur ! Pas de ficher de version existant ! Êtes vous sur un compte Friendica ?";
+$a->strings["User '%s' already exists on this server!"] = "L'utilisateur '%s' existe déjà sur ce serveur!";
+$a->strings["User creation error"] = "Erreur de création d'utilisateur";
+$a->strings["User profile creation error"] = "Erreur de création du profil utilisateur";
+$a->strings["%d contact not imported"] = [
+	0 => "%d contacts non importés",
+	1 => "%d contacts non importés",
+];
+$a->strings["Done. You can now login with your username and password"] = "Action réalisée. Vous pouvez désormais vous connecter avec votre nom d'utilisateur et votre mot de passe";
+$a->strings["Birthday:"] = "Anniversaire :";
+$a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-JJ ou MM-JJ";
+$a->strings["never"] = "jamais";
+$a->strings["less than a second ago"] = "il y a moins d'une seconde";
+$a->strings["year"] = "an";
+$a->strings["years"] = "ans";
+$a->strings["months"] = "mois";
+$a->strings["weeks"] = "semaines";
+$a->strings["days"] = "jours";
+$a->strings["hour"] = "heure";
+$a->strings["hours"] = "heures";
+$a->strings["minute"] = "minute";
+$a->strings["minutes"] = "minutes";
+$a->strings["second"] = "seconde";
+$a->strings["seconds"] = "secondes";
+$a->strings["in %1\$d %2\$s"] = "";
+$a->strings["%1\$d %2\$s ago"] = "il y a %1\$d %2\$s ";
+$a->strings["view full size"] = "voir en pleine taille";
+$a->strings["Image/photo"] = "Image/photo";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
+$a->strings["$1 wrote:"] = "$1 a écrit :";
+$a->strings["Encrypted content"] = "Contenu chiffré";
+$a->strings["Invalid source protocol"] = "";
+$a->strings["Invalid link protocol"] = "";
+$a->strings["Loading more entries..."] = "Chargement de résultats supplémentaires...";
+$a->strings["The end"] = "Fin";
+$a->strings["Follow"] = "S'abonner";
+$a->strings["@name, !forum, #tags, content"] = "@nom, !forum, #tags, contenu";
+$a->strings["Full Text"] = "Texte Entier";
+$a->strings["Tags"] = "Tags";
+$a->strings["Click to open/close"] = "Cliquer pour ouvrir/fermer";
+$a->strings["Export"] = "Exporter";
+$a->strings["Export calendar as ical"] = "Exporter au format iCal";
+$a->strings["Export calendar as csv"] = "Exporter au format CSV";
+$a->strings["No contacts"] = "Aucun contact";
+$a->strings["%d Contact"] = [
+	0 => "%d contact",
+	1 => "%d contacts",
+];
+$a->strings["View Contacts"] = "Voir les contacts";
 $a->strings["Frequently"] = "";
 $a->strings["Hourly"] = "";
 $a->strings["Twice daily"] = "";
@@ -1594,6 +1843,8 @@ $a->strings["Ability for visitors to download the public calendar"] = "Les visit
 $a->strings["Post Composition Features"] = "Caractéristiques de composition de publication";
 $a->strings["Auto-mention Forums"] = "Mentionner automatiquement les Forums";
 $a->strings["Add/remove mention when a forum page is selected/deselected in ACL window."] = "Ajoute/retire une mention quand une page forum est sélectionnée/désélectionnée lors du choix des destinataires d'une publication.";
+$a->strings["Explicit Mentions"] = "";
+$a->strings["Add explicit mentions to comment box for manual control over who gets mentioned in replies."] = "";
 $a->strings["Network Sidebar"] = "";
 $a->strings["Ability to select posts by date ranges"] = "Capacité de sélectionner les publications par intervalles de dates";
 $a->strings["Protocol Filter"] = "";
@@ -1613,54 +1864,34 @@ $a->strings["Tag Cloud"] = "";
 $a->strings["Provide a personal tag cloud on your profile page"] = "";
 $a->strings["Display Membership Date"] = "";
 $a->strings["Display membership date in profile"] = "";
-$a->strings["Forums"] = "Forums";
-$a->strings["External link to forum"] = "Lien sortant vers le forum";
 $a->strings["Nothing new here"] = "Rien de neuf ici";
 $a->strings["Clear notifications"] = "Effacer les notifications";
-$a->strings["@name, !forum, #tags, content"] = "@nom, !forum, #tags, contenu";
-$a->strings["Logout"] = "Se déconnecter";
-$a->strings["End this session"] = "Mettre fin à cette session";
-$a->strings["Status"] = "Statut";
-$a->strings["Your posts and conversations"] = "Vos publications et conversations";
-$a->strings["Your profile page"] = "Votre page de profil";
-$a->strings["Your photos"] = "Vos photos";
-$a->strings["Videos"] = "Vidéos";
-$a->strings["Your videos"] = "Vos vidéos";
-$a->strings["Your events"] = "Vos événements";
 $a->strings["Personal notes"] = "Notes personnelles";
 $a->strings["Your personal notes"] = "Vos notes personnelles";
 $a->strings["Sign in"] = "Se connecter";
-$a->strings["Home"] = "Profil";
 $a->strings["Home Page"] = "Page d'accueil";
+$a->strings["Register"] = "S'inscrire";
 $a->strings["Create an account"] = "Créer un compte";
 $a->strings["Help and documentation"] = "Aide et documentation";
 $a->strings["Apps"] = "Applications";
 $a->strings["Addon applications, utilities, games"] = "Applications supplémentaires, utilitaires, jeux";
 $a->strings["Search site content"] = "Rechercher dans le contenu du site";
-$a->strings["Full Text"] = "Texte Entier";
-$a->strings["Tags"] = "Tags";
 $a->strings["Community"] = "Communauté";
 $a->strings["Conversations on this and other servers"] = "";
-$a->strings["Events and Calendar"] = "Événements et agenda";
 $a->strings["Directory"] = "Annuaire";
 $a->strings["People directory"] = "Annuaire des utilisateurs";
 $a->strings["Information about this friendica instance"] = "Information au sujet de cette instance de friendica";
 $a->strings["Terms of Service of this Friendica instance"] = "";
-$a->strings["Conversations from your friends"] = "Conversations de vos amis";
 $a->strings["Network Reset"] = "Réinitialiser le réseau";
 $a->strings["Load Network page with no filters"] = "Chargement des pages du réseau sans filtre";
-$a->strings["Introductions"] = "Introductions";
 $a->strings["Friend Requests"] = "Demande d'amitié";
 $a->strings["See all notifications"] = "Voir toutes les notifications";
 $a->strings["Mark all system notifications seen"] = "Marquer toutes les notifications système comme 'vues'";
-$a->strings["Private mail"] = "Messages privés";
 $a->strings["Inbox"] = "Messages entrants";
 $a->strings["Outbox"] = "Messages sortants";
 $a->strings["Manage"] = "Gérer";
 $a->strings["Manage other pages"] = "Gérer les autres pages";
-$a->strings["Account settings"] = "Compte";
 $a->strings["Manage/Edit Profiles"] = "Gérer/Éditer les profiles";
-$a->strings["Manage/edit friends and contacts"] = "Gérer/éditer les amitiés et contacts";
 $a->strings["Site setup and configuration"] = "Démarrage et configuration du site";
 $a->strings["Navigation"] = "Navigation";
 $a->strings["Site map"] = "Carte du site";
@@ -1668,30 +1899,8 @@ $a->strings["Embedding disabled"] = "Incorporation désactivée";
 $a->strings["Embedded content"] = "Contenu incorporé";
 $a->strings["newer"] = "Plus récent";
 $a->strings["older"] = "Plus ancien";
-$a->strings["first"] = "premier";
 $a->strings["prev"] = "précédent";
-$a->strings["next"] = "suivant";
 $a->strings["last"] = "dernier";
-$a->strings["view full size"] = "voir en pleine taille";
-$a->strings["Image/photo"] = "Image/photo";
-$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
-$a->strings["$1 wrote:"] = "$1 a écrit :";
-$a->strings["Encrypted content"] = "Contenu chiffré";
-$a->strings["Invalid source protocol"] = "";
-$a->strings["Invalid link protocol"] = "";
-$a->strings["Loading more entries..."] = "Chargement de résultats supplémentaires...";
-$a->strings["The end"] = "Fin";
-$a->strings["No contacts"] = "Aucun contact";
-$a->strings["%d Contact"] = [
-	0 => "%d contact",
-	1 => "%d contacts",
-];
-$a->strings["View Contacts"] = "Voir les contacts";
-$a->strings["Follow"] = "S'abonner";
-$a->strings["Click to open/close"] = "Cliquer pour ouvrir/fermer";
-$a->strings["Export"] = "Exporter";
-$a->strings["Export calendar as ical"] = "Exporter au format iCal";
-$a->strings["Export calendar as csv"] = "Exporter au format CSV";
 $a->strings["Add New Contact"] = "Ajouter un nouveau contact";
 $a->strings["Enter address or web location"] = "Entrez son adresse ou sa localisation web";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Exemple : bob@example.com, http://example.com/barbara";
@@ -1699,13 +1908,6 @@ $a->strings["%d invitation available"] = [
 	0 => "%d invitation disponible",
 	1 => "%d invitations disponibles",
 ];
-$a->strings["Find People"] = "Trouver des personnes";
-$a->strings["Enter name or interest"] = "Entrez un nom ou un centre d'intérêt";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Exemples : Robert Morgenstein, Pêche";
-$a->strings["Similar Interests"] = "Intérêts similaires";
-$a->strings["Random Profile"] = "Profil au hasard";
-$a->strings["Invite Friends"] = "Inviter des amis";
-$a->strings["Local Directory"] = "Annuaire local";
 $a->strings["Protocols"] = "";
 $a->strings["All Protocols"] = "";
 $a->strings["Saved Folders"] = "Dossiers sauvegardés";
@@ -1715,157 +1917,11 @@ $a->strings["%d contact in common"] = [
 	0 => "%d contact en commun",
 	1 => "%d contacts en commun",
 ];
-$a->strings["Post to Email"] = "Publier aux courriels";
-$a->strings["Hide your profile details from unknown viewers?"] = "Cacher les détails du profil aux visiteurs inconnus?";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Les connecteurs sont désactivés parce que \"%s\" est activé.";
-$a->strings["Visible to everybody"] = "Visible par tout le monde";
-$a->strings["show"] = "montrer";
-$a->strings["don't show"] = "cacher";
-$a->strings["Close"] = "Fermer";
-$a->strings["Welcome "] = "Bienvenue ";
-$a->strings["Please upload a profile photo."] = "Merci d'illustrer votre profil d'une image.";
-$a->strings["Welcome back "] = "Bienvenue à nouveau, ";
-$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "";
-$a->strings["The contact entries have been archived"] = "";
-$a->strings["Enter new password: "] = "";
-$a->strings["Password can't be empty"] = "";
-$a->strings["Post update version number has been set to %s."] = "";
-$a->strings["Check for pending update actions."] = "";
-$a->strings["Done."] = "";
-$a->strings["Execute pending post updates."] = "";
-$a->strings["All pending post updates are done."] = "";
-$a->strings["The database configuration file \"config/local.config.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Vous pourriez avoir besoin d'importer le fichier \"database.sql\" manuellement au moyen de phpmyadmin ou de la commande mysql.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Référez-vous au fichier \"INSTALL.txt\".";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH du serveur web.";
-$a->strings["If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"] = "";
-$a->strings["PHP executable path"] = "Chemin vers l'exécutable de PHP";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Entrez le chemin (absolu) vers l'exécutable 'php'. Vous pouvez laisser cette ligne vide pour continuer l'installation.";
-$a->strings["Command line PHP"] = "Version \"ligne de commande\" de PHP";
-$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "L'executable PHP n'est pas le binaire php client (c'est peut être la version cgi-fcgi)";
-$a->strings["Found PHP version: "] = "Version de PHP :";
-$a->strings["PHP cli binary"] = "PHP cli binary";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La version \"ligne de commande\" de PHP de votre système n'a pas \"register_argc_argv\" d'activé.";
-$a->strings["This is required for message delivery to work."] = "Ceci est requis pour que la livraison des messages fonctionne.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Erreur: la fonction \"openssl_pkey_new\" de ce système ne permet pas de générer des clés de chiffrement";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si vous utilisez Windows, merci de vous réferer à \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Generate encryption keys"] = "Générer les clés de chiffrement";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Erreur : Le module \"rewrite\" du serveur web Apache est requis mais pas installé.";
-$a->strings["Apache mod_rewrite module"] = "Module mod_rewrite Apache";
-$a->strings["Error: PDO or MySQLi PHP module required but not installed."] = "";
-$a->strings["Error: The MySQL driver for PDO is not installed."] = "";
-$a->strings["PDO or MySQLi PHP module"] = "";
-$a->strings["Error, XML PHP module required but not installed."] = "Erreur : le module PHP XML requis est absent.";
-$a->strings["XML PHP module"] = "Module PHP XML";
-$a->strings["libCurl PHP module"] = "Module libCurl de PHP";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Erreur : Le module PHP \"libCURL\" est requis mais pas installé.";
-$a->strings["GD graphics PHP module"] = "Module GD (graphiques) de PHP";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Erreur : Le module PHP \"GD\" disposant du support JPEG est requis mais pas installé.";
-$a->strings["OpenSSL PHP module"] = "Module OpenSSL de PHP";
-$a->strings["Error: openssl PHP module required but not installed."] = "Erreur : Le module PHP \"openssl\" est requis mais pas installé.";
-$a->strings["mb_string PHP module"] = "Module mb_string de PHP";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Erreur : le module PHP mb_string est requis mais pas installé.";
-$a->strings["iconv PHP module"] = "";
-$a->strings["Error: iconv PHP module required but not installed."] = "Erreur : Le module PHP iconv requis est absent.";
-$a->strings["POSIX PHP module"] = "";
-$a->strings["Error: POSIX PHP module required but not installed."] = "";
-$a->strings["The web installer needs to be able to create a file called \"local.config.php\" in the \"config\" folder of your web server and it is unable to do so."] = "";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Le plus souvent, il s'agit d'un problème de permission. Le serveur web peut ne pas être capable d'écrire dans votre répertoire - alors que vous-même le pouvez.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder."] = "";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Vous pouvez également sauter cette étape et procéder à une installation manuelle. Pour cela, merci de lire le fichier \"INSTALL.txt\".";
-$a->strings["config/local.config.php is writable"] = "";
-$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica utilise le moteur de modèles Smarty3 pour le rendu d'affichage web. Smarty3 compile les modèles en PHP pour accélérer le rendu.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Pour pouvoir stocker ces modèles compilés, le serveur internet doit avoir accès au droit d'écriture pour le répertoire view/smarty3/ sous le dossier racine de Friendica.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Veuillez vous assurer que l'utilisateur qui exécute votre serveur internet (p. ex. www-data) détient le droit d'accès en écriture sur ce dossier.";
-$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Note: pour plus de sécurité, vous devriez ne donner le droit d'accès en écriture qu'à view/smarty3/ et pas aux fichiers modèles (.tpl) qu'il contient.";
-$a->strings["view/smarty3 is writable"] = "view/smarty3 est autorisé à l écriture";
-$a->strings["Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess."] = "";
-$a->strings["Error message from Curl when fetching"] = "";
-$a->strings["Url rewrite is working"] = "La réécriture d'URL fonctionne.";
-$a->strings["ImageMagick PHP extension is not installed"] = "L'extension PHP ImageMagick n'est pas installée";
-$a->strings["ImageMagick PHP extension is installed"] = "L’extension PHP ImageMagick est installée";
-$a->strings["ImageMagick supports GIF"] = "ImageMagick supporte le format GIF";
-$a->strings["Could not connect to database."] = "Impossible de se connecter à la base.";
-$a->strings["Database already in use."] = "Base de données déjà en cours d'utilisation.";
-$a->strings["Tuesday"] = "Mardi";
-$a->strings["Wednesday"] = "Mercredi";
-$a->strings["Thursday"] = "Jeudi";
-$a->strings["Friday"] = "Vendredi";
-$a->strings["Saturday"] = "Samedi";
-$a->strings["January"] = "Janvier";
-$a->strings["February"] = "Février";
-$a->strings["March"] = "Mars";
-$a->strings["April"] = "Avril";
-$a->strings["May"] = "Mai";
-$a->strings["June"] = "Juin";
-$a->strings["July"] = "Juillet";
-$a->strings["August"] = "Août";
-$a->strings["September"] = "Septembre";
-$a->strings["October"] = "Octobre";
-$a->strings["November"] = "Novembre";
-$a->strings["December"] = "Décembre";
-$a->strings["Mon"] = "Lun";
-$a->strings["Tue"] = "Mar";
-$a->strings["Wed"] = "Mer";
-$a->strings["Thu"] = "Jeu";
-$a->strings["Fri"] = "Ven";
-$a->strings["Sat"] = "Sam";
-$a->strings["Sun"] = "Dim";
-$a->strings["Jan"] = "Jan";
-$a->strings["Feb"] = "Fév";
-$a->strings["Mar"] = "Mar";
-$a->strings["Apr"] = "Avr";
-$a->strings["Jul"] = "Jul";
-$a->strings["Aug"] = "Aoû";
-$a->strings["Sep"] = "";
-$a->strings["Oct"] = "Oct";
-$a->strings["Nov"] = "Nov";
-$a->strings["Dec"] = "Déc";
-$a->strings["poke"] = "titiller";
-$a->strings["poked"] = "a titillé";
-$a->strings["ping"] = "attirer l'attention";
-$a->strings["pinged"] = "a attiré l'attention de";
-$a->strings["prod"] = "aiguillonner";
-$a->strings["prodded"] = "a aiguillonné";
-$a->strings["slap"] = "gifler";
-$a->strings["slapped"] = "a giflé";
-$a->strings["finger"] = "tripoter";
-$a->strings["fingered"] = "a tripoté";
-$a->strings["rebuff"] = "rabrouer";
-$a->strings["rebuffed"] = "a rabroué";
-$a->strings["System"] = "Système";
-$a->strings["%s commented on %s's post"] = "%s a commenté la publication de %s";
-$a->strings["%s created a new post"] = "%s a créé une nouvelle publication";
-$a->strings["%s liked %s's post"] = "%s a aimé la publication de %s";
-$a->strings["%s disliked %s's post"] = "%s n'a pas aimé la publication de %s";
-$a->strings["%s is attending %s's event"] = "%s participe à l'événement de %s";
-$a->strings["%s is not attending %s's event"] = "%s ne participe pas à l'événement de %s";
-$a->strings["%s may attend %s's event"] = "%s participera peut-être à l'événement de %s";
-$a->strings["%s is now friends with %s"] = "%s est désormais ami(e) avec %s";
-$a->strings["Friend Suggestion"] = "Suggestion d'amitié/contact";
-$a->strings["Friend/Connect Request"] = "Demande de connexion/relation";
-$a->strings["New Follower"] = "Nouvel abonné";
-$a->strings["Update %s failed. See error logs."] = "Mise-à-jour %s échouée. Voir les journaux d'erreur.";
-$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "";
-$a->strings["The error message is\n[pre]%s[/pre]"] = "Le message d’erreur est\n[pre]%s[/pre]";
-$a->strings["\n\t\t\t\t\tThe friendica database was successfully updated from %s to %s."] = "";
-$a->strings["Error decoding account file"] = "Une erreur a été détecté en décodant un fichier utilisateur";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Erreur ! Pas de ficher de version existant ! Êtes vous sur un compte Friendica ?";
-$a->strings["User '%s' already exists on this server!"] = "L'utilisateur '%s' existe déjà sur ce serveur!";
-$a->strings["User creation error"] = "Erreur de création d'utilisateur";
-$a->strings["User profile creation error"] = "Erreur de création du profil utilisateur";
-$a->strings["%d contact not imported"] = [
-	0 => "%d contacts non importés",
-	1 => "%d contacts non importés",
-];
-$a->strings["Done. You can now login with your username and password"] = "Action réalisée. Vous pouvez désormais vous connecter avec votre nom d'utilisateur et votre mot de passe";
 $a->strings["There are no tables on MyISAM."] = "";
 $a->strings["\nError %d occurred during database update:\n%s\n"] = "\nErreur %d survenue durant la mise à jour de la base de données :\n%s\n";
 $a->strings["Errors encountered performing database changes: "] = "";
 $a->strings["%s: Database update"] = "";
 $a->strings["%s: updating %s table."] = "";
-$a->strings["Legacy module file not found: %s"] = "";
 $a->strings["Drop Contact"] = "Supprimer le contact";
 $a->strings["Organisation"] = "";
 $a->strings["News"] = "Nouvelles";
@@ -1919,6 +1975,7 @@ $a->strings["View on separate page"] = "Voir dans une nouvelle page";
 $a->strings["view on separate page"] = "voir dans une nouvelle page";
 $a->strings["[no subject]"] = "[pas de sujet]";
 $a->strings["Requested account is not available."] = "Le compte demandé n'est pas disponible.";
+$a->strings["Requested profile is not available."] = "Le profil demandé n'est pas disponible.";
 $a->strings["Edit profile"] = "Editer le profil";
 $a->strings["Atom feed"] = "Flux Atom";
 $a->strings["Manage/edit profiles"] = "Gérer/éditer les profils";
@@ -1934,7 +1991,6 @@ $a->strings["Upcoming events the next 7 days:"] = "";
 $a->strings["Member since:"] = "";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
-$a->strings["Birthday:"] = "Anniversaire :";
 $a->strings["Age:"] = "Age :";
 $a->strings["for %1\$d %2\$s"] = "depuis %1\$d %2\$s";
 $a->strings["Religion:"] = "Religion :";
@@ -1952,8 +2008,20 @@ $a->strings["Profile Details"] = "Détails du profil";
 $a->strings["Only You Can See This"] = "Vous seul pouvez voir ça";
 $a->strings["Tips for New Members"] = "Conseils aux nouveaux venus";
 $a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "";
+$a->strings["Database storage failed to update %s"] = "";
+$a->strings["Database storage failed to insert data"] = "";
+$a->strings["Filesystem storage failed to create \"%s\". Check you write permissions."] = "";
+$a->strings["Filesystem storage failed to save data to \"%s\". Check your write permissions"] = "";
+$a->strings["Storage base path"] = "";
+$a->strings["Folder where uploaded files are saved. For maximum security, This should be a path outside web server folder tree"] = "";
+$a->strings["Enter a valid existing folder"] = "";
 $a->strings["Login failed"] = "";
 $a->strings["Not enough information to authenticate"] = "";
+$a->strings["Password can't be empty"] = "";
+$a->strings["Empty passwords are not allowed."] = "";
+$a->strings["The new password has been exposed in a public data dump, please choose another."] = "";
+$a->strings["The password can't contain accentuated letters, white spaces or colons (:)"] = "";
+$a->strings["Passwords do not match. Password unchanged."] = "Les mots de passe ne correspondent pas. Aucun changement appliqué.";
 $a->strings["An invitation is required."] = "Une invitation est requise.";
 $a->strings["Invitation could not be verified."] = "L'invitation fournie n'a pu être validée.";
 $a->strings["Invalid OpenID url"] = "Adresse OpenID invalide";
@@ -1978,7 +2046,6 @@ $a->strings["Your nickname can only contain a-z, 0-9 and _."] = "";
 $a->strings["Nickname is already registered. Please choose another."] = "Pseudo déjà utilisé. Merci d'en choisir un autre.";
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERREUR FATALE : La génération des clés de sécurité a échoué.";
 $a->strings["An error occurred during registration. Please try again."] = "Une erreur est survenue lors de l'inscription. Merci de recommencer.";
-$a->strings["default"] = "défaut";
 $a->strings["An error occurred creating your default profile. Please try again."] = "Une erreur est survenue lors de la création de votre profil par défaut. Merci de recommencer.";
 $a->strings["An error occurred creating your self contact. Please try again."] = "";
 $a->strings["An error occurred creating your default contact group. Please try again."] = "";
@@ -1986,6 +2053,17 @@ $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Yo
 $a->strings["Registration at %s"] = "";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "";
 $a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "";
+$a->strings["Sharing notification from Diaspora network"] = "Notification de partage du réseau Diaspora";
+$a->strings["Attachments:"] = "Pièces jointes : ";
+$a->strings["%s's timeline"] = "";
+$a->strings["%s's posts"] = "";
+$a->strings["%s's comments"] = "";
+$a->strings["%s is now following %s."] = "%s suit désormais %s.";
+$a->strings["following"] = "following";
+$a->strings["%s stopped following %s."] = "%s ne suit plus %s.";
+$a->strings["stopped following"] = "retiré de la liste de suivi";
+$a->strings["(no subject)"] = "(sans titre)";
+$a->strings["Item was not found."] = "Element introuvable.";
 $a->strings["%d contact edited."] = [
 	0 => "%d contact mis à jour.",
 	1 => "%d contacts mis à jour.",
@@ -2108,6 +2186,26 @@ $a->strings["Website Privacy Policy"] = "Politique de confidentialité du site i
 $a->strings["privacy policy"] = "politique de confidentialité";
 $a->strings["Logged out."] = "Déconnecté.";
 $a->strings["Bad Request."] = "";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking \"Register\"."] = "";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si vous n'êtes pas familier avec OpenID, laissez ce champ vide et remplissez le reste.";
+$a->strings["Your OpenID (optional): "] = "Votre OpenID (facultatif): ";
+$a->strings["Include your profile in member directory?"] = "Inclure votre profil dans l'annuaire des membres?";
+$a->strings["Note for the admin"] = "Commentaire pour l'administrateur";
+$a->strings["Leave a message for the admin, why you want to join this node"] = "Indiquez à l'administrateur les raisons de votre inscription à cette instance.";
+$a->strings["Membership on this site is by invitation only."] = "L'inscription à ce site se fait uniquement sur invitation.";
+$a->strings["Your invitation code: "] = "";
+$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Votre nom complet (p. ex. Michel Dupont):";
+$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Votre courriel : (Des informations de connexion vont être envoyées à cette adresse; elle doit exister).";
+$a->strings["Leave empty for an auto generated password."] = "Laisser ce champ libre pour obtenir un mot de passe généré automatiquement.";
+$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \"<strong>nickname@%s</strong>\"."] = "";
+$a->strings["Choose a nickname: "] = "Choisir un pseudo : ";
+$a->strings["Import your profile to this friendica instance"] = "Importer votre profile dans cette instance de friendica";
+$a->strings["Note: This node explicitly contains adult content"] = "";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Inscription réussie. Vérifiez vos emails pour la suite des instructions.";
+$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Impossible d’envoyer le courriel de confirmation. Voici vos informations de connexion:<br> identifiant : %s<br> mot de passe : %s<br><br>Vous pourrez changer votre mot de passe une fois connecté.";
+$a->strings["Registration successful."] = "Inscription réussie.";
+$a->strings["Your registration can not be processed."] = "Votre inscription ne peut être traitée.";
+$a->strings["Your registration is pending approval by the site owner."] = "Votre inscription attend une validation du propriétaire du site.";
 $a->strings["At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication."] = "";
 $a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "";
 $a->strings["At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners."] = "";
@@ -2136,78 +2234,20 @@ $a->strings["to"] = "à";
 $a->strings["via"] = "via";
 $a->strings["Wall-to-Wall"] = "Inter-mur";
 $a->strings["via Wall-To-Wall:"] = "en Inter-mur :";
+$a->strings["Notifier task is pending"] = "";
+$a->strings["Delivery to remote servers is pending"] = "";
+$a->strings["Delivery to remote servers is underway"] = "";
+$a->strings["Delivery to remote servers is mostly done"] = "";
+$a->strings["Delivery to remote servers is done"] = "";
 $a->strings["%d comment"] = [
 	0 => "%d commentaire",
 	1 => "%d commentaires",
 ];
-$a->strings["Sharing notification from Diaspora network"] = "Notification de partage du réseau Diaspora";
-$a->strings["Attachments:"] = "Pièces jointes : ";
-$a->strings["%s is now following %s."] = "%s suit désormais %s.";
-$a->strings["following"] = "following";
-$a->strings["%s stopped following %s."] = "%s ne suit plus %s.";
-$a->strings["stopped following"] = "retiré de la liste de suivi";
-$a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-JJ ou MM-JJ";
-$a->strings["never"] = "jamais";
-$a->strings["less than a second ago"] = "il y a moins d'une seconde";
-$a->strings["year"] = "an";
-$a->strings["years"] = "ans";
-$a->strings["months"] = "mois";
-$a->strings["weeks"] = "semaines";
-$a->strings["days"] = "jours";
-$a->strings["hour"] = "heure";
-$a->strings["hours"] = "heures";
-$a->strings["minute"] = "minute";
-$a->strings["minutes"] = "minutes";
-$a->strings["second"] = "seconde";
-$a->strings["seconds"] = "secondes";
-$a->strings["in %1\$d %2\$s"] = "";
-$a->strings["%1\$d %2\$s ago"] = "il y a %1\$d %2\$s ";
-$a->strings["(no subject)"] = "(sans titre)";
+$a->strings["Delete this item?"] = "Effacer cet élément?";
+$a->strings["show fewer"] = "montrer moins";
+$a->strings["toggle mobile"] = "activ. mobile";
+$a->strings["No system theme config value set."] = "";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probablement dire que le formulaire est resté ouvert trop longtemps (plus de 3 heures) avant d'être validé.";
+$a->strings["Legacy module file not found: %s"] = "";
 $a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "";
 $a->strings["%s: Updating post-type."] = "";
-$a->strings["greenzero"] = "greenzero";
-$a->strings["purplezero"] = "purplezero";
-$a->strings["easterbunny"] = "easterbunny";
-$a->strings["darkzero"] = "darkzero";
-$a->strings["comix"] = "comix";
-$a->strings["slackr"] = "slackr";
-$a->strings["Variations"] = "Variations";
-$a->strings["Custom"] = "Personnalisé";
-$a->strings["Note"] = "Remarque";
-$a->strings["Check image permissions if all users are allowed to see the image"] = "Vérifier que tous les utilisateurs du site sont autorisés à voir l'image.";
-$a->strings["Select color scheme"] = "Choisir le schéma de couleurs";
-$a->strings["Navigation bar background color"] = "Couleur d'arrière-plan de la barre de navigation";
-$a->strings["Navigation bar icon color "] = "Couleur des icônes de la barre de navigation";
-$a->strings["Link color"] = "Couleur des liens";
-$a->strings["Set the background color"] = "Couleur d'arrière-plan";
-$a->strings["Content background opacity"] = "Opacité du contenu d'arrière-plan";
-$a->strings["Set the background image"] = "Image d'arrière-plan";
-$a->strings["Background image style"] = "Style de l'image de fond";
-$a->strings["Login page background image"] = "Image de fond de la page de login";
-$a->strings["Login page background color"] = "Couleur d'arrière-plan de la page de login";
-$a->strings["Leave background image and color empty for theme defaults"] = "Laisser l'image et la couleur de fond vides pour les paramètres par défaut du thème";
-$a->strings["Top Banner"] = "Bannière du haut";
-$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Redimensionner l'image à la largeur de l'écran et combler en dessous avec la couleur d'arrière plan.";
-$a->strings["Full screen"] = "Plein écran";
-$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Agrandir l'image pour remplir l'écran, jusqu'à toucher le bord droit ou le bas de l'écran.";
-$a->strings["Single row mosaic"] = "Mosaïque sur un rang";
-$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Redimensionner l'image pour la dupliquer sur un seul rang, vertical ou horizontal.";
-$a->strings["Mosaic"] = "Mosaïque";
-$a->strings["Repeat image to fill the screen."] = "Dupliquer l'image pour couvrir l'écran.";
-$a->strings["Guest"] = "Invité";
-$a->strings["Visitor"] = "Visiteur";
-$a->strings["Alignment"] = "Alignement";
-$a->strings["Left"] = "Gauche";
-$a->strings["Center"] = "Centre";
-$a->strings["Color scheme"] = "Palette de couleurs";
-$a->strings["Posts font size"] = "Taille de texte des publications";
-$a->strings["Textareas font size"] = "Taille de police des zones de texte";
-$a->strings["Comma separated list of helper forums"] = "Liste de forums d'aide, séparés par des virgules";
-$a->strings["Set style"] = "Définir le style";
-$a->strings["Community Pages"] = "Pages de Communauté";
-$a->strings["Community Profiles"] = "Profils communautaires";
-$a->strings["Help or @NewHere ?"] = "Aide ou @NewHere?";
-$a->strings["Connect Services"] = "Connecter des services";
-$a->strings["Find Friends"] = "Trouver des amis";
-$a->strings["Last users"] = "Derniers utilisateurs";
-$a->strings["Quick Start"] = "Démarrage rapide";

From 11a7f97fe72791baa36983242e56397f56d6132a Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 16 Feb 2019 22:13:19 +0100
Subject: [PATCH 013/145] friendica-6667 Installer needs to check fileinfo
 module

---
 src/Core/Installer.php           |  8 ++++++++
 tests/src/Core/InstallerTest.php | 16 +++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 4a287a885..fdeb940a2 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -357,6 +357,7 @@ class Installer
 	 * - mb_string
 	 * - XML
 	 * - iconv
+	 * - fileinfo
 	 * - POSIX
 	 *
 	 * @return bool false if something required failed
@@ -452,6 +453,13 @@ class Installer
 		);
 		$returnVal = $returnVal ? $status : false;
 
+		$status = $this->checkFunction('finfo_open',
+			L10n::t('File Information PHP module'),
+			L10n::t('Error: File Information PHP module required but not installed.'),
+			true
+		);
+		$returnVal = $returnVal ? $status : false;
+
 		return $returnVal;
 	}
 
diff --git a/tests/src/Core/InstallerTest.php b/tests/src/Core/InstallerTest.php
index f7f8f5c7d..c1a003bad 100644
--- a/tests/src/Core/InstallerTest.php
+++ b/tests/src/Core/InstallerTest.php
@@ -45,6 +45,8 @@ class InstallerTest extends MockedTest
 		$this->mockL10nT('Error: POSIX PHP module required but not installed.', 1);
 		$this->mockL10nT('JSON PHP module', 1);
 		$this->mockL10nT('Error: JSON PHP module required but not installed.', 1);
+		$this->mockL10nT('File Information PHP module', 1);
+		$this->mockL10nT('Error: File Information PHP module required but not installed.', 1);
 	}
 
 	private function assertCheckExist($position, $title, $help, $status, $required, $assertionArray)
@@ -192,6 +194,17 @@ class InstallerTest extends MockedTest
 			true,
 			$install->getChecks());
 
+		$this->mockFunctionL10TCalls();
+		$this->setFunctions(['finfo_open' => false]);
+		$install = new Installer();
+		$this->assertFalse($install->checkFunctions());
+		$this->assertCheckExist(10,
+			'File Information PHP module',
+			'Error: File Information PHP module required but not installed.',
+			false,
+			true,
+			$install->getChecks());
+
 		$this->mockFunctionL10TCalls();
 		$this->setFunctions([
 			'curl_init' => true,
@@ -200,7 +213,8 @@ class InstallerTest extends MockedTest
 			'mb_strlen' => true,
 			'iconv_strlen' => true,
 			'posix_kill' => true,
-			'json_encode' => true
+			'json_encode' => true,
+			'finfo_open' => true,
 		]);
 		$install = new Installer();
 		$this->assertTrue($install->checkFunctions());

From 5e6e1a80250a9b03a0689bbda92a6a66140cc669 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 16 Feb 2019 23:11:30 +0100
Subject: [PATCH 014/145] Introducing Profiler

---
 bin/auth_ejabberd.php                      |   3 +-
 bin/console.php                            |   3 +-
 bin/daemon.php                             |   3 +-
 bin/worker.php                             |   3 +-
 include/api.php                            |  64 +-----
 index.php                                  |   3 +-
 src/App.php                                |  84 ++-----
 src/Content/Text/BBCode.php                |   6 +-
 src/Content/Text/Markdown.php              |   2 +-
 src/Core/Addon.php                         |   2 +-
 src/Core/Cache.php                         |   8 +-
 src/Core/Console/AutomaticInstallation.php |   2 +-
 src/Core/Installer.php                     |   6 +-
 src/Core/Logger.php                        |  20 +-
 src/Core/Renderer.php                      |   4 +-
 src/Core/Theme.php                         |   2 +-
 src/Core/Worker.php                        |  86 +------
 src/Database/DBA.php                       |  22 +-
 src/Factory/ProfilerFactory.php            |  25 ++
 src/Module/Install.php                     |   4 +-
 src/Object/Image.php                       |  10 +-
 src/Util/Network.php                       |  14 +-
 src/Util/Profiler.php                      | 252 +++++++++++++++++++++
 tests/DatabaseTest.php                     |   4 +
 24 files changed, 370 insertions(+), 262 deletions(-)
 create mode 100644 src/Factory/ProfilerFactory.php
 create mode 100644 src/Util/Profiler.php

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 11df43895..8a5c43c6d 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -58,8 +58,9 @@ $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
 $configLoader = new Config\ConfigCacheLoader($basedir);
 $config = Factory\ConfigFactory::createCache($configLoader);
 $logger = Factory\LoggerFactory::create('auth_ejabberd', $config);
+$profiler = Factory\ProfilerFactory::create($config);
 
-$a = new App($config, $logger);
+$a = new App($config, $logger, $profiler);
 
 if ($a->getMode()->isNormal()) {
 	$oAuth = new ExAuth();
diff --git a/bin/console.php b/bin/console.php
index 9061824d8..ceccfc823 100755
--- a/bin/console.php
+++ b/bin/console.php
@@ -11,8 +11,9 @@ $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
 $configLoader = new Config\ConfigCacheLoader($basedir);
 $config = Factory\ConfigFactory::createCache($configLoader);
 $logger = Factory\LoggerFactory::create('console', $config);
+$profiler = Factory\ProfilerFactory::create($config);
 
-$a = new Friendica\App($config, $logger);
+$a = new Friendica\App($config, $logger, $profiler);
 \Friendica\BaseObject::setApp($a);
 
 (new Friendica\Core\Console($argv))->execute();
diff --git a/bin/daemon.php b/bin/daemon.php
index 5c014a927..3b5c04b7a 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -37,8 +37,9 @@ $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
 $configLoader = new Config\ConfigCacheLoader($basedir);
 $config = Factory\ConfigFactory::createCache($configLoader);
 $logger = Factory\LoggerFactory::create('daemon', $config);
+$profiler = Factory\ProfilerFactory::create($config);
 
-$a = new App($config, $logger);
+$a = new App($config, $logger, $profiler);
 
 if ($a->getMode()->isInstall()) {
 	die("Friendica isn't properly installed yet.\n");
diff --git a/bin/worker.php b/bin/worker.php
index 553e98497..c93abaf0f 100755
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -35,8 +35,9 @@ $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
 $configLoader = new Config\ConfigCacheLoader($basedir);
 $config = Factory\ConfigFactory::createCache($configLoader);
 $logger = Factory\LoggerFactory::create('worker', $config);
+$profiler = Factory\ProfilerFactory::create($config);
 
-$a = new App($config, $logger);
+$a = new App($config, $logger, $profiler);
 
 // Check the database structure and possibly fixes it
 Update::check($a->getBasePath(), true);
diff --git a/include/api.php b/include/api.php
index 052d32b17..6bd08d01d 100644
--- a/include/api.php
+++ b/include/api.php
@@ -326,69 +326,7 @@ function api_call(App $a)
 
 				Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username'], 'duration' => round($duration, 2)]);
 
-				if (Config::get("system", "profiler")) {
-					$duration = microtime(true)-$a->performance["start"];
-
-					/// @TODO round() really everywhere?
-					Logger::debug(
-						API_LOG_PREFIX . 'performance',
-						[
-							'module' => 'api',
-							'action' => 'call',
-							'database_read' => round($a->performance["database"] - $a->performance["database_write"], 3),
-							'database_write' => round($a->performance["database_write"], 3),
-							'cache_read' => round($a->performance["cache"], 3),
-							'cache_write' => round($a->performance["cache_write"], 3),
-							'network_io' => round($a->performance["network"], 2),
-							'file_io' => round($a->performance["file"], 2),
-							'other_io' => round($duration - ($a->performance["database"]
-									+ $a->performance["cache"] + $a->performance["cache_write"]
-									+ $a->performance["network"] + $a->performance["file"]), 2),
-							'total' => round($duration, 2)
-						]
-					);
-
-					if (Config::get("rendertime", "callstack")) {
-						$o = "Database Read:\n";
-						foreach ($a->callstack["database"] as $func => $time) {
-							$time = round($time, 3);
-							if ($time > 0) {
-								$o .= $func . ": " . $time . "\n";
-							}
-						}
-						$o .= "\nDatabase Write:\n";
-						foreach ($a->callstack["database_write"] as $func => $time) {
-							$time = round($time, 3);
-							if ($time > 0) {
-								$o .= $func . ": " . $time . "\n";
-							}
-						}
-
-						$o = "Cache Read:\n";
-						foreach ($a->callstack["cache"] as $func => $time) {
-							$time = round($time, 3);
-							if ($time > 0) {
-								$o .= $func . ": " . $time . "\n";
-							}
-						}
-						$o .= "\nCache Write:\n";
-						foreach ($a->callstack["cache_write"] as $func => $time) {
-							$time = round($time, 3);
-							if ($time > 0) {
-								$o .= $func . ": " . $time . "\n";
-							}
-						}
-
-						$o .= "\nNetwork:\n";
-						foreach ($a->callstack["network"] as $func => $time) {
-							$time = round($time, 3);
-							if ($time > 0) {
-								$o .= $func . ": " . $time . "\n";
-							}
-						}
-						Logger::debug(API_LOG_PREFIX . $o, ['module' => 'api', 'action' => 'call']);
-					}
-				}
+				$a->getProfiler()->saveLog(API_LOG_PREFIX . 'performance');
 
 				if (false === $return) {
 					/*
diff --git a/index.php b/index.php
index 7e7396785..d8c233be2 100644
--- a/index.php
+++ b/index.php
@@ -19,9 +19,10 @@ $basedir = BasePath::create(__DIR__, $_SERVER);
 $configLoader = new Config\ConfigCacheLoader($basedir);
 $config = Factory\ConfigFactory::createCache($configLoader);
 $logger = Factory\LoggerFactory::create('index', $config);
+$profiler = Factory\ProfilerFactory::create($config);
 
 // We assume that the index.php is called by a frontend process
 // The value is set to "true" by default in App
-$a = new App($config, $logger, false);
+$a = new App($config, $logger, $profiler, false);
 
 $a->runFrontend();
diff --git a/src/App.php b/src/App.php
index 8068a1530..6e1f83fdd 100644
--- a/src/App.php
+++ b/src/App.php
@@ -13,6 +13,7 @@ use Friendica\Core\Config\ConfigCacheLoader;
 use Friendica\Database\DBA;
 use Friendica\Factory\ConfigFactory;
 use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -53,8 +54,6 @@ class App
 	public $identities;
 	public $is_mobile = false;
 	public $is_tablet = false;
-	public $performance = [];
-	public $callstack = [];
 	public $theme_info = [];
 	public $category;
 	// Allow themes to control internal parameters
@@ -119,6 +118,11 @@ class App
 	 */
 	private $config;
 
+	/**
+	 * @var Profiler The profiler of this app
+	 */
+	private $profiler;
+
 	/**
 	 * Returns the current config cache of this node
 	 *
@@ -139,6 +143,16 @@ class App
 		return $this->basePath;
 	}
 
+	/**
+	 * The profiler of this app
+	 *
+	 * @return Profiler
+	 */
+	public function getProfiler()
+	{
+		return $this->profiler;
+	}
+
 	/**
 	 * Register a stylesheet file path to be included in the <head> tag of every page.
 	 * Inclusion is done in App->initHead().
@@ -183,14 +197,16 @@ class App
 	 *
 	 * @param ConfigCache      $config    The Cached Config
 	 * @param LoggerInterface  $logger    Logger of this application
+	 * @param Profiler         $profiler  The profiler of this application
 	 * @param bool             $isBackend Whether it is used for backend or frontend (Default true=backend)
 	 *
 	 * @throws Exception if the Basepath is not usable
 	 */
-	public function __construct(ConfigCache $config, LoggerInterface $logger, $isBackend = true)
+	public function __construct(ConfigCache $config, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
 	{
 		$this->config   = $config;
 		$this->logger   = $logger;
+		$this->profiler = $profiler;
 		$this->basePath = $this->config->get('system', 'basepath');
 
 		if (!Core\System::isDirectoryUsable($this->basePath, false)) {
@@ -203,26 +219,7 @@ class App
 		$this->checkBackend($isBackend);
 		$this->checkFriendicaApp();
 
-		$this->performance['start'] = microtime(true);
-		$this->performance['database'] = 0;
-		$this->performance['database_write'] = 0;
-		$this->performance['cache'] = 0;
-		$this->performance['cache_write'] = 0;
-		$this->performance['network'] = 0;
-		$this->performance['file'] = 0;
-		$this->performance['rendering'] = 0;
-		$this->performance['parser'] = 0;
-		$this->performance['marktime'] = 0;
-		$this->performance['markstart'] = microtime(true);
-
-		$this->callstack['database'] = [];
-		$this->callstack['database_write'] = [];
-		$this->callstack['cache'] = [];
-		$this->callstack['cache_write'] = [];
-		$this->callstack['network'] = [];
-		$this->callstack['file'] = [];
-		$this->callstack['rendering'] = [];
-		$this->callstack['parser'] = [];
+		$this->profiler->reset();
 
 		$this->mode = new App\Mode($this->basePath);
 
@@ -489,14 +486,14 @@ class App
 
 		$stamp1 = microtime(true);
 
-		if (DBA::connect($this->config, $db_host, $db_user, $db_pass, $db_data, $charset)) {
+		if (DBA::connect($this->config, $this->profiler, $db_host, $db_user, $db_pass, $db_data, $charset)) {
 			// Loads DB_UPDATE_VERSION constant
 			Database\DBStructure::definition($this->basePath, false);
 		}
 
 		unset($db_host, $db_user, $db_pass, $db_data, $charset);
 
-		$this->saveTimestamp($stamp1, 'network');
+		$this->profiler->saveTimestamp($stamp1, 'network');
 	}
 
 	public function getScheme()
@@ -742,41 +739,6 @@ class App
 		}
 	}
 
-	/**
-	 * Saves a timestamp for a value - f.e. a call
-	 * Necessary for profiling Friendica
-	 *
-	 * @param int $timestamp the Timestamp
-	 * @param string $value A value to profile
-	 */
-	public function saveTimestamp($timestamp, $value)
-	{
-		$profiler = $this->config->get('system', 'profiler');
-
-		if (!isset($profiler) || !$profiler) {
-			return;
-		}
-
-		$duration = (float) (microtime(true) - $timestamp);
-
-		if (!isset($this->performance[$value])) {
-			// Prevent ugly E_NOTICE
-			$this->performance[$value] = 0;
-		}
-
-		$this->performance[$value] += (float) $duration;
-		$this->performance['marktime'] += (float) $duration;
-
-		$callstack = Core\System::callstack();
-
-		if (!isset($this->callstack[$value][$callstack])) {
-			// Prevent ugly E_NOTICE
-			$this->callstack[$value][$callstack] = 0;
-		}
-
-		$this->callstack[$value][$callstack] += (float) $duration;
-	}
-
 	/**
 	 * Returns the current UserAgent as a String
 	 *
@@ -1227,7 +1189,7 @@ class App
 		if (!$this->isBackend()) {
 			$stamp1 = microtime(true);
 			session_start();
-			$this->saveTimestamp($stamp1, 'parser');
+			$this->profiler->saveTimestamp($stamp1, 'parser');
 			Core\L10n::setSessionVariable();
 			Core\L10n::setLangFromSession();
 		} else {
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index a8b5ec202..75cb32b62 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1027,7 +1027,7 @@ class BBCode extends BaseObject
 			@curl_exec($ch);
 			$curl_info = @curl_getinfo($ch);
 
-			$a->saveTimestamp($stamp1, "network");
+			$a->getProfiler()->saveTimestamp($stamp1, "network");
 
 			if (substr($curl_info["content_type"], 0, 6) == "image/") {
 				$text = "[url=" . $match[1] . "]" . $match[1] . "[/url]";
@@ -1086,7 +1086,7 @@ class BBCode extends BaseObject
 			@curl_exec($ch);
 			$curl_info = @curl_getinfo($ch);
 
-			$a->saveTimestamp($stamp1, "network");
+			$a->getProfiler()->saveTimestamp($stamp1, "network");
 
 			// if its a link to a picture then embed this picture
 			if (substr($curl_info["content_type"], 0, 6) == "image/") {
@@ -1915,7 +1915,7 @@ class BBCode extends BaseObject
 		// unmask the special chars back to HTML
 		$text = str_replace(['&\_lt\_;', '&\_gt\_;', '&\_amp\_;'], ['&lt;', '&gt;', '&amp;'], $text);
 
-		$a->saveTimestamp($stamp1, "parser");
+		$a->getProfiler()->saveTimestamp($stamp1, "parser");
 
 		// Libertree has a problem with escaped hashtags.
 		$text = str_replace(['\#'], ['#'], $text);
diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index ceb5b043b..28ee215b2 100644
--- a/src/Content/Text/Markdown.php
+++ b/src/Content/Text/Markdown.php
@@ -36,7 +36,7 @@ class Markdown extends BaseObject
 		$html = $MarkdownParser->transform($text);
 		$html = preg_replace('/<a(.*?)href="#/is', '<a$1href="' . ltrim($_SERVER['REQUEST_URI'], '/') . '#', $html);
 
-		self::getApp()->saveTimestamp($stamp1, "parser");
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, "parser");
 
 		return $html;
 	}
diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 6697a44ae..483882c3e 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -219,7 +219,7 @@ class Addon extends BaseObject
 
 		$stamp1 = microtime(true);
 		$f = file_get_contents("addon/$addon/$addon.php");
-		$a->saveTimestamp($stamp1, "file");
+		$a->getProfiler()->saveTimestamp($stamp1, "file");
 
 		$r = preg_match("|/\*.*\*/|msU", $f, $m);
 
diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index 39c29566d..cd1581ef9 100644
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -63,7 +63,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->getAllKeys($prefix);
 
-		self::getApp()->saveTimestamp($time, 'cache');
+		self::getApp()->getProfiler()->saveTimestamp($time, 'cache');
 
 		return $return;
 	}
@@ -82,7 +82,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->get($key);
 
-		self::getApp()->saveTimestamp($time, 'cache');
+		self::getApp()->getProfiler()->saveTimestamp($time, 'cache');
 
 		return $return;
 	}
@@ -105,7 +105,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->set($key, $value, $duration);
 
-		self::getApp()->saveTimestamp($time, 'cache_write');
+		self::getApp()->getProfiler()->saveTimestamp($time, 'cache_write');
 
 		return $return;
 	}
@@ -124,7 +124,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->delete($key);
 
-		self::getApp()->saveTimestamp($time, 'cache_write');
+		self::getApp()->getProfiler()->saveTimestamp($time, 'cache_write');
 
 		return $return;
 	}
diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php
index 7f2585e63..d5c63dd99 100644
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Core/Console/AutomaticInstallation.php
@@ -146,7 +146,7 @@ HELP;
 
 		$installer->resetChecks();
 
-		if (!$installer->checkDB($a->getConfig(), $db_host, $db_user, $db_pass, $db_data)) {
+		if (!$installer->checkDB($a->getConfig(), $a->getProfiler(), $db_host, $db_user, $db_pass, $db_data)) {
 			$errorMessage = $this->extractErrors($installer->getChecks());
 			throw new RuntimeException($errorMessage);
 		}
diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 4a287a885..dd9e3d22e 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -11,6 +11,7 @@ use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Object\Image;
 use Friendica\Util\Network;
+use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
 
 /**
@@ -583,6 +584,7 @@ class Installer
 	 * Checking the Database connection and if it is available for the current installation
 	 *
 	 * @param ConfigCache $configCache The configuration cache
+	 * @param Profiler    $profiler    The profiler of this app
 	 * @param string $dbhost           Hostname/IP of the Friendica Database
 	 * @param string $dbuser           Username of the Database connection credentials
 	 * @param string $dbpass           Password of the Database connection credentials
@@ -591,9 +593,9 @@ class Installer
 	 * @return bool true if the check was successful, otherwise false
 	 * @throws Exception
 	 */
-	public function checkDB(ConfigCache $configCache, $dbhost, $dbuser, $dbpass, $dbdata)
+	public function checkDB(ConfigCache $configCache, Profiler $profiler, $dbhost, $dbuser, $dbpass, $dbdata)
 	{
-		if (!DBA::connect($configCache, $dbhost, $dbuser, $dbpass, $dbdata)) {
+		if (!DBA::connect($configCache, $profiler, $dbhost, $dbuser, $dbpass, $dbdata)) {
 			$this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
 
 			return false;
diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index 6b8112796..69be501a3 100644
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -155,7 +155,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->emergency($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->GetProfiler()->saveTimestamp($stamp1, 'file');
 	}
 
 	/**
@@ -179,7 +179,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->alert($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
 	}
 
 	/**
@@ -202,7 +202,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->critical($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
 	}
 
 	/**
@@ -225,7 +225,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->error($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
 	}
 
 	/**
@@ -249,7 +249,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->warning($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
 	}
 
 	/**
@@ -270,7 +270,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->notice($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
 	}
 
 	/**
@@ -293,7 +293,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->info($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
 	}
 
 	/**
@@ -314,7 +314,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->debug($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
 	}
 
     /**
@@ -334,7 +334,7 @@ class Logger extends BaseObject
 
         $stamp1 = microtime(true);
 		self::$logger->log($level, $msg);
-        self::getApp()->saveTimestamp($stamp1, "file");
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, "file");
     }
 
 	/**
@@ -355,6 +355,6 @@ class Logger extends BaseObject
 
         $stamp1 = microtime(true);
         self::$devLogger->log($level, $msg);
-        self::getApp()->saveTimestamp($stamp1, "file");
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, "file");
     }
 }
diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
index 67bc5e3ba..c032448c9 100644
--- a/src/Core/Renderer.php
+++ b/src/Core/Renderer.php
@@ -74,7 +74,7 @@ class Renderer extends BaseObject
             exit();
         }
 
-        $a->saveTimestamp($stamp1, "rendering");
+		$a->getProfiler()->saveTimestamp($stamp1, "rendering");
 
         return $output;
     }
@@ -101,7 +101,7 @@ class Renderer extends BaseObject
             exit();
         }
 
-        $a->saveTimestamp($stamp1, "file");
+        $a->getProfiler()->saveTimestamp($stamp1, "file");
 
         return $template;
     }
diff --git a/src/Core/Theme.php b/src/Core/Theme.php
index 62dfaa51f..dbfc0fd90 100644
--- a/src/Core/Theme.php
+++ b/src/Core/Theme.php
@@ -51,7 +51,7 @@ class Theme
 		$a = \get_app();
 		$stamp1 = microtime(true);
 		$theme_file = file_get_contents("view/theme/$theme/theme.php");
-		$a->saveTimestamp($stamp1, "file");
+		$a->getProfiler()->saveTimestamp($stamp1, "file");
 
 		$result = preg_match("|/\*.*\*/|msU", $theme_file, $matches);
 
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 75d4e4874..dff60e9fa 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -380,20 +380,7 @@ class Worker
 
 		// We use the callstack here to analyze the performance of executed worker entries.
 		// For this reason the variables have to be initialized.
-		if (Config::get("system", "profiler")) {
-			$a->performance["start"] = microtime(true);
-			$a->performance["database"] = 0;
-			$a->performance["database_write"] = 0;
-			$a->performance["cache"] = 0;
-			$a->performance["cache_write"] = 0;
-			$a->performance["network"] = 0;
-			$a->performance["file"] = 0;
-			$a->performance["rendering"] = 0;
-			$a->performance["parser"] = 0;
-			$a->performance["marktime"] = 0;
-			$a->performance["markstart"] = microtime(true);
-			$a->callstack = [];
-		}
+		$a->getProfiler()->reset();
 
 		// For better logging create a new process id for every worker call
 		// But preserve the old one for the worker
@@ -452,76 +439,7 @@ class Worker
 
 		Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".number_format($duration, 4)." seconds. Process PID: ".$new_process_id);
 
-		// Write down the performance values into the log
-		if (Config::get("system", "profiler")) {
-			$duration = microtime(true)-$a->performance["start"];
-
-			$o = '';
-			if (Config::get("rendertime", "callstack")) {
-				if (isset($a->callstack["database"])) {
-					$o .= "\nDatabase Read:\n";
-					foreach ($a->callstack["database"] as $func => $time) {
-						$time = round($time, 3);
-						if ($time > 0) {
-							$o .= $func.": ".$time."\n";
-						}
-					}
-				}
-				if (isset($a->callstack["database_write"])) {
-					$o .= "\nDatabase Write:\n";
-					foreach ($a->callstack["database_write"] as $func => $time) {
-						$time = round($time, 3);
-						if ($time > 0) {
-							$o .= $func.": ".$time."\n";
-						}
-					}
-				}
-				if (isset($a->callstack["dache"])) {
-					$o .= "\nCache Read:\n";
-					foreach ($a->callstack["dache"] as $func => $time) {
-						$time = round($time, 3);
-						if ($time > 0) {
-							$o .= $func.": ".$time."\n";
-						}
-					}
-				}
-				if (isset($a->callstack["dache_write"])) {
-					$o .= "\nCache Write:\n";
-					foreach ($a->callstack["dache_write"] as $func => $time) {
-						$time = round($time, 3);
-						if ($time > 0) {
-							$o .= $func.": ".$time."\n";
-						}
-					}
-				}
-				if (isset($a->callstack["network"])) {
-					$o .= "\nNetwork:\n";
-					foreach ($a->callstack["network"] as $func => $time) {
-						$time = round($time, 3);
-						if ($time > 0) {
-							$o .= $func.": ".$time."\n";
-						}
-					}
-				}
-			}
-
-			Logger::log(
-				"ID ".$queue["id"].": ".$funcname.": ".sprintf(
-					"DB: %s/%s, Cache: %s/%s, Net: %s, I/O: %s, Other: %s, Total: %s".$o,
-					number_format($a->performance["database"] - $a->performance["database_write"], 2),
-					number_format($a->performance["database_write"], 2),
-					number_format($a->performance["cache"], 2),
-					number_format($a->performance["cache_write"], 2),
-					number_format($a->performance["network"], 2),
-					number_format($a->performance["file"], 2),
-					number_format($duration - ($a->performance["database"]
-						+ $a->performance["cache"] + $a->performance["cache_write"]
-						+ $a->performance["network"] + $a->performance["file"]), 2),
-					number_format($duration, 2)
-				),
-				Logger::DEBUG
-			);
-		}
+		$a->getProfiler()->saveLog("ID " . $queue["id"] . ": " . $funcname);
 
 		$cooldown = Config::get("system", "worker_cooldown", 0);
 
diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index d2a739e93..7c24ecfd3 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -6,6 +6,7 @@ use Friendica\Core\Config\IConfigCache;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Profiler;
 use mysqli;
 use mysqli_result;
 use mysqli_stmt;
@@ -35,6 +36,10 @@ class DBA
 	 * @var IConfigCache
 	 */
 	private static $configCache;
+	/**
+	 * @var Profiler
+	 */
+	private static $profiler;
 	private static $server_info = '';
 	private static $connection;
 	private static $driver;
@@ -50,7 +55,7 @@ class DBA
 	private static $db_name = '';
 	private static $db_charset = '';
 
-	public static function connect($configCache, $serveraddr, $user, $pass, $db, $charset = null)
+	public static function connect(IConfigCache $configCache, Profiler $profiler, $serveraddr, $user, $pass, $db, $charset = null)
 	{
 		if (!is_null(self::$connection) && self::connected()) {
 			return true;
@@ -58,6 +63,7 @@ class DBA
 
 		// We are storing these values for being able to perform a reconnect
 		self::$configCache = $configCache;
+		self::$profiler = $profiler;
 		self::$db_serveraddr = $serveraddr;
 		self::$db_user = $user;
 		self::$db_pass = $pass;
@@ -158,7 +164,7 @@ class DBA
 	public static function reconnect() {
 		self::disconnect();
 
-		$ret = self::connect(self::$configCache, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
+		$ret = self::connect(self::$configCache, self::$profiler, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
 		return $ret;
 	}
 
@@ -392,7 +398,6 @@ class DBA
 	 * @throws \Exception
 	 */
 	public static function p($sql) {
-		$a = \get_app();
 
 		$stamp1 = microtime(true);
 
@@ -582,7 +587,7 @@ class DBA
 			self::$errorno = $errorno;
 		}
 
-		$a->saveTimestamp($stamp1, 'database');
+		self::$profiler->saveTimestamp($stamp1, 'database');
 
 		if (self::$configCache->get('system', 'db_log')) {
 			$stamp2 = microtime(true);
@@ -611,7 +616,6 @@ class DBA
 	 * @throws \Exception
 	 */
 	public static function e($sql) {
-		$a = \get_app();
 
 		$stamp = microtime(true);
 
@@ -654,7 +658,7 @@ class DBA
 			self::$errorno = $errorno;
 		}
 
-		$a->saveTimestamp($stamp, "database_write");
+		self::$profiler->saveTimestamp($stamp, "database_write");
 
 		return $retval;
 	}
@@ -777,7 +781,6 @@ class DBA
 	 * @return array current row
 	 */
 	public static function fetch($stmt) {
-		$a = \get_app();
 
 		$stamp1 = microtime(true);
 
@@ -824,7 +827,7 @@ class DBA
 				}
 		}
 
-		$a->saveTimestamp($stamp1, 'database');
+		self::$profiler->saveTimestamp($stamp1, 'database');
 
 		return $columns;
 	}
@@ -1534,7 +1537,6 @@ class DBA
 	 * @return boolean was the close successful?
 	 */
 	public static function close($stmt) {
-		$a = \get_app();
 
 		$stamp1 = microtime(true);
 
@@ -1562,7 +1564,7 @@ class DBA
 				break;
 		}
 
-		$a->saveTimestamp($stamp1, 'database');
+		self::$profiler->saveTimestamp($stamp1, 'database');
 
 		return $ret;
 	}
diff --git a/src/Factory/ProfilerFactory.php b/src/Factory/ProfilerFactory.php
new file mode 100644
index 000000000..7a63c7440
--- /dev/null
+++ b/src/Factory/ProfilerFactory.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Friendica\Factory;
+
+use Friendica\Core\Config\ConfigCache;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
+
+class ProfilerFactory
+{
+	/**
+	 * Creates a Profiler for the current execution
+	 *
+	 * @param LoggerInterface $logger      The logger for saving the profiling data
+	 * @param ConfigCache     $configCache The configuration cache
+	 *
+	 * @return Profiler
+	 */
+	public static function create(LoggerInterface $logger, ConfigCache $configCache)
+	{
+		$enabled = $configCache->get('system', 'profiler', false);
+		$renderTime = $configCache->get('rendertime', 'callstack', false);
+		return new Profiler($logger, $enabled, $renderTime);
+	}
+}
diff --git a/src/Module/Install.php b/src/Module/Install.php
index 6948dee6e..4fb4a932c 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -75,7 +75,7 @@ class Install extends BaseModule
 				$dbdata  = Strings::escapeTags(trim(defaults($_POST, 'dbdata', '')));
 
 				// If we cannot connect to the database, return to the previous step
-				if (!self::$installer->checkDB($a->getConfig(), $dbhost, $dbuser, $dbpass, $dbdata)) {
+				if (!self::$installer->checkDB($a->getConfig(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
 					self::$currentWizardStep = self::DATABASE_CONFIG;
 				}
 
@@ -92,7 +92,7 @@ class Install extends BaseModule
 				$adminmail = Strings::escapeTags(trim(defaults($_POST, 'adminmail', '')));
 
 				// If we cannot connect to the database, return to the Database config wizard
-				if (!self::$installer->checkDB($a->getConfig(), $dbhost, $dbuser, $dbpass, $dbdata)) {
+				if (!self::$installer->checkDB($a->getConfig(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
 					self::$currentWizardStep = self::DATABASE_CONFIG;
 					return;
 				}
diff --git a/src/Object/Image.php b/src/Object/Image.php
index 9143c23c1..c43955375 100644
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -5,6 +5,7 @@
  */
 namespace Friendica\Object;
 
+use Exception;
 use Friendica\App;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
@@ -14,7 +15,6 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Util\Network;
-use Exception;
 use Imagick;
 use ImagickPixel;
 
@@ -656,7 +656,7 @@ class Image
 
 		$stamp1 = microtime(true);
 		file_put_contents($path, $string);
-		$a->saveTimestamp($stamp1, "file");
+		$a->getProfiler()->saveTimestamp($stamp1, "file");
 	}
 
 	/**
@@ -802,7 +802,7 @@ class Image
 					$a = \get_app();
 					$stamp1 = microtime(true);
 					file_put_contents($tempfile, $img_str);
-					$a->saveTimestamp($stamp1, "file");
+					$a->getProfiler()->saveTimestamp($stamp1, "file");
 
 					$data = getimagesize($tempfile);
 					unlink($tempfile);
@@ -910,7 +910,7 @@ class Image
 
 			$stamp1 = microtime(true);
 			$imagedata = @file_get_contents($url);
-			$a->saveTimestamp($stamp1, "file");
+			$a->getProfiler()->saveTimestamp($stamp1, "file");
 		}
 
 		$maximagesize = Config::get('system', 'maximagesize');
@@ -924,7 +924,7 @@ class Image
 
 		$stamp1 = microtime(true);
 		file_put_contents($tempfile, $imagedata);
-		$a->saveTimestamp($stamp1, "file");
+		$a->getProfiler()->saveTimestamp($stamp1, "file");
 
 		$data = getimagesize($tempfile);
 
diff --git a/src/Util/Network.php b/src/Util/Network.php
index de4b45da9..4d5afa3a3 100644
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -4,13 +4,13 @@
  */
 namespace Friendica\Util;
 
+use DOMDocument;
+use DomXPath;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
-use Friendica\Core\Config;
 use Friendica\Network\CurlResult;
-use DOMDocument;
-use DomXPath;
 
 class Network
 {
@@ -232,7 +232,7 @@ class Network
 
 		@curl_close($ch);
 
-		$a->saveTimestamp($stamp1, 'network');
+		$a->getProfiler()->saveTimestamp($stamp1, 'network');
 
 		return $curlResponse;
 	}
@@ -334,7 +334,7 @@ class Network
 
 		curl_close($ch);
 
-		$a->saveTimestamp($stamp1, 'network');
+		$a->getProfiler()->saveTimestamp($stamp1, 'network');
 
 		Logger::log('post_url: end ' . $url, Logger::DATA);
 
@@ -641,7 +641,7 @@ class Network
 		$http_code = $curl_info['http_code'];
 		curl_close($ch);
 
-		$a->saveTimestamp($stamp1, "network");
+		$a->getProfiler()->saveTimestamp($stamp1, "network");
 
 		if ($http_code == 0) {
 			return $url;
@@ -683,7 +683,7 @@ class Network
 		$body = curl_exec($ch);
 		curl_close($ch);
 
-		$a->saveTimestamp($stamp1, "network");
+		$a->getProfiler()->saveTimestamp($stamp1, "network");
 
 		if (trim($body) == "") {
 			return $url;
diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
new file mode 100644
index 000000000..7bf30a277
--- /dev/null
+++ b/src/Util/Profiler.php
@@ -0,0 +1,252 @@
+<?php
+
+namespace Friendica\Util;
+
+use Friendica\Core;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * A class to store profiling data
+ * It can handle different logging data for specific functions or global performance measures
+ *
+ * It stores the data as log entries (@see LoggerInterface )
+ */
+class Profiler implements ContainerInterface
+{
+	/**
+	 * @var array The global performance array
+	 */
+	private $performance;
+	/**
+	 * @var array The function specific callstack
+	 */
+	private $callstack;
+	/**
+	 * @var bool True, if the Profiler is enabled
+	 */
+	private $enabled;
+	/**
+	 * @var bool True, if the Profiler should measure the whole rendertime including functions
+	 */
+	private $rendertime;
+
+	/**
+	 * @var LoggerInterface The profiler logger
+	 */
+	private $logger;
+
+	/**
+	 * @param LoggerInterface $logger The profiler logger
+	 * @param bool $enabled           True, if the Profiler is enabled
+	 * @param bool $renderTime        True, if the Profiler should measure the whole rendertime including functions
+	 */
+	public function __construct(LoggerInterface $logger, $enabled = false, $renderTime = false)
+	{
+		$this->enabled = $enabled;
+		$this->rendertime = $renderTime;
+		$this->logger = $logger;
+		$this->performance = [];
+		$this->callstack   = [];
+	}
+
+	/**
+	 * Saves a timestamp for a value - f.e. a call
+	 * Necessary for profiling Friendica
+	 *
+	 * @param int $timestamp the Timestamp
+	 * @param string $value A value to profile
+	 */
+	public function saveTimestamp($timestamp, $value)
+	{
+		if (!$this->enabled) {
+			return;
+		}
+
+		$duration = (float) (microtime(true) - $timestamp);
+
+		if (!isset($this->performance[$value])) {
+			// Prevent ugly E_NOTICE
+			$this->performance[$value] = 0;
+		}
+
+		$this->performance[$value] += (float) $duration;
+		$this->performance['marktime'] += (float) $duration;
+
+		$callstack = Core\System::callstack();
+
+		if (!isset($this->callstack[$value][$callstack])) {
+			// Prevent ugly E_NOTICE
+			$this->callstack[$value][$callstack] = 0;
+		}
+
+		$this->callstack[$value][$callstack] += (float) $duration;
+	}
+
+	/**
+	 * Resets the performance and callstack profiling
+	 *
+	 * @param bool $performance If true, reset the performance (Default true)
+	 * @param bool $callstack   If true, reset the callstack (Default true)
+	 */
+	public function reset($performance = true, $callstack = true)
+	{
+		if ($performance) {
+			$this->performance = [];
+			$this->performance['start'] = microtime(true);
+			$this->performance['database'] = 0;
+			$this->performance['database_write'] = 0;
+			$this->performance['cache'] = 0;
+			$this->performance['cache_write'] = 0;
+			$this->performance['network'] = 0;
+			$this->performance['file'] = 0;
+			$this->performance['rendering'] = 0;
+			$this->performance['parser'] = 0;
+			$this->performance['marktime'] = 0;
+			$this->performance['markstart'] = microtime(true);
+		}
+
+		if ($callstack) {
+			$this->callstack['database'] = [];
+			$this->callstack['database_write'] = [];
+			$this->callstack['cache'] = [];
+			$this->callstack['cache_write'] = [];
+			$this->callstack['network'] = [];
+			$this->callstack['file'] = [];
+			$this->callstack['rendering'] = [];
+			$this->callstack['parser'] = [];
+		}
+	}
+
+	/**
+	 * Save the current profiling data to a log entry
+	 *
+	 * @param string $message Additional message for the log
+	 */
+	public function saveLog($message)
+	{
+		// Write down the performance values into the log
+		if ($this->enabled) {
+			$duration = microtime(true)-$this->get('start');
+			$this->logger->info(
+				$message,
+				[
+					'module' => 'api',
+					'action' => 'call',
+					'database_read' => round($this->get('database') - $this->get('database_write'), 3),
+					'database_write' => round($this->get('database_write'), 3),
+					'cache_read' => round($this->get('cache'), 3),
+					'cache_write' => round($this->get('cache_write'), 3),
+					'network_io' => round($this->get('network'), 2),
+					'file_io' => round($this->get('file'), 2),
+					'other_io' => round($duration - ($this->get('database')
+							+ $this->get('cache') + $this->get('cache_write')
+							+ $this->get('network') + $this->get('file')), 2),
+					'total' => round($duration, 2)
+				]
+			);
+
+			$o = '';
+			if ($this->rendertime) {
+				if (isset($this->callstack["database"])) {
+					$o .= "\nDatabase Read:\n";
+					foreach ($this->callstack["database"] as $func => $time) {
+						$time = round($time, 3);
+						if ($time > 0) {
+							$o .= $func.": ".$time."\n";
+						}
+					}
+				}
+				if (isset($this->callstack["database_write"])) {
+					$o .= "\nDatabase Write:\n";
+					foreach ($this->callstack["database_write"] as $func => $time) {
+						$time = round($time, 3);
+						if ($time > 0) {
+							$o .= $func.": ".$time."\n";
+						}
+					}
+				}
+				if (isset($this->callstack["dache"])) {
+					$o .= "\nCache Read:\n";
+					foreach ($this->callstack["dache"] as $func => $time) {
+						$time = round($time, 3);
+						if ($time > 0) {
+							$o .= $func.": ".$time."\n";
+						}
+					}
+				}
+				if (isset($this->callstack["dache_write"])) {
+					$o .= "\nCache Write:\n";
+					foreach ($this->callstack["dache_write"] as $func => $time) {
+						$time = round($time, 3);
+						if ($time > 0) {
+							$o .= $func.": ".$time."\n";
+						}
+					}
+				}
+				if (isset($this->callstack["network"])) {
+					$o .= "\nNetwork:\n";
+					foreach ($this->callstack["network"] as $func => $time) {
+						$time = round($time, 3);
+						if ($time > 0) {
+							$o .= $func.": ".$time."\n";
+						}
+					}
+				}
+			}
+
+			$this->logger->info(
+				$message . ": " . sprintf(
+					"DB: %s/%s, Cache: %s/%s, Net: %s, I/O: %s, Other: %s, Total: %s".$o,
+					number_format($this->get('database') - $this->get('database_write'), 2),
+					number_format($this->get('database_write'), 2),
+					number_format($this->get('cache'), 2),
+					number_format($this->get('cache_write'), 2),
+					number_format($this->get('network'), 2),
+					number_format($this->get('file'), 2),
+					number_format($duration - ($this->get('database')
+							+ $this->get('cache') + $this->get('cache_write')
+							+ $this->get('network') + $this->get('file')), 2),
+					number_format($duration, 2)
+				)
+			);
+		}
+	}
+
+	/**
+	 * Finds an entry of the container by its identifier and returns it.
+	 *
+	 * @param string $id Identifier of the entry to look for.
+	 *
+	 * @throws NotFoundExceptionInterface  No entry was found for **this** identifier.
+	 * @throws ContainerExceptionInterface Error while retrieving the entry.
+	 *
+	 * @return int Entry.
+	 */
+	public function get($id)
+	{
+		if (!$this->has($id)) {
+			return 0;
+		} else {
+			return $this->performance[$id];
+		}
+	}
+
+	/**
+	 * Returns true if the container can return an entry for the given identifier.
+	 * Returns false otherwise.
+	 *
+	 * `has($id)` returning true does not mean that `get($id)` will not throw an exception.
+	 * It does however mean that `get($id)` will not throw a `NotFoundExceptionInterface`.
+	 *
+	 * @param string $id Identifier of the entry to look for.
+	 *
+	 * @return bool
+	 */
+	public function has($id)
+	{
+		return isset($this->performance[$id]);
+	}
+}
diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 79af5b546..5c66711dc 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -9,6 +9,7 @@ use Friendica\Core\Config;
 use Friendica\Database\DBA;
 use Friendica\Factory;
 use Friendica\Util\BasePath;
+use Friendica\Util\Profiler;
 use PHPUnit\DbUnit\DataSet\YamlDataSet;
 use PHPUnit\DbUnit\TestCaseTrait;
 use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
@@ -43,8 +44,11 @@ abstract class DatabaseTest extends MockedTest
 		$configLoader = new Config\ConfigCacheLoader($basedir);
 		$config = Factory\ConfigFactory::createCache($configLoader);
 
+		$profiler = \Mockery::mock(Profiler::class);
+
 		DBA::connect(
 			$config,
+			$profiler,
 			getenv('MYSQL_HOST'),
 			getenv('MYSQL_USERNAME'),
 			getenv('MYSQL_PASSWORD'),

From 0a7861da652b0ea30ec4827c69cb5b98072c1a60 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 16 Feb 2019 23:17:10 +0100
Subject: [PATCH 015/145] Dependency of callstack moved one layer up

---
 src/App.php                   |  4 ++--
 src/Content/Text/BBCode.php   |  6 +++---
 src/Content/Text/Markdown.php |  3 ++-
 src/Core/Addon.php            |  2 +-
 src/Core/Cache.php            |  8 ++++----
 src/Core/Logger.php           | 20 ++++++++++----------
 src/Core/Renderer.php         |  4 ++--
 src/Core/Theme.php            |  2 +-
 src/Database/DBA.php          |  8 ++++----
 src/Object/Image.php          |  8 ++++----
 src/Util/Network.php          |  8 ++++----
 src/Util/Profiler.php         |  6 ++----
 12 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/src/App.php b/src/App.php
index 6e1f83fdd..e61b8dbae 100644
--- a/src/App.php
+++ b/src/App.php
@@ -493,7 +493,7 @@ class App
 
 		unset($db_host, $db_user, $db_pass, $db_data, $charset);
 
-		$this->profiler->saveTimestamp($stamp1, 'network');
+		$this->profiler->saveTimestamp($stamp1, 'network', Core\System::callstack());
 	}
 
 	public function getScheme()
@@ -1189,7 +1189,7 @@ class App
 		if (!$this->isBackend()) {
 			$stamp1 = microtime(true);
 			session_start();
-			$this->profiler->saveTimestamp($stamp1, 'parser');
+			$this->profiler->saveTimestamp($stamp1, 'parser', Core\System::callstack());
 			Core\L10n::setSessionVariable();
 			Core\L10n::setLangFromSession();
 		} else {
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 75cb32b62..e9b5f98d0 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1027,7 +1027,7 @@ class BBCode extends BaseObject
 			@curl_exec($ch);
 			$curl_info = @curl_getinfo($ch);
 
-			$a->getProfiler()->saveTimestamp($stamp1, "network");
+			$a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack());
 
 			if (substr($curl_info["content_type"], 0, 6) == "image/") {
 				$text = "[url=" . $match[1] . "]" . $match[1] . "[/url]";
@@ -1086,7 +1086,7 @@ class BBCode extends BaseObject
 			@curl_exec($ch);
 			$curl_info = @curl_getinfo($ch);
 
-			$a->getProfiler()->saveTimestamp($stamp1, "network");
+			$a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack());
 
 			// if its a link to a picture then embed this picture
 			if (substr($curl_info["content_type"], 0, 6) == "image/") {
@@ -1915,7 +1915,7 @@ class BBCode extends BaseObject
 		// unmask the special chars back to HTML
 		$text = str_replace(['&\_lt\_;', '&\_gt\_;', '&\_amp\_;'], ['&lt;', '&gt;', '&amp;'], $text);
 
-		$a->getProfiler()->saveTimestamp($stamp1, "parser");
+		$a->getProfiler()->saveTimestamp($stamp1, "parser", System::callstack());
 
 		// Libertree has a problem with escaped hashtags.
 		$text = str_replace(['\#'], ['#'], $text);
diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index 28ee215b2..e3e2cd3ac 100644
--- a/src/Content/Text/Markdown.php
+++ b/src/Content/Text/Markdown.php
@@ -7,6 +7,7 @@
 namespace Friendica\Content\Text;
 
 use Friendica\BaseObject;
+use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Michelf\MarkdownExtra;
 
@@ -36,7 +37,7 @@ class Markdown extends BaseObject
 		$html = $MarkdownParser->transform($text);
 		$html = preg_replace('/<a(.*?)href="#/is', '<a$1href="' . ltrim($_SERVER['REQUEST_URI'], '/') . '#', $html);
 
-		self::getApp()->getProfiler()->saveTimestamp($stamp1, "parser");
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, "parser", System::callstack());
 
 		return $html;
 	}
diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 483882c3e..7957e0835 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -219,7 +219,7 @@ class Addon extends BaseObject
 
 		$stamp1 = microtime(true);
 		$f = file_get_contents("addon/$addon/$addon.php");
-		$a->getProfiler()->saveTimestamp($stamp1, "file");
+		$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
 
 		$r = preg_match("|/\*.*\*/|msU", $f, $m);
 
diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index cd1581ef9..cadb2444b 100644
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -63,7 +63,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->getAllKeys($prefix);
 
-		self::getApp()->getProfiler()->saveTimestamp($time, 'cache');
+		self::getApp()->getProfiler()->saveTimestamp($time, 'cache', System::callstack());
 
 		return $return;
 	}
@@ -82,7 +82,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->get($key);
 
-		self::getApp()->getProfiler()->saveTimestamp($time, 'cache');
+		self::getApp()->getProfiler()->saveTimestamp($time, 'cache', System::callstack());
 
 		return $return;
 	}
@@ -105,7 +105,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->set($key, $value, $duration);
 
-		self::getApp()->getProfiler()->saveTimestamp($time, 'cache_write');
+		self::getApp()->getProfiler()->saveTimestamp($time, 'cache_write', System::callstack());
 
 		return $return;
 	}
@@ -124,7 +124,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->delete($key);
 
-		self::getApp()->getProfiler()->saveTimestamp($time, 'cache_write');
+		self::getApp()->getProfiler()->saveTimestamp($time, 'cache_write', System::callstack());
 
 		return $return;
 	}
diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index 69be501a3..0712c91b1 100644
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -155,7 +155,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->emergency($message, $context);
-		self::getApp()->GetProfiler()->saveTimestamp($stamp1, 'file');
+		self::getApp()->GetProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -179,7 +179,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->alert($message, $context);
-		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -202,7 +202,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->critical($message, $context);
-		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -225,7 +225,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->error($message, $context);
-		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -249,7 +249,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->warning($message, $context);
-		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -270,7 +270,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->notice($message, $context);
-		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -293,7 +293,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->info($message, $context);
-		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -314,7 +314,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->debug($message, $context);
-		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
     /**
@@ -334,7 +334,7 @@ class Logger extends BaseObject
 
         $stamp1 = microtime(true);
 		self::$logger->log($level, $msg);
-		self::getApp()->getProfiler()->saveTimestamp($stamp1, "file");
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
     }
 
 	/**
@@ -355,6 +355,6 @@ class Logger extends BaseObject
 
         $stamp1 = microtime(true);
         self::$devLogger->log($level, $msg);
-		self::getApp()->getProfiler()->saveTimestamp($stamp1, "file");
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
     }
 }
diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
index c032448c9..8844f2688 100644
--- a/src/Core/Renderer.php
+++ b/src/Core/Renderer.php
@@ -74,7 +74,7 @@ class Renderer extends BaseObject
             exit();
         }
 
-		$a->getProfiler()->saveTimestamp($stamp1, "rendering");
+		$a->getProfiler()->saveTimestamp($stamp1, "rendering", System::callstack());
 
         return $output;
     }
@@ -101,7 +101,7 @@ class Renderer extends BaseObject
             exit();
         }
 
-        $a->getProfiler()->saveTimestamp($stamp1, "file");
+        $a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
 
         return $template;
     }
diff --git a/src/Core/Theme.php b/src/Core/Theme.php
index dbfc0fd90..5479f8f46 100644
--- a/src/Core/Theme.php
+++ b/src/Core/Theme.php
@@ -51,7 +51,7 @@ class Theme
 		$a = \get_app();
 		$stamp1 = microtime(true);
 		$theme_file = file_get_contents("view/theme/$theme/theme.php");
-		$a->getProfiler()->saveTimestamp($stamp1, "file");
+		$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
 
 		$result = preg_match("|/\*.*\*/|msU", $theme_file, $matches);
 
diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 7c24ecfd3..edef30901 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -587,7 +587,7 @@ class DBA
 			self::$errorno = $errorno;
 		}
 
-		self::$profiler->saveTimestamp($stamp1, 'database');
+		self::$profiler->saveTimestamp($stamp1, 'database', System::callstack());
 
 		if (self::$configCache->get('system', 'db_log')) {
 			$stamp2 = microtime(true);
@@ -658,7 +658,7 @@ class DBA
 			self::$errorno = $errorno;
 		}
 
-		self::$profiler->saveTimestamp($stamp, "database_write");
+		self::$profiler->saveTimestamp($stamp, "database_write", System::callstack());
 
 		return $retval;
 	}
@@ -827,7 +827,7 @@ class DBA
 				}
 		}
 
-		self::$profiler->saveTimestamp($stamp1, 'database');
+		self::$profiler->saveTimestamp($stamp1, 'database', System::callstack());
 
 		return $columns;
 	}
@@ -1564,7 +1564,7 @@ class DBA
 				break;
 		}
 
-		self::$profiler->saveTimestamp($stamp1, 'database');
+		self::$profiler->saveTimestamp($stamp1, 'database', System::callstack());
 
 		return $ret;
 	}
diff --git a/src/Object/Image.php b/src/Object/Image.php
index c43955375..45c8bedea 100644
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -656,7 +656,7 @@ class Image
 
 		$stamp1 = microtime(true);
 		file_put_contents($path, $string);
-		$a->getProfiler()->saveTimestamp($stamp1, "file");
+		$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
 	}
 
 	/**
@@ -802,7 +802,7 @@ class Image
 					$a = \get_app();
 					$stamp1 = microtime(true);
 					file_put_contents($tempfile, $img_str);
-					$a->getProfiler()->saveTimestamp($stamp1, "file");
+					$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
 
 					$data = getimagesize($tempfile);
 					unlink($tempfile);
@@ -910,7 +910,7 @@ class Image
 
 			$stamp1 = microtime(true);
 			$imagedata = @file_get_contents($url);
-			$a->getProfiler()->saveTimestamp($stamp1, "file");
+			$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
 		}
 
 		$maximagesize = Config::get('system', 'maximagesize');
@@ -924,7 +924,7 @@ class Image
 
 		$stamp1 = microtime(true);
 		file_put_contents($tempfile, $imagedata);
-		$a->getProfiler()->saveTimestamp($stamp1, "file");
+		$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
 
 		$data = getimagesize($tempfile);
 
diff --git a/src/Util/Network.php b/src/Util/Network.php
index 4d5afa3a3..cda8c9a71 100644
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -232,7 +232,7 @@ class Network
 
 		@curl_close($ch);
 
-		$a->getProfiler()->saveTimestamp($stamp1, 'network');
+		$a->getProfiler()->saveTimestamp($stamp1, 'network', System::callstack());
 
 		return $curlResponse;
 	}
@@ -334,7 +334,7 @@ class Network
 
 		curl_close($ch);
 
-		$a->getProfiler()->saveTimestamp($stamp1, 'network');
+		$a->getProfiler()->saveTimestamp($stamp1, 'network', System::callstack());
 
 		Logger::log('post_url: end ' . $url, Logger::DATA);
 
@@ -641,7 +641,7 @@ class Network
 		$http_code = $curl_info['http_code'];
 		curl_close($ch);
 
-		$a->getProfiler()->saveTimestamp($stamp1, "network");
+		$a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack());
 
 		if ($http_code == 0) {
 			return $url;
@@ -683,7 +683,7 @@ class Network
 		$body = curl_exec($ch);
 		curl_close($ch);
 
-		$a->getProfiler()->saveTimestamp($stamp1, "network");
+		$a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack());
 
 		if (trim($body) == "") {
 			return $url;
diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index 7bf30a277..f65bede15 100644
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Util;
 
-use Friendica\Core;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -58,8 +57,9 @@ class Profiler implements ContainerInterface
 	 *
 	 * @param int $timestamp the Timestamp
 	 * @param string $value A value to profile
+	 * @param string $callstack The callstack of the current profiling data
 	 */
-	public function saveTimestamp($timestamp, $value)
+	public function saveTimestamp($timestamp, $value, $callstack = '')
 	{
 		if (!$this->enabled) {
 			return;
@@ -75,8 +75,6 @@ class Profiler implements ContainerInterface
 		$this->performance[$value] += (float) $duration;
 		$this->performance['marktime'] += (float) $duration;
 
-		$callstack = Core\System::callstack();
-
 		if (!isset($this->callstack[$value][$callstack])) {
 			// Prevent ugly E_NOTICE
 			$this->callstack[$value][$callstack] = 0;

From cb1ad4287d114ef3c712aa2d163a7f80e9bd48f1 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 16 Feb 2019 23:18:24 +0100
Subject: [PATCH 016/145] adding parameter to App

---
 bin/auth_ejabberd.php | 2 +-
 bin/console.php       | 2 +-
 bin/daemon.php        | 2 +-
 bin/worker.php        | 2 +-
 index.php             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 8a5c43c6d..cc2517644 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -58,7 +58,7 @@ $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
 $configLoader = new Config\ConfigCacheLoader($basedir);
 $config = Factory\ConfigFactory::createCache($configLoader);
 $logger = Factory\LoggerFactory::create('auth_ejabberd', $config);
-$profiler = Factory\ProfilerFactory::create($config);
+$profiler = Factory\ProfilerFactory::create($logger, $config);
 
 $a = new App($config, $logger, $profiler);
 
diff --git a/bin/console.php b/bin/console.php
index ceccfc823..757af31d5 100755
--- a/bin/console.php
+++ b/bin/console.php
@@ -11,7 +11,7 @@ $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
 $configLoader = new Config\ConfigCacheLoader($basedir);
 $config = Factory\ConfigFactory::createCache($configLoader);
 $logger = Factory\LoggerFactory::create('console', $config);
-$profiler = Factory\ProfilerFactory::create($config);
+$profiler = Factory\ProfilerFactory::create($logger, $config);
 
 $a = new Friendica\App($config, $logger, $profiler);
 \Friendica\BaseObject::setApp($a);
diff --git a/bin/daemon.php b/bin/daemon.php
index 3b5c04b7a..da4bc1992 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -37,7 +37,7 @@ $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
 $configLoader = new Config\ConfigCacheLoader($basedir);
 $config = Factory\ConfigFactory::createCache($configLoader);
 $logger = Factory\LoggerFactory::create('daemon', $config);
-$profiler = Factory\ProfilerFactory::create($config);
+$profiler = Factory\ProfilerFactory::create($logger, $config);
 
 $a = new App($config, $logger, $profiler);
 
diff --git a/bin/worker.php b/bin/worker.php
index c93abaf0f..9b396c6f9 100755
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -35,7 +35,7 @@ $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
 $configLoader = new Config\ConfigCacheLoader($basedir);
 $config = Factory\ConfigFactory::createCache($configLoader);
 $logger = Factory\LoggerFactory::create('worker', $config);
-$profiler = Factory\ProfilerFactory::create($config);
+$profiler = Factory\ProfilerFactory::create($logger, $config);
 
 $a = new App($config, $logger, $profiler);
 
diff --git a/index.php b/index.php
index d8c233be2..216fbe90a 100644
--- a/index.php
+++ b/index.php
@@ -19,7 +19,7 @@ $basedir = BasePath::create(__DIR__, $_SERVER);
 $configLoader = new Config\ConfigCacheLoader($basedir);
 $config = Factory\ConfigFactory::createCache($configLoader);
 $logger = Factory\LoggerFactory::create('index', $config);
-$profiler = Factory\ProfilerFactory::create($config);
+$profiler = Factory\ProfilerFactory::create($logger, $config);
 
 // We assume that the index.php is called by a frontend process
 // The value is set to "true" by default in App

From 68c904bbf4977283b7083f411064bcf4b315a124 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 16 Feb 2019 23:19:54 +0100
Subject: [PATCH 017/145] adding parameter to App

---
 tests/include/ApiTest.php              | 3 ++-
 tests/src/Database/DBATest.php         | 3 ++-
 tests/src/Database/DBStructureTest.php | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index be70d923b..41f5c0fdf 100644
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -39,7 +39,8 @@ class ApiTest extends DatabaseTest
 		$configLoader = new Config\ConfigCacheLoader($basedir);
 		$config = Factory\ConfigFactory::createCache($configLoader);
 		$logger = Factory\LoggerFactory::create('test', $config);
-		$this->app = new App($config, $logger, false);
+		$profiler = Factory\ProfilerFactory::create($logger, $config);
+		$this->app = new App($config, $logger, $profiler, false);
 		$this->logOutput = FActory\LoggerFactory::enableTest($this->app->getLogger());
 
 		parent::setUp();
diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
index f2a5cc555..c6981a91d 100644
--- a/tests/src/Database/DBATest.php
+++ b/tests/src/Database/DBATest.php
@@ -16,7 +16,8 @@ class DBATest extends DatabaseTest
 		$configLoader = new Config\ConfigCacheLoader($basedir);
 		$config = Factory\ConfigFactory::createCache($configLoader);
 		$logger = Factory\LoggerFactory::create('test', $config);
-		$this->app = new App($config, $logger, false);
+		$profiler = Factory\ProfilerFactory::create($logger, $config);
+		$this->app = new App($config, $logger, $profiler, false);
 		$this->logOutput = FActory\LoggerFactory::enableTest($this->app->getLogger());
 
 		parent::setUp();
diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php
index bc50a0a69..250df0693 100644
--- a/tests/src/Database/DBStructureTest.php
+++ b/tests/src/Database/DBStructureTest.php
@@ -17,7 +17,8 @@ class DBStructureTest extends DatabaseTest
 		$configLoader = new Config\ConfigCacheLoader($basedir);
 		$config = Factory\ConfigFactory::createCache($configLoader);
 		$logger = Factory\LoggerFactory::create('test', $config);
-		$this->app = new App($config, $logger, false);
+		$profiler = Factory\ProfilerFactory::create($logger, $config);
+		$this->app = new App($config, $logger, $profiler, false);
 		$this->logOutput = FActory\LoggerFactory::enableTest($this->app->getLogger());
 
 		parent::setUp();

From ad30e4824c1c325bbf49210517c7e586d051bdb4 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 16 Feb 2019 17:58:00 -0500
Subject: [PATCH 018/145] [frio] Add margin between comment submit buttons and
 preview

---
 view/theme/frio/templates/comment_item.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index 903eb1346..98b3c4563 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -54,12 +54,12 @@
 		</p>
 {{/if}}
 
-		<div class="comment-edit-submit-wrapper">
+		<p class="comment-edit-submit-wrapper">
 {{if $preview}}
 			<button type="button" class="btn btn-defaul btn-sm" onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}"><i class="fa fa-eye"></i> {{$preview}}</button>
 {{/if}}
 			<button type="submit" class="btn btn-primary btn-sm" id="comment-edit-submit-{{$id}}" name="submit"><i class="fa fa-envelope"></i> {{$submit}}</button>
-		</div>
+		</p>
 
 		<div class="comment-edit-end clear"></div>
 	</form>

From 6d73dcbe3d12dea1bed0e0bc3827b39d0e98aea7 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 17 Feb 2019 00:03:38 +0100
Subject: [PATCH 019/145] Adding composer & tests

---
 composer.json                   |   9 +-
 composer.lock                   |  52 ++++++++-
 src/Util/Profiler.php           |  31 ++----
 tests/src/Util/ProfilerTest.php | 181 ++++++++++++++++++++++++++++++++
 4 files changed, 245 insertions(+), 28 deletions(-)
 create mode 100644 tests/src/Util/ProfilerTest.php

diff --git a/composer.json b/composer.json
index 39d935892..c3d5d4570 100644
--- a/composer.json
+++ b/composer.json
@@ -35,12 +35,12 @@
 		"michelf/php-markdown": "^1.7",
 		"mobiledetect/mobiledetectlib": "2.8.*",
 		"paragonie/random_compat": "^2.0",
-		"pear/Text_LanguageDetect": "1.*",
+		"pear/text_languageDetect": "1.*",
 		"seld/cli-prompt": "^1.0",
 		"smarty/smarty": "^3.1",
 		"fxp/composer-asset-plugin": "~1.3",
 		"bower-asset/base64": "^1.0",
-		"bower-asset/Chart-js": "^2.7",
+		"bower-asset/chart-js": "^2.7",
 		"bower-asset/perfect-scrollbar": "^0.6",
 		"bower-asset/vue": "^2.5",
 		"npm-asset/jquery": "^2.0",
@@ -50,7 +50,8 @@
 		"npm-asset/fullcalendar": "^3.0.1",
 		"npm-asset/cropperjs": "1.2.2",
 		"npm-asset/imagesloaded": "4.1.4",
-		"monolog/monolog": "^1.24"
+		"monolog/monolog": "^1.24",
+		"psr/container": "^1.0"
 	},
 	"repositories": [
 		{
@@ -96,7 +97,7 @@
 		"phpunit/dbunit": "^2.0",
 		"phpdocumentor/reflection-docblock": "^3.0.2",
 		"phpunit/php-token-stream": "^1.4.2",
-		"mikey179/vfsStream": "^1.6",
+		"mikey179/vfsstream": "^1.6",
 		"mockery/mockery": "^1.2",
 		"johnkary/phpunit-speedtrap": "1.1"
 	},
diff --git a/composer.lock b/composer.lock
index f91b833de..e554b1199 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b944adfb6ede89430ba3b7e9ebb45acb",
+    "content-hash": "19fabb14e0dd5d806ef841e51d5f6a0b",
     "packages": [
         {
             "name": "asika/simple-console",
@@ -1882,6 +1882,55 @@
             ],
             "time": "2016-08-06T20:24:11+00:00"
         },
+        {
+            "name": "psr/container",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "time": "2017-02-14T16:28:37+00:00"
+        },
         {
             "name": "psr/http-message",
             "version": "1.0.1",
@@ -2650,6 +2699,7 @@
                 "testing",
                 "xunit"
             ],
+            "abandoned": true,
             "time": "2016-12-02T14:39:14+00:00"
         },
         {
diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index f65bede15..e2d070075 100644
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -47,8 +47,7 @@ class Profiler implements ContainerInterface
 		$this->enabled = $enabled;
 		$this->rendertime = $renderTime;
 		$this->logger = $logger;
-		$this->performance = [];
-		$this->callstack   = [];
+		$this->reset();
 	}
 
 	/**
@@ -103,7 +102,7 @@ class Profiler implements ContainerInterface
 			$this->performance['rendering'] = 0;
 			$this->performance['parser'] = 0;
 			$this->performance['marktime'] = 0;
-			$this->performance['markstart'] = microtime(true);
+			$this->performance['marktime'] = microtime(true);
 		}
 
 		if ($callstack) {
@@ -123,7 +122,7 @@ class Profiler implements ContainerInterface
 	 *
 	 * @param string $message Additional message for the log
 	 */
-	public function saveLog($message)
+	public function saveLog($message = '')
 	{
 		// Write down the performance values into the log
 		if ($this->enabled) {
@@ -166,18 +165,18 @@ class Profiler implements ContainerInterface
 						}
 					}
 				}
-				if (isset($this->callstack["dache"])) {
+				if (isset($this->callstack["cache"])) {
 					$o .= "\nCache Read:\n";
-					foreach ($this->callstack["dache"] as $func => $time) {
+					foreach ($this->callstack["cache"] as $func => $time) {
 						$time = round($time, 3);
 						if ($time > 0) {
 							$o .= $func.": ".$time."\n";
 						}
 					}
 				}
-				if (isset($this->callstack["dache_write"])) {
+				if (isset($this->callstack["cache_write"])) {
 					$o .= "\nCache Write:\n";
-					foreach ($this->callstack["dache_write"] as $func => $time) {
+					foreach ($this->callstack["cache_write"] as $func => $time) {
 						$time = round($time, 3);
 						if ($time > 0) {
 							$o .= $func.": ".$time."\n";
@@ -193,23 +192,9 @@ class Profiler implements ContainerInterface
 						}
 					}
 				}
+				$this->logger->info($message . ": " . $o);
 			}
 
-			$this->logger->info(
-				$message . ": " . sprintf(
-					"DB: %s/%s, Cache: %s/%s, Net: %s, I/O: %s, Other: %s, Total: %s".$o,
-					number_format($this->get('database') - $this->get('database_write'), 2),
-					number_format($this->get('database_write'), 2),
-					number_format($this->get('cache'), 2),
-					number_format($this->get('cache_write'), 2),
-					number_format($this->get('network'), 2),
-					number_format($this->get('file'), 2),
-					number_format($duration - ($this->get('database')
-							+ $this->get('cache') + $this->get('cache_write')
-							+ $this->get('network') + $this->get('file')), 2),
-					number_format($duration, 2)
-				)
-			);
 		}
 	}
 
diff --git a/tests/src/Util/ProfilerTest.php b/tests/src/Util/ProfilerTest.php
new file mode 100644
index 000000000..f9febeae8
--- /dev/null
+++ b/tests/src/Util/ProfilerTest.php
@@ -0,0 +1,181 @@
+<?php
+
+namespace src\Util;
+
+use Friendica\Test\MockedTest;
+use Friendica\Util\Profiler;
+use Mockery\MockInterface;
+use Psr\Log\LoggerInterface;
+
+class ProfilerTest extends MockedTest
+{
+	/**
+	 * @var LoggerInterface|MockInterface
+	 */
+	private $logger;
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->logger = \Mockery::mock('Psr\Log\LoggerInterface');
+	}
+
+	/**
+	 * Test the Profiler setup
+	 */
+	public function testSetUp()
+	{
+		$profiler = new Profiler($this->logger, true, true);
+	}
+
+	/**
+	 * A dataset for different profiling settings
+	 * @return array
+	 */
+	public function dataPerformance()
+	{
+		return [
+			'database' => [
+				'timestamp' => time(),
+				'name' => 'database',
+				'functions' => ['test', 'it'],
+			],
+			'database_write' => [
+				'timestamp' => time(),
+				'name' => 'database_write',
+				'functions' => ['test', 'it2'],
+			],
+			'cache' => [
+				'timestamp' => time(),
+				'name' => 'cache',
+				'functions' => ['test', 'it3'],
+			],
+			'cache_write' => [
+				'timestamp' => time(),
+				'name' => 'cache_write',
+				'functions' => ['test', 'it4'],
+			],
+			'network' => [
+				'timestamp' => time(),
+				'name' => 'network',
+				'functions' => ['test', 'it5'],
+			],
+			'file' => [
+				'timestamp' => time(),
+				'name' => 'file',
+				'functions' => [],
+			],
+			'rendering' => [
+				'timestamp' => time(),
+				'name' => 'rendering',
+				'functions' => ['test', 'it7'],
+			],
+			'parser' => [
+				'timestamp' => time(),
+				'name' => 'parser',
+				'functions' => ['test', 'it8'],
+			],
+			'marktime' => [
+				'timestamp' => time(),
+				'name' => 'parser',
+				'functions' => ['test'],
+			],
+			// This one isn't set during reset
+			'unknown' => [
+				'timestamp' => time(),
+				'name' => 'unknown',
+				'functions' => ['test'],
+			],
+		];
+	}
+
+	/**
+	 * Test the Profiler savetimestamp
+	 * @dataProvider dataPerformance
+	 */
+	public function testSaveTimestamp($timestamp, $name, array $functions)
+	{
+		$profiler = new Profiler($this->logger, true, true);
+
+		foreach ($functions as $function) {
+			$profiler->saveTimestamp($timestamp, $name, $function);
+		}
+
+		$this->assertGreaterThanOrEqual(0, $profiler->get($name));
+	}
+
+	/**
+	 * Test the Profiler reset
+	 * @dataProvider dataPerformance
+	 */
+	public function testReset($timestamp, $name, array $functions)
+	{
+		$profiler = new Profiler($this->logger, true, true);
+
+		$profiler->saveTimestamp($timestamp, $name);
+		$profiler->reset();
+
+		$this->assertEquals(0, $profiler->get($name));
+	}
+
+	public function dataBig()
+	{
+		return [
+			'big' => [
+				'data' => [
+					'database' => [
+						'timestamp' => time(),
+						'name' => 'database',
+						'functions' => ['test', 'it'],
+					],
+					'database_write' => [
+						'timestamp' => time(),
+						'name' => 'database_write',
+						'functions' => ['test', 'it2'],
+					],
+					'cache' => [
+						'timestamp' => time(),
+						'name' => 'cache',
+						'functions' => ['test', 'it3'],
+					],
+					'cache_write' => [
+						'timestamp' => time(),
+						'name' => 'cache_write',
+						'functions' => ['test', 'it4'],
+					],
+					'network' => [
+						'timestamp' => time(),
+						'name' => 'network',
+						'functions' => ['test', 'it5'],
+					],
+				]
+			]
+		];
+	}
+
+	/**
+	 * Test the output of the Profiler
+	 * @dataProvider dataBig
+	 */
+	public function testSaveLog($data)
+	{
+		$this->logger
+			->shouldReceive('info')
+			->with('test', \Mockery::any())
+			->once();
+		$this->logger
+			->shouldReceive('info')
+			->once();
+
+		$profiler = new Profiler($this->logger, true, true);
+
+		foreach ($data as $perf => $items) {
+			foreach ($items['functions'] as $function) {
+				$profiler->saveTimestamp($items['timestamp'], $items['name'], $function);
+			}
+		}
+
+		$profiler->saveLog('test');
+	}
+}

From 3cabddcdec98731bfef0b9921d046c01321b5943 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 16 Feb 2019 18:40:05 -0500
Subject: [PATCH 020/145] [frio] Hide fake comment form when comment form isn't
 present

---
 view/theme/frio/templates/wall_thread.tpl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 0fcb84bad..591e102c7 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -408,24 +408,22 @@ as the value of $top_child_total (this is done at the end of this file)
 		{{* Insert the comment box of the top level post at the bottom of the thread.
 			Display this comment box if there are any comments. If not hide it. In this
 			case it could be opend with the "comment" button *}}
-		{{if $item.total_comments_num}}
+		{{if $item.comment && $item.thread_level==1}}
+			{{if $item.total_comments_num}}
 			<div class="comment-fake-form" id="comment-fake-form-{{$item.id}}">
 				<textarea id="comment-fake-text-{{$item.id}}" class="comment-fake-text-empty form-control" placeholder="{{$item.reply_label}}" onFocus="commentOpenUI(this, {{$item.id}});"  rows="1"></textarea>
 			</div>
-		{{/if}}
-		{{if $item.comment && $item.thread_level==1}}
+			{{/if}}
 			<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" data-display="block" style="display: none">{{$item.comment nofilter}}</div>
 		{{/if}}
 	</div><!-- /media -->
 </div><!-- ./panel-body or ./wall-item-container -->
 
-
 {{if $mode == display}}
 {{else}}
 {{if $item.comment_lastcollapsed}}</div>{{/if}}
 {{/if}}
 
-
 {{* close the comment-container div if no more thread_level = 2 children are left *}}
 {{if $item.thread_level==2 && $top_child_nr==$top_child_total}}
 </div><!--./comment-container-->

From 88fd8718447ebf09ab3e8ac1701ceeb67718a8a0 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 17 Feb 2019 01:18:21 +0100
Subject: [PATCH 021/145] refactoring & test fixing

---
 composer.json                          |   6 +-
 src/Core/Logger.php                    |   2 +-
 src/Util/Profiler.php                  | 199 ++++++++++++++-----------
 tests/src/Core/Console/ConsoleTest.php |   6 +-
 4 files changed, 118 insertions(+), 95 deletions(-)

diff --git a/composer.json b/composer.json
index c3d5d4570..78abd98e7 100644
--- a/composer.json
+++ b/composer.json
@@ -34,8 +34,10 @@
 		"lightopenid/lightopenid": "dev-master",
 		"michelf/php-markdown": "^1.7",
 		"mobiledetect/mobiledetectlib": "2.8.*",
+		"monolog/monolog": "^1.24",
 		"paragonie/random_compat": "^2.0",
 		"pear/text_languageDetect": "1.*",
+		"psr/container": "^1.0",
 		"seld/cli-prompt": "^1.0",
 		"smarty/smarty": "^3.1",
 		"fxp/composer-asset-plugin": "~1.3",
@@ -49,9 +51,7 @@
 		"npm-asset/jgrowl": "^1.4",
 		"npm-asset/fullcalendar": "^3.0.1",
 		"npm-asset/cropperjs": "1.2.2",
-		"npm-asset/imagesloaded": "4.1.4",
-		"monolog/monolog": "^1.24",
-		"psr/container": "^1.0"
+		"npm-asset/imagesloaded": "4.1.4"
 	},
 	"repositories": [
 		{
diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index 0712c91b1..d2b9e21ee 100644
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -354,7 +354,7 @@ class Logger extends BaseObject
 		}
 
         $stamp1 = microtime(true);
-        self::$devLogger->log($level, $msg);
+		self::$devLogger->log($level, $msg);
 		self::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
     }
 }
diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index e2d070075..5bad5eb6a 100644
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -91,32 +91,49 @@ class Profiler implements ContainerInterface
 	public function reset($performance = true, $callstack = true)
 	{
 		if ($performance) {
-			$this->performance = [];
-			$this->performance['start'] = microtime(true);
-			$this->performance['database'] = 0;
-			$this->performance['database_write'] = 0;
-			$this->performance['cache'] = 0;
-			$this->performance['cache_write'] = 0;
-			$this->performance['network'] = 0;
-			$this->performance['file'] = 0;
-			$this->performance['rendering'] = 0;
-			$this->performance['parser'] = 0;
-			$this->performance['marktime'] = 0;
-			$this->performance['marktime'] = microtime(true);
+			$this->resetPerformance();
 		}
 
 		if ($callstack) {
-			$this->callstack['database'] = [];
-			$this->callstack['database_write'] = [];
-			$this->callstack['cache'] = [];
-			$this->callstack['cache_write'] = [];
-			$this->callstack['network'] = [];
-			$this->callstack['file'] = [];
-			$this->callstack['rendering'] = [];
-			$this->callstack['parser'] = [];
+			$this->resetCallstack();
 		}
 	}
 
+	/**
+	 * Resets the performance profiling data
+	 */
+	public function resetPerformance()
+	{
+		$this->performance = [];
+		$this->performance['start'] = microtime(true);
+		$this->performance['database'] = 0;
+		$this->performance['database_write'] = 0;
+		$this->performance['cache'] = 0;
+		$this->performance['cache_write'] = 0;
+		$this->performance['network'] = 0;
+		$this->performance['file'] = 0;
+		$this->performance['rendering'] = 0;
+		$this->performance['parser'] = 0;
+		$this->performance['marktime'] = 0;
+		$this->performance['marktime'] = microtime(true);
+	}
+
+	/**
+	 * Resets the callstack profiling data
+	 */
+	public function resetCallstack()
+	{
+		$this->callstack = [];
+		$this->callstack['database'] = [];
+		$this->callstack['database_write'] = [];
+		$this->callstack['cache'] = [];
+		$this->callstack['cache_write'] = [];
+		$this->callstack['network'] = [];
+		$this->callstack['file'] = [];
+		$this->callstack['rendering'] = [];
+		$this->callstack['parser'] = [];
+	}
+
 	/**
 	 * Save the current profiling data to a log entry
 	 *
@@ -125,77 +142,79 @@ class Profiler implements ContainerInterface
 	public function saveLog($message = '')
 	{
 		// Write down the performance values into the log
-		if ($this->enabled) {
-			$duration = microtime(true)-$this->get('start');
-			$this->logger->info(
-				$message,
-				[
-					'module' => 'api',
-					'action' => 'call',
-					'database_read' => round($this->get('database') - $this->get('database_write'), 3),
-					'database_write' => round($this->get('database_write'), 3),
-					'cache_read' => round($this->get('cache'), 3),
-					'cache_write' => round($this->get('cache_write'), 3),
-					'network_io' => round($this->get('network'), 2),
-					'file_io' => round($this->get('file'), 2),
-					'other_io' => round($duration - ($this->get('database')
-							+ $this->get('cache') + $this->get('cache_write')
-							+ $this->get('network') + $this->get('file')), 2),
-					'total' => round($duration, 2)
-				]
-			);
-
-			$o = '';
-			if ($this->rendertime) {
-				if (isset($this->callstack["database"])) {
-					$o .= "\nDatabase Read:\n";
-					foreach ($this->callstack["database"] as $func => $time) {
-						$time = round($time, 3);
-						if ($time > 0) {
-							$o .= $func.": ".$time."\n";
-						}
-					}
-				}
-				if (isset($this->callstack["database_write"])) {
-					$o .= "\nDatabase Write:\n";
-					foreach ($this->callstack["database_write"] as $func => $time) {
-						$time = round($time, 3);
-						if ($time > 0) {
-							$o .= $func.": ".$time."\n";
-						}
-					}
-				}
-				if (isset($this->callstack["cache"])) {
-					$o .= "\nCache Read:\n";
-					foreach ($this->callstack["cache"] as $func => $time) {
-						$time = round($time, 3);
-						if ($time > 0) {
-							$o .= $func.": ".$time."\n";
-						}
-					}
-				}
-				if (isset($this->callstack["cache_write"])) {
-					$o .= "\nCache Write:\n";
-					foreach ($this->callstack["cache_write"] as $func => $time) {
-						$time = round($time, 3);
-						if ($time > 0) {
-							$o .= $func.": ".$time."\n";
-						}
-					}
-				}
-				if (isset($this->callstack["network"])) {
-					$o .= "\nNetwork:\n";
-					foreach ($this->callstack["network"] as $func => $time) {
-						$time = round($time, 3);
-						if ($time > 0) {
-							$o .= $func.": ".$time."\n";
-						}
-					}
-				}
-				$this->logger->info($message . ": " . $o);
-			}
-
+		if (!$this->enabled) {
+			return;
 		}
+		$duration = microtime(true) - $this->get('start');
+		$this->logger->info(
+			$message,
+			[
+				'module' => 'api',
+				'action' => 'call',
+				'database_read' => round($this->get('database') - $this->get('database_write'), 3),
+				'database_write' => round($this->get('database_write'), 3),
+				'cache_read' => round($this->get('cache'), 3),
+				'cache_write' => round($this->get('cache_write'), 3),
+				'network_io' => round($this->get('network'), 2),
+				'file_io' => round($this->get('file'), 2),
+				'other_io' => round($duration - ($this->get('database')
+						+ $this->get('cache') + $this->get('cache_write')
+						+ $this->get('network') + $this->get('file')), 2),
+				'total' => round($duration, 2)
+			]
+		);
+
+		if (!$this->rendertime) {
+			return;
+		}
+		
+		$o = '';
+		if (isset($this->callstack["database"])) {
+			$o .= "\nDatabase Read:\n";
+			foreach ($this->callstack["database"] as $func => $time) {
+				$time = round($time, 3);
+				if ($time > 0) {
+					$o .= $func . ": " . $time . "\n";
+				}
+			}
+		}
+		if (isset($this->callstack["database_write"])) {
+			$o .= "\nDatabase Write:\n";
+			foreach ($this->callstack["database_write"] as $func => $time) {
+				$time = round($time, 3);
+				if ($time > 0) {
+					$o .= $func . ": " . $time . "\n";
+				}
+			}
+		}
+		if (isset($this->callstack["cache"])) {
+			$o .= "\nCache Read:\n";
+			foreach ($this->callstack["cache"] as $func => $time) {
+				$time = round($time, 3);
+				if ($time > 0) {
+					$o .= $func . ": " . $time . "\n";
+				}
+			}
+		}
+		if (isset($this->callstack["cache_write"])) {
+			$o .= "\nCache Write:\n";
+			foreach ($this->callstack["cache_write"] as $func => $time) {
+				$time = round($time, 3);
+				if ($time > 0) {
+					$o .= $func . ": " . $time . "\n";
+				}
+			}
+		}
+		if (isset($this->callstack["network"])) {
+			$o .= "\nNetwork:\n";
+			foreach ($this->callstack["network"] as $func => $time) {
+				$time = round($time, 3);
+				if ($time > 0) {
+					$o .= $func . ": " . $time . "\n";
+				}
+			}
+		}
+		$this->logger->info($message . ": " . $o);
 	}
 
 	/**
diff --git a/tests/src/Core/Console/ConsoleTest.php b/tests/src/Core/Console/ConsoleTest.php
index 905d214ca..715e68ab2 100644
--- a/tests/src/Core/Console/ConsoleTest.php
+++ b/tests/src/Core/Console/ConsoleTest.php
@@ -3,10 +3,12 @@
 namespace Friendica\Test\src\Core\Console;
 
 use Asika\SimpleConsole\Console;
+use Friendica\Core\Config\ConfigCache;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\AppMockTrait;
 use Friendica\Test\Util\Intercept;
 use Friendica\Test\Util\VFSTrait;
+use Friendica\Util\Profiler;
 
 abstract class ConsoleTest extends MockedTest
 {
@@ -29,8 +31,10 @@ abstract class ConsoleTest extends MockedTest
 		Intercept::setUp();
 
 		$this->setUpVfsDir();
-		$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+		$configMock = \Mockery::mock(ConfigCache::class);
 		$this->mockApp($this->root, $configMock);
+		$profileMock = \Mockery::mock(Profiler::class);
+		$this->app->shouldReceive('getProfiler')->andReturn($profileMock);
 	}
 
 	/**

From a3b9a8fe6146fd845f47b9eaf430fc8efcfc0c60 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 17 Feb 2019 01:56:46 +0100
Subject: [PATCH 022/145] Excluding Profiler from Loglines (better using the
 class above)

---
 src/Factory/LoggerFactory.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index 751a6357d..f6e2d6039 100644
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -3,9 +3,11 @@
 namespace Friendica\Factory;
 
 use Friendica\Core\Config\ConfigCache;
+use Friendica\Core\Logger;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\Logger\FriendicaDevelopHandler;
 use Friendica\Util\Logger\FriendicaIntrospectionProcessor;
+use Friendica\Util\Profiler;
 use Monolog;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
@@ -31,7 +33,7 @@ class LoggerFactory
 		$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
 		$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
 		$logger->pushProcessor(new Monolog\Processor\UidProcessor());
-		$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, ['Friendica\\Core\\Logger']));
+		$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, [Logger::class, Profiler::class]));
 
 		if (isset($config)) {
 			$debugging = $config->get('system', 'debugging');

From 3d077745099c51ca7dad306925a10cb2a8ad5a8d Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 17 Feb 2019 01:57:59 +0100
Subject: [PATCH 023/145] removed wrong log-output

---
 src/Util/Profiler.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index 5bad5eb6a..9d04a6498 100644
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -149,8 +149,7 @@ class Profiler implements ContainerInterface
 		$this->logger->info(
 			$message,
 			[
-				'module' => 'api',
-				'action' => 'call',
+				'action' => 'profiling',
 				'database_read' => round($this->get('database') - $this->get('database_write'), 3),
 				'database_write' => round($this->get('database_write'), 3),
 				'cache_read' => round($this->get('cache'), 3),
@@ -214,7 +213,7 @@ class Profiler implements ContainerInterface
 				}
 			}
 		}
-		$this->logger->info($message . ": " . $o);
+		$this->logger->info($message . ": " . $o, ['action' => 'profiling']);
 	}
 
 	/**

From d87a6e5a670be0e7d30d26d2ff05365e8d71fc73 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 17 Feb 2019 02:09:39 +0100
Subject: [PATCH 024/145] fixed line intends

---
 src/Core/Logger.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index d2b9e21ee..e42f2f033 100644
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -317,25 +317,25 @@ class Logger extends BaseObject
 		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
-    /**
-     * @brief Logs the given message at the given log level
-     *
-     * @param string $msg
-     * @param string $level
+	    /**
+	 * @brief Logs the given message at the given log level
+	 *
+	 * @param string $msg
+	 * @param string $level
 	 *
 	 * @throws \Exception
 	 * @deprecated since 2019.03 Use Logger::debug() Logger::info() , ... instead
-     */
-    public static function log($msg, $level = LogLevel::INFO)
-    {
+	 */
+	public static function log($msg, $level = LogLevel::INFO)
+	{
 		if (!isset(self::$logger)) {
 			return;
 		}
 
-        $stamp1 = microtime(true);
+		$stamp1 = microtime(true);
 		self::$logger->log($level, $msg);
 		self::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
-    }
+	}
 
 	/**
 	 * @brief An alternative logger for development.
@@ -347,14 +347,14 @@ class Logger extends BaseObject
 	 * @param string $level
 	 * @throws \Exception
 	 */
-    public static function devLog($msg, $level = LogLevel::DEBUG)
-    {
+	public static function devLog($msg, $level = LogLevel::DEBUG)
+	{
 		if (!isset(self::$logger)) {
 			return;
 		}
 
-        $stamp1 = microtime(true);
+		$stamp1 = microtime(true);
 		self::$devLogger->log($level, $msg);
 		self::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
-    }
+	}
 }

From a043848904bebf94127a0efae7e90f8661e9e90b Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 17 Feb 2019 02:12:19 +0100
Subject: [PATCH 025/145] fixed last uppercase composer entry

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 78abd98e7..3638a9495 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
 		"mobiledetect/mobiledetectlib": "2.8.*",
 		"monolog/monolog": "^1.24",
 		"paragonie/random_compat": "^2.0",
-		"pear/text_languageDetect": "1.*",
+		"pear/text_languagedetect": "1.*",
 		"psr/container": "^1.0",
 		"seld/cli-prompt": "^1.0",
 		"smarty/smarty": "^3.1",

From c36a0eabdb87afc553039e54e0a3e15ac3a77642 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 17 Feb 2019 10:34:48 +0100
Subject: [PATCH 026/145] fixing reset()

---
 src/Util/Profiler.php | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index 9d04a6498..a3f889380 100644
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -84,19 +84,11 @@ class Profiler implements ContainerInterface
 
 	/**
 	 * Resets the performance and callstack profiling
-	 *
-	 * @param bool $performance If true, reset the performance (Default true)
-	 * @param bool $callstack   If true, reset the callstack (Default true)
 	 */
-	public function reset($performance = true, $callstack = true)
+	public function reset()
 	{
-		if ($performance) {
-			$this->resetPerformance();
-		}
-
-		if ($callstack) {
-			$this->resetCallstack();
-		}
+		$this->resetPerformance();
+		$this->resetCallstack();
 	}
 
 	/**

From c59ba946483adf5c618337e07f929cd5ff8637e7 Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Sun, 17 Feb 2019 17:19:57 +0100
Subject: [PATCH 027/145] fix magic links for item mentions

---
 src/Model/Term.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Model/Term.php b/src/Model/Term.php
index 6a213d445..6e3425524 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -272,10 +272,10 @@ class Term
 
 			$author = ['uid' => 0, 'id' => $item['author-id'],
 				'network' => $item['author-network'], 'url' => $item['author-link']];
-			$tag['url'] = Contact::magicLinkByContact($author, $tag['url']);
 
 			$prefix = '';
 			if ($tag['type'] == TERM_HASHTAG) {
+				$tag['url'] = Contact::magicLinkByContact($author, $tag['url']);
 				if ($orig_tag != $tag['url']) {
 					$item['body'] = str_replace($orig_tag, $tag['url'], $item['body']);
 				}
@@ -283,6 +283,7 @@ class Term
 				$return['hashtags'][] = '#<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
 				$prefix = '#';
 			} elseif ($tag['type'] == TERM_MENTION) {
+				$tag['url'] = Contact::magicLink($tag['url']);
 				$return['mentions'][] = '@<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
 				$prefix = '@';
 			}

From eafcf3592db02392770cdc88bed9ddb000cb44f2 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 10 Feb 2019 19:52:21 +0100
Subject: [PATCH 028/145] Config FollowUp

- New Configuration (Config is now only holding the instance)
- New PConfiguration (PConfig is now only holding the instance)

- Config & PConfig-Adapter don't need "ConfigCache" anymore

- DB-Connection is now outside App->reload() for better dependency-chaining
---
 bin/auth_ejabberd.php                         |   9 +-
 bin/console.php                               |   9 +-
 bin/daemon.php                                |  10 +-
 bin/worker.php                                |   8 +-
 index.php                                     |   9 +-
 src/App.php                                   |  72 +-----
 src/Core/Config.php                           |  80 ++-----
 .../AbstractDbaConfigAdapter.php              |   9 +-
 .../Config/{ => Adapter}/IConfigAdapter.php   |  22 +-
 .../Config/{ => Adapter}/IPConfigAdapter.php  |  29 ++-
 src/Core/Config/Adapter/JITConfigAdapter.php  | 123 ++++++++++
 src/Core/Config/Adapter/JITPConfigAdapter.php | 126 ++++++++++
 .../Config/Adapter/PreloadConfigAdapter.php   | 104 +++++++++
 .../Config/Adapter/PreloadPConfigAdapter.php  | 126 ++++++++++
 src/Core/Config/{ => Cache}/ConfigCache.php   | 132 ++++++-----
 .../Config/{ => Cache}/ConfigCacheLoader.php  |  12 +-
 src/Core/Config/Cache/IConfigCache.php        |  65 ++++++
 src/Core/Config/Cache/IPConfigCache.php       |  70 ++++++
 src/Core/Config/Configuration.php             | 154 +++++++++++++
 src/Core/Config/IConfigCache.php              |  39 ----
 src/Core/Config/IPConfigCache.php             |  44 ----
 src/Core/Config/JITConfigAdapter.php          | 172 --------------
 src/Core/Config/JITPConfigAdapter.php         | 136 -----------
 src/Core/Config/PConfiguration.php            | 150 ++++++++++++
 src/Core/Config/PreloadConfigAdapter.php      | 123 ----------
 src/Core/Config/PreloadPConfigAdapter.php     | 125 ----------
 src/Core/Console/AutomaticInstallation.php    |  10 +-
 src/Core/Console/Config.php                   |   6 +-
 src/Core/Console/Typo.php                     |   2 +-
 src/Core/Installer.php                        |   6 +-
 src/Core/PConfig.php                          |  89 ++------
 src/Database/DBA.php                          |   2 +-
 src/Factory/ConfigFactory.php                 |  53 +++--
 src/Factory/DBFactory.php                     |  48 ++++
 src/Factory/LoggerFactory.php                 |   8 +-
 src/Module/Install.php                        |   4 +-
 tests/DatabaseTest.php                        |   4 +-
 tests/Util/AppMockTrait.php                   |  19 +-
 tests/include/ApiTest.php                     |   8 +-
 tests/src/App/ModeTest.php                    |  18 +-
 tests/src/BaseObjectTest.php                  |   2 +-
 tests/src/Core/Cache/CacheTest.php            |   2 +-
 .../Core/Cache/MemcacheCacheDriverTest.php    |   4 +-
 .../Core/Cache/MemcachedCacheDriverTest.php   |   2 +-
 tests/src/Core/Cache/RedisCacheDriverTest.php |   4 +-
 .../{ => Cache}/ConfigCacheLoaderTest.php     |  10 +-
 .../Config/{ => Cache}/ConfigCacheTest.php    |  83 ++++++-
 tests/src/Core/Config/ConfigurationTest.php   | 215 ++++++++++++++++++
 tests/src/Core/Config/PConfigurationTest.php  | 186 +++++++++++++++
 .../AutomaticInstallationConsoleTest.php      |   2 +-
 tests/src/Core/Console/ConfigConsoleTest.php  |  12 +-
 tests/src/Core/Console/ConsoleTest.php        |   4 +-
 tests/src/Core/Lock/LockTest.php              |   2 +-
 .../Core/Lock/MemcacheCacheLockDriverTest.php |   4 +-
 .../Lock/MemcachedCacheLockDriverTest.php     |   2 +-
 .../Core/Lock/RedisCacheLockDriverTest.php    |   4 +-
 .../src/Core/Lock/SemaphoreLockDriverTest.php |   2 +-
 tests/src/Database/DBATest.php                |   8 +-
 tests/src/Database/DBStructureTest.php        |   9 +-
 59 files changed, 1754 insertions(+), 1038 deletions(-)
 rename src/Core/Config/{ => Adapter}/AbstractDbaConfigAdapter.php (52%)
 rename src/Core/Config/{ => Adapter}/IConfigAdapter.php (59%)
 rename src/Core/Config/{ => Adapter}/IPConfigAdapter.php (65%)
 create mode 100644 src/Core/Config/Adapter/JITConfigAdapter.php
 create mode 100644 src/Core/Config/Adapter/JITPConfigAdapter.php
 create mode 100644 src/Core/Config/Adapter/PreloadConfigAdapter.php
 create mode 100644 src/Core/Config/Adapter/PreloadPConfigAdapter.php
 rename src/Core/Config/{ => Cache}/ConfigCache.php (56%)
 rename src/Core/Config/{ => Cache}/ConfigCacheLoader.php (93%)
 create mode 100644 src/Core/Config/Cache/IConfigCache.php
 create mode 100644 src/Core/Config/Cache/IPConfigCache.php
 create mode 100644 src/Core/Config/Configuration.php
 delete mode 100644 src/Core/Config/IConfigCache.php
 delete mode 100644 src/Core/Config/IPConfigCache.php
 delete mode 100644 src/Core/Config/JITConfigAdapter.php
 delete mode 100644 src/Core/Config/JITPConfigAdapter.php
 create mode 100644 src/Core/Config/PConfiguration.php
 delete mode 100644 src/Core/Config/PreloadConfigAdapter.php
 delete mode 100644 src/Core/Config/PreloadPConfigAdapter.php
 create mode 100644 src/Factory/DBFactory.php
 rename tests/src/Core/Config/{ => Cache}/ConfigCacheLoaderTest.php (95%)
 rename tests/src/Core/Config/{ => Cache}/ConfigCacheTest.php (62%)
 create mode 100644 tests/src/Core/Config/ConfigurationTest.php
 create mode 100644 tests/src/Core/Config/PConfigurationTest.php

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index cc2517644..7682674d7 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -33,7 +33,7 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
 use Friendica\Factory;
 use Friendica\Util\BasePath;
 use Friendica\Util\ExAuth;
@@ -55,8 +55,11 @@ chdir($directory);
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
+$configLoader = new Cache\ConfigCacheLoader($basedir);
+$configCache = Factory\ConfigFactory::createCache($configLoader);
+Factory\DBFactory::init($configCache, $_SERVER);
+$config = Factory\ConfigFactory::createConfig($configCache);
+$pconfig = Factory\ConfigFactory::createPConfig($configCache);
 $logger = Factory\LoggerFactory::create('auth_ejabberd', $config);
 $profiler = Factory\ProfilerFactory::create($logger, $config);
 
diff --git a/bin/console.php b/bin/console.php
index 757af31d5..9fee605b2 100755
--- a/bin/console.php
+++ b/bin/console.php
@@ -3,13 +3,16 @@
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
 use Friendica\Factory;
 use Friendica\Util\BasePath;
 
 $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
+$configLoader = new Cache\ConfigCacheLoader($basedir);
+$configCache = Factory\ConfigFactory::createCache($configLoader);
+Factory\DBFactory::init($configCache, $_SERVER);
+$config = Factory\ConfigFactory::createConfig($configCache);
+$pconfig = Factory\ConfigFactory::createPConfig($configCache);
 $logger = Factory\LoggerFactory::create('console', $config);
 $profiler = Factory\ProfilerFactory::create($logger, $config);
 
diff --git a/bin/daemon.php b/bin/daemon.php
index da4bc1992..2b106b62d 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -9,6 +9,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Factory;
@@ -34,8 +35,11 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
+$configLoader = new Cache\ConfigCacheLoader($basedir);
+$configCache = Factory\ConfigFactory::createCache($configLoader);
+Factory\DBFactory::init($configCache, $_SERVER);
+$config = Factory\ConfigFactory::createConfig($configCache);
+$pconfig = Factory\ConfigFactory::createPConfig($configCache);
 $logger = Factory\LoggerFactory::create('daemon', $config);
 $profiler = Factory\ProfilerFactory::create($logger, $config);
 
@@ -151,7 +155,7 @@ if (!$foreground) {
 	file_put_contents($pidfile, $pid);
 
 	// We lose the database connection upon forking
-	$a->loadDatabase();
+	Factory\DBFactory::init($configCache, $_SERVER);
 }
 
 Config::set('system', 'worker_daemon_mode', true);
diff --git a/bin/worker.php b/bin/worker.php
index 9b396c6f9..0a9b4cb38 100755
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -7,6 +7,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Factory;
@@ -32,8 +33,11 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
+$configLoader = new Cache\ConfigCacheLoader($basedir);
+$configCache = Factory\ConfigFactory::createCache($configLoader);
+Factory\DBFactory::init($configCache, $_SERVER);
+$config = Factory\ConfigFactory::createConfig($configCache);
+$pconfig = Factory\ConfigFactory::createPConfig($configCache);
 $logger = Factory\LoggerFactory::create('worker', $config);
 $profiler = Factory\ProfilerFactory::create($logger, $config);
 
diff --git a/index.php b/index.php
index 216fbe90a..9ef9490b3 100644
--- a/index.php
+++ b/index.php
@@ -5,7 +5,7 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
 use Friendica\Factory;
 use Friendica\Util\BasePath;
 
@@ -16,8 +16,11 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
 require __DIR__ . '/vendor/autoload.php';
 
 $basedir = BasePath::create(__DIR__, $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
+$configLoader = new Cache\ConfigCacheLoader($basedir);
+$configCache = Factory\ConfigFactory::createCache($configLoader);
+Factory\DBFactory::init($configCache, $_SERVER);
+$config = Factory\ConfigFactory::createConfig($configCache);
+$pconfig = Factory\ConfigFactory::createPConfig($configCache);
 $logger = Factory\LoggerFactory::create('index', $config);
 $profiler = Factory\ProfilerFactory::create($logger, $config);
 
diff --git a/src/App.php b/src/App.php
index e61b8dbae..e715e6ced 100644
--- a/src/App.php
+++ b/src/App.php
@@ -8,8 +8,9 @@ use Detection\MobileDetect;
 use DOMDocument;
 use DOMXPath;
 use Exception;
-use Friendica\Core\Config\ConfigCache;
-use Friendica\Core\Config\ConfigCacheLoader;
+use Friendica\Core\Config\Cache\ConfigCacheLoader;
+use Friendica\Core\Config\Cache\IConfigCache;
+use Friendica\Core\Config\Configuration;
 use Friendica\Database\DBA;
 use Friendica\Factory\ConfigFactory;
 use Friendica\Network\HTTPException\InternalServerErrorException;
@@ -114,7 +115,7 @@ class App
 	private $logger;
 
 	/**
-	 * @var ConfigCache The cached config
+	 * @var Configuration The config
 	 */
 	private $config;
 
@@ -126,11 +127,11 @@ class App
 	/**
 	 * Returns the current config cache of this node
 	 *
-	 * @return ConfigCache
+	 * @return IConfigCache
 	 */
-	public function getConfig()
+	public function getConfigCache()
 	{
-		return $this->config;
+		return $this->config->getCache();
 	}
 
 	/**
@@ -195,14 +196,14 @@ class App
 	/**
 	 * @brief App constructor.
 	 *
-	 * @param ConfigCache      $config    The Cached Config
+	 * @param Configuration    $config    The Configuration
 	 * @param LoggerInterface  $logger    Logger of this application
 	 * @param Profiler         $profiler  The profiler of this application
 	 * @param bool             $isBackend Whether it is used for backend or frontend (Default true=backend)
 	 *
 	 * @throws Exception if the Basepath is not usable
 	 */
-	public function __construct(ConfigCache $config, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
+	public function __construct(Configuration $config, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
 	{
 		$this->config   = $config;
 		$this->logger   = $logger;
@@ -358,21 +359,11 @@ class App
 	 */
 	public function reload()
 	{
-		Core\Config::init($this->config);
-		Core\PConfig::init($this->config);
-
-		$this->loadDatabase();
-
 		$this->getMode()->determine($this->basePath);
 
 		$this->determineURLPath();
 
 		if ($this->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
-			$adapterType = $this->config->get('system', 'config_adapter');
-			$adapter = ConfigFactory::createConfig($adapterType, $this->config);
-			Core\Config::setAdapter($adapter);
-			$adapterP = ConfigFactory::createPConfig($adapterType, $this->config);
-			Core\PConfig::setAdapter($adapterP);
 			Core\Config::load();
 		}
 
@@ -383,7 +374,7 @@ class App
 			Core\Hook::loadHooks();
 			$loader = new ConfigCacheLoader($this->basePath);
 			Core\Hook::callAll('load_config', $loader);
-			$this->config->loadConfigArray($loader->loadCoreConfig('addon'), true);
+			$this->config->getCache()->load($loader->loadCoreConfig('addon'), true);
 		}
 
 		$this->loadDefaultTimezone();
@@ -453,49 +444,6 @@ class App
 		}
 	}
 
-	public function loadDatabase()
-	{
-		if (DBA::connected()) {
-			return;
-		}
-
-		$db_host = $this->config->get('database', 'hostname');
-		$db_user = $this->config->get('database', 'username');
-		$db_pass = $this->config->get('database', 'password');
-		$db_data = $this->config->get('database', 'database');
-		$charset = $this->config->get('database', 'charset');
-
-		// Use environment variables for mysql if they are set beforehand
-		if (!empty(getenv('MYSQL_HOST'))
-			&& !empty(getenv('MYSQL_USERNAME') || !empty(getenv('MYSQL_USER')))
-			&& getenv('MYSQL_PASSWORD') !== false
-			&& !empty(getenv('MYSQL_DATABASE')))
-		{
-			$db_host = getenv('MYSQL_HOST');
-			if (!empty(getenv('MYSQL_PORT'))) {
-				$db_host .= ':' . getenv('MYSQL_PORT');
-			}
-			if (!empty(getenv('MYSQL_USERNAME'))) {
-				$db_user = getenv('MYSQL_USERNAME');
-			} else {
-				$db_user = getenv('MYSQL_USER');
-			}
-			$db_pass = (string) getenv('MYSQL_PASSWORD');
-			$db_data = getenv('MYSQL_DATABASE');
-		}
-
-		$stamp1 = microtime(true);
-
-		if (DBA::connect($this->config, $this->profiler, $db_host, $db_user, $db_pass, $db_data, $charset)) {
-			// Loads DB_UPDATE_VERSION constant
-			Database\DBStructure::definition($this->basePath, false);
-		}
-
-		unset($db_host, $db_user, $db_pass, $db_data, $charset);
-
-		$this->profiler->saveTimestamp($stamp1, 'network', Core\System::callstack());
-	}
-
 	public function getScheme()
 	{
 		return $this->scheme;
diff --git a/src/Core/Config.php b/src/Core/Config.php
index 559ee83ec..405d14d12 100644
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -22,116 +22,76 @@ use Friendica\Core\Config\IConfigCache;
 class Config
 {
 	/**
-	 * @var Config\IConfigAdapter|null
+	 * @var Config\Configuration
 	 */
-	private static $adapter;
+	private static $config;
 
 	/**
-	 * @var Config\IConfigCache
-	 */
-	private static $cache;
-
-	/**
-	 * Initialize the config with only the cache
+	 * Initialize the config
 	 *
-	 * @param Config\IConfigCache $cache  The configuration cache
+	 * @param Config\Configuration $config
 	 */
-	public static function init(Config\IConfigCache $cache)
+	public static function init(Config\Configuration $config)
 	{
-		self::$cache  = $cache;
-	}
-
-	/**
-	 * Add the adapter for DB-backend
-	 *
-	 * @param Config\IConfigAdapter $adapter
-	 */
-	public static function setAdapter(Config\IConfigAdapter $adapter)
-	{
-		self::$adapter = $adapter;
+		self::$config = $config;
 	}
 
 	/**
 	 * @brief Loads all configuration values of family into a cached storage.
 	 *
-	 * All configuration values of the system are stored in the cache ( @see IConfigCache )
-	 *
-	 * @param string $family The category of the configuration value
+	 * @param string $cat The category of the configuration value
 	 *
 	 * @return void
 	 */
-	public static function load($family = "config")
+	public static function load($cat = "config")
 	{
-		if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
-			return;
-		}
-
-		self::$adapter->load($family);
+		self::$config->load($cat);
 	}
 
 	/**
 	 * @brief Get a particular user's config variable given the category name
 	 * ($family) and a key.
 	 *
-	 * Get a particular config value from the given category ($family)
-	 * and the $key from a cached storage either from the self::$adapter
-	 * (@see IConfigAdapter ) or from the static::$cache (@see IConfigCache ).
-	 *
-	 * @param string  $family        The category of the configuration value
+	 * @param string  $cat        The category of the configuration value
 	 * @param string  $key           The configuration key to query
 	 * @param mixed   $default_value optional, The value to return if key is not set (default: null)
 	 * @param boolean $refresh       optional, If true the config is loaded from the db and not from the cache (default: false)
 	 *
 	 * @return mixed Stored value or null if it does not exist
 	 */
-	public static function get($family, $key, $default_value = null, $refresh = false)
+	public static function get($cat, $key, $default_value = null, $refresh = false)
 	{
-		if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
-			return self::$cache->get($family, $key, $default_value);
-		}
-
-		return self::$adapter->get($family, $key, $default_value, $refresh);
+		return self::$config->get($cat, $key, $default_value, $refresh);
 	}
 
 	/**
 	 * @brief Sets a configuration value for system config
 	 *
-	 * Stores a config value ($value) in the category ($family) under the key ($key)
+	 * Stores a config value ($value) in the category ($cat) under the key ($key)
 	 *
 	 * Note: Please do not store booleans - convert to 0/1 integer values!
 	 *
-	 * @param string $family The category of the configuration value
+	 * @param string $cat The category of the configuration value
 	 * @param string $key    The configuration key to set
 	 * @param mixed  $value  The value to store
 	 *
 	 * @return bool Operation success
 	 */
-	public static function set($family, $key, $value)
+	public static function set($cat, $key, $value)
 	{
-		if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
-			return self::$cache->set($family, $key, $value);
-		}
-
-		return self::$adapter->set($family, $key, $value);
+		return self::$config->set($cat, $key, $value);
 	}
 
 	/**
 	 * @brief Deletes the given key from the system configuration.
 	 *
-	 * Removes the configured value from the stored cache in self::$config
-	 * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter ).
-	 *
-	 * @param string $family The category of the configuration value
+	 * @param string $cat The category of the configuration value
 	 * @param string $key    The configuration key to delete
 	 *
-	 * @return mixed
+	 * @return bool
 	 */
-	public static function delete($family, $key)
+	public static function delete($cat, $key)
 	{
-		if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
-			self::$cache->delete($family, $key);
-		}
-
-		return self::$adapter->delete($family, $key);
+		return self::$config->delete($cat, $key);
 	}
 }
diff --git a/src/Core/Config/AbstractDbaConfigAdapter.php b/src/Core/Config/Adapter/AbstractDbaConfigAdapter.php
similarity index 52%
rename from src/Core/Config/AbstractDbaConfigAdapter.php
rename to src/Core/Config/Adapter/AbstractDbaConfigAdapter.php
index bae75122a..770dfd2c9 100644
--- a/src/Core/Config/AbstractDbaConfigAdapter.php
+++ b/src/Core/Config/Adapter/AbstractDbaConfigAdapter.php
@@ -1,12 +1,19 @@
 <?php
 
-namespace Friendica\Core\Config;
+namespace Friendica\Core\Config\Adapter;
+
+use Friendica\Database\DBA;
 
 abstract class AbstractDbaConfigAdapter
 {
 	/** @var bool */
 	protected $connected = true;
 
+	public function __construct()
+	{
+		$this->connected = DBA::connected();
+	}
+
 	public function isConnected()
 	{
 		return $this->connected;
diff --git a/src/Core/Config/IConfigAdapter.php b/src/Core/Config/Adapter/IConfigAdapter.php
similarity index 59%
rename from src/Core/Config/IConfigAdapter.php
rename to src/Core/Config/Adapter/IConfigAdapter.php
index 70e141484..3bbbbbe94 100644
--- a/src/Core/Config/IConfigAdapter.php
+++ b/src/Core/Config/Adapter/IConfigAdapter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Config;
+namespace Friendica\Core\Config\Adapter;
 
 /**
  *
@@ -13,7 +13,7 @@ interface IConfigAdapter
 	 *
 	 * @param string  $cat The category of the configuration values to load
 	 *
-	 * @return void
+	 * @return array
 	 */
 	public function load($cat = "config");
 
@@ -21,14 +21,12 @@ interface IConfigAdapter
 	 * Get a particular user's config variable given the category name
 	 * ($family) and a key.
 	 *
-	 * @param string  $cat           The category of the configuration value
-	 * @param string  $k             The configuration key to query
-	 * @param mixed   $default_value optional, The value to return if key is not set (default: null)
-	 * @param boolean $refresh       optional, If true the config is loaded from the db and not from the cache (default: false)
+	 * @param string  $cat The category of the configuration value
+	 * @param string  $key The configuration key to query
 	 *
-	 * @return mixed Stored value or null if it does not exist
+	 * @return mixed Stored value or "!<unset>!" if it does not exist
 	 */
-	public function get($cat, $k, $default_value = null, $refresh = false);
+	public function get($cat, $key);
 
 	/**
 	 * Stores a config value ($value) in the category ($family) under the key ($key)
@@ -37,23 +35,23 @@ interface IConfigAdapter
 	 * Note: Please do not store booleans - convert to 0/1 integer values!
 	 *
 	 * @param string $cat   The category of the configuration value
-	 * @param string $k     The configuration key to set
+	 * @param string $key   The configuration key to set
 	 * @param mixed  $value The value to store
 	 *
 	 * @return bool Operation success
 	 */
-	public function set($cat, $k, $value);
+	public function set($cat, $key, $value);
 
 	/**
 	 * Removes the configured value from the stored cache
 	 * and removes it from the database.
 	 *
 	 * @param string $cat The category of the configuration value
-	 * @param string $k   The configuration key to delete
+	 * @param string $key   The configuration key to delete
 	 *
 	 * @return mixed
 	 */
-	public function delete($cat, $k);
+	public function delete($cat, $key);
 
 	/**
 	 * Checks, if the current adapter is connected to the backend
diff --git a/src/Core/Config/IPConfigAdapter.php b/src/Core/Config/Adapter/IPConfigAdapter.php
similarity index 65%
rename from src/Core/Config/IPConfigAdapter.php
rename to src/Core/Config/Adapter/IPConfigAdapter.php
index e62fc9c93..3e821efa0 100644
--- a/src/Core/Config/IPConfigAdapter.php
+++ b/src/Core/Config/Adapter/IPConfigAdapter.php
@@ -6,7 +6,7 @@
  * and open the template in the editor.
  */
 
-namespace Friendica\Core\Config;
+namespace Friendica\Core\Config\Adapter;
 
 /**
  *
@@ -20,7 +20,7 @@ interface IPConfigAdapter
 	 * @param string $uid The user_id
 	 * @param string $cat The category of the configuration value
 	 *
-	 * @return void
+	 * @return array
 	 */
 	public function load($uid, $cat);
 
@@ -30,13 +30,11 @@ interface IPConfigAdapter
 	 *
 	 * @param string  $uid           The user_id
 	 * @param string  $cat           The category of the configuration value
-	 * @param string  $k             The configuration key to query
-	 * @param mixed   $default_value optional, The value to return if key is not set (default: null)
-	 * @param boolean $refresh       optional, If true the config is loaded from the db and not from the cache (default: false)
+	 * @param string  $key           The configuration key to query
 	 *
-	 * @return mixed Stored value or null if it does not exist
+	 * @return mixed Stored value or "!<unset>!" if it does not exist
 	 */
-	public function get($uid, $cat, $k, $default_value = null, $refresh = false);
+	public function get($uid, $cat, $key);
 
 	/**
 	 * Stores a config value ($value) in the category ($family) under the key ($key)
@@ -46,12 +44,12 @@ interface IPConfigAdapter
 	 *
 	 * @param string $uid   The user_id
 	 * @param string $cat   The category of the configuration value
-	 * @param string $k     The configuration key to set
+	 * @param string $key   The configuration key to set
 	 * @param string $value The value to store
 	 *
 	 * @return bool Operation success
 	 */
-	public function set($uid, $cat, $k, $value);
+	public function set($uid, $cat, $key, $value);
 
 	/**
 	 * Removes the configured value from the stored cache
@@ -59,9 +57,16 @@ interface IPConfigAdapter
 	 *
 	 * @param string $uid The user_id
 	 * @param string $cat The category of the configuration value
-	 * @param string $k   The configuration key to delete
+	 * @param string $key The configuration key to delete
 	 *
-	 * @return mixed
+	 * @return bool
 	 */
-	public function delete($uid, $cat, $k);
+	public function delete($uid, $cat, $key);
+
+	/**
+	 * Checks, if the current adapter is connected to the backend
+	 *
+	 * @return bool
+	 */
+	public function isConnected();
 }
diff --git a/src/Core/Config/Adapter/JITConfigAdapter.php b/src/Core/Config/Adapter/JITConfigAdapter.php
new file mode 100644
index 000000000..8dadfff68
--- /dev/null
+++ b/src/Core/Config/Adapter/JITConfigAdapter.php
@@ -0,0 +1,123 @@
+<?php
+namespace Friendica\Core\Config\Adapter;
+
+use Friendica\Database\DBA;
+
+/**
+ * JustInTime Configuration Adapter
+ *
+ * Default Config Adapter. Provides the best performance for pages loading few configuration variables.
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapter
+{
+	private $in_db;
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function load($cat = "config")
+	{
+		$return = [];
+
+		if (!$this->isConnected()) {
+			return $return;
+		}
+
+		// We don't preload "system" anymore.
+		// This reduces the number of database reads a lot.
+		if ($cat === 'system') {
+			return $return;
+		}
+
+		$configs = DBA::select('config', ['v', 'k'], ['cat' => $cat]);
+		while ($config = DBA::fetch($configs)) {
+			$key = $config['k'];
+
+			$return[$key] = $config['v'];
+			$this->in_db[$cat][$key] = true;
+		}
+		DBA::close($configs);
+
+		return [$cat => $config];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function get($cat, $key)
+	{
+		if (!$this->isConnected()) {
+			return '!<unset>!';
+		}
+
+		$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
+		if (DBA::isResult($config)) {
+			// manage array value
+			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
+
+			$this->in_db[$cat][$key] = true;
+			return $value;
+		} else {
+
+			$this->in_db[$cat][$key] = false;
+			return '!<unset>!';
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function set($cat, $key, $value)
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		// We store our setting values in a string variable.
+		// So we have to do the conversion here so that the compare below works.
+		// The exception are array values.
+		$dbvalue = (!is_array($value) ? (string)$value : $value);
+
+		$stored = $this->get($cat, $key);
+
+		if (!isset($this->in_db[$cat])) {
+			$this->in_db[$cat] = [];
+		}
+		if (!isset($this->in_db[$cat][$key])) {
+			$this->in_db[$cat][$key] = false;
+		}
+
+		if (($stored === $dbvalue) && $this->in_db[$cat][$key]) {
+			return true;
+		}
+
+		// manage array value
+		$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
+
+		$result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $key], true);
+
+		$this->in_db[$cat][$key] = $result;
+
+		return $result;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function delete($cat, $key)
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		if (isset($this->cache[$cat][$key])) {
+			unset($this->in_db[$cat][$key]);
+		}
+
+		$result = DBA::delete('config', ['cat' => $cat, 'k' => $key]);
+
+		return $result;
+	}
+}
diff --git a/src/Core/Config/Adapter/JITPConfigAdapter.php b/src/Core/Config/Adapter/JITPConfigAdapter.php
new file mode 100644
index 000000000..950dd58bd
--- /dev/null
+++ b/src/Core/Config/Adapter/JITPConfigAdapter.php
@@ -0,0 +1,126 @@
+<?php
+namespace Friendica\Core\Config\Adapter;
+
+use Friendica\Database\DBA;
+
+/**
+ * JustInTime User Configuration Adapter
+ *
+ * Default PConfig Adapter. Provides the best performance for pages loading few configuration variables.
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdapter
+{
+	private $in_db;
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function load($uid, $cat)
+	{
+		$return = [];
+
+		if (!$this->isConnected()) {
+			return $return;
+		}
+
+		$pconfigs = DBA::select('pconfig', ['v', 'k'], ['cat' => $cat, 'uid' => $uid]);
+		if (DBA::isResult($pconfigs)) {
+			while ($pconfig = DBA::fetch($pconfigs)) {
+				$key = $pconfig['k'];
+
+				$return[$key] = $pconfig['v'];
+
+				$this->in_db[$uid][$cat][$key] = true;
+			}
+		} else if ($cat != 'config') {
+			// Negative caching
+			$return[null] = "!<unset>!";
+		}
+		DBA::close($pconfigs);
+
+		return [$cat => $return];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function get($uid, $cat, $key)
+	{
+		if (!$this->isConnected()) {
+			return null;
+		}
+
+		$pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
+		if (DBA::isResult($pconfig)) {
+			// manage array value
+			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']);
+
+			$this->in_db[$uid][$cat][$key] = true;
+			return $value;
+		} else {
+
+			$this->in_db[$uid][$cat][$key] = false;
+			return '!<unset>!';
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function set($uid, $cat, $key, $value)
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		// We store our setting values in a string variable.
+		// So we have to do the conversion here so that the compare below works.
+		// The exception are array values.
+		$dbvalue = (!is_array($value) ? (string)$value : $value);
+
+		$stored = $this->get($uid, $cat, $key);
+
+		if (!isset($this->in_db[$uid])) {
+			$this->in_db[$uid] = [];
+		}
+		if (!isset($this->in_db[$uid][$cat])) {
+			$this->in_db[$uid][$cat] = [];
+		}
+		if (!isset($this->in_db[$uid][$cat][$key])) {
+			$this->in_db[$uid][$cat][$key] = false;
+		}
+
+		if (($stored === $dbvalue) && $this->in_db[$uid][$cat][$key]) {
+			return true;
+		}
+
+		// manage array value
+		$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
+
+		$result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $key], true);
+
+		$this->in_db[$uid][$cat][$key] = $result;
+
+		return $result;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function delete($uid, $cat, $key)
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		if (!empty($this->in_db[$uid][$cat][$key])) {
+			unset($this->in_db[$uid][$cat][$key]);
+		}
+
+		$result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
+
+		return $result;
+	}
+}
diff --git a/src/Core/Config/Adapter/PreloadConfigAdapter.php b/src/Core/Config/Adapter/PreloadConfigAdapter.php
new file mode 100644
index 000000000..8cad5c555
--- /dev/null
+++ b/src/Core/Config/Adapter/PreloadConfigAdapter.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Friendica\Core\Config\Adapter;
+
+use Friendica\Database\DBA;
+
+/**
+ * Preload Configuration Adapter
+ *
+ * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapter
+{
+	private $config_loaded = false;
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function load($cat = 'config')
+	{
+		$return = [];
+
+		if (!$this->isConnected()) {
+			return $return;
+		}
+
+		if ($this->config_loaded) {
+			return $return;
+		}
+
+		$configs = DBA::select('config', ['cat', 'v', 'k']);
+		while ($config = DBA::fetch($configs)) {
+			$return[$config['k']] = $config['v'];
+		}
+		DBA::close($configs);
+
+		$this->config_loaded = true;
+
+		return [$cat => $return];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function get($cat, $key)
+	{
+		if (!$this->isConnected()) {
+			return null;
+		}
+
+		$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
+		if (DBA::isResult($config)) {
+			// manage array value
+			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
+
+			return $value;
+		} else {
+
+			return '!<unset>!';
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function set($cat, $key, $value)
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		// We store our setting values as strings.
+		// So we have to do the conversion here so that the compare below works.
+		// The exception are array values.
+		$compare_value = !is_array($value) ? (string)$value : $value;
+
+		if ($this->get($cat, $key) === $compare_value) {
+			return true;
+		}
+
+		// manage array value
+		$dbvalue = is_array($value) ? serialize($value) : $value;
+
+		$result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $key], true);
+
+		return $result;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function delete($cat, $key)
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		$result = DBA::delete('config', ['cat' => $cat, 'k' => $key]);
+
+		return $result;
+	}
+}
diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
new file mode 100644
index 000000000..d117ed354
--- /dev/null
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Friendica\Core\Config\Adapter;
+
+use Friendica\Database\DBA;
+
+/**
+ * Preload User Configuration Adapter
+ *
+ * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdapter
+{
+	private $config_loaded = false;
+
+	/**
+	 * @param int $uid The UID of the current user
+	 */
+	public function __construct($uid = null)
+	{
+		parent::__construct();
+
+		if (isset($uid)) {
+			$this->load($uid, 'config');
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function load($uid, $cat)
+	{
+		$return = [];
+
+		if ($this->config_loaded) {
+			return $return;
+		}
+
+		if (empty($uid)) {
+			return $return;
+		}
+
+		$pconfigs = DBA::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
+		while ($pconfig = DBA::fetch($pconfigs)) {
+			$return[$pconfig['k']] = $pconfig['v'];
+		}
+		DBA::close($pconfigs);
+
+		$this->config_loaded = true;
+
+		return [$cat => $return];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function get($uid, $cat, $key)
+	{
+		if (!$this->isConnected()) {
+			return null;
+		}
+
+		if (!$this->config_loaded) {
+			$this->load($uid, $cat);
+		}
+
+		$config = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
+		if (DBA::isResult($config)) {
+			// manage array value
+			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
+
+			return $value;
+		} else {
+			return '!<unset>!';
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function set($uid, $cat, $key, $value)
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		if (!$this->config_loaded) {
+			$this->load($uid, $cat);
+		}
+		// We store our setting values as strings.
+		// So we have to do the conversion here so that the compare below works.
+		// The exception are array values.
+		$compare_value = !is_array($value) ? (string)$value : $value;
+
+		if ($this->get($uid, $cat, $key) === $compare_value) {
+			return true;
+		}
+
+		// manage array value
+		$dbvalue = is_array($value) ? serialize($value) : $value;
+
+		$result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $key], true);
+
+		return $result;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function delete($uid, $cat, $key)
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		if (!$this->config_loaded) {
+			$this->load($uid, $cat);
+		}
+
+		$result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
+
+		return $result;
+	}
+}
diff --git a/src/Core/Config/ConfigCache.php b/src/Core/Config/Cache/ConfigCache.php
similarity index 56%
rename from src/Core/Config/ConfigCache.php
rename to src/Core/Config/Cache/ConfigCache.php
index b86ec3860..b1172c0c8 100644
--- a/src/Core/Config/ConfigCache.php
+++ b/src/Core/Config/Cache/ConfigCache.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Config;
+namespace Friendica\Core\Config\Cache;
 
 /**
  * The Friendica config cache for the application
@@ -11,6 +11,9 @@ namespace Friendica\Core\Config;
  */
 class ConfigCache implements IConfigCache, IPConfigCache
 {
+	/**
+	 * @var array
+	 */
 	private $config;
 
 	/**
@@ -18,24 +21,28 @@ class ConfigCache implements IConfigCache, IPConfigCache
 	 */
 	public function __construct(array $config = [])
 	{
-		$this->loadConfigArray($config);
+		$this->load($config);
 	}
 
 	/**
-	 * Tries to load the specified configuration array into the App->config array.
-	 * Doesn't overwrite previously set values by default to prevent default config files to supersede DB Config.
-	 *
-	 * @param array $config
-	 * @param bool  $overwrite Force value overwrite if the config key already exists
+	 * {@inheritdoc}
 	 */
-	public function loadConfigArray(array $config, $overwrite = false)
+	public function load(array $config, $overwrite = false)
 	{
-		foreach ($config as $category => $values) {
-			foreach ($values as $key => $value) {
-				if ($overwrite) {
-					$this->set($category, $key, $value);
-				} else {
-					$this->setDefault($category, $key, $value);
+		$categories = array_keys($config);
+
+		foreach ($categories as $category) {
+			if (isset($config[$category]) && is_array($config[$category])) {
+				$keys = array_keys($config[$category]);
+
+				foreach ($keys as $key) {
+					if (isset($config[$category][$key])) {
+						if ($overwrite) {
+							$this->set($category, $key, $config[$category][$key]);
+						} else {
+							$this->setDefault($category, $key, $config[$category][$key]);
+						}
+					}
 				}
 			}
 		}
@@ -44,23 +51,22 @@ class ConfigCache implements IConfigCache, IPConfigCache
 	/**
 	 * {@inheritdoc}
 	 */
-	public function get($cat, $key = null, $default = null)
+	public function get($cat, $key = null)
 	{
-		$return = $default;
-
-		if ($cat === 'config') {
-			if (isset($this->config[$key])) {
-				$return = $this->config[$key];
-			}
+		if (isset($this->config[$cat][$key])) {
+			return $this->config[$cat][$key];
 		} else {
-			if (isset($this->config[$cat][$key])) {
-				$return = $this->config[$cat][$key];
-			} elseif ($key == null && isset($this->config[$cat])) {
-				$return = $this->config[$cat];
-			}
+			return '!<unset>!';
 		}
+	}
 
-		return $return;
+	/**
+	 * {@inheritdoc}
+	 */
+	public function has($cat, $key = null)
+	{
+		return isset($this->config[$cat][$key])
+			&& $this->config[$cat][$key] !== '!<unset>!';
 	}
 
 	/**
@@ -85,34 +91,48 @@ class ConfigCache implements IConfigCache, IPConfigCache
 		// Only arrays are serialized in database, so we have to unserialize sparingly
 		$value = is_string($value) && preg_match("|^a:[0-9]+:{.*}$|s", $value) ? unserialize($value) : $value;
 
-		if ($cat === 'config') {
-			$this->config[$key] = $value;
-		} else {
-			if (!isset($this->config[$cat])) {
-				$this->config[$cat] = [];
-			}
-
-			$this->config[$cat][$key] = $value;
+		if (!isset($this->config[$cat])) {
+			$this->config[$cat] = [];
 		}
 
+		$this->config[$cat][$key] = $value;
+
 		return true;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
+	public function hasP($uid, $cat, $key = null)
+	{
+		return isset($this->config[$uid][$cat][$key])
+			&& $this->config[$uid][$cat][$key] !== '!<unset>!';
+	}
+
 	/**
 	 * {@inheritdoc}
 	 */
 	public function delete($cat, $key)
 	{
-		if ($cat === 'config') {
-			if (isset($this->config[$key])) {
-				unset($this->config[$key]);
+		if (isset($this->config[$cat][$key])) {
+			unset($this->config[$cat][$key]);
+			if (count($this->config[$cat]) == 0) {
+				unset($this->config[$cat]);
 			}
+			return true;
 		} else {
-			if (isset($this->config[$cat][$key])) {
-				unset($this->config[$cat][$key]);
-				if (count($this->config[$cat]) == 0) {
-					unset($this->config[$cat]);
-				}
+			return false;
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function loadP($uid, array $config)
+	{
+		foreach ($config as $category => $values) {
+			foreach ($values as $key => $value) {
+				$this->setP($uid, $category, $key, $value);
 			}
 		}
 	}
@@ -120,17 +140,13 @@ class ConfigCache implements IConfigCache, IPConfigCache
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getP($uid, $cat, $key = null, $default = null)
+	public function getP($uid, $cat, $key = null)
 	{
-		$return = $default;
-
 		if (isset($this->config[$uid][$cat][$key])) {
-			$return = $this->config[$uid][$cat][$key];
-		} elseif ($key === null && isset($this->config[$uid][$cat])) {
-			$return = $this->config[$uid][$cat];
+			return $this->config[$uid][$cat][$key];
+		} else {
+			return '!<unset>!';
 		}
-
-		return $return;
 	}
 
 	/**
@@ -145,15 +161,13 @@ class ConfigCache implements IConfigCache, IPConfigCache
 			$this->config[$uid] = [];
 		}
 
-		if (!isset($this->config[$uid][$cat]) || !is_array($this->config[$uid][$cat])) {
+		if (!isset($this->config[$uid][$cat])) {
 			$this->config[$uid][$cat] = [];
 		}
 
-		if ($key === null) {
-			$this->config[$uid][$cat] = $value;
-		} else {
-			$this->config[$uid][$cat][$key] = $value;
-		}
+		$this->config[$uid][$cat][$key] = $value;
+
+		return true;
 	}
 
 	/**
@@ -169,6 +183,10 @@ class ConfigCache implements IConfigCache, IPConfigCache
 					unset($this->config[$uid]);
 				}
 			}
+
+			return true;
+		} else {
+			return false;
 		}
 	}
 
diff --git a/src/Core/Config/ConfigCacheLoader.php b/src/Core/Config/Cache/ConfigCacheLoader.php
similarity index 93%
rename from src/Core/Config/ConfigCacheLoader.php
rename to src/Core/Config/Cache/ConfigCacheLoader.php
index 3a6a3c803..b728d1082 100644
--- a/src/Core/Config/ConfigCacheLoader.php
+++ b/src/Core/Config/Cache/ConfigCacheLoader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Config;
+namespace Friendica\Core\Config\Cache;
 
 use Friendica\Core\Addon;
 
@@ -40,13 +40,13 @@ class ConfigCacheLoader
 		// Setting at least the basepath we know
 		$config->set('system', 'basepath', $this->baseDir);
 
-		$config->loadConfigArray($this->loadCoreConfig('defaults'));
-		$config->loadConfigArray($this->loadCoreConfig('settings'));
+		$config->load($this->loadCoreConfig('defaults'));
+		$config->load($this->loadCoreConfig('settings'));
 
-		$config->loadConfigArray($this->loadLegacyConfig('htpreconfig'), true);
-		$config->loadConfigArray($this->loadLegacyConfig('htconfig'), true);
+		$config->load($this->loadLegacyConfig('htpreconfig'), true);
+		$config->load($this->loadLegacyConfig('htconfig'), true);
 
-		$config->loadConfigArray($this->loadCoreConfig('local'), true);
+		$config->load($this->loadCoreConfig('local'), true);
 	}
 
 	/**
diff --git a/src/Core/Config/Cache/IConfigCache.php b/src/Core/Config/Cache/IConfigCache.php
new file mode 100644
index 000000000..9d948527d
--- /dev/null
+++ b/src/Core/Config/Cache/IConfigCache.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Friendica\Core\Config\Cache;
+
+/**
+ * The interface for a system-wide ConfigCache
+ */
+interface IConfigCache
+{
+	/**
+	 * Tries to load the specified configuration array into the config array.
+	 * Doesn't overwrite previously set values by default to prevent default config files to supersede DB Config.
+	 *
+	 * @param array $config
+	 * @param bool  $overwrite Force value overwrite if the config key already exists
+	 */
+	function load(array $config, $overwrite = false);
+
+	/**
+	 * Gets a value from the config cache.
+	 *
+	 * @param string $cat     Config category
+	 * @param string $key       Config key
+	 *
+	 * @return mixed Returns the value of the Config entry or '!<unset>!' if not set
+	 */
+	function get($cat, $key = null);
+
+	/**
+	 * Sets a value in the config cache. Accepts raw output from the config table
+	 *
+	 * @param string $cat   Config category
+	 * @param string $key   Config key
+	 * @param mixed  $value Value to set
+	 *
+	 * @return bool True, if the value is set
+	 */
+	function set($cat, $key, $value);
+
+	/**
+	 * Deletes a value from the config cache.
+	 *
+	 * @param string $cat  Config category
+	 * @param string $key  Config key
+	 *
+	 * @return bool true, if deleted
+	 */
+	function delete($cat, $key);
+
+	/**
+	 * Checks if a value is set in the config cache.
+	 *
+	 * @param string $cat  Config category
+	 * @param string $key  Config key
+	 * @return bool
+	 */
+	function has($cat, $key = null);
+
+	/**
+	 * Returns the whole configuration cache
+	 *
+	 * @return array
+	 */
+	function getAll();
+}
diff --git a/src/Core/Config/Cache/IPConfigCache.php b/src/Core/Config/Cache/IPConfigCache.php
new file mode 100644
index 000000000..4ac21481a
--- /dev/null
+++ b/src/Core/Config/Cache/IPConfigCache.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Friendica\Core\Config\Cache;
+
+/**
+ * The interface for a user-specific config cache
+ */
+interface IPConfigCache
+{
+	/**
+	 * Tries to load the specified configuration array into the user specific config array.
+	 * Doesn't overwrite previously set values by default to prevent default config files to supersede DB Config.
+	 *
+	 * @param int   $uid
+	 * @param array $config
+	 */
+	function loadP($uid, array $config);
+
+	/**
+	 * Retrieves a value from the user config cache
+	 *
+	 * @param int    $uid     User Id
+	 * @param string $cat     Config category
+	 * @param string $key     Config key
+	 *
+	 * @return string The value of the config entry or '!<unset>!' if not set
+	 */
+	function getP($uid, $cat, $key = null);
+
+	/**
+	 * Sets a value in the user config cache
+	 *
+	 * Accepts raw output from the pconfig table
+	 *
+	 * @param int    $uid   User Id
+	 * @param string $cat   Config category
+	 * @param string $key   Config key
+	 * @param mixed  $value Value to set
+	 */
+	function setP($uid, $cat, $key, $value);
+
+	/**
+	 * Deletes a value from the user config cache
+	 *
+	 * @param int    $uid User Id
+	 * @param string $cat Config category
+	 * @param string $key Config key
+	 *
+	 * @return bool true, if deleted
+	 */
+	function deleteP($uid, $cat, $key);
+
+
+	/**
+	 * Checks if a value is set in the user config cache.
+	 *
+	 * @param int    $uid  User Id
+	 * @param string $cat  Config category
+	 * @param string $key  Config key
+	 * @return bool
+	 */
+	function hasP($uid, $cat, $key = null);
+
+	/**
+	 * Returns the whole configuration cache
+	 *
+	 * @return array
+	 */
+	function getAll();
+}
diff --git a/src/Core/Config/Configuration.php b/src/Core/Config/Configuration.php
new file mode 100644
index 000000000..ccb9abda8
--- /dev/null
+++ b/src/Core/Config/Configuration.php
@@ -0,0 +1,154 @@
+<?php
+
+namespace Friendica\Core\Config;
+
+/**
+ * This class is responsible for all system-wide configuration values in Friendica
+ * There are two types of storage
+ * - The Config-Files    (loaded into the FileCache @see Cache\IConfigCache )
+ * - The Config-DB-Table (per Config-DB-adapter @see Adapter\IConfigAdapter )
+ */
+class Configuration
+{
+	/**
+	 * @var Cache\IConfigCache
+	 */
+	private $configCache;
+
+	/**
+	 * @var Adapter\IConfigAdapter
+	 */
+	private $configAdapter;
+
+	/**
+	 * @param Cache\IConfigCache     $configCache   The configuration cache (based on the config-files)
+	 * @param Adapter\IConfigAdapter $configAdapter The configuration DB-backend
+	 */
+	public function __construct(Cache\IConfigCache $configCache, Adapter\IConfigAdapter $configAdapter)
+	{
+		$this->configCache = $configCache;
+		$this->configAdapter = $configAdapter;
+
+		$this->load();
+	}
+
+	/**
+	 * Returns the Config Cache
+	 *
+	 * @return Cache\IConfigCache
+	 */
+	public function getCache()
+	{
+		return $this->configCache;
+	}
+
+	/**
+	 * @brief Loads all configuration values of family into a cached storage.
+	 *
+	 * All configuration values of the system are stored in the cache ( @see IConfigCache )
+	 *
+	 * @param string $cat The category of the configuration value
+	 *
+	 * @return void
+	 */
+	public function load($cat = 'config')
+	{
+		// If not connected, do nothing
+		if (!$this->configAdapter->isConnected()) {
+			return;
+		}
+
+		// load the whole category out of the DB into the cache
+		$this->configCache->load($this->configAdapter->load($cat), true);
+	}
+
+	/**
+	 * @brief Get a particular user's config variable given the category name
+	 * ($cat) and a $key.
+	 *
+	 * Get a particular config value from the given category ($cat)
+	 * and the $key from a cached storage either from the $this->configAdapter
+	 * (@see IConfigAdapter ) or from the $this->configCache (@see IConfigCache ).
+	 *
+	 * @param string  $cat        The category of the configuration value
+	 * @param string  $key           The configuration key to query
+	 * @param mixed   $default_value optional, The value to return if key is not set (default: null)
+	 * @param boolean $refresh       optional, If true the config is loaded from the db and not from the cache (default: false)
+	 *
+	 * @return mixed Stored value or null if it does not exist
+	 */
+	public function get($cat, $key, $default_value = null, $refresh = false)
+	{
+		// Return the value of the cache if found and no refresh is forced
+		if (!$refresh && $this->configCache->has($cat, $key)) {
+			return $this->configCache->get($cat, $key);
+		}
+
+		// if we don't find the value in the cache and the adapter isn't ready, return the default value
+		if (!$this->configAdapter->isConnected()) {
+			return $default_value;
+		}
+
+		// load DB value to cache
+		$dbvalue = $this->configAdapter->get($cat, $key);
+
+		if ($dbvalue !== '!<unset>!') {
+			$this->configCache->set($cat, $key, $dbvalue);
+			return $dbvalue;
+		} else {
+			return $default_value;
+		}
+	}
+
+	/**
+	 * @brief Sets a configuration value for system config
+	 *
+	 * Stores a config value ($value) in the category ($cat) under the key ($key)
+	 *
+	 * Note: Please do not store booleans - convert to 0/1 integer values!
+	 *
+	 * @param string $cat The category of the configuration value
+	 * @param string $key    The configuration key to set
+	 * @param mixed  $value  The value to store
+	 *
+	 * @return bool Operation success
+	 */
+	public function set($cat, $key, $value)
+	{
+		// set the cache first
+		$cached = $this->configCache->set($cat, $key, $value);
+
+		// If there is no connected adapter, we're finished
+		if (!$this->configAdapter->isConnected()) {
+			return $cached;
+		}
+
+		$stored = $this->configAdapter->set($cat, $key, $value);
+
+		return $cached && $stored;
+	}
+
+	/**
+	 * @brief Deletes the given key from the system configuration.
+	 *
+	 * Removes the configured value from the stored cache in $this->configCache
+	 * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter ).
+	 *
+	 * @param string $cat The category of the configuration value
+	 * @param string $key    The configuration key to delete
+	 *
+	 * @return bool
+	 */
+	public function delete($cat, $key)
+	{
+		$cacheRemoved = $this->configCache->delete($cat, $key);
+
+		if (!$this->configAdapter->isConnected()) {
+			return $cacheRemoved;
+		}
+
+		$storeRemoved = $this->configAdapter->delete($cat, $key);
+
+		return $cacheRemoved || $storeRemoved;
+	}
+}
diff --git a/src/Core/Config/IConfigCache.php b/src/Core/Config/IConfigCache.php
deleted file mode 100644
index 898e3c0f8..000000000
--- a/src/Core/Config/IConfigCache.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Friendica\Core\Config;
-
-/**
- * The interface for a system-wide ConfigCache
- */
-interface IConfigCache
-{
-	/**
-	 * @param string $cat     Config category
-	 * @param string $key       Config key
-	 * @param mixed  $default Default value if it isn't set
-	 *
-	 * @return mixed Returns the value of the Config entry
-	 */
-	function get($cat, $key = null, $default = null);
-
-	/**
-	 * Sets a value in the config cache. Accepts raw output from the config table
-	 *
-	 * @param string $cat   Config category
-	 * @param string $key   Config key
-	 * @param mixed  $value Value to set
-	 *
-	 * @return bool True, if the value is set
-	 */
-	function set($cat, $key, $value);
-
-	/**
-	 * Deletes a value from the config cache
-	 *
-	 * @param string $cat  Config category
-	 * @param string $key  Config key
-	 */
-	function delete($cat, $key);
-
-	function getAll();
-}
diff --git a/src/Core/Config/IPConfigCache.php b/src/Core/Config/IPConfigCache.php
deleted file mode 100644
index 6a57dafa8..000000000
--- a/src/Core/Config/IPConfigCache.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Friendica\Core\Config;
-
-/**
- * The interface for a user-specific config cache
- */
-interface IPConfigCache
-{
-	/**
-	 * Retrieves a value from the user config cache
-	 *
-	 * @param int    $uid     User Id
-	 * @param string $cat     Config category
-	 * @param string $key     Config key
-	 * @param mixed  $default Default value if key isn't set
-	 *
-	 * @return string The value of the config entry
-	 */
-	function getP($uid, $cat, $key = null, $default = null);
-
-	/**
-	 * Sets a value in the user config cache
-	 *
-	 * Accepts raw output from the pconfig table
-	 *
-	 * @param int    $uid   User Id
-	 * @param string $cat   Config category
-	 * @param string $key   Config key
-	 * @param mixed  $value Value to set
-	 */
-	function setP($uid, $cat, $key, $value);
-
-	/**
-	 * Deletes a value from the user config cache
-	 *
-	 * @param int    $uid User Id
-	 * @param string $cat Config category
-	 * @param string $key Config key
-	 */
-	function deleteP($uid, $cat, $key);
-
-	function getAll();
-}
diff --git a/src/Core/Config/JITConfigAdapter.php b/src/Core/Config/JITConfigAdapter.php
deleted file mode 100644
index ecd88bb3d..000000000
--- a/src/Core/Config/JITConfigAdapter.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-namespace Friendica\Core\Config;
-
-use Friendica\Database\DBA;
-
-/**
- * JustInTime Configuration Adapter
- *
- * Default Config Adapter. Provides the best performance for pages loading few configuration variables.
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
- */
-class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapter
-{
-	private $cache;
-	private $in_db;
-
-	/**
-	 * @var IConfigCache The config cache of this driver
-	 */
-	private $configCache;
-
-	/**
-	 * @param IConfigCache $configCache The config cache of this driver
-	 */
-	public function __construct(IConfigCache $configCache)
-	{
-		$this->configCache = $configCache;
-		$this->connected = DBA::connected();
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function load($cat = "config")
-	{
-		if (!$this->isConnected()) {
-			return;
-		}
-
-		// We don't preload "system" anymore.
-		// This reduces the number of database reads a lot.
-		if ($cat === 'system') {
-			return;
-		}
-
-		$configs = DBA::select('config', ['v', 'k'], ['cat' => $cat]);
-		while ($config = DBA::fetch($configs)) {
-			$k = $config['k'];
-
-			$this->configCache->set($cat, $k, $config['v']);
-
-			if ($cat !== 'config') {
-				$this->cache[$cat][$k] = $config['v'];
-				$this->in_db[$cat][$k] = true;
-			}
-		}
-		DBA::close($configs);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get($cat, $k, $default_value = null, $refresh = false)
-	{
-		if (!$this->isConnected()) {
-			return $default_value;
-		}
-
-		if (!$refresh) {
-			// Do we have the cached value? Then return it
-			if (isset($this->cache[$cat][$k])) {
-				if ($this->cache[$cat][$k] === '!<unset>!') {
-					return $default_value;
-				} else {
-					return $this->cache[$cat][$k];
-				}
-			}
-		}
-
-		$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
-		if (DBA::isResult($config)) {
-			// manage array value
-			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
-
-			// Assign the value from the database to the cache
-			$this->cache[$cat][$k] = $value;
-			$this->in_db[$cat][$k] = true;
-			return $value;
-		} elseif ($this->configCache->get($cat, $k) !== null) {
-			// Assign the value (mostly) from config/local.config.php file to the cache
-			$this->cache[$cat][$k] = $this->configCache->get($cat, $k);
-			$this->in_db[$cat][$k] = false;
-
-			return $this->configCache->get($cat, $k);
-		} elseif ($this->configCache->get('config', $k) !== null) {
-			// Assign the value (mostly) from config/local.config.php file to the cache
-			$this->cache[$k] = $this->configCache->get('config', $k);
-			$this->in_db[$k] = false;
-
-			return $this->configCache->get('config', $k);
-		}
-
-		$this->cache[$cat][$k] = '!<unset>!';
-		$this->in_db[$cat][$k] = false;
-
-		return $default_value;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function set($cat, $k, $value)
-	{
-		if (!$this->isConnected()) {
-			return false;
-		}
-
-		// We store our setting values in a string variable.
-		// So we have to do the conversion here so that the compare below works.
-		// The exception are array values.
-		$dbvalue = (!is_array($value) ? (string)$value : $value);
-
-		$stored = $this->get($cat, $k, null, true);
-
-		if (!isset($this->in_db[$cat])) {
-			$this->in_db[$cat] = [];
-		}
-		if (!isset($this->in_db[$cat][$k])) {
-			$this->in_db[$cat] = false;
-		}
-
-		if (($stored === $dbvalue) && $this->in_db[$cat][$k]) {
-			return true;
-		}
-
-		$this->configCache->set($cat, $k, $value);
-
-		// Assign the just added value to the cache
-		$this->cache[$cat][$k] = $dbvalue;
-
-		// manage array value
-		$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
-
-		$result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
-
-		if ($result) {
-			$this->in_db[$cat][$k] = true;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function delete($cat, $k)
-	{
-		if (!$this->isConnected()) {
-			return false;
-		}
-
-		if (isset($this->cache[$cat][$k])) {
-			unset($this->cache[$cat][$k]);
-			unset($this->in_db[$cat][$k]);
-		}
-
-		$result = DBA::delete('config', ['cat' => $cat, 'k' => $k]);
-
-		return $result;
-	}
-}
diff --git a/src/Core/Config/JITPConfigAdapter.php b/src/Core/Config/JITPConfigAdapter.php
deleted file mode 100644
index b1a15601c..000000000
--- a/src/Core/Config/JITPConfigAdapter.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-namespace Friendica\Core\Config;
-
-use Friendica\Database\DBA;
-
-/**
- * JustInTime User Configuration Adapter
- *
- * Default PConfig Adapter. Provides the best performance for pages loading few configuration variables.
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
- */
-class JITPConfigAdapter implements IPConfigAdapter
-{
-	private $in_db;
-
-	/**
-	 * The config cache of this adapter
-	 * @var IPConfigCache
-	 */
-	private $configCache;
-
-	/**
-	 * @param IPConfigCache $configCache The config cache of this adapter
-	 */
-	public function __construct(IPConfigCache $configCache)
-	{
-		$this->configCache = $configCache;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function load($uid, $cat)
-	{
-		$pconfigs = DBA::select('pconfig', ['v', 'k'], ['cat' => $cat, 'uid' => $uid]);
-		if (DBA::isResult($pconfigs)) {
-			while ($pconfig = DBA::fetch($pconfigs)) {
-				$k = $pconfig['k'];
-
-				$this->configCache->setP($uid, $cat, $k, $pconfig['v']);
-
-				$this->in_db[$uid][$cat][$k] = true;
-			}
-		} else if ($cat != 'config') {
-			// Negative caching
-			$this->configCache->setP($uid, $cat, null, "!<unset>!");
-		}
-		DBA::close($pconfigs);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get($uid, $cat, $k, $default_value = null, $refresh = false)
-	{
-		if (!$refresh) {
-			// Looking if the whole family isn't set
-			if ($this->configCache->getP($uid, $cat) !== null) {
-				if ($this->configCache->getP($uid, $cat) === '!<unset>!') {
-					return $default_value;
-				}
-			}
-
-			if ($this->configCache->getP($uid, $cat, $k) !== null) {
-				if ($this->configCache->getP($uid, $cat, $k) === '!<unset>!') {
-					return $default_value;
-				}
-				return $this->configCache->getP($uid, $cat, $k);
-			}
-		}
-
-		$pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
-		if (DBA::isResult($pconfig)) {
-			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']);
-
-			$this->configCache->setP($uid, $cat, $k, $val);
-
-			$this->in_db[$uid][$cat][$k] = true;
-
-			return $val;
-		} else {
-			$this->configCache->setP($uid, $cat, $k, '!<unset>!');
-
-			$this->in_db[$uid][$cat][$k] = false;
-
-			return $default_value;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function set($uid, $cat, $k, $value)
-	{
-		// We store our setting values in a string variable.
-		// So we have to do the conversion here so that the compare below works.
-		// The exception are array values.
-		$dbvalue = (!is_array($value) ? (string)$value : $value);
-
-		$stored = $this->get($uid, $cat, $k, null, true);
-
-		if (($stored === $dbvalue) && $this->in_db[$uid][$cat][$k]) {
-			return true;
-		}
-
-		$this->configCache->setP($uid, $cat, $k, $value);
-
-		// manage array value
-		$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
-
-		$result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);
-
-		if ($result) {
-			$this->in_db[$uid][$cat][$k] = true;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function delete($uid, $cat, $k)
-	{
-		$this->configCache->deleteP($uid, $cat, $k);
-
-		if (!empty($this->in_db[$uid][$cat][$k])) {
-			unset($this->in_db[$uid][$cat][$k]);
-		}
-
-		$result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
-
-		return $result;
-	}
-}
diff --git a/src/Core/Config/PConfiguration.php b/src/Core/Config/PConfiguration.php
new file mode 100644
index 000000000..d3c848c9d
--- /dev/null
+++ b/src/Core/Config/PConfiguration.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace Friendica\Core\Config;
+
+/**
+ * This class is responsible for the user-specific configuration values in Friendica
+ * The values are set through the Config-DB-Table (per Config-DB-adapter @see Adapter\IPConfigAdapter )
+ *
+ * The configuration cache (@see Cache\IPConfigCache ) is used for temporary caching of database calls. This will
+ * increase the performance.
+ */
+class PConfiguration
+{
+	/**
+	 * @var Cache\IPConfigCache
+	 */
+	private $configCache;
+
+	/**
+	 * @var Adapter\IPConfigAdapter
+	 */
+	private $configAdapter;
+
+	/**
+	 * @param Cache\IPConfigCache     $configCache   The configuration cache
+	 * @param Adapter\IPConfigAdapter $configAdapter The configuration DB-backend
+	 */
+	public function __construct(Cache\IPConfigCache $configCache, Adapter\IPConfigAdapter $configAdapter)
+	{
+		$this->configCache = $configCache;
+		$this->configAdapter = $configAdapter;
+	}
+
+	/**
+	 * @brief Loads all configuration values of a user's config family into a cached storage.
+	 *
+	 * All configuration values of the given user are stored with the $uid in
+	 * the cache ( @see IPConfigCache )
+	 *
+	 * @param string $uid The user_id
+	 * @param string $cat The category of the configuration value
+	 *
+	 * @return void
+	 */
+	public function load($uid, $cat = 'config')
+	{
+		// If not connected, do nothing
+		if (!$this->configAdapter->isConnected()) {
+			return;
+		}
+
+		// load the whole category out of the DB into the cache
+		$this->configCache->loadP($uid, $this->configAdapter->load($uid, $cat));
+	}
+
+	/**
+	 * @brief Get a particular user's config variable given the category name
+	 * ($cat) and a key.
+	 *
+	 * Get a particular user's config value from the given category ($cat)
+	 * and the $key with the $uid from a cached storage either from the $this->configAdapter
+	 * (@see IConfigAdapter ) or from the $this->configCache (@see IConfigCache ).
+	 *
+	 * @param string  $uid           The user_id
+	 * @param string  $cat           The category of the configuration value
+	 * @param string  $key           The configuration key to query
+	 * @param mixed   $default_value optional, The value to return if key is not set (default: null)
+	 * @param boolean $refresh       optional, If true the config is loaded from the db and not from the cache (default: false)
+	 *
+	 * @return mixed Stored value or null if it does not exist
+	 */
+	public function get($uid, $cat, $key, $default_value = null, $refresh = false)
+	{
+		// Return the value of the cache if found and no refresh is forced
+		if (!$refresh && $this->configCache->hasP($uid, $cat, $key)) {
+			return $this->configCache->getP($uid, $cat, $key);
+		}
+
+		// if we don't find the value in the cache and the adapter isn't ready, return the default value
+		if (!$this->configAdapter->isConnected()) {
+			return $default_value;
+		}
+
+		// load DB value to cache
+		$dbvalue = $this->configAdapter->get($uid, $cat, $key);
+
+		if ($dbvalue !== '!<unset>!') {
+			$this->configCache->setP($uid, $cat, $key, $dbvalue);
+			return $dbvalue;
+		} else {
+			return $default_value;
+		}
+	}
+
+	/**
+	 * @brief Sets a configuration value for a user
+	 *
+	 * Stores a config value ($value) in the category ($family) under the key ($key)
+	 * for the user_id $uid.
+	 *
+	 * @note  Please do not store booleans - convert to 0/1 integer values!
+	 *
+	 * @param string $uid    The user_id
+	 * @param string $cat    The category of the configuration value
+	 * @param string $key    The configuration key to set
+	 * @param mixed  $value  The value to store
+	 *
+	 * @return bool Operation success
+	 */
+	public function set($uid, $cat, $key, $value)
+	{
+		// set the cache first
+		$cached = $this->configCache->setP($uid, $cat, $key, $value);
+
+		// If there is no connected adapter, we're finished
+		if (!$this->configAdapter->isConnected()) {
+			return $cached;
+		}
+
+		$stored = $this->configAdapter->set($uid, $cat, $key, $value);
+
+		return $cached && $stored;
+	}
+
+	/**
+	 * @brief Deletes the given key from the users's configuration.
+	 *
+	 * Removes the configured value from the stored cache in $this->configCache
+	 * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter )
+	 * with the given $uid.
+	 *
+	 * @param string $uid The user_id
+	 * @param string $cat The category of the configuration value
+	 * @param string $key The configuration key to delete
+	 *
+	 * @return bool
+	 */
+	public function delete($uid, $cat, $key)
+	{
+		$cacheRemoved = $this->configCache->deleteP($uid, $cat, $key);
+
+		if (!$this->configAdapter->isConnected()) {
+			return $cacheRemoved;
+		}
+
+		$storeRemoved = $this->configAdapter->delete($uid, $cat, $key);
+
+		return $cacheRemoved || $storeRemoved;
+	}
+}
diff --git a/src/Core/Config/PreloadConfigAdapter.php b/src/Core/Config/PreloadConfigAdapter.php
deleted file mode 100644
index 96331e7a2..000000000
--- a/src/Core/Config/PreloadConfigAdapter.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-namespace Friendica\Core\Config;
-
-use Exception;
-use Friendica\Database\DBA;
-
-/**
- * Preload Configuration Adapter
- *
- * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
- */
-class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapter
-{
-	private $config_loaded = false;
-
-	/**
-	 * @var IConfigCache The config cache of this driver
-	 */
-	private $configCache;
-
-	/**
-	 * @param IConfigCache $configCache The config cache of this driver
-	 */
-	public function __construct(IConfigCache $configCache)
-	{
-		$this->configCache = $configCache;
-		$this->connected = DBA::connected();
-		$this->load();
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function load($family = 'config')
-	{
-		if (!$this->isConnected()) {
-			return;
-		}
-
-		if ($this->config_loaded) {
-			return;
-		}
-
-		$configs = DBA::select('config', ['cat', 'v', 'k']);
-		while ($config = DBA::fetch($configs)) {
-			$this->configCache->set($config['cat'], $config['k'], $config['v']);
-		}
-		DBA::close($configs);
-
-		$this->config_loaded = true;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get($cat, $k, $default_value = null, $refresh = false)
-	{
-		if (!$this->isConnected()) {
-			return $default_value;
-		}
-
-		if ($refresh) {
-			$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
-			if (DBA::isResult($config)) {
-				$this->configCache->set($cat, $k, $config['v']);
-			}
-		}
-
-		$return = $this->configCache->get($cat, $k, $default_value);
-
-		return $return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function set($cat, $k, $value)
-	{
-		if (!$this->isConnected()) {
-			return false;
-		}
-
-		// We store our setting values as strings.
-		// So we have to do the conversion here so that the compare below works.
-		// The exception are array values.
-		$compare_value = !is_array($value) ? (string)$value : $value;
-
-		if ($this->configCache->get($cat, $k) === $compare_value) {
-			return true;
-		}
-
-		$this->configCache->set($cat, $k, $value);
-
-		// manage array value
-		$dbvalue = is_array($value) ? serialize($value) : $value;
-
-		$result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
-		if (!$result) {
-			throw new Exception('Unable to store config value in [' . $cat . '][' . $k . ']');
-		}
-
-		return true;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function delete($cat, $k)
-	{
-		if (!$this->isConnected()) {
-			return false;
-		}
-
-		$this->configCache->delete($cat, $k);
-
-		$result = DBA::delete('config', ['cat' => $cat, 'k' => $k]);
-
-		return $result;
-	}
-}
diff --git a/src/Core/Config/PreloadPConfigAdapter.php b/src/Core/Config/PreloadPConfigAdapter.php
deleted file mode 100644
index af97815ad..000000000
--- a/src/Core/Config/PreloadPConfigAdapter.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-namespace Friendica\Core\Config;
-
-use Exception;
-use Friendica\Database\DBA;
-
-/**
- * Preload User Configuration Adapter
- *
- * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
- */
-class PreloadPConfigAdapter implements IPConfigAdapter
-{
-	private $config_loaded = false;
-
-	/**
-	 * The config cache of this adapter
-	 * @var IPConfigCache
-	 */
-	private $configCache;
-
-	/**
-	 * @param IPConfigCache $configCache The config cache of this adapter
-	 * @param int           $uid    The UID of the current user
-	 */
-	public function __construct(IPConfigCache $configCache, $uid = null)
-	{
-		$this->configCache = $configCache;
-		if (isset($uid)) {
-			$this->load($uid, 'config');
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function load($uid, $family)
-	{
-		if ($this->config_loaded) {
-			return;
-		}
-
-		if (empty($uid)) {
-			return;
-		}
-
-		$pconfigs = DBA::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
-		while ($pconfig = DBA::fetch($pconfigs)) {
-			$this->configCache->setP($uid, $pconfig['cat'], $pconfig['k'], $pconfig['v']);
-		}
-		DBA::close($pconfigs);
-
-		$this->config_loaded = true;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get($uid, $cat, $k, $default_value = null, $refresh = false)
-	{
-		if (!$this->config_loaded) {
-			$this->load($uid, $cat);
-		}
-
-		if ($refresh) {
-			$config = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
-			if (DBA::isResult($config)) {
-				$this->configCache->setP($uid, $cat, $k, $config['v']);
-			} else {
-				$this->configCache->deleteP($uid, $cat, $k);
-			}
-		}
-
-		return $this->configCache->getP($uid, $cat, $k, $default_value);;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function set($uid, $cat, $k, $value)
-	{
-		if (!$this->config_loaded) {
-			$this->load($uid, $cat);
-		}
-		// We store our setting values as strings.
-		// So we have to do the conversion here so that the compare below works.
-		// The exception are array values.
-		$compare_value = !is_array($value) ? (string)$value : $value;
-
-		if ($this->configCache->getP($uid, $cat, $k) === $compare_value) {
-			return true;
-		}
-
-		$this->configCache->setP($uid, $cat, $k, $value);
-
-		// manage array value
-		$dbvalue = is_array($value) ? serialize($value) : $value;
-
-		$result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);
-		if (!$result) {
-			throw new Exception('Unable to store config value in [' . $uid . '][' . $cat . '][' . $k . ']');
-		}
-
-		return true;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function delete($uid, $cat, $k)
-	{
-		if (!$this->config_loaded) {
-			$this->load($uid, $cat);
-		}
-
-		$this->configCache->deleteP($uid, $cat, $k);
-
-		$result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
-
-		return $result;
-	}
-}
diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php
index d5c63dd99..682d10971 100644
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Core/Console/AutomaticInstallation.php
@@ -100,10 +100,10 @@ HELP;
 				}
 			}
 
-			$db_host = $a->getConfig()->get('database', 'hostname');
-			$db_user = $a->getConfig()->get('database', 'username');
-			$db_pass = $a->getConfig()->get('database', 'password');
-			$db_data = $a->getConfig()->get('database', 'database');
+			$db_host = $a->getConfigCache()->get('database', 'hostname');
+			$db_user = $a->getConfigCache()->get('database', 'username');
+			$db_pass = $a->getConfigCache()->get('database', 'password');
+			$db_data = $a->getConfigCache()->get('database', 'database');
 		} else {
 			// Creating config file
 			$this->out("Creating config file...\n");
@@ -146,7 +146,7 @@ HELP;
 
 		$installer->resetChecks();
 
-		if (!$installer->checkDB($a->getConfig(), $a->getProfiler(), $db_host, $db_user, $db_pass, $db_data)) {
+		if (!$installer->checkDB($a->getConfigCache(), $a->getProfiler(), $db_host, $db_user, $db_pass, $db_data)) {
 			$errorMessage = $this->extractErrors($installer->getChecks());
 			throw new RuntimeException($errorMessage);
 		}
diff --git a/src/Core/Console/Config.php b/src/Core/Console/Config.php
index b1c3df54e..cf5c09fc0 100644
--- a/src/Core/Console/Config.php
+++ b/src/Core/Console/Config.php
@@ -124,9 +124,9 @@ HELP;
 			$cat = $this->getArgument(0);
 			Core\Config::load($cat);
 
-			if ($a->getConfig()->get($cat) !== null) {
+			if ($a->getConfigCache()->get($cat) !== null) {
 				$this->out("[{$cat}]");
-				$catVal = $a->getConfig()->get($cat);
+				$catVal = $a->getConfigCache()->get($cat);
 				foreach ($catVal as $key => $value) {
 					if (is_array($value)) {
 						foreach ($value as $k => $v) {
@@ -148,7 +148,7 @@ HELP;
 				$this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only');
 			}
 
-			$config = $a->getConfig()->getAll();
+			$config = $a->getConfigCache()->getAll();
 			foreach ($config as $cat => $section) {
 				if (is_array($section)) {
 					foreach ($section as $key => $value) {
diff --git a/src/Core/Console/Typo.php b/src/Core/Console/Typo.php
index 32ba6ded3..8d07051e8 100644
--- a/src/Core/Console/Typo.php
+++ b/src/Core/Console/Typo.php
@@ -43,7 +43,7 @@ HELP;
 			throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
 		}
 
-		$php_path = BaseObject::getApp()->getConfig()->get('config', 'php_path', 'php');
+		$php_path = BaseObject::getApp()->getConfigCache()->get('config', 'php_path', 'php');
 
 		if ($this->getOption('v')) {
 			$this->out('Directory: src');
diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index dd9e3d22e..73f85785e 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -6,7 +6,7 @@ namespace Friendica\Core;
 
 use DOMDocument;
 use Exception;
-use Friendica\Core\Config\ConfigCache;
+use Friendica\Core\Config\Cache\IConfigCache;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Object\Image;
@@ -583,7 +583,7 @@ class Installer
 	/**
 	 * Checking the Database connection and if it is available for the current installation
 	 *
-	 * @param ConfigCache $configCache The configuration cache
+	 * @param IConfigCache $configCache The configuration cache
 	 * @param Profiler    $profiler    The profiler of this app
 	 * @param string $dbhost           Hostname/IP of the Friendica Database
 	 * @param string $dbuser           Username of the Database connection credentials
@@ -593,7 +593,7 @@ class Installer
 	 * @return bool true if the check was successful, otherwise false
 	 * @throws Exception
 	 */
-	public function checkDB(ConfigCache $configCache, Profiler $profiler, $dbhost, $dbuser, $dbpass, $dbdata)
+	public function checkDB(IConfigCache $configCache, Profiler $profiler, $dbhost, $dbuser, $dbpass, $dbdata)
 	{
 		if (!DBA::connect($configCache, $profiler, $dbhost, $dbuser, $dbpass, $dbdata)) {
 			$this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index df024f0f3..f62b59f47 100644
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -18,123 +18,78 @@ namespace Friendica\Core;
 class PConfig
 {
 	/**
-	 * @var Config\IPConfigAdapter
+	 * @var Config\PConfiguration
 	 */
-	private static $adapter;
-
-	/**
-	 * @var Config\IPConfigCache
-	 */
-	private static $cache;
+	private static $config;
 
 	/**
 	 * Initialize the config with only the cache
 	 *
-	 * @param Config\IPConfigCache $cache  The configuration cache
+	 * @param Config\PConfiguration $config The configuration cache
 	 */
-	public static function init(Config\IPConfigCache $cache)
+	public static function init(Config\PConfiguration $config)
 	{
-		self::$cache  = $cache;
-	}
-
-	/**
-	 * Add the adapter for DB-backend
-	 *
-	 * @param Config\IPConfigAdapter $adapter
-	 */
-	public static function setAdapter(Config\IPConfigAdapter $adapter)
-	{
-		self::$adapter = $adapter;
+		self::$config = $config;
 	}
 
 	/**
 	 * @brief Loads all configuration values of a user's config family into a cached storage.
 	 *
-	 * All configuration values of the given user are stored with the $uid in
-	 * the cache ( @see IPConfigCache )
-	 *
-	 * @param string $uid    The user_id
-	 * @param string $family The category of the configuration value
+	 * @param string $uid The user_id
+	 * @param string $cat The category of the configuration value
 	 *
 	 * @return void
 	 */
-	public static function load($uid, $family)
+	public static function load($uid, $cat)
 	{
-		if (!isset(self::$adapter)) {
-			return;
-		}
-
-		self::$adapter->load($uid, $family);
+		self::$config->load($uid, $cat);
 	}
 
 	/**
 	 * @brief Get a particular user's config variable given the category name
-	 * ($family) and a key.
-	 *
-	 * Get a particular user's config value from the given category ($family)
-	 * and the $key with the $uid from a cached storage either from the self::$adapter
-	 * (@see IConfigAdapter ) or from the static::$cache (@see IConfigCache ).
+	 * ($cat) and a key.
 	 *
 	 * @param string  $uid           The user_id
-	 * @param string  $family        The category of the configuration value
+	 * @param string  $cat           The category of the configuration value
 	 * @param string  $key           The configuration key to query
 	 * @param mixed   $default_value optional, The value to return if key is not set (default: null)
 	 * @param boolean $refresh       optional, If true the config is loaded from the db and not from the cache (default: false)
 	 *
 	 * @return mixed Stored value or null if it does not exist
 	 */
-	public static function get($uid, $family, $key, $default_value = null, $refresh = false)
+	public static function get($uid, $cat, $key, $default_value = null, $refresh = false)
 	{
-		if (!isset(self::$adapter)) {
-			return self::$cache->getP($uid, $family, $key, $default_value);
-		}
-
-		return self::$adapter->get($uid, $family, $key, $default_value, $refresh);
+		return self::$config->get($uid, $cat, $key, $default_value, $refresh);
 	}
 
 	/**
 	 * @brief Sets a configuration value for a user
 	 *
-	 * Stores a config value ($value) in the category ($family) under the key ($key)
-	 * for the user_id $uid.
-	 *
 	 * @note  Please do not store booleans - convert to 0/1 integer values!
 	 *
 	 * @param string $uid    The user_id
-	 * @param string $family The category of the configuration value
+	 * @param string $cat    The category of the configuration value
 	 * @param string $key    The configuration key to set
 	 * @param mixed  $value  The value to store
 	 *
 	 * @return bool Operation success
 	 */
-	public static function set($uid, $family, $key, $value)
+	public static function set($uid, $cat, $key, $value)
 	{
-		if (!isset(self::$adapter)) {
-			return self::$cache->setP($uid, $family, $key, $value);
-		}
-
-		return self::$adapter->set($uid, $family, $key, $value);
+		return self::$config->set($uid, $cat, $key, $value);
 	}
 
 	/**
 	 * @brief Deletes the given key from the users's configuration.
 	 *
-	 * Removes the configured value from the stored cache in self::$config
-	 * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter )
-	 * with the given $uid.
+	 * @param string $uid The user_id
+	 * @param string $cat The category of the configuration value
+	 * @param string $key The configuration key to delete
 	 *
-	 * @param string $uid    The user_id
-	 * @param string $family The category of the configuration value
-	 * @param string $key    The configuration key to delete
-	 *
-	 * @return mixed
+	 * @return bool
 	 */
-	public static function delete($uid, $family, $key)
+	public static function delete($uid, $cat, $key)
 	{
-		if (!isset(self::$adapter)) {
-			return self::$cache->deleteP($uid, $family, $key);
-		}
-
-		return self::$adapter->delete($uid, $family, $key);
+		return self::$config->delete($uid, $cat, $key);
 	}
 }
diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index edef30901..1c17d9aca 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -2,7 +2,7 @@
 
 namespace Friendica\Database;
 
-use Friendica\Core\Config\IConfigCache;
+use Friendica\Core\Config\Cache\IConfigCache;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Util\DateTimeFormat;
diff --git a/src/Factory/ConfigFactory.php b/src/Factory/ConfigFactory.php
index 269daea8b..6a30cf0e0 100644
--- a/src/Factory/ConfigFactory.php
+++ b/src/Factory/ConfigFactory.php
@@ -2,51 +2,66 @@
 
 namespace Friendica\Factory;
 
+use Friendica\Core;
 use Friendica\Core\Config;
+use Friendica\Core\Config\Adapter;
+use Friendica\Core\Config\Cache;
 
 class ConfigFactory
 {
 	/**
-	 * @param Config\ConfigCacheLoader $loader The Config Cache loader (INI/config/.htconfig)
+	 * @param Cache\ConfigCacheLoader $loader The Config Cache loader (INI/config/.htconfig)
 	 *
-	 * @return Config\ConfigCache
+	 * @return Cache\ConfigCache
 	 */
-	public static function createCache(Config\ConfigCacheLoader $loader)
+	public static function createCache(Cache\ConfigCacheLoader $loader)
 	{
-		$configCache = new Config\ConfigCache();
+		$configCache = new Cache\ConfigCache();
 		$loader->loadConfigFiles($configCache);
 
 		return $configCache;
 	}
 
 	/**
-	 * @param string              $type   The adapter type
-	 * @param Config\IConfigCache $config The config cache of this adapter
+	 * @param Cache\ConfigCache $configCache The config cache of this adapter
 	 *
-	 * @return Config\IConfigAdapter
+	 * @return Config\Configuration
 	 */
-	public static function createConfig($type, Config\IConfigCache $config)
+	public static function createConfig(Cache\ConfigCache $configCache)
 	{
-		if ($type == 'preload') {
-			return new Config\PreloadConfigAdapter($config);
+		if ($configCache->get('system', 'config_adapter') === 'preload') {
+			$configAdapter = new Adapter\PreloadConfigAdapter();
 		} else {
-			return new Config\JITConfigAdapter($config);
+			$configAdapter = new Adapter\JITConfigAdapter();
 		}
+
+		$configuration = new Config\Configuration($configCache, $configAdapter);
+
+		// Set the config in the static container for legacy usage
+		Core\Config::init($configuration);
+
+		return $configuration;
 	}
 
 	/**
-	 * @param string               $type   The adapter type
-	 * @param Config\IPConfigCache $config The config cache of this adapter
-	 * @param int                  $uid    The UID of the current user
+	 * @param Cache\ConfigCache  $configCache The config cache of this adapter
+	 * @param int                $uid         The UID of the current user
 	 *
-	 * @return Config\IPConfigAdapter
+	 * @return Config\PConfiguration
 	 */
-	public static function createPConfig($type, Config\IPConfigCache $config, $uid = null)
+	public static function createPConfig(Cache\ConfigCache $configCache, $uid = null)
 	{
-		if ($type == 'preload') {
-			return new Config\PreloadPConfigAdapter($config, $uid);
+		if ($configCache->get('system', 'config_adapter') === 'preload') {
+			$configAdapter = new Adapter\PreloadPConfigAdapter($uid);
 		} else {
-			return new Config\JITPConfigAdapter($config);
+			$configAdapter = new Adapter\JITPConfigAdapter();
 		}
+
+		$configuration = new Config\PConfiguration($configCache, $configAdapter);
+
+		// Set the config in the static container for legacy usage
+		Core\PConfig::init($configuration);
+
+		return $configuration;
 	}
 }
diff --git a/src/Factory/DBFactory.php b/src/Factory/DBFactory.php
new file mode 100644
index 000000000..5970541c1
--- /dev/null
+++ b/src/Factory/DBFactory.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Friendica\Factory;
+
+use Friendica\Core\Config\Cache;
+use Friendica\Database;
+
+class DBFactory
+{
+	public static function init(Cache\ConfigCache $configCache, array $server)
+	{
+		if (Database\DBA::connected()) {
+			return;
+		}
+
+		$db_host = $configCache->get('database', 'hostname');
+		$db_user = $configCache->get('database', 'username');
+		$db_pass = $configCache->get('database', 'password');
+		$db_data = $configCache->get('database', 'database');
+		$charset = $configCache->get('database', 'charset');
+
+		// Use environment variables for mysql if they are set beforehand
+		if (!empty($server['MYSQL_HOST'])
+			&& !empty($server['MYSQL_USERNAME'] || !empty($server['MYSQL_USER']))
+			&& $server['MYSQL_PASSWORD'] !== false
+			&& !empty($server['MYSQL_DATABASE']))
+		{
+			$db_host = $server['MYSQL_HOST'];
+			if (!empty($server['MYSQL_PORT'])) {
+				$db_host .= ':' . $server['MYSQL_PORT'];
+			}
+			if (!empty($server['MYSQL_USERNAME'])) {
+				$db_user = $server['MYSQL_USERNAME'];
+			} else {
+				$db_user = $server['MYSQL_USER'];
+			}
+			$db_pass = (string) $server['MYSQL_PASSWORD'];
+			$db_data = $server['MYSQL_DATABASE'];
+		}
+
+		if (Database\DBA::connect($configCache, $db_host, $db_user, $db_pass, $db_data, $charset)) {
+			// Loads DB_UPDATE_VERSION constant
+			Database\DBStructure::definition($configCache->get('system', 'basepath'), false);
+		}
+
+		unset($db_host, $db_user, $db_pass, $db_data, $charset);
+	}
+}
diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index f6e2d6039..e9bacb38e 100644
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -2,7 +2,7 @@
 
 namespace Friendica\Factory;
 
-use Friendica\Core\Config\ConfigCache;
+use Friendica\Core\Config\Configuration;
 use Friendica\Core\Logger;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\Logger\FriendicaDevelopHandler;
@@ -22,12 +22,12 @@ class LoggerFactory
 	/**
 	 * Creates a new PSR-3 compliant logger instances
 	 *
-	 * @param string      $channel The channel of the logger instance
-	 * @param ConfigCache $config  The config
+	 * @param string        $channel The channel of the logger instance
+	 * @param Configuration $config  The config
 	 *
 	 * @return LoggerInterface The PSR-3 compliant logger instance
 	 */
-	public static function create($channel, ConfigCache $config = null)
+	public static function create($channel, Configuration $config)
 	{
 		$logger = new Monolog\Logger($channel);
 		$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
diff --git a/src/Module/Install.php b/src/Module/Install.php
index 4fb4a932c..3414e887f 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -75,7 +75,7 @@ class Install extends BaseModule
 				$dbdata  = Strings::escapeTags(trim(defaults($_POST, 'dbdata', '')));
 
 				// If we cannot connect to the database, return to the previous step
-				if (!self::$installer->checkDB($a->getConfig(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
+				if (!self::$installer->checkDB($a->getConfigCache(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
 					self::$currentWizardStep = self::DATABASE_CONFIG;
 				}
 
@@ -92,7 +92,7 @@ class Install extends BaseModule
 				$adminmail = Strings::escapeTags(trim(defaults($_POST, 'adminmail', '')));
 
 				// If we cannot connect to the database, return to the Database config wizard
-				if (!self::$installer->checkDB($a->getConfig(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
+				if (!self::$installer->checkDB($a->getConfigCache(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
 					self::$currentWizardStep = self::DATABASE_CONFIG;
 					return;
 				}
diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 5c66711dc..dde61e856 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,7 +5,7 @@
 
 namespace Friendica\Test;
 
-use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
 use Friendica\Database\DBA;
 use Friendica\Factory;
 use Friendica\Util\BasePath;
@@ -41,7 +41,7 @@ abstract class DatabaseTest extends MockedTest
 		}
 
 		$basedir = BasePath::create(dirname(__DIR__));
-		$configLoader = new Config\ConfigCacheLoader($basedir);
+		$configLoader = new Cache\ConfigCacheLoader($basedir);
 		$config = Factory\ConfigFactory::createCache($configLoader);
 
 		$profiler = \Mockery::mock(Profiler::class);
diff --git a/tests/Util/AppMockTrait.php b/tests/Util/AppMockTrait.php
index 18188239f..66b95b04e 100644
--- a/tests/Util/AppMockTrait.php
+++ b/tests/Util/AppMockTrait.php
@@ -5,7 +5,6 @@ namespace Friendica\Test\Util;
 use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Core\Config;
-use Friendica\Core\Config\ConfigCache;
 use Friendica\Render\FriendicaSmartyEngine;
 use Mockery\MockInterface;
 use org\bovigo\vfs\vfsStreamDirectory;
@@ -21,7 +20,7 @@ trait AppMockTrait
 	protected $app;
 
 	/**
-	 * @var MockInterface|ConfigCache The mocked Config Cache
+	 * @var MockInterface|Config\Configuration The mocked Config Cache
 	 */
 	protected $configCache;
 
@@ -29,9 +28,9 @@ trait AppMockTrait
 	 * Mock the App
 	 *
 	 * @param vfsStreamDirectory $root The root directory
-	 * @param MockInterface|ConfigCache $config The config cache
+	 * @param MockInterface|Config\Configuration $config The config cache
 	 */
-	public function mockApp($root, $config)
+	public function mockApp($root, Config\Configuration $config)
 	{
 		$this->configCache = $config;
 		// Mocking App and most used functions
@@ -62,11 +61,14 @@ trait AppMockTrait
 			->andReturn('localhost');
 		$config
 			->shouldReceive('get')
-			->with('system', 'theme', NULL)
+			->with('system', 'theme', NULL, false)
 			->andReturn('system_theme');
+		$config
+			->shouldReceive('getConfig')
+			->andReturn($config);
 
 		$this->app
-			->shouldReceive('getConfig')
+			->shouldReceive('getConfigCache')
 			->andReturn($config);
 
 		$this->app
@@ -84,11 +86,6 @@ trait AppMockTrait
 
 		// Initialize empty Config
 		Config::init($config);
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\IConfigAdapter');
-		$configAdapter
-			->shouldReceive('isConnected')
-			->andReturn(false);
-		Config::setAdapter($configAdapter);
 
 		BaseObject::setApp($this->app);
 	}
diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index 41f5c0fdf..7f2299d51 100644
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -7,6 +7,7 @@ namespace Friendica\Test;
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -36,8 +37,11 @@ class ApiTest extends DatabaseTest
 	public function setUp()
 	{
 		$basedir = BasePath::create(dirname(__DIR__) . '/../');
-		$configLoader = new Config\ConfigCacheLoader($basedir);
-		$config = Factory\ConfigFactory::createCache($configLoader);
+		$configLoader = new Cache\ConfigCacheLoader($basedir);
+		$configCache = Factory\ConfigFactory::createCache($configLoader);
+		Factory\DBFactory::init($configCache, $_SERVER);
+		$config = Factory\ConfigFactory::createConfig($configCache);
+		$pconfig = Factory\ConfigFactory::createPConfig($configCache);
 		$logger = Factory\LoggerFactory::create('test', $config);
 		$profiler = Factory\ProfilerFactory::create($logger, $config);
 		$this->app = new App($config, $logger, $profiler, false);
diff --git a/tests/src/App/ModeTest.php b/tests/src/App/ModeTest.php
index 19dad07cd..5a5c4c87e 100644
--- a/tests/src/App/ModeTest.php
+++ b/tests/src/App/ModeTest.php
@@ -90,19 +90,14 @@ class ModeTest extends MockedTest
 		$this->mockConnected(true, 1);
 		$this->mockFetchFirst('SHOW TABLES LIKE \'config\'', true, 1);
 
-		$config = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+		$config = \Mockery::mock('Friendica\Core\Config\Configuration');
 		$config
 			->shouldReceive('get')
-			->with('system', 'maintenance', null)
+			->with('system', 'maintenance', null, false)
 			->andReturn(true)
 			->once();
 		// Initialize empty Config
 		Config::init($config);
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\IConfigAdapter');
-		$configAdapter
-			->shouldReceive('isConnected')
-			->andReturn(false);
-		Config::setAdapter($configAdapter);
 
 		$mode = new Mode($this->root->url());
 		$mode->determine();
@@ -123,19 +118,14 @@ class ModeTest extends MockedTest
 		$this->mockConnected(true, 1);
 		$this->mockFetchFirst('SHOW TABLES LIKE \'config\'', true, 1);
 
-		$config = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+		$config = \Mockery::mock('Friendica\Core\Config\Configuration');
 		$config
 			->shouldReceive('get')
-			->with('system', 'maintenance', null)
+			->with('system', 'maintenance', null, false)
 			->andReturn(false)
 			->once();
 		// Initialize empty Config
 		Config::init($config);
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\IConfigAdapter');
-		$configAdapter
-			->shouldReceive('isConnected')
-			->andReturn(false);
-		Config::setAdapter($configAdapter);
 
 		$mode = new Mode($this->root->url());
 		$mode->determine();
diff --git a/tests/src/BaseObjectTest.php b/tests/src/BaseObjectTest.php
index 784944c3a..39741eb9e 100644
--- a/tests/src/BaseObjectTest.php
+++ b/tests/src/BaseObjectTest.php
@@ -31,7 +31,7 @@ class BaseObjectTest extends TestCase
 	{
 		$baseObject = new BaseObject();
 		$this->setUpVfsDir();
-		$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+		$configMock = \Mockery::mock('Friendica\Core\Config\Configuration');
 		$this->mockApp($this->root, $configMock);
 
 		$this->assertNull($baseObject->setApp($this->app));
diff --git a/tests/src/Core/Cache/CacheTest.php b/tests/src/Core/Cache/CacheTest.php
index e8bd65cbf..961ac9e1b 100644
--- a/tests/src/Core/Cache/CacheTest.php
+++ b/tests/src/Core/Cache/CacheTest.php
@@ -67,7 +67,7 @@ abstract class CacheTest extends MockedTest
 	protected function setUp()
 	{
 		$this->setUpVfsDir();
-		$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+		$configMock = \Mockery::mock('Friendica\Core\Config\Configuration');
 		$this->mockApp($this->root, $configMock);
 		$this->app
 			->shouldReceive('getHostname')
diff --git a/tests/src/Core/Cache/MemcacheCacheDriverTest.php b/tests/src/Core/Cache/MemcacheCacheDriverTest.php
index 7832344a8..5017b6967 100644
--- a/tests/src/Core/Cache/MemcacheCacheDriverTest.php
+++ b/tests/src/Core/Cache/MemcacheCacheDriverTest.php
@@ -14,12 +14,12 @@ class MemcacheCacheDriverTest extends MemoryCacheTest
 	{
 		$this->configCache
 			->shouldReceive('get')
-			->with('system', 'memcache_host', NULL)
+			->with('system', 'memcache_host', NULL, false)
 			->andReturn('localhost');
 
 		$this->configCache
 			->shouldReceive('get')
-			->with('system', 'memcache_port', NULL)
+			->with('system', 'memcache_port', NULL, false)
 			->andReturn(11211);
 
 		$this->cache = CacheDriverFactory::create('memcache');
diff --git a/tests/src/Core/Cache/MemcachedCacheDriverTest.php b/tests/src/Core/Cache/MemcachedCacheDriverTest.php
index fe401f97d..7c6835359 100644
--- a/tests/src/Core/Cache/MemcachedCacheDriverTest.php
+++ b/tests/src/Core/Cache/MemcachedCacheDriverTest.php
@@ -14,7 +14,7 @@ class MemcachedCacheDriverTest extends MemoryCacheTest
 	{
 		$this->configCache
 			->shouldReceive('get')
-			->with('system', 'memcached_hosts', NULL)
+			->with('system', 'memcached_hosts', NULL, false)
 			->andReturn([0 => 'localhost, 11211']);
 
 		$this->cache = CacheDriverFactory::create('memcached');
diff --git a/tests/src/Core/Cache/RedisCacheDriverTest.php b/tests/src/Core/Cache/RedisCacheDriverTest.php
index 0a3dba439..d36e6b826 100644
--- a/tests/src/Core/Cache/RedisCacheDriverTest.php
+++ b/tests/src/Core/Cache/RedisCacheDriverTest.php
@@ -14,12 +14,12 @@ class RedisCacheDriverTest extends MemoryCacheTest
 	{
 		$this->configCache
 			->shouldReceive('get')
-			->with('system', 'redis_host', NULL)
+			->with('system', 'redis_host', NULL, false)
 			->andReturn('localhost');
 
 		$this->configCache
 			->shouldReceive('get')
-			->with('system', 'redis_port', NULL)
+			->with('system', 'redis_port', NULL, false)
 			->andReturn(null);
 
 		$this->cache = CacheDriverFactory::create('redis');
diff --git a/tests/src/Core/Config/ConfigCacheLoaderTest.php b/tests/src/Core/Config/Cache/ConfigCacheLoaderTest.php
similarity index 95%
rename from tests/src/Core/Config/ConfigCacheLoaderTest.php
rename to tests/src/Core/Config/Cache/ConfigCacheLoaderTest.php
index 6be89bc40..f91f267c7 100644
--- a/tests/src/Core/Config/ConfigCacheLoaderTest.php
+++ b/tests/src/Core/Config/Cache/ConfigCacheLoaderTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Friendica\Test\Core\Config;
+namespace Friendica\Test\Core\Config\Cache;
 
-use Friendica\Core\Config\ConfigCache;
-use Friendica\Core\Config\ConfigCacheLoader;
+use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\Cache\ConfigCacheLoader;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\VFSTrait;
 use org\bovigo\vfs\vfsStream;
@@ -59,6 +59,7 @@ class ConfigCacheLoaderTest extends MockedTest
 		$this->delConfigFile('local.config.php');
 
 		$file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
+			'..' . DIRECTORY_SEPARATOR .
 			'..' . DIRECTORY_SEPARATOR .
 			'..' . DIRECTORY_SEPARATOR .
 			'datasets' . DIRECTORY_SEPARATOR .
@@ -91,6 +92,7 @@ class ConfigCacheLoaderTest extends MockedTest
 		$this->delConfigFile('local.config.php');
 
 		$file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
+			'..' . DIRECTORY_SEPARATOR .
 			'..' . DIRECTORY_SEPARATOR .
 			'..' . DIRECTORY_SEPARATOR .
 			'datasets' . DIRECTORY_SEPARATOR .
@@ -122,6 +124,7 @@ class ConfigCacheLoaderTest extends MockedTest
 		$this->delConfigFile('local.config.php');
 
 		$file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
+			'..' . DIRECTORY_SEPARATOR .
 			'..' . DIRECTORY_SEPARATOR .
 			'..' . DIRECTORY_SEPARATOR .
 			'datasets' . DIRECTORY_SEPARATOR .
@@ -160,6 +163,7 @@ class ConfigCacheLoaderTest extends MockedTest
 		vfsStream::create($structure, $this->root);
 
 		$file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
+			'..' . DIRECTORY_SEPARATOR .
 			'..' . DIRECTORY_SEPARATOR .
 			'..' . DIRECTORY_SEPARATOR .
 			'datasets' . DIRECTORY_SEPARATOR .
diff --git a/tests/src/Core/Config/ConfigCacheTest.php b/tests/src/Core/Config/Cache/ConfigCacheTest.php
similarity index 62%
rename from tests/src/Core/Config/ConfigCacheTest.php
rename to tests/src/Core/Config/Cache/ConfigCacheTest.php
index 25ea6030f..7b56ca646 100644
--- a/tests/src/Core/Config/ConfigCacheTest.php
+++ b/tests/src/Core/Config/Cache/ConfigCacheTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Friendica\Test\Core\Config;
+namespace Friendica\Test\Core\Config\Cache;
 
-use Friendica\Core\Config\ConfigCache;
+use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Test\MockedTest;
 
 class ConfigCacheTest extends MockedTest
@@ -48,7 +48,7 @@ class ConfigCacheTest extends MockedTest
 	public function testLoadConfigArray($data)
 	{
 		$configCache = new ConfigCache();
-		$configCache->loadConfigArray($data);
+		$configCache->load($data);
 
 		$this->assertConfigValues($data, $configCache);
 	}
@@ -67,18 +67,38 @@ class ConfigCacheTest extends MockedTest
 		];
 
 		$configCache = new ConfigCache();
-		$configCache->loadConfigArray($data);
-		$configCache->loadConfigArray($override);
+		$configCache->load($data);
+		$configCache->load($override);
 
 		$this->assertConfigValues($data, $configCache);
 
 		// override the value
-		$configCache->loadConfigArray($override, true);
+		$configCache->load($override, true);
 
 		$this->assertEquals($override['system']['test'], $configCache->get('system', 'test'));
 		$this->assertEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue'));
 	}
 
+	/**
+	 * Test the loadConfigArray() method with wrong/empty datasets
+	 */
+	public function testLoadConfigArrayWrong()
+	{
+		$configCache = new ConfigCache();
+
+		// empty dataset
+		$configCache->load([]);
+		$this->assertEmpty($configCache->getAll());
+
+		// wrong dataset
+		$configCache->load(['system' => 'not_array']);
+		$this->assertEmpty($configCache->getAll());
+
+		// incomplete dataset (key is integer ID of the array)
+		$configCache->load(['system' => ['value']]);
+		$this->assertEquals('value', $configCache->get('system', 0));
+	}
+
 	/**
 	 * Test the getAll() method
 	 * @dataProvider dataTests
@@ -86,14 +106,12 @@ class ConfigCacheTest extends MockedTest
 	public function testGetAll($data)
 	{
 		$configCache = new ConfigCache();
-		$configCache->loadConfigArray($data);
+		$configCache->load($data);
 
 		$all = $configCache->getAll();
 
 		$this->assertContains($data['system'], $all);
-
-		// config values are stored directly in the array base
-		$this->assertEquals($data['config']['a'], $all['a']);
+		$this->assertContains($data['config'], $all);
 	}
 
 	/**
@@ -113,6 +131,33 @@ class ConfigCacheTest extends MockedTest
 		$this->assertConfigValues($data, $configCache);
 	}
 
+	/**
+	 * Test the get() method without a value
+	 */
+	public function testGetEmpty()
+	{
+		$configCache = new ConfigCache();
+
+		$this->assertEquals('!<unset>!', $configCache->get('something', 'value'));
+	}
+
+	/**
+	 * Test the has() method
+	 */
+	public function testHas()
+	{
+		$configCache = new ConfigCache();
+
+		$this->assertFalse($configCache->has('system', 'test'));
+
+		$configCache->set('system', 'test', 'it');
+		$this->assertTrue($configCache->has('system', 'test'));
+
+		$this->assertFalse($configCache->has('system', null));
+		$configCache->set('system', null, 'it');
+		$this->assertTrue($configCache->has('system', null));
+	}
+
 	/**
 	 * Test the delete() method
 	 * @dataProvider dataTests
@@ -172,4 +217,22 @@ class ConfigCacheTest extends MockedTest
 
 		$this->assertEmpty($configCache->getAll());
 	}
+
+	/**
+	 * Test the hasP() method
+	 */
+	public function testHasP()
+	{
+		$configCache = new ConfigCache();
+		$uid = 345;
+
+		$this->assertFalse($configCache->hasP($uid, 'system', 'test'));
+
+		$configCache->setP($uid, 'system', 'test', 'it');
+		$this->assertTrue($configCache->hasP($uid, 'system', 'test'));
+
+		$this->assertFalse($configCache->hasP($uid, 'system', null));
+		$configCache->setP($uid, 'system', null, 'it');
+		$this->assertTrue($configCache->hasP($uid, 'system', null));
+	}
 }
diff --git a/tests/src/Core/Config/ConfigurationTest.php b/tests/src/Core/Config/ConfigurationTest.php
new file mode 100644
index 000000000..6ce81a41b
--- /dev/null
+++ b/tests/src/Core/Config/ConfigurationTest.php
@@ -0,0 +1,215 @@
+<?php
+
+namespace Friendica\Test\Core\Config;
+
+use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\Cache\IConfigCache;
+use Friendica\Core\Config\Configuration;
+use Friendica\Test\MockedTest;
+
+class ConfigurationTest extends MockedTest
+{
+	/**
+	 * Test the configuration initialization
+	 */
+	public function testSetUp()
+	{
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(false)->once();
+
+		$configuration = new Configuration($configCache, $configAdapter);
+
+		$this->assertInstanceOf(IConfigCache::class, $configuration->getCache());
+	}
+
+	/**
+	 * Test if the configuration load() method
+	 */
+	public function testCacheLoad()
+	{
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
+		// constructor loading
+		$configAdapter->shouldReceive('load')->andReturn([])->once();
+		// expected loading
+		$configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'it']])->once();
+
+		$configuration = new Configuration($configCache, $configAdapter);
+		$configuration->load('testing');
+
+		$this->assertEquals('it', $configuration->get('testing', 'test'));
+		$this->assertEquals('it', $configuration->getCache()->get('testing', 'test'));
+	}
+
+	/**
+	 * Test if the configuration load() method with overwrite
+	 */
+	public function testCacheLoadDouble()
+	{
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
+		// constructor loading
+		$configAdapter->shouldReceive('load')->andReturn([])->once();
+		// expected loading
+		$configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'it']])->once();
+		// expected next loading
+		$configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'again']])->once();
+
+		$configuration = new Configuration($configCache, $configAdapter);
+		$configuration->load('testing');
+
+		$this->assertEquals('it', $configuration->get('testing', 'test'));
+		$this->assertEquals('it', $configuration->getCache()->get('testing', 'test'));
+
+		$configuration->load('testing');
+
+		$this->assertEquals('again', $configuration->get('testing', 'test'));
+		$this->assertEquals('again', $configuration->getCache()->get('testing', 'test'));
+	}
+
+	/**
+	 * Test if the configuration get() and set() methods without adapter
+	 */
+	public function testSetGetWithoutDB()
+	{
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(false)->twice();
+
+		$configuration = new Configuration($configCache, $configAdapter);
+
+		$this->assertTrue($configuration->set('test', 'it', 'now'));
+
+		$this->assertEquals('now', $configuration->get('test', 'it'));
+		$this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
+	}
+
+	/**
+	 * Test if the configuration get() and set() methods with adapter
+	 */
+	public function testSetGetWithDB()
+	{
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
+		// constructor loading
+		$configAdapter->shouldReceive('load')->andReturn([])->once();
+		$configAdapter->shouldReceive('set')->with('test', 'it', 'now')->andReturn(true)->once();
+
+		$configuration = new Configuration($configCache, $configAdapter);
+
+		$this->assertTrue($configuration->set('test', 'it', 'now'));
+
+		$this->assertEquals('now', $configuration->get('test', 'it'));
+		$this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
+	}
+
+	/**
+	 * Test the configuration get() method with wrong value and no db
+	 */
+	public function testGetWrongWithoutDB()
+	{
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(4);
+
+		$configuration = new Configuration($configCache, $configAdapter);
+
+		// without refresh
+		$this->assertNull($configuration->get('test', 'it'));
+
+		/// beware that the cache returns '!<unset>!' and not null for a non existing value
+		$this->assertEquals('!<unset>!', $configuration->getCache()->get('test', 'it'));
+
+		// with default value
+		$this->assertEquals('default', $configuration->get('test', 'it', 'default'));
+
+		// with default value and refresh
+		$this->assertEquals('default', $configuration->get('test', 'it', 'default', true));
+	}
+
+	/**
+	 * Test the configuration get() method with refresh
+	 */
+	public function testGetWithRefresh()
+	{
+		$configCache = new ConfigCache(['test' => ['it' => 'now']]);
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
+		// constructor loading
+		$configAdapter->shouldReceive('load')->andReturn([])->once();
+		$configAdapter->shouldReceive('get')->with('test', 'it')->andReturn('again')->once();
+		$configAdapter->shouldReceive('get')->with('test', 'not')->andReturn('!<unset>!')->once();
+
+		$configuration = new Configuration($configCache, $configAdapter);
+
+		// without refresh
+		$this->assertEquals('now', $configuration->get('test', 'it'));
+		$this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
+
+		// with refresh
+		$this->assertEquals('again', $configuration->get('test', 'it', null, true));
+		$this->assertEquals('again', $configuration->getCache()->get('test', 'it'));
+
+		// without refresh and wrong value and default
+		$this->assertEquals('default', $configuration->get('test', 'not', 'default'));
+		$this->assertEquals('!<unset>!', $configuration->getCache()->get('test', 'not'));
+	}
+
+	/**
+	 * Test the configuration delete() method without adapter
+	 */
+	public function testDeleteWithoutDB()
+	{
+		$configCache = new ConfigCache(['test' => ['it' => 'now']]);
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
+
+		$configuration = new Configuration($configCache, $configAdapter);
+
+		$this->assertEquals('now', $configuration->get('test', 'it'));
+		$this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
+
+		$this->assertTrue($configuration->delete('test', 'it'));
+		$this->assertNull($configuration->get('test', 'it'));
+		$this->assertEquals('!<unset>!', $configuration->getCache()->get('test', 'it'));
+
+		$this->assertEmpty($configuration->getCache()->getAll());
+	}
+
+	/**
+	 * Test the configuration delete() method with adapter
+	 */
+	public function testDeleteWithDB()
+	{
+		$configCache = new ConfigCache(['test' => ['it' => 'now', 'quarter' => 'true']]);
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(5);
+		// constructor loading
+		$configAdapter->shouldReceive('load')->andReturn([])->once();
+		$configAdapter->shouldReceive('delete')->with('test', 'it')->andReturn(false)->once();
+
+		$configAdapter->shouldReceive('delete')->with('test', 'second')->andReturn(true)->once();
+		$configAdapter->shouldReceive('delete')->with('test', 'third')->andReturn(false)->once();
+		$configAdapter->shouldReceive('delete')->with('test', 'quarter')->andReturn(true)->once();
+
+		$configuration = new Configuration($configCache, $configAdapter);
+
+		$this->assertEquals('now', $configuration->get('test', 'it'));
+		$this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
+
+		// delete from cache only
+		$this->assertTrue($configuration->delete('test', 'it'));
+		// delete from db only
+		$this->assertTrue($configuration->delete('test', 'second'));
+		// no delete
+		$this->assertFalse($configuration->delete('test', 'third'));
+		// delete both
+		$this->assertTrue($configuration->delete('test', 'quarter'));
+
+		$this->assertEmpty($configuration->getCache()->getAll());
+	}
+}
diff --git a/tests/src/Core/Config/PConfigurationTest.php b/tests/src/Core/Config/PConfigurationTest.php
new file mode 100644
index 000000000..3d8fb586c
--- /dev/null
+++ b/tests/src/Core/Config/PConfigurationTest.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace Friendica\Test\Core\Config;
+
+use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\PConfiguration;
+use Friendica\Test\MockedTest;
+
+class PConfigurationTest extends MockedTest
+{
+	/**
+	 * Test if the configuration load() method
+	 */
+	public function testCacheLoad()
+	{
+		$uid = 234;
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->once();
+		// expected loading
+		$configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'it']])->once();
+
+		$configuration = new PConfiguration($configCache, $configAdapter);
+		$configuration->load($uid, 'testing');
+
+		$this->assertEquals('it', $configuration->get($uid, 'testing', 'test'));
+	}
+
+	/**
+	 * Test if the configuration load() method with overwrite
+	 */
+	public function testCacheLoadDouble()
+	{
+		$uid = 234;
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
+		// expected loading
+		$configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'it']])->once();
+		// expected next loading
+		$configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'again']])->once();
+
+		$configuration = new PConfiguration($configCache, $configAdapter);
+		$configuration->load($uid, 'testing');
+
+		$this->assertEquals('it', $configuration->get($uid, 'testing', 'test'));
+
+		$configuration->load($uid, 'testing');
+
+		$this->assertEquals('again', $configuration->get($uid, 'testing', 'test'));
+	}
+
+	/**
+	 * Test if the configuration get() and set() methods without adapter
+	 */
+	public function testSetGetWithoutDB()
+	{
+		$uid = 234;
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(false)->once();
+
+		$configuration = new PConfiguration($configCache, $configAdapter);
+
+		$this->assertTrue($configuration->set($uid, 'test', 'it', 'now'));
+
+		$this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+	}
+
+	/**
+	 * Test if the configuration get() and set() methods with adapter
+	 */
+	public function testSetGetWithDB()
+	{
+		$uid = 234;
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->once();
+		$configAdapter->shouldReceive('set')->with($uid, 'test', 'it', 'now')->andReturn(true)->once();
+
+		$configuration = new PConfiguration($configCache, $configAdapter);
+
+		$this->assertTrue($configuration->set($uid, 'test', 'it', 'now'));
+
+		$this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+	}
+
+	/**
+	 * Test the configuration get() method with wrong value and no db
+	 */
+	public function testGetWrongWithoutDB()
+	{
+		$uid = 234;
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
+
+		$configuration = new PConfiguration($configCache, $configAdapter);
+
+		// without refresh
+		$this->assertNull($configuration->get($uid, 'test', 'it'));
+
+		// with default value
+		$this->assertEquals('default', $configuration->get($uid, 'test', 'it', 'default'));
+
+		// with default value and refresh
+		$this->assertEquals('default', $configuration->get($uid, 'test', 'it', 'default', true));
+	}
+
+	/**
+	 * Test the configuration get() method with refresh
+	 */
+	public function testGetWithRefresh()
+	{
+		$uid = 234;
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
+		$configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn('now')->once();
+		$configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn('again')->once();
+		$configAdapter->shouldReceive('get')->with($uid, 'test', 'not')->andReturn('!<unset>!')->once();
+
+		$configuration = new PConfiguration($configCache, $configAdapter);
+
+		// without refresh
+		$this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+		// use the cache again
+		$this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+
+		// with refresh (and load the second value out of the db)
+		$this->assertEquals('again', $configuration->get($uid, 'test', 'it', null, true));
+
+		// without refresh and wrong value and default
+		$this->assertEquals('default', $configuration->get($uid, 'test', 'not', 'default'));
+	}
+
+	/**
+	 * Test the configuration delete() method without adapter
+	 */
+	public function testDeleteWithoutDB()
+	{
+		$uid = 234;
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
+
+		$configuration = new PConfiguration($configCache, $configAdapter);
+
+		$this->assertTrue($configuration->set($uid, 'test', 'it', 'now'));
+		$this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+
+		$this->assertTrue($configuration->delete($uid, 'test', 'it'));
+		$this->assertNull($configuration->get($uid, 'test', 'it'));
+	}
+
+	/**
+	 * Test the configuration delete() method with adapter
+	 */
+	public function testDeleteWithDB()
+	{
+		$uid = 234;
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(5);
+		$configAdapter->shouldReceive('set')->with($uid, 'test', 'it', 'now')->andReturn(false)->once();
+		$configAdapter->shouldReceive('delete')->with($uid, 'test', 'it')->andReturn(false)->once();
+
+		$configAdapter->shouldReceive('delete')->with($uid, 'test', 'second')->andReturn(true)->once();
+		$configAdapter->shouldReceive('delete')->with($uid, 'test', 'third')->andReturn(false)->once();
+		$configAdapter->shouldReceive('delete')->with($uid, 'test', 'quarter')->andReturn(true)->once();
+
+		$configuration = new PConfiguration($configCache, $configAdapter);
+
+		$this->assertFalse($configuration->set($uid, 'test', 'it', 'now'));
+		$this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+
+		// delete from set
+		$this->assertTrue($configuration->delete($uid, 'test', 'it'));
+		// delete from db only
+		$this->assertTrue($configuration->delete($uid, 'test', 'second'));
+		// no delete
+		$this->assertFalse($configuration->delete($uid, 'test', 'third'));
+		// delete both
+		$this->assertTrue($configuration->delete($uid, 'test', 'quarter'));
+	}
+}
diff --git a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php b/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
index 41ccce0b2..ce3dac02c 100644
--- a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
+++ b/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
@@ -54,7 +54,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
 
 		$this->configCache
 			->shouldReceive('get')
-			->with('config', 'php_path', NULL)
+			->with('config', 'php_path', NULL, false)
 			->andReturn(false);
 
 		$this->mockL10nT();
diff --git a/tests/src/Core/Console/ConfigConsoleTest.php b/tests/src/Core/Console/ConfigConsoleTest.php
index 505c4f794..5b7d14906 100644
--- a/tests/src/Core/Console/ConfigConsoleTest.php
+++ b/tests/src/Core/Console/ConfigConsoleTest.php
@@ -39,7 +39,7 @@ class ConfigConsoleTest extends ConsoleTest
 			->once();
 		$this->configCache
 			->shouldReceive('get')
-			->with('config', 'test', NULL)
+			->with('config', 'test', NULL, false)
 			->andReturn('now')
 			->twice();
 
@@ -52,7 +52,7 @@ class ConfigConsoleTest extends ConsoleTest
 
 		$this->configCache
 			->shouldReceive('get')
-			->with('config', 'test', null)
+			->with('config', 'test', null, false)
 			->andReturn('now')
 			->once();
 
@@ -64,7 +64,7 @@ class ConfigConsoleTest extends ConsoleTest
 
 		$this->configCache
 			->shouldReceive('get')
-			->with('config', 'test', null)
+			->with('config', 'test', null, false)
 			->andReturn(null)
 			->once();
 
@@ -79,7 +79,7 @@ class ConfigConsoleTest extends ConsoleTest
 		$testArray = [1, 2, 3];
 		$this->configCache
 			->shouldReceive('get')
-			->with('config', 'test', null)
+			->with('config', 'test', null, false)
 			->andReturn($testArray)
 			->once();
 
@@ -107,7 +107,7 @@ class ConfigConsoleTest extends ConsoleTest
 	function testVerbose() {
 		$this->configCache
 			->shouldReceive('get')
-			->with('test', 'it', null)
+			->with('test', 'it', null, false)
 			->andReturn('now')
 			->once();
 		$console = new Config($this->consoleArgv);
@@ -140,7 +140,7 @@ CONF;
 			->once();
 		$this->configCache
 			->shouldReceive('get')
-			->with('test', 'it', NULL)
+			->with('test', 'it', NULL, false)
 			->andReturn(NULL)
 			->once();
 		$console = new Config();
diff --git a/tests/src/Core/Console/ConsoleTest.php b/tests/src/Core/Console/ConsoleTest.php
index 715e68ab2..f733175d3 100644
--- a/tests/src/Core/Console/ConsoleTest.php
+++ b/tests/src/Core/Console/ConsoleTest.php
@@ -3,7 +3,7 @@
 namespace Friendica\Test\src\Core\Console;
 
 use Asika\SimpleConsole\Console;
-use Friendica\Core\Config\ConfigCache;
+use Friendica\Core\Config\Configuration;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\AppMockTrait;
 use Friendica\Test\Util\Intercept;
@@ -31,7 +31,7 @@ abstract class ConsoleTest extends MockedTest
 		Intercept::setUp();
 
 		$this->setUpVfsDir();
-		$configMock = \Mockery::mock(ConfigCache::class);
+		$configMock = \Mockery::mock(Configuration::class);
 		$this->mockApp($this->root, $configMock);
 		$profileMock = \Mockery::mock(Profiler::class);
 		$this->app->shouldReceive('getProfiler')->andReturn($profileMock);
diff --git a/tests/src/Core/Lock/LockTest.php b/tests/src/Core/Lock/LockTest.php
index ab8e1b2f2..c1378aa16 100644
--- a/tests/src/Core/Lock/LockTest.php
+++ b/tests/src/Core/Lock/LockTest.php
@@ -27,7 +27,7 @@ abstract class LockTest extends MockedTest
 	{
 		// Reusable App object
 		$this->setUpVfsDir();
-		$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+		$configMock = \Mockery::mock('Friendica\Core\Config\Configuration');
 		$this->mockApp($this->root, $configMock);
 		$this->app
 			->shouldReceive('getHostname')
diff --git a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php b/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
index 46f29f52e..0e118c5dd 100644
--- a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
+++ b/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
@@ -15,12 +15,12 @@ class MemcacheCacheLockDriverTest extends LockTest
 	{
 		$this->configCache
 			->shouldReceive('get')
-			->with('system', 'memcache_host', NULL)
+			->with('system', 'memcache_host', NULL, false)
 			->andReturn('localhost');
 
 		$this->configCache
 			->shouldReceive('get')
-			->with('system', 'memcache_port', NULL)
+			->with('system', 'memcache_port', NULL, false)
 			->andReturn(11211);
 
 		return new CacheLockDriver(CacheDriverFactory::create('memcache'));
diff --git a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php b/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
index 72271c98b..fe490a38c 100644
--- a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
+++ b/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
@@ -15,7 +15,7 @@ class MemcachedCacheLockDriverTest extends LockTest
 	{
 		$this->configCache
 			->shouldReceive('get')
-			->with('system', 'memcached_hosts', NULL)
+			->with('system', 'memcached_hosts', NULL, false)
 			->andReturn([0 => 'localhost, 11211']);
 
 		return new CacheLockDriver(CacheDriverFactory::create('memcached'));
diff --git a/tests/src/Core/Lock/RedisCacheLockDriverTest.php b/tests/src/Core/Lock/RedisCacheLockDriverTest.php
index 0c9deea16..f5d0a648f 100644
--- a/tests/src/Core/Lock/RedisCacheLockDriverTest.php
+++ b/tests/src/Core/Lock/RedisCacheLockDriverTest.php
@@ -15,12 +15,12 @@ class RedisCacheLockDriverTest extends LockTest
 	{
 		$this->configCache
 			->shouldReceive('get')
-			->with('system', 'redis_host', NULL)
+			->with('system', 'redis_host', NULL, false)
 			->andReturn('localhost');
 
 		$this->configCache
 			->shouldReceive('get')
-			->with('system', 'redis_port', NULL)
+			->with('system', 'redis_port', NULL, false)
 			->andReturn(null);
 
 		return new CacheLockDriver(CacheDriverFactory::create('redis'));
diff --git a/tests/src/Core/Lock/SemaphoreLockDriverTest.php b/tests/src/Core/Lock/SemaphoreLockDriverTest.php
index c2b941457..bf422f2f8 100644
--- a/tests/src/Core/Lock/SemaphoreLockDriverTest.php
+++ b/tests/src/Core/Lock/SemaphoreLockDriverTest.php
@@ -14,7 +14,7 @@ class SemaphoreLockDriverTest extends LockTest
 
 		$this->configCache
 			->shouldReceive('get')
-			->with('system', 'temppath', NULL)
+			->with('system', 'temppath', NULL, false)
 			->andReturn('/tmp/');
 	}
 
diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
index c6981a91d..a4a715575 100644
--- a/tests/src/Database/DBATest.php
+++ b/tests/src/Database/DBATest.php
@@ -3,6 +3,7 @@ namespace Friendica\Test\Database;
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
 use Friendica\Database\DBA;
 use Friendica\Factory;
 use Friendica\Test\DatabaseTest;
@@ -13,8 +14,11 @@ class DBATest extends DatabaseTest
 	public function setUp()
 	{
 		$basedir = BasePath::create(dirname(__DIR__) . '/../../');
-		$configLoader = new Config\ConfigCacheLoader($basedir);
-		$config = Factory\ConfigFactory::createCache($configLoader);
+		$configLoader = new Cache\ConfigCacheLoader($basedir);
+		$configCache = Factory\ConfigFactory::createCache($configLoader);
+		Factory\DBFactory::init($configCache, $_SERVER);
+		$config = Factory\ConfigFactory::createConfig($configCache);
+		$pconfig = Factory\ConfigFactory::createPConfig($configCache);
 		$logger = Factory\LoggerFactory::create('test', $config);
 		$profiler = Factory\ProfilerFactory::create($logger, $config);
 		$this->app = new App($config, $logger, $profiler, false);
diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php
index 250df0693..6a5e25e76 100644
--- a/tests/src/Database/DBStructureTest.php
+++ b/tests/src/Database/DBStructureTest.php
@@ -3,7 +3,7 @@
 namespace Friendica\Test\Database;
 
 use Friendica\App;
-use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
 use Friendica\Database\DBStructure;
 use Friendica\Factory;
 use Friendica\Test\DatabaseTest;
@@ -14,8 +14,11 @@ class DBStructureTest extends DatabaseTest
 	public function setUp()
 	{
 		$basedir = BasePath::create(dirname(__DIR__) . '/../../');
-		$configLoader = new Config\ConfigCacheLoader($basedir);
-		$config = Factory\ConfigFactory::createCache($configLoader);
+		$configLoader = new Cache\ConfigCacheLoader($basedir);
+		$configCache = Factory\ConfigFactory::createCache($configLoader);
+		Factory\DBFactory::init($configCache, $_SERVER);
+		$config = Factory\ConfigFactory::createConfig($configCache);
+		$pconfig = Factory\ConfigFactory::createPConfig($configCache);
 		$logger = Factory\LoggerFactory::create('test', $config);
 		$profiler = Factory\ProfilerFactory::create($logger, $config);
 		$this->app = new App($config, $logger, $profiler, false);

From 80f1feabe5ecf9b09b76627ba4b114ae10ddcaf6 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 11 Feb 2019 21:13:53 +0100
Subject: [PATCH 029/145] Refactoring Logging to use Configuration

---
 bin/auth_ejabberd.php                         |  3 +-
 bin/console.php                               |  3 +-
 bin/daemon.php                                |  3 +-
 bin/worker.php                                |  3 +-
 index.php                                     |  3 +-
 src/App.php                                   | 29 ------
 src/Core/Config.php                           |  4 -
 src/Core/Config/Cache/ConfigCache.php         | 12 ++-
 src/Core/Logger.php                           | 61 +-----------
 src/Factory/DBFactory.php                     |  8 ++
 src/Factory/LoggerFactory.php                 | 97 +++++++++++--------
 tests/include/ApiTest.php                     |  2 +-
 .../src/Core/Config/Cache/ConfigCacheTest.php | 59 +++++++++--
 13 files changed, 141 insertions(+), 146 deletions(-)

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 7682674d7..003faae1f 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -59,7 +59,8 @@ $configLoader = new Cache\ConfigCacheLoader($basedir);
 $configCache = Factory\ConfigFactory::createCache($configLoader);
 Factory\DBFactory::init($configCache, $_SERVER);
 $config = Factory\ConfigFactory::createConfig($configCache);
-$pconfig = Factory\ConfigFactory::createPConfig($configCache);
+// needed to call PConfig::init()
+Factory\ConfigFactory::createPConfig($configCache);
 $logger = Factory\LoggerFactory::create('auth_ejabberd', $config);
 $profiler = Factory\ProfilerFactory::create($logger, $config);
 
diff --git a/bin/console.php b/bin/console.php
index 9fee605b2..2b0d58821 100755
--- a/bin/console.php
+++ b/bin/console.php
@@ -12,7 +12,8 @@ $configLoader = new Cache\ConfigCacheLoader($basedir);
 $configCache = Factory\ConfigFactory::createCache($configLoader);
 Factory\DBFactory::init($configCache, $_SERVER);
 $config = Factory\ConfigFactory::createConfig($configCache);
-$pconfig = Factory\ConfigFactory::createPConfig($configCache);
+// needed to call PConfig::init()
+Factory\ConfigFactory::createPConfig($configCache);
 $logger = Factory\LoggerFactory::create('console', $config);
 $profiler = Factory\ProfilerFactory::create($logger, $config);
 
diff --git a/bin/daemon.php b/bin/daemon.php
index 2b106b62d..f2970a518 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -39,7 +39,8 @@ $configLoader = new Cache\ConfigCacheLoader($basedir);
 $configCache = Factory\ConfigFactory::createCache($configLoader);
 Factory\DBFactory::init($configCache, $_SERVER);
 $config = Factory\ConfigFactory::createConfig($configCache);
-$pconfig = Factory\ConfigFactory::createPConfig($configCache);
+// needed to call PConfig::init()
+Factory\ConfigFactory::createPConfig($configCache);
 $logger = Factory\LoggerFactory::create('daemon', $config);
 $profiler = Factory\ProfilerFactory::create($logger, $config);
 
diff --git a/bin/worker.php b/bin/worker.php
index 0a9b4cb38..530333127 100755
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -37,7 +37,8 @@ $configLoader = new Cache\ConfigCacheLoader($basedir);
 $configCache = Factory\ConfigFactory::createCache($configLoader);
 Factory\DBFactory::init($configCache, $_SERVER);
 $config = Factory\ConfigFactory::createConfig($configCache);
-$pconfig = Factory\ConfigFactory::createPConfig($configCache);
+// needed to call PConfig::init()
+Factory\ConfigFactory::createPConfig($configCache);
 $logger = Factory\LoggerFactory::create('worker', $config);
 $profiler = Factory\ProfilerFactory::create($logger, $config);
 
diff --git a/index.php b/index.php
index 9ef9490b3..66f023965 100644
--- a/index.php
+++ b/index.php
@@ -20,7 +20,8 @@ $configLoader = new Cache\ConfigCacheLoader($basedir);
 $configCache = Factory\ConfigFactory::createCache($configLoader);
 Factory\DBFactory::init($configCache, $_SERVER);
 $config = Factory\ConfigFactory::createConfig($configCache);
-$pconfig = Factory\ConfigFactory::createPConfig($configCache);
+// needed to call PConfig::init()
+Factory\ConfigFactory::createPConfig($configCache);
 $logger = Factory\LoggerFactory::create('index', $config);
 $profiler = Factory\ProfilerFactory::create($logger, $config);
 
diff --git a/src/App.php b/src/App.php
index e715e6ced..3189b2da7 100644
--- a/src/App.php
+++ b/src/App.php
@@ -109,11 +109,6 @@ class App
 	 */
 	public $mobileDetect;
 
-	/**
-	 * @var LoggerInterface The current logger of this App
-	 */
-	private $logger;
-
 	/**
 	 * @var Configuration The config
 	 */
@@ -339,35 +334,13 @@ class App
 		return $this->mode;
 	}
 
-	/**
-	 * Returns the Logger of the Application
-	 *
-	 * @return LoggerInterface The Logger
-	 * @throws InternalServerErrorException when the logger isn't created
-	 */
-	public function getLogger()
-	{
-		if (empty($this->logger)) {
-			throw new InternalServerErrorException('Logger of the Application is not defined');
-		}
-
-		return $this->logger;
-	}
-
 	/**
 	 * Reloads the whole app instance
 	 */
 	public function reload()
 	{
-		$this->getMode()->determine($this->basePath);
-
 		$this->determineURLPath();
 
-		if ($this->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
-			Core\Config::load();
-		}
-
-		// again because DB-config could change the config
 		$this->getMode()->determine($this->basePath);
 
 		if ($this->getMode()->has(App\Mode::DBAVAILABLE)) {
@@ -382,8 +355,6 @@ class App
 		Core\L10n::init();
 
 		$this->process_id = Core\System::processID('log');
-
-		Core\Logger::setLogger($this->logger);
 	}
 
 	/**
diff --git a/src/Core/Config.php b/src/Core/Config.php
index 405d14d12..4bf9c5b11 100644
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -8,10 +8,6 @@
  */
 namespace Friendica\Core;
 
-use Friendica\Core\Config\ConfigCache;
-use Friendica\Core\Config\IConfigAdapter;
-use Friendica\Core\Config\IConfigCache;
-
 /**
  * @brief Arbitrary system configuration storage
  *
diff --git a/src/Core/Config/Cache/ConfigCache.php b/src/Core/Config/Cache/ConfigCache.php
index b1172c0c8..54da327db 100644
--- a/src/Core/Config/Cache/ConfigCache.php
+++ b/src/Core/Config/Cache/ConfigCache.php
@@ -55,6 +55,8 @@ class ConfigCache implements IConfigCache, IPConfigCache
 	{
 		if (isset($this->config[$cat][$key])) {
 			return $this->config[$cat][$key];
+		} elseif ($key == null && isset($this->config[$cat])) {
+			return $this->config[$cat];
 		} else {
 			return '!<unset>!';
 		}
@@ -65,8 +67,8 @@ class ConfigCache implements IConfigCache, IPConfigCache
 	 */
 	public function has($cat, $key = null)
 	{
-		return isset($this->config[$cat][$key])
-			&& $this->config[$cat][$key] !== '!<unset>!';
+		return (isset($this->config[$cat][$key]) && $this->config[$cat][$key] !== '!<unset>!') ||
+		($key == null && isset($this->config[$cat]) && $this->config[$cat] !== '!<unset>!' && is_array($this->config[$cat]));
 	}
 
 	/**
@@ -105,8 +107,8 @@ class ConfigCache implements IConfigCache, IPConfigCache
 	 */
 	public function hasP($uid, $cat, $key = null)
 	{
-		return isset($this->config[$uid][$cat][$key])
-			&& $this->config[$uid][$cat][$key] !== '!<unset>!';
+		return (isset($this->config[$uid][$cat][$key]) && $this->config[$uid][$cat][$key] !== '!<unset>!') ||
+			($key == null && isset($this->config[$uid][$cat]) && $this->config[$uid][$cat] !== '!<unset>!' && is_array($this->config[$uid][$cat]));
 	}
 
 	/**
@@ -144,6 +146,8 @@ class ConfigCache implements IConfigCache, IPConfigCache
 	{
 		if (isset($this->config[$uid][$cat][$key])) {
 			return $this->config[$uid][$cat][$key];
+		} elseif ($key == null && isset($this->config[$uid][$cat])) {
+			return $this->config[$uid][$cat];
 		} else {
 			return '!<unset>!';
 		}
diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index e42f2f033..a2e587342 100644
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -5,8 +5,6 @@
 namespace Friendica\Core;
 
 use Friendica\BaseObject;
-use Friendica\Factory\LoggerFactory;
-use Friendica\Network\HTTPException\InternalServerErrorException;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 
@@ -67,73 +65,22 @@ class Logger extends BaseObject
 
 	/**
 	 * Sets the default logging handler for Friendica.
-	 * @todo Can be combined with other handlers too if necessary, could be configurable.
 	 *
 	 * @param LoggerInterface $logger The Logger instance of this Application
-	 *
-	 * @throws InternalServerErrorException if the logger factory is incompatible to this logger
 	 */
 	public static function setLogger($logger)
 	{
-		$debugging = Config::get('system', 'debugging');
-		$logfile = Config::get('system', 'logfile');
-		$loglevel = Config::get('system', 'loglevel');
-
-		if (!$debugging || !$logfile) {
-			return;
-		}
-
-		$loglevel = self::mapLegacyConfigDebugLevel((string)$loglevel);
-
-		LoggerFactory::addStreamHandler($logger, $logfile, $loglevel);
-
 		self::$logger = $logger;
-
-		$logfile = Config::get('system', 'dlogfile');
-
-		if (!$logfile) {
-			return;
-		}
-
-		$developIp = Config::get('system', 'dlogip');
-
-		self::$devLogger = LoggerFactory::createDev('develop', $developIp);
-		LoggerFactory::addStreamHandler(self::$devLogger, $logfile, LogLevel::DEBUG);
 	}
 
 	/**
-	 * Mapping a legacy level to the PSR-3 compliant levels
-	 * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#5-psrlogloglevel
+	 * Sets the default dev-logging handler for Friendica.
 	 *
-	 * @param string $level the level to be mapped
-	 *
-	 * @return string the PSR-3 compliant level
+	 * @param LoggerInterface $logger The Logger instance of this Application
 	 */
-	private static function mapLegacyConfigDebugLevel($level)
+	public static function setDevLogger($logger)
 	{
-		switch ($level) {
-			// legacy WARNING
-			case "0":
-				return LogLevel::ERROR;
-			// legacy INFO
-			case "1":
-				return LogLevel::WARNING;
-			// legacy TRACE
-			case "2":
-				return LogLevel::NOTICE;
-			// legacy DEBUG
-			case "3":
-				return LogLevel::INFO;
-			// legacy DATA
-			case "4":
-				return LogLevel::DEBUG;
-			// legacy ALL
-			case "5":
-				return LogLevel::DEBUG;
-			// default if nothing set
-			default:
-				return $level;
-		}
+		self::$devLogger = $logger;
 	}
 
 	/**
diff --git a/src/Factory/DBFactory.php b/src/Factory/DBFactory.php
index 5970541c1..abfe6f99d 100644
--- a/src/Factory/DBFactory.php
+++ b/src/Factory/DBFactory.php
@@ -7,6 +7,14 @@ use Friendica\Database;
 
 class DBFactory
 {
+	/**
+	 * Initialize the DBA connection
+	 *
+	 * @param Cache\ConfigCache $configCache The configuration cache
+	 * @param array             $server      The $_SERVER variables
+	 *
+	 * @throws \Exception if connection went bad
+	 */
 	public static function init(Cache\ConfigCache $configCache, array $server)
 	{
 		if (Database\DBA::connected()) {
diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index e9bacb38e..74f55e637 100644
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -35,16 +35,17 @@ class LoggerFactory
 		$logger->pushProcessor(new Monolog\Processor\UidProcessor());
 		$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, [Logger::class, Profiler::class]));
 
-		if (isset($config)) {
-			$debugging = $config->get('system', 'debugging');
-			$stream = $config->get('system', 'logfile');
-			$level = $config->get('system', 'loglevel');
+		$debugging = $config->get('system', 'debugging');
+		$stream    = $config->get('system', 'logfile');
+		$level     = $config->get('system', 'loglevel');
 
-			if ($debugging) {
-				static::addStreamHandler($logger, $stream, $level);
-			}
+		if ($debugging) {
+			$loglevel = self::mapLegacyConfigDebugLevel((string)$level);
+			static::addStreamHandler($logger, $stream, $loglevel);
 		}
 
+		Logger::setLogger($logger);
+
 		return $logger;
 	}
 
@@ -56,25 +57,71 @@ class LoggerFactory
 	 *
 	 * It should never get filled during normal usage of Friendica
 	 *
-	 * @param string $channel      The channel of the logger instance
-	 * @param string $developerIp  The IP of the developer who wants to use the logger
+	 * @param string        $channel The channel of the logger instance
+	 * @param Configuration $config  The config
 	 *
 	 * @return LoggerInterface The PSR-3 compliant logger instance
 	 */
-	public static function createDev($channel, $developerIp)
+	public static function createDev($channel, Configuration $config)
 	{
+		$debugging   = $config->get('system', 'debugging');
+		$stream      = $config->get('system', 'dlogfile');
+		$developerIp = $config->get('system', 'dlogip');
+
+		if (!isset($developerIp) || !$debugging) {
+			return null;
+		}
+
 		$logger = new Monolog\Logger($channel);
 		$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
 		$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
 		$logger->pushProcessor(new Monolog\Processor\UidProcessor());
 		$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, ['Friendica\\Core\\Logger']));
 
-
 		$logger->pushHandler(new FriendicaDevelopHandler($developerIp));
 
+		static::addStreamHandler($logger, $stream, LogLevel::DEBUG);
+
+		Logger::setDevLogger($logger);
+
 		return $logger;
 	}
 
+	/**
+	 * Mapping a legacy level to the PSR-3 compliant levels
+	 * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#5-psrlogloglevel
+	 *
+	 * @param string $level the level to be mapped
+	 *
+	 * @return string the PSR-3 compliant level
+	 */
+	private static function mapLegacyConfigDebugLevel($level)
+	{
+		switch ($level) {
+			// legacy WARNING
+			case "0":
+				return LogLevel::ERROR;
+			// legacy INFO
+			case "1":
+				return LogLevel::WARNING;
+			// legacy TRACE
+			case "2":
+				return LogLevel::NOTICE;
+			// legacy DEBUG
+			case "3":
+				return LogLevel::INFO;
+			// legacy DATA
+			case "4":
+				return LogLevel::DEBUG;
+			// legacy ALL
+			case "5":
+				return LogLevel::DEBUG;
+			// default if nothing set
+			default:
+				return $level;
+		}
+	}
+
 	/**
 	 * Adding a handler to a given logger instance
 	 *
@@ -106,32 +153,4 @@ class LoggerFactory
 			throw new InternalServerErrorException('Logger instance incompatible for MonologFactory');
 		}
 	}
-
-	/**
-	 * This method enables the test mode of a given logger
-	 *
-	 * @param LoggerInterface $logger The logger
-	 *
-	 * @return Monolog\Handler\TestHandler the Handling for tests
-	 *
-	 * @throws InternalServerErrorException if the logger is incompatible to the logger factory
-	 */
-	public static function enableTest($logger)
-	{
-		if ($logger instanceof Monolog\Logger) {
-			// disable every handler so far
-			$logger->pushHandler(new Monolog\Handler\NullHandler());
-
-			// enable the test handler
-			$fileHandler = new Monolog\Handler\TestHandler();
-			$formatter = new Monolog\Formatter\LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");
-			$fileHandler->setFormatter($formatter);
-
-			$logger->pushHandler($fileHandler);
-
-			return $fileHandler;
-		} else {
-			throw new InternalServerErrorException('Logger instance incompatible for MonologFactory');
-		}
-	}
 }
diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index 7f2299d51..59096f5e5 100644
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -41,7 +41,7 @@ class ApiTest extends DatabaseTest
 		$configCache = Factory\ConfigFactory::createCache($configLoader);
 		Factory\DBFactory::init($configCache, $_SERVER);
 		$config = Factory\ConfigFactory::createConfig($configCache);
-		$pconfig = Factory\ConfigFactory::createPConfig($configCache);
+		Factory\ConfigFactory::createPConfig($configCache);
 		$logger = Factory\LoggerFactory::create('test', $config);
 		$profiler = Factory\ProfilerFactory::create($logger, $config);
 		$this->app = new App($config, $logger, $profiler, false);
diff --git a/tests/src/Core/Config/Cache/ConfigCacheTest.php b/tests/src/Core/Config/Cache/ConfigCacheTest.php
index 7b56ca646..ac9fae540 100644
--- a/tests/src/Core/Config/Cache/ConfigCacheTest.php
+++ b/tests/src/Core/Config/Cache/ConfigCacheTest.php
@@ -149,13 +149,34 @@ class ConfigCacheTest extends MockedTest
 		$configCache = new ConfigCache();
 
 		$this->assertFalse($configCache->has('system', 'test'));
+		$this->assertFalse($configCache->has('system'));
 
 		$configCache->set('system', 'test', 'it');
 		$this->assertTrue($configCache->has('system', 'test'));
+		$this->assertTrue($configCache->has('system'));
+	}
 
-		$this->assertFalse($configCache->has('system', null));
-		$configCache->set('system', null, 'it');
-		$this->assertTrue($configCache->has('system', null));
+	/**
+	 * Test the get() method with a category
+	 */
+	public function testGetCat()
+	{
+		$configCache = new ConfigCache([
+			'system' => [
+				'key1' => 'value1',
+				'key2' => 'value2',
+			],
+			'config' => [
+				'key3' => 'value3',
+			],
+		]);
+
+		$this->assertTrue($configCache->has('system'));
+
+		$this->assertEquals([
+			'key1' => 'value1',
+			'key2' => 'value2',
+		], $configCache->get('system'));
 	}
 
 	/**
@@ -194,6 +215,32 @@ class ConfigCacheTest extends MockedTest
 	}
 
 
+	/**
+	 * Test the getP() method with a category
+	 */
+	public function testGetPCat()
+	{
+		$configCache = new ConfigCache();
+		$uid = 345;
+
+		$configCache->loadP($uid, [
+			'system' => [
+				'key1' => 'value1',
+				'key2' => 'value2',
+			],
+			'config' => [
+				'key3' => 'value3',
+			],
+		]);
+
+		$this->assertTrue($configCache->hasP($uid,'system'));
+
+		$this->assertEquals([
+			'key1' => 'value1',
+			'key2' => 'value2',
+		], $configCache->get($uid, 'system'));
+	}
+
 	/**
 	 * Test the deleteP() method
 	 * @dataProvider dataTests
@@ -227,12 +274,10 @@ class ConfigCacheTest extends MockedTest
 		$uid = 345;
 
 		$this->assertFalse($configCache->hasP($uid, 'system', 'test'));
+		$this->assertFalse($configCache->hasP($uid, 'system'));
 
 		$configCache->setP($uid, 'system', 'test', 'it');
 		$this->assertTrue($configCache->hasP($uid, 'system', 'test'));
-
-		$this->assertFalse($configCache->hasP($uid, 'system', null));
-		$configCache->setP($uid, 'system', null, 'it');
-		$this->assertTrue($configCache->hasP($uid, 'system', null));
+		$this->assertTrue($configCache->hasP($uid, 'system'));
 	}
 }

From e1d9d67632a8d6777a2b49c227b7a40d1014437c Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 11 Feb 2019 21:36:26 +0100
Subject: [PATCH 030/145] renamed Logger::setLogger() to Logger::init()

---
 src/Core/Config/Adapter/IConfigAdapter.php    |  13 +-
 src/Core/Config/Adapter/IPConfigAdapter.php   |  11 ++
 src/Core/Config/Adapter/JITConfigAdapter.php  |  12 ++
 src/Core/Config/Adapter/JITPConfigAdapter.php |  14 ++-
 .../Config/Adapter/PreloadConfigAdapter.php   |  16 ++-
 .../Config/Adapter/PreloadPConfigAdapter.php  |  16 ++-
 src/Core/Config/Configuration.php             |  28 ++---
 src/Core/Config/PConfiguration.php            |  28 ++---
 src/Core/Logger.php                           |   2 +-
 src/Factory/LoggerFactory.php                 |   2 +-
 tests/src/Core/Config/ConfigurationTest.php   | 112 +++++++++++++----
 tests/src/Core/Config/PConfigurationTest.php  | 114 +++++++++++++-----
 12 files changed, 276 insertions(+), 92 deletions(-)

diff --git a/src/Core/Config/Adapter/IConfigAdapter.php b/src/Core/Config/Adapter/IConfigAdapter.php
index 3bbbbbe94..8223d3367 100644
--- a/src/Core/Config/Adapter/IConfigAdapter.php
+++ b/src/Core/Config/Adapter/IConfigAdapter.php
@@ -29,8 +29,7 @@ interface IConfigAdapter
 	public function get($cat, $key);
 
 	/**
-	 * Stores a config value ($value) in the category ($family) under the key ($key)
-	 * for the user_id $uid.
+	 * Stores a config value ($value) in the category ($family) under the key ($key).
 	 *
 	 * Note: Please do not store booleans - convert to 0/1 integer values!
 	 *
@@ -59,4 +58,14 @@ interface IConfigAdapter
 	 * @return bool
 	 */
 	public function isConnected();
+
+	/**
+	 * Checks, if a config value ($value) in the category ($cat) is already loaded.
+	 *
+	 * @param string $cat The configuration category
+	 * @param string $key The configuration key
+	 *
+	 * @return bool
+	 */
+	public function isLoaded($cat, $key);
 }
diff --git a/src/Core/Config/Adapter/IPConfigAdapter.php b/src/Core/Config/Adapter/IPConfigAdapter.php
index 3e821efa0..e9f389292 100644
--- a/src/Core/Config/Adapter/IPConfigAdapter.php
+++ b/src/Core/Config/Adapter/IPConfigAdapter.php
@@ -69,4 +69,15 @@ interface IPConfigAdapter
 	 * @return bool
 	 */
 	public function isConnected();
+
+	/**
+	 * Checks, if a config value ($value) in the category ($cat) is already loaded for the user_id $uid.
+	 *
+	 * @param string $uid The user_id
+	 * @param string $cat The configuration category
+	 * @param string $key The configuration key
+	 *
+	 * @return bool
+	 */
+	public function isLoaded($uid, $cat, $key);
 }
diff --git a/src/Core/Config/Adapter/JITConfigAdapter.php b/src/Core/Config/Adapter/JITConfigAdapter.php
index 8dadfff68..95211777f 100644
--- a/src/Core/Config/Adapter/JITConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITConfigAdapter.php
@@ -120,4 +120,16 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 
 		return $result;
 	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isLoaded($cat, $key)
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		return (isset($this->in_db[$cat][$key])) && $this->in_db[$cat][$key];
+	}
 }
diff --git a/src/Core/Config/Adapter/JITPConfigAdapter.php b/src/Core/Config/Adapter/JITPConfigAdapter.php
index 950dd58bd..697e27128 100644
--- a/src/Core/Config/Adapter/JITPConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITPConfigAdapter.php
@@ -36,7 +36,7 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
 			}
 		} else if ($cat != 'config') {
 			// Negative caching
-			$return[null] = "!<unset>!";
+			$return = "!<unset>!";
 		}
 		DBA::close($pconfigs);
 
@@ -123,4 +123,16 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
 
 		return $result;
 	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isLoaded($uid, $cat, $key)
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		return (isset($this->in_db[$uid][$cat][$key])) && $this->in_db[$uid][$cat][$key];
+	}
 }
diff --git a/src/Core/Config/Adapter/PreloadConfigAdapter.php b/src/Core/Config/Adapter/PreloadConfigAdapter.php
index 8cad5c555..a12c2a7ca 100644
--- a/src/Core/Config/Adapter/PreloadConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadConfigAdapter.php
@@ -32,13 +32,13 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 
 		$configs = DBA::select('config', ['cat', 'v', 'k']);
 		while ($config = DBA::fetch($configs)) {
-			$return[$config['k']] = $config['v'];
+			$return[$config['cat']][$config['k']] = $config['v'];
 		}
 		DBA::close($configs);
 
 		$this->config_loaded = true;
 
-		return [$cat => $return];
+		return $return;
 	}
 
 	/**
@@ -101,4 +101,16 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 
 		return $result;
 	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isLoaded($cat, $key)
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		return $this->config_loaded;
+	}
 }
diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
index d117ed354..d1c44d9fb 100644
--- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -44,13 +44,13 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 
 		$pconfigs = DBA::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
 		while ($pconfig = DBA::fetch($pconfigs)) {
-			$return[$pconfig['k']] = $pconfig['v'];
+			$return[$pconfig['cat']][$pconfig['k']] = $pconfig['v'];
 		}
 		DBA::close($pconfigs);
 
 		$this->config_loaded = true;
 
-		return [$cat => $return];
+		return $return;
 	}
 
 	/**
@@ -123,4 +123,16 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 
 		return $result;
 	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isLoaded($uid, $cat, $key)
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		return $this->config_loaded;
+	}
 }
diff --git a/src/Core/Config/Configuration.php b/src/Core/Config/Configuration.php
index ccb9abda8..2ad11b0ba 100644
--- a/src/Core/Config/Configuration.php
+++ b/src/Core/Config/Configuration.php
@@ -79,22 +79,20 @@ class Configuration
 	 */
 	public function get($cat, $key, $default_value = null, $refresh = false)
 	{
-		// Return the value of the cache if found and no refresh is forced
-		if (!$refresh && $this->configCache->has($cat, $key)) {
+		// if the value isn't loaded or refresh is needed, load it to the cache
+		if ($this->configAdapter->isConnected() &&
+			(!$this->configAdapter->isLoaded($cat, $key) ||
+			$refresh)) {
+			$dbvalue = $this->configAdapter->get($cat, $key);
+
+			if ($dbvalue !== '!<unset>!') {
+				$this->configCache->set($cat, $key, $dbvalue);
+			}
+		}
+
+		// use the config cache for return
+		if ($this->configCache->has($cat, $key)) {
 			return $this->configCache->get($cat, $key);
-		}
-
-		// if we don't find the value in the cache and the adapter isn't ready, return the default value
-		if (!$this->configAdapter->isConnected()) {
-			return $default_value;
-		}
-
-		// load DB value to cache
-		$dbvalue = $this->configAdapter->get($cat, $key);
-
-		if ($dbvalue !== '!<unset>!') {
-			$this->configCache->set($cat, $key, $dbvalue);
-			return $dbvalue;
 		} else {
 			return $default_value;
 		}
diff --git a/src/Core/Config/PConfiguration.php b/src/Core/Config/PConfiguration.php
index d3c848c9d..cf7ef6adc 100644
--- a/src/Core/Config/PConfiguration.php
+++ b/src/Core/Config/PConfiguration.php
@@ -71,22 +71,20 @@ class PConfiguration
 	 */
 	public function get($uid, $cat, $key, $default_value = null, $refresh = false)
 	{
-		// Return the value of the cache if found and no refresh is forced
-		if (!$refresh && $this->configCache->hasP($uid, $cat, $key)) {
+		// if the value isn't loaded or refresh is needed, load it to the cache
+		if ($this->configAdapter->isConnected() &&
+			(!$this->configAdapter->isLoaded($uid, $cat, $key) ||
+				$refresh)) {
+			$dbValue = $this->configAdapter->get($uid, $cat, $key);
+
+			if ($dbValue !== '!<unset>!') {
+				$this->configCache->setP($uid, $cat, $key, $dbValue);
+			}
+		}
+
+		// use the config cache for return
+		if ($this->configCache->hasP($uid, $cat, $key)) {
 			return $this->configCache->getP($uid, $cat, $key);
-		}
-
-		// if we don't find the value in the cache and the adapter isn't ready, return the default value
-		if (!$this->configAdapter->isConnected()) {
-			return $default_value;
-		}
-
-		// load DB value to cache
-		$dbvalue = $this->configAdapter->get($uid, $cat, $key);
-
-		if ($dbvalue !== '!<unset>!') {
-			$this->configCache->setP($uid, $cat, $key, $dbvalue);
-			return $dbvalue;
 		} else {
 			return $default_value;
 		}
diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index a2e587342..67e58ef6b 100644
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -68,7 +68,7 @@ class Logger extends BaseObject
 	 *
 	 * @param LoggerInterface $logger The Logger instance of this Application
 	 */
-	public static function setLogger($logger)
+	public static function init($logger)
 	{
 		self::$logger = $logger;
 	}
diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index 74f55e637..bbe3b0a4b 100644
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -44,7 +44,7 @@ class LoggerFactory
 			static::addStreamHandler($logger, $stream, $loglevel);
 		}
 
-		Logger::setLogger($logger);
+		Logger::init($logger);
 
 		return $logger;
 	}
diff --git a/tests/src/Core/Config/ConfigurationTest.php b/tests/src/Core/Config/ConfigurationTest.php
index 6ce81a41b..0437f1e7a 100644
--- a/tests/src/Core/Config/ConfigurationTest.php
+++ b/tests/src/Core/Config/ConfigurationTest.php
@@ -9,6 +9,20 @@ use Friendica\Test\MockedTest;
 
 class ConfigurationTest extends MockedTest
 {
+	public function dataTests()
+	{
+		return [
+			'string'       => ['data' => 'it'],
+			'boolTrue'     => ['data' => true],
+			'boolFalse'    => ['data' => false],
+			'integer'      => ['data' => 235],
+			'decimal'      => ['data' => 2.456],
+			'array'        => ['data' => ['1', 2, '3', true, false]],
+			'boolIntTrue'  => ['data' => 1],
+			'boolIntFalse' => ['Data' => 0],
+		];
+	}
+
 	/**
 	 * Test the configuration initialization
 	 */
@@ -24,17 +38,18 @@ class ConfigurationTest extends MockedTest
 	}
 
 	/**
-	 * Test if the configuration load() method
+	 * Test the configuration load() method
 	 */
 	public function testCacheLoad()
 	{
 		$configCache = new ConfigCache();
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
 		// constructor loading
 		$configAdapter->shouldReceive('load')->andReturn([])->once();
 		// expected loading
 		$configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'it']])->once();
+		$configAdapter->shouldReceive('isLoaded')->with('testing', 'test')->andReturn(true)->once();
 
 		$configuration = new Configuration($configCache, $configAdapter);
 		$configuration->load('testing');
@@ -44,17 +59,18 @@ class ConfigurationTest extends MockedTest
 	}
 
 	/**
-	 * Test if the configuration load() method with overwrite
+	 * Test the configuration load() method with overwrite
 	 */
 	public function testCacheLoadDouble()
 	{
 		$configCache = new ConfigCache();
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(5);
 		// constructor loading
 		$configAdapter->shouldReceive('load')->andReturn([])->once();
 		// expected loading
 		$configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'it']])->once();
+		$configAdapter->shouldReceive('isLoaded')->with('testing', 'test')->andReturn(true)->twice();
 		// expected next loading
 		$configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'again']])->once();
 
@@ -71,40 +87,43 @@ class ConfigurationTest extends MockedTest
 	}
 
 	/**
-	 * Test if the configuration get() and set() methods without adapter
+	 * Test the configuration get() and set() methods without adapter
+	 * @dataProvider dataTests
 	 */
-	public function testSetGetWithoutDB()
+	public function testSetGetWithoutDB($data)
 	{
 		$configCache = new ConfigCache();
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(false)->twice();
+		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
 
 		$configuration = new Configuration($configCache, $configAdapter);
 
-		$this->assertTrue($configuration->set('test', 'it', 'now'));
+		$this->assertTrue($configuration->set('test', 'it', $data));
 
-		$this->assertEquals('now', $configuration->get('test', 'it'));
-		$this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
+		$this->assertEquals($data, $configuration->get('test', 'it'));
+		$this->assertEquals($data, $configuration->getCache()->get('test', 'it'));
 	}
 
 	/**
-	 * Test if the configuration get() and set() methods with adapter
+	 * Test the configuration get() and set() methods with adapter
+	 * @dataProvider dataTests
 	 */
-	public function testSetGetWithDB()
+	public function testSetGetWithDB($data)
 	{
 		$configCache = new ConfigCache();
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
 		// constructor loading
 		$configAdapter->shouldReceive('load')->andReturn([])->once();
-		$configAdapter->shouldReceive('set')->with('test', 'it', 'now')->andReturn(true)->once();
+		$configAdapter->shouldReceive('isLoaded')->with('test', 'it')->andReturn(true)->once();
+		$configAdapter->shouldReceive('set')->with('test', 'it', $data)->andReturn(true)->once();
 
 		$configuration = new Configuration($configCache, $configAdapter);
 
-		$this->assertTrue($configuration->set('test', 'it', 'now'));
+		$this->assertTrue($configuration->set('test', 'it', $data));
 
-		$this->assertEquals('now', $configuration->get('test', 'it'));
-		$this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
+		$this->assertEquals($data, $configuration->get('test', 'it'));
+		$this->assertEquals($data, $configuration->getCache()->get('test', 'it'));
 	}
 
 	/**
@@ -133,15 +152,18 @@ class ConfigurationTest extends MockedTest
 
 	/**
 	 * Test the configuration get() method with refresh
+	 * @dataProvider dataTests
 	 */
-	public function testGetWithRefresh()
+	public function testGetWithRefresh($data)
 	{
 		$configCache = new ConfigCache(['test' => ['it' => 'now']]);
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(4);
 		// constructor loading
 		$configAdapter->shouldReceive('load')->andReturn([])->once();
-		$configAdapter->shouldReceive('get')->with('test', 'it')->andReturn('again')->once();
+		$configAdapter->shouldReceive('isLoaded')->with('test', 'it')->andReturn(true)->twice();
+		$configAdapter->shouldReceive('get')->with('test', 'it')->andReturn($data)->once();
+		$configAdapter->shouldReceive('isLoaded')->with('test', 'not')->andReturn(false)->once();
 		$configAdapter->shouldReceive('get')->with('test', 'not')->andReturn('!<unset>!')->once();
 
 		$configuration = new Configuration($configCache, $configAdapter);
@@ -151,8 +173,8 @@ class ConfigurationTest extends MockedTest
 		$this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
 
 		// with refresh
-		$this->assertEquals('again', $configuration->get('test', 'it', null, true));
-		$this->assertEquals('again', $configuration->getCache()->get('test', 'it'));
+		$this->assertEquals($data, $configuration->get('test', 'it', null, true));
+		$this->assertEquals($data, $configuration->getCache()->get('test', 'it'));
 
 		// without refresh and wrong value and default
 		$this->assertEquals('default', $configuration->get('test', 'not', 'default'));
@@ -160,19 +182,55 @@ class ConfigurationTest extends MockedTest
 	}
 
 	/**
-	 * Test the configuration delete() method without adapter
+	 * Test the configuration get() method with different isLoaded settings
+	 * @dataProvider dataTests
 	 */
-	public function testDeleteWithoutDB()
+	public function testGetWithoutLoaded($data)
 	{
 		$configCache = new ConfigCache(['test' => ['it' => 'now']]);
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(4);
+		// constructor loading
+		$configAdapter->shouldReceive('load')->andReturn([])->once();
+
+		$configAdapter->shouldReceive('isLoaded')->with('test', 'it')->andReturn(false)->once();
+		$configAdapter->shouldReceive('get')->with('test', 'it')->andReturn('!<unset>!')->once();
+
+		$configAdapter->shouldReceive('isLoaded')->with('test', 'it')->andReturn(false)->once();
+		$configAdapter->shouldReceive('get')->with('test', 'it')->andReturn($data)->once();
+
+		$configAdapter->shouldReceive('isLoaded')->with('test', 'it')->andReturn(true)->once();
 
 		$configuration = new Configuration($configCache, $configAdapter);
 
+		// first run is not loaded and no data is found in the DB
 		$this->assertEquals('now', $configuration->get('test', 'it'));
 		$this->assertEquals('now', $configuration->getCache()->get('test', 'it'));
 
+		// second run is not loaded, but now data is found in the db (overwrote cache)
+		$this->assertEquals($data, $configuration->get('test', 'it'));
+		$this->assertEquals($data, $configuration->getCache()->get('test', 'it'));
+
+		// third run is loaded and therefore cache is used
+		$this->assertEquals($data, $configuration->get('test', 'it'));
+		$this->assertEquals($data, $configuration->getCache()->get('test', 'it'));
+	}
+
+	/**
+	 * Test the configuration delete() method without adapter
+	 * @dataProvider dataTests
+	 */
+	public function testDeleteWithoutDB($data)
+	{
+		$configCache = new ConfigCache(['test' => ['it' => $data]]);
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(4);
+
+		$configuration = new Configuration($configCache, $configAdapter);
+
+		$this->assertEquals($data, $configuration->get('test', 'it'));
+		$this->assertEquals($data, $configuration->getCache()->get('test', 'it'));
+
 		$this->assertTrue($configuration->delete('test', 'it'));
 		$this->assertNull($configuration->get('test', 'it'));
 		$this->assertEquals('!<unset>!', $configuration->getCache()->get('test', 'it'));
@@ -187,9 +245,11 @@ class ConfigurationTest extends MockedTest
 	{
 		$configCache = new ConfigCache(['test' => ['it' => 'now', 'quarter' => 'true']]);
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(5);
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(6);
 		// constructor loading
 		$configAdapter->shouldReceive('load')->andReturn([])->once();
+		$configAdapter->shouldReceive('isLoaded')->with('test', 'it')->andReturn(true)->once();
+
 		$configAdapter->shouldReceive('delete')->with('test', 'it')->andReturn(false)->once();
 
 		$configAdapter->shouldReceive('delete')->with('test', 'second')->andReturn(true)->once();
diff --git a/tests/src/Core/Config/PConfigurationTest.php b/tests/src/Core/Config/PConfigurationTest.php
index 3d8fb586c..8ecc9bdf3 100644
--- a/tests/src/Core/Config/PConfigurationTest.php
+++ b/tests/src/Core/Config/PConfigurationTest.php
@@ -8,17 +8,35 @@ use Friendica\Test\MockedTest;
 
 class PConfigurationTest extends MockedTest
 {
+	public function dataTests()
+	{
+		return [
+			'string'       => ['data' => 'it'],
+			'boolTrue'     => ['data' => true],
+			'boolFalse'    => ['data' => false],
+			'integer'      => ['data' => 235],
+			'decimal'      => ['data' => 2.456],
+			'array'        => ['data' => ['1', 2, '3', true, false]],
+			'boolIntTrue'  => ['data' => 1],
+			'boolIntFalse' => ['Data' => 0],
+		];
+	}
+
 	/**
-	 * Test if the configuration load() method
+	 * Test the configuration load() method
 	 */
 	public function testCacheLoad()
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(true)->once();
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
 		// expected loading
-		$configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'it']])->once();
+		$configAdapter->shouldReceive('load')
+			->with($uid, 'testing')
+			->andReturn(['testing' => ['test' => 'it']])
+			->once();
+		$configAdapter->shouldReceive('isLoaded')->with($uid, 'testing', 'test')->andReturn(true)->once();
 
 		$configuration = new PConfiguration($configCache, $configAdapter);
 		$configuration->load($uid, 'testing');
@@ -27,16 +45,17 @@ class PConfigurationTest extends MockedTest
 	}
 
 	/**
-	 * Test if the configuration load() method with overwrite
+	 * Test the configuration load() method with overwrite
 	 */
 	public function testCacheLoadDouble()
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(4);
 		// expected loading
-		$configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'it']])->once();
+		$configAdapter->shouldReceive('load')->with($uid, 'testing')->andReturn(['testing' => ['test' => 'it']])->once();
+		$configAdapter->shouldReceive('isLoaded')->with($uid, 'testing', 'test')->andReturn(true)->twice();
 		// expected next loading
 		$configAdapter->shouldReceive('load')->andReturn(['testing' => ['test' => 'again']])->once();
 
@@ -51,38 +70,41 @@ class PConfigurationTest extends MockedTest
 	}
 
 	/**
-	 * Test if the configuration get() and set() methods without adapter
+	 * Test the configuration get() and set() methods without adapter
+	 * @dataProvider dataTests
 	 */
-	public function testSetGetWithoutDB()
+	public function testSetGetWithoutDB($data)
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(false)->once();
+		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(2);
 
 		$configuration = new PConfiguration($configCache, $configAdapter);
 
-		$this->assertTrue($configuration->set($uid, 'test', 'it', 'now'));
+		$this->assertTrue($configuration->set($uid, 'test', 'it', $data));
 
-		$this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+		$this->assertEquals($data, $configuration->get($uid, 'test', 'it'));
 	}
 
 	/**
-	 * Test if the configuration get() and set() methods with adapter
+	 * Test the configuration get() and set() methods with adapter
+	 * @dataProvider dataTests
 	 */
-	public function testSetGetWithDB()
+	public function testSetGetWithDB($data)
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(true)->once();
-		$configAdapter->shouldReceive('set')->with($uid, 'test', 'it', 'now')->andReturn(true)->once();
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(2);
+		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(true)->once();
+		$configAdapter->shouldReceive('set')->with($uid, 'test', 'it', $data)->andReturn(true)->once();
 
 		$configuration = new PConfiguration($configCache, $configAdapter);
 
-		$this->assertTrue($configuration->set($uid, 'test', 'it', 'now'));
+		$this->assertTrue($configuration->set($uid, 'test', 'it', $data));
 
-		$this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+		$this->assertEquals($data, $configuration->get($uid, 'test', 'it'));
 	}
 
 	/**
@@ -109,15 +131,19 @@ class PConfigurationTest extends MockedTest
 
 	/**
 	 * Test the configuration get() method with refresh
+	 * @dataProvider dataTests
 	 */
-	public function testGetWithRefresh()
+	public function testGetWithRefresh($data)
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(4);
+		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(false)->once();
 		$configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn('now')->once();
-		$configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn('again')->once();
+		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(true)->twice();
+		$configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn($data)->once();
+		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'not')->andReturn(false)->once();
 		$configAdapter->shouldReceive('get')->with($uid, 'test', 'not')->andReturn('!<unset>!')->once();
 
 		$configuration = new PConfiguration($configCache, $configAdapter);
@@ -128,26 +154,58 @@ class PConfigurationTest extends MockedTest
 		$this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
 
 		// with refresh (and load the second value out of the db)
-		$this->assertEquals('again', $configuration->get($uid, 'test', 'it', null, true));
+		$this->assertEquals($data, $configuration->get($uid, 'test', 'it', null, true));
 
 		// without refresh and wrong value and default
 		$this->assertEquals('default', $configuration->get($uid, 'test', 'not', 'default'));
 	}
 
 	/**
-	 * Test the configuration delete() method without adapter
+	 * Test the configuration get() method with different isLoaded settings
+	 * @dataProvider dataTests
 	 */
-	public function testDeleteWithoutDB()
+	public function testGetWithoutLoaded($data)
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
+
+		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(false)->once();
+		$configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn('!<unset>!')->once();
+
+		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(false)->once();
+		$configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn($data)->once();
+
+		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(true)->once();
 
 		$configuration = new PConfiguration($configCache, $configAdapter);
 
-		$this->assertTrue($configuration->set($uid, 'test', 'it', 'now'));
-		$this->assertEquals('now', $configuration->get($uid, 'test', 'it'));
+		// first run is not loaded and no data is found in the DB
+		$this->assertNull($configuration->get($uid, 'test', 'it'));
+
+		// second run is not loaded, but now data is found in the db (overwrote cache)
+		$this->assertEquals($data, $configuration->get($uid,'test', 'it'));
+
+		// third run is loaded and therefore cache is used
+		$this->assertEquals($data, $configuration->get($uid,'test', 'it'));
+	}
+
+	/**
+	 * Test the configuration delete() method without adapter
+	 * @dataProvider dataTests
+	 */
+	public function testDeleteWithoutDB($data)
+	{
+		$uid = 234;
+		$configCache = new ConfigCache();
+		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(4);
+
+		$configuration = new PConfiguration($configCache, $configAdapter);
+
+		$this->assertTrue($configuration->set($uid, 'test', 'it', $data));
+		$this->assertEquals($data, $configuration->get($uid, 'test', 'it'));
 
 		$this->assertTrue($configuration->delete($uid, 'test', 'it'));
 		$this->assertNull($configuration->get($uid, 'test', 'it'));
@@ -161,8 +219,10 @@ class PConfigurationTest extends MockedTest
 		$uid = 234;
 		$configCache = new ConfigCache();
 		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
-		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(5);
+		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(6);
 		$configAdapter->shouldReceive('set')->with($uid, 'test', 'it', 'now')->andReturn(false)->once();
+		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(true)->once();
+
 		$configAdapter->shouldReceive('delete')->with($uid, 'test', 'it')->andReturn(false)->once();
 
 		$configAdapter->shouldReceive('delete')->with($uid, 'test', 'second')->andReturn(true)->once();

From ad1254c49cac6e6278cd777b1a3887f5042204de Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 11 Feb 2019 23:39:51 +0100
Subject: [PATCH 031/145] performance improvement in case of db-load

---
 src/Core/Config/Configuration.php  | 1 +
 src/Core/Config/PConfiguration.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Core/Config/Configuration.php b/src/Core/Config/Configuration.php
index 2ad11b0ba..2ac0da0ad 100644
--- a/src/Core/Config/Configuration.php
+++ b/src/Core/Config/Configuration.php
@@ -87,6 +87,7 @@ class Configuration
 
 			if ($dbvalue !== '!<unset>!') {
 				$this->configCache->set($cat, $key, $dbvalue);
+				return $dbvalue;
 			}
 		}
 
diff --git a/src/Core/Config/PConfiguration.php b/src/Core/Config/PConfiguration.php
index cf7ef6adc..99b1aa146 100644
--- a/src/Core/Config/PConfiguration.php
+++ b/src/Core/Config/PConfiguration.php
@@ -79,6 +79,7 @@ class PConfiguration
 
 			if ($dbValue !== '!<unset>!') {
 				$this->configCache->setP($uid, $cat, $key, $dbValue);
+				return $dbValue;
 			}
 		}
 

From 0a318925a4bf5ee41cee4869f97a4276c2bc8d23 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 11 Feb 2019 23:45:08 +0100
Subject: [PATCH 032/145] bugfixing adapter get() in case of no connection

---
 src/Core/Config/Adapter/IConfigAdapter.php        | 6 +++---
 src/Core/Config/Adapter/IPConfigAdapter.php       | 4 ++--
 src/Core/Config/Adapter/JITPConfigAdapter.php     | 2 +-
 src/Core/Config/Adapter/PreloadConfigAdapter.php  | 2 +-
 src/Core/Config/Adapter/PreloadPConfigAdapter.php | 2 +-
 src/Core/Logger.php                               | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Core/Config/Adapter/IConfigAdapter.php b/src/Core/Config/Adapter/IConfigAdapter.php
index 8223d3367..21cd9a4b2 100644
--- a/src/Core/Config/Adapter/IConfigAdapter.php
+++ b/src/Core/Config/Adapter/IConfigAdapter.php
@@ -9,7 +9,7 @@ namespace Friendica\Core\Config\Adapter;
 interface IConfigAdapter
 {
 	/**
-	 * Loads all configuration values into a cached storage.
+	 * Loads all configuration values and returns the loaded category as an array.
 	 *
 	 * @param string  $cat The category of the configuration values to load
 	 *
@@ -18,7 +18,7 @@ interface IConfigAdapter
 	public function load($cat = "config");
 
 	/**
-	 * Get a particular user's config variable given the category name
+	 * Get a particular system-wide config variable given the category name
 	 * ($family) and a key.
 	 *
 	 * @param string  $cat The category of the configuration value
@@ -60,7 +60,7 @@ interface IConfigAdapter
 	public function isConnected();
 
 	/**
-	 * Checks, if a config value ($value) in the category ($cat) is already loaded.
+	 * Checks, if a config key ($key) in the category ($cat) is already loaded.
 	 *
 	 * @param string $cat The configuration category
 	 * @param string $key The configuration key
diff --git a/src/Core/Config/Adapter/IPConfigAdapter.php b/src/Core/Config/Adapter/IPConfigAdapter.php
index e9f389292..8e6c050b2 100644
--- a/src/Core/Config/Adapter/IPConfigAdapter.php
+++ b/src/Core/Config/Adapter/IPConfigAdapter.php
@@ -15,7 +15,7 @@ namespace Friendica\Core\Config\Adapter;
 interface IPConfigAdapter
 {
 	/**
-	 * Loads all configuration values of a user's config family into a cached storage.
+	 * Loads all configuration values of a user's config family and returns the loaded category as an array.
 	 *
 	 * @param string $uid The user_id
 	 * @param string $cat The category of the configuration value
@@ -71,7 +71,7 @@ interface IPConfigAdapter
 	public function isConnected();
 
 	/**
-	 * Checks, if a config value ($value) in the category ($cat) is already loaded for the user_id $uid.
+	 * Checks, if a config key ($key) in the category ($cat) is already loaded for the user_id $uid.
 	 *
 	 * @param string $uid The user_id
 	 * @param string $cat The configuration category
diff --git a/src/Core/Config/Adapter/JITPConfigAdapter.php b/src/Core/Config/Adapter/JITPConfigAdapter.php
index 697e27128..c5f3a381e 100644
--- a/src/Core/Config/Adapter/JITPConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITPConfigAdapter.php
@@ -49,7 +49,7 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
 	public function get($uid, $cat, $key)
 	{
 		if (!$this->isConnected()) {
-			return null;
+			return '!<unset>!';
 		}
 
 		$pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
diff --git a/src/Core/Config/Adapter/PreloadConfigAdapter.php b/src/Core/Config/Adapter/PreloadConfigAdapter.php
index a12c2a7ca..fa691a16d 100644
--- a/src/Core/Config/Adapter/PreloadConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadConfigAdapter.php
@@ -47,7 +47,7 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 	public function get($cat, $key)
 	{
 		if (!$this->isConnected()) {
-			return null;
+			return '!<unset>!';
 		}
 
 		$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
index d1c44d9fb..e79a4a1e3 100644
--- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -59,7 +59,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 	public function get($uid, $cat, $key)
 	{
 		if (!$this->isConnected()) {
-			return null;
+			return '!<unset>!';
 		}
 
 		if (!$this->config_loaded) {
diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index 67e58ef6b..3cb22e1e4 100644
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -68,7 +68,7 @@ class Logger extends BaseObject
 	 *
 	 * @param LoggerInterface $logger The Logger instance of this Application
 	 */
-	public static function init($logger)
+	public static function init(LoggerInterface $logger)
 	{
 		self::$logger = $logger;
 	}
@@ -78,7 +78,7 @@ class Logger extends BaseObject
 	 *
 	 * @param LoggerInterface $logger The Logger instance of this Application
 	 */
-	public static function setDevLogger($logger)
+	public static function setDevLogger(LoggerInterface $logger)
 	{
 		self::$devLogger = $logger;
 	}

From cdcf1667d7cb5cdcf960b5939deb558dd3f22233 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Tue, 12 Feb 2019 20:12:25 +0100
Subject: [PATCH 033/145] Adding DependencyFactory

---
 bin/auth_ejabberd.php             | 15 +------------
 bin/console.php                   | 14 +-----------
 bin/daemon.php                    | 28 +++++++-----------------
 bin/worker.php                    | 14 +-----------
 index.php                         | 15 +------------
 src/Factory/DependencyFactory.php | 36 +++++++++++++++++++++++++++++++
 6 files changed, 48 insertions(+), 74 deletions(-)
 create mode 100644 src/Factory/DependencyFactory.php

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 003faae1f..bf6d069d1 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -32,10 +32,7 @@
  *
  */
 
-use Friendica\App;
-use Friendica\Core\Config\Cache;
 use Friendica\Factory;
-use Friendica\Util\BasePath;
 use Friendica\Util\ExAuth;
 
 if (sizeof($_SERVER["argv"]) == 0) {
@@ -54,17 +51,7 @@ chdir($directory);
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Cache\ConfigCacheLoader($basedir);
-$configCache = Factory\ConfigFactory::createCache($configLoader);
-Factory\DBFactory::init($configCache, $_SERVER);
-$config = Factory\ConfigFactory::createConfig($configCache);
-// needed to call PConfig::init()
-Factory\ConfigFactory::createPConfig($configCache);
-$logger = Factory\LoggerFactory::create('auth_ejabberd', $config);
-$profiler = Factory\ProfilerFactory::create($logger, $config);
-
-$a = new App($config, $logger, $profiler);
+$a = Factory\DependencyFactory::setUp('auth_ejabbered', dirname(__DIR__));
 
 if ($a->getMode()->isNormal()) {
 	$oAuth = new ExAuth();
diff --git a/bin/console.php b/bin/console.php
index 2b0d58821..410eabda0 100755
--- a/bin/console.php
+++ b/bin/console.php
@@ -3,21 +3,9 @@
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-use Friendica\Core\Config\Cache;
 use Friendica\Factory;
-use Friendica\Util\BasePath;
 
-$basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Cache\ConfigCacheLoader($basedir);
-$configCache = Factory\ConfigFactory::createCache($configLoader);
-Factory\DBFactory::init($configCache, $_SERVER);
-$config = Factory\ConfigFactory::createConfig($configCache);
-// needed to call PConfig::init()
-Factory\ConfigFactory::createPConfig($configCache);
-$logger = Factory\LoggerFactory::create('console', $config);
-$profiler = Factory\ProfilerFactory::create($logger, $config);
-
-$a = new Friendica\App($config, $logger, $profiler);
+$a = Factory\DependencyFactory::setUp('console', dirname(__DIR__));
 \Friendica\BaseObject::setApp($a);
 
 (new Friendica\Core\Console($argv))->execute();
diff --git a/bin/daemon.php b/bin/daemon.php
index f2970a518..257896cfa 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -7,13 +7,11 @@
  * This script was taken from http://php.net/manual/en/function.pcntl-fork.php
  */
 
-use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Factory;
-use Friendica\Util\BasePath;
 
 // Get options
 $shortopts = 'f';
@@ -34,17 +32,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Cache\ConfigCacheLoader($basedir);
-$configCache = Factory\ConfigFactory::createCache($configLoader);
-Factory\DBFactory::init($configCache, $_SERVER);
-$config = Factory\ConfigFactory::createConfig($configCache);
-// needed to call PConfig::init()
-Factory\ConfigFactory::createPConfig($configCache);
-$logger = Factory\LoggerFactory::create('daemon', $config);
-$profiler = Factory\ProfilerFactory::create($logger, $config);
-
-$a = new App($config, $logger, $profiler);
+$a = Factory\DependencyFactory::setUp('daemon', dirname(__DIR__));
 
 if ($a->getMode()->isInstall()) {
 	die("Friendica isn't properly installed yet.\n");
@@ -114,7 +102,7 @@ if ($mode == "stop") {
 
 	unlink($pidfile);
 
-	$logger->notice("Worker daemon process was killed", ["pid" => $pid]);
+	Logger::notice("Worker daemon process was killed", ["pid" => $pid]);
 
 	Config::set('system', 'worker_daemon_mode', false);
 	die("Worker daemon process $pid was killed.\n");
@@ -124,7 +112,7 @@ if (!empty($pid) && posix_kill($pid, 0)) {
 	die("Daemon process $pid is already running.\n");
 }
 
-$logger->notice('Starting worker daemon.', ["pid" => $pid]);
+Logger::notice('Starting worker daemon.', ["pid" => $pid]);
 
 if (!$foreground) {
 	echo "Starting worker daemon.\n";
@@ -172,7 +160,7 @@ $last_cron = 0;
 // Now running as a daemon.
 while (true) {
 	if (!$do_cron && ($last_cron + $wait_interval) < time()) {
-		$logger->info('Forcing cron worker call.', ["pid" => $pid]);
+		Logger::info('Forcing cron worker call.', ["pid" => $pid]);
 		$do_cron = true;
 	}
 
@@ -186,7 +174,7 @@ while (true) {
 		$last_cron = time();
 	}
 
-	$logger->info("Sleeping", ["pid" => $pid]);
+	Logger::info("Sleeping", ["pid" => $pid]);
 	$start = time();
 	do {
 		$seconds = (time() - $start);
@@ -203,10 +191,10 @@ while (true) {
 
 	if ($timeout) {
 		$do_cron = true;
-		$logger->info("Woke up after $wait_interval seconds.", ["pid" => $pid, 'sleep' => $wait_interval]);
+		Logger::info("Woke up after $wait_interval seconds.", ["pid" => $pid, 'sleep' => $wait_interval]);
 	} else {
 		$do_cron = false;
-		$logger->info("Worker jobs are calling to be forked.", ["pid" => $pid]);
+		Logger::info("Worker jobs are calling to be forked.", ["pid" => $pid]);
 	}
 }
 
diff --git a/bin/worker.php b/bin/worker.php
index 530333127..c7174d81e 100755
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -7,11 +7,9 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\Config\Cache;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Factory;
-use Friendica\Util\BasePath;
 
 // Get options
 $shortopts = 'sn';
@@ -32,17 +30,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Cache\ConfigCacheLoader($basedir);
-$configCache = Factory\ConfigFactory::createCache($configLoader);
-Factory\DBFactory::init($configCache, $_SERVER);
-$config = Factory\ConfigFactory::createConfig($configCache);
-// needed to call PConfig::init()
-Factory\ConfigFactory::createPConfig($configCache);
-$logger = Factory\LoggerFactory::create('worker', $config);
-$profiler = Factory\ProfilerFactory::create($logger, $config);
-
-$a = new App($config, $logger, $profiler);
+$a = Factory\DependencyFactory::setUp('worker', dirname(__DIR__));
 
 // Check the database structure and possibly fixes it
 Update::check($a->getBasePath(), true);
diff --git a/index.php b/index.php
index 66f023965..6bbd70a19 100644
--- a/index.php
+++ b/index.php
@@ -4,10 +4,7 @@
  * Friendica
  */
 
-use Friendica\App;
-use Friendica\Core\Config\Cache;
 use Friendica\Factory;
-use Friendica\Util\BasePath;
 
 if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
 	die('Vendor path not found. Please execute "bin/composer.phar --no-dev install" on the command line in the web root.');
@@ -15,18 +12,8 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
 
 require __DIR__ . '/vendor/autoload.php';
 
-$basedir = BasePath::create(__DIR__, $_SERVER);
-$configLoader = new Cache\ConfigCacheLoader($basedir);
-$configCache = Factory\ConfigFactory::createCache($configLoader);
-Factory\DBFactory::init($configCache, $_SERVER);
-$config = Factory\ConfigFactory::createConfig($configCache);
-// needed to call PConfig::init()
-Factory\ConfigFactory::createPConfig($configCache);
-$logger = Factory\LoggerFactory::create('index', $config);
-$profiler = Factory\ProfilerFactory::create($logger, $config);
-
 // We assume that the index.php is called by a frontend process
 // The value is set to "true" by default in App
-$a = new App($config, $logger, $profiler, false);
+$a = Factory\DependencyFactory::setUp('index', __DIR__, true);
 
 $a->runFrontend();
diff --git a/src/Factory/DependencyFactory.php b/src/Factory/DependencyFactory.php
new file mode 100644
index 000000000..041202e6b
--- /dev/null
+++ b/src/Factory/DependencyFactory.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Friendica\Factory;
+
+use Friendica\App;
+use Friendica\Core\Config\Cache;
+use Friendica\Factory;
+use Friendica\Util\BasePath;
+
+class DependencyFactory
+{
+	/**
+	 * Setting all default-dependencies of a friendica execution
+	 *
+	 * @param string $channel   The channel of this execution
+	 * @param string $directory The base directory
+	 * @param bool   $isBackend True, if it's a backend execution, otherwise false (Default true)
+	 *
+	 * @return App The application
+	 *
+	 * @throws \Exception
+	 */
+	public static function setUp($channel, $directory, $isBackend = true)
+	{
+		$basedir = BasePath::create($directory, $_SERVER);
+		$configLoader = new Cache\ConfigCacheLoader($basedir);
+		$configCache = Factory\ConfigFactory::createCache($configLoader);
+		Factory\DBFactory::init($configCache, $_SERVER);
+		$config = Factory\ConfigFactory::createConfig($configCache);
+		// needed to call PConfig::init()
+		Factory\ConfigFactory::createPConfig($configCache);
+		Factory\LoggerFactory::create($channel, $config);
+
+		return new App($config, $isBackend);
+	}
+}

From fa74adcf36628c89b832f60ff3feec5107234c0d Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 17 Feb 2019 15:00:24 -0500
Subject: [PATCH 034/145] [frio] Reduce replies right padding

---
 view/theme/frio/css/style.css | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 6759195ee..c75142120 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -375,9 +375,6 @@ header #site-location {
 header #banner {
     position: fixed;
     top: 0px;
-/*    width: 33%;
-    margin-left: 33%;
-    margin-right: 33%;*/
     left:49%;
     right: 49%;
     z-index: 1040;
@@ -393,8 +390,6 @@ header #banner {
 }
 header #banner #logo-img,
 .navbar-brand #logo-img {
-    /*mask: url('network#m1');*/
-    /*mask-image: url('img/friendica-25.png');*/
     -webkit-mask-image: url('img/friendica-25.png');
     background-color: $nav_icon_color;
     height: 25px;
@@ -2125,8 +2120,8 @@ img.acpopup-img {
 .wall-item-container.thread_level_5,
 .wall-item-container.thread_level_6,
 .wall-item-container.thread_level_7 {
-  margin-left: 15px;
-
+    margin-left: 15px;
+    margin-right: -0.5em;
 }
 /* Menubar Tabs */
 section > .tabbar-wrapper {
@@ -3619,4 +3614,12 @@ section .profile-match-wrapper {
 	.form-control {
 		font-size: 16px;
 	}
+
+    .wall-item-container.thread_level_3,
+    .wall-item-container.thread_level_4,
+    .wall-item-container.thread_level_5,
+    .wall-item-container.thread_level_6,
+    .wall-item-container.thread_level_7 {
+        margin-left: 5px;
+    }
 }

From 5e5c39b0e12154551ece88692c1567fc04db86ec Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 17 Feb 2019 21:12:12 +0100
Subject: [PATCH 035/145] Refactored DependencyFactory for Profiler

---
 bin/daemon.php                         |  2 +-
 include/api.php                        |  2 +-
 src/App.php                            | 20 +++++++++++++++++---
 src/Factory/DBFactory.php              |  8 +++++---
 src/Factory/DependencyFactory.php      |  7 ++++---
 src/Factory/LoggerFactory.php          |  9 +++++++++
 src/Factory/ProfilerFactory.php        | 17 +++++++++--------
 src/Util/Profiler.php                  | 18 ++++++------------
 tests/include/ApiTest.php              |  5 ++---
 tests/src/Database/DBATest.php         |  7 +++----
 tests/src/Database/DBStructureTest.php |  7 +++----
 tests/src/Util/ProfilerTest.php        | 10 +++++-----
 12 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/bin/daemon.php b/bin/daemon.php
index 257896cfa..047bf71be 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -144,7 +144,7 @@ if (!$foreground) {
 	file_put_contents($pidfile, $pid);
 
 	// We lose the database connection upon forking
-	Factory\DBFactory::init($configCache, $_SERVER);
+	Factory\DBFactory::init($a->getConfigCache(), $a->getProfiler(), $_SERVER);
 }
 
 Config::set('system', 'worker_daemon_mode', true);
diff --git a/include/api.php b/include/api.php
index 6bd08d01d..13ff75bdb 100644
--- a/include/api.php
+++ b/include/api.php
@@ -326,7 +326,7 @@ function api_call(App $a)
 
 				Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username'], 'duration' => round($duration, 2)]);
 
-				$a->getProfiler()->saveLog(API_LOG_PREFIX . 'performance');
+				$a->getProfiler()->saveLog($a->getLogger(), API_LOG_PREFIX . 'performance');
 
 				if (false === $return) {
 					/*
diff --git a/src/App.php b/src/App.php
index 3189b2da7..8a49f060b 100644
--- a/src/App.php
+++ b/src/App.php
@@ -12,7 +12,6 @@ use Friendica\Core\Config\Cache\ConfigCacheLoader;
 use Friendica\Core\Config\Cache\IConfigCache;
 use Friendica\Core\Config\Configuration;
 use Friendica\Database\DBA;
-use Friendica\Factory\ConfigFactory;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
@@ -114,6 +113,11 @@ class App
 	 */
 	private $config;
 
+	/**
+	 * @var LoggerInterface The logger
+	 */
+	private $logger;
+
 	/**
 	 * @var Profiler The profiler of this app
 	 */
@@ -139,6 +143,16 @@ class App
 		return $this->basePath;
 	}
 
+	/**
+	 * The Logger of this app
+	 *
+	 * @return LoggerInterface
+	 */
+	public function getLogger()
+	{
+		return $this->logger;
+	}
+
 	/**
 	 * The profiler of this app
 	 *
@@ -192,7 +206,7 @@ class App
 	 * @brief App constructor.
 	 *
 	 * @param Configuration    $config    The Configuration
-	 * @param LoggerInterface  $logger    Logger of this application
+	 * @param LoggerInterface  $logger    The current app logger
 	 * @param Profiler         $profiler  The profiler of this application
 	 * @param bool             $isBackend Whether it is used for backend or frontend (Default true=backend)
 	 *
@@ -200,8 +214,8 @@ class App
 	 */
 	public function __construct(Configuration $config, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
 	{
-		$this->config   = $config;
 		$this->logger   = $logger;
+		$this->config   = $config;
 		$this->profiler = $profiler;
 		$this->basePath = $this->config->get('system', 'basepath');
 
diff --git a/src/Factory/DBFactory.php b/src/Factory/DBFactory.php
index abfe6f99d..c1a796501 100644
--- a/src/Factory/DBFactory.php
+++ b/src/Factory/DBFactory.php
@@ -4,18 +4,20 @@ namespace Friendica\Factory;
 
 use Friendica\Core\Config\Cache;
 use Friendica\Database;
+use Friendica\Util\Profiler;
 
 class DBFactory
 {
 	/**
 	 * Initialize the DBA connection
 	 *
-	 * @param Cache\ConfigCache $configCache The configuration cache
+	 * @param Cache\IConfigCache $configCache The configuration cache
+	 * @param Profiler          $profiler    The profiler
 	 * @param array             $server      The $_SERVER variables
 	 *
 	 * @throws \Exception if connection went bad
 	 */
-	public static function init(Cache\ConfigCache $configCache, array $server)
+	public static function init(Cache\IConfigCache $configCache, Profiler $profiler, array $server)
 	{
 		if (Database\DBA::connected()) {
 			return;
@@ -46,7 +48,7 @@ class DBFactory
 			$db_data = $server['MYSQL_DATABASE'];
 		}
 
-		if (Database\DBA::connect($configCache, $db_host, $db_user, $db_pass, $db_data, $charset)) {
+		if (Database\DBA::connect($configCache, $profiler, $db_host, $db_user, $db_pass, $db_data, $charset)) {
 			// Loads DB_UPDATE_VERSION constant
 			Database\DBStructure::definition($configCache->get('system', 'basepath'), false);
 		}
diff --git a/src/Factory/DependencyFactory.php b/src/Factory/DependencyFactory.php
index 041202e6b..acbf4bfaf 100644
--- a/src/Factory/DependencyFactory.php
+++ b/src/Factory/DependencyFactory.php
@@ -25,12 +25,13 @@ class DependencyFactory
 		$basedir = BasePath::create($directory, $_SERVER);
 		$configLoader = new Cache\ConfigCacheLoader($basedir);
 		$configCache = Factory\ConfigFactory::createCache($configLoader);
-		Factory\DBFactory::init($configCache, $_SERVER);
+		$profiler = Factory\ProfilerFactory::create($configCache);
+		Factory\DBFactory::init($configCache, $profiler, $_SERVER);
 		$config = Factory\ConfigFactory::createConfig($configCache);
 		// needed to call PConfig::init()
 		Factory\ConfigFactory::createPConfig($configCache);
-		Factory\LoggerFactory::create($channel, $config);
+		$logger = Factory\LoggerFactory::create($channel, $config);
 
-		return new App($config, $isBackend);
+		return new App($config, $logger, $profiler, $isBackend);
 	}
 }
diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index bbe3b0a4b..77a09637c 100644
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -42,6 +42,8 @@ class LoggerFactory
 		if ($debugging) {
 			$loglevel = self::mapLegacyConfigDebugLevel((string)$level);
 			static::addStreamHandler($logger, $stream, $loglevel);
+		} else {
+			static::addVoidHandler($logger);
 		}
 
 		Logger::init($logger);
@@ -153,4 +155,11 @@ class LoggerFactory
 			throw new InternalServerErrorException('Logger instance incompatible for MonologFactory');
 		}
 	}
+
+	public static function addVoidHandler($logger)
+	{
+		if ($logger instanceof Monolog\Logger) {
+			$logger->pushHandler(new Monolog\Handler\NullHandler());
+		}
+	}
 }
diff --git a/src/Factory/ProfilerFactory.php b/src/Factory/ProfilerFactory.php
index 7a63c7440..26a156639 100644
--- a/src/Factory/ProfilerFactory.php
+++ b/src/Factory/ProfilerFactory.php
@@ -2,24 +2,25 @@
 
 namespace Friendica\Factory;
 
-use Friendica\Core\Config\ConfigCache;
+use Friendica\Core\Config\Cache\IConfigCache;
 use Friendica\Util\Profiler;
-use Psr\Log\LoggerInterface;
 
 class ProfilerFactory
 {
 	/**
 	 * Creates a Profiler for the current execution
 	 *
-	 * @param LoggerInterface $logger      The logger for saving the profiling data
-	 * @param ConfigCache     $configCache The configuration cache
+	 * @param IConfigCache     $configCache The configuration cache
 	 *
 	 * @return Profiler
 	 */
-	public static function create(LoggerInterface $logger, ConfigCache $configCache)
+	public static function create(IConfigCache $configCache)
 	{
-		$enabled = $configCache->get('system', 'profiler', false);
-		$renderTime = $configCache->get('rendertime', 'callstack', false);
-		return new Profiler($logger, $enabled, $renderTime);
+		$enabled = $configCache->get('system', 'profiler');
+		$enabled = isset($enabled) && $enabled !== '!<unset>!';
+		$renderTime = $configCache->get('rendertime', 'callstack');
+		$renderTime = isset($renderTime) && $renderTime !== '!<unset>!';
+
+		return new Profiler($enabled, $renderTime);
 	}
 }
diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index a3f889380..2d3da3a9c 100644
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -33,20 +33,13 @@ class Profiler implements ContainerInterface
 	private $rendertime;
 
 	/**
-	 * @var LoggerInterface The profiler logger
-	 */
-	private $logger;
-
-	/**
-	 * @param LoggerInterface $logger The profiler logger
 	 * @param bool $enabled           True, if the Profiler is enabled
 	 * @param bool $renderTime        True, if the Profiler should measure the whole rendertime including functions
 	 */
-	public function __construct(LoggerInterface $logger, $enabled = false, $renderTime = false)
+	public function __construct($enabled = false, $renderTime = false)
 	{
 		$this->enabled = $enabled;
 		$this->rendertime = $renderTime;
-		$this->logger = $logger;
 		$this->reset();
 	}
 
@@ -129,16 +122,17 @@ class Profiler implements ContainerInterface
 	/**
 	 * Save the current profiling data to a log entry
 	 *
-	 * @param string $message Additional message for the log
+	 * @param LoggerInterface $logger The logger to save the current log
+	 * @param string          $message Additional message for the log
 	 */
-	public function saveLog($message = '')
+	public function saveLog(LoggerInterface $logger, $message = '')
 	{
 		// Write down the performance values into the log
 		if (!$this->enabled) {
 			return;
 		}
 		$duration = microtime(true) - $this->get('start');
-		$this->logger->info(
+		$logger->info(
 			$message,
 			[
 				'action' => 'profiling',
@@ -205,7 +199,7 @@ class Profiler implements ContainerInterface
 				}
 			}
 		}
-		$this->logger->info($message . ": " . $o, ['action' => 'profiling']);
+		$logger->info($message . ": " . $o, ['action' => 'profiling']);
 	}
 
 	/**
diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index 59096f5e5..289b3fcea 100644
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -39,13 +39,12 @@ class ApiTest extends DatabaseTest
 		$basedir = BasePath::create(dirname(__DIR__) . '/../');
 		$configLoader = new Cache\ConfigCacheLoader($basedir);
 		$configCache = Factory\ConfigFactory::createCache($configLoader);
-		Factory\DBFactory::init($configCache, $_SERVER);
+		$profiler = Factory\ProfilerFactory::create($configCache);
+		Factory\DBFactory::init($configCache, $profiler, $_SERVER);
 		$config = Factory\ConfigFactory::createConfig($configCache);
 		Factory\ConfigFactory::createPConfig($configCache);
 		$logger = Factory\LoggerFactory::create('test', $config);
-		$profiler = Factory\ProfilerFactory::create($logger, $config);
 		$this->app = new App($config, $logger, $profiler, false);
-		$this->logOutput = FActory\LoggerFactory::enableTest($this->app->getLogger());
 
 		parent::setUp();
 
diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
index a4a715575..e8b9c68b1 100644
--- a/tests/src/Database/DBATest.php
+++ b/tests/src/Database/DBATest.php
@@ -16,13 +16,12 @@ class DBATest extends DatabaseTest
 		$basedir = BasePath::create(dirname(__DIR__) . '/../../');
 		$configLoader = new Cache\ConfigCacheLoader($basedir);
 		$configCache = Factory\ConfigFactory::createCache($configLoader);
-		Factory\DBFactory::init($configCache, $_SERVER);
+		$profiler = Factory\ProfilerFactory::create($configCache);
+		Factory\DBFactory::init($configCache, $profiler, $_SERVER);
 		$config = Factory\ConfigFactory::createConfig($configCache);
-		$pconfig = Factory\ConfigFactory::createPConfig($configCache);
+		Factory\ConfigFactory::createPConfig($configCache);
 		$logger = Factory\LoggerFactory::create('test', $config);
-		$profiler = Factory\ProfilerFactory::create($logger, $config);
 		$this->app = new App($config, $logger, $profiler, false);
-		$this->logOutput = FActory\LoggerFactory::enableTest($this->app->getLogger());
 
 		parent::setUp();
 
diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php
index 6a5e25e76..325ad4e5e 100644
--- a/tests/src/Database/DBStructureTest.php
+++ b/tests/src/Database/DBStructureTest.php
@@ -16,13 +16,12 @@ class DBStructureTest extends DatabaseTest
 		$basedir = BasePath::create(dirname(__DIR__) . '/../../');
 		$configLoader = new Cache\ConfigCacheLoader($basedir);
 		$configCache = Factory\ConfigFactory::createCache($configLoader);
-		Factory\DBFactory::init($configCache, $_SERVER);
+		$profiler = Factory\ProfilerFactory::create($configCache);
+		Factory\DBFactory::init($configCache, $profiler, $_SERVER);
 		$config = Factory\ConfigFactory::createConfig($configCache);
-		$pconfig = Factory\ConfigFactory::createPConfig($configCache);
+		Factory\ConfigFactory::createPConfig($configCache);
 		$logger = Factory\LoggerFactory::create('test', $config);
-		$profiler = Factory\ProfilerFactory::create($logger, $config);
 		$this->app = new App($config, $logger, $profiler, false);
-		$this->logOutput = FActory\LoggerFactory::enableTest($this->app->getLogger());
 
 		parent::setUp();
 	}
diff --git a/tests/src/Util/ProfilerTest.php b/tests/src/Util/ProfilerTest.php
index f9febeae8..f242fd43c 100644
--- a/tests/src/Util/ProfilerTest.php
+++ b/tests/src/Util/ProfilerTest.php
@@ -26,7 +26,7 @@ class ProfilerTest extends MockedTest
 	 */
 	public function testSetUp()
 	{
-		$profiler = new Profiler($this->logger, true, true);
+		$profiler = new Profiler(true, true);
 	}
 
 	/**
@@ -96,7 +96,7 @@ class ProfilerTest extends MockedTest
 	 */
 	public function testSaveTimestamp($timestamp, $name, array $functions)
 	{
-		$profiler = new Profiler($this->logger, true, true);
+		$profiler = new Profiler(true, true);
 
 		foreach ($functions as $function) {
 			$profiler->saveTimestamp($timestamp, $name, $function);
@@ -111,7 +111,7 @@ class ProfilerTest extends MockedTest
 	 */
 	public function testReset($timestamp, $name, array $functions)
 	{
-		$profiler = new Profiler($this->logger, true, true);
+		$profiler = new Profiler(true, true);
 
 		$profiler->saveTimestamp($timestamp, $name);
 		$profiler->reset();
@@ -168,7 +168,7 @@ class ProfilerTest extends MockedTest
 			->shouldReceive('info')
 			->once();
 
-		$profiler = new Profiler($this->logger, true, true);
+		$profiler = new Profiler(true, true);
 
 		foreach ($data as $perf => $items) {
 			foreach ($items['functions'] as $function) {
@@ -176,6 +176,6 @@ class ProfilerTest extends MockedTest
 			}
 		}
 
-		$profiler->saveLog('test');
+		$profiler->saveLog($this->logger, 'test');
 	}
 }

From f5adbd268b0ad6f9e090ebb44dc32a0d4a1fec3c Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 17 Feb 2019 21:41:45 +0100
Subject: [PATCH 036/145] Fixing tests

---
 tests/Util/AppMockTrait.php                   | 56 +++++++++++--------
 tests/Util/DBStructureMockTrait.php           |  2 +
 tests/src/App/ModeTest.php                    |  4 +-
 tests/src/BaseObjectTest.php                  |  3 +-
 tests/src/Core/Cache/CacheTest.php            |  3 +-
 .../Core/Cache/MemcacheCacheDriverTest.php    |  8 +--
 .../Core/Cache/MemcachedCacheDriverTest.php   |  4 +-
 tests/src/Core/Cache/RedisCacheDriverTest.php |  8 +--
 tests/src/Core/Config/ConfigurationTest.php   | 21 +++----
 tests/src/Core/Config/PConfigurationTest.php  | 19 ++++---
 .../AutomaticInstallationConsoleTest.php      |  4 +-
 tests/src/Core/Console/ConfigConsoleTest.php  | 28 +++++-----
 tests/src/Core/Console/ConsoleTest.php        |  7 +--
 tests/src/Core/Lock/LockTest.php              |  3 +-
 .../Core/Lock/MemcacheCacheLockDriverTest.php |  8 +--
 .../Lock/MemcachedCacheLockDriverTest.php     |  4 +-
 .../Core/Lock/RedisCacheLockDriverTest.php    |  8 +--
 .../src/Core/Lock/SemaphoreLockDriverTest.php |  4 +-
 18 files changed, 101 insertions(+), 93 deletions(-)

diff --git a/tests/Util/AppMockTrait.php b/tests/Util/AppMockTrait.php
index 66b95b04e..817570dd5 100644
--- a/tests/Util/AppMockTrait.php
+++ b/tests/Util/AppMockTrait.php
@@ -6,6 +6,7 @@ use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Render\FriendicaSmartyEngine;
+use Friendica\Util\Profiler;
 use Mockery\MockInterface;
 use org\bovigo\vfs\vfsStreamDirectory;
 
@@ -22,70 +23,81 @@ trait AppMockTrait
 	/**
 	 * @var MockInterface|Config\Configuration The mocked Config Cache
 	 */
-	protected $configCache;
+	protected $configMock;
+
+	/**
+	 * @var MockInterface|Profiler The mocked profiler
+	 */
+	protected $profilerMock;
 
 	/**
 	 * Mock the App
 	 *
 	 * @param vfsStreamDirectory $root The root directory
-	 * @param MockInterface|Config\Configuration $config The config cache
 	 */
-	public function mockApp($root, Config\Configuration $config)
+	public function mockApp($root)
 	{
-		$this->configCache = $config;
+		$this->configMock = \Mockery::mock(Config\Cache\IConfigCache::class);
+		$configAdapterMock = \Mockery::mock(Config\Adapter\IConfigAdapter::class);
+		// Disable the adapter
+		$configAdapterMock->shouldReceive('isConnected')->andReturn(false);
+
+		$config = new Config\Configuration($this->configMock, $configAdapterMock);
+		// Initialize empty Config
+		Config::init($config);
+
 		// Mocking App and most used functions
 		$this->app = \Mockery::mock(App::class);
 		$this->app
 			->shouldReceive('getBasePath')
 			->andReturn($root->url());
 
-		$config
+		$this->configMock
+			->shouldReceive('has')
+			->andReturn(true);
+		$this->configMock
 			->shouldReceive('get')
 			->with('database', 'hostname')
 			->andReturn(getenv('MYSQL_HOST'));
-		$config
+		$this->configMock
 			->shouldReceive('get')
 			->with('database', 'username')
 			->andReturn(getenv('MYSQL_USERNAME'));
-		$config
+		$this->configMock
 			->shouldReceive('get')
 			->with('database', 'password')
 			->andReturn(getenv('MYSQL_PASSWORD'));
-		$config
+		$this->configMock
 			->shouldReceive('get')
 			->with('database', 'database')
 			->andReturn(getenv('MYSQL_DATABASE'));
-		$config
+		$this->configMock
 			->shouldReceive('get')
 			->with('config', 'hostname')
 			->andReturn('localhost');
-		$config
+		$this->configMock
 			->shouldReceive('get')
-			->with('system', 'theme', NULL, false)
+			->with('system', 'theme')
 			->andReturn('system_theme');
-		$config
-			->shouldReceive('getConfig')
-			->andReturn($config);
+
+		$this->profilerMock = \Mockery::mock(Profiler::class);
+		$this->profilerMock->shouldReceive('saveTimestamp');
 
 		$this->app
 			->shouldReceive('getConfigCache')
-			->andReturn($config);
-
+			->andReturn($this->configMock);
 		$this->app
 			->shouldReceive('getTemplateEngine')
 			->andReturn(new FriendicaSmartyEngine());
 		$this->app
 			->shouldReceive('getCurrentTheme')
 			->andReturn('Smarty3');
-		$this->app
-			->shouldReceive('saveTimestamp')
-			->andReturn(true);
 		$this->app
 			->shouldReceive('getBaseUrl')
 			->andReturn('http://friendica.local');
-
-		// Initialize empty Config
-		Config::init($config);
+		$this->app
+			->shouldReceive('getProfiler')
+			->andReturn($this->profilerMock);
 
 		BaseObject::setApp($this->app);
 	}
diff --git a/tests/Util/DBStructureMockTrait.php b/tests/Util/DBStructureMockTrait.php
index 87c120d3f..92ec412cb 100644
--- a/tests/Util/DBStructureMockTrait.php
+++ b/tests/Util/DBStructureMockTrait.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Test\Util;
 
+use Friendica\Database\DBStructure;
 use Mockery\MockInterface;
 
 /**
@@ -16,6 +17,7 @@ trait DBStructureMockTrait
 
 	/**
 	 * Mocking DBStructure::update()
+	 * @see DBStructure::update();
 	 *
 	 * @param array $args The arguments for the update call
 	 * @param bool $return True, if the connect was successful, otherwise false
diff --git a/tests/src/App/ModeTest.php b/tests/src/App/ModeTest.php
index 5a5c4c87e..9059e8beb 100644
--- a/tests/src/App/ModeTest.php
+++ b/tests/src/App/ModeTest.php
@@ -90,7 +90,7 @@ class ModeTest extends MockedTest
 		$this->mockConnected(true, 1);
 		$this->mockFetchFirst('SHOW TABLES LIKE \'config\'', true, 1);
 
-		$config = \Mockery::mock('Friendica\Core\Config\Configuration');
+		$config = \Mockery::mock(Config\Configuration::class);
 		$config
 			->shouldReceive('get')
 			->with('system', 'maintenance', null, false)
@@ -118,7 +118,7 @@ class ModeTest extends MockedTest
 		$this->mockConnected(true, 1);
 		$this->mockFetchFirst('SHOW TABLES LIKE \'config\'', true, 1);
 
-		$config = \Mockery::mock('Friendica\Core\Config\Configuration');
+		$config = \Mockery::mock(Config\Configuration::class);
 		$config
 			->shouldReceive('get')
 			->with('system', 'maintenance', null, false)
diff --git a/tests/src/BaseObjectTest.php b/tests/src/BaseObjectTest.php
index 39741eb9e..334150391 100644
--- a/tests/src/BaseObjectTest.php
+++ b/tests/src/BaseObjectTest.php
@@ -31,8 +31,7 @@ class BaseObjectTest extends TestCase
 	{
 		$baseObject = new BaseObject();
 		$this->setUpVfsDir();
-		$configMock = \Mockery::mock('Friendica\Core\Config\Configuration');
-		$this->mockApp($this->root, $configMock);
+		$this->mockApp($this->root);
 
 		$this->assertNull($baseObject->setApp($this->app));
 		$this->assertEquals($this->app, $baseObject->getApp());
diff --git a/tests/src/Core/Cache/CacheTest.php b/tests/src/Core/Cache/CacheTest.php
index 961ac9e1b..ef97f5a17 100644
--- a/tests/src/Core/Cache/CacheTest.php
+++ b/tests/src/Core/Cache/CacheTest.php
@@ -67,8 +67,7 @@ abstract class CacheTest extends MockedTest
 	protected function setUp()
 	{
 		$this->setUpVfsDir();
-		$configMock = \Mockery::mock('Friendica\Core\Config\Configuration');
-		$this->mockApp($this->root, $configMock);
+		$this->mockApp($this->root);
 		$this->app
 			->shouldReceive('getHostname')
 			->andReturn('friendica.local');
diff --git a/tests/src/Core/Cache/MemcacheCacheDriverTest.php b/tests/src/Core/Cache/MemcacheCacheDriverTest.php
index 5017b6967..f9df9eaba 100644
--- a/tests/src/Core/Cache/MemcacheCacheDriverTest.php
+++ b/tests/src/Core/Cache/MemcacheCacheDriverTest.php
@@ -12,14 +12,14 @@ class MemcacheCacheDriverTest extends MemoryCacheTest
 {
 	protected function getInstance()
 	{
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('system', 'memcache_host', NULL, false)
+			->with('system', 'memcache_host')
 			->andReturn('localhost');
 
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('system', 'memcache_port', NULL, false)
+			->with('system', 'memcache_port')
 			->andReturn(11211);
 
 		$this->cache = CacheDriverFactory::create('memcache');
diff --git a/tests/src/Core/Cache/MemcachedCacheDriverTest.php b/tests/src/Core/Cache/MemcachedCacheDriverTest.php
index 7c6835359..4e16ef947 100644
--- a/tests/src/Core/Cache/MemcachedCacheDriverTest.php
+++ b/tests/src/Core/Cache/MemcachedCacheDriverTest.php
@@ -12,9 +12,9 @@ class MemcachedCacheDriverTest extends MemoryCacheTest
 {
 	protected function getInstance()
 	{
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('system', 'memcached_hosts', NULL, false)
+			->with('system', 'memcached_hosts')
 			->andReturn([0 => 'localhost, 11211']);
 
 		$this->cache = CacheDriverFactory::create('memcached');
diff --git a/tests/src/Core/Cache/RedisCacheDriverTest.php b/tests/src/Core/Cache/RedisCacheDriverTest.php
index d36e6b826..20fe7eb53 100644
--- a/tests/src/Core/Cache/RedisCacheDriverTest.php
+++ b/tests/src/Core/Cache/RedisCacheDriverTest.php
@@ -12,14 +12,14 @@ class RedisCacheDriverTest extends MemoryCacheTest
 {
 	protected function getInstance()
 	{
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('system', 'redis_host', NULL, false)
+			->with('system', 'redis_host')
 			->andReturn('localhost');
 
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('system', 'redis_port', NULL, false)
+			->with('system', 'redis_port')
 			->andReturn(null);
 
 		$this->cache = CacheDriverFactory::create('redis');
diff --git a/tests/src/Core/Config/ConfigurationTest.php b/tests/src/Core/Config/ConfigurationTest.php
index 0437f1e7a..2e4fcd4f5 100644
--- a/tests/src/Core/Config/ConfigurationTest.php
+++ b/tests/src/Core/Config/ConfigurationTest.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Test\Core\Config;
 
+use Friendica\Core\Config\Adapter\IConfigAdapter;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Core\Config\Cache\IConfigCache;
 use Friendica\Core\Config\Configuration;
@@ -29,7 +30,7 @@ class ConfigurationTest extends MockedTest
 	public function testSetUp()
 	{
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter = \Mockery::mock(IConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(false)->once();
 
 		$configuration = new Configuration($configCache, $configAdapter);
@@ -43,7 +44,7 @@ class ConfigurationTest extends MockedTest
 	public function testCacheLoad()
 	{
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter = \Mockery::mock(IConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
 		// constructor loading
 		$configAdapter->shouldReceive('load')->andReturn([])->once();
@@ -64,7 +65,7 @@ class ConfigurationTest extends MockedTest
 	public function testCacheLoadDouble()
 	{
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter = \Mockery::mock(IConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(5);
 		// constructor loading
 		$configAdapter->shouldReceive('load')->andReturn([])->once();
@@ -93,7 +94,7 @@ class ConfigurationTest extends MockedTest
 	public function testSetGetWithoutDB($data)
 	{
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter = \Mockery::mock(IConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
 
 		$configuration = new Configuration($configCache, $configAdapter);
@@ -111,7 +112,7 @@ class ConfigurationTest extends MockedTest
 	public function testSetGetWithDB($data)
 	{
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter = \Mockery::mock(IConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
 		// constructor loading
 		$configAdapter->shouldReceive('load')->andReturn([])->once();
@@ -132,7 +133,7 @@ class ConfigurationTest extends MockedTest
 	public function testGetWrongWithoutDB()
 	{
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter = \Mockery::mock(IConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(4);
 
 		$configuration = new Configuration($configCache, $configAdapter);
@@ -157,7 +158,7 @@ class ConfigurationTest extends MockedTest
 	public function testGetWithRefresh($data)
 	{
 		$configCache = new ConfigCache(['test' => ['it' => 'now']]);
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter = \Mockery::mock(IConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(4);
 		// constructor loading
 		$configAdapter->shouldReceive('load')->andReturn([])->once();
@@ -188,7 +189,7 @@ class ConfigurationTest extends MockedTest
 	public function testGetWithoutLoaded($data)
 	{
 		$configCache = new ConfigCache(['test' => ['it' => 'now']]);
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter = \Mockery::mock(IConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(4);
 		// constructor loading
 		$configAdapter->shouldReceive('load')->andReturn([])->once();
@@ -223,7 +224,7 @@ class ConfigurationTest extends MockedTest
 	public function testDeleteWithoutDB($data)
 	{
 		$configCache = new ConfigCache(['test' => ['it' => $data]]);
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter = \Mockery::mock(IConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(4);
 
 		$configuration = new Configuration($configCache, $configAdapter);
@@ -244,7 +245,7 @@ class ConfigurationTest extends MockedTest
 	public function testDeleteWithDB()
 	{
 		$configCache = new ConfigCache(['test' => ['it' => 'now', 'quarter' => 'true']]);
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IConfigAdapter');
+		$configAdapter = \Mockery::mock(IConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(6);
 		// constructor loading
 		$configAdapter->shouldReceive('load')->andReturn([])->once();
diff --git a/tests/src/Core/Config/PConfigurationTest.php b/tests/src/Core/Config/PConfigurationTest.php
index 8ecc9bdf3..025994414 100644
--- a/tests/src/Core/Config/PConfigurationTest.php
+++ b/tests/src/Core/Config/PConfigurationTest.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Test\Core\Config;
 
+use Friendica\Core\Config\Adapter\IPConfigAdapter;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Core\Config\PConfiguration;
 use Friendica\Test\MockedTest;
@@ -29,7 +30,7 @@ class PConfigurationTest extends MockedTest
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter = \Mockery::mock(IPConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
 		// expected loading
 		$configAdapter->shouldReceive('load')
@@ -51,7 +52,7 @@ class PConfigurationTest extends MockedTest
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter = \Mockery::mock(IPConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(4);
 		// expected loading
 		$configAdapter->shouldReceive('load')->with($uid, 'testing')->andReturn(['testing' => ['test' => 'it']])->once();
@@ -77,7 +78,7 @@ class PConfigurationTest extends MockedTest
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter = \Mockery::mock(IPConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(2);
 
 		$configuration = new PConfiguration($configCache, $configAdapter);
@@ -95,7 +96,7 @@ class PConfigurationTest extends MockedTest
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter = \Mockery::mock(IPConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(2);
 		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(true)->once();
 		$configAdapter->shouldReceive('set')->with($uid, 'test', 'it', $data)->andReturn(true)->once();
@@ -114,7 +115,7 @@ class PConfigurationTest extends MockedTest
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter = \Mockery::mock(IPConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
 
 		$configuration = new PConfiguration($configCache, $configAdapter);
@@ -137,7 +138,7 @@ class PConfigurationTest extends MockedTest
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter = \Mockery::mock(IPConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(4);
 		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(false)->once();
 		$configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn('now')->once();
@@ -168,7 +169,7 @@ class PConfigurationTest extends MockedTest
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter = \Mockery::mock(IPConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
 
 		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(false)->once();
@@ -199,7 +200,7 @@ class PConfigurationTest extends MockedTest
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter = \Mockery::mock(IPConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(4);
 
 		$configuration = new PConfiguration($configCache, $configAdapter);
@@ -218,7 +219,7 @@ class PConfigurationTest extends MockedTest
 	{
 		$uid = 234;
 		$configCache = new ConfigCache();
-		$configAdapter = \Mockery::mock('Friendica\Core\Config\Adapter\IPConfigAdapter');
+		$configAdapter = \Mockery::mock(IPConfigAdapter::class);
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(6);
 		$configAdapter->shouldReceive('set')->with($uid, 'test', 'it', 'now')->andReturn(false)->once();
 		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(true)->once();
diff --git a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php b/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
index ce3dac02c..73b6835fb 100644
--- a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
+++ b/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
@@ -52,9 +52,9 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
 		$this->db_user = getenv('MYSQL_USERNAME') . getenv('MYSQL_USER');
 		$this->db_pass = getenv('MYSQL_PASSWORD');
 
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('config', 'php_path', NULL, false)
+			->with('config', 'php_path')
 			->andReturn(false);
 
 		$this->mockL10nT();
diff --git a/tests/src/Core/Console/ConfigConsoleTest.php b/tests/src/Core/Console/ConfigConsoleTest.php
index 5b7d14906..579b28e02 100644
--- a/tests/src/Core/Console/ConfigConsoleTest.php
+++ b/tests/src/Core/Console/ConfigConsoleTest.php
@@ -32,14 +32,14 @@ class ConfigConsoleTest extends ConsoleTest
 	}
 
 	function testSetGetKeyValue() {
-		$this->configCache
+		$this->configMock
 			->shouldReceive('set')
 			->with('config', 'test', 'now')
 			->andReturn(true)
 			->once();
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('config', 'test', NULL, false)
+			->with('config', 'test')
 			->andReturn('now')
 			->twice();
 
@@ -50,9 +50,9 @@ class ConfigConsoleTest extends ConsoleTest
 		$txt = $this->dumpExecute($console);
 		$this->assertEquals("config.test <= now\n", $txt);
 
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('config', 'test', null, false)
+			->with('config', 'test')
 			->andReturn('now')
 			->once();
 
@@ -62,9 +62,9 @@ class ConfigConsoleTest extends ConsoleTest
 		$txt = $this->dumpExecute($console);
 		$this->assertEquals("config.test => now\n", $txt);
 
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('config', 'test', null, false)
+			->with('config', 'test')
 			->andReturn(null)
 			->once();
 
@@ -77,9 +77,9 @@ class ConfigConsoleTest extends ConsoleTest
 
 	function testSetArrayValue() {
 		$testArray = [1, 2, 3];
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('config', 'test', null, false)
+			->with('config', 'test')
 			->andReturn($testArray)
 			->once();
 
@@ -105,9 +105,9 @@ class ConfigConsoleTest extends ConsoleTest
 	}
 
 	function testVerbose() {
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('test', 'it', null, false)
+			->with('test', 'it')
 			->andReturn('now')
 			->once();
 		$console = new Config($this->consoleArgv);
@@ -133,14 +133,14 @@ CONF;
 	}
 
 	function testUnableToSet() {
-		$this->configCache
+		$this->configMock
 			->shouldReceive('set')
 			->with('test', 'it', 'now')
 			->andReturn(false)
 			->once();
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('test', 'it', NULL, false)
+			->with('test', 'it')
 			->andReturn(NULL)
 			->once();
 		$console = new Config();
diff --git a/tests/src/Core/Console/ConsoleTest.php b/tests/src/Core/Console/ConsoleTest.php
index f733175d3..4f7acc9c4 100644
--- a/tests/src/Core/Console/ConsoleTest.php
+++ b/tests/src/Core/Console/ConsoleTest.php
@@ -3,12 +3,10 @@
 namespace Friendica\Test\src\Core\Console;
 
 use Asika\SimpleConsole\Console;
-use Friendica\Core\Config\Configuration;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\AppMockTrait;
 use Friendica\Test\Util\Intercept;
 use Friendica\Test\Util\VFSTrait;
-use Friendica\Util\Profiler;
 
 abstract class ConsoleTest extends MockedTest
 {
@@ -31,10 +29,7 @@ abstract class ConsoleTest extends MockedTest
 		Intercept::setUp();
 
 		$this->setUpVfsDir();
-		$configMock = \Mockery::mock(Configuration::class);
-		$this->mockApp($this->root, $configMock);
-		$profileMock = \Mockery::mock(Profiler::class);
-		$this->app->shouldReceive('getProfiler')->andReturn($profileMock);
+		$this->mockApp($this->root);
 	}
 
 	/**
diff --git a/tests/src/Core/Lock/LockTest.php b/tests/src/Core/Lock/LockTest.php
index c1378aa16..6dc170e51 100644
--- a/tests/src/Core/Lock/LockTest.php
+++ b/tests/src/Core/Lock/LockTest.php
@@ -27,8 +27,7 @@ abstract class LockTest extends MockedTest
 	{
 		// Reusable App object
 		$this->setUpVfsDir();
-		$configMock = \Mockery::mock('Friendica\Core\Config\Configuration');
-		$this->mockApp($this->root, $configMock);
+		$this->mockApp($this->root);
 		$this->app
 			->shouldReceive('getHostname')
 			->andReturn('friendica.local');
diff --git a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php b/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
index 0e118c5dd..ad20f5bfd 100644
--- a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
+++ b/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
@@ -13,14 +13,14 @@ class MemcacheCacheLockDriverTest extends LockTest
 {
 	protected function getInstance()
 	{
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('system', 'memcache_host', NULL, false)
+			->with('system', 'memcache_host')
 			->andReturn('localhost');
 
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('system', 'memcache_port', NULL, false)
+			->with('system', 'memcache_port')
 			->andReturn(11211);
 
 		return new CacheLockDriver(CacheDriverFactory::create('memcache'));
diff --git a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php b/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
index fe490a38c..a5bdeaedb 100644
--- a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
+++ b/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
@@ -13,9 +13,9 @@ class MemcachedCacheLockDriverTest extends LockTest
 {
 	protected function getInstance()
 	{
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('system', 'memcached_hosts', NULL, false)
+			->with('system', 'memcached_hosts')
 			->andReturn([0 => 'localhost, 11211']);
 
 		return new CacheLockDriver(CacheDriverFactory::create('memcached'));
diff --git a/tests/src/Core/Lock/RedisCacheLockDriverTest.php b/tests/src/Core/Lock/RedisCacheLockDriverTest.php
index f5d0a648f..5f047bc66 100644
--- a/tests/src/Core/Lock/RedisCacheLockDriverTest.php
+++ b/tests/src/Core/Lock/RedisCacheLockDriverTest.php
@@ -13,14 +13,14 @@ class RedisCacheLockDriverTest extends LockTest
 {
 	protected function getInstance()
 	{
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('system', 'redis_host', NULL, false)
+			->with('system', 'redis_host')
 			->andReturn('localhost');
 
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('system', 'redis_port', NULL, false)
+			->with('system', 'redis_port')
 			->andReturn(null);
 
 		return new CacheLockDriver(CacheDriverFactory::create('redis'));
diff --git a/tests/src/Core/Lock/SemaphoreLockDriverTest.php b/tests/src/Core/Lock/SemaphoreLockDriverTest.php
index bf422f2f8..a37fbffbe 100644
--- a/tests/src/Core/Lock/SemaphoreLockDriverTest.php
+++ b/tests/src/Core/Lock/SemaphoreLockDriverTest.php
@@ -12,9 +12,9 @@ class SemaphoreLockDriverTest extends LockTest
 
 		$this->app->shouldReceive('getHostname')->andReturn('friendica.local');
 
-		$this->configCache
+		$this->configMock
 			->shouldReceive('get')
-			->with('system', 'temppath', NULL, false)
+			->with('system', 'temppath')
 			->andReturn('/tmp/');
 	}
 

From bfed7b3b2faaabd627bdeb09dc3b0bd16b1f3f5e Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 17 Feb 2019 21:43:19 +0100
Subject: [PATCH 037/145] removing comment

---
 index.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/index.php b/index.php
index 6bbd70a19..47264362c 100644
--- a/index.php
+++ b/index.php
@@ -12,8 +12,6 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
 
 require __DIR__ . '/vendor/autoload.php';
 
-// We assume that the index.php is called by a frontend process
-// The value is set to "true" by default in App
 $a = Factory\DependencyFactory::setUp('index', __DIR__, true);
 
 $a->runFrontend();

From 218e41a818fb0bed0c2733fa6be831b5287a747f Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 00:26:38 +0100
Subject: [PATCH 038/145] Bugfixing index.php

---
 index.php   | 2 +-
 src/App.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.php b/index.php
index 47264362c..e98987289 100644
--- a/index.php
+++ b/index.php
@@ -12,6 +12,6 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
 
 require __DIR__ . '/vendor/autoload.php';
 
-$a = Factory\DependencyFactory::setUp('index', __DIR__, true);
+$a = Factory\DependencyFactory::setUp('index', __DIR__, false);
 
 $a->runFrontend();
diff --git a/src/App.php b/src/App.php
index ca2b6dfc2..f48abcf9c 100644
--- a/src/App.php
+++ b/src/App.php
@@ -214,18 +214,18 @@ class App
 	 */
 	public function __construct(Configuration $config, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
 	{
+		BaseObject::setApp($this);
+
 		$this->logger   = $logger;
 		$this->config   = $config;
 		$this->profiler = $profiler;
 		$this->basePath = $this->config->get('system', 'basepath');
 
 		if (!Core\System::isDirectoryUsable($this->basePath, false)) {
-			throw new Exception('Basepath ' . $this->basePath . ' isn\'t usable.');
+			throw new Exception('Basepath \'' . $this->basePath . '\' isn\'t usable.');
 		}
 		$this->basePath = rtrim($this->basePath, DIRECTORY_SEPARATOR);
 
-		BaseObject::setApp($this);
-
 		$this->checkBackend($isBackend);
 		$this->checkFriendicaApp();
 

From 95deff1685ceff88e7acd002b2341913cc51f011 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 01:15:55 +0100
Subject: [PATCH 039/145] use cache for basepath

---
 src/App.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.php b/src/App.php
index f48abcf9c..f41d486b5 100644
--- a/src/App.php
+++ b/src/App.php
@@ -219,7 +219,7 @@ class App
 		$this->logger   = $logger;
 		$this->config   = $config;
 		$this->profiler = $profiler;
-		$this->basePath = $this->config->get('system', 'basepath');
+		$this->basePath = $this->config->getCache()->get('system', 'basepath');
 
 		if (!Core\System::isDirectoryUsable($this->basePath, false)) {
 			throw new Exception('Basepath \'' . $this->basePath . '\' isn\'t usable.');

From 85f050849473b4ca16567f4261f6dbb3fbf9f0c4 Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Mon, 18 Feb 2019 03:00:10 +0100
Subject: [PATCH 040/145] own function for processing data of directory entries

---
 mod/directory.php                             | 123 +++++++++---------
 view/templates/directory_header.tpl           |   2 +-
 view/theme/frio/css/style.css                 |   2 +-
 .../theme/frio/templates/directory_header.tpl |  60 ++++-----
 4 files changed, 97 insertions(+), 90 deletions(-)

diff --git a/mod/directory.php b/mod/directory.php
index 6ef313451..a1e37d677 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -45,6 +45,8 @@ function directory_content(App $a)
 	}
 
 	$o = '';
+	$entries = [];
+
 	Nav::setSelected('directory');
 
 	if (!empty($a->data['search'])) {
@@ -98,7 +100,7 @@ function directory_content(App $a)
 	$limit = $pager->getStart()."," . $pager->getItemsPerPage();
 
 	$r = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
-			`contact`.`addr`, `contact`.`url` AS profile_url FROM `profile`
+			`contact`.`addr`, `contact`.`url` AS `profile_url` FROM `profile`
 			LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
 			LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
 			WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
@@ -111,39 +113,68 @@ function directory_content(App $a)
 			$photo = 'photo';
 		}
 
-		$entries = [];
-
 		while ($rr = DBA::fetch($r)) {
-			$itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
+			$entries[] = format_directory_entry($rr, $photo);
+		}
+		DBA::close($r);
+	} else {
+		info(L10n::t("No entries \x28some entries may be hidden\x29.") . EOL);
+	}
 
-			$profile_link = $rr['profile_url'];
+	$tpl = Renderer::getMarkupTemplate('directory_header.tpl');
 
-			$pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
+	$o .= Renderer::replaceMacros($tpl, [
+		'$search'    => $search,
+		'$globaldir' => L10n::t('Global Directory'),
+		'$gdirpath'  => $gdirpath,
+		'$desc'      => L10n::t('Find on this site'),
+		'$contacts'  => $entries,
+		'$finding'   => L10n::t('Results for:'),
+		'$findterm'  => (strlen($search) ? $search : ""),
+		'$title'     => L10n::t('Site Directory'),
+		'$search_mod' => 'directory',
+		'$submit'    => L10n::t('Find'),
+		'$paginate'  => $pager->renderFull($total),
+	]);
+
+	return $o;
+}
+
+/**
+ * Format contact/profile/user data from the database into an usable
+ * array for displaying directory entries.
+ * 
+ * @param type $r The directory entry from the database.
+ * @param string $photo_size Avatar size (thumb, photo or micro).
+ * 
+ * @return array
+ */
+function format_directory_entry($arr, $photo_size = 'photo')
+{
+			$itemurl = (($arr['addr'] != "") ? $arr['addr'] : $arr['profile_url']);
+
+			$profile_link = $arr['profile_url'];
+
+			$pdesc = (($arr['pdesc']) ? $arr['pdesc'] . '<br />' : '');
 
 			$details = '';
-			if (strlen($rr['locality'])) {
-				$details .= $rr['locality'];
+			if (strlen($arr['locality'])) {
+				$details .= $arr['locality'];
 			}
-			if (strlen($rr['region'])) {
-				if (strlen($rr['locality'])) {
+			if (strlen($arr['region'])) {
+				if (strlen($arr['locality'])) {
 					$details .= ', ';
 				}
-				$details .= $rr['region'];
+				$details .= $arr['region'];
 			}
-			if (strlen($rr['country-name'])) {
+			if (strlen($arr['country-name'])) {
 				if (strlen($details)) {
 					$details .= ', ';
 				}
-				$details .= $rr['country-name'];
+				$details .= $arr['country-name'];
 			}
-//			if(strlen($rr['dob'])) {
-//				if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
-//					$details .= '<br />' . L10n::t('Age: ') . $years;
-//			}
-//			if(strlen($rr['gender']))
-//				$details .= '<br />' . L10n::t('Gender: ') . $rr['gender'];
 
-			$profile = $rr;
+			$profile = $arr;
 
 			if (!empty($profile['address'])
 				|| !empty($profile['locality'])
@@ -156,10 +187,10 @@ function directory_content(App $a)
 				$location = '';
 			}
 
-			$gender   = (!empty($profile['gender']) ? L10n::t('Gender:')   : false);
-			$marital  = (!empty($profile['marital']) ? L10n::t('Status:')   : false);
+			$gender   = (!empty($profile['gender'])   ? L10n::t('Gender:')   : false);
+			$marital  = (!empty($profile['marital'])  ? L10n::t('Status:')   : false);
 			$homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false);
-			$about    = (!empty($profile['about']) ? L10n::t('About:')    : false);
+			$about    = (!empty($profile['about'])    ? L10n::t('About:')    : false);
 
 			$location_e = $location;
 
@@ -168,17 +199,17 @@ function directory_content(App $a)
 			];
 
 			$entry = [
-				'id'           => $rr['id'],
+				'id'           => $arr['id'],
 				'url'          => Contact::magicLInk($profile_link),
 				'itemurl'      => $itemurl,
-				'thumb'        => ProxyUtils::proxifyUrl($rr[$photo], false, ProxyUtils::SIZE_THUMB),
-				'img_hover'    => $rr['name'],
-				'name'         => $rr['name'],
+				'thumb'        => ProxyUtils::proxifyUrl($arr[$photo_size], false, ProxyUtils::SIZE_THUMB),
+				'img_hover'    => $arr['name'],
+				'name'         => $arr['name'],
 				'details'      => $details,
-				'account_type' => Contact::getAccountType($rr),
+				'account_type' => Contact::getAccountType($arr),
 				'profile'      => $profile,
 				'location'     => $location_e,
-				'tags'         => $rr['pub_keywords'],
+				'tags'         => $arr['pub_keywords'],
 				'gender'       => $gender,
 				'pdesc'        => $pdesc,
 				'marital'      => $marital,
@@ -188,38 +219,12 @@ function directory_content(App $a)
 
 			];
 
-			$arr = ['contact' => $rr, 'entry' => $entry];
+			$hook = ['contact' => $arr, 'entry' => $entry];
 
-			Hook::callAll('directory_item', $arr);
+			Hook::callAll('directory_item', $hook);
 
 			unset($profile);
 			unset($location);
 
-			if (!$arr['entry']) {
-				continue;
-			}
-
-			$entries[] = $arr['entry'];
-		}
-		DBA::close($r);
-
-		$tpl = Renderer::getMarkupTemplate('directory_header.tpl');
-
-		$o .= Renderer::replaceMacros($tpl, [
-			'$search'    => $search,
-			'$globaldir' => L10n::t('Global Directory'),
-			'$gdirpath'  => $gdirpath,
-			'$desc'      => L10n::t('Find on this site'),
-			'$contacts'  => $entries,
-			'$finding'   => L10n::t('Results for:'),
-			'$findterm'  => (strlen($search) ? $search : ""),
-			'$title'     => L10n::t('Site Directory'),
-			'$submit'    => L10n::t('Find'),
-			'$paginate'  => $pager->renderFull($total),
-		]);
-	} else {
-		info(L10n::t("No entries \x28some entries may be hidden\x29.") . EOL);
-	}
-
-	return $o;
-}
+			return $hook['entry'];
+}
\ No newline at end of file
diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl
index 4c9fe1298..06776aa00 100644
--- a/view/templates/directory_header.tpl
+++ b/view/templates/directory_header.tpl
@@ -9,7 +9,7 @@
 
 
 <div id="directory-search-wrapper">
-	<form id="directory-search-form" action="directory" method="get" >
+	<form id="directory-search-form" action="{{$search_mod}}" method="get" >
 		<span class="dirsearch-desc">{{$desc nofilter}}</span>
 		<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
 		<input type="submit" name="submit" id="directory-search-submit" value="{{$submit}}" class="button" />
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 6759195ee..eba1a2ed2 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2315,7 +2315,7 @@ ul.dropdown-menu li:hover {
 .generic-page-wrapper, .profile_photo-content-wrapper, .videos-content-wrapper,
  .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper,
 .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
-.directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
+.manage-content-wrapper, .notes-content-wrapper,
 .message-content-wrapper, .apps-content-wrapper,
 #adminpage, .delegate-content-wrapper, .uexport-content-wrapper,
 .viewcontacts-content-wrapper, .dfrn_request-content-wrapper,
diff --git a/view/theme/frio/templates/directory_header.tpl b/view/theme/frio/templates/directory_header.tpl
index 98ec3f5e2..087614b0d 100644
--- a/view/theme/frio/templates/directory_header.tpl
+++ b/view/theme/frio/templates/directory_header.tpl
@@ -1,40 +1,42 @@
 
-{{if $gdirpath}}
-<ul class="list-unstyled pull-right">
-	<li><div id="global-directory-link"><a href="{{$gdirpath}}">{{$globaldir}}</a></div></li>
-</ul>
-{{/if}}
+<div class="generic-page-wrapper">
+	{{if $gdirpath}}
+	<ul class="list-unstyled pull-right">
+		<li><div id="global-directory-link"><a href="{{$gdirpath}}">{{$globaldir}}</a></div></li>
+	</ul>
+	{{/if}}
 
-{{include file="section_title.tpl"}}
+	{{include file="section_title.tpl"}}
 
 
-{{* The search input field to search for contacts *}}
-<div id="directory-search-wrapper">
-	<form id="directory-search-form" class="navbar-form" role="search" action="directory" method="get" >
-		<div class="row">
-			<div class="col-md-2"></div>
-			<div class="col-md-8 ">
-				<div class="form-group form-group-search">
-					<input type="text" name="search" id="directory-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc nofilter}}"/>
-					<button class="btn btn-default btn-sm form-button-search" type="submit" id="directory-search-submit">{{$submit}}</button>
+	{{* The search input field to search for contacts *}}
+	<div id="directory-search-wrapper">
+		<form id="directory-search-form" class="navbar-form" role="search" action="{{$search_mod}}" method="get" >
+			<div class="row">
+				<div class="col-md-2"></div>
+				<div class="col-md-8 ">
+					<div class="form-group form-group-search">
+						<input type="text" name="search" id="directory-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc nofilter}}"/>
+						<button class="btn btn-default btn-sm form-button-search" type="submit" id="directory-search-submit">{{$submit}}</button>
+					</div>
 				</div>
+				<div class="col-md-2"></div>
 			</div>
-			<div class="col-md-2"></div>
-		</div>
-	</form>
-</div>
+		</form>
+	</div>
 
-<hr>
+	<hr>
 
-<div id="directory-search-end" class="clear"></div>
+	<div id="directory-search-end" class="clear"></div>
 
-{{* format each contact with the contact_template.tpl *}}
-<ul id="viewcontact_wrapper" class="viewcontact_wrapper media-list">
-{{foreach $contacts as $contact}}
-	<li>{{include file="contact_template.tpl"}}</li>
-{{/foreach}}
-</ul>
+	{{* format each contact with the contact_template.tpl *}}
+	<ul id="viewcontact_wrapper" class="viewcontact_wrapper media-list">
+	{{foreach $contacts as $contact}}
+		<li>{{include file="contact_template.tpl"}}</li>
+	{{/foreach}}
+	</ul>
 
-<div class="directory-end" ></div>
+	<div class="directory-end" ></div>
 
-{{$paginate nofilter}}
+	{{$paginate nofilter}}
+</div>
\ No newline at end of file

From a3d6062476dde7fecfb559bb366a3f22cb6ead57 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 08:51:38 +0100
Subject: [PATCH 041/145] check if value is set get basepath with config
 instead cache

---
 src/App.php                                  |  2 +-
 src/Core/Config/Adapter/JITConfigAdapter.php | 18 ++++++++++++++++--
 src/Core/Config/Configuration.php            |  6 ++++++
 src/Core/Worker.php                          |  2 ++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/App.php b/src/App.php
index f41d486b5..f48abcf9c 100644
--- a/src/App.php
+++ b/src/App.php
@@ -219,7 +219,7 @@ class App
 		$this->logger   = $logger;
 		$this->config   = $config;
 		$this->profiler = $profiler;
-		$this->basePath = $this->config->getCache()->get('system', 'basepath');
+		$this->basePath = $this->config->get('system', 'basepath');
 
 		if (!Core\System::isDirectoryUsable($this->basePath, false)) {
 			throw new Exception('Basepath \'' . $this->basePath . '\' isn\'t usable.');
diff --git a/src/Core/Config/Adapter/JITConfigAdapter.php b/src/Core/Config/Adapter/JITConfigAdapter.php
index 95211777f..0c94f8127 100644
--- a/src/Core/Config/Adapter/JITConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITConfigAdapter.php
@@ -1,6 +1,7 @@
 <?php
 namespace Friendica\Core\Config\Adapter;
 
+use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 
 /**
@@ -57,8 +58,17 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 			// manage array value
 			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
 
-			$this->in_db[$cat][$key] = true;
-			return $value;
+			if ($key === 'last_worker_execution') {
+				Logger::alert('catchmeifyou', ['store' => $value, 'in_db' => $this->in_db[$cat][$key]]);
+			}
+
+			if (isset($value) && $value !== '') {
+				$this->in_db[$cat][$key] = true;
+				return $value;
+			} else {
+				$this->in_db[$cat][$key] = false;
+				return '!<unset>!';
+			}
 		} else {
 
 			$this->in_db[$cat][$key] = false;
@@ -89,6 +99,10 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 			$this->in_db[$cat][$key] = false;
 		}
 
+		if ($key === 'last_worker_execution') {
+			Logger::alert('catchmeifyou', ['db' => $dbvalue, 'store' => $stored, 'in_db' => $this->in_db[$cat][$key]]);
+		}
+
 		if (($stored === $dbvalue) && $this->in_db[$cat][$key]) {
 			return true;
 		}
diff --git a/src/Core/Config/Configuration.php b/src/Core/Config/Configuration.php
index 2ac0da0ad..48220c2de 100644
--- a/src/Core/Config/Configuration.php
+++ b/src/Core/Config/Configuration.php
@@ -2,6 +2,8 @@
 
 namespace Friendica\Core\Config;
 
+use Friendica\Core\Logger;
+
 /**
  * This class is responsible for all system-wide configuration values in Friendica
  * There are two types of storage
@@ -114,6 +116,10 @@ class Configuration
 	 */
 	public function set($cat, $key, $value)
 	{
+		if ($key === 'last_worker_execution') {
+			Logger::alert('catchmeifyou', ['value' => $value]);
+		}
+
 		// set the cache first
 		$cached = $this->configCache->set($cat, $key, $value);
 
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index dff60e9fa..c5d60f14d 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -277,6 +277,8 @@ class Worker
 			$age = (time() - self::$last_update) / 60;
 			self::$last_update = time();
 
+			Logger::alert('last_update', ['age' => $age, 'last_update' => self::$last_update]);
+
 			if ($age > 1) {
 				$stamp = (float)microtime(true);
 				DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);

From 86aaa6565e4630ecbc4a70eb3bb3faabaea5b86c Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 11:18:05 +0100
Subject: [PATCH 042/145] Fixing saveLog()

---
 src/Core/Worker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index c5d60f14d..13db8d97e 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -441,7 +441,7 @@ class Worker
 
 		Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".number_format($duration, 4)." seconds. Process PID: ".$new_process_id);
 
-		$a->getProfiler()->saveLog("ID " . $queue["id"] . ": " . $funcname);
+		$a->getProfiler()->saveLog($a->getLogger(), "ID " . $queue["id"] . ": " . $funcname);
 
 		$cooldown = Config::get("system", "worker_cooldown", 0);
 

From f53610791184ad8a567fb6a61cb3ad437519c2a4 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 11:27:51 +0100
Subject: [PATCH 043/145] Fixing value check for configuration

---
 src/Core/Config/Adapter/JITConfigAdapter.php  | 19 +++----------------
 src/Core/Config/Adapter/JITPConfigAdapter.php | 13 +++++++------
 .../Config/Adapter/PreloadConfigAdapter.php   |  9 +++++----
 .../Config/Adapter/PreloadPConfigAdapter.php  |  7 ++++---
 src/Core/Config/Configuration.php             |  6 ------
 src/Core/Worker.php                           |  2 --
 6 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/src/Core/Config/Adapter/JITConfigAdapter.php b/src/Core/Config/Adapter/JITConfigAdapter.php
index 0c94f8127..5d06dc2b3 100644
--- a/src/Core/Config/Adapter/JITConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITConfigAdapter.php
@@ -1,7 +1,6 @@
 <?php
 namespace Friendica\Core\Config\Adapter;
 
-use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 
 /**
@@ -58,22 +57,14 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 			// manage array value
 			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
 
-			if ($key === 'last_worker_execution') {
-				Logger::alert('catchmeifyou', ['store' => $value, 'in_db' => $this->in_db[$cat][$key]]);
-			}
-
 			if (isset($value) && $value !== '') {
 				$this->in_db[$cat][$key] = true;
 				return $value;
-			} else {
-				$this->in_db[$cat][$key] = false;
-				return '!<unset>!';
 			}
-		} else {
-
-			$this->in_db[$cat][$key] = false;
-			return '!<unset>!';
 		}
+
+		$this->in_db[$cat][$key] = false;
+		return '!<unset>!';
 	}
 
 	/**
@@ -99,10 +90,6 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 			$this->in_db[$cat][$key] = false;
 		}
 
-		if ($key === 'last_worker_execution') {
-			Logger::alert('catchmeifyou', ['db' => $dbvalue, 'store' => $stored, 'in_db' => $this->in_db[$cat][$key]]);
-		}
-
 		if (($stored === $dbvalue) && $this->in_db[$cat][$key]) {
 			return true;
 		}
diff --git a/src/Core/Config/Adapter/JITPConfigAdapter.php b/src/Core/Config/Adapter/JITPConfigAdapter.php
index c5f3a381e..d3c38623b 100644
--- a/src/Core/Config/Adapter/JITPConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITPConfigAdapter.php
@@ -57,13 +57,14 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
 			// manage array value
 			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']);
 
-			$this->in_db[$uid][$cat][$key] = true;
-			return $value;
-		} else {
-
-			$this->in_db[$uid][$cat][$key] = false;
-			return '!<unset>!';
+			if (isset($value) && $value !== '') {
+				$this->in_db[$uid][$cat][$key] = true;
+				return $value;
+			}
 		}
+
+		$this->in_db[$uid][$cat][$key] = false;
+		return '!<unset>!';
 	}
 
 	/**
diff --git a/src/Core/Config/Adapter/PreloadConfigAdapter.php b/src/Core/Config/Adapter/PreloadConfigAdapter.php
index fa691a16d..b1866a259 100644
--- a/src/Core/Config/Adapter/PreloadConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadConfigAdapter.php
@@ -55,11 +55,12 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 			// manage array value
 			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
 
-			return $value;
-		} else {
-
-			return '!<unset>!';
+			if (isset($value) && $value !== '') {
+				return $value;
+			}
 		}
+
+		return '!<unset>!';
 	}
 
 	/**
diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
index e79a4a1e3..857f2b176 100644
--- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -71,10 +71,11 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 			// manage array value
 			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
 
-			return $value;
-		} else {
-			return '!<unset>!';
+			if (isset($value) && $value !== '') {
+				return $value;
+			}
 		}
+		return '!<unset>!';
 	}
 
 	/**
diff --git a/src/Core/Config/Configuration.php b/src/Core/Config/Configuration.php
index 48220c2de..2ac0da0ad 100644
--- a/src/Core/Config/Configuration.php
+++ b/src/Core/Config/Configuration.php
@@ -2,8 +2,6 @@
 
 namespace Friendica\Core\Config;
 
-use Friendica\Core\Logger;
-
 /**
  * This class is responsible for all system-wide configuration values in Friendica
  * There are two types of storage
@@ -116,10 +114,6 @@ class Configuration
 	 */
 	public function set($cat, $key, $value)
 	{
-		if ($key === 'last_worker_execution') {
-			Logger::alert('catchmeifyou', ['value' => $value]);
-		}
-
 		// set the cache first
 		$cached = $this->configCache->set($cat, $key, $value);
 
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 13db8d97e..4007a7923 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -277,8 +277,6 @@ class Worker
 			$age = (time() - self::$last_update) / 60;
 			self::$last_update = time();
 
-			Logger::alert('last_update', ['age' => $age, 'last_update' => self::$last_update]);
-
 			if ($age > 1) {
 				$stamp = (float)microtime(true);
 				DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);

From 2b7c331afbb3adc739c2857f11cb70174adcff89 Mon Sep 17 00:00:00 2001
From: rabuzarus <trebor@central-unit>
Date: Mon, 18 Feb 2019 13:03:21 +0100
Subject: [PATCH 044/145] forumdirectory: some polishing

---
 mod/directory.php                             | 130 +++++++++---------
 view/templates/directory_header.tpl           |   1 -
 .../theme/frio/templates/directory_header.tpl |   3 +-
 3 files changed, 66 insertions(+), 68 deletions(-)

diff --git a/mod/directory.php b/mod/directory.php
index a1e37d677..a3fc965c8 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -144,87 +144,87 @@ function directory_content(App $a)
  * Format contact/profile/user data from the database into an usable
  * array for displaying directory entries.
  * 
- * @param type $r The directory entry from the database.
+ * @param type $arr The directory entry from the database.
  * @param string $photo_size Avatar size (thumb, photo or micro).
  * 
  * @return array
  */
-function format_directory_entry($arr, $photo_size = 'photo')
+function format_directory_entry(array $arr, $photo_size = 'photo')
 {
-			$itemurl = (($arr['addr'] != "") ? $arr['addr'] : $arr['profile_url']);
+	$itemurl = (($arr['addr'] != "") ? $arr['addr'] : $arr['profile_url']);
 
-			$profile_link = $arr['profile_url'];
+	$profile_link = $arr['profile_url'];
 
-			$pdesc = (($arr['pdesc']) ? $arr['pdesc'] . '<br />' : '');
+	$pdesc = (($arr['pdesc']) ? $arr['pdesc'] . '<br />' : '');
 
-			$details = '';
-			if (strlen($arr['locality'])) {
-				$details .= $arr['locality'];
-			}
-			if (strlen($arr['region'])) {
-				if (strlen($arr['locality'])) {
-					$details .= ', ';
-				}
-				$details .= $arr['region'];
-			}
-			if (strlen($arr['country-name'])) {
-				if (strlen($details)) {
-					$details .= ', ';
-				}
-				$details .= $arr['country-name'];
-			}
+	$details = '';
+	if (strlen($arr['locality'])) {
+		$details .= $arr['locality'];
+	}
+	if (strlen($arr['region'])) {
+		if (strlen($arr['locality'])) {
+			$details .= ', ';
+		}
+		$details .= $arr['region'];
+	}
+	if (strlen($arr['country-name'])) {
+		if (strlen($details)) {
+			$details .= ', ';
+		}
+		$details .= $arr['country-name'];
+	}
 
-			$profile = $arr;
+	$profile = $arr;
 
-			if (!empty($profile['address'])
-				|| !empty($profile['locality'])
-				|| !empty($profile['region'])
-				|| !empty($profile['postal-code'])
-				|| !empty($profile['country-name'])
-			) {
-				$location = L10n::t('Location:');
-			} else {
-				$location = '';
-			}
+	if (!empty($profile['address'])
+		|| !empty($profile['locality'])
+		|| !empty($profile['region'])
+		|| !empty($profile['postal-code'])
+		|| !empty($profile['country-name'])
+	) {
+		$location = L10n::t('Location:');
+	} else {
+		$location = '';
+	}
 
-			$gender   = (!empty($profile['gender'])   ? L10n::t('Gender:')   : false);
-			$marital  = (!empty($profile['marital'])  ? L10n::t('Status:')   : false);
-			$homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false);
-			$about    = (!empty($profile['about'])    ? L10n::t('About:')    : false);
+	$gender   = (!empty($profile['gender'])   ? L10n::t('Gender:')   : false);
+	$marital  = (!empty($profile['marital'])  ? L10n::t('Status:')   : false);
+	$homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false);
+	$about    = (!empty($profile['about'])    ? L10n::t('About:')    : false);
 
-			$location_e = $location;
+	$location_e = $location;
 
-			$photo_menu = [
-				'profile' => [L10n::t("View Profile"), Contact::magicLink($profile_link)]
-			];
+	$photo_menu = [
+		'profile' => [L10n::t("View Profile"), Contact::magicLink($profile_link)]
+	];
 
-			$entry = [
-				'id'           => $arr['id'],
-				'url'          => Contact::magicLInk($profile_link),
-				'itemurl'      => $itemurl,
-				'thumb'        => ProxyUtils::proxifyUrl($arr[$photo_size], false, ProxyUtils::SIZE_THUMB),
-				'img_hover'    => $arr['name'],
-				'name'         => $arr['name'],
-				'details'      => $details,
-				'account_type' => Contact::getAccountType($arr),
-				'profile'      => $profile,
-				'location'     => $location_e,
-				'tags'         => $arr['pub_keywords'],
-				'gender'       => $gender,
-				'pdesc'        => $pdesc,
-				'marital'      => $marital,
-				'homepage'     => $homepage,
-				'about'        => $about,
-				'photo_menu'   => $photo_menu,
+	$entry = [
+		'id'           => $arr['id'],
+		'url'          => Contact::magicLInk($profile_link),
+		'itemurl'      => $itemurl,
+		'thumb'        => ProxyUtils::proxifyUrl($arr[$photo_size], false, ProxyUtils::SIZE_THUMB),
+		'img_hover'    => $arr['name'],
+		'name'         => $arr['name'],
+		'details'      => $details,
+		'account_type' => Contact::getAccountType($arr),
+		'profile'      => $profile,
+		'location'     => $location_e,
+		'tags'         => $arr['pub_keywords'],
+		'gender'       => $gender,
+		'pdesc'        => $pdesc,
+		'marital'      => $marital,
+		'homepage'     => $homepage,
+		'about'        => $about,
+		'photo_menu'   => $photo_menu,
 
-			];
+	];
 
-			$hook = ['contact' => $arr, 'entry' => $entry];
+	$hook = ['contact' => $arr, 'entry' => $entry];
 
-			Hook::callAll('directory_item', $hook);
+	Hook::callAll('directory_item', $hook);
 
-			unset($profile);
-			unset($location);
+	unset($profile);
+	unset($location);
 
-			return $hook['entry'];
-}
\ No newline at end of file
+	return $hook['entry'];
+}
diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl
index 06776aa00..14b1074dc 100644
--- a/view/templates/directory_header.tpl
+++ b/view/templates/directory_header.tpl
@@ -7,7 +7,6 @@
 	</ul>
 {{/if}}
 
-
 <div id="directory-search-wrapper">
 	<form id="directory-search-form" action="{{$search_mod}}" method="get" >
 		<span class="dirsearch-desc">{{$desc nofilter}}</span>
diff --git a/view/theme/frio/templates/directory_header.tpl b/view/theme/frio/templates/directory_header.tpl
index 087614b0d..36812916d 100644
--- a/view/theme/frio/templates/directory_header.tpl
+++ b/view/theme/frio/templates/directory_header.tpl
@@ -8,7 +8,6 @@
 
 	{{include file="section_title.tpl"}}
 
-
 	{{* The search input field to search for contacts *}}
 	<div id="directory-search-wrapper">
 		<form id="directory-search-form" class="navbar-form" role="search" action="{{$search_mod}}" method="get" >
@@ -39,4 +38,4 @@
 	<div class="directory-end" ></div>
 
 	{{$paginate nofilter}}
-</div>
\ No newline at end of file
+</div>

From 3ba7907b57a018617d57c9ae216ecbf03e914803 Mon Sep 17 00:00:00 2001
From: rabuzarus <trebor@central-unit>
Date: Mon, 18 Feb 2019 13:27:26 +0100
Subject: [PATCH 045/145] forumdirectory: type is array

---
 mod/directory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/directory.php b/mod/directory.php
index a3fc965c8..256c9bbbd 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -144,7 +144,7 @@ function directory_content(App $a)
  * Format contact/profile/user data from the database into an usable
  * array for displaying directory entries.
  * 
- * @param type $arr The directory entry from the database.
+ * @param array $arr The directory entry from the database.
  * @param string $photo_size Avatar size (thumb, photo or micro).
  * 
  * @return array

From 2fc81898dabafafbdc902bfae96c3c64a1fc0700 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 14:00:34 +0100
Subject: [PATCH 046/145] Preload Adapter Fix

---
 src/Core/Config/Adapter/JITConfigAdapter.php  |  9 +++++---
 src/Core/Config/Adapter/JITPConfigAdapter.php |  8 ++++---
 .../Config/Adapter/PreloadConfigAdapter.php   |  5 +++-
 .../Config/Adapter/PreloadPConfigAdapter.php  |  5 +++-
 src/Core/Config/Cache/ConfigCache.php         | 23 ++++++++++++++-----
 5 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/Core/Config/Adapter/JITConfigAdapter.php b/src/Core/Config/Adapter/JITConfigAdapter.php
index 5d06dc2b3..c0d680d2c 100644
--- a/src/Core/Config/Adapter/JITConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITConfigAdapter.php
@@ -33,10 +33,13 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 
 		$configs = DBA::select('config', ['v', 'k'], ['cat' => $cat]);
 		while ($config = DBA::fetch($configs)) {
-			$key = $config['k'];
+			$key   = $config['k'];
+			$value = $config['v'];
 
-			$return[$key] = $config['v'];
-			$this->in_db[$cat][$key] = true;
+			if (isset($value) && $value !== '') {
+				$return[$key] = $value;
+				$this->in_db[$cat][$key] = true;
+			}
 		}
 		DBA::close($configs);
 
diff --git a/src/Core/Config/Adapter/JITPConfigAdapter.php b/src/Core/Config/Adapter/JITPConfigAdapter.php
index d3c38623b..4485ee5df 100644
--- a/src/Core/Config/Adapter/JITPConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITPConfigAdapter.php
@@ -29,10 +29,12 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
 		if (DBA::isResult($pconfigs)) {
 			while ($pconfig = DBA::fetch($pconfigs)) {
 				$key = $pconfig['k'];
+				$value = $pconfig['v'];
 
-				$return[$key] = $pconfig['v'];
-
-				$this->in_db[$uid][$cat][$key] = true;
+				if (isset($value) && $value !== '') {
+					$return[$key] = $value;
+					$this->in_db[$uid][$cat][$key] = true;
+				}
 			}
 		} else if ($cat != 'config') {
 			// Negative caching
diff --git a/src/Core/Config/Adapter/PreloadConfigAdapter.php b/src/Core/Config/Adapter/PreloadConfigAdapter.php
index b1866a259..d4ce6406b 100644
--- a/src/Core/Config/Adapter/PreloadConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadConfigAdapter.php
@@ -32,7 +32,10 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 
 		$configs = DBA::select('config', ['cat', 'v', 'k']);
 		while ($config = DBA::fetch($configs)) {
-			$return[$config['cat']][$config['k']] = $config['v'];
+			$value = $config['v'];
+			if (isset($value) && $value !== '') {
+				$return[$config['cat']][$config['k']] = $value;
+			}
 		}
 		DBA::close($configs);
 
diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
index 857f2b176..090d0f5c6 100644
--- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -44,7 +44,10 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 
 		$pconfigs = DBA::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
 		while ($pconfig = DBA::fetch($pconfigs)) {
-			$return[$pconfig['cat']][$pconfig['k']] = $pconfig['v'];
+			$value = $pconfig['v'];
+			if (isset($value) && $value !== '') {
+				$return[$pconfig['cat']][$pconfig['k']] = $value;
+			}
 		}
 		DBA::close($pconfigs);
 
diff --git a/src/Core/Config/Cache/ConfigCache.php b/src/Core/Config/Cache/ConfigCache.php
index 54da327db..4ebcc8748 100644
--- a/src/Core/Config/Cache/ConfigCache.php
+++ b/src/Core/Config/Cache/ConfigCache.php
@@ -36,11 +36,12 @@ class ConfigCache implements IConfigCache, IPConfigCache
 				$keys = array_keys($config[$category]);
 
 				foreach ($keys as $key) {
-					if (isset($config[$category][$key])) {
+					$value = $config[$category][$key];
+					if (isset($value) && $value !== '!<unset>!') {
 						if ($overwrite) {
-							$this->set($category, $key, $config[$category][$key]);
+							$this->set($category, $key, $value);
 						} else {
-							$this->setDefault($category, $key, $config[$category][$key]);
+							$this->setDefault($category, $key, $value);
 						}
 					}
 				}
@@ -132,9 +133,19 @@ class ConfigCache implements IConfigCache, IPConfigCache
 	 */
 	public function loadP($uid, array $config)
 	{
-		foreach ($config as $category => $values) {
-			foreach ($values as $key => $value) {
-				$this->setP($uid, $category, $key, $value);
+		$categories = array_keys($config);
+
+		foreach ($categories as $category) {
+			if (isset($config[$category]) && is_array($config[$category])) {
+
+				$keys = array_keys($config[$category]);
+
+				foreach ($keys as $key) {
+					$value = $config[$category][$key];
+					if (isset($value) && $value !== '!<unset>!') {
+						$this->setP($uid, $category, $key, $value);
+					}
+				}
 			}
 		}
 	}

From 5157084969e5f29a4979d3d7a8b3641a13a33697 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 14:10:04 +0100
Subject: [PATCH 047/145] negative set

---
 src/Core/Config/Adapter/PreloadConfigAdapter.php  | 2 ++
 src/Core/Config/Adapter/PreloadPConfigAdapter.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/Core/Config/Adapter/PreloadConfigAdapter.php b/src/Core/Config/Adapter/PreloadConfigAdapter.php
index d4ce6406b..218648cbd 100644
--- a/src/Core/Config/Adapter/PreloadConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadConfigAdapter.php
@@ -35,6 +35,8 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 			$value = $config['v'];
 			if (isset($value) && $value !== '') {
 				$return[$config['cat']][$config['k']] = $value;
+			} else {
+				$return[$config['cat']][$config['k']] = '!<unset>!';
 			}
 		}
 		DBA::close($configs);
diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
index 090d0f5c6..5c736b2ff 100644
--- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -47,6 +47,8 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 			$value = $pconfig['v'];
 			if (isset($value) && $value !== '') {
 				$return[$pconfig['cat']][$pconfig['k']] = $value;
+			} else {
+				$return[$pconfig['cat']][$pconfig['k']] = '!<unset>!';
 			}
 		}
 		DBA::close($pconfigs);

From f825fa1d1ca78d3aed43be5a8fc84140eb0c2a9d Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 14:21:13 +0100
Subject: [PATCH 048/145] tmp alert

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

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index d8bffa9c6..824378793 100644
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -2,9 +2,9 @@
 /**
  * @file view/theme/frio/style.php
  */
+
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
-use Friendica\Model\Profile;
 
 require_once 'view/theme/frio/php/PHPColors/Color.php';
 
@@ -20,6 +20,7 @@ if ($a->module !== 'install') {
 
 		// Load the profile owners pconfig.
 		$scheme           = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
+		\Friendica\Core\Logger::alert($scheme);
 		$nav_bg           = PConfig::get($uid, 'frio', 'nav_bg');
 		$nav_icon_color   = PConfig::get($uid, 'frio', 'nav_icon_color');
 		$link_color       = PConfig::get($uid, 'frio', 'link_color');

From 44b556aaa6b61da8d8b7900fdcf1c2e7b00e4437 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 18 Feb 2019 08:23:05 -0500
Subject: [PATCH 049/145] [frio] Change comment expand icons to carets

---
 view/theme/frio/templates/wall_thread.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 591e102c7..1fb122125 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -42,11 +42,11 @@ as the value of $top_child_total (this is done at the end of this file)
 		<div class="hide-comments-outer-wrapper">
 			<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
 				<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
-					<i class="fa fa-plus-square" aria-hidden="true"></i>
+					<i class="fa fa-caret-right" aria-hidden="true"></i>
 					{{$item.num_comments}} - {{$item.show_text}}
 				</span>
 				<span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
-					<i class="fa fa-minus-square" aria-hidden="true"></i>
+					<i class="fa fa-caret-down" aria-hidden="true"></i>
 					{{$item.num_comments}} - {{$item.hide_text}}
 				</span>
 			</div>

From 1194e9b41ea21db22ffde4da8eff66fd4d507c6f Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 14:34:30 +0100
Subject: [PATCH 050/145] set config_loaded with uid

---
 .../Config/Adapter/PreloadPConfigAdapter.php  | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
index 5c736b2ff..72266744f 100644
--- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -13,7 +13,10 @@ use Friendica\Database\DBA;
  */
 class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdapter
 {
-	private $config_loaded = false;
+	/**
+	 * @var array true if config for user is loaded
+	 */
+	private $config_loaded;
 
 	/**
 	 * @param int $uid The UID of the current user
@@ -25,6 +28,8 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 		if (isset($uid)) {
 			$this->load($uid, 'config');
 		}
+
+		$this->config_loaded = [];
 	}
 
 	/**
@@ -34,11 +39,11 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 	{
 		$return = [];
 
-		if ($this->config_loaded) {
+		if (empty($uid)) {
 			return $return;
 		}
 
-		if (empty($uid)) {
+		if ($this->isLoaded($uid, $cat, null)) {
 			return $return;
 		}
 
@@ -53,7 +58,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 		}
 		DBA::close($pconfigs);
 
-		$this->config_loaded = true;
+		$this->config_loaded[$uid] = true;
 
 		return $return;
 	}
@@ -67,7 +72,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 			return '!<unset>!';
 		}
 
-		if (!$this->config_loaded) {
+		if (!$this->isLoaded($uid, $cat, $key)) {
 			$this->load($uid, $cat);
 		}
 
@@ -92,7 +97,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 			return false;
 		}
 
-		if (!$this->config_loaded) {
+		if ($this->isLoaded($uid, $cat, $key)) {
 			$this->load($uid, $cat);
 		}
 		// We store our setting values as strings.
@@ -121,7 +126,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 			return false;
 		}
 
-		if (!$this->config_loaded) {
+		if (!$this->isLoaded($uid, $cat, $key)) {
 			$this->load($uid, $cat);
 		}
 
@@ -139,6 +144,6 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 			return false;
 		}
 
-		return $this->config_loaded;
+		return isset($this->config_loaded[$uid]) && $this->config_loaded[$uid];
 	}
 }

From 5127a113aa7fb1c99a4e50febdbade08da5ff4e4 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 14:40:35 +0100
Subject: [PATCH 051/145] set config_loaded with uid

---
 src/Core/Config/Adapter/PreloadPConfigAdapter.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
index 72266744f..bc49d623f 100644
--- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -25,11 +25,11 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 	{
 		parent::__construct();
 
+		$this->config_loaded = [];
+
 		if (isset($uid)) {
 			$this->load($uid, 'config');
 		}
-
-		$this->config_loaded = [];
 	}
 
 	/**
@@ -43,7 +43,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 			return $return;
 		}
 
-		if ($this->isLoaded($uid, $cat, null)) {
+		if (!$this->isLoaded($uid, $cat, null)) {
 			return $return;
 		}
 

From c2176aad364f657094b6dc9a603a1e2d18a32ca9 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 14:45:24 +0100
Subject: [PATCH 052/145] bugfix

---
 src/Core/Config/Adapter/PreloadPConfigAdapter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
index bc49d623f..12e25df9f 100644
--- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -97,7 +97,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 			return false;
 		}
 
-		if ($this->isLoaded($uid, $cat, $key)) {
+		if (!$this->isLoaded($uid, $cat, $key)) {
 			$this->load($uid, $cat);
 		}
 		// We store our setting values as strings.

From 6c22f70b62d0a3ffae12371f3d3464bd5da4cc8d Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 14:48:26 +0100
Subject: [PATCH 053/145] revert style.php changes

---
 view/theme/frio/style.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 824378793..5fada9dd4 100644
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -20,7 +20,6 @@ if ($a->module !== 'install') {
 
 		// Load the profile owners pconfig.
 		$scheme           = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
-		\Friendica\Core\Logger::alert($scheme);
 		$nav_bg           = PConfig::get($uid, 'frio', 'nav_bg');
 		$nav_icon_color   = PConfig::get($uid, 'frio', 'nav_icon_color');
 		$link_color       = PConfig::get($uid, 'frio', 'link_color');

From 23c8d7e30208db68f4940db5f267e646ac7b9a9c Mon Sep 17 00:00:00 2001
From: softmetz <47755368+softmetz@users.noreply.github.com>
Date: Mon, 18 Feb 2019 22:34:05 +0100
Subject: [PATCH 054/145] add --no-dev parameter to composer

---
 doc/Install.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Install.md b/doc/Install.md
index dd483095c..1d94926ea 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -57,7 +57,7 @@ The Linux commands to clone the repository into a directory "mywebsite" would be
 
     git clone https://github.com/friendica/friendica.git -b master mywebsite
     cd mywebsite
-    bin/composer.phar install
+    bin/composer.phar install --no-dev
 
 Make sure the folder *view/smarty3* exists and is writable by the webserver user, in this case `www-data`
 

From fd4e8a430cd4a0c468c35fbd8f94dfd4429a8ccc Mon Sep 17 00:00:00 2001
From: softmetz <47755368+softmetz@users.noreply.github.com>
Date: Mon, 18 Feb 2019 22:36:16 +0100
Subject: [PATCH 055/145] correct information about changing domain name

---
 doc/Install.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/doc/Install.md b/doc/Install.md
index 1d94926ea..6d498abec 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -18,10 +18,7 @@ If you do not have a Friendica account yet, you can register a temporary one at
 The account will expire after 7 days, but you can ask the server admin to keep your account longer, should the problem not be resolved after that.
 
 Before you begin: Choose a domain name or subdomain name for your server.
-Put some thought into this. Changing it after installation is currently not supported.
-Things will break, and some of your friends may have difficulty communicating with you.
-We plan to address this limitation in a future release.
-
+Put some thought into this. While changing it after installation is supported, things still might break.
 
 Requirements
 ---

From 6170936d5d92f9b7cc6da16a52fcb2ff0a0c677c Mon Sep 17 00:00:00 2001
From: softmetz <47755368+softmetz@users.noreply.github.com>
Date: Mon, 18 Feb 2019 22:38:48 +0100
Subject: [PATCH 056/145] add --no-dev parameter to composer

---
 doc/Update.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/Update.md b/doc/Update.md
index 17c2d0e72..7b7ccf7bb 100644
--- a/doc/Update.md
+++ b/doc/Update.md
@@ -21,7 +21,7 @@ You can get the latest changes at any time with
 
     cd path/to/friendica
     git pull
-    bin/composer.phar install
+    bin/composer.phar install --no-dev
 
 The addon tree has to be updated separately like so:
 
@@ -69,4 +69,4 @@ DROP TABLE <table_name>;
 RENAME TABLE <table_name>_new TO <table_name>;
 ```
 
-This method is slower overall, but it is better suited for large numbers of duplicates.
\ No newline at end of file
+This method is slower overall, but it is better suited for large numbers of duplicates.

From 9fa812b35dd23299798ee437ea9bcb84f369714b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 19 Feb 2019 01:56:41 +0100
Subject: [PATCH 057/145] Rewrites: - converted single-line if() block to
 multi-line and with curly braces - "imported" SPL classes to have unified
 code style - always initialize your variables ... :-/ - added some empty
 lines/spaces for better readability
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/api.php                      | 12 ++++++++----
 index.php                            |  1 +
 mod/admin.php                        |  2 +-
 src/Model/ItemDeliveryData.php       |  7 ++++---
 src/Model/Photo.php                  |  5 +++++
 src/Model/Storage/Database.php       | 14 ++++++++++----
 src/Model/Storage/SystemResource.php |  6 ++++--
 src/Worker/Notifier.php              |  1 -
 8 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/include/api.php b/include/api.php
index 13ff75bdb..e6fd2f22b 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1528,8 +1528,10 @@ function api_search($type)
 
 	if (api_user() === false || $user_info === false) { throw new ForbiddenException(); }
 
-	if (empty($_REQUEST['q'])) { throw new BadRequestException('q parameter is required.'); }
-	
+	if (empty($_REQUEST['q'])) {
+		throw new BadRequestException('q parameter is required.');
+	}
+
 	$searchTerm = trim(rawurldecode($_REQUEST['q']));
 
 	$data = [];
@@ -4399,6 +4401,7 @@ function api_fr_photo_delete($type)
 	if (api_user() === false) {
 		throw new ForbiddenException();
 	}
+
 	// input params
 	$photo_id = defaults($_REQUEST, 'photo_id', null);
 
@@ -4407,11 +4410,12 @@ function api_fr_photo_delete($type)
 	if ($photo_id == null) {
 		throw new BadRequestException("no photo_id specified");
 	}
+
 	// check if photo is existing in database
-	$r = Photo::exists(['resource-id' => $photo_id, 'uid' => api_user()]);
-	if (!$r) {
+	if (!Photo::exists(['resource-id' => $photo_id, 'uid' => api_user()])) {
 		throw new BadRequestException("photo not available");
 	}
+
 	// now we can perform on the deletion of the photo
 	$result = Photo::delete(['uid' => api_user(), 'resource-id' => $photo_id]);
 
diff --git a/index.php b/index.php
index e98987289..ddc851cd4 100644
--- a/index.php
+++ b/index.php
@@ -15,3 +15,4 @@ require __DIR__ . '/vendor/autoload.php';
 $a = Factory\DependencyFactory::setUp('index', __DIR__, false);
 
 $a->runFrontend();
+
diff --git a/mod/admin.php b/mod/admin.php
index fcca69644..9486f85c9 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1565,7 +1565,7 @@ function admin_page_site(App $a)
 	
 	$storage_form = [];
 	if (!is_null($storage_current_backend) && $storage_current_backend != "") {
-		foreach($storage_current_backend::getOptions() as $name => $info) {
+		foreach ($storage_current_backend::getOptions() as $name => $info) {
 			$type = $info[0];
 			$info[0] = $storage_form_prefix . '_' . $name;
 			$info['type'] = $type;
diff --git a/src/Model/ItemDeliveryData.php b/src/Model/ItemDeliveryData.php
index 1cd9c4f44..b1fd28e3c 100644
--- a/src/Model/ItemDeliveryData.php
+++ b/src/Model/ItemDeliveryData.php
@@ -7,6 +7,7 @@
 namespace Friendica\Model;
 
 use Friendica\Database\DBA;
+use \BadMethodCallException;
 
 class ItemDeliveryData
 {
@@ -71,7 +72,7 @@ class ItemDeliveryData
 	public static function insert($item_id, array $fields)
 	{
 		if (empty($item_id)) {
-			throw new \BadMethodCallException('Empty item_id');
+			throw new BadMethodCallException('Empty item_id');
 		}
 
 		$fields['iid'] = $item_id;
@@ -92,7 +93,7 @@ class ItemDeliveryData
 	public static function update($item_id, array $fields)
 	{
 		if (empty($item_id)) {
-			throw new \BadMethodCallException('Empty item_id');
+			throw new BadMethodCallException('Empty item_id');
 		}
 
 		if (empty($fields)) {
@@ -113,7 +114,7 @@ class ItemDeliveryData
 	public static function delete($item_id)
 	{
 		if (empty($item_id)) {
-			throw new \BadMethodCallException('Empty item_id');
+			throw new BadMethodCallException('Empty item_id');
 		}
 
 		return DBA::delete('item-delivery-data', ['iid' => $item_id]);
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 0778bf419..152e870e8 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -173,6 +173,8 @@ class Photo extends BaseObject
 	 */
 	public static function getImageForPhoto(array $photo)
 	{
+		$data = "";
+
 		if ($photo["backend-class"] == "") {
 			// legacy data storage in "data" column
 			$i = self::selectFirst(["data"], ["id" => $photo["id"]]);
@@ -189,6 +191,7 @@ class Photo extends BaseObject
 		if ($data === "") {
 			return null;
 		}
+
 		return new Image($data, $photo["type"]);
 	}
 
@@ -219,11 +222,13 @@ class Photo extends BaseObject
 	{
 		$fields = self::getFields();
 		$values = array_fill(0, count($fields), "");
+
 		$photo = array_combine($fields, $values);
 		$photo["backend-class"] = Storage\SystemResource::class;
 		$photo["backend-ref"] = $filename;
 		$photo["type"] = $mimetype;
 		$photo["cacheable"] = false;
+
 		return $photo;
 	}
 
diff --git a/src/Model/Storage/Database.php b/src/Model/Storage/Database.php
index f9ad7fb7d..60bd154e6 100644
--- a/src/Model/Storage/Database.php
+++ b/src/Model/Storage/Database.php
@@ -50,8 +50,14 @@ class Database implements IStorage
 	{
 		return DBA::delete('storage', ['id' => $ref]);
 	}
-	
-	public static function getOptions() { return []; }
-	
-	public static function saveOptions($data) { return []; }
+
+	public static function getOptions()
+	{
+		return [];
+	}
+
+	public static function saveOptions($data)
+	{
+		return [];
+	}
 }
diff --git a/src/Model/Storage/SystemResource.php b/src/Model/Storage/SystemResource.php
index 718a2e90a..3afe8ee6f 100644
--- a/src/Model/Storage/SystemResource.php
+++ b/src/Model/Storage/SystemResource.php
@@ -6,6 +6,8 @@
 
 namespace Friendica\Model\Storage;
 
+use \BadMethodCallException;
+
 /**
  * @brief System resource storage class
  *
@@ -32,12 +34,12 @@ class SystemResource implements IStorage
 
 	public static function put($data, $filename = "")
 	{
-		throw new \BadMethodCallException();
+		throw new BadMethodCallException();
 	}
 
 	public static function delete($filename)
 	{
-		throw new \BadMethodCallException();
+		throw new BadMethodCallException();
 	}
 
 	public static function getOptions()
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 4492e3ce9..57c25a68f 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -498,7 +498,6 @@ class Notifier
 		}
 		DBA::close($delivery_contacts_stmt);
 
-
 		$url_recipients = array_filter($url_recipients);
 		// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
 		// They are especially used for notifications to OStatus users that don't follow us.

From b40485e61c3b0c7ff0779091fe3529410789cc7b Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 19 Feb 2019 06:24:33 +0100
Subject: [PATCH 058/145] added forgotten linebreak

---
 doc/Install.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/Install.md b/doc/Install.md
index 6d498abec..005db5b7f 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -18,7 +18,8 @@ If you do not have a Friendica account yet, you can register a temporary one at
 The account will expire after 7 days, but you can ask the server admin to keep your account longer, should the problem not be resolved after that.
 
 Before you begin: Choose a domain name or subdomain name for your server.
-Put some thought into this. While changing it after installation is supported, things still might break.
+Put some thought into this.
+While changing it after installation is supported, things still might break.
 
 Requirements
 ---

From 6fc581b03d3bd984bb7a37f5e0a6ebcb691d01c0 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 19 Feb 2019 06:47:52 +0100
Subject: [PATCH 059/145] DE translation update THX Ulf Rompe

---
 view/lang/de/messages.po | 3283 +++++++++++++++++++-------------------
 view/lang/de/strings.php |  860 +++++-----
 2 files changed, 2077 insertions(+), 2066 deletions(-)

diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po
index 60aab3021..ec77ba4f9 100644
--- a/view/lang/de/messages.po
+++ b/view/lang/de/messages.po
@@ -44,9 +44,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-10 08:14+0100\n"
-"PO-Revision-Date: 2019-02-15 09:51+0000\n"
-"Last-Translator: Ulf Rompe <transifex.com@rompe.org>\n"
+"POT-Creation-Date: 2019-02-15 09:33-0500\n"
+"PO-Revision-Date: 2019-02-19 05:01+0000\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,13 +78,13 @@ msgstr "Das monatliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde
 #: mod/photos.php:695 mod/photos.php:1126 mod/photos.php:1143
 #: mod/photos.php:1636 mod/profile_photo.php:85 mod/profile_photo.php:94
 #: mod/profile_photo.php:103 mod/profile_photo.php:217
-#: mod/profile_photo.php:305 mod/profile_photo.php:315 src/Model/User.php:735
-#: src/Model/User.php:743 src/Model/User.php:751
+#: mod/profile_photo.php:305 mod/profile_photo.php:315 src/Model/User.php:736
+#: src/Model/User.php:744 src/Model/User.php:752
 msgid "Profile Photos"
 msgstr "Profilbilder"
 
 #: include/conversation.php:160 include/conversation.php:297
-#: src/Model/Item.php:3265
+#: src/Model/Item.php:3283
 msgid "event"
 msgstr "Event"
 
@@ -95,7 +95,7 @@ msgid "status"
 msgstr "Status"
 
 #: include/conversation.php:168 include/conversation.php:305
-#: mod/subthread.php:88 mod/tagger.php:70 src/Model/Item.php:3267
+#: mod/subthread.php:88 mod/tagger.php:70 src/Model/Item.php:3285
 msgid "photo"
 msgstr "Foto"
 
@@ -156,7 +156,7 @@ msgstr "Likes"
 msgid "Dislikes"
 msgstr "Dislikes"
 
-#: include/conversation.php:569 include/conversation.php:1506
+#: include/conversation.php:569 include/conversation.php:1505
 #: mod/photos.php:1468
 msgid "Attending"
 msgid_plural "Attending"
@@ -203,9 +203,9 @@ msgstr "%s von %s"
 msgid "View in context"
 msgstr "Im Zusammenhang betrachten"
 
-#: include/conversation.php:721 include/conversation.php:1172
+#: include/conversation.php:721 include/conversation.php:1171
 #: mod/editpost.php:88 mod/message.php:260 mod/message.php:442
-#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:420
+#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:421
 msgid "Please wait"
 msgstr "Bitte warten"
 
@@ -221,43 +221,43 @@ msgstr "Lösche die markierten Beiträge"
 msgid "Follow Thread"
 msgstr "Folge der Unterhaltung"
 
-#: include/conversation.php:894 src/Model/Contact.php:1032
+#: include/conversation.php:894 src/Model/Contact.php:1049
 msgid "View Status"
 msgstr "Pinnwand anschauen"
 
 #: include/conversation.php:895 include/conversation.php:911
 #: mod/allfriends.php:72 mod/directory.php:167 mod/dirfind.php:226
-#: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:972
-#: src/Model/Contact.php:1025 src/Model/Contact.php:1033
+#: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:989
+#: src/Model/Contact.php:1042 src/Model/Contact.php:1050
 msgid "View Profile"
 msgstr "Profil anschauen"
 
-#: include/conversation.php:896 src/Model/Contact.php:1034
+#: include/conversation.php:896 src/Model/Contact.php:1051
 msgid "View Photos"
 msgstr "Bilder anschauen"
 
-#: include/conversation.php:897 src/Model/Contact.php:1026
-#: src/Model/Contact.php:1035
+#: include/conversation.php:897 src/Model/Contact.php:1043
+#: src/Model/Contact.php:1052
 msgid "Network Posts"
 msgstr "Netzwerkbeiträge"
 
-#: include/conversation.php:898 src/Model/Contact.php:1027
-#: src/Model/Contact.php:1036
+#: include/conversation.php:898 src/Model/Contact.php:1044
+#: src/Model/Contact.php:1053
 msgid "View Contact"
 msgstr "Kontakt anzeigen"
 
-#: include/conversation.php:899 src/Model/Contact.php:1038
+#: include/conversation.php:899 src/Model/Contact.php:1055
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
-#: include/conversation.php:903 src/Model/Contact.php:1039
+#: include/conversation.php:903 src/Model/Contact.php:1056
 msgid "Poke"
 msgstr "Anstupsen"
 
 #: include/conversation.php:908 mod/allfriends.php:73 mod/dirfind.php:227
 #: mod/follow.php:147 mod/match.php:88 mod/suggest.php:88
-#: view/theme/vier/theme.php:201 src/Content/Widget.php:63
-#: src/Model/Contact.php:1028 src/Module/Contact.php:574
+#: src/Content/Widget.php:63 src/Model/Contact.php:1045
+#: src/Module/Contact.php:574 view/theme/vier/theme.php:201
 msgid "Connect/Follow"
 msgstr "Verbinden/Folgen"
 
@@ -345,130 +345,130 @@ msgstr "<span %1$s>%2$d Personen</span> nehmen eventuell teil"
 msgid "%s attend maybe."
 msgstr "%s nimmt eventuell teil."
 
-#: include/conversation.php:1111
+#: include/conversation.php:1110
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Für <strong>jedermann</strong> sichtbar"
 
-#: include/conversation.php:1112 src/Object/Post.php:882
+#: include/conversation.php:1111 src/Object/Post.php:883
 msgid "Please enter a image/video/audio/webpage URL:"
 msgstr "Bitte gib eine Bild/Video/Audio/Webseiten-URL ein:"
 
-#: include/conversation.php:1113
+#: include/conversation.php:1112
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: include/conversation.php:1114 mod/filer.php:35
+#: include/conversation.php:1113 mod/filer.php:35
 msgid "Save to Folder:"
 msgstr "In diesem Ordner speichern:"
 
-#: include/conversation.php:1115
+#: include/conversation.php:1114
 msgid "Where are you right now?"
-msgstr "Wo hältst Du Dich jetzt gerade auf?"
+msgstr "Wo hältst du dich jetzt gerade auf?"
 
-#: include/conversation.php:1116
+#: include/conversation.php:1115
 msgid "Delete item(s)?"
 msgstr "Einträge löschen?"
 
-#: include/conversation.php:1148
+#: include/conversation.php:1147
 msgid "New Post"
 msgstr "Neuer Beitrag"
 
-#: include/conversation.php:1151
+#: include/conversation.php:1150
 msgid "Share"
 msgstr "Teilen"
 
-#: include/conversation.php:1152 mod/editpost.php:74 mod/message.php:258
+#: include/conversation.php:1151 mod/editpost.php:74 mod/message.php:258
 #: mod/message.php:439 mod/wallmessage.php:139
 msgid "Upload photo"
 msgstr "Foto hochladen"
 
-#: include/conversation.php:1153 mod/editpost.php:75
+#: include/conversation.php:1152 mod/editpost.php:75
 msgid "upload photo"
 msgstr "Bild hochladen"
 
-#: include/conversation.php:1154 mod/editpost.php:76
+#: include/conversation.php:1153 mod/editpost.php:76
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: include/conversation.php:1155 mod/editpost.php:77
+#: include/conversation.php:1154 mod/editpost.php:77
 msgid "attach file"
 msgstr "Datei anhängen"
 
-#: include/conversation.php:1156 src/Object/Post.php:874
+#: include/conversation.php:1155 src/Object/Post.php:875
 msgid "Bold"
 msgstr "Fett"
 
-#: include/conversation.php:1157 src/Object/Post.php:875
+#: include/conversation.php:1156 src/Object/Post.php:876
 msgid "Italic"
 msgstr "Kursiv"
 
-#: include/conversation.php:1158 src/Object/Post.php:876
+#: include/conversation.php:1157 src/Object/Post.php:877
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: include/conversation.php:1159 src/Object/Post.php:877
+#: include/conversation.php:1158 src/Object/Post.php:878
 msgid "Quote"
 msgstr "Zitat"
 
-#: include/conversation.php:1160 src/Object/Post.php:878
+#: include/conversation.php:1159 src/Object/Post.php:879
 msgid "Code"
 msgstr "Code"
 
-#: include/conversation.php:1161 src/Object/Post.php:879
+#: include/conversation.php:1160 src/Object/Post.php:880
 msgid "Image"
 msgstr "Bild"
 
-#: include/conversation.php:1162 src/Object/Post.php:880
+#: include/conversation.php:1161 src/Object/Post.php:881
 msgid "Link"
 msgstr "Link"
 
-#: include/conversation.php:1163 src/Object/Post.php:881
+#: include/conversation.php:1162 src/Object/Post.php:882
 msgid "Link or Media"
 msgstr "Link oder Mediendatei"
 
-#: include/conversation.php:1164 mod/editpost.php:84
+#: include/conversation.php:1163 mod/editpost.php:84
 msgid "Set your location"
 msgstr "Deinen Standort festlegen"
 
-#: include/conversation.php:1165 mod/editpost.php:85
+#: include/conversation.php:1164 mod/editpost.php:85
 msgid "set location"
 msgstr "Ort setzen"
 
-#: include/conversation.php:1166 mod/editpost.php:86
+#: include/conversation.php:1165 mod/editpost.php:86
 msgid "Clear browser location"
 msgstr "Browser-Standort leeren"
 
-#: include/conversation.php:1167 mod/editpost.php:87
+#: include/conversation.php:1166 mod/editpost.php:87
 msgid "clear location"
 msgstr "Ort löschen"
 
-#: include/conversation.php:1169 mod/editpost.php:102
+#: include/conversation.php:1168 mod/editpost.php:102
 msgid "Set title"
 msgstr "Titel setzen"
 
-#: include/conversation.php:1171 mod/editpost.php:104
+#: include/conversation.php:1170 mod/editpost.php:104
 msgid "Categories (comma-separated list)"
 msgstr "Kategorien (kommasepariert)"
 
-#: include/conversation.php:1173 mod/editpost.php:89
+#: include/conversation.php:1172 mod/editpost.php:89
 msgid "Permission settings"
 msgstr "Berechtigungseinstellungen"
 
-#: include/conversation.php:1174 mod/editpost.php:119
+#: include/conversation.php:1173 mod/editpost.php:119
 msgid "permissions"
 msgstr "Zugriffsrechte"
 
-#: include/conversation.php:1183 mod/editpost.php:99
+#: include/conversation.php:1182 mod/editpost.php:99
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: include/conversation.php:1187 mod/editpost.php:110 mod/events.php:551
+#: include/conversation.php:1186 mod/editpost.php:110 mod/events.php:551
 #: mod/photos.php:1458 mod/photos.php:1497 mod/photos.php:1557
-#: src/Object/Post.php:883
+#: src/Object/Post.php:884
 msgid "Preview"
 msgstr "Vorschau"
 
-#: include/conversation.php:1191 include/items.php:396
+#: include/conversation.php:1190 include/items.php:396
 #: mod/dfrn_request.php:650 mod/editpost.php:113 mod/fbrowser.php:104
 #: mod/fbrowser.php:134 mod/follow.php:161 mod/message.php:153
 #: mod/photos.php:257 mod/photos.php:325 mod/settings.php:666
@@ -477,50 +477,50 @@ msgstr "Vorschau"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: include/conversation.php:1196
+#: include/conversation.php:1195
 msgid "Post to Groups"
 msgstr "Poste an Gruppe"
 
-#: include/conversation.php:1197
+#: include/conversation.php:1196
 msgid "Post to Contacts"
 msgstr "Poste an Kontakte"
 
-#: include/conversation.php:1198
+#: include/conversation.php:1197
 msgid "Private post"
 msgstr "Privater Beitrag"
 
-#: include/conversation.php:1203 mod/editpost.php:117
+#: include/conversation.php:1202 mod/editpost.php:117
 #: src/Model/Profile.php:370
 msgid "Message"
 msgstr "Nachricht"
 
-#: include/conversation.php:1204 mod/editpost.php:118
+#: include/conversation.php:1203 mod/editpost.php:118
 msgid "Browser"
 msgstr "Browser"
 
-#: include/conversation.php:1476
+#: include/conversation.php:1475
 msgid "View all"
 msgstr "Zeige alle"
 
-#: include/conversation.php:1500
+#: include/conversation.php:1499
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "mag ich"
 msgstr[1] "Mag ich"
 
-#: include/conversation.php:1503
+#: include/conversation.php:1502
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "mag ich nicht"
 msgstr[1] "Mag ich nicht"
 
-#: include/conversation.php:1509
+#: include/conversation.php:1508
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Nicht teilnehmend "
 msgstr[1] "Nicht teilnehmend"
 
-#: include/conversation.php:1512 src/Content/ContactSelector.php:167
+#: include/conversation.php:1511 src/Content/ContactSelector.php:167
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Unentschieden"
@@ -552,7 +552,7 @@ msgstr "[Friendica-Meldung] Neue Email erhalten um %s"
 #: include/enotify.php:136
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$s hat Dir eine neue, private Nachricht um %2$s geschickt."
+msgstr "%1$s hat dir eine neue, private Nachricht um %2$s geschickt."
 
 #: include/enotify.php:137
 msgid "a private message"
@@ -561,7 +561,7 @@ msgstr "eine private Nachricht"
 #: include/enotify.php:137
 #, php-format
 msgid "%1$s sent you %2$s."
-msgstr "%1$s schickte Dir %2$s."
+msgstr "%1$s schickte dir %2$s."
 
 #: include/enotify.php:139
 #, php-format
@@ -611,12 +611,12 @@ msgstr "%1$s kommentierte den [url=%2$s]eigenen %3$s[/url]"
 #: include/enotify.php:243
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
-msgstr "[Friendica-Meldung] %s hat Dich erwähnt"
+msgstr "[Friendica-Meldung] %s hat dich erwähnt"
 
 #: include/enotify.php:245
 #, php-format
 msgid "%1$s tagged you at %2$s"
-msgstr "%1$s erwähnte Dich auf %2$s"
+msgstr "%1$s erwähnte dich auf %2$s"
 
 #: include/enotify.php:247
 #, php-format
@@ -626,7 +626,7 @@ msgstr "[Friendica-Meldung] Kommentar zum Beitrag #%1$d von %2$s"
 #: include/enotify.php:249
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
-msgstr "%s hat einen Beitrag kommentiert, dem Du folgst."
+msgstr "%s hat einen Beitrag kommentiert, dem du folgst."
 
 #: include/enotify.php:254 include/enotify.php:269 include/enotify.php:284
 #: include/enotify.php:303 include/enotify.php:319
@@ -667,17 +667,17 @@ msgstr "%1$s [url=%2$s]hat einen Beitrag geteilt[/url]."
 #: include/enotify.php:291
 #, php-format
 msgid "[Friendica:Notify] %1$s poked you"
-msgstr "[Friendica-Meldung] %1$s hat Dich angestupst"
+msgstr "[Friendica-Meldung] %1$s hat dich angestupst"
 
 #: include/enotify.php:293
 #, php-format
 msgid "%1$s poked you at %2$s"
-msgstr "%1$s hat Dich auf %2$s angestupst"
+msgstr "%1$s hat dich auf %2$s angestupst"
 
 #: include/enotify.php:294
 #, php-format
 msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr "%1$s [url=%2$s]hat Dich angestupst[/url]."
+msgstr "%1$s [url=%2$s]hat dich angestupst[/url]."
 
 #: include/enotify.php:311
 #, php-format
@@ -711,7 +711,7 @@ msgstr "Du hast eine [url=%1$s]Kontaktanfrage[/url] von %2$s erhalten."
 #: include/enotify.php:334 include/enotify.php:380
 #, php-format
 msgid "You may visit their profile at %s"
-msgstr "Hier kannst Du das Profil betrachten: %s"
+msgstr "Hier kannst du das Profil betrachten: %s"
 
 #: include/enotify.php:336
 #, php-format
@@ -720,12 +720,12 @@ msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."
 
 #: include/enotify.php:343
 msgid "[Friendica:Notify] A new person is sharing with you"
-msgstr "[Friendica Benachrichtigung] Eine neue Person teilt mit Dir"
+msgstr "[Friendica Benachrichtigung] Eine neue Person teilt mit dir"
 
 #: include/enotify.php:345 include/enotify.php:346
 #, php-format
 msgid "%1$s is sharing with you at %2$s"
-msgstr "%1$s teilt mit Dir auf %2$s"
+msgstr "%1$s teilt mit dir auf %2$s"
 
 #: include/enotify.php:353
 msgid "[Friendica:Notify] You have a new follower"
@@ -787,7 +787,7 @@ msgstr "Ihr seid nun beidseitige Kontakte und könnt Statusmitteilungen, Bilder
 #: include/enotify.php:400
 #, php-format
 msgid "Please visit %s if you wish to make any changes to this relationship."
-msgstr "Bitte besuche %s, wenn Du Änderungen an eurer Beziehung vornehmen willst."
+msgstr "Bitte besuche %s, wenn du Änderungen an eurer Beziehung vornehmen willst."
 
 #: include/enotify.php:413
 #, php-format
@@ -796,7 +796,7 @@ msgid ""
 "communication - such as private messaging and some profile interactions. If "
 "this is a celebrity or community page, these settings were applied "
 "automatically."
-msgstr "'%1$s' hat sich entschieden Dich als Fan zu akzeptieren, dies schränkt einige Kommunikationswege - wie private Nachrichten und einige Interaktionsmöglichkeiten auf der Profilseite - ein. Wenn dies eine Berühmtheiten- oder Gemeinschaftsseite ist, werden diese Einstellungen automatisch vorgenommen."
+msgstr "'%1$s' hat sich entschieden dich als Fan zu akzeptieren, dies schränkt einige Kommunikationswege - wie private Nachrichten und einige Interaktionsmöglichkeiten auf der Profilseite - ein. Wenn dies eine Berühmtheiten- oder Gemeinschaftsseite ist, werden diese Einstellungen automatisch vorgenommen."
 
 #: include/enotify.php:415
 #, php-format
@@ -808,7 +808,7 @@ msgstr "'%1$s' kann den Kontaktstatus zu einem späteren Zeitpunkt erweitern und
 #: include/enotify.php:417
 #, php-format
 msgid "Please visit %s  if you wish to make any changes to this relationship."
-msgstr "Bitte besuche %s, wenn Du Änderungen an eurer Beziehung vornehmen willst."
+msgstr "Bitte besuche %s, wenn du Änderungen an eurer Beziehung vornehmen willst."
 
 #: include/enotify.php:427 mod/removeme.php:46
 msgid "[Friendica System Notify]"
@@ -848,7 +848,7 @@ msgstr "Beitrag nicht gefunden."
 
 #: include/items.php:391
 msgid "Do you really want to delete this item?"
-msgstr "Möchtest Du wirklich dieses Item löschen?"
+msgstr "Möchtest du wirklich dieses Item löschen?"
 
 #: include/items.php:393 mod/api.php:109 mod/dfrn_request.php:640
 #: mod/follow.php:150 mod/message.php:150 mod/profiles.php:526
@@ -869,16 +869,17 @@ msgstr "Ja"
 #: mod/invite.php:111 mod/item.php:167 mod/manage.php:129 mod/message.php:56
 #: mod/message.php:101 mod/network.php:35 mod/nogroup.php:18 mod/notes.php:27
 #: mod/notifications.php:70 mod/ostatus_subscribe.php:18 mod/photos.php:186
-#: mod/photos.php:1020 mod/poke.php:141 mod/profile_photo.php:32
-#: mod/profile_photo.php:177 mod/profile_photo.php:204 mod/profiles.php:182
-#: mod/profiles.php:499 mod/regmod.php:89 mod/repair_ostatus.php:16
+#: mod/photos.php:1020 mod/poke.php:141 mod/profiles.php:182
+#: mod/profiles.php:499 mod/profile_photo.php:32 mod/profile_photo.php:177
+#: mod/profile_photo.php:204 mod/regmod.php:89 mod/repair_ostatus.php:16
 #: mod/settings.php:48 mod/settings.php:154 mod/settings.php:655
 #: mod/suggest.php:62 mod/uimport.php:17 mod/unfollow.php:22
 #: mod/unfollow.php:77 mod/unfollow.php:109 mod/viewcontacts.php:56
-#: mod/wall_attach.php:76 mod/wall_attach.php:79 mod/wall_upload.php:107
-#: mod/wall_upload.php:110 mod/wallmessage.php:19 mod/wallmessage.php:43
-#: mod/wallmessage.php:82 mod/wallmessage.php:106 src/Module/Attach.php:42
-#: src/Module/Contact.php:360 src/Module/Register.php:193 src/App.php:1482
+#: mod/wallmessage.php:19 mod/wallmessage.php:43 mod/wallmessage.php:82
+#: mod/wallmessage.php:106 mod/wall_attach.php:76 mod/wall_attach.php:79
+#: mod/wall_upload.php:107 mod/wall_upload.php:110 src/App.php:1480
+#: src/Module/Attach.php:42 src/Module/Contact.php:360
+#: src/Module/Register.php:193
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
@@ -886,28 +887,11 @@ msgstr "Zugriff verweigert."
 msgid "Archives"
 msgstr "Archiv"
 
-#: include/items.php:520 view/theme/vier/theme.php:255
-#: src/Content/ForumManager.php:135 src/Content/Widget.php:329
-#: src/Object/Post.php:458 src/App.php:666
+#: include/items.php:520 src/Content/ForumManager.php:135
+#: src/Content/Widget.php:329 view/theme/vier/theme.php:255
 msgid "show more"
 msgstr "mehr anzeigen"
 
-#: mod/apps.php:15 src/App.php:1351
-msgid "You must be logged in to use addons. "
-msgstr "Sie müssen angemeldet sein um Addons benutzen zu können."
-
-#: mod/apps.php:20
-msgid "Applications"
-msgstr "Anwendungen"
-
-#: mod/apps.php:25
-msgid "No installed applications."
-msgstr "Keine Applikationen installiert."
-
-#: mod/maintenance.php:26
-msgid "System down for maintenance"
-msgstr "System zur Wartung abgeschaltet"
-
 #: mod/admin.php:122
 msgid "Theme settings updated."
 msgstr "Themeneinstellungen aktualisiert."
@@ -1075,7 +1059,7 @@ msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
 #: mod/admin.php:386 mod/admin.php:404 mod/dfrn_request.php:346
-#: mod/friendica.php:131 src/Model/Contact.php:1702
+#: mod/friendica.php:131 src/Model/Contact.php:1719
 msgid "Blocked domain"
 msgstr "Blockierte Domain"
 
@@ -1089,7 +1073,7 @@ msgstr "Begründung für die Blockierung"
 
 #: mod/admin.php:387 mod/admin.php:400
 msgid "The reason why you blocked this domain."
-msgstr "Die Begründung warum du diese Domain blockiert hast."
+msgstr "Die Begründung, warum du diese Domain blockiert hast."
 
 #: mod/admin.php:388
 msgid "Delete domain"
@@ -1316,8 +1300,8 @@ msgstr "Empfänger-Name"
 msgid "Recipient Profile"
 msgstr "Empfänger-Profil"
 
-#: mod/admin.php:828 view/theme/frio/theme.php:269
-#: src/Core/NotificationsManager.php:182 src/Content/Nav.php:239
+#: mod/admin.php:828 src/Content/Nav.php:239
+#: src/Core/NotificationsManager.php:182 view/theme/frio/theme.php:269
 msgid "Network"
 msgstr "Netzwerk"
 
@@ -1674,7 +1658,7 @@ msgstr "Zusätzliche Informationen"
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
-msgstr "Für öffentliche Server kannst Du hier zusätzliche Informationen angeben, die dann auf %s/servers angezeigt werden."
+msgstr "Für öffentliche Server kannst du hier zusätzliche Informationen angeben, die dann auf %s/servers angezeigt werden."
 
 #: mod/admin.php:1604
 msgid "System language"
@@ -1949,7 +1933,7 @@ msgid ""
 "node information and might be used, e.g. by the global directory, to filter "
 "your node from listings of nodes to join. Additionally a note about this "
 "will be shown at the user registration page."
-msgstr "Wählen Sie dies, um anzuzeigen, dass Ihr Knoten hauptsächlich für explizite Inhalte verwendet wird, die möglicherweise nicht für Minderjährige geeignet sind. Diese Info wird in der Knoteninformation veröffentlicht und kann durch das Globale Verzeichnis genutzt werden, um Ihren Knoten von den Auflistungen auszuschließen. Zusätzlich wird auf der Registrierungsseite ein Hinweis darüber angezeigt."
+msgstr "Wähle dies, um anzuzeigen, dass dein Knoten hauptsächlich für explizite Inhalte verwendet wird, die möglicherweise nicht für Minderjährige geeignet sind. Diese Info wird in der Knoteninformation veröffentlicht und kann durch das Globale Verzeichnis genutzt werden, um deinen Knoten von den Auflistungen auszuschließen. Zusätzlich wird auf der Registrierungsseite ein Hinweis darüber angezeigt."
 
 #: mod/admin.php:1635
 msgid "Allow Users to set remote_self"
@@ -1960,7 +1944,7 @@ msgid ""
 "With checking this, every user is allowed to mark every contact as a "
 "remote_self in the repair contact dialog. Setting this flag on a contact "
 "causes mirroring every posting of that contact in the users stream."
-msgstr "Ist dies ausgewählt, kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im \"Kontakt reparieren\"-Dialog markieren. Nach dem Setzen dieses Flags werden alle Top-Level-Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet."
+msgstr "Ist dies ausgewählt, kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im \"Erweitert\"-Reiter der Kontaktansicht markieren. Nach dem Setzen dieses Flags werden alle Top-Level-Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet (gespiegelt)."
 
 #: mod/admin.php:1636
 msgid "Block multiple registrations"
@@ -2527,7 +2511,7 @@ msgid ""
 "\n"
 "\t\t\tDear %1$s,\n"
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
-msgstr "\nHallo %1$s,\n\nauf %2$s wurde ein Account für Dich angelegt."
+msgstr "\nHallo %1$s,\n\nauf %2$s wurde ein Account für dich angelegt."
 
 #: mod/admin.php:1834
 #, php-format
@@ -2559,9 +2543,9 @@ msgid ""
 "\t\t\tIf you ever want to delete your account, you can do so at %1$s/removeme\n"
 "\n"
 "\t\t\tThank you and welcome to %4$s."
-msgstr "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1$s\n\tBenutzername:\t%2$s\n\tPasswort:\t%3$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %1$s/removeme  jederzeit tun.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4$s."
+msgstr "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1$s\n\tBenutzername:\t%2$s\n\tPasswort:\t%3$s\n\nDu kannst dein Passwort unter \"Einstellungen\" ändern, sobald du dich\nangemeldet hast.\n\nBitte nimm dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst du ja auch einige Informationen über dich in deinem\nProfil veröffentlichen, damit andere Leute dich einfacher finden können.\nBearbeite hierfür einfach dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen dir, deinen kompletten Namen anzugeben und ein zu dir\npassendes Profilbild zu wählen, damit dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn du auf deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die deine Interessen teilen.\n\nWir respektieren deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %1$s/removeme  jederzeit tun.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4$s."
 
-#: mod/admin.php:1871 src/Model/User.php:858
+#: mod/admin.php:1871 src/Model/User.php:859
 #, php-format
 msgid "Registration details for %s"
 msgstr "Details der Registration von %s"
@@ -2716,13 +2700,13 @@ msgstr "Permanent löschen"
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist Du sicher?"
+msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?"
 
 #: mod/admin.php:2087
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist Du sicher?"
+msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?"
 
 #: mod/admin.php:2097
 msgid "Name of the new user."
@@ -2763,7 +2747,7 @@ msgid "Toggle"
 msgstr "Umschalten"
 
 #: mod/admin.php:2181 mod/admin.php:2438 mod/newmember.php:20
-#: mod/settings.php:136 view/theme/frio/theme.php:272 src/Content/Nav.php:263
+#: mod/settings.php:136 src/Content/Nav.php:263 view/theme/frio/theme.php:272
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -2857,7 +2841,7 @@ msgid ""
 "the 'error_log' line is relative to the friendica top-level directory and "
 "must be writeable by the web server. The option '1' for 'log_errors' and "
 "'display_errors' is to enable these options, set to '0' to disable them."
-msgstr "Um die Protokollierung von PHP-Fehlern und Warnungen vorübergehend zu aktivieren, können Sie der Datei index.php Ihrer Installation Folgendes voranstellen. Der in der Datei 'error_log' angegebene Dateiname ist relativ zum obersten Verzeichnis von friendica und muss vom Webserver beschreibbar sein. Die Option '1' für 'log_errors' und 'display_errors' aktiviert diese Optionen, ersetze die '1' durch einer '0' um sie zu deaktivieren."
+msgstr "Um die Protokollierung von PHP-Fehlern und Warnungen vorübergehend zu aktivieren, kannst du der Datei index.php deiner Installation Folgendes voranstellen. Der in der Datei 'error_log' angegebene Dateiname ist relativ zum obersten Verzeichnis von Friendica und muss vom Webserver beschreibbar sein. Die Option '1' für 'log_errors' und 'display_errors' aktiviert diese Optionen, ersetze die '1' durch eine '0', um sie zu deaktivieren."
 
 #: mod/admin.php:2599
 #, php-format
@@ -2909,13 +2893,13 @@ msgstr "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscod
 
 #: mod/api.php:94
 msgid "Please login to continue."
-msgstr "Bitte melde Dich an, um fortzufahren."
+msgstr "Bitte melde dich an, um fortzufahren."
 
 #: mod/api.php:108
 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 den Zugriff auf Deine Beiträge und Kontakte sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?"
+msgstr "Möchtest du dieser Anwendung den Zugriff auf Deine Beiträge und Kontakte sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?"
 
 #: mod/api.php:110 mod/dfrn_request.php:640 mod/follow.php:150
 #: mod/profiles.php:526 mod/profiles.php:530 mod/profiles.php:551
@@ -2927,6 +2911,18 @@ msgstr "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontak
 msgid "No"
 msgstr "Nein"
 
+#: mod/apps.php:15 src/App.php:1349
+msgid "You must be logged in to use addons. "
+msgstr "Du musst angemeldet sein, um Addons benutzen zu können."
+
+#: mod/apps.php:20
+msgid "Applications"
+msgstr "Anwendungen"
+
+#: mod/apps.php:25
+msgid "No installed applications."
+msgstr "Keine Applikationen installiert."
+
 #: mod/babel.php:25
 msgid "Source input"
 msgstr "Originaltext:"
@@ -3049,7 +3045,7 @@ msgid "Access denied."
 msgstr "Zugriff verweigert."
 
 #: mod/cal.php:46 mod/dfrn_poll.php:486 mod/help.php:68
-#: mod/viewcontacts.php:34 src/App.php:1402
+#: mod/viewcontacts.php:34 src/App.php:1400
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
@@ -3057,9 +3053,9 @@ msgstr "Seite nicht gefunden."
 msgid "Access to this profile has been restricted."
 msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
 
-#: mod/cal.php:273 mod/events.php:384 view/theme/frio/theme.php:266
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:160
+#: mod/cal.php:273 mod/events.php:384 src/Content/Nav.php:160
 #: src/Content/Nav.php:226 src/Model/Profile.php:937 src/Model/Profile.php:948
+#: view/theme/frio/theme.php:266 view/theme/frio/theme.php:270
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -3075,22 +3071,22 @@ msgstr "Vorherige"
 msgid "Next"
 msgstr "Nächste"
 
-#: mod/cal.php:279 mod/events.php:393 src/Model/Event.php:429
+#: mod/cal.php:279 mod/events.php:393 src/Model/Event.php:428
 msgid "today"
 msgstr "Heute"
 
-#: mod/cal.php:280 mod/events.php:394 src/Util/Temporal.php:314
-#: src/Model/Event.php:430
+#: mod/cal.php:280 mod/events.php:394 src/Model/Event.php:429
+#: src/Util/Temporal.php:314
 msgid "month"
 msgstr "Monat"
 
-#: mod/cal.php:281 mod/events.php:395 src/Util/Temporal.php:315
-#: src/Model/Event.php:431
+#: mod/cal.php:281 mod/events.php:395 src/Model/Event.php:430
+#: src/Util/Temporal.php:315
 msgid "week"
 msgstr "Woche"
 
-#: mod/cal.php:282 mod/events.php:396 src/Util/Temporal.php:316
-#: src/Model/Event.php:432
+#: mod/cal.php:282 mod/events.php:396 src/Model/Event.php:431
+#: src/Util/Temporal.php:316
 msgid "day"
 msgstr "Tag"
 
@@ -3098,7 +3094,7 @@ msgstr "Tag"
 msgid "list"
 msgstr "Liste"
 
-#: mod/cal.php:296 src/Core/Console/NewPassword.php:67 src/Model/User.php:323
+#: mod/cal.php:296 src/Core/Console/NewPassword.php:67 src/Model/User.php:324
 msgid "User not found"
 msgstr "Nutzer nicht gefunden"
 
@@ -3191,13 +3187,13 @@ msgstr "Kontakt nicht gefunden."
 msgid ""
 "<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
 " information your communications with this contact may stop working."
-msgstr "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."
+msgstr "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."
 
 #: mod/crepair.php:116
 msgid ""
 "Please use your browser 'Back' button <strong>now</strong> if you are "
 "uncertain what to do on this page."
-msgstr "Bitte nutze den Zurück-Button Deines Browsers <strong>jetzt</strong>, wenn Du Dir unsicher bist, was Du tun willst."
+msgstr "Bitte nutze den Zurück-Button Deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst."
 
 #: mod/crepair.php:130 mod/crepair.php:132
 msgid "No mirroring"
@@ -3224,11 +3220,10 @@ msgstr "Kontaktdaten neu laden"
 #: mod/message.php:261 mod/message.php:441 mod/photos.php:1049
 #: mod/photos.php:1137 mod/photos.php:1412 mod/photos.php:1457
 #: mod/photos.php:1496 mod/photos.php:1556 mod/poke.php:188
-#: mod/profiles.php:562 view/theme/duepuntozero/config.php:72
-#: view/theme/frio/config.php:119 view/theme/quattro/config.php:74
-#: view/theme/vier/config.php:120 src/Module/Contact.php:594
-#: src/Module/Install.php:187 src/Module/Install.php:222
-#: src/Object/Post.php:873
+#: mod/profiles.php:562 src/Module/Contact.php:594 src/Module/Install.php:187
+#: src/Module/Install.php:222 src/Object/Post.php:874
+#: view/theme/duepuntozero/config.php:72 view/theme/frio/config.php:119
+#: view/theme/quattro/config.php:74 view/theme/vier/config.php:120
 msgid "Submit"
 msgstr "Senden"
 
@@ -3244,7 +3239,7 @@ msgstr "Spiegle Beiträge dieses Kontakts"
 msgid ""
 "Mark this contact as remote_self, this will cause friendica to repost new "
 "entries from this contact."
-msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica, alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden."
+msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica, alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden (spiegeln)."
 
 #: mod/crepair.php:160
 msgid "Account Nickname"
@@ -3322,7 +3317,7 @@ msgid ""
 "Delegates are able to manage all aspects of this account/page except for "
 "basic account settings. Please do not delegate your personal account to "
 "anybody that you do not trust completely."
-msgstr "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!"
+msgstr "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem du nicht absolut vertraust!"
 
 #: mod/delegate.php:180
 msgid "Existing Page Delegates"
@@ -3409,7 +3404,7 @@ msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
-msgstr "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."
+msgstr "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."
 
 #: mod/dfrn_confirm.php:526
 msgid "Unable to set your contact credentials on our system."
@@ -3417,10 +3412,10 @@ msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werd
 
 #: mod/dfrn_confirm.php:582
 msgid "Unable to update your contact profile details on our system"
-msgstr "Die Updates für Dein Profil konnten nicht gespeichert werden"
+msgstr "Die Updates für dein Profil konnten nicht gespeichert werden"
 
 #: mod/dfrn_confirm.php:612 mod/dfrn_request.php:560
-#: src/Model/Contact.php:2026
+#: src/Model/Contact.php:2043
 msgid "[Name Withheld]"
 msgstr "[Name unterdrückt]"
 
@@ -3483,18 +3478,18 @@ msgstr "Ungültiger Locator"
 
 #: mod/dfrn_request.php:311
 msgid "You have already introduced yourself here."
-msgstr "Du hast Dich hier bereits vorgestellt."
+msgstr "Du hast dich hier bereits vorgestellt."
 
 #: mod/dfrn_request.php:314
 #, php-format
 msgid "Apparently you are already friends with %s."
-msgstr "Es scheint so, als ob Du bereits mit %s in Kontakt stehst."
+msgstr "Es scheint so, als ob du bereits mit %s in Kontakt stehst."
 
 #: mod/dfrn_request.php:334
 msgid "Invalid profile URL."
 msgstr "Ungültige Profil-URL."
 
-#: mod/dfrn_request.php:340 src/Model/Contact.php:1697
+#: mod/dfrn_request.php:340 src/Model/Contact.php:1714
 msgid "Disallowed profile URL."
 msgstr "Nicht erlaubte Profil-URL."
 
@@ -3514,13 +3509,13 @@ msgstr "Entferntes Abon­nie­ren kann für dein Netzwerk nicht durchgeführt we
 
 #: mod/dfrn_request.php:487
 msgid "Please login to confirm introduction."
-msgstr "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen."
+msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen."
 
 #: mod/dfrn_request.php:495
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
-msgstr "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an."
+msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde dich mit <strong>diesem</strong> Profil an."
 
 #: mod/dfrn_request.php:509 mod/dfrn_request.php:524
 msgid "Confirm"
@@ -3570,7 +3565,7 @@ msgstr "Bitte beantworte folgendes:"
 #: mod/dfrn_request.php:640 mod/follow.php:150
 #, php-format
 msgid "Does %s know you?"
-msgstr "Kennt %s Dich?"
+msgstr "Kennt %s dich?"
 
 #: mod/dfrn_request.php:641 mod/follow.php:151
 msgid "Add a personal note:"
@@ -3604,8 +3599,8 @@ msgid "Submit Request"
 msgstr "Anfrage abschicken"
 
 #: mod/directory.php:154 mod/events.php:541 mod/notifications.php:253
-#: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:438
-#: src/Model/Event.php:934 src/Model/Profile.php:443
+#: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:437
+#: src/Model/Event.php:933 src/Model/Profile.php:443
 #: src/Module/Contact.php:643
 msgid "Location:"
 msgstr "Ort:"
@@ -3628,8 +3623,8 @@ msgstr "Homepage:"
 msgid "About:"
 msgstr "Über:"
 
-#: mod/directory.php:210 view/theme/vier/theme.php:208
-#: src/Content/Widget.php:70
+#: mod/directory.php:210 src/Content/Widget.php:70
+#: view/theme/vier/theme.php:208
 msgid "Global Directory"
 msgstr "Weltweites Verzeichnis"
 
@@ -3645,8 +3640,8 @@ msgstr "Ergebnisse für:"
 msgid "Site Directory"
 msgstr "Verzeichnis"
 
-#: mod/directory.php:217 view/theme/vier/theme.php:203
-#: src/Content/Widget.php:65 src/Module/Contact.php:817
+#: mod/directory.php:217 src/Content/Widget.php:65 src/Module/Contact.php:817
+#: view/theme/vier/theme.php:203
 msgid "Find"
 msgstr "Finde"
 
@@ -3783,8 +3778,8 @@ msgstr "Entfernen der Veranstaltung fehlgeschlagen"
 msgid "Event removed"
 msgstr "Veranstaltung enfternt"
 
-#: mod/fbrowser.php:36 view/theme/frio/theme.php:264 src/Content/Nav.php:158
-#: src/Model/Profile.php:917
+#: mod/fbrowser.php:36 src/Content/Nav.php:158 src/Model/Profile.php:917
+#: view/theme/frio/theme.php:264
 msgid "Photos"
 msgstr "Bilder"
 
@@ -3916,7 +3911,7 @@ msgstr "Gruppe nicht gefunden."
 msgid "Group name changed."
 msgstr "Gruppenname geändert."
 
-#: mod/group.php:85 mod/profperm.php:30 src/App.php:1481
+#: mod/group.php:85 mod/profperm.php:30 src/App.php:1479
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
@@ -3989,11 +3984,11 @@ msgstr "Kein Profil"
 msgid "Help:"
 msgstr "Hilfe:"
 
-#: mod/help.php:59 view/theme/vier/theme.php:294 src/Content/Nav.php:190
+#: mod/help.php:59 src/Content/Nav.php:190 view/theme/vier/theme.php:294
 msgid "Help"
 msgstr "Hilfe"
 
-#: mod/help.php:65 src/App.php:1399
+#: mod/help.php:65 src/App.php:1397
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
@@ -4013,7 +4008,7 @@ msgstr "%s: Keine gültige Email Adresse."
 
 #: mod/invite.php:87
 msgid "Please join us on Friendica"
-msgstr "Ich lade Dich zu unserem sozialen Netzwerk Friendica ein"
+msgstr "Ich lade dich zu unserem sozialen Netzwerk Friendica ein"
 
 #: mod/invite.php:96
 msgid "Invitation limit exceeded. Please contact your site administrator."
@@ -4041,14 +4036,14 @@ msgid ""
 "Visit %s for a list of public sites that you can join. Friendica members on "
 "other sites can all connect with each other, as well as with members of many"
 " other social networks."
-msgstr "Besuche %s für eine Liste der öffentlichen Server, denen Du beitreten kannst. Friendica-Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer sozialer Netzwerke."
+msgstr "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica-Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer sozialer Netzwerke."
 
 #: mod/invite.php:132
 #, php-format
 msgid ""
 "To accept this invitation, please visit and register at %s or any other "
 "public Friendica website."
-msgstr "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s oder einer anderen öffentlichen Friendica-Website."
+msgstr "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica-Website."
 
 #: mod/invite.php:133
 #, php-format
@@ -4057,7 +4052,7 @@ msgid ""
 "web that is owned and controlled by its members. They can also connect with "
 "many traditional social networks. See %s for a list of alternate Friendica "
 "sites you can join."
-msgstr "Friendica Server verbinden sich alle untereinander, um ein großes, datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica-Server, denen Du beitreten kannst."
+msgstr "Friendica Server verbinden sich alle untereinander, um ein großes, datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica-Server, denen du beitreten kannst."
 
 #: mod/invite.php:137
 msgid ""
@@ -4075,7 +4070,7 @@ msgstr "Friendica Server verbinden sich alle untereinander, um ein großes, date
 #: mod/invite.php:140
 #, php-format
 msgid "To accept this invitation, please visit and register at %s."
-msgstr "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s."
+msgstr "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere dich bitte bei %s."
 
 #: mod/invite.php:147
 msgid "Send invitations"
@@ -4094,7 +4089,7 @@ msgstr "Deine Nachricht:"
 msgid ""
 "You are cordially invited to join me and other close friends on Friendica - "
 "and help us to create a better social web."
-msgstr "Du bist herzlich dazu eingeladen, Dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen."
+msgstr "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres, soziales Netz aufzubauen."
 
 #: mod/invite.php:151
 msgid "You will need to supply this invitation code: $invite_code"
@@ -4103,7 +4098,7 @@ msgstr "Du benötigst den folgenden Einladungscode: $invite_code"
 #: mod/invite.php:151
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
-msgstr "Sobald Du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"
+msgstr "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"
 
 #: mod/invite.php:153
 msgid ""
@@ -4135,14 +4130,14 @@ msgstr "Du kannst sie online unter %s besuchen"
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
-msgstr "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest."
+msgstr "Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem du auf diese Nachricht antwortest."
 
 #: mod/item.php:848
 #, php-format
 msgid "%s posted an update."
 msgstr "%s hat ein Update veröffentlicht."
 
-#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:848
+#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:847
 msgid "l F d, Y \\@ g:i A"
 msgstr "l, d. F Y\\, H:i"
 
@@ -4205,7 +4200,7 @@ msgid ""
 "\n"
 "\t\tYour password will not be changed unless we can verify that you\n"
 "\t\tissued this request."
-msgstr "\nHallo %1$s,\n\nAuf \"%2$s\" ist eine Anfrage auf das Zurücksetzen Deines Passworts gestellt\nworden. Um diese Anfrage zu verifizieren, folge bitte dem unten stehenden\nLink oder kopiere und füge ihn in die Adressleiste Deines Browsers ein.\n\nSolltest Du die Anfrage NICHT gestellt haben, ignoriere und/oder lösche diese\nE-Mail bitte.\n\nDein Passwort wird nicht geändert, solange wir nicht verifiziert haben, dass\nDu diese Änderung angefragt hast."
+msgstr "\nHallo %1$s,\n\nAuf \"%2$s\" ist eine Anfrage auf das Zurücksetzen deines Passworts gestellt\nworden. Um diese Anfrage zu verifizieren, folge bitte dem unten stehenden\nLink oder kopiere und füge ihn in die Adressleiste deines Browsers ein.\n\nSolltest du die Anfrage NICHT gestellt haben, ignoriere und/oder lösche diese\nE-Mail bitte.\n\nDein Passwort wird nicht geändert, solange wir nicht verifiziert haben, dass\ndu diese Änderung angefragt hast."
 
 #: mod/lostpass.php:55
 #, php-format
@@ -4222,7 +4217,7 @@ msgid ""
 "\n"
 "\t\tSite Location:\t%2$s\n"
 "\t\tLogin Name:\t%3$s"
-msgstr "\nUm Deine Identität zu verifizieren, folge bitte diesem Link:\n\n%1$s\n\nDu wirst eine weitere E-Mail mit Deinem neuen Passwort erhalten. Sobald Du Dich\nangemeldet hast, kannst Du Dein Passwort in den Einstellungen ändern.\n\nDie Anmeldedetails sind die folgenden:\n\nAdresse der Seite:\t%2$s\nBenutzername:\t%3$s"
+msgstr "\nUm deine Identität zu verifizieren, folge bitte diesem Link:\n\n%1$s\n\nDu wirst eine weitere E-Mail mit deinem neuen Passwort erhalten. Sobald du dich\nangemeldet hast, kannst du dein Passwort in den Einstellungen ändern.\n\nDie Anmeldedetails sind die folgenden:\n\nAdresse der Seite:\t%2$s\nBenutzername:\t%3$s"
 
 #: mod/lostpass.php:74
 #, php-format
@@ -4233,7 +4228,7 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
-msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast Du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
+msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
 #: mod/lostpass.php:102
 msgid "Request has expired, please make a new one."
@@ -4241,13 +4236,13 @@ msgstr "Die Anfrage ist abgelaufen. Bitte stelle eine erneute."
 
 #: mod/lostpass.php:117
 msgid "Forgot your Password?"
-msgstr "Hast Du Dein Passwort vergessen?"
+msgstr "Hast du dein Passwort vergessen?"
 
 #: mod/lostpass.php:118
 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 an und fordere ein neues Passwort an. Es werden Dir dann weitere Informationen per Mail zugesendet."
+msgstr "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."
 
 #: mod/lostpass.php:119 src/Module/Login.php:324
 msgid "Nickname or Email: "
@@ -4271,17 +4266,17 @@ msgstr "Dein neues Passwort lautet"
 
 #: mod/lostpass.php:138
 msgid "Save or copy your new password - and then"
-msgstr "Speichere oder kopiere Dein neues Passwort - und dann"
+msgstr "Speichere oder kopiere dein neues Passwort - und dann"
 
 #: mod/lostpass.php:139
 msgid "click here to login"
-msgstr "hier klicken, um Dich anzumelden"
+msgstr "hier klicken, um dich anzumelden"
 
 #: mod/lostpass.php:140
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
-msgstr "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald Du Dich erfolgreich angemeldet hast."
+msgstr "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald du dich erfolgreich angemeldet hast."
 
 #: mod/lostpass.php:148
 #, php-format
@@ -4292,7 +4287,7 @@ msgid ""
 "\t\t\tinformation for your records (or change your password immediately to\n"
 "\t\t\tsomething that you will remember).\n"
 "\t\t"
-msgstr "\nHallo %1$s,\n\nDein Passwort wurde wie gewünscht geändert. Bitte bewahre diese Informationen gut auf (oder ändere Dein Passwort in eines, das Du Dir leicht merken kannst)."
+msgstr "\nHallo %1$s,\n\nDein Passwort wurde wie gewünscht geändert. Bitte bewahre diese Informationen gut auf (oder ändere dein Passwort in eines, das du dir leicht merken kannst)."
 
 #: mod/lostpass.php:154
 #, php-format
@@ -4311,7 +4306,11 @@ msgstr "\nDie Anmeldedaten sind die folgenden:\n\nAdresse der Seite: %1$s\nLogin
 #: mod/lostpass.php:170
 #, php-format
 msgid "Your password has been changed at %s"
-msgstr "Auf %s wurde Dein Passwort geändert"
+msgstr "Auf %s wurde dein Passwort geändert"
+
+#: mod/maintenance.php:26
+msgid "System down for maintenance"
+msgstr "System zur Wartung abgeschaltet"
 
 #: mod/manage.php:178
 msgid "Manage Identities and/or Pages"
@@ -4321,7 +4320,7 @@ msgstr "Verwalte Identitäten und/oder Seiten"
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
-msgstr "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die Deine Kontoinformationen teilen oder zu denen Du „Verwalten“-Befugnisse bekommen hast."
+msgstr "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die deine Kontoinformationen teilen oder zu denen du „Verwalten“-Befugnisse bekommen hast."
 
 #: mod/manage.php:180
 msgid "Select an identity to manage: "
@@ -4372,13 +4371,13 @@ msgstr "Nachricht gesendet."
 msgid "Discard"
 msgstr "Verwerfen"
 
-#: mod/message.php:123 view/theme/frio/theme.php:271 src/Content/Nav.php:252
+#: mod/message.php:123 src/Content/Nav.php:252 view/theme/frio/theme.php:271
 msgid "Messages"
 msgstr "Nachrichten"
 
 #: mod/message.php:148
 msgid "Do you really want to delete this message?"
-msgstr "Möchtest Du diese Nachricht wirklich löschen?"
+msgstr "Möchtest du diese Nachricht wirklich löschen?"
 
 #: mod/message.php:166
 msgid "Conversation not found."
@@ -4432,7 +4431,7 @@ msgstr "Unterhaltung löschen"
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
-msgstr "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten."
+msgstr "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst du auf der Profilseite des Absenders antworten."
 
 #: mod/message.php:429
 msgid "Send Reply"
@@ -4451,7 +4450,7 @@ msgstr "Du und %s"
 #: mod/message.php:516
 #, php-format
 msgid "%s and You"
-msgstr "%s und Du"
+msgstr "%s und du"
 
 #: mod/message.php:543
 #, php-format
@@ -4527,7 +4526,7 @@ msgstr "Persönlich"
 
 #: mod/network.php:987
 msgid "Posts that mention or involve you"
-msgstr "Beiträge, in denen es um Dich geht"
+msgstr "Beiträge, in denen es um dich geht"
 
 #: mod/network.php:994
 msgid "New"
@@ -4567,7 +4566,7 @@ msgid ""
 "enjoyable. Click any item to visit the relevant page. A link to this page "
 "will be visible from your home page for two weeks after your initial "
 "registration and then will quietly disappear."
-msgstr "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden."
+msgstr "Wir möchten dir einige Tipps und Links anbieten, die dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für dich an deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden."
 
 #: mod/newmember.php:16
 msgid "Getting Started"
@@ -4582,7 +4581,7 @@ msgid ""
 "On your <em>Quick Start</em> page - find a brief introduction to your "
 "profile and network tabs, make some new connections, and find some groups to"
 " join."
-msgstr "Auf der <em>Quick Start</em>-Seite findest Du eine kurze Einleitung in die einzelnen Funktionen Deines Profils und die Netzwerk-Reiter, wo Du interessante Foren findest und neue Kontakte knüpfst."
+msgstr "Auf der <em>Quick Start</em>-Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest und neue Kontakte knüpfst."
 
 #: mod/newmember.php:22
 msgid "Go to Your Settings"
@@ -4601,15 +4600,16 @@ msgid ""
 " directory listing is like having an unlisted phone number. In general, you "
 "should probably publish your listing - unless all of your friends and "
 "potential friends know exactly how to find you."
-msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das, als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können."
+msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das, als wenn du deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Kontakte und potentiellen Kontakte wissen genau, wie sie dich finden können."
 
-#: mod/newmember.php:25 mod/profperm.php:117 view/theme/frio/theme.php:263
-#: src/Content/Nav.php:157 src/Model/Profile.php:876 src/Model/Profile.php:909
+#: mod/newmember.php:25 mod/profperm.php:117 src/Content/Nav.php:157
+#: src/Model/Profile.php:876 src/Model/Profile.php:909
 #: src/Module/Contact.php:654 src/Module/Contact.php:869
+#: view/theme/frio/theme.php:263
 msgid "Profile"
 msgstr "Profil"
 
-#: mod/newmember.php:27 mod/profile_photo.php:253 mod/profiles.php:583
+#: mod/newmember.php:27 mod/profiles.php:583 mod/profile_photo.php:253
 msgid "Upload Profile Photo"
 msgstr "Profilbild hochladen"
 
@@ -4618,7 +4618,7 @@ msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make"
 " friends than people who do not."
-msgstr "Lade ein Profilbild hoch, falls Du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist, neue Kontakte zu finden, wenn Du ein Bild von Dir selbst verwendest, als wenn Du dies nicht tust."
+msgstr "Lade ein Profilbild hoch, falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist, neue Kontakte zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust."
 
 #: mod/newmember.php:28
 msgid "Edit Your Profile"
@@ -4629,7 +4629,7 @@ msgid ""
 "Edit your <strong>default</strong> profile to your liking. Review the "
 "settings for hiding your list of friends and hiding the profile from unknown"
 " visitors."
-msgstr "Editiere Dein <strong>Standard</strong>-Profil nach Deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen Deiner Kontaktliste vor unbekannten Betrachtern des Profils."
+msgstr "Editiere dein <strong>Standard</strong>-Profil nach deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen deiner Kontaktliste vor unbekannten Betrachtern des Profils."
 
 #: mod/newmember.php:29
 msgid "Profile Keywords"
@@ -4640,7 +4640,7 @@ msgid ""
 "Set some public keywords for your default profile which describe your "
 "interests. We may be able to find other people with similar interests and "
 "suggest friendships."
-msgstr "Trage ein paar öffentliche Stichwörter in Dein Standardprofil ein, die Deine Interessen beschreiben. Eventuell sind wir in der Lage, Leute zu finden, die Deine Interessen teilen, und können Dir dann Kontakte vorschlagen."
+msgstr "Trage ein paar öffentliche Stichwörter in dein Standardprofil ein, die deine Interessen beschreiben. Eventuell sind wir in der Lage, Leute zu finden, die deine Interessen teilen, und können dir dann Kontakte vorschlagen."
 
 #: mod/newmember.php:31
 msgid "Connecting"
@@ -4655,7 +4655,7 @@ msgid ""
 "Enter your email access information on your Connector Settings page if you "
 "wish to import and interact with friends or mailing lists from your email "
 "INBOX"
-msgstr "Gib Deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls Du E-Mails aus Deinem Posteingang importieren und mit Kontakten und Mailinglisten interagieren willst."
+msgstr "Gib deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls du E-Mails aus Deinem Posteingang importieren und mit Kontakten und Mailinglisten interagieren willst."
 
 #: mod/newmember.php:40
 msgid "Go to Your Contacts Page"
@@ -4666,7 +4666,7 @@ msgid ""
 "Your Contacts page is your gateway to managing friendships and connecting "
 "with friends on other networks. Typically you enter their address or site "
 "URL in the <em>Add New Contact</em> dialog."
-msgstr "Die Kontakte-Seite ist die Einstiegsseite, von der aus Du Kontakte verwalten und Dich mit Personen in anderen Netzwerken verbinden kannst. Normalerweise gibst Du dazu einfach ihre Adresse oder die URL der Seite im Kasten <em>Neuen Kontakt hinzufügen</em> ein."
+msgstr "Die Kontakte-Seite ist die Einstiegsseite, von der aus du Kontakte verwalten und dich mit Personen in anderen Netzwerken verbinden kannst. Normalerweise gibst du dazu einfach ihre Adresse oder die URL der Seite im Kasten <em>Neuen Kontakt hinzufügen</em> ein."
 
 #: mod/newmember.php:41
 msgid "Go to Your Site's Directory"
@@ -4677,7 +4677,7 @@ msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
-msgstr "Über die Verzeichnisseite kannst Du andere Personen auf diesem Server oder anderen, verknüpften Seiten finden. Halte nach einem <em>Verbinden</em>- oder <em>Folgen</em>-Link auf deren Profilseiten Ausschau und gib Deine eigene Profiladresse an, falls Du danach gefragt wirst."
+msgstr "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen, verknüpften Seiten finden. Halte nach einem <em>Verbinden</em>- oder <em>Folgen</em>-Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an, falls du danach gefragt wirst."
 
 #: mod/newmember.php:42
 msgid "Finding New People"
@@ -4705,7 +4705,7 @@ msgid ""
 "Once you have made some friends, organize them into private conversation "
 "groups from the sidebar of your Contacts page and then you can interact with"
 " each group privately on your Network page."
-msgstr "Sobald Du einige Kontakte gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren."
+msgstr "Sobald du einige Kontakte gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren."
 
 #: mod/newmember.php:49
 msgid "Why Aren't My Posts Public?"
@@ -4716,7 +4716,7 @@ msgid ""
 "Friendica respects your privacy. By default, your posts will only show up to"
 " people you've added as friends. For more information, see the help section "
 "from the link above."
-msgstr "Friendica respektiert Deine Privatsphäre. Mit der Grundeinstellung werden Deine Beiträge ausschließlich Deinen Kontakten angezeigt. Für weitere Informationen diesbezüglich lies Dir bitte den entsprechenden Abschnitt in der Hilfe unter dem obigen Link durch."
+msgstr "Friendica respektiert Deine Privatsphäre. Mit der Grundeinstellung werden Deine Beiträge ausschließlich Deinen Kontakten angezeigt. Für weitere Informationen diesbezüglich lies dir bitte den entsprechenden Abschnitt in der Hilfe unter dem obigen Link durch."
 
 #: mod/newmember.php:53
 msgid "Getting Help"
@@ -4797,7 +4797,7 @@ msgstr "Verbirg diesen Kontakt vor Anderen"
 
 #: mod/notifications.php:203
 msgid "Claims to be known to you: "
-msgstr "Behauptet Dich zu kennen: "
+msgstr "Behauptet, dich zu kennen: "
 
 #: mod/notifications.php:204
 msgid "yes"
@@ -4945,7 +4945,7 @@ msgstr "Album löschen"
 
 #: mod/photos.php:252
 msgid "Do you really want to delete this photo album and all its photos?"
-msgstr "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?"
+msgstr "Möchtest du wirklich dieses Foto-Album und all seine Foto löschen?"
 
 #: mod/photos.php:310 mod/photos.php:322 mod/photos.php:1413
 msgid "Delete Photo"
@@ -4953,7 +4953,7 @@ msgstr "Foto löschen"
 
 #: mod/photos.php:320
 msgid "Do you really want to delete this photo?"
-msgstr "Möchtest Du wirklich dieses Foto löschen?"
+msgstr "Möchtest du wirklich dieses Foto löschen?"
 
 #: mod/photos.php:645
 msgid "a photo"
@@ -5118,12 +5118,12 @@ msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (toggle)"
 
 #: mod/photos.php:1454 mod/photos.php:1493 mod/photos.php:1553
-#: src/Module/Contact.php:1018 src/Object/Post.php:870
+#: src/Module/Contact.php:1018 src/Object/Post.php:871
 msgid "This is you"
-msgstr "Das bist Du"
+msgstr "Das bist du"
 
 #: mod/photos.php:1456 mod/photos.php:1495 mod/photos.php:1555
-#: src/Object/Post.php:417 src/Object/Post.php:872
+#: src/Object/Post.php:417 src/Object/Post.php:873
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -5137,7 +5137,7 @@ msgstr "Album betrachten"
 
 #: mod/ping.php:272
 msgid "{0} wants to be your friend"
-msgstr "{0} möchte mit Dir in Kontakt treten"
+msgstr "{0} möchte mit dir in Kontakt treten"
 
 #: mod/ping.php:288
 msgid "{0} requested registration"
@@ -5157,7 +5157,7 @@ msgstr "Empfänger"
 
 #: mod/poke.php:184
 msgid "Choose what you wish to do to recipient"
-msgstr "Was willst Du mit dem Empfänger machen:"
+msgstr "Was willst du mit dem Empfänger machen:"
 
 #: mod/poke.php:187
 msgid "Make this post private"
@@ -5167,62 +5167,6 @@ msgstr "Diesen Beitrag privat machen"
 msgid "Only logged in users are permitted to perform a probing."
 msgstr "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet."
 
-#: mod/profile_photo.php:58
-msgid "Image uploaded but image cropping failed."
-msgstr "Bild hochgeladen, aber das Zuschneiden schlug fehl."
-
-#: mod/profile_photo.php:88 mod/profile_photo.php:97 mod/profile_photo.php:106
-#: mod/profile_photo.php:318
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr "Verkleinern der Bildgröße von [%s] scheiterte."
-
-#: mod/profile_photo.php:125
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."
-
-#: mod/profile_photo.php:133
-msgid "Unable to process image"
-msgstr "Bild konnte nicht verarbeitet werden"
-
-#: mod/profile_photo.php:251
-msgid "Upload File:"
-msgstr "Datei hochladen:"
-
-#: mod/profile_photo.php:252
-msgid "Select a profile:"
-msgstr "Profil auswählen:"
-
-#: mod/profile_photo.php:257
-msgid "or"
-msgstr "oder"
-
-#: mod/profile_photo.php:258
-msgid "skip this step"
-msgstr "diesen Schritt überspringen"
-
-#: mod/profile_photo.php:258
-msgid "select a photo from your photo albums"
-msgstr "wähle ein Foto aus deinen Fotoalben"
-
-#: mod/profile_photo.php:271
-msgid "Crop Image"
-msgstr "Bild zurechtschneiden"
-
-#: mod/profile_photo.php:272
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."
-
-#: mod/profile_photo.php:274
-msgid "Done Editing"
-msgstr "Bearbeitung abgeschlossen"
-
-#: mod/profile_photo.php:308
-msgid "Image uploaded successfully."
-msgstr "Bild erfolgreich hochgeladen."
-
 #: mod/profiles.php:62
 msgid "Profile deleted."
 msgstr "Profil gelöscht."
@@ -5391,7 +5335,7 @@ msgstr "Profilname:"
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
-msgstr "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."
+msgstr "Dies ist dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."
 
 #: mod/profiles.php:595
 msgid "Your Full Name:"
@@ -5439,7 +5383,7 @@ msgstr "Seit [Datum]:"
 
 #: mod/profiles.php:610
 msgid "Tell us about yourself..."
-msgstr "Erzähle uns ein bisschen von Dir …"
+msgstr "Erzähle uns ein bisschen von dir …"
 
 #: mod/profiles.php:611
 msgid "XMPP (Jabber) address:"
@@ -5547,6 +5491,62 @@ msgstr "Profilbild ändern"
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
+#: mod/profile_photo.php:58
+msgid "Image uploaded but image cropping failed."
+msgstr "Bild hochgeladen, aber das Zuschneiden schlug fehl."
+
+#: mod/profile_photo.php:88 mod/profile_photo.php:97 mod/profile_photo.php:106
+#: mod/profile_photo.php:318
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "Verkleinern der Bildgröße von [%s] scheiterte."
+
+#: mod/profile_photo.php:125
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."
+
+#: mod/profile_photo.php:133
+msgid "Unable to process image"
+msgstr "Bild konnte nicht verarbeitet werden"
+
+#: mod/profile_photo.php:251
+msgid "Upload File:"
+msgstr "Datei hochladen:"
+
+#: mod/profile_photo.php:252
+msgid "Select a profile:"
+msgstr "Profil auswählen:"
+
+#: mod/profile_photo.php:257
+msgid "or"
+msgstr "oder"
+
+#: mod/profile_photo.php:258
+msgid "skip this step"
+msgstr "diesen Schritt überspringen"
+
+#: mod/profile_photo.php:258
+msgid "select a photo from your photo albums"
+msgstr "wähle ein Foto aus deinen Fotoalben"
+
+#: mod/profile_photo.php:271
+msgid "Crop Image"
+msgstr "Bild zurechtschneiden"
+
+#: mod/profile_photo.php:272
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."
+
+#: mod/profile_photo.php:274
+msgid "Done Editing"
+msgstr "Bearbeitung abgeschlossen"
+
+#: mod/profile_photo.php:308
+msgid "Image uploaded successfully."
+msgstr "Bild erfolgreich hochgeladen."
+
 #: mod/profperm.php:36 mod/profperm.php:69
 msgid "Invalid profile identifier."
 msgstr "Ungültiger Profil-Bezeichner."
@@ -5574,7 +5574,7 @@ msgstr "Registrierung für %s wurde zurückgezogen"
 
 #: mod/regmod.php:84
 msgid "Please login."
-msgstr "Bitte melde Dich an."
+msgstr "Bitte melde dich an."
 
 #: mod/removeme.php:46
 msgid "User deleted their account"
@@ -5603,7 +5603,7 @@ msgstr "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wie
 
 #: mod/removeme.php:86
 msgid "Please enter your password for verification:"
-msgstr "Bitte gib Dein Passwort zur Verifikation ein:"
+msgstr "Bitte gib dein Passwort zur Verifikation ein:"
 
 #: mod/repair_ostatus.php:21
 msgid "Resubscribing to OStatus contacts"
@@ -5625,7 +5625,7 @@ msgstr "Zu viele Abfragen"
 msgid "Only one search per minute is permitted for not logged in users."
 msgstr "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet."
 
-#: mod/search.php:149 src/Content/Text/HTML.php:900 src/Content/Nav.php:198
+#: mod/search.php:149 src/Content/Nav.php:198 src/Content/Text/HTML.php:900
 msgid "Search"
 msgstr "Suche"
 
@@ -5889,7 +5889,7 @@ msgstr "E-Mail/Postfach-Einstellungen"
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
-msgstr "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für Dein Postfach an."
+msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an."
 
 #: mod/settings.php:849
 msgid "Last successful email check:"
@@ -5953,11 +5953,11 @@ msgstr "%s - (Nicht unterstützt)"
 msgid "%s - (Experimental)"
 msgstr "%s - (Experimentell)"
 
-#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:396
+#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:395
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:397
+#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:396
 msgid "Monday"
 msgstr "Montag"
 
@@ -6025,7 +6025,7 @@ msgstr "Endloses Scrollen"
 
 #: mod/settings.php:964
 msgid "Automatic updates only at the top of the network page"
-msgstr "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist."
+msgstr "Automatische Updates nur, wenn du oben auf der Netzwerkseite bist."
 
 #: mod/settings.php:964
 msgid ""
@@ -6147,7 +6147,7 @@ msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."
 
 #: mod/settings.php:1085
 msgid "Publish your default profile in your local site directory?"
-msgstr "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"
+msgstr "Darf dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"
 
 #: mod/settings.php:1085
 #, php-format
@@ -6159,7 +6159,7 @@ msgstr "Dein Profil wird im <a href=\"%s\">lokalen Verzeichnis</a> dieses Knoten
 
 #: mod/settings.php:1091
 msgid "Publish your default profile in the global social directory?"
-msgstr "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"
+msgstr "Darf dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"
 
 #: mod/settings.php:1091
 #, php-format
@@ -6296,7 +6296,7 @@ msgstr "Bestätigen:"
 
 #: mod/settings.php:1182
 msgid "Leave password fields blank unless changing"
-msgstr "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern"
+msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern"
 
 #: mod/settings.php:1183
 msgid "Current Password:"
@@ -6390,7 +6390,7 @@ msgstr "Benachrichtigungs-E-Mail senden, wenn:"
 
 #: mod/settings.php:1233
 msgid "You receive an introduction"
-msgstr "– Du eine Kontaktanfrage erhältst"
+msgstr "– du eine Kontaktanfrage erhältst"
 
 #: mod/settings.php:1234
 msgid "Your introductions are confirmed"
@@ -6406,19 +6406,19 @@ msgstr "– jemand auch einen Kommentar verfasst"
 
 #: mod/settings.php:1237
 msgid "You receive a private message"
-msgstr "– Du eine private Nachricht erhältst"
+msgstr "– du eine private Nachricht erhältst"
 
 #: mod/settings.php:1238
 msgid "You receive a friend suggestion"
-msgstr "– Du eine Empfehlung erhältst"
+msgstr "– du eine Empfehlung erhältst"
 
 #: mod/settings.php:1239
 msgid "You are tagged in a post"
-msgstr "– Du in einem Beitrag erwähnt wirst"
+msgstr "– du in einem Beitrag erwähnt wirst"
 
 #: mod/settings.php:1240
 msgid "You are poked/prodded/etc. in a post"
-msgstr "– Du von jemandem angestupst oder sonstwie behandelt wirst"
+msgstr "– du von jemandem angestupst oder sonstwie behandelt wirst"
 
 #: mod/settings.php:1242
 msgid "Activate desktop notifications"
@@ -6462,7 +6462,7 @@ msgstr "Umziehen"
 msgid ""
 "If you have moved this profile from another server, and some of your "
 "contacts don't receive your updates, try pushing this button."
-msgstr "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button."
+msgstr "Wenn du dein Profil von einem anderen Server umgezogen hast und einige deiner Kontakte deine Beiträge nicht erhalten, verwende diesen Button."
 
 #: mod/settings.php:1258
 msgid "Resend relocate message to contacts"
@@ -6475,7 +6475,7 @@ msgstr "%1$s folgt %2$s %3$s"
 
 #: mod/suggest.php:39
 msgid "Do you really want to delete this suggestion?"
-msgstr "Möchtest Du wirklich diese Empfehlung löschen?"
+msgstr "Möchtest du wirklich diese Empfehlung löschen?"
 
 #: mod/suggest.php:75
 msgid ""
@@ -6487,7 +6487,7 @@ msgstr "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde,
 msgid "Ignore/Hide"
 msgstr "Ignorieren/Verbergen"
 
-#: mod/suggest.php:119 view/theme/vier/theme.php:204 src/Content/Widget.php:66
+#: mod/suggest.php:119 src/Content/Widget.php:66 view/theme/vier/theme.php:204
 msgid "Friend Suggestions"
 msgstr "Kontaktvorschläge"
 
@@ -6551,7 +6551,7 @@ msgid ""
 "You need to export your account from the old server and upload it here. We "
 "will recreate your old account here with all your contacts. We will try also"
 " to inform your friends that you moved here."
-msgstr "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist."
+msgstr "Du musst deinen Account vom alten Server exportieren und hier hochladen. Wir stellen deinen alten Account mit all deinen Kontakten wieder her. Wir werden auch versuchen, deine Kontakte darüber zu informieren, dass du hierher umgezogen bist."
 
 #: mod/uimport.php:59
 msgid ""
@@ -6593,7 +6593,7 @@ msgstr "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"
 
 #: mod/videos.php:97
 msgid "Do you really want to delete this video?"
-msgstr "Möchtest Du dieses Video wirklich löschen?"
+msgstr "Möchtest du dieses Video wirklich löschen?"
 
 #: mod/videos.php:102
 msgid "Delete Video"
@@ -6603,7 +6603,7 @@ msgstr "Video Löschen"
 msgid "No videos selected"
 msgstr "Keine Videos  ausgewählt"
 
-#: mod/videos.php:309 src/Model/Item.php:3435
+#: mod/videos.php:309 src/Model/Item.php:3453
 msgid "View Video"
 msgstr "Video ansehen"
 
@@ -6625,41 +6625,13 @@ msgstr "Keine Kontakte."
 msgid "Visit %s's profile [%s]"
 msgstr "Besuche %ss Profil [%s]"
 
-#: mod/viewcontacts.php:114 view/theme/frio/theme.php:273
-#: src/Content/Text/HTML.php:911 src/Content/Nav.php:203
-#: src/Content/Nav.php:269 src/Model/Profile.php:980 src/Model/Profile.php:983
-#: src/Module/Contact.php:811 src/Module/Contact.php:881
+#: mod/viewcontacts.php:114 src/Content/Nav.php:203 src/Content/Nav.php:269
+#: src/Content/Text/HTML.php:911 src/Model/Profile.php:980
+#: src/Model/Profile.php:983 src/Module/Contact.php:811
+#: src/Module/Contact.php:881 view/theme/frio/theme.php:273
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: mod/wall_attach.php:26 mod/wall_attach.php:33 mod/wall_attach.php:85
-#: mod/wall_upload.php:42 mod/wall_upload.php:58 mod/wall_upload.php:116
-#: mod/wall_upload.php:167 mod/wall_upload.php:170
-msgid "Invalid request."
-msgstr "Ungültige Anfrage"
-
-#: mod/wall_attach.php:103
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "Entschuldige, die Datei scheint größer zu sein, als es die PHP-Konfiguration erlaubt."
-
-#: mod/wall_attach.php:103
-msgid "Or - did you try to upload an empty file?"
-msgstr "Oder - hast Du versucht, eine leere Datei hochzuladen?"
-
-#: mod/wall_attach.php:114
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr "Die Datei ist größer als das erlaubte Limit von %s"
-
-#: mod/wall_attach.php:129
-msgid "File upload failed."
-msgstr "Hochladen der Datei fehlgeschlagen."
-
-#: mod/wall_upload.php:243 src/Object/Image.php:967 src/Object/Image.php:983
-#: src/Object/Image.php:991 src/Object/Image.php:1016
-msgid "Wall Photos"
-msgstr "Pinnwand-Bilder"
-
 #: mod/wallmessage.php:52 mod/wallmessage.php:115
 #, php-format
 msgid "Number of daily wall messages for %s exceeded. Message failed."
@@ -6678,1164 +6650,53 @@ msgstr "Kein Empfänger."
 msgid ""
 "If you wish for %s to respond, please check that the privacy settings on "
 "your site allow private mail from unknown senders."
-msgstr "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."
+msgstr "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."
 
-#: view/theme/duepuntozero/config.php:55 src/Model/User.php:684
-msgid "default"
-msgstr "Standard"
+#: mod/wall_attach.php:26 mod/wall_attach.php:33 mod/wall_attach.php:85
+#: mod/wall_upload.php:42 mod/wall_upload.php:58 mod/wall_upload.php:116
+#: mod/wall_upload.php:167 mod/wall_upload.php:170
+msgid "Invalid request."
+msgstr "Ungültige Anfrage"
 
-#: view/theme/duepuntozero/config.php:56
-msgid "greenzero"
-msgstr "greenzero"
+#: mod/wall_attach.php:103
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr "Entschuldige, die Datei scheint größer zu sein, als es die PHP-Konfiguration erlaubt."
 
-#: view/theme/duepuntozero/config.php:57
-msgid "purplezero"
-msgstr "purplezero"
+#: mod/wall_attach.php:103
+msgid "Or - did you try to upload an empty file?"
+msgstr "Oder - hast du versucht, eine leere Datei hochzuladen?"
 
-#: view/theme/duepuntozero/config.php:58
-msgid "easterbunny"
-msgstr "easterbunny"
-
-#: view/theme/duepuntozero/config.php:59
-msgid "darkzero"
-msgstr "darkzero"
-
-#: view/theme/duepuntozero/config.php:60
-msgid "comix"
-msgstr "comix"
-
-#: view/theme/duepuntozero/config.php:61
-msgid "slackr"
-msgstr "slackr"
-
-#: view/theme/duepuntozero/config.php:75
-msgid "Variations"
-msgstr "Variationen"
-
-#: view/theme/frio/php/Image.php:24
-msgid "Top Banner"
-msgstr "Top Banner"
-
-#: view/theme/frio/php/Image.php:24
-msgid ""
-"Resize image to the width of the screen and show background color below on "
-"long pages."
-msgstr "Skaliere das Hintergrundbild so, dass es die Breite der Seite einnimmt, und fülle den Rest der Seite mit der Hintergrundfarbe bei langen Seiten."
-
-#: view/theme/frio/php/Image.php:25
-msgid "Full screen"
-msgstr "Vollbildmodus"
-
-#: view/theme/frio/php/Image.php:25
-msgid ""
-"Resize image to fill entire screen, clipping either the right or the bottom."
-msgstr "Skaliere das Bild so, dass es den gesamten Bildschirm füllt. Hierfür wird entweder die Breite oder die Höhe des Bildes automatisch abgeschnitten."
-
-#: view/theme/frio/php/Image.php:26
-msgid "Single row mosaic"
-msgstr "Mosaik in einer Zeile"
-
-#: view/theme/frio/php/Image.php:26
-msgid ""
-"Resize image to repeat it on a single row, either vertical or horizontal."
-msgstr "Skaliere das Bild so, dass es in einer einzelnen Reihe, entweder horizontal oder vertikal, wiederholt wird."
-
-#: view/theme/frio/php/Image.php:27
-msgid "Mosaic"
-msgstr "Mosaik"
-
-#: view/theme/frio/php/Image.php:27
-msgid "Repeat image to fill the screen."
-msgstr "Wiederhole das Bild, um den Bildschirm zu füllen."
-
-#: view/theme/frio/config.php:103
-msgid "Custom"
-msgstr "Benutzerdefiniert"
-
-#: view/theme/frio/config.php:115
-msgid "Note"
-msgstr "Hinweis"
-
-#: view/theme/frio/config.php:115
-msgid "Check image permissions if all users are allowed to see the image"
-msgstr "Überprüfe, dass alle Benutzer die Berechtigung haben dieses Bild anzusehen"
-
-#: view/theme/frio/config.php:122
-msgid "Select color scheme"
-msgstr "Farbschema auswählen"
-
-#: view/theme/frio/config.php:123
-msgid "Navigation bar background color"
-msgstr "Hintergrundfarbe der Navigationsleiste"
-
-#: view/theme/frio/config.php:124
-msgid "Navigation bar icon color "
-msgstr "Icon Farbe in der Navigationsleiste"
-
-#: view/theme/frio/config.php:125
-msgid "Link color"
-msgstr "Linkfarbe"
-
-#: view/theme/frio/config.php:126
-msgid "Set the background color"
-msgstr "Hintergrundfarbe festlegen"
-
-#: view/theme/frio/config.php:127
-msgid "Content background opacity"
-msgstr "Opazität des Hintergrunds von Beiträgen"
-
-#: view/theme/frio/config.php:128
-msgid "Set the background image"
-msgstr "Hintergrundbild festlegen"
-
-#: view/theme/frio/config.php:129
-msgid "Background image style"
-msgstr "Stil des Hintergrundbildes"
-
-#: view/theme/frio/config.php:134
-msgid "Login page background image"
-msgstr "Hintergrundbild der Login-Seite"
-
-#: view/theme/frio/config.php:138
-msgid "Login page background color"
-msgstr "Hintergrundfarbe der Login-Seite"
-
-#: view/theme/frio/config.php:138
-msgid "Leave background image and color empty for theme defaults"
-msgstr "Wenn die Theme-Vorgaben verwendet werden sollen, lass bitte die Felder für die Hintergrundfarbe und das Hintergrundbild leer."
-
-#: view/theme/frio/theme.php:239
-msgid "Guest"
-msgstr "Gast"
-
-#: view/theme/frio/theme.php:244
-msgid "Visitor"
-msgstr "Besucher"
-
-#: view/theme/frio/theme.php:259 src/Content/Nav.php:153
-#: src/Module/Login.php:321
-msgid "Logout"
-msgstr "Abmelden"
-
-#: view/theme/frio/theme.php:259 src/Content/Nav.php:153
-msgid "End this session"
-msgstr "Diese Sitzung beenden"
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:156
-#: src/Model/Profile.php:901 src/Module/Contact.php:652
-#: src/Module/Contact.php:853
-msgid "Status"
-msgstr "Status"
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:156
-#: src/Content/Nav.php:242
-msgid "Your posts and conversations"
-msgstr "Deine Beiträge und Unterhaltungen"
-
-#: view/theme/frio/theme.php:263 src/Content/Nav.php:157
-msgid "Your profile page"
-msgstr "Deine Profilseite"
-
-#: view/theme/frio/theme.php:264 src/Content/Nav.php:158
-msgid "Your photos"
-msgstr "Deine Fotos"
-
-#: view/theme/frio/theme.php:265 src/Content/Nav.php:159
-#: src/Model/Profile.php:925 src/Model/Profile.php:928
-msgid "Videos"
-msgstr "Videos"
-
-#: view/theme/frio/theme.php:265 src/Content/Nav.php:159
-msgid "Your videos"
-msgstr "Deine Videos"
-
-#: view/theme/frio/theme.php:266 src/Content/Nav.php:160
-msgid "Your events"
-msgstr "Deine Ereignisse"
-
-#: view/theme/frio/theme.php:269 src/Content/Nav.php:239
-msgid "Conversations from your friends"
-msgstr "Unterhaltungen Deiner Kontakte"
-
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:226
-#: src/Model/Profile.php:940 src/Model/Profile.php:951
-msgid "Events and Calendar"
-msgstr "Ereignisse und Kalender"
-
-#: view/theme/frio/theme.php:271 src/Content/Nav.php:252
-msgid "Private mail"
-msgstr "Private E-Mail"
-
-#: view/theme/frio/theme.php:272 src/Content/Nav.php:263
-msgid "Account settings"
-msgstr "Kontoeinstellungen"
-
-#: view/theme/frio/theme.php:273 src/Content/Nav.php:269
-msgid "Manage/edit friends and contacts"
-msgstr "Freunde und Kontakte verwalten/bearbeiten"
-
-#: view/theme/quattro/config.php:77
-msgid "Alignment"
-msgstr "Ausrichtung"
-
-#: view/theme/quattro/config.php:77
-msgid "Left"
-msgstr "Links"
-
-#: view/theme/quattro/config.php:77
-msgid "Center"
-msgstr "Mitte"
-
-#: view/theme/quattro/config.php:78
-msgid "Color scheme"
-msgstr "Farbschema"
-
-#: view/theme/quattro/config.php:79
-msgid "Posts font size"
-msgstr "Schriftgröße in Beiträgen"
-
-#: view/theme/quattro/config.php:80
-msgid "Textareas font size"
-msgstr "Schriftgröße in Eingabefeldern"
-
-#: view/theme/vier/config.php:76
-msgid "Comma separated list of helper forums"
-msgstr "Komma-separierte Liste der Helfer-Foren"
-
-#: view/theme/vier/config.php:116 src/Core/ACL.php:301
-msgid "don't show"
-msgstr "nicht zeigen"
-
-#: view/theme/vier/config.php:116 src/Core/ACL.php:300
-msgid "show"
-msgstr "zeigen"
-
-#: view/theme/vier/config.php:123
-msgid "Set style"
-msgstr "Stil auswählen"
-
-#: view/theme/vier/config.php:124
-msgid "Community Pages"
-msgstr "Foren"
-
-#: view/theme/vier/config.php:125 view/theme/vier/theme.php:151
-msgid "Community Profiles"
-msgstr "Community-Profile"
-
-#: view/theme/vier/config.php:126
-msgid "Help or @NewHere ?"
-msgstr "Hilfe oder @NewHere"
-
-#: view/theme/vier/config.php:127 view/theme/vier/theme.php:373
-msgid "Connect Services"
-msgstr "Verbinde Dienste"
-
-#: view/theme/vier/config.php:128
-msgid "Find Friends"
-msgstr "Kontakte finden"
-
-#: view/theme/vier/config.php:129 view/theme/vier/theme.php:181
-msgid "Last users"
-msgstr "Letzte Nutzer"
-
-#: view/theme/vier/theme.php:199 src/Content/Widget.php:61
-msgid "Find People"
-msgstr "Leute finden"
-
-#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
-msgid "Enter name or interest"
-msgstr "Name oder Interessen eingeben"
-
-#: view/theme/vier/theme.php:202 src/Content/Widget.php:64
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Beispiel: Robert Morgenstein, Angeln"
-
-#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
-msgid "Similar Interests"
-msgstr "Ähnliche Interessen"
-
-#: view/theme/vier/theme.php:206 src/Content/Widget.php:68
-msgid "Random Profile"
-msgstr "Zufälliges Profil"
-
-#: view/theme/vier/theme.php:207 src/Content/Widget.php:69
-msgid "Invite Friends"
-msgstr "Freunde einladen"
-
-#: view/theme/vier/theme.php:210 src/Content/Widget.php:72
-msgid "Local Directory"
-msgstr "Lokales Verzeichnis"
-
-#: view/theme/vier/theme.php:250 src/Content/Text/HTML.php:914
-#: src/Content/ForumManager.php:130 src/Content/Nav.php:207
-msgid "Forums"
-msgstr "Foren"
-
-#: view/theme/vier/theme.php:252 src/Content/ForumManager.php:132
-msgid "External link to forum"
-msgstr "Externer Link zum Forum"
-
-#: view/theme/vier/theme.php:288
-msgid "Quick Start"
-msgstr "Schnell-Start"
-
-#: src/Core/Console/ArchiveContact.php:65
+#: mod/wall_attach.php:114
 #, php-format
-msgid "Could not find any unarchived contact entry for this URL (%s)"
-msgstr "Für die URL (%s) konnte kein nicht-archivierter Kontakt gefunden werden"
+msgid "File exceeds size limit of %s"
+msgstr "Die Datei ist größer als das erlaubte Limit von %s"
 
-#: src/Core/Console/ArchiveContact.php:70
-msgid "The contact entries have been archived"
-msgstr "Die Kontakteinträge wurden archiviert."
+#: mod/wall_attach.php:129
+msgid "File upload failed."
+msgstr "Hochladen der Datei fehlgeschlagen."
 
-#: src/Core/Console/NewPassword.php:72
-msgid "Enter new password: "
-msgstr "Neues Passwort eingeben:"
+#: mod/wall_upload.php:243 src/Object/Image.php:967 src/Object/Image.php:983
+#: src/Object/Image.php:991 src/Object/Image.php:1016
+msgid "Wall Photos"
+msgstr "Pinnwand-Bilder"
 
-#: src/Core/Console/PostUpdate.php:50
-#, php-format
-msgid "Post update version number has been set to %s."
-msgstr "Die Post-Update-Versionsnummer wurde auf %s gesetzt."
+#: src/App.php:665
+msgid "Delete this item?"
+msgstr "Diesen Beitrag löschen?"
 
-#: src/Core/Console/PostUpdate.php:58
-msgid "Check for pending update actions."
-msgstr "Überprüfe ausstehende Update-Aktionen"
+#: src/App.php:707
+msgid "toggle mobile"
+msgstr "mobile Ansicht umschalten"
 
-#: src/Core/Console/PostUpdate.php:60
-msgid "Done."
-msgstr "Erledigt."
+#: src/App.php:1075
+msgid "No system theme config value set."
+msgstr "Es wurde kein Konfigurationswert für das systemweite Theme gesetzt."
 
-#: src/Core/Console/PostUpdate.php:62
-msgid "Execute pending post updates."
-msgstr "Ausstehende Post-Updates ausführen"
-
-#: src/Core/Console/PostUpdate.php:68
-msgid "All pending post updates are done."
-msgstr "Alle ausstehenden Post-Updates wurden ausgeführt."
-
-#: src/Core/ACL.php:287
-msgid "Post to Email"
-msgstr "An E-Mail senden"
-
-#: src/Core/ACL.php:293
-msgid "Hide your profile details from unknown viewers?"
-msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
-
-#: src/Core/ACL.php:292
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."
-
-#: src/Core/ACL.php:299
-msgid "Visible to everybody"
-msgstr "Für jeden sichtbar"
-
-#: src/Core/ACL.php:311
-msgid "Close"
-msgstr "Schließen"
-
-#: src/Core/Authentication.php:87
-msgid "Welcome "
-msgstr "Willkommen "
-
-#: src/Core/Authentication.php:88
-msgid "Please upload a profile photo."
-msgstr "Bitte lade ein Profilbild hoch."
-
-#: src/Core/Authentication.php:90
-msgid "Welcome back "
-msgstr "Willkommen zurück "
-
-#: src/Core/Installer.php:162
+#: src/BaseModule.php:133
 msgid ""
-"The database configuration file \"config/local.config.php\" could not be "
-"written. Please use the enclosed text to create a configuration file in your"
-" web server root."
-msgstr "Die Datenbankkonfigurationsdatei \"config/local.config.php\" konnte nicht erstellt werden. Um eine Konfigurationsdatei in Ihrem Webserver-Verzeichnis zu erstellen, gehen Sie wie folgt vor."
-
-#: src/Core/Installer.php:181
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren."
-
-#: src/Core/Installer.php:182 src/Module/Install.php:132
-#: src/Module/Install.php:263
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Lies bitte die \"INSTALL.txt\"."
-
-#: src/Core/Installer.php:243
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden."
-
-#: src/Core/Installer.php:244
-msgid ""
-"If you don't have a command line version of PHP installed on your server, "
-"you will not be able to run the background processing. See <a "
-"href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
-"up-the-worker'>'Setup the worker'</a>"
-msgstr "Wenn auf deinem Server keine Kommandozeilenversion von PHP installiert ist, kannst du den Hintergrundprozess nicht einrichten. Hier findest du alternative Möglichkeiten<a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'für das Worker-Setup'</a>"
-
-#: src/Core/Installer.php:248
-msgid "PHP executable path"
-msgstr "Pfad zu PHP"
-
-#: src/Core/Installer.php:248
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren."
-
-#: src/Core/Installer.php:253
-msgid "Command line PHP"
-msgstr "Kommandozeilen-PHP"
-
-#: src/Core/Installer.php:262
-msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
-msgstr "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)"
-
-#: src/Core/Installer.php:263
-msgid "Found PHP version: "
-msgstr "Gefundene PHP Version:"
-
-#: src/Core/Installer.php:265
-msgid "PHP cli binary"
-msgstr "PHP CLI Binary"
-
-#: src/Core/Installer.php:278
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert."
-
-#: src/Core/Installer.php:279
-msgid "This is required for message delivery to work."
-msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
-
-#: src/Core/Installer.php:284
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
-
-#: src/Core/Installer.php:316
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen"
-
-#: src/Core/Installer.php:317
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Wenn der Server unter Windows läuft, schau Dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an."
-
-#: src/Core/Installer.php:320
-msgid "Generate encryption keys"
-msgstr "Schlüssel erzeugen"
-
-#: src/Core/Installer.php:371
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert."
-
-#: src/Core/Installer.php:376
-msgid "Apache mod_rewrite module"
-msgstr "Apache mod_rewrite module"
-
-#: src/Core/Installer.php:382
-msgid "Error: PDO or MySQLi PHP module required but not installed."
-msgstr "Fehler: PDO oder MySQLi PHP Modul erforderlich, aber nicht installiert."
-
-#: src/Core/Installer.php:387
-msgid "Error: The MySQL driver for PDO is not installed."
-msgstr "Fehler: der MySQL Treiber für PDO ist nicht installiert"
-
-#: src/Core/Installer.php:391
-msgid "PDO or MySQLi PHP module"
-msgstr "PDO oder MySQLi PHP Modul"
-
-#: src/Core/Installer.php:399
-msgid "Error, XML PHP module required but not installed."
-msgstr "Fehler: XML PHP Modul erforderlich aber nicht installiert."
-
-#: src/Core/Installer.php:403
-msgid "XML PHP module"
-msgstr "XML PHP Modul"
-
-#: src/Core/Installer.php:406
-msgid "libCurl PHP module"
-msgstr "PHP: libCurl-Modul"
-
-#: src/Core/Installer.php:407
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert."
-
-#: src/Core/Installer.php:413
-msgid "GD graphics PHP module"
-msgstr "PHP: GD-Grafikmodul"
-
-#: src/Core/Installer.php:414
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert."
-
-#: src/Core/Installer.php:420
-msgid "OpenSSL PHP module"
-msgstr "PHP: OpenSSL-Modul"
-
-#: src/Core/Installer.php:421
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Fehler: Das openssl-Modul von PHP ist nicht installiert."
-
-#: src/Core/Installer.php:427
-msgid "mb_string PHP module"
-msgstr "PHP: mb_string-Modul"
-
-#: src/Core/Installer.php:428
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Fehler: mb_string PHP Module wird benötigt, ist aber nicht installiert."
-
-#: src/Core/Installer.php:434
-msgid "iconv PHP module"
-msgstr "PHP iconv Modul"
-
-#: src/Core/Installer.php:435
-msgid "Error: iconv PHP module required but not installed."
-msgstr "Fehler: Das iconv-Modul von PHP ist nicht installiert."
-
-#: src/Core/Installer.php:441
-msgid "POSIX PHP module"
-msgstr "PHP POSIX Modul"
-
-#: src/Core/Installer.php:442
-msgid "Error: POSIX PHP module required but not installed."
-msgstr "Fehler POSIX PHP Modul erforderlich, aber nicht installiert."
-
-#: src/Core/Installer.php:448
-msgid "JSON PHP module"
-msgstr "PHP JASON Modul"
-
-#: src/Core/Installer.php:449
-msgid "Error: JSON PHP module required but not installed."
-msgstr "Fehler: Das JSON PHP Modul wird benötigt, ist aber nicht installiert."
-
-#: src/Core/Installer.php:472
-msgid ""
-"The web installer needs to be able to create a file called "
-"\"local.config.php\" in the \"config\" folder of your web server and it is "
-"unable to do so."
-msgstr "Das Installationsprogramm muss in der Lage sein, eine Datei namens \"local.config.php\" im Ordner \"config\" Ihres Webservers zu erstellen, ist aber nicht in der Lage dazu."
-
-#: src/Core/Installer.php:473
-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 "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast."
-
-#: src/Core/Installer.php:474
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named local.config.php in your Friendica \"config\" folder."
-msgstr "Am Ende dieser Prozedur bekommst du einen Text, der in der local.config.php im Friendica \"config\" Ordner gespeichert werden muss."
-
-#: src/Core/Installer.php:475
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"INSTALL.txt\" for instructions."
-msgstr "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt."
-
-#: src/Core/Installer.php:478
-msgid "config/local.config.php is writable"
-msgstr "config/local.config.php ist schreibbar"
-
-#: src/Core/Installer.php:498
-msgid ""
-"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Friendica nutzt die Smarty3-Template-Engine, um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP, um das Rendern zu beschleunigen."
-
-#: src/Core/Installer.php:499
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/smarty3/ under the Friendica top level "
-"folder."
-msgstr "Um diese kompilierten Templates zu speichern, benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica."
-
-#: src/Core/Installer.php:500
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Webserver läuft (z.B. www-data), Schreibrechte zu diesem Verzeichnis hat."
-
-#: src/Core/Installer.php:501
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten."
-
-#: src/Core/Installer.php:504
-msgid "view/smarty3 is writable"
-msgstr "view/smarty3 ist schreibbar"
-
-#: src/Core/Installer.php:533
-msgid ""
-"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist"
-" to .htaccess."
-msgstr "Umschreiben der URLs in der .htaccess funktioniert nicht. Vergewissere dich, dass du .htaccess-dist nach.htaccess kopiert hast."
-
-#: src/Core/Installer.php:535
-msgid "Error message from Curl when fetching"
-msgstr "Fehlermeldung von Curl während des Ladens"
-
-#: src/Core/Installer.php:540
-msgid "Url rewrite is working"
-msgstr "URL rewrite funktioniert"
-
-#: src/Core/Installer.php:569
-msgid "ImageMagick PHP extension is not installed"
-msgstr "ImageMagicx PHP Erweiterung ist nicht installiert."
-
-#: src/Core/Installer.php:571
-msgid "ImageMagick PHP extension is installed"
-msgstr "ImageMagick PHP Erweiterung ist installiert"
-
-#: src/Core/Installer.php:573 tests/src/Core/InstallerTest.php:329
-#: tests/src/Core/InstallerTest.php:355
-msgid "ImageMagick supports GIF"
-msgstr "ImageMagick unterstützt GIF"
-
-#: src/Core/Installer.php:595
-msgid "Could not connect to database."
-msgstr "Verbindung zur Datenbank gescheitert."
-
-#: src/Core/Installer.php:602
-msgid "Database already in use."
-msgstr "Die Datenbank wird bereits verwendet."
-
-#: src/Core/L10n.php:368 src/Model/Event.php:398
-msgid "Tuesday"
-msgstr "Dienstag"
-
-#: src/Core/L10n.php:368 src/Model/Event.php:399
-msgid "Wednesday"
-msgstr "Mittwoch"
-
-#: src/Core/L10n.php:368 src/Model/Event.php:400
-msgid "Thursday"
-msgstr "Donnerstag"
-
-#: src/Core/L10n.php:368 src/Model/Event.php:401
-msgid "Friday"
-msgstr "Freitag"
-
-#: src/Core/L10n.php:368 src/Model/Event.php:402
-msgid "Saturday"
-msgstr "Samstag"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:417
-msgid "January"
-msgstr "Januar"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:418
-msgid "February"
-msgstr "Februar"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:419
-msgid "March"
-msgstr "März"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:420
-msgid "April"
-msgstr "April"
-
-#: src/Core/L10n.php:372 src/Core/L10n.php:391 src/Model/Event.php:408
-msgid "May"
-msgstr "Mai"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:421
-msgid "June"
-msgstr "Juni"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:422
-msgid "July"
-msgstr "Juli"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:423
-msgid "August"
-msgstr "August"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:424
-msgid "September"
-msgstr "September"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:425
-msgid "October"
-msgstr "Oktober"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:426
-msgid "November"
-msgstr "November"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:427
-msgid "December"
-msgstr "Dezember"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:389
-msgid "Mon"
-msgstr "Mo"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:390
-msgid "Tue"
-msgstr "Di"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:391
-msgid "Wed"
-msgstr "Mi"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:392
-msgid "Thu"
-msgstr "Do"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:393
-msgid "Fri"
-msgstr "Fr"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:394
-msgid "Sat"
-msgstr "Sa"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:388
-msgid "Sun"
-msgstr "So"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:404
-msgid "Jan"
-msgstr "Jan"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:405
-msgid "Feb"
-msgstr "Feb"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:406
-msgid "Mar"
-msgstr "März"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:407
-msgid "Apr"
-msgstr "Apr"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:410
-msgid "Jul"
-msgstr "Juli"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:411
-msgid "Aug"
-msgstr "Aug"
-
-#: src/Core/L10n.php:391
-msgid "Sep"
-msgstr "Sep"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:413
-msgid "Oct"
-msgstr "Okt"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:414
-msgid "Nov"
-msgstr "Nov"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:415
-msgid "Dec"
-msgstr "Dez"
-
-#: src/Core/L10n.php:410
-msgid "poke"
-msgstr "anstupsen"
-
-#: src/Core/L10n.php:410
-msgid "poked"
-msgstr "stupste"
-
-#: src/Core/L10n.php:411
-msgid "ping"
-msgstr "anpingen"
-
-#: src/Core/L10n.php:411
-msgid "pinged"
-msgstr "pingte"
-
-#: src/Core/L10n.php:412
-msgid "prod"
-msgstr "knuffen"
-
-#: src/Core/L10n.php:412
-msgid "prodded"
-msgstr "knuffte"
-
-#: src/Core/L10n.php:413
-msgid "slap"
-msgstr "ohrfeigen"
-
-#: src/Core/L10n.php:413
-msgid "slapped"
-msgstr "ohrfeigte"
-
-#: src/Core/L10n.php:414
-msgid "finger"
-msgstr "befummeln"
-
-#: src/Core/L10n.php:414
-msgid "fingered"
-msgstr "befummelte"
-
-#: src/Core/L10n.php:415
-msgid "rebuff"
-msgstr "eine Abfuhr erteilen"
-
-#: src/Core/L10n.php:415
-msgid "rebuffed"
-msgstr "abfuhrerteilte"
-
-#: src/Core/NotificationsManager.php:175
-msgid "System"
-msgstr "System"
-
-#: src/Core/NotificationsManager.php:196 src/Content/Nav.php:180
-#: src/Content/Nav.php:242
-msgid "Home"
-msgstr "Pinnwand"
-
-#: src/Core/NotificationsManager.php:203 src/Content/Nav.php:246
-msgid "Introductions"
-msgstr "Kontaktanfragen"
-
-#: src/Core/NotificationsManager.php:265 src/Core/NotificationsManager.php:277
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s hat %ss Beitrag kommentiert"
-
-#: src/Core/NotificationsManager.php:276
-#, php-format
-msgid "%s created a new post"
-msgstr "%s hat einen neuen Beitrag erstellt"
-
-#: src/Core/NotificationsManager.php:290
-#, php-format
-msgid "%s liked %s's post"
-msgstr "%s mag %ss Beitrag"
-
-#: src/Core/NotificationsManager.php:303
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "%s mag %ss Beitrag nicht"
-
-#: src/Core/NotificationsManager.php:316
-#, php-format
-msgid "%s is attending %s's event"
-msgstr "%s nimmt an %s's Event teil"
-
-#: src/Core/NotificationsManager.php:329
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr "%s nimmt nicht an %s's Event teil"
-
-#: src/Core/NotificationsManager.php:342
-#, php-format
-msgid "%s may attend %s's event"
-msgstr "%s nimmt eventuell an %s's Event teil"
-
-#: src/Core/NotificationsManager.php:375
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s ist jetzt mit %s befreundet"
-
-#: src/Core/NotificationsManager.php:651
-msgid "Friend Suggestion"
-msgstr "Kontaktvorschlag"
-
-#: src/Core/NotificationsManager.php:685
-msgid "Friend/Connect Request"
-msgstr "Kontakt-/Freundschaftsanfrage"
-
-#: src/Core/NotificationsManager.php:685
-msgid "New Follower"
-msgstr "Neuer Bewunderer"
-
-#: src/Core/System.php:137
-msgid "Error 400 - Bad Request"
-msgstr "Error 400 - Bad Request"
-
-#: src/Core/System.php:138
-msgid "Error 401 - Unauthorized"
-msgstr "Error 401 - Unauthorized"
-
-#: src/Core/System.php:139
-msgid "Error 403 - Forbidden"
-msgstr "Error 403 - Forbidden"
-
-#: src/Core/System.php:140
-msgid "Error 404 - Not Found"
-msgstr "Error 404 - Not Found"
-
-#: src/Core/System.php:141
-msgid "Error 500 - Internal Server Error"
-msgstr "Error 500 - Internal Server Error"
-
-#: src/Core/System.php:142
-msgid "Error 503 - Service Unavailable"
-msgstr "Error 503 - Service Unavailable"
-
-#: src/Core/System.php:150
-msgid ""
-"The server cannot or will not process the request due to an apparent client "
-"error."
-msgstr "Aufgrund eines offensichtlichen Fehlers auf der Seite des Clients kann oder wird der Server die Anfrage nicht bearbeiten."
-
-#: src/Core/System.php:151
-msgid ""
-"Authentication is required and has failed or has not yet been provided."
-msgstr "Die erforderliche Authentifizierung ist fehlgeschlagen oder noch nicht erfolgt."
-
-#: src/Core/System.php:152
-msgid ""
-"The request was valid, but the server is refusing action. The user might not"
-" have the necessary permissions for a resource, or may need an account."
-msgstr "Die Anfrage war gültig, aber der Server verweigert die Ausführung. Der Benutzer verfügt möglicherweise nicht über die erforderlichen Berechtigungen oder benötigt ein Nutzerkonto."
-
-#: src/Core/System.php:153
-msgid ""
-"The requested resource could not be found but may be available in the "
-"future."
-msgstr "Die angeforderte Ressource konnte nicht gefunden werden, sie könnte allerdings zu einem späteren Zeitpunkt verfügbar sein."
-
-#: src/Core/System.php:154
-msgid ""
-"An unexpected condition was encountered and no more specific message is "
-"suitable."
-msgstr "Eine unerwartete Situation ist eingetreten, zu der keine detailliertere Nachricht vorliegt."
-
-#: src/Core/System.php:155
-msgid ""
-"The server is currently unavailable (because it is overloaded or down for "
-"maintenance). Please try again later."
-msgstr "Der Server ist derzeit nicht verfügbar (wegen Überlastung oder Wartungsarbeiten). Bitte versuche es später noch einmal."
-
-#: src/Core/Update.php:168
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
-
-#: src/Core/Update.php:225
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
-msgstr "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler, falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."
-
-#: src/Core/Update.php:231
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]"
-
-#: src/Core/Update.php:260
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
-msgstr "\n \t\t\t\t\tDie Friendica Datenbank wurde erfolgreich von %s auf %s aktualisiert."
-
-#: src/Core/UserImport.php:103
-msgid "Error decoding account file"
-msgstr "Fehler beim Verarbeiten der Account-Datei"
-
-#: src/Core/UserImport.php:109
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica-Account-Datei?"
-
-#: src/Core/UserImport.php:117
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "Nutzer '%s' existiert bereits auf diesem Server!"
-
-#: src/Core/UserImport.php:153
-msgid "User creation error"
-msgstr "Fehler beim Anlegen des Nutzer-Accounts aufgetreten"
-
-#: src/Core/UserImport.php:171
-msgid "User profile creation error"
-msgstr "Fehler beim Anlegen des Nutzer-Profils"
-
-#: src/Core/UserImport.php:215
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "%d Kontakt nicht importiert"
-msgstr[1] "%d Kontakte nicht importiert"
-
-#: src/Core/UserImport.php:280
-msgid "Done. You can now login with your username and password"
-msgstr "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden"
-
-#: src/Util/Temporal.php:147 src/Model/Profile.php:771
-msgid "Birthday:"
-msgstr "Geburtstag:"
-
-#: src/Util/Temporal.php:151
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "YYYY-MM-DD oder MM-DD"
-
-#: src/Util/Temporal.php:298
-msgid "never"
-msgstr "nie"
-
-#: src/Util/Temporal.php:305
-msgid "less than a second ago"
-msgstr "vor weniger als einer Sekunde"
-
-#: src/Util/Temporal.php:313
-msgid "year"
-msgstr "Jahr"
-
-#: src/Util/Temporal.php:313
-msgid "years"
-msgstr "Jahre"
-
-#: src/Util/Temporal.php:314
-msgid "months"
-msgstr "Monate"
-
-#: src/Util/Temporal.php:315
-msgid "weeks"
-msgstr "Wochen"
-
-#: src/Util/Temporal.php:316
-msgid "days"
-msgstr "Tage"
-
-#: src/Util/Temporal.php:317
-msgid "hour"
-msgstr "Stunde"
-
-#: src/Util/Temporal.php:317
-msgid "hours"
-msgstr "Stunden"
-
-#: src/Util/Temporal.php:318
-msgid "minute"
-msgstr "Minute"
-
-#: src/Util/Temporal.php:318
-msgid "minutes"
-msgstr "Minuten"
-
-#: src/Util/Temporal.php:319
-msgid "second"
-msgstr "Sekunde"
-
-#: src/Util/Temporal.php:319
-msgid "seconds"
-msgstr "Sekunden"
-
-#: src/Util/Temporal.php:329
-#, php-format
-msgid "in %1$d %2$s"
-msgstr "in %1$d %2$s"
-
-#: src/Util/Temporal.php:332
-#, php-format
-msgid "%1$d %2$s ago"
-msgstr "vor %1$d %2$s"
-
-#: src/Content/Text/BBCode.php:429
-msgid "view full size"
-msgstr "Volle Größe anzeigen"
-
-#: src/Content/Text/BBCode.php:863 src/Content/Text/BBCode.php:1596
-#: src/Content/Text/BBCode.php:1597
-msgid "Image/photo"
-msgstr "Bild/Foto"
-
-#: src/Content/Text/BBCode.php:967
-#, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
-msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
-
-#: src/Content/Text/BBCode.php:1523 src/Content/Text/BBCode.php:1545
-msgid "$1 wrote:"
-msgstr "$1 hat geschrieben:"
-
-#: src/Content/Text/BBCode.php:1607 src/Content/Text/BBCode.php:1608
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
-
-#: src/Content/Text/BBCode.php:1715
-msgid "Invalid source protocol"
-msgstr "Ungültiges Quell-Protokoll"
-
-#: src/Content/Text/BBCode.php:1726
-msgid "Invalid link protocol"
-msgstr "Ungültiges Link-Protokoll"
-
-#: src/Content/Text/HTML.php:800
-msgid "Loading more entries..."
-msgstr "lade weitere Einträge..."
-
-#: src/Content/Text/HTML.php:801
-msgid "The end"
-msgstr "Das Ende"
-
-#: src/Content/Text/HTML.php:894
-msgid "Follow"
-msgstr "Folge"
-
-#: src/Content/Text/HTML.php:903 src/Content/Nav.php:79
-msgid "@name, !forum, #tags, content"
-msgstr "@name, !forum, #tags, content"
-
-#: src/Content/Text/HTML.php:909 src/Content/Nav.php:201
-msgid "Full Text"
-msgstr "Volltext"
-
-#: src/Content/Text/HTML.php:910 src/Content/Widget/TagCloud.php:54
-#: src/Content/Nav.php:202
-msgid "Tags"
-msgstr "Tags"
-
-#: src/Content/Text/HTML.php:951 src/Model/Item.php:3485
-#: src/Model/Item.php:3496
-msgid "Click to open/close"
-msgstr "Zum Öffnen/Schließen klicken"
-
-#: src/Content/Widget/CalendarExport.php:64
-msgid "Export"
-msgstr "Exportieren"
-
-#: src/Content/Widget/CalendarExport.php:65
-msgid "Export calendar as ical"
-msgstr "Kalender als ical exportieren"
-
-#: src/Content/Widget/CalendarExport.php:66
-msgid "Export calendar as csv"
-msgstr "Kalender als csv exportieren"
-
-#: src/Content/Widget/ContactBlock.php:58
-msgid "No contacts"
-msgstr "Keine Kontakte"
-
-#: src/Content/Widget/ContactBlock.php:90
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] "%d Kontakt"
-msgstr[1] "%d Kontakte"
-
-#: src/Content/Widget/ContactBlock.php:109
-msgid "View Contacts"
-msgstr "Kontakte anzeigen"
+"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 Sicherheitsmerkmal war nicht korrekt. Das passiert meistens, wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
 
 #: src/Content/ContactSelector.php:58
 msgid "Frequently"
@@ -8057,7 +6918,7 @@ msgstr "Untreu"
 msgid "Sex Addict"
 msgstr "Sexbesessen"
 
-#: src/Content/ContactSelector.php:241 src/Model/User.php:701
+#: src/Content/ContactSelector.php:241 src/Model/User.php:702
 msgid "Friends"
 msgstr "Kontakte"
 
@@ -8274,6 +7135,15 @@ msgstr "Mitgliedschaftsdatum anzeigen"
 msgid "Display membership date in profile"
 msgstr "Das Datum der Registrierung deines Accounts im Profil anzeigen"
 
+#: src/Content/ForumManager.php:130 src/Content/Nav.php:207
+#: src/Content/Text/HTML.php:914 view/theme/vier/theme.php:250
+msgid "Forums"
+msgstr "Foren"
+
+#: src/Content/ForumManager.php:132 view/theme/vier/theme.php:252
+msgid "External link to forum"
+msgstr "Externer Link zum Forum"
+
 #: src/Content/Nav.php:74
 msgid "Nothing new here"
 msgstr "Keine Neuigkeiten"
@@ -8282,6 +7152,51 @@ msgstr "Keine Neuigkeiten"
 msgid "Clear notifications"
 msgstr "Bereinige Benachrichtigungen"
 
+#: src/Content/Nav.php:79 src/Content/Text/HTML.php:903
+msgid "@name, !forum, #tags, content"
+msgstr "@name, !forum, #tags, content"
+
+#: src/Content/Nav.php:153 src/Module/Login.php:321
+#: view/theme/frio/theme.php:259
+msgid "Logout"
+msgstr "Abmelden"
+
+#: src/Content/Nav.php:153 view/theme/frio/theme.php:259
+msgid "End this session"
+msgstr "Diese Sitzung beenden"
+
+#: src/Content/Nav.php:156 src/Model/Profile.php:901
+#: src/Module/Contact.php:652 src/Module/Contact.php:853
+#: view/theme/frio/theme.php:262
+msgid "Status"
+msgstr "Status"
+
+#: src/Content/Nav.php:156 src/Content/Nav.php:242
+#: view/theme/frio/theme.php:262
+msgid "Your posts and conversations"
+msgstr "Deine Beiträge und Unterhaltungen"
+
+#: src/Content/Nav.php:157 view/theme/frio/theme.php:263
+msgid "Your profile page"
+msgstr "Deine Profilseite"
+
+#: src/Content/Nav.php:158 view/theme/frio/theme.php:264
+msgid "Your photos"
+msgstr "Deine Fotos"
+
+#: src/Content/Nav.php:159 src/Model/Profile.php:925 src/Model/Profile.php:928
+#: view/theme/frio/theme.php:265
+msgid "Videos"
+msgstr "Videos"
+
+#: src/Content/Nav.php:159 view/theme/frio/theme.php:265
+msgid "Your videos"
+msgstr "Deine Videos"
+
+#: src/Content/Nav.php:160 view/theme/frio/theme.php:266
+msgid "Your events"
+msgstr "Deine Ereignisse"
+
 #: src/Content/Nav.php:161
 msgid "Personal notes"
 msgstr "Persönliche Notizen"
@@ -8294,6 +7209,11 @@ msgstr "Deine persönlichen Notizen"
 msgid "Sign in"
 msgstr "Anmelden"
 
+#: src/Content/Nav.php:180 src/Content/Nav.php:242
+#: src/Core/NotificationsManager.php:196
+msgid "Home"
+msgstr "Pinnwand"
+
 #: src/Content/Nav.php:180
 msgid "Home Page"
 msgstr "Homepage"
@@ -8323,6 +7243,15 @@ msgstr "Zusätzliche Anwendungen, Dienstprogramme, Spiele"
 msgid "Search site content"
 msgstr "Inhalt der Seite durchsuchen"
 
+#: src/Content/Nav.php:201 src/Content/Text/HTML.php:909
+msgid "Full Text"
+msgstr "Volltext"
+
+#: src/Content/Nav.php:202 src/Content/Text/HTML.php:910
+#: src/Content/Widget/TagCloud.php:54
+msgid "Tags"
+msgstr "Tags"
+
 #: src/Content/Nav.php:222
 msgid "Community"
 msgstr "Gemeinschaft"
@@ -8331,6 +7260,11 @@ msgstr "Gemeinschaft"
 msgid "Conversations on this and other servers"
 msgstr "Unterhaltungen auf diesem und anderen Servern"
 
+#: src/Content/Nav.php:226 src/Model/Profile.php:940 src/Model/Profile.php:951
+#: view/theme/frio/theme.php:270
+msgid "Events and Calendar"
+msgstr "Ereignisse und Kalender"
+
 #: src/Content/Nav.php:229
 msgid "Directory"
 msgstr "Verzeichnis"
@@ -8347,6 +7281,10 @@ msgstr "Informationen zu dieser Friendica-Instanz"
 msgid "Terms of Service of this Friendica instance"
 msgstr "Die Nutzungsbedingungen dieser Friendica-Instanz"
 
+#: src/Content/Nav.php:239 view/theme/frio/theme.php:269
+msgid "Conversations from your friends"
+msgstr "Unterhaltungen Deiner Kontakte"
+
 #: src/Content/Nav.php:240
 msgid "Network Reset"
 msgstr "Netzwerk zurücksetzen"
@@ -8355,6 +7293,10 @@ msgstr "Netzwerk zurücksetzen"
 msgid "Load Network page with no filters"
 msgstr "Netzwerk-Seite ohne Filter laden"
 
+#: src/Content/Nav.php:246 src/Core/NotificationsManager.php:203
+msgid "Introductions"
+msgstr "Kontaktanfragen"
+
 #: src/Content/Nav.php:246
 msgid "Friend Requests"
 msgstr "Kontaktanfragen"
@@ -8367,6 +7309,10 @@ msgstr "Alle Benachrichtigungen anzeigen"
 msgid "Mark all system notifications seen"
 msgstr "Markiere alle Systembenachrichtigungen als gelesen"
 
+#: src/Content/Nav.php:252 view/theme/frio/theme.php:271
+msgid "Private mail"
+msgstr "Private E-Mail"
+
 #: src/Content/Nav.php:253
 msgid "Inbox"
 msgstr "Eingang"
@@ -8383,10 +7329,18 @@ msgstr "Verwalten"
 msgid "Manage other pages"
 msgstr "Andere Seiten verwalten"
 
+#: src/Content/Nav.php:263 view/theme/frio/theme.php:272
+msgid "Account settings"
+msgstr "Kontoeinstellungen"
+
 #: src/Content/Nav.php:266
 msgid "Manage/Edit Profiles"
 msgstr "Profile verwalten/editieren"
 
+#: src/Content/Nav.php:269 view/theme/frio/theme.php:273
+msgid "Manage/edit friends and contacts"
+msgstr "Freunde und Kontakte verwalten/bearbeiten"
+
 #: src/Content/Nav.php:274
 msgid "Site setup and configuration"
 msgstr "Einstellungen der Seite und Konfiguration"
@@ -8423,6 +7377,80 @@ msgstr "vorige"
 msgid "last"
 msgstr "letzte"
 
+#: src/Content/Text/BBCode.php:429
+msgid "view full size"
+msgstr "Volle Größe anzeigen"
+
+#: src/Content/Text/BBCode.php:863 src/Content/Text/BBCode.php:1596
+#: src/Content/Text/BBCode.php:1597
+msgid "Image/photo"
+msgstr "Bild/Foto"
+
+#: src/Content/Text/BBCode.php:967
+#, php-format
+msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+
+#: src/Content/Text/BBCode.php:1523 src/Content/Text/BBCode.php:1545
+msgid "$1 wrote:"
+msgstr "$1 hat geschrieben:"
+
+#: src/Content/Text/BBCode.php:1607 src/Content/Text/BBCode.php:1608
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
+
+#: src/Content/Text/BBCode.php:1715
+msgid "Invalid source protocol"
+msgstr "Ungültiges Quell-Protokoll"
+
+#: src/Content/Text/BBCode.php:1726
+msgid "Invalid link protocol"
+msgstr "Ungültiges Link-Protokoll"
+
+#: src/Content/Text/HTML.php:800
+msgid "Loading more entries..."
+msgstr "lade weitere Einträge..."
+
+#: src/Content/Text/HTML.php:801
+msgid "The end"
+msgstr "Das Ende"
+
+#: src/Content/Text/HTML.php:894
+msgid "Follow"
+msgstr "Folge"
+
+#: src/Content/Text/HTML.php:951 src/Model/Item.php:3503
+#: src/Model/Item.php:3514
+msgid "Click to open/close"
+msgstr "Zum Öffnen/Schließen klicken"
+
+#: src/Content/Widget/CalendarExport.php:64
+msgid "Export"
+msgstr "Exportieren"
+
+#: src/Content/Widget/CalendarExport.php:65
+msgid "Export calendar as ical"
+msgstr "Kalender als ical exportieren"
+
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export calendar as csv"
+msgstr "Kalender als csv exportieren"
+
+#: src/Content/Widget/ContactBlock.php:58
+msgid "No contacts"
+msgstr "Keine Kontakte"
+
+#: src/Content/Widget/ContactBlock.php:90
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d Kontakt"
+msgstr[1] "%d Kontakte"
+
+#: src/Content/Widget/ContactBlock.php:109
+msgid "View Contacts"
+msgstr "Kontakte anzeigen"
+
 #: src/Content/Widget.php:35
 msgid "Add New Contact"
 msgstr "Neuen Kontakt hinzufügen"
@@ -8442,6 +7470,34 @@ msgid_plural "%d invitations available"
 msgstr[0] "%d Einladung verfügbar"
 msgstr[1] "%d Einladungen verfügbar"
 
+#: src/Content/Widget.php:61 view/theme/vier/theme.php:199
+msgid "Find People"
+msgstr "Leute finden"
+
+#: src/Content/Widget.php:62 view/theme/vier/theme.php:200
+msgid "Enter name or interest"
+msgstr "Name oder Interessen eingeben"
+
+#: src/Content/Widget.php:64 view/theme/vier/theme.php:202
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Beispiel: Robert Morgenstein, Angeln"
+
+#: src/Content/Widget.php:67 view/theme/vier/theme.php:205
+msgid "Similar Interests"
+msgstr "Ähnliche Interessen"
+
+#: src/Content/Widget.php:68 view/theme/vier/theme.php:206
+msgid "Random Profile"
+msgstr "Zufälliges Profil"
+
+#: src/Content/Widget.php:69 view/theme/vier/theme.php:207
+msgid "Invite Friends"
+msgstr "Freunde einladen"
+
+#: src/Content/Widget.php:72 view/theme/vier/theme.php:210
+msgid "Local Directory"
+msgstr "Lokales Verzeichnis"
+
 #: src/Content/Widget.php:158
 msgid "Protocols"
 msgstr "Protokolle"
@@ -8469,6 +7525,706 @@ msgid_plural "%d contacts in common"
 msgstr[0] "%d gemeinsamer Kontakt"
 msgstr[1] "%d gemeinsame Kontakte"
 
+#: src/Core/ACL.php:287
+msgid "Post to Email"
+msgstr "An E-Mail senden"
+
+#: src/Core/ACL.php:293
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
+
+#: src/Core/ACL.php:292
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."
+
+#: src/Core/ACL.php:299
+msgid "Visible to everybody"
+msgstr "Für jeden sichtbar"
+
+#: src/Core/ACL.php:300 view/theme/vier/config.php:116
+msgid "show"
+msgstr "zeigen"
+
+#: src/Core/ACL.php:301 view/theme/vier/config.php:116
+msgid "don't show"
+msgstr "nicht zeigen"
+
+#: src/Core/ACL.php:311
+msgid "Close"
+msgstr "Schließen"
+
+#: src/Core/Authentication.php:87
+msgid "Welcome "
+msgstr "Willkommen "
+
+#: src/Core/Authentication.php:88
+msgid "Please upload a profile photo."
+msgstr "Bitte lade ein Profilbild hoch."
+
+#: src/Core/Authentication.php:90
+msgid "Welcome back "
+msgstr "Willkommen zurück "
+
+#: src/Core/Console/ArchiveContact.php:65
+#, php-format
+msgid "Could not find any unarchived contact entry for this URL (%s)"
+msgstr "Für die URL (%s) konnte kein nicht-archivierter Kontakt gefunden werden"
+
+#: src/Core/Console/ArchiveContact.php:70
+msgid "The contact entries have been archived"
+msgstr "Die Kontakteinträge wurden archiviert."
+
+#: src/Core/Console/NewPassword.php:72
+msgid "Enter new password: "
+msgstr "Neues Passwort eingeben:"
+
+#: src/Core/Console/PostUpdate.php:50
+#, php-format
+msgid "Post update version number has been set to %s."
+msgstr "Die Post-Update-Versionsnummer wurde auf %s gesetzt."
+
+#: src/Core/Console/PostUpdate.php:58
+msgid "Check for pending update actions."
+msgstr "Überprüfe ausstehende Update-Aktionen"
+
+#: src/Core/Console/PostUpdate.php:60
+msgid "Done."
+msgstr "Erledigt."
+
+#: src/Core/Console/PostUpdate.php:62
+msgid "Execute pending post updates."
+msgstr "Ausstehende Post-Updates ausführen"
+
+#: src/Core/Console/PostUpdate.php:68
+msgid "All pending post updates are done."
+msgstr "Alle ausstehenden Post-Updates wurden ausgeführt."
+
+#: src/Core/Installer.php:163
+msgid ""
+"The database configuration file \"config/local.config.php\" could not be "
+"written. Please use the enclosed text to create a configuration file in your"
+" web server root."
+msgstr "Die Datenbankkonfigurationsdatei \"config/local.config.php\" konnte nicht erstellt werden. Um eine Konfigurationsdatei in Ihrem Webserver-Verzeichnis zu erstellen, gehe wie folgt vor."
+
+#: src/Core/Installer.php:182
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Möglicherweise musst du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren."
+
+#: src/Core/Installer.php:183 src/Module/Install.php:132
+#: src/Module/Install.php:263
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Lies bitte die \"INSTALL.txt\"."
+
+#: src/Core/Installer.php:244
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden."
+
+#: src/Core/Installer.php:245
+msgid ""
+"If you don't have a command line version of PHP installed on your server, "
+"you will not be able to run the background processing. See <a "
+"href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
+"up-the-worker'>'Setup the worker'</a>"
+msgstr "Wenn auf deinem Server keine Kommandozeilenversion von PHP installiert ist, kannst du den Hintergrundprozess nicht einrichten. Hier findest du alternative Möglichkeiten<a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'für das Worker-Setup'</a>"
+
+#: src/Core/Installer.php:249
+msgid "PHP executable path"
+msgstr "Pfad zu PHP"
+
+#: src/Core/Installer.php:249
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren."
+
+#: src/Core/Installer.php:254
+msgid "Command line PHP"
+msgstr "Kommandozeilen-PHP"
+
+#: src/Core/Installer.php:263
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+msgstr "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)"
+
+#: src/Core/Installer.php:264
+msgid "Found PHP version: "
+msgstr "Gefundene PHP Version:"
+
+#: src/Core/Installer.php:266
+msgid "PHP cli binary"
+msgstr "PHP CLI Binary"
+
+#: src/Core/Installer.php:279
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert."
+
+#: src/Core/Installer.php:280
+msgid "This is required for message delivery to work."
+msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
+
+#: src/Core/Installer.php:285
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
+
+#: src/Core/Installer.php:317
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen"
+
+#: src/Core/Installer.php:318
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an."
+
+#: src/Core/Installer.php:321
+msgid "Generate encryption keys"
+msgstr "Schlüssel erzeugen"
+
+#: src/Core/Installer.php:372
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert."
+
+#: src/Core/Installer.php:377
+msgid "Apache mod_rewrite module"
+msgstr "Apache mod_rewrite module"
+
+#: src/Core/Installer.php:383
+msgid "Error: PDO or MySQLi PHP module required but not installed."
+msgstr "Fehler: PDO oder MySQLi PHP Modul erforderlich, aber nicht installiert."
+
+#: src/Core/Installer.php:388
+msgid "Error: The MySQL driver for PDO is not installed."
+msgstr "Fehler: der MySQL Treiber für PDO ist nicht installiert"
+
+#: src/Core/Installer.php:392
+msgid "PDO or MySQLi PHP module"
+msgstr "PDO oder MySQLi PHP Modul"
+
+#: src/Core/Installer.php:400
+msgid "Error, XML PHP module required but not installed."
+msgstr "Fehler: XML PHP Modul erforderlich aber nicht installiert."
+
+#: src/Core/Installer.php:404
+msgid "XML PHP module"
+msgstr "XML PHP Modul"
+
+#: src/Core/Installer.php:407
+msgid "libCurl PHP module"
+msgstr "PHP: libCurl-Modul"
+
+#: src/Core/Installer.php:408
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert."
+
+#: src/Core/Installer.php:414
+msgid "GD graphics PHP module"
+msgstr "PHP: GD-Grafikmodul"
+
+#: src/Core/Installer.php:415
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert."
+
+#: src/Core/Installer.php:421
+msgid "OpenSSL PHP module"
+msgstr "PHP: OpenSSL-Modul"
+
+#: src/Core/Installer.php:422
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Fehler: Das openssl-Modul von PHP ist nicht installiert."
+
+#: src/Core/Installer.php:428
+msgid "mb_string PHP module"
+msgstr "PHP: mb_string-Modul"
+
+#: src/Core/Installer.php:429
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Fehler: mb_string PHP Module wird benötigt, ist aber nicht installiert."
+
+#: src/Core/Installer.php:435
+msgid "iconv PHP module"
+msgstr "PHP iconv Modul"
+
+#: src/Core/Installer.php:436
+msgid "Error: iconv PHP module required but not installed."
+msgstr "Fehler: Das iconv-Modul von PHP ist nicht installiert."
+
+#: src/Core/Installer.php:442
+msgid "POSIX PHP module"
+msgstr "PHP POSIX Modul"
+
+#: src/Core/Installer.php:443
+msgid "Error: POSIX PHP module required but not installed."
+msgstr "Fehler POSIX PHP Modul erforderlich, aber nicht installiert."
+
+#: src/Core/Installer.php:449
+msgid "JSON PHP module"
+msgstr "PHP JASON Modul"
+
+#: src/Core/Installer.php:450
+msgid "Error: JSON PHP module required but not installed."
+msgstr "Fehler: Das JSON PHP Modul wird benötigt, ist aber nicht installiert."
+
+#: src/Core/Installer.php:473
+msgid ""
+"The web installer needs to be able to create a file called "
+"\"local.config.php\" in the \"config\" folder of your web server and it is "
+"unable to do so."
+msgstr "Das Installationsprogramm muss in der Lage sein, eine Datei namens \"local.config.php\" im Ordner \"config\" Ihres Webservers zu erstellen, ist aber nicht in der Lage dazu."
+
+#: src/Core/Installer.php:474
+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 "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast."
+
+#: src/Core/Installer.php:475
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named local.config.php in your Friendica \"config\" folder."
+msgstr "Am Ende dieser Prozedur bekommst du einen Text, der in der local.config.php im Friendica \"config\" Ordner gespeichert werden muss."
+
+#: src/Core/Installer.php:476
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"INSTALL.txt\" for instructions."
+msgstr "Alternativ kannst du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest du in der Datei INSTALL.txt."
+
+#: src/Core/Installer.php:479
+msgid "config/local.config.php is writable"
+msgstr "config/local.config.php ist schreibbar"
+
+#: src/Core/Installer.php:499
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Friendica nutzt die Smarty3-Template-Engine, um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP, um das Rendern zu beschleunigen."
+
+#: src/Core/Installer.php:500
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
+msgstr "Um diese kompilierten Templates zu speichern, benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica."
+
+#: src/Core/Installer.php:501
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Webserver läuft (z.B. www-data), Schreibrechte zu diesem Verzeichnis hat."
+
+#: src/Core/Installer.php:502
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr "Hinweis: aus Sicherheitsgründen solltest du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht für die darin enthaltenen Template-Dateien (.tpl)."
+
+#: src/Core/Installer.php:505
+msgid "view/smarty3 is writable"
+msgstr "view/smarty3 ist schreibbar"
+
+#: src/Core/Installer.php:534
+msgid ""
+"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist"
+" to .htaccess."
+msgstr "Umschreiben der URLs in der .htaccess funktioniert nicht. Vergewissere dich, dass du .htaccess-dist nach.htaccess kopiert hast."
+
+#: src/Core/Installer.php:536
+msgid "Error message from Curl when fetching"
+msgstr "Fehlermeldung von Curl während des Ladens"
+
+#: src/Core/Installer.php:541
+msgid "Url rewrite is working"
+msgstr "URL rewrite funktioniert"
+
+#: src/Core/Installer.php:570
+msgid "ImageMagick PHP extension is not installed"
+msgstr "ImageMagicx PHP Erweiterung ist nicht installiert."
+
+#: src/Core/Installer.php:572
+msgid "ImageMagick PHP extension is installed"
+msgstr "ImageMagick PHP Erweiterung ist installiert"
+
+#: src/Core/Installer.php:574 tests/src/Core/InstallerTest.php:329
+#: tests/src/Core/InstallerTest.php:355
+msgid "ImageMagick supports GIF"
+msgstr "ImageMagick unterstützt GIF"
+
+#: src/Core/Installer.php:597
+msgid "Could not connect to database."
+msgstr "Verbindung zur Datenbank gescheitert."
+
+#: src/Core/Installer.php:604
+msgid "Database already in use."
+msgstr "Die Datenbank wird bereits verwendet."
+
+#: src/Core/L10n.php:368 src/Model/Event.php:397
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:398
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:399
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:400
+msgid "Friday"
+msgstr "Freitag"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:401
+msgid "Saturday"
+msgstr "Samstag"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:416
+msgid "January"
+msgstr "Januar"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:417
+msgid "February"
+msgstr "Februar"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:418
+msgid "March"
+msgstr "März"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:419
+msgid "April"
+msgstr "April"
+
+#: src/Core/L10n.php:372 src/Core/L10n.php:391 src/Model/Event.php:407
+msgid "May"
+msgstr "Mai"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:420
+msgid "June"
+msgstr "Juni"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:421
+msgid "July"
+msgstr "Juli"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:422
+msgid "August"
+msgstr "August"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:423
+msgid "September"
+msgstr "September"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:424
+msgid "October"
+msgstr "Oktober"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:425
+msgid "November"
+msgstr "November"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:426
+msgid "December"
+msgstr "Dezember"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:388
+msgid "Mon"
+msgstr "Mo"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:389
+msgid "Tue"
+msgstr "Di"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:390
+msgid "Wed"
+msgstr "Mi"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:391
+msgid "Thu"
+msgstr "Do"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:392
+msgid "Fri"
+msgstr "Fr"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:393
+msgid "Sat"
+msgstr "Sa"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:387
+msgid "Sun"
+msgstr "So"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:403
+msgid "Jan"
+msgstr "Jan"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:404
+msgid "Feb"
+msgstr "Feb"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:405
+msgid "Mar"
+msgstr "März"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:406
+msgid "Apr"
+msgstr "Apr"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:409
+msgid "Jul"
+msgstr "Juli"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:410
+msgid "Aug"
+msgstr "Aug"
+
+#: src/Core/L10n.php:391
+msgid "Sep"
+msgstr "Sep"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:412
+msgid "Oct"
+msgstr "Okt"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:413
+msgid "Nov"
+msgstr "Nov"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:414
+msgid "Dec"
+msgstr "Dez"
+
+#: src/Core/L10n.php:410
+msgid "poke"
+msgstr "anstupsen"
+
+#: src/Core/L10n.php:410
+msgid "poked"
+msgstr "stupste"
+
+#: src/Core/L10n.php:411
+msgid "ping"
+msgstr "anpingen"
+
+#: src/Core/L10n.php:411
+msgid "pinged"
+msgstr "pingte"
+
+#: src/Core/L10n.php:412
+msgid "prod"
+msgstr "knuffen"
+
+#: src/Core/L10n.php:412
+msgid "prodded"
+msgstr "knuffte"
+
+#: src/Core/L10n.php:413
+msgid "slap"
+msgstr "ohrfeigen"
+
+#: src/Core/L10n.php:413
+msgid "slapped"
+msgstr "ohrfeigte"
+
+#: src/Core/L10n.php:414
+msgid "finger"
+msgstr "befummeln"
+
+#: src/Core/L10n.php:414
+msgid "fingered"
+msgstr "befummelte"
+
+#: src/Core/L10n.php:415
+msgid "rebuff"
+msgstr "eine Abfuhr erteilen"
+
+#: src/Core/L10n.php:415
+msgid "rebuffed"
+msgstr "abfuhrerteilte"
+
+#: src/Core/NotificationsManager.php:175
+msgid "System"
+msgstr "System"
+
+#: src/Core/NotificationsManager.php:265 src/Core/NotificationsManager.php:277
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s hat %ss Beitrag kommentiert"
+
+#: src/Core/NotificationsManager.php:276
+#, php-format
+msgid "%s created a new post"
+msgstr "%s hat einen neuen Beitrag erstellt"
+
+#: src/Core/NotificationsManager.php:290
+#, php-format
+msgid "%s liked %s's post"
+msgstr "%s mag %ss Beitrag"
+
+#: src/Core/NotificationsManager.php:303
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "%s mag %ss Beitrag nicht"
+
+#: src/Core/NotificationsManager.php:316
+#, php-format
+msgid "%s is attending %s's event"
+msgstr "%s nimmt an %s's Event teil"
+
+#: src/Core/NotificationsManager.php:329
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s nimmt nicht an %s's Event teil"
+
+#: src/Core/NotificationsManager.php:342
+#, php-format
+msgid "%s may attend %s's event"
+msgstr "%s nimmt eventuell an %s's Event teil"
+
+#: src/Core/NotificationsManager.php:375
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s ist jetzt mit %s befreundet"
+
+#: src/Core/NotificationsManager.php:651
+msgid "Friend Suggestion"
+msgstr "Kontaktvorschlag"
+
+#: src/Core/NotificationsManager.php:685
+msgid "Friend/Connect Request"
+msgstr "Kontakt-/Freundschaftsanfrage"
+
+#: src/Core/NotificationsManager.php:685
+msgid "New Follower"
+msgstr "Neuer Bewunderer"
+
+#: src/Core/System.php:137
+msgid "Error 400 - Bad Request"
+msgstr "Error 400 - Bad Request"
+
+#: src/Core/System.php:138
+msgid "Error 401 - Unauthorized"
+msgstr "Error 401 - Unauthorized"
+
+#: src/Core/System.php:139
+msgid "Error 403 - Forbidden"
+msgstr "Error 403 - Forbidden"
+
+#: src/Core/System.php:140
+msgid "Error 404 - Not Found"
+msgstr "Error 404 - Not Found"
+
+#: src/Core/System.php:141
+msgid "Error 500 - Internal Server Error"
+msgstr "Error 500 - Internal Server Error"
+
+#: src/Core/System.php:142
+msgid "Error 503 - Service Unavailable"
+msgstr "Error 503 - Service Unavailable"
+
+#: src/Core/System.php:150
+msgid ""
+"The server cannot or will not process the request due to an apparent client "
+"error."
+msgstr "Aufgrund eines offensichtlichen Fehlers auf der Seite des Clients kann oder wird der Server die Anfrage nicht bearbeiten."
+
+#: src/Core/System.php:151
+msgid ""
+"Authentication is required and has failed or has not yet been provided."
+msgstr "Die erforderliche Authentifizierung ist fehlgeschlagen oder noch nicht erfolgt."
+
+#: src/Core/System.php:152
+msgid ""
+"The request was valid, but the server is refusing action. The user might not"
+" have the necessary permissions for a resource, or may need an account."
+msgstr "Die Anfrage war gültig, aber der Server verweigert die Ausführung. Der Benutzer verfügt möglicherweise nicht über die erforderlichen Berechtigungen oder benötigt ein Nutzerkonto."
+
+#: src/Core/System.php:153
+msgid ""
+"The requested resource could not be found but may be available in the "
+"future."
+msgstr "Die angeforderte Ressource konnte nicht gefunden werden, sie könnte allerdings zu einem späteren Zeitpunkt verfügbar sein."
+
+#: src/Core/System.php:154
+msgid ""
+"An unexpected condition was encountered and no more specific message is "
+"suitable."
+msgstr "Eine unerwartete Situation ist eingetreten, zu der keine detailliertere Nachricht vorliegt."
+
+#: src/Core/System.php:155
+msgid ""
+"The server is currently unavailable (because it is overloaded or down for "
+"maintenance). Please try again later."
+msgstr "Der Server ist derzeit nicht verfügbar (wegen Überlastung oder Wartungsarbeiten). Bitte versuche es später noch einmal."
+
+#: src/Core/Update.php:168
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
+
+#: src/Core/Update.php:225
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
+msgstr "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler, falls du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."
+
+#: src/Core/Update.php:231
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]"
+
+#: src/Core/Update.php:260
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
+msgstr "\n \t\t\t\t\tDie Friendica Datenbank wurde erfolgreich von %s auf %s aktualisiert."
+
+#: src/Core/UserImport.php:103
+msgid "Error decoding account file"
+msgstr "Fehler beim Verarbeiten der Account-Datei"
+
+#: src/Core/UserImport.php:109
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica-Account-Datei?"
+
+#: src/Core/UserImport.php:117
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "Nutzer '%s' existiert bereits auf diesem Server!"
+
+#: src/Core/UserImport.php:153
+msgid "User creation error"
+msgstr "Fehler beim Anlegen des Nutzer-Accounts aufgetreten"
+
+#: src/Core/UserImport.php:171
+msgid "User profile creation error"
+msgstr "Fehler beim Anlegen des Nutzer-Profils"
+
+#: src/Core/UserImport.php:215
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d Kontakt nicht importiert"
+msgstr[1] "%d Kontakte nicht importiert"
+
+#: src/Core/UserImport.php:280
+msgid "Done. You can now login with your username and password"
+msgstr "Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden"
+
 #: src/Database/DBStructure.php:47
 msgid "There are no tables on MyISAM."
 msgstr "Es gibt keine MyISAM-Tabellen."
@@ -8495,147 +8251,152 @@ msgstr "%s: Datenbank Aktualisierung"
 msgid "%s: updating %s table."
 msgstr "%s: aktualisiere Tabelle %s"
 
-#: src/Model/Contact.php:1037
+#: src/LegacyModule.php:30
+#, php-format
+msgid "Legacy module file not found: %s"
+msgstr "Legacy-Moduldatei nicht gefunden: %s"
+
+#: src/Model/Contact.php:1054
 msgid "Drop Contact"
 msgstr "Kontakt löschen"
 
-#: src/Model/Contact.php:1509
+#: src/Model/Contact.php:1526
 msgid "Organisation"
 msgstr "Organisation"
 
-#: src/Model/Contact.php:1513
+#: src/Model/Contact.php:1530
 msgid "News"
 msgstr "Nachrichten"
 
-#: src/Model/Contact.php:1517
+#: src/Model/Contact.php:1534
 msgid "Forum"
 msgstr "Forum"
 
-#: src/Model/Contact.php:1707
+#: src/Model/Contact.php:1724
 msgid "Connect URL missing."
 msgstr "Connect-URL fehlt"
 
-#: src/Model/Contact.php:1716
+#: src/Model/Contact.php:1733
 msgid ""
 "The contact could not be added. Please check the relevant network "
 "credentials in your Settings -> Social Networks page."
 msgstr "Der Kontakt konnte nicht hinzugefügt werden. Bitte überprüfe die Einstellungen unter Einstellungen -> Soziale Netzwerke"
 
-#: src/Model/Contact.php:1755
+#: src/Model/Contact.php:1772
 msgid ""
 "This site is not configured to allow communications with other networks."
 msgstr "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."
 
-#: src/Model/Contact.php:1756 src/Model/Contact.php:1769
+#: src/Model/Contact.php:1773 src/Model/Contact.php:1786
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."
 
-#: src/Model/Contact.php:1767
+#: src/Model/Contact.php:1784
 msgid "The profile address specified does not provide adequate information."
 msgstr "Die angegebene Profiladresse liefert unzureichende Informationen."
 
-#: src/Model/Contact.php:1772
+#: src/Model/Contact.php:1789
 msgid "An author or name was not found."
 msgstr "Es wurde kein Autor oder Name gefunden."
 
-#: src/Model/Contact.php:1775
+#: src/Model/Contact.php:1792
 msgid "No browser URL could be matched to this address."
 msgstr "Zu dieser Adresse konnte keine passende Browser-URL gefunden werden."
 
-#: src/Model/Contact.php:1778
+#: src/Model/Contact.php:1795
 msgid ""
 "Unable to match @-style Identity Address with a known protocol or email "
 "contact."
 msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."
 
-#: src/Model/Contact.php:1779
+#: src/Model/Contact.php:1796
 msgid "Use mailto: in front of address to force email check."
 msgstr "Verwende mailto: vor der E-Mail-Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."
 
-#: src/Model/Contact.php:1785
+#: src/Model/Contact.php:1802
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."
 
-#: src/Model/Contact.php:1790
+#: src/Model/Contact.php:1807
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
-msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können."
+msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können."
 
-#: src/Model/Contact.php:1843
+#: src/Model/Contact.php:1860
 msgid "Unable to retrieve contact information."
 msgstr "Konnte die Kontaktinformationen nicht empfangen."
 
-#: src/Model/Event.php:61 src/Model/Event.php:78 src/Model/Event.php:436
-#: src/Model/Event.php:916
+#: src/Model/Event.php:61 src/Model/Event.php:78 src/Model/Event.php:435
+#: src/Model/Event.php:915
 msgid "Starts:"
 msgstr "Beginnt:"
 
-#: src/Model/Event.php:64 src/Model/Event.php:84 src/Model/Event.php:437
-#: src/Model/Event.php:920
+#: src/Model/Event.php:64 src/Model/Event.php:84 src/Model/Event.php:436
+#: src/Model/Event.php:919
 msgid "Finishes:"
 msgstr "Endet:"
 
-#: src/Model/Event.php:386
+#: src/Model/Event.php:385
 msgid "all-day"
 msgstr "ganztägig"
 
-#: src/Model/Event.php:409
+#: src/Model/Event.php:408
 msgid "Jun"
 msgstr "Jun"
 
-#: src/Model/Event.php:412
+#: src/Model/Event.php:411
 msgid "Sept"
 msgstr "Sep"
 
-#: src/Model/Event.php:434
+#: src/Model/Event.php:433
 msgid "No events to display"
 msgstr "Keine Veranstaltung zum Anzeigen"
 
-#: src/Model/Event.php:562
+#: src/Model/Event.php:561
 msgid "l, F j"
 msgstr "l, F j"
 
-#: src/Model/Event.php:593
+#: src/Model/Event.php:592
 msgid "Edit event"
 msgstr "Veranstaltung bearbeiten"
 
-#: src/Model/Event.php:594
+#: src/Model/Event.php:593
 msgid "Duplicate event"
 msgstr "Veranstaltung kopieren"
 
-#: src/Model/Event.php:595
+#: src/Model/Event.php:594
 msgid "Delete event"
 msgstr "Veranstaltung löschen"
 
-#: src/Model/Event.php:627 src/Model/Item.php:3536 src/Model/Item.php:3543
+#: src/Model/Event.php:626 src/Model/Item.php:3554 src/Model/Item.php:3561
 msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
-#: src/Model/Event.php:849
+#: src/Model/Event.php:848
 msgid "D g:i A"
 msgstr "D H:i"
 
-#: src/Model/Event.php:850
+#: src/Model/Event.php:849
 msgid "g:i A"
 msgstr "H:i"
 
-#: src/Model/Event.php:935 src/Model/Event.php:937
+#: src/Model/Event.php:934 src/Model/Event.php:936
 msgid "Show map"
 msgstr "Karte anzeigen"
 
-#: src/Model/Event.php:936
+#: src/Model/Event.php:935
 msgid "Hide map"
 msgstr "Karte verbergen"
 
-#: src/Model/Event.php:1028
+#: src/Model/Event.php:1027
 #, php-format
 msgid "%s's birthday"
 msgstr "%ss Geburtstag"
 
-#: src/Model/Event.php:1029
+#: src/Model/Event.php:1028
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Herzlichen Glückwunsch, %s"
@@ -8649,7 +8410,7 @@ 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 "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen."
+msgstr "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen."
 
 #: src/Model/Group.php:338
 msgid "Default privacy group for new contacts"
@@ -8675,34 +8436,34 @@ msgstr "Neue Gruppe erstellen"
 msgid "Edit groups"
 msgstr "Gruppen bearbeiten"
 
-#: src/Model/Item.php:3269
+#: src/Model/Item.php:3287
 msgid "activity"
 msgstr "Aktivität"
 
-#: src/Model/Item.php:3271 src/Object/Post.php:457 src/Object/Post.php:469
+#: src/Model/Item.php:3289 src/Object/Post.php:470
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "Kommentar"
 msgstr[1] "Kommentare"
 
-#: src/Model/Item.php:3274
+#: src/Model/Item.php:3292
 msgid "post"
 msgstr "Beitrag"
 
-#: src/Model/Item.php:3373
+#: src/Model/Item.php:3391
 #, php-format
 msgid "Content warning: %s"
 msgstr "Inhaltswarnung: %s"
 
-#: src/Model/Item.php:3452
+#: src/Model/Item.php:3470
 msgid "bytes"
 msgstr "Byte"
 
-#: src/Model/Item.php:3530
+#: src/Model/Item.php:3548
 msgid "View on separate page"
 msgstr "Auf separater Seite ansehen"
 
-#: src/Model/Item.php:3531
+#: src/Model/Item.php:3549
 msgid "view on separate page"
 msgstr "auf separater Seite ansehen"
 
@@ -8779,6 +8540,10 @@ msgstr "j F, Y"
 msgid "j F"
 msgstr "j F"
 
+#: src/Model/Profile.php:771 src/Util/Temporal.php:147
+msgid "Birthday:"
+msgstr "Geburtstag:"
+
 #: src/Model/Profile.php:778
 msgid "Age:"
 msgstr "Alter:"
@@ -8838,7 +8603,7 @@ msgstr "Profildetails"
 
 #: src/Model/Profile.php:962
 msgid "Only You Can See This"
-msgstr "Nur Du kannst das sehen"
+msgstr "Nur du kannst das sehen"
 
 #: src/Model/Profile.php:970 src/Model/Profile.php:973
 msgid "Tips for New Members"
@@ -8861,14 +8626,14 @@ msgstr "Der Datenbankspeicher konnte keine Daten einfügen"
 #: src/Model/Storage/Filesystem.php:63
 #, php-format
 msgid "Filesystem storage failed to create \"%s\". Check you write permissions."
-msgstr "Dateisystemspeicher konnte nicht erstellt werden \"%s\". Überprüfen Sie, ob Sie Schreibberechtigungen haben."
+msgstr "Dateisystemspeicher konnte nicht erstellt werden \"%s\". Überprüfe, ob du Schreibberechtigungen hast."
 
 #: src/Model/Storage/Filesystem.php:105
 #, php-format
 msgid ""
 "Filesystem storage failed to save data to \"%s\". Check your write "
 "permissions"
-msgstr "Der Dateisystemspeicher konnte die Daten nicht in \"%s\" speichern. Überprüfen Sie Ihre Schreibberechtigungen"
+msgstr "Der Dateisystemspeicher konnte die Daten nicht in \"%s\" speichern. Überprüfe Deine Schreibberechtigungen"
 
 #: src/Model/Storage/Filesystem.php:126
 msgid "Storage base path"
@@ -8882,136 +8647,140 @@ msgstr "Verzeichnis, in das Dateien hochgeladen werden. Für maximale Sicherheit
 
 #: src/Model/Storage/Filesystem.php:138
 msgid "Enter a valid existing folder"
-msgstr "Geben Sie einen gültigen, existierenden Ordner ein"
+msgstr "Gib einen gültigen, existierenden Ordner ein"
 
-#: src/Model/User.php:270
+#: src/Model/User.php:271
 msgid "Login failed"
 msgstr "Anmeldung fehlgeschlagen"
 
-#: src/Model/User.php:301
+#: src/Model/User.php:302
 msgid "Not enough information to authenticate"
 msgstr "Nicht genügend Informationen für die Authentifizierung"
 
-#: src/Model/User.php:379
+#: src/Model/User.php:380
 msgid "Password can't be empty"
 msgstr "Das Passwort kann nicht leer sein"
 
-#: src/Model/User.php:398
+#: src/Model/User.php:399
 msgid "Empty passwords are not allowed."
 msgstr "Leere Passwörter sind nicht erlaubt."
 
-#: src/Model/User.php:402
+#: src/Model/User.php:403
 msgid ""
 "The new password has been exposed in a public data dump, please choose "
 "another."
 msgstr "Das neue Passwort wurde in einem öffentlichen Daten-Dump veröffentlicht. Bitte verwende ein anderes Passwort."
 
-#: src/Model/User.php:408
+#: src/Model/User.php:409
 msgid ""
 "The password can't contain accentuated letters, white spaces or colons (:)"
 msgstr "Das Passwort darf keine akzentuierten Buchstaben, Leerzeichen oder Doppelpunkte (:) beinhalten"
 
-#: src/Model/User.php:508
+#: src/Model/User.php:509
 msgid "Passwords do not match. Password unchanged."
 msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
 
-#: src/Model/User.php:515
+#: src/Model/User.php:516
 msgid "An invitation is required."
 msgstr "Du benötigst eine Einladung."
 
-#: src/Model/User.php:519
+#: src/Model/User.php:520
 msgid "Invitation could not be verified."
 msgstr "Die Einladung konnte nicht überprüft werden."
 
-#: src/Model/User.php:526
+#: src/Model/User.php:527
 msgid "Invalid OpenID url"
 msgstr "Ungültige OpenID URL"
 
-#: src/Model/User.php:539 src/Module/Login.php:106
+#: src/Model/User.php:540 src/Module/Login.php:106
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
-msgstr "Beim Versuch, Dich mit der von Dir angegebenen OpenID anzumelden, trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast."
+msgstr "Beim Versuch, dich mit der von dir angegebenen OpenID anzumelden, trat ein Problem auf. Bitte überprüfe, dass du die OpenID richtig geschrieben hast."
 
-#: src/Model/User.php:539 src/Module/Login.php:106
+#: src/Model/User.php:540 src/Module/Login.php:106
 msgid "The error message was:"
 msgstr "Die Fehlermeldung lautete:"
 
-#: src/Model/User.php:545
+#: src/Model/User.php:546
 msgid "Please enter the required information."
 msgstr "Bitte trage die erforderlichen Informationen ein."
 
-#: src/Model/User.php:559
+#: src/Model/User.php:560
 #, php-format
 msgid ""
 "system.username_min_length (%s) and system.username_max_length (%s) are "
 "excluding each other, swapping values."
 msgstr "system.username_min_length (%s) and system.username_max_length (%s) schließen sich gegenseitig aus, tausche Werte aus."
 
-#: src/Model/User.php:566
+#: src/Model/User.php:567
 #, php-format
 msgid "Username should be at least %s character."
 msgid_plural "Username should be at least %s characters."
 msgstr[0] "Der Benutzername sollte aus mindestens %s Zeichen bestehen."
 msgstr[1] "Der Benutzername sollte aus mindestens %s Zeichen bestehen."
 
-#: src/Model/User.php:570
+#: src/Model/User.php:571
 #, php-format
 msgid "Username should be at most %s character."
 msgid_plural "Username should be at most %s characters."
 msgstr[0] "Der Benutzername sollte aus maximal %s Zeichen bestehen."
 msgstr[1] "Der Benutzername sollte aus maximal %s Zeichen bestehen."
 
-#: src/Model/User.php:578
+#: src/Model/User.php:579
 msgid "That doesn't appear to be your full (First Last) name."
-msgstr "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein."
+msgstr "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein."
 
-#: src/Model/User.php:583
+#: src/Model/User.php:584
 msgid "Your email domain is not among those allowed on this site."
 msgstr "Die Domain Deiner E-Mail-Adresse ist auf dieser Seite nicht erlaubt."
 
-#: src/Model/User.php:587
+#: src/Model/User.php:588
 msgid "Not a valid email address."
 msgstr "Keine gültige E-Mail-Adresse."
 
-#: src/Model/User.php:590
+#: src/Model/User.php:591
 msgid "The nickname was blocked from registration by the nodes admin."
 msgstr "Der Admin des Knotens hat den Spitznamen für die Registrierung gesperrt."
 
-#: src/Model/User.php:594 src/Model/User.php:602
+#: src/Model/User.php:595 src/Model/User.php:603
 msgid "Cannot use that email."
 msgstr "Konnte diese E-Mail-Adresse nicht verwenden."
 
-#: src/Model/User.php:609
+#: src/Model/User.php:610
 msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen."
 
-#: src/Model/User.php:616 src/Model/User.php:673
+#: src/Model/User.php:617 src/Model/User.php:674
 msgid "Nickname is already registered. Please choose another."
 msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
 
-#: src/Model/User.php:626
+#: src/Model/User.php:627
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."
 
-#: src/Model/User.php:660 src/Model/User.php:664
+#: src/Model/User.php:661 src/Model/User.php:665
 msgid "An error occurred during registration. Please try again."
 msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
-#: src/Model/User.php:689
+#: src/Model/User.php:685 view/theme/duepuntozero/config.php:55
+msgid "default"
+msgstr "Standard"
+
+#: src/Model/User.php:690
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
-#: src/Model/User.php:696
+#: src/Model/User.php:697
 msgid "An error occurred creating your self contact. Please try again."
 msgstr "Bei der Erstellung deines self-Kontakts ist ein Fehler aufgetreten. Bitte versuche es erneut."
 
-#: src/Model/User.php:705
+#: src/Model/User.php:706
 msgid ""
 "An error occurred creating your default contact group. Please try again."
 msgstr "Bei der Erstellung deiner Standardgruppe für Kontakte ist ein Fehler aufgetreten. Bitte versuche es erneut."
 
-#: src/Model/User.php:781
+#: src/Model/User.php:782
 #, php-format
 msgid ""
 "\n"
@@ -9024,23 +8793,23 @@ msgid ""
 "\t\t\tLogin Name:\t\t%4$s\n"
 "\t\t\tPassword:\t\t%5$s\n"
 "\t\t"
-msgstr "\n\t\t\tHallo %1$s,\n\t\t\t\tdanke für Deine Registrierung auf %2$s. Dein Account muss noch vom Admin des Knotens freigeschaltet werden.\n\n\t\t\tDeine Zugangsdaten lauten wie folgt:\n\n\t\t\tSeitenadresse:\t%3$s\n\t\t\tAnmeldename:\t\t%4$s\n\t\t\tPasswort:\t\t%5$s\n\t\t"
+msgstr "\n\t\t\tHallo %1$s,\n\t\t\t\tdanke für deine Registrierung auf %2$s. Dein Account muss noch vom Admin des Knotens freigeschaltet werden.\n\n\t\t\tDeine Zugangsdaten lauten wie folgt:\n\n\t\t\tSeitenadresse:\t%3$s\n\t\t\tAnmeldename:\t\t%4$s\n\t\t\tPasswort:\t\t%5$s\n\t\t"
 
-#: src/Model/User.php:798
+#: src/Model/User.php:799
 #, php-format
 msgid "Registration at %s"
 msgstr "Registrierung als %s"
 
-#: src/Model/User.php:817
+#: src/Model/User.php:818
 #, php-format
 msgid ""
 "\n"
 "\t\t\tDear %1$s,\n"
 "\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
 "\t\t"
-msgstr "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde eingerichtet."
+msgstr "\nHallo %1$s,\n\ndanke für deine Registrierung auf %2$s. Dein Account wurde eingerichtet."
 
-#: src/Model/User.php:823
+#: src/Model/User.php:824
 #, php-format
 msgid ""
 "\n"
@@ -9070,53 +8839,7 @@ msgid ""
 "\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n"
 "\n"
 "\t\t\tThank you and welcome to %2$s."
-msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s."
-
-#: src/Protocol/Diaspora.php:2496
-msgid "Sharing notification from Diaspora network"
-msgstr "Freigabe-Benachrichtigung von Diaspora"
-
-#: src/Protocol/Diaspora.php:3613
-msgid "Attachments:"
-msgstr "Anhänge:"
-
-#: src/Protocol/OStatus.php:1302 src/Module/Profile.php:102
-#: src/Module/Profile.php:105
-#, php-format
-msgid "%s's timeline"
-msgstr "Timeline von %s"
-
-#: src/Protocol/OStatus.php:1306 src/Module/Profile.php:103
-#, php-format
-msgid "%s's posts"
-msgstr "Beiträge von %s"
-
-#: src/Protocol/OStatus.php:1309 src/Module/Profile.php:104
-#, php-format
-msgid "%s's comments"
-msgstr "Kommentare von %s"
-
-#: src/Protocol/OStatus.php:1866
-#, php-format
-msgid "%s is now following %s."
-msgstr "%s folgt nun %s"
-
-#: src/Protocol/OStatus.php:1867
-msgid "following"
-msgstr "folgen"
-
-#: src/Protocol/OStatus.php:1870
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%s hat aufgehört %s, zu folgen"
-
-#: src/Protocol/OStatus.php:1871
-msgid "stopped following"
-msgstr "wird nicht mehr gefolgt"
-
-#: src/Worker/Delivery.php:453
-msgid "(no subject)"
-msgstr "(kein Betreff)"
+msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst dein Passwort unter \"Einstellungen\" ändern, sobald du dich\nangemeldet hast.\n\nBitte nimm dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst du ja auch einige Informationen über dich in deinem\nProfil veröffentlichen, damit andere Leute dich einfacher finden können.\nBearbeite hierfür einfach dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen dir, deinen kompletten Namen anzugeben und ein zu dir\npassendes Profilbild zu wählen, damit dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn du auf deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die deine Interessen teilen.\n\nWir respektieren deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3$s/removeme jederzeit tun.\n\nDanke für deine Aufmerksamkeit und willkommen auf %2$s."
 
 #: src/Module/Attach.php:36 src/Module/Attach.php:48
 msgid "Item was not found."
@@ -9190,7 +8913,7 @@ msgstr "Du teilst mit %s"
 #: src/Module/Contact.php:496
 #, php-format
 msgid "%s is sharing with you"
-msgstr "%s teilt mit Dir"
+msgstr "%s teilt mit dir"
 
 #: src/Module/Contact.php:520
 msgid "Private communications are not available for this contact."
@@ -9265,7 +8988,7 @@ msgstr "Kontakt"
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
-msgstr "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft."
+msgstr "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft."
 
 #: src/Module/Contact.php:598
 msgid "Their personal note"
@@ -9501,13 +9224,13 @@ msgstr "Um Friendica installieren zu können, müssen wir wissen, wie wir mit De
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
-msgstr "Bitte kontaktiere den Hosting-Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest."
+msgstr "Bitte kontaktiere den Hosting-Provider oder den Administrator der Seite, falls du Fragen zu diesen Einstellungen haben solltest."
 
 #: src/Module/Install.php:154
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
-msgstr "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte, bevor Du mit der Installation fortfährst."
+msgstr "Die Datenbank, die du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte, bevor du mit der Installation fortfährst."
 
 #: src/Module/Install.php:157
 msgid "Database Server Name"
@@ -9537,7 +9260,7 @@ msgstr "E-Mail-Adresse des Administrators"
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
-msgstr "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst."
+msgstr "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit du das Admin-Panel benutzen kannst."
 
 #: src/Module/Install.php:184 src/Module/Install.php:215
 msgid "Please select a default timezone for your website"
@@ -9573,7 +9296,7 @@ msgstr "<h1>Wie geht es weiter?</h1>"
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "worker."
-msgstr "Wichtig: Du musst [manuell] einen Cronjob (o.ä.) für den Worker einrichten."
+msgstr "Wichtig: du musst [manuell] einen Cronjob (o.ä.) für den Worker einrichten."
 
 #: src/Module/Install.php:265
 #, php-format
@@ -9601,7 +9324,7 @@ msgstr "Anmeldedaten merken"
 
 #: src/Module/Login.php:329
 msgid "Or login using OpenID: "
-msgstr "Oder melde Dich mit Deiner OpenID an: "
+msgstr "Oder melde dich mit deiner OpenID an: "
 
 #: src/Module/Login.php:335
 msgid "Forgot your password?"
@@ -9627,6 +9350,22 @@ msgstr "Datenschutzerklärung"
 msgid "Logged out."
 msgstr "Abgemeldet."
 
+#: src/Module/Profile.php:102 src/Module/Profile.php:105
+#: src/Protocol/OStatus.php:1302
+#, php-format
+msgid "%s's timeline"
+msgstr "Timeline von %s"
+
+#: src/Module/Profile.php:103 src/Protocol/OStatus.php:1306
+#, php-format
+msgid "%s's posts"
+msgstr "Beiträge von %s"
+
+#: src/Module/Profile.php:104 src/Protocol/OStatus.php:1309
+#, php-format
+msgid "%s's comments"
+msgstr "Kommentare von %s"
+
 #: src/Module/Proxy.php:73
 msgid "Bad Request."
 msgstr "Ungültige Anfrage."
@@ -9641,7 +9380,7 @@ msgstr "Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen,
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
-msgstr "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."
+msgstr "Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."
 
 #: src/Module/Register.php:85
 msgid "Your OpenID (optional): "
@@ -9649,7 +9388,7 @@ msgstr "Deine OpenID (optional): "
 
 #: src/Module/Register.php:94
 msgid "Include your profile in member directory?"
-msgstr "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?"
+msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?"
 
 #: src/Module/Register.php:117
 msgid "Note for the admin"
@@ -9686,7 +9425,7 @@ msgstr "Leer lassen, um das Passwort automatisch zu generieren."
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be \"<strong>nickname@%s</strong>\"."
-msgstr "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@%s</strong>' sein."
+msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@%s</strong>' sein."
 
 #: src/Module/Register.php:133
 msgid "Choose a nickname: "
@@ -9694,7 +9433,7 @@ msgstr "Spitznamen wählen: "
 
 #: src/Module/Register.php:142
 msgid "Import your profile to this friendica instance"
-msgstr "Importiere Dein Profil auf diese Friendica-Instanz"
+msgstr "Importiere dein Profil auf diese Friendica-Instanz"
 
 #: src/Module/Register.php:150
 msgid "Note: This node explicitly contains adult content"
@@ -9703,7 +9442,7 @@ msgstr "Hinweis: Dieser Knoten enthält explizit Inhalte für Erwachsene"
 #: src/Module/Register.php:243
 msgid ""
 "Registration successful. Please check your email for further instructions."
-msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
+msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet."
 
 #: src/Module/Register.php:247
 #, php-format
@@ -9855,59 +9594,141 @@ msgstr "Wall-to-Wall"
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: src/Object/Post.php:432
+#: src/Object/Post.php:418
+#, php-format
+msgid "Reply to %s"
+msgstr "Antworte %s"
+
+#: src/Object/Post.php:433
 msgid "Notifier task is pending"
 msgstr "Die Benachrichtigungsaufgabe ist ausstehend"
 
-#: src/Object/Post.php:433
+#: src/Object/Post.php:434
 msgid "Delivery to remote servers is pending"
 msgstr "Die Auslieferung an Remote-Server steht noch aus"
 
-#: src/Object/Post.php:434
+#: src/Object/Post.php:435
 msgid "Delivery to remote servers is underway"
 msgstr "Die Auslieferung an Remote-Server ist unterwegs"
 
-#: src/Object/Post.php:435
+#: src/Object/Post.php:436
 msgid "Delivery to remote servers is mostly done"
 msgstr "Die Zustellung an Remote-Server ist fast erledigt"
 
-#: src/Object/Post.php:436
+#: src/Object/Post.php:437
 msgid "Delivery to remote servers is done"
 msgstr "Die Zustellung an die Remote-Server ist erledigt"
 
-#: src/Object/Post.php:455
+#: src/Object/Post.php:457
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d Kommentar"
 msgstr[1] "%d Kommentare"
 
-#: src/App.php:665
-msgid "Delete this item?"
-msgstr "Diesen Beitrag löschen?"
+#: src/Object/Post.php:458
+msgid "Show more"
+msgstr "Zeige mehr"
 
-#: src/App.php:667
-msgid "show fewer"
-msgstr "weniger anzeigen"
+#: src/Object/Post.php:459
+msgid "Show fewer"
+msgstr "Zeige weniger"
 
-#: src/App.php:709
-msgid "toggle mobile"
-msgstr "mobile Ansicht umschalten"
+#: src/Protocol/Diaspora.php:2496
+msgid "Sharing notification from Diaspora network"
+msgstr "Freigabe-Benachrichtigung von Diaspora"
 
-#: src/App.php:1077
-msgid "No system theme config value set."
-msgstr "Es wurde kein Konfigurationswert für das systemweite Theme gesetzt."
+#: src/Protocol/Diaspora.php:3613
+msgid "Attachments:"
+msgstr "Anhänge:"
 
-#: src/BaseModule.php:133
-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 Sicherheitsmerkmal war nicht korrekt. Das passiert meistens, wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
-
-#: src/LegacyModule.php:30
+#: src/Protocol/OStatus.php:1866
 #, php-format
-msgid "Legacy module file not found: %s"
-msgstr "Legacy-Moduldatei nicht gefunden: %s"
+msgid "%s is now following %s."
+msgstr "%s folgt nun %s"
+
+#: src/Protocol/OStatus.php:1867
+msgid "following"
+msgstr "folgen"
+
+#: src/Protocol/OStatus.php:1870
+#, php-format
+msgid "%s stopped following %s."
+msgstr "%s hat aufgehört %s, zu folgen"
+
+#: src/Protocol/OStatus.php:1871
+msgid "stopped following"
+msgstr "wird nicht mehr gefolgt"
+
+#: src/Util/Temporal.php:151
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "YYYY-MM-DD oder MM-DD"
+
+#: src/Util/Temporal.php:298
+msgid "never"
+msgstr "nie"
+
+#: src/Util/Temporal.php:305
+msgid "less than a second ago"
+msgstr "vor weniger als einer Sekunde"
+
+#: src/Util/Temporal.php:313
+msgid "year"
+msgstr "Jahr"
+
+#: src/Util/Temporal.php:313
+msgid "years"
+msgstr "Jahre"
+
+#: src/Util/Temporal.php:314
+msgid "months"
+msgstr "Monate"
+
+#: src/Util/Temporal.php:315
+msgid "weeks"
+msgstr "Wochen"
+
+#: src/Util/Temporal.php:316
+msgid "days"
+msgstr "Tage"
+
+#: src/Util/Temporal.php:317
+msgid "hour"
+msgstr "Stunde"
+
+#: src/Util/Temporal.php:317
+msgid "hours"
+msgstr "Stunden"
+
+#: src/Util/Temporal.php:318
+msgid "minute"
+msgstr "Minute"
+
+#: src/Util/Temporal.php:318
+msgid "minutes"
+msgstr "Minuten"
+
+#: src/Util/Temporal.php:319
+msgid "second"
+msgstr "Sekunde"
+
+#: src/Util/Temporal.php:319
+msgid "seconds"
+msgstr "Sekunden"
+
+#: src/Util/Temporal.php:329
+#, php-format
+msgid "in %1$d %2$s"
+msgstr "in %1$d %2$s"
+
+#: src/Util/Temporal.php:332
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr "vor %1$d %2$s"
+
+#: src/Worker/Delivery.php:453
+msgid "(no subject)"
+msgstr "(kein Betreff)"
 
 #: update.php:217
 #, php-format
@@ -9918,3 +9739,191 @@ msgstr "%s: Aktualisiere die author-id und owner-id in der Thread Tabelle"
 #, php-format
 msgid "%s: Updating post-type."
 msgstr "%s: Aktualisiere Beitrags-Typ"
+
+#: view/theme/duepuntozero/config.php:56
+msgid "greenzero"
+msgstr "greenzero"
+
+#: view/theme/duepuntozero/config.php:57
+msgid "purplezero"
+msgstr "purplezero"
+
+#: view/theme/duepuntozero/config.php:58
+msgid "easterbunny"
+msgstr "easterbunny"
+
+#: view/theme/duepuntozero/config.php:59
+msgid "darkzero"
+msgstr "darkzero"
+
+#: view/theme/duepuntozero/config.php:60
+msgid "comix"
+msgstr "comix"
+
+#: view/theme/duepuntozero/config.php:61
+msgid "slackr"
+msgstr "slackr"
+
+#: view/theme/duepuntozero/config.php:75
+msgid "Variations"
+msgstr "Variationen"
+
+#: view/theme/frio/config.php:103
+msgid "Custom"
+msgstr "Benutzerdefiniert"
+
+#: view/theme/frio/config.php:115
+msgid "Note"
+msgstr "Hinweis"
+
+#: view/theme/frio/config.php:115
+msgid "Check image permissions if all users are allowed to see the image"
+msgstr "Überprüfe, dass alle Benutzer die Berechtigung haben dieses Bild anzusehen"
+
+#: view/theme/frio/config.php:122
+msgid "Select color scheme"
+msgstr "Farbschema auswählen"
+
+#: view/theme/frio/config.php:123
+msgid "Navigation bar background color"
+msgstr "Hintergrundfarbe der Navigationsleiste"
+
+#: view/theme/frio/config.php:124
+msgid "Navigation bar icon color "
+msgstr "Icon Farbe in der Navigationsleiste"
+
+#: view/theme/frio/config.php:125
+msgid "Link color"
+msgstr "Linkfarbe"
+
+#: view/theme/frio/config.php:126
+msgid "Set the background color"
+msgstr "Hintergrundfarbe festlegen"
+
+#: view/theme/frio/config.php:127
+msgid "Content background opacity"
+msgstr "Opazität des Hintergrunds von Beiträgen"
+
+#: view/theme/frio/config.php:128
+msgid "Set the background image"
+msgstr "Hintergrundbild festlegen"
+
+#: view/theme/frio/config.php:129
+msgid "Background image style"
+msgstr "Stil des Hintergrundbildes"
+
+#: view/theme/frio/config.php:134
+msgid "Login page background image"
+msgstr "Hintergrundbild der Login-Seite"
+
+#: view/theme/frio/config.php:138
+msgid "Login page background color"
+msgstr "Hintergrundfarbe der Login-Seite"
+
+#: view/theme/frio/config.php:138
+msgid "Leave background image and color empty for theme defaults"
+msgstr "Wenn die Theme-Vorgaben verwendet werden sollen, lass bitte die Felder für die Hintergrundfarbe und das Hintergrundbild leer."
+
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
+msgstr "Top Banner"
+
+#: view/theme/frio/php/Image.php:24
+msgid ""
+"Resize image to the width of the screen and show background color below on "
+"long pages."
+msgstr "Skaliere das Hintergrundbild so, dass es die Breite der Seite einnimmt, und fülle den Rest der Seite mit der Hintergrundfarbe bei langen Seiten."
+
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
+msgstr "Vollbildmodus"
+
+#: view/theme/frio/php/Image.php:25
+msgid ""
+"Resize image to fill entire screen, clipping either the right or the bottom."
+msgstr "Skaliere das Bild so, dass es den gesamten Bildschirm füllt. Hierfür wird entweder die Breite oder die Höhe des Bildes automatisch abgeschnitten."
+
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
+msgstr "Mosaik in einer Zeile"
+
+#: view/theme/frio/php/Image.php:26
+msgid ""
+"Resize image to repeat it on a single row, either vertical or horizontal."
+msgstr "Skaliere das Bild so, dass es in einer einzelnen Reihe, entweder horizontal oder vertikal, wiederholt wird."
+
+#: view/theme/frio/php/Image.php:27
+msgid "Mosaic"
+msgstr "Mosaik"
+
+#: view/theme/frio/php/Image.php:27
+msgid "Repeat image to fill the screen."
+msgstr "Wiederhole das Bild, um den Bildschirm zu füllen."
+
+#: view/theme/frio/theme.php:239
+msgid "Guest"
+msgstr "Gast"
+
+#: view/theme/frio/theme.php:244
+msgid "Visitor"
+msgstr "Besucher"
+
+#: view/theme/quattro/config.php:77
+msgid "Alignment"
+msgstr "Ausrichtung"
+
+#: view/theme/quattro/config.php:77
+msgid "Left"
+msgstr "Links"
+
+#: view/theme/quattro/config.php:77
+msgid "Center"
+msgstr "Mitte"
+
+#: view/theme/quattro/config.php:78
+msgid "Color scheme"
+msgstr "Farbschema"
+
+#: view/theme/quattro/config.php:79
+msgid "Posts font size"
+msgstr "Schriftgröße in Beiträgen"
+
+#: view/theme/quattro/config.php:80
+msgid "Textareas font size"
+msgstr "Schriftgröße in Eingabefeldern"
+
+#: view/theme/vier/config.php:76
+msgid "Comma separated list of helper forums"
+msgstr "Komma-separierte Liste der Helfer-Foren"
+
+#: view/theme/vier/config.php:123
+msgid "Set style"
+msgstr "Stil auswählen"
+
+#: view/theme/vier/config.php:124
+msgid "Community Pages"
+msgstr "Foren"
+
+#: view/theme/vier/config.php:125 view/theme/vier/theme.php:151
+msgid "Community Profiles"
+msgstr "Community-Profile"
+
+#: view/theme/vier/config.php:126
+msgid "Help or @NewHere ?"
+msgstr "Hilfe oder @NewHere"
+
+#: view/theme/vier/config.php:127 view/theme/vier/theme.php:373
+msgid "Connect Services"
+msgstr "Verbinde Dienste"
+
+#: view/theme/vier/config.php:128
+msgid "Find Friends"
+msgstr "Kontakte finden"
+
+#: view/theme/vier/config.php:129 view/theme/vier/theme.php:181
+msgid "Last users"
+msgstr "Letzte Nutzer"
+
+#: view/theme/vier/theme.php:288
+msgid "Quick Start"
+msgstr "Schnell-Start"
diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php
index b5bfc9b52..f4659b9c3 100644
--- a/view/lang/de/strings.php
+++ b/view/lang/de/strings.php
@@ -77,7 +77,7 @@ $a->strings["Visible to <strong>everybody</strong>"] = "Für <strong>jedermann</
 $a->strings["Please enter a image/video/audio/webpage URL:"] = "Bitte gib eine Bild/Video/Audio/Webseiten-URL ein:";
 $a->strings["Tag term:"] = "Tag:";
 $a->strings["Save to Folder:"] = "In diesem Ordner speichern:";
-$a->strings["Where are you right now?"] = "Wo hältst Du Dich jetzt gerade auf?";
+$a->strings["Where are you right now?"] = "Wo hältst du dich jetzt gerade auf?";
 $a->strings["Delete item(s)?"] = "Einträge löschen?";
 $a->strings["New Post"] = "Neuer Beitrag";
 $a->strings["Share"] = "Teilen";
@@ -131,9 +131,9 @@ $a->strings["Thank You,"] = "Danke,";
 $a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrator";
 $a->strings["%s Administrator"] = "der Administrator von %s";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica-Meldung] Neue Email erhalten um %s";
-$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat Dir eine neue, private Nachricht um %2\$s geschickt.";
+$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat dir eine neue, private Nachricht um %2\$s geschickt.";
 $a->strings["a private message"] = "eine private Nachricht";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s schickte Dir %2\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s schickte dir %2\$s.";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um Deine privaten Nachrichten anzusehen und/oder zu beantworten.";
 $a->strings["%1\$s tagged you on [url=%2\$s]a %3\$s[/url]"] = "%1\$s erwähnte dich in [url=%2\$s] einem %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]a %3\$s[/url]";
@@ -143,10 +143,10 @@ $a->strings["%1\$s tagged you on [url=%2\$s]your %3\$s[/url]"] = "%1\$s erwähnt
 $a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]deinen %3\$s[/url]";
 $a->strings["%1\$s tagged you on [url=%2\$s]their %3\$s[/url]"] = "%1\$s erwähnte dich im [url=%2\$s]eigenen %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]their %3\$s[/url]"] = "%1\$s kommentierte den [url=%2\$s]eigenen %3\$s[/url]";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica-Meldung] %s hat Dich erwähnt";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s erwähnte Dich auf %2\$s";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica-Meldung] %s hat dich erwähnt";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s erwähnte dich auf %2\$s";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica-Meldung] Kommentar zum Beitrag #%1\$d von %2\$s";
-$a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem Du folgst.";
+$a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem du folgst.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
 $a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica-Meldung] %s hat auf Deine Pinnwand geschrieben";
 $a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s schrieb um %2\$s auf Deine Pinnwand";
@@ -154,19 +154,19 @@ $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s hat etwas auf
 $a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica Benachrichtigung] %s hat einen Beitrag geteilt";
 $a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s hat einen neuen Beitrag auf %2\$s geteilt";
 $a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]hat einen Beitrag geteilt[/url].";
-$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica-Meldung] %1\$s hat Dich angestupst";
-$a->strings["%1\$s poked you at %2\$s"] = "%1\$s hat Dich auf %2\$s angestupst";
-$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]hat Dich angestupst[/url].";
+$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica-Meldung] %1\$s hat dich angestupst";
+$a->strings["%1\$s poked you at %2\$s"] = "%1\$s hat dich auf %2\$s angestupst";
+$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]hat dich angestupst[/url].";
 $a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica-Meldung] %s hat Deinen Beitrag getaggt";
 $a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s erwähnte Deinen Beitrag auf %2\$s";
 $a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s erwähnte [url=%2\$s]Deinen Beitrag[/url]";
 $a->strings["[Friendica:Notify] Introduction received"] = "[Friendica-Meldung] Kontaktanfrage erhalten";
 $a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Du hast eine Kontaktanfrage von '%1\$s' auf %2\$s erhalten";
 $a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Kontaktanfrage[/url] von %2\$s erhalten.";
-$a->strings["You may visit their profile at %s"] = "Hier kannst Du das Profil betrachten: %s";
+$a->strings["You may visit their profile at %s"] = "Hier kannst du das Profil betrachten: %s";
 $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen.";
-$a->strings["[Friendica:Notify] A new person is sharing with you"] = "[Friendica Benachrichtigung] Eine neue Person teilt mit Dir";
-$a->strings["%1\$s is sharing with you at %2\$s"] = "%1\$s teilt mit Dir auf %2\$s";
+$a->strings["[Friendica:Notify] A new person is sharing with you"] = "[Friendica Benachrichtigung] Eine neue Person teilt mit dir";
+$a->strings["%1\$s is sharing with you at %2\$s"] = "%1\$s teilt mit dir auf %2\$s";
 $a->strings["[Friendica:Notify] You have a new follower"] = "[Friendica-Benachrichtigung] Du hast einen neuen Kontakt";
 $a->strings["You have a new follower at %2\$s : %1\$s"] = "Du hast einen neuen Kontakt auf %2\$s: %1\$s";
 $a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica-Meldung] Kontaktvorschlag erhalten";
@@ -179,10 +179,10 @@ $a->strings["[Friendica:Notify] Connection accepted"] = "[Friendica-Benachrichti
 $a->strings["'%1\$s' has accepted your connection request at %2\$s"] = "'%1\$s' hat Deine Kontaktanfrage auf  %2\$s bestätigt";
 $a->strings["%2\$s has accepted your [url=%1\$s]connection request[/url]."] = "%2\$s hat Deine [url=%1\$s]Kontaktanfrage[/url] akzeptiert.";
 $a->strings["You are now mutual friends and may exchange status updates, photos, and email without restriction."] = "Ihr seid nun beidseitige Kontakte und könnt Statusmitteilungen, Bilder und E-Mails ohne Einschränkungen austauschen.";
-$a->strings["Please visit %s if you wish to make any changes to this relationship."] = "Bitte besuche %s, wenn Du Änderungen an eurer Beziehung vornehmen willst.";
-$a->strings["'%1\$s' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically."] = "'%1\$s' hat sich entschieden Dich als Fan zu akzeptieren, dies schränkt einige Kommunikationswege - wie private Nachrichten und einige Interaktionsmöglichkeiten auf der Profilseite - ein. Wenn dies eine Berühmtheiten- oder Gemeinschaftsseite ist, werden diese Einstellungen automatisch vorgenommen.";
+$a->strings["Please visit %s if you wish to make any changes to this relationship."] = "Bitte besuche %s, wenn du Änderungen an eurer Beziehung vornehmen willst.";
+$a->strings["'%1\$s' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically."] = "'%1\$s' hat sich entschieden dich als Fan zu akzeptieren, dies schränkt einige Kommunikationswege - wie private Nachrichten und einige Interaktionsmöglichkeiten auf der Profilseite - ein. Wenn dies eine Berühmtheiten- oder Gemeinschaftsseite ist, werden diese Einstellungen automatisch vorgenommen.";
 $a->strings["'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future."] = "'%1\$s' kann den Kontaktstatus zu einem späteren Zeitpunkt erweitern und diese Einschränkungen aufheben. ";
-$a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "Bitte besuche %s, wenn Du Änderungen an eurer Beziehung vornehmen willst.";
+$a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "Bitte besuche %s, wenn du Änderungen an eurer Beziehung vornehmen willst.";
 $a->strings["[Friendica System Notify]"] = "[Friendica-Systembenachrichtigung]";
 $a->strings["registration request"] = "Registrierungsanfrage";
 $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Du hast eine Registrierungsanfrage von %2\$s auf '%1\$s' erhalten";
@@ -190,15 +190,11 @@ $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s.
 $a->strings["Full Name:\t%s\nSite Location:\t%s\nLogin Name:\t%s (%s)"] = "Kompletter Name: %s\nURL der Seite: %s\nLogin Name: %s(%s)";
 $a->strings["Please visit %s to approve or reject the request."] = "Bitte besuche %s, um die Anfrage zu bearbeiten.";
 $a->strings["Item not found."] = "Beitrag nicht gefunden.";
-$a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?";
+$a->strings["Do you really want to delete this item?"] = "Möchtest du wirklich dieses Item löschen?";
 $a->strings["Yes"] = "Ja";
 $a->strings["Permission denied."] = "Zugriff verweigert.";
 $a->strings["Archives"] = "Archiv";
 $a->strings["show more"] = "mehr anzeigen";
-$a->strings["You must be logged in to use addons. "] = "Sie müssen angemeldet sein um Addons benutzen zu können.";
-$a->strings["Applications"] = "Anwendungen";
-$a->strings["No installed applications."] = "Keine Applikationen installiert.";
-$a->strings["System down for maintenance"] = "System zur Wartung abgeschaltet";
 $a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert.";
 $a->strings["Information"] = "Information";
 $a->strings["Overview"] = "Übersicht";
@@ -240,7 +236,7 @@ $a->strings["Save Settings"] = "Einstellungen speichern";
 $a->strings["Blocked domain"] = "Blockierte Domain";
 $a->strings["The blocked domain"] = "Die blockierte Domain";
 $a->strings["Reason for the block"] = "Begründung für die Blockierung";
-$a->strings["The reason why you blocked this domain."] = "Die Begründung warum du diese Domain blockiert hast.";
+$a->strings["The reason why you blocked this domain."] = "Die Begründung, warum du diese Domain blockiert hast.";
 $a->strings["Delete domain"] = "Domain löschen";
 $a->strings["Check to delete this entry from the blocklist"] = "Markieren, um diesen Eintrag von der Blocklist zu entfernen";
 $a->strings["This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server."] = "Auf dieser Seite kannst du die Liste der blockierten Domains aus dem föderalen Netzwerk verwalten, denen es untersagt ist, mit deinem Knoten zu interagieren. Für jede der blockierten Domains musst du außerdem einen Grund für die Sperrung angeben.";
@@ -372,7 +368,7 @@ $a->strings["Link to an icon that will be used for browsers."] = "Link zu einem
 $a->strings["Touch icon"] = "Touch Icon";
 $a->strings["Link to an icon that will be used for tablets and mobiles."] = "Link zu einem Icon, das Tablets und Mobiltelefone verwenden sollen.";
 $a->strings["Additional Info"] = "Zusätzliche Informationen";
-$a->strings["For public servers: you can add additional information here that will be listed at %s/servers."] = "Für öffentliche Server kannst Du hier zusätzliche Informationen angeben, die dann auf %s/servers angezeigt werden.";
+$a->strings["For public servers: you can add additional information here that will be listed at %s/servers."] = "Für öffentliche Server kannst du hier zusätzliche Informationen angeben, die dann auf %s/servers angezeigt werden.";
 $a->strings["System language"] = "Systemsprache";
 $a->strings["System theme"] = "Systemweites Theme";
 $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>";
@@ -427,9 +423,9 @@ $a->strings["Checking this box will restrict addons listed in the apps menu to m
 $a->strings["Don't embed private images in posts"] = "Private Bilder nicht in Beiträgen einbetten.";
 $a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "Ersetze lokal gehostete, private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten, sich zunächst auf den jeweiligen Servern authentifizieren müssen, bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert.";
 $a->strings["Explicit Content"] = "Sensibler Inhalt";
-$a->strings["Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page."] = "Wählen Sie dies, um anzuzeigen, dass Ihr Knoten hauptsächlich für explizite Inhalte verwendet wird, die möglicherweise nicht für Minderjährige geeignet sind. Diese Info wird in der Knoteninformation veröffentlicht und kann durch das Globale Verzeichnis genutzt werden, um Ihren Knoten von den Auflistungen auszuschließen. Zusätzlich wird auf der Registrierungsseite ein Hinweis darüber angezeigt.";
+$a->strings["Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page."] = "Wähle dies, um anzuzeigen, dass dein Knoten hauptsächlich für explizite Inhalte verwendet wird, die möglicherweise nicht für Minderjährige geeignet sind. Diese Info wird in der Knoteninformation veröffentlicht und kann durch das Globale Verzeichnis genutzt werden, um deinen Knoten von den Auflistungen auszuschließen. Zusätzlich wird auf der Registrierungsseite ein Hinweis darüber angezeigt.";
 $a->strings["Allow Users to set remote_self"] = "Nutzern erlauben, das remote_self Flag zu setzen";
-$a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "Ist dies ausgewählt, kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im \"Kontakt reparieren\"-Dialog markieren. Nach dem Setzen dieses Flags werden alle Top-Level-Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet.";
+$a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "Ist dies ausgewählt, kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im \"Erweitert\"-Reiter der Kontaktansicht markieren. Nach dem Setzen dieses Flags werden alle Top-Level-Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet (gespiegelt).";
 $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten für Organisationsseiten o. ä. mit der gleichen E-Mail-Adresse anzulegen.";
 $a->strings["Disable OpenID"] = "OpenID deaktivieren";
@@ -545,8 +541,8 @@ $a->strings["Failed Updates"] = "Fehlgeschlagene Updates";
 $a->strings["This does not include updates prior to 1139, which did not return a status."] = "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben.";
 $a->strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (falls das Update manuell installiert wurde)";
 $a->strings["Attempt to execute this update step automatically"] = "Versuchen, diesen Schritt automatisch auszuführen";
-$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tthe administrator of %2\$s has set up an account for you."] = "\nHallo %1\$s,\n\nauf %2\$s wurde ein Account für Dich angelegt.";
-$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t\t%2\$s\n\t\t\tPassword:\t\t%3\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %1\$s/removeme\n\n\t\t\tThank you and welcome to %4\$s."] = "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1\$s\n\tBenutzername:\t%2\$s\n\tPasswort:\t%3\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %1\$s/removeme  jederzeit tun.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4\$s.";
+$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tthe administrator of %2\$s has set up an account for you."] = "\nHallo %1\$s,\n\nauf %2\$s wurde ein Account für dich angelegt.";
+$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t\t%2\$s\n\t\t\tPassword:\t\t%3\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %1\$s/removeme\n\n\t\t\tThank you and welcome to %4\$s."] = "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1\$s\n\tBenutzername:\t%2\$s\n\tPasswort:\t%3\$s\n\nDu kannst dein Passwort unter \"Einstellungen\" ändern, sobald du dich\nangemeldet hast.\n\nBitte nimm dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst du ja auch einige Informationen über dich in deinem\nProfil veröffentlichen, damit andere Leute dich einfacher finden können.\nBearbeite hierfür einfach dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen dir, deinen kompletten Namen anzugeben und ein zu dir\npassendes Profilbild zu wählen, damit dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn du auf deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die deine Interessen teilen.\n\nWir respektieren deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %1\$s/removeme  jederzeit tun.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4\$s.";
 $a->strings["Registration details for %s"] = "Details der Registration von %s";
 $a->strings["%s user blocked/unblocked"] = [
 	0 => "%s Benutzer geblockt/freigegeben",
@@ -588,8 +584,8 @@ $a->strings["Site admin"] = "Seitenadministrator";
 $a->strings["Account expired"] = "Account ist abgelaufen";
 $a->strings["New User"] = "Neuer Nutzer";
 $a->strings["Permanent deletion"] = "Permanent löschen";
-$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist Du sicher?";
-$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist Du sicher?";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?";
 $a->strings["Name of the new user."] = "Name des neuen Nutzers";
 $a->strings["Nickname"] = "Spitzname";
 $a->strings["Nickname of the new user."] = "Spitznamen für den neuen Nutzer";
@@ -619,7 +615,7 @@ $a->strings["Log file"] = "Protokolldatei";
 $a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis.";
 $a->strings["Log level"] = "Protokoll-Level";
 $a->strings["PHP logging"] = "PHP Protokollieren";
-$a->strings["To temporarily enable logging of PHP errors and warnings you can prepend the following to the index.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "Um die Protokollierung von PHP-Fehlern und Warnungen vorübergehend zu aktivieren, können Sie der Datei index.php Ihrer Installation Folgendes voranstellen. Der in der Datei 'error_log' angegebene Dateiname ist relativ zum obersten Verzeichnis von friendica und muss vom Webserver beschreibbar sein. Die Option '1' für 'log_errors' und 'display_errors' aktiviert diese Optionen, ersetze die '1' durch einer '0' um sie zu deaktivieren.";
+$a->strings["To temporarily enable logging of PHP errors and warnings you can prepend the following to the index.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "Um die Protokollierung von PHP-Fehlern und Warnungen vorübergehend zu aktivieren, kannst du der Datei index.php deiner Installation Folgendes voranstellen. Der in der Datei 'error_log' angegebene Dateiname ist relativ zum obersten Verzeichnis von Friendica und muss vom Webserver beschreibbar sein. Die Option '1' für 'log_errors' und 'display_errors' aktiviert diese Optionen, ersetze die '1' durch eine '0', um sie zu deaktivieren.";
 $a->strings["Error trying to open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s exist and is readable."] = "Fehler beim Öffnen der Logdatei <strong>%1\$s</strong>.\\r\\n<br/>Bitte überprüfe ob die Datei %1\$s existiert und gelesen werden kann.";
 $a->strings["Couldn't open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s is readable."] = "Konnte die Logdatei <strong>%1\$s</strong> nicht öffnen.\\r\\n<br/>Bitte stelle sicher, dass die Datei %1\$s lesbar ist.";
 $a->strings["Off"] = "Aus";
@@ -630,9 +626,12 @@ $a->strings["No friends to display."] = "Keine Kontakte zum Anzeigen.";
 $a->strings["Connect"] = "Verbinden";
 $a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren";
 $a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:";
-$a->strings["Please login to continue."] = "Bitte melde Dich an, um fortzufahren.";
-$a->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 den Zugriff auf Deine Beiträge und Kontakte sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?";
+$a->strings["Please login to continue."] = "Bitte melde dich an, um fortzufahren.";
+$a->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 den Zugriff auf Deine Beiträge und Kontakte sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?";
 $a->strings["No"] = "Nein";
+$a->strings["You must be logged in to use addons. "] = "Du musst angemeldet sein, um Addons benutzen zu können.";
+$a->strings["Applications"] = "Anwendungen";
+$a->strings["No installed applications."] = "Keine Applikationen installiert.";
 $a->strings["Source input"] = "Originaltext:";
 $a->strings["BBCode::toPlaintext"] = "BBCode::toPlaintext";
 $a->strings["BBCode::convert (raw HTML)"] = "BBCode::convert (pures HTML)";
@@ -694,8 +693,8 @@ $a->strings["Friendica is a community project, that would not be possible withou
 $a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt.";
 $a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren.";
 $a->strings["Contact not found."] = "Kontakt nicht gefunden.";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button Deines Browsers <strong>jetzt</strong>, wenn Du Dir unsicher bist, was Du tun willst.";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button Deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst.";
 $a->strings["No mirroring"] = "Kein Spiegeln";
 $a->strings["Mirror as forwarded posting"] = "Spiegeln als weitergeleitete Beiträge";
 $a->strings["Mirror as my own posting"] = "Spiegeln als meine eigenen Beiträge";
@@ -704,7 +703,7 @@ $a->strings["Refetch contact data"] = "Kontaktdaten neu laden";
 $a->strings["Submit"] = "Senden";
 $a->strings["Remote Self"] = "Entfernte Konten";
 $a->strings["Mirror postings from this contact"] = "Spiegle Beiträge dieses Kontakts";
-$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica, alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden.";
+$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica, alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden (spiegeln).";
 $a->strings["Account Nickname"] = "Konto-Spitzname";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname";
 $a->strings["Account URL"] = "Konto-URL";
@@ -722,7 +721,7 @@ $a->strings["Parent User"] = "Verwalter";
 $a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "Verwalter haben Zugriff auf alle Funktionen dieses Benutzerkontos und können dessen Einstellungen ändern.";
 $a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite";
 $a->strings["Delegates"] = "Bevollmächtigte";
-$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem du nicht absolut vertraust!";
 $a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite";
 $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
 $a->strings["Remove"] = "Entfernen";
@@ -742,9 +741,9 @@ $a->strings["Our site encryption key is apparently messed up."] = "Der Verschlü
 $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden.";
 $a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden.";
 $a->strings["Site public key not available in contact record for URL %s."] = "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server.";
-$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal.";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal.";
 $a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden.";
-$a->strings["Unable to update your contact profile details on our system"] = "Die Updates für Dein Profil konnten nicht gespeichert werden";
+$a->strings["Unable to update your contact profile details on our system"] = "Die Updates für dein Profil konnten nicht gespeichert werden";
 $a->strings["[Name Withheld]"] = "[Name unterdrückt]";
 $a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen";
 $a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert.";
@@ -762,15 +761,15 @@ $a->strings["%s has received too many connection requests today."] = "%s hat heu
 $a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen.";
 $a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen.";
 $a->strings["Invalid locator"] = "Ungültiger Locator";
-$a->strings["You have already introduced yourself here."] = "Du hast Dich hier bereits vorgestellt.";
-$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob Du bereits mit %s in Kontakt stehst.";
+$a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
+$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits mit %s in Kontakt stehst.";
 $a->strings["Invalid profile URL."] = "Ungültige Profil-URL.";
 $a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL.";
 $a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen.";
 $a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
 $a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Entferntes Abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems.   ";
-$a->strings["Please login to confirm introduction."] = "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen.";
-$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
+$a->strings["Please login to confirm introduction."] = "Bitte melde dich an, um die Kontaktanfrage zu bestätigen.";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde dich mit <strong>diesem</strong> Profil an.";
 $a->strings["Confirm"] = "Bestätigen";
 $a->strings["Hide this contact"] = "Verberge diesen Kontakt";
 $a->strings["Welcome home %s."] = "Willkommen zurück %s.";
@@ -780,7 +779,7 @@ $a->strings["If you are not yet a member of the free social web, <a href=\"%s\">
 $a->strings["Friend/Connection Request"] = "Kontaktanfrage";
 $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de";
 $a->strings["Please answer the following:"] = "Bitte beantworte folgendes:";
-$a->strings["Does %s know you?"] = "Kennt %s Dich?";
+$a->strings["Does %s know you?"] = "Kennt %s dich?";
 $a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:";
 $a->strings["Friendica"] = "Friendica";
 $a->strings["GNU Social (Pleroma, Mastodon)"] = "GNU Social (Pleroma, Mastodon)";
@@ -883,7 +882,7 @@ $a->strings["Not Found"] = "Nicht gefunden";
 $a->strings["Welcome to %s"] = "Willkommen zu %s";
 $a->strings["Total invitation limit exceeded."] = "Limit für Einladungen erreicht.";
 $a->strings["%s : Not a valid email address."] = "%s: Keine gültige Email Adresse.";
-$a->strings["Please join us on Friendica"] = "Ich lade Dich zu unserem sozialen Netzwerk Friendica ein";
+$a->strings["Please join us on Friendica"] = "Ich lade dich zu unserem sozialen Netzwerk Friendica ein";
 $a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limit für Einladungen erreicht. Bitte kontaktiere des Administrator der Seite.";
 $a->strings["%s : Message delivery failed."] = "%s: Zustellung der Nachricht fehlgeschlagen.";
 $a->strings["%d message sent."] = [
@@ -891,24 +890,24 @@ $a->strings["%d message sent."] = [
 	1 => "%d Nachrichten gesendet.",
 ];
 $a->strings["You have no more invitations available"] = "Du hast keine weiteren Einladungen";
-$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Besuche %s für eine Liste der öffentlichen Server, denen Du beitreten kannst. Friendica-Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer sozialer Netzwerke.";
-$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s oder einer anderen öffentlichen Friendica-Website.";
-$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica Server verbinden sich alle untereinander, um ein großes, datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica-Server, denen Du beitreten kannst.";
+$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica-Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer sozialer Netzwerke.";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica-Website.";
+$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica Server verbinden sich alle untereinander, um ein großes, datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica-Server, denen du beitreten kannst.";
 $a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen.";
 $a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks."] = "Friendica Server verbinden sich alle untereinander, um ein großes, datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden.";
-$a->strings["To accept this invitation, please visit and register at %s."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s.";
+$a->strings["To accept this invitation, please visit and register at %s."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere dich bitte bei %s.";
 $a->strings["Send invitations"] = "Einladungen senden";
 $a->strings["Enter email addresses, one per line:"] = "E-Mail-Adressen eingeben, eine pro Zeile:";
 $a->strings["Your message:"] = "Deine Nachricht:";
-$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Du bist herzlich dazu eingeladen, Dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen.";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres, soziales Netz aufzubauen.";
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code";
-$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald Du registriert bist, kontaktiere mich bitte auf meiner Profilseite:";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:";
 $a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "Für weitere Informationen über das Friendica-Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendi.ca.";
 $a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden.";
 $a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen.";
 $a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica.";
 $a->strings["You may visit them online at %s"] = "Du kannst sie online unter %s besuchen";
-$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest.";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem du auf diese Nachricht antwortest.";
 $a->strings["%s posted an update."] = "%s hat ein Update veröffentlicht.";
 $a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\, H:i";
 $a->strings["Time Conversion"] = "Zeitumrechnung";
@@ -921,26 +920,27 @@ $a->strings["Remote privacy information not available."] = "Entfernte Privatsph
 $a->strings["Visible to:"] = "Sichtbar für:";
 $a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
 $a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe Deine E-Mail.";
-$a->strings["\n\t\tDear %1\$s,\n\t\t\tA request was recently received at \"%2\$s\" to reset your account\n\t\tpassword. In order to confirm this request, please select the verification link\n\t\tbelow or paste it into your web browser address bar.\n\n\t\tIf you did NOT request this change, please DO NOT follow the link\n\t\tprovided and ignore and/or delete this email, the request will expire shortly.\n\n\t\tYour password will not be changed unless we can verify that you\n\t\tissued this request."] = "\nHallo %1\$s,\n\nAuf \"%2\$s\" ist eine Anfrage auf das Zurücksetzen Deines Passworts gestellt\nworden. Um diese Anfrage zu verifizieren, folge bitte dem unten stehenden\nLink oder kopiere und füge ihn in die Adressleiste Deines Browsers ein.\n\nSolltest Du die Anfrage NICHT gestellt haben, ignoriere und/oder lösche diese\nE-Mail bitte.\n\nDein Passwort wird nicht geändert, solange wir nicht verifiziert haben, dass\nDu diese Änderung angefragt hast.";
-$a->strings["\n\t\tFollow this link soon to verify your identity:\n\n\t\t%1\$s\n\n\t\tYou will then receive a follow-up message containing the new password.\n\t\tYou may change that password from your account settings page after logging in.\n\n\t\tThe login details are as follows:\n\n\t\tSite Location:\t%2\$s\n\t\tLogin Name:\t%3\$s"] = "\nUm Deine Identität zu verifizieren, folge bitte diesem Link:\n\n%1\$s\n\nDu wirst eine weitere E-Mail mit Deinem neuen Passwort erhalten. Sobald Du Dich\nangemeldet hast, kannst Du Dein Passwort in den Einstellungen ändern.\n\nDie Anmeldedetails sind die folgenden:\n\nAdresse der Seite:\t%2\$s\nBenutzername:\t%3\$s";
+$a->strings["\n\t\tDear %1\$s,\n\t\t\tA request was recently received at \"%2\$s\" to reset your account\n\t\tpassword. In order to confirm this request, please select the verification link\n\t\tbelow or paste it into your web browser address bar.\n\n\t\tIf you did NOT request this change, please DO NOT follow the link\n\t\tprovided and ignore and/or delete this email, the request will expire shortly.\n\n\t\tYour password will not be changed unless we can verify that you\n\t\tissued this request."] = "\nHallo %1\$s,\n\nAuf \"%2\$s\" ist eine Anfrage auf das Zurücksetzen deines Passworts gestellt\nworden. Um diese Anfrage zu verifizieren, folge bitte dem unten stehenden\nLink oder kopiere und füge ihn in die Adressleiste deines Browsers ein.\n\nSolltest du die Anfrage NICHT gestellt haben, ignoriere und/oder lösche diese\nE-Mail bitte.\n\nDein Passwort wird nicht geändert, solange wir nicht verifiziert haben, dass\ndu diese Änderung angefragt hast.";
+$a->strings["\n\t\tFollow this link soon to verify your identity:\n\n\t\t%1\$s\n\n\t\tYou will then receive a follow-up message containing the new password.\n\t\tYou may change that password from your account settings page after logging in.\n\n\t\tThe login details are as follows:\n\n\t\tSite Location:\t%2\$s\n\t\tLogin Name:\t%3\$s"] = "\nUm deine Identität zu verifizieren, folge bitte diesem Link:\n\n%1\$s\n\nDu wirst eine weitere E-Mail mit deinem neuen Passwort erhalten. Sobald du dich\nangemeldet hast, kannst du dein Passwort in den Einstellungen ändern.\n\nDie Anmeldedetails sind die folgenden:\n\nAdresse der Seite:\t%2\$s\nBenutzername:\t%3\$s";
 $a->strings["Password reset requested at %s"] = "Anfrage zum Zurücksetzen des Passworts auf %s erhalten";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Anfrage konnte nicht verifiziert werden. (Eventuell hast Du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert.";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert.";
 $a->strings["Request has expired, please make a new one."] = "Die Anfrage ist abgelaufen. Bitte stelle eine erneute.";
-$a->strings["Forgot your Password?"] = "Hast Du Dein Passwort vergessen?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden Dir dann weitere Informationen per Mail zugesendet.";
+$a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
 $a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:";
 $a->strings["Reset"] = "Zurücksetzen";
 $a->strings["Password Reset"] = "Passwort zurücksetzen";
 $a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie gewünscht zurückgesetzt.";
 $a->strings["Your new password is"] = "Dein neues Passwort lautet";
-$a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere Dein neues Passwort - und dann";
-$a->strings["click here to login"] = "hier klicken, um Dich anzumelden";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald Du Dich erfolgreich angemeldet hast.";
-$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tYour password has been changed as requested. Please retain this\n\t\t\tinformation for your records (or change your password immediately to\n\t\t\tsomething that you will remember).\n\t\t"] = "\nHallo %1\$s,\n\nDein Passwort wurde wie gewünscht geändert. Bitte bewahre diese Informationen gut auf (oder ändere Dein Passwort in eines, das Du Dir leicht merken kannst).";
+$a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere dein neues Passwort - und dann";
+$a->strings["click here to login"] = "hier klicken, um dich anzumelden";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald du dich erfolgreich angemeldet hast.";
+$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tYour password has been changed as requested. Please retain this\n\t\t\tinformation for your records (or change your password immediately to\n\t\t\tsomething that you will remember).\n\t\t"] = "\nHallo %1\$s,\n\nDein Passwort wurde wie gewünscht geändert. Bitte bewahre diese Informationen gut auf (oder ändere dein Passwort in eines, das du dir leicht merken kannst).";
 $a->strings["\n\t\t\tYour login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t%2\$s\n\t\t\tPassword:\t%3\$s\n\n\t\t\tYou may change that password from your account settings page after logging in.\n\t\t"] = "\nDie Anmeldedaten sind die folgenden:\n\nAdresse der Seite: %1\$s\nLogin Name: %2\$s\nPasswort: %3\$s\n\nDas Passwort kann und sollte in den Kontoeinstellungen nach der Anmeldung geändert werden.";
-$a->strings["Your password has been changed at %s"] = "Auf %s wurde Dein Passwort geändert";
+$a->strings["Your password has been changed at %s"] = "Auf %s wurde dein Passwort geändert";
+$a->strings["System down for maintenance"] = "System zur Wartung abgeschaltet";
 $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
-$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die Deine Kontoinformationen teilen oder zu denen Du „Verwalten“-Befugnisse bekommen hast.";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die deine Kontoinformationen teilen oder zu denen du „Verwalten“-Befugnisse bekommen hast.";
 $a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten aus: ";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu.";
 $a->strings["first"] = "erste";
@@ -954,7 +954,7 @@ $a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen."
 $a->strings["Message sent."] = "Nachricht gesendet.";
 $a->strings["Discard"] = "Verwerfen";
 $a->strings["Messages"] = "Nachrichten";
-$a->strings["Do you really want to delete this message?"] = "Möchtest Du diese Nachricht wirklich löschen?";
+$a->strings["Do you really want to delete this message?"] = "Möchtest du diese Nachricht wirklich löschen?";
 $a->strings["Conversation not found."] = "Unterhaltung nicht gefunden.";
 $a->strings["Message deleted."] = "Nachricht gelöscht.";
 $a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
@@ -967,11 +967,11 @@ $a->strings["Message not available."] = "Nachricht nicht verfügbar.";
 $a->strings["Delete message"] = "Nachricht löschen";
 $a->strings["D, d M Y - g:i A"] = "D, d. M Y - H:i";
 $a->strings["Delete conversation"] = "Unterhaltung löschen";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten.";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst du auf der Profilseite des Absenders antworten.";
 $a->strings["Send Reply"] = "Antwort senden";
 $a->strings["Unknown sender - %s"] = "Unbekannter Absender - %s";
 $a->strings["You and %s"] = "Du und %s";
-$a->strings["%s and You"] = "%s und Du";
+$a->strings["%s and You"] = "%s und du";
 $a->strings["%d message"] = [
 	0 => "%d Nachricht",
 	1 => "%d Nachrichten",
@@ -993,7 +993,7 @@ $a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortieren";
 $a->strings["Posted Order"] = "Neueste Beiträge";
 $a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortieren";
 $a->strings["Personal"] = "Persönlich";
-$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um Dich geht";
+$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um dich geht";
 $a->strings["New"] = "Neue";
 $a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum";
 $a->strings["Shared Links"] = "Geteilte Links";
@@ -1002,34 +1002,34 @@ $a->strings["Starred"] = "Markierte";
 $a->strings["Favourite Posts"] = "Favorisierte Beiträge";
 $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica";
 $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder";
-$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden.";
+$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten dir einige Tipps und Links anbieten, die dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für dich an deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden.";
 $a->strings["Getting Started"] = "Einstieg";
 $a->strings["Friendica Walk-Through"] = "Friendica Rundgang";
-$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em>-Seite findest Du eine kurze Einleitung in die einzelnen Funktionen Deines Profils und die Netzwerk-Reiter, wo Du interessante Foren findest und neue Kontakte knüpfst.";
+$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em>-Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest und neue Kontakte knüpfst.";
 $a->strings["Go to Your Settings"] = "Gehe zu deinen Einstellungen";
 $a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter <em>Einstellungen</em> dein Passwort. Außerdem merke dir deine Identifikationsadresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Kontakte mit anderen im Friendica Netzwerk zu knüpfen..";
-$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das, als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können.";
+$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das, als wenn du deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Kontakte und potentiellen Kontakte wissen genau, wie sie dich finden können.";
 $a->strings["Profile"] = "Profil";
 $a->strings["Upload Profile Photo"] = "Profilbild hochladen";
-$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch, falls Du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist, neue Kontakte zu finden, wenn Du ein Bild von Dir selbst verwendest, als wenn Du dies nicht tust.";
+$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch, falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist, neue Kontakte zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust.";
 $a->strings["Edit Your Profile"] = "Editiere dein Profil";
-$a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editiere Dein <strong>Standard</strong>-Profil nach Deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen Deiner Kontaktliste vor unbekannten Betrachtern des Profils.";
+$a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editiere dein <strong>Standard</strong>-Profil nach deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen deiner Kontaktliste vor unbekannten Betrachtern des Profils.";
 $a->strings["Profile Keywords"] = "Profil-Schlüsselbegriffe";
-$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Trage ein paar öffentliche Stichwörter in Dein Standardprofil ein, die Deine Interessen beschreiben. Eventuell sind wir in der Lage, Leute zu finden, die Deine Interessen teilen, und können Dir dann Kontakte vorschlagen.";
+$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Trage ein paar öffentliche Stichwörter in dein Standardprofil ein, die deine Interessen beschreiben. Eventuell sind wir in der Lage, Leute zu finden, die deine Interessen teilen, und können dir dann Kontakte vorschlagen.";
 $a->strings["Connecting"] = "Verbindungen knüpfen";
 $a->strings["Importing Emails"] = "Emails Importieren";
-$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Gib Deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls Du E-Mails aus Deinem Posteingang importieren und mit Kontakten und Mailinglisten interagieren willst.";
+$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Gib deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls du E-Mails aus Deinem Posteingang importieren und mit Kontakten und Mailinglisten interagieren willst.";
 $a->strings["Go to Your Contacts Page"] = "Gehe zu deiner Kontakt-Seite";
-$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog."] = "Die Kontakte-Seite ist die Einstiegsseite, von der aus Du Kontakte verwalten und Dich mit Personen in anderen Netzwerken verbinden kannst. Normalerweise gibst Du dazu einfach ihre Adresse oder die URL der Seite im Kasten <em>Neuen Kontakt hinzufügen</em> ein.";
+$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog."] = "Die Kontakte-Seite ist die Einstiegsseite, von der aus du Kontakte verwalten und dich mit Personen in anderen Netzwerken verbinden kannst. Normalerweise gibst du dazu einfach ihre Adresse oder die URL der Seite im Kasten <em>Neuen Kontakt hinzufügen</em> ein.";
 $a->strings["Go to Your Site's Directory"] = "Gehe zum Verzeichnis Deiner Friendica-Instanz";
-$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "Über die Verzeichnisseite kannst Du andere Personen auf diesem Server oder anderen, verknüpften Seiten finden. Halte nach einem <em>Verbinden</em>- oder <em>Folgen</em>-Link auf deren Profilseiten Ausschau und gib Deine eigene Profiladresse an, falls Du danach gefragt wirst.";
+$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen, verknüpften Seiten finden. Halte nach einem <em>Verbinden</em>- oder <em>Folgen</em>-Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an, falls du danach gefragt wirst.";
 $a->strings["Finding New People"] = "Neue Leute kennenlernen";
 $a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Im seitlichen Bedienfeld der Kontakteseite gibt es diverse Werkzeuge, um neue Personen zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Leute vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden.";
 $a->strings["Groups"] = "Gruppen";
 $a->strings["Group Your Contacts"] = "Gruppiere deine Kontakte";
-$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Sobald Du einige Kontakte gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren.";
+$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Sobald du einige Kontakte gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren.";
 $a->strings["Why Aren't My Posts Public?"] = "Warum sind meine Beiträge nicht öffentlich?";
-$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respektiert Deine Privatsphäre. Mit der Grundeinstellung werden Deine Beiträge ausschließlich Deinen Kontakten angezeigt. Für weitere Informationen diesbezüglich lies Dir bitte den entsprechenden Abschnitt in der Hilfe unter dem obigen Link durch.";
+$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respektiert Deine Privatsphäre. Mit der Grundeinstellung werden Deine Beiträge ausschließlich Deinen Kontakten angezeigt. Für weitere Informationen diesbezüglich lies dir bitte den entsprechenden Abschnitt in der Hilfe unter dem obigen Link durch.";
 $a->strings["Getting Help"] = "Hilfe bekommen";
 $a->strings["Go to the Help Section"] = "Zum Hilfe Abschnitt gehen";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Unsere <strong>Hilfe</strong>-Seiten können herangezogen werden, um weitere Einzelheiten zu anderen Programm-Features zu erhalten.";
@@ -1048,7 +1048,7 @@ $a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen";
 $a->strings["Notification type:"] = "Art der Benachrichtigung:";
 $a->strings["Suggested by:"] = "Vorgeschlagen von:";
 $a->strings["Hide this contact from others"] = "Verbirg diesen Kontakt vor Anderen";
-$a->strings["Claims to be known to you: "] = "Behauptet Dich zu kennen: ";
+$a->strings["Claims to be known to you: "] = "Behauptet, dich zu kennen: ";
 $a->strings["yes"] = "ja";
 $a->strings["no"] = "nein";
 $a->strings["Shall your connection be bidirectional or not?"] = "Soll die Verbindung beidseitig sein oder nicht?";
@@ -1082,9 +1082,9 @@ $a->strings["everybody"] = "jeder";
 $a->strings["Contact information unavailable"] = "Kontaktinformationen nicht verfügbar";
 $a->strings["Album not found."] = "Album nicht gefunden.";
 $a->strings["Delete Album"] = "Album löschen";
-$a->strings["Do you really want to delete this photo album and all its photos?"] = "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?";
+$a->strings["Do you really want to delete this photo album and all its photos?"] = "Möchtest du wirklich dieses Foto-Album und all seine Foto löschen?";
 $a->strings["Delete Photo"] = "Foto löschen";
-$a->strings["Do you really want to delete this photo?"] = "Möchtest Du wirklich dieses Foto löschen?";
+$a->strings["Do you really want to delete this photo?"] = "Möchtest du wirklich dieses Foto löschen?";
 $a->strings["a photo"] = "einem Foto";
 $a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s wurde von %3\$s in %2\$s getaggt";
 $a->strings["Image exceeds size limit of %s"] = "Bildgröße überschreitet das Limit von %s";
@@ -1124,31 +1124,18 @@ $a->strings["Rotate CW (right)"] = "Drehen US (rechts)";
 $a->strings["Rotate CCW (left)"] = "Drehen EUS (links)";
 $a->strings["I like this (toggle)"] = "Ich mag das (toggle)";
 $a->strings["I don't like this (toggle)"] = "Ich mag das nicht (toggle)";
-$a->strings["This is you"] = "Das bist Du";
+$a->strings["This is you"] = "Das bist du";
 $a->strings["Comment"] = "Kommentar";
 $a->strings["Map"] = "Karte";
 $a->strings["View Album"] = "Album betrachten";
-$a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten";
+$a->strings["{0} wants to be your friend"] = "{0} möchte mit dir in Kontakt treten";
 $a->strings["{0} requested registration"] = "{0} möchte sich registrieren";
 $a->strings["Poke/Prod"] = "Anstupsen";
 $a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
 $a->strings["Recipient"] = "Empfänger";
-$a->strings["Choose what you wish to do to recipient"] = "Was willst Du mit dem Empfänger machen:";
+$a->strings["Choose what you wish to do to recipient"] = "Was willst du mit dem Empfänger machen:";
 $a->strings["Make this post private"] = "Diesen Beitrag privat machen";
 $a->strings["Only logged in users are permitted to perform a probing."] = "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet.";
-$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl.";
-$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird.";
-$a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden";
-$a->strings["Upload File:"] = "Datei hochladen:";
-$a->strings["Select a profile:"] = "Profil auswählen:";
-$a->strings["or"] = "oder";
-$a->strings["skip this step"] = "diesen Schritt überspringen";
-$a->strings["select a photo from your photo albums"] = "wähle ein Foto aus deinen Fotoalben";
-$a->strings["Crop Image"] = "Bild zurechtschneiden";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann.";
-$a->strings["Done Editing"] = "Bearbeitung abgeschlossen";
-$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen.";
 $a->strings["Profile deleted."] = "Profil gelöscht.";
 $a->strings["Profile-"] = "Profil-";
 $a->strings["New profile created."] = "Neues Profil angelegt.";
@@ -1190,7 +1177,7 @@ $a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span cl
 $a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:";
 $a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software";
 $a->strings["Profile Name:"] = "Profilname:";
-$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein.";
+$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein.";
 $a->strings["Your Full Name:"] = "Dein kompletter Name:";
 $a->strings["Title/Description:"] = "Titel/Beschreibung:";
 $a->strings["Street Address:"] = "Adresse:";
@@ -1202,7 +1189,7 @@ $a->strings["Age: "] = "Alter: ";
 $a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
 $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
 $a->strings["Since [date]:"] = "Seit [Datum]:";
-$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …";
+$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von dir …";
 $a->strings["XMPP (Jabber) address:"] = "XMPP (Jabber) Adresse";
 $a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können.";
 $a->strings["Homepage URL:"] = "Adresse der Homepage:";
@@ -1229,19 +1216,32 @@ $a->strings["visible to everybody"] = "sichtbar für jeden";
 $a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile";
 $a->strings["Change profile photo"] = "Profilbild ändern";
 $a->strings["Create New Profile"] = "Neues Profil anlegen";
+$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl.";
+$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird.";
+$a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden";
+$a->strings["Upload File:"] = "Datei hochladen:";
+$a->strings["Select a profile:"] = "Profil auswählen:";
+$a->strings["or"] = "oder";
+$a->strings["skip this step"] = "diesen Schritt überspringen";
+$a->strings["select a photo from your photo albums"] = "wähle ein Foto aus deinen Fotoalben";
+$a->strings["Crop Image"] = "Bild zurechtschneiden";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann.";
+$a->strings["Done Editing"] = "Bearbeitung abgeschlossen";
+$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen.";
 $a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner.";
 $a->strings["Profile Visibility Editor"] = "Editor für die Profil-Sichtbarkeit";
 $a->strings["Visible To"] = "Sichtbar für";
 $a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit gesichertem Profilzugriff)";
 $a->strings["Account approved."] = "Konto freigegeben.";
 $a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen";
-$a->strings["Please login."] = "Bitte melde Dich an.";
+$a->strings["Please login."] = "Bitte melde dich an.";
 $a->strings["User deleted their account"] = "Gelöschter Nutzeraccount";
 $a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "Ein Nutzer deiner Friendica-Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass dessen Daten aus deinen Backups entfernt werden.";
 $a->strings["The user id is %d"] = "Die ID des Users lautet %d";
 $a->strings["Remove My Account"] = "Konto löschen";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen.";
-$a->strings["Please enter your password for verification:"] = "Bitte gib Dein Passwort zur Verifikation ein:";
+$a->strings["Please enter your password for verification:"] = "Bitte gib dein Passwort zur Verifikation ein:";
 $a->strings["Resubscribing to OStatus contacts"] = "Erneuern der OStatus-Abonements";
 $a->strings["Error"] = "Fehler";
 $a->strings["Only logged in users are permitted to perform a search."] = "Nur eingeloggten Benutzern ist das Suchen gestattet.";
@@ -1308,7 +1308,7 @@ $a->strings["Your legacy GNU Social account"] = "Dein alter GNU Social-Account";
 $a->strings["If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done."] = "Wenn du deinen alten GNU Social/Statusnet-Account-Namen hier angibst (Format name@domain.tld), werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden.";
 $a->strings["Repair OStatus subscriptions"] = "OStatus-Abonnements reparieren";
 $a->strings["Email/Mailbox Setup"] = "E-Mail/Postfach-Einstellungen";
-$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für Dein Postfach an.";
+$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an.";
 $a->strings["Last successful email check:"] = "Letzter erfolgreicher E-Mail-Check";
 $a->strings["IMAP server name:"] = "IMAP-Server-Name:";
 $a->strings["IMAP port:"] = "IMAP-Port:";
@@ -1341,7 +1341,7 @@ $a->strings["Calendar"] = "Kalender";
 $a->strings["Beginning of week:"] = "Wochenbeginn:";
 $a->strings["Don't show notices"] = "Info-Popups nicht anzeigen";
 $a->strings["Infinite scroll"] = "Endloses Scrollen";
-$a->strings["Automatic updates only at the top of the network page"] = "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist.";
+$a->strings["Automatic updates only at the top of the network page"] = "Automatische Updates nur, wenn du oben auf der Netzwerkseite bist.";
 $a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "Wenn dies deaktiviert ist, wird die Netzwerk-Seite aktualisiert, wann immer neue Beiträge eintreffen, egal an welcher Stelle gerade gelesen wird.";
 $a->strings["Bandwidth Saver Mode"] = "Bandbreiten-Spar-Modus";
 $a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden.";
@@ -1367,9 +1367,9 @@ $a->strings["Private Forum [Experimental]"] = "Privates Forum [Versuchsstadium]"
 $a->strings["Requires manual approval of contact requests."] = "Kontaktanfragen müssen manuell bestätigt werden.";
 $a->strings["OpenID:"] = "OpenID:";
 $a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID.";
-$a->strings["Publish your default profile in your local site directory?"] = "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?";
+$a->strings["Publish your default profile in your local site directory?"] = "Darf dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?";
 $a->strings["Your profile will be published in this node's <a href=\"%s\">local directory</a>. Your profile details may be publicly visible depending on the system settings."] = "Dein Profil wird im <a href=\"%s\">lokalen Verzeichnis</a> dieses Knotens veröffentlicht. Je nach Systemeinstellungen kann es öffentlich auffindbar sein.";
-$a->strings["Publish your default profile in the global social directory?"] = "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?";
+$a->strings["Publish your default profile in the global social directory?"] = "Darf dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?";
 $a->strings["Your profile will be published in the global friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be visible in public."] = "Dein Profil wird in den globalen Friendica-Verzeichnissen (z.B. <a href=\"%s\">%s</a>) veröffentlicht. Dein Profil wird öffentlich auffindbar sein.";
 $a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?";
 $a->strings["Your contact list won't be shown in your default profile page. You can decide to show your contact list separately for each additional profile you create"] = "Die Liste deiner Kontakte wird nicht in deinem Standard-Profil angezeigt werden. Du kannst für jedes weitere Profil diese Entscheidung separat einstellen.";
@@ -1399,7 +1399,7 @@ $a->strings["Password Settings"] = "Passwort-Einstellungen";
 $a->strings["New Password:"] = "Neues Passwort:";
 $a->strings["Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:)."] = "Erlaubte Zeichen sind a-z, A-Z, 0-9 und Sonderzeichen, abgesehen von Leerzeichen, Doppelpunkten (:) und akzentuierten Buchstaben.";
 $a->strings["Confirm:"] = "Bestätigen:";
-$a->strings["Leave password fields blank unless changing"] = "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern";
+$a->strings["Leave password fields blank unless changing"] = "Lass die Passwort-Felder leer, außer du willst das Passwort ändern";
 $a->strings["Current Password:"] = "Aktuelles Passwort:";
 $a->strings["Your current password to confirm the changes"] = "Dein aktuelles Passwort um die Änderungen zu bestätigen";
 $a->strings["Password:"] = "Passwort:";
@@ -1422,14 +1422,14 @@ $a->strings["Default Permissions for New Posts"] = "Standardberechtigungen für
 $a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:";
 $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
 $a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden, wenn:";
-$a->strings["You receive an introduction"] = "– Du eine Kontaktanfrage erhältst";
+$a->strings["You receive an introduction"] = "– du eine Kontaktanfrage erhältst";
 $a->strings["Your introductions are confirmed"] = "– eine Deiner Kontaktanfragen akzeptiert wurde";
 $a->strings["Someone writes on your profile wall"] = "– jemand etwas auf Deine Pinnwand schreibt";
 $a->strings["Someone writes a followup comment"] = "– jemand auch einen Kommentar verfasst";
-$a->strings["You receive a private message"] = "– Du eine private Nachricht erhältst";
-$a->strings["You receive a friend suggestion"] = "– Du eine Empfehlung erhältst";
-$a->strings["You are tagged in a post"] = "– Du in einem Beitrag erwähnt wirst";
-$a->strings["You are poked/prodded/etc. in a post"] = "– Du von jemandem angestupst oder sonstwie behandelt wirst";
+$a->strings["You receive a private message"] = "– du eine private Nachricht erhältst";
+$a->strings["You receive a friend suggestion"] = "– du eine Empfehlung erhältst";
+$a->strings["You are tagged in a post"] = "– du in einem Beitrag erwähnt wirst";
+$a->strings["You are poked/prodded/etc. in a post"] = "– du von jemandem angestupst oder sonstwie behandelt wirst";
 $a->strings["Activate desktop notifications"] = "Desktop-Benachrichtigungen einschalten";
 $a->strings["Show desktop popup on new notifications"] = "Desktop-Benachrichtigungen einschalten";
 $a->strings["Text-only notification emails"] = "Benachrichtigungs-E-Mail als Rein-Text.";
@@ -1439,10 +1439,10 @@ $a->strings["Per default, notifications are condensed to a single notification p
 $a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Konto-/Seitentyp-Einstellungen";
 $a->strings["Change the behaviour of this account for special situations"] = "Verhalten dieses Kontos in bestimmten Situationen:";
 $a->strings["Relocate"] = "Umziehen";
-$a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button.";
+$a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Wenn du dein Profil von einem anderen Server umgezogen hast und einige deiner Kontakte deine Beiträge nicht erhalten, verwende diesen Button.";
 $a->strings["Resend relocate message to contacts"] = "Umzugsbenachrichtigung erneut an Kontakte senden";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s";
-$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?";
+$a->strings["Do you really want to delete this suggestion?"] = "Möchtest du wirklich diese Empfehlung löschen?";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
 $a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
 $a->strings["Friend Suggestions"] = "Kontaktvorschläge";
@@ -1458,7 +1458,7 @@ $a->strings["This site has exceeded the number of allowed daily account registra
 $a->strings["Import"] = "Import";
 $a->strings["Move account"] = "Account umziehen";
 $a->strings["You can import an account from another Friendica server."] = "Du kannst einen Account von einem anderen Friendica Server importieren.";
-$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist.";
+$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Du musst deinen Account vom alten Server exportieren und hier hochladen. Wir stellen deinen alten Account mit all deinen Kontakten wieder her. Wir werden auch versuchen, deine Kontakte darüber zu informieren, dass du hierher umgezogen bist.";
 $a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus-Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren";
 $a->strings["Account file"] = "Account-Datei";
 $a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"";
@@ -1467,7 +1467,7 @@ $a->strings["Unfollowing is currently not supported by your network."] = "Bei di
 $a->strings["Contact unfollowed"] = "Kontakt wird nicht mehr gefolgt";
 $a->strings["Disconnect/Unfollow"] = "Verbindung lösen/Nicht mehr folgen";
 $a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
-$a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?";
+$a->strings["Do you really want to delete this video?"] = "Möchtest du dieses Video wirklich löschen?";
 $a->strings["Delete Video"] = "Video Löschen";
 $a->strings["No videos selected"] = "Keine Videos  ausgewählt";
 $a->strings["View Video"] = "Video ansehen";
@@ -1476,286 +1476,20 @@ $a->strings["Upload New Videos"] = "Neues Video hochladen";
 $a->strings["No contacts."] = "Keine Kontakte.";
 $a->strings["Visit %s's profile [%s]"] = "Besuche %ss Profil [%s]";
 $a->strings["Contacts"] = "Kontakte";
-$a->strings["Invalid request."] = "Ungültige Anfrage";
-$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Entschuldige, die Datei scheint größer zu sein, als es die PHP-Konfiguration erlaubt.";
-$a->strings["Or - did you try to upload an empty file?"] = "Oder - hast Du versucht, eine leere Datei hochzuladen?";
-$a->strings["File exceeds size limit of %s"] = "Die Datei ist größer als das erlaubte Limit von %s";
-$a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
-$a->strings["Wall Photos"] = "Pinnwand-Bilder";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand-Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.";
 $a->strings["Unable to check your home location."] = "Konnte Deinen Heimatort nicht bestimmen.";
 $a->strings["No recipient."] = "Kein Empfänger.";
-$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern.";
-$a->strings["default"] = "Standard";
-$a->strings["greenzero"] = "greenzero";
-$a->strings["purplezero"] = "purplezero";
-$a->strings["easterbunny"] = "easterbunny";
-$a->strings["darkzero"] = "darkzero";
-$a->strings["comix"] = "comix";
-$a->strings["slackr"] = "slackr";
-$a->strings["Variations"] = "Variationen";
-$a->strings["Top Banner"] = "Top Banner";
-$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Skaliere das Hintergrundbild so, dass es die Breite der Seite einnimmt, und fülle den Rest der Seite mit der Hintergrundfarbe bei langen Seiten.";
-$a->strings["Full screen"] = "Vollbildmodus";
-$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Skaliere das Bild so, dass es den gesamten Bildschirm füllt. Hierfür wird entweder die Breite oder die Höhe des Bildes automatisch abgeschnitten.";
-$a->strings["Single row mosaic"] = "Mosaik in einer Zeile";
-$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Skaliere das Bild so, dass es in einer einzelnen Reihe, entweder horizontal oder vertikal, wiederholt wird.";
-$a->strings["Mosaic"] = "Mosaik";
-$a->strings["Repeat image to fill the screen."] = "Wiederhole das Bild, um den Bildschirm zu füllen.";
-$a->strings["Custom"] = "Benutzerdefiniert";
-$a->strings["Note"] = "Hinweis";
-$a->strings["Check image permissions if all users are allowed to see the image"] = "Überprüfe, dass alle Benutzer die Berechtigung haben dieses Bild anzusehen";
-$a->strings["Select color scheme"] = "Farbschema auswählen";
-$a->strings["Navigation bar background color"] = "Hintergrundfarbe der Navigationsleiste";
-$a->strings["Navigation bar icon color "] = "Icon Farbe in der Navigationsleiste";
-$a->strings["Link color"] = "Linkfarbe";
-$a->strings["Set the background color"] = "Hintergrundfarbe festlegen";
-$a->strings["Content background opacity"] = "Opazität des Hintergrunds von Beiträgen";
-$a->strings["Set the background image"] = "Hintergrundbild festlegen";
-$a->strings["Background image style"] = "Stil des Hintergrundbildes";
-$a->strings["Login page background image"] = "Hintergrundbild der Login-Seite";
-$a->strings["Login page background color"] = "Hintergrundfarbe der Login-Seite";
-$a->strings["Leave background image and color empty for theme defaults"] = "Wenn die Theme-Vorgaben verwendet werden sollen, lass bitte die Felder für die Hintergrundfarbe und das Hintergrundbild leer.";
-$a->strings["Guest"] = "Gast";
-$a->strings["Visitor"] = "Besucher";
-$a->strings["Logout"] = "Abmelden";
-$a->strings["End this session"] = "Diese Sitzung beenden";
-$a->strings["Status"] = "Status";
-$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
-$a->strings["Your profile page"] = "Deine Profilseite";
-$a->strings["Your photos"] = "Deine Fotos";
-$a->strings["Videos"] = "Videos";
-$a->strings["Your videos"] = "Deine Videos";
-$a->strings["Your events"] = "Deine Ereignisse";
-$a->strings["Conversations from your friends"] = "Unterhaltungen Deiner Kontakte";
-$a->strings["Events and Calendar"] = "Ereignisse und Kalender";
-$a->strings["Private mail"] = "Private E-Mail";
-$a->strings["Account settings"] = "Kontoeinstellungen";
-$a->strings["Manage/edit friends and contacts"] = "Freunde und Kontakte verwalten/bearbeiten";
-$a->strings["Alignment"] = "Ausrichtung";
-$a->strings["Left"] = "Links";
-$a->strings["Center"] = "Mitte";
-$a->strings["Color scheme"] = "Farbschema";
-$a->strings["Posts font size"] = "Schriftgröße in Beiträgen";
-$a->strings["Textareas font size"] = "Schriftgröße in Eingabefeldern";
-$a->strings["Comma separated list of helper forums"] = "Komma-separierte Liste der Helfer-Foren";
-$a->strings["don't show"] = "nicht zeigen";
-$a->strings["show"] = "zeigen";
-$a->strings["Set style"] = "Stil auswählen";
-$a->strings["Community Pages"] = "Foren";
-$a->strings["Community Profiles"] = "Community-Profile";
-$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
-$a->strings["Connect Services"] = "Verbinde Dienste";
-$a->strings["Find Friends"] = "Kontakte finden";
-$a->strings["Last users"] = "Letzte Nutzer";
-$a->strings["Find People"] = "Leute finden";
-$a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln";
-$a->strings["Similar Interests"] = "Ähnliche Interessen";
-$a->strings["Random Profile"] = "Zufälliges Profil";
-$a->strings["Invite Friends"] = "Freunde einladen";
-$a->strings["Local Directory"] = "Lokales Verzeichnis";
-$a->strings["Forums"] = "Foren";
-$a->strings["External link to forum"] = "Externer Link zum Forum";
-$a->strings["Quick Start"] = "Schnell-Start";
-$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Für die URL (%s) konnte kein nicht-archivierter Kontakt gefunden werden";
-$a->strings["The contact entries have been archived"] = "Die Kontakteinträge wurden archiviert.";
-$a->strings["Enter new password: "] = "Neues Passwort eingeben:";
-$a->strings["Post update version number has been set to %s."] = "Die Post-Update-Versionsnummer wurde auf %s gesetzt.";
-$a->strings["Check for pending update actions."] = "Überprüfe ausstehende Update-Aktionen";
-$a->strings["Done."] = "Erledigt.";
-$a->strings["Execute pending post updates."] = "Ausstehende Post-Updates ausführen";
-$a->strings["All pending post updates are done."] = "Alle ausstehenden Post-Updates wurden ausgeführt.";
-$a->strings["Post to Email"] = "An E-Mail senden";
-$a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist.";
-$a->strings["Visible to everybody"] = "Für jeden sichtbar";
-$a->strings["Close"] = "Schließen";
-$a->strings["Welcome "] = "Willkommen ";
-$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
-$a->strings["Welcome back "] = "Willkommen zurück ";
-$a->strings["The database configuration file \"config/local.config.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbankkonfigurationsdatei \"config/local.config.php\" konnte nicht erstellt werden. Um eine Konfigurationsdatei in Ihrem Webserver-Verzeichnis zu erstellen, gehen Sie wie folgt vor.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
-$a->strings["If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"] = "Wenn auf deinem Server keine Kommandozeilenversion von PHP installiert ist, kannst du den Hintergrundprozess nicht einrichten. Hier findest du alternative Möglichkeiten<a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'für das Worker-Setup'</a>";
-$a->strings["PHP executable path"] = "Pfad zu PHP";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren.";
-$a->strings["Command line PHP"] = "Kommandozeilen-PHP";
-$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)";
-$a->strings["Found PHP version: "] = "Gefundene PHP Version:";
-$a->strings["PHP cli binary"] = "PHP CLI Binary";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert.";
-$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau Dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
-$a->strings["Generate encryption keys"] = "Schlüssel erzeugen";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert.";
-$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
-$a->strings["Error: PDO or MySQLi PHP module required but not installed."] = "Fehler: PDO oder MySQLi PHP Modul erforderlich, aber nicht installiert.";
-$a->strings["Error: The MySQL driver for PDO is not installed."] = "Fehler: der MySQL Treiber für PDO ist nicht installiert";
-$a->strings["PDO or MySQLi PHP module"] = "PDO oder MySQLi PHP Modul";
-$a->strings["Error, XML PHP module required but not installed."] = "Fehler: XML PHP Modul erforderlich aber nicht installiert.";
-$a->strings["XML PHP module"] = "XML PHP Modul";
-$a->strings["libCurl PHP module"] = "PHP: libCurl-Modul";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert.";
-$a->strings["GD graphics PHP module"] = "PHP: GD-Grafikmodul";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert.";
-$a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul";
-$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl-Modul von PHP ist nicht installiert.";
-$a->strings["mb_string PHP module"] = "PHP: mb_string-Modul";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt, ist aber nicht installiert.";
-$a->strings["iconv PHP module"] = "PHP iconv Modul";
-$a->strings["Error: iconv PHP module required but not installed."] = "Fehler: Das iconv-Modul von PHP ist nicht installiert.";
-$a->strings["POSIX PHP module"] = "PHP POSIX Modul";
-$a->strings["Error: POSIX PHP module required but not installed."] = "Fehler POSIX PHP Modul erforderlich, aber nicht installiert.";
-$a->strings["JSON PHP module"] = "PHP JASON Modul";
-$a->strings["Error: JSON PHP module required but not installed."] = "Fehler: Das JSON PHP Modul wird benötigt, ist aber nicht installiert.";
-$a->strings["The web installer needs to be able to create a file called \"local.config.php\" in the \"config\" folder of your web server and it is unable to do so."] = "Das Installationsprogramm muss in der Lage sein, eine Datei namens \"local.config.php\" im Ordner \"config\" Ihres Webservers zu erstellen, ist aber nicht in der Lage dazu.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder."] = "Am Ende dieser Prozedur bekommst du einen Text, der in der local.config.php im Friendica \"config\" Ordner gespeichert werden muss.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt.";
-$a->strings["config/local.config.php is writable"] = "config/local.config.php ist schreibbar";
-$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3-Template-Engine, um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP, um das Rendern zu beschleunigen.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Um diese kompilierten Templates zu speichern, benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica.";
-$a->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 Webserver läuft (z.B. www-data), Schreibrechte zu diesem Verzeichnis hat.";
-$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten.";
-$a->strings["view/smarty3 is writable"] = "view/smarty3 ist schreibbar";
-$a->strings["Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Vergewissere dich, dass du .htaccess-dist nach.htaccess kopiert hast.";
-$a->strings["Error message from Curl when fetching"] = "Fehlermeldung von Curl während des Ladens";
-$a->strings["Url rewrite is working"] = "URL rewrite funktioniert";
-$a->strings["ImageMagick PHP extension is not installed"] = "ImageMagicx PHP Erweiterung ist nicht installiert.";
-$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP Erweiterung ist installiert";
-$a->strings["ImageMagick supports GIF"] = "ImageMagick unterstützt GIF";
-$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert.";
-$a->strings["Database already in use."] = "Die Datenbank wird bereits verwendet.";
-$a->strings["Tuesday"] = "Dienstag";
-$a->strings["Wednesday"] = "Mittwoch";
-$a->strings["Thursday"] = "Donnerstag";
-$a->strings["Friday"] = "Freitag";
-$a->strings["Saturday"] = "Samstag";
-$a->strings["January"] = "Januar";
-$a->strings["February"] = "Februar";
-$a->strings["March"] = "März";
-$a->strings["April"] = "April";
-$a->strings["May"] = "Mai";
-$a->strings["June"] = "Juni";
-$a->strings["July"] = "Juli";
-$a->strings["August"] = "August";
-$a->strings["September"] = "September";
-$a->strings["October"] = "Oktober";
-$a->strings["November"] = "November";
-$a->strings["December"] = "Dezember";
-$a->strings["Mon"] = "Mo";
-$a->strings["Tue"] = "Di";
-$a->strings["Wed"] = "Mi";
-$a->strings["Thu"] = "Do";
-$a->strings["Fri"] = "Fr";
-$a->strings["Sat"] = "Sa";
-$a->strings["Sun"] = "So";
-$a->strings["Jan"] = "Jan";
-$a->strings["Feb"] = "Feb";
-$a->strings["Mar"] = "März";
-$a->strings["Apr"] = "Apr";
-$a->strings["Jul"] = "Juli";
-$a->strings["Aug"] = "Aug";
-$a->strings["Sep"] = "Sep";
-$a->strings["Oct"] = "Okt";
-$a->strings["Nov"] = "Nov";
-$a->strings["Dec"] = "Dez";
-$a->strings["poke"] = "anstupsen";
-$a->strings["poked"] = "stupste";
-$a->strings["ping"] = "anpingen";
-$a->strings["pinged"] = "pingte";
-$a->strings["prod"] = "knuffen";
-$a->strings["prodded"] = "knuffte";
-$a->strings["slap"] = "ohrfeigen";
-$a->strings["slapped"] = "ohrfeigte";
-$a->strings["finger"] = "befummeln";
-$a->strings["fingered"] = "befummelte";
-$a->strings["rebuff"] = "eine Abfuhr erteilen";
-$a->strings["rebuffed"] = "abfuhrerteilte";
-$a->strings["System"] = "System";
-$a->strings["Home"] = "Pinnwand";
-$a->strings["Introductions"] = "Kontaktanfragen";
-$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert";
-$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt";
-$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag";
-$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht";
-$a->strings["%s is attending %s's event"] = "%s nimmt an %s's Event teil";
-$a->strings["%s is not attending %s's event"] = "%s nimmt nicht an %s's Event teil";
-$a->strings["%s may attend %s's event"] = "%s nimmt eventuell an %s's Event teil";
-$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet";
-$a->strings["Friend Suggestion"] = "Kontaktvorschlag";
-$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage";
-$a->strings["New Follower"] = "Neuer Bewunderer";
-$a->strings["Error 400 - Bad Request"] = "Error 400 - Bad Request";
-$a->strings["Error 401 - Unauthorized"] = "Error 401 - Unauthorized";
-$a->strings["Error 403 - Forbidden"] = "Error 403 - Forbidden";
-$a->strings["Error 404 - Not Found"] = "Error 404 - Not Found";
-$a->strings["Error 500 - Internal Server Error"] = "Error 500 - Internal Server Error";
-$a->strings["Error 503 - Service Unavailable"] = "Error 503 - Service Unavailable";
-$a->strings["The server cannot or will not process the request due to an apparent client error."] = "Aufgrund eines offensichtlichen Fehlers auf der Seite des Clients kann oder wird der Server die Anfrage nicht bearbeiten.";
-$a->strings["Authentication is required and has failed or has not yet been provided."] = "Die erforderliche Authentifizierung ist fehlgeschlagen oder noch nicht erfolgt.";
-$a->strings["The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account."] = "Die Anfrage war gültig, aber der Server verweigert die Ausführung. Der Benutzer verfügt möglicherweise nicht über die erforderlichen Berechtigungen oder benötigt ein Nutzerkonto.";
-$a->strings["The requested resource could not be found but may be available in the future."] = "Die angeforderte Ressource konnte nicht gefunden werden, sie könnte allerdings zu einem späteren Zeitpunkt verfügbar sein.";
-$a->strings["An unexpected condition was encountered and no more specific message is suitable."] = "Eine unerwartete Situation ist eingetreten, zu der keine detailliertere Nachricht vorliegt.";
-$a->strings["The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later."] = "Der Server ist derzeit nicht verfügbar (wegen Überlastung oder Wartungsarbeiten). Bitte versuche es später noch einmal.";
-$a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen.";
-$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler, falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein.";
-$a->strings["The error message is\n[pre]%s[/pre]"] = "Die Fehlermeldung lautet\n[pre]%s[/pre]";
-$a->strings["\n\t\t\t\t\tThe friendica database was successfully updated from %s to %s."] = "\n \t\t\t\t\tDie Friendica Datenbank wurde erfolgreich von %s auf %s aktualisiert.";
-$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account-Datei";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica-Account-Datei?";
-$a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!";
-$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzer-Accounts aufgetreten";
-$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzer-Profils";
-$a->strings["%d contact not imported"] = [
-	0 => "%d Kontakt nicht importiert",
-	1 => "%d Kontakte nicht importiert",
-];
-$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden";
-$a->strings["Birthday:"] = "Geburtstag:";
-$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD oder MM-DD";
-$a->strings["never"] = "nie";
-$a->strings["less than a second ago"] = "vor weniger als einer Sekunde";
-$a->strings["year"] = "Jahr";
-$a->strings["years"] = "Jahre";
-$a->strings["months"] = "Monate";
-$a->strings["weeks"] = "Wochen";
-$a->strings["days"] = "Tage";
-$a->strings["hour"] = "Stunde";
-$a->strings["hours"] = "Stunden";
-$a->strings["minute"] = "Minute";
-$a->strings["minutes"] = "Minuten";
-$a->strings["second"] = "Sekunde";
-$a->strings["seconds"] = "Sekunden";
-$a->strings["in %1\$d %2\$s"] = "in %1\$d %2\$s";
-$a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s";
-$a->strings["view full size"] = "Volle Größe anzeigen";
-$a->strings["Image/photo"] = "Bild/Foto";
-$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
-$a->strings["$1 wrote:"] = "$1 hat geschrieben:";
-$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
-$a->strings["Invalid source protocol"] = "Ungültiges Quell-Protokoll";
-$a->strings["Invalid link protocol"] = "Ungültiges Link-Protokoll";
-$a->strings["Loading more entries..."] = "lade weitere Einträge...";
-$a->strings["The end"] = "Das Ende";
-$a->strings["Follow"] = "Folge";
-$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content";
-$a->strings["Full Text"] = "Volltext";
-$a->strings["Tags"] = "Tags";
-$a->strings["Click to open/close"] = "Zum Öffnen/Schließen klicken";
-$a->strings["Export"] = "Exportieren";
-$a->strings["Export calendar as ical"] = "Kalender als ical exportieren";
-$a->strings["Export calendar as csv"] = "Kalender als csv exportieren";
-$a->strings["No contacts"] = "Keine Kontakte";
-$a->strings["%d Contact"] = [
-	0 => "%d Kontakt",
-	1 => "%d Kontakte",
-];
-$a->strings["View Contacts"] = "Kontakte anzeigen";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern.";
+$a->strings["Invalid request."] = "Ungültige Anfrage";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Entschuldige, die Datei scheint größer zu sein, als es die PHP-Konfiguration erlaubt.";
+$a->strings["Or - did you try to upload an empty file?"] = "Oder - hast du versucht, eine leere Datei hochzuladen?";
+$a->strings["File exceeds size limit of %s"] = "Die Datei ist größer als das erlaubte Limit von %s";
+$a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
+$a->strings["Wall Photos"] = "Pinnwand-Bilder";
+$a->strings["Delete this item?"] = "Diesen Beitrag löschen?";
+$a->strings["toggle mobile"] = "mobile Ansicht umschalten";
+$a->strings["No system theme config value set."] = "Es wurde kein Konfigurationswert für das systemweite Theme gesetzt.";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens, wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
 $a->strings["Frequently"] = "immer wieder";
 $a->strings["Hourly"] = "Stündlich";
 $a->strings["Twice daily"] = "Zweimal täglich";
@@ -1864,11 +1598,24 @@ $a->strings["Tag Cloud"] = "Schlagwortwolke";
 $a->strings["Provide a personal tag cloud on your profile page"] = "Wortwolke aus den von dir verwendeten Schlagwörtern im Profil anzeigen";
 $a->strings["Display Membership Date"] = "Mitgliedschaftsdatum anzeigen";
 $a->strings["Display membership date in profile"] = "Das Datum der Registrierung deines Accounts im Profil anzeigen";
+$a->strings["Forums"] = "Foren";
+$a->strings["External link to forum"] = "Externer Link zum Forum";
 $a->strings["Nothing new here"] = "Keine Neuigkeiten";
 $a->strings["Clear notifications"] = "Bereinige Benachrichtigungen";
+$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content";
+$a->strings["Logout"] = "Abmelden";
+$a->strings["End this session"] = "Diese Sitzung beenden";
+$a->strings["Status"] = "Status";
+$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
+$a->strings["Your profile page"] = "Deine Profilseite";
+$a->strings["Your photos"] = "Deine Fotos";
+$a->strings["Videos"] = "Videos";
+$a->strings["Your videos"] = "Deine Videos";
+$a->strings["Your events"] = "Deine Ereignisse";
 $a->strings["Personal notes"] = "Persönliche Notizen";
 $a->strings["Your personal notes"] = "Deine persönlichen Notizen";
 $a->strings["Sign in"] = "Anmelden";
+$a->strings["Home"] = "Pinnwand";
 $a->strings["Home Page"] = "Homepage";
 $a->strings["Register"] = "Registrieren";
 $a->strings["Create an account"] = "Nutzerkonto erstellen";
@@ -1876,22 +1623,30 @@ $a->strings["Help and documentation"] = "Hilfe und Dokumentation";
 $a->strings["Apps"] = "Apps";
 $a->strings["Addon applications, utilities, games"] = "Zusätzliche Anwendungen, Dienstprogramme, Spiele";
 $a->strings["Search site content"] = "Inhalt der Seite durchsuchen";
+$a->strings["Full Text"] = "Volltext";
+$a->strings["Tags"] = "Tags";
 $a->strings["Community"] = "Gemeinschaft";
 $a->strings["Conversations on this and other servers"] = "Unterhaltungen auf diesem und anderen Servern";
+$a->strings["Events and Calendar"] = "Ereignisse und Kalender";
 $a->strings["Directory"] = "Verzeichnis";
 $a->strings["People directory"] = "Nutzerverzeichnis";
 $a->strings["Information about this friendica instance"] = "Informationen zu dieser Friendica-Instanz";
 $a->strings["Terms of Service of this Friendica instance"] = "Die Nutzungsbedingungen dieser Friendica-Instanz";
+$a->strings["Conversations from your friends"] = "Unterhaltungen Deiner Kontakte";
 $a->strings["Network Reset"] = "Netzwerk zurücksetzen";
 $a->strings["Load Network page with no filters"] = "Netzwerk-Seite ohne Filter laden";
+$a->strings["Introductions"] = "Kontaktanfragen";
 $a->strings["Friend Requests"] = "Kontaktanfragen";
 $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen";
 $a->strings["Mark all system notifications seen"] = "Markiere alle Systembenachrichtigungen als gelesen";
+$a->strings["Private mail"] = "Private E-Mail";
 $a->strings["Inbox"] = "Eingang";
 $a->strings["Outbox"] = "Ausgang";
 $a->strings["Manage"] = "Verwalten";
 $a->strings["Manage other pages"] = "Andere Seiten verwalten";
+$a->strings["Account settings"] = "Kontoeinstellungen";
 $a->strings["Manage/Edit Profiles"] = "Profile verwalten/editieren";
+$a->strings["Manage/edit friends and contacts"] = "Freunde und Kontakte verwalten/bearbeiten";
 $a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration";
 $a->strings["Navigation"] = "Navigation";
 $a->strings["Site map"] = "Sitemap";
@@ -1901,6 +1656,26 @@ $a->strings["newer"] = "neuer";
 $a->strings["older"] = "älter";
 $a->strings["prev"] = "vorige";
 $a->strings["last"] = "letzte";
+$a->strings["view full size"] = "Volle Größe anzeigen";
+$a->strings["Image/photo"] = "Bild/Foto";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
+$a->strings["$1 wrote:"] = "$1 hat geschrieben:";
+$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
+$a->strings["Invalid source protocol"] = "Ungültiges Quell-Protokoll";
+$a->strings["Invalid link protocol"] = "Ungültiges Link-Protokoll";
+$a->strings["Loading more entries..."] = "lade weitere Einträge...";
+$a->strings["The end"] = "Das Ende";
+$a->strings["Follow"] = "Folge";
+$a->strings["Click to open/close"] = "Zum Öffnen/Schließen klicken";
+$a->strings["Export"] = "Exportieren";
+$a->strings["Export calendar as ical"] = "Kalender als ical exportieren";
+$a->strings["Export calendar as csv"] = "Kalender als csv exportieren";
+$a->strings["No contacts"] = "Keine Kontakte";
+$a->strings["%d Contact"] = [
+	0 => "%d Kontakt",
+	1 => "%d Kontakte",
+];
+$a->strings["View Contacts"] = "Kontakte anzeigen";
 $a->strings["Add New Contact"] = "Neuen Kontakt hinzufügen";
 $a->strings["Enter address or web location"] = "Adresse oder Web-Link eingeben";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@example.com, http://example.com/barbara";
@@ -1908,6 +1683,13 @@ $a->strings["%d invitation available"] = [
 	0 => "%d Einladung verfügbar",
 	1 => "%d Einladungen verfügbar",
 ];
+$a->strings["Find People"] = "Leute finden";
+$a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln";
+$a->strings["Similar Interests"] = "Ähnliche Interessen";
+$a->strings["Random Profile"] = "Zufälliges Profil";
+$a->strings["Invite Friends"] = "Freunde einladen";
+$a->strings["Local Directory"] = "Lokales Verzeichnis";
 $a->strings["Protocols"] = "Protokolle";
 $a->strings["All Protocols"] = "Alle Protokolle";
 $a->strings["Saved Folders"] = "Gespeicherte Ordner";
@@ -1917,11 +1699,170 @@ $a->strings["%d contact in common"] = [
 	0 => "%d gemeinsamer Kontakt",
 	1 => "%d gemeinsame Kontakte",
 ];
+$a->strings["Post to Email"] = "An E-Mail senden";
+$a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist.";
+$a->strings["Visible to everybody"] = "Für jeden sichtbar";
+$a->strings["show"] = "zeigen";
+$a->strings["don't show"] = "nicht zeigen";
+$a->strings["Close"] = "Schließen";
+$a->strings["Welcome "] = "Willkommen ";
+$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
+$a->strings["Welcome back "] = "Willkommen zurück ";
+$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Für die URL (%s) konnte kein nicht-archivierter Kontakt gefunden werden";
+$a->strings["The contact entries have been archived"] = "Die Kontakteinträge wurden archiviert.";
+$a->strings["Enter new password: "] = "Neues Passwort eingeben:";
+$a->strings["Post update version number has been set to %s."] = "Die Post-Update-Versionsnummer wurde auf %s gesetzt.";
+$a->strings["Check for pending update actions."] = "Überprüfe ausstehende Update-Aktionen";
+$a->strings["Done."] = "Erledigt.";
+$a->strings["Execute pending post updates."] = "Ausstehende Post-Updates ausführen";
+$a->strings["All pending post updates are done."] = "Alle ausstehenden Post-Updates wurden ausgeführt.";
+$a->strings["The database configuration file \"config/local.config.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbankkonfigurationsdatei \"config/local.config.php\" konnte nicht erstellt werden. Um eine Konfigurationsdatei in Ihrem Webserver-Verzeichnis zu erstellen, gehe wie folgt vor.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
+$a->strings["If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"] = "Wenn auf deinem Server keine Kommandozeilenversion von PHP installiert ist, kannst du den Hintergrundprozess nicht einrichten. Hier findest du alternative Möglichkeiten<a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'für das Worker-Setup'</a>";
+$a->strings["PHP executable path"] = "Pfad zu PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren.";
+$a->strings["Command line PHP"] = "Kommandozeilen-PHP";
+$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)";
+$a->strings["Found PHP version: "] = "Gefundene PHP Version:";
+$a->strings["PHP cli binary"] = "PHP CLI Binary";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert.";
+$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
+$a->strings["Generate encryption keys"] = "Schlüssel erzeugen";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert.";
+$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
+$a->strings["Error: PDO or MySQLi PHP module required but not installed."] = "Fehler: PDO oder MySQLi PHP Modul erforderlich, aber nicht installiert.";
+$a->strings["Error: The MySQL driver for PDO is not installed."] = "Fehler: der MySQL Treiber für PDO ist nicht installiert";
+$a->strings["PDO or MySQLi PHP module"] = "PDO oder MySQLi PHP Modul";
+$a->strings["Error, XML PHP module required but not installed."] = "Fehler: XML PHP Modul erforderlich aber nicht installiert.";
+$a->strings["XML PHP module"] = "XML PHP Modul";
+$a->strings["libCurl PHP module"] = "PHP: libCurl-Modul";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert.";
+$a->strings["GD graphics PHP module"] = "PHP: GD-Grafikmodul";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert.";
+$a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul";
+$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl-Modul von PHP ist nicht installiert.";
+$a->strings["mb_string PHP module"] = "PHP: mb_string-Modul";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt, ist aber nicht installiert.";
+$a->strings["iconv PHP module"] = "PHP iconv Modul";
+$a->strings["Error: iconv PHP module required but not installed."] = "Fehler: Das iconv-Modul von PHP ist nicht installiert.";
+$a->strings["POSIX PHP module"] = "PHP POSIX Modul";
+$a->strings["Error: POSIX PHP module required but not installed."] = "Fehler POSIX PHP Modul erforderlich, aber nicht installiert.";
+$a->strings["JSON PHP module"] = "PHP JASON Modul";
+$a->strings["Error: JSON PHP module required but not installed."] = "Fehler: Das JSON PHP Modul wird benötigt, ist aber nicht installiert.";
+$a->strings["The web installer needs to be able to create a file called \"local.config.php\" in the \"config\" folder of your web server and it is unable to do so."] = "Das Installationsprogramm muss in der Lage sein, eine Datei namens \"local.config.php\" im Ordner \"config\" Ihres Webservers zu erstellen, ist aber nicht in der Lage dazu.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder."] = "Am Ende dieser Prozedur bekommst du einen Text, der in der local.config.php im Friendica \"config\" Ordner gespeichert werden muss.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest du in der Datei INSTALL.txt.";
+$a->strings["config/local.config.php is writable"] = "config/local.config.php ist schreibbar";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3-Template-Engine, um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP, um das Rendern zu beschleunigen.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Um diese kompilierten Templates zu speichern, benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica.";
+$a->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 Webserver läuft (z.B. www-data), Schreibrechte zu diesem Verzeichnis hat.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: aus Sicherheitsgründen solltest du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht für die darin enthaltenen Template-Dateien (.tpl).";
+$a->strings["view/smarty3 is writable"] = "view/smarty3 ist schreibbar";
+$a->strings["Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Vergewissere dich, dass du .htaccess-dist nach.htaccess kopiert hast.";
+$a->strings["Error message from Curl when fetching"] = "Fehlermeldung von Curl während des Ladens";
+$a->strings["Url rewrite is working"] = "URL rewrite funktioniert";
+$a->strings["ImageMagick PHP extension is not installed"] = "ImageMagicx PHP Erweiterung ist nicht installiert.";
+$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP Erweiterung ist installiert";
+$a->strings["ImageMagick supports GIF"] = "ImageMagick unterstützt GIF";
+$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert.";
+$a->strings["Database already in use."] = "Die Datenbank wird bereits verwendet.";
+$a->strings["Tuesday"] = "Dienstag";
+$a->strings["Wednesday"] = "Mittwoch";
+$a->strings["Thursday"] = "Donnerstag";
+$a->strings["Friday"] = "Freitag";
+$a->strings["Saturday"] = "Samstag";
+$a->strings["January"] = "Januar";
+$a->strings["February"] = "Februar";
+$a->strings["March"] = "März";
+$a->strings["April"] = "April";
+$a->strings["May"] = "Mai";
+$a->strings["June"] = "Juni";
+$a->strings["July"] = "Juli";
+$a->strings["August"] = "August";
+$a->strings["September"] = "September";
+$a->strings["October"] = "Oktober";
+$a->strings["November"] = "November";
+$a->strings["December"] = "Dezember";
+$a->strings["Mon"] = "Mo";
+$a->strings["Tue"] = "Di";
+$a->strings["Wed"] = "Mi";
+$a->strings["Thu"] = "Do";
+$a->strings["Fri"] = "Fr";
+$a->strings["Sat"] = "Sa";
+$a->strings["Sun"] = "So";
+$a->strings["Jan"] = "Jan";
+$a->strings["Feb"] = "Feb";
+$a->strings["Mar"] = "März";
+$a->strings["Apr"] = "Apr";
+$a->strings["Jul"] = "Juli";
+$a->strings["Aug"] = "Aug";
+$a->strings["Sep"] = "Sep";
+$a->strings["Oct"] = "Okt";
+$a->strings["Nov"] = "Nov";
+$a->strings["Dec"] = "Dez";
+$a->strings["poke"] = "anstupsen";
+$a->strings["poked"] = "stupste";
+$a->strings["ping"] = "anpingen";
+$a->strings["pinged"] = "pingte";
+$a->strings["prod"] = "knuffen";
+$a->strings["prodded"] = "knuffte";
+$a->strings["slap"] = "ohrfeigen";
+$a->strings["slapped"] = "ohrfeigte";
+$a->strings["finger"] = "befummeln";
+$a->strings["fingered"] = "befummelte";
+$a->strings["rebuff"] = "eine Abfuhr erteilen";
+$a->strings["rebuffed"] = "abfuhrerteilte";
+$a->strings["System"] = "System";
+$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert";
+$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt";
+$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag";
+$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht";
+$a->strings["%s is attending %s's event"] = "%s nimmt an %s's Event teil";
+$a->strings["%s is not attending %s's event"] = "%s nimmt nicht an %s's Event teil";
+$a->strings["%s may attend %s's event"] = "%s nimmt eventuell an %s's Event teil";
+$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet";
+$a->strings["Friend Suggestion"] = "Kontaktvorschlag";
+$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage";
+$a->strings["New Follower"] = "Neuer Bewunderer";
+$a->strings["Error 400 - Bad Request"] = "Error 400 - Bad Request";
+$a->strings["Error 401 - Unauthorized"] = "Error 401 - Unauthorized";
+$a->strings["Error 403 - Forbidden"] = "Error 403 - Forbidden";
+$a->strings["Error 404 - Not Found"] = "Error 404 - Not Found";
+$a->strings["Error 500 - Internal Server Error"] = "Error 500 - Internal Server Error";
+$a->strings["Error 503 - Service Unavailable"] = "Error 503 - Service Unavailable";
+$a->strings["The server cannot or will not process the request due to an apparent client error."] = "Aufgrund eines offensichtlichen Fehlers auf der Seite des Clients kann oder wird der Server die Anfrage nicht bearbeiten.";
+$a->strings["Authentication is required and has failed or has not yet been provided."] = "Die erforderliche Authentifizierung ist fehlgeschlagen oder noch nicht erfolgt.";
+$a->strings["The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account."] = "Die Anfrage war gültig, aber der Server verweigert die Ausführung. Der Benutzer verfügt möglicherweise nicht über die erforderlichen Berechtigungen oder benötigt ein Nutzerkonto.";
+$a->strings["The requested resource could not be found but may be available in the future."] = "Die angeforderte Ressource konnte nicht gefunden werden, sie könnte allerdings zu einem späteren Zeitpunkt verfügbar sein.";
+$a->strings["An unexpected condition was encountered and no more specific message is suitable."] = "Eine unerwartete Situation ist eingetreten, zu der keine detailliertere Nachricht vorliegt.";
+$a->strings["The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later."] = "Der Server ist derzeit nicht verfügbar (wegen Überlastung oder Wartungsarbeiten). Bitte versuche es später noch einmal.";
+$a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen.";
+$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler, falls du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein.";
+$a->strings["The error message is\n[pre]%s[/pre]"] = "Die Fehlermeldung lautet\n[pre]%s[/pre]";
+$a->strings["\n\t\t\t\t\tThe friendica database was successfully updated from %s to %s."] = "\n \t\t\t\t\tDie Friendica Datenbank wurde erfolgreich von %s auf %s aktualisiert.";
+$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account-Datei";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica-Account-Datei?";
+$a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!";
+$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzer-Accounts aufgetreten";
+$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzer-Profils";
+$a->strings["%d contact not imported"] = [
+	0 => "%d Kontakt nicht importiert",
+	1 => "%d Kontakte nicht importiert",
+];
+$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden";
 $a->strings["There are no tables on MyISAM."] = "Es gibt keine MyISAM-Tabellen.";
 $a->strings["\nError %d occurred during database update:\n%s\n"] = "\nFehler %d beim Update der Datenbank aufgetreten\n%s\n";
 $a->strings["Errors encountered performing database changes: "] = "Fehler beim Ändern der Datenbank aufgetreten";
 $a->strings["%s: Database update"] = "%s: Datenbank Aktualisierung";
 $a->strings["%s: updating %s table."] = "%s: aktualisiere Tabelle %s";
+$a->strings["Legacy module file not found: %s"] = "Legacy-Moduldatei nicht gefunden: %s";
 $a->strings["Drop Contact"] = "Kontakt löschen";
 $a->strings["Organisation"] = "Organisation";
 $a->strings["News"] = "Nachrichten";
@@ -1936,7 +1877,7 @@ $a->strings["No browser URL could be matched to this address."] = "Zu dieser Adr
 $a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen.";
 $a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der E-Mail-Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen.";
 $a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde.";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können.";
 $a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen.";
 $a->strings["Starts:"] = "Beginnt:";
 $a->strings["Finishes:"] = "Endet:";
@@ -1956,7 +1897,7 @@ $a->strings["Hide map"] = "Karte verbergen";
 $a->strings["%s's birthday"] = "%ss Geburtstag";
 $a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch, %s";
 $a->strings["Item filed"] = "Beitrag abgelegt";
-$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
+$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
 $a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte";
 $a->strings["Everybody"] = "Alle Kontakte";
 $a->strings["edit"] = "bearbeiten";
@@ -1991,6 +1932,7 @@ $a->strings["Upcoming events the next 7 days:"] = "Veranstaltungen der nächsten
 $a->strings["Member since:"] = "Mitglied seit:";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Geburtstag:";
 $a->strings["Age:"] = "Alter:";
 $a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s";
 $a->strings["Religion:"] = "Religion:";
@@ -2005,16 +1947,16 @@ $a->strings["Work/employment:"] = "Arbeit/Beschäftigung:";
 $a->strings["School/education:"] = "Schule/Ausbildung:";
 $a->strings["Forums:"] = "Foren:";
 $a->strings["Profile Details"] = "Profildetails";
-$a->strings["Only You Can See This"] = "Nur Du kannst das sehen";
+$a->strings["Only You Can See This"] = "Nur du kannst das sehen";
 $a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
 $a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s heißt %2\$s herzlich willkommen";
 $a->strings["Database storage failed to update %s"] = "Datenbankspeicher konnte nicht aktualisiert werden %s";
 $a->strings["Database storage failed to insert data"] = "Der Datenbankspeicher konnte keine Daten einfügen";
-$a->strings["Filesystem storage failed to create \"%s\". Check you write permissions."] = "Dateisystemspeicher konnte nicht erstellt werden \"%s\". Überprüfen Sie, ob Sie Schreibberechtigungen haben.";
-$a->strings["Filesystem storage failed to save data to \"%s\". Check your write permissions"] = "Der Dateisystemspeicher konnte die Daten nicht in \"%s\" speichern. Überprüfen Sie Ihre Schreibberechtigungen";
+$a->strings["Filesystem storage failed to create \"%s\". Check you write permissions."] = "Dateisystemspeicher konnte nicht erstellt werden \"%s\". Überprüfe, ob du Schreibberechtigungen hast.";
+$a->strings["Filesystem storage failed to save data to \"%s\". Check your write permissions"] = "Der Dateisystemspeicher konnte die Daten nicht in \"%s\" speichern. Überprüfe Deine Schreibberechtigungen";
 $a->strings["Storage base path"] = "Dateipfad zum Speicher";
 $a->strings["Folder where uploaded files are saved. For maximum security, This should be a path outside web server folder tree"] = "Verzeichnis, in das Dateien hochgeladen werden. Für maximale Sicherheit sollte dies ein Pfad außerhalb der Webserver-Verzeichnisstruktur sein";
-$a->strings["Enter a valid existing folder"] = "Geben Sie einen gültigen, existierenden Ordner ein";
+$a->strings["Enter a valid existing folder"] = "Gib einen gültigen, existierenden Ordner ein";
 $a->strings["Login failed"] = "Anmeldung fehlgeschlagen";
 $a->strings["Not enough information to authenticate"] = "Nicht genügend Informationen für die Authentifizierung";
 $a->strings["Password can't be empty"] = "Das Passwort kann nicht leer sein";
@@ -2025,7 +1967,7 @@ $a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter st
 $a->strings["An invitation is required."] = "Du benötigst eine Einladung.";
 $a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden.";
 $a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch, Dich mit der von Dir angegebenen OpenID anzumelden, trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch, dich mit der von dir angegebenen OpenID anzumelden, trat ein Problem auf. Bitte überprüfe, dass du die OpenID richtig geschrieben hast.";
 $a->strings["The error message was:"] = "Die Fehlermeldung lautete:";
 $a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein.";
 $a->strings["system.username_min_length (%s) and system.username_max_length (%s) are excluding each other, swapping values."] = "system.username_min_length (%s) and system.username_max_length (%s) schließen sich gegenseitig aus, tausche Werte aus.";
@@ -2037,7 +1979,7 @@ $a->strings["Username should be at most %s character."] = [
 	0 => "Der Benutzername sollte aus maximal %s Zeichen bestehen.",
 	1 => "Der Benutzername sollte aus maximal %s Zeichen bestehen.",
 ];
-$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein.";
 $a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail-Adresse ist auf dieser Seite nicht erlaubt.";
 $a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse.";
 $a->strings["The nickname was blocked from registration by the nodes admin."] = "Der Admin des Knotens hat den Spitznamen für die Registrierung gesperrt.";
@@ -2046,23 +1988,14 @@ $a->strings["Your nickname can only contain a-z, 0-9 and _."] = "Dein Spitzname
 $a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
 $a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
+$a->strings["default"] = "Standard";
 $a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
 $a->strings["An error occurred creating your self contact. Please try again."] = "Bei der Erstellung deines self-Kontakts ist ein Fehler aufgetreten. Bitte versuche es erneut.";
 $a->strings["An error occurred creating your default contact group. Please try again."] = "Bei der Erstellung deiner Standardgruppe für Kontakte ist ein Fehler aufgetreten. Bitte versuche es erneut.";
-$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\n\t\t\tYour login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%4\$s\n\t\t\tPassword:\t\t%5\$s\n\t\t"] = "\n\t\t\tHallo %1\$s,\n\t\t\t\tdanke für Deine Registrierung auf %2\$s. Dein Account muss noch vom Admin des Knotens freigeschaltet werden.\n\n\t\t\tDeine Zugangsdaten lauten wie folgt:\n\n\t\t\tSeitenadresse:\t%3\$s\n\t\t\tAnmeldename:\t\t%4\$s\n\t\t\tPasswort:\t\t%5\$s\n\t\t";
+$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\n\t\t\tYour login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%4\$s\n\t\t\tPassword:\t\t%5\$s\n\t\t"] = "\n\t\t\tHallo %1\$s,\n\t\t\t\tdanke für deine Registrierung auf %2\$s. Dein Account muss noch vom Admin des Knotens freigeschaltet werden.\n\n\t\t\tDeine Zugangsdaten lauten wie folgt:\n\n\t\t\tSeitenadresse:\t%3\$s\n\t\t\tAnmeldename:\t\t%4\$s\n\t\t\tPasswort:\t\t%5\$s\n\t\t";
 $a->strings["Registration at %s"] = "Registrierung als %s";
-$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet.";
-$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3\$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s.";
-$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
-$a->strings["Attachments:"] = "Anhänge:";
-$a->strings["%s's timeline"] = "Timeline von %s";
-$a->strings["%s's posts"] = "Beiträge von %s";
-$a->strings["%s's comments"] = "Kommentare von %s";
-$a->strings["%s is now following %s."] = "%s folgt nun %s";
-$a->strings["following"] = "folgen";
-$a->strings["%s stopped following %s."] = "%s hat aufgehört %s, zu folgen";
-$a->strings["stopped following"] = "wird nicht mehr gefolgt";
-$a->strings["(no subject)"] = "(kein Betreff)";
+$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\nHallo %1\$s,\n\ndanke für deine Registrierung auf %2\$s. Dein Account wurde eingerichtet.";
+$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst dein Passwort unter \"Einstellungen\" ändern, sobald du dich\nangemeldet hast.\n\nBitte nimm dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst du ja auch einige Informationen über dich in deinem\nProfil veröffentlichen, damit andere Leute dich einfacher finden können.\nBearbeite hierfür einfach dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen dir, deinen kompletten Namen anzugeben und ein zu dir\npassendes Profilbild zu wählen, damit dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn du auf deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die deine Interessen teilen.\n\nWir respektieren deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3\$s/removeme jederzeit tun.\n\nDanke für deine Aufmerksamkeit und willkommen auf %2\$s.";
 $a->strings["Item was not found."] = "Beitrag konnte nicht gefunden werden.";
 $a->strings["%d contact edited."] = [
 	0 => "%d Kontakt bearbeitet.",
@@ -2082,7 +2015,7 @@ $a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirkli
 $a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
 $a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft";
 $a->strings["You are sharing with %s"] = "Du teilst mit %s";
-$a->strings["%s is sharing with you"] = "%s teilt mit Dir";
+$a->strings["%s is sharing with you"] = "%s teilt mit dir";
 $a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar.";
 $a->strings["Never"] = "Niemals";
 $a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)";
@@ -2099,7 +2032,7 @@ $a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
 $a->strings["Contact Information / Notes"] = "Kontakt-Informationen / -Notizen";
 $a->strings["Contact Settings"] = "Kontakteinstellungen";
 $a->strings["Contact"] = "Kontakt";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft.";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft.";
 $a->strings["Their personal note"] = "Die persönliche Mitteilung";
 $a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten";
 $a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten";
@@ -2156,15 +2089,15 @@ $a->strings["System check"] = "Systemtest";
 $a->strings["Check again"] = "Noch einmal testen";
 $a->strings["Database connection"] = "Datenbankverbindung";
 $a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting-Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte, bevor Du mit der Installation fortfährst.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting-Provider oder den Administrator der Seite, falls du Fragen zu diesen Einstellungen haben solltest.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte, bevor du mit der Installation fortfährst.";
 $a->strings["Database Server Name"] = "Datenbank-Server";
 $a->strings["Database Login Name"] = "Datenbank-Nutzer";
 $a->strings["Database Login Password"] = "Datenbank-Passwort";
 $a->strings["For security reasons the password must not be empty"] = "Aus Sicherheitsgründen darf das Passwort nicht leer sein.";
 $a->strings["Database Name"] = "Datenbank-Name";
 $a->strings["Site administrator email address"] = "E-Mail-Adresse des Administrators";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst.";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit du das Admin-Panel benutzen kannst.";
 $a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone Deiner Webseite";
 $a->strings["Site settings"] = "Server-Einstellungen";
 $a->strings["System Language:"] = "Systemsprache:";
@@ -2172,24 +2105,27 @@ $a->strings["Set the default language for your Friendica installation interface
 $a->strings["Your Friendica site database has been installed."] = "Die Datenbank Deiner Friendica-Seite wurde installiert.";
 $a->strings["Installation finished"] = "Installation abgeschlossen";
 $a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "Wichtig: Du musst [manuell] einen Cronjob (o.ä.) für den Worker einrichten.";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "Wichtig: du musst [manuell] einen Cronjob (o.ä.) für den Worker einrichten.";
 $a->strings["Go to your new Friendica node <a href=\"%s/register\">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel."] = "Du solltest nun die Seite zur <a href=\"%s/register\">Nutzerregistrierung</a> deiner neuen Friendica Instanz besuchen und einen neuen Nutzer einrichten. Bitte denke daran, dieselbe E-Mail Adresse anzugeben, die du auch als Administrator-E-Mail angegeben hast, damit du das Admin-Panel verwenden kannst.";
 $a->strings["Item Guid"] = "Beitrags-Guid";
 $a->strings["Create a New Account"] = "Neues Konto erstellen";
 $a->strings["Password: "] = "Passwort: ";
 $a->strings["Remember me"] = "Anmeldedaten merken";
-$a->strings["Or login using OpenID: "] = "Oder melde Dich mit Deiner OpenID an: ";
+$a->strings["Or login using OpenID: "] = "Oder melde dich mit deiner OpenID an: ";
 $a->strings["Forgot your password?"] = "Passwort vergessen?";
 $a->strings["Website Terms of Service"] = "Website-Nutzungsbedingungen";
 $a->strings["terms of service"] = "Nutzungsbedingungen";
 $a->strings["Website Privacy Policy"] = "Website-Datenschutzerklärung";
 $a->strings["privacy policy"] = "Datenschutzerklärung";
 $a->strings["Logged out."] = "Abgemeldet.";
+$a->strings["%s's timeline"] = "Timeline von %s";
+$a->strings["%s's posts"] = "Beiträge von %s";
+$a->strings["%s's comments"] = "Kommentare von %s";
 $a->strings["Bad Request."] = "Ungültige Anfrage.";
 $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking \"Register\"."] = "Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen, indem du deine OpenID angibst und 'Registrieren' klickst.";
-$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus.";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus.";
 $a->strings["Your OpenID (optional): "] = "Deine OpenID (optional): ";
-$a->strings["Include your profile in member directory?"] = "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?";
+$a->strings["Include your profile in member directory?"] = "Soll dein Profil im Nutzerverzeichnis angezeigt werden?";
 $a->strings["Note for the admin"] = "Hinweis für den Admin";
 $a->strings["Leave a message for the admin, why you want to join this node"] = "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest.";
 $a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
@@ -2197,11 +2133,11 @@ $a->strings["Your invitation code: "] = "Dein Ein­la­dungs­code";
 $a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):";
 $a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Deine E-Mail Adresse (Informationen zur Registrierung werden an diese Adresse gesendet, darum muss sie existieren.)";
 $a->strings["Leave empty for an auto generated password."] = "Leer lassen, um das Passwort automatisch zu generieren.";
-$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \"<strong>nickname@%s</strong>\"."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@%s</strong>' sein.";
+$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \"<strong>nickname@%s</strong>\"."] = "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@%s</strong>' sein.";
 $a->strings["Choose a nickname: "] = "Spitznamen wählen: ";
-$a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica-Instanz";
+$a->strings["Import your profile to this friendica instance"] = "Importiere dein Profil auf diese Friendica-Instanz";
 $a->strings["Note: This node explicitly contains adult content"] = "Hinweis: Dieser Knoten enthält explizit Inhalte für Erwachsene";
-$a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet.";
 $a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account-Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern.";
 $a->strings["Registration successful."] = "Registrierung erfolgreich.";
 $a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
@@ -2234,6 +2170,7 @@ $a->strings["to"] = "zu";
 $a->strings["via"] = "via";
 $a->strings["Wall-to-Wall"] = "Wall-to-Wall";
 $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
+$a->strings["Reply to %s"] = "Antworte %s";
 $a->strings["Notifier task is pending"] = "Die Benachrichtigungsaufgabe ist ausstehend";
 $a->strings["Delivery to remote servers is pending"] = "Die Auslieferung an Remote-Server steht noch aus";
 $a->strings["Delivery to remote servers is underway"] = "Die Auslieferung an Remote-Server ist unterwegs";
@@ -2243,11 +2180,76 @@ $a->strings["%d comment"] = [
 	0 => "%d Kommentar",
 	1 => "%d Kommentare",
 ];
-$a->strings["Delete this item?"] = "Diesen Beitrag löschen?";
-$a->strings["show fewer"] = "weniger anzeigen";
-$a->strings["toggle mobile"] = "mobile Ansicht umschalten";
-$a->strings["No system theme config value set."] = "Es wurde kein Konfigurationswert für das systemweite Theme gesetzt.";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens, wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
-$a->strings["Legacy module file not found: %s"] = "Legacy-Moduldatei nicht gefunden: %s";
+$a->strings["Show more"] = "Zeige mehr";
+$a->strings["Show fewer"] = "Zeige weniger";
+$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
+$a->strings["Attachments:"] = "Anhänge:";
+$a->strings["%s is now following %s."] = "%s folgt nun %s";
+$a->strings["following"] = "folgen";
+$a->strings["%s stopped following %s."] = "%s hat aufgehört %s, zu folgen";
+$a->strings["stopped following"] = "wird nicht mehr gefolgt";
+$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD oder MM-DD";
+$a->strings["never"] = "nie";
+$a->strings["less than a second ago"] = "vor weniger als einer Sekunde";
+$a->strings["year"] = "Jahr";
+$a->strings["years"] = "Jahre";
+$a->strings["months"] = "Monate";
+$a->strings["weeks"] = "Wochen";
+$a->strings["days"] = "Tage";
+$a->strings["hour"] = "Stunde";
+$a->strings["hours"] = "Stunden";
+$a->strings["minute"] = "Minute";
+$a->strings["minutes"] = "Minuten";
+$a->strings["second"] = "Sekunde";
+$a->strings["seconds"] = "Sekunden";
+$a->strings["in %1\$d %2\$s"] = "in %1\$d %2\$s";
+$a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s";
+$a->strings["(no subject)"] = "(kein Betreff)";
 $a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Aktualisiere die author-id und owner-id in der Thread Tabelle";
 $a->strings["%s: Updating post-type."] = "%s: Aktualisiere Beitrags-Typ";
+$a->strings["greenzero"] = "greenzero";
+$a->strings["purplezero"] = "purplezero";
+$a->strings["easterbunny"] = "easterbunny";
+$a->strings["darkzero"] = "darkzero";
+$a->strings["comix"] = "comix";
+$a->strings["slackr"] = "slackr";
+$a->strings["Variations"] = "Variationen";
+$a->strings["Custom"] = "Benutzerdefiniert";
+$a->strings["Note"] = "Hinweis";
+$a->strings["Check image permissions if all users are allowed to see the image"] = "Überprüfe, dass alle Benutzer die Berechtigung haben dieses Bild anzusehen";
+$a->strings["Select color scheme"] = "Farbschema auswählen";
+$a->strings["Navigation bar background color"] = "Hintergrundfarbe der Navigationsleiste";
+$a->strings["Navigation bar icon color "] = "Icon Farbe in der Navigationsleiste";
+$a->strings["Link color"] = "Linkfarbe";
+$a->strings["Set the background color"] = "Hintergrundfarbe festlegen";
+$a->strings["Content background opacity"] = "Opazität des Hintergrunds von Beiträgen";
+$a->strings["Set the background image"] = "Hintergrundbild festlegen";
+$a->strings["Background image style"] = "Stil des Hintergrundbildes";
+$a->strings["Login page background image"] = "Hintergrundbild der Login-Seite";
+$a->strings["Login page background color"] = "Hintergrundfarbe der Login-Seite";
+$a->strings["Leave background image and color empty for theme defaults"] = "Wenn die Theme-Vorgaben verwendet werden sollen, lass bitte die Felder für die Hintergrundfarbe und das Hintergrundbild leer.";
+$a->strings["Top Banner"] = "Top Banner";
+$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Skaliere das Hintergrundbild so, dass es die Breite der Seite einnimmt, und fülle den Rest der Seite mit der Hintergrundfarbe bei langen Seiten.";
+$a->strings["Full screen"] = "Vollbildmodus";
+$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Skaliere das Bild so, dass es den gesamten Bildschirm füllt. Hierfür wird entweder die Breite oder die Höhe des Bildes automatisch abgeschnitten.";
+$a->strings["Single row mosaic"] = "Mosaik in einer Zeile";
+$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Skaliere das Bild so, dass es in einer einzelnen Reihe, entweder horizontal oder vertikal, wiederholt wird.";
+$a->strings["Mosaic"] = "Mosaik";
+$a->strings["Repeat image to fill the screen."] = "Wiederhole das Bild, um den Bildschirm zu füllen.";
+$a->strings["Guest"] = "Gast";
+$a->strings["Visitor"] = "Besucher";
+$a->strings["Alignment"] = "Ausrichtung";
+$a->strings["Left"] = "Links";
+$a->strings["Center"] = "Mitte";
+$a->strings["Color scheme"] = "Farbschema";
+$a->strings["Posts font size"] = "Schriftgröße in Beiträgen";
+$a->strings["Textareas font size"] = "Schriftgröße in Eingabefeldern";
+$a->strings["Comma separated list of helper forums"] = "Komma-separierte Liste der Helfer-Foren";
+$a->strings["Set style"] = "Stil auswählen";
+$a->strings["Community Pages"] = "Foren";
+$a->strings["Community Profiles"] = "Community-Profile";
+$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
+$a->strings["Connect Services"] = "Verbinde Dienste";
+$a->strings["Find Friends"] = "Kontakte finden";
+$a->strings["Last users"] = "Letzte Nutzer";
+$a->strings["Quick Start"] = "Schnell-Start";

From 4facd1dfdba93ede48ca40b5e146424e6701118b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 19 Feb 2019 07:49:27 +0000
Subject: [PATCH 060/145] Avoid memory issue in exception

---
 src/Util/JsonLD.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 8cc9f274d..ec68375d6 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -68,7 +68,7 @@ class JsonLD
 		}
 		catch (Exception $e) {
 			$normalized = false;
-			Logger::log('normalise error:' . print_r($e, true), Logger::DEBUG);
+			Logger::log('normalise error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG);
 		}
 
 		return $normalized;
@@ -115,7 +115,7 @@ class JsonLD
 		}
 		catch (Exception $e) {
 			$compacted = false;
-			Logger::log('compacting error:' . print_r($e, true), Logger::DEBUG);
+			Logger::log('compacting error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG);
 		}
 
 		$json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);

From ae8125fbf720083186597c2d5e97cec5d2ac9eac Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Wed, 20 Feb 2019 08:14:32 -0500
Subject: [PATCH 061/145] Welcome 2019.03-rc

---
 VERSION  | 2 +-
 boot.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 2b5b640bc..f546d9acb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2019.03-dev
+2019.03-rc
diff --git a/boot.php b/boot.php
index 1f503c908..14c0a88ed 100644
--- a/boot.php
+++ b/boot.php
@@ -30,7 +30,7 @@ use Friendica\Util\DateTimeFormat;
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '2019.03-dev');
+define('FRIENDICA_VERSION',      '2019.03-rc');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 

From 5b18bcc12be6d8151d9c3b7c25ead3579e9ba35e Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 20 Feb 2019 14:45:16 +0100
Subject: [PATCH 062/145] update FR translations THX hypolite

---
 view/lang/fr/messages.po | 3247 +++++++++++++++++++-------------------
 view/lang/fr/strings.php |  824 +++++-----
 2 files changed, 2041 insertions(+), 2030 deletions(-)

diff --git a/view/lang/fr/messages.po b/view/lang/fr/messages.po
index f433d12a2..a24816fe3 100644
--- a/view/lang/fr/messages.po
+++ b/view/lang/fr/messages.po
@@ -28,8 +28,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-10 08:14+0100\n"
-"PO-Revision-Date: 2019-02-15 20:23+0000\n"
+"POT-Creation-Date: 2019-02-15 09:33-0500\n"
+"PO-Revision-Date: 2019-02-20 05:05+0000\n"
 "Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -42,8 +42,8 @@ msgstr ""
 #, php-format
 msgid "Daily posting limit of %d post reached. The post was rejected."
 msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
-msgstr[0] "Limite quotidienne de publications de%d atteinte. La publication a été rejetée."
-msgstr[1] "Limite quotidienne de %dpublications atteinte.  La publication a été rejetée."
+msgstr[0] "Limite quotidienne d'%d publication atteinte. La publication a été rejetée."
+msgstr[1] "Limite quotidienne de %d publications atteinte.  La publication a été rejetée."
 
 #: include/api.php:1193
 #, php-format
@@ -62,13 +62,13 @@ msgstr "La limite mensuelle de%d publication est atteinte. Votre publication a 
 #: mod/photos.php:695 mod/photos.php:1126 mod/photos.php:1143
 #: mod/photos.php:1636 mod/profile_photo.php:85 mod/profile_photo.php:94
 #: mod/profile_photo.php:103 mod/profile_photo.php:217
-#: mod/profile_photo.php:305 mod/profile_photo.php:315 src/Model/User.php:735
-#: src/Model/User.php:743 src/Model/User.php:751
+#: mod/profile_photo.php:305 mod/profile_photo.php:315 src/Model/User.php:736
+#: src/Model/User.php:744 src/Model/User.php:752
 msgid "Profile Photos"
 msgstr "Photos du profil"
 
 #: include/conversation.php:160 include/conversation.php:297
-#: src/Model/Item.php:3265
+#: src/Model/Item.php:3283
 msgid "event"
 msgstr "événement"
 
@@ -79,7 +79,7 @@ msgid "status"
 msgstr "le statut"
 
 #: include/conversation.php:168 include/conversation.php:305
-#: mod/subthread.php:88 mod/tagger.php:70 src/Model/Item.php:3267
+#: mod/subthread.php:88 mod/tagger.php:70 src/Model/Item.php:3285
 msgid "photo"
 msgstr "photo"
 
@@ -140,7 +140,7 @@ msgstr "Derniers \"J'aime\""
 msgid "Dislikes"
 msgstr "Derniers \"Je n'aime pas\""
 
-#: include/conversation.php:569 include/conversation.php:1506
+#: include/conversation.php:569 include/conversation.php:1505
 #: mod/photos.php:1468
 msgid "Attending"
 msgid_plural "Attending"
@@ -187,9 +187,9 @@ msgstr "%s de %s"
 msgid "View in context"
 msgstr "Voir dans le contexte"
 
-#: include/conversation.php:721 include/conversation.php:1172
+#: include/conversation.php:721 include/conversation.php:1171
 #: mod/editpost.php:88 mod/message.php:260 mod/message.php:442
-#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:420
+#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:421
 msgid "Please wait"
 msgstr "Patientez"
 
@@ -205,43 +205,43 @@ msgstr "Supprimer les éléments sélectionnés"
 msgid "Follow Thread"
 msgstr "Suivre le fil"
 
-#: include/conversation.php:894 src/Model/Contact.php:1032
+#: include/conversation.php:894 src/Model/Contact.php:1049
 msgid "View Status"
 msgstr "Voir les statuts"
 
 #: include/conversation.php:895 include/conversation.php:911
 #: mod/allfriends.php:72 mod/directory.php:167 mod/dirfind.php:226
-#: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:972
-#: src/Model/Contact.php:1025 src/Model/Contact.php:1033
+#: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:989
+#: src/Model/Contact.php:1042 src/Model/Contact.php:1050
 msgid "View Profile"
 msgstr "Voir le profil"
 
-#: include/conversation.php:896 src/Model/Contact.php:1034
+#: include/conversation.php:896 src/Model/Contact.php:1051
 msgid "View Photos"
 msgstr "Voir les photos"
 
-#: include/conversation.php:897 src/Model/Contact.php:1026
-#: src/Model/Contact.php:1035
+#: include/conversation.php:897 src/Model/Contact.php:1043
+#: src/Model/Contact.php:1052
 msgid "Network Posts"
 msgstr "Publications du réseau"
 
-#: include/conversation.php:898 src/Model/Contact.php:1027
-#: src/Model/Contact.php:1036
+#: include/conversation.php:898 src/Model/Contact.php:1044
+#: src/Model/Contact.php:1053
 msgid "View Contact"
 msgstr "Voir Contact"
 
-#: include/conversation.php:899 src/Model/Contact.php:1038
+#: include/conversation.php:899 src/Model/Contact.php:1055
 msgid "Send PM"
 msgstr "Message privé"
 
-#: include/conversation.php:903 src/Model/Contact.php:1039
+#: include/conversation.php:903 src/Model/Contact.php:1056
 msgid "Poke"
 msgstr "Sollicitations (pokes)"
 
 #: include/conversation.php:908 mod/allfriends.php:73 mod/dirfind.php:227
 #: mod/follow.php:147 mod/match.php:88 mod/suggest.php:88
-#: view/theme/vier/theme.php:201 src/Content/Widget.php:63
-#: src/Model/Contact.php:1028 src/Module/Contact.php:574
+#: src/Content/Widget.php:63 src/Model/Contact.php:1045
+#: src/Module/Contact.php:574 view/theme/vier/theme.php:201
 msgid "Connect/Follow"
 msgstr "Se connecter/Suivre"
 
@@ -329,130 +329,130 @@ msgstr "<span  %1$s>%2$d personnes</span> vont peut-être participer"
 msgid "%s attend maybe."
 msgstr "%sparticipent peut-être"
 
-#: include/conversation.php:1111
+#: include/conversation.php:1110
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Visible par <strong>tout le monde</strong>"
 
-#: include/conversation.php:1112 src/Object/Post.php:882
+#: include/conversation.php:1111 src/Object/Post.php:883
 msgid "Please enter a image/video/audio/webpage URL:"
 msgstr "Veuillez entrer une URL d'image/vidéo/page web."
 
-#: include/conversation.php:1113
+#: include/conversation.php:1112
 msgid "Tag term:"
 msgstr "Étiquette :"
 
-#: include/conversation.php:1114 mod/filer.php:35
+#: include/conversation.php:1113 mod/filer.php:35
 msgid "Save to Folder:"
 msgstr "Sauver dans le Dossier :"
 
-#: include/conversation.php:1115
+#: include/conversation.php:1114
 msgid "Where are you right now?"
 msgstr "Où êtes-vous actuellement ?"
 
-#: include/conversation.php:1116
+#: include/conversation.php:1115
 msgid "Delete item(s)?"
 msgstr "Supprimer les élément(s) ?"
 
-#: include/conversation.php:1148
+#: include/conversation.php:1147
 msgid "New Post"
 msgstr "Nouvelle publication"
 
-#: include/conversation.php:1151
+#: include/conversation.php:1150
 msgid "Share"
 msgstr "Partager"
 
-#: include/conversation.php:1152 mod/editpost.php:74 mod/message.php:258
+#: include/conversation.php:1151 mod/editpost.php:74 mod/message.php:258
 #: mod/message.php:439 mod/wallmessage.php:139
 msgid "Upload photo"
 msgstr "Joindre photo"
 
-#: include/conversation.php:1153 mod/editpost.php:75
+#: include/conversation.php:1152 mod/editpost.php:75
 msgid "upload photo"
 msgstr "envoi image"
 
-#: include/conversation.php:1154 mod/editpost.php:76
+#: include/conversation.php:1153 mod/editpost.php:76
 msgid "Attach file"
 msgstr "Joindre fichier"
 
-#: include/conversation.php:1155 mod/editpost.php:77
+#: include/conversation.php:1154 mod/editpost.php:77
 msgid "attach file"
 msgstr "ajout fichier"
 
-#: include/conversation.php:1156 src/Object/Post.php:874
+#: include/conversation.php:1155 src/Object/Post.php:875
 msgid "Bold"
 msgstr "Gras"
 
-#: include/conversation.php:1157 src/Object/Post.php:875
+#: include/conversation.php:1156 src/Object/Post.php:876
 msgid "Italic"
 msgstr "Italique"
 
-#: include/conversation.php:1158 src/Object/Post.php:876
+#: include/conversation.php:1157 src/Object/Post.php:877
 msgid "Underline"
 msgstr "Souligné"
 
-#: include/conversation.php:1159 src/Object/Post.php:877
+#: include/conversation.php:1158 src/Object/Post.php:878
 msgid "Quote"
 msgstr "Citation"
 
-#: include/conversation.php:1160 src/Object/Post.php:878
+#: include/conversation.php:1159 src/Object/Post.php:879
 msgid "Code"
 msgstr "Code"
 
-#: include/conversation.php:1161 src/Object/Post.php:879
+#: include/conversation.php:1160 src/Object/Post.php:880
 msgid "Image"
 msgstr "Image"
 
-#: include/conversation.php:1162 src/Object/Post.php:880
+#: include/conversation.php:1161 src/Object/Post.php:881
 msgid "Link"
 msgstr "Lien"
 
-#: include/conversation.php:1163 src/Object/Post.php:881
+#: include/conversation.php:1162 src/Object/Post.php:882
 msgid "Link or Media"
 msgstr "Lien ou média"
 
-#: include/conversation.php:1164 mod/editpost.php:84
+#: include/conversation.php:1163 mod/editpost.php:84
 msgid "Set your location"
 msgstr "Définir votre localisation"
 
-#: include/conversation.php:1165 mod/editpost.php:85
+#: include/conversation.php:1164 mod/editpost.php:85
 msgid "set location"
 msgstr "spéc. localisation"
 
-#: include/conversation.php:1166 mod/editpost.php:86
+#: include/conversation.php:1165 mod/editpost.php:86
 msgid "Clear browser location"
 msgstr "Effacer la localisation du navigateur"
 
-#: include/conversation.php:1167 mod/editpost.php:87
+#: include/conversation.php:1166 mod/editpost.php:87
 msgid "clear location"
 msgstr "supp. localisation"
 
-#: include/conversation.php:1169 mod/editpost.php:102
+#: include/conversation.php:1168 mod/editpost.php:102
 msgid "Set title"
 msgstr "Définir un titre"
 
-#: include/conversation.php:1171 mod/editpost.php:104
+#: include/conversation.php:1170 mod/editpost.php:104
 msgid "Categories (comma-separated list)"
 msgstr "Catégories (séparées par des virgules)"
 
-#: include/conversation.php:1173 mod/editpost.php:89
+#: include/conversation.php:1172 mod/editpost.php:89
 msgid "Permission settings"
 msgstr "Réglages des permissions"
 
-#: include/conversation.php:1174 mod/editpost.php:119
+#: include/conversation.php:1173 mod/editpost.php:119
 msgid "permissions"
 msgstr "permissions"
 
-#: include/conversation.php:1183 mod/editpost.php:99
+#: include/conversation.php:1182 mod/editpost.php:99
 msgid "Public post"
 msgstr "Publication publique"
 
-#: include/conversation.php:1187 mod/editpost.php:110 mod/events.php:551
+#: include/conversation.php:1186 mod/editpost.php:110 mod/events.php:551
 #: mod/photos.php:1458 mod/photos.php:1497 mod/photos.php:1557
-#: src/Object/Post.php:883
+#: src/Object/Post.php:884
 msgid "Preview"
 msgstr "Aperçu"
 
-#: include/conversation.php:1191 include/items.php:396
+#: include/conversation.php:1190 include/items.php:396
 #: mod/dfrn_request.php:650 mod/editpost.php:113 mod/fbrowser.php:104
 #: mod/fbrowser.php:134 mod/follow.php:161 mod/message.php:153
 #: mod/photos.php:257 mod/photos.php:325 mod/settings.php:666
@@ -461,50 +461,50 @@ msgstr "Aperçu"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: include/conversation.php:1196
+#: include/conversation.php:1195
 msgid "Post to Groups"
 msgstr "Publier aux groupes"
 
-#: include/conversation.php:1197
+#: include/conversation.php:1196
 msgid "Post to Contacts"
 msgstr "Publier aux contacts"
 
-#: include/conversation.php:1198
+#: include/conversation.php:1197
 msgid "Private post"
 msgstr "Message privé"
 
-#: include/conversation.php:1203 mod/editpost.php:117
+#: include/conversation.php:1202 mod/editpost.php:117
 #: src/Model/Profile.php:370
 msgid "Message"
 msgstr "Message"
 
-#: include/conversation.php:1204 mod/editpost.php:118
+#: include/conversation.php:1203 mod/editpost.php:118
 msgid "Browser"
 msgstr "Navigateur"
 
-#: include/conversation.php:1476
+#: include/conversation.php:1475
 msgid "View all"
 msgstr "Voir tout"
 
-#: include/conversation.php:1500
+#: include/conversation.php:1499
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Like"
 msgstr[1] "Likes"
 
-#: include/conversation.php:1503
+#: include/conversation.php:1502
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "Dislike"
 msgstr[1] "Dislikes"
 
-#: include/conversation.php:1509
+#: include/conversation.php:1508
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Ne participe pas"
 msgstr[1] "Ne participent pas"
 
-#: include/conversation.php:1512 src/Content/ContactSelector.php:167
+#: include/conversation.php:1511 src/Content/ContactSelector.php:167
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Indécis"
@@ -853,16 +853,17 @@ msgstr "Oui"
 #: mod/invite.php:111 mod/item.php:167 mod/manage.php:129 mod/message.php:56
 #: mod/message.php:101 mod/network.php:35 mod/nogroup.php:18 mod/notes.php:27
 #: mod/notifications.php:70 mod/ostatus_subscribe.php:18 mod/photos.php:186
-#: mod/photos.php:1020 mod/poke.php:141 mod/profile_photo.php:32
-#: mod/profile_photo.php:177 mod/profile_photo.php:204 mod/profiles.php:182
-#: mod/profiles.php:499 mod/regmod.php:89 mod/repair_ostatus.php:16
+#: mod/photos.php:1020 mod/poke.php:141 mod/profiles.php:182
+#: mod/profiles.php:499 mod/profile_photo.php:32 mod/profile_photo.php:177
+#: mod/profile_photo.php:204 mod/regmod.php:89 mod/repair_ostatus.php:16
 #: mod/settings.php:48 mod/settings.php:154 mod/settings.php:655
 #: mod/suggest.php:62 mod/uimport.php:17 mod/unfollow.php:22
 #: mod/unfollow.php:77 mod/unfollow.php:109 mod/viewcontacts.php:56
-#: mod/wall_attach.php:76 mod/wall_attach.php:79 mod/wall_upload.php:107
-#: mod/wall_upload.php:110 mod/wallmessage.php:19 mod/wallmessage.php:43
-#: mod/wallmessage.php:82 mod/wallmessage.php:106 src/Module/Attach.php:42
-#: src/Module/Contact.php:360 src/Module/Register.php:193 src/App.php:1482
+#: mod/wallmessage.php:19 mod/wallmessage.php:43 mod/wallmessage.php:82
+#: mod/wallmessage.php:106 mod/wall_attach.php:76 mod/wall_attach.php:79
+#: mod/wall_upload.php:107 mod/wall_upload.php:110 src/App.php:1480
+#: src/Module/Attach.php:42 src/Module/Contact.php:360
+#: src/Module/Register.php:193
 msgid "Permission denied."
 msgstr "Permission refusée."
 
@@ -870,28 +871,11 @@ msgstr "Permission refusée."
 msgid "Archives"
 msgstr "Archives"
 
-#: include/items.php:520 view/theme/vier/theme.php:255
-#: src/Content/ForumManager.php:135 src/Content/Widget.php:329
-#: src/Object/Post.php:458 src/App.php:666
+#: include/items.php:520 src/Content/ForumManager.php:135
+#: src/Content/Widget.php:329 view/theme/vier/theme.php:255
 msgid "show more"
 msgstr "montrer plus"
 
-#: mod/apps.php:15 src/App.php:1351
-msgid "You must be logged in to use addons. "
-msgstr "Vous devez être connecté pour utiliser les greffons."
-
-#: mod/apps.php:20
-msgid "Applications"
-msgstr "Applications"
-
-#: mod/apps.php:25
-msgid "No installed applications."
-msgstr "Pas d'application installée."
-
-#: mod/maintenance.php:26
-msgid "System down for maintenance"
-msgstr "Système indisponible pour cause de maintenance"
-
 #: mod/admin.php:122
 msgid "Theme settings updated."
 msgstr "Réglages du thème sauvés."
@@ -1059,7 +1043,7 @@ msgid "Save Settings"
 msgstr "Sauvegarder les paramètres"
 
 #: mod/admin.php:386 mod/admin.php:404 mod/dfrn_request.php:346
-#: mod/friendica.php:131 src/Model/Contact.php:1702
+#: mod/friendica.php:131 src/Model/Contact.php:1719
 msgid "Blocked domain"
 msgstr "Domaine bloqué"
 
@@ -1300,8 +1284,8 @@ msgstr "Nom du destinataire"
 msgid "Recipient Profile"
 msgstr "Profil du destinataire"
 
-#: mod/admin.php:828 view/theme/frio/theme.php:269
-#: src/Core/NotificationsManager.php:182 src/Content/Nav.php:239
+#: mod/admin.php:828 src/Content/Nav.php:239
+#: src/Core/NotificationsManager.php:182 view/theme/frio/theme.php:269
 msgid "Network"
 msgstr "Réseau"
 
@@ -2005,14 +1989,14 @@ msgstr "Désactive le support natif d'OStatus (StatusNet, GNU Social, etc...). T
 
 #: mod/admin.php:1642
 msgid "Only import OStatus/ActivityPub threads from our contacts"
-msgstr ""
+msgstr "Importer seulement les conversations OStatus/ActivityPub provenant de profils distants connus."
 
 #: mod/admin.php:1642
 msgid ""
 "Normally we import every content from our OStatus and ActivityPub contacts. "
 "With this option we only store threads that are started by a contact that is"
 " known on our system."
-msgstr ""
+msgstr "Normalement toutes les conversations auxquelles les contacts suivis participent sont importées en entier peu importe l'auteur original. Avec cette option, seules les conversations démarrées par un contact suivi sont importées."
 
 #: mod/admin.php:1643
 msgid "OStatus support can only be enabled if threading is enabled."
@@ -2088,13 +2072,13 @@ msgstr "Limite de charge système pour le rendu des pages - défaut 50."
 
 #: mod/admin.php:1654
 msgid "Minimal Memory"
-msgstr ""
+msgstr "Mémoire minimum"
 
 #: mod/admin.php:1654
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
-msgstr ""
+msgstr "Mémoire libre minimale pour les tâches de fond (en Mo). Requiert l'accès à <code>/proc/meminfo</code>. La valeur par défaut est 0 (désactivé)."
 
 #: mod/admin.php:1655
 msgid "Maximum table size for optimization"
@@ -2104,7 +2088,7 @@ msgstr "Limite de taille de table pour l'optimisation"
 msgid ""
 "Maximum table size (in MB) for the automatic optimization. Enter -1 to "
 "disable it."
-msgstr ""
+msgstr "Limite de taille de table (en Mo) pour l'optimisation automatique. -1 pour désactiver cette limite."
 
 #: mod/admin.php:1656
 msgid "Minimum level of fragmentation"
@@ -2146,7 +2130,7 @@ msgid ""
 "and older friendica servers, where global contacts weren't available. The "
 "fallback increases the server load, so the recommended setting is 'Users, "
 "Global Contacts'."
-msgstr ""
+msgstr "Demande régulièrement les serveurs distants connus une liste de profils distants. \"Utilisateurs\" concerne les utilisateurs locaux du serveur distant, \"Contacts Globaux\" concerne tous les profils dont le serveur distant a connaissance. \"Alternative\" est prévu pour les serveurs RedMatrix et les versions obsolètes de Friendica. Ce choix augmente significativement la charge serveur, donc le choix recommendé est \"Utilisateurs, Contacts Globaux\"."
 
 #: mod/admin.php:1661
 msgid "Timeframe for fetching global contacts"
@@ -2201,28 +2185,28 @@ msgstr "Ne pas afficher la liste des hashtags à la fin d’un message."
 
 #: mod/admin.php:1668
 msgid "Clean database"
-msgstr ""
+msgstr "Nettoyer la base de données"
 
 #: mod/admin.php:1668
 msgid ""
 "Remove old remote items, orphaned database records and old content from some"
 " other helper tables."
-msgstr ""
+msgstr "Supprime les conversations distantes anciennes, les enregistrements orphelins et le contenu obsolète de certaines tables de débogage."
 
 #: mod/admin.php:1669
 msgid "Lifespan of remote items"
-msgstr ""
+msgstr "Durée de vie des conversations distantes"
 
 #: mod/admin.php:1669
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "remote items will be deleted. Own items, and marked or filed items are "
 "always kept. 0 disables this behaviour."
-msgstr ""
+msgstr "Si le nettoyage de la base de donnée est actif, cette valeur représente le délai en jours après lequel les conversations distantes sont supprimées. Les conversations démarrées par un utilisateur local, étoilées ou archivées sont toujours conservées. 0 pour désactiver."
 
 #: mod/admin.php:1670
 msgid "Lifespan of unclaimed items"
-msgstr ""
+msgstr "Durée de vie des conversations relayées"
 
 #: mod/admin.php:1670
 msgid ""
@@ -2230,18 +2214,18 @@ msgid ""
 "unclaimed remote items (mostly content from the relay) will be deleted. "
 "Default value is 90 days. Defaults to the general lifespan value of remote "
 "items if set to 0."
-msgstr ""
+msgstr "Si le nettoyage de la base de donnée est actif, cette valeur représente le délai en jours après lequel les conversations relayées qui n'ont pas reçu d'interactions locales sont supprimées. La valeur par défaut est 90 jours. 0 pour aligner cette valeur sur la durée de vie des conversations distantes."
 
 #: mod/admin.php:1671
 msgid "Lifespan of raw conversation data"
-msgstr ""
+msgstr "Durée de vie des méta-données de conversation"
 
 #: mod/admin.php:1671
 msgid ""
 "The conversation data is used for ActivityPub and OStatus, as well as for "
 "debug purposes. It should be safe to remove it after 14 days, default is 90 "
 "days."
-msgstr ""
+msgstr "Cette valeur représente le délai en jours après lequel les méta-données de conversations sont supprimées. Ces méta-données sont utilisées par les protocoles ActivityPub et OStatus, et pour le débogage. Il est prudent de conserver ces meta-données pendant au moins 14 jours. La valeur par défaut est 90 jours."
 
 #: mod/admin.php:1672
 msgid "Path to item cache"
@@ -2249,7 +2233,7 @@ msgstr "Chemin vers le cache des objets."
 
 #: mod/admin.php:1672
 msgid "The item caches buffers generated bbcode and external images."
-msgstr ""
+msgstr "Le cache de publications contient des textes HTML de BBCode compil's et une copie de chaque image distante."
 
 #: mod/admin.php:1673
 msgid "Cache duration in seconds"
@@ -2298,7 +2282,7 @@ msgstr "Désactiver le proxy image "
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
 " systems with very low bandwidth."
-msgstr ""
+msgstr "Le proxy d'image améliore les performances d'affichage et protège la vie privée des utilisateurs locaux. Il n'est pas recommandé de l'activer sur un serveur avec une bande passante limitée."
 
 #: mod/admin.php:1678
 msgid "Only search in tags"
@@ -2316,7 +2300,7 @@ msgstr "Nouvelle URL de base"
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and"
 " Diaspora* contacts of all users."
-msgstr ""
+msgstr "Changer l'URL de base de ce serveur. Envoie un message de déménagement à tous les contacts Friendica et Diaspora des utilisateurs locaux."
 
 #: mod/admin.php:1682
 msgid "RINO Encryption"
@@ -2328,7 +2312,7 @@ msgstr "Couche de chiffrement entre les nœuds du réseau."
 
 #: mod/admin.php:1682
 msgid "Enabled"
-msgstr ""
+msgstr "Activé"
 
 #: mod/admin.php:1684
 msgid "Maximum number of parallel workers"
@@ -2339,7 +2323,7 @@ msgstr "Nombre maximum de processus simultanés"
 msgid ""
 "On shared hosters set this to %d. On larger systems, values of %d are great."
 " Default value is %d."
-msgstr ""
+msgstr "Sur un hébergement partagé, mettez %d. Sur des serveurs plus puissants, %d est optimal. La valeur par défaut est %d."
 
 #: mod/admin.php:1685
 msgid "Don't use 'proc_open' with the worker"
@@ -2354,17 +2338,17 @@ msgstr "Activez cette option si votre système ne permet pas d'utiliser 'proc_op
 
 #: mod/admin.php:1686
 msgid "Enable fastlane"
-msgstr ""
+msgstr "Activer la file prioritaire"
 
 #: mod/admin.php:1686
 msgid ""
 "When enabed, the fastlane mechanism starts an additional worker if processes"
 " with higher priority are blocked by processes of lower priority."
-msgstr ""
+msgstr "La file prioritaire est un ouvrier additionel démarré quand des tâches de fondde grande importance sont bloquées par des tâches de moindre importance dans la file d'attente."
 
 #: mod/admin.php:1687
 msgid "Enable frontend worker"
-msgstr ""
+msgstr "Activer l'ouvrier manuel"
 
 #: mod/admin.php:1687
 #, php-format
@@ -2374,77 +2358,77 @@ msgid ""
 "might want to call %s/worker on a regular basis via an external cron job. "
 "You should only enable this option if you cannot utilize cron/scheduled jobs"
 " on your server."
-msgstr ""
+msgstr "L'ouvrier manuel est lancé à la réception de messages distants. Sur un petit serveur il est conseillé d'ouvrir %s/worker régulièrement via une tâche planifée. Vous ne devriez activer cette option que si vous ne pouvez pas définir de tâches récurrentes sur votre serveur,"
 
 #: mod/admin.php:1689
 msgid "Subscribe to relay"
-msgstr ""
+msgstr "S'abonner au relai"
 
 #: mod/admin.php:1689
 msgid ""
 "Enables the receiving of public posts from the relay. They will be included "
 "in the search, subscribed tags and on the global community page."
-msgstr ""
+msgstr "Active la réception de conversations publiques relayées. Elles sont affichées dans la page de recherche, les recherches enregistrées et dans la page de communauté globale."
 
 #: mod/admin.php:1690
 msgid "Relay server"
-msgstr ""
+msgstr "Serveur relai"
 
 #: mod/admin.php:1690
 msgid ""
 "Address of the relay server where public posts should be send to. For "
 "example https://relay.diasp.org"
-msgstr ""
+msgstr "URL du serveur relai auquel les conversations publique locales doivent être soumises."
 
 #: mod/admin.php:1691
 msgid "Direct relay transfer"
-msgstr ""
+msgstr "Relai direct"
 
 #: mod/admin.php:1691
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
-msgstr ""
+msgstr "Soumet les conversations publiques aux serveurs distants sans passer par le serveur relai."
 
 #: mod/admin.php:1692
 msgid "Relay scope"
-msgstr ""
+msgstr "Filtre du relai"
 
 #: mod/admin.php:1692
 msgid ""
 "Can be 'all' or 'tags'. 'all' means that every public post should be "
 "received. 'tags' means that only posts with selected tags should be "
 "received."
-msgstr ""
+msgstr "\"Tous\" signifie que toutes les conversations publiques en provenance du relai sont acceptées. \"Tags\" signifie que seules les conversations comportant les tags suivants sont acceptées."
 
 #: mod/admin.php:1692
 msgid "all"
-msgstr ""
+msgstr "Tous"
 
 #: mod/admin.php:1692
 msgid "tags"
-msgstr ""
+msgstr "Tags"
 
 #: mod/admin.php:1693
 msgid "Server tags"
-msgstr ""
+msgstr "Tags de filtre du relai"
 
 #: mod/admin.php:1693
 msgid "Comma separated list of tags for the 'tags' subscription."
-msgstr ""
+msgstr "Liste de tags séparés par des virgules pour le filtre de relai."
 
 #: mod/admin.php:1694
 msgid "Allow user tags"
-msgstr ""
+msgstr "Inclure les tags des utilisateurs"
 
 #: mod/admin.php:1694
 msgid ""
 "If enabled, the tags from the saved searches will used for the 'tags' "
 "subscription in addition to the 'relay_server_tags'."
-msgstr ""
+msgstr "Inclut les tags des recherches enregistrées des utilisateurs au filtre de relai."
 
 #: mod/admin.php:1697
 msgid "Start Relocation"
-msgstr ""
+msgstr "Démarrer le déménagement"
 
 #: mod/admin.php:1724
 msgid "Update has been marked successful"
@@ -2545,7 +2529,7 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: mod/admin.php:1871 src/Model/User.php:858
+#: mod/admin.php:1871 src/Model/User.php:859
 #, php-format
 msgid "Registration details for %s"
 msgstr "Détails d'inscription pour %s"
@@ -2559,7 +2543,7 @@ msgstr[1] "%s utilisateurs ont (dé)bloqué"
 
 #: mod/admin.php:1888 mod/admin.php:1942
 msgid "You can't remove yourself"
-msgstr ""
+msgstr "Vous ne pouvez pas supprimer votre propre compte"
 
 #: mod/admin.php:1891
 #, php-format
@@ -2601,7 +2585,7 @@ msgstr "Compte d' \"amitié automatique\""
 
 #: mod/admin.php:2003
 msgid "Private Forum"
-msgstr ""
+msgstr "Forum Privé"
 
 #: mod/admin.php:2006 mod/settings.php:1033
 msgid "Personal Page"
@@ -2609,7 +2593,7 @@ msgstr "Page personnelle"
 
 #: mod/admin.php:2007 mod/settings.php:1037
 msgid "Organisation Page"
-msgstr ""
+msgstr "Page Associative"
 
 #: mod/admin.php:2008 mod/settings.php:1041
 msgid "News Page"
@@ -2617,11 +2601,11 @@ msgstr "Page d'informations"
 
 #: mod/admin.php:2009 mod/settings.php:1045
 msgid "Community Forum"
-msgstr ""
+msgstr "Forum Communautaire"
 
 #: mod/admin.php:2010
 msgid "Relay"
-msgstr ""
+msgstr "Relai"
 
 #: mod/admin.php:2056 mod/admin.php:2067 mod/admin.php:2081 mod/admin.php:2099
 #: src/Content/ContactSelector.php:86
@@ -2642,7 +2626,7 @@ msgstr "Dernier élément"
 
 #: mod/admin.php:2056
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #: mod/admin.php:2063
 msgid "Add User"
@@ -2666,7 +2650,7 @@ msgstr "Pas d'inscriptions."
 
 #: mod/admin.php:2069
 msgid "Note from the user"
-msgstr ""
+msgstr "Message personnel"
 
 #: mod/admin.php:2070 mod/notifications.php:183 mod/notifications.php:269
 msgid "Approve"
@@ -2678,7 +2662,7 @@ msgstr "Rejetter"
 
 #: mod/admin.php:2074
 msgid "User blocked"
-msgstr ""
+msgstr "Utilisateur bloqué"
 
 #: mod/admin.php:2076
 msgid "Site admin"
@@ -2694,7 +2678,7 @@ msgstr "Nouvel utilisateur"
 
 #: mod/admin.php:2081
 msgid "Permanent deletion"
-msgstr ""
+msgstr "Suppression définitive"
 
 #: mod/admin.php:2086
 msgid ""
@@ -2727,12 +2711,12 @@ msgstr "Adresse mail du nouvel utilisateur."
 #: mod/admin.php:2141
 #, php-format
 msgid "Addon %s disabled."
-msgstr ""
+msgstr "Add-on %s désactivé."
 
 #: mod/admin.php:2144
 #, php-format
 msgid "Addon %s enabled."
-msgstr ""
+msgstr "Add-on %s activé."
 
 #: mod/admin.php:2155 mod/admin.php:2405
 msgid "Disable"
@@ -2747,7 +2731,7 @@ msgid "Toggle"
 msgstr "Activer/Désactiver"
 
 #: mod/admin.php:2181 mod/admin.php:2438 mod/newmember.php:20
-#: mod/settings.php:136 view/theme/frio/theme.php:272 src/Content/Nav.php:263
+#: mod/settings.php:136 src/Content/Nav.php:263 view/theme/frio/theme.php:272
 msgid "Settings"
 msgstr "Réglages"
 
@@ -2761,7 +2745,7 @@ msgstr "Mainteneur : "
 
 #: mod/admin.php:2241
 msgid "Reload active addons"
-msgstr ""
+msgstr "Recharger les add-ons activés."
 
 #: mod/admin.php:2246
 #, php-format
@@ -2769,7 +2753,7 @@ msgid ""
 "There are currently no addons available on your node. You can find the "
 "official addon repository at %1$s and might find other interesting addons in"
 " the open addon registry at %2$s"
-msgstr ""
+msgstr "Il n'y a pas d'add-on disponible sur votre serveur. Vous pouvez trouver le dépôt officiel d'add-ons sur %1$s et des add-ons non-officiel dans le répertoire d'add-ons ouvert sur %2$s."
 
 #: mod/admin.php:2367
 msgid "No themes found."
@@ -2786,7 +2770,7 @@ msgstr "Recharger les thèmes actifs"
 #: mod/admin.php:2487
 #, php-format
 msgid "No themes found on the system. They should be placed in %1$s"
-msgstr ""
+msgstr "Aucun thème trouvé. Leur emplacement d'installation est%1$s."
 
 #: mod/admin.php:2488
 msgid "[Experimental]"
@@ -2841,21 +2825,21 @@ msgid ""
 "the 'error_log' line is relative to the friendica top-level directory and "
 "must be writeable by the web server. The option '1' for 'log_errors' and "
 "'display_errors' is to enable these options, set to '0' to disable them."
-msgstr ""
+msgstr "Pour activer temporairement la journalisation de PHP vous pouvez insérez les lignes suivantes au début du fichier <code>index.php</code> dans votre répertoire Friendica. The nom de fichier défini dans la ligne <code>'error_log'</code> est relatif au répertoire d'installation de Friendica et le serveur web doit avoir le droit d'écriture sur ce fichier. Les lignes <code>log_errors</code> et <code>display_errors</code> prennent les valeurs <code>0</code>  et <code>1</code> respectivement pour les activer ou désactiver."
 
 #: mod/admin.php:2599
 #, php-format
 msgid ""
 "Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see "
 "if file %1$s exist and is readable."
-msgstr ""
+msgstr "Erreur lors de l'ouverture du fichier de journal <strong>%1$s</strong>.\\r\\n<br/>Veuillez vérifier que le fichier %1$s existe et que le serveur web a le droit de lecture dessus."
 
 #: mod/admin.php:2603
 #, php-format
 msgid ""
 "Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file"
 " %1$s is readable."
-msgstr ""
+msgstr "Erreur lors de l'ouverture du fichier de journal <strong>%1$s</strong>.\\r\\n<br/>Veuillez vérifier que le fichier %1$s existe et que le serveur web a le droit de lecture dessus."
 
 #: mod/admin.php:2696 mod/admin.php:2697 mod/settings.php:763
 msgid "Off"
@@ -2911,109 +2895,121 @@ msgstr "Voulez-vous autoriser cette application à accéder à vos publications
 msgid "No"
 msgstr "Non"
 
+#: mod/apps.php:15 src/App.php:1349
+msgid "You must be logged in to use addons. "
+msgstr "Vous devez être connecté pour utiliser les greffons."
+
+#: mod/apps.php:20
+msgid "Applications"
+msgstr "Applications"
+
+#: mod/apps.php:25
+msgid "No installed applications."
+msgstr "Pas d'application installée."
+
 #: mod/babel.php:25
 msgid "Source input"
-msgstr ""
+msgstr "Saisie source"
 
 #: mod/babel.php:31
 msgid "BBCode::toPlaintext"
-msgstr ""
+msgstr "BBCode::toPlaintext"
 
 #: mod/babel.php:37
 msgid "BBCode::convert (raw HTML)"
-msgstr ""
+msgstr "BBCode::convert (code HTML)"
 
 #: mod/babel.php:42
 msgid "BBCode::convert"
-msgstr ""
+msgstr "BBCode::convert"
 
 #: mod/babel.php:48
 msgid "BBCode::convert => HTML::toBBCode"
-msgstr ""
+msgstr "BBCode::convert => HTML::toBBCode"
 
 #: mod/babel.php:54
 msgid "BBCode::toMarkdown"
-msgstr ""
+msgstr "BBCode::toMarkdown"
 
 #: mod/babel.php:60
 msgid "BBCode::toMarkdown => Markdown::convert"
-msgstr ""
+msgstr "BBCode::toMarkdown => Markdown::convert"
 
 #: mod/babel.php:66
 msgid "BBCode::toMarkdown => Markdown::toBBCode"
-msgstr ""
+msgstr "BBCode::toMarkdown => Markdown::toBBCode"
 
 #: mod/babel.php:72
 msgid "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
-msgstr ""
+msgstr "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
 
 #: mod/babel.php:83
 msgid "Item Body"
-msgstr ""
+msgstr "Corps du message"
 
 #: mod/babel.php:87
 msgid "Item Tags"
-msgstr ""
+msgstr "Tags du messages"
 
 #: mod/babel.php:94
 msgid "Source input (Diaspora format)"
-msgstr ""
+msgstr "Saisie source (format Diaspora)"
 
 #: mod/babel.php:100
 msgid "Markdown::convert (raw HTML)"
-msgstr ""
+msgstr "Markdown::convert (code HTML)"
 
 #: mod/babel.php:105
 msgid "Markdown::convert"
-msgstr ""
+msgstr "Markdown::convert"
 
 #: mod/babel.php:111
 msgid "Markdown::toBBCode"
-msgstr ""
+msgstr "Markdown::toBBCode"
 
 #: mod/babel.php:118
 msgid "Raw HTML input"
-msgstr ""
+msgstr "Saisie code HTML"
 
 #: mod/babel.php:123
 msgid "HTML Input"
-msgstr ""
+msgstr "Code HTML"
 
 #: mod/babel.php:129
 msgid "HTML::toBBCode"
-msgstr ""
+msgstr "HTML::toBBCode"
 
 #: mod/babel.php:135
 msgid "HTML::toBBCode => BBCode::convert"
-msgstr ""
+msgstr "HTML::toBBCode => BBCode::convert"
 
 #: mod/babel.php:140
 msgid "HTML::toBBCode => BBCode::convert (raw HTML)"
-msgstr ""
+msgstr "HTML::toBBCode => BBCode::convert (code HTML)"
 
 #: mod/babel.php:146
 msgid "HTML::toMarkdown"
-msgstr ""
+msgstr "HTML::toMarkdown"
 
 #: mod/babel.php:152
 msgid "HTML::toPlaintext"
-msgstr ""
+msgstr "HTML::toPlaintext"
 
 #: mod/babel.php:160
 msgid "Source text"
-msgstr ""
+msgstr "Texte source"
 
 #: mod/babel.php:161
 msgid "BBCode"
-msgstr ""
+msgstr "BBCode"
 
 #: mod/babel.php:162
 msgid "Markdown"
-msgstr ""
+msgstr "Markdown"
 
 #: mod/babel.php:163
 msgid "HTML"
-msgstr ""
+msgstr "HTML"
 
 #: mod/bookmarklet.php:22 src/Content/Nav.php:170 src/Module/Login.php:322
 msgid "Login"
@@ -3021,7 +3017,7 @@ msgstr "Connexion"
 
 #: mod/bookmarklet.php:32
 msgid "Bad Request"
-msgstr ""
+msgstr "Requête erronée"
 
 #: mod/bookmarklet.php:54
 msgid "The post was created"
@@ -3033,7 +3029,7 @@ msgid "Access denied."
 msgstr "Accès refusé."
 
 #: mod/cal.php:46 mod/dfrn_poll.php:486 mod/help.php:68
-#: mod/viewcontacts.php:34 src/App.php:1402
+#: mod/viewcontacts.php:34 src/App.php:1400
 msgid "Page not found."
 msgstr "Page introuvable."
 
@@ -3041,9 +3037,9 @@ msgstr "Page introuvable."
 msgid "Access to this profile has been restricted."
 msgstr "L'accès au profil a été restreint."
 
-#: mod/cal.php:273 mod/events.php:384 view/theme/frio/theme.php:266
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:160
+#: mod/cal.php:273 mod/events.php:384 src/Content/Nav.php:160
 #: src/Content/Nav.php:226 src/Model/Profile.php:937 src/Model/Profile.php:948
+#: view/theme/frio/theme.php:266 view/theme/frio/theme.php:270
 msgid "Events"
 msgstr "Événements"
 
@@ -3059,30 +3055,30 @@ msgstr "Précédent"
 msgid "Next"
 msgstr "Suivant"
 
-#: mod/cal.php:279 mod/events.php:393 src/Model/Event.php:429
+#: mod/cal.php:279 mod/events.php:393 src/Model/Event.php:428
 msgid "today"
 msgstr "aujourd'hui"
 
-#: mod/cal.php:280 mod/events.php:394 src/Util/Temporal.php:314
-#: src/Model/Event.php:430
+#: mod/cal.php:280 mod/events.php:394 src/Model/Event.php:429
+#: src/Util/Temporal.php:314
 msgid "month"
 msgstr "mois"
 
-#: mod/cal.php:281 mod/events.php:395 src/Util/Temporal.php:315
-#: src/Model/Event.php:431
+#: mod/cal.php:281 mod/events.php:395 src/Model/Event.php:430
+#: src/Util/Temporal.php:315
 msgid "week"
 msgstr "semaine"
 
-#: mod/cal.php:282 mod/events.php:396 src/Util/Temporal.php:316
-#: src/Model/Event.php:432
+#: mod/cal.php:282 mod/events.php:396 src/Model/Event.php:431
+#: src/Util/Temporal.php:316
 msgid "day"
 msgstr "jour"
 
 #: mod/cal.php:283 mod/events.php:397
 msgid "list"
-msgstr ""
+msgstr "liste"
 
-#: mod/cal.php:296 src/Core/Console/NewPassword.php:67 src/Model/User.php:323
+#: mod/cal.php:296 src/Core/Console/NewPassword.php:67 src/Model/User.php:324
 msgid "User not found"
 msgstr "Utilisateur introuvable"
 
@@ -3115,7 +3111,7 @@ msgstr "Accès public refusé."
 
 #: mod/community.php:75
 msgid "Community option not available."
-msgstr ""
+msgstr "L'option communauté n'est pas disponible"
 
 #: mod/community.php:92
 msgid "Not available."
@@ -3123,19 +3119,19 @@ msgstr "Indisponible."
 
 #: mod/community.php:102
 msgid "Local Community"
-msgstr ""
+msgstr "Communauté locale"
 
 #: mod/community.php:105
 msgid "Posts from local users on this server"
-msgstr ""
+msgstr "Conversations publiques démarrées par des utilisateurs locaux"
 
 #: mod/community.php:113
 msgid "Global Community"
-msgstr ""
+msgstr "Communauté globale"
 
 #: mod/community.php:116
 msgid "Posts from users of the whole federated network"
-msgstr ""
+msgstr "Conversations publiques provenant du réseau fédéré global"
 
 #: mod/community.php:162 mod/search.php:229
 msgid "No results."
@@ -3145,7 +3141,7 @@ msgstr "Aucun résultat."
 msgid ""
 "This community stream shows all public posts received by this node. They may"
 " not reflect the opinions of this node’s users."
-msgstr ""
+msgstr "Ce fil communautaire liste toutes les conversations publiques reçues par ce serveur. Elles ne reflètent pas nécessairement les opinions personelles des utilisateurs locaux."
 
 #: mod/credits.php:19
 msgid "Credits"
@@ -3189,11 +3185,11 @@ msgstr "Pas de miroir"
 
 #: mod/crepair.php:130
 msgid "Mirror as forwarded posting"
-msgstr ""
+msgstr "Refléter les publications de ce profil comme des partages"
 
 #: mod/crepair.php:130 mod/crepair.php:132
 msgid "Mirror as my own posting"
-msgstr ""
+msgstr "Refléter les publications de ce profil comme les vôtres"
 
 #: mod/crepair.php:145
 msgid "Return to contact editor"
@@ -3208,11 +3204,10 @@ msgstr "Récupérer à nouveau les données de contact"
 #: mod/message.php:261 mod/message.php:441 mod/photos.php:1049
 #: mod/photos.php:1137 mod/photos.php:1412 mod/photos.php:1457
 #: mod/photos.php:1496 mod/photos.php:1556 mod/poke.php:188
-#: mod/profiles.php:562 view/theme/duepuntozero/config.php:72
-#: view/theme/frio/config.php:119 view/theme/quattro/config.php:74
-#: view/theme/vier/config.php:120 src/Module/Contact.php:594
-#: src/Module/Install.php:187 src/Module/Install.php:222
-#: src/Object/Post.php:873
+#: mod/profiles.php:562 src/Module/Contact.php:594 src/Module/Install.php:187
+#: src/Module/Install.php:222 src/Object/Post.php:874
+#: view/theme/duepuntozero/config.php:72 view/theme/frio/config.php:119
+#: view/theme/quattro/config.php:74 view/theme/vier/config.php:120
 msgid "Submit"
 msgstr "Envoyer"
 
@@ -3244,7 +3239,7 @@ msgstr "URL du compte"
 
 #: mod/crepair.php:163
 msgid "Account URL Alias"
-msgstr ""
+msgstr "Alias d'URL du compte"
 
 #: mod/crepair.php:164
 msgid "Friend Request URL"
@@ -3268,30 +3263,30 @@ msgstr "Nouvelle photo depuis cette URL"
 
 #: mod/delegate.php:42
 msgid "Parent user not found."
-msgstr ""
+msgstr "Compte parent inconnu."
 
 #: mod/delegate.php:149
 msgid "No parent user"
-msgstr ""
+msgstr "Pas d'utilisateur parent"
 
 #: mod/delegate.php:164
 msgid "Parent Password:"
-msgstr ""
+msgstr "Mot de passe du compte parent :"
 
 #: mod/delegate.php:164
 msgid ""
 "Please enter the password of the parent account to legitimize your request."
-msgstr ""
+msgstr "Veuillez saisir le mot de passe du compte parent pour authentifier votre requête."
 
 #: mod/delegate.php:171
 msgid "Parent User"
-msgstr ""
+msgstr "Compte parent"
 
 #: mod/delegate.php:174
 msgid ""
 "Parent users have total control about this account, including the account "
 "settings. Please double check whom you give this access."
-msgstr ""
+msgstr "Le compte parent a un contrôle total sur ce compte, incluant les paramètres de compte. Veuillez vérifier à qui vous donnez cet accès."
 
 #: mod/delegate.php:176 src/Content/Nav.php:261
 msgid "Delegate Page Management"
@@ -3404,7 +3399,7 @@ msgid "Unable to update your contact profile details on our system"
 msgstr "Impossible de mettre les détails de votre profil à jour sur notre système"
 
 #: mod/dfrn_confirm.php:612 mod/dfrn_request.php:560
-#: src/Model/Contact.php:2026
+#: src/Model/Contact.php:2043
 msgid "[Name Withheld]"
 msgstr "[Nom non-publié]"
 
@@ -3478,7 +3473,7 @@ msgstr "Il semblerait que vous soyez déjà ami avec %s."
 msgid "Invalid profile URL."
 msgstr "URL de profil invalide."
 
-#: mod/dfrn_request.php:340 src/Model/Contact.php:1697
+#: mod/dfrn_request.php:340 src/Model/Contact.php:1714
 msgid "Disallowed profile URL."
 msgstr "URL de profil interdite."
 
@@ -3566,11 +3561,11 @@ msgstr "Friendica"
 
 #: mod/dfrn_request.php:644
 msgid "GNU Social (Pleroma, Mastodon)"
-msgstr ""
+msgstr "GNU Social (Pleroma, Mastodon)"
 
 #: mod/dfrn_request.php:645
 msgid "Diaspora (Socialhome, Hubzilla)"
-msgstr ""
+msgstr "Diaspora (Socialhome, Hubzilla)"
 
 #: mod/dfrn_request.php:646
 #, php-format
@@ -3588,8 +3583,8 @@ msgid "Submit Request"
 msgstr "Envoyer la requête"
 
 #: mod/directory.php:154 mod/events.php:541 mod/notifications.php:253
-#: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:438
-#: src/Model/Event.php:934 src/Model/Profile.php:443
+#: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:437
+#: src/Model/Event.php:933 src/Model/Profile.php:443
 #: src/Module/Contact.php:643
 msgid "Location:"
 msgstr "Localisation :"
@@ -3612,8 +3607,8 @@ msgstr "Page personnelle :"
 msgid "About:"
 msgstr "À propos :"
 
-#: mod/directory.php:210 view/theme/vier/theme.php:208
-#: src/Content/Widget.php:70
+#: mod/directory.php:210 src/Content/Widget.php:70
+#: view/theme/vier/theme.php:208
 msgid "Global Directory"
 msgstr "Annuaire global"
 
@@ -3629,8 +3624,8 @@ msgstr "Résultats pour :"
 msgid "Site Directory"
 msgstr "Annuaire local"
 
-#: mod/directory.php:217 view/theme/vier/theme.php:203
-#: src/Content/Widget.php:65 src/Module/Contact.php:817
+#: mod/directory.php:217 src/Content/Widget.php:65 src/Module/Contact.php:817
+#: view/theme/vier/theme.php:203
 msgid "Find"
 msgstr "Trouver"
 
@@ -3767,8 +3762,8 @@ msgstr "La suppression de l'événement a échoué."
 msgid "Event removed"
 msgstr "Événement supprimé."
 
-#: mod/fbrowser.php:36 view/theme/frio/theme.php:264 src/Content/Nav.php:158
-#: src/Model/Profile.php:917
+#: mod/fbrowser.php:36 src/Content/Nav.php:158 src/Model/Profile.php:917
+#: view/theme/frio/theme.php:264
 msgid "Photos"
 msgstr "Photos"
 
@@ -3793,7 +3788,7 @@ msgstr ""
 
 #: mod/feedtest.php:45
 msgid "Source URL"
-msgstr ""
+msgstr "URL Source"
 
 #: mod/filer.php:35
 msgid "- select -"
@@ -3900,7 +3895,7 @@ msgstr "Groupe introuvable."
 msgid "Group name changed."
 msgstr "Groupe renommé."
 
-#: mod/group.php:85 mod/profperm.php:30 src/App.php:1481
+#: mod/group.php:85 mod/profperm.php:30 src/App.php:1479
 msgid "Permission denied"
 msgstr "Permission refusée"
 
@@ -3910,7 +3905,7 @@ msgstr "Sauvegarder le groupe"
 
 #: mod/group.php:104
 msgid "Filter"
-msgstr ""
+msgstr "Filtre"
 
 #: mod/group.php:109
 msgid "Create a group of contacts/friends."
@@ -3973,11 +3968,11 @@ msgstr "Aucun profil"
 msgid "Help:"
 msgstr "Aide :"
 
-#: mod/help.php:59 view/theme/vier/theme.php:294 src/Content/Nav.php:190
+#: mod/help.php:59 src/Content/Nav.php:190 view/theme/vier/theme.php:294
 msgid "Help"
 msgstr "Aide"
 
-#: mod/help.php:65 src/App.php:1399
+#: mod/help.php:65 src/App.php:1397
 msgid "Not Found"
 msgstr "Non trouvé"
 
@@ -4126,7 +4121,7 @@ msgstr "Merci de contacter l’émetteur en répondant à cette publication si v
 msgid "%s posted an update."
 msgstr "%s a publié une mise à jour."
 
-#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:848
+#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:847
 msgid "l F d, Y \\@ g:i A"
 msgstr "l F d, Y \\@ g:i A"
 
@@ -4297,6 +4292,10 @@ msgstr ""
 msgid "Your password has been changed at %s"
 msgstr "Votre mot de passe a été modifié à %s"
 
+#: mod/maintenance.php:26
+msgid "System down for maintenance"
+msgstr "Système indisponible pour cause de maintenance"
+
 #: mod/manage.php:178
 msgid "Manage Identities and/or Pages"
 msgstr "Gérer les identités et/ou les pages"
@@ -4356,7 +4355,7 @@ msgstr "Message envoyé."
 msgid "Discard"
 msgstr "Rejeter"
 
-#: mod/message.php:123 view/theme/frio/theme.php:271 src/Content/Nav.php:252
+#: mod/message.php:123 src/Content/Nav.php:252 view/theme/frio/theme.php:271
 msgid "Messages"
 msgstr "Messages"
 
@@ -4587,13 +4586,14 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr "Vérifiez les autres réglages, tout particulièrement ceux liés à la vie privée. Un profil non listé, c'est un peu comme un numéro sur liste rouge. En général, vous devriez probablement publier votre profil - à moins que tous vos amis (potentiels) sachent déjà comment vous trouver."
 
-#: mod/newmember.php:25 mod/profperm.php:117 view/theme/frio/theme.php:263
-#: src/Content/Nav.php:157 src/Model/Profile.php:876 src/Model/Profile.php:909
+#: mod/newmember.php:25 mod/profperm.php:117 src/Content/Nav.php:157
+#: src/Model/Profile.php:876 src/Model/Profile.php:909
 #: src/Module/Contact.php:654 src/Module/Contact.php:869
+#: view/theme/frio/theme.php:263
 msgid "Profile"
 msgstr "Profil"
 
-#: mod/newmember.php:27 mod/profile_photo.php:253 mod/profiles.php:583
+#: mod/newmember.php:27 mod/profiles.php:583 mod/profile_photo.php:253
 msgid "Upload Profile Photo"
 msgstr "Téléverser une photo de profil"
 
@@ -5102,12 +5102,12 @@ msgid "I don't like this (toggle)"
 msgstr "Je n'aime pas"
 
 #: mod/photos.php:1454 mod/photos.php:1493 mod/photos.php:1553
-#: src/Module/Contact.php:1018 src/Object/Post.php:870
+#: src/Module/Contact.php:1018 src/Object/Post.php:871
 msgid "This is you"
 msgstr "C'est vous"
 
 #: mod/photos.php:1456 mod/photos.php:1495 mod/photos.php:1555
-#: src/Object/Post.php:417 src/Object/Post.php:872
+#: src/Object/Post.php:417 src/Object/Post.php:873
 msgid "Comment"
 msgstr "Commenter"
 
@@ -5151,62 +5151,6 @@ msgstr "Rendez ce message privé"
 msgid "Only logged in users are permitted to perform a probing."
 msgstr ""
 
-#: mod/profile_photo.php:58
-msgid "Image uploaded but image cropping failed."
-msgstr "Image envoyée, mais impossible de la retailler."
-
-#: mod/profile_photo.php:88 mod/profile_photo.php:97 mod/profile_photo.php:106
-#: mod/profile_photo.php:318
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr "Réduction de la taille de l'image [%s] échouée."
-
-#: mod/profile_photo.php:125
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Rechargez la page avec la touche Maj pressée, ou bien effacez le cache du navigateur, si d'aventure la nouvelle photo n'apparaissait pas immédiatement."
-
-#: mod/profile_photo.php:133
-msgid "Unable to process image"
-msgstr "Impossible de traiter l'image"
-
-#: mod/profile_photo.php:251
-msgid "Upload File:"
-msgstr "Fichier à téléverser :"
-
-#: mod/profile_photo.php:252
-msgid "Select a profile:"
-msgstr "Choisir un profil :"
-
-#: mod/profile_photo.php:257
-msgid "or"
-msgstr "ou"
-
-#: mod/profile_photo.php:258
-msgid "skip this step"
-msgstr "ignorer cette étape"
-
-#: mod/profile_photo.php:258
-msgid "select a photo from your photo albums"
-msgstr "choisissez une photo depuis vos albums"
-
-#: mod/profile_photo.php:271
-msgid "Crop Image"
-msgstr "(Re)cadrer l'image"
-
-#: mod/profile_photo.php:272
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Ajustez le cadre de l'image pour une visualisation optimale."
-
-#: mod/profile_photo.php:274
-msgid "Done Editing"
-msgstr "Édition terminée"
-
-#: mod/profile_photo.php:308
-msgid "Image uploaded successfully."
-msgstr "Image téléversée avec succès."
-
 #: mod/profiles.php:62
 msgid "Profile deleted."
 msgstr "Profil supprimé."
@@ -5531,6 +5475,62 @@ msgstr "Changer de photo de profil"
 msgid "Create New Profile"
 msgstr "Créer un nouveau profil"
 
+#: mod/profile_photo.php:58
+msgid "Image uploaded but image cropping failed."
+msgstr "Image envoyée, mais impossible de la retailler."
+
+#: mod/profile_photo.php:88 mod/profile_photo.php:97 mod/profile_photo.php:106
+#: mod/profile_photo.php:318
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "Réduction de la taille de l'image [%s] échouée."
+
+#: mod/profile_photo.php:125
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Rechargez la page avec la touche Maj pressée, ou bien effacez le cache du navigateur, si d'aventure la nouvelle photo n'apparaissait pas immédiatement."
+
+#: mod/profile_photo.php:133
+msgid "Unable to process image"
+msgstr "Impossible de traiter l'image"
+
+#: mod/profile_photo.php:251
+msgid "Upload File:"
+msgstr "Fichier à téléverser :"
+
+#: mod/profile_photo.php:252
+msgid "Select a profile:"
+msgstr "Choisir un profil :"
+
+#: mod/profile_photo.php:257
+msgid "or"
+msgstr "ou"
+
+#: mod/profile_photo.php:258
+msgid "skip this step"
+msgstr "ignorer cette étape"
+
+#: mod/profile_photo.php:258
+msgid "select a photo from your photo albums"
+msgstr "choisissez une photo depuis vos albums"
+
+#: mod/profile_photo.php:271
+msgid "Crop Image"
+msgstr "(Re)cadrer l'image"
+
+#: mod/profile_photo.php:272
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Ajustez le cadre de l'image pour une visualisation optimale."
+
+#: mod/profile_photo.php:274
+msgid "Done Editing"
+msgstr "Édition terminée"
+
+#: mod/profile_photo.php:308
+msgid "Image uploaded successfully."
+msgstr "Image téléversée avec succès."
+
 #: mod/profperm.php:36 mod/profperm.php:69
 msgid "Invalid profile identifier."
 msgstr "Identifiant de profil invalide."
@@ -5609,7 +5609,7 @@ msgstr "Trop de requêtes"
 msgid "Only one search per minute is permitted for not logged in users."
 msgstr "Une seule recherche par minute pour les utilisateurs qui ne sont pas connectés."
 
-#: mod/search.php:149 src/Content/Text/HTML.php:900 src/Content/Nav.php:198
+#: mod/search.php:149 src/Content/Nav.php:198 src/Content/Text/HTML.php:900
 msgid "Search"
 msgstr "Recherche"
 
@@ -5937,11 +5937,11 @@ msgstr ""
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:396
+#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:395
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:397
+#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:396
 msgid "Monday"
 msgstr "Lundi"
 
@@ -6471,7 +6471,7 @@ msgstr "Aucune suggestion. Si ce site est récent, merci de recommencer dans 24h
 msgid "Ignore/Hide"
 msgstr "Ignorer/cacher"
 
-#: mod/suggest.php:119 view/theme/vier/theme.php:204 src/Content/Widget.php:66
+#: mod/suggest.php:119 src/Content/Widget.php:66 view/theme/vier/theme.php:204
 msgid "Friend Suggestions"
 msgstr "Suggestions d'amitiés/contacts"
 
@@ -6587,7 +6587,7 @@ msgstr "Supprimer la vidéo"
 msgid "No videos selected"
 msgstr "Pas de vidéo sélectionné"
 
-#: mod/videos.php:309 src/Model/Item.php:3435
+#: mod/videos.php:309 src/Model/Item.php:3453
 msgid "View Video"
 msgstr "Regarder la vidéo"
 
@@ -6609,13 +6609,33 @@ msgstr "Aucun contact."
 msgid "Visit %s's profile [%s]"
 msgstr "Visiter le profil de %s [%s]"
 
-#: mod/viewcontacts.php:114 view/theme/frio/theme.php:273
-#: src/Content/Text/HTML.php:911 src/Content/Nav.php:203
-#: src/Content/Nav.php:269 src/Model/Profile.php:980 src/Model/Profile.php:983
-#: src/Module/Contact.php:811 src/Module/Contact.php:881
+#: mod/viewcontacts.php:114 src/Content/Nav.php:203 src/Content/Nav.php:269
+#: src/Content/Text/HTML.php:911 src/Model/Profile.php:980
+#: src/Model/Profile.php:983 src/Module/Contact.php:811
+#: src/Module/Contact.php:881 view/theme/frio/theme.php:273
 msgid "Contacts"
 msgstr "Contacts"
 
+#: mod/wallmessage.php:52 mod/wallmessage.php:115
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Nombre de messages de mur quotidiens pour %s dépassé. Échec du message."
+
+#: mod/wallmessage.php:63
+msgid "Unable to check your home location."
+msgstr "Impossible de vérifier votre localisation."
+
+#: mod/wallmessage.php:89 mod/wallmessage.php:98
+msgid "No recipient."
+msgstr "Pas de destinataire."
+
+#: mod/wallmessage.php:129
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr "Si vous souhaitez que %s réponde, merci de vérifier vos réglages pour autoriser les messages privés venant d'inconnus."
+
 #: mod/wall_attach.php:26 mod/wall_attach.php:33 mod/wall_attach.php:85
 #: mod/wall_upload.php:42 mod/wall_upload.php:58 mod/wall_upload.php:116
 #: mod/wall_upload.php:167 mod/wall_upload.php:170
@@ -6644,1182 +6664,23 @@ msgstr "Le téléversement a échoué."
 msgid "Wall Photos"
 msgstr "Photos du mur"
 
-#: mod/wallmessage.php:52 mod/wallmessage.php:115
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr "Nombre de messages de mur quotidiens pour %s dépassé. Échec du message."
+#: src/App.php:665
+msgid "Delete this item?"
+msgstr "Effacer cet élément?"
 
-#: mod/wallmessage.php:63
-msgid "Unable to check your home location."
-msgstr "Impossible de vérifier votre localisation."
+#: src/App.php:707
+msgid "toggle mobile"
+msgstr "activ. mobile"
 
-#: mod/wallmessage.php:89 mod/wallmessage.php:98
-msgid "No recipient."
-msgstr "Pas de destinataire."
+#: src/App.php:1075
+msgid "No system theme config value set."
+msgstr ""
 
-#: mod/wallmessage.php:129
-#, php-format
+#: src/BaseModule.php:133
 msgid ""
-"If you wish for %s to respond, please check that the privacy settings on "
-"your site allow private mail from unknown senders."
-msgstr "Si vous souhaitez que %s réponde, merci de vérifier vos réglages pour autoriser les messages privés venant d'inconnus."
-
-#: view/theme/duepuntozero/config.php:55 src/Model/User.php:684
-msgid "default"
-msgstr "défaut"
-
-#: view/theme/duepuntozero/config.php:56
-msgid "greenzero"
-msgstr "greenzero"
-
-#: view/theme/duepuntozero/config.php:57
-msgid "purplezero"
-msgstr "purplezero"
-
-#: view/theme/duepuntozero/config.php:58
-msgid "easterbunny"
-msgstr "easterbunny"
-
-#: view/theme/duepuntozero/config.php:59
-msgid "darkzero"
-msgstr "darkzero"
-
-#: view/theme/duepuntozero/config.php:60
-msgid "comix"
-msgstr "comix"
-
-#: view/theme/duepuntozero/config.php:61
-msgid "slackr"
-msgstr "slackr"
-
-#: view/theme/duepuntozero/config.php:75
-msgid "Variations"
-msgstr "Variations"
-
-#: view/theme/frio/php/Image.php:24
-msgid "Top Banner"
-msgstr "Bannière du haut"
-
-#: view/theme/frio/php/Image.php:24
-msgid ""
-"Resize image to the width of the screen and show background color below on "
-"long pages."
-msgstr "Redimensionner l'image à la largeur de l'écran et combler en dessous avec la couleur d'arrière plan."
-
-#: view/theme/frio/php/Image.php:25
-msgid "Full screen"
-msgstr "Plein écran"
-
-#: view/theme/frio/php/Image.php:25
-msgid ""
-"Resize image to fill entire screen, clipping either the right or the bottom."
-msgstr "Agrandir l'image pour remplir l'écran, jusqu'à toucher le bord droit ou le bas de l'écran."
-
-#: view/theme/frio/php/Image.php:26
-msgid "Single row mosaic"
-msgstr "Mosaïque sur un rang"
-
-#: view/theme/frio/php/Image.php:26
-msgid ""
-"Resize image to repeat it on a single row, either vertical or horizontal."
-msgstr "Redimensionner l'image pour la dupliquer sur un seul rang, vertical ou horizontal."
-
-#: view/theme/frio/php/Image.php:27
-msgid "Mosaic"
-msgstr "Mosaïque"
-
-#: view/theme/frio/php/Image.php:27
-msgid "Repeat image to fill the screen."
-msgstr "Dupliquer l'image pour couvrir l'écran."
-
-#: view/theme/frio/config.php:103
-msgid "Custom"
-msgstr "Personnalisé"
-
-#: view/theme/frio/config.php:115
-msgid "Note"
-msgstr "Remarque"
-
-#: view/theme/frio/config.php:115
-msgid "Check image permissions if all users are allowed to see the image"
-msgstr "Vérifier que tous les utilisateurs du site sont autorisés à voir l'image."
-
-#: view/theme/frio/config.php:122
-msgid "Select color scheme"
-msgstr "Choisir le schéma de couleurs"
-
-#: view/theme/frio/config.php:123
-msgid "Navigation bar background color"
-msgstr "Couleur d'arrière-plan de la barre de navigation"
-
-#: view/theme/frio/config.php:124
-msgid "Navigation bar icon color "
-msgstr "Couleur des icônes de la barre de navigation"
-
-#: view/theme/frio/config.php:125
-msgid "Link color"
-msgstr "Couleur des liens"
-
-#: view/theme/frio/config.php:126
-msgid "Set the background color"
-msgstr "Couleur d'arrière-plan"
-
-#: view/theme/frio/config.php:127
-msgid "Content background opacity"
-msgstr "Opacité du contenu d'arrière-plan"
-
-#: view/theme/frio/config.php:128
-msgid "Set the background image"
-msgstr "Image d'arrière-plan"
-
-#: view/theme/frio/config.php:129
-msgid "Background image style"
-msgstr "Style de l'image de fond"
-
-#: view/theme/frio/config.php:134
-msgid "Login page background image"
-msgstr "Image de fond de la page de login"
-
-#: view/theme/frio/config.php:138
-msgid "Login page background color"
-msgstr "Couleur d'arrière-plan de la page de login"
-
-#: view/theme/frio/config.php:138
-msgid "Leave background image and color empty for theme defaults"
-msgstr "Laisser l'image et la couleur de fond vides pour les paramètres par défaut du thème"
-
-#: view/theme/frio/theme.php:239
-msgid "Guest"
-msgstr "Invité"
-
-#: view/theme/frio/theme.php:244
-msgid "Visitor"
-msgstr "Visiteur"
-
-#: view/theme/frio/theme.php:259 src/Content/Nav.php:153
-#: src/Module/Login.php:321
-msgid "Logout"
-msgstr "Se déconnecter"
-
-#: view/theme/frio/theme.php:259 src/Content/Nav.php:153
-msgid "End this session"
-msgstr "Mettre fin à cette session"
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:156
-#: src/Model/Profile.php:901 src/Module/Contact.php:652
-#: src/Module/Contact.php:853
-msgid "Status"
-msgstr "Statut"
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:156
-#: src/Content/Nav.php:242
-msgid "Your posts and conversations"
-msgstr "Vos publications et conversations"
-
-#: view/theme/frio/theme.php:263 src/Content/Nav.php:157
-msgid "Your profile page"
-msgstr "Votre page de profil"
-
-#: view/theme/frio/theme.php:264 src/Content/Nav.php:158
-msgid "Your photos"
-msgstr "Vos photos"
-
-#: view/theme/frio/theme.php:265 src/Content/Nav.php:159
-#: src/Model/Profile.php:925 src/Model/Profile.php:928
-msgid "Videos"
-msgstr "Vidéos"
-
-#: view/theme/frio/theme.php:265 src/Content/Nav.php:159
-msgid "Your videos"
-msgstr "Vos vidéos"
-
-#: view/theme/frio/theme.php:266 src/Content/Nav.php:160
-msgid "Your events"
-msgstr "Vos événements"
-
-#: view/theme/frio/theme.php:269 src/Content/Nav.php:239
-msgid "Conversations from your friends"
-msgstr "Conversations de vos amis"
-
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:226
-#: src/Model/Profile.php:940 src/Model/Profile.php:951
-msgid "Events and Calendar"
-msgstr "Événements et agenda"
-
-#: view/theme/frio/theme.php:271 src/Content/Nav.php:252
-msgid "Private mail"
-msgstr "Messages privés"
-
-#: view/theme/frio/theme.php:272 src/Content/Nav.php:263
-msgid "Account settings"
-msgstr "Compte"
-
-#: view/theme/frio/theme.php:273 src/Content/Nav.php:269
-msgid "Manage/edit friends and contacts"
-msgstr "Gérer/éditer les amitiés et contacts"
-
-#: view/theme/quattro/config.php:77
-msgid "Alignment"
-msgstr "Alignement"
-
-#: view/theme/quattro/config.php:77
-msgid "Left"
-msgstr "Gauche"
-
-#: view/theme/quattro/config.php:77
-msgid "Center"
-msgstr "Centre"
-
-#: view/theme/quattro/config.php:78
-msgid "Color scheme"
-msgstr "Palette de couleurs"
-
-#: view/theme/quattro/config.php:79
-msgid "Posts font size"
-msgstr "Taille de texte des publications"
-
-#: view/theme/quattro/config.php:80
-msgid "Textareas font size"
-msgstr "Taille de police des zones de texte"
-
-#: view/theme/vier/config.php:76
-msgid "Comma separated list of helper forums"
-msgstr "Liste de forums d'aide, séparés par des virgules"
-
-#: view/theme/vier/config.php:116 src/Core/ACL.php:301
-msgid "don't show"
-msgstr "cacher"
-
-#: view/theme/vier/config.php:116 src/Core/ACL.php:300
-msgid "show"
-msgstr "montrer"
-
-#: view/theme/vier/config.php:123
-msgid "Set style"
-msgstr "Définir le style"
-
-#: view/theme/vier/config.php:124
-msgid "Community Pages"
-msgstr "Pages de Communauté"
-
-#: view/theme/vier/config.php:125 view/theme/vier/theme.php:151
-msgid "Community Profiles"
-msgstr "Profils communautaires"
-
-#: view/theme/vier/config.php:126
-msgid "Help or @NewHere ?"
-msgstr "Aide ou @NewHere?"
-
-#: view/theme/vier/config.php:127 view/theme/vier/theme.php:373
-msgid "Connect Services"
-msgstr "Connecter des services"
-
-#: view/theme/vier/config.php:128
-msgid "Find Friends"
-msgstr "Trouver des amis"
-
-#: view/theme/vier/config.php:129 view/theme/vier/theme.php:181
-msgid "Last users"
-msgstr "Derniers utilisateurs"
-
-#: view/theme/vier/theme.php:199 src/Content/Widget.php:61
-msgid "Find People"
-msgstr "Trouver des personnes"
-
-#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
-msgid "Enter name or interest"
-msgstr "Entrez un nom ou un centre d'intérêt"
-
-#: view/theme/vier/theme.php:202 src/Content/Widget.php:64
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Exemples : Robert Morgenstein, Pêche"
-
-#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
-msgid "Similar Interests"
-msgstr "Intérêts similaires"
-
-#: view/theme/vier/theme.php:206 src/Content/Widget.php:68
-msgid "Random Profile"
-msgstr "Profil au hasard"
-
-#: view/theme/vier/theme.php:207 src/Content/Widget.php:69
-msgid "Invite Friends"
-msgstr "Inviter des amis"
-
-#: view/theme/vier/theme.php:210 src/Content/Widget.php:72
-msgid "Local Directory"
-msgstr "Annuaire local"
-
-#: view/theme/vier/theme.php:250 src/Content/Text/HTML.php:914
-#: src/Content/ForumManager.php:130 src/Content/Nav.php:207
-msgid "Forums"
-msgstr "Forums"
-
-#: view/theme/vier/theme.php:252 src/Content/ForumManager.php:132
-msgid "External link to forum"
-msgstr "Lien sortant vers le forum"
-
-#: view/theme/vier/theme.php:288
-msgid "Quick Start"
-msgstr "Démarrage rapide"
-
-#: src/Core/Console/ArchiveContact.php:65
-#, php-format
-msgid "Could not find any unarchived contact entry for this URL (%s)"
-msgstr ""
-
-#: src/Core/Console/ArchiveContact.php:70
-msgid "The contact entries have been archived"
-msgstr ""
-
-#: src/Core/Console/NewPassword.php:72
-msgid "Enter new password: "
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:50
-#, php-format
-msgid "Post update version number has been set to %s."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:58
-msgid "Check for pending update actions."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:60
-msgid "Done."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:62
-msgid "Execute pending post updates."
-msgstr ""
-
-#: src/Core/Console/PostUpdate.php:68
-msgid "All pending post updates are done."
-msgstr ""
-
-#: src/Core/ACL.php:287
-msgid "Post to Email"
-msgstr "Publier aux courriels"
-
-#: src/Core/ACL.php:293
-msgid "Hide your profile details from unknown viewers?"
-msgstr "Cacher les détails du profil aux visiteurs inconnus?"
-
-#: src/Core/ACL.php:292
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr "Les connecteurs sont désactivés parce que \"%s\" est activé."
-
-#: src/Core/ACL.php:299
-msgid "Visible to everybody"
-msgstr "Visible par tout le monde"
-
-#: src/Core/ACL.php:311
-msgid "Close"
-msgstr "Fermer"
-
-#: src/Core/Authentication.php:87
-msgid "Welcome "
-msgstr "Bienvenue "
-
-#: src/Core/Authentication.php:88
-msgid "Please upload a profile photo."
-msgstr "Merci d'illustrer votre profil d'une image."
-
-#: src/Core/Authentication.php:90
-msgid "Welcome back "
-msgstr "Bienvenue à nouveau, "
-
-#: src/Core/Installer.php:162
-msgid ""
-"The database configuration file \"config/local.config.php\" could not be "
-"written. Please use the enclosed text to create a configuration file in your"
-" web server root."
-msgstr ""
-
-#: src/Core/Installer.php:181
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "Vous pourriez avoir besoin d'importer le fichier \"database.sql\" manuellement au moyen de phpmyadmin ou de la commande mysql."
-
-#: src/Core/Installer.php:182 src/Module/Install.php:132
-#: src/Module/Install.php:263
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Référez-vous au fichier \"INSTALL.txt\"."
-
-#: src/Core/Installer.php:243
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH du serveur web."
-
-#: src/Core/Installer.php:244
-msgid ""
-"If you don't have a command line version of PHP installed on your server, "
-"you will not be able to run the background processing. See <a "
-"href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
-"up-the-worker'>'Setup the worker'</a>"
-msgstr ""
-
-#: src/Core/Installer.php:248
-msgid "PHP executable path"
-msgstr "Chemin vers l'exécutable de PHP"
-
-#: src/Core/Installer.php:248
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Entrez le chemin (absolu) vers l'exécutable 'php'. Vous pouvez laisser cette ligne vide pour continuer l'installation."
-
-#: src/Core/Installer.php:253
-msgid "Command line PHP"
-msgstr "Version \"ligne de commande\" de PHP"
-
-#: src/Core/Installer.php:262
-msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
-msgstr "L'executable PHP n'est pas le binaire php client (c'est peut être la version cgi-fcgi)"
-
-#: src/Core/Installer.php:263
-msgid "Found PHP version: "
-msgstr "Version de PHP :"
-
-#: src/Core/Installer.php:265
-msgid "PHP cli binary"
-msgstr "PHP cli binary"
-
-#: src/Core/Installer.php:278
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "La version \"ligne de commande\" de PHP de votre système n'a pas \"register_argc_argv\" d'activé."
-
-#: src/Core/Installer.php:279
-msgid "This is required for message delivery to work."
-msgstr "Ceci est requis pour que la livraison des messages fonctionne."
-
-#: src/Core/Installer.php:284
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
-
-#: src/Core/Installer.php:316
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Erreur: la fonction \"openssl_pkey_new\" de ce système ne permet pas de générer des clés de chiffrement"
-
-#: src/Core/Installer.php:317
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Si vous utilisez Windows, merci de vous réferer à \"http://www.php.net/manual/en/openssl.installation.php\"."
-
-#: src/Core/Installer.php:320
-msgid "Generate encryption keys"
-msgstr "Générer les clés de chiffrement"
-
-#: src/Core/Installer.php:371
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Erreur : Le module \"rewrite\" du serveur web Apache est requis mais pas installé."
-
-#: src/Core/Installer.php:376
-msgid "Apache mod_rewrite module"
-msgstr "Module mod_rewrite Apache"
-
-#: src/Core/Installer.php:382
-msgid "Error: PDO or MySQLi PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:387
-msgid "Error: The MySQL driver for PDO is not installed."
-msgstr ""
-
-#: src/Core/Installer.php:391
-msgid "PDO or MySQLi PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:399
-msgid "Error, XML PHP module required but not installed."
-msgstr "Erreur : le module PHP XML requis est absent."
-
-#: src/Core/Installer.php:403
-msgid "XML PHP module"
-msgstr "Module PHP XML"
-
-#: src/Core/Installer.php:406
-msgid "libCurl PHP module"
-msgstr "Module libCurl de PHP"
-
-#: src/Core/Installer.php:407
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Erreur : Le module PHP \"libCURL\" est requis mais pas installé."
-
-#: src/Core/Installer.php:413
-msgid "GD graphics PHP module"
-msgstr "Module GD (graphiques) de PHP"
-
-#: src/Core/Installer.php:414
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Erreur : Le module PHP \"GD\" disposant du support JPEG est requis mais pas installé."
-
-#: src/Core/Installer.php:420
-msgid "OpenSSL PHP module"
-msgstr "Module OpenSSL de PHP"
-
-#: src/Core/Installer.php:421
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Erreur : Le module PHP \"openssl\" est requis mais pas installé."
-
-#: src/Core/Installer.php:427
-msgid "mb_string PHP module"
-msgstr "Module mb_string de PHP"
-
-#: src/Core/Installer.php:428
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Erreur : le module PHP mb_string est requis mais pas installé."
-
-#: src/Core/Installer.php:434
-msgid "iconv PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:435
-msgid "Error: iconv PHP module required but not installed."
-msgstr "Erreur : Le module PHP iconv requis est absent."
-
-#: src/Core/Installer.php:441
-msgid "POSIX PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:442
-msgid "Error: POSIX PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:448
-msgid "JSON PHP module"
-msgstr ""
-
-#: src/Core/Installer.php:449
-msgid "Error: JSON PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Installer.php:472
-msgid ""
-"The web installer needs to be able to create a file called "
-"\"local.config.php\" in the \"config\" folder of your web server and it is "
-"unable to do so."
-msgstr ""
-
-#: src/Core/Installer.php:473
-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 "Le plus souvent, il s'agit d'un problème de permission. Le serveur web peut ne pas être capable d'écrire dans votre répertoire - alors que vous-même le pouvez."
-
-#: src/Core/Installer.php:474
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named local.config.php in your Friendica \"config\" folder."
-msgstr ""
-
-#: src/Core/Installer.php:475
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"INSTALL.txt\" for instructions."
-msgstr "Vous pouvez également sauter cette étape et procéder à une installation manuelle. Pour cela, merci de lire le fichier \"INSTALL.txt\"."
-
-#: src/Core/Installer.php:478
-msgid "config/local.config.php is writable"
-msgstr ""
-
-#: src/Core/Installer.php:498
-msgid ""
-"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Friendica utilise le moteur de modèles Smarty3 pour le rendu d'affichage web. Smarty3 compile les modèles en PHP pour accélérer le rendu."
-
-#: src/Core/Installer.php:499
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/smarty3/ under the Friendica top level "
-"folder."
-msgstr "Pour pouvoir stocker ces modèles compilés, le serveur internet doit avoir accès au droit d'écriture pour le répertoire view/smarty3/ sous le dossier racine de Friendica."
-
-#: src/Core/Installer.php:500
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Veuillez vous assurer que l'utilisateur qui exécute votre serveur internet (p. ex. www-data) détient le droit d'accès en écriture sur ce dossier."
-
-#: src/Core/Installer.php:501
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr "Note: pour plus de sécurité, vous devriez ne donner le droit d'accès en écriture qu'à view/smarty3/ et pas aux fichiers modèles (.tpl) qu'il contient."
-
-#: src/Core/Installer.php:504
-msgid "view/smarty3 is writable"
-msgstr "view/smarty3 est autorisé à l écriture"
-
-#: src/Core/Installer.php:533
-msgid ""
-"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist"
-" to .htaccess."
-msgstr ""
-
-#: src/Core/Installer.php:535
-msgid "Error message from Curl when fetching"
-msgstr ""
-
-#: src/Core/Installer.php:540
-msgid "Url rewrite is working"
-msgstr "La réécriture d'URL fonctionne."
-
-#: src/Core/Installer.php:569
-msgid "ImageMagick PHP extension is not installed"
-msgstr "L'extension PHP ImageMagick n'est pas installée"
-
-#: src/Core/Installer.php:571
-msgid "ImageMagick PHP extension is installed"
-msgstr "L’extension PHP ImageMagick est installée"
-
-#: src/Core/Installer.php:573 tests/src/Core/InstallerTest.php:329
-#: tests/src/Core/InstallerTest.php:355
-msgid "ImageMagick supports GIF"
-msgstr "ImageMagick supporte le format GIF"
-
-#: src/Core/Installer.php:595
-msgid "Could not connect to database."
-msgstr "Impossible de se connecter à la base."
-
-#: src/Core/Installer.php:602
-msgid "Database already in use."
-msgstr "Base de données déjà en cours d'utilisation."
-
-#: src/Core/L10n.php:368 src/Model/Event.php:398
-msgid "Tuesday"
-msgstr "Mardi"
-
-#: src/Core/L10n.php:368 src/Model/Event.php:399
-msgid "Wednesday"
-msgstr "Mercredi"
-
-#: src/Core/L10n.php:368 src/Model/Event.php:400
-msgid "Thursday"
-msgstr "Jeudi"
-
-#: src/Core/L10n.php:368 src/Model/Event.php:401
-msgid "Friday"
-msgstr "Vendredi"
-
-#: src/Core/L10n.php:368 src/Model/Event.php:402
-msgid "Saturday"
-msgstr "Samedi"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:417
-msgid "January"
-msgstr "Janvier"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:418
-msgid "February"
-msgstr "Février"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:419
-msgid "March"
-msgstr "Mars"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:420
-msgid "April"
-msgstr "Avril"
-
-#: src/Core/L10n.php:372 src/Core/L10n.php:391 src/Model/Event.php:408
-msgid "May"
-msgstr "Mai"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:421
-msgid "June"
-msgstr "Juin"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:422
-msgid "July"
-msgstr "Juillet"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:423
-msgid "August"
-msgstr "Août"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:424
-msgid "September"
-msgstr "Septembre"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:425
-msgid "October"
-msgstr "Octobre"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:426
-msgid "November"
-msgstr "Novembre"
-
-#: src/Core/L10n.php:372 src/Model/Event.php:427
-msgid "December"
-msgstr "Décembre"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:389
-msgid "Mon"
-msgstr "Lun"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:390
-msgid "Tue"
-msgstr "Mar"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:391
-msgid "Wed"
-msgstr "Mer"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:392
-msgid "Thu"
-msgstr "Jeu"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:393
-msgid "Fri"
-msgstr "Ven"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:394
-msgid "Sat"
-msgstr "Sam"
-
-#: src/Core/L10n.php:387 src/Model/Event.php:388
-msgid "Sun"
-msgstr "Dim"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:404
-msgid "Jan"
-msgstr "Jan"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:405
-msgid "Feb"
-msgstr "Fév"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:406
-msgid "Mar"
-msgstr "Mar"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:407
-msgid "Apr"
-msgstr "Avr"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:410
-msgid "Jul"
-msgstr "Jul"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:411
-msgid "Aug"
-msgstr "Aoû"
-
-#: src/Core/L10n.php:391
-msgid "Sep"
-msgstr ""
-
-#: src/Core/L10n.php:391 src/Model/Event.php:413
-msgid "Oct"
-msgstr "Oct"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:414
-msgid "Nov"
-msgstr "Nov"
-
-#: src/Core/L10n.php:391 src/Model/Event.php:415
-msgid "Dec"
-msgstr "Déc"
-
-#: src/Core/L10n.php:410
-msgid "poke"
-msgstr "titiller"
-
-#: src/Core/L10n.php:410
-msgid "poked"
-msgstr "a titillé"
-
-#: src/Core/L10n.php:411
-msgid "ping"
-msgstr "attirer l'attention"
-
-#: src/Core/L10n.php:411
-msgid "pinged"
-msgstr "a attiré l'attention de"
-
-#: src/Core/L10n.php:412
-msgid "prod"
-msgstr "aiguillonner"
-
-#: src/Core/L10n.php:412
-msgid "prodded"
-msgstr "a aiguillonné"
-
-#: src/Core/L10n.php:413
-msgid "slap"
-msgstr "gifler"
-
-#: src/Core/L10n.php:413
-msgid "slapped"
-msgstr "a giflé"
-
-#: src/Core/L10n.php:414
-msgid "finger"
-msgstr "tripoter"
-
-#: src/Core/L10n.php:414
-msgid "fingered"
-msgstr "a tripoté"
-
-#: src/Core/L10n.php:415
-msgid "rebuff"
-msgstr "rabrouer"
-
-#: src/Core/L10n.php:415
-msgid "rebuffed"
-msgstr "a rabroué"
-
-#: src/Core/NotificationsManager.php:175
-msgid "System"
-msgstr "Système"
-
-#: src/Core/NotificationsManager.php:196 src/Content/Nav.php:180
-#: src/Content/Nav.php:242
-msgid "Home"
-msgstr "Profil"
-
-#: src/Core/NotificationsManager.php:203 src/Content/Nav.php:246
-msgid "Introductions"
-msgstr "Introductions"
-
-#: src/Core/NotificationsManager.php:265 src/Core/NotificationsManager.php:277
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s a commenté la publication de %s"
-
-#: src/Core/NotificationsManager.php:276
-#, php-format
-msgid "%s created a new post"
-msgstr "%s a créé une nouvelle publication"
-
-#: src/Core/NotificationsManager.php:290
-#, php-format
-msgid "%s liked %s's post"
-msgstr "%s a aimé la publication de %s"
-
-#: src/Core/NotificationsManager.php:303
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "%s n'a pas aimé la publication de %s"
-
-#: src/Core/NotificationsManager.php:316
-#, php-format
-msgid "%s is attending %s's event"
-msgstr "%s participe à l'événement de %s"
-
-#: src/Core/NotificationsManager.php:329
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr "%s ne participe pas à l'événement de %s"
-
-#: src/Core/NotificationsManager.php:342
-#, php-format
-msgid "%s may attend %s's event"
-msgstr "%s participera peut-être à l'événement de %s"
-
-#: src/Core/NotificationsManager.php:375
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s est désormais ami(e) avec %s"
-
-#: src/Core/NotificationsManager.php:651
-msgid "Friend Suggestion"
-msgstr "Suggestion d'amitié/contact"
-
-#: src/Core/NotificationsManager.php:685
-msgid "Friend/Connect Request"
-msgstr "Demande de connexion/relation"
-
-#: src/Core/NotificationsManager.php:685
-msgid "New Follower"
-msgstr "Nouvel abonné"
-
-#: src/Core/System.php:137
-msgid "Error 400 - Bad Request"
-msgstr ""
-
-#: src/Core/System.php:138
-msgid "Error 401 - Unauthorized"
-msgstr ""
-
-#: src/Core/System.php:139
-msgid "Error 403 - Forbidden"
-msgstr ""
-
-#: src/Core/System.php:140
-msgid "Error 404 - Not Found"
-msgstr ""
-
-#: src/Core/System.php:141
-msgid "Error 500 - Internal Server Error"
-msgstr ""
-
-#: src/Core/System.php:142
-msgid "Error 503 - Service Unavailable"
-msgstr ""
-
-#: src/Core/System.php:150
-msgid ""
-"The server cannot or will not process the request due to an apparent client "
-"error."
-msgstr ""
-
-#: src/Core/System.php:151
-msgid ""
-"Authentication is required and has failed or has not yet been provided."
-msgstr ""
-
-#: src/Core/System.php:152
-msgid ""
-"The request was valid, but the server is refusing action. The user might not"
-" have the necessary permissions for a resource, or may need an account."
-msgstr ""
-
-#: src/Core/System.php:153
-msgid ""
-"The requested resource could not be found but may be available in the "
-"future."
-msgstr ""
-
-#: src/Core/System.php:154
-msgid ""
-"An unexpected condition was encountered and no more specific message is "
-"suitable."
-msgstr ""
-
-#: src/Core/System.php:155
-msgid ""
-"The server is currently unavailable (because it is overloaded or down for "
-"maintenance). Please try again later."
-msgstr ""
-
-#: src/Core/Update.php:168
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Mise-à-jour %s échouée. Voir les journaux d'erreur."
-
-#: src/Core/Update.php:225
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
-msgstr ""
-
-#: src/Core/Update.php:231
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "Le message d’erreur est\n[pre]%s[/pre]"
-
-#: src/Core/Update.php:260
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
-msgstr ""
-
-#: src/Core/UserImport.php:103
-msgid "Error decoding account file"
-msgstr "Une erreur a été détecté en décodant un fichier utilisateur"
-
-#: src/Core/UserImport.php:109
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "Erreur ! Pas de ficher de version existant ! Êtes vous sur un compte Friendica ?"
-
-#: src/Core/UserImport.php:117
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "L'utilisateur '%s' existe déjà sur ce serveur!"
-
-#: src/Core/UserImport.php:153
-msgid "User creation error"
-msgstr "Erreur de création d'utilisateur"
-
-#: src/Core/UserImport.php:171
-msgid "User profile creation error"
-msgstr "Erreur de création du profil utilisateur"
-
-#: src/Core/UserImport.php:215
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "%d contacts non importés"
-msgstr[1] "%d contacts non importés"
-
-#: src/Core/UserImport.php:280
-msgid "Done. You can now login with your username and password"
-msgstr "Action réalisée. Vous pouvez désormais vous connecter avec votre nom d'utilisateur et votre mot de passe"
-
-#: src/Util/Temporal.php:147 src/Model/Profile.php:771
-msgid "Birthday:"
-msgstr "Anniversaire :"
-
-#: src/Util/Temporal.php:151
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "AAAA-MM-JJ ou MM-JJ"
-
-#: src/Util/Temporal.php:298
-msgid "never"
-msgstr "jamais"
-
-#: src/Util/Temporal.php:305
-msgid "less than a second ago"
-msgstr "il y a moins d'une seconde"
-
-#: src/Util/Temporal.php:313
-msgid "year"
-msgstr "an"
-
-#: src/Util/Temporal.php:313
-msgid "years"
-msgstr "ans"
-
-#: src/Util/Temporal.php:314
-msgid "months"
-msgstr "mois"
-
-#: src/Util/Temporal.php:315
-msgid "weeks"
-msgstr "semaines"
-
-#: src/Util/Temporal.php:316
-msgid "days"
-msgstr "jours"
-
-#: src/Util/Temporal.php:317
-msgid "hour"
-msgstr "heure"
-
-#: src/Util/Temporal.php:317
-msgid "hours"
-msgstr "heures"
-
-#: src/Util/Temporal.php:318
-msgid "minute"
-msgstr "minute"
-
-#: src/Util/Temporal.php:318
-msgid "minutes"
-msgstr "minutes"
-
-#: src/Util/Temporal.php:319
-msgid "second"
-msgstr "seconde"
-
-#: src/Util/Temporal.php:319
-msgid "seconds"
-msgstr "secondes"
-
-#: src/Util/Temporal.php:329
-#, php-format
-msgid "in %1$d %2$s"
-msgstr ""
-
-#: src/Util/Temporal.php:332
-#, php-format
-msgid "%1$d %2$s ago"
-msgstr "il y a %1$d %2$s "
-
-#: src/Content/Text/BBCode.php:429
-msgid "view full size"
-msgstr "voir en pleine taille"
-
-#: src/Content/Text/BBCode.php:863 src/Content/Text/BBCode.php:1596
-#: src/Content/Text/BBCode.php:1597
-msgid "Image/photo"
-msgstr "Image/photo"
-
-#: src/Content/Text/BBCode.php:967
-#, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
-msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
-
-#: src/Content/Text/BBCode.php:1523 src/Content/Text/BBCode.php:1545
-msgid "$1 wrote:"
-msgstr "$1 a écrit :"
-
-#: src/Content/Text/BBCode.php:1607 src/Content/Text/BBCode.php:1608
-msgid "Encrypted content"
-msgstr "Contenu chiffré"
-
-#: src/Content/Text/BBCode.php:1715
-msgid "Invalid source protocol"
-msgstr ""
-
-#: src/Content/Text/BBCode.php:1726
-msgid "Invalid link protocol"
-msgstr ""
-
-#: src/Content/Text/HTML.php:800
-msgid "Loading more entries..."
-msgstr "Chargement de résultats supplémentaires..."
-
-#: src/Content/Text/HTML.php:801
-msgid "The end"
-msgstr "Fin"
-
-#: src/Content/Text/HTML.php:894
-msgid "Follow"
-msgstr "S'abonner"
-
-#: src/Content/Text/HTML.php:903 src/Content/Nav.php:79
-msgid "@name, !forum, #tags, content"
-msgstr "@nom, !forum, #tags, contenu"
-
-#: src/Content/Text/HTML.php:909 src/Content/Nav.php:201
-msgid "Full Text"
-msgstr "Texte Entier"
-
-#: src/Content/Text/HTML.php:910 src/Content/Widget/TagCloud.php:54
-#: src/Content/Nav.php:202
-msgid "Tags"
-msgstr "Tags"
-
-#: src/Content/Text/HTML.php:951 src/Model/Item.php:3485
-#: src/Model/Item.php:3496
-msgid "Click to open/close"
-msgstr "Cliquer pour ouvrir/fermer"
-
-#: src/Content/Widget/CalendarExport.php:64
-msgid "Export"
-msgstr "Exporter"
-
-#: src/Content/Widget/CalendarExport.php:65
-msgid "Export calendar as ical"
-msgstr "Exporter au format iCal"
-
-#: src/Content/Widget/CalendarExport.php:66
-msgid "Export calendar as csv"
-msgstr "Exporter au format CSV"
-
-#: src/Content/Widget/ContactBlock.php:58
-msgid "No contacts"
-msgstr "Aucun contact"
-
-#: src/Content/Widget/ContactBlock.php:90
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] "%d contact"
-msgstr[1] "%d contacts"
-
-#: src/Content/Widget/ContactBlock.php:109
-msgid "View Contacts"
-msgstr "Voir les contacts"
+"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 "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probablement dire que le formulaire est resté ouvert trop longtemps (plus de 3 heures) avant d'être validé."
 
 #: src/Content/ContactSelector.php:58
 msgid "Frequently"
@@ -8041,7 +6902,7 @@ msgstr "Infidèle"
 msgid "Sex Addict"
 msgstr "Accro au sexe"
 
-#: src/Content/ContactSelector.php:241 src/Model/User.php:701
+#: src/Content/ContactSelector.php:241 src/Model/User.php:702
 msgid "Friends"
 msgstr "Amis"
 
@@ -8258,6 +7119,15 @@ msgstr ""
 msgid "Display membership date in profile"
 msgstr ""
 
+#: src/Content/ForumManager.php:130 src/Content/Nav.php:207
+#: src/Content/Text/HTML.php:914 view/theme/vier/theme.php:250
+msgid "Forums"
+msgstr "Forums"
+
+#: src/Content/ForumManager.php:132 view/theme/vier/theme.php:252
+msgid "External link to forum"
+msgstr "Lien sortant vers le forum"
+
 #: src/Content/Nav.php:74
 msgid "Nothing new here"
 msgstr "Rien de neuf ici"
@@ -8266,6 +7136,51 @@ msgstr "Rien de neuf ici"
 msgid "Clear notifications"
 msgstr "Effacer les notifications"
 
+#: src/Content/Nav.php:79 src/Content/Text/HTML.php:903
+msgid "@name, !forum, #tags, content"
+msgstr "@nom, !forum, #tags, contenu"
+
+#: src/Content/Nav.php:153 src/Module/Login.php:321
+#: view/theme/frio/theme.php:259
+msgid "Logout"
+msgstr "Se déconnecter"
+
+#: src/Content/Nav.php:153 view/theme/frio/theme.php:259
+msgid "End this session"
+msgstr "Mettre fin à cette session"
+
+#: src/Content/Nav.php:156 src/Model/Profile.php:901
+#: src/Module/Contact.php:652 src/Module/Contact.php:853
+#: view/theme/frio/theme.php:262
+msgid "Status"
+msgstr "Statut"
+
+#: src/Content/Nav.php:156 src/Content/Nav.php:242
+#: view/theme/frio/theme.php:262
+msgid "Your posts and conversations"
+msgstr "Vos publications et conversations"
+
+#: src/Content/Nav.php:157 view/theme/frio/theme.php:263
+msgid "Your profile page"
+msgstr "Votre page de profil"
+
+#: src/Content/Nav.php:158 view/theme/frio/theme.php:264
+msgid "Your photos"
+msgstr "Vos photos"
+
+#: src/Content/Nav.php:159 src/Model/Profile.php:925 src/Model/Profile.php:928
+#: view/theme/frio/theme.php:265
+msgid "Videos"
+msgstr "Vidéos"
+
+#: src/Content/Nav.php:159 view/theme/frio/theme.php:265
+msgid "Your videos"
+msgstr "Vos vidéos"
+
+#: src/Content/Nav.php:160 view/theme/frio/theme.php:266
+msgid "Your events"
+msgstr "Vos événements"
+
 #: src/Content/Nav.php:161
 msgid "Personal notes"
 msgstr "Notes personnelles"
@@ -8278,6 +7193,11 @@ msgstr "Vos notes personnelles"
 msgid "Sign in"
 msgstr "Se connecter"
 
+#: src/Content/Nav.php:180 src/Content/Nav.php:242
+#: src/Core/NotificationsManager.php:196
+msgid "Home"
+msgstr "Profil"
+
 #: src/Content/Nav.php:180
 msgid "Home Page"
 msgstr "Page d'accueil"
@@ -8307,6 +7227,15 @@ msgstr "Applications supplémentaires, utilitaires, jeux"
 msgid "Search site content"
 msgstr "Rechercher dans le contenu du site"
 
+#: src/Content/Nav.php:201 src/Content/Text/HTML.php:909
+msgid "Full Text"
+msgstr "Texte Entier"
+
+#: src/Content/Nav.php:202 src/Content/Text/HTML.php:910
+#: src/Content/Widget/TagCloud.php:54
+msgid "Tags"
+msgstr "Tags"
+
 #: src/Content/Nav.php:222
 msgid "Community"
 msgstr "Communauté"
@@ -8315,6 +7244,11 @@ msgstr "Communauté"
 msgid "Conversations on this and other servers"
 msgstr ""
 
+#: src/Content/Nav.php:226 src/Model/Profile.php:940 src/Model/Profile.php:951
+#: view/theme/frio/theme.php:270
+msgid "Events and Calendar"
+msgstr "Événements et agenda"
+
 #: src/Content/Nav.php:229
 msgid "Directory"
 msgstr "Annuaire"
@@ -8331,6 +7265,10 @@ msgstr "Information au sujet de cette instance de friendica"
 msgid "Terms of Service of this Friendica instance"
 msgstr ""
 
+#: src/Content/Nav.php:239 view/theme/frio/theme.php:269
+msgid "Conversations from your friends"
+msgstr "Conversations de vos amis"
+
 #: src/Content/Nav.php:240
 msgid "Network Reset"
 msgstr "Réinitialiser le réseau"
@@ -8339,6 +7277,10 @@ msgstr "Réinitialiser le réseau"
 msgid "Load Network page with no filters"
 msgstr "Chargement des pages du réseau sans filtre"
 
+#: src/Content/Nav.php:246 src/Core/NotificationsManager.php:203
+msgid "Introductions"
+msgstr "Introductions"
+
 #: src/Content/Nav.php:246
 msgid "Friend Requests"
 msgstr "Demande d'amitié"
@@ -8351,6 +7293,10 @@ msgstr "Voir toutes les notifications"
 msgid "Mark all system notifications seen"
 msgstr "Marquer toutes les notifications système comme 'vues'"
 
+#: src/Content/Nav.php:252 view/theme/frio/theme.php:271
+msgid "Private mail"
+msgstr "Messages privés"
+
 #: src/Content/Nav.php:253
 msgid "Inbox"
 msgstr "Messages entrants"
@@ -8367,10 +7313,18 @@ msgstr "Gérer"
 msgid "Manage other pages"
 msgstr "Gérer les autres pages"
 
+#: src/Content/Nav.php:263 view/theme/frio/theme.php:272
+msgid "Account settings"
+msgstr "Compte"
+
 #: src/Content/Nav.php:266
 msgid "Manage/Edit Profiles"
 msgstr "Gérer/Éditer les profiles"
 
+#: src/Content/Nav.php:269 view/theme/frio/theme.php:273
+msgid "Manage/edit friends and contacts"
+msgstr "Gérer/éditer les amitiés et contacts"
+
 #: src/Content/Nav.php:274
 msgid "Site setup and configuration"
 msgstr "Démarrage et configuration du site"
@@ -8407,6 +7361,80 @@ msgstr "précédent"
 msgid "last"
 msgstr "dernier"
 
+#: src/Content/Text/BBCode.php:429
+msgid "view full size"
+msgstr "voir en pleine taille"
+
+#: src/Content/Text/BBCode.php:863 src/Content/Text/BBCode.php:1596
+#: src/Content/Text/BBCode.php:1597
+msgid "Image/photo"
+msgstr "Image/photo"
+
+#: src/Content/Text/BBCode.php:967
+#, php-format
+msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+
+#: src/Content/Text/BBCode.php:1523 src/Content/Text/BBCode.php:1545
+msgid "$1 wrote:"
+msgstr "$1 a écrit :"
+
+#: src/Content/Text/BBCode.php:1607 src/Content/Text/BBCode.php:1608
+msgid "Encrypted content"
+msgstr "Contenu chiffré"
+
+#: src/Content/Text/BBCode.php:1715
+msgid "Invalid source protocol"
+msgstr ""
+
+#: src/Content/Text/BBCode.php:1726
+msgid "Invalid link protocol"
+msgstr ""
+
+#: src/Content/Text/HTML.php:800
+msgid "Loading more entries..."
+msgstr "Chargement de résultats supplémentaires..."
+
+#: src/Content/Text/HTML.php:801
+msgid "The end"
+msgstr "Fin"
+
+#: src/Content/Text/HTML.php:894
+msgid "Follow"
+msgstr "S'abonner"
+
+#: src/Content/Text/HTML.php:951 src/Model/Item.php:3503
+#: src/Model/Item.php:3514
+msgid "Click to open/close"
+msgstr "Cliquer pour ouvrir/fermer"
+
+#: src/Content/Widget/CalendarExport.php:64
+msgid "Export"
+msgstr "Exporter"
+
+#: src/Content/Widget/CalendarExport.php:65
+msgid "Export calendar as ical"
+msgstr "Exporter au format iCal"
+
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export calendar as csv"
+msgstr "Exporter au format CSV"
+
+#: src/Content/Widget/ContactBlock.php:58
+msgid "No contacts"
+msgstr "Aucun contact"
+
+#: src/Content/Widget/ContactBlock.php:90
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d contact"
+msgstr[1] "%d contacts"
+
+#: src/Content/Widget/ContactBlock.php:109
+msgid "View Contacts"
+msgstr "Voir les contacts"
+
 #: src/Content/Widget.php:35
 msgid "Add New Contact"
 msgstr "Ajouter un nouveau contact"
@@ -8426,6 +7454,34 @@ msgid_plural "%d invitations available"
 msgstr[0] "%d invitation disponible"
 msgstr[1] "%d invitations disponibles"
 
+#: src/Content/Widget.php:61 view/theme/vier/theme.php:199
+msgid "Find People"
+msgstr "Trouver des personnes"
+
+#: src/Content/Widget.php:62 view/theme/vier/theme.php:200
+msgid "Enter name or interest"
+msgstr "Entrez un nom ou un centre d'intérêt"
+
+#: src/Content/Widget.php:64 view/theme/vier/theme.php:202
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Exemples : Robert Morgenstein, Pêche"
+
+#: src/Content/Widget.php:67 view/theme/vier/theme.php:205
+msgid "Similar Interests"
+msgstr "Intérêts similaires"
+
+#: src/Content/Widget.php:68 view/theme/vier/theme.php:206
+msgid "Random Profile"
+msgstr "Profil au hasard"
+
+#: src/Content/Widget.php:69 view/theme/vier/theme.php:207
+msgid "Invite Friends"
+msgstr "Inviter des amis"
+
+#: src/Content/Widget.php:72 view/theme/vier/theme.php:210
+msgid "Local Directory"
+msgstr "Annuaire local"
+
 #: src/Content/Widget.php:158
 msgid "Protocols"
 msgstr ""
@@ -8453,6 +7509,706 @@ msgid_plural "%d contacts in common"
 msgstr[0] "%d contact en commun"
 msgstr[1] "%d contacts en commun"
 
+#: src/Core/ACL.php:287
+msgid "Post to Email"
+msgstr "Publier aux courriels"
+
+#: src/Core/ACL.php:293
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Cacher les détails du profil aux visiteurs inconnus?"
+
+#: src/Core/ACL.php:292
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr "Les connecteurs sont désactivés parce que \"%s\" est activé."
+
+#: src/Core/ACL.php:299
+msgid "Visible to everybody"
+msgstr "Visible par tout le monde"
+
+#: src/Core/ACL.php:300 view/theme/vier/config.php:116
+msgid "show"
+msgstr "montrer"
+
+#: src/Core/ACL.php:301 view/theme/vier/config.php:116
+msgid "don't show"
+msgstr "cacher"
+
+#: src/Core/ACL.php:311
+msgid "Close"
+msgstr "Fermer"
+
+#: src/Core/Authentication.php:87
+msgid "Welcome "
+msgstr "Bienvenue "
+
+#: src/Core/Authentication.php:88
+msgid "Please upload a profile photo."
+msgstr "Merci d'illustrer votre profil d'une image."
+
+#: src/Core/Authentication.php:90
+msgid "Welcome back "
+msgstr "Bienvenue à nouveau, "
+
+#: src/Core/Console/ArchiveContact.php:65
+#, php-format
+msgid "Could not find any unarchived contact entry for this URL (%s)"
+msgstr ""
+
+#: src/Core/Console/ArchiveContact.php:70
+msgid "The contact entries have been archived"
+msgstr ""
+
+#: src/Core/Console/NewPassword.php:72
+msgid "Enter new password: "
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:50
+#, php-format
+msgid "Post update version number has been set to %s."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:58
+msgid "Check for pending update actions."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:60
+msgid "Done."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:62
+msgid "Execute pending post updates."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:68
+msgid "All pending post updates are done."
+msgstr ""
+
+#: src/Core/Installer.php:163
+msgid ""
+"The database configuration file \"config/local.config.php\" could not be "
+"written. Please use the enclosed text to create a configuration file in your"
+" web server root."
+msgstr ""
+
+#: src/Core/Installer.php:182
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Vous pourriez avoir besoin d'importer le fichier \"database.sql\" manuellement au moyen de phpmyadmin ou de la commande mysql."
+
+#: src/Core/Installer.php:183 src/Module/Install.php:132
+#: src/Module/Install.php:263
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Référez-vous au fichier \"INSTALL.txt\"."
+
+#: src/Core/Installer.php:244
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH du serveur web."
+
+#: src/Core/Installer.php:245
+msgid ""
+"If you don't have a command line version of PHP installed on your server, "
+"you will not be able to run the background processing. See <a "
+"href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
+"up-the-worker'>'Setup the worker'</a>"
+msgstr ""
+
+#: src/Core/Installer.php:249
+msgid "PHP executable path"
+msgstr "Chemin vers l'exécutable de PHP"
+
+#: src/Core/Installer.php:249
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Entrez le chemin (absolu) vers l'exécutable 'php'. Vous pouvez laisser cette ligne vide pour continuer l'installation."
+
+#: src/Core/Installer.php:254
+msgid "Command line PHP"
+msgstr "Version \"ligne de commande\" de PHP"
+
+#: src/Core/Installer.php:263
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+msgstr "L'executable PHP n'est pas le binaire php client (c'est peut être la version cgi-fcgi)"
+
+#: src/Core/Installer.php:264
+msgid "Found PHP version: "
+msgstr "Version de PHP :"
+
+#: src/Core/Installer.php:266
+msgid "PHP cli binary"
+msgstr "PHP cli binary"
+
+#: src/Core/Installer.php:279
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "La version \"ligne de commande\" de PHP de votre système n'a pas \"register_argc_argv\" d'activé."
+
+#: src/Core/Installer.php:280
+msgid "This is required for message delivery to work."
+msgstr "Ceci est requis pour que la livraison des messages fonctionne."
+
+#: src/Core/Installer.php:285
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
+
+#: src/Core/Installer.php:317
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Erreur: la fonction \"openssl_pkey_new\" de ce système ne permet pas de générer des clés de chiffrement"
+
+#: src/Core/Installer.php:318
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Si vous utilisez Windows, merci de vous réferer à \"http://www.php.net/manual/en/openssl.installation.php\"."
+
+#: src/Core/Installer.php:321
+msgid "Generate encryption keys"
+msgstr "Générer les clés de chiffrement"
+
+#: src/Core/Installer.php:372
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Erreur : Le module \"rewrite\" du serveur web Apache est requis mais pas installé."
+
+#: src/Core/Installer.php:377
+msgid "Apache mod_rewrite module"
+msgstr "Module mod_rewrite Apache"
+
+#: src/Core/Installer.php:383
+msgid "Error: PDO or MySQLi PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:388
+msgid "Error: The MySQL driver for PDO is not installed."
+msgstr ""
+
+#: src/Core/Installer.php:392
+msgid "PDO or MySQLi PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:400
+msgid "Error, XML PHP module required but not installed."
+msgstr "Erreur : le module PHP XML requis est absent."
+
+#: src/Core/Installer.php:404
+msgid "XML PHP module"
+msgstr "Module PHP XML"
+
+#: src/Core/Installer.php:407
+msgid "libCurl PHP module"
+msgstr "Module libCurl de PHP"
+
+#: src/Core/Installer.php:408
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Erreur : Le module PHP \"libCURL\" est requis mais pas installé."
+
+#: src/Core/Installer.php:414
+msgid "GD graphics PHP module"
+msgstr "Module GD (graphiques) de PHP"
+
+#: src/Core/Installer.php:415
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Erreur : Le module PHP \"GD\" disposant du support JPEG est requis mais pas installé."
+
+#: src/Core/Installer.php:421
+msgid "OpenSSL PHP module"
+msgstr "Module OpenSSL de PHP"
+
+#: src/Core/Installer.php:422
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Erreur : Le module PHP \"openssl\" est requis mais pas installé."
+
+#: src/Core/Installer.php:428
+msgid "mb_string PHP module"
+msgstr "Module mb_string de PHP"
+
+#: src/Core/Installer.php:429
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Erreur : le module PHP mb_string est requis mais pas installé."
+
+#: src/Core/Installer.php:435
+msgid "iconv PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:436
+msgid "Error: iconv PHP module required but not installed."
+msgstr "Erreur : Le module PHP iconv requis est absent."
+
+#: src/Core/Installer.php:442
+msgid "POSIX PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:443
+msgid "Error: POSIX PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:449
+msgid "JSON PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:450
+msgid "Error: JSON PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:473
+msgid ""
+"The web installer needs to be able to create a file called "
+"\"local.config.php\" in the \"config\" folder of your web server and it is "
+"unable to do so."
+msgstr ""
+
+#: src/Core/Installer.php:474
+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 "Le plus souvent, il s'agit d'un problème de permission. Le serveur web peut ne pas être capable d'écrire dans votre répertoire - alors que vous-même le pouvez."
+
+#: src/Core/Installer.php:475
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named local.config.php in your Friendica \"config\" folder."
+msgstr ""
+
+#: src/Core/Installer.php:476
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"INSTALL.txt\" for instructions."
+msgstr "Vous pouvez également sauter cette étape et procéder à une installation manuelle. Pour cela, merci de lire le fichier \"INSTALL.txt\"."
+
+#: src/Core/Installer.php:479
+msgid "config/local.config.php is writable"
+msgstr ""
+
+#: src/Core/Installer.php:499
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Friendica utilise le moteur de modèles Smarty3 pour le rendu d'affichage web. Smarty3 compile les modèles en PHP pour accélérer le rendu."
+
+#: src/Core/Installer.php:500
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
+msgstr "Pour pouvoir stocker ces modèles compilés, le serveur internet doit avoir accès au droit d'écriture pour le répertoire view/smarty3/ sous le dossier racine de Friendica."
+
+#: src/Core/Installer.php:501
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Veuillez vous assurer que l'utilisateur qui exécute votre serveur internet (p. ex. www-data) détient le droit d'accès en écriture sur ce dossier."
+
+#: src/Core/Installer.php:502
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr "Note: pour plus de sécurité, vous devriez ne donner le droit d'accès en écriture qu'à view/smarty3/ et pas aux fichiers modèles (.tpl) qu'il contient."
+
+#: src/Core/Installer.php:505
+msgid "view/smarty3 is writable"
+msgstr "view/smarty3 est autorisé à l écriture"
+
+#: src/Core/Installer.php:534
+msgid ""
+"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist"
+" to .htaccess."
+msgstr ""
+
+#: src/Core/Installer.php:536
+msgid "Error message from Curl when fetching"
+msgstr ""
+
+#: src/Core/Installer.php:541
+msgid "Url rewrite is working"
+msgstr "La réécriture d'URL fonctionne."
+
+#: src/Core/Installer.php:570
+msgid "ImageMagick PHP extension is not installed"
+msgstr "L'extension PHP ImageMagick n'est pas installée"
+
+#: src/Core/Installer.php:572
+msgid "ImageMagick PHP extension is installed"
+msgstr "L’extension PHP ImageMagick est installée"
+
+#: src/Core/Installer.php:574 tests/src/Core/InstallerTest.php:329
+#: tests/src/Core/InstallerTest.php:355
+msgid "ImageMagick supports GIF"
+msgstr "ImageMagick supporte le format GIF"
+
+#: src/Core/Installer.php:597
+msgid "Could not connect to database."
+msgstr "Impossible de se connecter à la base."
+
+#: src/Core/Installer.php:604
+msgid "Database already in use."
+msgstr "Base de données déjà en cours d'utilisation."
+
+#: src/Core/L10n.php:368 src/Model/Event.php:397
+msgid "Tuesday"
+msgstr "Mardi"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:398
+msgid "Wednesday"
+msgstr "Mercredi"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:399
+msgid "Thursday"
+msgstr "Jeudi"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:400
+msgid "Friday"
+msgstr "Vendredi"
+
+#: src/Core/L10n.php:368 src/Model/Event.php:401
+msgid "Saturday"
+msgstr "Samedi"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:416
+msgid "January"
+msgstr "Janvier"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:417
+msgid "February"
+msgstr "Février"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:418
+msgid "March"
+msgstr "Mars"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:419
+msgid "April"
+msgstr "Avril"
+
+#: src/Core/L10n.php:372 src/Core/L10n.php:391 src/Model/Event.php:407
+msgid "May"
+msgstr "Mai"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:420
+msgid "June"
+msgstr "Juin"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:421
+msgid "July"
+msgstr "Juillet"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:422
+msgid "August"
+msgstr "Août"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:423
+msgid "September"
+msgstr "Septembre"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:424
+msgid "October"
+msgstr "Octobre"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:425
+msgid "November"
+msgstr "Novembre"
+
+#: src/Core/L10n.php:372 src/Model/Event.php:426
+msgid "December"
+msgstr "Décembre"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:388
+msgid "Mon"
+msgstr "Lun"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:389
+msgid "Tue"
+msgstr "Mar"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:390
+msgid "Wed"
+msgstr "Mer"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:391
+msgid "Thu"
+msgstr "Jeu"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:392
+msgid "Fri"
+msgstr "Ven"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:393
+msgid "Sat"
+msgstr "Sam"
+
+#: src/Core/L10n.php:387 src/Model/Event.php:387
+msgid "Sun"
+msgstr "Dim"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:403
+msgid "Jan"
+msgstr "Jan"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:404
+msgid "Feb"
+msgstr "Fév"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:405
+msgid "Mar"
+msgstr "Mar"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:406
+msgid "Apr"
+msgstr "Avr"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:409
+msgid "Jul"
+msgstr "Jul"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:410
+msgid "Aug"
+msgstr "Aoû"
+
+#: src/Core/L10n.php:391
+msgid "Sep"
+msgstr ""
+
+#: src/Core/L10n.php:391 src/Model/Event.php:412
+msgid "Oct"
+msgstr "Oct"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:413
+msgid "Nov"
+msgstr "Nov"
+
+#: src/Core/L10n.php:391 src/Model/Event.php:414
+msgid "Dec"
+msgstr "Déc"
+
+#: src/Core/L10n.php:410
+msgid "poke"
+msgstr "titiller"
+
+#: src/Core/L10n.php:410
+msgid "poked"
+msgstr "a titillé"
+
+#: src/Core/L10n.php:411
+msgid "ping"
+msgstr "attirer l'attention"
+
+#: src/Core/L10n.php:411
+msgid "pinged"
+msgstr "a attiré l'attention de"
+
+#: src/Core/L10n.php:412
+msgid "prod"
+msgstr "aiguillonner"
+
+#: src/Core/L10n.php:412
+msgid "prodded"
+msgstr "a aiguillonné"
+
+#: src/Core/L10n.php:413
+msgid "slap"
+msgstr "gifler"
+
+#: src/Core/L10n.php:413
+msgid "slapped"
+msgstr "a giflé"
+
+#: src/Core/L10n.php:414
+msgid "finger"
+msgstr "tripoter"
+
+#: src/Core/L10n.php:414
+msgid "fingered"
+msgstr "a tripoté"
+
+#: src/Core/L10n.php:415
+msgid "rebuff"
+msgstr "rabrouer"
+
+#: src/Core/L10n.php:415
+msgid "rebuffed"
+msgstr "a rabroué"
+
+#: src/Core/NotificationsManager.php:175
+msgid "System"
+msgstr "Système"
+
+#: src/Core/NotificationsManager.php:265 src/Core/NotificationsManager.php:277
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s a commenté la publication de %s"
+
+#: src/Core/NotificationsManager.php:276
+#, php-format
+msgid "%s created a new post"
+msgstr "%s a créé une nouvelle publication"
+
+#: src/Core/NotificationsManager.php:290
+#, php-format
+msgid "%s liked %s's post"
+msgstr "%s a aimé la publication de %s"
+
+#: src/Core/NotificationsManager.php:303
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "%s n'a pas aimé la publication de %s"
+
+#: src/Core/NotificationsManager.php:316
+#, php-format
+msgid "%s is attending %s's event"
+msgstr "%s participe à l'événement de %s"
+
+#: src/Core/NotificationsManager.php:329
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s ne participe pas à l'événement de %s"
+
+#: src/Core/NotificationsManager.php:342
+#, php-format
+msgid "%s may attend %s's event"
+msgstr "%s participera peut-être à l'événement de %s"
+
+#: src/Core/NotificationsManager.php:375
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s est désormais ami(e) avec %s"
+
+#: src/Core/NotificationsManager.php:651
+msgid "Friend Suggestion"
+msgstr "Suggestion d'amitié/contact"
+
+#: src/Core/NotificationsManager.php:685
+msgid "Friend/Connect Request"
+msgstr "Demande de connexion/relation"
+
+#: src/Core/NotificationsManager.php:685
+msgid "New Follower"
+msgstr "Nouvel abonné"
+
+#: src/Core/System.php:137
+msgid "Error 400 - Bad Request"
+msgstr ""
+
+#: src/Core/System.php:138
+msgid "Error 401 - Unauthorized"
+msgstr ""
+
+#: src/Core/System.php:139
+msgid "Error 403 - Forbidden"
+msgstr ""
+
+#: src/Core/System.php:140
+msgid "Error 404 - Not Found"
+msgstr ""
+
+#: src/Core/System.php:141
+msgid "Error 500 - Internal Server Error"
+msgstr ""
+
+#: src/Core/System.php:142
+msgid "Error 503 - Service Unavailable"
+msgstr ""
+
+#: src/Core/System.php:150
+msgid ""
+"The server cannot or will not process the request due to an apparent client "
+"error."
+msgstr ""
+
+#: src/Core/System.php:151
+msgid ""
+"Authentication is required and has failed or has not yet been provided."
+msgstr ""
+
+#: src/Core/System.php:152
+msgid ""
+"The request was valid, but the server is refusing action. The user might not"
+" have the necessary permissions for a resource, or may need an account."
+msgstr ""
+
+#: src/Core/System.php:153
+msgid ""
+"The requested resource could not be found but may be available in the "
+"future."
+msgstr ""
+
+#: src/Core/System.php:154
+msgid ""
+"An unexpected condition was encountered and no more specific message is "
+"suitable."
+msgstr ""
+
+#: src/Core/System.php:155
+msgid ""
+"The server is currently unavailable (because it is overloaded or down for "
+"maintenance). Please try again later."
+msgstr ""
+
+#: src/Core/Update.php:168
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "Mise-à-jour %s échouée. Voir les journaux d'erreur."
+
+#: src/Core/Update.php:225
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
+msgstr ""
+
+#: src/Core/Update.php:231
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "Le message d’erreur est\n[pre]%s[/pre]"
+
+#: src/Core/Update.php:260
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
+msgstr ""
+
+#: src/Core/UserImport.php:103
+msgid "Error decoding account file"
+msgstr "Une erreur a été détecté en décodant un fichier utilisateur"
+
+#: src/Core/UserImport.php:109
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Erreur ! Pas de ficher de version existant ! Êtes vous sur un compte Friendica ?"
+
+#: src/Core/UserImport.php:117
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "L'utilisateur '%s' existe déjà sur ce serveur!"
+
+#: src/Core/UserImport.php:153
+msgid "User creation error"
+msgstr "Erreur de création d'utilisateur"
+
+#: src/Core/UserImport.php:171
+msgid "User profile creation error"
+msgstr "Erreur de création du profil utilisateur"
+
+#: src/Core/UserImport.php:215
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d contacts non importés"
+msgstr[1] "%d contacts non importés"
+
+#: src/Core/UserImport.php:280
+msgid "Done. You can now login with your username and password"
+msgstr "Action réalisée. Vous pouvez désormais vous connecter avec votre nom d'utilisateur et votre mot de passe"
+
 #: src/Database/DBStructure.php:47
 msgid "There are no tables on MyISAM."
 msgstr ""
@@ -8479,147 +8235,152 @@ msgstr ""
 msgid "%s: updating %s table."
 msgstr ""
 
-#: src/Model/Contact.php:1037
+#: src/LegacyModule.php:30
+#, php-format
+msgid "Legacy module file not found: %s"
+msgstr ""
+
+#: src/Model/Contact.php:1054
 msgid "Drop Contact"
 msgstr "Supprimer le contact"
 
-#: src/Model/Contact.php:1509
+#: src/Model/Contact.php:1526
 msgid "Organisation"
 msgstr ""
 
-#: src/Model/Contact.php:1513
+#: src/Model/Contact.php:1530
 msgid "News"
 msgstr "Nouvelles"
 
-#: src/Model/Contact.php:1517
+#: src/Model/Contact.php:1534
 msgid "Forum"
 msgstr "Forum"
 
-#: src/Model/Contact.php:1707
+#: src/Model/Contact.php:1724
 msgid "Connect URL missing."
 msgstr "URL de connexion manquante."
 
-#: src/Model/Contact.php:1716
+#: src/Model/Contact.php:1733
 msgid ""
 "The contact could not be added. Please check the relevant network "
 "credentials in your Settings -> Social Networks page."
 msgstr ""
 
-#: src/Model/Contact.php:1755
+#: src/Model/Contact.php:1772
 msgid ""
 "This site is not configured to allow communications with other networks."
 msgstr "Ce site n'est pas configuré pour dialoguer avec d'autres réseaux."
 
-#: src/Model/Contact.php:1756 src/Model/Contact.php:1769
+#: src/Model/Contact.php:1773 src/Model/Contact.php:1786
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr "Aucun protocole de communication ni aucun flux n'a pu être découvert."
 
-#: src/Model/Contact.php:1767
+#: src/Model/Contact.php:1784
 msgid "The profile address specified does not provide adequate information."
 msgstr "L'adresse de profil indiquée ne fournit par les informations adéquates."
 
-#: src/Model/Contact.php:1772
+#: src/Model/Contact.php:1789
 msgid "An author or name was not found."
 msgstr "Aucun auteur ou nom d'auteur n'a pu être trouvé."
 
-#: src/Model/Contact.php:1775
+#: src/Model/Contact.php:1792
 msgid "No browser URL could be matched to this address."
 msgstr "Aucune URL de navigation ne correspond à cette adresse."
 
-#: src/Model/Contact.php:1778
+#: src/Model/Contact.php:1795
 msgid ""
 "Unable to match @-style Identity Address with a known protocol or email "
 "contact."
 msgstr "Impossible de faire correspondre l'adresse d'identité en \"@\" avec un protocole connu ou un contact courriel."
 
-#: src/Model/Contact.php:1779
+#: src/Model/Contact.php:1796
 msgid "Use mailto: in front of address to force email check."
 msgstr "Utilisez mailto: en face d'une adresse pour l'obliger à être reconnue comme courriel."
 
-#: src/Model/Contact.php:1785
+#: src/Model/Contact.php:1802
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr "L'adresse de profil spécifiée correspond à un réseau qui a été désactivé sur ce site."
 
-#: src/Model/Contact.php:1790
+#: src/Model/Contact.php:1807
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr "Profil limité. Cette personne ne sera pas capable de recevoir des notifications directes/personnelles de votre part."
 
-#: src/Model/Contact.php:1843
+#: src/Model/Contact.php:1860
 msgid "Unable to retrieve contact information."
 msgstr "Impossible de récupérer les informations du contact."
 
-#: src/Model/Event.php:61 src/Model/Event.php:78 src/Model/Event.php:436
-#: src/Model/Event.php:916
+#: src/Model/Event.php:61 src/Model/Event.php:78 src/Model/Event.php:435
+#: src/Model/Event.php:915
 msgid "Starts:"
 msgstr "Débute :"
 
-#: src/Model/Event.php:64 src/Model/Event.php:84 src/Model/Event.php:437
-#: src/Model/Event.php:920
+#: src/Model/Event.php:64 src/Model/Event.php:84 src/Model/Event.php:436
+#: src/Model/Event.php:919
 msgid "Finishes:"
 msgstr "Finit :"
 
-#: src/Model/Event.php:386
+#: src/Model/Event.php:385
 msgid "all-day"
 msgstr "toute la journée"
 
-#: src/Model/Event.php:409
+#: src/Model/Event.php:408
 msgid "Jun"
 msgstr "Jun"
 
-#: src/Model/Event.php:412
+#: src/Model/Event.php:411
 msgid "Sept"
 msgstr "Sep"
 
-#: src/Model/Event.php:434
+#: src/Model/Event.php:433
 msgid "No events to display"
 msgstr "Pas d'événement à afficher"
 
-#: src/Model/Event.php:562
+#: src/Model/Event.php:561
 msgid "l, F j"
 msgstr "l, F j"
 
-#: src/Model/Event.php:593
+#: src/Model/Event.php:592
 msgid "Edit event"
 msgstr "Editer l'événement"
 
-#: src/Model/Event.php:594
+#: src/Model/Event.php:593
 msgid "Duplicate event"
 msgstr "Dupliquer l'événement"
 
-#: src/Model/Event.php:595
+#: src/Model/Event.php:594
 msgid "Delete event"
 msgstr "Supprimer l'événement"
 
-#: src/Model/Event.php:627 src/Model/Item.php:3536 src/Model/Item.php:3543
+#: src/Model/Event.php:626 src/Model/Item.php:3554 src/Model/Item.php:3561
 msgid "link to source"
 msgstr "lien original"
 
-#: src/Model/Event.php:849
+#: src/Model/Event.php:848
 msgid "D g:i A"
 msgstr ""
 
-#: src/Model/Event.php:850
+#: src/Model/Event.php:849
 msgid "g:i A"
 msgstr ""
 
-#: src/Model/Event.php:935 src/Model/Event.php:937
+#: src/Model/Event.php:934 src/Model/Event.php:936
 msgid "Show map"
 msgstr "Montrer la carte"
 
-#: src/Model/Event.php:936
+#: src/Model/Event.php:935
 msgid "Hide map"
 msgstr "Cacher la carte"
 
-#: src/Model/Event.php:1028
+#: src/Model/Event.php:1027
 #, php-format
 msgid "%s's birthday"
 msgstr "Anniversaire de %s's"
 
-#: src/Model/Event.php:1029
+#: src/Model/Event.php:1028
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Joyeux anniversaire, %s !"
@@ -8659,34 +8420,34 @@ msgstr "Créer un nouveau groupe"
 msgid "Edit groups"
 msgstr "Modifier les groupes"
 
-#: src/Model/Item.php:3269
+#: src/Model/Item.php:3287
 msgid "activity"
 msgstr "activité"
 
-#: src/Model/Item.php:3271 src/Object/Post.php:457 src/Object/Post.php:469
+#: src/Model/Item.php:3289 src/Object/Post.php:470
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] "commentaire"
 
-#: src/Model/Item.php:3274
+#: src/Model/Item.php:3292
 msgid "post"
 msgstr "publication"
 
-#: src/Model/Item.php:3373
+#: src/Model/Item.php:3391
 #, php-format
 msgid "Content warning: %s"
 msgstr "Avertissement de contenu: %s"
 
-#: src/Model/Item.php:3452
+#: src/Model/Item.php:3470
 msgid "bytes"
 msgstr "octets"
 
-#: src/Model/Item.php:3530
+#: src/Model/Item.php:3548
 msgid "View on separate page"
 msgstr "Voir dans une nouvelle page"
 
-#: src/Model/Item.php:3531
+#: src/Model/Item.php:3549
 msgid "view on separate page"
 msgstr "voir dans une nouvelle page"
 
@@ -8763,6 +8524,10 @@ msgstr "j F, Y"
 msgid "j F"
 msgstr "j F"
 
+#: src/Model/Profile.php:771 src/Util/Temporal.php:147
+msgid "Birthday:"
+msgstr "Anniversaire :"
+
 #: src/Model/Profile.php:778
 msgid "Age:"
 msgstr "Age :"
@@ -8868,134 +8633,138 @@ msgstr ""
 msgid "Enter a valid existing folder"
 msgstr ""
 
-#: src/Model/User.php:270
+#: src/Model/User.php:271
 msgid "Login failed"
 msgstr ""
 
-#: src/Model/User.php:301
+#: src/Model/User.php:302
 msgid "Not enough information to authenticate"
 msgstr ""
 
-#: src/Model/User.php:379
+#: src/Model/User.php:380
 msgid "Password can't be empty"
 msgstr ""
 
-#: src/Model/User.php:398
+#: src/Model/User.php:399
 msgid "Empty passwords are not allowed."
 msgstr ""
 
-#: src/Model/User.php:402
+#: src/Model/User.php:403
 msgid ""
 "The new password has been exposed in a public data dump, please choose "
 "another."
 msgstr ""
 
-#: src/Model/User.php:408
+#: src/Model/User.php:409
 msgid ""
 "The password can't contain accentuated letters, white spaces or colons (:)"
 msgstr ""
 
-#: src/Model/User.php:508
+#: src/Model/User.php:509
 msgid "Passwords do not match. Password unchanged."
 msgstr "Les mots de passe ne correspondent pas. Aucun changement appliqué."
 
-#: src/Model/User.php:515
+#: src/Model/User.php:516
 msgid "An invitation is required."
 msgstr "Une invitation est requise."
 
-#: src/Model/User.php:519
+#: src/Model/User.php:520
 msgid "Invitation could not be verified."
 msgstr "L'invitation fournie n'a pu être validée."
 
-#: src/Model/User.php:526
+#: src/Model/User.php:527
 msgid "Invalid OpenID url"
 msgstr "Adresse OpenID invalide"
 
-#: src/Model/User.php:539 src/Module/Login.php:106
+#: src/Model/User.php:540 src/Module/Login.php:106
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr "Nous avons eu un souci avec l'OpenID que vous avez fourni. Merci de vérifier qu'il est correctement écrit."
 
-#: src/Model/User.php:539 src/Module/Login.php:106
+#: src/Model/User.php:540 src/Module/Login.php:106
 msgid "The error message was:"
 msgstr "Le message d'erreur était :"
 
-#: src/Model/User.php:545
+#: src/Model/User.php:546
 msgid "Please enter the required information."
 msgstr "Entrez les informations requises."
 
-#: src/Model/User.php:559
+#: src/Model/User.php:560
 #, php-format
 msgid ""
 "system.username_min_length (%s) and system.username_max_length (%s) are "
 "excluding each other, swapping values."
 msgstr ""
 
-#: src/Model/User.php:566
+#: src/Model/User.php:567
 #, php-format
 msgid "Username should be at least %s character."
 msgid_plural "Username should be at least %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/User.php:570
+#: src/Model/User.php:571
 #, php-format
 msgid "Username should be at most %s character."
 msgid_plural "Username should be at most %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/User.php:578
+#: src/Model/User.php:579
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr "Ceci ne semble pas être votre nom complet (Prénom Nom)."
 
-#: src/Model/User.php:583
+#: src/Model/User.php:584
 msgid "Your email domain is not among those allowed on this site."
 msgstr "Votre domaine de courriel n'est pas autorisé sur ce site."
 
-#: src/Model/User.php:587
+#: src/Model/User.php:588
 msgid "Not a valid email address."
 msgstr "Ceci n'est pas une adresse courriel valide."
 
-#: src/Model/User.php:590
+#: src/Model/User.php:591
 msgid "The nickname was blocked from registration by the nodes admin."
 msgstr ""
 
-#: src/Model/User.php:594 src/Model/User.php:602
+#: src/Model/User.php:595 src/Model/User.php:603
 msgid "Cannot use that email."
 msgstr "Impossible d'utiliser ce courriel."
 
-#: src/Model/User.php:609
+#: src/Model/User.php:610
 msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr ""
 
-#: src/Model/User.php:616 src/Model/User.php:673
+#: src/Model/User.php:617 src/Model/User.php:674
 msgid "Nickname is already registered. Please choose another."
 msgstr "Pseudo déjà utilisé. Merci d'en choisir un autre."
 
-#: src/Model/User.php:626
+#: src/Model/User.php:627
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "ERREUR FATALE : La génération des clés de sécurité a échoué."
 
-#: src/Model/User.php:660 src/Model/User.php:664
+#: src/Model/User.php:661 src/Model/User.php:665
 msgid "An error occurred during registration. Please try again."
 msgstr "Une erreur est survenue lors de l'inscription. Merci de recommencer."
 
-#: src/Model/User.php:689
+#: src/Model/User.php:685 view/theme/duepuntozero/config.php:55
+msgid "default"
+msgstr "défaut"
+
+#: src/Model/User.php:690
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "Une erreur est survenue lors de la création de votre profil par défaut. Merci de recommencer."
 
-#: src/Model/User.php:696
+#: src/Model/User.php:697
 msgid "An error occurred creating your self contact. Please try again."
 msgstr ""
 
-#: src/Model/User.php:705
+#: src/Model/User.php:706
 msgid ""
 "An error occurred creating your default contact group. Please try again."
 msgstr ""
 
-#: src/Model/User.php:781
+#: src/Model/User.php:782
 #, php-format
 msgid ""
 "\n"
@@ -9010,12 +8779,12 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: src/Model/User.php:798
+#: src/Model/User.php:799
 #, php-format
 msgid "Registration at %s"
 msgstr ""
 
-#: src/Model/User.php:817
+#: src/Model/User.php:818
 #, php-format
 msgid ""
 "\n"
@@ -9024,7 +8793,7 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: src/Model/User.php:823
+#: src/Model/User.php:824
 #, php-format
 msgid ""
 "\n"
@@ -9056,52 +8825,6 @@ msgid ""
 "\t\t\tThank you and welcome to %2$s."
 msgstr ""
 
-#: src/Protocol/Diaspora.php:2496
-msgid "Sharing notification from Diaspora network"
-msgstr "Notification de partage du réseau Diaspora"
-
-#: src/Protocol/Diaspora.php:3613
-msgid "Attachments:"
-msgstr "Pièces jointes : "
-
-#: src/Protocol/OStatus.php:1302 src/Module/Profile.php:102
-#: src/Module/Profile.php:105
-#, php-format
-msgid "%s's timeline"
-msgstr ""
-
-#: src/Protocol/OStatus.php:1306 src/Module/Profile.php:103
-#, php-format
-msgid "%s's posts"
-msgstr ""
-
-#: src/Protocol/OStatus.php:1309 src/Module/Profile.php:104
-#, php-format
-msgid "%s's comments"
-msgstr ""
-
-#: src/Protocol/OStatus.php:1866
-#, php-format
-msgid "%s is now following %s."
-msgstr "%s suit désormais %s."
-
-#: src/Protocol/OStatus.php:1867
-msgid "following"
-msgstr "following"
-
-#: src/Protocol/OStatus.php:1870
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%s ne suit plus %s."
-
-#: src/Protocol/OStatus.php:1871
-msgid "stopped following"
-msgstr "retiré de la liste de suivi"
-
-#: src/Worker/Delivery.php:453
-msgid "(no subject)"
-msgstr "(sans titre)"
-
 #: src/Module/Attach.php:36 src/Module/Attach.php:48
 msgid "Item was not found."
 msgstr "Element introuvable."
@@ -9611,6 +9334,22 @@ msgstr "politique de confidentialité"
 msgid "Logged out."
 msgstr "Déconnecté."
 
+#: src/Module/Profile.php:102 src/Module/Profile.php:105
+#: src/Protocol/OStatus.php:1302
+#, php-format
+msgid "%s's timeline"
+msgstr ""
+
+#: src/Module/Profile.php:103 src/Protocol/OStatus.php:1306
+#, php-format
+msgid "%s's posts"
+msgstr ""
+
+#: src/Module/Profile.php:104 src/Protocol/OStatus.php:1309
+#, php-format
+msgid "%s's comments"
+msgstr ""
+
 #: src/Module/Proxy.php:73
 msgid "Bad Request."
 msgstr ""
@@ -9839,60 +9578,142 @@ msgstr "Inter-mur"
 msgid "via Wall-To-Wall:"
 msgstr "en Inter-mur :"
 
-#: src/Object/Post.php:432
-msgid "Notifier task is pending"
+#: src/Object/Post.php:418
+#, php-format
+msgid "Reply to %s"
 msgstr ""
 
 #: src/Object/Post.php:433
-msgid "Delivery to remote servers is pending"
+msgid "Notifier task is pending"
 msgstr ""
 
 #: src/Object/Post.php:434
-msgid "Delivery to remote servers is underway"
+msgid "Delivery to remote servers is pending"
 msgstr ""
 
 #: src/Object/Post.php:435
-msgid "Delivery to remote servers is mostly done"
+msgid "Delivery to remote servers is underway"
 msgstr ""
 
 #: src/Object/Post.php:436
+msgid "Delivery to remote servers is mostly done"
+msgstr ""
+
+#: src/Object/Post.php:437
 msgid "Delivery to remote servers is done"
 msgstr ""
 
-#: src/Object/Post.php:455
+#: src/Object/Post.php:457
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d commentaire"
 msgstr[1] "%d commentaires"
 
-#: src/App.php:665
-msgid "Delete this item?"
-msgstr "Effacer cet élément?"
-
-#: src/App.php:667
-msgid "show fewer"
-msgstr "montrer moins"
-
-#: src/App.php:709
-msgid "toggle mobile"
-msgstr "activ. mobile"
-
-#: src/App.php:1077
-msgid "No system theme config value set."
+#: src/Object/Post.php:458
+msgid "Show more"
 msgstr ""
 
-#: src/BaseModule.php:133
-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 "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probablement dire que le formulaire est resté ouvert trop longtemps (plus de 3 heures) avant d'être validé."
+#: src/Object/Post.php:459
+msgid "Show fewer"
+msgstr ""
 
-#: src/LegacyModule.php:30
+#: src/Protocol/Diaspora.php:2496
+msgid "Sharing notification from Diaspora network"
+msgstr "Notification de partage du réseau Diaspora"
+
+#: src/Protocol/Diaspora.php:3613
+msgid "Attachments:"
+msgstr "Pièces jointes : "
+
+#: src/Protocol/OStatus.php:1866
 #, php-format
-msgid "Legacy module file not found: %s"
+msgid "%s is now following %s."
+msgstr "%s suit désormais %s."
+
+#: src/Protocol/OStatus.php:1867
+msgid "following"
+msgstr "following"
+
+#: src/Protocol/OStatus.php:1870
+#, php-format
+msgid "%s stopped following %s."
+msgstr "%s ne suit plus %s."
+
+#: src/Protocol/OStatus.php:1871
+msgid "stopped following"
+msgstr "retiré de la liste de suivi"
+
+#: src/Util/Temporal.php:151
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "AAAA-MM-JJ ou MM-JJ"
+
+#: src/Util/Temporal.php:298
+msgid "never"
+msgstr "jamais"
+
+#: src/Util/Temporal.php:305
+msgid "less than a second ago"
+msgstr "il y a moins d'une seconde"
+
+#: src/Util/Temporal.php:313
+msgid "year"
+msgstr "an"
+
+#: src/Util/Temporal.php:313
+msgid "years"
+msgstr "ans"
+
+#: src/Util/Temporal.php:314
+msgid "months"
+msgstr "mois"
+
+#: src/Util/Temporal.php:315
+msgid "weeks"
+msgstr "semaines"
+
+#: src/Util/Temporal.php:316
+msgid "days"
+msgstr "jours"
+
+#: src/Util/Temporal.php:317
+msgid "hour"
+msgstr "heure"
+
+#: src/Util/Temporal.php:317
+msgid "hours"
+msgstr "heures"
+
+#: src/Util/Temporal.php:318
+msgid "minute"
+msgstr "minute"
+
+#: src/Util/Temporal.php:318
+msgid "minutes"
+msgstr "minutes"
+
+#: src/Util/Temporal.php:319
+msgid "second"
+msgstr "seconde"
+
+#: src/Util/Temporal.php:319
+msgid "seconds"
+msgstr "secondes"
+
+#: src/Util/Temporal.php:329
+#, php-format
+msgid "in %1$d %2$s"
 msgstr ""
 
+#: src/Util/Temporal.php:332
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr "il y a %1$d %2$s "
+
+#: src/Worker/Delivery.php:453
+msgid "(no subject)"
+msgstr "(sans titre)"
+
 #: update.php:217
 #, php-format
 msgid "%s: Updating author-id and owner-id in item and thread table. "
@@ -9902,3 +9723,191 @@ msgstr ""
 #, php-format
 msgid "%s: Updating post-type."
 msgstr ""
+
+#: view/theme/duepuntozero/config.php:56
+msgid "greenzero"
+msgstr "greenzero"
+
+#: view/theme/duepuntozero/config.php:57
+msgid "purplezero"
+msgstr "purplezero"
+
+#: view/theme/duepuntozero/config.php:58
+msgid "easterbunny"
+msgstr "easterbunny"
+
+#: view/theme/duepuntozero/config.php:59
+msgid "darkzero"
+msgstr "darkzero"
+
+#: view/theme/duepuntozero/config.php:60
+msgid "comix"
+msgstr "comix"
+
+#: view/theme/duepuntozero/config.php:61
+msgid "slackr"
+msgstr "slackr"
+
+#: view/theme/duepuntozero/config.php:75
+msgid "Variations"
+msgstr "Variations"
+
+#: view/theme/frio/config.php:103
+msgid "Custom"
+msgstr "Personnalisé"
+
+#: view/theme/frio/config.php:115
+msgid "Note"
+msgstr "Remarque"
+
+#: view/theme/frio/config.php:115
+msgid "Check image permissions if all users are allowed to see the image"
+msgstr "Vérifier que tous les utilisateurs du site sont autorisés à voir l'image."
+
+#: view/theme/frio/config.php:122
+msgid "Select color scheme"
+msgstr "Choisir le schéma de couleurs"
+
+#: view/theme/frio/config.php:123
+msgid "Navigation bar background color"
+msgstr "Couleur d'arrière-plan de la barre de navigation"
+
+#: view/theme/frio/config.php:124
+msgid "Navigation bar icon color "
+msgstr "Couleur des icônes de la barre de navigation"
+
+#: view/theme/frio/config.php:125
+msgid "Link color"
+msgstr "Couleur des liens"
+
+#: view/theme/frio/config.php:126
+msgid "Set the background color"
+msgstr "Couleur d'arrière-plan"
+
+#: view/theme/frio/config.php:127
+msgid "Content background opacity"
+msgstr "Opacité du contenu d'arrière-plan"
+
+#: view/theme/frio/config.php:128
+msgid "Set the background image"
+msgstr "Image d'arrière-plan"
+
+#: view/theme/frio/config.php:129
+msgid "Background image style"
+msgstr "Style de l'image de fond"
+
+#: view/theme/frio/config.php:134
+msgid "Login page background image"
+msgstr "Image de fond de la page de login"
+
+#: view/theme/frio/config.php:138
+msgid "Login page background color"
+msgstr "Couleur d'arrière-plan de la page de login"
+
+#: view/theme/frio/config.php:138
+msgid "Leave background image and color empty for theme defaults"
+msgstr "Laisser l'image et la couleur de fond vides pour les paramètres par défaut du thème"
+
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
+msgstr "Bannière du haut"
+
+#: view/theme/frio/php/Image.php:24
+msgid ""
+"Resize image to the width of the screen and show background color below on "
+"long pages."
+msgstr "Redimensionner l'image à la largeur de l'écran et combler en dessous avec la couleur d'arrière plan."
+
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
+msgstr "Plein écran"
+
+#: view/theme/frio/php/Image.php:25
+msgid ""
+"Resize image to fill entire screen, clipping either the right or the bottom."
+msgstr "Agrandir l'image pour remplir l'écran, jusqu'à toucher le bord droit ou le bas de l'écran."
+
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
+msgstr "Mosaïque sur un rang"
+
+#: view/theme/frio/php/Image.php:26
+msgid ""
+"Resize image to repeat it on a single row, either vertical or horizontal."
+msgstr "Redimensionner l'image pour la dupliquer sur un seul rang, vertical ou horizontal."
+
+#: view/theme/frio/php/Image.php:27
+msgid "Mosaic"
+msgstr "Mosaïque"
+
+#: view/theme/frio/php/Image.php:27
+msgid "Repeat image to fill the screen."
+msgstr "Dupliquer l'image pour couvrir l'écran."
+
+#: view/theme/frio/theme.php:239
+msgid "Guest"
+msgstr "Invité"
+
+#: view/theme/frio/theme.php:244
+msgid "Visitor"
+msgstr "Visiteur"
+
+#: view/theme/quattro/config.php:77
+msgid "Alignment"
+msgstr "Alignement"
+
+#: view/theme/quattro/config.php:77
+msgid "Left"
+msgstr "Gauche"
+
+#: view/theme/quattro/config.php:77
+msgid "Center"
+msgstr "Centre"
+
+#: view/theme/quattro/config.php:78
+msgid "Color scheme"
+msgstr "Palette de couleurs"
+
+#: view/theme/quattro/config.php:79
+msgid "Posts font size"
+msgstr "Taille de texte des publications"
+
+#: view/theme/quattro/config.php:80
+msgid "Textareas font size"
+msgstr "Taille de police des zones de texte"
+
+#: view/theme/vier/config.php:76
+msgid "Comma separated list of helper forums"
+msgstr "Liste de forums d'aide, séparés par des virgules"
+
+#: view/theme/vier/config.php:123
+msgid "Set style"
+msgstr "Définir le style"
+
+#: view/theme/vier/config.php:124
+msgid "Community Pages"
+msgstr "Pages de Communauté"
+
+#: view/theme/vier/config.php:125 view/theme/vier/theme.php:151
+msgid "Community Profiles"
+msgstr "Profils communautaires"
+
+#: view/theme/vier/config.php:126
+msgid "Help or @NewHere ?"
+msgstr "Aide ou @NewHere?"
+
+#: view/theme/vier/config.php:127 view/theme/vier/theme.php:373
+msgid "Connect Services"
+msgstr "Connecter des services"
+
+#: view/theme/vier/config.php:128
+msgid "Find Friends"
+msgstr "Trouver des amis"
+
+#: view/theme/vier/config.php:129 view/theme/vier/theme.php:181
+msgid "Last users"
+msgstr "Derniers utilisateurs"
+
+#: view/theme/vier/theme.php:288
+msgid "Quick Start"
+msgstr "Démarrage rapide"
diff --git a/view/lang/fr/strings.php b/view/lang/fr/strings.php
index 6f4943a97..bdf5ef5f4 100644
--- a/view/lang/fr/strings.php
+++ b/view/lang/fr/strings.php
@@ -7,8 +7,8 @@ function string_plural_select_fr($n){
 }}
 ;
 $a->strings["Daily posting limit of %d post reached. The post was rejected."] = [
-	0 => "Limite quotidienne de publications de%d atteinte. La publication a été rejetée.",
-	1 => "Limite quotidienne de %dpublications atteinte.  La publication a été rejetée.",
+	0 => "Limite quotidienne d'%d publication atteinte. La publication a été rejetée.",
+	1 => "Limite quotidienne de %d publications atteinte.  La publication a été rejetée.",
 ];
 $a->strings["Weekly posting limit of %d post reached. The post was rejected."] = [
 	0 => "Limite hebdomadaire d'%d unique publication atteinte, votre soumission a été rejetée.",
@@ -195,10 +195,6 @@ $a->strings["Yes"] = "Oui";
 $a->strings["Permission denied."] = "Permission refusée.";
 $a->strings["Archives"] = "Archives";
 $a->strings["show more"] = "montrer plus";
-$a->strings["You must be logged in to use addons. "] = "Vous devez être connecté pour utiliser les greffons.";
-$a->strings["Applications"] = "Applications";
-$a->strings["No installed applications."] = "Pas d'application installée.";
-$a->strings["System down for maintenance"] = "Système indisponible pour cause de maintenance";
 $a->strings["Theme settings updated."] = "Réglages du thème sauvés.";
 $a->strings["Information"] = "Information";
 $a->strings["Overview"] = "Synthèse";
@@ -442,8 +438,8 @@ $a->strings["Posts per user on community page"] = "Nombre de publications par ut
 $a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "Nombre maximal de publications par utilisateurs sur la page de la communauté (ne s'applique pas pour « Communauté globale »).";
 $a->strings["Disable OStatus support"] = "Désactiver OStatus";
 $a->strings["Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Désactive le support natif d'OStatus (StatusNet, GNU Social, etc...). Toutes les communications via OStatus sont publiques, donc des avertissements de protection de vie privée sont régulièrement affichés.";
-$a->strings["Only import OStatus/ActivityPub threads from our contacts"] = "";
-$a->strings["Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system."] = "";
+$a->strings["Only import OStatus/ActivityPub threads from our contacts"] = "Importer seulement les conversations OStatus/ActivityPub provenant de profils distants connus.";
+$a->strings["Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system."] = "Normalement toutes les conversations auxquelles les contacts suivis participent sont importées en entier peu importe l'auteur original. Avec cette option, seules les conversations démarrées par un contact suivi sont importées.";
 $a->strings["OStatus support can only be enabled if threading is enabled."] = "Le support OStatus ne peut être activé que si l'imbrication des commentaires est activée.";
 $a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "Le support de Diaspora ne peut pas être activé parce que Friendica a été installé dans un sous-répertoire.";
 $a->strings["Enable Diaspora support"] = "Activer le support de Diaspora";
@@ -460,10 +456,10 @@ $a->strings["Maximum Load Average"] = "Plafond de la charge moyenne";
 $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Charge système maximale à partir de laquelle l'émission et la réception seront soumises à un délai supplémentaire. Par défaut, 50.";
 $a->strings["Maximum Load Average (Frontend)"] = "Plafond de la charge moyenne (frontale)";
 $a->strings["Maximum system load before the frontend quits service - default 50."] = "Limite de charge système pour le rendu des pages - défaut 50.";
-$a->strings["Minimal Memory"] = "";
-$a->strings["Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated)."] = "";
+$a->strings["Minimal Memory"] = "Mémoire minimum";
+$a->strings["Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated)."] = "Mémoire libre minimale pour les tâches de fond (en Mo). Requiert l'accès à <code>/proc/meminfo</code>. La valeur par défaut est 0 (désactivé).";
 $a->strings["Maximum table size for optimization"] = "Limite de taille de table pour l'optimisation";
-$a->strings["Maximum table size (in MB) for the automatic optimization. Enter -1 to disable it."] = "";
+$a->strings["Maximum table size (in MB) for the automatic optimization. Enter -1 to disable it."] = "Limite de taille de table (en Mo) pour l'optimisation automatique. -1 pour désactiver cette limite.";
 $a->strings["Minimum level of fragmentation"] = "Seuil de fragmentation";
 $a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "Seuil de fragmentation pour que l'optimisation automatique se déclenche - défaut 30%.";
 $a->strings["Periodical check of global contacts"] = "Vérification périodique des contacts globaux";
@@ -471,7 +467,7 @@ $a->strings["If enabled, the global contacts are checked periodically for missin
 $a->strings["Days between requery"] = "Nombre de jours entre les requêtes";
 $a->strings["Number of days after which a server is requeried for his contacts."] = "Nombre de jours avant qu'une requête de contacts soient envoyée à nouveau à un serveur.";
 $a->strings["Discover contacts from other servers"] = "Découvrir des contacts des autres serveurs";
-$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommended setting is 'Users, Global Contacts'."] = "";
+$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommended setting is 'Users, Global Contacts'."] = "Demande régulièrement les serveurs distants connus une liste de profils distants. \"Utilisateurs\" concerne les utilisateurs locaux du serveur distant, \"Contacts Globaux\" concerne tous les profils dont le serveur distant a connaissance. \"Alternative\" est prévu pour les serveurs RedMatrix et les versions obsolètes de Friendica. Ce choix augmente significativement la charge serveur, donc le choix recommendé est \"Utilisateurs, Contacts Globaux\".";
 $a->strings["Timeframe for fetching global contacts"] = "Fréquence de récupération des contacts globaux";
 $a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "Quand la découverte de contacts est activée, cette valeur détermine la fréquence de récupération des données des contacts globaux présents sur d'autres serveurs.";
 $a->strings["Search the local directory"] = "Chercher dans le répertoire local";
@@ -482,16 +478,16 @@ $a->strings["Check upstream version"] = "Mises à jour";
 $a->strings["Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."] = "Permet de vérifier la présence de nouvelles versions de Friendica sur github. Si une nouvelle version est disponible, vous recevrez une notification dans l'interface d'administration.";
 $a->strings["Suppress Tags"] = "Masquer les tags";
 $a->strings["Suppress showing a list of hashtags at the end of the posting."] = "Ne pas afficher la liste des hashtags à la fin d’un message.";
-$a->strings["Clean database"] = "";
-$a->strings["Remove old remote items, orphaned database records and old content from some other helper tables."] = "";
-$a->strings["Lifespan of remote items"] = "";
-$a->strings["When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour."] = "";
-$a->strings["Lifespan of unclaimed items"] = "";
-$a->strings["When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0."] = "";
-$a->strings["Lifespan of raw conversation data"] = "";
-$a->strings["The conversation data is used for ActivityPub and OStatus, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days."] = "";
+$a->strings["Clean database"] = "Nettoyer la base de données";
+$a->strings["Remove old remote items, orphaned database records and old content from some other helper tables."] = "Supprime les conversations distantes anciennes, les enregistrements orphelins et le contenu obsolète de certaines tables de débogage.";
+$a->strings["Lifespan of remote items"] = "Durée de vie des conversations distantes";
+$a->strings["When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour."] = "Si le nettoyage de la base de donnée est actif, cette valeur représente le délai en jours après lequel les conversations distantes sont supprimées. Les conversations démarrées par un utilisateur local, étoilées ou archivées sont toujours conservées. 0 pour désactiver.";
+$a->strings["Lifespan of unclaimed items"] = "Durée de vie des conversations relayées";
+$a->strings["When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0."] = "Si le nettoyage de la base de donnée est actif, cette valeur représente le délai en jours après lequel les conversations relayées qui n'ont pas reçu d'interactions locales sont supprimées. La valeur par défaut est 90 jours. 0 pour aligner cette valeur sur la durée de vie des conversations distantes.";
+$a->strings["Lifespan of raw conversation data"] = "Durée de vie des méta-données de conversation";
+$a->strings["The conversation data is used for ActivityPub and OStatus, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days."] = "Cette valeur représente le délai en jours après lequel les méta-données de conversations sont supprimées. Ces méta-données sont utilisées par les protocoles ActivityPub et OStatus, et pour le débogage. Il est prudent de conserver ces meta-données pendant au moins 14 jours. La valeur par défaut est 90 jours.";
 $a->strings["Path to item cache"] = "Chemin vers le cache des objets.";
-$a->strings["The item caches buffers generated bbcode and external images."] = "";
+$a->strings["The item caches buffers generated bbcode and external images."] = "Le cache de publications contient des textes HTML de BBCode compil's et une copie de chaque image distante.";
 $a->strings["Cache duration in seconds"] = "Durée du cache en secondes";
 $a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "Combien de temps les fichiers de cache doivent être maintenu? La valeur par défaut est 86400 secondes (une journée). Pour désactiver le cache de l'item, définissez la valeur à -1.";
 $a->strings["Maximum numbers of comments per post"] = "Nombre maximum de commentaires par publication";
@@ -501,37 +497,37 @@ $a->strings["If you have a restricted system where the webserver can't access th
 $a->strings["Base path to installation"] = "Chemin de base de l'installation";
 $a->strings["If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."] = "Si le système ne peut pas détecter le chemin de l'installation, entrez le bon chemin ici. Ce paramètre doit être utilisé uniquement si vous avez des accès restreints à votre système et que vous n'avez qu'un lien symbolique vers le répertoire web.";
 $a->strings["Disable picture proxy"] = "Désactiver le proxy image ";
-$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth."] = "";
+$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth."] = "Le proxy d'image améliore les performances d'affichage et protège la vie privée des utilisateurs locaux. Il n'est pas recommandé de l'activer sur un serveur avec une bande passante limitée.";
 $a->strings["Only search in tags"] = "Rechercher seulement dans les étiquettes";
 $a->strings["On large systems the text search can slow down the system extremely."] = "La recherche textuelle peut ralentir considérablement les systèmes de grande taille.";
 $a->strings["New base url"] = "Nouvelle URL de base";
-$a->strings["Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."] = "";
+$a->strings["Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."] = "Changer l'URL de base de ce serveur. Envoie un message de déménagement à tous les contacts Friendica et Diaspora des utilisateurs locaux.";
 $a->strings["RINO Encryption"] = "Chiffrement RINO";
 $a->strings["Encryption layer between nodes."] = "Couche de chiffrement entre les nœuds du réseau.";
-$a->strings["Enabled"] = "";
+$a->strings["Enabled"] = "Activé";
 $a->strings["Maximum number of parallel workers"] = "Nombre maximum de processus simultanés";
-$a->strings["On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d."] = "";
+$a->strings["On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d."] = "Sur un hébergement partagé, mettez %d. Sur des serveurs plus puissants, %d est optimal. La valeur par défaut est %d.";
 $a->strings["Don't use 'proc_open' with the worker"] = "Ne pas utiliser 'proc_open' pour les tâches de fond";
 $a->strings["Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of worker calls in your crontab."] = "Activez cette option si votre système ne permet pas d'utiliser 'proc_open'. Cela peut être le cas sur les hébergements partagés. Si vous activez cette option, vous devriez augmenter la fréquence d'appel du \"worker\" dans crontab.";
-$a->strings["Enable fastlane"] = "";
-$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "";
-$a->strings["Enable frontend worker"] = "";
-$a->strings["When enabled the Worker process is triggered when backend access is performed \\x28e.g. messages being delivered\\x29. On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server."] = "";
-$a->strings["Subscribe to relay"] = "";
-$a->strings["Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page."] = "";
-$a->strings["Relay server"] = "";
-$a->strings["Address of the relay server where public posts should be send to. For example https://relay.diasp.org"] = "";
-$a->strings["Direct relay transfer"] = "";
-$a->strings["Enables the direct transfer to other servers without using the relay servers"] = "";
-$a->strings["Relay scope"] = "";
-$a->strings["Can be 'all' or 'tags'. 'all' means that every public post should be received. 'tags' means that only posts with selected tags should be received."] = "";
-$a->strings["all"] = "";
-$a->strings["tags"] = "";
-$a->strings["Server tags"] = "";
-$a->strings["Comma separated list of tags for the 'tags' subscription."] = "";
-$a->strings["Allow user tags"] = "";
-$a->strings["If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'."] = "";
-$a->strings["Start Relocation"] = "";
+$a->strings["Enable fastlane"] = "Activer la file prioritaire";
+$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "La file prioritaire est un ouvrier additionel démarré quand des tâches de fondde grande importance sont bloquées par des tâches de moindre importance dans la file d'attente.";
+$a->strings["Enable frontend worker"] = "Activer l'ouvrier manuel";
+$a->strings["When enabled the Worker process is triggered when backend access is performed \\x28e.g. messages being delivered\\x29. On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server."] = "L'ouvrier manuel est lancé à la réception de messages distants. Sur un petit serveur il est conseillé d'ouvrir %s/worker régulièrement via une tâche planifée. Vous ne devriez activer cette option que si vous ne pouvez pas définir de tâches récurrentes sur votre serveur,";
+$a->strings["Subscribe to relay"] = "S'abonner au relai";
+$a->strings["Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page."] = "Active la réception de conversations publiques relayées. Elles sont affichées dans la page de recherche, les recherches enregistrées et dans la page de communauté globale.";
+$a->strings["Relay server"] = "Serveur relai";
+$a->strings["Address of the relay server where public posts should be send to. For example https://relay.diasp.org"] = "URL du serveur relai auquel les conversations publique locales doivent être soumises.";
+$a->strings["Direct relay transfer"] = "Relai direct";
+$a->strings["Enables the direct transfer to other servers without using the relay servers"] = "Soumet les conversations publiques aux serveurs distants sans passer par le serveur relai.";
+$a->strings["Relay scope"] = "Filtre du relai";
+$a->strings["Can be 'all' or 'tags'. 'all' means that every public post should be received. 'tags' means that only posts with selected tags should be received."] = "\"Tous\" signifie que toutes les conversations publiques en provenance du relai sont acceptées. \"Tags\" signifie que seules les conversations comportant les tags suivants sont acceptées.";
+$a->strings["all"] = "Tous";
+$a->strings["tags"] = "Tags";
+$a->strings["Server tags"] = "Tags de filtre du relai";
+$a->strings["Comma separated list of tags for the 'tags' subscription."] = "Liste de tags séparés par des virgules pour le filtre de relai.";
+$a->strings["Allow user tags"] = "Inclure les tags des utilisateurs";
+$a->strings["If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'."] = "Inclut les tags des recherches enregistrées des utilisateurs au filtre de relai.";
+$a->strings["Start Relocation"] = "Démarrer le déménagement";
 $a->strings["Update has been marked successful"] = "Mise-à-jour validée comme 'réussie'";
 $a->strings["Database structure update %s was successfully applied."] = "La structure de base de données pour la mise à jour %s a été appliquée avec succès.";
 $a->strings["Executing of database structure update %s failed with error: %s"] = "L'exécution de la mise à jour %s pour la structure de base de données a échoué avec l'erreur: %s";
@@ -552,7 +548,7 @@ $a->strings["%s user blocked/unblocked"] = [
 	0 => "%s utilisateur a (dé)bloqué",
 	1 => "%s utilisateurs ont (dé)bloqué",
 ];
-$a->strings["You can't remove yourself"] = "";
+$a->strings["You can't remove yourself"] = "Vous ne pouvez pas supprimer votre propre compte";
 $a->strings["%s user deleted"] = [
 	0 => "%s utilisateur supprimé",
 	1 => "%s utilisateurs supprimés",
@@ -564,50 +560,50 @@ $a->strings["Normal Account Page"] = "Compte normal";
 $a->strings["Soapbox Page"] = "Compte \"boîte à savon\"";
 $a->strings["Public Forum"] = "Forum public";
 $a->strings["Automatic Friend Page"] = "Compte d' \"amitié automatique\"";
-$a->strings["Private Forum"] = "";
+$a->strings["Private Forum"] = "Forum Privé";
 $a->strings["Personal Page"] = "Page personnelle";
-$a->strings["Organisation Page"] = "";
+$a->strings["Organisation Page"] = "Page Associative";
 $a->strings["News Page"] = "Page d'informations";
-$a->strings["Community Forum"] = "";
-$a->strings["Relay"] = "";
+$a->strings["Community Forum"] = "Forum Communautaire";
+$a->strings["Relay"] = "Relai";
 $a->strings["Email"] = "Courriel";
 $a->strings["Register date"] = "Date d'inscription";
 $a->strings["Last login"] = "Dernière connexion";
 $a->strings["Last item"] = "Dernier élément";
-$a->strings["Type"] = "";
+$a->strings["Type"] = "Type";
 $a->strings["Add User"] = "Ajouter l'utilisateur";
 $a->strings["User registrations waiting for confirm"] = "Inscriptions d'utilisateurs en attente de confirmation";
 $a->strings["User waiting for permanent deletion"] = "Utilisateur en attente de suppression définitive";
 $a->strings["Request date"] = "Date de la demande";
 $a->strings["No registrations."] = "Pas d'inscriptions.";
-$a->strings["Note from the user"] = "";
+$a->strings["Note from the user"] = "Message personnel";
 $a->strings["Approve"] = "Approuver";
 $a->strings["Deny"] = "Rejetter";
-$a->strings["User blocked"] = "";
+$a->strings["User blocked"] = "Utilisateur bloqué";
 $a->strings["Site admin"] = "Administration du Site";
 $a->strings["Account expired"] = "Compte expiré";
 $a->strings["New User"] = "Nouvel utilisateur";
-$a->strings["Permanent deletion"] = "";
+$a->strings["Permanent deletion"] = "Suppression définitive";
 $a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Les utilisateurs sélectionnés vont être supprimés!\\n\\nTout ce qu'ils ont posté sur ce site sera définitivement effacé!\\n\\nÊtes-vous certain?";
 $a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'utilisateur {0} va être supprimé!\\n\\nTout ce qu'il a posté sur ce site sera définitivement perdu!\\n\\nÊtes-vous certain?";
 $a->strings["Name of the new user."] = "Nom du nouvel utilisateur.";
 $a->strings["Nickname"] = "Pseudo";
 $a->strings["Nickname of the new user."] = "Pseudo du nouvel utilisateur.";
 $a->strings["Email address of the new user."] = "Adresse mail du nouvel utilisateur.";
-$a->strings["Addon %s disabled."] = "";
-$a->strings["Addon %s enabled."] = "";
+$a->strings["Addon %s disabled."] = "Add-on %s désactivé.";
+$a->strings["Addon %s enabled."] = "Add-on %s activé.";
 $a->strings["Disable"] = "Désactiver";
 $a->strings["Enable"] = "Activer";
 $a->strings["Toggle"] = "Activer/Désactiver";
 $a->strings["Settings"] = "Réglages";
 $a->strings["Author: "] = "Auteur : ";
 $a->strings["Maintainer: "] = "Mainteneur : ";
-$a->strings["Reload active addons"] = "";
-$a->strings["There are currently no addons available on your node. You can find the official addon repository at %1\$s and might find other interesting addons in the open addon registry at %2\$s"] = "";
+$a->strings["Reload active addons"] = "Recharger les add-ons activés.";
+$a->strings["There are currently no addons available on your node. You can find the official addon repository at %1\$s and might find other interesting addons in the open addon registry at %2\$s"] = "Il n'y a pas d'add-on disponible sur votre serveur. Vous pouvez trouver le dépôt officiel d'add-ons sur %1\$s et des add-ons non-officiel dans le répertoire d'add-ons ouvert sur %2\$s.";
 $a->strings["No themes found."] = "Aucun thème trouvé.";
 $a->strings["Screenshot"] = "Capture d'écran";
 $a->strings["Reload active themes"] = "Recharger les thèmes actifs";
-$a->strings["No themes found on the system. They should be placed in %1\$s"] = "";
+$a->strings["No themes found on the system. They should be placed in %1\$s"] = "Aucun thème trouvé. Leur emplacement d'installation est%1\$s.";
 $a->strings["[Experimental]"] = "[Expérimental]";
 $a->strings["[Unsupported]"] = "[Non supporté]";
 $a->strings["Log settings updated."] = "Réglages des journaux mis-à-jour.";
@@ -619,9 +615,9 @@ $a->strings["Log file"] = "Fichier de journaux";
 $a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Accès en écriture par le serveur web requis. Relatif à la racine de votre installation de Friendica.";
 $a->strings["Log level"] = "Niveau de journalisaton";
 $a->strings["PHP logging"] = "Log PHP";
-$a->strings["To temporarily enable logging of PHP errors and warnings you can prepend the following to the index.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "";
-$a->strings["Error trying to open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s exist and is readable."] = "";
-$a->strings["Couldn't open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s is readable."] = "";
+$a->strings["To temporarily enable logging of PHP errors and warnings you can prepend the following to the index.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "Pour activer temporairement la journalisation de PHP vous pouvez insérez les lignes suivantes au début du fichier <code>index.php</code> dans votre répertoire Friendica. The nom de fichier défini dans la ligne <code>'error_log'</code> est relatif au répertoire d'installation de Friendica et le serveur web doit avoir le droit d'écriture sur ce fichier. Les lignes <code>log_errors</code> et <code>display_errors</code> prennent les valeurs <code>0</code>  et <code>1</code> respectivement pour les activer ou désactiver.";
+$a->strings["Error trying to open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s exist and is readable."] = "Erreur lors de l'ouverture du fichier de journal <strong>%1\$s</strong>.\\r\\n<br/>Veuillez vérifier que le fichier %1\$s existe et que le serveur web a le droit de lecture dessus.";
+$a->strings["Couldn't open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s is readable."] = "Erreur lors de l'ouverture du fichier de journal <strong>%1\$s</strong>.\\r\\n<br/>Veuillez vérifier que le fichier %1\$s existe et que le serveur web a le droit de lecture dessus.";
 $a->strings["Off"] = "Éteint";
 $a->strings["On"] = "Allumé";
 $a->strings["Lock feature %s"] = "Verouiller la fonctionnalité %s";
@@ -633,34 +629,37 @@ $a->strings["Return to your app and insert this Securty Code:"] = "Retournez à
 $a->strings["Please login to continue."] = "Merci de vous connecter pour continuer.";
 $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Voulez-vous autoriser cette application à accéder à vos publications et contacts, et/ou à créer des billets à votre place?";
 $a->strings["No"] = "Non";
-$a->strings["Source input"] = "";
-$a->strings["BBCode::toPlaintext"] = "";
-$a->strings["BBCode::convert (raw HTML)"] = "";
-$a->strings["BBCode::convert"] = "";
-$a->strings["BBCode::convert => HTML::toBBCode"] = "";
-$a->strings["BBCode::toMarkdown"] = "";
-$a->strings["BBCode::toMarkdown => Markdown::convert"] = "";
-$a->strings["BBCode::toMarkdown => Markdown::toBBCode"] = "";
-$a->strings["BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"] = "";
-$a->strings["Item Body"] = "";
-$a->strings["Item Tags"] = "";
-$a->strings["Source input (Diaspora format)"] = "";
-$a->strings["Markdown::convert (raw HTML)"] = "";
-$a->strings["Markdown::convert"] = "";
-$a->strings["Markdown::toBBCode"] = "";
-$a->strings["Raw HTML input"] = "";
-$a->strings["HTML Input"] = "";
-$a->strings["HTML::toBBCode"] = "";
-$a->strings["HTML::toBBCode => BBCode::convert"] = "";
-$a->strings["HTML::toBBCode => BBCode::convert (raw HTML)"] = "";
-$a->strings["HTML::toMarkdown"] = "";
-$a->strings["HTML::toPlaintext"] = "";
-$a->strings["Source text"] = "";
-$a->strings["BBCode"] = "";
-$a->strings["Markdown"] = "";
-$a->strings["HTML"] = "";
+$a->strings["You must be logged in to use addons. "] = "Vous devez être connecté pour utiliser les greffons.";
+$a->strings["Applications"] = "Applications";
+$a->strings["No installed applications."] = "Pas d'application installée.";
+$a->strings["Source input"] = "Saisie source";
+$a->strings["BBCode::toPlaintext"] = "BBCode::toPlaintext";
+$a->strings["BBCode::convert (raw HTML)"] = "BBCode::convert (code HTML)";
+$a->strings["BBCode::convert"] = "BBCode::convert";
+$a->strings["BBCode::convert => HTML::toBBCode"] = "BBCode::convert => HTML::toBBCode";
+$a->strings["BBCode::toMarkdown"] = "BBCode::toMarkdown";
+$a->strings["BBCode::toMarkdown => Markdown::convert"] = "BBCode::toMarkdown => Markdown::convert";
+$a->strings["BBCode::toMarkdown => Markdown::toBBCode"] = "BBCode::toMarkdown => Markdown::toBBCode";
+$a->strings["BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"] = "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode";
+$a->strings["Item Body"] = "Corps du message";
+$a->strings["Item Tags"] = "Tags du messages";
+$a->strings["Source input (Diaspora format)"] = "Saisie source (format Diaspora)";
+$a->strings["Markdown::convert (raw HTML)"] = "Markdown::convert (code HTML)";
+$a->strings["Markdown::convert"] = "Markdown::convert";
+$a->strings["Markdown::toBBCode"] = "Markdown::toBBCode";
+$a->strings["Raw HTML input"] = "Saisie code HTML";
+$a->strings["HTML Input"] = "Code HTML";
+$a->strings["HTML::toBBCode"] = "HTML::toBBCode";
+$a->strings["HTML::toBBCode => BBCode::convert"] = "HTML::toBBCode => BBCode::convert";
+$a->strings["HTML::toBBCode => BBCode::convert (raw HTML)"] = "HTML::toBBCode => BBCode::convert (code HTML)";
+$a->strings["HTML::toMarkdown"] = "HTML::toMarkdown";
+$a->strings["HTML::toPlaintext"] = "HTML::toPlaintext";
+$a->strings["Source text"] = "Texte source";
+$a->strings["BBCode"] = "BBCode";
+$a->strings["Markdown"] = "Markdown";
+$a->strings["HTML"] = "HTML";
 $a->strings["Login"] = "Connexion";
-$a->strings["Bad Request"] = "";
+$a->strings["Bad Request"] = "Requête erronée";
 $a->strings["The post was created"] = "La publication a été créée";
 $a->strings["Access denied."] = "Accès refusé.";
 $a->strings["Page not found."] = "Page introuvable.";
@@ -673,7 +672,7 @@ $a->strings["today"] = "aujourd'hui";
 $a->strings["month"] = "mois";
 $a->strings["week"] = "semaine";
 $a->strings["day"] = "jour";
-$a->strings["list"] = "";
+$a->strings["list"] = "liste";
 $a->strings["User not found"] = "Utilisateur introuvable";
 $a->strings["This calendar format is not supported"] = "Format de calendrier inconnu";
 $a->strings["No exportable data found"] = "Rien à exporter";
@@ -681,14 +680,14 @@ $a->strings["calendar"] = "calendrier";
 $a->strings["No contacts in common."] = "Pas de contacts en commun.";
 $a->strings["Common Friends"] = "Amis communs";
 $a->strings["Public access denied."] = "Accès public refusé.";
-$a->strings["Community option not available."] = "";
+$a->strings["Community option not available."] = "L'option communauté n'est pas disponible";
 $a->strings["Not available."] = "Indisponible.";
-$a->strings["Local Community"] = "";
-$a->strings["Posts from local users on this server"] = "";
-$a->strings["Global Community"] = "";
-$a->strings["Posts from users of the whole federated network"] = "";
+$a->strings["Local Community"] = "Communauté locale";
+$a->strings["Posts from local users on this server"] = "Conversations publiques démarrées par des utilisateurs locaux";
+$a->strings["Global Community"] = "Communauté globale";
+$a->strings["Posts from users of the whole federated network"] = "Conversations publiques provenant du réseau fédéré global";
 $a->strings["No results."] = "Aucun résultat.";
-$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "";
+$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Ce fil communautaire liste toutes les conversations publiques reçues par ce serveur. Elles ne reflètent pas nécessairement les opinions personelles des utilisateurs locaux.";
 $a->strings["Credits"] = "Remerciements";
 $a->strings["Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!"] = "Friendica est un projet communautaire, qui ne serait pas possible sans l'aide de beaucoup de gens. Voici une liste de ceux qui ont contribué au code ou à la traduction de Friendica. Merci à tous!";
 $a->strings["Contact settings applied."] = "Réglages du contact appliqués.";
@@ -697,8 +696,8 @@ $a->strings["Contact not found."] = "Contact introuvable.";
 $a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ATTENTION: Manipulation réservée aux experts</strong>, toute information incorrecte pourrait empêcher la communication avec ce contact.";
 $a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "une photo";
 $a->strings["No mirroring"] = "Pas de miroir";
-$a->strings["Mirror as forwarded posting"] = "";
-$a->strings["Mirror as my own posting"] = "";
+$a->strings["Mirror as forwarded posting"] = "Refléter les publications de ce profil comme des partages";
+$a->strings["Mirror as my own posting"] = "Refléter les publications de ce profil comme les vôtres";
 $a->strings["Return to contact editor"] = "Retour à l'éditeur de contact";
 $a->strings["Refetch contact data"] = "Récupérer à nouveau les données de contact";
 $a->strings["Submit"] = "Envoyer";
@@ -708,18 +707,18 @@ $a->strings["Mark this contact as remote_self, this will cause friendica to repo
 $a->strings["Account Nickname"] = "Pseudo du compte";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@NomEtiquette - prend le pas sur Nom/Pseudo";
 $a->strings["Account URL"] = "URL du compte";
-$a->strings["Account URL Alias"] = "";
+$a->strings["Account URL Alias"] = "Alias d'URL du compte";
 $a->strings["Friend Request URL"] = "Echec du téléversement de l'image.";
 $a->strings["Friend Confirm URL"] = "Accès public refusé.";
 $a->strings["Notification Endpoint URL"] = "Aucune photo sélectionnée";
 $a->strings["Poll/Feed URL"] = "Téléverser des photos";
 $a->strings["New photo from this URL"] = "Nouvelle photo depuis cette URL";
-$a->strings["Parent user not found."] = "";
-$a->strings["No parent user"] = "";
-$a->strings["Parent Password:"] = "";
-$a->strings["Please enter the password of the parent account to legitimize your request."] = "";
-$a->strings["Parent User"] = "";
-$a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "";
+$a->strings["Parent user not found."] = "Compte parent inconnu.";
+$a->strings["No parent user"] = "Pas d'utilisateur parent";
+$a->strings["Parent Password:"] = "Mot de passe du compte parent :";
+$a->strings["Please enter the password of the parent account to legitimize your request."] = "Veuillez saisir le mot de passe du compte parent pour authentifier votre requête.";
+$a->strings["Parent User"] = "Compte parent";
+$a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "Le compte parent a un contrôle total sur ce compte, incluant les paramètres de compte. Veuillez vérifier à qui vous donnez cet accès.";
 $a->strings["Delegate Page Management"] = "Déléguer la gestion de la page";
 $a->strings["Delegates"] = "";
 $a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Les délégataires seront capables de gérer tous les aspects de ce compte ou de cette page, à l'exception des réglages de compte. Merci de ne pas déléguer votre compte principal à quelqu'un en qui vous n'avez pas une confiance absolue.";
@@ -783,8 +782,8 @@ $a->strings["Please answer the following:"] = "Merci de répondre à ce qui suit
 $a->strings["Does %s know you?"] = "Est-ce que %s vous connaît?";
 $a->strings["Add a personal note:"] = "Ajouter une note personnelle :";
 $a->strings["Friendica"] = "Friendica";
-$a->strings["GNU Social (Pleroma, Mastodon)"] = "";
-$a->strings["Diaspora (Socialhome, Hubzilla)"] = "";
+$a->strings["GNU Social (Pleroma, Mastodon)"] = "GNU Social (Pleroma, Mastodon)";
+$a->strings["Diaspora (Socialhome, Hubzilla)"] = "Diaspora (Socialhome, Hubzilla)";
 $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - merci de ne pas utiliser ce formulaire.   Entrez plutôt %s dans votre barre de recherche Diaspora.";
 $a->strings["Your Identity Address:"] = "Votre adresse d'identité :";
 $a->strings["Submit Request"] = "Envoyer la requête";
@@ -835,7 +834,7 @@ $a->strings["Contact Photos"] = "Photos du contact";
 $a->strings["Upload"] = "Téléverser";
 $a->strings["Files"] = "Fichiers";
 $a->strings["You must be logged in to use this module"] = "";
-$a->strings["Source URL"] = "";
+$a->strings["Source URL"] = "URL Source";
 $a->strings["- select -"] = "- choisir -";
 $a->strings["The contact could not be added."] = "";
 $a->strings["You already added this contact."] = "Vous avez déjà ajouté ce contact.";
@@ -862,7 +861,7 @@ $a->strings["Group not found."] = "Groupe introuvable.";
 $a->strings["Group name changed."] = "Groupe renommé.";
 $a->strings["Permission denied"] = "Permission refusée";
 $a->strings["Save Group"] = "Sauvegarder le groupe";
-$a->strings["Filter"] = "";
+$a->strings["Filter"] = "Filtre";
 $a->strings["Create a group of contacts/friends."] = "Créez un groupe de contacts/amis.";
 $a->strings["Group Name: "] = "Nom du groupe : ";
 $a->strings["Contacts not in any group"] = "Contacts n'appartenant à aucun groupe";
@@ -939,6 +938,7 @@ $a->strings["Your password may be changed from the <em>Settings</em> page after
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tYour password has been changed as requested. Please retain this\n\t\t\tinformation for your records (or change your password immediately to\n\t\t\tsomething that you will remember).\n\t\t"] = "";
 $a->strings["\n\t\t\tYour login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t%2\$s\n\t\t\tPassword:\t%3\$s\n\n\t\t\tYou may change that password from your account settings page after logging in.\n\t\t"] = "";
 $a->strings["Your password has been changed at %s"] = "Votre mot de passe a été modifié à %s";
+$a->strings["System down for maintenance"] = "Système indisponible pour cause de maintenance";
 $a->strings["Manage Identities and/or Pages"] = "Gérer les identités et/ou les pages";
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Basculez entre les différentes identités ou pages (groupes/communautés) qui se partagent votre compte ou que vous avez été autorisé à gérer.";
 $a->strings["Select an identity to manage: "] = "Choisir une identité à gérer: ";
@@ -1136,19 +1136,6 @@ $a->strings["Recipient"] = "Destinataire";
 $a->strings["Choose what you wish to do to recipient"] = "Choisissez ce que vous voulez faire au destinataire";
 $a->strings["Make this post private"] = "Rendez ce message privé";
 $a->strings["Only logged in users are permitted to perform a probing."] = "";
-$a->strings["Image uploaded but image cropping failed."] = "Image envoyée, mais impossible de la retailler.";
-$a->strings["Image size reduction [%s] failed."] = "Réduction de la taille de l'image [%s] échouée.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Rechargez la page avec la touche Maj pressée, ou bien effacez le cache du navigateur, si d'aventure la nouvelle photo n'apparaissait pas immédiatement.";
-$a->strings["Unable to process image"] = "Impossible de traiter l'image";
-$a->strings["Upload File:"] = "Fichier à téléverser :";
-$a->strings["Select a profile:"] = "Choisir un profil :";
-$a->strings["or"] = "ou";
-$a->strings["skip this step"] = "ignorer cette étape";
-$a->strings["select a photo from your photo albums"] = "choisissez une photo depuis vos albums";
-$a->strings["Crop Image"] = "(Re)cadrer l'image";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Ajustez le cadre de l'image pour une visualisation optimale.";
-$a->strings["Done Editing"] = "Édition terminée";
-$a->strings["Image uploaded successfully."] = "Image téléversée avec succès.";
 $a->strings["Profile deleted."] = "Profil supprimé.";
 $a->strings["Profile-"] = "Profil-";
 $a->strings["New profile created."] = "Nouveau profil créé.";
@@ -1229,6 +1216,19 @@ $a->strings["visible to everybody"] = "visible par tous";
 $a->strings["Edit/Manage Profiles"] = "Editer / gérer les profils";
 $a->strings["Change profile photo"] = "Changer de photo de profil";
 $a->strings["Create New Profile"] = "Créer un nouveau profil";
+$a->strings["Image uploaded but image cropping failed."] = "Image envoyée, mais impossible de la retailler.";
+$a->strings["Image size reduction [%s] failed."] = "Réduction de la taille de l'image [%s] échouée.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Rechargez la page avec la touche Maj pressée, ou bien effacez le cache du navigateur, si d'aventure la nouvelle photo n'apparaissait pas immédiatement.";
+$a->strings["Unable to process image"] = "Impossible de traiter l'image";
+$a->strings["Upload File:"] = "Fichier à téléverser :";
+$a->strings["Select a profile:"] = "Choisir un profil :";
+$a->strings["or"] = "ou";
+$a->strings["skip this step"] = "ignorer cette étape";
+$a->strings["select a photo from your photo albums"] = "choisissez une photo depuis vos albums";
+$a->strings["Crop Image"] = "(Re)cadrer l'image";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Ajustez le cadre de l'image pour une visualisation optimale.";
+$a->strings["Done Editing"] = "Édition terminée";
+$a->strings["Image uploaded successfully."] = "Image téléversée avec succès.";
 $a->strings["Invalid profile identifier."] = "Identifiant de profil invalide.";
 $a->strings["Profile Visibility Editor"] = "Éditer la visibilité du profil";
 $a->strings["Visible To"] = "Visible par";
@@ -1476,286 +1476,20 @@ $a->strings["Upload New Videos"] = "Téléversé une nouvelle vidéo";
 $a->strings["No contacts."] = "Aucun contact.";
 $a->strings["Visit %s's profile [%s]"] = "Visiter le profil de %s [%s]";
 $a->strings["Contacts"] = "Contacts";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Nombre de messages de mur quotidiens pour %s dépassé. Échec du message.";
+$a->strings["Unable to check your home location."] = "Impossible de vérifier votre localisation.";
+$a->strings["No recipient."] = "Pas de destinataire.";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Si vous souhaitez que %s réponde, merci de vérifier vos réglages pour autoriser les messages privés venant d'inconnus.";
 $a->strings["Invalid request."] = "Requête invalide.";
 $a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Désolé, il semble que votre fichier est plus important que ce que la configuration de PHP autorise";
 $a->strings["Or - did you try to upload an empty file?"] = "Ou — auriez-vous essayé de télécharger un fichier vide ?";
 $a->strings["File exceeds size limit of %s"] = "La taille du fichier dépasse la limite de %s";
 $a->strings["File upload failed."] = "Le téléversement a échoué.";
 $a->strings["Wall Photos"] = "Photos du mur";
-$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Nombre de messages de mur quotidiens pour %s dépassé. Échec du message.";
-$a->strings["Unable to check your home location."] = "Impossible de vérifier votre localisation.";
-$a->strings["No recipient."] = "Pas de destinataire.";
-$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Si vous souhaitez que %s réponde, merci de vérifier vos réglages pour autoriser les messages privés venant d'inconnus.";
-$a->strings["default"] = "défaut";
-$a->strings["greenzero"] = "greenzero";
-$a->strings["purplezero"] = "purplezero";
-$a->strings["easterbunny"] = "easterbunny";
-$a->strings["darkzero"] = "darkzero";
-$a->strings["comix"] = "comix";
-$a->strings["slackr"] = "slackr";
-$a->strings["Variations"] = "Variations";
-$a->strings["Top Banner"] = "Bannière du haut";
-$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Redimensionner l'image à la largeur de l'écran et combler en dessous avec la couleur d'arrière plan.";
-$a->strings["Full screen"] = "Plein écran";
-$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Agrandir l'image pour remplir l'écran, jusqu'à toucher le bord droit ou le bas de l'écran.";
-$a->strings["Single row mosaic"] = "Mosaïque sur un rang";
-$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Redimensionner l'image pour la dupliquer sur un seul rang, vertical ou horizontal.";
-$a->strings["Mosaic"] = "Mosaïque";
-$a->strings["Repeat image to fill the screen."] = "Dupliquer l'image pour couvrir l'écran.";
-$a->strings["Custom"] = "Personnalisé";
-$a->strings["Note"] = "Remarque";
-$a->strings["Check image permissions if all users are allowed to see the image"] = "Vérifier que tous les utilisateurs du site sont autorisés à voir l'image.";
-$a->strings["Select color scheme"] = "Choisir le schéma de couleurs";
-$a->strings["Navigation bar background color"] = "Couleur d'arrière-plan de la barre de navigation";
-$a->strings["Navigation bar icon color "] = "Couleur des icônes de la barre de navigation";
-$a->strings["Link color"] = "Couleur des liens";
-$a->strings["Set the background color"] = "Couleur d'arrière-plan";
-$a->strings["Content background opacity"] = "Opacité du contenu d'arrière-plan";
-$a->strings["Set the background image"] = "Image d'arrière-plan";
-$a->strings["Background image style"] = "Style de l'image de fond";
-$a->strings["Login page background image"] = "Image de fond de la page de login";
-$a->strings["Login page background color"] = "Couleur d'arrière-plan de la page de login";
-$a->strings["Leave background image and color empty for theme defaults"] = "Laisser l'image et la couleur de fond vides pour les paramètres par défaut du thème";
-$a->strings["Guest"] = "Invité";
-$a->strings["Visitor"] = "Visiteur";
-$a->strings["Logout"] = "Se déconnecter";
-$a->strings["End this session"] = "Mettre fin à cette session";
-$a->strings["Status"] = "Statut";
-$a->strings["Your posts and conversations"] = "Vos publications et conversations";
-$a->strings["Your profile page"] = "Votre page de profil";
-$a->strings["Your photos"] = "Vos photos";
-$a->strings["Videos"] = "Vidéos";
-$a->strings["Your videos"] = "Vos vidéos";
-$a->strings["Your events"] = "Vos événements";
-$a->strings["Conversations from your friends"] = "Conversations de vos amis";
-$a->strings["Events and Calendar"] = "Événements et agenda";
-$a->strings["Private mail"] = "Messages privés";
-$a->strings["Account settings"] = "Compte";
-$a->strings["Manage/edit friends and contacts"] = "Gérer/éditer les amitiés et contacts";
-$a->strings["Alignment"] = "Alignement";
-$a->strings["Left"] = "Gauche";
-$a->strings["Center"] = "Centre";
-$a->strings["Color scheme"] = "Palette de couleurs";
-$a->strings["Posts font size"] = "Taille de texte des publications";
-$a->strings["Textareas font size"] = "Taille de police des zones de texte";
-$a->strings["Comma separated list of helper forums"] = "Liste de forums d'aide, séparés par des virgules";
-$a->strings["don't show"] = "cacher";
-$a->strings["show"] = "montrer";
-$a->strings["Set style"] = "Définir le style";
-$a->strings["Community Pages"] = "Pages de Communauté";
-$a->strings["Community Profiles"] = "Profils communautaires";
-$a->strings["Help or @NewHere ?"] = "Aide ou @NewHere?";
-$a->strings["Connect Services"] = "Connecter des services";
-$a->strings["Find Friends"] = "Trouver des amis";
-$a->strings["Last users"] = "Derniers utilisateurs";
-$a->strings["Find People"] = "Trouver des personnes";
-$a->strings["Enter name or interest"] = "Entrez un nom ou un centre d'intérêt";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Exemples : Robert Morgenstein, Pêche";
-$a->strings["Similar Interests"] = "Intérêts similaires";
-$a->strings["Random Profile"] = "Profil au hasard";
-$a->strings["Invite Friends"] = "Inviter des amis";
-$a->strings["Local Directory"] = "Annuaire local";
-$a->strings["Forums"] = "Forums";
-$a->strings["External link to forum"] = "Lien sortant vers le forum";
-$a->strings["Quick Start"] = "Démarrage rapide";
-$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "";
-$a->strings["The contact entries have been archived"] = "";
-$a->strings["Enter new password: "] = "";
-$a->strings["Post update version number has been set to %s."] = "";
-$a->strings["Check for pending update actions."] = "";
-$a->strings["Done."] = "";
-$a->strings["Execute pending post updates."] = "";
-$a->strings["All pending post updates are done."] = "";
-$a->strings["Post to Email"] = "Publier aux courriels";
-$a->strings["Hide your profile details from unknown viewers?"] = "Cacher les détails du profil aux visiteurs inconnus?";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Les connecteurs sont désactivés parce que \"%s\" est activé.";
-$a->strings["Visible to everybody"] = "Visible par tout le monde";
-$a->strings["Close"] = "Fermer";
-$a->strings["Welcome "] = "Bienvenue ";
-$a->strings["Please upload a profile photo."] = "Merci d'illustrer votre profil d'une image.";
-$a->strings["Welcome back "] = "Bienvenue à nouveau, ";
-$a->strings["The database configuration file \"config/local.config.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Vous pourriez avoir besoin d'importer le fichier \"database.sql\" manuellement au moyen de phpmyadmin ou de la commande mysql.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Référez-vous au fichier \"INSTALL.txt\".";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH du serveur web.";
-$a->strings["If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"] = "";
-$a->strings["PHP executable path"] = "Chemin vers l'exécutable de PHP";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Entrez le chemin (absolu) vers l'exécutable 'php'. Vous pouvez laisser cette ligne vide pour continuer l'installation.";
-$a->strings["Command line PHP"] = "Version \"ligne de commande\" de PHP";
-$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "L'executable PHP n'est pas le binaire php client (c'est peut être la version cgi-fcgi)";
-$a->strings["Found PHP version: "] = "Version de PHP :";
-$a->strings["PHP cli binary"] = "PHP cli binary";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La version \"ligne de commande\" de PHP de votre système n'a pas \"register_argc_argv\" d'activé.";
-$a->strings["This is required for message delivery to work."] = "Ceci est requis pour que la livraison des messages fonctionne.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Erreur: la fonction \"openssl_pkey_new\" de ce système ne permet pas de générer des clés de chiffrement";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si vous utilisez Windows, merci de vous réferer à \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Generate encryption keys"] = "Générer les clés de chiffrement";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Erreur : Le module \"rewrite\" du serveur web Apache est requis mais pas installé.";
-$a->strings["Apache mod_rewrite module"] = "Module mod_rewrite Apache";
-$a->strings["Error: PDO or MySQLi PHP module required but not installed."] = "";
-$a->strings["Error: The MySQL driver for PDO is not installed."] = "";
-$a->strings["PDO or MySQLi PHP module"] = "";
-$a->strings["Error, XML PHP module required but not installed."] = "Erreur : le module PHP XML requis est absent.";
-$a->strings["XML PHP module"] = "Module PHP XML";
-$a->strings["libCurl PHP module"] = "Module libCurl de PHP";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Erreur : Le module PHP \"libCURL\" est requis mais pas installé.";
-$a->strings["GD graphics PHP module"] = "Module GD (graphiques) de PHP";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Erreur : Le module PHP \"GD\" disposant du support JPEG est requis mais pas installé.";
-$a->strings["OpenSSL PHP module"] = "Module OpenSSL de PHP";
-$a->strings["Error: openssl PHP module required but not installed."] = "Erreur : Le module PHP \"openssl\" est requis mais pas installé.";
-$a->strings["mb_string PHP module"] = "Module mb_string de PHP";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Erreur : le module PHP mb_string est requis mais pas installé.";
-$a->strings["iconv PHP module"] = "";
-$a->strings["Error: iconv PHP module required but not installed."] = "Erreur : Le module PHP iconv requis est absent.";
-$a->strings["POSIX PHP module"] = "";
-$a->strings["Error: POSIX PHP module required but not installed."] = "";
-$a->strings["JSON PHP module"] = "";
-$a->strings["Error: JSON PHP module required but not installed."] = "";
-$a->strings["The web installer needs to be able to create a file called \"local.config.php\" in the \"config\" folder of your web server and it is unable to do so."] = "";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Le plus souvent, il s'agit d'un problème de permission. Le serveur web peut ne pas être capable d'écrire dans votre répertoire - alors que vous-même le pouvez.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder."] = "";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Vous pouvez également sauter cette étape et procéder à une installation manuelle. Pour cela, merci de lire le fichier \"INSTALL.txt\".";
-$a->strings["config/local.config.php is writable"] = "";
-$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica utilise le moteur de modèles Smarty3 pour le rendu d'affichage web. Smarty3 compile les modèles en PHP pour accélérer le rendu.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Pour pouvoir stocker ces modèles compilés, le serveur internet doit avoir accès au droit d'écriture pour le répertoire view/smarty3/ sous le dossier racine de Friendica.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Veuillez vous assurer que l'utilisateur qui exécute votre serveur internet (p. ex. www-data) détient le droit d'accès en écriture sur ce dossier.";
-$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Note: pour plus de sécurité, vous devriez ne donner le droit d'accès en écriture qu'à view/smarty3/ et pas aux fichiers modèles (.tpl) qu'il contient.";
-$a->strings["view/smarty3 is writable"] = "view/smarty3 est autorisé à l écriture";
-$a->strings["Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess."] = "";
-$a->strings["Error message from Curl when fetching"] = "";
-$a->strings["Url rewrite is working"] = "La réécriture d'URL fonctionne.";
-$a->strings["ImageMagick PHP extension is not installed"] = "L'extension PHP ImageMagick n'est pas installée";
-$a->strings["ImageMagick PHP extension is installed"] = "L’extension PHP ImageMagick est installée";
-$a->strings["ImageMagick supports GIF"] = "ImageMagick supporte le format GIF";
-$a->strings["Could not connect to database."] = "Impossible de se connecter à la base.";
-$a->strings["Database already in use."] = "Base de données déjà en cours d'utilisation.";
-$a->strings["Tuesday"] = "Mardi";
-$a->strings["Wednesday"] = "Mercredi";
-$a->strings["Thursday"] = "Jeudi";
-$a->strings["Friday"] = "Vendredi";
-$a->strings["Saturday"] = "Samedi";
-$a->strings["January"] = "Janvier";
-$a->strings["February"] = "Février";
-$a->strings["March"] = "Mars";
-$a->strings["April"] = "Avril";
-$a->strings["May"] = "Mai";
-$a->strings["June"] = "Juin";
-$a->strings["July"] = "Juillet";
-$a->strings["August"] = "Août";
-$a->strings["September"] = "Septembre";
-$a->strings["October"] = "Octobre";
-$a->strings["November"] = "Novembre";
-$a->strings["December"] = "Décembre";
-$a->strings["Mon"] = "Lun";
-$a->strings["Tue"] = "Mar";
-$a->strings["Wed"] = "Mer";
-$a->strings["Thu"] = "Jeu";
-$a->strings["Fri"] = "Ven";
-$a->strings["Sat"] = "Sam";
-$a->strings["Sun"] = "Dim";
-$a->strings["Jan"] = "Jan";
-$a->strings["Feb"] = "Fév";
-$a->strings["Mar"] = "Mar";
-$a->strings["Apr"] = "Avr";
-$a->strings["Jul"] = "Jul";
-$a->strings["Aug"] = "Aoû";
-$a->strings["Sep"] = "";
-$a->strings["Oct"] = "Oct";
-$a->strings["Nov"] = "Nov";
-$a->strings["Dec"] = "Déc";
-$a->strings["poke"] = "titiller";
-$a->strings["poked"] = "a titillé";
-$a->strings["ping"] = "attirer l'attention";
-$a->strings["pinged"] = "a attiré l'attention de";
-$a->strings["prod"] = "aiguillonner";
-$a->strings["prodded"] = "a aiguillonné";
-$a->strings["slap"] = "gifler";
-$a->strings["slapped"] = "a giflé";
-$a->strings["finger"] = "tripoter";
-$a->strings["fingered"] = "a tripoté";
-$a->strings["rebuff"] = "rabrouer";
-$a->strings["rebuffed"] = "a rabroué";
-$a->strings["System"] = "Système";
-$a->strings["Home"] = "Profil";
-$a->strings["Introductions"] = "Introductions";
-$a->strings["%s commented on %s's post"] = "%s a commenté la publication de %s";
-$a->strings["%s created a new post"] = "%s a créé une nouvelle publication";
-$a->strings["%s liked %s's post"] = "%s a aimé la publication de %s";
-$a->strings["%s disliked %s's post"] = "%s n'a pas aimé la publication de %s";
-$a->strings["%s is attending %s's event"] = "%s participe à l'événement de %s";
-$a->strings["%s is not attending %s's event"] = "%s ne participe pas à l'événement de %s";
-$a->strings["%s may attend %s's event"] = "%s participera peut-être à l'événement de %s";
-$a->strings["%s is now friends with %s"] = "%s est désormais ami(e) avec %s";
-$a->strings["Friend Suggestion"] = "Suggestion d'amitié/contact";
-$a->strings["Friend/Connect Request"] = "Demande de connexion/relation";
-$a->strings["New Follower"] = "Nouvel abonné";
-$a->strings["Error 400 - Bad Request"] = "";
-$a->strings["Error 401 - Unauthorized"] = "";
-$a->strings["Error 403 - Forbidden"] = "";
-$a->strings["Error 404 - Not Found"] = "";
-$a->strings["Error 500 - Internal Server Error"] = "";
-$a->strings["Error 503 - Service Unavailable"] = "";
-$a->strings["The server cannot or will not process the request due to an apparent client error."] = "";
-$a->strings["Authentication is required and has failed or has not yet been provided."] = "";
-$a->strings["The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account."] = "";
-$a->strings["The requested resource could not be found but may be available in the future."] = "";
-$a->strings["An unexpected condition was encountered and no more specific message is suitable."] = "";
-$a->strings["The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later."] = "";
-$a->strings["Update %s failed. See error logs."] = "Mise-à-jour %s échouée. Voir les journaux d'erreur.";
-$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "";
-$a->strings["The error message is\n[pre]%s[/pre]"] = "Le message d’erreur est\n[pre]%s[/pre]";
-$a->strings["\n\t\t\t\t\tThe friendica database was successfully updated from %s to %s."] = "";
-$a->strings["Error decoding account file"] = "Une erreur a été détecté en décodant un fichier utilisateur";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Erreur ! Pas de ficher de version existant ! Êtes vous sur un compte Friendica ?";
-$a->strings["User '%s' already exists on this server!"] = "L'utilisateur '%s' existe déjà sur ce serveur!";
-$a->strings["User creation error"] = "Erreur de création d'utilisateur";
-$a->strings["User profile creation error"] = "Erreur de création du profil utilisateur";
-$a->strings["%d contact not imported"] = [
-	0 => "%d contacts non importés",
-	1 => "%d contacts non importés",
-];
-$a->strings["Done. You can now login with your username and password"] = "Action réalisée. Vous pouvez désormais vous connecter avec votre nom d'utilisateur et votre mot de passe";
-$a->strings["Birthday:"] = "Anniversaire :";
-$a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-JJ ou MM-JJ";
-$a->strings["never"] = "jamais";
-$a->strings["less than a second ago"] = "il y a moins d'une seconde";
-$a->strings["year"] = "an";
-$a->strings["years"] = "ans";
-$a->strings["months"] = "mois";
-$a->strings["weeks"] = "semaines";
-$a->strings["days"] = "jours";
-$a->strings["hour"] = "heure";
-$a->strings["hours"] = "heures";
-$a->strings["minute"] = "minute";
-$a->strings["minutes"] = "minutes";
-$a->strings["second"] = "seconde";
-$a->strings["seconds"] = "secondes";
-$a->strings["in %1\$d %2\$s"] = "";
-$a->strings["%1\$d %2\$s ago"] = "il y a %1\$d %2\$s ";
-$a->strings["view full size"] = "voir en pleine taille";
-$a->strings["Image/photo"] = "Image/photo";
-$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
-$a->strings["$1 wrote:"] = "$1 a écrit :";
-$a->strings["Encrypted content"] = "Contenu chiffré";
-$a->strings["Invalid source protocol"] = "";
-$a->strings["Invalid link protocol"] = "";
-$a->strings["Loading more entries..."] = "Chargement de résultats supplémentaires...";
-$a->strings["The end"] = "Fin";
-$a->strings["Follow"] = "S'abonner";
-$a->strings["@name, !forum, #tags, content"] = "@nom, !forum, #tags, contenu";
-$a->strings["Full Text"] = "Texte Entier";
-$a->strings["Tags"] = "Tags";
-$a->strings["Click to open/close"] = "Cliquer pour ouvrir/fermer";
-$a->strings["Export"] = "Exporter";
-$a->strings["Export calendar as ical"] = "Exporter au format iCal";
-$a->strings["Export calendar as csv"] = "Exporter au format CSV";
-$a->strings["No contacts"] = "Aucun contact";
-$a->strings["%d Contact"] = [
-	0 => "%d contact",
-	1 => "%d contacts",
-];
-$a->strings["View Contacts"] = "Voir les contacts";
+$a->strings["Delete this item?"] = "Effacer cet élément?";
+$a->strings["toggle mobile"] = "activ. mobile";
+$a->strings["No system theme config value set."] = "";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probablement dire que le formulaire est resté ouvert trop longtemps (plus de 3 heures) avant d'être validé.";
 $a->strings["Frequently"] = "";
 $a->strings["Hourly"] = "";
 $a->strings["Twice daily"] = "";
@@ -1864,11 +1598,24 @@ $a->strings["Tag Cloud"] = "";
 $a->strings["Provide a personal tag cloud on your profile page"] = "";
 $a->strings["Display Membership Date"] = "";
 $a->strings["Display membership date in profile"] = "";
+$a->strings["Forums"] = "Forums";
+$a->strings["External link to forum"] = "Lien sortant vers le forum";
 $a->strings["Nothing new here"] = "Rien de neuf ici";
 $a->strings["Clear notifications"] = "Effacer les notifications";
+$a->strings["@name, !forum, #tags, content"] = "@nom, !forum, #tags, contenu";
+$a->strings["Logout"] = "Se déconnecter";
+$a->strings["End this session"] = "Mettre fin à cette session";
+$a->strings["Status"] = "Statut";
+$a->strings["Your posts and conversations"] = "Vos publications et conversations";
+$a->strings["Your profile page"] = "Votre page de profil";
+$a->strings["Your photos"] = "Vos photos";
+$a->strings["Videos"] = "Vidéos";
+$a->strings["Your videos"] = "Vos vidéos";
+$a->strings["Your events"] = "Vos événements";
 $a->strings["Personal notes"] = "Notes personnelles";
 $a->strings["Your personal notes"] = "Vos notes personnelles";
 $a->strings["Sign in"] = "Se connecter";
+$a->strings["Home"] = "Profil";
 $a->strings["Home Page"] = "Page d'accueil";
 $a->strings["Register"] = "S'inscrire";
 $a->strings["Create an account"] = "Créer un compte";
@@ -1876,22 +1623,30 @@ $a->strings["Help and documentation"] = "Aide et documentation";
 $a->strings["Apps"] = "Applications";
 $a->strings["Addon applications, utilities, games"] = "Applications supplémentaires, utilitaires, jeux";
 $a->strings["Search site content"] = "Rechercher dans le contenu du site";
+$a->strings["Full Text"] = "Texte Entier";
+$a->strings["Tags"] = "Tags";
 $a->strings["Community"] = "Communauté";
 $a->strings["Conversations on this and other servers"] = "";
+$a->strings["Events and Calendar"] = "Événements et agenda";
 $a->strings["Directory"] = "Annuaire";
 $a->strings["People directory"] = "Annuaire des utilisateurs";
 $a->strings["Information about this friendica instance"] = "Information au sujet de cette instance de friendica";
 $a->strings["Terms of Service of this Friendica instance"] = "";
+$a->strings["Conversations from your friends"] = "Conversations de vos amis";
 $a->strings["Network Reset"] = "Réinitialiser le réseau";
 $a->strings["Load Network page with no filters"] = "Chargement des pages du réseau sans filtre";
+$a->strings["Introductions"] = "Introductions";
 $a->strings["Friend Requests"] = "Demande d'amitié";
 $a->strings["See all notifications"] = "Voir toutes les notifications";
 $a->strings["Mark all system notifications seen"] = "Marquer toutes les notifications système comme 'vues'";
+$a->strings["Private mail"] = "Messages privés";
 $a->strings["Inbox"] = "Messages entrants";
 $a->strings["Outbox"] = "Messages sortants";
 $a->strings["Manage"] = "Gérer";
 $a->strings["Manage other pages"] = "Gérer les autres pages";
+$a->strings["Account settings"] = "Compte";
 $a->strings["Manage/Edit Profiles"] = "Gérer/Éditer les profiles";
+$a->strings["Manage/edit friends and contacts"] = "Gérer/éditer les amitiés et contacts";
 $a->strings["Site setup and configuration"] = "Démarrage et configuration du site";
 $a->strings["Navigation"] = "Navigation";
 $a->strings["Site map"] = "Carte du site";
@@ -1901,6 +1656,26 @@ $a->strings["newer"] = "Plus récent";
 $a->strings["older"] = "Plus ancien";
 $a->strings["prev"] = "précédent";
 $a->strings["last"] = "dernier";
+$a->strings["view full size"] = "voir en pleine taille";
+$a->strings["Image/photo"] = "Image/photo";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
+$a->strings["$1 wrote:"] = "$1 a écrit :";
+$a->strings["Encrypted content"] = "Contenu chiffré";
+$a->strings["Invalid source protocol"] = "";
+$a->strings["Invalid link protocol"] = "";
+$a->strings["Loading more entries..."] = "Chargement de résultats supplémentaires...";
+$a->strings["The end"] = "Fin";
+$a->strings["Follow"] = "S'abonner";
+$a->strings["Click to open/close"] = "Cliquer pour ouvrir/fermer";
+$a->strings["Export"] = "Exporter";
+$a->strings["Export calendar as ical"] = "Exporter au format iCal";
+$a->strings["Export calendar as csv"] = "Exporter au format CSV";
+$a->strings["No contacts"] = "Aucun contact";
+$a->strings["%d Contact"] = [
+	0 => "%d contact",
+	1 => "%d contacts",
+];
+$a->strings["View Contacts"] = "Voir les contacts";
 $a->strings["Add New Contact"] = "Ajouter un nouveau contact";
 $a->strings["Enter address or web location"] = "Entrez son adresse ou sa localisation web";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Exemple : bob@example.com, http://example.com/barbara";
@@ -1908,6 +1683,13 @@ $a->strings["%d invitation available"] = [
 	0 => "%d invitation disponible",
 	1 => "%d invitations disponibles",
 ];
+$a->strings["Find People"] = "Trouver des personnes";
+$a->strings["Enter name or interest"] = "Entrez un nom ou un centre d'intérêt";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Exemples : Robert Morgenstein, Pêche";
+$a->strings["Similar Interests"] = "Intérêts similaires";
+$a->strings["Random Profile"] = "Profil au hasard";
+$a->strings["Invite Friends"] = "Inviter des amis";
+$a->strings["Local Directory"] = "Annuaire local";
 $a->strings["Protocols"] = "";
 $a->strings["All Protocols"] = "";
 $a->strings["Saved Folders"] = "Dossiers sauvegardés";
@@ -1917,11 +1699,170 @@ $a->strings["%d contact in common"] = [
 	0 => "%d contact en commun",
 	1 => "%d contacts en commun",
 ];
+$a->strings["Post to Email"] = "Publier aux courriels";
+$a->strings["Hide your profile details from unknown viewers?"] = "Cacher les détails du profil aux visiteurs inconnus?";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Les connecteurs sont désactivés parce que \"%s\" est activé.";
+$a->strings["Visible to everybody"] = "Visible par tout le monde";
+$a->strings["show"] = "montrer";
+$a->strings["don't show"] = "cacher";
+$a->strings["Close"] = "Fermer";
+$a->strings["Welcome "] = "Bienvenue ";
+$a->strings["Please upload a profile photo."] = "Merci d'illustrer votre profil d'une image.";
+$a->strings["Welcome back "] = "Bienvenue à nouveau, ";
+$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "";
+$a->strings["The contact entries have been archived"] = "";
+$a->strings["Enter new password: "] = "";
+$a->strings["Post update version number has been set to %s."] = "";
+$a->strings["Check for pending update actions."] = "";
+$a->strings["Done."] = "";
+$a->strings["Execute pending post updates."] = "";
+$a->strings["All pending post updates are done."] = "";
+$a->strings["The database configuration file \"config/local.config.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Vous pourriez avoir besoin d'importer le fichier \"database.sql\" manuellement au moyen de phpmyadmin ou de la commande mysql.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Référez-vous au fichier \"INSTALL.txt\".";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH du serveur web.";
+$a->strings["If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"] = "";
+$a->strings["PHP executable path"] = "Chemin vers l'exécutable de PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Entrez le chemin (absolu) vers l'exécutable 'php'. Vous pouvez laisser cette ligne vide pour continuer l'installation.";
+$a->strings["Command line PHP"] = "Version \"ligne de commande\" de PHP";
+$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "L'executable PHP n'est pas le binaire php client (c'est peut être la version cgi-fcgi)";
+$a->strings["Found PHP version: "] = "Version de PHP :";
+$a->strings["PHP cli binary"] = "PHP cli binary";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La version \"ligne de commande\" de PHP de votre système n'a pas \"register_argc_argv\" d'activé.";
+$a->strings["This is required for message delivery to work."] = "Ceci est requis pour que la livraison des messages fonctionne.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Erreur: la fonction \"openssl_pkey_new\" de ce système ne permet pas de générer des clés de chiffrement";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si vous utilisez Windows, merci de vous réferer à \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Générer les clés de chiffrement";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Erreur : Le module \"rewrite\" du serveur web Apache est requis mais pas installé.";
+$a->strings["Apache mod_rewrite module"] = "Module mod_rewrite Apache";
+$a->strings["Error: PDO or MySQLi PHP module required but not installed."] = "";
+$a->strings["Error: The MySQL driver for PDO is not installed."] = "";
+$a->strings["PDO or MySQLi PHP module"] = "";
+$a->strings["Error, XML PHP module required but not installed."] = "Erreur : le module PHP XML requis est absent.";
+$a->strings["XML PHP module"] = "Module PHP XML";
+$a->strings["libCurl PHP module"] = "Module libCurl de PHP";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Erreur : Le module PHP \"libCURL\" est requis mais pas installé.";
+$a->strings["GD graphics PHP module"] = "Module GD (graphiques) de PHP";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Erreur : Le module PHP \"GD\" disposant du support JPEG est requis mais pas installé.";
+$a->strings["OpenSSL PHP module"] = "Module OpenSSL de PHP";
+$a->strings["Error: openssl PHP module required but not installed."] = "Erreur : Le module PHP \"openssl\" est requis mais pas installé.";
+$a->strings["mb_string PHP module"] = "Module mb_string de PHP";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Erreur : le module PHP mb_string est requis mais pas installé.";
+$a->strings["iconv PHP module"] = "";
+$a->strings["Error: iconv PHP module required but not installed."] = "Erreur : Le module PHP iconv requis est absent.";
+$a->strings["POSIX PHP module"] = "";
+$a->strings["Error: POSIX PHP module required but not installed."] = "";
+$a->strings["JSON PHP module"] = "";
+$a->strings["Error: JSON PHP module required but not installed."] = "";
+$a->strings["The web installer needs to be able to create a file called \"local.config.php\" in the \"config\" folder of your web server and it is unable to do so."] = "";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Le plus souvent, il s'agit d'un problème de permission. Le serveur web peut ne pas être capable d'écrire dans votre répertoire - alors que vous-même le pouvez.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder."] = "";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Vous pouvez également sauter cette étape et procéder à une installation manuelle. Pour cela, merci de lire le fichier \"INSTALL.txt\".";
+$a->strings["config/local.config.php is writable"] = "";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica utilise le moteur de modèles Smarty3 pour le rendu d'affichage web. Smarty3 compile les modèles en PHP pour accélérer le rendu.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Pour pouvoir stocker ces modèles compilés, le serveur internet doit avoir accès au droit d'écriture pour le répertoire view/smarty3/ sous le dossier racine de Friendica.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Veuillez vous assurer que l'utilisateur qui exécute votre serveur internet (p. ex. www-data) détient le droit d'accès en écriture sur ce dossier.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Note: pour plus de sécurité, vous devriez ne donner le droit d'accès en écriture qu'à view/smarty3/ et pas aux fichiers modèles (.tpl) qu'il contient.";
+$a->strings["view/smarty3 is writable"] = "view/smarty3 est autorisé à l écriture";
+$a->strings["Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess."] = "";
+$a->strings["Error message from Curl when fetching"] = "";
+$a->strings["Url rewrite is working"] = "La réécriture d'URL fonctionne.";
+$a->strings["ImageMagick PHP extension is not installed"] = "L'extension PHP ImageMagick n'est pas installée";
+$a->strings["ImageMagick PHP extension is installed"] = "L’extension PHP ImageMagick est installée";
+$a->strings["ImageMagick supports GIF"] = "ImageMagick supporte le format GIF";
+$a->strings["Could not connect to database."] = "Impossible de se connecter à la base.";
+$a->strings["Database already in use."] = "Base de données déjà en cours d'utilisation.";
+$a->strings["Tuesday"] = "Mardi";
+$a->strings["Wednesday"] = "Mercredi";
+$a->strings["Thursday"] = "Jeudi";
+$a->strings["Friday"] = "Vendredi";
+$a->strings["Saturday"] = "Samedi";
+$a->strings["January"] = "Janvier";
+$a->strings["February"] = "Février";
+$a->strings["March"] = "Mars";
+$a->strings["April"] = "Avril";
+$a->strings["May"] = "Mai";
+$a->strings["June"] = "Juin";
+$a->strings["July"] = "Juillet";
+$a->strings["August"] = "Août";
+$a->strings["September"] = "Septembre";
+$a->strings["October"] = "Octobre";
+$a->strings["November"] = "Novembre";
+$a->strings["December"] = "Décembre";
+$a->strings["Mon"] = "Lun";
+$a->strings["Tue"] = "Mar";
+$a->strings["Wed"] = "Mer";
+$a->strings["Thu"] = "Jeu";
+$a->strings["Fri"] = "Ven";
+$a->strings["Sat"] = "Sam";
+$a->strings["Sun"] = "Dim";
+$a->strings["Jan"] = "Jan";
+$a->strings["Feb"] = "Fév";
+$a->strings["Mar"] = "Mar";
+$a->strings["Apr"] = "Avr";
+$a->strings["Jul"] = "Jul";
+$a->strings["Aug"] = "Aoû";
+$a->strings["Sep"] = "";
+$a->strings["Oct"] = "Oct";
+$a->strings["Nov"] = "Nov";
+$a->strings["Dec"] = "Déc";
+$a->strings["poke"] = "titiller";
+$a->strings["poked"] = "a titillé";
+$a->strings["ping"] = "attirer l'attention";
+$a->strings["pinged"] = "a attiré l'attention de";
+$a->strings["prod"] = "aiguillonner";
+$a->strings["prodded"] = "a aiguillonné";
+$a->strings["slap"] = "gifler";
+$a->strings["slapped"] = "a giflé";
+$a->strings["finger"] = "tripoter";
+$a->strings["fingered"] = "a tripoté";
+$a->strings["rebuff"] = "rabrouer";
+$a->strings["rebuffed"] = "a rabroué";
+$a->strings["System"] = "Système";
+$a->strings["%s commented on %s's post"] = "%s a commenté la publication de %s";
+$a->strings["%s created a new post"] = "%s a créé une nouvelle publication";
+$a->strings["%s liked %s's post"] = "%s a aimé la publication de %s";
+$a->strings["%s disliked %s's post"] = "%s n'a pas aimé la publication de %s";
+$a->strings["%s is attending %s's event"] = "%s participe à l'événement de %s";
+$a->strings["%s is not attending %s's event"] = "%s ne participe pas à l'événement de %s";
+$a->strings["%s may attend %s's event"] = "%s participera peut-être à l'événement de %s";
+$a->strings["%s is now friends with %s"] = "%s est désormais ami(e) avec %s";
+$a->strings["Friend Suggestion"] = "Suggestion d'amitié/contact";
+$a->strings["Friend/Connect Request"] = "Demande de connexion/relation";
+$a->strings["New Follower"] = "Nouvel abonné";
+$a->strings["Error 400 - Bad Request"] = "";
+$a->strings["Error 401 - Unauthorized"] = "";
+$a->strings["Error 403 - Forbidden"] = "";
+$a->strings["Error 404 - Not Found"] = "";
+$a->strings["Error 500 - Internal Server Error"] = "";
+$a->strings["Error 503 - Service Unavailable"] = "";
+$a->strings["The server cannot or will not process the request due to an apparent client error."] = "";
+$a->strings["Authentication is required and has failed or has not yet been provided."] = "";
+$a->strings["The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account."] = "";
+$a->strings["The requested resource could not be found but may be available in the future."] = "";
+$a->strings["An unexpected condition was encountered and no more specific message is suitable."] = "";
+$a->strings["The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later."] = "";
+$a->strings["Update %s failed. See error logs."] = "Mise-à-jour %s échouée. Voir les journaux d'erreur.";
+$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "";
+$a->strings["The error message is\n[pre]%s[/pre]"] = "Le message d’erreur est\n[pre]%s[/pre]";
+$a->strings["\n\t\t\t\t\tThe friendica database was successfully updated from %s to %s."] = "";
+$a->strings["Error decoding account file"] = "Une erreur a été détecté en décodant un fichier utilisateur";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Erreur ! Pas de ficher de version existant ! Êtes vous sur un compte Friendica ?";
+$a->strings["User '%s' already exists on this server!"] = "L'utilisateur '%s' existe déjà sur ce serveur!";
+$a->strings["User creation error"] = "Erreur de création d'utilisateur";
+$a->strings["User profile creation error"] = "Erreur de création du profil utilisateur";
+$a->strings["%d contact not imported"] = [
+	0 => "%d contacts non importés",
+	1 => "%d contacts non importés",
+];
+$a->strings["Done. You can now login with your username and password"] = "Action réalisée. Vous pouvez désormais vous connecter avec votre nom d'utilisateur et votre mot de passe";
 $a->strings["There are no tables on MyISAM."] = "";
 $a->strings["\nError %d occurred during database update:\n%s\n"] = "\nErreur %d survenue durant la mise à jour de la base de données :\n%s\n";
 $a->strings["Errors encountered performing database changes: "] = "";
 $a->strings["%s: Database update"] = "";
 $a->strings["%s: updating %s table."] = "";
+$a->strings["Legacy module file not found: %s"] = "";
 $a->strings["Drop Contact"] = "Supprimer le contact";
 $a->strings["Organisation"] = "";
 $a->strings["News"] = "Nouvelles";
@@ -1991,6 +1932,7 @@ $a->strings["Upcoming events the next 7 days:"] = "";
 $a->strings["Member since:"] = "";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Anniversaire :";
 $a->strings["Age:"] = "Age :";
 $a->strings["for %1\$d %2\$s"] = "depuis %1\$d %2\$s";
 $a->strings["Religion:"] = "Religion :";
@@ -2046,6 +1988,7 @@ $a->strings["Your nickname can only contain a-z, 0-9 and _."] = "";
 $a->strings["Nickname is already registered. Please choose another."] = "Pseudo déjà utilisé. Merci d'en choisir un autre.";
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERREUR FATALE : La génération des clés de sécurité a échoué.";
 $a->strings["An error occurred during registration. Please try again."] = "Une erreur est survenue lors de l'inscription. Merci de recommencer.";
+$a->strings["default"] = "défaut";
 $a->strings["An error occurred creating your default profile. Please try again."] = "Une erreur est survenue lors de la création de votre profil par défaut. Merci de recommencer.";
 $a->strings["An error occurred creating your self contact. Please try again."] = "";
 $a->strings["An error occurred creating your default contact group. Please try again."] = "";
@@ -2053,16 +1996,6 @@ $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Yo
 $a->strings["Registration at %s"] = "";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "";
 $a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "";
-$a->strings["Sharing notification from Diaspora network"] = "Notification de partage du réseau Diaspora";
-$a->strings["Attachments:"] = "Pièces jointes : ";
-$a->strings["%s's timeline"] = "";
-$a->strings["%s's posts"] = "";
-$a->strings["%s's comments"] = "";
-$a->strings["%s is now following %s."] = "%s suit désormais %s.";
-$a->strings["following"] = "following";
-$a->strings["%s stopped following %s."] = "%s ne suit plus %s.";
-$a->strings["stopped following"] = "retiré de la liste de suivi";
-$a->strings["(no subject)"] = "(sans titre)";
 $a->strings["Item was not found."] = "Element introuvable.";
 $a->strings["%d contact edited."] = [
 	0 => "%d contact mis à jour.",
@@ -2185,6 +2118,9 @@ $a->strings["terms of service"] = "conditions d'utilisation";
 $a->strings["Website Privacy Policy"] = "Politique de confidentialité du site internet";
 $a->strings["privacy policy"] = "politique de confidentialité";
 $a->strings["Logged out."] = "Déconnecté.";
+$a->strings["%s's timeline"] = "";
+$a->strings["%s's posts"] = "";
+$a->strings["%s's comments"] = "";
 $a->strings["Bad Request."] = "";
 $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking \"Register\"."] = "";
 $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si vous n'êtes pas familier avec OpenID, laissez ce champ vide et remplissez le reste.";
@@ -2234,6 +2170,7 @@ $a->strings["to"] = "à";
 $a->strings["via"] = "via";
 $a->strings["Wall-to-Wall"] = "Inter-mur";
 $a->strings["via Wall-To-Wall:"] = "en Inter-mur :";
+$a->strings["Reply to %s"] = "";
 $a->strings["Notifier task is pending"] = "";
 $a->strings["Delivery to remote servers is pending"] = "";
 $a->strings["Delivery to remote servers is underway"] = "";
@@ -2243,11 +2180,76 @@ $a->strings["%d comment"] = [
 	0 => "%d commentaire",
 	1 => "%d commentaires",
 ];
-$a->strings["Delete this item?"] = "Effacer cet élément?";
-$a->strings["show fewer"] = "montrer moins";
-$a->strings["toggle mobile"] = "activ. mobile";
-$a->strings["No system theme config value set."] = "";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probablement dire que le formulaire est resté ouvert trop longtemps (plus de 3 heures) avant d'être validé.";
-$a->strings["Legacy module file not found: %s"] = "";
+$a->strings["Show more"] = "";
+$a->strings["Show fewer"] = "";
+$a->strings["Sharing notification from Diaspora network"] = "Notification de partage du réseau Diaspora";
+$a->strings["Attachments:"] = "Pièces jointes : ";
+$a->strings["%s is now following %s."] = "%s suit désormais %s.";
+$a->strings["following"] = "following";
+$a->strings["%s stopped following %s."] = "%s ne suit plus %s.";
+$a->strings["stopped following"] = "retiré de la liste de suivi";
+$a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-JJ ou MM-JJ";
+$a->strings["never"] = "jamais";
+$a->strings["less than a second ago"] = "il y a moins d'une seconde";
+$a->strings["year"] = "an";
+$a->strings["years"] = "ans";
+$a->strings["months"] = "mois";
+$a->strings["weeks"] = "semaines";
+$a->strings["days"] = "jours";
+$a->strings["hour"] = "heure";
+$a->strings["hours"] = "heures";
+$a->strings["minute"] = "minute";
+$a->strings["minutes"] = "minutes";
+$a->strings["second"] = "seconde";
+$a->strings["seconds"] = "secondes";
+$a->strings["in %1\$d %2\$s"] = "";
+$a->strings["%1\$d %2\$s ago"] = "il y a %1\$d %2\$s ";
+$a->strings["(no subject)"] = "(sans titre)";
 $a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "";
 $a->strings["%s: Updating post-type."] = "";
+$a->strings["greenzero"] = "greenzero";
+$a->strings["purplezero"] = "purplezero";
+$a->strings["easterbunny"] = "easterbunny";
+$a->strings["darkzero"] = "darkzero";
+$a->strings["comix"] = "comix";
+$a->strings["slackr"] = "slackr";
+$a->strings["Variations"] = "Variations";
+$a->strings["Custom"] = "Personnalisé";
+$a->strings["Note"] = "Remarque";
+$a->strings["Check image permissions if all users are allowed to see the image"] = "Vérifier que tous les utilisateurs du site sont autorisés à voir l'image.";
+$a->strings["Select color scheme"] = "Choisir le schéma de couleurs";
+$a->strings["Navigation bar background color"] = "Couleur d'arrière-plan de la barre de navigation";
+$a->strings["Navigation bar icon color "] = "Couleur des icônes de la barre de navigation";
+$a->strings["Link color"] = "Couleur des liens";
+$a->strings["Set the background color"] = "Couleur d'arrière-plan";
+$a->strings["Content background opacity"] = "Opacité du contenu d'arrière-plan";
+$a->strings["Set the background image"] = "Image d'arrière-plan";
+$a->strings["Background image style"] = "Style de l'image de fond";
+$a->strings["Login page background image"] = "Image de fond de la page de login";
+$a->strings["Login page background color"] = "Couleur d'arrière-plan de la page de login";
+$a->strings["Leave background image and color empty for theme defaults"] = "Laisser l'image et la couleur de fond vides pour les paramètres par défaut du thème";
+$a->strings["Top Banner"] = "Bannière du haut";
+$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Redimensionner l'image à la largeur de l'écran et combler en dessous avec la couleur d'arrière plan.";
+$a->strings["Full screen"] = "Plein écran";
+$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Agrandir l'image pour remplir l'écran, jusqu'à toucher le bord droit ou le bas de l'écran.";
+$a->strings["Single row mosaic"] = "Mosaïque sur un rang";
+$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Redimensionner l'image pour la dupliquer sur un seul rang, vertical ou horizontal.";
+$a->strings["Mosaic"] = "Mosaïque";
+$a->strings["Repeat image to fill the screen."] = "Dupliquer l'image pour couvrir l'écran.";
+$a->strings["Guest"] = "Invité";
+$a->strings["Visitor"] = "Visiteur";
+$a->strings["Alignment"] = "Alignement";
+$a->strings["Left"] = "Gauche";
+$a->strings["Center"] = "Centre";
+$a->strings["Color scheme"] = "Palette de couleurs";
+$a->strings["Posts font size"] = "Taille de texte des publications";
+$a->strings["Textareas font size"] = "Taille de police des zones de texte";
+$a->strings["Comma separated list of helper forums"] = "Liste de forums d'aide, séparés par des virgules";
+$a->strings["Set style"] = "Définir le style";
+$a->strings["Community Pages"] = "Pages de Communauté";
+$a->strings["Community Profiles"] = "Profils communautaires";
+$a->strings["Help or @NewHere ?"] = "Aide ou @NewHere?";
+$a->strings["Connect Services"] = "Connecter des services";
+$a->strings["Find Friends"] = "Trouver des amis";
+$a->strings["Last users"] = "Derniers utilisateurs";
+$a->strings["Quick Start"] = "Démarrage rapide";

From 107293bd6173af37bcabb946b932169009ce84b9 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Wed, 20 Feb 2019 17:12:40 +0100
Subject: [PATCH 063/145] Fixing rendertime

---
 src/Util/Profiler.php | 121 +++++++++++++++++++++++-------------------
 1 file changed, 65 insertions(+), 56 deletions(-)

diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index 2d3da3a9c..115e75f7b 100644
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -119,18 +119,76 @@ class Profiler implements ContainerInterface
 		$this->callstack['parser'] = [];
 	}
 
+	/**
+	 * Returns the rendertime string
+	 *
+	 * @return string the rendertime
+	 */
+	public function getRendertimeString()
+	{
+		$output = '';
+
+		if (!$this->enabled || !$this->rendertime) {
+			return $output;
+		}
+
+		if (isset($this->callstack["database"])) {
+			$output .= "\nDatabase Read:\n";
+			foreach ($this->callstack["database"] as $func => $time) {
+				$time = round($time, 3);
+				if ($time > 0) {
+					$output .= $func . ": " . $time . "\n";
+				}
+			}
+		}
+		if (isset($this->callstack["database_write"])) {
+			$output .= "\nDatabase Write:\n";
+			foreach ($this->callstack["database_write"] as $func => $time) {
+				$time = round($time, 3);
+				if ($time > 0) {
+					$output .= $func . ": " . $time . "\n";
+				}
+			}
+		}
+		if (isset($this->callstack["cache"])) {
+			$output .= "\nCache Read:\n";
+			foreach ($this->callstack["cache"] as $func => $time) {
+				$time = round($time, 3);
+				if ($time > 0) {
+					$output .= $func . ": " . $time . "\n";
+				}
+			}
+		}
+		if (isset($this->callstack["cache_write"])) {
+			$output .= "\nCache Write:\n";
+			foreach ($this->callstack["cache_write"] as $func => $time) {
+				$time = round($time, 3);
+				if ($time > 0) {
+					$output .= $func . ": " . $time . "\n";
+				}
+			}
+		}
+		if (isset($this->callstack["network"])) {
+			$output .= "\nNetwork:\n";
+			foreach ($this->callstack["network"] as $func => $time) {
+				$time = round($time, 3);
+				if ($time > 0) {
+					$output .= $func . ": " . $time . "\n";
+				}
+			}
+		}
+
+		return $output;
+	}
+
 	/**
 	 * Save the current profiling data to a log entry
 	 *
-	 * @param LoggerInterface $logger The logger to save the current log
+	 * @param LoggerInterface $logger  The logger to save the current log
 	 * @param string          $message Additional message for the log
 	 */
 	public function saveLog(LoggerInterface $logger, $message = '')
 	{
-		// Write down the performance values into the log
-		if (!$this->enabled) {
-			return;
-		}
 		$duration = microtime(true) - $this->get('start');
 		$logger->info(
 			$message,
@@ -149,57 +207,8 @@ class Profiler implements ContainerInterface
 			]
 		);
 
-		if (!$this->rendertime) {
-			return;
-		}
-		
-		$o = '';
-		if (isset($this->callstack["database"])) {
-			$o .= "\nDatabase Read:\n";
-			foreach ($this->callstack["database"] as $func => $time) {
-				$time = round($time, 3);
-				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
-				}
-			}
-		}
-		if (isset($this->callstack["database_write"])) {
-			$o .= "\nDatabase Write:\n";
-			foreach ($this->callstack["database_write"] as $func => $time) {
-				$time = round($time, 3);
-				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
-				}
-			}
-		}
-		if (isset($this->callstack["cache"])) {
-			$o .= "\nCache Read:\n";
-			foreach ($this->callstack["cache"] as $func => $time) {
-				$time = round($time, 3);
-				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
-				}
-			}
-		}
-		if (isset($this->callstack["cache_write"])) {
-			$o .= "\nCache Write:\n";
-			foreach ($this->callstack["cache_write"] as $func => $time) {
-				$time = round($time, 3);
-				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
-				}
-			}
-		}
-		if (isset($this->callstack["network"])) {
-			$o .= "\nNetwork:\n";
-			foreach ($this->callstack["network"] as $func => $time) {
-				$time = round($time, 3);
-				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
-				}
-			}
-		}
-		$logger->info($message . ": " . $o, ['action' => 'profiling']);
+		$output = $this->getRendertimeString();
+		$logger->info($message . ": " . $output, ['action' => 'profiling']);
 	}
 
 	/**

From 466f7a0ee5eb21dd54c0bea536d562fe1e8afb85 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Wed, 20 Feb 2019 17:20:17 +0100
Subject: [PATCH 064/145] adding test

---
 src/Util/Profiler.php           | 16 ++++++++++++++--
 tests/src/Util/ProfilerTest.php | 20 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index 115e75f7b..c8c563371 100644
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -32,6 +32,16 @@ class Profiler implements ContainerInterface
 	 */
 	private $rendertime;
 
+	/**
+	 * True, if the Profiler should measure the whole rendertime including functions
+	 *
+	 * @return bool
+	 */
+	public function isRendertime()
+	{
+		return $this->rendertime;
+	}
+
 	/**
 	 * @param bool $enabled           True, if the Profiler is enabled
 	 * @param bool $renderTime        True, if the Profiler should measure the whole rendertime including functions
@@ -207,8 +217,10 @@ class Profiler implements ContainerInterface
 			]
 		);
 
-		$output = $this->getRendertimeString();
-		$logger->info($message . ": " . $output, ['action' => 'profiling']);
+		if ($this->isRendertime()) {
+			$output = $this->getRendertimeString();
+			$logger->info($message . ": " . $output, ['action' => 'profiling']);
+		}
 	}
 
 	/**
diff --git a/tests/src/Util/ProfilerTest.php b/tests/src/Util/ProfilerTest.php
index f242fd43c..8ceb59ea5 100644
--- a/tests/src/Util/ProfilerTest.php
+++ b/tests/src/Util/ProfilerTest.php
@@ -177,5 +177,25 @@ class ProfilerTest extends MockedTest
 		}
 
 		$profiler->saveLog($this->logger, 'test');
+
+		$output = $profiler->getRendertimeString();
+
+		foreach ($data as $perf => $items) {
+			foreach ($items['functions'] as $function) {
+				// assert that the output contains the functions
+				$this->assertRegExp('/' . $function . ': \d+/', $output);
+			}
+		}
+	}
+
+	/**
+	 * Test if no rendertime is set
+	 */
+	public function testNoRenderTime()
+	{
+		$profiler = new Profiler(true, false);
+
+		$this->assertFalse($profiler->isRendertime());
+		self::assertEmpty($profiler->getRendertimeString());
 	}
 }

From 52c5ef9a75da012607cc43cd9b8b254a19871bc2 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Wed, 20 Feb 2019 17:37:46 +0100
Subject: [PATCH 065/145] bugfix test

---
 tests/src/Util/ProfilerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/src/Util/ProfilerTest.php b/tests/src/Util/ProfilerTest.php
index 8ceb59ea5..87796a2f3 100644
--- a/tests/src/Util/ProfilerTest.php
+++ b/tests/src/Util/ProfilerTest.php
@@ -196,6 +196,6 @@ class ProfilerTest extends MockedTest
 		$profiler = new Profiler(true, false);
 
 		$this->assertFalse($profiler->isRendertime());
-		self::assertEmpty($profiler->getRendertimeString());
+		$this->assertEmpty($profiler->getRendertimeString());
 	}
 }

From c11b7f7075280a95ef137ad648e28b21028a8ac2 Mon Sep 17 00:00:00 2001
From: Aditoo17 <42938951+Aditoo17@users.noreply.github.com>
Date: Wed, 20 Feb 2019 20:32:01 +0100
Subject: [PATCH 066/145] Change iframe address

---
 doc/Quick-Start-groupsandpages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Quick-Start-groupsandpages.md b/doc/Quick-Start-groupsandpages.md
index d4680f65f..f64f3afcb 100644
--- a/doc/Quick-Start-groupsandpages.md
+++ b/doc/Quick-Start-groupsandpages.md
@@ -15,6 +15,6 @@ Remember the link at the top of this page will bring you back here.
 
 Once you've added some groups, <a href="help/Quick-Start-andfinally">move on to the next section</a>.
 
-<iframe src="http://dir.friendica.social/directory" width="950" height="600"></iframe>
+<iframe src="https://dir.friendica.social/forum" width="950" height="600"></iframe>
 
 

From 5349de3a9fc3ddfa7a8817590a844aa77cda9ec8 Mon Sep 17 00:00:00 2001
From: Aditoo17 <42938951+Aditoo17@users.noreply.github.com>
Date: Wed, 20 Feb 2019 20:32:19 +0100
Subject: [PATCH 067/145] Change iframe address

---
 doc/de/Quick-Start-groupsandpages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/de/Quick-Start-groupsandpages.md b/doc/de/Quick-Start-groupsandpages.md
index da2a7dc3c..66df79d3f 100644
--- a/doc/de/Quick-Start-groupsandpages.md
+++ b/doc/de/Quick-Start-groupsandpages.md
@@ -21,6 +21,6 @@ Solltest Du beim Stöbern durch die vielen Gruppen nicht wieder hierher zurück
 
 Wenn Du einige Gruppen hinzugefügt hast, gehe <a href="help/Quick-Start-andfinally">weiter zum nächsten Schritt</a>.
 
-<iframe src="https://dir.friendica.social/home" width="950" height="600"></iframe>
+<iframe src="https://dir.friendica.social/forum" width="950" height="600"></iframe>
 
 

From 886da5047407831a192187150f2f4d46fdbcc476 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 20 Feb 2019 21:06:52 +0000
Subject: [PATCH 068/145] Issue 6679: Quick fix

---
 src/App.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/App.php b/src/App.php
index f48abcf9c..3df285cb3 100644
--- a/src/App.php
+++ b/src/App.php
@@ -397,16 +397,25 @@ class App
 	 */
 	private function determineURLPath()
 	{
+		/*
+		 * The automatic path detection in this function is currently deactivated,
+		 * see issue https://github.com/friendica/friendica/issues/6679
+		 *
+		 * The problem is that the function seems to be confused with some url.
+		 * These then confuses the detection which changes the url path.
+		 */
+
 		/* Relative script path to the web server root
 		 * Not all of those $_SERVER properties can be present, so we do by inverse priority order
 		 */
+/*
 		$relative_script_path = '';
 		$relative_script_path = defaults($_SERVER, 'REDIRECT_URL'       , $relative_script_path);
 		$relative_script_path = defaults($_SERVER, 'REDIRECT_URI'       , $relative_script_path);
 		$relative_script_path = defaults($_SERVER, 'REDIRECT_SCRIPT_URL', $relative_script_path);
 		$relative_script_path = defaults($_SERVER, 'SCRIPT_URL'         , $relative_script_path);
 		$relative_script_path = defaults($_SERVER, 'REQUEST_URI'        , $relative_script_path);
-
+*/
 		$this->urlPath = $this->config->get('system', 'urlpath');
 
 		/* $relative_script_path gives /relative/path/to/friendica/module/parameter
@@ -414,6 +423,7 @@ class App
 		 *
 		 * To get /relative/path/to/friendica we perform dirname() for as many levels as there are slashes in the QUERY_STRING
 		 */
+/*
 		if (!empty($relative_script_path)) {
 			// Module
 			if (!empty($_SERVER['QUERY_STRING'])) {
@@ -427,6 +437,7 @@ class App
 				$this->urlPath = $path;
 			}
 		}
+*/
 	}
 
 	public function getScheme()

From f2881d95c23d29f08cc8c18f6063656f30ca0108 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 20 Feb 2019 23:16:36 +0000
Subject: [PATCH 069/145] Updated composer lockfile

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index e554b1199..a22d39529 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "19fabb14e0dd5d806ef841e51d5f6a0b",
+    "content-hash": "fabea74e511a05896a2a9b7e2367ae28",
     "packages": [
         {
             "name": "asika/simple-console",

From 43ce3cb5110cb12131f747e77964142a28009676 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 21 Feb 2019 06:52:36 +0100
Subject: [PATCH 070/145] CS translation update THX Aditoo

---
 view/lang/cs/messages.po | 1588 +++++++++++++++++++-------------------
 view/lang/cs/strings.php |   11 +-
 2 files changed, 813 insertions(+), 786 deletions(-)

diff --git a/view/lang/cs/messages.po b/view/lang/cs/messages.po
index 5496fe66f..bf68707e7 100644
--- a/view/lang/cs/messages.po
+++ b/view/lang/cs/messages.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-08 23:34-0500\n"
-"PO-Revision-Date: 2019-02-09 19:22+0000\n"
+"POT-Creation-Date: 2019-02-15 09:33-0500\n"
+"PO-Revision-Date: 2019-02-20 19:19+0000\n"
 "Last-Translator: Aditoo\n"
 "Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -50,13 +50,13 @@ msgstr "Byl dosažen měsíční limit %d příspěvků. Příspěvek byl odmít
 #: mod/photos.php:695 mod/photos.php:1126 mod/photos.php:1143
 #: mod/photos.php:1636 mod/profile_photo.php:85 mod/profile_photo.php:94
 #: mod/profile_photo.php:103 mod/profile_photo.php:217
-#: mod/profile_photo.php:305 mod/profile_photo.php:315 src/Model/User.php:735
-#: src/Model/User.php:743 src/Model/User.php:751
+#: mod/profile_photo.php:305 mod/profile_photo.php:315 src/Model/User.php:736
+#: src/Model/User.php:744 src/Model/User.php:752
 msgid "Profile Photos"
 msgstr "Profilové fotky"
 
 #: include/conversation.php:160 include/conversation.php:297
-#: src/Model/Item.php:3265
+#: src/Model/Item.php:3283
 msgid "event"
 msgstr "událost"
 
@@ -67,7 +67,7 @@ msgid "status"
 msgstr "stav"
 
 #: include/conversation.php:168 include/conversation.php:305
-#: mod/subthread.php:88 mod/tagger.php:70 src/Model/Item.php:3267
+#: mod/subthread.php:88 mod/tagger.php:70 src/Model/Item.php:3285
 msgid "photo"
 msgstr "fotka"
 
@@ -128,7 +128,7 @@ msgstr "Libí se"
 msgid "Dislikes"
 msgstr "Nelibí se"
 
-#: include/conversation.php:569 include/conversation.php:1506
+#: include/conversation.php:569 include/conversation.php:1505
 #: mod/photos.php:1468
 msgid "Attending"
 msgid_plural "Attending"
@@ -145,30 +145,30 @@ msgstr "Neúčastní se"
 msgid "Might attend"
 msgstr "Mohl/a by se zúčastnit"
 
-#: include/conversation.php:649 mod/photos.php:1524 src/Object/Post.php:206
+#: include/conversation.php:649 mod/photos.php:1524 src/Object/Post.php:207
 msgid "Select"
 msgstr "Vybrat"
 
-#: include/conversation.php:650 mod/admin.php:2071 mod/photos.php:1525
+#: include/conversation.php:650 mod/admin.php:2072 mod/photos.php:1525
 #: mod/settings.php:726 src/Module/Contact.php:827 src/Module/Contact.php:1102
 msgid "Delete"
 msgstr "Odstranit"
 
-#: include/conversation.php:684 src/Object/Post.php:379
-#: src/Object/Post.php:380
+#: include/conversation.php:684 src/Object/Post.php:380
+#: src/Object/Post.php:381
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Zobrazit profil uživatele %s na %s"
 
-#: include/conversation.php:696 src/Object/Post.php:367
+#: include/conversation.php:696 src/Object/Post.php:368
 msgid "Categories:"
 msgstr "Kategorie:"
 
-#: include/conversation.php:697 src/Object/Post.php:368
+#: include/conversation.php:697 src/Object/Post.php:369
 msgid "Filed under:"
 msgstr "Vyplněn pod:"
 
-#: include/conversation.php:704 src/Object/Post.php:393
+#: include/conversation.php:704 src/Object/Post.php:394
 #, php-format
 msgid "%s from %s"
 msgstr "%s z %s"
@@ -177,9 +177,9 @@ msgstr "%s z %s"
 msgid "View in context"
 msgstr "Zobrazit v kontextu"
 
-#: include/conversation.php:721 include/conversation.php:1172
+#: include/conversation.php:721 include/conversation.php:1171
 #: mod/editpost.php:88 mod/message.php:260 mod/message.php:442
-#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:419
+#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:421
 msgid "Please wait"
 msgstr "Čekejte prosím"
 
@@ -195,42 +195,42 @@ msgstr "Smazat vybrané položky"
 msgid "Follow Thread"
 msgstr "Sledovat vlákno"
 
-#: include/conversation.php:894 src/Model/Contact.php:1032
+#: include/conversation.php:894 src/Model/Contact.php:1049
 msgid "View Status"
 msgstr "Zobrazit stav"
 
 #: include/conversation.php:895 include/conversation.php:911
 #: mod/allfriends.php:72 mod/directory.php:167 mod/dirfind.php:226
-#: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:972
-#: src/Model/Contact.php:1025 src/Model/Contact.php:1033
+#: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:989
+#: src/Model/Contact.php:1042 src/Model/Contact.php:1050
 msgid "View Profile"
 msgstr "Zobrazit profil"
 
-#: include/conversation.php:896 src/Model/Contact.php:1034
+#: include/conversation.php:896 src/Model/Contact.php:1051
 msgid "View Photos"
 msgstr "Zobrazit fotky"
 
-#: include/conversation.php:897 src/Model/Contact.php:1026
-#: src/Model/Contact.php:1035
+#: include/conversation.php:897 src/Model/Contact.php:1043
+#: src/Model/Contact.php:1052
 msgid "Network Posts"
 msgstr "Síťové příspěvky"
 
-#: include/conversation.php:898 src/Model/Contact.php:1027
-#: src/Model/Contact.php:1036
+#: include/conversation.php:898 src/Model/Contact.php:1044
+#: src/Model/Contact.php:1053
 msgid "View Contact"
 msgstr "Zobrazit kontakt"
 
-#: include/conversation.php:899 src/Model/Contact.php:1038
+#: include/conversation.php:899 src/Model/Contact.php:1055
 msgid "Send PM"
 msgstr "Poslat soukromou zprávu"
 
-#: include/conversation.php:903 src/Model/Contact.php:1039
+#: include/conversation.php:903 src/Model/Contact.php:1056
 msgid "Poke"
 msgstr "Šťouchnout"
 
 #: include/conversation.php:908 mod/allfriends.php:73 mod/dirfind.php:227
 #: mod/follow.php:147 mod/match.php:88 mod/suggest.php:88
-#: src/Content/Widget.php:63 src/Model/Contact.php:1028
+#: src/Content/Widget.php:63 src/Model/Contact.php:1045
 #: src/Module/Contact.php:574 view/theme/vier/theme.php:201
 msgid "Connect/Follow"
 msgstr "Spojit se/sledovat"
@@ -319,130 +319,130 @@ msgstr "<span  %1$s>%2$d lidí</span> se možná účastní"
 msgid "%s attend maybe."
 msgstr "%s se možná účastní"
 
-#: include/conversation.php:1111
+#: include/conversation.php:1110
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Viditelné pro <strong>všechny</strong>"
 
-#: include/conversation.php:1112 src/Object/Post.php:876
+#: include/conversation.php:1111 src/Object/Post.php:883
 msgid "Please enter a image/video/audio/webpage URL:"
 msgstr "Prosím zadejte URL obrázku/videa/audia/webové stránky:"
 
-#: include/conversation.php:1113
+#: include/conversation.php:1112
 msgid "Tag term:"
 msgstr "Štítek:"
 
-#: include/conversation.php:1114 mod/filer.php:35
+#: include/conversation.php:1113 mod/filer.php:35
 msgid "Save to Folder:"
 msgstr "Uložit do složky:"
 
-#: include/conversation.php:1115
+#: include/conversation.php:1114
 msgid "Where are you right now?"
 msgstr "Kde právě jste?"
 
-#: include/conversation.php:1116
+#: include/conversation.php:1115
 msgid "Delete item(s)?"
 msgstr "Smazat položku(y)?"
 
-#: include/conversation.php:1148
+#: include/conversation.php:1147
 msgid "New Post"
 msgstr "Nový příspěvek"
 
-#: include/conversation.php:1151
+#: include/conversation.php:1150
 msgid "Share"
 msgstr "Sdílet"
 
-#: include/conversation.php:1152 mod/editpost.php:74 mod/message.php:258
+#: include/conversation.php:1151 mod/editpost.php:74 mod/message.php:258
 #: mod/message.php:439 mod/wallmessage.php:139
 msgid "Upload photo"
 msgstr "Nahrát fotku"
 
-#: include/conversation.php:1153 mod/editpost.php:75
+#: include/conversation.php:1152 mod/editpost.php:75
 msgid "upload photo"
 msgstr "nahrát fotku"
 
-#: include/conversation.php:1154 mod/editpost.php:76
+#: include/conversation.php:1153 mod/editpost.php:76
 msgid "Attach file"
 msgstr "Přiložit soubor"
 
-#: include/conversation.php:1155 mod/editpost.php:77
+#: include/conversation.php:1154 mod/editpost.php:77
 msgid "attach file"
 msgstr "přiložit soubor"
 
-#: include/conversation.php:1156 src/Object/Post.php:868
+#: include/conversation.php:1155 src/Object/Post.php:875
 msgid "Bold"
 msgstr "Tučné"
 
-#: include/conversation.php:1157 src/Object/Post.php:869
+#: include/conversation.php:1156 src/Object/Post.php:876
 msgid "Italic"
 msgstr "Kurziva"
 
-#: include/conversation.php:1158 src/Object/Post.php:870
+#: include/conversation.php:1157 src/Object/Post.php:877
 msgid "Underline"
 msgstr "Podtržené"
 
-#: include/conversation.php:1159 src/Object/Post.php:871
+#: include/conversation.php:1158 src/Object/Post.php:878
 msgid "Quote"
 msgstr "Citace"
 
-#: include/conversation.php:1160 src/Object/Post.php:872
+#: include/conversation.php:1159 src/Object/Post.php:879
 msgid "Code"
 msgstr "Kód"
 
-#: include/conversation.php:1161 src/Object/Post.php:873
+#: include/conversation.php:1160 src/Object/Post.php:880
 msgid "Image"
 msgstr "Obrázek"
 
-#: include/conversation.php:1162 src/Object/Post.php:874
+#: include/conversation.php:1161 src/Object/Post.php:881
 msgid "Link"
 msgstr "Odkaz"
 
-#: include/conversation.php:1163 src/Object/Post.php:875
+#: include/conversation.php:1162 src/Object/Post.php:882
 msgid "Link or Media"
 msgstr "Odkaz nebo média"
 
-#: include/conversation.php:1164 mod/editpost.php:84
+#: include/conversation.php:1163 mod/editpost.php:84
 msgid "Set your location"
 msgstr "Nastavit vaši polohu"
 
-#: include/conversation.php:1165 mod/editpost.php:85
+#: include/conversation.php:1164 mod/editpost.php:85
 msgid "set location"
 msgstr "nastavit polohu"
 
-#: include/conversation.php:1166 mod/editpost.php:86
+#: include/conversation.php:1165 mod/editpost.php:86
 msgid "Clear browser location"
 msgstr "Vymazat polohu v prohlížeči"
 
-#: include/conversation.php:1167 mod/editpost.php:87
+#: include/conversation.php:1166 mod/editpost.php:87
 msgid "clear location"
 msgstr "vymazat polohu"
 
-#: include/conversation.php:1169 mod/editpost.php:102
+#: include/conversation.php:1168 mod/editpost.php:102
 msgid "Set title"
 msgstr "Nastavit nadpis"
 
-#: include/conversation.php:1171 mod/editpost.php:104
+#: include/conversation.php:1170 mod/editpost.php:104
 msgid "Categories (comma-separated list)"
 msgstr "Kategorie (seznam, oddělujte čárkou)"
 
-#: include/conversation.php:1173 mod/editpost.php:89
+#: include/conversation.php:1172 mod/editpost.php:89
 msgid "Permission settings"
 msgstr "Nastavení oprávnění"
 
-#: include/conversation.php:1174 mod/editpost.php:119
+#: include/conversation.php:1173 mod/editpost.php:119
 msgid "permissions"
 msgstr "oprávnění"
 
-#: include/conversation.php:1183 mod/editpost.php:99
+#: include/conversation.php:1182 mod/editpost.php:99
 msgid "Public post"
 msgstr "Veřejný příspěvek"
 
-#: include/conversation.php:1187 mod/editpost.php:110 mod/events.php:551
+#: include/conversation.php:1186 mod/editpost.php:110 mod/events.php:551
 #: mod/photos.php:1458 mod/photos.php:1497 mod/photos.php:1557
-#: src/Object/Post.php:877
+#: src/Object/Post.php:884
 msgid "Preview"
 msgstr "Náhled"
 
-#: include/conversation.php:1191 include/items.php:396
+#: include/conversation.php:1190 include/items.php:396
 #: mod/dfrn_request.php:650 mod/editpost.php:113 mod/fbrowser.php:104
 #: mod/fbrowser.php:134 mod/follow.php:161 mod/message.php:153
 #: mod/photos.php:257 mod/photos.php:325 mod/settings.php:666
@@ -451,32 +451,32 @@ msgstr "Náhled"
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: include/conversation.php:1196
+#: include/conversation.php:1195
 msgid "Post to Groups"
 msgstr "Zveřejnit ve skupinách"
 
-#: include/conversation.php:1197
+#: include/conversation.php:1196
 msgid "Post to Contacts"
 msgstr "Zveřejnit v kontaktech"
 
-#: include/conversation.php:1198
+#: include/conversation.php:1197
 msgid "Private post"
 msgstr "Soukromý příspěvek"
 
-#: include/conversation.php:1203 mod/editpost.php:117
+#: include/conversation.php:1202 mod/editpost.php:117
 #: src/Model/Profile.php:370
 msgid "Message"
 msgstr "Zpráva"
 
-#: include/conversation.php:1204 mod/editpost.php:118
+#: include/conversation.php:1203 mod/editpost.php:118
 msgid "Browser"
 msgstr "Prohlížeč"
 
-#: include/conversation.php:1476
+#: include/conversation.php:1475
 msgid "View all"
 msgstr "Zobrazit vše"
 
-#: include/conversation.php:1500
+#: include/conversation.php:1499
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Líbí se"
@@ -484,7 +484,7 @@ msgstr[1] "Líbí se"
 msgstr[2] "Líbí se"
 msgstr[3] "Líbí se"
 
-#: include/conversation.php:1503
+#: include/conversation.php:1502
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "Nelíbí se"
@@ -492,7 +492,7 @@ msgstr[1] "Nelíbí se"
 msgstr[2] "Nelíbí se"
 msgstr[3] "Nelíbí se"
 
-#: include/conversation.php:1509
+#: include/conversation.php:1508
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Neúčastní se"
@@ -500,7 +500,7 @@ msgstr[1] "Neúčastní se"
 msgstr[2] "Neúčastní se"
 msgstr[3] "Neúčastní se"
 
-#: include/conversation.php:1512 src/Content/ContactSelector.php:167
+#: include/conversation.php:1511 src/Content/ContactSelector.php:167
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Nerozhodnut"
@@ -823,8 +823,8 @@ msgstr "Celé jméno:\t\t%s\nAdresa stránky:\t\t%s\nPřihlašovací jméno:\t%s
 msgid "Please visit %s to approve or reject the request."
 msgstr "Prosím navštivte %s k odsouhlasení nebo k zamítnutí požadavku."
 
-#: include/items.php:353 mod/admin.php:301 mod/admin.php:2130
-#: mod/admin.php:2377 mod/notice.php:20 mod/viewsrc.php:22
+#: include/items.php:353 mod/admin.php:302 mod/admin.php:2131
+#: mod/admin.php:2378 mod/notice.php:20 mod/viewsrc.php:22
 msgid "Item not found."
 msgstr "Položka nenalezena."
 
@@ -844,7 +844,7 @@ msgid "Yes"
 msgstr "Ano"
 
 #: include/items.php:443 mod/allfriends.php:22 mod/api.php:34 mod/api.php:39
-#: mod/cal.php:303 mod/common.php:27 mod/crepair.php:101 mod/delegate.php:30
+#: mod/cal.php:303 mod/common.php:27 mod/crepair.php:90 mod/delegate.php:30
 #: mod/delegate.php:48 mod/delegate.php:59 mod/dfrn_confirm.php:66
 #: mod/dirfind.php:29 mod/editpost.php:22 mod/events.php:207 mod/follow.php:57
 #: mod/follow.php:121 mod/fsuggest.php:77 mod/group.php:28 mod/invite.php:23
@@ -859,214 +859,213 @@ msgstr "Ano"
 #: mod/unfollow.php:77 mod/unfollow.php:109 mod/viewcontacts.php:56
 #: mod/wallmessage.php:19 mod/wallmessage.php:43 mod/wallmessage.php:82
 #: mod/wallmessage.php:106 mod/wall_attach.php:76 mod/wall_attach.php:79
-#: mod/wall_upload.php:107 mod/wall_upload.php:110 src/App.php:1482
+#: mod/wall_upload.php:107 mod/wall_upload.php:110 src/App.php:1480
 #: src/Module/Attach.php:42 src/Module/Contact.php:360
 #: src/Module/Register.php:193
 msgid "Permission denied."
 msgstr "Přístup odmítnut."
 
-#: include/items.php:514 src/Content/Feature.php:98
+#: include/items.php:514 src/Content/Feature.php:99
 msgid "Archives"
 msgstr "Archivy"
 
-#: include/items.php:520 src/App.php:666 src/Content/ForumManager.php:135
-#: src/Content/Widget.php:329 src/Object/Post.php:457
-#: view/theme/vier/theme.php:255
+#: include/items.php:520 src/Content/ForumManager.php:135
+#: src/Content/Widget.php:329 view/theme/vier/theme.php:255
 msgid "show more"
 msgstr "zobrazit více"
 
-#: mod/admin.php:121
+#: mod/admin.php:122
 msgid "Theme settings updated."
 msgstr "Nastavení motivu bylo aktualizováno."
 
-#: mod/admin.php:195 src/Content/Nav.php:231
+#: mod/admin.php:196 src/Content/Nav.php:231
 msgid "Information"
 msgstr "Informace"
 
-#: mod/admin.php:196
+#: mod/admin.php:197
 msgid "Overview"
 msgstr "Přehled"
 
-#: mod/admin.php:197 mod/admin.php:778
+#: mod/admin.php:198 mod/admin.php:779
 msgid "Federation Statistics"
 msgstr "Statistiky Federation"
 
-#: mod/admin.php:198
+#: mod/admin.php:199
 msgid "Configuration"
 msgstr "Konfigurace"
 
-#: mod/admin.php:199 mod/admin.php:1580
+#: mod/admin.php:200 mod/admin.php:1581
 msgid "Site"
 msgstr "Web"
 
-#: mod/admin.php:200 mod/admin.php:1481 mod/admin.php:2061 mod/admin.php:2078
+#: mod/admin.php:201 mod/admin.php:1482 mod/admin.php:2062 mod/admin.php:2079
 msgid "Users"
 msgstr "Uživatelé"
 
-#: mod/admin.php:201 mod/admin.php:2178 mod/admin.php:2238 mod/settings.php:99
+#: mod/admin.php:202 mod/admin.php:2179 mod/admin.php:2239 mod/settings.php:99
 msgid "Addons"
 msgstr "Doplňky"
 
-#: mod/admin.php:202 mod/admin.php:2435 mod/admin.php:2479
+#: mod/admin.php:203 mod/admin.php:2436 mod/admin.php:2480
 msgid "Themes"
 msgstr "Motivy"
 
-#: mod/admin.php:203 mod/settings.php:77
+#: mod/admin.php:204 mod/settings.php:77
 msgid "Additional features"
 msgstr "Dodatečné vlastnosti"
 
-#: mod/admin.php:204 mod/admin.php:328 src/Content/Nav.php:234
+#: mod/admin.php:205 mod/admin.php:329 src/Content/Nav.php:234
 #: src/Module/Register.php:144 src/Module/Tos.php:73
 msgid "Terms of Service"
 msgstr "Podmínky používání"
 
-#: mod/admin.php:205
+#: mod/admin.php:206
 msgid "Database"
 msgstr "Databáze"
 
-#: mod/admin.php:206
+#: mod/admin.php:207
 msgid "DB updates"
 msgstr "Aktualizace databáze"
 
-#: mod/admin.php:207 mod/admin.php:822
+#: mod/admin.php:208 mod/admin.php:823
 msgid "Inspect Queue"
 msgstr "Prozkoumat frontu"
 
-#: mod/admin.php:208
+#: mod/admin.php:209
 msgid "Inspect Deferred Workers"
 msgstr "Prozkoumat odložené pracovníky"
 
-#: mod/admin.php:209
+#: mod/admin.php:210
 msgid "Inspect worker Queue"
 msgstr "Prozkoumat frontu pro pracovníka"
 
-#: mod/admin.php:210
+#: mod/admin.php:211
 msgid "Tools"
 msgstr "Nástroje"
 
-#: mod/admin.php:211
+#: mod/admin.php:212
 msgid "Contact Blocklist"
 msgstr "Blokované kontakty"
 
-#: mod/admin.php:212 mod/admin.php:394
+#: mod/admin.php:213 mod/admin.php:395
 msgid "Server Blocklist"
 msgstr "Blokované servery"
 
-#: mod/admin.php:213 mod/admin.php:557
+#: mod/admin.php:214 mod/admin.php:558
 msgid "Delete Item"
 msgstr "Smazat položku"
 
-#: mod/admin.php:214 mod/admin.php:215 mod/admin.php:2555
+#: mod/admin.php:215 mod/admin.php:216 mod/admin.php:2556
 msgid "Logs"
 msgstr "Záznamy"
 
-#: mod/admin.php:216 mod/admin.php:2623
+#: mod/admin.php:217 mod/admin.php:2624
 msgid "View Logs"
 msgstr "Zobrazit záznamy"
 
-#: mod/admin.php:218
+#: mod/admin.php:219
 msgid "Diagnostics"
 msgstr "Diagnostika"
 
-#: mod/admin.php:219
+#: mod/admin.php:220
 msgid "PHP Info"
 msgstr "Info o PHP"
 
-#: mod/admin.php:220
+#: mod/admin.php:221
 msgid "probe address"
 msgstr "vyzkoušet adresu"
 
-#: mod/admin.php:221
+#: mod/admin.php:222
 msgid "check webfinger"
 msgstr "vyzkoušet webfinger"
 
-#: mod/admin.php:241 src/Content/Nav.php:274
+#: mod/admin.php:242 src/Content/Nav.php:274
 msgid "Admin"
 msgstr "Administrátor"
 
-#: mod/admin.php:242
+#: mod/admin.php:243
 msgid "Addon Features"
 msgstr "Vlastnosti doplňků"
 
-#: mod/admin.php:243
+#: mod/admin.php:244
 msgid "User registrations waiting for confirmation"
 msgstr "Registrace uživatelů čekající na potvrzení"
 
-#: mod/admin.php:327 mod/admin.php:393 mod/admin.php:513 mod/admin.php:556
-#: mod/admin.php:777 mod/admin.php:821 mod/admin.php:874 mod/admin.php:997
-#: mod/admin.php:1579 mod/admin.php:2060 mod/admin.php:2177 mod/admin.php:2237
-#: mod/admin.php:2434 mod/admin.php:2478 mod/admin.php:2554 mod/admin.php:2622
+#: mod/admin.php:328 mod/admin.php:394 mod/admin.php:514 mod/admin.php:557
+#: mod/admin.php:778 mod/admin.php:822 mod/admin.php:875 mod/admin.php:998
+#: mod/admin.php:1580 mod/admin.php:2061 mod/admin.php:2178 mod/admin.php:2238
+#: mod/admin.php:2435 mod/admin.php:2479 mod/admin.php:2555 mod/admin.php:2623
 msgid "Administration"
 msgstr "Administrace"
 
-#: mod/admin.php:329
+#: mod/admin.php:330
 msgid "Display Terms of Service"
 msgstr "Zobrazit Podmínky používání"
 
-#: mod/admin.php:329
+#: mod/admin.php:330
 msgid ""
 "Enable the Terms of Service page. If this is enabled a link to the terms "
 "will be added to the registration form and the general information page."
 msgstr "Povolí stránku Podmínky používání. Pokud je toto povoleno, bude na formulář pro registrací a stránku s obecnými informacemi přidán odkaz k podmínkám."
 
-#: mod/admin.php:330
+#: mod/admin.php:331
 msgid "Display Privacy Statement"
 msgstr "Zobrazit Prohlášení o soukromí"
 
-#: mod/admin.php:330
+#: mod/admin.php:331
 #, php-format
 msgid ""
 "Show some informations regarding the needed information to operate the node "
 "according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."
 msgstr "Ukázat některé informace ohledně potřebných informací k provozování serveru podle například <a href=\"%s\" target=\"_blank\">Obecného nařízení o ochraně osobních údajů EU (GDPR)</a>"
 
-#: mod/admin.php:331
+#: mod/admin.php:332
 msgid "Privacy Statement Preview"
 msgstr "Náhled Prohlášení o soukromí"
 
-#: mod/admin.php:333
+#: mod/admin.php:334
 msgid "The Terms of Service"
 msgstr "Podmínky používání"
 
-#: mod/admin.php:333
+#: mod/admin.php:334
 msgid ""
 "Enter the Terms of Service for your node here. You can use BBCode. Headers "
 "of sections should be [h2] and below."
 msgstr "Zde zadejte podmínky používání vašeho serveru. Můžete používat BBCode. Záhlaví sekcí by měly být označeny [h2] a níže."
 
-#: mod/admin.php:335 mod/admin.php:1581 mod/admin.php:2239 mod/admin.php:2480
-#: mod/admin.php:2556 mod/admin.php:2706 mod/delegate.php:175
+#: mod/admin.php:336 mod/admin.php:1582 mod/admin.php:2240 mod/admin.php:2481
+#: mod/admin.php:2557 mod/admin.php:2707 mod/delegate.php:175
 #: mod/settings.php:665 mod/settings.php:772 mod/settings.php:860
 #: mod/settings.php:949 mod/settings.php:1174
 msgid "Save Settings"
 msgstr "Uložit nastavení"
 
-#: mod/admin.php:385 mod/admin.php:403 mod/dfrn_request.php:346
-#: mod/friendica.php:130 src/Model/Contact.php:1702
+#: mod/admin.php:386 mod/admin.php:404 mod/dfrn_request.php:346
+#: mod/friendica.php:131 src/Model/Contact.php:1719
 msgid "Blocked domain"
 msgstr "Zablokovaná doména"
 
-#: mod/admin.php:385
+#: mod/admin.php:386
 msgid "The blocked domain"
 msgstr "Zablokovaná doména"
 
-#: mod/admin.php:386 mod/admin.php:404 mod/friendica.php:130
+#: mod/admin.php:387 mod/admin.php:405 mod/friendica.php:131
 msgid "Reason for the block"
 msgstr "Důvody pro zablokování"
 
-#: mod/admin.php:386 mod/admin.php:399
+#: mod/admin.php:387 mod/admin.php:400
 msgid "The reason why you blocked this domain."
 msgstr "Důvod, proč jste doménu zablokoval/a"
 
-#: mod/admin.php:387
+#: mod/admin.php:388
 msgid "Delete domain"
 msgstr "Smazat doménu"
 
-#: mod/admin.php:387
+#: mod/admin.php:388
 msgid "Check to delete this entry from the blocklist"
 msgstr "Zaškrtnutím odstraníte tuto položku z blokovacího seznamu"
 
-#: mod/admin.php:395
+#: mod/admin.php:396
 msgid ""
 "This page can be used to define a black list of servers from the federated "
 "network that are not allowed to interact with your node. For all entered "
@@ -1074,69 +1073,69 @@ msgid ""
 "server."
 msgstr "Tato stránka může být použita k definici „černé listiny“ serverů z federované sítě, kterým není dovoleno interagovat s vaším serverem. Měl/a byste také pro všechny zadané domény uvést důvod, proč jste vzdálený server zablokoval/a."
 
-#: mod/admin.php:396
+#: mod/admin.php:397
 msgid ""
 "The list of blocked servers will be made publically available on the "
 "/friendica page so that your users and people investigating communication "
 "problems can find the reason easily."
 msgstr "Seznam zablokovaných serverů bude zveřejněn na stránce /friendica, takže vaši uživatelé a lidé vyšetřující probém s komunikací mohou důvod najít snadno."
 
-#: mod/admin.php:397
+#: mod/admin.php:398
 msgid "Add new entry to block list"
 msgstr "Přidat na blokovací seznam novou položku"
 
-#: mod/admin.php:398
+#: mod/admin.php:399
 msgid "Server Domain"
 msgstr "Serverová doména"
 
-#: mod/admin.php:398
+#: mod/admin.php:399
 msgid ""
 "The domain of the new server to add to the block list. Do not include the "
 "protocol."
 msgstr "Doména serveru, který má být přidán na blokovací seznam. Vynechejte protokol („http://“)."
 
-#: mod/admin.php:399
+#: mod/admin.php:400
 msgid "Block reason"
 msgstr "Důvod zablokování"
 
-#: mod/admin.php:400
+#: mod/admin.php:401
 msgid "Add Entry"
 msgstr "Přidat položku"
 
-#: mod/admin.php:401
+#: mod/admin.php:402
 msgid "Save changes to the blocklist"
 msgstr "Uložit změny do blokovacího seznamu"
 
-#: mod/admin.php:402
+#: mod/admin.php:403
 msgid "Current Entries in the Blocklist"
 msgstr "Aktuální položky v bokovacím seznamu"
 
-#: mod/admin.php:405
+#: mod/admin.php:406
 msgid "Delete entry from blocklist"
 msgstr "Odstranit položku z blokovacího seznamu"
 
-#: mod/admin.php:408
+#: mod/admin.php:409
 msgid "Delete entry from blocklist?"
 msgstr "Odstranit položku z blokovacího seznamu?"
 
-#: mod/admin.php:435
+#: mod/admin.php:436
 msgid "Server added to blocklist."
 msgstr "Server přidán do blokovacího seznamu"
 
-#: mod/admin.php:451
+#: mod/admin.php:452
 msgid "Site blocklist updated."
 msgstr "Blokovací seznam stránky aktualizován"
 
-#: mod/admin.php:476 src/Core/Console/GlobalCommunityBlock.php:68
+#: mod/admin.php:477 src/Core/Console/GlobalCommunityBlock.php:68
 msgid "The contact has been blocked from the node"
 msgstr "Kontakt byl na serveru zablokován"
 
-#: mod/admin.php:478 src/Core/Console/GlobalCommunityBlock.php:65
+#: mod/admin.php:479 src/Core/Console/GlobalCommunityBlock.php:65
 #, php-format
 msgid "Could not find any contact entry for this URL (%s)"
 msgstr "Nelze nalézt žádnou položku v kontaktech pro tuto URL adresu (%s)"
 
-#: mod/admin.php:485
+#: mod/admin.php:486
 #, php-format
 msgid "%s contact unblocked"
 msgid_plural "%s contacts unblocked"
@@ -1145,71 +1144,71 @@ msgstr[1] "%s kontakty odblokovány"
 msgstr[2] "%s kontaktu odblokováno"
 msgstr[3] "%s kontaktů odblokováno"
 
-#: mod/admin.php:514
+#: mod/admin.php:515
 msgid "Remote Contact Blocklist"
 msgstr "Blokované vzdálené kontakty"
 
-#: mod/admin.php:515
+#: mod/admin.php:516
 msgid ""
 "This page allows you to prevent any message from a remote contact to reach "
 "your node."
 msgstr "Tato stránka vám umožňuje zabránit jakýmkoliv zprávám ze vzdáleného kontaktu, aby se k vašemu serveru dostaly."
 
-#: mod/admin.php:516
+#: mod/admin.php:517
 msgid "Block Remote Contact"
 msgstr "Zablokovat vzdálený kontakt"
 
-#: mod/admin.php:517 mod/admin.php:2063
+#: mod/admin.php:518 mod/admin.php:2064
 msgid "select all"
 msgstr "Vybrat vše"
 
-#: mod/admin.php:518
+#: mod/admin.php:519
 msgid "select none"
 msgstr "nevybrat žádný"
 
-#: mod/admin.php:519 mod/admin.php:2072 src/Module/Contact.php:621
+#: mod/admin.php:520 mod/admin.php:2073 src/Module/Contact.php:621
 #: src/Module/Contact.php:824 src/Module/Contact.php:1077
 msgid "Block"
 msgstr "Blokovat"
 
-#: mod/admin.php:520 mod/admin.php:2074 src/Module/Contact.php:621
+#: mod/admin.php:521 mod/admin.php:2075 src/Module/Contact.php:621
 #: src/Module/Contact.php:824 src/Module/Contact.php:1077
 msgid "Unblock"
 msgstr "Odblokovat"
 
-#: mod/admin.php:521
+#: mod/admin.php:522
 msgid "No remote contact is blocked from this node."
 msgstr "Žádný vzdálený kontakt není na tomto serveru zablokován."
 
-#: mod/admin.php:523
+#: mod/admin.php:524
 msgid "Blocked Remote Contacts"
 msgstr "Zablokované vzdálené kontakty"
 
-#: mod/admin.php:524
+#: mod/admin.php:525
 msgid "Block New Remote Contact"
 msgstr "Zablokovat nový vzdálený kontakt"
 
-#: mod/admin.php:525
+#: mod/admin.php:526
 msgid "Photo"
 msgstr "Fotka"
 
-#: mod/admin.php:525 mod/admin.php:2055 mod/admin.php:2066 mod/admin.php:2080
-#: mod/admin.php:2096 mod/crepair.php:161 mod/settings.php:667
+#: mod/admin.php:526 mod/admin.php:2056 mod/admin.php:2067 mod/admin.php:2081
+#: mod/admin.php:2097 mod/crepair.php:159 mod/settings.php:667
 #: mod/settings.php:693
 msgid "Name"
 msgstr "Jméno"
 
-#: mod/admin.php:525 mod/profiles.php:382
+#: mod/admin.php:526 mod/profiles.php:382
 msgid "Address"
 msgstr "Adresa"
 
-#: mod/admin.php:525 mod/admin.php:535 mod/follow.php:166
+#: mod/admin.php:526 mod/admin.php:536 mod/follow.php:166
 #: mod/notifications.php:179 mod/notifications.php:263 mod/unfollow.php:137
 #: src/Module/Contact.php:639
 msgid "Profile URL"
 msgstr "URL profilu"
 
-#: mod/admin.php:533
+#: mod/admin.php:534
 #, php-format
 msgid "%s total blocked contact"
 msgid_plural "%s total blocked contacts"
@@ -1218,124 +1217,124 @@ msgstr[1] "Celkem %s zablokované kontakty"
 msgstr[2] "Celkem %s zablokovaného kontaktu"
 msgstr[3] "Celkem %s zablokovaných kontaktů"
 
-#: mod/admin.php:535
+#: mod/admin.php:536
 msgid "URL of the remote contact to block."
 msgstr "Adresa URL vzdáleného kontaktu k zablokování."
 
-#: mod/admin.php:558
+#: mod/admin.php:559
 msgid "Delete this Item"
 msgstr "Smazat tuto položku"
 
-#: mod/admin.php:559
+#: mod/admin.php:560
 msgid ""
 "On this page you can delete an item from your node. If the item is a top "
 "level posting, the entire thread will be deleted."
 msgstr "Na této stránce můžete smazat položku z vašeho serveru. Pokud je položkou příspěvek nejvyššího stupně, bude smazáno celé vlákno."
 
-#: mod/admin.php:560
+#: mod/admin.php:561
 msgid ""
 "You need to know the GUID of the item. You can find it e.g. by looking at "
 "the display URL. The last part of http://example.com/display/123456 is the "
 "GUID, here 123456."
 msgstr "Budete muset znát číslo GUID položky. Můžete jej najít např. v adrese URL. Poslední část adresy http://priklad.cz/display/123456 je GUID, v tomto případě 123456"
 
-#: mod/admin.php:561
+#: mod/admin.php:562
 msgid "GUID"
 msgstr "GUID"
 
-#: mod/admin.php:561
+#: mod/admin.php:562
 msgid "The GUID of the item you want to delete."
 msgstr "Číslo GUID položky, kterou chcete smazat"
 
-#: mod/admin.php:596
+#: mod/admin.php:597
 msgid "Item marked for deletion."
 msgstr "Položka označená ke smazání"
 
-#: mod/admin.php:668
+#: mod/admin.php:669
 msgid "unknown"
 msgstr "neznámé"
 
-#: mod/admin.php:771
+#: mod/admin.php:772
 msgid ""
 "This page offers you some numbers to the known part of the federated social "
 "network your Friendica node is part of. These numbers are not complete but "
 "only reflect the part of the network your node is aware of."
 msgstr "Tato stránka vám nabízí pár čísel pro známou část federované sociální sítě, které je Váš server Friendica součástí. Tato čísla nejsou kompletní, ale pouze odrážejí část sítě, které si je Váš server vědom."
 
-#: mod/admin.php:772
+#: mod/admin.php:773
 msgid ""
 "The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
 "will improve the data displayed here."
 msgstr "Funkce <em>Adresář automaticky objevených kontaktů</em> není zapnuta, zlepší zde zobrazená data."
 
-#: mod/admin.php:784
+#: mod/admin.php:785
 #, php-format
 msgid ""
 "Currently this node is aware of %d nodes with %d registered users from the "
 "following platforms:"
 msgstr "Aktuálně si je tento server vědom %d serverů s %d registrovanými uživateli z těchto platforem:"
 
-#: mod/admin.php:824 mod/admin.php:877
+#: mod/admin.php:825 mod/admin.php:878
 msgid "ID"
 msgstr "Identifikátor"
 
-#: mod/admin.php:825
+#: mod/admin.php:826
 msgid "Recipient Name"
 msgstr "Jméno příjemce"
 
-#: mod/admin.php:826
+#: mod/admin.php:827
 msgid "Recipient Profile"
 msgstr "Profil příjemce"
 
-#: mod/admin.php:827 src/Content/Nav.php:239
+#: mod/admin.php:828 src/Content/Nav.php:239
 #: src/Core/NotificationsManager.php:182 view/theme/frio/theme.php:269
 msgid "Network"
 msgstr "Síť"
 
-#: mod/admin.php:828 mod/admin.php:879
+#: mod/admin.php:829 mod/admin.php:880
 msgid "Created"
 msgstr "Vytvořeno"
 
-#: mod/admin.php:829
+#: mod/admin.php:830
 msgid "Last Tried"
 msgstr "Naposled vyzkoušeno"
 
-#: mod/admin.php:830
+#: mod/admin.php:831
 msgid ""
 "This page lists the content of the queue for outgoing postings. These are "
 "postings the initial delivery failed for. They will be resend later and "
 "eventually deleted if the delivery fails permanently."
 msgstr "Na této stránce najdete obsah fronty odchozích příspěvků. Toto jsou příspěvky, u kterých počáteční doručení selhalo. Budou znovu poslány později, a pokud doručení selže trvale, budou nakonec smazány."
 
-#: mod/admin.php:853
+#: mod/admin.php:854
 msgid "Inspect Deferred Worker Queue"
 msgstr "Prozkoumat frontu odložených pracovníků"
 
-#: mod/admin.php:854
+#: mod/admin.php:855
 msgid ""
 "This page lists the deferred worker jobs. This are jobs that couldn't be "
 "executed at the first time."
 msgstr "Na této stránce jsou vypsány odložené úlohy pracovníků. To jsou úlohy, které nemohly být napoprvé provedeny."
 
-#: mod/admin.php:857
+#: mod/admin.php:858
 msgid "Inspect Worker Queue"
 msgstr "Prozkoumat frontu pro pracovníka"
 
-#: mod/admin.php:858
+#: mod/admin.php:859
 msgid ""
 "This page lists the currently queued worker jobs. These jobs are handled by "
 "the worker cronjob you've set up during install."
 msgstr "Na této stránce jsou vypsány aktuálně čekající úlohy pro pracovníka . Tyto úlohy vykonává úloha cron pracovníka, kterou jste nastavil/a při instalaci."
 
-#: mod/admin.php:878
+#: mod/admin.php:879
 msgid "Job Parameters"
 msgstr "Parametry úlohy"
 
-#: mod/admin.php:880
+#: mod/admin.php:881
 msgid "Priority"
 msgstr "Priorita"
 
-#: mod/admin.php:906
+#: mod/admin.php:907
 #, php-format
 msgid ""
 "Your DB still runs with MyISAM tables. You should change the engine type to "
@@ -1346,32 +1345,32 @@ msgid ""
 " an automatic conversion.<br />"
 msgstr "Vaše databáze stále běží s tabulkami MyISAM. Měl/a byste změnit typ datového úložiště na InnoDB. Protože Friendica bude v budoucnu používat pouze funkce pro InnoDB, měl/a byste to změnit! <a href=\"%s\">Zde</a> naleznete návod, který by pro vás mohl být užitečný při konverzi úložišť. Můžete také použít příkaz <tt>php bin/console.php dbstructure toinnodb</tt> na Vaší instalaci Friendica pro automatickou konverzi.<br />"
 
-#: mod/admin.php:913
+#: mod/admin.php:914
 #, php-format
 msgid ""
 "There is a new version of Friendica available for download. Your current "
 "version is %1$s, upstream version is %2$s"
 msgstr "Je dostupná ke stažení nová verze Friendica. Vaše aktuální verze je %1$s, upstreamová verze je %2$s"
 
-#: mod/admin.php:923
+#: mod/admin.php:924
 msgid ""
 "The database update failed. Please run \"php bin/console.php dbstructure "
 "update\" from the command line and have a look at the errors that might "
 "appear."
 msgstr "Aktualizace databáze selhala. Prosím, spusťte příkaz „php bin/console.php dbstructure update“ z příkazového řádku a podívejte se na chyby, které by se mohly vyskytnout."
 
-#: mod/admin.php:929
+#: mod/admin.php:930
 msgid "The worker was never executed. Please check your database structure!"
 msgstr "Pracovník nebyl nikdy spuštěn. Prosím zkontrolujte strukturu Vaší databáze!"
 
-#: mod/admin.php:932
+#: mod/admin.php:933
 #, php-format
 msgid ""
 "The last worker execution was on %s UTC. This is older than one hour. Please"
 " check your crontab settings."
 msgstr "Pracovník byl naposledy spuštěn v %s UTC. Toto je více než jedna hodina. Prosím zkontrolujte si nastavení crontab."
 
-#: mod/admin.php:938
+#: mod/admin.php:939
 #, php-format
 msgid ""
 "Friendica's configuration now is stored in config/local.config.php, please "
@@ -1380,7 +1379,7 @@ msgid ""
 "help with the transition."
 msgstr "Konfigurace Friendica je nyní uložena v souboru config/local.config.php, prosím zkopírujte soubor config/local-sample.config.php a přesuňte svou konfiguraci ze souboru <code>.htconfig.php</code>. Pro pomoc při přechodu navštivte <a href=\"%s\">stránku Config v sekci nápovědy</a>."
 
-#: mod/admin.php:942
+#: mod/admin.php:943
 #, php-format
 msgid ""
 "Friendica's configuration now is stored in config/local.config.php, please "
@@ -1389,7 +1388,7 @@ msgid ""
 "page</a> for help with the transition."
 msgstr "Konfigurace Friendica je nyní uložena v souboru config/local.config.php, prosím zkopírujte soubor config/local-sample.config.php a přesuňte svou konfiguraci ze souboru <code>local.config.php</code>. Pro pomoc při přechodu navštivte <a href=\"%s\">stránku Config v sekci nápovědy</a>."
 
-#: mod/admin.php:949
+#: mod/admin.php:950
 #, php-format
 msgid ""
 "<a href=\"%s\">%s</a> is not reachable on your system. This is a severe "
@@ -1397,319 +1396,319 @@ msgid ""
 "href=\"%s\">the installation page</a> for help."
 msgstr "<a href=\"%s\">%s</a> není na Vašem systému dosažitelné. Tohle je závažná chyba konfigurace, která brání komunikaci mezi servery. Pro pomoc navštivte <a href=\"%s\">stránku instalace</a>."
 
-#: mod/admin.php:955
+#: mod/admin.php:956
 msgid "Normal Account"
 msgstr "Normální účet"
 
-#: mod/admin.php:956
+#: mod/admin.php:957
 msgid "Automatic Follower Account"
 msgstr "Účet s automatickými sledujícími"
 
-#: mod/admin.php:957
+#: mod/admin.php:958
 msgid "Public Forum Account"
 msgstr "Účet veřejného fóra"
 
-#: mod/admin.php:958
+#: mod/admin.php:959
 msgid "Automatic Friend Account"
 msgstr "Účet s automatickými přáteli"
 
-#: mod/admin.php:959
+#: mod/admin.php:960
 msgid "Blog Account"
 msgstr "Blogovací účet"
 
-#: mod/admin.php:960
+#: mod/admin.php:961
 msgid "Private Forum Account"
 msgstr "Účet soukromého fóra"
 
-#: mod/admin.php:983
+#: mod/admin.php:984
 msgid "Message queues"
 msgstr "Fronty zpráv"
 
-#: mod/admin.php:989
+#: mod/admin.php:990
 msgid "Server Settings"
 msgstr "Nastavení serveru"
 
-#: mod/admin.php:998
+#: mod/admin.php:999
 msgid "Summary"
 msgstr "Shrnutí"
 
-#: mod/admin.php:1000
+#: mod/admin.php:1001
 msgid "Registered users"
 msgstr "Registrovaní uživatelé"
 
-#: mod/admin.php:1002
+#: mod/admin.php:1003
 msgid "Pending registrations"
 msgstr "Čekající registrace"
 
-#: mod/admin.php:1003
+#: mod/admin.php:1004
 msgid "Version"
 msgstr "Verze"
 
-#: mod/admin.php:1008
+#: mod/admin.php:1009
 msgid "Active addons"
 msgstr "Aktivní doplňky"
 
-#: mod/admin.php:1041
+#: mod/admin.php:1042
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr "Nelze zpracovat výchozí url adresu. Musí obsahovat alespoň <scheme>://<domain>"
 
-#: mod/admin.php:1414
+#: mod/admin.php:1415
 msgid "Site settings updated."
 msgstr "Nastavení webu aktualizováno."
 
-#: mod/admin.php:1443 mod/settings.php:893
+#: mod/admin.php:1444 mod/settings.php:893
 msgid "No special theme for mobile devices"
 msgstr "Žádný speciální motiv pro mobilní zařízení"
 
-#: mod/admin.php:1472
+#: mod/admin.php:1473
 msgid "No community page for local users"
 msgstr "Žádná komunitní stránka pro místní uživatele"
 
-#: mod/admin.php:1473
+#: mod/admin.php:1474
 msgid "No community page"
 msgstr "Žádná komunitní stránka"
 
-#: mod/admin.php:1474
+#: mod/admin.php:1475
 msgid "Public postings from users of this site"
 msgstr "Veřejné příspěvky od místních uživatelů"
 
-#: mod/admin.php:1475
+#: mod/admin.php:1476
 msgid "Public postings from the federated network"
 msgstr "Veřejné příspěvky z federované sítě"
 
-#: mod/admin.php:1476
+#: mod/admin.php:1477
 msgid "Public postings from local users and the federated network"
 msgstr "Veřejné příspěvky od místních uživatelů a z federované sítě"
 
-#: mod/admin.php:1480 mod/admin.php:1681 mod/admin.php:1691
+#: mod/admin.php:1481 mod/admin.php:1682 mod/admin.php:1692
 #: src/Module/Contact.php:546
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: mod/admin.php:1482
+#: mod/admin.php:1483
 msgid "Users, Global Contacts"
 msgstr "Uživatelé, globální kontakty"
 
-#: mod/admin.php:1483
+#: mod/admin.php:1484
 msgid "Users, Global Contacts/fallback"
 msgstr "Uživatelé, globální kontakty/fallback"
 
-#: mod/admin.php:1487
+#: mod/admin.php:1488
 msgid "One month"
 msgstr "Jeden měsíc"
 
-#: mod/admin.php:1488
+#: mod/admin.php:1489
 msgid "Three months"
 msgstr "Tři měsíce"
 
-#: mod/admin.php:1489
+#: mod/admin.php:1490
 msgid "Half a year"
 msgstr "Půl roku"
 
-#: mod/admin.php:1490
+#: mod/admin.php:1491
 msgid "One year"
 msgstr "Jeden rok"
 
-#: mod/admin.php:1495
+#: mod/admin.php:1496
 msgid "Multi user instance"
 msgstr "Víceuživatelská instance"
 
-#: mod/admin.php:1519
+#: mod/admin.php:1520
 msgid "Closed"
 msgstr "Uzavřeno"
 
-#: mod/admin.php:1520
+#: mod/admin.php:1521
 msgid "Requires approval"
 msgstr "Vyžaduje schválení"
 
-#: mod/admin.php:1521
+#: mod/admin.php:1522
 msgid "Open"
 msgstr "Otevřeno"
 
-#: mod/admin.php:1525
+#: mod/admin.php:1526
 msgid "No SSL policy, links will track page SSL state"
 msgstr "Žádná SSL politika, odkazy budou následovat SSL stav stránky"
 
-#: mod/admin.php:1526
+#: mod/admin.php:1527
 msgid "Force all links to use SSL"
 msgstr "Vyžadovat u všech odkazů použití SSL"
 
-#: mod/admin.php:1527
+#: mod/admin.php:1528
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Certifikát podepsaný sám sebou, použít SSL pouze pro místní odkazy (nedoporučeno)"
 
-#: mod/admin.php:1531
+#: mod/admin.php:1532
 msgid "Don't check"
 msgstr "Nekontrolovat"
 
-#: mod/admin.php:1532
+#: mod/admin.php:1533
 msgid "check the stable version"
 msgstr "kontrolovat stabilní verzi"
 
-#: mod/admin.php:1533
+#: mod/admin.php:1534
 msgid "check the development version"
 msgstr "kontrolovat vývojovou verzi"
 
-#: mod/admin.php:1555
+#: mod/admin.php:1556
 msgid "Database (legacy)"
 msgstr "Databáze (legacy)"
 
-#: mod/admin.php:1582
+#: mod/admin.php:1583
 msgid "Republish users to directory"
 msgstr "Znovu publikovat uživatele do adresáře"
 
-#: mod/admin.php:1583 src/Module/Register.php:121
+#: mod/admin.php:1584 src/Module/Register.php:121
 msgid "Registration"
 msgstr "Registrace"
 
-#: mod/admin.php:1584
+#: mod/admin.php:1585
 msgid "File upload"
 msgstr "Nahrání souborů"
 
-#: mod/admin.php:1585
+#: mod/admin.php:1586
 msgid "Policies"
 msgstr "Politika"
 
-#: mod/admin.php:1586 mod/events.php:555 src/Model/Profile.php:878
+#: mod/admin.php:1587 mod/events.php:555 src/Model/Profile.php:878
 #: src/Module/Contact.php:902
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: mod/admin.php:1587
+#: mod/admin.php:1588
 msgid "Auto Discovered Contact Directory"
 msgstr "Adresář automaticky objevených kontaktů"
 
-#: mod/admin.php:1588
+#: mod/admin.php:1589
 msgid "Performance"
 msgstr "Výkon"
 
-#: mod/admin.php:1589
+#: mod/admin.php:1590
 msgid "Worker"
 msgstr "Pracovník (worker)"
 
-#: mod/admin.php:1590
+#: mod/admin.php:1591
 msgid "Message Relay"
 msgstr "Přeposílání zpráv"
 
-#: mod/admin.php:1591
+#: mod/admin.php:1592
 msgid "Relocate Instance"
 msgstr "Přemístit instanci"
 
-#: mod/admin.php:1592
+#: mod/admin.php:1593
 msgid "Warning! Advanced function. Could make this server unreachable."
 msgstr "Varování! Pokročilá funkce. Tímto můžete znepřístupnit server."
 
-#: mod/admin.php:1596
+#: mod/admin.php:1597
 msgid "Site name"
 msgstr "Název webu"
 
-#: mod/admin.php:1597
+#: mod/admin.php:1598
 msgid "Host name"
 msgstr "Jméno hostitele (host name)"
 
-#: mod/admin.php:1598
+#: mod/admin.php:1599
 msgid "Sender Email"
 msgstr "E-mail odesílatele"
 
-#: mod/admin.php:1598
+#: mod/admin.php:1599
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr "E-mailová adresa, kterou bude Váš server používat pro posílání e-mailů s oznámeními."
 
-#: mod/admin.php:1599
+#: mod/admin.php:1600
 msgid "Banner/Logo"
 msgstr "Banner/logo"
 
-#: mod/admin.php:1600
+#: mod/admin.php:1601
 msgid "Shortcut icon"
 msgstr "Favikona"
 
-#: mod/admin.php:1600
+#: mod/admin.php:1601
 msgid "Link to an icon that will be used for browsers."
 msgstr "Odkaz k ikoně, která bude použita pro prohlížeče."
 
-#: mod/admin.php:1601
+#: mod/admin.php:1602
 msgid "Touch icon"
 msgstr "Dotyková ikona"
 
-#: mod/admin.php:1601
+#: mod/admin.php:1602
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr "Odkaz k ikoně, která bude použita pro tablety a mobilní zařízení."
 
-#: mod/admin.php:1602
+#: mod/admin.php:1603
 msgid "Additional Info"
 msgstr "Dodatečné informace"
 
-#: mod/admin.php:1602
+#: mod/admin.php:1603
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
 msgstr "Pro veřejné servery: zde můžete přidat dodatečné informace, které budou vypsané na stránce %s/servers."
 
-#: mod/admin.php:1603
+#: mod/admin.php:1604
 msgid "System language"
 msgstr "Systémový jazyk"
 
-#: mod/admin.php:1604
+#: mod/admin.php:1605
 msgid "System theme"
 msgstr "Systémový motiv"
 
-#: mod/admin.php:1604
+#: mod/admin.php:1605
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Výchozí systémový motiv - může být změněn v uživatelských profilech - <a href='#' id='cnftheme'>změnit nastavení motivu</a>"
 
-#: mod/admin.php:1605
+#: mod/admin.php:1606
 msgid "Mobile system theme"
 msgstr "Mobilní systémový motiv"
 
-#: mod/admin.php:1605
+#: mod/admin.php:1606
 msgid "Theme for mobile devices"
 msgstr "Motiv pro mobilní zařízení"
 
-#: mod/admin.php:1606
+#: mod/admin.php:1607
 msgid "SSL link policy"
 msgstr "Politika SSL odkazů"
 
-#: mod/admin.php:1606
+#: mod/admin.php:1607
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Určuje, zda-li budou generované odkazy používat SSL"
 
-#: mod/admin.php:1607
+#: mod/admin.php:1608
 msgid "Force SSL"
 msgstr "Vynutit SSL"
 
-#: mod/admin.php:1607
+#: mod/admin.php:1608
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr "Vynutit SSL pro všechny ne-SSL žádosti - Upozornění: na některých systémech může dojít k nekonečnému zacyklení."
 
-#: mod/admin.php:1608
+#: mod/admin.php:1609
 msgid "Hide help entry from navigation menu"
 msgstr "Skrýt nápovědu z navigačního menu"
 
-#: mod/admin.php:1608
+#: mod/admin.php:1609
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr "Skryje z navigačního menu položku pro stránky nápovědy. Nápovědu můžete stále zobrazit přímo zadáním /help."
 
-#: mod/admin.php:1609
+#: mod/admin.php:1610
 msgid "Single user instance"
 msgstr "Jednouživatelská instance"
 
-#: mod/admin.php:1609
+#: mod/admin.php:1610
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "Nastavit tuto instanci víceuživatelskou nebo jednouživatelskou pro pojmenovaného uživatele"
 
-#: mod/admin.php:1611
+#: mod/admin.php:1612
 msgid "File storage backend"
 msgstr "Backend souborového úložiště"
 
-#: mod/admin.php:1611
+#: mod/admin.php:1612
 msgid ""
 "The backend used to store uploaded data. If you change the storage backend, "
 "you can manually move the existing files. If you do not do so, the files "
@@ -1718,190 +1717,190 @@ msgid ""
 " for more information about the choices and the moving procedure."
 msgstr "Backend použitý pro ukládání nahraných dat. Pokud změníte backend úložiště, můžete manuálně přesunout existující soubory. Pokud tak neučiníte, budou soubory nahrané před změnou stále dostupné ve starém backendu. Pro více informací o možnostech a proceduře pro přesun si prosím přečtěte <a href=\"/help/Settings#1_2_3_1\">dokumentaci nastavení</a>."
 
-#: mod/admin.php:1613
+#: mod/admin.php:1614
 msgid "Maximum image size"
 msgstr "Maximální velikost obrázků"
 
-#: mod/admin.php:1613
+#: mod/admin.php:1614
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximální velikost nahraných obrázků v bajtech. Výchozí hodnota je 0, což znamená bez omezení."
 
-#: mod/admin.php:1614
+#: mod/admin.php:1615
 msgid "Maximum image length"
 msgstr "Maximální velikost obrázků"
 
-#: mod/admin.php:1614
+#: mod/admin.php:1615
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Maximální délka delší stránky nahrávaných obrázků v pixelech. Výchozí hodnota je -1, což znamená bez omezení."
 
-#: mod/admin.php:1615
+#: mod/admin.php:1616
 msgid "JPEG image quality"
 msgstr "Kvalita obrázků JPEG"
 
-#: mod/admin.php:1615
+#: mod/admin.php:1616
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "Nahrávané obrázky JPEG budou uloženy se zadanou kvalitou v rozmezí [0-100]. Výchozí hodnota je 100, což znamená plnou kvalitu."
 
-#: mod/admin.php:1617
+#: mod/admin.php:1618
 msgid "Register policy"
 msgstr "Politika registrace"
 
-#: mod/admin.php:1618
+#: mod/admin.php:1619
 msgid "Maximum Daily Registrations"
 msgstr "Maximální počet denních registrací"
 
-#: mod/admin.php:1618
+#: mod/admin.php:1619
 msgid ""
 "If registration is permitted above, this sets the maximum number of new user"
 " registrations to accept per day.  If register is set to closed, this "
 "setting has no effect."
 msgstr "Pokud je registrace výše povolena, zde se nastaví maximální počet registrací nových uživatelů za den. Pokud je registrace zakázána, toto nastavení nemá žádný efekt."
 
-#: mod/admin.php:1619
+#: mod/admin.php:1620
 msgid "Register text"
 msgstr "Text při registraci"
 
-#: mod/admin.php:1619
+#: mod/admin.php:1620
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr "Bude zobrazen viditelně na stránce registrace. Zde můžete používat BBCode."
 
-#: mod/admin.php:1620
+#: mod/admin.php:1621
 msgid "Forbidden Nicknames"
 msgstr "Zakázané přezdívky"
 
-#: mod/admin.php:1620
+#: mod/admin.php:1621
 msgid ""
 "Comma separated list of nicknames that are forbidden from registration. "
 "Preset is a list of role names according RFC 2142."
 msgstr "Seznam přezdívek, které nelze registrovat, oddělených čárkami. Přednastaven je seznam častých přezdívek dle RFC 2142."
 
-#: mod/admin.php:1621
+#: mod/admin.php:1622
 msgid "Accounts abandoned after x days"
 msgstr "Účty jsou opuštěny po x dnech"
 
-#: mod/admin.php:1621
+#: mod/admin.php:1622
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Nebude se plýtvat systémovými zdroji kontaktováním externích webů s opuštěnými účty. Zadejte 0 pro žádný časový limit."
 
-#: mod/admin.php:1622
+#: mod/admin.php:1623
 msgid "Allowed friend domains"
 msgstr "Povolené domény přátel"
 
-#: mod/admin.php:1622
+#: mod/admin.php:1623
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Seznam domén, kterým je povoleno navazovat přátelství s tímto webem, oddělených čárkami. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolné domény."
 
-#: mod/admin.php:1623
+#: mod/admin.php:1624
 msgid "Allowed email domains"
 msgstr "Povolené e-mailové domény"
 
-#: mod/admin.php:1623
+#: mod/admin.php:1624
 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 "Seznam domén e-mailových adres, kterým je povoleno provádět registraci na tomto webu, oddělených čárkami. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolné domény."
 
-#: mod/admin.php:1624
+#: mod/admin.php:1625
 msgid "No OEmbed rich content"
 msgstr "Žádný obohacený obsah oEmbed"
 
-#: mod/admin.php:1624
+#: mod/admin.php:1625
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
 msgstr "Neukazovat obohacený obsah (např. vložené PDF dokumenty), kromě toho z domén vypsaných níže."
 
-#: mod/admin.php:1625
+#: mod/admin.php:1626
 msgid "Allowed OEmbed domains"
 msgstr "Povolené domény pro oEmbed"
 
-#: mod/admin.php:1625
+#: mod/admin.php:1626
 msgid ""
 "Comma separated list of domains which oembed content is allowed to be "
 "displayed. Wildcards are accepted."
 msgstr "Seznam domén, u nichž je povoleno zobrazit obsah oEmbed, oddělených čárkami. Zástupné znaky jsou povoleny."
 
-#: mod/admin.php:1626
+#: mod/admin.php:1627
 msgid "Block public"
 msgstr "Blokovat veřejný přístup"
 
-#: mod/admin.php:1626
+#: mod/admin.php:1627
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Označením zablokujete veřejný přístup ke všem jinak veřejně přístupným osobním stránkám nepřihlášeným uživatelům."
 
-#: mod/admin.php:1627
+#: mod/admin.php:1628
 msgid "Force publish"
 msgstr "Vynutit publikaci"
 
-#: mod/admin.php:1627
+#: mod/admin.php:1628
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Označením budou všechny profily na tomto serveru uvedeny v adresáři stránky."
 
-#: mod/admin.php:1627
+#: mod/admin.php:1628
 msgid "Enabling this may violate privacy laws like the GDPR"
 msgstr "Povolení této funkce může porušit zákony o ochraně soukromí, jako je Obecné nařízení o ochraně osobních údajů (GDPR)"
 
-#: mod/admin.php:1628
+#: mod/admin.php:1629
 msgid "Global directory URL"
 msgstr "Adresa URL globálního adresáře"
 
-#: mod/admin.php:1628
+#: mod/admin.php:1629
 msgid ""
 "URL to the global directory. If this is not set, the global directory is "
 "completely unavailable to the application."
 msgstr "Adresa URL globálního adresáře. Pokud toto není nastaveno, globální adresář bude aplikaci naprosto nedostupný."
 
-#: mod/admin.php:1629
+#: mod/admin.php:1630
 msgid "Private posts by default for new users"
 msgstr "Nastavit pro nové uživatele příspěvky jako soukromé"
 
-#: mod/admin.php:1629
+#: mod/admin.php:1630
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "Nastavit výchozí práva pro příspěvky od všech nových členů na výchozí soukromou skupinu místo veřejné."
 
-#: mod/admin.php:1630
+#: mod/admin.php:1631
 msgid "Don't include post content in email notifications"
 msgstr "Nezahrnovat v e-mailových oznámeních obsah příspěvků"
 
-#: mod/admin.php:1630
+#: mod/admin.php:1631
 msgid ""
 "Don't include the content of a post/comment/private message/etc. in the "
 "email notifications that are sent out from this site, as a privacy measure."
 msgstr " V e-mailových oznámeních, které jsou odesílány z tohoto webu, nebudou z důvodů bezpečnosti obsaženy příspěvky/komentáře/soukromé zprávy apod. "
 
-#: mod/admin.php:1631
+#: mod/admin.php:1632
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr "Zakázat veřejný přístup k rozšířením uvedeným v menu aplikace."
 
-#: mod/admin.php:1631
+#: mod/admin.php:1632
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr "Označení této volby omezí rozšíření uvedená v menu aplikace pouze pro členy."
 
-#: mod/admin.php:1632
+#: mod/admin.php:1633
 msgid "Don't embed private images in posts"
 msgstr "Nepovolit přidávání soukromých obrázků do příspěvků"
 
-#: mod/admin.php:1632
+#: mod/admin.php:1633
 msgid ""
 "Don't replace locally-hosted private photos in posts with an embedded copy "
 "of the image. This means that contacts who receive posts containing private "
@@ -1909,11 +1908,11 @@ msgid ""
 "while."
 msgstr "Nenahrazovat místní soukromé fotky v příspěvcích vloženou kopií obrázku. To znamená, že kontakty, které obdrží příspěvek obsahující soukromé fotky, budou muset autentikovat a načíst každý obrázek, což může zabrat nějaký čas."
 
-#: mod/admin.php:1633
+#: mod/admin.php:1634
 msgid "Explicit Content"
 msgstr "Explicitní obsah"
 
-#: mod/admin.php:1633
+#: mod/admin.php:1634
 msgid ""
 "Set this to announce that your node is used mostly for explicit content that"
 " might not be suited for minors. This information will be published in the "
@@ -1922,245 +1921,245 @@ msgid ""
 "will be shown at the user registration page."
 msgstr "Touto funkcí oznámíte, že je Váš server používán hlavně pro explicitní obsah, který nemusí být vhodný pro mladistvé. Tato informace bude publikována na stránce informací o serveru a může být využita např. globálním adresářem pro odfiltrování Vašeho serveru ze seznamu serverů pro spojení. Poznámka o tom bude navíc zobrazena na stránce registrace."
 
-#: mod/admin.php:1634
+#: mod/admin.php:1635
 msgid "Allow Users to set remote_self"
 msgstr "Umožnit uživatelům nastavit remote_self"
 
-#: mod/admin.php:1634
+#: mod/admin.php:1635
 msgid ""
 "With checking this, every user is allowed to mark every contact as a "
 "remote_self in the repair contact dialog. Setting this flag on a contact "
 "causes mirroring every posting of that contact in the users stream."
 msgstr "S tímto označením má každý uživatel možnost označit jakékoliv ze svých kontakt jako „remote_self“ v nastavení v dialogu opravit kontakt. Tímto označením se budou zrcadlit všechny správy tohoto kontaktu v uživatelově proudu."
 
-#: mod/admin.php:1635
+#: mod/admin.php:1636
 msgid "Block multiple registrations"
 msgstr "Blokovat více registrací"
 
-#: mod/admin.php:1635
+#: mod/admin.php:1636
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Znemožnit uživatelům registraci dodatečných účtů k použití jako stránky."
 
-#: mod/admin.php:1636
+#: mod/admin.php:1637
 msgid "Disable OpenID"
 msgstr "Zakázat OpenID"
 
-#: mod/admin.php:1636
+#: mod/admin.php:1637
 msgid "Disable OpenID support for registration and logins."
 msgstr "Zakázat podporu OpenID pro registrace a přihlášení."
 
-#: mod/admin.php:1637
+#: mod/admin.php:1638
 msgid "No Fullname check"
 msgstr "Bez kontroly celého jména"
 
-#: mod/admin.php:1637
+#: mod/admin.php:1638
 msgid ""
 "Allow users to register without a space between the first name and the last "
 "name in their full name."
 msgstr "Dovolit uživatelům se registrovat bez mezery mezi křestním jménem a příjmením ve svém celém jméně."
 
-#: mod/admin.php:1638
+#: mod/admin.php:1639
 msgid "Community pages for visitors"
 msgstr "Komunitní stránky pro návštěvníky"
 
-#: mod/admin.php:1638
+#: mod/admin.php:1639
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
 msgstr "Které komunitní stránky by měly být viditelné pro návštěvníky. Místní uživatelé vždy vidí obě stránky."
 
-#: mod/admin.php:1639
+#: mod/admin.php:1640
 msgid "Posts per user on community page"
 msgstr "Počet příspěvků na komunitní stránce"
 
-#: mod/admin.php:1639
+#: mod/admin.php:1640
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr "Maximální počet příspěvků na uživatele na komunitní stránce. (neplatí pro „Globální komunitu“)"
 
-#: mod/admin.php:1640
+#: mod/admin.php:1641
 msgid "Disable OStatus support"
 msgstr "Zakázat podporu pro OStatus"
 
-#: mod/admin.php:1640
+#: mod/admin.php:1641
 msgid ""
 "Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr "Zakázat zabudouvanou kompatibilitu s OStatus (StatusNet, GNU social apod.). Veškerá komunikace pomocí OStatus je veřejná, proto budou občas zobrazena varování o soukromí."
 
-#: mod/admin.php:1641
+#: mod/admin.php:1642
 msgid "Only import OStatus/ActivityPub threads from our contacts"
 msgstr "Pouze importovat vlákna z OStatus/ActivityPub z našich kontaktů"
 
-#: mod/admin.php:1641
+#: mod/admin.php:1642
 msgid ""
 "Normally we import every content from our OStatus and ActivityPub contacts. "
 "With this option we only store threads that are started by a contact that is"
 " known on our system."
 msgstr "Běžně importujeme všechen obsah z našich kontaktů na OStatus a ActivityPub. S touto volbou uchováváme vlákna počatá kontaktem, který je na našem systému známý."
 
-#: mod/admin.php:1642
+#: mod/admin.php:1643
 msgid "OStatus support can only be enabled if threading is enabled."
 msgstr "Podpora pro OStatus může být zapnuta pouze, je-li povolen threading."
 
-#: mod/admin.php:1644
+#: mod/admin.php:1645
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub"
 " directory."
 msgstr "Podpora pro Diasporu nemůže být zapnuta, protože Friendica byla nainstalována do podadresáře."
 
-#: mod/admin.php:1645
+#: mod/admin.php:1646
 msgid "Enable Diaspora support"
 msgstr "Zapnout podporu pro Diaspora"
 
-#: mod/admin.php:1645
+#: mod/admin.php:1646
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Poskytnout zabudovanou kompatibilitu sitě Diaspora."
 
-#: mod/admin.php:1646
+#: mod/admin.php:1647
 msgid "Only allow Friendica contacts"
 msgstr "Povolit pouze kontakty z Friendica"
 
-#: mod/admin.php:1646
+#: mod/admin.php:1647
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "Všechny kontakty musí používat protokol Friendica. Všchny ostatní zabudované komunikační protokoly budou zablokované."
 
-#: mod/admin.php:1647
+#: mod/admin.php:1648
 msgid "Verify SSL"
 msgstr "Ověřit SSL"
 
-#: mod/admin.php:1647
+#: mod/admin.php:1648
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
 msgstr "Pokud si přejete, můžete vynutit striktní ověřování certifikátů. To znamená že se nebudete moci připojit k žádnému serveru s vlastním SSL certifikátem."
 
-#: mod/admin.php:1648
+#: mod/admin.php:1649
 msgid "Proxy user"
 msgstr "Proxy uživatel"
 
-#: mod/admin.php:1649
+#: mod/admin.php:1650
 msgid "Proxy URL"
 msgstr "Proxy URL adresa"
 
-#: mod/admin.php:1650
+#: mod/admin.php:1651
 msgid "Network timeout"
 msgstr "Čas vypršení síťového spojení (timeout)"
 
-#: mod/admin.php:1650
+#: mod/admin.php:1651
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Hodnota ve vteřinách. Nastavte 0 pro neomezeno (není doporučeno)."
 
-#: mod/admin.php:1651
+#: mod/admin.php:1652
 msgid "Maximum Load Average"
 msgstr "Maximální průměrné zatížení"
 
-#: mod/admin.php:1651
+#: mod/admin.php:1652
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximální zatížení systému před pozastavením procesů zajišťujících doručování aktualizací - výchozí hodnota 50"
 
-#: mod/admin.php:1652
+#: mod/admin.php:1653
 msgid "Maximum Load Average (Frontend)"
 msgstr "Maximální průměrné zatížení (Frontend)"
 
-#: mod/admin.php:1652
+#: mod/admin.php:1653
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr "Maximální zatížení systému předtím, než frontend ukončí službu - výchozí hodnota 50"
 
-#: mod/admin.php:1653
+#: mod/admin.php:1654
 msgid "Minimal Memory"
 msgstr "Minimální paměť"
 
-#: mod/admin.php:1653
+#: mod/admin.php:1654
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
 msgstr "Minimální volná paměť v MB pro pracovníka. Potřebuje přístup do /proc/meminfo - výchozí hodnota 0 (deaktivováno)"
 
-#: mod/admin.php:1654
+#: mod/admin.php:1655
 msgid "Maximum table size for optimization"
 msgstr "Maximální velikost tabulky pro optimalizaci"
 
-#: mod/admin.php:1654
+#: mod/admin.php:1655
 msgid ""
 "Maximum table size (in MB) for the automatic optimization. Enter -1 to "
 "disable it."
 msgstr "Maximální velikost tabulky (v MB) pro automatickou optimalizaci. Zadáním -1 ji vypnete."
 
-#: mod/admin.php:1655
+#: mod/admin.php:1656
 msgid "Minimum level of fragmentation"
 msgstr "Minimální úroveň fragmentace"
 
-#: mod/admin.php:1655
+#: mod/admin.php:1656
 msgid ""
 "Minimum fragmenation level to start the automatic optimization - default "
 "value is 30%."
 msgstr "Minimální úroveň fragmentace pro spuštění automatické optimalizace - výchozí hodnota je 30%."
 
-#: mod/admin.php:1657
+#: mod/admin.php:1658
 msgid "Periodical check of global contacts"
 msgstr "Pravidelně ověřování globálních kontaktů"
 
-#: mod/admin.php:1657
+#: mod/admin.php:1658
 msgid ""
 "If enabled, the global contacts are checked periodically for missing or "
 "outdated data and the vitality of the contacts and servers."
 msgstr "Pokud je toto povoleno, budou globální kontakty pravidelně kontrolovány pro zastaralá data a životnost kontaktů a serverů."
 
-#: mod/admin.php:1658
+#: mod/admin.php:1659
 msgid "Days between requery"
 msgstr "Dny mezi dotazy"
 
-#: mod/admin.php:1658
+#: mod/admin.php:1659
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr "Počet dnů, po kterých je server znovu dotázán na své kontakty"
 
-#: mod/admin.php:1659
+#: mod/admin.php:1660
 msgid "Discover contacts from other servers"
 msgstr "Objevit kontakty z ostatních serverů"
 
-#: mod/admin.php:1659
+#: mod/admin.php:1660
 msgid ""
 "Periodically query other servers for contacts. You can choose between "
 "'users': the users on the remote system, 'Global Contacts': active contacts "
 "that are known on the system. The fallback is meant for Redmatrix servers "
 "and older friendica servers, where global contacts weren't available. The "
-"fallback increases the server load, so the recommened setting is 'Users, "
+"fallback increases the server load, so the recommended setting is 'Users, "
 "Global Contacts'."
-msgstr "Periodicky dotazovat ostatní servery pro kontakty. Můžete si vybrat mezi možnostmi: „uživatelé“ - uživatelé na vzdáleném systému, a „globální kontakty“ - aktivní kontakty, které jsou známy na systému. Funkce fallback je určena pro servery Redmatrix a starší servery Friendica, kde globální kontakty nejsou dostupné. Fallback zvyšuje serverovou zátěž, doporučené nastavení je proto „Uživatelé, globální kontakty“."
+msgstr "Periodicky dotazovat ostatní servery pro kontakty. Můžete si vybrat mezi možnostmi: „uživatelé“ - uživatelé na vzdáleném systému, a „globální kontakty“ - aktivní kontakty, které jsou známy na systému. Funkce fallback je určena pro servery Redmatrix a starší servery Friendica, kde globální kontakty nejsou dostupné. Fallback zvyšuje serverovou zátěž, doporučené nastavení je proto „Uživatelé, globální kontakty“. "
 
-#: mod/admin.php:1660
+#: mod/admin.php:1661
 msgid "Timeframe for fetching global contacts"
 msgstr "Časový rámec pro načítání globálních kontaktů"
 
-#: mod/admin.php:1660
+#: mod/admin.php:1661
 msgid ""
 "When the discovery is activated, this value defines the timeframe for the "
 "activity of the global contacts that are fetched from other servers."
 msgstr "Pokud je aktivováno objevování, tato hodnota definuje časový rámec pro aktivitu globálních kontaktů, které jsou načteny z jiných serverů."
 
-#: mod/admin.php:1661
+#: mod/admin.php:1662
 msgid "Search the local directory"
 msgstr "Hledat  v místním adresáři"
 
-#: mod/admin.php:1661
+#: mod/admin.php:1662
 msgid ""
 "Search the local directory instead of the global directory. When searching "
 "locally, every search will be executed on the global directory in the "
 "background. This improves the search results when the search is repeated."
 msgstr "Prohledat místní adresář místo globálního adresáře. Při místním prohledávání bude každé hledání provedeno v globálním adresáři na pozadí. To vylepšuje výsledky při zopakování hledání."
 
-#: mod/admin.php:1663
+#: mod/admin.php:1664
 msgid "Publish server information"
 msgstr "Zveřejnit informace o serveru"
 
-#: mod/admin.php:1663
+#: mod/admin.php:1664
 msgid ""
 "If enabled, general server and usage data will be published. The data "
 "contains the name and version of the server, number of users with public "
@@ -2168,50 +2167,50 @@ msgid ""
 " href='http://the-federation.info/'>the-federation.info</a> for details."
 msgstr "Pokud je toto povoleno, budou zveřejněna obecná data o serveru a jeho používání. Data obsahují jméno a verzi serveru, počet uživatelů s veřejnými profily, počet příspěvků a aktivované protokoly a konektory. Pro více informací navštivte <a href='http://the-federation.info/'>the-federation.info</a>."
 
-#: mod/admin.php:1665
+#: mod/admin.php:1666
 msgid "Check upstream version"
 msgstr "Zkontrolovat upstreamovou verzi"
 
-#: mod/admin.php:1665
+#: mod/admin.php:1666
 msgid ""
 "Enables checking for new Friendica versions at github. If there is a new "
 "version, you will be informed in the admin panel overview."
 msgstr "Umožní kontrolovat nové verze Friendica na GitHubu. Pokud existuje nová verze, budete informován/a na přehledu administračního panelu."
 
-#: mod/admin.php:1666
+#: mod/admin.php:1667
 msgid "Suppress Tags"
 msgstr "Potlačit štítky"
 
-#: mod/admin.php:1666
+#: mod/admin.php:1667
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr "Potlačit zobrazení seznamu hastagů na konci příspěvků."
 
-#: mod/admin.php:1667
+#: mod/admin.php:1668
 msgid "Clean database"
 msgstr "Vyčistit databázi"
 
-#: mod/admin.php:1667
+#: mod/admin.php:1668
 msgid ""
 "Remove old remote items, orphaned database records and old content from some"
 " other helper tables."
 msgstr "Odstranit staré vzdálené položky, osiřelé záznamy v databázi a starý obsah z některých dalších pomocných tabulek."
 
-#: mod/admin.php:1668
+#: mod/admin.php:1669
 msgid "Lifespan of remote items"
 msgstr "Životnost vzdálených položek"
 
-#: mod/admin.php:1668
+#: mod/admin.php:1669
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "remote items will be deleted. Own items, and marked or filed items are "
 "always kept. 0 disables this behaviour."
 msgstr "Pokud je zapnuto čištění databáze, tato funkce definuje počet dnů, po kterých budou smazány vzdálené položky. Vlastní položky a označené či vyplněné položky jsou vždy ponechány. Hodnota 0 tuto funkci vypíná."
 
-#: mod/admin.php:1669
+#: mod/admin.php:1670
 msgid "Lifespan of unclaimed items"
 msgstr "Životnost nevyžádaných položek"
 
-#: mod/admin.php:1669
+#: mod/admin.php:1670
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "unclaimed remote items (mostly content from the relay) will be deleted. "
@@ -2219,141 +2218,141 @@ msgid ""
 "items if set to 0."
 msgstr "Pokud je zapnuto čištění databáze, tato funkce definuje počet dnů, po kterých budou smazány nevyžádané vzdálené položky (většinou obsah z přeposílacího serveru). Výchozí hodnota je 90 dní. Pokud je zadaná hodnota 0, výchozí hodnotou bude obecná hodnota životnosti vzdálených položek."
 
-#: mod/admin.php:1670
+#: mod/admin.php:1671
 msgid "Lifespan of raw conversation data"
 msgstr "Životnost hrubých dat konverzací"
 
-#: mod/admin.php:1670
+#: mod/admin.php:1671
 msgid ""
 "The conversation data is used for ActivityPub and OStatus, as well as for "
 "debug purposes. It should be safe to remove it after 14 days, default is 90 "
 "days."
 msgstr "Data konverzací jsou použita pro ActivityPub a OStatus a pro účely ladění. Mělo by být bezpečné je odstranit po 14 dnech, výchozí hodnota je 90 dní."
 
-#: mod/admin.php:1671
+#: mod/admin.php:1672
 msgid "Path to item cache"
 msgstr "Cesta k položkám v mezipaměti"
 
-#: mod/admin.php:1671
+#: mod/admin.php:1672
 msgid "The item caches buffers generated bbcode and external images."
 msgstr "V mezipaměti je uložen vygenerovaný BBCode a externí obrázky."
 
-#: mod/admin.php:1672
+#: mod/admin.php:1673
 msgid "Cache duration in seconds"
 msgstr "Doba platnosti vyrovnávací paměti v sekundách"
 
-#: mod/admin.php:1672
+#: mod/admin.php:1673
 msgid ""
 "How long should the cache files be hold? Default value is 86400 seconds (One"
 " day). To disable the item cache, set the value to -1."
 msgstr "Jak dlouho by měla vyrovnávací paměť držet data? Výchozí hodnota je 86400 sekund (Jeden den). Pro vypnutí funkce vyrovnávací paměti nastavte hodnotu na -1."
 
-#: mod/admin.php:1673
+#: mod/admin.php:1674
 msgid "Maximum numbers of comments per post"
 msgstr "Maximální počet komentářů k příspěvku"
 
-#: mod/admin.php:1673
+#: mod/admin.php:1674
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr "Kolik komentářů by mělo být zobrazeno k každému příspěvku? Výchozí hodnotou je 100."
 
-#: mod/admin.php:1674
+#: mod/admin.php:1675
 msgid "Temp path"
 msgstr "Cesta k dočasným souborům"
 
-#: mod/admin.php:1674
+#: mod/admin.php:1675
 msgid ""
 "If you have a restricted system where the webserver can't access the system "
 "temp path, enter another path here."
 msgstr "Pokud máte omezený systém, kde webový server nemá přístup k systémové složce temp, zde zadejte jinou cestu."
 
-#: mod/admin.php:1675
+#: mod/admin.php:1676
 msgid "Base path to installation"
 msgstr "Základní cesta k instalaci"
 
-#: mod/admin.php:1675
+#: mod/admin.php:1676
 msgid ""
 "If the system cannot detect the correct path to your installation, enter the"
 " correct path here. This setting should only be set if you are using a "
 "restricted system and symbolic links to your webroot."
 msgstr "Pokud systém nemůže detekovat správnou cestu k Vaší instalaci, zde zadejte jinou cestu. Toto nastavení by mělo být nastaveno pouze, pokud používáte omezený systém a symbolické odkazy ke kořenové složce webu."
 
-#: mod/admin.php:1676
+#: mod/admin.php:1677
 msgid "Disable picture proxy"
 msgstr "Vypnutí obrázkové proxy"
 
-#: mod/admin.php:1676
+#: mod/admin.php:1677
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
 " systems with very low bandwidth."
 msgstr "Obrázková proxy zvyšuje výkon a soukromí. Neměla by však být používána na systémech s velmi malou rychlostí připojení."
 
-#: mod/admin.php:1677
+#: mod/admin.php:1678
 msgid "Only search in tags"
 msgstr "Hledat pouze ve štítcích"
 
-#: mod/admin.php:1677
+#: mod/admin.php:1678
 msgid "On large systems the text search can slow down the system extremely."
 msgstr "Textové vyhledávání může u rozsáhlých systémů znamenat velmi citelné zpomalení systému."
 
-#: mod/admin.php:1679
+#: mod/admin.php:1680
 msgid "New base url"
 msgstr "Nová výchozí url adresa"
 
-#: mod/admin.php:1679
+#: mod/admin.php:1680
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and"
 " Diaspora* contacts of all users."
 msgstr "Změnit výchozí URL adresu pro tento server. Toto odešle zprávu o přemístění všem kontaktům na Friendica a Diaspora* všech uživatelů."
 
-#: mod/admin.php:1681
+#: mod/admin.php:1682
 msgid "RINO Encryption"
 msgstr "RINO Šifrování"
 
-#: mod/admin.php:1681
+#: mod/admin.php:1682
 msgid "Encryption layer between nodes."
 msgstr "Šifrovací vrstva mezi servery."
 
-#: mod/admin.php:1681
+#: mod/admin.php:1682
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: mod/admin.php:1683
+#: mod/admin.php:1684
 msgid "Maximum number of parallel workers"
 msgstr "Maximální počet paralelních pracovníků"
 
-#: mod/admin.php:1683
+#: mod/admin.php:1684
 #, php-format
 msgid ""
 "On shared hosters set this to %d. On larger systems, values of %d are great."
 " Default value is %d."
 msgstr "Na sdílených hostinzích toto nastavte na hodnotu %d. Na větších systémech se hodí hodnoty kolem %d. Výchozí hodnotou je %d."
 
-#: mod/admin.php:1684
+#: mod/admin.php:1685
 msgid "Don't use 'proc_open' with the worker"
 msgstr "Nepoužívat „proc_open“ s pracovníkem"
 
-#: mod/admin.php:1684
+#: mod/admin.php:1685
 msgid ""
 "Enable this if your system doesn't allow the use of 'proc_open'. This can "
 "happen on shared hosters. If this is enabled you should increase the "
 "frequency of worker calls in your crontab."
 msgstr "Toto zapněte, pokud Váš systém nedovoluje používání „proc_open“. To se může stát na sdíleném hostingu. Pokud je toto povoleno, bude zvýšena častost vyvolávání pracovníka v crontabu."
 
-#: mod/admin.php:1685
+#: mod/admin.php:1686
 msgid "Enable fastlane"
 msgstr "Povolit fastlane"
 
-#: mod/admin.php:1685
+#: mod/admin.php:1686
 msgid ""
 "When enabed, the fastlane mechanism starts an additional worker if processes"
 " with higher priority are blocked by processes of lower priority."
 msgstr "Pokud je toto povoleno, mechanismus fastlane spustí dodatečného pracovníka, pokud jsou procesy vyšší priority zablokované procesy nižší priority."
 
-#: mod/admin.php:1686
+#: mod/admin.php:1687
 msgid "Enable frontend worker"
 msgstr "Povolit frontendového pracovníka"
 
-#: mod/admin.php:1686
+#: mod/admin.php:1687
 #, php-format
 msgid ""
 "When enabled the Worker process is triggered when backend access is "
@@ -2363,136 +2362,136 @@ msgid ""
 " on your server."
 msgstr "Pokud je toto povoleno, bude proces pracovníka vyvolán, pokud je proveden backendový přístup (např. když jsou doručovány zprávy). Na menších stránkách možná budete chtít pravidelně vyvolávat %s/worker přes externí úlohu cron. Tuto možnost byste měl/a zapnout pouze, pokud nemůžete na Vašem serveru používat cron/plánované úlohy."
 
-#: mod/admin.php:1688
+#: mod/admin.php:1689
 msgid "Subscribe to relay"
 msgstr "Odebírat ze serveru pro přeposílání"
 
-#: mod/admin.php:1688
+#: mod/admin.php:1689
 msgid ""
 "Enables the receiving of public posts from the relay. They will be included "
 "in the search, subscribed tags and on the global community page."
 msgstr "Umožňuje přijímat veřejné příspěvky z přeposílacího serveru. Budou zahrnuty ve vyhledávání, odebíraných štítcích a na globální komunitní stránce."
 
-#: mod/admin.php:1689
+#: mod/admin.php:1690
 msgid "Relay server"
 msgstr "Server pro přeposílání (relay)"
 
-#: mod/admin.php:1689
+#: mod/admin.php:1690
 msgid ""
 "Address of the relay server where public posts should be send to. For "
 "example https://relay.diasp.org"
 msgstr "Adresa přeposílacího serveru, kam budou posílány veřejné příspěvky. Příklad: https://relay.diasp.org"
 
-#: mod/admin.php:1690
+#: mod/admin.php:1691
 msgid "Direct relay transfer"
 msgstr "Přímý přenos na server pro přeposílání"
 
-#: mod/admin.php:1690
+#: mod/admin.php:1691
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr "Umožňuje přímý přenos na ostatní servery bez použití přeposílacích serverů"
 
-#: mod/admin.php:1691
+#: mod/admin.php:1692
 msgid "Relay scope"
 msgstr "Rozsah příspěvků z přeposílacího serveru"
 
-#: mod/admin.php:1691
+#: mod/admin.php:1692
 msgid ""
 "Can be 'all' or 'tags'. 'all' means that every public post should be "
 "received. 'tags' means that only posts with selected tags should be "
 "received."
 msgstr "Může být buď „vše“ nebo „štítky“. „vše“ znamená, že budou přijaty všechny veřejné příspěvky. „štítky“ znamená, že budou přijaty pouze příspěvky s vybranými štítky."
 
-#: mod/admin.php:1691
+#: mod/admin.php:1692
 msgid "all"
 msgstr "vše"
 
-#: mod/admin.php:1691
+#: mod/admin.php:1692
 msgid "tags"
 msgstr "štítky"
 
-#: mod/admin.php:1692
+#: mod/admin.php:1693
 msgid "Server tags"
 msgstr "Serverové štítky"
 
-#: mod/admin.php:1692
+#: mod/admin.php:1693
 msgid "Comma separated list of tags for the 'tags' subscription."
 msgstr "Seznam štítků pro odběr „tags“, oddělených čárkami."
 
-#: mod/admin.php:1693
+#: mod/admin.php:1694
 msgid "Allow user tags"
 msgstr "Povolit uživatelské štítky"
 
-#: mod/admin.php:1693
+#: mod/admin.php:1694
 msgid ""
 "If enabled, the tags from the saved searches will used for the 'tags' "
 "subscription in addition to the 'relay_server_tags'."
 msgstr "Pokud je toto povoleno, budou štítky z uložených hledání vedle odběru „relay_server_tags“ použity i pro odběr „tags“."
 
-#: mod/admin.php:1696
+#: mod/admin.php:1697
 msgid "Start Relocation"
 msgstr "Začít přemístění"
 
-#: mod/admin.php:1723
+#: mod/admin.php:1724
 msgid "Update has been marked successful"
 msgstr "Aktualizace byla označena jako úspěšná."
 
-#: mod/admin.php:1730
+#: mod/admin.php:1731
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr "Aktualizace struktury databáze %s byla úspěšně aplikována."
 
-#: mod/admin.php:1734
+#: mod/admin.php:1735
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr "Provádění aktualizace databáze %s selhalo s chybou: %s"
 
-#: mod/admin.php:1750
+#: mod/admin.php:1751
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr "Vykonávání %s selhalo s chybou: %s"
 
-#: mod/admin.php:1752
+#: mod/admin.php:1753
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Aktualizace %s byla úspěšně aplikována."
 
-#: mod/admin.php:1755
+#: mod/admin.php:1756
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Aktualizace %s nevrátila žádný stav. Není zřejmé, jestli byla úspěšná."
 
-#: mod/admin.php:1758
+#: mod/admin.php:1759
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr "Nebyla nalezena žádná další aktualizační funkce %s která by měla být volána."
 
-#: mod/admin.php:1781
+#: mod/admin.php:1782
 msgid "No failed updates."
 msgstr "Žádné neúspěšné aktualizace."
 
-#: mod/admin.php:1782
+#: mod/admin.php:1783
 msgid "Check database structure"
 msgstr "Ověřit strukturu databáze"
 
-#: mod/admin.php:1787
+#: mod/admin.php:1788
 msgid "Failed Updates"
 msgstr "Neúspěšné aktualizace"
 
-#: mod/admin.php:1788
+#: mod/admin.php:1789
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "To nezahrnuje aktualizace do verze 1139, které nevracejí žádný status."
 
-#: mod/admin.php:1789
+#: mod/admin.php:1790
 msgid "Mark success (if update was manually applied)"
 msgstr "Označit za úspěšné (pokud byla aktualizace aplikována manuálně)"
 
-#: mod/admin.php:1790
+#: mod/admin.php:1791
 msgid "Attempt to execute this update step automatically"
 msgstr "Pokusit se provést tuto aktualizaci automaticky."
 
-#: mod/admin.php:1830
+#: mod/admin.php:1831
 #, php-format
 msgid ""
 "\n"
@@ -2500,7 +2499,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr "\n\t\t\tVážený/á %1$s,\n\t\t\t\tadministrátor %2$s pro Vás vytvořil uživatelský účet."
 
-#: mod/admin.php:1833
+#: mod/admin.php:1834
 #, php-format
 msgid ""
 "\n"
@@ -2532,12 +2531,12 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr "\n\t\t\tZde jsou vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%1$s\n\t\t\tPřihlašovací jméno:\t%2$s\n\t\t\tHeslo:\t\t\t%3$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce „Nastavení“ vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na této stránce.\n\n\t\t\tMožná byste si také přál/a přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce „Profily“) aby vás další lidé mohli snadno najít.\n\t\t\tDoporučujeme nastavit si Vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár „klíčových slov“ k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\t\t\tPokud byste si někdy přál/a smazat účet, můžete tak učinit na stránce\n\t\t\t%1$s/removeme.\n\n\t\t\tDěkujeme vám a vítáme vás na %4$s."
 
-#: mod/admin.php:1870 src/Model/User.php:858
+#: mod/admin.php:1871 src/Model/User.php:859
 #, php-format
 msgid "Registration details for %s"
 msgstr "Registrační údaje pro uživatele %s"
 
-#: mod/admin.php:1880
+#: mod/admin.php:1881
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
@@ -2546,11 +2545,11 @@ msgstr[1] "%s uživatelů blokováno/odblokováno"
 msgstr[2] "%s uživatele blokováno/odblokováno"
 msgstr[3] "%s uživatelů blokováno/odblokováno"
 
-#: mod/admin.php:1887 mod/admin.php:1941
+#: mod/admin.php:1888 mod/admin.php:1942
 msgid "You can't remove yourself"
 msgstr "Nemůžete odstranit sebe sama"
 
-#: mod/admin.php:1890
+#: mod/admin.php:1891
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
@@ -2559,202 +2558,202 @@ msgstr[1] "%s uživatelů smazáno"
 msgstr[2] "%s uživatele smazáno"
 msgstr[3] "%s uživatelů smazáno"
 
-#: mod/admin.php:1939
+#: mod/admin.php:1940
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Uživatel „%s“ smazán"
 
-#: mod/admin.php:1950
+#: mod/admin.php:1951
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Uživatel „%s“ odblokován"
 
-#: mod/admin.php:1950
+#: mod/admin.php:1951
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Uživatel „%s“ zablokován"
 
-#: mod/admin.php:1998 mod/settings.php:1049
+#: mod/admin.php:1999 mod/settings.php:1049
 msgid "Normal Account Page"
 msgstr "Normální stránka účtu"
 
-#: mod/admin.php:1999 mod/settings.php:1053
+#: mod/admin.php:2000 mod/settings.php:1053
 msgid "Soapbox Page"
 msgstr "Propagační stránka"
 
-#: mod/admin.php:2000 mod/settings.php:1057
+#: mod/admin.php:2001 mod/settings.php:1057
 msgid "Public Forum"
 msgstr "Veřejné fórum"
 
-#: mod/admin.php:2001 mod/settings.php:1061
+#: mod/admin.php:2002 mod/settings.php:1061
 msgid "Automatic Friend Page"
 msgstr "Stránka s automatickými přátely"
 
-#: mod/admin.php:2002
+#: mod/admin.php:2003
 msgid "Private Forum"
 msgstr "Soukromé fórum"
 
-#: mod/admin.php:2005 mod/settings.php:1033
+#: mod/admin.php:2006 mod/settings.php:1033
 msgid "Personal Page"
 msgstr "Osobní stránka"
 
-#: mod/admin.php:2006 mod/settings.php:1037
+#: mod/admin.php:2007 mod/settings.php:1037
 msgid "Organisation Page"
 msgstr "Stránka organizace"
 
-#: mod/admin.php:2007 mod/settings.php:1041
+#: mod/admin.php:2008 mod/settings.php:1041
 msgid "News Page"
 msgstr "Zpravodajská stránka"
 
-#: mod/admin.php:2008 mod/settings.php:1045
+#: mod/admin.php:2009 mod/settings.php:1045
 msgid "Community Forum"
 msgstr "Komunitní fórum"
 
-#: mod/admin.php:2009
+#: mod/admin.php:2010
 msgid "Relay"
 msgstr "Přeposílací server"
 
-#: mod/admin.php:2055 mod/admin.php:2066 mod/admin.php:2080 mod/admin.php:2098
+#: mod/admin.php:2056 mod/admin.php:2067 mod/admin.php:2081 mod/admin.php:2099
 #: src/Content/ContactSelector.php:86
 msgid "Email"
 msgstr "E-mail"
 
-#: mod/admin.php:2055 mod/admin.php:2080
+#: mod/admin.php:2056 mod/admin.php:2081
 msgid "Register date"
 msgstr "Datum registrace"
 
-#: mod/admin.php:2055 mod/admin.php:2080
+#: mod/admin.php:2056 mod/admin.php:2081
 msgid "Last login"
 msgstr "Datum posledního přihlášení"
 
-#: mod/admin.php:2055 mod/admin.php:2080
+#: mod/admin.php:2056 mod/admin.php:2081
 msgid "Last item"
 msgstr "Poslední položka"
 
-#: mod/admin.php:2055
+#: mod/admin.php:2056
 msgid "Type"
 msgstr "Typ"
 
-#: mod/admin.php:2062
+#: mod/admin.php:2063
 msgid "Add User"
 msgstr "Přidat uživatele"
 
-#: mod/admin.php:2064
+#: mod/admin.php:2065
 msgid "User registrations waiting for confirm"
 msgstr "Registrace uživatelů čekající na potvrzení"
 
-#: mod/admin.php:2065
+#: mod/admin.php:2066
 msgid "User waiting for permanent deletion"
 msgstr "Uživatel čekající na trvalé smazání"
 
-#: mod/admin.php:2066
+#: mod/admin.php:2067
 msgid "Request date"
 msgstr "Datum požadavku"
 
-#: mod/admin.php:2067
+#: mod/admin.php:2068
 msgid "No registrations."
 msgstr "Žádné registrace."
 
-#: mod/admin.php:2068
+#: mod/admin.php:2069
 msgid "Note from the user"
 msgstr "Poznámka od uživatele"
 
-#: mod/admin.php:2069 mod/notifications.php:183 mod/notifications.php:269
+#: mod/admin.php:2070 mod/notifications.php:183 mod/notifications.php:269
 msgid "Approve"
 msgstr "Schválit"
 
-#: mod/admin.php:2070
+#: mod/admin.php:2071
 msgid "Deny"
 msgstr "Odmítnout"
 
-#: mod/admin.php:2073
+#: mod/admin.php:2074
 msgid "User blocked"
 msgstr "Uživatel zablokován"
 
-#: mod/admin.php:2075
+#: mod/admin.php:2076
 msgid "Site admin"
 msgstr "Administrátor webu"
 
-#: mod/admin.php:2076
+#: mod/admin.php:2077
 msgid "Account expired"
 msgstr "Účtu vypršela platnost"
 
-#: mod/admin.php:2079
+#: mod/admin.php:2080
 msgid "New User"
 msgstr "Nový uživatel"
 
-#: mod/admin.php:2080
+#: mod/admin.php:2081
 msgid "Permanent deletion"
 msgstr "Trvalé smazání"
 
-#: mod/admin.php:2085
+#: mod/admin.php:2086
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Vybraní uživatelé budou smazáni!\\n\\n Vše, co tito uživatelé na těchto stránkách vytvořili, bude trvale odstraněno!\\n\\nOpravdu chcete pokračovat?"
 
-#: mod/admin.php:2086
+#: mod/admin.php:2087
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Uživatel {0} bude smazán!\\n\\n Vše, co tento uživatel na těchto stránkách vytvořil, bude trvale odstraněno!\\n\\n Opravdu chcete pokračovat?"
 
-#: mod/admin.php:2096
+#: mod/admin.php:2097
 msgid "Name of the new user."
 msgstr "Jméno nového uživatele."
 
-#: mod/admin.php:2097
+#: mod/admin.php:2098
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: mod/admin.php:2097
+#: mod/admin.php:2098
 msgid "Nickname of the new user."
 msgstr "Přezdívka nového uživatele."
 
-#: mod/admin.php:2098
+#: mod/admin.php:2099
 msgid "Email address of the new user."
 msgstr "Emailová adresa nového uživatele."
 
-#: mod/admin.php:2140
+#: mod/admin.php:2141
 #, php-format
 msgid "Addon %s disabled."
 msgstr "Doplněk %s zakázán."
 
-#: mod/admin.php:2143
+#: mod/admin.php:2144
 #, php-format
 msgid "Addon %s enabled."
 msgstr "Doplněk %s povolen."
 
-#: mod/admin.php:2154 mod/admin.php:2404
+#: mod/admin.php:2155 mod/admin.php:2405
 msgid "Disable"
 msgstr "Zakázat"
 
-#: mod/admin.php:2157 mod/admin.php:2407
+#: mod/admin.php:2158 mod/admin.php:2408
 msgid "Enable"
 msgstr "Povolit"
 
-#: mod/admin.php:2179 mod/admin.php:2436
+#: mod/admin.php:2180 mod/admin.php:2437
 msgid "Toggle"
 msgstr "Přepnout"
 
-#: mod/admin.php:2180 mod/admin.php:2437 mod/newmember.php:20
+#: mod/admin.php:2181 mod/admin.php:2438 mod/newmember.php:20
 #: mod/settings.php:136 src/Content/Nav.php:263 view/theme/frio/theme.php:272
 msgid "Settings"
 msgstr "Nastavení"
 
-#: mod/admin.php:2187 mod/admin.php:2445
+#: mod/admin.php:2188 mod/admin.php:2446
 msgid "Author: "
 msgstr "Autor: "
 
-#: mod/admin.php:2188 mod/admin.php:2446
+#: mod/admin.php:2189 mod/admin.php:2447
 msgid "Maintainer: "
 msgstr "Správce: "
 
-#: mod/admin.php:2240
+#: mod/admin.php:2241
 msgid "Reload active addons"
 msgstr "Znovu načíst aktivní doplňky"
 
-#: mod/admin.php:2245
+#: mod/admin.php:2246
 #, php-format
 msgid ""
 "There are currently no addons available on your node. You can find the "
@@ -2762,70 +2761,70 @@ msgid ""
 " the open addon registry at %2$s"
 msgstr "Aktuálně nejsou na Vašem serveru k dispozici žádné doplňky. Oficiální repozitář doplňků najdete na %1$s a další zajímavé doplňky můžete najít v otevřeném registru doplňků na %2$s"
 
-#: mod/admin.php:2366
+#: mod/admin.php:2367
 msgid "No themes found."
 msgstr "Nenalezeny žádné motivy."
 
-#: mod/admin.php:2427
+#: mod/admin.php:2428
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
-#: mod/admin.php:2481
+#: mod/admin.php:2482
 msgid "Reload active themes"
 msgstr "Znovu načíst aktivní motivy"
 
-#: mod/admin.php:2486
+#: mod/admin.php:2487
 #, php-format
 msgid "No themes found on the system. They should be placed in %1$s"
 msgstr "V systému nebyly nalezeny žádné motivy. Měly by být uloženy v %1$s"
 
-#: mod/admin.php:2487
+#: mod/admin.php:2488
 msgid "[Experimental]"
 msgstr "[Experimentální]"
 
-#: mod/admin.php:2488
+#: mod/admin.php:2489
 msgid "[Unsupported]"
 msgstr "[Nepodporováno]"
 
-#: mod/admin.php:2513
+#: mod/admin.php:2514
 msgid "Log settings updated."
 msgstr "Nastavení záznamů aktualizována."
 
-#: mod/admin.php:2546
+#: mod/admin.php:2547
 msgid "PHP log currently enabled."
 msgstr "PHP záznamy jsou aktuálně povolené."
 
-#: mod/admin.php:2548
+#: mod/admin.php:2549
 msgid "PHP log currently disabled."
 msgstr "PHP záznamy jsou aktuálně zakázané."
 
-#: mod/admin.php:2557
+#: mod/admin.php:2558
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: mod/admin.php:2561
+#: mod/admin.php:2562
 msgid "Enable Debugging"
 msgstr "Povolit ladění"
 
-#: mod/admin.php:2562
+#: mod/admin.php:2563
 msgid "Log file"
 msgstr "Soubor se záznamem"
 
-#: mod/admin.php:2562
+#: mod/admin.php:2563
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Musí být zapisovatelný webovým serverem. Cesta relativní k vašemu kořenovému adresáři Friendica."
 
-#: mod/admin.php:2563
+#: mod/admin.php:2564
 msgid "Log level"
 msgstr "Úroveň auditu"
 
-#: mod/admin.php:2565
+#: mod/admin.php:2566
 msgid "PHP logging"
 msgstr "Záznamování PHP"
 
-#: mod/admin.php:2566
+#: mod/admin.php:2567
 msgid ""
 "To temporarily enable logging of PHP errors and warnings you can prepend the"
 " following to the index.php file of your installation. The filename set in "
@@ -2834,34 +2833,34 @@ msgid ""
 "'display_errors' is to enable these options, set to '0' to disable them."
 msgstr "Pro dočasné umožnění zaznamenávání PHP chyb a varování, můžete přidat do souboru index.php na vaší instalaci následující: Název souboru nastavený v řádku „error_log“ je relativní ke kořenovému adresáři Friendica a webový server musí mít povolení na něj zapisovat. Možnost „1“ pro „log_errors“ a „display_errors“ tyto funkce povoluje, nastavením hodnoty na „0“ je zakážete. "
 
-#: mod/admin.php:2598
+#: mod/admin.php:2599
 #, php-format
 msgid ""
 "Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see "
 "if file %1$s exist and is readable."
 msgstr "Chyba při otevírání záznamu <strong>%1$s</strong>.\\r\\n<br/>Zkontrolujte, jestli soubor %1$s existuje a může se číst."
 
-#: mod/admin.php:2602
+#: mod/admin.php:2603
 #, php-format
 msgid ""
 "Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file"
 " %1$s is readable."
 msgstr "Nelze otevřít záznam <strong>%1$s</strong>.\\r\\n<br/>Zkontrolujte, jestli se soubor %1$s může číst."
 
-#: mod/admin.php:2695 mod/admin.php:2696 mod/settings.php:763
+#: mod/admin.php:2696 mod/admin.php:2697 mod/settings.php:763
 msgid "Off"
 msgstr "Vyp"
 
-#: mod/admin.php:2695 mod/admin.php:2696 mod/settings.php:763
+#: mod/admin.php:2696 mod/admin.php:2697 mod/settings.php:763
 msgid "On"
 msgstr "Zap"
 
-#: mod/admin.php:2696
+#: mod/admin.php:2697
 #, php-format
 msgid "Lock feature %s"
 msgstr "Uzamknout vlastnost %s"
 
-#: mod/admin.php:2704
+#: mod/admin.php:2705
 msgid "Manage Additional Features"
 msgstr "Spravovat další funkce"
 
@@ -2902,7 +2901,7 @@ msgstr "Chcete umožnit této aplikaci přístup k vašim příspěvkům a konta
 msgid "No"
 msgstr "Ne"
 
-#: mod/apps.php:15 src/App.php:1351
+#: mod/apps.php:15 src/App.php:1349
 msgid "You must be logged in to use addons. "
 msgstr "Pro použití doplňků musíte být přihlášen/a."
 
@@ -3036,7 +3035,7 @@ msgid "Access denied."
 msgstr "Přístup odmítnut."
 
 #: mod/cal.php:46 mod/dfrn_poll.php:486 mod/help.php:68
-#: mod/viewcontacts.php:34 src/App.php:1402
+#: mod/viewcontacts.php:34 src/App.php:1400
 msgid "Page not found."
 msgstr "Stránka nenalezena"
 
@@ -3062,21 +3061,21 @@ msgstr "Předchozí"
 msgid "Next"
 msgstr "Dále"
 
-#: mod/cal.php:279 mod/events.php:393 src/Model/Event.php:429
+#: mod/cal.php:279 mod/events.php:393 src/Model/Event.php:428
 msgid "today"
 msgstr "dnes"
 
-#: mod/cal.php:280 mod/events.php:394 src/Model/Event.php:430
+#: mod/cal.php:280 mod/events.php:394 src/Model/Event.php:429
 #: src/Util/Temporal.php:314
 msgid "month"
 msgstr "měsíc"
 
-#: mod/cal.php:281 mod/events.php:395 src/Model/Event.php:431
+#: mod/cal.php:281 mod/events.php:395 src/Model/Event.php:430
 #: src/Util/Temporal.php:315
 msgid "week"
 msgstr "týden"
 
-#: mod/cal.php:282 mod/events.php:396 src/Model/Event.php:432
+#: mod/cal.php:282 mod/events.php:396 src/Model/Event.php:431
 #: src/Util/Temporal.php:316
 msgid "day"
 msgstr "den"
@@ -3085,7 +3084,7 @@ msgstr "den"
 msgid "list"
 msgstr "seznam"
 
-#: mod/cal.php:296 src/Core/Console/NewPassword.php:67 src/Model/User.php:323
+#: mod/cal.php:296 src/Core/Console/NewPassword.php:67 src/Model/User.php:324
 msgid "User not found"
 msgstr "Uživatel nenalezen."
 
@@ -3161,106 +3160,110 @@ msgid ""
 "code or the translation of Friendica. Thank you all!"
 msgstr "Friendica je komunitní projekt, který by nebyl možný bez pomoci mnoha lidí. Zde je seznam těch, kteří přispěli ke kódu nebo k překladu Friendica. Děkujeme všem!"
 
-#: mod/crepair.php:90
+#: mod/crepair.php:79
 msgid "Contact settings applied."
 msgstr "Nastavení kontaktu změněno"
 
-#: mod/crepair.php:92
+#: mod/crepair.php:81
 msgid "Contact update failed."
 msgstr "Aktualizace kontaktu selhala."
 
-#: mod/crepair.php:113 mod/dfrn_confirm.php:127 mod/fsuggest.php:28
+#: mod/crepair.php:102 mod/dfrn_confirm.php:127 mod/fsuggest.php:28
 #: mod/fsuggest.php:89 mod/redir.php:31 mod/redir.php:137
 msgid "Contact not found."
 msgstr "Kontakt nenalezen."
 
-#: mod/crepair.php:117
+#: mod/crepair.php:115
 msgid ""
 "<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
 " information your communications with this contact may stop working."
 msgstr "<strong>VAROVÁNÍ: Toto je velmi pokročilé</strong> a pokud zadáte nesprávné informace, vaše komunikace s tímto kontaktem může přestat fungovat."
 
-#: mod/crepair.php:118
+#: mod/crepair.php:116
 msgid ""
 "Please use your browser 'Back' button <strong>now</strong> if you are "
 "uncertain what to do on this page."
 msgstr "Prosím použijte <strong>ihned</strong> v prohlížeči tlačítko „zpět“ pokud si nejste jisti, co dělat na této stránce."
 
-#: mod/crepair.php:132 mod/crepair.php:134
+#: mod/crepair.php:130 mod/crepair.php:132
 msgid "No mirroring"
 msgstr "Žádné zrcadlení"
 
-#: mod/crepair.php:132
+#: mod/crepair.php:130
 msgid "Mirror as forwarded posting"
 msgstr "Zrcadlit pro přeposlané příspěvky"
 
-#: mod/crepair.php:132 mod/crepair.php:134
+#: mod/crepair.php:130 mod/crepair.php:132
 msgid "Mirror as my own posting"
 msgstr "Zrcadlit jako mé vlastní příspěvky"
 
-#: mod/crepair.php:147
+#: mod/crepair.php:145
 msgid "Return to contact editor"
 msgstr "Zpět k editoru kontaktu"
 
-#: mod/crepair.php:149
+#: mod/crepair.php:147
 msgid "Refetch contact data"
 msgstr "Znovu načíst data kontaktu"
 
-#: mod/crepair.php:151 mod/events.php:553 mod/fsuggest.php:106
+#: mod/crepair.php:149 mod/events.php:553 mod/fsuggest.php:106
 #: mod/invite.php:154 mod/localtime.php:56 mod/manage.php:182
 #: mod/message.php:261 mod/message.php:441 mod/photos.php:1049
 #: mod/photos.php:1137 mod/photos.php:1412 mod/photos.php:1457
 #: mod/photos.php:1496 mod/photos.php:1556 mod/poke.php:188
 #: mod/profiles.php:562 src/Module/Contact.php:594 src/Module/Install.php:187
-#: src/Module/Install.php:222 src/Object/Post.php:867
+#: src/Module/Install.php:222 src/Object/Post.php:874
 #: view/theme/duepuntozero/config.php:72 view/theme/frio/config.php:119
 #: view/theme/quattro/config.php:74 view/theme/vier/config.php:120
 msgid "Submit"
 msgstr "Odeslat"
 
-#: mod/crepair.php:152
+#: mod/crepair.php:150
 msgid "Remote Self"
 msgstr "Vzdálené zrcadlení"
 
-#: mod/crepair.php:155
+#: mod/crepair.php:153
 msgid "Mirror postings from this contact"
 msgstr "Zrcadlení příspěvků od tohoto kontaktu"
 
-#: mod/crepair.php:157
+#: mod/crepair.php:155
 msgid ""
 "Mark this contact as remote_self, this will cause friendica to repost new "
 "entries from this contact."
 msgstr "Označit tento kontakt jako „remote_self“, s tímto nastavením bude Friendica znovupublikovat všechny nové příspěvky od tohoto kontaktu."
 
-#: mod/crepair.php:162
+#: mod/crepair.php:160
 msgid "Account Nickname"
 msgstr "Přezdívka účtu"
 
-#: mod/crepair.php:163
+#: mod/crepair.php:161
 msgid "@Tagname - overrides Name/Nickname"
 msgstr "@jménoštítku- upřednostněno před jménem/přezdívkou"
 
-#: mod/crepair.php:164
+#: mod/crepair.php:162
 msgid "Account URL"
 msgstr "URL adresa účtu"
 
-#: mod/crepair.php:165
+#: mod/crepair.php:163
+msgid "Account URL Alias"
+msgstr "Alias URL adresy účtu"
+
+#: mod/crepair.php:164
 msgid "Friend Request URL"
 msgstr "URL požadavku o přátelství"
 
-#: mod/crepair.php:166
+#: mod/crepair.php:165
 msgid "Friend Confirm URL"
 msgstr "URL adresa pro potvrzení přátelství"
 
-#: mod/crepair.php:167
+#: mod/crepair.php:166
 msgid "Notification Endpoint URL"
 msgstr "URL adresa koncového bodu oznámení"
 
-#: mod/crepair.php:168
+#: mod/crepair.php:167
 msgid "Poll/Feed URL"
 msgstr "URL adresa poll/feed"
 
-#: mod/crepair.php:169
+#: mod/crepair.php:168
 msgid "New photo from this URL"
 msgstr "Nová fotka z této URL adresy"
 
@@ -3402,7 +3405,7 @@ msgid "Unable to update your contact profile details on our system"
 msgstr "Nelze aktualizovat váš profil v našem systému"
 
 #: mod/dfrn_confirm.php:612 mod/dfrn_request.php:560
-#: src/Model/Contact.php:2026
+#: src/Model/Contact.php:2043
 msgid "[Name Withheld]"
 msgstr "[Jméno odepřeno]"
 
@@ -3478,7 +3481,7 @@ msgstr "Zřejmě jste s %s již přátelé."
 msgid "Invalid profile URL."
 msgstr "Neplatné URL profilu."
 
-#: mod/dfrn_request.php:340 src/Model/Contact.php:1697
+#: mod/dfrn_request.php:340 src/Model/Contact.php:1714
 msgid "Disallowed profile URL."
 msgstr "Nepovolené URL profilu."
 
@@ -3588,8 +3591,8 @@ msgid "Submit Request"
 msgstr "Odeslat požadavek"
 
 #: mod/directory.php:154 mod/events.php:541 mod/notifications.php:253
-#: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:438
-#: src/Model/Event.php:934 src/Model/Profile.php:443
+#: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:437
+#: src/Model/Event.php:933 src/Model/Profile.php:443
 #: src/Module/Contact.php:643
 msgid "Location:"
 msgstr "Poloha:"
@@ -3829,45 +3832,45 @@ msgstr "Štítky:"
 msgid "Status Messages and Posts"
 msgstr "Stavové zprávy a příspěvky "
 
-#: mod/friendica.php:87
+#: mod/friendica.php:88
 #, php-format
 msgid ""
 "This is Friendica, version %s that is running at the web location %s. The "
 "database version is %s, the post update version is %s."
 msgstr "Tohle je Friendica, verze %s, běžící na webové adrese %s. Verze databáze je %s, verze post update je %s."
 
-#: mod/friendica.php:93
+#: mod/friendica.php:94
 msgid ""
 "Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
 "about the Friendica project."
 msgstr "Pro více informací o projektu Friendica, prosím, navštivte stránku <a href=\"https://friendi.ca\">Friendi.ca</a>"
 
-#: mod/friendica.php:97
+#: mod/friendica.php:98
 msgid "Bug reports and issues: please visit"
 msgstr "Pro hlášení chyb a námětů na změny prosím navštivte"
 
-#: mod/friendica.php:97
+#: mod/friendica.php:98
 msgid "the bugtracker at github"
 msgstr "sledování chyb na GitHubu"
 
-#: mod/friendica.php:100
+#: mod/friendica.php:101
 msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
 msgstr "Návrhy, pochvaly atd. prosím posílejte na adresu „info“ zavináč „friendi“-tečka-„ca“"
 
-#: mod/friendica.php:105
+#: mod/friendica.php:106
 msgid "Installed addons/apps:"
 msgstr "Nainstalované doplňky/aplikace:"
 
-#: mod/friendica.php:119
+#: mod/friendica.php:120
 msgid "No installed addons/apps"
 msgstr "Žádne nainstalované doplňky/aplikace"
 
-#: mod/friendica.php:124
+#: mod/friendica.php:125
 #, php-format
 msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
 msgstr "Přečtěte si o <a href=\"%1$s/tos\">Podmínkách používání</a> tohoto serveru."
 
-#: mod/friendica.php:129
+#: mod/friendica.php:130
 msgid "On this server the following remote servers are blocked."
 msgstr "Na tomto serveru jsou zablokovány následující vzdálené servery."
 
@@ -3900,7 +3903,7 @@ msgstr "Skupina nenalezena."
 msgid "Group name changed."
 msgstr "Název skupiny byl změněn."
 
-#: mod/group.php:85 mod/profperm.php:30 src/App.php:1481
+#: mod/group.php:85 mod/profperm.php:30 src/App.php:1479
 msgid "Permission denied"
 msgstr "Nedostatečné oprávnění"
 
@@ -3977,7 +3980,7 @@ msgstr "Nápověda:"
 msgid "Help"
 msgstr "Nápověda"
 
-#: mod/help.php:65 src/App.php:1399
+#: mod/help.php:65 src/App.php:1397
 msgid "Not Found"
 msgstr "Nenalezeno"
 
@@ -4128,7 +4131,7 @@ msgstr "Pokud nechcete dostávat tyto zprávy, kontaktujte prosím odesílatele
 msgid "%s posted an update."
 msgstr "%s poslal/a aktualizaci."
 
-#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:848
+#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:847
 msgid "l F d, Y \\@ g:i A"
 msgstr "l d. F, Y v g:i A"
 
@@ -4902,7 +4905,7 @@ msgstr "úspěch"
 msgid "failed"
 msgstr "selhalo"
 
-#: mod/ostatus_subscribe.php:89 src/Object/Post.php:282
+#: mod/ostatus_subscribe.php:89 src/Object/Post.php:283
 msgid "ignored"
 msgstr "ignorován"
 
@@ -5059,7 +5062,7 @@ msgstr "Upravit fotku"
 msgid "Use as profile photo"
 msgstr "Použít jako profilovou fotku"
 
-#: mod/photos.php:1297 src/Object/Post.php:155
+#: mod/photos.php:1297 src/Object/Post.php:156
 msgid "Private Message"
 msgstr "Soukromá zpráva"
 
@@ -5104,21 +5107,21 @@ msgstr "Otáčet po směru hodinových ručiček (doprava)"
 msgid "Rotate CCW (left)"
 msgstr "Otáčet proti směru hodinových ručiček (doleva)"
 
-#: mod/photos.php:1438 src/Object/Post.php:310
+#: mod/photos.php:1438 src/Object/Post.php:311
 msgid "I like this (toggle)"
 msgstr "To se mi líbí (přepínat)"
 
-#: mod/photos.php:1439 src/Object/Post.php:311
+#: mod/photos.php:1439 src/Object/Post.php:312
 msgid "I don't like this (toggle)"
 msgstr "To se mi nelíbí (přepínat)"
 
 #: mod/photos.php:1454 mod/photos.php:1493 mod/photos.php:1553
-#: src/Module/Contact.php:1018 src/Object/Post.php:864
+#: src/Module/Contact.php:1018 src/Object/Post.php:871
 msgid "This is you"
 msgstr "Tohle jste vy"
 
 #: mod/photos.php:1456 mod/photos.php:1495 mod/photos.php:1555
-#: src/Object/Post.php:416 src/Object/Post.php:866
+#: src/Object/Post.php:417 src/Object/Post.php:873
 msgid "Comment"
 msgstr "Okomentovat"
 
@@ -5766,7 +5769,7 @@ msgstr "Nemůžete upravit tuto aplikaci."
 msgid "Connected Apps"
 msgstr "Připojené aplikace"
 
-#: mod/settings.php:725 src/Object/Post.php:165 src/Object/Post.php:167
+#: mod/settings.php:725 src/Object/Post.php:166 src/Object/Post.php:168
 msgid "Edit"
 msgstr "Upravit"
 
@@ -5948,11 +5951,11 @@ msgstr "%s - (Nepodporováno)"
 msgid "%s - (Experimental)"
 msgstr "%s - (Experimentální)"
 
-#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:396
+#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:395
 msgid "Sunday"
 msgstr "neděle"
 
-#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:397
+#: mod/settings.php:931 src/Core/L10n.php:368 src/Model/Event.php:396
 msgid "Monday"
 msgstr "pondělí"
 
@@ -6598,7 +6601,7 @@ msgstr "Odstranit video"
 msgid "No videos selected"
 msgstr "Není vybráno žádné video"
 
-#: mod/videos.php:309 src/Model/Item.php:3435
+#: mod/videos.php:309 src/Model/Item.php:3453
 msgid "View Video"
 msgstr "Zobrazit video"
 
@@ -6679,15 +6682,11 @@ msgstr "Fotky na zdi"
 msgid "Delete this item?"
 msgstr "Odstranit tuto položku?"
 
-#: src/App.php:667
-msgid "show fewer"
-msgstr "zobrazit méně"
-
-#: src/App.php:709
+#: src/App.php:707
 msgid "toggle mobile"
 msgstr "přepínat mobilní zobrazení"
 
-#: src/App.php:1077
+#: src/App.php:1075
 msgid "No system theme config value set."
 msgstr "Není nastavena konfigurační hodnota systémového motivu."
 
@@ -6917,7 +6916,7 @@ msgstr "Nevěrný/á"
 msgid "Sex Addict"
 msgstr "Posedlý/á sexem"
 
-#: src/Content/ContactSelector.php:241 src/Model/User.php:701
+#: src/Content/ContactSelector.php:241 src/Model/User.php:702
 msgid "Friends"
 msgstr "Přátelé"
 
@@ -7048,79 +7047,89 @@ msgid ""
 "Add/remove mention when a forum page is selected/deselected in ACL window."
 msgstr "Přidat/odstranit zmínku, když je stránka na fóru označena/odznačena v okně ACL."
 
-#: src/Content/Feature.php:97
+#: src/Content/Feature.php:93
+msgid "Explicit Mentions"
+msgstr "Výslovné zmínky"
+
+#: src/Content/Feature.php:93
+msgid ""
+"Add explicit mentions to comment box for manual control over who gets "
+"mentioned in replies."
+msgstr "Přidá do pole pro komentování výslovné zmínky pro ruční kontrolu nad tím, koho zmíníte v odpovědích."
+
+#: src/Content/Feature.php:98
 msgid "Network Sidebar"
 msgstr "Síťová postranní lišta"
 
-#: src/Content/Feature.php:98
+#: src/Content/Feature.php:99
 msgid "Ability to select posts by date ranges"
 msgstr "Možnost označit příspěvky dle časového intervalu"
 
-#: src/Content/Feature.php:99
+#: src/Content/Feature.php:100
 msgid "Protocol Filter"
 msgstr "Filtr protokolů"
 
-#: src/Content/Feature.php:99
+#: src/Content/Feature.php:100
 msgid "Enable widget to display Network posts only from selected protocols"
 msgstr "Povolením této funkce se budou zobrazovat síťové příspěvky pouze z vybraných protokolů"
 
-#: src/Content/Feature.php:104
+#: src/Content/Feature.php:105
 msgid "Network Tabs"
 msgstr "Síťové záložky"
 
-#: src/Content/Feature.php:105
+#: src/Content/Feature.php:106
 msgid "Network New Tab"
 msgstr "Síťová záložka Nové"
 
-#: src/Content/Feature.php:105
+#: src/Content/Feature.php:106
 msgid "Enable tab to display only new Network posts (from the last 12 hours)"
 msgstr "Povolit záložku pro zobrazení pouze nových příspěvků (za posledních 12 hodin)"
 
-#: src/Content/Feature.php:106
+#: src/Content/Feature.php:107
 msgid "Network Shared Links Tab"
 msgstr "Síťová záložka Sdílené odkazy "
 
-#: src/Content/Feature.php:106
+#: src/Content/Feature.php:107
 msgid "Enable tab to display only Network posts with links in them"
 msgstr "Povolit záložky pro zobrazování pouze Síťových příspěvků s vazbou na ně"
 
-#: src/Content/Feature.php:111
+#: src/Content/Feature.php:112
 msgid "Post/Comment Tools"
 msgstr "Nástroje příspěvků/komentářů"
 
-#: src/Content/Feature.php:112
+#: src/Content/Feature.php:113
 msgid "Post Categories"
 msgstr "Kategorie příspěvků"
 
-#: src/Content/Feature.php:112
+#: src/Content/Feature.php:113
 msgid "Add categories to your posts"
 msgstr "Přidat kategorie k vašim příspěvkům"
 
-#: src/Content/Feature.php:117
+#: src/Content/Feature.php:118
 msgid "Advanced Profile Settings"
 msgstr "Pokročilá nastavení profilu"
 
-#: src/Content/Feature.php:118
+#: src/Content/Feature.php:119
 msgid "List Forums"
 msgstr "Vypsat fóra"
 
-#: src/Content/Feature.php:118
+#: src/Content/Feature.php:119
 msgid "Show visitors public community forums at the Advanced Profile Page"
 msgstr "Zobrazit návštěvníkům veřejná komunitní fóra na stránce pokročilého profilu"
 
-#: src/Content/Feature.php:119
+#: src/Content/Feature.php:120
 msgid "Tag Cloud"
 msgstr "Štítkový oblak"
 
-#: src/Content/Feature.php:119
+#: src/Content/Feature.php:120
 msgid "Provide a personal tag cloud on your profile page"
 msgstr "Poskytne na vaší profilové stránce osobní „štítkový oblak“"
 
-#: src/Content/Feature.php:120
+#: src/Content/Feature.php:121
 msgid "Display Membership Date"
 msgstr "Zobrazit datum členství"
 
-#: src/Content/Feature.php:120
+#: src/Content/Feature.php:121
 msgid "Display membership date in profile"
 msgstr "Zobrazit v profilu datum připojení"
 
@@ -7408,8 +7417,8 @@ msgstr "Konec"
 msgid "Follow"
 msgstr "Sledovat"
 
-#: src/Content/Text/HTML.php:951 src/Model/Item.php:3485
-#: src/Model/Item.php:3496
+#: src/Content/Text/HTML.php:951 src/Model/Item.php:3503
+#: src/Model/Item.php:3514
 msgid "Click to open/close"
 msgstr "Kliknutím otevřete/zavřete"
 
@@ -7595,29 +7604,29 @@ msgstr "Provést čekající aktualizace příspěvků."
 msgid "All pending post updates are done."
 msgstr "Všechny čekající aktualizace příspěvků jsou hotové."
 
-#: src/Core/Installer.php:162
+#: src/Core/Installer.php:163
 msgid ""
 "The database configuration file \"config/local.config.php\" could not be "
 "written. Please use the enclosed text to create a configuration file in your"
 " web server root."
 msgstr "Databázový konfigurační soubor „config/local.config.php“ nemohl být zapsán. Prosím, použijte přiložený text k vytvoření konfiguračního souboru v kořenovém adresáři vašeho webového serveru."
 
-#: src/Core/Installer.php:181
+#: src/Core/Installer.php:182
 msgid ""
 "You may need to import the file \"database.sql\" manually using phpmyadmin "
 "or mysql."
 msgstr "Nejspíše budete muset manuálně importovat soubor „database.sql“ pomocí phpMyAdmin či MySQL."
 
-#: src/Core/Installer.php:182 src/Module/Install.php:132
+#: src/Core/Installer.php:183 src/Module/Install.php:132
 #: src/Module/Install.php:263
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr "Přečtěte si prosím informace v souboru „INSTALL.txt“."
 
-#: src/Core/Installer.php:243
+#: src/Core/Installer.php:244
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Nelze najít verzi PHP pro příkazový řádek v PATH webového serveru."
 
-#: src/Core/Installer.php:244
+#: src/Core/Installer.php:245
 msgid ""
 "If you don't have a command line version of PHP installed on your server, "
 "you will not be able to run the background processing. See <a "
@@ -7625,358 +7634,358 @@ msgid ""
 "up-the-worker'>'Setup the worker'</a>"
 msgstr "Pokud nemáte na vašem serveru nainstalovanou verzi PHP pro příkazový řádek, nebudete moci spouštět procesy v pozadí. Více na <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>„Nastavte pracovníka“</a>"
 
-#: src/Core/Installer.php:248
+#: src/Core/Installer.php:249
 msgid "PHP executable path"
 msgstr "Cesta ke spustitelnému souboru PHP"
 
-#: src/Core/Installer.php:248
+#: src/Core/Installer.php:249
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Zadejte plnou cestu ke spustitelnému souboru PHP. Tento údaj můžete ponechat nevyplněný a pokračovat v instalaci."
 
-#: src/Core/Installer.php:253
+#: src/Core/Installer.php:254
 msgid "Command line PHP"
 msgstr "Příkazový řádek PHP"
 
-#: src/Core/Installer.php:262
+#: src/Core/Installer.php:263
 msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr "PHP executable není php cli binary (může být verze cgi-fgci)"
 
-#: src/Core/Installer.php:263
+#: src/Core/Installer.php:264
 msgid "Found PHP version: "
 msgstr "Nalezena verze PHP:"
 
-#: src/Core/Installer.php:265
+#: src/Core/Installer.php:266
 msgid "PHP cli binary"
 msgstr "PHP cli binary"
 
-#: src/Core/Installer.php:278
+#: src/Core/Installer.php:279
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "Verze PHP pro příkazový řádek na vašem systému nemá povoleno nastavení „register_argc_argv“."
 
-#: src/Core/Installer.php:279
+#: src/Core/Installer.php:280
 msgid "This is required for message delivery to work."
 msgstr "Toto je nutné pro fungování doručování zpráv."
 
-#: src/Core/Installer.php:284
+#: src/Core/Installer.php:285
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: src/Core/Installer.php:316
+#: src/Core/Installer.php:317
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Chyba: funkce „openssl_pkey_new“ na tomto systému není schopna generovat šifrovací klíče"
 
-#: src/Core/Installer.php:317
+#: src/Core/Installer.php:318
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Pokud systém běží na Windows, prosím přečtěte si „http://www.php.net/manual/en/openssl.installation.php“."
 
-#: src/Core/Installer.php:320
+#: src/Core/Installer.php:321
 msgid "Generate encryption keys"
 msgstr "Generovat šifrovací klíče"
 
-#: src/Core/Installer.php:371
+#: src/Core/Installer.php:372
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Chyba: Modul mod_rewrite webového serveru Apache je vyadován, ale není nainstalován."
 
-#: src/Core/Installer.php:376
+#: src/Core/Installer.php:377
 msgid "Apache mod_rewrite module"
 msgstr "Modul Apache mod_rewrite"
 
-#: src/Core/Installer.php:382
+#: src/Core/Installer.php:383
 msgid "Error: PDO or MySQLi PHP module required but not installed."
 msgstr "Chyba: PHP modul PDO nebo MySQLi je vyžadován, ale není nainstalován."
 
-#: src/Core/Installer.php:387
+#: src/Core/Installer.php:388
 msgid "Error: The MySQL driver for PDO is not installed."
 msgstr "Chyba: Ovladač MySQL pro PDO není nainstalován"
 
-#: src/Core/Installer.php:391
+#: src/Core/Installer.php:392
 msgid "PDO or MySQLi PHP module"
 msgstr "PHP modul PDO nebo MySQLi"
 
-#: src/Core/Installer.php:399
+#: src/Core/Installer.php:400
 msgid "Error, XML PHP module required but not installed."
 msgstr "Chyba: PHP modul XML je vyžadován, ale není nainstalován"
 
-#: src/Core/Installer.php:403
+#: src/Core/Installer.php:404
 msgid "XML PHP module"
 msgstr "PHP modul XML"
 
-#: src/Core/Installer.php:406
+#: src/Core/Installer.php:407
 msgid "libCurl PHP module"
 msgstr "PHP modul libCurl"
 
-#: src/Core/Installer.php:407
+#: src/Core/Installer.php:408
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Chyba: PHP modul libcurl je vyžadován, ale není nainstalován."
 
-#: src/Core/Installer.php:413
+#: src/Core/Installer.php:414
 msgid "GD graphics PHP module"
 msgstr "PHP modul GD graphics"
 
-#: src/Core/Installer.php:414
+#: src/Core/Installer.php:415
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Chyba: PHP modul GD graphics je vyžadován, ale není nainstalován."
 
-#: src/Core/Installer.php:420
+#: src/Core/Installer.php:421
 msgid "OpenSSL PHP module"
 msgstr "PHP modul OpenSSL"
 
-#: src/Core/Installer.php:421
+#: src/Core/Installer.php:422
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Chyba: PHP modul openssl je vyžadován, ale není nainstalován."
 
-#: src/Core/Installer.php:427
+#: src/Core/Installer.php:428
 msgid "mb_string PHP module"
 msgstr "PHP modul mb_string"
 
-#: src/Core/Installer.php:428
+#: src/Core/Installer.php:429
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Chyba: PHP modul mb_string  je vyžadován, ale není nainstalován."
 
-#: src/Core/Installer.php:434
+#: src/Core/Installer.php:435
 msgid "iconv PHP module"
 msgstr "PHP modul iconv"
 
-#: src/Core/Installer.php:435
+#: src/Core/Installer.php:436
 msgid "Error: iconv PHP module required but not installed."
 msgstr "Chyba: PHP modul iconv je vyžadován, ale není nainstalován"
 
-#: src/Core/Installer.php:441
+#: src/Core/Installer.php:442
 msgid "POSIX PHP module"
 msgstr "PHP modul POSIX"
 
-#: src/Core/Installer.php:442
+#: src/Core/Installer.php:443
 msgid "Error: POSIX PHP module required but not installed."
 msgstr "Chyba: PHP modul POSIX je vyžadován, ale není nainstalován."
 
-#: src/Core/Installer.php:448
+#: src/Core/Installer.php:449
 msgid "JSON PHP module"
 msgstr "PHP modul JSON"
 
-#: src/Core/Installer.php:449
+#: src/Core/Installer.php:450
 msgid "Error: JSON PHP module required but not installed."
 msgstr "Chyba: PHP modul JSON je vyžadován, ale není nainstalován"
 
-#: src/Core/Installer.php:472
+#: src/Core/Installer.php:473
 msgid ""
 "The web installer needs to be able to create a file called "
 "\"local.config.php\" in the \"config\" folder of your web server and it is "
 "unable to do so."
 msgstr "Webový instalátor musí být schopen vytvořit soubor s názvem „local.config.php“ v adresáři „config“ Vašeho webového serveru a není mu to umožněno. "
 
-#: src/Core/Installer.php:473
+#: src/Core/Installer.php:474
 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 "Toto je nejčastěji nastavením oprávnění, kdy webový server nemusí být schopen zapisovat soubory do vašeho adresáře - i když vy můžete."
 
-#: src/Core/Installer.php:474
+#: src/Core/Installer.php:475
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named local.config.php in your Friendica \"config\" folder."
 msgstr "Na konci této procedury od nás obdržíte text k uložení v souboru pojmenovaném local.config.php v adresáři „config“ na Vaší instalaci Friendica."
 
-#: src/Core/Installer.php:475
+#: src/Core/Installer.php:476
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"INSTALL.txt\" for instructions."
 msgstr "Alternativně můžete tento krok přeskočit a provést manuální instalaci. Přečtěte si prosím soubor „INSTALL.txt“ pro další instrukce."
 
-#: src/Core/Installer.php:478
+#: src/Core/Installer.php:479
 msgid "config/local.config.php is writable"
 msgstr "Soubor config/local.config.php je zapisovatelný"
 
-#: src/Core/Installer.php:498
+#: src/Core/Installer.php:499
 msgid ""
 "Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr "Friendica používá k zobrazení svých webových stránek šablonovací nástroj Smarty3. Smarty3 kompiluje šablony do PHP pro zrychlení vykreslování."
 
-#: src/Core/Installer.php:499
+#: src/Core/Installer.php:500
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory view/smarty3/ under the Friendica top level "
 "folder."
 msgstr "Pro uložení kompilovaných šablon potřebuje webový server mít přístup k zápisu do adresáře view/smarty3/ pod kořenovým adresářem Friendica."
 
-#: src/Core/Installer.php:500
+#: src/Core/Installer.php:501
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Prosím ujistěte se, že má uživatel webového serveru (jako například www-data) právo zápisu do tohoto adresáře"
 
-#: src/Core/Installer.php:501
+#: src/Core/Installer.php:502
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "view/smarty3/ only--not the template files (.tpl) that it contains."
 msgstr "Poznámka: jako bezpečnostní opatření byste měl/a přidělit webovém serveru právo zápisu pouze do adresáře /view/smarty3/ -- a nikoliv už do souborů s šablonami (.tpl), které obsahuje."
 
-#: src/Core/Installer.php:504
+#: src/Core/Installer.php:505
 msgid "view/smarty3 is writable"
 msgstr "Adresář view/smarty3 je zapisovatelný"
 
-#: src/Core/Installer.php:533
+#: src/Core/Installer.php:534
 msgid ""
 "Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist"
 " to .htaccess."
 msgstr "URL rewrite v souboru .htacess nefunguje. Ujistěte se, že jste zkopíroval/a soubor .htaccess-dist jako .htaccess"
 
-#: src/Core/Installer.php:535
+#: src/Core/Installer.php:536
 msgid "Error message from Curl when fetching"
 msgstr "Chybová zpráva od Curl při načítání"
 
-#: src/Core/Installer.php:540
+#: src/Core/Installer.php:541
 msgid "Url rewrite is working"
 msgstr "Url rewrite je funkční."
 
-#: src/Core/Installer.php:569
+#: src/Core/Installer.php:570
 msgid "ImageMagick PHP extension is not installed"
 msgstr "PHP rozšíření ImageMagick není nainstalováno"
 
-#: src/Core/Installer.php:571
+#: src/Core/Installer.php:572
 msgid "ImageMagick PHP extension is installed"
 msgstr "PHP rozšíření ImageMagick je nainstalováno"
 
-#: src/Core/Installer.php:573 tests/src/Core/InstallerTest.php:329
+#: src/Core/Installer.php:574 tests/src/Core/InstallerTest.php:329
 #: tests/src/Core/InstallerTest.php:355
 msgid "ImageMagick supports GIF"
 msgstr "ImageMagick podporuje GIF"
 
-#: src/Core/Installer.php:595
+#: src/Core/Installer.php:597
 msgid "Could not connect to database."
 msgstr "Nelze se připojit k databázi."
 
-#: src/Core/Installer.php:602
+#: src/Core/Installer.php:604
 msgid "Database already in use."
 msgstr "Databáze se již používá."
 
-#: src/Core/L10n.php:368 src/Model/Event.php:398
+#: src/Core/L10n.php:368 src/Model/Event.php:397
 msgid "Tuesday"
 msgstr "úterý"
 
-#: src/Core/L10n.php:368 src/Model/Event.php:399
+#: src/Core/L10n.php:368 src/Model/Event.php:398
 msgid "Wednesday"
 msgstr "středa"
 
-#: src/Core/L10n.php:368 src/Model/Event.php:400
+#: src/Core/L10n.php:368 src/Model/Event.php:399
 msgid "Thursday"
 msgstr "čtvrtek"
 
-#: src/Core/L10n.php:368 src/Model/Event.php:401
+#: src/Core/L10n.php:368 src/Model/Event.php:400
 msgid "Friday"
 msgstr "pátek"
 
-#: src/Core/L10n.php:368 src/Model/Event.php:402
+#: src/Core/L10n.php:368 src/Model/Event.php:401
 msgid "Saturday"
 msgstr "sobota"
 
-#: src/Core/L10n.php:372 src/Model/Event.php:417
+#: src/Core/L10n.php:372 src/Model/Event.php:416
 msgid "January"
 msgstr "leden"
 
-#: src/Core/L10n.php:372 src/Model/Event.php:418
+#: src/Core/L10n.php:372 src/Model/Event.php:417
 msgid "February"
 msgstr "únor"
 
-#: src/Core/L10n.php:372 src/Model/Event.php:419
+#: src/Core/L10n.php:372 src/Model/Event.php:418
 msgid "March"
 msgstr "březen"
 
-#: src/Core/L10n.php:372 src/Model/Event.php:420
+#: src/Core/L10n.php:372 src/Model/Event.php:419
 msgid "April"
 msgstr "duben"
 
-#: src/Core/L10n.php:372 src/Core/L10n.php:391 src/Model/Event.php:408
+#: src/Core/L10n.php:372 src/Core/L10n.php:391 src/Model/Event.php:407
 msgid "May"
 msgstr "květen"
 
-#: src/Core/L10n.php:372 src/Model/Event.php:421
+#: src/Core/L10n.php:372 src/Model/Event.php:420
 msgid "June"
 msgstr "červen"
 
-#: src/Core/L10n.php:372 src/Model/Event.php:422
+#: src/Core/L10n.php:372 src/Model/Event.php:421
 msgid "July"
 msgstr "červenec"
 
-#: src/Core/L10n.php:372 src/Model/Event.php:423
+#: src/Core/L10n.php:372 src/Model/Event.php:422
 msgid "August"
 msgstr "srpen"
 
-#: src/Core/L10n.php:372 src/Model/Event.php:424
+#: src/Core/L10n.php:372 src/Model/Event.php:423
 msgid "September"
 msgstr "září"
 
-#: src/Core/L10n.php:372 src/Model/Event.php:425
+#: src/Core/L10n.php:372 src/Model/Event.php:424
 msgid "October"
 msgstr "říjen"
 
-#: src/Core/L10n.php:372 src/Model/Event.php:426
+#: src/Core/L10n.php:372 src/Model/Event.php:425
 msgid "November"
 msgstr "listopad"
 
-#: src/Core/L10n.php:372 src/Model/Event.php:427
+#: src/Core/L10n.php:372 src/Model/Event.php:426
 msgid "December"
 msgstr "prosinec"
 
-#: src/Core/L10n.php:387 src/Model/Event.php:389
+#: src/Core/L10n.php:387 src/Model/Event.php:388
 msgid "Mon"
 msgstr "pon"
 
-#: src/Core/L10n.php:387 src/Model/Event.php:390
+#: src/Core/L10n.php:387 src/Model/Event.php:389
 msgid "Tue"
 msgstr "úte"
 
-#: src/Core/L10n.php:387 src/Model/Event.php:391
+#: src/Core/L10n.php:387 src/Model/Event.php:390
 msgid "Wed"
 msgstr "stř"
 
-#: src/Core/L10n.php:387 src/Model/Event.php:392
+#: src/Core/L10n.php:387 src/Model/Event.php:391
 msgid "Thu"
 msgstr "čtv"
 
-#: src/Core/L10n.php:387 src/Model/Event.php:393
+#: src/Core/L10n.php:387 src/Model/Event.php:392
 msgid "Fri"
 msgstr "pát"
 
-#: src/Core/L10n.php:387 src/Model/Event.php:394
+#: src/Core/L10n.php:387 src/Model/Event.php:393
 msgid "Sat"
 msgstr "sob"
 
-#: src/Core/L10n.php:387 src/Model/Event.php:388
+#: src/Core/L10n.php:387 src/Model/Event.php:387
 msgid "Sun"
 msgstr "ned"
 
-#: src/Core/L10n.php:391 src/Model/Event.php:404
+#: src/Core/L10n.php:391 src/Model/Event.php:403
 msgid "Jan"
 msgstr "led"
 
-#: src/Core/L10n.php:391 src/Model/Event.php:405
+#: src/Core/L10n.php:391 src/Model/Event.php:404
 msgid "Feb"
 msgstr "úno"
 
-#: src/Core/L10n.php:391 src/Model/Event.php:406
+#: src/Core/L10n.php:391 src/Model/Event.php:405
 msgid "Mar"
 msgstr "bře"
 
-#: src/Core/L10n.php:391 src/Model/Event.php:407
+#: src/Core/L10n.php:391 src/Model/Event.php:406
 msgid "Apr"
 msgstr "dub"
 
-#: src/Core/L10n.php:391 src/Model/Event.php:410
+#: src/Core/L10n.php:391 src/Model/Event.php:409
 msgid "Jul"
 msgstr "čvc"
 
-#: src/Core/L10n.php:391 src/Model/Event.php:411
+#: src/Core/L10n.php:391 src/Model/Event.php:410
 msgid "Aug"
 msgstr "srp"
 
@@ -7984,15 +7993,15 @@ msgstr "srp"
 msgid "Sep"
 msgstr "zář"
 
-#: src/Core/L10n.php:391 src/Model/Event.php:413
+#: src/Core/L10n.php:391 src/Model/Event.php:412
 msgid "Oct"
 msgstr "říj"
 
-#: src/Core/L10n.php:391 src/Model/Event.php:414
+#: src/Core/L10n.php:391 src/Model/Event.php:413
 msgid "Nov"
 msgstr "lis"
 
-#: src/Core/L10n.php:391 src/Model/Event.php:415
+#: src/Core/L10n.php:391 src/Model/Event.php:414
 msgid "Dec"
 msgstr "pro"
 
@@ -8253,147 +8262,147 @@ msgstr "%s: aktualizuji tabulku %s"
 msgid "Legacy module file not found: %s"
 msgstr "Soubor legacy modulu nenalezen: %s"
 
-#: src/Model/Contact.php:1037
+#: src/Model/Contact.php:1054
 msgid "Drop Contact"
 msgstr "Odstranit kontakt"
 
-#: src/Model/Contact.php:1509
+#: src/Model/Contact.php:1526
 msgid "Organisation"
 msgstr "Organizace"
 
-#: src/Model/Contact.php:1513
+#: src/Model/Contact.php:1530
 msgid "News"
 msgstr "Zprávy"
 
-#: src/Model/Contact.php:1517
+#: src/Model/Contact.php:1534
 msgid "Forum"
 msgstr "Fórum"
 
-#: src/Model/Contact.php:1707
+#: src/Model/Contact.php:1724
 msgid "Connect URL missing."
 msgstr "Chybí URL adresa pro připojení."
 
-#: src/Model/Contact.php:1716
+#: src/Model/Contact.php:1733
 msgid ""
 "The contact could not be added. Please check the relevant network "
 "credentials in your Settings -> Social Networks page."
 msgstr "Kontakt nemohl být přidán. Prosím zkontrolujte relevantní přihlašovací údaje sítě na stránce Nastavení -> Sociální sítě."
 
-#: src/Model/Contact.php:1755
+#: src/Model/Contact.php:1772
 msgid ""
 "This site is not configured to allow communications with other networks."
 msgstr "Tento web není nakonfigurován tak, aby umožňoval komunikaci s ostatními sítěmi."
 
-#: src/Model/Contact.php:1756 src/Model/Contact.php:1769
+#: src/Model/Contact.php:1773 src/Model/Contact.php:1786
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr "Nenalezen žádný kompatibilní komunikační protokol nebo kanál."
 
-#: src/Model/Contact.php:1767
+#: src/Model/Contact.php:1784
 msgid "The profile address specified does not provide adequate information."
 msgstr "Uvedená adresa profilu neposkytuje dostatečné informace."
 
-#: src/Model/Contact.php:1772
+#: src/Model/Contact.php:1789
 msgid "An author or name was not found."
 msgstr "Autor nebo jméno nenalezeno"
 
-#: src/Model/Contact.php:1775
+#: src/Model/Contact.php:1792
 msgid "No browser URL could be matched to this address."
 msgstr "Této adrese neodpovídá žádné URL prohlížeče."
 
-#: src/Model/Contact.php:1778
+#: src/Model/Contact.php:1795
 msgid ""
 "Unable to match @-style Identity Address with a known protocol or email "
 "contact."
 msgstr "Není možné namapovat adresu identity ve stylu @ s žádným možným protokolem ani emailovým kontaktem."
 
-#: src/Model/Contact.php:1779
+#: src/Model/Contact.php:1796
 msgid "Use mailto: in front of address to force email check."
 msgstr "Použite mailo: před adresou k vynucení emailové kontroly."
 
-#: src/Model/Contact.php:1785
+#: src/Model/Contact.php:1802
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr "Zadaná adresa profilu patří do sítě, která  byla na tomto serveru zakázána."
 
-#: src/Model/Contact.php:1790
+#: src/Model/Contact.php:1807
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr "Omezený profil. Tato osoba nebude schopna od vás přijímat přímá/osobní oznámení."
 
-#: src/Model/Contact.php:1843
+#: src/Model/Contact.php:1860
 msgid "Unable to retrieve contact information."
 msgstr "Nepodařilo se získat kontaktní informace."
 
-#: src/Model/Event.php:61 src/Model/Event.php:78 src/Model/Event.php:436
-#: src/Model/Event.php:916
+#: src/Model/Event.php:61 src/Model/Event.php:78 src/Model/Event.php:435
+#: src/Model/Event.php:915
 msgid "Starts:"
 msgstr "Začíná:"
 
-#: src/Model/Event.php:64 src/Model/Event.php:84 src/Model/Event.php:437
-#: src/Model/Event.php:920
+#: src/Model/Event.php:64 src/Model/Event.php:84 src/Model/Event.php:436
+#: src/Model/Event.php:919
 msgid "Finishes:"
 msgstr "Končí:"
 
-#: src/Model/Event.php:386
+#: src/Model/Event.php:385
 msgid "all-day"
 msgstr "celodenní"
 
-#: src/Model/Event.php:409
+#: src/Model/Event.php:408
 msgid "Jun"
 msgstr "čvn"
 
-#: src/Model/Event.php:412
+#: src/Model/Event.php:411
 msgid "Sept"
 msgstr "září"
 
-#: src/Model/Event.php:434
+#: src/Model/Event.php:433
 msgid "No events to display"
 msgstr "Žádné události k zobrazení"
 
-#: src/Model/Event.php:562
+#: src/Model/Event.php:561
 msgid "l, F j"
 msgstr "l, j. F"
 
-#: src/Model/Event.php:593
+#: src/Model/Event.php:592
 msgid "Edit event"
 msgstr "Upravit událost"
 
-#: src/Model/Event.php:594
+#: src/Model/Event.php:593
 msgid "Duplicate event"
 msgstr "Duplikovat událost"
 
-#: src/Model/Event.php:595
+#: src/Model/Event.php:594
 msgid "Delete event"
 msgstr "Smazat událost"
 
-#: src/Model/Event.php:627 src/Model/Item.php:3536 src/Model/Item.php:3543
+#: src/Model/Event.php:626 src/Model/Item.php:3554 src/Model/Item.php:3561
 msgid "link to source"
 msgstr "odkaz na zdroj"
 
-#: src/Model/Event.php:849
+#: src/Model/Event.php:848
 msgid "D g:i A"
 msgstr "D g:i A"
 
-#: src/Model/Event.php:850
+#: src/Model/Event.php:849
 msgid "g:i A"
 msgstr "g:i A"
 
-#: src/Model/Event.php:935 src/Model/Event.php:937
+#: src/Model/Event.php:934 src/Model/Event.php:936
 msgid "Show map"
 msgstr "Zobrazit mapu"
 
-#: src/Model/Event.php:936
+#: src/Model/Event.php:935
 msgid "Hide map"
 msgstr "Skrýt mapu"
 
-#: src/Model/Event.php:1028
+#: src/Model/Event.php:1027
 #, php-format
 msgid "%s's birthday"
 msgstr "%s má narozeniny"
 
-#: src/Model/Event.php:1029
+#: src/Model/Event.php:1028
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Veselé narozeniny, %s"
@@ -8433,11 +8442,11 @@ msgstr "Vytvořit novou skupinu"
 msgid "Edit groups"
 msgstr "Upravit skupiny"
 
-#: src/Model/Item.php:3269
+#: src/Model/Item.php:3287
 msgid "activity"
 msgstr "aktivita"
 
-#: src/Model/Item.php:3271 src/Object/Post.php:456 src/Object/Post.php:468
+#: src/Model/Item.php:3289 src/Object/Post.php:470
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "komentář"
@@ -8445,24 +8454,24 @@ msgstr[1] "komentáře"
 msgstr[2] "komentáře"
 msgstr[3] "komentářů"
 
-#: src/Model/Item.php:3274
+#: src/Model/Item.php:3292
 msgid "post"
 msgstr "příspěvek"
 
-#: src/Model/Item.php:3373
+#: src/Model/Item.php:3391
 #, php-format
 msgid "Content warning: %s"
 msgstr "Varování o obsahu: %s"
 
-#: src/Model/Item.php:3452
+#: src/Model/Item.php:3470
 msgid "bytes"
 msgstr "bytů"
 
-#: src/Model/Item.php:3530
+#: src/Model/Item.php:3548
 msgid "View on separate page"
 msgstr "Zobrazit na separátní stránce"
 
-#: src/Model/Item.php:3531
+#: src/Model/Item.php:3549
 msgid "view on separate page"
 msgstr "zobrazit na separátní stránce"
 
@@ -8640,79 +8649,79 @@ msgstr "Cesta ke kořenové složce úložiště"
 
 #: src/Model/Storage/Filesystem.php:128
 msgid ""
-"Folder were uploaded files are saved. For maximum security, This should be a"
-" path outside web server folder tree"
+"Folder where uploaded files are saved. For maximum security, This should be "
+"a path outside web server folder tree"
 msgstr "Složka, do které jsou ukládány nahrané soubory. Pro maximální bezpečnost to musí být cesta mimo složku webového serveru"
 
 #: src/Model/Storage/Filesystem.php:138
 msgid "Enter a valid existing folder"
 msgstr "Zadejte platnou existující složku"
 
-#: src/Model/User.php:270
+#: src/Model/User.php:271
 msgid "Login failed"
 msgstr "Přihlášení selhalo"
 
-#: src/Model/User.php:301
+#: src/Model/User.php:302
 msgid "Not enough information to authenticate"
 msgstr "Není dost informací pro autentikaci"
 
-#: src/Model/User.php:379
+#: src/Model/User.php:380
 msgid "Password can't be empty"
 msgstr "Heslo nemůže být prázdné"
 
-#: src/Model/User.php:398
+#: src/Model/User.php:399
 msgid "Empty passwords are not allowed."
 msgstr "Prázdná hesla nejsou povolena."
 
-#: src/Model/User.php:402
+#: src/Model/User.php:403
 msgid ""
 "The new password has been exposed in a public data dump, please choose "
 "another."
 msgstr "Nové heslo bylo zveřejněno ve veřejném výpisu dat, prosím zvolte si jiné."
 
-#: src/Model/User.php:408
+#: src/Model/User.php:409
 msgid ""
 "The password can't contain accentuated letters, white spaces or colons (:)"
 msgstr "Heslo nesmí obsahovat mezery, znaky s diakritikou a dvojtečky (:)"
 
-#: src/Model/User.php:508
+#: src/Model/User.php:509
 msgid "Passwords do not match. Password unchanged."
 msgstr "Hesla se neshodují. Heslo nebylo změněno."
 
-#: src/Model/User.php:515
+#: src/Model/User.php:516
 msgid "An invitation is required."
 msgstr "Je vyžadována pozvánka."
 
-#: src/Model/User.php:519
+#: src/Model/User.php:520
 msgid "Invitation could not be verified."
 msgstr "Pozvánka nemohla být ověřena."
 
-#: src/Model/User.php:526
+#: src/Model/User.php:527
 msgid "Invalid OpenID url"
 msgstr "Neplatný odkaz OpenID"
 
-#: src/Model/User.php:539 src/Module/Login.php:106
+#: src/Model/User.php:540 src/Module/Login.php:106
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr "Zaznamenali jsme problém s vaším přihlášením prostřednictvím Vámi zadaným OpenID. Prosím ověřte si, že jste ID zadali správně. "
 
-#: src/Model/User.php:539 src/Module/Login.php:106
+#: src/Model/User.php:540 src/Module/Login.php:106
 msgid "The error message was:"
 msgstr "Chybová zpráva byla:"
 
-#: src/Model/User.php:545
+#: src/Model/User.php:546
 msgid "Please enter the required information."
 msgstr "Zadejte prosím požadované informace."
 
-#: src/Model/User.php:559
+#: src/Model/User.php:560
 #, php-format
 msgid ""
 "system.username_min_length (%s) and system.username_max_length (%s) are "
 "excluding each other, swapping values."
 msgstr "system.username_min_length (%s) a system.username_max_length (%s) se vzájemně vylučují, čímž se vyměňují hodnoty."
 
-#: src/Model/User.php:566
+#: src/Model/User.php:567
 #, php-format
 msgid "Username should be at least %s character."
 msgid_plural "Username should be at least %s characters."
@@ -8721,7 +8730,7 @@ msgstr[1] "Uživateleké jméno musí mít alespoň %s znaky."
 msgstr[2] "Uživateleké jméno musí mít alespoň %s znaku."
 msgstr[3] "Uživateleké jméno musí mít alespoň %s znaků."
 
-#: src/Model/User.php:570
+#: src/Model/User.php:571
 #, php-format
 msgid "Username should be at most %s character."
 msgid_plural "Username should be at most %s characters."
@@ -8730,60 +8739,60 @@ msgstr[1] "Uživateleké jméno musí mít nanejvýš %s znaky."
 msgstr[2] "Uživateleké jméno musí mít nanejvýš %s znaku."
 msgstr[3] "Uživateleké jméno musí mít nanejvýš %s znaků."
 
-#: src/Model/User.php:578
+#: src/Model/User.php:579
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr "Nezdá se, že by to bylo vaše celé jméno (křestní jméno a příjmení)."
 
-#: src/Model/User.php:583
+#: src/Model/User.php:584
 msgid "Your email domain is not among those allowed on this site."
 msgstr "Vaše e-mailová doména není na tomto serveru mezi povolenými."
 
-#: src/Model/User.php:587
+#: src/Model/User.php:588
 msgid "Not a valid email address."
 msgstr "Neplatná e-mailová adresa."
 
-#: src/Model/User.php:590
+#: src/Model/User.php:591
 msgid "The nickname was blocked from registration by the nodes admin."
 msgstr "Administrátor serveru zablokoval registraci této přezdívky."
 
-#: src/Model/User.php:594 src/Model/User.php:602
+#: src/Model/User.php:595 src/Model/User.php:603
 msgid "Cannot use that email."
 msgstr "Tento e-mail nelze použít."
 
-#: src/Model/User.php:609
+#: src/Model/User.php:610
 msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr "Uživatelské jméno může obsahovat pouze znaky a-z, 0-9 a _."
 
-#: src/Model/User.php:616 src/Model/User.php:673
+#: src/Model/User.php:617 src/Model/User.php:674
 msgid "Nickname is already registered. Please choose another."
 msgstr "Přezdívka je již registrována. Prosím vyberte jinou."
 
-#: src/Model/User.php:626
+#: src/Model/User.php:627
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "ZÁVAŽNÁ CHYBA: Generování bezpečnostních klíčů se nezdařilo."
 
-#: src/Model/User.php:660 src/Model/User.php:664
+#: src/Model/User.php:661 src/Model/User.php:665
 msgid "An error occurred during registration. Please try again."
 msgstr "Došlo k chybě při registraci. Zkuste to prosím znovu."
 
-#: src/Model/User.php:684 view/theme/duepuntozero/config.php:55
+#: src/Model/User.php:685 view/theme/duepuntozero/config.php:55
 msgid "default"
 msgstr "výchozí"
 
-#: src/Model/User.php:689
+#: src/Model/User.php:690
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "Při vytváření vašeho výchozího profilu došlo k chybě. Zkuste to prosím znovu."
 
-#: src/Model/User.php:696
+#: src/Model/User.php:697
 msgid "An error occurred creating your self contact. Please try again."
 msgstr "Při vytváření vašeho kontaktu na sebe došlo k chybě. Zkuste to prosím znovu."
 
-#: src/Model/User.php:705
+#: src/Model/User.php:706
 msgid ""
 "An error occurred creating your default contact group. Please try again."
 msgstr "Při vytváření vaší výchozí skupiny kontaktů došlo k chybě. Zkuste to prosím znovu."
 
-#: src/Model/User.php:781
+#: src/Model/User.php:782
 #, php-format
 msgid ""
 "\n"
@@ -8798,12 +8807,12 @@ msgid ""
 "\t\t"
 msgstr "\n\t\t\tVážený/á %1$s,\n\t\t\t\tDěkujeme, že jste se registroval/a na %2$s. Váš účet čeká na schválení administrátora.\n\n\t\t\tZde jsou vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%3$s\n\t\t\tPřihlašovací jméno:\t%4$s\n\t\t\tHeslo:\t\t\t%5$s\n\t\t"
 
-#: src/Model/User.php:798
+#: src/Model/User.php:799
 #, php-format
 msgid "Registration at %s"
 msgstr "Registrace na %s"
 
-#: src/Model/User.php:817
+#: src/Model/User.php:818
 #, php-format
 msgid ""
 "\n"
@@ -8812,7 +8821,7 @@ msgid ""
 "\t\t"
 msgstr "\n\t\t\tVážený/á %1$s,\n\t\t\t\tDěkujeme, že jste se registroval/a na %2$s. Váš účet byl vytvořen.\n\t\t"
 
-#: src/Model/User.php:823
+#: src/Model/User.php:824
 #, php-format
 msgid ""
 "\n"
@@ -9311,7 +9320,7 @@ msgid ""
 " administrator email. This will allow you to enter the site admin panel."
 msgstr "Přejděte k <a href=\"%s/register\">registrační stránce</a> vašeho nového serveru Friendica a zaregistrujte se jako nový uživatel. Nezapomeňte použít stejný e-mail, který jste zadal/a jako administrátorský e-mail. To vám umožní navštívit panel pro administraci stránky."
 
-#: src/Module/Itemsource.php:33
+#: src/Module/Itemsource.php:41
 msgid "Item Guid"
 msgstr "Číslo GUID položky"
 
@@ -9503,123 +9512,128 @@ msgstr "Přihlášený uživatel si kdykoliv může exportovat svoje data účtu
 msgid "Privacy Statement"
 msgstr "Prohlášení o soukromí"
 
-#: src/Object/Post.php:135
+#: src/Object/Post.php:136
 msgid "This entry was edited"
 msgstr "Tato položka byla upravena"
 
-#: src/Object/Post.php:197
+#: src/Object/Post.php:198
 msgid "Delete locally"
 msgstr "Smazat lokálně"
 
-#: src/Object/Post.php:200
+#: src/Object/Post.php:201
 msgid "Delete globally"
 msgstr "Smazat globálně"
 
-#: src/Object/Post.php:200
+#: src/Object/Post.php:201
 msgid "Remove locally"
 msgstr "Odstranit lokálně"
 
-#: src/Object/Post.php:214
+#: src/Object/Post.php:215
 msgid "save to folder"
 msgstr "uložit do složky"
 
-#: src/Object/Post.php:249
+#: src/Object/Post.php:250
 msgid "I will attend"
 msgstr "zúčastním se"
 
-#: src/Object/Post.php:249
+#: src/Object/Post.php:250
 msgid "I will not attend"
 msgstr "nezúčastním se"
 
-#: src/Object/Post.php:249
+#: src/Object/Post.php:250
 msgid "I might attend"
 msgstr "mohl bych se zúčastnit"
 
-#: src/Object/Post.php:277
+#: src/Object/Post.php:278
 msgid "ignore thread"
 msgstr "ignorovat vlákno"
 
-#: src/Object/Post.php:278
+#: src/Object/Post.php:279
 msgid "unignore thread"
 msgstr "přestat ignorovat vlákno"
 
-#: src/Object/Post.php:279
+#: src/Object/Post.php:280
 msgid "toggle ignore status"
 msgstr "přepínat stav ignorování"
 
-#: src/Object/Post.php:290
+#: src/Object/Post.php:291
 msgid "add star"
 msgstr "přidat hvězdu"
 
-#: src/Object/Post.php:291
+#: src/Object/Post.php:292
 msgid "remove star"
 msgstr "odebrat hvězdu"
 
-#: src/Object/Post.php:292
+#: src/Object/Post.php:293
 msgid "toggle star status"
 msgstr "přepínat hvězdu"
 
-#: src/Object/Post.php:295
+#: src/Object/Post.php:296
 msgid "starred"
 msgstr "s hvězdou"
 
-#: src/Object/Post.php:299
+#: src/Object/Post.php:300
 msgid "add tag"
 msgstr "přidat štítek"
 
-#: src/Object/Post.php:310
+#: src/Object/Post.php:311
 msgid "like"
 msgstr "líbí se mi"
 
-#: src/Object/Post.php:311
+#: src/Object/Post.php:312
 msgid "dislike"
 msgstr "nelíbí se mi"
 
-#: src/Object/Post.php:314
+#: src/Object/Post.php:315
 msgid "Share this"
 msgstr "Sdílet toto"
 
-#: src/Object/Post.php:314
+#: src/Object/Post.php:315
 msgid "share"
 msgstr "sdílet"
 
-#: src/Object/Post.php:381
+#: src/Object/Post.php:382
 msgid "to"
 msgstr "na"
 
-#: src/Object/Post.php:382
+#: src/Object/Post.php:383
 msgid "via"
 msgstr "přes"
 
-#: src/Object/Post.php:383
+#: src/Object/Post.php:384
 msgid "Wall-to-Wall"
 msgstr "Ze zdi na zeď"
 
-#: src/Object/Post.php:384
+#: src/Object/Post.php:385
 msgid "via Wall-To-Wall:"
 msgstr "ze zdi na zeď"
 
-#: src/Object/Post.php:431
+#: src/Object/Post.php:418
+#, php-format
+msgid "Reply to %s"
+msgstr "Odpovědět uživateli %s"
+
+#: src/Object/Post.php:433
 msgid "Notifier task is pending"
 msgstr "Úloha pro notifiera čeká"
 
-#: src/Object/Post.php:432
+#: src/Object/Post.php:434
 msgid "Delivery to remote servers is pending"
 msgstr "Doručení vzdáleným serverům čeká"
 
-#: src/Object/Post.php:433
+#: src/Object/Post.php:435
 msgid "Delivery to remote servers is underway"
 msgstr "Doručení vzdáleným serverům je v plném proudu"
 
-#: src/Object/Post.php:434
+#: src/Object/Post.php:436
 msgid "Delivery to remote servers is mostly done"
 msgstr "Doručení vzdáleným serverům je téměř hotovo"
 
-#: src/Object/Post.php:435
+#: src/Object/Post.php:437
 msgid "Delivery to remote servers is done"
 msgstr "Doručení vzdáleným serverům je hotovo"
 
-#: src/Object/Post.php:454
+#: src/Object/Post.php:457
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -9628,11 +9642,19 @@ msgstr[1] "%d komentáře"
 msgstr[2] "%d komentáře"
 msgstr[3] "%d komentářů"
 
-#: src/Protocol/Diaspora.php:2495
+#: src/Object/Post.php:458
+msgid "Show more"
+msgstr "Zobrazit více"
+
+#: src/Object/Post.php:459
+msgid "Show fewer"
+msgstr "Zobrazit méně"
+
+#: src/Protocol/Diaspora.php:2496
 msgid "Sharing notification from Diaspora network"
 msgstr "Oznámení o sdílení ze sítě Diaspora"
 
-#: src/Protocol/Diaspora.php:3612
+#: src/Protocol/Diaspora.php:3613
 msgid "Attachments:"
 msgstr "Přílohy:"
 
diff --git a/view/lang/cs/strings.php b/view/lang/cs/strings.php
index 86fd159f1..f479e5046 100644
--- a/view/lang/cs/strings.php
+++ b/view/lang/cs/strings.php
@@ -485,7 +485,7 @@ $a->strings["If enabled, the global contacts are checked periodically for missin
 $a->strings["Days between requery"] = "Dny mezi dotazy";
 $a->strings["Number of days after which a server is requeried for his contacts."] = "Počet dnů, po kterých je server znovu dotázán na své kontakty";
 $a->strings["Discover contacts from other servers"] = "Objevit kontakty z ostatních serverů";
-$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."] = "Periodicky dotazovat ostatní servery pro kontakty. Můžete si vybrat mezi možnostmi: „uživatelé“ - uživatelé na vzdáleném systému, a „globální kontakty“ - aktivní kontakty, které jsou známy na systému. Funkce fallback je určena pro servery Redmatrix a starší servery Friendica, kde globální kontakty nejsou dostupné. Fallback zvyšuje serverovou zátěž, doporučené nastavení je proto „Uživatelé, globální kontakty“.";
+$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommended setting is 'Users, Global Contacts'."] = "Periodicky dotazovat ostatní servery pro kontakty. Můžete si vybrat mezi možnostmi: „uživatelé“ - uživatelé na vzdáleném systému, a „globální kontakty“ - aktivní kontakty, které jsou známy na systému. Funkce fallback je určena pro servery Redmatrix a starší servery Friendica, kde globální kontakty nejsou dostupné. Fallback zvyšuje serverovou zátěž, doporučené nastavení je proto „Uživatelé, globální kontakty“. ";
 $a->strings["Timeframe for fetching global contacts"] = "Časový rámec pro načítání globálních kontaktů";
 $a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "Pokud je aktivováno objevování, tato hodnota definuje časový rámec pro aktivitu globálních kontaktů, které jsou načteny z jiných serverů.";
 $a->strings["Search the local directory"] = "Hledat  v místním adresáři";
@@ -729,6 +729,7 @@ $a->strings["Mark this contact as remote_self, this will cause friendica to repo
 $a->strings["Account Nickname"] = "Přezdívka účtu";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@jménoštítku- upřednostněno před jménem/přezdívkou";
 $a->strings["Account URL"] = "URL adresa účtu";
+$a->strings["Account URL Alias"] = "Alias URL adresy účtu";
 $a->strings["Friend Request URL"] = "URL požadavku o přátelství";
 $a->strings["Friend Confirm URL"] = "URL adresa pro potvrzení přátelství";
 $a->strings["Notification Endpoint URL"] = "URL adresa koncového bodu oznámení";
@@ -1516,7 +1517,6 @@ $a->strings["File exceeds size limit of %s"] = "Velikost souboru přesáhla limi
 $a->strings["File upload failed."] = "Nahrání souboru se nezdařilo.";
 $a->strings["Wall Photos"] = "Fotky na zdi";
 $a->strings["Delete this item?"] = "Odstranit tuto položku?";
-$a->strings["show fewer"] = "zobrazit méně";
 $a->strings["toggle mobile"] = "přepínat mobilní zobrazení";
 $a->strings["No system theme config value set."] = "Není nastavena konfigurační hodnota systémového motivu.";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Formulářový bezpečnostní token nebyl správný. To pravděpodobně nastalo kvůli tom, že formulář byl otevřen příliš dlouho (>3 hodiny) před jeho odesláním.";
@@ -1607,6 +1607,8 @@ $a->strings["Ability for visitors to download the public calendar"] = "Umožnit
 $a->strings["Post Composition Features"] = "Nastavení vytváření příspěvků";
 $a->strings["Auto-mention Forums"] = "Automaticky zmiňovat fóra";
 $a->strings["Add/remove mention when a forum page is selected/deselected in ACL window."] = "Přidat/odstranit zmínku, když je stránka na fóru označena/odznačena v okně ACL.";
+$a->strings["Explicit Mentions"] = "Výslovné zmínky";
+$a->strings["Add explicit mentions to comment box for manual control over who gets mentioned in replies."] = "Přidá do pole pro komentování výslovné zmínky pro ruční kontrolu nad tím, koho zmíníte v odpovědích.";
 $a->strings["Network Sidebar"] = "Síťová postranní lišta";
 $a->strings["Ability to select posts by date ranges"] = "Možnost označit příspěvky dle časového intervalu";
 $a->strings["Protocol Filter"] = "Filtr protokolů";
@@ -1993,7 +1995,7 @@ $a->strings["Database storage failed to insert data"] = "Vklad dat do databázov
 $a->strings["Filesystem storage failed to create \"%s\". Check you write permissions."] = "Vytvoření „%s“ v úložišti souborového systému neuspělo. Zkontrolujte vaše povolení zapisovat.";
 $a->strings["Filesystem storage failed to save data to \"%s\". Check your write permissions"] = "Uložení dat do „%s“ v úložišti souborového systému neuspělo. Zkontrolujte vaše povolení zapisovat";
 $a->strings["Storage base path"] = "Cesta ke kořenové složce úložiště";
-$a->strings["Folder were uploaded files are saved. For maximum security, This should be a path outside web server folder tree"] = "Složka, do které jsou ukládány nahrané soubory. Pro maximální bezpečnost to musí být cesta mimo složku webového serveru";
+$a->strings["Folder where uploaded files are saved. For maximum security, This should be a path outside web server folder tree"] = "Složka, do které jsou ukládány nahrané soubory. Pro maximální bezpečnost to musí být cesta mimo složku webového serveru";
 $a->strings["Enter a valid existing folder"] = "Zadejte platnou existující složku";
 $a->strings["Login failed"] = "Přihlášení selhalo";
 $a->strings["Not enough information to authenticate"] = "Není dost informací pro autentikaci";
@@ -2214,6 +2216,7 @@ $a->strings["to"] = "na";
 $a->strings["via"] = "přes";
 $a->strings["Wall-to-Wall"] = "Ze zdi na zeď";
 $a->strings["via Wall-To-Wall:"] = "ze zdi na zeď";
+$a->strings["Reply to %s"] = "Odpovědět uživateli %s";
 $a->strings["Notifier task is pending"] = "Úloha pro notifiera čeká";
 $a->strings["Delivery to remote servers is pending"] = "Doručení vzdáleným serverům čeká";
 $a->strings["Delivery to remote servers is underway"] = "Doručení vzdáleným serverům je v plném proudu";
@@ -2225,6 +2228,8 @@ $a->strings["%d comment"] = [
 	2 => "%d komentáře",
 	3 => "%d komentářů",
 ];
+$a->strings["Show more"] = "Zobrazit více";
+$a->strings["Show fewer"] = "Zobrazit méně";
 $a->strings["Sharing notification from Diaspora network"] = "Oznámení o sdílení ze sítě Diaspora";
 $a->strings["Attachments:"] = "Přílohy:";
 $a->strings["%s is now following %s."] = "%s nyní sleduje %s.";

From 08d92d7ad844e08f113d225cbf9f20cea623fcd7 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 21 Feb 2019 20:42:00 +0000
Subject: [PATCH 071/145] Automatically adding mentions in the network stream
 hadn't really worked

---
 src/Object/Post.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 05ffeb52b..fbe6970e2 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -19,6 +19,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Term;
+use Friendica\Model\User;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
@@ -781,10 +782,12 @@ class Post extends BaseObject
 	{
 		$a = self::getApp();
 
-		if (!local_user() || empty($a->profile['addr'])) {
+		if (!local_user()) {
 			return '';
 		}
 
+		$owner = User::getOwnerDataById($a->user['uid']);
+
 		if (!Feature::isEnabled(local_user(), 'explicit_mentions')) {
 			return '';
 		}
@@ -795,7 +798,7 @@ class Post extends BaseObject
 			return '';
 		}
 
-		if ($item['author-addr'] != $a->profile['addr']) {
+		if ($item['author-addr'] != $owner['addr']) {
 			$text = '@' . $item['author-addr'] . ' ';
 		} else {
 			$text = '';
@@ -805,8 +808,8 @@ class Post extends BaseObject
 
 		foreach ($terms as $term) {
 			$profile = Contact::getDetailsByURL($term['url']);
-			if (!empty($profile['addr']) && ($profile['contact-type'] != Contact::TYPE_COMMUNITY) &&
-				($profile['addr'] != $a->profile['addr']) && !strstr($text, $profile['addr'])) {
+			if (($profile['contact-type'] != Contact::TYPE_COMMUNITY) &&
+				($profile['addr'] != $owner['addr']) && !strstr($text, $profile['addr'])) {
 				$text .= '@' . $profile['addr'] . ' ';
 			}
 		}

From ee37632695c0fac1960149d0d4263f93285611a7 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 22 Feb 2019 20:10:27 +0100
Subject: [PATCH 072/145] Adding worker id & functionname to worker logs

---
 src/Core/Worker.php                        |  19 +-
 src/Util/Logger/WorkerLogger.php           | 220 +++++++++++++++++++++
 tests/src/Util/Logger/WorkerLoggerTest.php | 119 +++++++++++
 3 files changed, 346 insertions(+), 12 deletions(-)
 create mode 100644 src/Util/Logger/WorkerLogger.php
 create mode 100644 tests/src/Util/Logger/WorkerLoggerTest.php

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 3f55aede3..bfe70c39c 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -8,6 +8,7 @@ use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\Model\Process;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Logger\WorkerLogger;
 use Friendica\Util\Network;
 
 /**
@@ -359,11 +360,10 @@ class Worker
 
 		$argc = count($argv);
 
-		// Currently deactivated, since the new logger doesn't support this
-		//$new_process_id = System::processID("wrk");
-		$new_process_id = '';
+		$logger = $a->getLogger();
+		$workerLogger = new WorkerLogger($logger, $funcname);
 
-		Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]." - Process PID: ".$new_process_id);
+		$workerLogger ->info("Process start.", ['process' => $mypid, 'priority' => $queue["priority"], 'id' => $queue["id"]]);
 
 		$stamp = (float)microtime(true);
 
@@ -371,24 +371,19 @@ class Worker
 		// For this reason the variables have to be initialized.
 		$a->getProfiler()->reset();
 
-		// For better logging create a new process id for every worker call
-		// But preserve the old one for the worker
-		$old_process_id = $a->process_id;
-		$a->process_id = $new_process_id;
-		$a->queue = $queue;
-
 		$up_duration = microtime(true) - self::$up_start;
 
 		// Reset global data to avoid interferences
 		unset($_SESSION);
 
+		Logger::init($workerLogger);
 		if ($method_call) {
 			call_user_func_array(sprintf('Friendica\Worker\%s::execute', $funcname), $argv);
 		} else {
 			$funcname($argv, $argc);
 		}
+		Logger::init($logger);
 
-		$a->process_id = $old_process_id;
 		unset($a->queue);
 
 		$duration = (microtime(true) - $stamp);
@@ -425,7 +420,7 @@ class Worker
 			Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 2 minutes (".round($duration/60, 3).")", Logger::DEBUG);
 		}
 
-		Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".number_format($duration, 4)." seconds. Process PID: ".$new_process_id);
+		Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".number_format($duration, 4)." seconds.");
 
 		$a->getProfiler()->saveLog($a->getLogger(), "ID " . $queue["id"] . ": " . $funcname);
 
diff --git a/src/Util/Logger/WorkerLogger.php b/src/Util/Logger/WorkerLogger.php
new file mode 100644
index 000000000..a9295834d
--- /dev/null
+++ b/src/Util/Logger/WorkerLogger.php
@@ -0,0 +1,220 @@
+<?php
+
+namespace Friendica\Util\Logger;
+
+use Psr\Log\LoggerInterface;
+
+/**
+ * A Logger for specific worker tasks, which adds an additional woker-id to it.
+ * Uses the decorator pattern (https://en.wikipedia.org/wiki/Decorator_pattern)
+ */
+class WorkerLogger implements LoggerInterface
+{
+	/**
+	 * @var LoggerInterface The original Logger instance
+	 */
+	private $logger;
+
+	/**
+	 * @var string the current worker ID
+	 */
+	private $workerId;
+
+	/**
+	 * @var string The called function name
+	 */
+	private $functionName;
+
+	/**
+	 * @param LoggerInterface $logger The logger for worker entries
+	 * @param string $functionName The current function name of the worker
+	 * @param int $idLength The length of the generated worker ID
+	 */
+	public function __construct(LoggerInterface $logger, $functionName, $idLength = 7)
+	{
+		$this->logger = $logger;
+		$this->functionName = $functionName;
+		$this->workerId = $this->generateWorkerId($idLength);
+	}
+
+	/**
+	 * Generates an ID
+	 *
+	 * @param int $length
+	 *
+	 * @return string
+	 */
+	private function generateWorkerId($length)
+	{
+		if ($length <= 0) {
+			$this->logger->alert('id length must be greater than 0.');
+			return '';
+		}
+
+		try {
+			return substr(bin2hex(random_bytes(ceil($length / 2))), 0, $length);
+		} catch (\Exception $exception) {
+			$this->logger->alert('random_bytes threw an error', ['exception' => $exception]);
+			return '';
+		}
+	}
+
+	/**
+	 * Adds the worker context for each log entry
+	 *
+	 * @param array $context
+	 */
+	private function addContext(array &$context)
+	{
+		$context['worker_id'] = $this->workerId;
+		$context['worker_cmd'] = $this->functionName;
+	}
+
+	/**
+	 * Returns the worker ID
+	 *
+	 * @return string
+	 */
+	public function getWorkerId()
+	{
+		return $this->workerId;
+	}
+
+	/**
+	 * System is unusable.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 *
+	 * @return void
+	 */
+	public function emergency($message, array $context = [])
+	{
+		$this->addContext($context);
+		$this->logger->emergency($message, $context);
+	}
+
+	/**
+	 * Action must be taken immediately.
+	 *
+	 * Example: Entire website down, database unavailable, etc. This should
+	 * trigger the SMS alerts and wake you up.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 *
+	 * @return void
+	 */
+	public function alert($message, array $context = [])
+	{
+		$this->addContext($context);
+		$this->logger->alert($message, $context);
+	}
+
+	/**
+	 * Critical conditions.
+	 *
+	 * Example: Application component unavailable, unexpected exception.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 *
+	 * @return void
+	 */
+	public function critical($message, array $context = [])
+	{
+		$this->addContext($context);
+		$this->logger->critical($message, $context);
+	}
+
+	/**
+	 * Runtime errors that do not require immediate action but should typically
+	 * be logged and monitored.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 *
+	 * @return void
+	 */
+	public function error($message, array $context = [])
+	{
+		$this->addContext($context);
+		$this->logger->error($message, $context);
+	}
+
+	/**
+	 * Exceptional occurrences that are not errors.
+	 *
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
+	 * that are not necessarily wrong.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 *
+	 * @return void
+	 */
+	public function warning($message, array $context = [])
+	{
+		$this->addContext($context);
+		$this->logger->warning($message, $context);
+	}
+
+	/**
+	 * Normal but significant events.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 *
+	 * @return void
+	 */
+	public function notice($message, array $context = [])
+	{
+		$this->addContext($context);
+		$this->logger->notice($message, $context);
+	}
+
+	/**
+	 * Interesting events.
+	 *
+	 * Example: User logs in, SQL logs.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 *
+	 * @return void
+	 */
+	public function info($message, array $context = [])
+	{
+		$this->addContext($context);
+		$this->logger->info($message, $context);
+	}
+
+	/**
+	 * Detailed debug information.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 *
+	 * @return void
+	 */
+	public function debug($message, array $context = [])
+	{
+		$this->addContext($context);
+		$this->logger->debug($message, $context);
+	}
+
+	/**
+	 * Logs with an arbitrary level.
+	 *
+	 * @param mixed $level
+	 * @param string $message
+	 * @param array $context
+	 *
+	 * @return void
+	 */
+	public function log($level, $message, array $context = [])
+	{
+		$this->addContext($context);
+		$this->logger->log($level, $message, $context);
+	}
+}
diff --git a/tests/src/Util/Logger/WorkerLoggerTest.php b/tests/src/Util/Logger/WorkerLoggerTest.php
new file mode 100644
index 000000000..4a84c40bb
--- /dev/null
+++ b/tests/src/Util/Logger/WorkerLoggerTest.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace src\Util\Logger;
+
+use Friendica\Test\MockedTest;
+use Friendica\Util\Logger\WorkerLogger;
+
+class WorkerLoggerTest extends MockedTest
+{
+	private function assertUid($uid, $length = 7)
+	{
+		$this->assertRegExp('/^[a-zA-Z0-9]{' . $length . '}+$/', $uid);
+	}
+
+	/**
+	 * Test the a id with length zero
+	 * @expectedException
+	 */
+	public function testGetWorkerIdZero()
+	{
+		$logger = \Mockery::mock('Psr\Log\LoggerInterface');
+		$logger
+			->shouldReceive('alert')
+			->with('id length must be greater than 0.')
+			->once();
+		new WorkerLogger($logger, 'test', 0);
+	}
+
+	/**
+	 * Test the generated Uid
+	 */
+	public function testGetWorkerId()
+	{
+		$logger = \Mockery::mock('Psr\Log\LoggerInterface');
+		for ($i = 1; $i < 14; $i++) {
+			$workLogger = new WorkerLogger($logger, 'test', $i);
+			$uid = $workLogger->getWorkerId();
+			$this->assertUid($uid, $i);
+		}
+	}
+
+	public function dataTest()
+	{
+		return [
+			'info' => [
+				'func' => 'info',
+				'msg' => 'the alert',
+				'context' => [],
+			],
+			'alert' => [
+				'func' => 'alert',
+				'msg' => 'another alert',
+				'context' => ['test' => 'it'],
+			],
+			'critical' => [
+				'func' => 'critical',
+				'msg' => 'Critical msg used',
+				'context' => ['test' => 'it', 'more' => 0.24545],
+			],
+			'error' => [
+				'func' => 'error',
+				'msg' => 21345623,
+				'context' => ['test' => 'it', 'yet' => true],
+			],
+			'warning' => [
+				'func' => 'warning',
+				'msg' => 'another alert' . 123523 . 324.54534 . 'test',
+				'context' => ['test' => 'it', 2 => 'nope'],
+			],
+			'notice' => [
+				'func' => 'notice',
+				'msg' => 'Notice' . ' alert' . true . 'with' . '\'strange\'' . 1.24. 'behavior',
+				'context' => ['test' => 'it'],
+			],
+			'debug' => [
+				'func' => 'debug',
+				'msg' => 'at last a debug',
+				'context' => ['test' => 'it'],
+			],
+		];
+	}
+
+	/**
+	 * Test the WorkerLogger with different log calls
+	 * @dataProvider dataTest
+	 */
+	public function testEmergency($func, $msg, $context = [])
+	{
+		$logger = \Mockery::mock('Psr\Log\LoggerInterface');
+		$workLogger = new WorkerLogger($logger, 'test');
+		$testContext = $context;
+		$testContext['worker_id'] = $workLogger->getWorkerId();
+		$testContext['worker_cmd'] = 'test';
+		$this->assertUid($testContext['worker_id']);
+		$logger
+			->shouldReceive($func)
+			->with($msg, $testContext)
+			->once();
+		$workLogger->$func($msg, $context);
+	}
+
+	/**
+	 * Test the WorkerLogger with
+	 */
+	public function testLog()
+	{
+		$logger = \Mockery::mock('Psr\Log\LoggerInterface');
+		$workLogger = new WorkerLogger($logger, 'test');
+		$context = $testContext = ['test' => 'it'];
+		$testContext['worker_id'] = $workLogger->getWorkerId();
+		$testContext['worker_cmd'] = 'test';
+		$this->assertUid($testContext['worker_id']);
+		$logger
+			->shouldReceive('log')
+			->with('debug', 'a test', $testContext)
+			->once();
+		$workLogger->log('debug', 'a test', $context);
+	}
+}

From cec6f4902394f74653c3b11bf04221d59470aeb1 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 22 Feb 2019 20:24:10 +0100
Subject: [PATCH 073/145] Removed unused code

---
 src/App.php         |  3 ---
 src/Core/System.php | 15 ---------------
 2 files changed, 18 deletions(-)

diff --git a/src/App.php b/src/App.php
index 3df285cb3..5a8d9831d 100644
--- a/src/App.php
+++ b/src/App.php
@@ -197,7 +197,6 @@ class App
 		$this->footerScripts[] = trim($url, '/');
 	}
 
-	public $process_id;
 	public $queue;
 	private $scheme;
 	private $hostname;
@@ -367,8 +366,6 @@ class App
 		$this->loadDefaultTimezone();
 
 		Core\L10n::init();
-
-		$this->process_id = Core\System::processID('log');
 	}
 
 	/**
diff --git a/src/Core/System.php b/src/Core/System.php
index f0ed08357..69d15a176 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -234,21 +234,6 @@ class System extends BaseObject
 		}
 	}
 
-	/**
-	 * Generates a process identifier for the logging
-	 *
-	 * @param string $prefix A given prefix
-	 *
-	 * @return string a generated process identifier
-	 */
-	public static function processID($prefix)
-	{
-		// We aren't calling any other function here.
-		// Doing so could easily create an endless loop
-		$trailer = $prefix . ':' . getmypid() . ':';
-		return substr($trailer . uniqid('') . mt_rand(), 0, 26);
-	}
-
 	/**
 	 * Returns the current Load of the System
 	 *

From 9c12f3f226cefa64456c559fd060e067389d9886 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 22 Feb 2019 20:41:13 +0100
Subject: [PATCH 074/145] Formatting logger to new style

---
 src/Core/Worker.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index bfe70c39c..29d825050 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -356,14 +356,12 @@ class Worker
 	{
 		$a = \get_app();
 
-		$mypid = getmypid();
-
 		$argc = count($argv);
 
 		$logger = $a->getLogger();
 		$workerLogger = new WorkerLogger($logger, $funcname);
 
-		$workerLogger ->info("Process start.", ['process' => $mypid, 'priority' => $queue["priority"], 'id' => $queue["id"]]);
+		$workerLogger ->info("Process start.", ['priority' => $queue["priority"], 'id' => $queue["id"]]);
 
 		$stamp = (float)microtime(true);
 
@@ -376,6 +374,7 @@ class Worker
 		// Reset global data to avoid interferences
 		unset($_SESSION);
 
+		// Set the workerLogger as new default logger
 		Logger::init($workerLogger);
 		if ($method_call) {
 			call_user_func_array(sprintf('Friendica\Worker\%s::execute', $funcname), $argv);
@@ -401,7 +400,7 @@ class Worker
 		$rest    = number_format(max(0, $up_duration - (self::$db_duration + self::$lock_duration)), 4);
 		$exec    = number_format($duration, 4);
 
-		Logger::info('Performance:', ['total' => $dbtotal, 'count' => $dbcount, 'stat' => $dbstat, 'write' => $dbwrite, 'block' => $dblock, 'rest' => $rest, 'exec' => $exec]);
+		$workerLogger->info('Performance log.', ['total' => $dbtotal, 'count' => $dbcount, 'stat' => $dbstat, 'write' => $dbwrite, 'block' => $dblock, 'rest' => $rest, 'exec' => $exec]);
 
 		self::$up_start = microtime(true);
 		self::$db_duration = 0;
@@ -411,23 +410,23 @@ class Worker
 		self::$lock_duration = 0;
 
 		if ($duration > 3600) {
-			Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 1 hour (".round($duration/60, 3).")", Logger::DEBUG);
+			$workerLogger->info('Longer than 1 hour.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   round($duration/60, 3)]);
 		} elseif ($duration > 600) {
-			Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 10 minutes (".round($duration/60, 3).")", Logger::DEBUG);
+			$workerLogger->info('Longer than 10 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   round($duration/60, 3)]);
 		} elseif ($duration > 300) {
-			Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 5 minutes (".round($duration/60, 3).")", Logger::DEBUG);
+			$workerLogger->info('Longer than 5 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   round($duration/60, 3)]);
 		} elseif ($duration > 120) {
-			Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 2 minutes (".round($duration/60, 3).")", Logger::DEBUG);
+			$workerLogger->info('Longer than 2 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   round($duration/60, 3)]);
 		}
 
-		Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".number_format($duration, 4)." seconds.");
+		$workerLogger->info('Process done. ', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   number_format($duration, 4)]);
 
 		$a->getProfiler()->saveLog($a->getLogger(), "ID " . $queue["id"] . ": " . $funcname);
 
 		$cooldown = Config::get("system", "worker_cooldown", 0);
 
 		if ($cooldown > 0) {
-			Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
+			$workerLogger->info('Cooldown.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'cooldown' => $cooldown]);
 			sleep($cooldown);
 		}
 	}

From a613523dd7cd69bf5c7f1e08a5bb7a113e7f7f4e Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 22 Feb 2019 20:45:13 +0100
Subject: [PATCH 075/145] skip WorkerLogger for Logging

---
 src/Factory/LoggerFactory.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index 77a09637c..97b513bd3 100644
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -7,6 +7,7 @@ use Friendica\Core\Logger;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\Logger\FriendicaDevelopHandler;
 use Friendica\Util\Logger\FriendicaIntrospectionProcessor;
+use Friendica\Util\Logger\WorkerLogger;
 use Friendica\Util\Profiler;
 use Monolog;
 use Psr\Log\LoggerInterface;
@@ -33,7 +34,7 @@ class LoggerFactory
 		$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
 		$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
 		$logger->pushProcessor(new Monolog\Processor\UidProcessor());
-		$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, [Logger::class, Profiler::class]));
+		$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, [Logger::class, Profiler::class, WorkerLogger::class]));
 
 		$debugging = $config->get('system', 'debugging');
 		$stream    = $config->get('system', 'logfile');

From 8c3aebc376a496e5f6ac93cda8ba88b1bd1261fa Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 22 Feb 2019 23:51:13 +0100
Subject: [PATCH 076/145] Bugfixings in Config

- replaced usage of "!<unset>!" with null-returns
- fixed bool settings (0/1)
- fixed overriding config-values
- fixed basepath problems
---
 bin/daemon.php                                |  4 +-
 src/App.php                                   |  6 +-
 src/Core/Config.php                           |  2 -
 .../Adapter/AbstractDbaConfigAdapter.php      | 64 ++++++++++++++++++-
 src/Core/Config/Adapter/IConfigAdapter.php    |  8 ++-
 src/Core/Config/Adapter/IPConfigAdapter.php   |  6 +-
 src/Core/Config/Adapter/JITConfigAdapter.php  | 38 ++++++-----
 src/Core/Config/Adapter/JITPConfigAdapter.php | 29 +++++----
 .../Config/Adapter/PreloadConfigAdapter.php   | 14 ++--
 .../Config/Adapter/PreloadPConfigAdapter.php  | 14 ++--
 src/Core/Config/Cache/ConfigCache.php         | 38 ++---------
 src/Core/Config/Cache/ConfigCacheLoader.php   |  3 -
 src/Core/Config/Cache/IConfigCache.php        | 13 +---
 src/Core/Config/Cache/IPConfigCache.php       | 13 +---
 src/Core/Config/Configuration.php             | 11 ++--
 src/Core/Config/PConfiguration.php            |  9 +--
 src/Core/PConfig.php                          |  2 -
 src/Database/DBA.php                          |  9 ++-
 src/Factory/DBFactory.php                     | 13 ++--
 src/Factory/DependencyFactory.php             |  8 +--
 src/Model/Photo.php                           |  4 +-
 tests/include/ApiTest.php                     |  8 +--
 tests/src/Database/DBATest.php                |  8 +--
 tests/src/Database/DBStructureTest.php        |  8 +--
 24 files changed, 175 insertions(+), 157 deletions(-)

diff --git a/bin/daemon.php b/bin/daemon.php
index 047bf71be..298cfa253 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -144,7 +144,9 @@ if (!$foreground) {
 	file_put_contents($pidfile, $pid);
 
 	// We lose the database connection upon forking
-	Factory\DBFactory::init($a->getConfigCache(), $a->getProfiler(), $_SERVER);
+	/// @todo refactoring during https://github.com/friendica/friendica/issues/6720
+	$basePath = \Friendica\Util\BasePath::create(dirname(__DIR__), $_SERVER);
+	Factory\DBFactory::init($basePath, $a->getConfigCache(), $a->getProfiler(), $_SERVER);
 }
 
 Config::set('system', 'worker_daemon_mode', true);
diff --git a/src/App.php b/src/App.php
index 3df285cb3..e5ac5dda3 100644
--- a/src/App.php
+++ b/src/App.php
@@ -205,6 +205,7 @@ class App
 	/**
 	 * @brief App constructor.
 	 *
+	 * @param string           $basePath   The basedir of the app
 	 * @param Configuration    $config    The Configuration
 	 * @param LoggerInterface  $logger    The current app logger
 	 * @param Profiler         $profiler  The profiler of this application
@@ -212,14 +213,15 @@ class App
 	 *
 	 * @throws Exception if the Basepath is not usable
 	 */
-	public function __construct(Configuration $config, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
+	public function __construct($basePath, Configuration $config, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
 	{
 		BaseObject::setApp($this);
 
 		$this->logger   = $logger;
 		$this->config   = $config;
 		$this->profiler = $profiler;
-		$this->basePath = $this->config->get('system', 'basepath');
+		$cfgBasePath = $this->config->get('system', 'basepath');
+		$this->basePath = (isset($cfgBasePath) && $cfgBasePath !== '') ? $cfgBasePath : $basePath;
 
 		if (!Core\System::isDirectoryUsable($this->basePath, false)) {
 			throw new Exception('Basepath \'' . $this->basePath . '\' isn\'t usable.');
diff --git a/src/Core/Config.php b/src/Core/Config.php
index 4bf9c5b11..f974e2fff 100644
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -65,8 +65,6 @@ class Config
 	 *
 	 * Stores a config value ($value) in the category ($cat) under the key ($key)
 	 *
-	 * Note: Please do not store booleans - convert to 0/1 integer values!
-	 *
 	 * @param string $cat The category of the configuration value
 	 * @param string $key    The configuration key to set
 	 * @param mixed  $value  The value to store
diff --git a/src/Core/Config/Adapter/AbstractDbaConfigAdapter.php b/src/Core/Config/Adapter/AbstractDbaConfigAdapter.php
index 770dfd2c9..38caf35ca 100644
--- a/src/Core/Config/Adapter/AbstractDbaConfigAdapter.php
+++ b/src/Core/Config/Adapter/AbstractDbaConfigAdapter.php
@@ -6,7 +6,11 @@ use Friendica\Database\DBA;
 
 abstract class AbstractDbaConfigAdapter
 {
-	/** @var bool */
+	/**
+	 * The connection state of the adapter
+	 *
+	 * @var bool
+	 */
 	protected $connected = true;
 
 	public function __construct()
@@ -14,8 +18,66 @@ abstract class AbstractDbaConfigAdapter
 		$this->connected = DBA::connected();
 	}
 
+	/**
+	 * Checks if the adapter is currently connected
+	 *
+	 * @return bool
+	 */
 	public function isConnected()
 	{
 		return $this->connected;
 	}
+
+	/**
+	 * Formats a DB value to a config value
+	 * - null   = The db-value isn't set
+	 * - bool   = The db-value is either '0' or '1'
+	 * - array  = The db-value is a serialized array
+	 * - string = The db-value is a string
+	 *
+	 * Keep in mind that there aren't any numeric/integer config values in the database
+	 *
+	 * @param null|string $value
+	 *
+	 * @return null|array|string
+	 */
+	protected function toConfigValue($value)
+	{
+		if (!isset($value)) {
+			return null;
+		}
+
+		switch (true) {
+			// manage array value
+			case preg_match("|^a:[0-9]+:{.*}$|s", $value):
+				return unserialize($value);
+
+			default:
+				return $value;
+		}
+	}
+
+	/**
+	 * Formats a config value to a DB value (string)
+	 *
+	 * @param mixed $value
+	 *
+	 * @return string
+	 */
+	protected function toDbValue($value)
+	{
+		// if not set, save an empty string
+		if (!isset($value)) {
+			return '';
+		}
+
+		switch (true) {
+			// manage arrays
+			case is_array($value):
+				return serialize($value);
+
+			default:
+				return (string)$value;
+		}
+	}
 }
diff --git a/src/Core/Config/Adapter/IConfigAdapter.php b/src/Core/Config/Adapter/IConfigAdapter.php
index 21cd9a4b2..892c476e7 100644
--- a/src/Core/Config/Adapter/IConfigAdapter.php
+++ b/src/Core/Config/Adapter/IConfigAdapter.php
@@ -21,10 +21,12 @@ interface IConfigAdapter
 	 * Get a particular system-wide config variable given the category name
 	 * ($family) and a key.
 	 *
+	 * Note: Boolean variables are defined as 0/1 in the database
+	 *
 	 * @param string  $cat The category of the configuration value
 	 * @param string  $key The configuration key to query
 	 *
-	 * @return mixed Stored value or "!<unset>!" if it does not exist
+	 * @return null|mixed Stored value or null if it does not exist
 	 */
 	public function get($cat, $key);
 
@@ -46,9 +48,9 @@ interface IConfigAdapter
 	 * and removes it from the database.
 	 *
 	 * @param string $cat The category of the configuration value
-	 * @param string $key   The configuration key to delete
+	 * @param string $key The configuration key to delete
 	 *
-	 * @return mixed
+	 * @return bool Operation success
 	 */
 	public function delete($cat, $key);
 
diff --git a/src/Core/Config/Adapter/IPConfigAdapter.php b/src/Core/Config/Adapter/IPConfigAdapter.php
index 8e6c050b2..c505532c5 100644
--- a/src/Core/Config/Adapter/IPConfigAdapter.php
+++ b/src/Core/Config/Adapter/IPConfigAdapter.php
@@ -28,11 +28,13 @@ interface IPConfigAdapter
 	 * Get a particular user's config variable given the category name
 	 * ($family) and a key.
 	 *
+	 * Note: Boolean variables are defined as 0/1 in the database
+	 *
 	 * @param string  $uid           The user_id
 	 * @param string  $cat           The category of the configuration value
 	 * @param string  $key           The configuration key to query
 	 *
-	 * @return mixed Stored value or "!<unset>!" if it does not exist
+	 * @return null|mixed Stored value or null if it does not exist
 	 */
 	public function get($uid, $cat, $key);
 
@@ -59,7 +61,7 @@ interface IPConfigAdapter
 	 * @param string $cat The category of the configuration value
 	 * @param string $key The configuration key to delete
 	 *
-	 * @return bool
+	 * @return bool Operation success
 	 */
 	public function delete($uid, $cat, $key);
 
diff --git a/src/Core/Config/Adapter/JITConfigAdapter.php b/src/Core/Config/Adapter/JITConfigAdapter.php
index c0d680d2c..5a4146303 100644
--- a/src/Core/Config/Adapter/JITConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITConfigAdapter.php
@@ -34,40 +34,49 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 		$configs = DBA::select('config', ['v', 'k'], ['cat' => $cat]);
 		while ($config = DBA::fetch($configs)) {
 			$key   = $config['k'];
-			$value = $config['v'];
+			$value = $this->toConfigValue($config['v']);
 
-			if (isset($value) && $value !== '') {
+			// The value was in the db, so don't check it again (unless you have to)
+			$this->in_db[$cat][$key] = true;
+
+			// just save it in case it is set
+			if (isset($value)) {
 				$return[$key] = $value;
-				$this->in_db[$cat][$key] = true;
 			}
 		}
 		DBA::close($configs);
 
-		return [$cat => $config];
+		return [$cat => $return];
 	}
 
 	/**
 	 * {@inheritdoc}
+	 *
+	 * @param bool $mark if true, mark the selection of the current cat/key pair
 	 */
-	public function get($cat, $key)
+	public function get($cat, $key, $mark = true)
 	{
 		if (!$this->isConnected()) {
-			return '!<unset>!';
+			return null;
+		}
+
+		// The value got checked, so mark it to avoid checking it over and over again
+		if ($mark) {
+			$this->in_db[$cat][$key] = true;
 		}
 
 		$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
 		if (DBA::isResult($config)) {
 			// manage array value
-			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
+			$value = $this->toConfigValue($config['v']);
 
-			if (isset($value) && $value !== '') {
-				$this->in_db[$cat][$key] = true;
+			// just return it in case it is set
+			if (isset($value)) {
 				return $value;
 			}
 		}
 
-		$this->in_db[$cat][$key] = false;
-		return '!<unset>!';
+		return null;
 	}
 
 	/**
@@ -84,7 +93,7 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 		// The exception are array values.
 		$dbvalue = (!is_array($value) ? (string)$value : $value);
 
-		$stored = $this->get($cat, $key);
+		$stored = $this->get($cat, $key, false);
 
 		if (!isset($this->in_db[$cat])) {
 			$this->in_db[$cat] = [];
@@ -93,12 +102,11 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 			$this->in_db[$cat][$key] = false;
 		}
 
-		if (($stored === $dbvalue) && $this->in_db[$cat][$key]) {
+		if (isset($stored) && ($stored === $dbvalue) && $this->in_db[$cat][$key]) {
 			return true;
 		}
 
-		// manage array value
-		$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
+		$dbvalue = $this->toDbValue($dbvalue);
 
 		$result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $key], true);
 
diff --git a/src/Core/Config/Adapter/JITPConfigAdapter.php b/src/Core/Config/Adapter/JITPConfigAdapter.php
index 4485ee5df..e320104e7 100644
--- a/src/Core/Config/Adapter/JITPConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITPConfigAdapter.php
@@ -29,16 +29,18 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
 		if (DBA::isResult($pconfigs)) {
 			while ($pconfig = DBA::fetch($pconfigs)) {
 				$key = $pconfig['k'];
-				$value = $pconfig['v'];
+				$value = $this->toConfigValue($pconfig['v']);
 
-				if (isset($value) && $value !== '') {
+				// The value was in the db, so don't check it again (unless you have to)
+				$this->in_db[$uid][$cat][$key] = true;
+
+				if (isset($value)) {
 					$return[$key] = $value;
-					$this->in_db[$uid][$cat][$key] = true;
 				}
 			}
 		} else if ($cat != 'config') {
 			// Negative caching
-			$return = "!<unset>!";
+			$return = null;
 		}
 		DBA::close($pconfigs);
 
@@ -51,22 +53,23 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
 	public function get($uid, $cat, $key)
 	{
 		if (!$this->isConnected()) {
-			return '!<unset>!';
+			return null;
 		}
 
+		// The value was in the db, so don't check it again (unless you have to)
+		$this->in_db[$uid][$cat][$key] = true;
+
 		$pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
 		if (DBA::isResult($pconfig)) {
-			// manage array value
-			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']);
+			$value = $this->toConfigValue($pconfig['v']);
 
-			if (isset($value) && $value !== '') {
-				$this->in_db[$uid][$cat][$key] = true;
+			if (isset($value)) {
 				return $value;
 			}
 		}
 
 		$this->in_db[$uid][$cat][$key] = false;
-		return '!<unset>!';
+		return null;
 	}
 
 	/**
@@ -118,13 +121,11 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
 			return false;
 		}
 
-		if (!empty($this->in_db[$uid][$cat][$key])) {
+		if (isset($this->in_db[$uid][$cat][$key])) {
 			unset($this->in_db[$uid][$cat][$key]);
 		}
 
-		$result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
-
-		return $result;
+		return DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
 	}
 
 	/**
diff --git a/src/Core/Config/Adapter/PreloadConfigAdapter.php b/src/Core/Config/Adapter/PreloadConfigAdapter.php
index 218648cbd..7ebd1efcf 100644
--- a/src/Core/Config/Adapter/PreloadConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadConfigAdapter.php
@@ -35,8 +35,6 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 			$value = $config['v'];
 			if (isset($value) && $value !== '') {
 				$return[$config['cat']][$config['k']] = $value;
-			} else {
-				$return[$config['cat']][$config['k']] = '!<unset>!';
 			}
 		}
 		DBA::close($configs);
@@ -52,7 +50,7 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 	public function get($cat, $key)
 	{
 		if (!$this->isConnected()) {
-			return '!<unset>!';
+			return null;
 		}
 
 		$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
@@ -65,7 +63,7 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 			}
 		}
 
-		return '!<unset>!';
+		return null;
 	}
 
 	/**
@@ -89,9 +87,7 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 		// manage array value
 		$dbvalue = is_array($value) ? serialize($value) : $value;
 
-		$result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $key], true);
-
-		return $result;
+		return DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $key], true);
 	}
 
 	/**
@@ -103,9 +99,7 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 			return false;
 		}
 
-		$result = DBA::delete('config', ['cat' => $cat, 'k' => $key]);
-
-		return $result;
+		return DBA::delete('config', ['cat' => $cat, 'k' => $key]);
 	}
 
 	/**
diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
index 12e25df9f..d2ba971ff 100644
--- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -52,8 +52,6 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 			$value = $pconfig['v'];
 			if (isset($value) && $value !== '') {
 				$return[$pconfig['cat']][$pconfig['k']] = $value;
-			} else {
-				$return[$pconfig['cat']][$pconfig['k']] = '!<unset>!';
 			}
 		}
 		DBA::close($pconfigs);
@@ -69,7 +67,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 	public function get($uid, $cat, $key)
 	{
 		if (!$this->isConnected()) {
-			return '!<unset>!';
+			return null;
 		}
 
 		if (!$this->isLoaded($uid, $cat, $key)) {
@@ -85,7 +83,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 				return $value;
 			}
 		}
-		return '!<unset>!';
+		return null;
 	}
 
 	/**
@@ -112,9 +110,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 		// manage array value
 		$dbvalue = is_array($value) ? serialize($value) : $value;
 
-		$result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $key], true);
-
-		return $result;
+		return DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $key], true);
 	}
 
 	/**
@@ -130,9 +126,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 			$this->load($uid, $cat);
 		}
 
-		$result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
-
-		return $result;
+		return DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
 	}
 
 	/**
diff --git a/src/Core/Config/Cache/ConfigCache.php b/src/Core/Config/Cache/ConfigCache.php
index 4ebcc8748..cf50b43d4 100644
--- a/src/Core/Config/Cache/ConfigCache.php
+++ b/src/Core/Config/Cache/ConfigCache.php
@@ -6,8 +6,6 @@ namespace Friendica\Core\Config\Cache;
  * The Friendica config cache for the application
  * Initial, all *.config.php files are loaded into this cache with the
  * ConfigCacheLoader ( @see ConfigCacheLoader )
- *
- * Is used for further caching operations too (depending on the ConfigAdapter )
  */
 class ConfigCache implements IConfigCache, IPConfigCache
 {
@@ -37,7 +35,7 @@ class ConfigCache implements IConfigCache, IPConfigCache
 
 				foreach ($keys as $key) {
 					$value = $config[$category][$key];
-					if (isset($value) && $value !== '!<unset>!') {
+					if (isset($value)) {
 						if ($overwrite) {
 							$this->set($category, $key, $value);
 						} else {
@@ -56,22 +54,13 @@ class ConfigCache implements IConfigCache, IPConfigCache
 	{
 		if (isset($this->config[$cat][$key])) {
 			return $this->config[$cat][$key];
-		} elseif ($key == null && isset($this->config[$cat])) {
+		} elseif (!isset($key) && isset($this->config[$cat])) {
 			return $this->config[$cat];
 		} else {
-			return '!<unset>!';
+			return null;
 		}
 	}
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function has($cat, $key = null)
-	{
-		return (isset($this->config[$cat][$key]) && $this->config[$cat][$key] !== '!<unset>!') ||
-		($key == null && isset($this->config[$cat]) && $this->config[$cat] !== '!<unset>!' && is_array($this->config[$cat]));
-	}
-
 	/**
 	 * Sets a default value in the config cache. Ignores already existing keys.
 	 *
@@ -91,9 +80,6 @@ class ConfigCache implements IConfigCache, IPConfigCache
 	 */
 	public function set($cat, $key, $value)
 	{
-		// Only arrays are serialized in database, so we have to unserialize sparingly
-		$value = is_string($value) && preg_match("|^a:[0-9]+:{.*}$|s", $value) ? unserialize($value) : $value;
-
 		if (!isset($this->config[$cat])) {
 			$this->config[$cat] = [];
 		}
@@ -103,15 +89,6 @@ class ConfigCache implements IConfigCache, IPConfigCache
 		return true;
 	}
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function hasP($uid, $cat, $key = null)
-	{
-		return (isset($this->config[$uid][$cat][$key]) && $this->config[$uid][$cat][$key] !== '!<unset>!') ||
-			($key == null && isset($this->config[$uid][$cat]) && $this->config[$uid][$cat] !== '!<unset>!' && is_array($this->config[$uid][$cat]));
-	}
-
 	/**
 	 * {@inheritdoc}
 	 */
@@ -142,7 +119,7 @@ class ConfigCache implements IConfigCache, IPConfigCache
 
 				foreach ($keys as $key) {
 					$value = $config[$category][$key];
-					if (isset($value) && $value !== '!<unset>!') {
+					if (isset($value)) {
 						$this->setP($uid, $category, $key, $value);
 					}
 				}
@@ -157,10 +134,10 @@ class ConfigCache implements IConfigCache, IPConfigCache
 	{
 		if (isset($this->config[$uid][$cat][$key])) {
 			return $this->config[$uid][$cat][$key];
-		} elseif ($key == null && isset($this->config[$uid][$cat])) {
+		} elseif (!isset($key) && isset($this->config[$uid][$cat])) {
 			return $this->config[$uid][$cat];
 		} else {
-			return '!<unset>!';
+			return null;
 		}
 	}
 
@@ -169,9 +146,6 @@ class ConfigCache implements IConfigCache, IPConfigCache
 	 */
 	public function setP($uid, $cat, $key, $value)
 	{
-		// Only arrays are serialized in database, so we have to unserialize sparingly
-		$value = is_string($value) && preg_match("|^a:[0-9]+:{.*}$|s", $value) ? unserialize($value) : $value;
-
 		if (!isset($this->config[$uid]) || !is_array($this->config[$uid])) {
 			$this->config[$uid] = [];
 		}
diff --git a/src/Core/Config/Cache/ConfigCacheLoader.php b/src/Core/Config/Cache/ConfigCacheLoader.php
index b728d1082..b043bf27c 100644
--- a/src/Core/Config/Cache/ConfigCacheLoader.php
+++ b/src/Core/Config/Cache/ConfigCacheLoader.php
@@ -37,9 +37,6 @@ class ConfigCacheLoader
 	 */
 	public function loadConfigFiles(ConfigCache $config)
 	{
-		// Setting at least the basepath we know
-		$config->set('system', 'basepath', $this->baseDir);
-
 		$config->load($this->loadCoreConfig('defaults'));
 		$config->load($this->loadCoreConfig('settings'));
 
diff --git a/src/Core/Config/Cache/IConfigCache.php b/src/Core/Config/Cache/IConfigCache.php
index 9d948527d..499bd312d 100644
--- a/src/Core/Config/Cache/IConfigCache.php
+++ b/src/Core/Config/Cache/IConfigCache.php
@@ -20,9 +20,9 @@ interface IConfigCache
 	 * Gets a value from the config cache.
 	 *
 	 * @param string $cat     Config category
-	 * @param string $key       Config key
+	 * @param string $key     Config key
 	 *
-	 * @return mixed Returns the value of the Config entry or '!<unset>!' if not set
+	 * @return null|mixed Returns the value of the Config entry or null if not set
 	 */
 	function get($cat, $key = null);
 
@@ -47,15 +47,6 @@ interface IConfigCache
 	 */
 	function delete($cat, $key);
 
-	/**
-	 * Checks if a value is set in the config cache.
-	 *
-	 * @param string $cat  Config category
-	 * @param string $key  Config key
-	 * @return bool
-	 */
-	function has($cat, $key = null);
-
 	/**
 	 * Returns the whole configuration cache
 	 *
diff --git a/src/Core/Config/Cache/IPConfigCache.php b/src/Core/Config/Cache/IPConfigCache.php
index 4ac21481a..30076a2a9 100644
--- a/src/Core/Config/Cache/IPConfigCache.php
+++ b/src/Core/Config/Cache/IPConfigCache.php
@@ -23,7 +23,7 @@ interface IPConfigCache
 	 * @param string $cat     Config category
 	 * @param string $key     Config key
 	 *
-	 * @return string The value of the config entry or '!<unset>!' if not set
+	 * @return null|string The value of the config entry or null if not set
 	 */
 	function getP($uid, $cat, $key = null);
 
@@ -50,17 +50,6 @@ interface IPConfigCache
 	 */
 	function deleteP($uid, $cat, $key);
 
-
-	/**
-	 * Checks if a value is set in the user config cache.
-	 *
-	 * @param int    $uid  User Id
-	 * @param string $cat  Config category
-	 * @param string $key  Config key
-	 * @return bool
-	 */
-	function hasP($uid, $cat, $key = null);
-
 	/**
 	 * Returns the whole configuration cache
 	 *
diff --git a/src/Core/Config/Configuration.php b/src/Core/Config/Configuration.php
index 2ac0da0ad..532ed982a 100644
--- a/src/Core/Config/Configuration.php
+++ b/src/Core/Config/Configuration.php
@@ -83,20 +83,19 @@ class Configuration
 		if ($this->configAdapter->isConnected() &&
 			(!$this->configAdapter->isLoaded($cat, $key) ||
 			$refresh)) {
+
 			$dbvalue = $this->configAdapter->get($cat, $key);
 
-			if ($dbvalue !== '!<unset>!') {
+			if (isset($dbvalue)) {
 				$this->configCache->set($cat, $key, $dbvalue);
 				return $dbvalue;
 			}
 		}
 
 		// use the config cache for return
-		if ($this->configCache->has($cat, $key)) {
-			return $this->configCache->get($cat, $key);
-		} else {
-			return $default_value;
-		}
+		$result = $this->configCache->get($cat, $key);
+
+		return (isset($result)) ? $result : $default_value;
 	}
 
 	/**
diff --git a/src/Core/Config/PConfiguration.php b/src/Core/Config/PConfiguration.php
index 99b1aa146..0d3b0c178 100644
--- a/src/Core/Config/PConfiguration.php
+++ b/src/Core/Config/PConfiguration.php
@@ -77,18 +77,15 @@ class PConfiguration
 				$refresh)) {
 			$dbValue = $this->configAdapter->get($uid, $cat, $key);
 
-			if ($dbValue !== '!<unset>!') {
+			if (isset($dbValue)) {
 				$this->configCache->setP($uid, $cat, $key, $dbValue);
 				return $dbValue;
 			}
 		}
 
 		// use the config cache for return
-		if ($this->configCache->hasP($uid, $cat, $key)) {
-			return $this->configCache->getP($uid, $cat, $key);
-		} else {
-			return $default_value;
-		}
+		$result = $this->configCache->getP($uid, $cat, $key);
+		return (isset($result)) ? $result : $default_value;
 	}
 
 	/**
diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index f62b59f47..da4c80293 100644
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -65,8 +65,6 @@ class PConfig
 	/**
 	 * @brief Sets a configuration value for a user
 	 *
-	 * @note  Please do not store booleans - convert to 0/1 integer values!
-	 *
 	 * @param string $uid    The user_id
 	 * @param string $cat    The category of the configuration value
 	 * @param string $key    The configuration key to set
diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 1c17d9aca..97e5c63c8 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -40,6 +40,10 @@ class DBA
 	 * @var Profiler
 	 */
 	private static $profiler;
+	/**
+	 * @var string
+	 */
+	private static $basedir;
 	private static $server_info = '';
 	private static $connection;
 	private static $driver;
@@ -55,13 +59,14 @@ class DBA
 	private static $db_name = '';
 	private static $db_charset = '';
 
-	public static function connect(IConfigCache $configCache, Profiler $profiler, $serveraddr, $user, $pass, $db, $charset = null)
+	public static function connect($basedir, IConfigCache $configCache, Profiler $profiler, $serveraddr, $user, $pass, $db, $charset = null)
 	{
 		if (!is_null(self::$connection) && self::connected()) {
 			return true;
 		}
 
 		// We are storing these values for being able to perform a reconnect
+		self::$basedir = $basedir;
 		self::$configCache = $configCache;
 		self::$profiler = $profiler;
 		self::$db_serveraddr = $serveraddr;
@@ -1034,7 +1039,7 @@ class DBA
 	 * This process must only be started once, since the value is cached.
 	 */
 	private static function buildRelationData() {
-		$definition = DBStructure::definition(self::$configCache->get('system', 'basepath'));
+		$definition = DBStructure::definition(self::$basedir);
 
 		foreach ($definition AS $table => $structure) {
 			foreach ($structure['fields'] AS $field => $field_struct) {
diff --git a/src/Factory/DBFactory.php b/src/Factory/DBFactory.php
index c1a796501..b4f0c9e3c 100644
--- a/src/Factory/DBFactory.php
+++ b/src/Factory/DBFactory.php
@@ -11,13 +11,16 @@ class DBFactory
 	/**
 	 * Initialize the DBA connection
 	 *
+	 * @param string             $basePath    The basepath of the application
 	 * @param Cache\IConfigCache $configCache The configuration cache
-	 * @param Profiler          $profiler    The profiler
-	 * @param array             $server      The $_SERVER variables
+	 * @param Profiler           $profiler    The profiler
+	 * @param array              $server      The $_SERVER variables
 	 *
 	 * @throws \Exception if connection went bad
+	 *
+	 * @todo refactor basedir during https://github.com/friendica/friendica/issues/6720
 	 */
-	public static function init(Cache\IConfigCache $configCache, Profiler $profiler, array $server)
+	public static function init($basePath, Cache\IConfigCache $configCache, Profiler $profiler, array $server)
 	{
 		if (Database\DBA::connected()) {
 			return;
@@ -48,9 +51,9 @@ class DBFactory
 			$db_data = $server['MYSQL_DATABASE'];
 		}
 
-		if (Database\DBA::connect($configCache, $profiler, $db_host, $db_user, $db_pass, $db_data, $charset)) {
+		if (Database\DBA::connect($basePath, $configCache, $profiler, $db_host, $db_user, $db_pass, $db_data, $charset)) {
 			// Loads DB_UPDATE_VERSION constant
-			Database\DBStructure::definition($configCache->get('system', 'basepath'), false);
+			Database\DBStructure::definition($basePath, false);
 		}
 
 		unset($db_host, $db_user, $db_pass, $db_data, $charset);
diff --git a/src/Factory/DependencyFactory.php b/src/Factory/DependencyFactory.php
index acbf4bfaf..52178bb77 100644
--- a/src/Factory/DependencyFactory.php
+++ b/src/Factory/DependencyFactory.php
@@ -22,16 +22,16 @@ class DependencyFactory
 	 */
 	public static function setUp($channel, $directory, $isBackend = true)
 	{
-		$basedir = BasePath::create($directory, $_SERVER);
-		$configLoader = new Cache\ConfigCacheLoader($basedir);
+		$basePath = BasePath::create($directory, $_SERVER);
+		$configLoader = new Cache\ConfigCacheLoader($basePath);
 		$configCache = Factory\ConfigFactory::createCache($configLoader);
 		$profiler = Factory\ProfilerFactory::create($configCache);
-		Factory\DBFactory::init($configCache, $profiler, $_SERVER);
+		Factory\DBFactory::init($basePath, $configCache, $profiler, $_SERVER);
 		$config = Factory\ConfigFactory::createConfig($configCache);
 		// needed to call PConfig::init()
 		Factory\ConfigFactory::createPConfig($configCache);
 		$logger = Factory\LoggerFactory::create($channel, $config);
 
-		return new App($config, $logger, $profiler, $isBackend);
+		return new App($basePath, $config, $logger, $profiler, $isBackend);
 	}
 }
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 152e870e8..8ad7f3145 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -10,8 +10,8 @@ use Friendica\BaseObject;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
 use Friendica\Core\StorageManager;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Storage\IStorage;
@@ -203,7 +203,7 @@ class Photo extends BaseObject
 	 */
 	private static function getFields()
 	{
-		$allfields = DBStructure::definition(false);
+		$allfields = DBStructure::definition(self::getApp()->getBasePath(), false);
 		$fields = array_keys($allfields["photo"]["fields"]);
 		array_splice($fields, array_search("data", $fields), 1);
 		return $fields;
diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index 289b3fcea..2f8becc18 100644
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -36,15 +36,15 @@ class ApiTest extends DatabaseTest
 	 */
 	public function setUp()
 	{
-		$basedir = BasePath::create(dirname(__DIR__) . '/../');
-		$configLoader = new Cache\ConfigCacheLoader($basedir);
+		$basePath = BasePath::create(dirname(__DIR__) . '/../');
+		$configLoader = new Cache\ConfigCacheLoader($basePath);
 		$configCache = Factory\ConfigFactory::createCache($configLoader);
 		$profiler = Factory\ProfilerFactory::create($configCache);
-		Factory\DBFactory::init($configCache, $profiler, $_SERVER);
+		Factory\DBFactory::init($basePath, $configCache, $profiler, $_SERVER);
 		$config = Factory\ConfigFactory::createConfig($configCache);
 		Factory\ConfigFactory::createPConfig($configCache);
 		$logger = Factory\LoggerFactory::create('test', $config);
-		$this->app = new App($config, $logger, $profiler, false);
+		$this->app = new App($basePath, $config, $logger, $profiler, false);
 
 		parent::setUp();
 
diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
index e8b9c68b1..8e102ec63 100644
--- a/tests/src/Database/DBATest.php
+++ b/tests/src/Database/DBATest.php
@@ -13,15 +13,15 @@ class DBATest extends DatabaseTest
 {
 	public function setUp()
 	{
-		$basedir = BasePath::create(dirname(__DIR__) . '/../../');
-		$configLoader = new Cache\ConfigCacheLoader($basedir);
+		$basePath = BasePath::create(dirname(__DIR__) . '/../../');
+		$configLoader = new Cache\ConfigCacheLoader($basePath);
 		$configCache = Factory\ConfigFactory::createCache($configLoader);
 		$profiler = Factory\ProfilerFactory::create($configCache);
-		Factory\DBFactory::init($configCache, $profiler, $_SERVER);
+		Factory\DBFactory::init($basePath, $configCache, $profiler, $_SERVER);
 		$config = Factory\ConfigFactory::createConfig($configCache);
 		Factory\ConfigFactory::createPConfig($configCache);
 		$logger = Factory\LoggerFactory::create('test', $config);
-		$this->app = new App($config, $logger, $profiler, false);
+		$this->app = new App($basePath, $config, $logger, $profiler, false);
 
 		parent::setUp();
 
diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php
index 325ad4e5e..454d6e8a4 100644
--- a/tests/src/Database/DBStructureTest.php
+++ b/tests/src/Database/DBStructureTest.php
@@ -13,15 +13,15 @@ class DBStructureTest extends DatabaseTest
 {
 	public function setUp()
 	{
-		$basedir = BasePath::create(dirname(__DIR__) . '/../../');
-		$configLoader = new Cache\ConfigCacheLoader($basedir);
+		$basePath = BasePath::create(dirname(__DIR__) . '/../../');
+		$configLoader = new Cache\ConfigCacheLoader($basePath);
 		$configCache = Factory\ConfigFactory::createCache($configLoader);
 		$profiler = Factory\ProfilerFactory::create($configCache);
-		Factory\DBFactory::init($configCache, $profiler, $_SERVER);
+		Factory\DBFactory::init($basePath, $configCache, $profiler, $_SERVER);
 		$config = Factory\ConfigFactory::createConfig($configCache);
 		Factory\ConfigFactory::createPConfig($configCache);
 		$logger = Factory\LoggerFactory::create('test', $config);
-		$this->app = new App($config, $logger, $profiler, false);
+		$this->app = new App($basePath, $config, $logger, $profiler, false);
 
 		parent::setUp();
 	}

From 16863c5d825caf41978920cd579426864f48f65c Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 22 Feb 2019 23:53:20 +0100
Subject: [PATCH 077/145] switched back to logger

---
 src/Core/Worker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 29d825050..cb8511a0e 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -400,7 +400,7 @@ class Worker
 		$rest    = number_format(max(0, $up_duration - (self::$db_duration + self::$lock_duration)), 4);
 		$exec    = number_format($duration, 4);
 
-		$workerLogger->info('Performance log.', ['total' => $dbtotal, 'count' => $dbcount, 'stat' => $dbstat, 'write' => $dbwrite, 'block' => $dblock, 'rest' => $rest, 'exec' => $exec]);
+		$logger->info('Performance log.', ['total' => $dbtotal, 'count' => $dbcount, 'stat' => $dbstat, 'write' => $dbwrite, 'block' => $dblock, 'rest' => $rest, 'exec' => $exec]);
 
 		self::$up_start = microtime(true);
 		self::$db_duration = 0;

From b47fc97b06ef1a0939f0f2d05e33b36288fa8303 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 22 Feb 2019 23:55:13 +0100
Subject: [PATCH 078/145] readded note

---
 src/Core/Config.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Core/Config.php b/src/Core/Config.php
index f974e2fff..44556a601 100644
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -48,6 +48,8 @@ class Config
 	 * @brief Get a particular user's config variable given the category name
 	 * ($family) and a key.
 	 *
+	 * Note: Please do not store booleans - convert to 0/1 integer values!
+	 *
 	 * @param string  $cat        The category of the configuration value
 	 * @param string  $key           The configuration key to query
 	 * @param mixed   $default_value optional, The value to return if key is not set (default: null)

From 8d56fb8fbef24496fc4a8d6cbfeeba634789a317 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 22 Feb 2019 23:57:04 +0100
Subject: [PATCH 079/145] bugfix marking of db-values

---
 src/Core/Config/Adapter/JITPConfigAdapter.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Core/Config/Adapter/JITPConfigAdapter.php b/src/Core/Config/Adapter/JITPConfigAdapter.php
index e320104e7..5c1627eba 100644
--- a/src/Core/Config/Adapter/JITPConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITPConfigAdapter.php
@@ -49,15 +49,19 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
 
 	/**
 	 * {@inheritdoc}
+	 *
+	 * @param bool $mark if true, mark the selection of the current cat/key pair
 	 */
-	public function get($uid, $cat, $key)
+	public function get($uid, $cat, $key, $mark = true)
 	{
 		if (!$this->isConnected()) {
 			return null;
 		}
 
 		// The value was in the db, so don't check it again (unless you have to)
-		$this->in_db[$uid][$cat][$key] = true;
+		if ($mark) {
+			$this->in_db[$uid][$cat][$key] = true;
+		}
 
 		$pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
 		if (DBA::isResult($pconfig)) {
@@ -86,7 +90,7 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
 		// The exception are array values.
 		$dbvalue = (!is_array($value) ? (string)$value : $value);
 
-		$stored = $this->get($uid, $cat, $key);
+		$stored = $this->get($uid, $cat, $key, false);
 
 		if (!isset($this->in_db[$uid])) {
 			$this->in_db[$uid] = [];

From 1dee89f215f5411d451078fb9abf8ac8dea85c18 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 00:09:57 +0100
Subject: [PATCH 080/145] fixing tests and preload config

---
 .../Config/Adapter/PreloadConfigAdapter.php   |  4 +-
 .../Config/Adapter/PreloadPConfigAdapter.php  |  4 +-
 .../Config/Cache/ConfigCacheLoaderTest.php    | 13 -------
 .../src/Core/Config/Cache/ConfigCacheTest.php | 37 +------------------
 tests/src/Core/Config/ConfigurationTest.php   | 10 ++---
 tests/src/Core/Config/PConfigurationTest.php  |  4 +-
 6 files changed, 12 insertions(+), 60 deletions(-)

diff --git a/src/Core/Config/Adapter/PreloadConfigAdapter.php b/src/Core/Config/Adapter/PreloadConfigAdapter.php
index 7ebd1efcf..d9f7b132d 100644
--- a/src/Core/Config/Adapter/PreloadConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadConfigAdapter.php
@@ -33,7 +33,7 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 		$configs = DBA::select('config', ['cat', 'v', 'k']);
 		while ($config = DBA::fetch($configs)) {
 			$value = $config['v'];
-			if (isset($value) && $value !== '') {
+			if (isset($value)) {
 				$return[$config['cat']][$config['k']] = $value;
 			}
 		}
@@ -58,7 +58,7 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 			// manage array value
 			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
 
-			if (isset($value) && $value !== '') {
+			if (isset($value)) {
 				return $value;
 			}
 		}
diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
index d2ba971ff..1af526b7c 100644
--- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -50,7 +50,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 		$pconfigs = DBA::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
 		while ($pconfig = DBA::fetch($pconfigs)) {
 			$value = $pconfig['v'];
-			if (isset($value) && $value !== '') {
+			if (isset($value)) {
 				$return[$pconfig['cat']][$pconfig['k']] = $value;
 			}
 		}
@@ -79,7 +79,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 			// manage array value
 			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
 
-			if (isset($value) && $value !== '') {
+			if (isset($value)) {
 				return $value;
 			}
 		}
diff --git a/tests/src/Core/Config/Cache/ConfigCacheLoaderTest.php b/tests/src/Core/Config/Cache/ConfigCacheLoaderTest.php
index f91f267c7..100c4ab65 100644
--- a/tests/src/Core/Config/Cache/ConfigCacheLoaderTest.php
+++ b/tests/src/Core/Config/Cache/ConfigCacheLoaderTest.php
@@ -19,19 +19,6 @@ class ConfigCacheLoaderTest extends MockedTest
 		$this->setUpVfsDir();
 	}
 
-	/**
-	 * Test the loadConfigFiles() method with default values
-	 */
-	public function testLoadConfigFiles()
-	{
-		$configCacheLoader = new ConfigCacheLoader($this->root->url());
-		$configCache = new ConfigCache();
-
-		$configCacheLoader->loadConfigFiles($configCache);
-
-		$this->assertEquals($this->root->url(), $configCache->get('system', 'basepath'));
-	}
-
 	/**
 	 * Test the loadConfigFiles() method with a wrong local.config.php
 	 * @expectedException \Exception
diff --git a/tests/src/Core/Config/Cache/ConfigCacheTest.php b/tests/src/Core/Config/Cache/ConfigCacheTest.php
index ac9fae540..582007ed8 100644
--- a/tests/src/Core/Config/Cache/ConfigCacheTest.php
+++ b/tests/src/Core/Config/Cache/ConfigCacheTest.php
@@ -138,22 +138,7 @@ class ConfigCacheTest extends MockedTest
 	{
 		$configCache = new ConfigCache();
 
-		$this->assertEquals('!<unset>!', $configCache->get('something', 'value'));
-	}
-
-	/**
-	 * Test the has() method
-	 */
-	public function testHas()
-	{
-		$configCache = new ConfigCache();
-
-		$this->assertFalse($configCache->has('system', 'test'));
-		$this->assertFalse($configCache->has('system'));
-
-		$configCache->set('system', 'test', 'it');
-		$this->assertTrue($configCache->has('system', 'test'));
-		$this->assertTrue($configCache->has('system'));
+		$this->assertNull($configCache->get('something', 'value'));
 	}
 
 	/**
@@ -171,8 +156,6 @@ class ConfigCacheTest extends MockedTest
 			],
 		]);
 
-		$this->assertTrue($configCache->has('system'));
-
 		$this->assertEquals([
 			'key1' => 'value1',
 			'key2' => 'value2',
@@ -233,8 +216,6 @@ class ConfigCacheTest extends MockedTest
 			],
 		]);
 
-		$this->assertTrue($configCache->hasP($uid,'system'));
-
 		$this->assertEquals([
 			'key1' => 'value1',
 			'key2' => 'value2',
@@ -264,20 +245,4 @@ class ConfigCacheTest extends MockedTest
 
 		$this->assertEmpty($configCache->getAll());
 	}
-
-	/**
-	 * Test the hasP() method
-	 */
-	public function testHasP()
-	{
-		$configCache = new ConfigCache();
-		$uid = 345;
-
-		$this->assertFalse($configCache->hasP($uid, 'system', 'test'));
-		$this->assertFalse($configCache->hasP($uid, 'system'));
-
-		$configCache->setP($uid, 'system', 'test', 'it');
-		$this->assertTrue($configCache->hasP($uid, 'system', 'test'));
-		$this->assertTrue($configCache->hasP($uid, 'system'));
-	}
 }
diff --git a/tests/src/Core/Config/ConfigurationTest.php b/tests/src/Core/Config/ConfigurationTest.php
index 2e4fcd4f5..d06b2beb3 100644
--- a/tests/src/Core/Config/ConfigurationTest.php
+++ b/tests/src/Core/Config/ConfigurationTest.php
@@ -142,7 +142,7 @@ class ConfigurationTest extends MockedTest
 		$this->assertNull($configuration->get('test', 'it'));
 
 		/// beware that the cache returns '!<unset>!' and not null for a non existing value
-		$this->assertEquals('!<unset>!', $configuration->getCache()->get('test', 'it'));
+		$this->assertNull($configuration->getCache()->get('test', 'it'));
 
 		// with default value
 		$this->assertEquals('default', $configuration->get('test', 'it', 'default'));
@@ -165,7 +165,7 @@ class ConfigurationTest extends MockedTest
 		$configAdapter->shouldReceive('isLoaded')->with('test', 'it')->andReturn(true)->twice();
 		$configAdapter->shouldReceive('get')->with('test', 'it')->andReturn($data)->once();
 		$configAdapter->shouldReceive('isLoaded')->with('test', 'not')->andReturn(false)->once();
-		$configAdapter->shouldReceive('get')->with('test', 'not')->andReturn('!<unset>!')->once();
+		$configAdapter->shouldReceive('get')->with('test', 'not')->andReturn(null)->once();
 
 		$configuration = new Configuration($configCache, $configAdapter);
 
@@ -179,7 +179,7 @@ class ConfigurationTest extends MockedTest
 
 		// without refresh and wrong value and default
 		$this->assertEquals('default', $configuration->get('test', 'not', 'default'));
-		$this->assertEquals('!<unset>!', $configuration->getCache()->get('test', 'not'));
+		$this->assertNull($configuration->getCache()->get('test', 'not'));
 	}
 
 	/**
@@ -195,7 +195,7 @@ class ConfigurationTest extends MockedTest
 		$configAdapter->shouldReceive('load')->andReturn([])->once();
 
 		$configAdapter->shouldReceive('isLoaded')->with('test', 'it')->andReturn(false)->once();
-		$configAdapter->shouldReceive('get')->with('test', 'it')->andReturn('!<unset>!')->once();
+		$configAdapter->shouldReceive('get')->with('test', 'it')->andReturn(null)->once();
 
 		$configAdapter->shouldReceive('isLoaded')->with('test', 'it')->andReturn(false)->once();
 		$configAdapter->shouldReceive('get')->with('test', 'it')->andReturn($data)->once();
@@ -234,7 +234,7 @@ class ConfigurationTest extends MockedTest
 
 		$this->assertTrue($configuration->delete('test', 'it'));
 		$this->assertNull($configuration->get('test', 'it'));
-		$this->assertEquals('!<unset>!', $configuration->getCache()->get('test', 'it'));
+		$this->assertNull($configuration->getCache()->get('test', 'it'));
 
 		$this->assertEmpty($configuration->getCache()->getAll());
 	}
diff --git a/tests/src/Core/Config/PConfigurationTest.php b/tests/src/Core/Config/PConfigurationTest.php
index 025994414..68443d05b 100644
--- a/tests/src/Core/Config/PConfigurationTest.php
+++ b/tests/src/Core/Config/PConfigurationTest.php
@@ -145,7 +145,7 @@ class PConfigurationTest extends MockedTest
 		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(true)->twice();
 		$configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn($data)->once();
 		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'not')->andReturn(false)->once();
-		$configAdapter->shouldReceive('get')->with($uid, 'test', 'not')->andReturn('!<unset>!')->once();
+		$configAdapter->shouldReceive('get')->with($uid, 'test', 'not')->andReturn(null)->once();
 
 		$configuration = new PConfiguration($configCache, $configAdapter);
 
@@ -173,7 +173,7 @@ class PConfigurationTest extends MockedTest
 		$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
 
 		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(false)->once();
-		$configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn('!<unset>!')->once();
+		$configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn(null)->once();
 
 		$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(false)->once();
 		$configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn($data)->once();

From 13807129aa26e61176df36f0f2d78ab9ecbe06c5 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 00:23:41 +0100
Subject: [PATCH 081/145] fixing preload adapter

---
 src/Core/Config/Adapter/JITConfigAdapter.php      | 10 ++++------
 src/Core/Config/Adapter/JITPConfigAdapter.php     |  9 ++++-----
 src/Core/Config/Adapter/PreloadConfigAdapter.php  | 11 +++++------
 src/Core/Config/Adapter/PreloadPConfigAdapter.php | 11 +++++------
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/Core/Config/Adapter/JITConfigAdapter.php b/src/Core/Config/Adapter/JITConfigAdapter.php
index 5a4146303..d125f7d40 100644
--- a/src/Core/Config/Adapter/JITConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITConfigAdapter.php
@@ -67,7 +67,6 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 
 		$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
 		if (DBA::isResult($config)) {
-			// manage array value
 			$value = $this->toConfigValue($config['v']);
 
 			// just return it in case it is set
@@ -91,9 +90,8 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 		// We store our setting values in a string variable.
 		// So we have to do the conversion here so that the compare below works.
 		// The exception are array values.
-		$dbvalue = (!is_array($value) ? (string)$value : $value);
-
-		$stored = $this->get($cat, $key, false);
+		$compare_value = (!is_array($value) ? (string)$value : $value);
+		$stored_value = $this->get($cat, $key, false);
 
 		if (!isset($this->in_db[$cat])) {
 			$this->in_db[$cat] = [];
@@ -102,11 +100,11 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 			$this->in_db[$cat][$key] = false;
 		}
 
-		if (isset($stored) && ($stored === $dbvalue) && $this->in_db[$cat][$key]) {
+		if (isset($stored_value) && ($stored_value === $compare_value) && $this->in_db[$cat][$key]) {
 			return true;
 		}
 
-		$dbvalue = $this->toDbValue($dbvalue);
+		$dbvalue = $this->toDbValue($value);
 
 		$result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $key], true);
 
diff --git a/src/Core/Config/Adapter/JITPConfigAdapter.php b/src/Core/Config/Adapter/JITPConfigAdapter.php
index 5c1627eba..a0c6a9547 100644
--- a/src/Core/Config/Adapter/JITPConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITPConfigAdapter.php
@@ -88,9 +88,8 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
 		// We store our setting values in a string variable.
 		// So we have to do the conversion here so that the compare below works.
 		// The exception are array values.
-		$dbvalue = (!is_array($value) ? (string)$value : $value);
-
-		$stored = $this->get($uid, $cat, $key, false);
+		$compare_value = (!is_array($value) ? (string)$value : $value);
+		$stored_value = $this->get($uid, $cat, $key, false);
 
 		if (!isset($this->in_db[$uid])) {
 			$this->in_db[$uid] = [];
@@ -102,12 +101,12 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
 			$this->in_db[$uid][$cat][$key] = false;
 		}
 
-		if (($stored === $dbvalue) && $this->in_db[$uid][$cat][$key]) {
+		if (isset($stored_value) && ($stored_value === $compare_value) && $this->in_db[$uid][$cat][$key]) {
 			return true;
 		}
 
 		// manage array value
-		$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
+		$dbvalue = (is_array($value) ? serialize($value) : $value);
 
 		$result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $key], true);
 
diff --git a/src/Core/Config/Adapter/PreloadConfigAdapter.php b/src/Core/Config/Adapter/PreloadConfigAdapter.php
index d9f7b132d..c691c88bc 100644
--- a/src/Core/Config/Adapter/PreloadConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadConfigAdapter.php
@@ -32,7 +32,7 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 
 		$configs = DBA::select('config', ['cat', 'v', 'k']);
 		while ($config = DBA::fetch($configs)) {
-			$value = $config['v'];
+			$value = $this->toConfigValue($config['v']);
 			if (isset($value)) {
 				$return[$config['cat']][$config['k']] = $value;
 			}
@@ -55,8 +55,7 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 
 		$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
 		if (DBA::isResult($config)) {
-			// manage array value
-			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
+			$value = $this->toConfigValue($config['v']);
 
 			if (isset($value)) {
 				return $value;
@@ -79,13 +78,13 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 		// So we have to do the conversion here so that the compare below works.
 		// The exception are array values.
 		$compare_value = !is_array($value) ? (string)$value : $value;
+		$stored_value = $this->get($cat, $key);
 
-		if ($this->get($cat, $key) === $compare_value) {
+		if (isset($stored_value) && $stored_value === $compare_value) {
 			return true;
 		}
 
-		// manage array value
-		$dbvalue = is_array($value) ? serialize($value) : $value;
+		$dbvalue = $this->toDbValue($value);
 
 		return DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $key], true);
 	}
diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
index 1af526b7c..838f3763d 100644
--- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -49,7 +49,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 
 		$pconfigs = DBA::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
 		while ($pconfig = DBA::fetch($pconfigs)) {
-			$value = $pconfig['v'];
+			$value = $this->toConfigValue($pconfig['v']);
 			if (isset($value)) {
 				$return[$pconfig['cat']][$pconfig['k']] = $value;
 			}
@@ -76,8 +76,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 
 		$config = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
 		if (DBA::isResult($config)) {
-			// manage array value
-			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
+			$value = $this->toConfigValue($config['v']);
 
 			if (isset($value)) {
 				return $value;
@@ -102,13 +101,13 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
 		// So we have to do the conversion here so that the compare below works.
 		// The exception are array values.
 		$compare_value = !is_array($value) ? (string)$value : $value;
+		$stored_value = $this->get($uid, $cat, $key);
 
-		if ($this->get($uid, $cat, $key) === $compare_value) {
+		if (isset($stored_value) && $stored_value === $compare_value) {
 			return true;
 		}
 
-		// manage array value
-		$dbvalue = is_array($value) ? serialize($value) : $value;
+		$dbvalue = $this->toDbValue($value);
 
 		return DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $key], true);
 	}

From b23368b0eaded02df85d6b7d582f99b1a4ec7ce2 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 00:51:08 +0100
Subject: [PATCH 082/145] bugfixing test

---
 tests/DatabaseTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index dde61e856..bb87cf36d 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -47,6 +47,7 @@ abstract class DatabaseTest extends MockedTest
 		$profiler = \Mockery::mock(Profiler::class);
 
 		DBA::connect(
+			$basedir,
 			$config,
 			$profiler,
 			getenv('MYSQL_HOST'),

From 40e9bbeb88961e494510a18f24d595abfb83f9f8 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 00:53:31 +0100
Subject: [PATCH 083/145] cleanup

---
 src/App.php         | 2 +-
 src/Core/Config.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/App.php b/src/App.php
index e5ac5dda3..9a1536fbe 100644
--- a/src/App.php
+++ b/src/App.php
@@ -221,7 +221,7 @@ class App
 		$this->config   = $config;
 		$this->profiler = $profiler;
 		$cfgBasePath = $this->config->get('system', 'basepath');
-		$this->basePath = (isset($cfgBasePath) && $cfgBasePath !== '') ? $cfgBasePath : $basePath;
+		$this->basePath = !empty($cfgBasePath) ? $cfgBasePath : $basePath;
 
 		if (!Core\System::isDirectoryUsable($this->basePath, false)) {
 			throw new Exception('Basepath \'' . $this->basePath . '\' isn\'t usable.');
diff --git a/src/Core/Config.php b/src/Core/Config.php
index 44556a601..4bf9c5b11 100644
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -48,8 +48,6 @@ class Config
 	 * @brief Get a particular user's config variable given the category name
 	 * ($family) and a key.
 	 *
-	 * Note: Please do not store booleans - convert to 0/1 integer values!
-	 *
 	 * @param string  $cat        The category of the configuration value
 	 * @param string  $key           The configuration key to query
 	 * @param mixed   $default_value optional, The value to return if key is not set (default: null)
@@ -67,6 +65,8 @@ class Config
 	 *
 	 * Stores a config value ($value) in the category ($cat) under the key ($key)
 	 *
+	 * Note: Please do not store booleans - convert to 0/1 integer values!
+	 *
 	 * @param string $cat The category of the configuration value
 	 * @param string $key    The configuration key to set
 	 * @param mixed  $value  The value to store

From 3aae84edd1ce050a0f7013b5ca24323e1af49583 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 01:24:08 +0100
Subject: [PATCH 084/145] [rendertime] Timing problem during addon config read

---
 src/App.php           |  9 +++++++--
 src/Util/Profiler.php | 12 ++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/App.php b/src/App.php
index 3df285cb3..571546cbb 100644
--- a/src/App.php
+++ b/src/App.php
@@ -358,10 +358,15 @@ class App
 		$this->getMode()->determine($this->basePath);
 
 		if ($this->getMode()->has(App\Mode::DBAVAILABLE)) {
-			Core\Hook::loadHooks();
 			$loader = new ConfigCacheLoader($this->basePath);
-			Core\Hook::callAll('load_config', $loader);
 			$this->config->getCache()->load($loader->loadCoreConfig('addon'), true);
+
+			$this->profiler->update(
+				$this->config->get('system', 'profiler', false),
+				$this->config->get('rendertime', 'callstack', false));
+
+			Core\Hook::loadHooks();
+			Core\Hook::callAll('load_config', $loader);
 		}
 
 		$this->loadDefaultTimezone();
diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index c8c563371..fe72efce4 100644
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -42,6 +42,18 @@ class Profiler implements ContainerInterface
 		return $this->rendertime;
 	}
 
+	/**
+	 * Updates the enabling of the current profiler
+	 *
+	 * @param bool $enabled
+	 * @param bool $renderTime
+	 */
+	public function update($enabled = false, $renderTime = false)
+	{
+		$this->enabled = $enabled;
+		$this->rendertime = $renderTime;
+	}
+
 	/**
 	 * @param bool $enabled           True, if the Profiler is enabled
 	 * @param bool $renderTime        True, if the Profiler should measure the whole rendertime including functions

From dddaf8ea1d4c3941107d17dd7781de001d2a5db9 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 01:37:29 +0100
Subject: [PATCH 085/145] improve tests

---
 tests/src/Util/ProfilerTest.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/tests/src/Util/ProfilerTest.php b/tests/src/Util/ProfilerTest.php
index 87796a2f3..449ec5e5f 100644
--- a/tests/src/Util/ProfilerTest.php
+++ b/tests/src/Util/ProfilerTest.php
@@ -189,13 +189,29 @@ class ProfilerTest extends MockedTest
 	}
 
 	/**
-	 * Test if no rendertime is set
+	 * Test different enable and disable states of the profiler
 	 */
-	public function testNoRenderTime()
+	public function testEnableDisable()
 	{
 		$profiler = new Profiler(true, false);
 
 		$this->assertFalse($profiler->isRendertime());
 		$this->assertEmpty($profiler->getRendertimeString());
+
+		$profiler->saveTimestamp(time(), 'network', 'test1');
+
+		$profiler->update(false, false);
+
+		$this->assertFalse($profiler->isRendertime());
+		$this->assertEmpty($profiler->getRendertimeString());
+
+		$profiler->update(true, true);
+
+		$profiler->saveTimestamp(time(), 'database', 'test2');
+
+		$this->assertTrue($profiler->isRendertime());
+		$output = $profiler->getRendertimeString();
+		$this->assertRegExp('/test1: \d+/', $output);
+		$this->assertRegExp('/test2: \d+/', $output);
 	}
 }

From 45cc8180b18228b7cdb441411df77d49a0f68fdd Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 10:10:33 +0100
Subject: [PATCH 086/145] Return 404 if nodeinfo isn't enabled.

---
 mod/nodeinfo.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index 39f430f92..da9dbb87c 100644
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -12,7 +12,12 @@ use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\Network;
+
 function nodeinfo_wellknown(App $a) {
+	if (!Config::get('system', 'nodeinfo')) {
+		System::httpExit(404);
+	}
+
 	$nodeinfo = ['links' => [['rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
 					'href' => System::baseUrl().'/nodeinfo/1.0']]];
 

From 5b2f394e3eec710b8d0997178fcfeb914f4d3e0f Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 10:16:07 +0100
Subject: [PATCH 087/145] Fixing #issuecomment-456403983

---
 src/Core/Update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 5df0675cd..ed6c05872 100644
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -94,7 +94,7 @@ class Update
 
 					// update the structure in one call
 					$retval = DBStructure::update($basePath, $verbose, true);
-					if ($retval) {
+					if (!empty($retval)) {
 						if ($sendMail) {
 							self::updateFailed(
 								DB_UPDATE_VERSION,

From 8760d89eb8ea30b37a8dbbbc0f440a4d7e38f444 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 10:24:22 +0100
Subject: [PATCH 088/145] reverting back workerLogger to Logger

---
 src/Core/Worker.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index cb8511a0e..efaa7cd49 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -410,13 +410,13 @@ class Worker
 		self::$lock_duration = 0;
 
 		if ($duration > 3600) {
-			$workerLogger->info('Longer than 1 hour.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   round($duration/60, 3)]);
+			$logger->info('Longer than 1 hour.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   round($duration/60, 3)]);
 		} elseif ($duration > 600) {
-			$workerLogger->info('Longer than 10 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   round($duration/60, 3)]);
+			$logger->info('Longer than 10 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   round($duration/60, 3)]);
 		} elseif ($duration > 300) {
-			$workerLogger->info('Longer than 5 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   round($duration/60, 3)]);
+			$logger->info('Longer than 5 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   round($duration/60, 3)]);
 		} elseif ($duration > 120) {
-			$workerLogger->info('Longer than 2 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   round($duration/60, 3)]);
+			$logger->info('Longer than 2 minutes.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   round($duration/60, 3)]);
 		}
 
 		$workerLogger->info('Process done. ', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' =>   number_format($duration, 4)]);
@@ -426,7 +426,7 @@ class Worker
 		$cooldown = Config::get("system", "worker_cooldown", 0);
 
 		if ($cooldown > 0) {
-			$workerLogger->info('Cooldown.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'cooldown' => $cooldown]);
+			$logger->info('Cooldown.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'cooldown' => $cooldown]);
 			sleep($cooldown);
 		}
 	}

From c53f0a4382d0415badb60d4f2635a41addf5f6aa Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 12:48:39 +0100
Subject: [PATCH 089/145] Fixing DBA::reconnect()

---
 src/Database/DBA.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 97e5c63c8..95f721e7c 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -169,7 +169,7 @@ class DBA
 	public static function reconnect() {
 		self::disconnect();
 
-		$ret = self::connect(self::$configCache, self::$profiler, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
+		$ret = self::connect(self::$basedir, self::$configCache, self::$profiler, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
 		return $ret;
 	}
 

From a73235b6eee32f41895eb5d4098e40d6a363caaf Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 12:49:56 +0100
Subject: [PATCH 090/145] Fixing DBA::(re-)connect()

---
 src/Core/Console/AutomaticInstallation.php | 2 +-
 src/Core/Installer.php                     | 5 +++--
 src/Module/Install.php                     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php
index 682d10971..9d1e8506c 100644
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Core/Console/AutomaticInstallation.php
@@ -146,7 +146,7 @@ HELP;
 
 		$installer->resetChecks();
 
-		if (!$installer->checkDB($a->getConfigCache(), $a->getProfiler(), $db_host, $db_user, $db_pass, $db_data)) {
+		if (!$installer->checkDB($a->getBasePath(), $a->getConfigCache(), $a->getProfiler(), $db_host, $db_user, $db_pass, $db_data)) {
 			$errorMessage = $this->extractErrors($installer->getChecks());
 			throw new RuntimeException($errorMessage);
 		}
diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index ed4721014..b6090bddb 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -591,6 +591,7 @@ class Installer
 	/**
 	 * Checking the Database connection and if it is available for the current installation
 	 *
+	 * @param string       $basePath    The basepath of this call
 	 * @param IConfigCache $configCache The configuration cache
 	 * @param Profiler    $profiler    The profiler of this app
 	 * @param string $dbhost           Hostname/IP of the Friendica Database
@@ -601,9 +602,9 @@ class Installer
 	 * @return bool true if the check was successful, otherwise false
 	 * @throws Exception
 	 */
-	public function checkDB(IConfigCache $configCache, Profiler $profiler, $dbhost, $dbuser, $dbpass, $dbdata)
+	public function checkDB($basePath, IConfigCache $configCache, Profiler $profiler, $dbhost, $dbuser, $dbpass, $dbdata)
 	{
-		if (!DBA::connect($configCache, $profiler, $dbhost, $dbuser, $dbpass, $dbdata)) {
+		if (!DBA::connect($basePath, $configCache, $profiler, $dbhost, $dbuser, $dbpass, $dbdata)) {
 			$this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
 
 			return false;
diff --git a/src/Module/Install.php b/src/Module/Install.php
index 3414e887f..d1e267758 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -75,7 +75,7 @@ class Install extends BaseModule
 				$dbdata  = Strings::escapeTags(trim(defaults($_POST, 'dbdata', '')));
 
 				// If we cannot connect to the database, return to the previous step
-				if (!self::$installer->checkDB($a->getConfigCache(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
+				if (!self::$installer->checkDB($a->getBasePath(), $a->getConfigCache(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
 					self::$currentWizardStep = self::DATABASE_CONFIG;
 				}
 
@@ -92,7 +92,7 @@ class Install extends BaseModule
 				$adminmail = Strings::escapeTags(trim(defaults($_POST, 'adminmail', '')));
 
 				// If we cannot connect to the database, return to the Database config wizard
-				if (!self::$installer->checkDB($a->getConfigCache(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
+				if (!self::$installer->checkDB($a->getBasePath(), $a->getConfigCache(), $a->getProfiler(), $dbhost, $dbuser, $dbpass, $dbdata)) {
 					self::$currentWizardStep = self::DATABASE_CONFIG;
 					return;
 				}

From 5f17ce574fa37e84592d1dc1518ae34d58654b6f Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 23 Feb 2019 12:50:52 +0100
Subject: [PATCH 091/145] Fixing DBA::(re-)connect()

---
 src/Database/DBA.php   | 10 +++++-----
 tests/DatabaseTest.php |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 95f721e7c..897ab2e6e 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -43,7 +43,7 @@ class DBA
 	/**
 	 * @var string
 	 */
-	private static $basedir;
+	private static $basePath;
 	private static $server_info = '';
 	private static $connection;
 	private static $driver;
@@ -59,14 +59,14 @@ class DBA
 	private static $db_name = '';
 	private static $db_charset = '';
 
-	public static function connect($basedir, IConfigCache $configCache, Profiler $profiler, $serveraddr, $user, $pass, $db, $charset = null)
+	public static function connect($basePath, IConfigCache $configCache, Profiler $profiler, $serveraddr, $user, $pass, $db, $charset = null)
 	{
 		if (!is_null(self::$connection) && self::connected()) {
 			return true;
 		}
 
 		// We are storing these values for being able to perform a reconnect
-		self::$basedir = $basedir;
+		self::$basePath = $basePath;
 		self::$configCache = $configCache;
 		self::$profiler = $profiler;
 		self::$db_serveraddr = $serveraddr;
@@ -169,7 +169,7 @@ class DBA
 	public static function reconnect() {
 		self::disconnect();
 
-		$ret = self::connect(self::$basedir, self::$configCache, self::$profiler, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
+		$ret = self::connect(self::$basePath, self::$configCache, self::$profiler, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
 		return $ret;
 	}
 
@@ -1039,7 +1039,7 @@ class DBA
 	 * This process must only be started once, since the value is cached.
 	 */
 	private static function buildRelationData() {
-		$definition = DBStructure::definition(self::$basedir);
+		$definition = DBStructure::definition(self::$basePath);
 
 		foreach ($definition AS $table => $structure) {
 			foreach ($structure['fields'] AS $field => $field_struct) {
diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index bb87cf36d..3ff4c6fe1 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -40,14 +40,14 @@ abstract class DatabaseTest extends MockedTest
 			$this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
 		}
 
-		$basedir = BasePath::create(dirname(__DIR__));
-		$configLoader = new Cache\ConfigCacheLoader($basedir);
+		$basePath = BasePath::create(dirname(__DIR__));
+		$configLoader = new Cache\ConfigCacheLoader($basePath);
 		$config = Factory\ConfigFactory::createCache($configLoader);
 
 		$profiler = \Mockery::mock(Profiler::class);
 
 		DBA::connect(
-			$basedir,
+			$basePath,
 			$config,
 			$profiler,
 			getenv('MYSQL_HOST'),

From 7703875b55e3620565f090bf484b948671386e9b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 23 Feb 2019 16:08:02 +0000
Subject: [PATCH 092/145] Fixes "Undefined property: Friendica\App::$queue"

---
 src/Core/Worker.php | 2 ++
 src/Object/Post.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index efaa7cd49..0a97c11c1 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -369,6 +369,8 @@ class Worker
 		// For this reason the variables have to be initialized.
 		$a->getProfiler()->reset();
 
+		$a->queue = $queue;
+
 		$up_duration = microtime(true) - self::$up_start;
 
 		// Reset global data to avoid interferences
diff --git a/src/Object/Post.php b/src/Object/Post.php
index fbe6970e2..e24607a78 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -808,7 +808,7 @@ class Post extends BaseObject
 
 		foreach ($terms as $term) {
 			$profile = Contact::getDetailsByURL($term['url']);
-			if (($profile['contact-type'] != Contact::TYPE_COMMUNITY) &&
+			if (!empty($profile['addr']) && !empty($profile['contact-type']) && ($profile['contact-type'] != Contact::TYPE_COMMUNITY) &&
 				($profile['addr'] != $owner['addr']) && !strstr($text, $profile['addr'])) {
 				$text .= '@' . $profile['addr'] . ' ';
 			}

From 7e93355671cef8d60dec3c1dfa90679e57c8b1fc Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 23 Feb 2019 21:20:56 +0000
Subject: [PATCH 093/145] Fix: Following url with html entities now works again

---
 view/theme/frio/templates/auto_request.tpl | 13 +++++++------
 view/theme/frio/templates/dfrn_request.tpl | 12 ++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/view/theme/frio/templates/auto_request.tpl b/view/theme/frio/templates/auto_request.tpl
index 915a49375..787288180 100644
--- a/view/theme/frio/templates/auto_request.tpl
+++ b/view/theme/frio/templates/auto_request.tpl
@@ -30,6 +30,7 @@
 
 {{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
 {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
+
 {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
 {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
 
@@ -37,12 +38,12 @@
 	<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
         {{if $myaddr}}
                 {{$myaddr}}
-                <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr|escape:'html'}}" />
+                <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}" />
         {{else}}
-        <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+        <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
         {{/if}}
         {{if $url}}
-                <input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" />
+                <input type="hidden" name="url" id="url" value="{{$url}}" />
         {{/if}}
 	<div id="dfrn-request-url-end"></div>
 </div>
@@ -54,9 +55,9 @@
 
 	<div id="dfrn-request-submit-wrapper">
 		{{if $submit}}
-			<input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
+			<input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
 		{{/if}}
-		<input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+		<input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
 	</div>
 </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/theme/frio/templates/dfrn_request.tpl b/view/theme/frio/templates/dfrn_request.tpl
index ebcf3a062..478f9bf64 100644
--- a/view/theme/frio/templates/dfrn_request.tpl
+++ b/view/theme/frio/templates/dfrn_request.tpl
@@ -36,12 +36,12 @@
 	<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
 	{{if $myaddr}}
 		{{$myaddr}}
-		<input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+		<input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
 	{{else}}
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
 	{{/if}}
 	{{if $url}}
-		<input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" />
+		<input type="hidden" name="url" id="url" value="{{$url}}" />
 	{{/if}}
 	<div id="dfrn-request-url-end"></div>
 </div>
@@ -84,9 +84,9 @@
 
 	<div id="dfrn-request-submit-wrapper">
 		{{if $submit}}
-			<input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
+			<input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
 		{{/if}}
-		<input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+		<input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
 	</div>
 </form>
-</div>
\ No newline at end of file
+</div>

From 28f7c72cc762151f965c48226a945cda66528b2d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 23 Feb 2019 21:58:35 +0000
Subject: [PATCH 094/145] Don't allow calling the install page after the
 install had been processed

---
 src/Module/Install.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Module/Install.php b/src/Module/Install.php
index d1e267758..bfb988cac 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -43,6 +43,10 @@ class Install extends BaseModule
 	{
 		$a = self::getApp();
 
+		if (!$a->getMode()->isInstall()) {
+			Core\System::httpExit(403);
+		}
+
 		// route: install/testrwrite
 		// $baseurl/install/testrwrite to test if rewrite in .htaccess is working
 		if ($a->getArgumentValue(1, '') == 'testrewrite') {
@@ -62,6 +66,10 @@ class Install extends BaseModule
 	{
 		$a = self::getApp();
 
+		if (!$a->getMode()->isInstall()) {
+			Core\System::httpExit(403);
+		}
+
 		switch (self::$currentWizardStep) {
 			case self::SYSTEM_CHECK:
 			case self::DATABASE_CONFIG:
@@ -113,6 +121,10 @@ class Install extends BaseModule
 	{
 		$a = self::getApp();
 
+		if (!$a->getMode()->isInstall()) {
+			Core\System::httpExit(403);
+		}
+
 		$output = '';
 
 		$install_title = L10n::t('Friendica Communications Server - Setup');

From ed54345ce1e1bd49829b8f968e89236bb54b9fc6 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 23 Feb 2019 22:27:03 +0000
Subject: [PATCH 095/145] Only check once

---
 src/Module/Install.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Module/Install.php b/src/Module/Install.php
index bfb988cac..de19bc86a 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -66,10 +66,6 @@ class Install extends BaseModule
 	{
 		$a = self::getApp();
 
-		if (!$a->getMode()->isInstall()) {
-			Core\System::httpExit(403);
-		}
-
 		switch (self::$currentWizardStep) {
 			case self::SYSTEM_CHECK:
 			case self::DATABASE_CONFIG:
@@ -121,10 +117,6 @@ class Install extends BaseModule
 	{
 		$a = self::getApp();
 
-		if (!$a->getMode()->isInstall()) {
-			Core\System::httpExit(403);
-		}
-
 		$output = '';
 
 		$install_title = L10n::t('Friendica Communications Server - Setup');

From 7320c5e8e835e09b7ec77c8dd11303d6d6dec039 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 21 Feb 2019 21:29:22 -0500
Subject: [PATCH 096/145] Normalize Contact::magicLinkByContact method name

---
 include/conversation.php | 8 ++++----
 src/Model/Contact.php    | 4 ++--
 src/Object/Post.php      | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 23a0dcbf2..3c52e62fc 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -365,7 +365,7 @@ function localize_item(&$item)
 
 	// Only create a redirection to a magic link when logged in
 	if (!empty($item['plink']) && (local_user() || remote_user())) {
-		$item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
+		$item['plink'] = Contact::magicLinkByContact($author, $item['plink']);
 	}
 }
 
@@ -625,7 +625,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 
 				$author = ['uid' => 0, 'id' => $item['author-id'],
 					'network' => $item['author-network'], 'url' => $item['author-link']];
-				$profile_link = Contact::magicLinkbyContact($author);
+				$profile_link = Contact::magicLinkByContact($author);
 
 				if (strpos($profile_link, 'redir/') === 0) {
 					$sparkle = ' sparkle';
@@ -858,7 +858,7 @@ function item_photo_menu($item) {
 
 	$author = ['uid' => 0, 'id' => $item['author-id'],
 		'network' => $item['author-network'], 'url' => $item['author-link']];
-	$profile_link = Contact::magicLinkbyContact($author);
+	$profile_link = Contact::magicLinkByContact($author);
 	$sparkle = (strpos($profile_link, 'redir/') === 0);
 
 	$cid = 0;
@@ -966,7 +966,7 @@ function builtin_activity_puller($item, &$conv_responses) {
 		if (activity_match($item['verb'], $verb) && ($item['id'] != $item['parent'])) {
 			$author = ['uid' => 0, 'id' => $item['author-id'],
 				'network' => $item['author-network'], 'url' => $item['author-link']];
-			$url = Contact::magicLinkbyContact($author);
+			$url = Contact::magicLinkByContact($author);
 			if (strpos($url, 'redir/') === 0) {
 				$sparkle = ' class="sparkle" ';
 			}
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index d38d1cc10..5f63d89d0 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2184,7 +2184,7 @@ class Contact extends BaseObject
 	{
 		$contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
 
-		return self::magicLinkbyContact($contact, $url);
+		return self::magicLinkByContact($contact, $url);
 	}
 
 	/**
@@ -2197,7 +2197,7 @@ class Contact extends BaseObject
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function magicLinkbyContact($contact, $url = '')
+	public static function magicLinkByContact($contact, $url = '')
 	{
 		if ((!local_user() && !remote_user()) || ($contact['network'] != Protocol::DFRN)) {
 			return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
diff --git a/src/Object/Post.php b/src/Object/Post.php
index e24607a78..bd48dbb3d 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -83,7 +83,7 @@ class Post extends BaseObject
 		$author = ['uid' => 0, 'id' => $this->getDataValue('author-id'),
 			'network' => $this->getDataValue('author-network'),
 			'url' => $this->getDataValue('author-link')];
-		$this->redirect_url = Contact::magicLinkbyContact($author);
+		$this->redirect_url = Contact::magicLinkByContact($author);
 		if (!$this->isToplevel()) {
 			$this->threaded = true;
 		}
@@ -224,7 +224,7 @@ class Post extends BaseObject
 			'network' => $item['author-network'], 'url' => $item['author-link']];
 
 		if (local_user() || remote_user()) {
-			$profile_link = Contact::magicLinkbyContact($author);
+			$profile_link = Contact::magicLinkByContact($author);
 		} else {
 			$profile_link = $item['author-link'];
 		}
@@ -948,7 +948,7 @@ class Post extends BaseObject
 						$owner = ['uid' => 0, 'id' => $this->getDataValue('owner-id'),
 							'network' => $this->getDataValue('owner-network'),
 							'url' => $this->getDataValue('owner-link')];
-						$this->owner_url = Contact::magicLinkbyContact($owner);
+						$this->owner_url = Contact::magicLinkByContact($owner);
 					}
 				}
 			}

From cd535851012fc4e96b8e073f3d252ce7fa2844b1 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 21 Feb 2019 21:37:23 -0500
Subject: [PATCH 097/145] Improve /itemsource display

- Add Item Id
- Add Item Terms
---
 src/Module/Itemsource.php           | 16 ++++++++++---
 view/templates/debug/itemsource.tpl | 37 +++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/Module/Itemsource.php b/src/Module/Itemsource.php
index 9e62a568c..12ce04f95 100644
--- a/src/Module/Itemsource.php
+++ b/src/Module/Itemsource.php
@@ -2,9 +2,12 @@
 
 namespace Friendica\Module;
 
+use Friendica\Content\Text\HTML;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Model;
+use Friendica\Protocol\ActivityPub\Processor;
+use Friendica\Protocol\Diaspora;
 
 /**
  * @author Hypolite Petovan <mrpetovan@gmail.com>
@@ -27,20 +30,27 @@ class Itemsource extends \Friendica\BaseModule
 
 		$source = '';
 		$item_uri = '';
+		$item_id = '';
+		$terms = [];
 		if (!empty($guid)) {
-			$item = Model\Item::selectFirst([], ['guid' => $guid]);
+			$item = Model\Item::selectFirst(['id', 'guid', 'uri'], ['guid' => $guid]);
 
 			$conversation = Model\Conversation::getByItemUri($item['uri']);
 
+			$guid = $item['guid'];
+			$item_id = $item['id'];
 			$item_uri = $item['uri'];
 			$source = $conversation['source'];
+			$terms = Model\Term::tagArrayFromItemId($item['id'], [Model\Term::HASHTAG, Model\Term::MENTION, Model\Term::IMPLICIT_MENTION]);
 		}
 
 		$tpl = Renderer::getMarkupTemplate('debug/itemsource.tpl');
 		$o = Renderer::replaceMacros($tpl, [
-			'$guid'          => ['guid', L10n::t('Item Guid'), defaults($_REQUEST, 'guid', ''), ''],
+			'$guid'          => ['guid', L10n::t('Item Guid'), $guid, ''],
 			'$source'        => $source,
-			'$item_uri'      => $item_uri
+			'$item_uri'      => $item_uri,
+			'$item_id'       => $item_id,
+			'$terms'         => $terms,
 		]);
 
 		return $o;
diff --git a/view/templates/debug/itemsource.tpl b/view/templates/debug/itemsource.tpl
index 377409ebf..0d925b3c8 100644
--- a/view/templates/debug/itemsource.tpl
+++ b/view/templates/debug/itemsource.tpl
@@ -10,6 +10,14 @@
 
 {{if $source}}
 <div class="itemsource-results">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<h3 class="panel-title">Item Id</h3>
+		</div>
+		<div class="panel-body">
+			{{$item_id}}
+		</div>
+	</div>
 	<div class="panel panel-default">
 		<div class="panel-heading">
 			<h3 class="panel-title">Item URI</h3>
@@ -18,6 +26,35 @@
 			{{$item_uri}}
 		</div>
 	</div>
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<h3 class="panel-title">Terms</h3>
+		</div>
+		<div class="panel-body">
+			<table class="table table-condensed table-striped">
+				<tr>
+					<th>Type</th>
+					<th>Term</th>
+					<th>URL</th>
+				</tr>
+		{{foreach $terms as $term}}
+				<tr>
+					<td>
+			{{if $term.type == 1}}Tag{{/if}}
+			{{if $term.type == 2}}Mention{{/if}}
+			{{if $term.type == 8}}Implicit Mention{{/if}}
+					</td>
+					<td>
+						{{$term.term}}
+					</td>
+					<td>
+						{{$term.url}}
+					</td>
+				</tr>
+		{{/foreach}}
+			</table>
+		</div>
+	</div>
 	<div class="panel panel-default">
 		<div class="panel-heading">
 			<h3 class="panel-title">Source</h3>

From 1917f04153ffa37880a9900c76e54d6d73e90c85 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 22 Feb 2019 19:15:35 -0500
Subject: [PATCH 098/145] Rewrite Term class

- Move term type constants from TERM_* to Term::*
- Move term object type constants from TERM_OBJ_* to Term::OBJECT_TYPE_*
- Add Term::isType() method
- Add Strings::startsWith()  method
---
 boot.php             |  37 +++---
 src/Model/Term.php   | 265 ++++++++++++++++++++++++++++---------------
 src/Util/Strings.php |  15 +++
 3 files changed, 209 insertions(+), 108 deletions(-)

diff --git a/boot.php b/boot.php
index 14c0a88ed..830a636ac 100644
--- a/boot.php
+++ b/boot.php
@@ -25,6 +25,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Term;
 use Friendica\Util\BasePath;
 use Friendica\Util\DateTimeFormat;
 
@@ -171,23 +172,27 @@ define('NOTIFY_SYSTEM',   32768);
 /* @}*/
 
 
-/**
- * @name Term
- *
- * Tag/term types
- * @{
- */
-define('TERM_UNKNOWN',   0);
-define('TERM_HASHTAG',   1);
-define('TERM_MENTION',   2);
-define('TERM_CATEGORY',  3);
-define('TERM_PCATEGORY', 4);
-define('TERM_FILE',      5);
-define('TERM_SAVEDSEARCH', 6);
-define('TERM_CONVERSATION', 7);
+/** @deprecated since 2019.03, use Term::UNKNOWN instead */
+define('TERM_UNKNOWN',   Term::UNKNOWN);
+/** @deprecated since 2019.03, use Term::HASHTAG instead */
+define('TERM_HASHTAG',   Term::HASHTAG);
+/** @deprecated since 2019.03, use Term::MENTION instead */
+define('TERM_MENTION',   Term::MENTION);
+/** @deprecated since 2019.03, use Term::CATEGORY instead */
+define('TERM_CATEGORY',  Term::CATEGORY);
+/** @deprecated since 2019.03, use Term::PCATEGORY instead */
+define('TERM_PCATEGORY', Term::PCATEGORY);
+/** @deprecated since 2019.03, use Term::FILE instead */
+define('TERM_FILE',      Term::FILE);
+/** @deprecated since 2019.03, use Term::SAVEDSEARCH instead */
+define('TERM_SAVEDSEARCH', Term::SAVEDSEARCH);
+/** @deprecated since 2019.03, use Term::CONVERSATION instead */
+define('TERM_CONVERSATION', Term::CONVERSATION);
 
-define('TERM_OBJ_POST',  1);
-define('TERM_OBJ_PHOTO', 2);
+/** @deprecated since 2019.03, use Term::OBJECT_TYPE_POST instead */
+define('TERM_OBJ_POST',  Term::OBJECT_TYPE_POST);
+/** @deprecated since 2019.03, use Term::OBJECT_TYPE_PHOTO instead */
+define('TERM_OBJ_PHOTO', Term::OBJECT_TYPE_PHOTO);
 
 /**
  * @name Namespaces
diff --git a/src/Model/Term.php b/src/Model/Term.php
index 6e3425524..5266627ac 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -6,32 +6,61 @@ namespace Friendica\Model;
 
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Util\Strings;
 
 class Term
 {
-	public static function tagTextFromItemId($itemid)
-	{
-		$tag_text = '';
-		$condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]];
-		$tags = DBA::select('term', [], $condition);
-		while ($tag = DBA::fetch($tags)) {
-			if ($tag_text != '') {
-				$tag_text .= ',';
-			}
+    const UNKNOWN           = 0;
+    const HASHTAG           = 1;
+    const MENTION           = 2;
+    const CATEGORY          = 3;
+    const PCATEGORY         = 4;
+    const FILE              = 5;
+    const SAVEDSEARCH       = 6;
+    const CONVERSATION      = 7;
+    const IMPLICIT_MENTION  = 8;
+    const EXCLUSIVE_MENTION = 9;
 
-			if ($tag['type'] == 1) {
-				$tag_text .= '#';
-			} else {
-				$tag_text .= '@';
-			}
-			$tag_text .= '[url=' . $tag['url'] . ']' . $tag['term'] . '[/url]';
+    const TAG_CHARACTER = [
+    	self::HASHTAG           => '#',
+    	self::MENTION           => '@',
+    	self::IMPLICIT_MENTION  => '%',
+    	self::EXCLUSIVE_MENTION => '!',
+    ];
+
+    const OBJECT_TYPE_POST  = 1;
+    const OBJECT_TYPE_PHOTO = 2;
+
+	/**
+	 * Generates the legacy item.tag field comma-separated BBCode string from an item ID.
+	 * Includes only hashtags, implicit and explicit mentions.
+	 *
+	 * @param int $item_id
+	 * @return string
+	 * @throws \Exception
+	 */
+	public static function tagTextFromItemId($item_id)
+	{
+		$tag_list = [];
+		$tags = self::tagArrayFromItemId($item_id, [self::HASHTAG, self::MENTION, self::IMPLICIT_MENTION]);
+		foreach ($tags as $tag) {
+			$tag_list[] = self::TAG_CHARACTER[$tag['type']] . '[url=' . $tag['url'] . ']' . $tag['term'] . '[/url]';
 		}
-		return $tag_text;
+
+		return implode(',', $tag_list);
 	}
 
-	public static function tagArrayFromItemId($itemid, $type = [TERM_HASHTAG, TERM_MENTION])
+	/**
+	 * Retrieves the terms from the provided type(s) associated with the provided item ID.
+	 *
+	 * @param int       $item_id
+	 * @param int|array $type
+	 * @return array
+	 * @throws \Exception
+	 */
+	public static function tagArrayFromItemId($item_id, $type = [self::HASHTAG, self::MENTION])
 	{
-		$condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => $type];
+		$condition = ['otype' => self::OBJECT_TYPE_POST, 'oid' => $item_id, 'type' => $type];
 		$tags = DBA::select('term', ['type', 'term', 'url'], $condition);
 		if (!DBA::isResult($tags)) {
 			return [];
@@ -40,22 +69,39 @@ class Term
 		return DBA::toArray($tags);
 	}
 
-	public static function fileTextFromItemId($itemid)
+	/**
+	 * Generates the legacy item.file field string from an item ID.
+	 * Includes only file and category terms.
+	 *
+	 * @param int $item_id
+	 * @return string
+	 * @throws \Exception
+	 */
+	public static function fileTextFromItemId($item_id)
 	{
 		$file_text = '';
-		$condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]];
-		$tags = DBA::select('term', [], $condition);
-		while ($tag = DBA::fetch($tags)) {
-			if ($tag['type'] == TERM_CATEGORY) {
+		$tags = self::tagArrayFromItemId($item_id, [self::FILE, self::CATEGORY]);
+		foreach ($tags as $tag) {
+			if ($tag['type'] == self::CATEGORY) {
 				$file_text .= '<' . $tag['term'] . '>';
 			} else {
 				$file_text .= '[' . $tag['term'] . ']';
 			}
 		}
+
 		return $file_text;
 	}
 
-	public static function insertFromTagFieldByItemId($itemid, $tags)
+	/**
+	 * Inserts new terms for the provided item ID based on the legacy item.tag field BBCode content.
+	 * Deletes all previous tag terms for the same item ID.
+	 * Sets both the item.mention and thread.mentions field flags if a mention concerning the item UID is found.
+	 *
+	 * @param int    $item_id
+	 * @param string $tag_str
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	public static function insertFromTagFieldByItemId($item_id, $tag_str)
 	{
 		$profile_base = System::baseUrl();
 		$profile_data = parse_url($profile_base);
@@ -64,32 +110,32 @@ class Term
 		$profile_base_diaspora = $profile_data['host'] . $profile_path . '/u/';
 
 		$fields = ['guid', 'uid', 'id', 'edited', 'deleted', 'created', 'received', 'title', 'body', 'parent'];
-		$message = Item::selectFirst($fields, ['id' => $itemid]);
-		if (!DBA::isResult($message)) {
+		$item = Item::selectFirst($fields, ['id' => $item_id]);
+		if (!DBA::isResult($item)) {
 			return;
 		}
 
-		$message['tag'] = $tags;
+		$item['tag'] = $tag_str;
 
 		// Clean up all tags
-		self::deleteByItemId($itemid);
+		self::deleteByItemId($item_id);
 
-		if ($message['deleted']) {
+		if ($item['deleted']) {
 			return;
 		}
 
-		$taglist = explode(',', $message['tag']);
+		$taglist = explode(',', $item['tag']);
 
 		$tags_string = '';
 		foreach ($taglist as $tag) {
-			if ((substr(trim($tag), 0, 1) == '#') || (substr(trim($tag), 0, 1) == '@') || (substr(trim($tag), 0, 1) == '!')) {
+			if (Strings::startsWith($tag, self::TAG_CHARACTER)) {
 				$tags_string .= ' ' . trim($tag);
 			} else {
 				$tags_string .= ' #' . trim($tag);
 			}
 		}
 
-		$data = ' ' . $message['title'] . ' ' . $message['body'] . ' ' . $tags_string . ' ';
+		$data = ' ' . $item['title'] . ' ' . $item['body'] . ' ' . $tags_string . ' ';
 
 		// ignore anything in a code block
 		$data = preg_replace('/\[code\](.*?)\[\/code\]/sm', '', $data);
@@ -103,11 +149,15 @@ class Term
 			}
 		}
 
-		$pattern = '/\W([\#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism';
+		$pattern = '/\W([\#@!%])\[url\=(.*?)\](.*?)\[\/url\]/ism';
 		if (preg_match_all($pattern, $data, $matches, PREG_SET_ORDER)) {
 			foreach ($matches as $match) {
 
-				if (($match[1] == '@') || ($match[1] == '!')) {
+				if (in_array($match[1], [
+					self::TAG_CHARACTER[self::MENTION],
+					self::TAG_CHARACTER[self::IMPLICIT_MENTION],
+					self::TAG_CHARACTER[self::EXCLUSIVE_MENTION]
+				])) {
 					$contact = Contact::getDetailsByURL($match[2], 0);
 					if (!empty($contact['addr'])) {
 						$match[3] = $contact['addr'];
@@ -118,12 +168,12 @@ class Term
 					}
 				}
 
-				$tags[$match[1] . trim($match[3], ',.:;[]/\"?!')] = $match[2];
+				$tags[$match[2]] = $match[1] . trim($match[3], ',.:;[]/\"?!');
 			}
 		}
 
-		foreach ($tags as $tag => $link) {
-			if (substr(trim($tag), 0, 1) == '#') {
+		foreach ($tags as $link => $tag) {
+			if (self::isType($tag, self::HASHTAG)) {
 				// try to ignore #039 or #1 or anything like that
 				if (ctype_digit(substr(trim($tag), 1))) {
 					continue;
@@ -134,11 +184,15 @@ class Term
 					continue;
 				}
 
-				$type = TERM_HASHTAG;
+				$type = self::HASHTAG;
 				$term = substr($tag, 1);
 				$link = '';
-			} elseif ((substr(trim($tag), 0, 1) == '@') || (substr(trim($tag), 0, 1) == '!')) {
-				$type = TERM_MENTION;
+			} elseif (self::isType($tag, self::MENTION, self::EXCLUSIVE_MENTION, self::IMPLICIT_MENTION)) {
+				if (self::isType($tag, self::MENTION, self::EXCLUSIVE_MENTION)) {
+					$type = self::MENTION;
+				} else {
+					$type = self::IMPLICIT_MENTION;
+				}
 
 				$contact = Contact::getDetailsByURL($link, 0);
 				if (!empty($contact['name'])) {
@@ -147,43 +201,49 @@ class Term
 					$term = substr($tag, 1);
 				}
 			} else { // This shouldn't happen
-				$type = TERM_HASHTAG;
+				$type = self::HASHTAG;
 				$term = $tag;
 				$link = '';
 			}
 
-			if (DBA::exists('term', ['uid' => $message['uid'], 'otype' => TERM_OBJ_POST, 'oid' => $itemid, 'term' => $term])) {
+			if (DBA::exists('term', ['uid' => $item['uid'], 'otype' => self::OBJECT_TYPE_POST, 'oid' => $item_id, 'term' => $term, 'type' => $type])) {
 				continue;
 			}
 
-			if ($message['uid'] == 0) {
+			if ($item['uid'] == 0) {
 				$global = true;
-				DBA::update('term', ['global' => true], ['otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
+				DBA::update('term', ['global' => true], ['otype' => self::OBJECT_TYPE_POST, 'guid' => $item['guid']]);
 			} else {
-				$global = DBA::exists('term', ['uid' => 0, 'otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
+				$global = DBA::exists('term', ['uid' => 0, 'otype' => self::OBJECT_TYPE_POST, 'guid' => $item['guid']]);
 			}
 
 			DBA::insert('term', [
-				'uid'      => $message['uid'],
-				'oid'      => $itemid,
-				'otype'    => TERM_OBJ_POST,
+				'uid'      => $item['uid'],
+				'oid'      => $item_id,
+				'otype'    => self::OBJECT_TYPE_POST,
 				'type'     => $type,
 				'term'     => $term,
 				'url'      => $link,
-				'guid'     => $message['guid'],
-				'created'  => $message['created'],
-				'received' => $message['received'],
+				'guid'     => $item['guid'],
+				'created'  => $item['created'],
+				'received' => $item['received'],
 				'global'   => $global
 			]);
 
 			// Search for mentions
-			if (((substr($tag, 0, 1) == '@') || (substr($tag, 0, 1) == '!')) && (strpos($link, $profile_base_friendica) || strpos($link, $profile_base_diaspora))) {
-				$users = q("SELECT `uid` FROM `contact` WHERE self AND (`url` = '%s' OR `nurl` = '%s')", $link, $link);
+			if (self::isType($tag, self::MENTION, self::EXCLUSIVE_MENTION)
+				&& (
+					strpos($link, $profile_base_friendica) !== false
+					|| strpos($link, $profile_base_diaspora) !== false
+				)
+			) {
+				$users_stmt = DBA::p("SELECT `uid` FROM `contact` WHERE self AND (`url` = ? OR `nurl` = ?)", $link, $link);
+				$users = DBA::toArray($users_stmt);
 				foreach ($users AS $user) {
-					if ($user['uid'] == $message['uid']) {
-						/// @todo This function is called frim Item::update - so we mustn't call that function here
-						DBA::update('item', ['mention' => true], ['id' => $itemid]);
-						DBA::update('thread', ['mention' => true], ['iid' => $message['parent']]);
+					if ($user['uid'] == $item['uid']) {
+						/// @todo This function is called from Item::update - so we mustn't call that function here
+						DBA::update('item', ['mention' => true], ['id' => $item_id]);
+						DBA::update('thread', ['mention' => true], ['iid' => $item['parent']]);
 					}
 				}
 			}
@@ -191,20 +251,23 @@ class Term
 	}
 
 	/**
-	 * @param integer $itemid item id
+	 * Inserts new terms for the provided item ID based on the legacy item.file field BBCode content.
+	 * Deletes all previous file terms for the same item ID.
+	 *
+	 * @param integer $item_id item id
 	 * @param         $files
 	 * @return void
 	 * @throws \Exception
 	 */
-	public static function insertFromFileFieldByItemId($itemid, $files)
+	public static function insertFromFileFieldByItemId($item_id, $files)
 	{
-		$message = Item::selectFirst(['uid', 'deleted'], ['id' => $itemid]);
+		$message = Item::selectFirst(['uid', 'deleted'], ['id' => $item_id]);
 		if (!DBA::isResult($message)) {
 			return;
 		}
 
 		// Clean up all tags
-		DBA::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]]);
+		DBA::delete('term', ['otype' => self::OBJECT_TYPE_POST, 'oid' => $item_id, 'type' => [self::FILE, self::CATEGORY]]);
 
 		if ($message["deleted"]) {
 			return;
@@ -216,9 +279,9 @@ class Term
 			foreach ($files[1] as $file) {
 				DBA::insert('term', [
 					'uid' => $message["uid"],
-					'oid' => $itemid,
-					'otype' => TERM_OBJ_POST,
-					'type' => TERM_FILE,
+					'oid' => $item_id,
+					'otype' => self::OBJECT_TYPE_POST,
+					'type' => self::FILE,
 					'term' => $file
 				]);
 			}
@@ -228,9 +291,9 @@ class Term
 			foreach ($files[1] as $file) {
 				DBA::insert('term', [
 					'uid' => $message["uid"],
-					'oid' => $itemid,
-					'otype' => TERM_OBJ_POST,
-					'type' => TERM_CATEGORY,
+					'oid' => $item_id,
+					'otype' => self::OBJECT_TYPE_POST,
+					'type' => self::CATEGORY,
 					'term' => $file
 				]);
 			}
@@ -252,6 +315,7 @@ class Term
 			'tags' => [],
 			'hashtags' => [],
 			'mentions' => [],
+			'implicit_mentions' => [],
 		];
 
 		$searchpath = System::baseUrl() . "/search?tag=";
@@ -259,10 +323,9 @@ class Term
 		$taglist = DBA::select(
 			'term',
 			['type', 'term', 'url'],
-			["`otype` = ? AND `oid` = ? AND `type` IN (?, ?)", TERM_OBJ_POST, $item['id'], TERM_HASHTAG, TERM_MENTION],
+			['otype' => self::OBJECT_TYPE_POST, 'oid' => $item['id'], 'type' => [self::HASHTAG, self::MENTION, self::IMPLICIT_MENTION]],
 			['order' => ['tid']]
 		);
-
 		while ($tag = DBA::fetch($taglist)) {
 			if ($tag['url'] == '') {
 				$tag['url'] = $searchpath . rawurlencode($tag['term']);
@@ -270,25 +333,25 @@ class Term
 
 			$orig_tag = $tag['url'];
 
-			$author = ['uid' => 0, 'id' => $item['author-id'],
-				'network' => $item['author-network'], 'url' => $item['author-link']];
+			$prefix = self::TAG_CHARACTER[$tag['type']];
+			switch($tag['type']) {
+				case self::HASHTAG:
+					if ($orig_tag != $tag['url']) {
+						$item['body'] = str_replace($orig_tag, $tag['url'], $item['body']);
+					}
 
-			$prefix = '';
-			if ($tag['type'] == TERM_HASHTAG) {
-				$tag['url'] = Contact::magicLinkByContact($author, $tag['url']);
-				if ($orig_tag != $tag['url']) {
-					$item['body'] = str_replace($orig_tag, $tag['url'], $item['body']);
-				}
-
-				$return['hashtags'][] = '#<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
-				$prefix = '#';
-			} elseif ($tag['type'] == TERM_MENTION) {
-				$tag['url'] = Contact::magicLink($tag['url']);
-				$return['mentions'][] = '@<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
-				$prefix = '@';
+					$return['hashtags'][] = $prefix . '<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
+					$return['tags'][] = $prefix . '<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
+					break;
+				case self::MENTION:
+					$tag['url'] = Contact::magicLink($tag['url']);
+					$return['mentions'][] = $prefix . '<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
+					$return['tags'][] = $prefix . '<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
+					break;
+				case self::IMPLICIT_MENTION:
+					$return['implicit_mentions'][] = $prefix . $tag['term'];
+					break;
 			}
-
-			$return['tags'][] = $prefix . '<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
 		}
 		DBA::close($taglist);
 
@@ -296,20 +359,38 @@ class Term
 	}
 
 	/**
-	 * Delete all tags from an item
+	 * Delete tags of the specific type(s) from an item
 	 *
-	 * @param int itemid - choose from which item the tags will be removed
-	 * @param array $type
+	 * @param int       $item_id
+	 * @param int|array $type
 	 * @throws \Exception
 	 */
-	public static function deleteByItemId($itemid, $type = [TERM_HASHTAG, TERM_MENTION])
+	public static function deleteByItemId($item_id, $type = [self::HASHTAG, self::MENTION, self::IMPLICIT_MENTION])
 	{
-		if (empty($itemid)) {
+		if (empty($item_id)) {
 			return;
 		}
 
 		// Clean up all tags
-		DBA::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => $type]);
+		DBA::delete('term', ['otype' => self::OBJECT_TYPE_POST, 'oid' => $item_id, 'type' => $type]);
+	}
 
+	/**
+	 * Check if the provided tag is of one of the provided term types.
+	 *
+	 * @param string $tag
+	 * @param int    ...$types
+	 * @return bool
+	 */
+	public static function isType($tag, ...$types)
+	{
+		$tag_chars = [];
+		foreach ($types as $type) {
+			if (isset(self::TAG_CHARACTER[$type])) {
+				$tag_chars[] = self::TAG_CHARACTER[$type];
+			}
+		}
+
+		return Strings::startsWith($tag, $tag_chars);
 	}
 }
diff --git a/src/Util/Strings.php b/src/Util/Strings.php
index 0c63749c8..55751d8d8 100644
--- a/src/Util/Strings.php
+++ b/src/Util/Strings.php
@@ -331,4 +331,19 @@ class Strings
 
 		return $uri;
 	}
+
+
+	/**
+	 * Check if the trimmed provided string is starting with one of the provided characters
+	 *
+	 * @param string $string
+	 * @param array  $chars
+	 * @return bool
+	 */
+	public static function startsWith($string, array $chars)
+	{
+		$return = in_array(substr(trim($string), 0, 1), $chars);
+
+		return $return;
+	}
 }

From 8c1db51a760dd60745c55592fd08dee03c2d8a52 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 22 Feb 2019 23:00:16 -0500
Subject: [PATCH 099/145] Improve Logger calls

- Replace various deprecated Logger::log calls
- Reassign log level for verbose log calls
---
 include/enotify.php                    |  6 +++---
 mod/item.php                           |  2 +-
 src/Database/DBA.php                   |  2 +-
 src/Model/Item.php                     | 17 ++++++++---------
 src/Protocol/ActivityPub/Processor.php |  8 ++++++--
 src/Protocol/ActivityPub/Receiver.php  |  8 ++++----
 src/Protocol/DFRN.php                  |  2 +-
 src/Protocol/Diaspora.php              |  2 +-
 src/Util/XML.php                       |  6 ++++--
 9 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/include/enotify.php b/include/enotify.php
index 58e1a75f0..db44b464d 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -33,8 +33,8 @@ function notification($params)
 	$a = \get_app();
 
 	// Temporary logging for finding the origin
-	if (!isset($params['language']) || !isset($params['uid'])) {
-		Logger::log('Missing parameters.' . System::callstack());
+	if (!isset($params['uid'])) {
+		Logger::notice('Missing parameters "uid".', ['params' => $params, 'callstack' => System::callstack()]);
 	}
 
 	// Ensure that the important fields are set at any time
@@ -42,7 +42,7 @@ function notification($params)
 	$user = DBA::selectFirst('user', $fields, ['uid' => $params['uid']]);
 
 	if (!DBA::isResult($user)) {
-		Logger::log('Unknown user ' . $params['uid']);
+		Logger::error('Unknown user', ['uid' =>  $params['uid']]);
 		return false;
 	}
 
diff --git a/mod/item.php b/mod/item.php
index 40c01da20..100205f1c 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -131,7 +131,7 @@ function item_post(App $a) {
 	}
 
 	if ($parent) {
-		Logger::log('mod_item: item_post parent=' . $parent);
+		Logger::info('mod_item: item_post parent=' . $toplevel_item_id);
 	}
 
 	$post_id     = intval(defaults($_REQUEST, 'post_id', 0));
diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 897ab2e6e..326fb0771 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -425,7 +425,7 @@ class DBA
 
 		if ((substr_count($sql, '?') != count($args)) && (count($args) > 0)) {
 			// Question: Should we continue or stop the query here?
-			Logger::log('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), Logger::DEBUG);
+			Logger::error('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true));
 		}
 
 		$sql = self::cleanQuery($sql);
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 475f9131f..e4d18c9a7 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1336,7 +1336,7 @@ class Item extends BaseObject
 			$expire_date = time() - ($expire_interval * 86400);
 			$created_date = strtotime($item['created']);
 			if ($created_date < $expire_date) {
-				Logger::log('item-store: item created ('.date('c', $created_date).') before expiration time ('.date('c', $expire_date).'). ignored. ' . print_r($item,true), Logger::DEBUG);
+				Logger::notice('item-store: item created ('.date('c', $created_date).') before expiration time ('.date('c', $expire_date).'). ignored. ' . print_r($item,true));
 				return 0;
 			}
 		}
@@ -1354,7 +1354,7 @@ class Item extends BaseObject
 			if (DBA::isResult($existing)) {
 				// We only log the entries with a different user id than 0. Otherwise we would have too many false positives
 				if ($uid != 0) {
-					Logger::log("Item with uri ".$item['uri']." already existed for user ".$uid." with id ".$existing["id"]." target network ".$existing["network"]." - new network: ".$item['network']);
+					Logger::notice("Item with uri ".$item['uri']." already existed for user ".$uid." with id ".$existing["id"]." target network ".$existing["network"]." - new network: ".$item['network']);
 				}
 
 				return $existing["id"];
@@ -1405,7 +1405,7 @@ class Item extends BaseObject
 
 		// When there is no content then we don't post it
 		if ($item['body'].$item['title'] == '') {
-			Logger::log('No body, no title.');
+			Logger::notice('No body, no title.');
 			return 0;
 		}
 
@@ -1432,7 +1432,7 @@ class Item extends BaseObject
 		$item['author-id'] = defaults($item, 'author-id', Contact::getIdForURL($item["author-link"], 0, false, $default));
 
 		if (Contact::isBlocked($item["author-id"])) {
-			Logger::log('Contact '.$item["author-id"].' is blocked, item '.$item["uri"].' will not be stored');
+			Logger::notice('Contact '.$item["author-id"].' is blocked, item '.$item["uri"].' will not be stored');
 			return 0;
 		}
 
@@ -1442,22 +1442,21 @@ class Item extends BaseObject
 		$item['owner-id'] = defaults($item, 'owner-id', Contact::getIdForURL($item["owner-link"], 0, false, $default));
 
 		if (Contact::isBlocked($item["owner-id"])) {
-			Logger::log('Contact '.$item["owner-id"].' is blocked, item '.$item["uri"].' will not be stored');
+			Logger::notice('Contact '.$item["owner-id"].' is blocked, item '.$item["uri"].' will not be stored');
 			return 0;
 		}
 
 		if ($item['network'] == Protocol::PHANTOM) {
-			Logger::log('Missing network. Called by: '.System::callstack(), Logger::DEBUG);
+			Logger::notice('Missing network. Called by: '.System::callstack(), Logger::DEBUG);
 
 			$item['network'] = Protocol::DFRN;
-			Logger::log("Set network to " . $item["network"] . " for " . $item["uri"], Logger::DEBUG);
+			Logger::notice("Set network to " . $item["network"] . " for " . $item["uri"], Logger::DEBUG);
 		}
 
 		// Checking if there is already an item with the same guid
-		Logger::log('Checking for an item for user '.$item['uid'].' on network '.$item['network'].' with the guid '.$item['guid'], Logger::DEBUG);
 		$condition = ['guid' => $item['guid'], 'network' => $item['network'], 'uid' => $item['uid']];
 		if (self::exists($condition)) {
-			Logger::log('found item with guid '.$item['guid'].' for user '.$item['uid'].' on network '.$item['network'], Logger::DEBUG);
+			Logger::notice('Found already existing item with guid '.$item['guid'].' for user '.$item['uid'].' on network '.$item['network']);
 			return 0;
 		}
 
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index f4befcd6f..5899d7f25 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -289,7 +289,7 @@ class Processor
 			$item['owner-link'] = $activity['actor'];
 			$item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
 		} else {
-			Logger::log('Ignoring actor because of thread completion.', Logger::DEBUG);
+			Logger::info('Ignoring actor because of thread completion.');
 			$item['owner-link'] = $item['author-link'];
 			$item['owner-id'] = $item['author-id'];
 		}
@@ -358,7 +358,11 @@ class Processor
 			}
 
 			$item_id = Item::insert($item);
-			Logger::log('Storing for user ' . $item['uid'] . ': ' . $item_id);
+			if ($item_id) {
+				Logger::info('Item insertion successful', ['user' => $item['uid'], 'item_id' => $item_id]);
+			} else {
+				Logger::notice('Item insertion aborted', ['user' => $item['uid']]);
+			}
 
 			if ($item['uid'] == 0) {
 				$stored = $item_id;
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index e0ee1f0f9..5ee81302f 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -62,16 +62,16 @@ class Receiver
 	{
 		$http_signer = HTTPSignature::getSigner($body, $header);
 		if (empty($http_signer)) {
-			Logger::log('Invalid HTTP signature, message will be discarded.', Logger::DEBUG);
+			Logger::warning('Invalid HTTP signature, message will be discarded.');
 			return;
 		} else {
-			Logger::log('HTTP signature is signed by ' . $http_signer, Logger::DEBUG);
+			Logger::info('Valid HTTP signature', ['signer' => $http_signer]);
 		}
 
 		$activity = json_decode($body, true);
 
 		if (empty($activity)) {
-			Logger::log('Invalid body.', Logger::DEBUG);
+			Logger::warning('Invalid body.');
 			return;
 		}
 
@@ -79,7 +79,7 @@ class Receiver
 
 		$actor = JsonLD::fetchElement($ldactivity, 'as:actor');
 
-		Logger::log('Message for user ' . $uid . ' is from actor ' . $actor, Logger::DEBUG);
+		Logger::info('Message for user ' . $uid . ' is from actor ' . $actor);
 
 		if (LDSignature::isSigned($activity)) {
 			$ld_signer = LDSignature::getSigner($activity);
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index e6524de96..39d982bb9 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1546,7 +1546,7 @@ class DFRN
 			$author["network"] = $contact_old["network"];
 		} else {
 			if (!$onlyfetch) {
-				Logger::log("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml, Logger::DEBUG);
+				Logger::debug("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml);
 			}
 
 			$author["contact-unknown"] = true;
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 77ad01704..3687fb9d4 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -942,7 +942,7 @@ class Diaspora
 
 		$person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
 		if (DBA::isResult($person)) {
-			Logger::log("In cache " . print_r($person, true), Logger::DEBUG);
+			Logger::debug("In cache " . print_r($person, true));
 
 			// update record occasionally so it doesn't get stale
 			$d = strtotime($person["updated"]." +00:00");
diff --git a/src/Util/XML.php b/src/Util/XML.php
index ba146ec7b..4dd6d84ec 100644
--- a/src/Util/XML.php
+++ b/src/Util/XML.php
@@ -6,6 +6,7 @@ namespace Friendica\Util;
 
 use Friendica\Core\Logger;
 use DOMXPath;
+use Friendica\Core\System;
 use SimpleXMLElement;
 
 /**
@@ -422,10 +423,11 @@ class XML
 
 		$x = @simplexml_load_string($s);
 		if (!$x) {
-			Logger::log('libxml: parse: error: ' . $s, Logger::DATA);
+			Logger::error('Error(s) while parsing XML string.', ['callstack' => System::callstack()]);
 			foreach (libxml_get_errors() as $err) {
-				Logger::log('libxml: parse: ' . $err->code." at ".$err->line.":".$err->column." : ".$err->message, Logger::DATA);
+				Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ":" . $err->column, 'message' => $err->message]);
 			}
+			Logger::debug('Erroring XML string', ['xml' => $s]);
 			libxml_clear_errors();
 		}
 		return $x;

From 34bc0b0c97b7ba4a29d217c33227906e2ced6a73 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 22 Feb 2019 23:03:32 -0500
Subject: [PATCH 100/145] Add potential debug display of implicit mentions in
 frio

- Refactored conversation() by removing extraneous intermediary variables
---
 include/conversation.php                  | 32 +++++++++--------------
 src/Object/Post.php                       |  1 +
 view/theme/frio/templates/wall_thread.tpl |  5 +++-
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 3c52e62fc..77b96574a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -660,21 +660,12 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 
 				list($categories, $folders) = get_cats_and_terms($item);
 
-				$profile_name_e = $profile_name;
-
 				if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) {
-					$title_e = ucfirst($item['content-warning']);
+					$title = ucfirst($item['content-warning']);
 				} else {
-					$title_e = $item['title'];
+					$title = $item['title'];
 				}
 
-				$body_e = $body;
-				$tags_e = $tags['tags'];
-				$hashtags_e = $tags['hashtags'];
-				$mentions_e = $tags['mentions'];
-				$location_e = $location;
-				$owner_name_e = $owner_name;
-
 				$tmp_item = [
 					'template' => $tpl,
 					'id' => ($preview ? 'P0' : $item['id']),
@@ -684,27 +675,28 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 					'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
 					'profile_url' => $profile_link,
 					'item_photo_menu' => item_photo_menu($item),
-					'name' => $profile_name_e,
+					'name' => $profile_name,
 					'sparkle' => $sparkle,
 					'lock' => $lock,
 					'thumb' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
-					'title' => $title_e,
-					'body' => $body_e,
-					'tags' => $tags_e,
-					'hashtags' => $hashtags_e,
-					'mentions' => $mentions_e,
+					'title' => $title,
+					'body' => $body,
+					'tags' => $tags['tags'],
+					'hashtags' => $tags['hashtags'],
+					'mentions' => $tags['mentions'],
+					'implicit_mentions' => $tags['implicit_mentions'],
 					'txt_cats' => L10n::t('Categories:'),
 					'txt_folders' => L10n::t('Filed under:'),
 					'has_cats' => ((count($categories)) ? 'true' : ''),
 					'has_folders' => ((count($folders)) ? 'true' : ''),
 					'categories' => $categories,
 					'folders' => $folders,
-					'text' => strip_tags($body_e),
+					'text' => strip_tags($body),
 					'localtime' => DateTimeFormat::local($item['created'], 'r'),
 					'ago' => (($item['app']) ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
-					'location' => $location_e,
+					'location' => $location,
 					'indent' => '',
-					'owner_name' => $owner_name_e,
+					'owner_name' => $owner_name,
 					'owner_url' => $owner_url,
 					'owner_photo' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
 					'plink' => Item::getPlink($item),
diff --git a/src/Object/Post.php b/src/Object/Post.php
index bd48dbb3d..85fd7876c 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -366,6 +366,7 @@ class Post extends BaseObject
 			'tags'            => $tags['tags'],
 			'hashtags'        => $tags['hashtags'],
 			'mentions'        => $tags['mentions'],
+			'implicit_mentions' => $tags['implicit_mentions'],
 			'txt_cats'        => L10n::t('Categories:'),
 			'txt_folders'     => L10n::t('Filed under:'),
 			'has_cats'        => ((count($categories)) ? 'true' : ''),
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 1fb122125..bd069f5cd 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -293,8 +293,11 @@ as the value of $top_child_total (this is done at the end of this file)
 			{{foreach $item.mentions as $tag}}
 				<span class="mention label btn-warning sm">{{$tag nofilter}} <i class="fa fa-user" aria-hidden="true"></i></span>
 			{{/foreach}}
-		{{/if}}
 
+			{{*foreach $item.implicit_mentions as $tag}}
+				<span class="mention label label-default sm">{{$tag nofilter}} <i class="fa fa-eye-slash" aria-hidden="true"></i></span>
+			{{/foreach*}}
+		{{/if}}
 			{{foreach $item.folders as $cat}}
 				<span class="folder label btn-danger sm p-category">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
 			{{/foreach}}

From 0cc0df9e3e7696c79642411bc7efa9e7d6008124 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 22 Feb 2019 23:23:05 -0500
Subject: [PATCH 101/145] Rename system.disable_mentions_removal config key to
 system.disable_implicit_mentions

- Update configuration key description
---
 config/defaults.config.php             | 11 ++++++++---
 src/Protocol/ActivityPub/Processor.php |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/config/defaults.config.php b/config/defaults.config.php
index 694f75c22..a6f90f319 100644
--- a/config/defaults.config.php
+++ b/config/defaults.config.php
@@ -135,9 +135,14 @@ return [
 		// Disables the check if a mail address is in a valid format and can be resolved via DNS.
 		'disable_email_validation' => false,
 
-		// disable_mentions_removal (Boolean)
-		// Disables the automatic removal of implicit mentions in ActivityPub postings.
-		'disable_mentions_removal' => false,
+		// disable_implicit_mentions (Boolean) since 2019.03
+		// Implicit mentions are mentions in the body of replies that are redundant in a thread-enabled system like Friendica.
+		// This config key disables the gathering of implicit mentions in incoming and outgoing posts.
+		// Also disables the default automatic removal of implicit mentions from the body of incoming posts.
+		// Also disables the default automatic addition of implicit mentions in the body of outgoing posts.
+		// Disabling implicit mentions also affects the "explicit_mentions" additional feature by limiting it
+		// to the replied-to post author mention in the comment boxes.
+		'disable_implicit_mentions' => false,
 
 		// disable_url_validation (Boolean)
 		// Disables the DNS lookup of an URL.
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 5899d7f25..68697381b 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -693,7 +693,7 @@ class Processor
 	 */
 	private static function removeImplicitMentionsFromBody($body, array $implicit_mentions)
 	{
-		if (Config::get('system', 'disable_mentions_removal')) {
+		if (Config::get('system', 'disable_implicit_mentions')) {
 			return $body;
 		}
 

From c7dfc88c6c31750a07e36dc1ba91ecfcfce3c7bd Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 22 Feb 2019 23:28:39 -0500
Subject: [PATCH 102/145] Add implicit mention gathering in local posts

- Rename $parent_item to $toplevel_item in item_post()
- Add $thread_parent_id variable to distinguish from $parent_item
- Add item_add_implicit_mentions() function
---
 mod/item.php | 125 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 77 insertions(+), 48 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index 100205f1c..122f62c4e 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -33,6 +33,7 @@ use Friendica\Model\FileTag;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Attach;
+use Friendica\Model\Term;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
 use Friendica\Util\DateTimeFormat;
@@ -83,13 +84,13 @@ function item_post(App $a) {
 	}
 
 	// Is this a reply to something?
-	$thr_parent = intval(defaults($_REQUEST, 'parent', 0));
+	$toplevel_item_id = intval(defaults($_REQUEST, 'parent', 0));
 	$thr_parent_uri = trim(defaults($_REQUEST, 'parent_uri', ''));
 
-	$thr_parent_contact = null;
+	$thread_parent_id = 0;
+	$thread_parent_contact = null;
 
-	$parent = 0;
-	$parent_item = null;
+	$toplevel_item = null;
 	$parent_user = null;
 
 	$parent_contact = null;
@@ -98,25 +99,26 @@ function item_post(App $a) {
 	$profile_uid = defaults($_REQUEST, 'profile_uid', local_user());
 	$posttype = defaults($_REQUEST, 'post_type', Item::PT_ARTICLE);
 
-	if ($thr_parent || $thr_parent_uri) {
-		if ($thr_parent) {
-			$parent_item = Item::selectFirst([], ['id' => $thr_parent]);
+	if ($toplevel_item_id || $thr_parent_uri) {
+		if ($toplevel_item_id) {
+			$toplevel_item = Item::selectFirst([], ['id' => $toplevel_item_id]);
 		} elseif ($thr_parent_uri) {
-			$parent_item = Item::selectFirst([], ['uri' => $thr_parent_uri, 'uid' => $profile_uid]);
+			$toplevel_item = Item::selectFirst([], ['uri' => $thr_parent_uri, 'uid' => $profile_uid]);
 		}
 
-		// if this isn't the real parent of the conversation, find it
-		if (DBA::isResult($parent_item)) {
+		// if this isn't the top-level parent of the conversation, find it
+		if (DBA::isResult($toplevel_item)) {
 			// The URI and the contact is taken from the direct parent which needn't to be the top parent
-			$thr_parent_uri = $parent_item['uri'];
-			$thr_parent_contact = Contact::getDetailsByURL($parent_item["author-link"]);
+			$thread_parent_id = $toplevel_item['id'];
+			$thr_parent_uri = $toplevel_item['uri'];
+			$thread_parent_contact = Contact::getDetailsByURL($toplevel_item["author-link"]);
 
-			if ($parent_item['id'] != $parent_item['parent']) {
-				$parent_item = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $parent_item['parent']]);
+			if ($toplevel_item['id'] != $toplevel_item['parent']) {
+				$toplevel_item = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $toplevel_item['parent']]);
 			}
 		}
 
-		if (!DBA::isResult($parent_item)) {
+		if (!DBA::isResult($toplevel_item)) {
 			notice(L10n::t('Unable to locate original post.') . EOL);
 			if (!empty($_REQUEST['return'])) {
 				$a->internalRedirect($return_path);
@@ -124,13 +126,13 @@ function item_post(App $a) {
 			exit();
 		}
 
-		$parent = $parent_item['id'];
-		$parent_user = $parent_item['uid'];
+		$toplevel_item_id = $toplevel_item['id'];
+		$parent_user = $toplevel_item['uid'];
 
 		$objecttype = ACTIVITY_OBJ_COMMENT;
 	}
 
-	if ($parent) {
+	if ($toplevel_item_id) {
 		Logger::info('mod_item: item_post parent=' . $toplevel_item_id);
 	}
 
@@ -160,7 +162,7 @@ function item_post(App $a) {
 	}
 
 	// Allow commenting if it is an answer to a public post
-	$allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
+	$allow_comment = local_user() && ($profile_uid == 0) && $toplevel_item_id && in_array($toplevel_item['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
 
 	// Now check that valid personal details have been provided
 	if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) {
@@ -183,7 +185,7 @@ function item_post(App $a) {
 
 	$user = DBA::selectFirst('user', [], ['uid' => $profile_uid]);
 
-	if (!DBA::isResult($user) && !$parent) {
+	if (!DBA::isResult($user) && !$toplevel_item_id) {
 		return 0;
 	}
 
@@ -287,21 +289,21 @@ function item_post(App $a) {
 
 		// If this is a comment, set the permissions from the parent.
 
-		if ($parent_item) {
+		if ($toplevel_item) {
 			// for non native networks use the network of the original post as network of the item
-			if (($parent_item['network'] != Protocol::DIASPORA)
-				&& ($parent_item['network'] != Protocol::OSTATUS)
+			if (($toplevel_item['network'] != Protocol::DIASPORA)
+				&& ($toplevel_item['network'] != Protocol::OSTATUS)
 				&& ($network == "")) {
-				$network = $parent_item['network'];
+				$network = $toplevel_item['network'];
 			}
 
-			$str_contact_allow = $parent_item['allow_cid'];
-			$str_group_allow   = $parent_item['allow_gid'];
-			$str_contact_deny  = $parent_item['deny_cid'];
-			$str_group_deny    = $parent_item['deny_gid'];
-			$private           = $parent_item['private'];
+			$str_contact_allow = $toplevel_item['allow_cid'];
+			$str_group_allow   = $toplevel_item['allow_gid'];
+			$str_contact_deny  = $toplevel_item['deny_cid'];
+			$str_group_deny    = $toplevel_item['deny_gid'];
+			$private           = $toplevel_item['private'];
 
-			$wall              = $parent_item['wall'];
+			$wall              = $toplevel_item['wall'];
 		}
 
 		$pubmail_enabled = defaults($_REQUEST, 'pubmail_enable', false) && !$private;
@@ -382,12 +384,8 @@ function item_post(App $a) {
 
 	$tags = BBCode::getTags($body);
 
-	// Add a tag if the parent contact is from ActivityPub or OStatus (This will notify them)
-	if ($parent && in_array($thr_parent_contact['network'], [Protocol::OSTATUS, Protocol::ACTIVITYPUB])) {
-		$contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]';
-		if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) {
-			$tags[] = $contact;
-		}
+	if ($thread_parent_id && !\Friendica\Content\Feature::isEnabled($uid, 'explicit_mentions')) {
+		$tags = item_add_implicit_mentions($tags, $thread_parent_contact, $thread_parent_id);
 	}
 
 	$tagged = [];
@@ -400,7 +398,7 @@ function item_post(App $a) {
 		foreach ($tags as $tag) {
 			$tag_type = substr($tag, 0, 1);
 
-			if ($tag_type == '#') {
+			if ($tag_type == Term::TAG_CHARACTER[Term::HASHTAG]) {
 				continue;
 			}
 
@@ -425,9 +423,9 @@ function item_post(App $a) {
 				$tagged[] = $tag;
 			}
 			// When the forum is private or the forum is addressed with a "!" make the post private
-			if (is_array($success['contact']) && (!empty($success['contact']['prv']) || ($tag_type == '!'))) {
+			if (is_array($success['contact']) && (!empty($success['contact']['prv']) || ($tag_type == Term::TAG_CHARACTER[Term::EXCLUSIVE_MENTION]))) {
 				$private_forum = $success['contact']['prv'];
-				$only_to_forum = ($tag_type == '!');
+				$only_to_forum = ($tag_type == Term::TAG_CHARACTER[Term::EXCLUSIVE_MENTION]);
 				$private_id = $success['contact']['id'];
 				$forum_contact = $success['contact'];
 			} elseif (is_array($success['contact']) && !empty($success['contact']['forum']) &&
@@ -442,7 +440,7 @@ function item_post(App $a) {
 
 	$original_contact_id = $contact_id;
 
-	if (!$parent && count($forum_contact) && ($private_forum || $only_to_forum)) {
+	if (!$toplevel_item_id && count($forum_contact) && ($private_forum || $only_to_forum)) {
 		// we tagged a forum in a top level post. Now we change the post
 		$private = $private_forum;
 
@@ -595,7 +593,7 @@ function item_post(App $a) {
 		$network = Protocol::DFRN;
 	}
 
-	$gravity = ($parent ? GRAVITY_COMMENT : GRAVITY_PARENT);
+	$gravity = ($toplevel_item_id ? GRAVITY_COMMENT : GRAVITY_PARENT);
 
 	// even if the post arrived via API we are considering that it
 	// originated on this site by default for determining relayability.
@@ -607,12 +605,12 @@ function item_post(App $a) {
 		$origin = $_REQUEST['origin'];
 	}
 
-	$notify_type = ($parent ? 'comment-new' : 'wall-new');
+	$notify_type = ($toplevel_item_id ? 'comment-new' : 'wall-new');
 
 	$uri = ($message_id ? $message_id : Item::newURI($api_source ? $profile_uid : $uid, $guid));
 
 	// Fallback so that we alway have a parent uri
-	if (!$thr_parent_uri || !$parent) {
+	if (!$thr_parent_uri || !$toplevel_item_id) {
 		$thr_parent_uri = $uri;
 	}
 
@@ -670,7 +668,7 @@ function item_post(App $a) {
 	 * 'self' if true indicates the owner is posting on their own wall
 	 * If parent is 0 it is a top-level post.
 	 */
-	$datarray['parent']        = $parent;
+	$datarray['parent']        = $toplevel_item_id;
 	$datarray['self']          = $self;
 
 	// This triggers posts via API and the mirror functions
@@ -788,7 +786,7 @@ function item_post(App $a) {
 	FileTag::updatePconfig($uid, $categories_old, $categories_new, 'category');
 
 	// These notifications are sent if someone else is commenting other your wall
-	if ($parent) {
+	if ($toplevel_item_id) {
 		if ($contact_record != $author) {
 			notification([
 				'type'         => NOTIFY_COMMENT,
@@ -804,8 +802,8 @@ function item_post(App $a) {
 				'source_photo' => $datarray['author-avatar'],
 				'verb'         => ACTIVITY_POST,
 				'otype'        => 'item',
-				'parent'       => $parent,
-				'parent_uri'   => $parent_item['uri']
+				'parent'       => $toplevel_item_id,
+				'parent_uri'   => $toplevel_item['uri']
 			]);
 		}
 	} else {
@@ -962,7 +960,7 @@ function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network =
 	$r = null;
 
 	//is it a person tag?
-	if ((strpos($tag, '@') === 0) || (strpos($tag, '!') === 0)) {
+	if (Term::isType($tag, Term::MENTION, Term::IMPLICIT_MENTION, Term::EXCLUSIVE_MENTION)) {
 		$tag_type = substr($tag, 0, 1);
 		//is it already replaced?
 		if (strpos($tag, '[url=')) {
@@ -1099,3 +1097,34 @@ function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network =
 
 	return ['replaced' => $replaced, 'contact' => $contact];
 }
+
+function item_add_implicit_mentions(array $tags, array $thread_parent_contact, $thread_parent_id)
+{
+	if (Config::get('system', 'disable_implicit_mentions')) {
+		// Add a tag if the parent contact is from ActivityPub or OStatus (This will notify them)
+		if (in_array($thread_parent_contact['network'], [Protocol::OSTATUS, Protocol::ACTIVITYPUB])) {
+			$contact = Term::TAG_CHARACTER[Term::MENTION] . '[url=' . $thread_parent_contact['url'] . ']' . $thread_parent_contact['nick'] . '[/url]';
+			if (!stripos(implode($tags), '[url=' . $thread_parent_contact['url'] . ']')) {
+				$tags[] = $contact;
+			}
+		}
+	} else {
+		$implicit_mentions = [
+			$thread_parent_contact['url'] => $thread_parent_contact['nick']
+		];
+
+		$parent_terms = Term::tagArrayFromItemId($thread_parent_id, [Term::MENTION, Term::IMPLICIT_MENTION]);
+
+		foreach ($parent_terms as $parent_term) {
+			$implicit_mentions[$parent_term['url']] = $parent_term['term'];
+		}
+
+		foreach ($implicit_mentions as $url => $label) {
+			if ($url != \Friendica\Model\Profile::getMyURL() && !stripos(implode($tags), '[url=' . $url . ']')) {
+				$tags[] = Term::TAG_CHARACTER[Term::IMPLICIT_MENTION] . '[url=' . $url . ']' . $label . '[/url]';
+			}
+		}
+	}
+
+	return $tags;
+}
\ No newline at end of file

From e51f2cea0d821890c70ad8783c489635f7ab8daa Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 22 Feb 2019 23:36:06 -0500
Subject: [PATCH 103/145] Add implicit mentions to explicit mentions default
 text

---
 src/Object/Post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 85fd7876c..807c2d222 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -805,7 +805,7 @@ class Post extends BaseObject
 			$text = '';
 		}
 
-		$terms = Term::tagArrayFromItemId($this->getId(), TERM_MENTION);
+		$terms = Term::tagArrayFromItemId($this->getId(), [Term::MENTION, Term::IMPLICIT_MENTION]);
 
 		foreach ($terms as $term) {
 			$profile = Contact::getDetailsByURL($term['url']);

From fc47a0780168fe4da046b990c1d1b461e0211940 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 22 Feb 2019 23:38:59 -0500
Subject: [PATCH 104/145] Fix Diaspora outgoing implicit mention

- Use name instead of nick for implicit mention
- Rename $parent to $toplevel_item in Diaspora::constructComment
- Use thread parent to retrieve the expected mention instead of the top level item
---
 src/Protocol/Diaspora.php | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 3687fb9d4..ca66aa0a6 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -3675,7 +3675,7 @@ class Diaspora
 			&& !strstr($body, $profile['addr'])
 			&& !strstr($body, $profile_url)
 		) {
-			$body = '@[url=' . $profile_url . ']' . $profile['nick'] . '[/url] ' . $body;
+			$body = '@[url=' . $profile_url . ']' . $profile['name'] . '[/url] ' . $body;
 		}
 
 		return $body;
@@ -3776,7 +3776,7 @@ class Diaspora
 	 * @param array $item  The item that will be exported
 	 * @param array $owner the array of the item owner
 	 *
-	 * @return array The data for a comment
+	 * @return array|false The data for a comment
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function constructComment(array $item, array $owner)
@@ -3788,30 +3788,40 @@ class Diaspora
 			return $result;
 		}
 
-		$parent = Item::selectFirst(['guid', 'author-link'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
-		if (!DBA::isResult($parent)) {
+		$toplevel_item = Item::selectFirst(['guid', 'author-link'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
+		if (!DBA::isResult($toplevel_item)) {
+			Logger::error('Missing parent conversation item', ['parent' => $item["parent"]]);
 			return false;
 		}
 
+		$thread_parent_item = $toplevel_item;
+		if ($item['thr-parent'] != $item['parent-uri']) {
+			$thread_parent_item = Item::selectFirst(['guid', 'author-link'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
+		}
+
 		$body = $item["body"];
 
-		if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) {
-			$body = self::prependParentAuthorMention($body, $parent['author-link']);
+		if ((empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions'))
+			&& !Config::get('system', 'disable_implicit_mentions')
+		) {
+			$body = self::prependParentAuthorMention($body, $thread_parent_item['author-link']);
 		}
 
 		$text = html_entity_decode(BBCode::toMarkdown($body));
 		$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
 
-		$comment = ["author" => self::myHandle($owner),
-				"guid" => $item["guid"],
-				"created_at" => $created,
-				"parent_guid" => $parent["guid"],
-				"text" => $text,
-				"author_signature" => ""];
+		$comment = [
+			"author"      => self::myHandle($owner),
+			"guid"        => $item["guid"],
+			"created_at"  => $created,
+			"parent_guid" => $toplevel_item["guid"],
+			"text"        => $text,
+			"author_signature" => ""
+		];
 
 		// Send the thread parent guid only if it is a threaded comment
 		if ($item['thr-parent'] != $item['parent-uri']) {
-			$comment['thread_parent_guid'] = self::getGuidFromUri($item['thr-parent'], $item['uid']);
+			$comment['thread_parent_guid'] = $thread_parent_item['guid'];
 		}
 
 		Cache::set($cachekey, $comment, Cache::QUARTER_HOUR);

From 3ac8576c8e464f989ec8baf4dff4fa9ad99d524a Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 22 Feb 2019 23:42:04 -0500
Subject: [PATCH 105/145] Fix implicit mentions in incoming ActivityPub posts

- Use thr-parent instead of parent-uri to retrieve implicit mentions to remove from body
- Add potential implicit mentions to 'tags' array for storage in Processor::convertImplicitMentionsInTags()
- Add usage of system.disable_implicit_mentions to disable implicit mention behavior
---
 src/Protocol/ActivityPub/Processor.php | 107 ++++++++++++++++++-------
 1 file changed, 80 insertions(+), 27 deletions(-)

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 68697381b..b77df1fae 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -65,7 +65,7 @@ class Processor
 	 * @param array   $implicit_mentions List of profile URLs to skip
 	 * @return string with tags
 	 */
-	private static function constructTagString($tags, $sensitive, array $implicit_mentions)
+	private static function constructTagString(array $tags, $sensitive)
 	{
 		if (empty($tags)) {
 			return '';
@@ -73,7 +73,7 @@ class Processor
 
 		$tag_text = '';
 		foreach ($tags as $tag) {
-			if (in_array(defaults($tag, 'type', ''), ['Mention', 'Hashtag']) && !in_array($tag['href'], $implicit_mentions)) {
+			if (in_array(defaults($tag, 'type', ''), ['Mention', 'Hashtag'])) {
 				if (!empty($tag_text)) {
 					$tag_text .= ',';
 				}
@@ -129,7 +129,7 @@ class Processor
 	 */
 	public static function updateItem($activity)
 	{
-		$item = Item::selectFirst(['uri', 'parent-uri', 'gravity'], ['uri' => $activity['id']]);
+		$item = Item::selectFirst(['uri', 'thr-parent', 'gravity'], ['uri' => $activity['id']]);
 		if (!DBA::isResult($item)) {
 			Logger::warning('Unknown item', ['uri' => $activity['id']]);
 			return;
@@ -144,20 +144,20 @@ class Processor
 		$content = self::replaceEmojis($content, $activity['emojis']);
 		$content = self::convertMentions($content);
 
-		$implicit_mentions = [];
-		if (($item['parent-uri'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
-			$parent = Item::selectFirst(['id', 'author-link', 'alias'], ['uri' => $item['parent-uri']]);
+		if (($item['thr-parent'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
+			$parent = Item::selectFirst(['id', 'author-link', 'alias'], ['uri' => $item['thr-parent']]);
 			if (!DBA::isResult($parent)) {
-				Logger::warning('Unknown parent item.', ['uri' => $item['parent-uri']]);
+				Logger::warning('Unknown parent item.', ['uri' => $item['thr-parent']]);
 				return;
 			}
 
-			$implicit_mentions = self::getImplicitMentionList($parent);
-			$content = self::removeImplicitMentionsFromBody($content, $implicit_mentions);
+			$potential_implicit_mentions = self::getImplicitMentionList($parent);
+			$content = self::removeImplicitMentionsFromBody($content, $potential_implicit_mentions);
+			$activity['tags'] = self::convertImplicitMentionsInTags($activity['tags'], $potential_implicit_mentions);
 		}
 
 		$item['body'] = $content;
-		$item['tag'] = self::constructTagString($activity['tags'], $activity['sensitive'], $implicit_mentions);
+		$item['tag'] = self::constructTagString($activity['tags'], $activity['sensitive']);
 
 		Item::update($item, ['uri' => $activity['id']]);
 	}
@@ -173,7 +173,7 @@ class Processor
 	{
 		$item = [];
 		$item['verb'] = ACTIVITY_POST;
-		$item['parent-uri'] = $activity['reply-to-id'];
+		$item['thr-parent'] = $activity['reply-to-id'];
 
 		if ($activity['reply-to-id'] == $activity['id']) {
 			$item['gravity'] = GRAVITY_PARENT;
@@ -220,7 +220,7 @@ class Processor
 	{
 		$item = [];
 		$item['verb'] = $verb;
-		$item['parent-uri'] = $activity['object_id'];
+		$item['thr-parent'] = $activity['object_id'];
 		$item['gravity'] = GRAVITY_ACTIVITY;
 		$item['object-type'] = ACTIVITY_OBJ_NOTE;
 
@@ -275,8 +275,8 @@ class Processor
 	{
 		/// @todo What to do with $activity['context']?
 
-		if (($item['gravity'] != GRAVITY_PARENT) && !Item::exists(['uri' => $item['parent-uri']])) {
-			Logger::log('Parent ' . $item['parent-uri'] . ' not found, message will be discarded.', Logger::DEBUG);
+		if (($item['gravity'] != GRAVITY_PARENT) && !Item::exists(['uri' => $item['thr-parent']])) {
+			Logger::log('Parent ' . $item['thr-parent'] . ' not found, message will be discarded.', Logger::DEBUG);
 			return;
 		}
 
@@ -299,21 +299,20 @@ class Processor
 		$content = self::replaceEmojis($content, $activity['emojis']);
 		$content = self::convertMentions($content);
 
-		$implicit_mentions = [];
-
-		if (($item['parent-uri'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
+		if (($item['thr-parent'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
 			$item_private = !in_array(0, $activity['item_receiver']);
-			$parent = Item::selectFirst(['id', 'private', 'author-link', 'alias'], ['uri' => $item['parent-uri']]);
+			$parent = Item::selectFirst(['id', 'private', 'author-link', 'alias'], ['uri' => $item['thr-parent']]);
 			if (!DBA::isResult($parent)) {
 				return;
 			}
 			if ($item_private && !$parent['private']) {
-				Logger::log('Item ' . $item['uri'] . ' is private but the parent ' . $item['parent-uri'] . ' is not. So we drop it.');
+				Logger::warning('Item is private but the parent is not. Dropping.', ['item-uri' => $item['uri'], 'thr-parent' => $item['thr-parent']]);
 				return;
 			}
 
-			$implicit_mentions = self::getImplicitMentionList($parent);
-			$content = self::removeImplicitMentionsFromBody($content, $implicit_mentions);
+			$potential_implicit_mentions = self::getImplicitMentionList($parent);
+			$content = self::removeImplicitMentionsFromBody($content, $potential_implicit_mentions);
+			$activity['tags'] = self::convertImplicitMentionsInTags($activity['tags'], $potential_implicit_mentions);
 		}
 
 		$item['created'] = $activity['published'];
@@ -333,7 +332,7 @@ class Processor
 			$item['coord'] = $item['latitude'] . ' ' . $item['longitude'];
 		}
 
-		$item['tag'] = self::constructTagString($activity['tags'], $activity['sensitive'], $implicit_mentions);
+		$item['tag'] = self::constructTagString($activity['tags'], $activity['sensitive']);
 		$item['app'] = $activity['generator'];
 		$item['plink'] = defaults($activity, 'alternate-url', $item['uri']);
 
@@ -662,10 +661,18 @@ class Processor
 	 */
 	private static function getImplicitMentionList(array $parent)
 	{
-		$parent_terms = Term::tagArrayFromItemId($parent['id'], [TERM_MENTION]);
+		if (Config::get('system', 'disable_implicit_mentions')) {
+			return [];
+		}
+
+		$parent_terms = Term::tagArrayFromItemId($parent['id'], [Term::MENTION, Term::IMPLICIT_MENTION]);
+
+		$parent_author = Contact::getDetailsByURL($parent['author-link'], 0);
 
 		$implicit_mentions = [
-			$parent['author-link']
+			$parent_author['url'],
+			$parent_author['nurl'],
+			$parent_author['alias'],
 		];
 
 		if ($parent['alias']) {
@@ -688,10 +695,10 @@ class Processor
 	 * Strips from the body prepended implicit mentions
 	 *
 	 * @param string $body
-	 * @param array  $implicit_mentions List of profile URLs
+	 * @param array $potential_mentions
 	 * @return string
 	 */
-	private static function removeImplicitMentionsFromBody($body, array $implicit_mentions)
+	private static function removeImplicitMentionsFromBody($body, array $potential_mentions)
 	{
 		if (Config::get('system', 'disable_implicit_mentions')) {
 			return $body;
@@ -701,7 +708,7 @@ class Processor
 
 		// Extract one prepended mention at a time from the body
 		while(preg_match('#^(@\[url=([^\]]+)].*?\[\/url]\s)(.*)#mis', $body, $matches)) {
-			if (!in_array($matches[2], $implicit_mentions) ) {
+			if (!in_array($matches[2], $potential_mentions) ) {
 				$kept_mentions[] = $matches[1];
 			}
 
@@ -713,4 +720,50 @@ class Processor
 
 		return implode('', $kept_mentions);
 	}
+
+	private static function convertImplicitMentionsInTags($activity_tags, array $potential_mentions)
+	{
+		if (Config::get('system', 'disable_implicit_mentions')) {
+			return $activity_tags;
+		}
+
+		foreach ($activity_tags as $index => $tag) {
+			if (in_array($tag['href'], $potential_mentions)) {
+				$activity_tags[$index]['name'] = preg_replace(
+					'/' . preg_quote(Term::TAG_CHARACTER[Term::MENTION], '/') . '/',
+					Term::TAG_CHARACTER[Term::IMPLICIT_MENTION],
+					$activity_tags[$index]['name'],
+					1
+				);
+			}
+		}
+
+		return $activity_tags;
+	}
+
+	public static function testImplicitMentions($item, $source)
+	{
+		$parent = Item::selectFirst(['id', 'guid', 'author-link', 'alias'], ['uri' => $item['thr-parent']]);
+
+		$implicit_mentions = self::getImplicitMentionList($parent);
+		var_dump($implicit_mentions);
+
+		$object = json_decode($source, true)['object'];
+		var_dump($object);
+
+		$content = HTML::toBBCode($object['content']);
+		$content = self::convertMentions($content);
+
+		$activity = [
+			'tags' => $object['tag'],
+			'content' => $content
+		];
+
+		var_dump($activity);
+
+		$activity['content'] = Processor::removeImplicitMentionsFromBody($activity['content'], $implicit_mentions);
+		$activity['tags'] = Processor::convertImplicitMentionsInTags($activity['tags'], $implicit_mentions);
+
+		return $activity;
+	}
 }

From cb78e7785079726b31ed8620043bfaf11a78462d Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 22 Feb 2019 23:43:32 -0500
Subject: [PATCH 106/145] Fix implicit mentions in outgoing ActivityPub posts

- Add usage of system.disable_implicit_mentions to disable implicit mention behavior
- Add usage of item own implicit mentions to be prepended to the outgoing body
---
 src/Protocol/ActivityPub/Transmitter.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index ebd32786a..7d33fb2dc 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -343,7 +343,7 @@ class Transmitter
 			$actor_profile = APContact::getByURL($item['author-link']);
 		}
 
-		$terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION);
+		$terms = Term::tagArrayFromItemId($item['id'], [Term::MENTION, Term::IMPLICIT_MENTION]);
 
 		if (!$item['private']) {
 			$data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
@@ -807,12 +807,12 @@ class Transmitter
 	{
 		$tags = [];
 
-		$terms = Term::tagArrayFromItemId($item['id']);
+		$terms = Term::tagArrayFromItemId($item['id'], [Term::HASHTAG, Term::MENTION, Term::IMPLICIT_MENTION]);
 		foreach ($terms as $term) {
-			if ($term['type'] == TERM_HASHTAG) {
+			if ($term['type'] == Term::HASHTAG) {
 				$url = System::baseUrl() . '/search?tag=' . urlencode($term['term']);
 				$tags[] = ['type' => 'Hashtag', 'href' => $url, 'name' => '#' . $term['term']];
-			} elseif ($term['type'] == TERM_MENTION) {
+			} elseif ($term['type'] == Term::MENTION || $term['type'] == Term::IMPLICIT_MENTION) {
 				$contact = Contact::getDetailsByURL($term['url']);
 				if (!empty($contact['addr'])) {
 					$mention = '@' . $contact['addr'];
@@ -1439,6 +1439,10 @@ class Transmitter
 
 	private static function prependMentions($body, array $permission_block)
 	{
+		if (Config::get('system', 'disable_implicit_mentions')) {
+			return $body;
+		}
+
 		$mentions = [];
 
 		foreach ($permission_block['to'] as $profile_url) {

From 67aa1888309e83648be62988b10e757c14a2e2a9 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 09:25:21 -0500
Subject: [PATCH 107/145] Improve Logger calls

- Add context in various calls
- Remove deprecated Logger::log call in Processor
---
 mod/item.php                           |  2 +-
 src/Database/DBA.php                   |  2 +-
 src/Model/Item.php                     | 32 +++++++++++++++++++-------
 src/Model/Term.php                     |  2 ++
 src/Protocol/ActivityPub/Processor.php |  2 +-
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index 122f62c4e..b126c4825 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -1127,4 +1127,4 @@ function item_add_implicit_mentions(array $tags, array $thread_parent_contact, $
 	}
 
 	return $tags;
-}
\ No newline at end of file
+}
diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 326fb0771..832f0a444 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -425,7 +425,7 @@ class DBA
 
 		if ((substr_count($sql, '?') != count($args)) && (count($args) > 0)) {
 			// Question: Should we continue or stop the query here?
-			Logger::error('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true));
+			Logger::warning('Query parameters mismatch.', ['query' => $sql, 'args' => $args, 'callstack' => System::callstack()]);
 		}
 
 		$sql = self::cleanQuery($sql);
diff --git a/src/Model/Item.php b/src/Model/Item.php
index e4d18c9a7..16a3b07b5 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1336,7 +1336,11 @@ class Item extends BaseObject
 			$expire_date = time() - ($expire_interval * 86400);
 			$created_date = strtotime($item['created']);
 			if ($created_date < $expire_date) {
-				Logger::notice('item-store: item created ('.date('c', $created_date).') before expiration time ('.date('c', $expire_date).'). ignored. ' . print_r($item,true));
+				Logger::notice('Item created before expiration interval.', [
+					'created' => date('c', $created_date),
+					'expired' => date('c', $expire_date),
+					'$item' => $item
+				]);
 				return 0;
 			}
 		}
@@ -1354,7 +1358,13 @@ class Item extends BaseObject
 			if (DBA::isResult($existing)) {
 				// We only log the entries with a different user id than 0. Otherwise we would have too many false positives
 				if ($uid != 0) {
-					Logger::notice("Item with uri ".$item['uri']." already existed for user ".$uid." with id ".$existing["id"]." target network ".$existing["network"]." - new network: ".$item['network']);
+					Logger::notice('Item already existed for user', [
+						'uri' => $item['uri'],
+						'uid' => $uid,
+						'network' => $item['network'],
+						'existing_id' => $existing["id"],
+						'existing_network' => $existing["network"]
+					]);
 				}
 
 				return $existing["id"];
@@ -1432,7 +1442,7 @@ class Item extends BaseObject
 		$item['author-id'] = defaults($item, 'author-id', Contact::getIdForURL($item["author-link"], 0, false, $default));
 
 		if (Contact::isBlocked($item["author-id"])) {
-			Logger::notice('Contact '.$item["author-id"].' is blocked, item '.$item["uri"].' will not be stored');
+			Logger::notice('Author is blocked node-wide', ['author-link' => $item["author-link"], 'item-uri' => $item["uri"]]);
 			return 0;
 		}
 
@@ -1442,21 +1452,27 @@ class Item extends BaseObject
 		$item['owner-id'] = defaults($item, 'owner-id', Contact::getIdForURL($item["owner-link"], 0, false, $default));
 
 		if (Contact::isBlocked($item["owner-id"])) {
-			Logger::notice('Contact '.$item["owner-id"].' is blocked, item '.$item["uri"].' will not be stored');
+			Logger::notice('Owner is blocked node-wide', ['owner-link' => $item["owner-link"], 'item-uri' => $item["uri"]]);
 			return 0;
 		}
 
 		if ($item['network'] == Protocol::PHANTOM) {
-			Logger::notice('Missing network. Called by: '.System::callstack(), Logger::DEBUG);
-
 			$item['network'] = Protocol::DFRN;
-			Logger::notice("Set network to " . $item["network"] . " for " . $item["uri"], Logger::DEBUG);
+			Logger::notice('Missing network, setting to {network}.', [
+				'uri' => $item["uri"],
+				'network' => $item['network'],
+				'callstack' => System::callstack()
+			]);
 		}
 
 		// Checking if there is already an item with the same guid
 		$condition = ['guid' => $item['guid'], 'network' => $item['network'], 'uid' => $item['uid']];
 		if (self::exists($condition)) {
-			Logger::notice('Found already existing item with guid '.$item['guid'].' for user '.$item['uid'].' on network '.$item['network']);
+			Logger::notice('Found already existing item', [
+				'guid' => $item['guid'],
+				'uid' => $item['uid'],
+				'network' => $item['network']
+			]);
 			return 0;
 		}
 
diff --git a/src/Model/Term.php b/src/Model/Term.php
index 5266627ac..36876368d 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -204,6 +204,8 @@ class Term
 				$type = self::HASHTAG;
 				$term = $tag;
 				$link = '';
+
+				Logger::notice('Unknown term type', ['tag' => $tag]);
 			}
 
 			if (DBA::exists('term', ['uid' => $item['uid'], 'otype' => self::OBJECT_TYPE_POST, 'oid' => $item_id, 'term' => $term, 'type' => $type])) {
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index b77df1fae..2661444e0 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -276,7 +276,7 @@ class Processor
 		/// @todo What to do with $activity['context']?
 
 		if (($item['gravity'] != GRAVITY_PARENT) && !Item::exists(['uri' => $item['thr-parent']])) {
-			Logger::log('Parent ' . $item['thr-parent'] . ' not found, message will be discarded.', Logger::DEBUG);
+			Logger::info('Parent not found, message will be discarded.', ['thr-parent' => $item['thr-parent']]);
 			return;
 		}
 

From f4745c5936947197935e0c57ee4b80058626042c Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 09:25:37 -0500
Subject: [PATCH 108/145] Add doc to Model\Term

---
 src/Model/Term.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Model/Term.php b/src/Model/Term.php
index 36876368d..58c322365 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @file src/Model/Term
+ * @file src/Model/Term.php
  */
 namespace Friendica\Model;
 
@@ -8,6 +8,15 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\Strings;
 
+/**
+ * Class Term
+ *
+ * This Model class handles term table interactions.
+ * This tables stores relevant terms related to posts, photos and searches, like hashtags, mentions and
+ * user-applied categories.
+ *
+ * @package Friendica\Model
+ */
 class Term
 {
     const UNKNOWN           = 0;
@@ -18,7 +27,13 @@ class Term
     const FILE              = 5;
     const SAVEDSEARCH       = 6;
     const CONVERSATION      = 7;
+	/**
+	 * An implicit mention is a mention in a comment body that is redundant with the threading information.
+	 */
     const IMPLICIT_MENTION  = 8;
+	/**
+	 * An exclusive mention transfers the ownership of the post to the target account, usually a forum.
+	 */
     const EXCLUSIVE_MENTION = 9;
 
     const TAG_CHARACTER = [

From 7e499647e35a743e0998ed2b722fbaeb81ef96da Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 15:25:41 -0500
Subject: [PATCH 109/145] Add System::jsonError method for ajax call returns

---
 src/Core/System.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Core/System.php b/src/Core/System.php
index 69d15a176..45a88fe09 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -176,6 +176,12 @@ class System extends BaseObject
 		exit();
 	}
 
+	public static function jsonError($httpCode, $data, $content_type = 'application/json')
+	{
+		header($_SERVER["SERVER_PROTOCOL"] . ' ' . $httpCode);
+		self::jsonExit($data, $content_type);
+	}
+
 	/**
 	 * @brief Encodes content to json.
 	 *

From b939faf4ef11144f885e6b12970739498b13181b Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 15:26:06 -0500
Subject: [PATCH 110/145] Add contact removal from all groups when blocked

---
 src/Model/Contact.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index d38d1cc10..bf7d806db 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -232,6 +232,11 @@ class Contact extends BaseObject
 		}
 
 		DBA::update('user-contact', ['blocked' => $blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
+
+		if ($blocked) {
+			// Blocked contact can't be in any group
+			self::removeFromGroups($cid);
+		}
 	}
 
 	/**
@@ -2220,4 +2225,9 @@ class Contact extends BaseObject
 
 		return $redirect;
 	}
+
+	public static function removeFromGroups($contact_id)
+	{
+		return DBA::delete('group_member', ['contact-id' => $contact_id]);
+	}
 }

From 7ab986bc97936abe737f2b001d80fc610a1060fc Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 15:33:55 -0500
Subject: [PATCH 111/145] Move group module to src/

---
 src/Model/Group.php  |  20 +++
 src/Module/Group.php | 283 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 303 insertions(+)
 create mode 100644 src/Module/Group.php

diff --git a/src/Model/Group.php b/src/Model/Group.php
index 0af10995b..feff4661a 100644
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -16,6 +16,26 @@ use Friendica\Database\DBA;
  */
 class Group extends BaseObject
 {
+	/**
+	 *
+	 *
+	 * @param int $group_id
+	 * @return bool
+	 * @throws \Exception
+	 */
+	public static function exists($group_id, $uid = null)
+	{
+		$condition = ['id' => $group_id, 'deleted' => false];
+
+		if (isset($uid)) {
+			$condition = [
+				'uid' => $uid
+			];
+		}
+
+		return DBA::exists('group', $condition);
+	}
+
 	/**
 	 * @brief Create a new contact group
 	 *
diff --git a/src/Module/Group.php b/src/Module/Group.php
new file mode 100644
index 000000000..c178c5201
--- /dev/null
+++ b/src/Module/Group.php
@@ -0,0 +1,283 @@
+<?php
+/**
+ * @file src/Module/Group.php
+ */
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Model;
+use Friendica\Util\Strings;
+
+require_once 'boot.php';
+
+class Group extends BaseModule
+{
+	public static function post()
+	{
+		$a = self::getApp();
+
+		if (!local_user()) {
+			notice(L10n::t('Permission denied.'));
+			$a->internalRedirect();
+		}
+
+		if (($a->argc == 2) && ($a->argv[1] === 'new')) {
+			BaseModule::checkFormSecurityTokenRedirectOnError('/group/new', 'group_edit');
+
+			$name = Strings::escapeTags(trim($_POST['groupname']));
+			$r = Model\Group::create(local_user(), $name);
+			if ($r) {
+				info(L10n::t('Group created.'));
+				$r = Model\Group::getIdByName(local_user(), $name);
+				if ($r) {
+					$a->internalRedirect('group/' . $r);
+				}
+			} else {
+				notice(L10n::t('Could not create group.'));
+			}
+			$a->internalRedirect('group');
+		}
+
+		if (($a->argc == 2) && intval($a->argv[1])) {
+			BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_edit');
+
+			$group = DBA::selectFirst('group', ['id', 'name'], ['id' => $a->argv[1], 'uid' => local_user()]);
+			if (!DBA::isResult($group)) {
+				notice(L10n::t('Group not found.'));
+				$a->internalRedirect('contact');
+			}
+			$groupname = Strings::escapeTags(trim($_POST['groupname']));
+			if (strlen($groupname) && ($groupname != $group['name'])) {
+				if (Model\Group::update($group['id'], $groupname)) {
+					info(L10n::t('Group name changed.'));
+				}
+			}
+		}
+	}
+
+	public static function content()
+	{
+		$change = false;
+
+		if (!local_user()) {
+			System::httpExit(403);
+		}
+
+		$a = self::getApp();
+
+		$a->page['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
+
+		// With no group number provided we jump to the unassigned contacts as a starting point
+		if ($a->argc == 1) {
+			$a->internalRedirect('group/none');
+		}
+
+		// Switch to text mode interface if we have more than 'n' contacts or group members
+		$switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit');
+		if (is_null($switchtotext)) {
+			$switchtotext = Config::get('system', 'groupedit_image_limit', 200);
+		}
+
+		$tpl = Renderer::getMarkupTemplate('group_edit.tpl');
+
+
+		$context = [
+			'$submit' => L10n::t('Save Group'),
+			'$submit_filter' => L10n::t('Filter'),
+		];
+
+		if (($a->argc == 2) && ($a->argv[1] === 'new')) {
+			return Renderer::replaceMacros($tpl, $context + [
+				'$title' => L10n::t('Create a group of contacts/friends.'),
+				'$gname' => ['groupname', L10n::t('Group Name: '), '', ''],
+				'$gid' => 'new',
+				'$form_security_token' => BaseModule::getFormSecurityToken("group_edit"),
+			]);
+		}
+
+		$nogroup = false;
+
+		if (($a->argc == 2) && ($a->argv[1] === 'none')) {
+			$id = -1;
+			$nogroup = true;
+			$group = [
+				'id' => $id,
+				'name' => L10n::t('Contacts not in any group'),
+			];
+
+			$members = [];
+			$preselected = [];
+
+			$context = $context + [
+				'$title' => $group['name'],
+				'$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
+				'$gid' => $id,
+				'$editable' => 0,
+			];
+		}
+
+		if (($a->argc == 3) && ($a->argv[1] === 'drop')) {
+			BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_drop', 't');
+
+			if (intval($a->argv[2])) {
+				if (!Model\Group::exists($a->argv[2], local_user())) {
+					notice(L10n::t('Group not found.'));
+					$a->internalRedirect('contact');
+				}
+
+				if (Model\Group::remove($a->argv[2])) {
+					info(L10n::t('Group removed.'));
+				} else {
+					notice(L10n::t('Unable to remove group.'));
+				}
+			}
+			$a->internalRedirect('group');
+		}
+
+		if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
+			BaseModule::checkFormSecurityTokenForbiddenOnError('group_member_change', 't');
+
+			if (DBA::exists('contact', ['id' => $a->argv[2], 'uid' => local_user(), 'self' => false, 'pending' => false, 'blocked' => false])) {
+				$change = intval($a->argv[2]);
+			}
+		}
+
+		if (($a->argc > 1) && intval($a->argv[1])) {
+			$group = DBA::selectFirst('group', ['id', 'name'], ['id' => $a->argv[1], 'uid' => local_user(), 'deleted' => false]);
+			if (!DBA::isResult($group)) {
+				notice(L10n::t('Group not found.'));
+				$a->internalRedirect('contact');
+			}
+
+			$members = Model\Contact::getByGroupId($group['id']);
+			$preselected = [];
+
+			if (count($members)) {
+				foreach ($members as $member) {
+					$preselected[] = $member['id'];
+				}
+			}
+
+			if ($change) {
+				if (in_array($change, $preselected)) {
+					Model\Group::removeMember($group['id'], $change);
+				} else {
+					Model\Group::addMember($group['id'], $change);
+				}
+
+				$members = Model\Contact::getByGroupId($group['id']);
+				$preselected = [];
+				if (count($members)) {
+					foreach ($members as $member) {
+						$preselected[] = $member['id'];
+					}
+				}
+			}
+
+			$drop_tpl = Renderer::getMarkupTemplate('group_drop.tpl');
+			$drop_txt = Renderer::replaceMacros($drop_tpl, [
+				'$id' => $group['id'],
+				'$delete' => L10n::t('Delete Group'),
+				'$form_security_token' => BaseModule::getFormSecurityToken("group_drop"),
+			]);
+
+			$context = $context + [
+				'$title' => $group['name'],
+				'$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
+				'$gid' => $group['id'],
+				'$drop' => $drop_txt,
+				'$form_security_token' => BaseModule::getFormSecurityToken('group_edit'),
+				'$edit_name' => L10n::t('Edit Group Name'),
+				'$editable' => 1,
+			];
+		}
+
+		if (!isset($group)) {
+			System::httpExit(400);
+		}
+
+		$groupeditor = [
+			'label_members' => L10n::t('Members'),
+			'members' => [],
+			'label_contacts' => L10n::t('All Contacts'),
+			'group_is_empty' => L10n::t('Group is empty'),
+			'contacts' => [],
+		];
+
+		$sec_token = addslashes(BaseModule::getFormSecurityToken('group_member_change'));
+
+		// Format the data of the group members
+		foreach ($members as $member) {
+			if ($member['url']) {
+				$entry = Contact::getContactTemplateVars($member);
+				$entry['label'] = 'members';
+				$entry['photo_menu'] = '';
+				$entry['change_member'] = [
+					'title'     => L10n::t("Remove contact from group"),
+					'gid'       => $group['id'],
+					'cid'       => $member['id'],
+					'sec_token' => $sec_token
+				];
+
+				$groupeditor['members'][] = $entry;
+			} else {
+				Model\Group::removeMember($group['id'], $member['id']);
+			}
+		}
+
+		if ($nogroup) {
+			$contacts = Model\Contact::getUngroupedList(local_user());
+		} else {
+			$contacts_stmt = DBA::select('contact', [],
+				['uid' => local_user(), 'pending' => false, 'blocked' => false, 'self' => false],
+				['order' => ['name']]
+			);
+			$contacts = DBA::toArray($contacts_stmt);
+			$context['$desc'] = L10n::t('Click on a contact to add or remove.');
+		}
+
+		if (DBA::isResult($contacts)) {
+			// Format the data of the contacts who aren't in the contact group
+			foreach ($contacts as $member) {
+				if (!in_array($member['id'], $preselected)) {
+					$entry = Contact::getContactTemplateVars($member);
+					$entry['label'] = 'contacts';
+					if (!$nogroup)
+						$entry['photo_menu'] = [];
+
+					if (!$nogroup) {
+						$entry['change_member'] = [
+							'title'     => L10n::t("Add contact to group"),
+							'gid'       => $group['id'],
+							'cid'       => $member['id'],
+							'sec_token' => $sec_token
+						];
+					}
+
+					$groupeditor['contacts'][] = $entry;
+				}
+			}
+		}
+
+		$context['$groupeditor'] = $groupeditor;
+
+		// If there are to many contacts we could provide an alternative view mode
+		$total = count($groupeditor['members']) + count($groupeditor['contacts']);
+		$context['$shortmode'] = (($switchtotext && ($total > $switchtotext)) ? true : false);
+
+		if ($change) {
+			$tpl = Renderer::getMarkupTemplate('groupeditor.tpl');
+			echo Renderer::replaceMacros($tpl, $context);
+			exit();
+		}
+
+		return Renderer::replaceMacros($tpl, $context);
+	}
+}
\ No newline at end of file

From 63762932184b5a4273adc7b81e459bc8f97305cb Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 15:34:45 -0500
Subject: [PATCH 112/145] Merge /contactgroup module with Group module

---
 src/Module/Group.php | 67 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/src/Module/Group.php b/src/Module/Group.php
index c178c5201..747ec1e56 100644
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -23,6 +23,10 @@ class Group extends BaseModule
 	{
 		$a = self::getApp();
 
+		if ($a->isAjax()) {
+			self::ajaxPost();
+		}
+
 		if (!local_user()) {
 			notice(L10n::t('Permission denied.'));
 			$a->internalRedirect();
@@ -62,6 +66,69 @@ class Group extends BaseModule
 		}
 	}
 
+	public static function ajaxPost()
+	{
+		try {
+			$a = self::getApp();
+
+			if (!local_user()) {
+				throw new \Exception(L10n::t('Permission denied.'), 403);
+			}
+
+			// POST /group/123/add/123
+			// POST /group/123/remove/123
+			if ($a->argc == 4) {
+				list($group_id, $command, $contact_id) = array_slice($a->argv, 1);
+
+				if (!Model\Group::exists($group_id, local_user())) {
+					throw new \Exception(L10n::t('Unknown group.'), 404);
+				}
+
+				$contact = DBA::selectFirst('contact', ['pending', 'blocked', 'deleted'], ['id' => $contact_id, 'uid' => local_user()]);
+				if (!DBA::isResult($contact)) {
+					throw new \Exception(L10n::t('Contact not found.'), 404);
+				}
+
+				if ($contact['pending']) {
+					throw new \Exception(L10n::t('Contact is unavailable.'), 400);
+				}
+
+				if ($contact['deleted']) {
+					throw new \Exception(L10n::t('Contact is deleted.'), 410);
+				}
+
+				switch($command) {
+					case 'add':
+						if ($contact['blocked']) {
+							throw new \Exception(L10n::t('Contact is blocked, unable to add it to a group.'), 400);
+						}
+
+						if (!Model\Group::addMember($group_id, $contact_id)) {
+							throw new \Exception(L10n::t('Unable to add the contact to the group.'), 500);
+						}
+						$message = L10n::t('Contact successfully added to group.');
+						break;
+					case 'remove':
+						if (!Model\Group::removeMember($group_id, $contact_id)) {
+							throw new \Exception(L10n::t('Unable to remove the contact from the group.'), 500);
+						}
+						$message = L10n::t('Contact successfully removed from group.');
+						break;
+					default:
+						throw new \Exception(L10n::t('Unknown group command.'), 400);
+				}
+			} else {
+				throw new \Exception(L10n::t('Bad request.'), 400);
+			}
+
+			notice($message);
+			System::jsonExit(['status' => 'OK', 'message' => $message]);
+		} catch (\Exception $e) {
+			notice($e->getMessage());
+			System::jsonError($e->getCode(), ['status' => 'error', 'message' => $e->getMessage()]);
+		}
+	}
+
 	public static function content()
 	{
 		$change = false;

From 0a58e4c952b0b104adde60bc142a940f195ab4fd Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 15:36:06 -0500
Subject: [PATCH 113/145] Improve contactgroupChangeMember() javascript
 function

- Add usage of new /group/123/add|remove/123 URL
- Add checkbox revert in case of error
---
 view/js/main.js                             | 20 +++++++++++++++++---
 view/templates/group_side.tpl               |  2 +-
 view/theme/frio/templates/group_side.tpl    |  2 +-
 view/theme/quattro/templates/group_side.tpl |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/view/js/main.js b/view/js/main.js
index 3370d7ccd..cd09de014 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -793,11 +793,25 @@ function profChangeMember(gid,cid) {
 	});
 }
 
-function contactgroupChangeMember(gid,cid) {
+function contactgroupChangeMember(checkbox, gid, cid) {
+	let url;
+	// checkbox.checked is the checkbox state after the click
+	if (checkbox.checked) {
+		url = 'group/' + gid + '/add/' + cid;
+	} else {
+		url = 'group/' + gid + '/remove/' + cid;
+	}
 	$('body').css('cursor', 'wait');
-	$.get('contactgroup/' + gid + '/' + cid, function(data) {
-			$('body').css('cursor', 'auto');
+	$.post(url)
+	.error(function () {
+		// Restores previous state in case of error
+		checkbox.checked = !checkbox.checked;
+	})
+	.always(function() {
+		$('body').css('cursor', 'auto');
 	});
+
+	return true;
 }
 
 function checkboxhighlight(box) {
diff --git a/view/templates/group_side.tpl b/view/templates/group_side.tpl
index 5796bb735..31b9287ba 100644
--- a/view/templates/group_side.tpl
+++ b/view/templates/group_side.tpl
@@ -9,7 +9,7 @@
 					{{if $group.cid}}
 						<input type="checkbox"
 							class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action"
-							onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
+							onclick="return contactgroupChangeMember(this, '{{$group.id}}','{{$group.cid}}');"
 							{{if $group.ismember}}checked="checked"{{/if}}
 						/>
 					{{/if}}
diff --git a/view/theme/frio/templates/group_side.tpl b/view/theme/frio/templates/group_side.tpl
index 947ae974e..75983b36e 100644
--- a/view/theme/frio/templates/group_side.tpl
+++ b/view/theme/frio/templates/group_side.tpl
@@ -28,7 +28,7 @@
 							<input type="checkbox"
 								id="sidebar-group-checkbox-{{$group.id}}"
 								class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action"
-								onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
+								onclick="return contactgroupChangeMember(this, '{{$group.id}}','{{$group.cid}}');"
 								{{if $group.ismember}}checked="checked"{{/if}}
 								aria-checked="{{if $group.ismember}}true{{else}}false{{/if}}"
 							/>
diff --git a/view/theme/quattro/templates/group_side.tpl b/view/theme/quattro/templates/group_side.tpl
index 620d2de75..18a6105a6 100644
--- a/view/theme/quattro/templates/group_side.tpl
+++ b/view/theme/quattro/templates/group_side.tpl
@@ -17,7 +17,7 @@
 				{{if $group.cid}}
 					<input type="checkbox"
 						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action"
-						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
+						onclick="return contactgroupChangeMember(this, '{{$group.id}}','{{$group.cid}}');"
 						{{if $group.ismember}}checked="checked"{{/if}}
 					/>
 				{{/if}}

From 486de602ff5e7b49bf0184bcbadf6e80985e8cea Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 15:36:27 -0500
Subject: [PATCH 114/145] Delete mod/contactgroup and mod/group files

---
 mod/contactgroup.php |  53 --------
 mod/group.php        | 313 -------------------------------------------
 2 files changed, 366 deletions(-)
 delete mode 100644 mod/contactgroup.php
 delete mode 100644 mod/group.php

diff --git a/mod/contactgroup.php b/mod/contactgroup.php
deleted file mode 100644
index 07997cd11..000000000
--- a/mod/contactgroup.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-use Friendica\App;
-use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\Group;
-
-function contactgroup_content(App $a)
-{
-	if (!local_user()) {
-		exit();
-	}
-
-	$change = null;
-	if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
-		$r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1",
-			intval($a->argv[2]),
-			intval(local_user())
-		);
-		if (DBA::isResult($r)) {
-			$change = intval($a->argv[2]);
-		}
-	}
-
-	if (($a->argc > 1) && (intval($a->argv[1]))) {
-		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
-			intval($a->argv[1]),
-			intval(local_user())
-		);
-		if (!DBA::isResult($r)) {
-			exit();
-		}
-
-		$group = $r[0];
-		$members = Contact::getByGroupId($group['id']);
-		$preselected = [];
-		if (count($members)) {
-			foreach ($members as $member) {
-				$preselected[] = $member['id'];
-			}
-		}
-
-		if (!empty($change)) {
-			if (in_array($change, $preselected)) {
-				Group::removeMember($group['id'], $change);
-			} else {
-				Group::addMember($group['id'], $change);
-			}
-		}
-	}
-
-	exit();
-}
diff --git a/mod/group.php b/mod/group.php
deleted file mode 100644
index a6f649bf3..000000000
--- a/mod/group.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-/**
- * @file mod/group.php
- * @brief The group module (create and rename contact groups, add and
- *	remove contacts to the contact groups
- */
-
-use Friendica\App;
-use Friendica\BaseModule;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
-use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
-use Friendica\Model;
-use Friendica\Module;
-use Friendica\Util\Strings;
-
-function group_init(App $a) {
-	if (local_user()) {
-		$a->page['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
-	}
-}
-
-function group_post(App $a) {
-
-	if (!local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
-		return;
-	}
-
-	if (($a->argc == 2) && ($a->argv[1] === 'new')) {
-		BaseModule::checkFormSecurityTokenRedirectOnError('/group/new', 'group_edit');
-
-		$name = Strings::escapeTags(trim($_POST['groupname']));
-		$r = Model\Group::create(local_user(), $name);
-		if ($r) {
-			info(L10n::t('Group created.') . EOL);
-			$r = Model\Group::getIdByName(local_user(), $name);
-			if ($r) {
-				$a->internalRedirect('group/' . $r);
-			}
-		} else {
-			notice(L10n::t('Could not create group.') . EOL);
-		}
-		$a->internalRedirect('group');
-		return; // NOTREACHED
-	}
-
-	if (($a->argc == 2) && intval($a->argv[1])) {
-		BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_edit');
-
-		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($a->argv[1]),
-			intval(local_user())
-		);
-		if (!DBA::isResult($r)) {
-			notice(L10n::t('Group not found.') . EOL);
-			$a->internalRedirect('contact');
-			return; // NOTREACHED
-		}
-		$group = $r[0];
-		$groupname = Strings::escapeTags(trim($_POST['groupname']));
-		if (strlen($groupname) && ($groupname != $group['name'])) {
-			$r = q("UPDATE `group` SET `name` = '%s' WHERE `uid` = %d AND `id` = %d",
-				DBA::escape($groupname),
-				intval(local_user()),
-				intval($group['id'])
-			);
-
-			if ($r) {
-				info(L10n::t('Group name changed.') . EOL);
-			}
-		}
-
-		$a->page['aside'] = Model\Group::sidebarWidget();
-	}
-	return;
-}
-
-function group_content(App $a) {
-	$change = false;
-
-	if (!local_user()) {
-		notice(L10n::t('Permission denied') . EOL);
-		return;
-	}
-
-	// With no group number provided we jump to the unassigned contacts as a starting point
-	if ($a->argc == 1) {
-		$a->internalRedirect('group/none');
-	}
-
-	// Switch to text mode interface if we have more than 'n' contacts or group members
-	$switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit');
-	if (is_null($switchtotext)) {
-		$switchtotext = Config::get('system', 'groupedit_image_limit', 400);
-	}
-
-	$tpl = Renderer::getMarkupTemplate('group_edit.tpl');
-
-	$context = [
-		'$submit' => L10n::t('Save Group'),
-		'$submit_filter' => L10n::t('Filter'),
-	];
-
-	if (($a->argc == 2) && ($a->argv[1] === 'new')) {
-		return Renderer::replaceMacros($tpl, $context + [
-			'$title' => L10n::t('Create a group of contacts/friends.'),
-			'$gname' => ['groupname', L10n::t('Group Name: '), '', ''],
-			'$gid' => 'new',
-			'$form_security_token' => BaseModule::getFormSecurityToken("group_edit"),
-		]);
-
-
-	}
-
-	$nogroup = false;
-
-	if (($a->argc == 2) && ($a->argv[1] === 'none')) {
-		$id = -1;
-		$nogroup = true;
-		$group = [
-			'id' => $id,
-			'name' => L10n::t('Contacts not in any group'),
-		];
-
-		$members = [];
-		$preselected = [];
-
-		$context = $context + [
-			'$title' => $group['name'],
-			'$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
-			'$gid' => $id,
-			'$editable' => 0,
-		];
-	}
-
-
-	if (($a->argc == 3) && ($a->argv[1] === 'drop')) {
-		BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_drop', 't');
-
-		if (intval($a->argv[2])) {
-			$r = q("SELECT `name` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval($a->argv[2]),
-				intval(local_user())
-			);
-
-			$result = null;
-
-			if (DBA::isResult($r)) {
-				$result = Model\Group::removeByName(local_user(), $r[0]['name']);
-			}
-
-			if ($result) {
-				info(L10n::t('Group removed.') . EOL);
-			} else {
-				notice(L10n::t('Unable to remove group.') . EOL);
-			}
-		}
-		$a->internalRedirect('group');
-		// NOTREACHED
-	}
-
-	if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
-		BaseModule::checkFormSecurityTokenForbiddenOnError('group_member_change', 't');
-
-		$r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1",
-			intval($a->argv[2]),
-			intval(local_user())
-		);
-		if (DBA::isResult($r)) {
-			$change = intval($a->argv[2]);
-		}
-	}
-
-	if (($a->argc > 1) && intval($a->argv[1])) {
-		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
-			intval($a->argv[1]),
-			intval(local_user())
-		);
-
-		if (!DBA::isResult($r)) {
-			notice(L10n::t('Group not found.') . EOL);
-			$a->internalRedirect('contact');
-		}
-
-		$group = $r[0];
-		$members = Model\Contact::getByGroupId($group['id']);
-		$preselected = [];
-
-		if (count($members)) {
-			foreach ($members as $member) {
-				$preselected[] = $member['id'];
-			}
-		}
-
-		if ($change) {
-			if (in_array($change, $preselected)) {
-				Model\Group::removeMember($group['id'], $change);
-			} else {
-				Model\Group::addMember($group['id'], $change);
-			}
-
-			$members = Model\Contact::getByGroupId($group['id']);
-			$preselected = [];
-			if (count($members)) {
-				foreach ($members as $member) {
-					$preselected[] = $member['id'];
-				}
-			}
-		}
-
-		$drop_tpl = Renderer::getMarkupTemplate('group_drop.tpl');
-		$drop_txt = Renderer::replaceMacros($drop_tpl, [
-			'$id' => $group['id'],
-			'$delete' => L10n::t('Delete Group'),
-			'$form_security_token' => BaseModule::getFormSecurityToken("group_drop"),
-		]);
-
-
-		$context = $context + [
-			'$title' => $group['name'],
-			'$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
-			'$gid' => $group['id'],
-			'$drop' => $drop_txt,
-			'$form_security_token' => BaseModule::getFormSecurityToken('group_edit'),
-			'$edit_name' => L10n::t('Edit Group Name'),
-			'$editable' => 1,
-		];
-
-	}
-
-	if (!isset($group)) {
-		return;
-	}
-
-	$groupeditor = [
-		'label_members' => L10n::t('Members'),
-		'members' => [],
-		'label_contacts' => L10n::t('All Contacts'),
-		'group_is_empty' => L10n::t('Group is empty'),
-		'contacts' => [],
-	];
-
-	$sec_token = addslashes(BaseModule::getFormSecurityToken('group_member_change'));
-
-	// Format the data of the group members
-	foreach ($members as $member) {
-		if ($member['url']) {
-			$entry = Module\Contact::getContactTemplateVars($member);
-			$entry['label'] = 'members';
-			$entry['photo_menu'] = '';
-			$entry['change_member'] = [
-				'title'     => L10n::t("Remove contact from group"),
-				'gid'       => $group['id'],
-				'cid'       => $member['id'],
-				'sec_token' => $sec_token
-			];
-
-			$groupeditor['members'][] = $entry;
-		} else {
-			Model\Group::removeMember($group['id'], $member['id']);
-		}
-	}
-
-	if ($nogroup) {
-		$r = Model\Contact::getUngroupedList(local_user());
-	} else {
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
-			intval(local_user())
-		);
-		$context['$desc'] = L10n::t('Click on a contact to add or remove.');
-	}
-
-	if (DBA::isResult($r)) {
-		// Format the data of the contacts who aren't in the contact group
-		foreach ($r as $member) {
-			if (!in_array($member['id'], $preselected)) {
-				$entry = Module\Contact::getContactTemplateVars($member);
-				$entry['label'] = 'contacts';
-				if (!$nogroup)
-					$entry['photo_menu'] = [];
-
-				if (!$nogroup) {
-					$entry['change_member'] = [
-						'title'     => L10n::t("Add contact to group"),
-						'gid'       => $group['id'],
-						'cid'       => $member['id'],
-						'sec_token' => $sec_token
-					];
-				}
-
-				$groupeditor['contacts'][] = $entry;
-			}
-		}
-	}
-
-	$context['$groupeditor'] = $groupeditor;
-
-	// If there are to many contacts we could provide an alternative view mode
-	$total = count($groupeditor['members']) + count($groupeditor['contacts']);
-	$context['$shortmode'] = (($switchtotext && ($total > $switchtotext)) ? true : false);
-
-	if ($change) {
-		$tpl = Renderer::getMarkupTemplate('groupeditor.tpl');
-		echo Renderer::replaceMacros($tpl, $context);
-		exit();
-	}
-
-	return Renderer::replaceMacros($tpl, $context);
-
-}

From 102c44e8eee263c4a22a845a184be73c9836e1a1 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 18:11:48 -0500
Subject: [PATCH 115/145] Fix typo in mod/profiles

---
 mod/profiles.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mod/profiles.php b/mod/profiles.php
index bc41718c5..58f23e463 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -338,7 +338,7 @@ function profiles_post(App $a) {
 
 		$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
 
-		PConfig::set(local_user(), 'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
+		PConfig::set(local_user(), 'system', 'detailled_profile', (($_POST['detailed_profile'] == 1) ? 1: 0));
 
 		$changes = [];
 		if ($is_default) {
@@ -535,18 +535,18 @@ function profiles_content(App $a) {
 		$personal_account = !(in_array($a->user["page-flags"],
 					[User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]));
 
-		$detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
+		$detailed_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
 
 		$is_default = (($r[0]['is-default']) ? 1 : 0);
 		$tpl = Renderer::getMarkupTemplate("profile_edit.tpl");
 		$o .= Renderer::replaceMacros($tpl, [
 			'$personal_account' => $personal_account,
-			'$detailled_profile' => $detailled_profile,
+			'$detailled_profile' => $detailed_profile,
 
 			'$details' => [
-				'detailled_profile', //Name
+				'detailed_profile', //Name
 				L10n::t('Show more profile fields:'), //Label
-				$detailled_profile, //Value
+				$detailed_profile, //Value
 				'', //Help string
 				[L10n::t('No'), L10n::t('Yes')] //Off - On strings
 			],

From b2e41e3298c1a9caef8c78054c49bfb7f7fa0d75 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 18:29:54 -0500
Subject: [PATCH 116/145] Replace EMPTY value by empty value in profile
 selectors

---
 src/Content/ContactSelector.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 470590388..e327069b3 100644
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -150,7 +150,7 @@ class ContactSelector
 	{
 		$o = '';
 		$select = [
-			'EMPTY'            => '',
+			''                 => L10n::t('No answer'),
 			'Male'             => L10n::t('Male'),
 			'Female'           => L10n::t('Female'),
 			'Currently Male'   => L10n::t('Currently Male'),
@@ -190,7 +190,7 @@ class ContactSelector
 	{
 		$o = '';
 		$select = [
-			'EMPTY'         => '',
+			''              => L10n::t('No answer'),
 			'Males'         => L10n::t('Males'),
 			'Females'       => L10n::t('Females'),
 			'Gay'           => L10n::t('Gay'),
@@ -228,7 +228,7 @@ class ContactSelector
 	{
 		$o = '';
 		$select = [
-			'EMPTY'                => '',
+			''                     => L10n::t('No answer'),
 			'Single'               => L10n::t('Single'),
 			'Lonely'               => L10n::t('Lonely'),
 			'Available'            => L10n::t('Available'),

From dbcca9cfacbee00238025a75d74808218304061a Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 18:30:05 -0500
Subject: [PATCH 117/145] Hide "never" on profile

---
 src/Model/Profile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index aacceedb3..b10e9848f 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -787,7 +787,7 @@ class Profile
 				$profile['marital']['with'] = $a->profile['with'];
 			}
 
-			if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= DBA::NULL_DATETIME) {
+			if (strlen($a->profile['howlong']) && $a->profile['howlong'] > DBA::NULL_DATETIME) {
 				$profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], L10n::t('for %1$d %2$s'));
 			}
 

From cd363291c6c540d478c45e4c11104d9a9f4bfde3 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 19:40:05 -0500
Subject: [PATCH 118/145] Update base translation strings

---
 view/lang/C/messages.po | 337 +++++++++++++++++++++-------------------
 1 file changed, 175 insertions(+), 162 deletions(-)

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index b0a1cf3f0..7ef1cfad0 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:33-0500\n"
+"POT-Creation-Date: 2019-02-23 18:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,26 +18,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 
-#: include/api.php:1179
+#: include/api.php:1117
 #, php-format
 msgid "Daily posting limit of %d post reached. The post was rejected."
 msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/api.php:1193
+#: include/api.php:1131
 #, php-format
 msgid "Weekly posting limit of %d post reached. The post was rejected."
 msgid_plural "Weekly posting limit of %d posts reached. The post was rejected."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/api.php:1207
+#: include/api.php:1145
 #, php-format
 msgid "Monthly posting limit of %d post reached. The post was rejected."
 msgstr ""
 
-#: include/api.php:4578 mod/photos.php:93 mod/photos.php:201 mod/photos.php:695
+#: include/api.php:4520 mod/photos.php:93 mod/photos.php:201 mod/photos.php:695
 #: mod/photos.php:1126 mod/photos.php:1143 mod/photos.php:1636
 #: mod/profile_photo.php:85 mod/profile_photo.php:94 mod/profile_photo.php:103
 #: mod/profile_photo.php:217 mod/profile_photo.php:305
@@ -134,7 +134,7 @@ msgstr ""
 msgid "Might attend"
 msgstr ""
 
-#: include/conversation.php:649 mod/photos.php:1524 src/Object/Post.php:207
+#: include/conversation.php:649 mod/photos.php:1524 src/Object/Post.php:208
 msgid "Select"
 msgstr ""
 
@@ -143,20 +143,20 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: include/conversation.php:684 src/Object/Post.php:380 src/Object/Post.php:381
+#: include/conversation.php:684 src/Object/Post.php:381 src/Object/Post.php:382
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: include/conversation.php:696 src/Object/Post.php:368
+#: include/conversation.php:696 src/Object/Post.php:369
 msgid "Categories:"
 msgstr ""
 
-#: include/conversation.php:697 src/Object/Post.php:369
+#: include/conversation.php:697 src/Object/Post.php:370
 msgid "Filed under:"
 msgstr ""
 
-#: include/conversation.php:704 src/Object/Post.php:394
+#: include/conversation.php:704 src/Object/Post.php:395
 #, php-format
 msgid "%s from %s"
 msgstr ""
@@ -167,7 +167,7 @@ msgstr ""
 
 #: include/conversation.php:721 include/conversation.php:1171
 #: mod/editpost.php:88 mod/message.php:260 mod/message.php:442
-#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:421
+#: mod/photos.php:1440 mod/wallmessage.php:141 src/Object/Post.php:422
 msgid "Please wait"
 msgstr ""
 
@@ -188,7 +188,7 @@ msgid "View Status"
 msgstr ""
 
 #: include/conversation.php:895 include/conversation.php:911
-#: mod/allfriends.php:72 mod/directory.php:167 mod/dirfind.php:226
+#: mod/allfriends.php:72 mod/directory.php:198 mod/dirfind.php:226
 #: mod/match.php:87 mod/suggest.php:87 src/Model/Contact.php:989
 #: src/Model/Contact.php:1042 src/Model/Contact.php:1050
 msgid "View Profile"
@@ -311,7 +311,7 @@ msgstr ""
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: include/conversation.php:1111 src/Object/Post.php:883
+#: include/conversation.php:1111 src/Object/Post.php:886
 msgid "Please enter a image/video/audio/webpage URL:"
 msgstr ""
 
@@ -356,35 +356,35 @@ msgstr ""
 msgid "attach file"
 msgstr ""
 
-#: include/conversation.php:1155 src/Object/Post.php:875
+#: include/conversation.php:1155 src/Object/Post.php:878
 msgid "Bold"
 msgstr ""
 
-#: include/conversation.php:1156 src/Object/Post.php:876
+#: include/conversation.php:1156 src/Object/Post.php:879
 msgid "Italic"
 msgstr ""
 
-#: include/conversation.php:1157 src/Object/Post.php:877
+#: include/conversation.php:1157 src/Object/Post.php:880
 msgid "Underline"
 msgstr ""
 
-#: include/conversation.php:1158 src/Object/Post.php:878
+#: include/conversation.php:1158 src/Object/Post.php:881
 msgid "Quote"
 msgstr ""
 
-#: include/conversation.php:1159 src/Object/Post.php:879
+#: include/conversation.php:1159 src/Object/Post.php:882
 msgid "Code"
 msgstr ""
 
-#: include/conversation.php:1160 src/Object/Post.php:880
+#: include/conversation.php:1160 src/Object/Post.php:883
 msgid "Image"
 msgstr ""
 
-#: include/conversation.php:1161 src/Object/Post.php:881
+#: include/conversation.php:1161 src/Object/Post.php:884
 msgid "Link"
 msgstr ""
 
-#: include/conversation.php:1162 src/Object/Post.php:882
+#: include/conversation.php:1162 src/Object/Post.php:885
 msgid "Link or Media"
 msgstr ""
 
@@ -426,7 +426,7 @@ msgstr ""
 
 #: include/conversation.php:1186 mod/editpost.php:110 mod/events.php:551
 #: mod/photos.php:1458 mod/photos.php:1497 mod/photos.php:1557
-#: src/Object/Post.php:884
+#: src/Object/Post.php:887
 msgid "Preview"
 msgstr ""
 
@@ -837,7 +837,7 @@ msgstr ""
 #: mod/unfollow.php:77 mod/unfollow.php:109 mod/viewcontacts.php:56
 #: mod/wallmessage.php:19 mod/wallmessage.php:43 mod/wallmessage.php:82
 #: mod/wallmessage.php:106 mod/wall_attach.php:76 mod/wall_attach.php:79
-#: mod/wall_upload.php:107 mod/wall_upload.php:110 src/App.php:1480
+#: mod/wall_upload.php:107 mod/wall_upload.php:110 src/App.php:1390
 #: src/Module/Attach.php:42 src/Module/Contact.php:360
 #: src/Module/Register.php:193
 msgid "Permission denied."
@@ -2875,7 +2875,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: mod/apps.php:15 src/App.php:1349
+#: mod/apps.php:15 src/App.php:1259
 msgid "You must be logged in to use addons. "
 msgstr ""
 
@@ -3009,7 +3009,7 @@ msgid "Access denied."
 msgstr ""
 
 #: mod/cal.php:46 mod/dfrn_poll.php:486 mod/help.php:68 mod/viewcontacts.php:34
-#: src/App.php:1400
+#: src/App.php:1310
 msgid "Page not found."
 msgstr ""
 
@@ -3185,7 +3185,7 @@ msgstr ""
 #: mod/photos.php:1137 mod/photos.php:1412 mod/photos.php:1457
 #: mod/photos.php:1496 mod/photos.php:1556 mod/poke.php:188
 #: mod/profiles.php:562 src/Module/Contact.php:594 src/Module/Install.php:187
-#: src/Module/Install.php:222 src/Object/Post.php:874
+#: src/Module/Install.php:222 src/Object/Post.php:877
 #: view/theme/duepuntozero/config.php:72 view/theme/frio/config.php:119
 #: view/theme/quattro/config.php:74 view/theme/vier/config.php:120
 msgid "Submit"
@@ -3561,56 +3561,56 @@ msgstr ""
 msgid "Submit Request"
 msgstr ""
 
-#: mod/directory.php:154 mod/events.php:541 mod/notifications.php:253
+#: mod/directory.php:121
+msgid "No entries (some entries may be hidden)."
+msgstr ""
+
+#: mod/directory.php:128 src/Content/Widget.php:70
+#: view/theme/vier/theme.php:208
+msgid "Global Directory"
+msgstr ""
+
+#: mod/directory.php:130
+msgid "Find on this site"
+msgstr ""
+
+#: mod/directory.php:132
+msgid "Results for:"
+msgstr ""
+
+#: mod/directory.php:134
+msgid "Site Directory"
+msgstr ""
+
+#: mod/directory.php:136 src/Content/Widget.php:65 src/Module/Contact.php:817
+#: view/theme/vier/theme.php:203
+msgid "Find"
+msgstr ""
+
+#: mod/directory.php:185 mod/events.php:541 mod/notifications.php:253
 #: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:437
 #: src/Model/Event.php:933 src/Model/Profile.php:443 src/Module/Contact.php:643
 msgid "Location:"
 msgstr ""
 
-#: mod/directory.php:159 mod/notifications.php:259 src/Model/Profile.php:446
+#: mod/directory.php:190 mod/notifications.php:259 src/Model/Profile.php:446
 #: src/Model/Profile.php:758
 msgid "Gender:"
 msgstr ""
 
-#: mod/directory.php:160 src/Model/Profile.php:447 src/Model/Profile.php:782
+#: mod/directory.php:191 src/Model/Profile.php:447 src/Model/Profile.php:782
 msgid "Status:"
 msgstr ""
 
-#: mod/directory.php:161 src/Model/Profile.php:448 src/Model/Profile.php:799
+#: mod/directory.php:192 src/Model/Profile.php:448 src/Model/Profile.php:799
 msgid "Homepage:"
 msgstr ""
 
-#: mod/directory.php:162 mod/notifications.php:255 src/Model/Profile.php:449
+#: mod/directory.php:193 mod/notifications.php:255 src/Model/Profile.php:449
 #: src/Model/Profile.php:819 src/Module/Contact.php:647
 msgid "About:"
 msgstr ""
 
-#: mod/directory.php:210 src/Content/Widget.php:70
-#: view/theme/vier/theme.php:208
-msgid "Global Directory"
-msgstr ""
-
-#: mod/directory.php:212
-msgid "Find on this site"
-msgstr ""
-
-#: mod/directory.php:214
-msgid "Results for:"
-msgstr ""
-
-#: mod/directory.php:216
-msgid "Site Directory"
-msgstr ""
-
-#: mod/directory.php:217 src/Content/Widget.php:65 src/Module/Contact.php:817
-#: view/theme/vier/theme.php:203
-msgid "Find"
-msgstr ""
-
-#: mod/directory.php:221
-msgid "No entries (some entries may be hidden)."
-msgstr ""
-
 #: mod/dirfind.php:55
 #, php-format
 msgid "People Search - %s"
@@ -3747,8 +3747,8 @@ msgstr ""
 
 #: mod/fbrowser.php:45 mod/fbrowser.php:69 mod/photos.php:201
 #: mod/photos.php:1031 mod/photos.php:1126 mod/photos.php:1143
-#: mod/photos.php:1610 mod/photos.php:1625 src/Model/Photo.php:547
-#: src/Model/Photo.php:556
+#: mod/photos.php:1610 mod/photos.php:1625 src/Model/Photo.php:552
+#: src/Model/Photo.php:561
 msgid "Contact Photos"
 msgstr ""
 
@@ -3874,7 +3874,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: mod/group.php:85 mod/profperm.php:30 src/App.php:1479
+#: mod/group.php:85 mod/profperm.php:30 src/App.php:1389
 msgid "Permission denied"
 msgstr ""
 
@@ -3951,7 +3951,7 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: mod/help.php:65 src/App.php:1397
+#: mod/help.php:65 src/App.php:1307
 msgid "Not Found"
 msgstr ""
 
@@ -4873,7 +4873,7 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:89 src/Object/Post.php:283
+#: mod/ostatus_subscribe.php:89 src/Object/Post.php:284
 msgid "ignored"
 msgstr ""
 
@@ -5030,7 +5030,7 @@ msgstr ""
 msgid "Use as profile photo"
 msgstr ""
 
-#: mod/photos.php:1297 src/Object/Post.php:156
+#: mod/photos.php:1297 src/Object/Post.php:157
 msgid "Private Message"
 msgstr ""
 
@@ -5074,21 +5074,21 @@ msgstr ""
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: mod/photos.php:1438 src/Object/Post.php:311
+#: mod/photos.php:1438 src/Object/Post.php:312
 msgid "I like this (toggle)"
 msgstr ""
 
-#: mod/photos.php:1439 src/Object/Post.php:312
+#: mod/photos.php:1439 src/Object/Post.php:313
 msgid "I don't like this (toggle)"
 msgstr ""
 
 #: mod/photos.php:1454 mod/photos.php:1493 mod/photos.php:1553
-#: src/Module/Contact.php:1018 src/Object/Post.php:871
+#: src/Module/Contact.php:1018 src/Object/Post.php:874
 msgid "This is you"
 msgstr ""
 
 #: mod/photos.php:1456 mod/photos.php:1495 mod/photos.php:1555
-#: src/Object/Post.php:417 src/Object/Post.php:873
+#: src/Object/Post.php:418 src/Object/Post.php:876
 msgid "Comment"
 msgstr ""
 
@@ -5736,7 +5736,7 @@ msgstr ""
 msgid "Connected Apps"
 msgstr ""
 
-#: mod/settings.php:725 src/Object/Post.php:166 src/Object/Post.php:168
+#: mod/settings.php:725 src/Object/Post.php:167 src/Object/Post.php:169
 msgid "Edit"
 msgstr ""
 
@@ -6644,15 +6644,15 @@ msgstr ""
 msgid "Wall Photos"
 msgstr ""
 
-#: src/App.php:665
+#: src/App.php:610
 msgid "Delete this item?"
 msgstr ""
 
-#: src/App.php:707
+#: src/App.php:652
 msgid "toggle mobile"
 msgstr ""
 
-#: src/App.php:1075
+#: src/App.php:985
 msgid "No system theme config value set."
 msgstr ""
 
@@ -6742,6 +6742,11 @@ msgstr ""
 msgid "pnut"
 msgstr ""
 
+#: src/Content/ContactSelector.php:153 src/Content/ContactSelector.php:193
+#: src/Content/ContactSelector.php:231
+msgid "No answer"
+msgstr ""
+
 #: src/Content/ContactSelector.php:154
 msgid "Male"
 msgstr ""
@@ -7562,29 +7567,29 @@ msgstr ""
 msgid "All pending post updates are done."
 msgstr ""
 
-#: src/Core/Installer.php:163
+#: src/Core/Installer.php:164
 msgid ""
 "The database configuration file \"config/local.config.php\" could not be "
 "written. Please use the enclosed text to create a configuration file in your "
 "web server root."
 msgstr ""
 
-#: src/Core/Installer.php:182
+#: src/Core/Installer.php:183
 msgid ""
 "You may need to import the file \"database.sql\" manually using phpmyadmin "
 "or mysql."
 msgstr ""
 
-#: src/Core/Installer.php:183 src/Module/Install.php:132
+#: src/Core/Installer.php:184 src/Module/Install.php:132
 #: src/Module/Install.php:263
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: src/Core/Installer.php:244
+#: src/Core/Installer.php:245
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: src/Core/Installer.php:245
+#: src/Core/Installer.php:246
 msgid ""
 "If you don't have a command line version of PHP installed on your server, "
 "you will not be able to run the background processing. See <a href='https://"
@@ -7592,237 +7597,245 @@ msgid ""
 "worker'>'Setup the worker'</a>"
 msgstr ""
 
-#: src/Core/Installer.php:249
+#: src/Core/Installer.php:250
 msgid "PHP executable path"
 msgstr ""
 
-#: src/Core/Installer.php:249
+#: src/Core/Installer.php:250
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: src/Core/Installer.php:254
+#: src/Core/Installer.php:255
 msgid "Command line PHP"
 msgstr ""
 
-#: src/Core/Installer.php:263
+#: src/Core/Installer.php:264
 msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr ""
 
-#: src/Core/Installer.php:264
+#: src/Core/Installer.php:265
 msgid "Found PHP version: "
 msgstr ""
 
-#: src/Core/Installer.php:266
+#: src/Core/Installer.php:267
 msgid "PHP cli binary"
 msgstr ""
 
-#: src/Core/Installer.php:279
+#: src/Core/Installer.php:280
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: src/Core/Installer.php:280
+#: src/Core/Installer.php:281
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: src/Core/Installer.php:285
+#: src/Core/Installer.php:286
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: src/Core/Installer.php:317
+#: src/Core/Installer.php:318
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: src/Core/Installer.php:318
+#: src/Core/Installer.php:319
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
 
-#: src/Core/Installer.php:321
+#: src/Core/Installer.php:322
 msgid "Generate encryption keys"
 msgstr ""
 
-#: src/Core/Installer.php:372
+#: src/Core/Installer.php:374
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:377
+#: src/Core/Installer.php:379
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: src/Core/Installer.php:383
+#: src/Core/Installer.php:385
 msgid "Error: PDO or MySQLi PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:388
+#: src/Core/Installer.php:390
 msgid "Error: The MySQL driver for PDO is not installed."
 msgstr ""
 
-#: src/Core/Installer.php:392
+#: src/Core/Installer.php:394
 msgid "PDO or MySQLi PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:400
+#: src/Core/Installer.php:402
 msgid "Error, XML PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:404
+#: src/Core/Installer.php:406
 msgid "XML PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:407
+#: src/Core/Installer.php:409
 msgid "libCurl PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:408
+#: src/Core/Installer.php:410
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:414
+#: src/Core/Installer.php:416
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:415
+#: src/Core/Installer.php:417
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:421
+#: src/Core/Installer.php:423
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:422
+#: src/Core/Installer.php:424
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:428
+#: src/Core/Installer.php:430
 msgid "mb_string PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:429
+#: src/Core/Installer.php:431
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:435
+#: src/Core/Installer.php:437
 msgid "iconv PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:436
+#: src/Core/Installer.php:438
 msgid "Error: iconv PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:442
+#: src/Core/Installer.php:444
 msgid "POSIX PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:443
+#: src/Core/Installer.php:445
 msgid "Error: POSIX PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:449
+#: src/Core/Installer.php:451
 msgid "JSON PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:450
+#: src/Core/Installer.php:452
 msgid "Error: JSON PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:473
+#: src/Core/Installer.php:458
+msgid "File Information PHP module"
+msgstr ""
+
+#: src/Core/Installer.php:459
+msgid "Error: File Information PHP module required but not installed."
+msgstr ""
+
+#: src/Core/Installer.php:482
 msgid ""
 "The web installer needs to be able to create a file called \"local.config.php"
 "\" in the \"config\" folder of your web server and it is unable to do so."
 msgstr ""
 
-#: src/Core/Installer.php:474
+#: src/Core/Installer.php:483
 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 ""
 
-#: src/Core/Installer.php:475
+#: src/Core/Installer.php:484
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named local.config.php in your Friendica \"config\" folder."
 msgstr ""
 
-#: src/Core/Installer.php:476
+#: src/Core/Installer.php:485
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation. "
 "Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: src/Core/Installer.php:479
+#: src/Core/Installer.php:488
 msgid "config/local.config.php is writable"
 msgstr ""
 
-#: src/Core/Installer.php:499
+#: src/Core/Installer.php:508
 msgid ""
 "Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: src/Core/Installer.php:500
+#: src/Core/Installer.php:509
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory view/smarty3/ under the Friendica top level "
 "folder."
 msgstr ""
 
-#: src/Core/Installer.php:501
+#: src/Core/Installer.php:510
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
 msgstr ""
 
-#: src/Core/Installer.php:502
+#: src/Core/Installer.php:511
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "view/smarty3/ only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: src/Core/Installer.php:505
+#: src/Core/Installer.php:514
 msgid "view/smarty3 is writable"
 msgstr ""
 
-#: src/Core/Installer.php:534
+#: src/Core/Installer.php:543
 msgid ""
 "Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist "
 "to .htaccess."
 msgstr ""
 
-#: src/Core/Installer.php:536
+#: src/Core/Installer.php:545
 msgid "Error message from Curl when fetching"
 msgstr ""
 
-#: src/Core/Installer.php:541
+#: src/Core/Installer.php:550
 msgid "Url rewrite is working"
 msgstr ""
 
-#: src/Core/Installer.php:570
+#: src/Core/Installer.php:579
 msgid "ImageMagick PHP extension is not installed"
 msgstr ""
 
-#: src/Core/Installer.php:572
+#: src/Core/Installer.php:581
 msgid "ImageMagick PHP extension is installed"
 msgstr ""
 
-#: src/Core/Installer.php:574 tests/src/Core/InstallerTest.php:329
-#: tests/src/Core/InstallerTest.php:355
+#: src/Core/Installer.php:583 tests/src/Core/InstallerTest.php:343
+#: tests/src/Core/InstallerTest.php:369
 msgid "ImageMagick supports GIF"
 msgstr ""
 
-#: src/Core/Installer.php:597
+#: src/Core/Installer.php:608
 msgid "Could not connect to database."
 msgstr ""
 
-#: src/Core/Installer.php:604
+#: src/Core/Installer.php:615
 msgid "Database already in use."
 msgstr ""
 
@@ -8401,7 +8414,7 @@ msgstr ""
 msgid "activity"
 msgstr ""
 
-#: src/Model/Item.php:3289 src/Object/Post.php:470
+#: src/Model/Item.php:3289 src/Object/Post.php:471
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
@@ -9466,139 +9479,139 @@ msgstr ""
 msgid "Privacy Statement"
 msgstr ""
 
-#: src/Object/Post.php:136
+#: src/Object/Post.php:137
 msgid "This entry was edited"
 msgstr ""
 
-#: src/Object/Post.php:198
+#: src/Object/Post.php:199
 msgid "Delete locally"
 msgstr ""
 
-#: src/Object/Post.php:201
+#: src/Object/Post.php:202
 msgid "Delete globally"
 msgstr ""
 
-#: src/Object/Post.php:201
+#: src/Object/Post.php:202
 msgid "Remove locally"
 msgstr ""
 
-#: src/Object/Post.php:215
+#: src/Object/Post.php:216
 msgid "save to folder"
 msgstr ""
 
-#: src/Object/Post.php:250
+#: src/Object/Post.php:251
 msgid "I will attend"
 msgstr ""
 
-#: src/Object/Post.php:250
+#: src/Object/Post.php:251
 msgid "I will not attend"
 msgstr ""
 
-#: src/Object/Post.php:250
+#: src/Object/Post.php:251
 msgid "I might attend"
 msgstr ""
 
-#: src/Object/Post.php:278
+#: src/Object/Post.php:279
 msgid "ignore thread"
 msgstr ""
 
-#: src/Object/Post.php:279
+#: src/Object/Post.php:280
 msgid "unignore thread"
 msgstr ""
 
-#: src/Object/Post.php:280
+#: src/Object/Post.php:281
 msgid "toggle ignore status"
 msgstr ""
 
-#: src/Object/Post.php:291
+#: src/Object/Post.php:292
 msgid "add star"
 msgstr ""
 
-#: src/Object/Post.php:292
+#: src/Object/Post.php:293
 msgid "remove star"
 msgstr ""
 
-#: src/Object/Post.php:293
+#: src/Object/Post.php:294
 msgid "toggle star status"
 msgstr ""
 
-#: src/Object/Post.php:296
+#: src/Object/Post.php:297
 msgid "starred"
 msgstr ""
 
-#: src/Object/Post.php:300
+#: src/Object/Post.php:301
 msgid "add tag"
 msgstr ""
 
-#: src/Object/Post.php:311
+#: src/Object/Post.php:312
 msgid "like"
 msgstr ""
 
-#: src/Object/Post.php:312
+#: src/Object/Post.php:313
 msgid "dislike"
 msgstr ""
 
-#: src/Object/Post.php:315
+#: src/Object/Post.php:316
 msgid "Share this"
 msgstr ""
 
-#: src/Object/Post.php:315
+#: src/Object/Post.php:316
 msgid "share"
 msgstr ""
 
-#: src/Object/Post.php:382
+#: src/Object/Post.php:383
 msgid "to"
 msgstr ""
 
-#: src/Object/Post.php:383
+#: src/Object/Post.php:384
 msgid "via"
 msgstr ""
 
-#: src/Object/Post.php:384
+#: src/Object/Post.php:385
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: src/Object/Post.php:385
+#: src/Object/Post.php:386
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: src/Object/Post.php:418
+#: src/Object/Post.php:419
 #, php-format
 msgid "Reply to %s"
 msgstr ""
 
-#: src/Object/Post.php:433
+#: src/Object/Post.php:434
 msgid "Notifier task is pending"
 msgstr ""
 
-#: src/Object/Post.php:434
+#: src/Object/Post.php:435
 msgid "Delivery to remote servers is pending"
 msgstr ""
 
-#: src/Object/Post.php:435
+#: src/Object/Post.php:436
 msgid "Delivery to remote servers is underway"
 msgstr ""
 
-#: src/Object/Post.php:436
+#: src/Object/Post.php:437
 msgid "Delivery to remote servers is mostly done"
 msgstr ""
 
-#: src/Object/Post.php:437
+#: src/Object/Post.php:438
 msgid "Delivery to remote servers is done"
 msgstr ""
 
-#: src/Object/Post.php:457
+#: src/Object/Post.php:458
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Object/Post.php:458
+#: src/Object/Post.php:459
 msgid "Show more"
 msgstr ""
 
-#: src/Object/Post.php:459
+#: src/Object/Post.php:460
 msgid "Show fewer"
 msgstr ""
 

From 9b07132b801791783a60eeeafe69df8ae735b24b Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 10:08:28 +0100
Subject: [PATCH 119/145] Fixing force-flag for lock-releasing

---
 src/Core/Lock.php                     |  7 ++++---
 src/Core/Lock/CacheLockDriver.php     |  8 ++++++--
 src/Core/Lock/DatabaseLockDriver.php  | 10 ++++++++--
 src/Core/Lock/ILockDriver.php         |  5 +++--
 src/Core/Lock/SemaphoreLockDriver.php |  2 +-
 src/Core/Update.php                   |  2 +-
 6 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/Core/Lock.php b/src/Core/Lock.php
index e8c8a7041..adff049dc 100644
--- a/src/Core/Lock.php
+++ b/src/Core/Lock.php
@@ -122,12 +122,13 @@ class Lock
 	/**
 	 * @brief Releases a lock if it was set by us
 	 *
-	 * @param string $key Name of the lock
+	 * @param string $key   Name of the lock
+	 * @param bool   $force Force the lock to get releases
 	 * @return void
 	 */
-	public static function release($key)
+	public static function release($key, $force = false)
 	{
-		self::getDriver()->releaseLock($key);
+		self::getDriver()->releaseLock($key, $force);
 	}
 
 	/**
diff --git a/src/Core/Lock/CacheLockDriver.php b/src/Core/Lock/CacheLockDriver.php
index 18d441ffe..d1ef1acff 100644
--- a/src/Core/Lock/CacheLockDriver.php
+++ b/src/Core/Lock/CacheLockDriver.php
@@ -61,11 +61,15 @@ class CacheLockDriver extends AbstractLockDriver
 	/**
 	 * (@inheritdoc)
 	 */
-	public function releaseLock($key)
+	public function releaseLock($key, $force = false)
 	{
 		$cachekey = self::getLockKey($key);
 
-		$this->cache->compareDelete($cachekey, getmypid());
+		if ($force) {
+			$this->cache->delete($key);
+		} else {
+			$this->cache->compareDelete($cachekey, getmypid());
+		}
 		$this->markRelease($key);
 	}
 
diff --git a/src/Core/Lock/DatabaseLockDriver.php b/src/Core/Lock/DatabaseLockDriver.php
index 6f18fb5be..73b97dc4b 100644
--- a/src/Core/Lock/DatabaseLockDriver.php
+++ b/src/Core/Lock/DatabaseLockDriver.php
@@ -68,9 +68,15 @@ class DatabaseLockDriver extends AbstractLockDriver
 	/**
 	 * (@inheritdoc)
 	 */
-	public function releaseLock($key)
+	public function releaseLock($key, $force = false)
 	{
-		DBA::delete('locks', ['name' => $key, 'pid' => $this->pid]);
+		if ($force) {
+			$where = ['name' => $key];
+		} else {
+			$where = ['name' => $key, 'pid' => $this->pid];
+		}
+
+		DBA::delete('locks', $where);
 
 		$this->markRelease($key);
 
diff --git a/src/Core/Lock/ILockDriver.php b/src/Core/Lock/ILockDriver.php
index a255f6834..2ee145980 100644
--- a/src/Core/Lock/ILockDriver.php
+++ b/src/Core/Lock/ILockDriver.php
@@ -33,11 +33,12 @@ interface ILockDriver
 	/**
 	 * Releases a lock if it was set by us
 	 *
-	 * @param string $key The Name of the lock
+	 * @param string $key   The Name of the lock
+	 * @param bool   $force Force the lock to get released
 	 *
 	 * @return void
 	 */
-	public function releaseLock($key);
+	public function releaseLock($key, $force = false);
 
 	/**
 	 * Releases all lock that were set by us
diff --git a/src/Core/Lock/SemaphoreLockDriver.php b/src/Core/Lock/SemaphoreLockDriver.php
index cf1ce5a8d..5ce03b2c3 100644
--- a/src/Core/Lock/SemaphoreLockDriver.php
+++ b/src/Core/Lock/SemaphoreLockDriver.php
@@ -50,7 +50,7 @@ class SemaphoreLockDriver extends AbstractLockDriver
 	/**
 	 * (@inheritdoc)
 	 */
-	public function releaseLock($key)
+	public function releaseLock($key, $force = false)
 	{
 		if (empty(self::$semaphore[$key])) {
 			return false;
diff --git a/src/Core/Update.php b/src/Core/Update.php
index ed6c05872..7f825f384 100644
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -60,7 +60,7 @@ class Update
 		// In force mode, we release the dbupdate lock first
 		// Necessary in case of an stuck update
 		if ($force) {
-			Lock::release('dbupdate');
+			Lock::release('dbupdate', true);
 		}
 
 		$build = Config::get('system', 'build');

From 7ce549c2947c99af3042f15735e2a3745ca89cae Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 10:27:56 +0100
Subject: [PATCH 120/145] fixing delete

---
 src/Core/Lock/CacheLockDriver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Lock/CacheLockDriver.php b/src/Core/Lock/CacheLockDriver.php
index d1ef1acff..a5c34bbdd 100644
--- a/src/Core/Lock/CacheLockDriver.php
+++ b/src/Core/Lock/CacheLockDriver.php
@@ -66,7 +66,7 @@ class CacheLockDriver extends AbstractLockDriver
 		$cachekey = self::getLockKey($key);
 
 		if ($force) {
-			$this->cache->delete($key);
+			$this->cache->delete($cachekey);
 		} else {
 			$this->cache->compareDelete($cachekey, getmypid());
 		}

From ee300a7db66fd95950d93d3c0e4f02499d0f09bf Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 24 Feb 2019 10:43:29 +0000
Subject: [PATCH 121/145] Ensure that the database update will be processed
 anyway

---
 src/Core/Update.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Core/Update.php b/src/Core/Update.php
index ed6c05872..d769d84e4 100644
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -36,11 +36,10 @@ class Update
 			die('You try to update from a version prior to database version 1170. The direct upgrade path is not supported. Please update to version 3.5.4 before updating to this version.');
 		}
 
-		if ($build < DB_UPDATE_VERSION) {
-			// When we cannot execute the database update via the worker, we will do it directly
-			if (!Worker::add(PRIORITY_CRITICAL, 'DBUpdate') && $via_worker) {
-				self::run($basePath);
-			}
+		// Calling the database update directly via the worker enables us to perform database changes to the workerqueue table itself.
+		// This is a fallback, since normally the database update will be performed by a worker job (which doesn't work for changes to the "workerqueue" table itself).
+		if (($build < DB_UPDATE_VERSION) && $via_worker) {
+			self::run($basePath);
 		}
 	}
 

From 4bad2645e5276431fcb70e01f4f3341740a6b89b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 24 Feb 2019 10:52:40 +0000
Subject: [PATCH 122/145] We should execute the worker job for normal
 situations ;-)

---
 src/Core/Update.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Core/Update.php b/src/Core/Update.php
index d769d84e4..b4626c27b 100644
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -36,10 +36,15 @@ class Update
 			die('You try to update from a version prior to database version 1170. The direct upgrade path is not supported. Please update to version 3.5.4 before updating to this version.');
 		}
 
-		// Calling the database update directly via the worker enables us to perform database changes to the workerqueue table itself.
-		// This is a fallback, since normally the database update will be performed by a worker job (which doesn't work for changes to the "workerqueue" table itself).
-		if (($build < DB_UPDATE_VERSION) && $via_worker) {
-			self::run($basePath);
+		if ($build < DB_UPDATE_VERSION) {
+			if ($via_worker) {
+				// Calling the database update directly via the worker enables us to perform database changes to the workerqueue table itself.
+				// This is a fallback, since normally the database update will be performed by a worker job.
+				// This worker job doesn't work for changes to the "workerqueue" table itself.
+				self::run($basePath);
+			} else {
+				Worker::add(PRIORITY_CRITICAL, 'DBUpdate');
+			}
 		}
 	}
 

From aae58815a8cd66d26a58c586dd083224a29dfb24 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 12:24:09 +0100
Subject: [PATCH 123/145] Adjust update parameters: -f|--force         Force
 the update command (Even if the database structure matches) -o|--override    
  Override running or stalling updates

---
 src/Core/Console/DatabaseStructure.php | 13 +++++++------
 src/Core/Console/PostUpdate.php        |  2 +-
 src/Core/Lock.php                      |  8 ++++----
 src/Core/Lock/CacheLockDriver.php      |  4 ++--
 src/Core/Lock/DatabaseLockDriver.php   |  4 ++--
 src/Core/Lock/ILockDriver.php          |  6 +++---
 src/Core/Lock/SemaphoreLockDriver.php  |  2 +-
 src/Core/Update.php                    | 13 ++++++-------
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Core/Console/DatabaseStructure.php b/src/Core/Console/DatabaseStructure.php
index 1ec108d2e..dededa9b3 100644
--- a/src/Core/Console/DatabaseStructure.php
+++ b/src/Core/Console/DatabaseStructure.php
@@ -31,9 +31,10 @@ Commands
 	toinnodb Convert all tables from MyISAM to InnoDB
 
 Options
-    -h|--help|-? Show help information
-    -v           Show more debug information.
-    -f|--force   Force the command in case of "update" (Ignore failed updates/running updates)
+    -h|--help|-?       Show help information
+    -v                 Show more debug information.
+    -f|--force         Force the update command (Even if the database structure matches)
+    -o|--override      Override running or stalling updates
 HELP;
 		return $help;
 	}
@@ -68,8 +69,9 @@ HELP;
 				$output = DBStructure::update($a->getBasePath(), true, false);
 				break;
 			case "update":
-				$force = $this->getOption(['f', 'force'], false);
-				$output = Update::run($a->getBasePath(), $force, true, false);
+				$force    = $this->getOption(['f', 'force'], false);
+				$override = $this->getOption(['o', 'override'], false);
+				$output = Update::run($a->getBasePath(), $force, $override,true, false);
 				break;
 			case "dumpsql":
 				ob_start();
@@ -89,5 +91,4 @@ HELP;
 
 		return 0;
 	}
-
 }
diff --git a/src/Core/Console/PostUpdate.php b/src/Core/Console/PostUpdate.php
index 103d0fef7..a34fc0bcf 100644
--- a/src/Core/Console/PostUpdate.php
+++ b/src/Core/Console/PostUpdate.php
@@ -56,7 +56,7 @@ HELP;
 		}
 
 		echo L10n::t('Check for pending update actions.') . "\n";
-		Update::run($a->getBasePath(), true, true, false);
+		Update::run($a->getBasePath(), true, false,true, false);
 		echo L10n::t('Done.') . "\n";
 
 		echo L10n::t('Execute pending post updates.') . "\n";
diff --git a/src/Core/Lock.php b/src/Core/Lock.php
index adff049dc..8bc2c242d 100644
--- a/src/Core/Lock.php
+++ b/src/Core/Lock.php
@@ -122,13 +122,13 @@ class Lock
 	/**
 	 * @brief Releases a lock if it was set by us
 	 *
-	 * @param string $key   Name of the lock
-	 * @param bool   $force Force the lock to get releases
+	 * @param string $key      Name of the lock
+	 * @param bool   $override Overrides the lock to get releases
 	 * @return void
 	 */
-	public static function release($key, $force = false)
+	public static function release($key, $override = false)
 	{
-		self::getDriver()->releaseLock($key, $force);
+		self::getDriver()->releaseLock($key, $override);
 	}
 
 	/**
diff --git a/src/Core/Lock/CacheLockDriver.php b/src/Core/Lock/CacheLockDriver.php
index a5c34bbdd..c1cd8ffb4 100644
--- a/src/Core/Lock/CacheLockDriver.php
+++ b/src/Core/Lock/CacheLockDriver.php
@@ -61,11 +61,11 @@ class CacheLockDriver extends AbstractLockDriver
 	/**
 	 * (@inheritdoc)
 	 */
-	public function releaseLock($key, $force = false)
+	public function releaseLock($key, $override = false)
 	{
 		$cachekey = self::getLockKey($key);
 
-		if ($force) {
+		if ($override) {
 			$this->cache->delete($cachekey);
 		} else {
 			$this->cache->compareDelete($cachekey, getmypid());
diff --git a/src/Core/Lock/DatabaseLockDriver.php b/src/Core/Lock/DatabaseLockDriver.php
index 73b97dc4b..a137ef12e 100644
--- a/src/Core/Lock/DatabaseLockDriver.php
+++ b/src/Core/Lock/DatabaseLockDriver.php
@@ -68,9 +68,9 @@ class DatabaseLockDriver extends AbstractLockDriver
 	/**
 	 * (@inheritdoc)
 	 */
-	public function releaseLock($key, $force = false)
+	public function releaseLock($key, $override = false)
 	{
-		if ($force) {
+		if ($override) {
 			$where = ['name' => $key];
 		} else {
 			$where = ['name' => $key, 'pid' => $this->pid];
diff --git a/src/Core/Lock/ILockDriver.php b/src/Core/Lock/ILockDriver.php
index 2ee145980..7cbaa4fc6 100644
--- a/src/Core/Lock/ILockDriver.php
+++ b/src/Core/Lock/ILockDriver.php
@@ -33,12 +33,12 @@ interface ILockDriver
 	/**
 	 * Releases a lock if it was set by us
 	 *
-	 * @param string $key   The Name of the lock
-	 * @param bool   $force Force the lock to get released
+	 * @param string $key      The Name of the lock
+	 * @param bool   $override Overrides the lock to get released
 	 *
 	 * @return void
 	 */
-	public function releaseLock($key, $force = false);
+	public function releaseLock($key, $override = false);
 
 	/**
 	 * Releases all lock that were set by us
diff --git a/src/Core/Lock/SemaphoreLockDriver.php b/src/Core/Lock/SemaphoreLockDriver.php
index 5ce03b2c3..781e110b1 100644
--- a/src/Core/Lock/SemaphoreLockDriver.php
+++ b/src/Core/Lock/SemaphoreLockDriver.php
@@ -50,7 +50,7 @@ class SemaphoreLockDriver extends AbstractLockDriver
 	/**
 	 * (@inheritdoc)
 	 */
-	public function releaseLock($key, $force = false)
+	public function releaseLock($key, $override = false)
 	{
 		if (empty(self::$semaphore[$key])) {
 			return false;
diff --git a/src/Core/Update.php b/src/Core/Update.php
index 7f825f384..86e481cf1 100644
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -48,18 +48,19 @@ class Update
 	 * Automatic database updates
 	 *
 	 * @param string $basePath The base path of this application
-	 * @param bool $force      Force the Update-Check even if the lock is set
+	 * @param bool $force      Force the Update-Check even if the database version doesn't match
+	 * @param bool $override   Overrides any running/stuck updates
 	 * @param bool $verbose    Run the Update-Check verbose
 	 * @param bool $sendMail   Sends a Mail to the administrator in case of success/failure
 	 *
 	 * @return string Empty string if the update is successful, error messages otherwise
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function run($basePath, $force = false, $verbose = false, $sendMail = true)
+	public static function run($basePath, $force = false, $override = false, $verbose = false, $sendMail = true)
 	{
 		// In force mode, we release the dbupdate lock first
 		// Necessary in case of an stuck update
-		if ($force) {
+		if ($override) {
 			Lock::release('dbupdate', true);
 		}
 
@@ -70,12 +71,12 @@ class Update
 			Config::set('system', 'build', $build);
 		}
 
-		if ($build != DB_UPDATE_VERSION) {
+		if ($build != DB_UPDATE_VERSION || $force) {
 			require_once 'update.php';
 
 			$stored = intval($build);
 			$current = intval(DB_UPDATE_VERSION);
-			if ($stored < $current) {
+			if ($stored < $current || $force) {
 				Config::load('database');
 
 				Logger::log('Update from \'' . $stored . '\'  to \'' . $current . '\' - starting', Logger::DEBUG);
@@ -126,8 +127,6 @@ class Update
 					Lock::release('dbupdate');
 				}
 			}
-		} elseif ($force) {
-			DBStructure::update($basePath, $verbose, true);
 		}
 
 		return '';

From d1c7815c4e12a3a8bf46fe25dff5c1636a525aac Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 12:51:46 +0100
Subject: [PATCH 124/145] added whitespace

---
 src/Core/Console/PostUpdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Console/PostUpdate.php b/src/Core/Console/PostUpdate.php
index a34fc0bcf..a903cd7dd 100644
--- a/src/Core/Console/PostUpdate.php
+++ b/src/Core/Console/PostUpdate.php
@@ -56,7 +56,7 @@ HELP;
 		}
 
 		echo L10n::t('Check for pending update actions.') . "\n";
-		Update::run($a->getBasePath(), true, false,true, false);
+		Update::run($a->getBasePath(), true, false, true, false);
 		echo L10n::t('Done.') . "\n";
 
 		echo L10n::t('Execute pending post updates.') . "\n";

From 5fc42a744e65564a2828157baee9c1fac99aab1d Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 13:40:54 +0100
Subject: [PATCH 125/145] Replace string namespaces with ::class

---
 src/Factory/LoggerFactory.php                | 21 ++++++++++++++++++--
 src/Factory/ProfilerFactory.php              |  4 ++--
 tests/Util/DBAMockTrait.php                  |  3 ++-
 tests/Util/DBStructureMockTrait.php          |  4 ++--
 tests/Util/DateTimeFormatMockTrait.php       |  5 +++--
 tests/Util/L10nMockTrait.php                 |  3 ++-
 tests/Util/RendererMockTrait.php             |  5 +++--
 tests/src/Core/Console/ConfigConsoleTest.php |  5 +++--
 tests/src/Core/InstallerTest.php             | 17 +++++++++-------
 tests/src/Util/Logger/WorkerLoggerTest.php   |  9 +++++----
 tests/src/Util/ProfilerTest.php              |  2 +-
 11 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index 97b513bd3..8eb550609 100644
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -20,6 +20,16 @@ use Psr\Log\LogLevel;
  */
 class LoggerFactory
 {
+	/**
+	 * A list of classes, which shouldn't get logged
+	 * @var array
+	 */
+	private static $ignoreClassList = [
+		Logger::class,
+		Profiler::class,
+		WorkerLogger::class
+	];
+
 	/**
 	 * Creates a new PSR-3 compliant logger instances
 	 *
@@ -34,7 +44,7 @@ class LoggerFactory
 		$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
 		$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
 		$logger->pushProcessor(new Monolog\Processor\UidProcessor());
-		$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, [Logger::class, Profiler::class, WorkerLogger::class]));
+		$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, self::$ignoreClassList));
 
 		$debugging = $config->get('system', 'debugging');
 		$stream    = $config->get('system', 'logfile');
@@ -79,7 +89,7 @@ class LoggerFactory
 		$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
 		$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
 		$logger->pushProcessor(new Monolog\Processor\UidProcessor());
-		$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, ['Friendica\\Core\\Logger']));
+		$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, self::$ignoreClassList));
 
 		$logger->pushHandler(new FriendicaDevelopHandler($developerIp));
 
@@ -146,6 +156,13 @@ class LoggerFactory
 			if (!is_int($loglevel)) {
 				$loglevel = LogLevel::NOTICE;
 			}
+
+			// if the stream is a file and it isn't writeable, add a null handler and return
+			if (is_file($stream) && !is_writable($stream)) {
+				$logger->pushHandler(new Monolog\Handler\NullHandler());
+				return;
+			}
+
 			$fileHandler = new Monolog\Handler\StreamHandler($stream, $loglevel);
 
 			$formatter = new Monolog\Formatter\LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");
diff --git a/src/Factory/ProfilerFactory.php b/src/Factory/ProfilerFactory.php
index 26a156639..19c96e8ca 100644
--- a/src/Factory/ProfilerFactory.php
+++ b/src/Factory/ProfilerFactory.php
@@ -17,9 +17,9 @@ class ProfilerFactory
 	public static function create(IConfigCache $configCache)
 	{
 		$enabled = $configCache->get('system', 'profiler');
-		$enabled = isset($enabled) && $enabled !== '!<unset>!';
+		$enabled = isset($enabled) && $enabled !== '0';
 		$renderTime = $configCache->get('rendertime', 'callstack');
-		$renderTime = isset($renderTime) && $renderTime !== '!<unset>!';
+		$renderTime = isset($renderTime) && $renderTime !== '0';
 
 		return new Profiler($enabled, $renderTime);
 	}
diff --git a/tests/Util/DBAMockTrait.php b/tests/Util/DBAMockTrait.php
index 296e35394..ab5bc6059 100644
--- a/tests/Util/DBAMockTrait.php
+++ b/tests/Util/DBAMockTrait.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Test\Util;
 
+use Friendica\Database\DBA;
 use Mockery\MockInterface;
 
 class DBAStub
@@ -22,7 +23,7 @@ trait DBAMockTrait
 	private function checkMock()
 	{
 		if (!isset($this->dbaMock)) {
-			$this->dbaMock = \Mockery::namedMock('Friendica\Database\DBA', 'Friendica\Test\Util\DBAStub');
+			$this->dbaMock = \Mockery::namedMock(DBA::class, DBAStub::class);
 		}
 	}
 
diff --git a/tests/Util/DBStructureMockTrait.php b/tests/Util/DBStructureMockTrait.php
index 92ec412cb..224e5d07a 100644
--- a/tests/Util/DBStructureMockTrait.php
+++ b/tests/Util/DBStructureMockTrait.php
@@ -26,7 +26,7 @@ trait DBStructureMockTrait
 	public function mockUpdate($args = [], $return = true, $times = null)
 	{
 		if (!isset($this->dbStructure)) {
-			$this->dbStructure = \Mockery::mock('alias:Friendica\Database\DBStructure');
+			$this->dbStructure = \Mockery::mock('alias:' . DBStructure::class);
 		}
 
 		$this->dbStructure
@@ -46,7 +46,7 @@ trait DBStructureMockTrait
 	public function mockExistsTable($tableName, $return = true, $times = null)
 	{
 		if (!isset($this->dbStructure)) {
-			$this->dbStructure = \Mockery::mock('alias:Friendica\Database\DBStructure');
+			$this->dbStructure = \Mockery::mock('alias:' . DBStructure::class);
 		}
 
 		$this->dbStructure
diff --git a/tests/Util/DateTimeFormatMockTrait.php b/tests/Util/DateTimeFormatMockTrait.php
index 1f1ad0199..0230e16a4 100644
--- a/tests/Util/DateTimeFormatMockTrait.php
+++ b/tests/Util/DateTimeFormatMockTrait.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Test\Util;
 
+use Friendica\Util\DateTimeFormat;
 use Mockery\MockInterface;
 
 trait DateTimeFormatMockTrait
@@ -14,7 +15,7 @@ trait DateTimeFormatMockTrait
 	public function mockUtcNow($time, $times = null)
 	{
 		if (!isset($this->dtfMock)) {
-			$this->dtfMock = \Mockery::mock('alias:Friendica\Util\DateTimeFormat');
+			$this->dtfMock = \Mockery::mock('alias:'. DateTimeFormat::class);
 		}
 
 		$this->dtfMock
@@ -26,7 +27,7 @@ trait DateTimeFormatMockTrait
 	public function mockUtc($input, $time, $times = null)
 	{
 		if (!isset($this->dtfMock)) {
-			$this->dtfMock = \Mockery::mock('alias:Friendica\Util\DateTimeFormat');
+			$this->dtfMock = \Mockery::mock('alias:' . DateTimeFormat::class);
 		}
 
 		$this->dtfMock
diff --git a/tests/Util/L10nMockTrait.php b/tests/Util/L10nMockTrait.php
index f1c771c6b..e47a35edc 100644
--- a/tests/Util/L10nMockTrait.php
+++ b/tests/Util/L10nMockTrait.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Test\Util;
 
+use Friendica\Core\L10n;
 use Mockery\MockInterface;
 
 trait L10nMockTrait
@@ -21,7 +22,7 @@ trait L10nMockTrait
 	public function mockL10nT($input = null, $times = null, $return = null)
 	{
 		if (!isset($this->l10nMock)) {
-			$this->l10nMock = \Mockery::mock('alias:Friendica\Core\L10n');
+			$this->l10nMock = \Mockery::mock('alias:' . L10n::class);
 		}
 
 		$with = isset($input) ? $input : \Mockery::any();
diff --git a/tests/Util/RendererMockTrait.php b/tests/Util/RendererMockTrait.php
index bea0fe16f..f4e05f39b 100644
--- a/tests/Util/RendererMockTrait.php
+++ b/tests/Util/RendererMockTrait.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Test\Util;
 
+use Friendica\Core\Renderer;
 use Mockery\MockInterface;
 
 trait RendererMockTrait
@@ -21,7 +22,7 @@ trait RendererMockTrait
 	public function mockGetMarkupTemplate($templateName, $return = '', $times = null)
 	{
 		if (!isset($this->rendererMock)) {
-			$this->rendererMock = \Mockery::mock('alias:Friendica\Core\Renderer');
+			$this->rendererMock = \Mockery::mock('alias:' . Renderer::class);
 		}
 
 		$this->rendererMock
@@ -42,7 +43,7 @@ trait RendererMockTrait
 	public function mockReplaceMacros($template, $args = [], $return = '', $times = null)
 	{
 		if (!isset($this->rendererMock)) {
-			$this->rendererMock = \Mockery::mock('alias:Friendica\Core\Renderer');
+			$this->rendererMock = \Mockery::mock('alias:' . Renderer::class);
 		}
 
 		$this->rendererMock
diff --git a/tests/src/Core/Console/ConfigConsoleTest.php b/tests/src/Core/Console/ConfigConsoleTest.php
index 579b28e02..ef50c19b7 100644
--- a/tests/src/Core/Console/ConfigConsoleTest.php
+++ b/tests/src/Core/Console/ConfigConsoleTest.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Test\src\Core\Console;
 
+use Friendica\App\Mode;
 use Friendica\Core\Console\Config;
 
 /**
@@ -16,12 +17,12 @@ class ConfigConsoleTest extends ConsoleTest
 		parent::setUp();
 
 		\Mockery::getConfiguration()->setConstantsMap([
-			'Friendica\App\Mode' => [
+			Mode::class => [
 				'DBCONFIGAVAILABLE' => 0
 			]
 		]);
 
-		$mode = \Mockery::mock('Friendica\App\Mode');
+		$mode = \Mockery::mock(Mode::class);
 		$mode
 			->shouldReceive('has')
 			->andReturn(true);
diff --git a/tests/src/Core/InstallerTest.php b/tests/src/Core/InstallerTest.php
index c1a003bad..e56596c6c 100644
--- a/tests/src/Core/InstallerTest.php
+++ b/tests/src/Core/InstallerTest.php
@@ -3,9 +3,12 @@
 // this is in the same namespace as Install for mocking 'function_exists'
 namespace Friendica\Core;
 
+use Friendica\Network\CurlResult;
+use Friendica\Object\Image;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\L10nMockTrait;
 use Friendica\Test\Util\VFSTrait;
+use Friendica\Util\Network;
 
 /**
  * @runTestsInSeparateProcesses
@@ -248,7 +251,7 @@ class InstallerTest extends MockedTest
 		$this->mockL10nT();
 
 		// Mocking the CURL Response
-		$curlResult = \Mockery::mock('Friendica\Network\CurlResult');
+		$curlResult = \Mockery::mock(CurlResult::class);
 		$curlResult
 			->shouldReceive('getReturnCode')
 			->andReturn('404');
@@ -260,7 +263,7 @@ class InstallerTest extends MockedTest
 			->andReturn('test Error');
 
 		// Mocking the CURL Request
-		$networkMock = \Mockery::mock('alias:Friendica\Util\Network');
+		$networkMock = \Mockery::mock('alias:' . Network::class);
 		$networkMock
 			->shouldReceive('fetchUrlFull')
 			->with('https://test/install/testrewrite')
@@ -287,19 +290,19 @@ class InstallerTest extends MockedTest
 		$this->mockL10nT();
 
 		// Mocking the failed CURL Response
-		$curlResultF = \Mockery::mock('Friendica\Network\CurlResult');
+		$curlResultF = \Mockery::mock(CurlResult::class);
 		$curlResultF
 			->shouldReceive('getReturnCode')
 			->andReturn('404');
 
 		// Mocking the working CURL Response
-		$curlResultW = \Mockery::mock('Friendica\Network\CurlResult');
+		$curlResultW = \Mockery::mock(CurlResult::class);
 		$curlResultW
 			->shouldReceive('getReturnCode')
 			->andReturn('204');
 
 		// Mocking the CURL Request
-		$networkMock = \Mockery::mock('alias:Friendica\Util\Network');
+		$networkMock = \Mockery::mock('alias:' . Network::class);
 		$networkMock
 			->shouldReceive('fetchUrlFull')
 			->with('https://test/install/testrewrite')
@@ -327,7 +330,7 @@ class InstallerTest extends MockedTest
 	{
 		$this->mockL10nT();
 
-		$imageMock = \Mockery::mock('alias:Friendica\Object\Image');
+		$imageMock = \Mockery::mock('alias:'. Image::class);
 		$imageMock
 			->shouldReceive('supportedTypes')
 			->andReturn(['image/gif' => 'gif']);
@@ -354,7 +357,7 @@ class InstallerTest extends MockedTest
 	{
 		$this->mockL10nT();
 
-		$imageMock = \Mockery::mock('alias:Friendica\Object\Image');
+		$imageMock = \Mockery::mock('alias:' . Image::class);
 		$imageMock
 			->shouldReceive('supportedTypes')
 			->andReturn([]);
diff --git a/tests/src/Util/Logger/WorkerLoggerTest.php b/tests/src/Util/Logger/WorkerLoggerTest.php
index 4a84c40bb..8ee3c82d8 100644
--- a/tests/src/Util/Logger/WorkerLoggerTest.php
+++ b/tests/src/Util/Logger/WorkerLoggerTest.php
@@ -4,6 +4,7 @@ namespace src\Util\Logger;
 
 use Friendica\Test\MockedTest;
 use Friendica\Util\Logger\WorkerLogger;
+use Psr\Log\LoggerInterface;
 
 class WorkerLoggerTest extends MockedTest
 {
@@ -18,7 +19,7 @@ class WorkerLoggerTest extends MockedTest
 	 */
 	public function testGetWorkerIdZero()
 	{
-		$logger = \Mockery::mock('Psr\Log\LoggerInterface');
+		$logger = \Mockery::mock(LoggerInterface::class);
 		$logger
 			->shouldReceive('alert')
 			->with('id length must be greater than 0.')
@@ -31,7 +32,7 @@ class WorkerLoggerTest extends MockedTest
 	 */
 	public function testGetWorkerId()
 	{
-		$logger = \Mockery::mock('Psr\Log\LoggerInterface');
+		$logger = \Mockery::mock(LoggerInterface::class);
 		for ($i = 1; $i < 14; $i++) {
 			$workLogger = new WorkerLogger($logger, 'test', $i);
 			$uid = $workLogger->getWorkerId();
@@ -86,7 +87,7 @@ class WorkerLoggerTest extends MockedTest
 	 */
 	public function testEmergency($func, $msg, $context = [])
 	{
-		$logger = \Mockery::mock('Psr\Log\LoggerInterface');
+		$logger = \Mockery::mock(LoggerInterface::class);
 		$workLogger = new WorkerLogger($logger, 'test');
 		$testContext = $context;
 		$testContext['worker_id'] = $workLogger->getWorkerId();
@@ -104,7 +105,7 @@ class WorkerLoggerTest extends MockedTest
 	 */
 	public function testLog()
 	{
-		$logger = \Mockery::mock('Psr\Log\LoggerInterface');
+		$logger = \Mockery::mock(LoggerInterface::class);
 		$workLogger = new WorkerLogger($logger, 'test');
 		$context = $testContext = ['test' => 'it'];
 		$testContext['worker_id'] = $workLogger->getWorkerId();
diff --git a/tests/src/Util/ProfilerTest.php b/tests/src/Util/ProfilerTest.php
index 449ec5e5f..af2e98509 100644
--- a/tests/src/Util/ProfilerTest.php
+++ b/tests/src/Util/ProfilerTest.php
@@ -18,7 +18,7 @@ class ProfilerTest extends MockedTest
 	{
 		parent::setUp();
 
-		$this->logger = \Mockery::mock('Psr\Log\LoggerInterface');
+		$this->logger = \Mockery::mock(LoggerInterface::class);
 	}
 
 	/**

From e48c608db0f6b79e8db44def50f0c9c5bc559b22 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 13:57:17 +0100
Subject: [PATCH 126/145] removed silent fail of logfile permission (should get
 fixed with #6745 )

---
 src/Factory/LoggerFactory.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index 8eb550609..681dc8a6c 100644
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -157,12 +157,6 @@ class LoggerFactory
 				$loglevel = LogLevel::NOTICE;
 			}
 
-			// if the stream is a file and it isn't writeable, add a null handler and return
-			if (is_file($stream) && !is_writable($stream)) {
-				$logger->pushHandler(new Monolog\Handler\NullHandler());
-				return;
-			}
-
 			$fileHandler = new Monolog\Handler\StreamHandler($stream, $loglevel);
 
 			$formatter = new Monolog\Formatter\LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");

From fe74db631139f4b387f14ae04b967a4658c0edcb Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 15:15:25 +0100
Subject: [PATCH 127/145] Fixing
 https://github.com/friendica/friendica/issues/6338#issuecomment-458030934

---
 mod/display.php | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/mod/display.php b/mod/display.php
index 2e931e068..6723a77e9 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -19,10 +19,10 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Module\Objects;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\Strings;
-use Friendica\Module\Objects;
 
 function display_init(App $a)
 {
@@ -283,22 +283,25 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$is_remote_contact = false;
 	$item_uid = local_user();
 
-	$parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
-	if (DBA::isResult($parent)) {
-		$a->profile['uid'] = defaults($a->profile, 'uid', $parent['uid']);
-		$a->profile['profile_uid'] = defaults($a->profile, 'profile_uid', $parent['uid']);
-		$is_remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']);
-	}
+	if (isset($item_parent_uri)) {
+		$parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
+		if (DBA::isResult($parent)) {
+			$a->profile['uid'] = defaults($a->profile, 'uid', $parent['uid']);
+			$a->profile['profile_uid'] = defaults($a->profile, 'profile_uid', $parent['uid']);
+			$is_remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']);
 
-	if ($is_remote_contact) {
-		$cdata = Contact::getPublicAndUserContacID(remote_user(), $a->profile['profile_uid']);
-		if (!empty($cdata['user'])) {
-			$groups = Group::getIdsByContactId($cdata['user']);
-			$remote_cid = $cdata['user'];
-			$item_uid = $parent['uid'];
+			if ($is_remote_contact) {
+				$cdata = Contact::getPublicAndUserContacID(remote_user(), $a->profile['profile_uid']);
+				if (!empty($cdata['user'])) {
+					$groups = Group::getIdsByContactId($cdata['user']);
+					$remote_cid = $cdata['user'];
+					$item_uid = $parent['uid'];
+				}
+			}
 		}
 	}
 
+
 	$page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]);
 	if (DBA::isResult($page_contact)) {
 		$a->page_contact = $page_contact;

From 5b932867c3f62153f590c15f18cc87aae5e69fd7 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 15:22:14 +0100
Subject: [PATCH 128/145] Fixing
 https://github.com/friendica/friendica/issues/6338#issuecomment-466749280

---
 src/Protocol/PortableContact.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 7900ff540..b9c1533e6 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -505,8 +505,15 @@ class PortableContact
 		$last_updated = "";
 
 		foreach ($entries as $entry) {
-			$published = DateTimeFormat::utc($xpath->query('atom:published/text()', $entry)->item(0)->nodeValue);
-			$updated   = DateTimeFormat::utc($xpath->query('atom:updated/text()'  , $entry)->item(0)->nodeValue);
+			$published_item = $xpath->query('atom:published/text()', $entry)->item(0);
+			$updated_item   = $xpath->query('atom:updated/text()'  , $entry)->item(0);
+			$published      = isset($published_item->nodeValue) ? DateTimeFormat::utc($published_item->nodeValue) : null;
+			$updated        = isset($updated_item->nodeValue) ? DateTimeFormat::utc($updated_item->nodeValue) : null;
+
+			if (!isset($published) || !isset($updated)) {
+				Logger::notice('Invalid entry for XPath.', ['entry' => $entry, 'profile' => $profile]);
+				continue;
+			}
 
 			if ($last_updated < $published) {
 				$last_updated = $published;

From da4fc0411e909d62e132450eec73190f180cbba9 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 15:40:05 +0100
Subject: [PATCH 129/145] Fixing admin scheme-change in frio

---
 view/theme/frio/php/scheme.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/view/theme/frio/php/scheme.php b/view/theme/frio/php/scheme.php
index 2f0918043..fa7d4a3fe 100644
--- a/view/theme/frio/php/scheme.php
+++ b/view/theme/frio/php/scheme.php
@@ -17,13 +17,16 @@
  *    'version' => Scheme version
  *    'overwrites' => Variables which overwriting custom settings
  */
+
 use Friendica\Core\PConfig;
 
 function get_scheme_info($scheme)
 {
 	$theme = \get_app()->getCurrentTheme();
 	$themepath = 'view/theme/' . $theme . '/';
-	$scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'scheme'));
+	if (!isset($scheme)) {
+		$scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'scheme'));
+	}
 
 	$info = [
 		'name' => $scheme,

From 758444a7d29feec4944626abd3fc3007ae2964ef Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 15:48:30 +0100
Subject: [PATCH 130/145] empty is better than isset

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

diff --git a/view/theme/frio/php/scheme.php b/view/theme/frio/php/scheme.php
index fa7d4a3fe..9e3f610cd 100644
--- a/view/theme/frio/php/scheme.php
+++ b/view/theme/frio/php/scheme.php
@@ -24,7 +24,7 @@ function get_scheme_info($scheme)
 {
 	$theme = \get_app()->getCurrentTheme();
 	$themepath = 'view/theme/' . $theme . '/';
-	if (!isset($scheme)) {
+	if (empty($scheme)) {
 		$scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'scheme'));
 	}
 

From bf6a765beb99a692bbdce96816b4a6405966bdd7 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 16:30:09 +0100
Subject: [PATCH 131/145] Fixing appending child at DFRN without a parent id.

---
 src/Protocol/DFRN.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index e6524de96..cf8f18866 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -119,7 +119,9 @@ class DFRN
 			$item["entry:cid"] = defaults($item, "entry:cid", 0);
 
 			$entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]);
-			$root->appendChild($entry);
+			if (isset($entry)) {
+				$root->appendChild($entry);
+			}
 		}
 
 		return trim($doc->saveXML());
@@ -323,7 +325,9 @@ class DFRN
 			}
 
 			$entry = self::entry($doc, $type, $item, $owner, true);
-			$root->appendChild($entry);
+			if (isset($entry)) {
+				$root->appendChild($entry);
+			}
 		}
 
 		$atom = trim($doc->saveXML());
@@ -390,7 +394,9 @@ class DFRN
 
 			foreach ($items as $item) {
 				$entry = self::entry($doc, $type, $item, $owner, true, 0);
-				$root->appendChild($entry);
+				if (isset($entry)) {
+					$root->appendChild($entry);
+				}
 			}
 		} else {
 			$root = self::entry($doc, $type, $item, $owner, true, 0, true);
@@ -916,7 +922,8 @@ class DFRN
 		$mentioned = [];
 
 		if (!$item['parent']) {
-			return;
+			Logger::notice('Item without parent found.', ['type' => $type, 'item' => $item]);
+			return null;
 		}
 
 		if ($item['deleted']) {

From 5d13b94761588c6ebca4aab2abcd03a22e00fcd8 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 16:31:16 +0100
Subject: [PATCH 132/145] update phpdoc

---
 src/Protocol/DFRN.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index cf8f18866..98f42b9a9 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -912,7 +912,7 @@ class DFRN
 	 * @param int         $cid     Contact ID of the recipient
 	 * @param bool        $single  If set, the entry is created as an XML document with a single "entry" element
 	 *
-	 * @return \DOMElement XML entry object
+	 * @return null|\DOMElement XML entry object
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 * @todo  Find proper type-hints

From 82072bae466fd6f8a906afc94fb586a0cbc97214 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 24 Feb 2019 13:33:11 -0500
Subject: [PATCH 133/145] Add missing use statement in Model\Term

---
 src/Model/Term.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Model/Term.php b/src/Model/Term.php
index 58c322365..ed6796926 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -4,6 +4,7 @@
  */
 namespace Friendica\Model;
 
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\Strings;

From 42c06506ce213745e0bf5699b7e22976e20efc37 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 24 Feb 2019 13:36:37 -0500
Subject: [PATCH 134/145] Stop appending entry when parent is missing in
 OStatus

- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-455785854
---
 src/Protocol/OStatus.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 38105e452..dec5c4c80 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -1763,20 +1763,17 @@ class OStatus
 		$verb = NAMESPACE_ACTIVITY_SCHEMA."favorite";
 		self::entryContent($doc, $entry, $item, $owner, "Favorite", $verb, false);
 
-		$as_object = $doc->createElement("activity:object");
-
 		$parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]);
+		if (DBA::isResult($parent)) {
+			$as_object = $doc->createElement("activity:object");
 
-		if (!$parent) {
-			$parent = [];
+			XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent));
+
+			self::entryContent($doc, $as_object, $parent, $owner, "New entry");
+
+			$entry->appendChild($as_object);
 		}
 
-		XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent));
-
-		self::entryContent($doc, $as_object, $parent, $owner, "New entry");
-
-		$entry->appendChild($as_object);
-
 		self::entryFooter($doc, $entry, $item, $owner);
 
 		return $entry;

From 088885070286ccf9f58e97efdd9fba1861a39f17 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 24 Feb 2019 13:40:04 -0500
Subject: [PATCH 135/145] Fix missing avatar key in DFRN

- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-456839092
---
 src/Protocol/DFRN.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 39d982bb9..544e77fa8 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1596,6 +1596,7 @@ class DFRN
 
 		if (empty($author['avatar'])) {
 			Logger::log('Empty author: ' . $xml);
+			$author['avatar'] = '';
 		}
 
 		if (DBA::isResult($contact_old) && !$onlyfetch) {

From e66768a0588e8ade3f72b76e59ac92ad2c9ac3bd Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 24 Feb 2019 14:00:40 -0500
Subject: [PATCH 136/145] Add empty entry author if contact query fails in DFRN

- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-462722599
---
 src/Protocol/DFRN.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 544e77fa8..e30f02756 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -763,31 +763,33 @@ class DFRN
 	 */
 	private static function addEntryAuthor(DOMDocument $doc, $element, $contact_url, $item)
 	{
-		$contact = Contact::getDetailsByURL($contact_url, $item["uid"]);
-
 		$author = $doc->createElement($element);
-		XML::addElement($doc, $author, "name", $contact["name"]);
-		XML::addElement($doc, $author, "uri", $contact["url"]);
-		XML::addElement($doc, $author, "dfrn:handle", $contact["addr"]);
 
-		/// @Todo
-		/// - Check real image type and image size
-		/// - Check which of these boths elements we should use
-		$attributes = [
+		$contact = Contact::getDetailsByURL($contact_url, $item["uid"]);
+		if (!empty($contact)) {
+			XML::addElement($doc, $author, "name", $contact["name"]);
+			XML::addElement($doc, $author, "uri", $contact["url"]);
+			XML::addElement($doc, $author, "dfrn:handle", $contact["addr"]);
+
+			/// @Todo
+			/// - Check real image type and image size
+			/// - Check which of these boths elements we should use
+			$attributes = [
 				"rel" => "photo",
 				"type" => "image/jpeg",
 				"media:width" => 80,
 				"media:height" => 80,
 				"href" => $contact["photo"]];
-		XML::addElement($doc, $author, "link", "", $attributes);
+			XML::addElement($doc, $author, "link", "", $attributes);
 
-		$attributes = [
+			$attributes = [
 				"rel" => "avatar",
 				"type" => "image/jpeg",
 				"media:width" => 80,
 				"media:height" => 80,
 				"href" => $contact["photo"]];
-		XML::addElement($doc, $author, "link", "", $attributes);
+			XML::addElement($doc, $author, "link", "", $attributes);
+		}
 
 		return $author;
 	}

From f95f6eced920a04e1dfa5bd0624279048104d6e5 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 24 Feb 2019 14:32:51 -0500
Subject: [PATCH 137/145] Add scheme input protection in frio/config.php

- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-464912016
---
 view/theme/frio/config.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index f73ef3ab0..dcf38d423 100644
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -35,16 +35,16 @@ function theme_admin_post(App $a)
 	}
 
 	if (isset($_POST['frio-settings-submit'])) {
-		Config::set('frio', 'scheme',           $_POST['frio_scheme']);
-		Config::set('frio', 'nav_bg',           $_POST['frio_nav_bg']);
-		Config::set('frio', 'nav_icon_color',   $_POST['frio_nav_icon_color']);
-		Config::set('frio', 'link_color',       $_POST['frio_link_color']);
-		Config::set('frio', 'background_color', $_POST['frio_background_color']);
-		Config::set('frio', 'contentbg_transp', $_POST['frio_contentbg_transp']);
-		Config::set('frio', 'background_image', $_POST['frio_background_image']);
-		Config::set('frio', 'bg_image_option',  $_POST['frio_bg_image_option']);
-		Config::set('frio', 'login_bg_image',   $_POST['frio_login_bg_image']);
-		Config::set('frio', 'login_bg_color',   $_POST['frio_login_bg_color']);
+		Config::set('frio', 'scheme',           defaults($_POST, 'frio_scheme', ''));
+		Config::set('frio', 'nav_bg',           defaults($_POST, 'frio_nav_bg', ''));
+		Config::set('frio', 'nav_icon_color',   defaults($_POST, 'frio_nav_icon_color', ''));
+		Config::set('frio', 'link_color',       defaults($_POST, 'frio_link_color', ''));
+		Config::set('frio', 'background_color', defaults($_POST, 'frio_background_color', ''));
+		Config::set('frio', 'contentbg_transp', defaults($_POST, 'frio_contentbg_transp', ''));
+		Config::set('frio', 'background_image', defaults($_POST, 'frio_background_image', ''));
+		Config::set('frio', 'bg_image_option',  defaults($_POST, 'frio_bg_image_option', ''));
+		Config::set('frio', 'login_bg_image',   defaults($_POST, 'frio_login_bg_image', ''));
+		Config::set('frio', 'login_bg_color',   defaults($_POST, 'frio_login_bg_color', ''));
 		Config::set('frio', 'css_modified',     time());
 	}
 }

From 1f6e0f168ceafcd254403b40f752a21b82e8d923 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 24 Feb 2019 15:48:56 -0500
Subject: [PATCH 138/145] Add missing author contact in ActivityPub\Processor

- Add logging for future occurrences
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-466812104
---
 src/Protocol/ActivityPub/Processor.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 2661444e0..e5ef354ba 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -669,13 +669,16 @@ class Processor
 
 		$parent_author = Contact::getDetailsByURL($parent['author-link'], 0);
 
-		$implicit_mentions = [
-			$parent_author['url'],
-			$parent_author['nurl'],
-			$parent_author['alias'],
-		];
+		$implicit_mentions = [];
+		if (empty($parent_author)) {
+			Logger::notice('Author public contact unknown.', ['author-link' => $parent['author-link'], 'item-id' => $parent['id']]);
+		}else {
+			$implicit_mentions[] = $parent_author['url'];
+			$implicit_mentions[] = $parent_author['nurl'];
+			$implicit_mentions[] = $parent_author['alias'];
+		}
 
-		if ($parent['alias']) {
+		if (!empty($parent['alias'])) {
 			$implicit_mentions[] = $parent['alias'];
 		}
 

From 7a73b63fc85418af08c3097144142719820b82a9 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 25 Feb 2019 07:49:33 +0100
Subject: [PATCH 139/145] update FR translations THX hypolite

---
 view/lang/fr/messages.po | 24 ++++++++++++------------
 view/lang/fr/strings.php | 22 +++++++++++-----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/view/lang/fr/messages.po b/view/lang/fr/messages.po
index a24816fe3..8a4a4b7f7 100644
--- a/view/lang/fr/messages.po
+++ b/view/lang/fr/messages.po
@@ -29,7 +29,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-02-15 09:33-0500\n"
-"PO-Revision-Date: 2019-02-20 05:05+0000\n"
+"PO-Revision-Date: 2019-02-20 15:30+0000\n"
 "Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -3784,7 +3784,7 @@ msgstr "Fichiers"
 
 #: mod/feedtest.php:18
 msgid "You must be logged in to use this module"
-msgstr ""
+msgstr "Vous devez être identifié pour accéder à cette fonctionnalité"
 
 #: mod/feedtest.php:45
 msgid "Source URL"
@@ -3796,7 +3796,7 @@ msgstr "- choisir -"
 
 #: mod/follow.php:46
 msgid "The contact could not be added."
-msgstr ""
+msgstr "Le contact n'a pas pu être ajouté."
 
 #: mod/follow.php:76
 msgid "You already added this contact."
@@ -3851,11 +3851,11 @@ msgstr ""
 
 #: mod/friendica.php:106
 msgid "Installed addons/apps:"
-msgstr ""
+msgstr "Add-ons/Applications installés :"
 
 #: mod/friendica.php:120
 msgid "No installed addons/apps"
-msgstr ""
+msgstr "Aucun add-on/application n'est installé"
 
 #: mod/friendica.php:125
 #, php-format
@@ -3950,7 +3950,7 @@ msgstr "Groupe vide"
 
 #: mod/group.php:255
 msgid "Remove contact from group"
-msgstr ""
+msgstr "Retirer ce contact du groupe"
 
 #: mod/group.php:273 mod/profperm.php:119
 msgid "Click on a contact to add or remove."
@@ -3958,7 +3958,7 @@ msgstr "Cliquez sur un contact pour l'ajouter ou le supprimer."
 
 #: mod/group.php:287
 msgid "Add contact to group"
-msgstr ""
+msgstr "Ajouter ce contact au groupe"
 
 #: mod/hcard.php:20
 msgid "No profile"
@@ -4216,7 +4216,7 @@ msgstr "Impossible d'honorer cette demande. (Vous l'avez peut-être déjà utili
 
 #: mod/lostpass.php:102
 msgid "Request has expired, please make a new one."
-msgstr ""
+msgstr "La requête a expiré, veuillez la renouveler."
 
 #: mod/lostpass.php:117
 msgid "Forgot your Password?"
@@ -4365,7 +4365,7 @@ msgstr "Voulez-vous vraiment supprimer ce message ?"
 
 #: mod/message.php:166
 msgid "Conversation not found."
-msgstr ""
+msgstr "Conversation inconnue."
 
 #: mod/message.php:171
 msgid "Message deleted."
@@ -4768,11 +4768,11 @@ msgstr "Cacher les demandes ignorées"
 
 #: mod/notifications.php:166 mod/notifications.php:243
 msgid "Notification type:"
-msgstr ""
+msgstr "Type de notification :"
 
 #: mod/notifications.php:169
 msgid "Suggested by:"
-msgstr ""
+msgstr "Suggéré par :"
 
 #: mod/notifications.php:181 mod/notifications.php:260
 #: src/Module/Contact.php:630
@@ -4826,7 +4826,7 @@ msgstr "Initiateur du partage"
 
 #: mod/notifications.php:223
 msgid "Subscriber"
-msgstr ""
+msgstr "Abonné∙e"
 
 #: mod/notifications.php:266 src/Model/Profile.php:543
 #: src/Module/Contact.php:88
diff --git a/view/lang/fr/strings.php b/view/lang/fr/strings.php
index bdf5ef5f4..b4efeaf13 100644
--- a/view/lang/fr/strings.php
+++ b/view/lang/fr/strings.php
@@ -833,10 +833,10 @@ $a->strings["Photos"] = "Photos";
 $a->strings["Contact Photos"] = "Photos du contact";
 $a->strings["Upload"] = "Téléverser";
 $a->strings["Files"] = "Fichiers";
-$a->strings["You must be logged in to use this module"] = "";
+$a->strings["You must be logged in to use this module"] = "Vous devez être identifié pour accéder à cette fonctionnalité";
 $a->strings["Source URL"] = "URL Source";
 $a->strings["- select -"] = "- choisir -";
-$a->strings["The contact could not be added."] = "";
+$a->strings["The contact could not be added."] = "Le contact n'a pas pu être ajouté.";
 $a->strings["You already added this contact."] = "Vous avez déjà ajouté ce contact.";
 $a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Le support de Diaspora est désactivé. Le contact ne peut pas être ajouté.";
 $a->strings["OStatus support is disabled. Contact can't be added."] = "Le support d'OStatus est désactivé. Le contact ne peut pas être ajouté.";
@@ -848,8 +848,8 @@ $a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn
 $a->strings["Bug reports and issues: please visit"] = "Pour les rapports de bugs : rendez vous sur";
 $a->strings["the bugtracker at github"] = "le bugtracker sur GitHub";
 $a->strings["Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"] = "";
-$a->strings["Installed addons/apps:"] = "";
-$a->strings["No installed addons/apps"] = "";
+$a->strings["Installed addons/apps:"] = "Add-ons/Applications installés :";
+$a->strings["No installed addons/apps"] = "Aucun add-on/application n'est installé";
 $a->strings["Read about the <a href=\"%1\$s/tos\">Terms of Service</a> of this node."] = "";
 $a->strings["On this server the following remote servers are blocked."] = "Sur ce serveur, les serveurs suivants sont sur liste noire.";
 $a->strings["Friend suggestion sent."] = "Suggestion d'amitié/contact envoyée.";
@@ -872,9 +872,9 @@ $a->strings["Edit Group Name"] = "Éditer le nom du groupe";
 $a->strings["Members"] = "Membres";
 $a->strings["All Contacts"] = "Tous les contacts";
 $a->strings["Group is empty"] = "Groupe vide";
-$a->strings["Remove contact from group"] = "";
+$a->strings["Remove contact from group"] = "Retirer ce contact du groupe";
 $a->strings["Click on a contact to add or remove."] = "Cliquez sur un contact pour l'ajouter ou le supprimer.";
-$a->strings["Add contact to group"] = "";
+$a->strings["Add contact to group"] = "Ajouter ce contact au groupe";
 $a->strings["No profile"] = "Aucun profil";
 $a->strings["Help:"] = "Aide :";
 $a->strings["Help"] = "Aide";
@@ -924,7 +924,7 @@ $a->strings["\n\t\tDear %1\$s,\n\t\t\tA request was recently received at \"%2\$s
 $a->strings["\n\t\tFollow this link soon to verify your identity:\n\n\t\t%1\$s\n\n\t\tYou will then receive a follow-up message containing the new password.\n\t\tYou may change that password from your account settings page after logging in.\n\n\t\tThe login details are as follows:\n\n\t\tSite Location:\t%2\$s\n\t\tLogin Name:\t%3\$s"] = "";
 $a->strings["Password reset requested at %s"] = "Requête de réinitialisation de mot de passe à %s";
 $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Impossible d'honorer cette demande. (Vous l'avez peut-être déjà utilisée par le passé.) La réinitialisation a échoué.";
-$a->strings["Request has expired, please make a new one."] = "";
+$a->strings["Request has expired, please make a new one."] = "La requête a expiré, veuillez la renouveler.";
 $a->strings["Forgot your Password?"] = "Mot de passe oublié ?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Entrez votre adresse de courriel et validez pour réinitialiser votre mot de passe. Vous recevrez la suite des instructions par courriel.";
 $a->strings["Nickname or Email: "] = "Pseudo ou eMail : ";
@@ -955,7 +955,7 @@ $a->strings["Message sent."] = "Message envoyé.";
 $a->strings["Discard"] = "Rejeter";
 $a->strings["Messages"] = "Messages";
 $a->strings["Do you really want to delete this message?"] = "Voulez-vous vraiment supprimer ce message ?";
-$a->strings["Conversation not found."] = "";
+$a->strings["Conversation not found."] = "Conversation inconnue.";
 $a->strings["Message deleted."] = "Message supprimé.";
 $a->strings["Conversation removed."] = "Conversation supprimée.";
 $a->strings["Please enter a link URL:"] = "Entrez un lien web :";
@@ -1045,8 +1045,8 @@ $a->strings["Show unread"] = "Afficher non-lus";
 $a->strings["Show all"] = "Tout afficher";
 $a->strings["Show Ignored Requests"] = "Voir les demandes ignorées";
 $a->strings["Hide Ignored Requests"] = "Cacher les demandes ignorées";
-$a->strings["Notification type:"] = "";
-$a->strings["Suggested by:"] = "";
+$a->strings["Notification type:"] = "Type de notification :";
+$a->strings["Suggested by:"] = "Suggéré par :";
 $a->strings["Hide this contact from others"] = "Cacher ce contact aux autres";
 $a->strings["Claims to be known to you: "] = "Prétend que vous le connaissez : ";
 $a->strings["yes"] = "oui";
@@ -1057,7 +1057,7 @@ $a->strings["Accepting %s as a subscriber allows them to subscribe to your posts
 $a->strings["Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "";
 $a->strings["Friend"] = "Ami";
 $a->strings["Sharer"] = "Initiateur du partage";
-$a->strings["Subscriber"] = "";
+$a->strings["Subscriber"] = "Abonné∙e";
 $a->strings["Network:"] = "Réseau";
 $a->strings["No introductions."] = "Aucune demande d'introduction.";
 $a->strings["No more %s notifications."] = "Aucune notification de %s";

From 3e290da8c261644ff0ad1a3cc0b1a506820bbf8f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 25 Feb 2019 03:16:18 -0500
Subject: [PATCH 140/145] Code standards: Add missing space in
 ActivityPub\Processor

---
 src/Protocol/ActivityPub/Processor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index e5ef354ba..fafc26b73 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -672,7 +672,7 @@ class Processor
 		$implicit_mentions = [];
 		if (empty($parent_author)) {
 			Logger::notice('Author public contact unknown.', ['author-link' => $parent['author-link'], 'item-id' => $parent['id']]);
-		}else {
+		} else {
 			$implicit_mentions[] = $parent_author['url'];
 			$implicit_mentions[] = $parent_author['nurl'];
 			$implicit_mentions[] = $parent_author['alias'];

From f597f3b378b3df741c718039393b75dc8f331ae7 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 25 Feb 2019 03:39:40 -0500
Subject: [PATCH 141/145] Protect access to rel attribute in Network\Probe

---
 src/Network/Probe.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index deec3cf2d..b061595d2 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -156,7 +156,7 @@ class Probe
 				continue;
 			}
 
-			if (($attributes["rel"] == "lrdd") && !empty($attributes["template"])) {
+			if (!empty($attributes["rel"]) && $attributes["rel"] == "lrdd" && !empty($attributes["template"])) {
 				$type = (empty($attributes["type"]) ? '' : $attributes["type"]);
 
 				$lrdd[$type] = $attributes["template"];

From 05d8bf6b5460964b4ed1c7637a9d5599827e0519 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 25 Feb 2019 07:11:35 -0500
Subject: [PATCH 142/145] Fix wrong use of array_shift in Core\Worker

---
 src/Core/Worker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 0a97c11c1..7b661d863 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -850,7 +850,7 @@ class Worker
 		}
 
 		if (!empty($waiting)) {
-			$priority =  array_shift(array_keys($waiting));
+			$priority = array_keys($waiting)[0];
 			Logger::info('No underassigned priority found, now taking the highest priority.', ['priority' => $priority]);
 			return $priority;
 		}

From 97eb2ba0538cdba1c878a0dd9d2379dfefa38637 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 25 Feb 2019 07:12:01 -0500
Subject: [PATCH 143/145] Fix possibly undefined after index in Text\BBCode

---
 src/Content/Text/BBCode.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index e9b5f98d0..ddfacf160 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -67,6 +67,7 @@ class BBCode extends BaseObject
 					$post["after"] = trim(substr($body, $pos + strlen($data[0])));
 				} else {
 					$post["text"] = trim(str_replace($data[0], "", $body));
+					$post["after"] = '';
 				}
 
 				$attacheddata = $data[2];

From 39ff7de06551367712cd31e8a12a7868182078f3 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 25 Feb 2019 21:06:18 -0500
Subject: [PATCH 144/145] [Composer] Update npm-asset/fullcalendar to version
 3.10.0

- Add now required explicit npm-asset/moment dependency for npm-asset/fullcalendar to work
---
 composer.json |  1 +
 composer.lock | 37 ++++++++++++-------------------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/composer.json b/composer.json
index 3638a9495..765ec23a2 100644
--- a/composer.json
+++ b/composer.json
@@ -49,6 +49,7 @@
 		"npm-asset/jquery-colorbox": "^1.6",
 		"npm-asset/jquery-datetimepicker": "^2.4.0",
 		"npm-asset/jgrowl": "^1.4",
+		"npm-asset/moment": "^2.20.1",
 		"npm-asset/fullcalendar": "^3.0.1",
 		"npm-asset/cropperjs": "1.2.2",
 		"npm-asset/imagesloaded": "4.1.4"
diff --git a/composer.lock b/composer.lock
index a22d39529..ff38c8105 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fabea74e511a05896a2a9b7e2367ae28",
+    "content-hash": "8897c1f6912cc9b889534a8c59deead1",
     "packages": [
         {
             "name": "asika/simple-console",
@@ -1026,32 +1026,18 @@
         },
         {
             "name": "npm-asset/fullcalendar",
-            "version": "3.9.0",
+            "version": "3.10.0",
             "dist": {
                 "type": "tar",
-                "url": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-3.9.0.tgz",
+                "url": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-3.10.0.tgz",
                 "reference": null,
-                "shasum": "b608a9989f3416f0b1d526c6bdfeeaf2ac79eda5"
-            },
-            "require": {
-                "npm-asset/jquery": ">=2,<4.0",
-                "npm-asset/moment": ">=2.20.1,<3.0.0"
+                "shasum": "cc5e87d518fd6550e142816a31dd191664847919"
             },
             "type": "npm-asset-library",
             "extra": {
                 "npm-asset-bugs": {
                     "url": "https://fullcalendar.io/wiki/Reporting-Bugs/"
                 },
-                "npm-asset-files": [
-                    "dist/*.js",
-                    "dist/*.css",
-                    "dist/*.d.ts",
-                    "dist/locale/*.js",
-                    "README.*",
-                    "LICENSE.*",
-                    "CHANGELOG.*",
-                    "CONTRIBUTING.*"
-                ],
                 "npm-asset-main": "dist/fullcalendar.js",
                 "npm-asset-directories": [],
                 "npm-asset-repository": {
@@ -1061,7 +1047,7 @@
                 "npm-asset-scripts": {
                     "clean": "gulp clean",
                     "dist": "gulp dist",
-                    "lint": "gulp lint",
+                    "lint": "gulp lint-and-example-repos",
                     "test": "gulp test:single"
                 }
             },
@@ -1083,7 +1069,7 @@
                 "full-sized",
                 "jquery-plugin"
             ],
-            "time": "2018-03-05T03:30:23+00:00"
+            "time": "2019-01-11T02:39:12+00:00"
         },
         {
             "name": "npm-asset/imagesloaded",
@@ -3090,6 +3076,7 @@
                 "mock",
                 "xunit"
             ],
+            "abandoned": true,
             "time": "2017-06-30T09:13:00+00:00"
         },
         {
@@ -3193,7 +3180,7 @@
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
             "keywords": [
                 "comparator",
                 "compare",
@@ -3295,7 +3282,7 @@
                 }
             ],
             "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "https://github.com/sebastianbergmann/environment",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
             "keywords": [
                 "Xdebug",
                 "environment",
@@ -3363,7 +3350,7 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "https://github.com/sebastianbergmann/exporter",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
@@ -3415,7 +3402,7 @@
                 }
             ],
             "description": "Snapshotting of global state",
-            "homepage": "https://github.com/sebastianbergmann/global-state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
             "keywords": [
                 "global state"
             ],
@@ -3517,7 +3504,7 @@
                 }
             ],
             "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "https://github.com/sebastianbergmann/recursion-context",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
             "time": "2016-11-19T07:33:16+00:00"
         },
         {

From bd7aaacfb0eb0fbe125375ae9db1a7aad5d0f9a2 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 26 Feb 2019 10:19:08 +0100
Subject: [PATCH 145/145] fixing links in photoMenu

---
 include/conversation.php | 8 ++++----
 src/Model/Contact.php    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 77b96574a..37752c083 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -850,7 +850,7 @@ function item_photo_menu($item) {
 
 	$author = ['uid' => 0, 'id' => $item['author-id'],
 		'network' => $item['author-network'], 'url' => $item['author-link']];
-	$profile_link = Contact::magicLinkByContact($author);
+	$profile_link = Contact::magicLinkByContact($author, $item['author-link']);
 	$sparkle = (strpos($profile_link, 'redir/') === 0);
 
 	$cid = 0;
@@ -865,9 +865,9 @@ function item_photo_menu($item) {
 	}
 
 	if ($sparkle) {
-		$status_link = $profile_link . '?url=status';
-		$photos_link = $profile_link . '?url=photos';
-		$profile_link = $profile_link . '?url=profile';
+		$status_link = $profile_link . '?tab=status';
+		$photos_link = str_replace('/profile/', '/photos/', $profile_link);
+		$profile_link = $profile_link . '?=profile';
 	}
 
 	if ($cid && !$item['self']) {
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 6e83b76e6..c472da2c0 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1006,7 +1006,7 @@ class Contact extends BaseObject
 		$sparkle = false;
 		if (($contact['network'] === Protocol::DFRN) && !$contact['self']) {
 			$sparkle = true;
-			$profile_link = System::baseUrl() . '/redir/' . $contact['id'];
+			$profile_link = System::baseUrl() . '/redir/' . $contact['id'] . '?url=' . $contact['url'];
 		} else {
 			$profile_link = $contact['url'];
 		}
@@ -1016,9 +1016,9 @@ class Contact extends BaseObject
 		}
 
 		if ($sparkle) {
-			$status_link = $profile_link . '?url=status';
-			$photos_link = $profile_link . '?url=photos';
-			$profile_link = $profile_link . '?url=profile';
+			$status_link = $profile_link . '?tab=status';
+			$photos_link = str_replace('/profile/', '/photos/', $profile_link);
+			$profile_link = $profile_link . '?tab=profile';
 		}
 
 		if (in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && !$contact['self']) {