From 7aa4f5297db47d7287ea47943771c013761761cd Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 1 Oct 2016 15:55:18 +0200 Subject: [PATCH 01/35] when the admin creates a new account, use the system language for this accounts --- mod/admin.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 4dc6064a7d..8fb0df24c4 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1127,18 +1127,20 @@ function admin_page_dbsync(&$a) { * @param App $a */ function admin_page_users_post(&$a){ - $pending = (x($_POST, 'pending') ? $_POST['pending'] : array()); - $users = (x($_POST, 'user') ? $_POST['user'] : array()); - $nu_name = (x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); - $nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); - $nu_email = (x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); + $pending = (x($_POST, 'pending') ? $_POST['pending'] : array()); + $users = (x($_POST, 'user') ? $_POST['user'] : array()); + $nu_name = (x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); + $nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); + $nu_email = (x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); + $nu_language = get_config('system', 'language'); check_form_security_token_redirectOnErr('/admin/users', 'admin_users'); if(!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { require_once('include/user.php'); - $result = create_user(array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1)); + $result = create_user(array('username'=>$nu_name, 'email'=>$nu_email, + 'nickname'=>$nu_nickname, 'verified'=>1, 'language'=>$nu_language)); if(! $result['success']) { notice($result['message']); return; From 5cfca894c1c891dec0f96eb2d86aefdea1ff1ec5 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 1 Oct 2016 15:55:56 +0200 Subject: [PATCH 02/35] On registration use the browser preferred language for the new account --- mod/register.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/register.php b/mod/register.php index 6fc5887ef5..4f5652f2f7 100644 --- a/mod/register.php +++ b/mod/register.php @@ -52,6 +52,7 @@ function register_post(&$a) { $arr['blocked'] = $blocked; $arr['verified'] = $verified; + $arr['language'] = get_browser_language(); $result = create_user($arr); From aba8313b210499440eb2237baa42a503ad4d4cc3 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 1 Oct 2016 15:57:37 +0200 Subject: [PATCH 03/35] don't save browser selected language on login --- include/security.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/security.php b/include/security.php index 2d6db95f4f..b52ddeb2df 100644 --- a/include/security.php +++ b/include/security.php @@ -79,11 +79,9 @@ function authenticate_success($user_record, $login_initial = false, $interactive header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"'); if($login_initial || $login_refresh) { - $l = get_browser_language(); - q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d", + q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d", dbesc(datetime_convert()), - dbesc($l), intval($_SESSION['uid']) ); From 60a0235af0dfb0a85613fbcf96d48906179f06c4 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 1 Oct 2016 20:03:27 +0000 Subject: [PATCH 04/35] The account type is now read and displayed --- include/Contact.php | 51 ++++++++++++++++++++++++++++++++++++++------ include/dfrn.php | 14 +++++++++++- include/identity.php | 11 ++-------- mod/allfriends.php | 2 +- mod/cal.php | 5 +---- mod/common.php | 2 +- mod/contacts.php | 15 ++++--------- mod/directory.php | 10 +-------- mod/dirfind.php | 2 +- mod/hovercard.php | 3 +-- mod/match.php | 2 +- mod/network.php | 5 +++-- mod/photos.php | 5 +---- mod/suggest.php | 3 +-- mod/videos.php | 5 +---- mod/viewcontacts.php | 2 +- 16 files changed, 78 insertions(+), 59 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 004d3aa287..f1e8bbe6d6 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -208,22 +208,22 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) { $uid = local_user(); // Fetch contact data from the contact table for the given user - $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, - `xmpp`, `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, `self` + $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`, + `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d", dbesc(normalise_link($url)), intval($uid)); // Fetch the data from the contact table with "uid=0" (which is filled automatically) if (!$r) - $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, - `xmpp`, `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, 0 AS `self` + $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`, + `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0", dbesc(normalise_link($url))); // Fetch the data from the gcontact table if (!$r) - $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, - '' AS `xmpp`, `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `birthday`, 0 AS `self` + $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`, + `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, 0 AS `contact-type`, `birthday`, 0 AS `self` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($url))); @@ -683,4 +683,43 @@ function formatted_location($profile) { return $location; } + +/** + * @brief Returns the account type name + * + * The function be called with either the profile or the contct array + * + * @param array $contact contact or profile array + */ +function account_type($contact) { + + if((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY)) + || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP)) + || (isset($contact['forum']) && intval($contact['forum'])) + || (isset($contact['prv']) && intval($contact['prv'])) + || (isset($contact['community']) && intval($contact['community']))) + $type = ACCOUNT_TYPE_COMMUNITY; + else + $type = ACCOUNT_TYPE_PERSON; + + if (isset($contact["contact-type"])) + $type = $contact["contact-type"]; + if (isset($contact["account-type"])) + $type = $contact["account-type"]; + + if ($type != 0) + switch($type) { + case ACCOUNT_TYPE_ORGANISATION: + $account_type = t("Organisation"); + break; + case ACCOUNT_TYPE_NEWS: + $account_type = t('News'); + break; + case ACCOUNT_TYPE_COMMUNITY: + $account_type = t("Forum"); + break; + } + + return $account_type; +} ?> diff --git a/include/dfrn.php b/include/dfrn.php index e9cfb228f6..c5d00e8a67 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -2492,7 +2492,19 @@ class dfrn { logger("Import DFRN message for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG); - // is it a public forum? Private forums aren't supported by now with this method + // The account type is new since 3.5.1 + if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) { + $accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()", $context)->item(0)->nodeValue); + + if ($accounttype != $importer["contact-type"]) + q("UPDATE `contact` SET `contact-type` = %d WHERE `id` = %d", + intval($accounttype), + intval($importer["id"]) + ); + } + + // is it a public forum? Private forums aren't supported with this method + // This is deprecated since 3.5.1 $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()", $context)->item(0)->nodeValue); if ($forum != $importer["forum"]) diff --git a/include/identity.php b/include/identity.php index def50a98fc..b3dbea8fc6 100644 --- a/include/identity.php +++ b/include/identity.php @@ -310,15 +310,8 @@ function profile_sidebar($profile, $block = 0) { ); } - // check if profile is a forum - if((intval($profile['page-flags']) == PAGE_COMMUNITY) - || (intval($profile['page-flags']) == PAGE_PRVGROUP) - || (isset($profile['forum']) && intval($profile['forum'])) - || (isset($profile['prv']) && intval($profile['prv'])) - || (isset($profile['community']) && intval($profile['community']))) - $account_type = t('Forum'); - else - $account_type = ""; + // Fetch the account type + $account_type = account_type($profile); if((x($profile,'address') == 1) || (x($profile,'location') == 1) diff --git a/mod/allfriends.php b/mod/allfriends.php index 498b9d7dbf..03f78e696e 100644 --- a/mod/allfriends.php +++ b/mod/allfriends.php @@ -76,7 +76,7 @@ function allfriends_content(&$a) { 'details' => $contact_details['location'], 'tags' => $contact_details['keywords'], 'about' => $contact_details['about'], - 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'account_type' => account_type($contact_details), 'network' => network_to_name($contact_details['network'], $contact_details['url']), 'photo_menu' => $photo_menu, 'conntxt' => t('Connect'), diff --git a/mod/cal.php b/mod/cal.php index ab20617257..78907da06a 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -40,10 +40,7 @@ function cal_init(&$a) { $profile = get_profiledata_by_nick($nick, $a->profile_uid); - if((intval($profile['page-flags']) == PAGE_COMMUNITY) || (intval($profile['page-flags']) == PAGE_PRVGROUP)) - $account_type = t('Forum'); - else - $account_type = ""; + $account_type = account_type($profile); $tpl = get_markup_template("vcard-widget.tpl"); diff --git a/mod/common.php b/mod/common.php index 9b2c69f6d7..063eafe67b 100644 --- a/mod/common.php +++ b/mod/common.php @@ -120,7 +120,7 @@ function common_content(&$a) { 'details' => $contact_details['location'], 'tags' => $contact_details['keywords'], 'about' => $contact_details['about'], - 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'account_type' => account_type($contact_details), 'network' => network_to_name($contact_details['network'], $contact_details['url']), 'photo_menu' => $photo_menu, 'id' => ++$id, diff --git a/mod/contacts.php b/mod/contacts.php index be8135f5cb..410cced8e6 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -38,7 +38,7 @@ function contacts_init(&$a) { if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) { $networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']); - } else + } else $networkname = ''; $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array( @@ -48,7 +48,7 @@ function contacts_init(&$a) { '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""), '$network_name' => $networkname, '$network' => t('Network:'), - 'account_type' => (($a->data['contact']['forum'] || $a->data['contact']['prv']) ? t('Forum') : '') + '$account_type' => account_type($a->data['contact']) )); $finpeople_widget = ''; $follow_widget = ''; @@ -623,7 +623,7 @@ function contacts_content(&$a) { '$url' => $url, '$profileurllabel' => t('Profile URL'), '$profileurl' => $contact['url'], - 'account_type' => (($contact['forum'] || $contact['prv']) ? t('Forum') : ''), + '$account_type' => account_type($contact), '$location' => bbcode($contact["location"]), '$location_label' => t("Location:"), '$xmpp' => bbcode($contact["xmpp"]), @@ -910,8 +910,6 @@ function contact_posts($a, $contact_id) { function _contact_detail_for_template($rr){ - $community = ''; - switch($rr['rel']) { case CONTACT_IS_FRIEND: $dir_icon = 'images/lrarrow.gif'; @@ -937,11 +935,6 @@ function _contact_detail_for_template($rr){ $sparkle = ''; } - //test if contact is a forum page - if (isset($rr['forum']) OR isset($rr['prv'])) - $community = ($rr['forum'] OR $rr['prv']); - - return array( 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']), 'edit_hover' => t('Edit contact'), @@ -952,7 +945,7 @@ function _contact_detail_for_template($rr){ 'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB), 'name' => htmlentities($rr['name']), 'username' => htmlentities($rr['name']), - 'account_type' => ($community ? t('Forum') : ''), + 'account_type' => account_type($rr), 'sparkle' => $sparkle, 'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']), 'url' => $url, diff --git a/mod/directory.php b/mod/directory.php index a6a9cb8ab2..06aeec622f 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -99,7 +99,6 @@ function directory_content(&$a) { foreach($r as $rr) { - $community = ''; $itemurl= ''; $itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']); @@ -128,13 +127,6 @@ function directory_content(&$a) { // if(strlen($rr['gender'])) // $details .= '
' . t('Gender: ') . $rr['gender']; - - // show if account is a community account - /// @TODO The other page types should be also respected, but first we need a good - /// translatiion and systemwide consistency for displaying the page type - if((intval($rr['page-flags']) == PAGE_COMMUNITY) OR (intval($rr['page-flags']) == PAGE_PRVGROUP)) - $community = true; - $profile = $rr; if((x($profile,'address') == 1) @@ -171,7 +163,7 @@ function directory_content(&$a) { 'img_hover' => $rr['name'], 'name' => $rr['name'], 'details' => $details, - 'account_type' => ($community ? t('Forum') : ''), + 'account_type' => account_type($rr), 'profile' => $profile, 'location' => $location_e, 'tags' => $rr['pub_keywords'], diff --git a/mod/dirfind.php b/mod/dirfind.php index 52e1617554..215731978c 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -220,7 +220,7 @@ function dirfind_content(&$a, $prefix = "") { 'details' => $contact_details['location'], 'tags' => $contact_details['keywords'], 'about' => $contact_details['about'], - 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'account_type' => account_type($contact_details), 'network' => network_to_name($jj->network, $jj->url), 'id' => ++$id, ); diff --git a/mod/hovercard.php b/mod/hovercard.php index 9bd91f0d5a..65b75b3211 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -77,10 +77,9 @@ function hovercard_content() { // 'server_url' => $contact["server_url"], 'bd' => (($contact["birthday"] == "0000-00-00") ? "" : $contact["birthday"]), // 'generation' => $contact["generation"], - 'account_type' => ($contact['community'] ? t("Forum") : ""), + 'account_type' => account_type($contact), 'actions' => $actions, ); - if($datatype == "html") { $t = get_markup_template("hovercard.tpl"); diff --git a/mod/match.php b/mod/match.php index 8341911577..33e07c91ce 100644 --- a/mod/match.php +++ b/mod/match.php @@ -81,7 +81,7 @@ function match_content(&$a) { 'details' => $contact_details['location'], 'tags' => $contact_details['keywords'], 'about' => $contact_details['about'], - 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'account_type' => account_type($contact_details), 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), 'inttxt' => ' ' . t('is interested in:'), 'conntxt' => t('Connect'), diff --git a/mod/network.php b/mod/network.php index 6ebedbcae8..f4af489db9 100644 --- a/mod/network.php +++ b/mod/network.php @@ -502,7 +502,7 @@ function network_content(&$a, $update = 0) { } elseif($cid) { - $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d + $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `contact-type`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0 LIMIT 1", intval($cid) ); @@ -514,10 +514,11 @@ function network_content(&$a, $update = 0) { 'name' => htmlentities($r[0]['name']), 'itemurl' => (($r[0]['addr']) ? ($r[0]['addr']) : ($r[0]['nurl'])), 'thumb' => proxy_url($r[0]['thumb'], false, PROXY_SIZE_THUMB), - 'account_type' => (($r[0]['forum']) || ($r[0]['prv']) ? t('Forum') : ''), 'details' => $r[0]['location'], ); + $entries[0]["account_type"] = account_type($r[0]); + $o = replace_macros(get_markup_template("viewcontact_template.tpl"),array( 'contacts' => $entries, 'id' => 'network', diff --git a/mod/photos.php b/mod/photos.php index a191dcf071..741181b2e9 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -38,10 +38,7 @@ function photos_init(&$a) { $profile = get_profiledata_by_nick($nick, $a->profile_uid); - if((intval($profile['page-flags']) == PAGE_COMMUNITY) || (intval($profile['page-flags']) == PAGE_PRVGROUP)) - $account_type = t('Forum'); - else - $account_type = ""; + $account_type = account_type($profile); $tpl = get_markup_template("vcard-widget.tpl"); diff --git a/mod/suggest.php b/mod/suggest.php index 00033b2d24..4399450ecc 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -95,7 +95,7 @@ function suggest_content(&$a) { 'details' => $contact_details['location'], 'tags' => $contact_details['keywords'], 'about' => $contact_details['about'], - 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'account_type' => account_type($contact_details), 'ignlnk' => $ignlnk, 'ignid' => $rr['id'], 'conntxt' => t('Connect'), @@ -113,7 +113,6 @@ function suggest_content(&$a) { $o .= replace_macros($tpl,array( '$title' => t('Friend Suggestions'), '$contacts' => $entries, - )); return $o; diff --git a/mod/videos.php b/mod/videos.php index e5a0887bb9..fb742eb015 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -33,10 +33,7 @@ function videos_init(&$a) { $profile = get_profiledata_by_nick($nick, $a->profile_uid); - if((intval($profile['page-flags']) == PAGE_COMMUNITY) || (intval($profile['page-flags']) == PAGE_PRVGROUP)) - $account_type = t('Forum'); - else - $account_type = ""; + $account_type = account_type($profile); $tpl = get_markup_template("vcard-widget.tpl"); diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index 2eae8fec8e..19dd8b7f95 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -102,7 +102,7 @@ function viewcontacts_content(&$a) { 'details' => $contact_details['location'], 'tags' => $contact_details['keywords'], 'about' => $contact_details['about'], - 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'account_type' => account_type($contact_details), 'url' => $url, 'sparkle' => '', 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']), From 9dee3cc809ab7319e4ce67ccadaf0ac492dc9613 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 1 Oct 2016 20:20:27 +0000 Subject: [PATCH 05/35] Some small changes --- include/Contact.php | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index f1e8bbe6d6..936589be98 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -687,12 +687,13 @@ function formatted_location($profile) { /** * @brief Returns the account type name * - * The function be called with either the profile or the contct array + * The function can be called with either the user or the contact array * - * @param array $contact contact or profile array + * @param array $contact contact or user array */ function account_type($contact) { + // There are several fields that indicate that the contact or user is a forum if((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY)) || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP)) || (isset($contact['forum']) && intval($contact['forum'])) @@ -702,23 +703,26 @@ function account_type($contact) { else $type = ACCOUNT_TYPE_PERSON; + // The field is named differently in the user and the contact record if (isset($contact["contact-type"])) $type = $contact["contact-type"]; if (isset($contact["account-type"])) $type = $contact["account-type"]; - if ($type != 0) - switch($type) { - case ACCOUNT_TYPE_ORGANISATION: - $account_type = t("Organisation"); - break; - case ACCOUNT_TYPE_NEWS: - $account_type = t('News'); - break; - case ACCOUNT_TYPE_COMMUNITY: - $account_type = t("Forum"); - break; - } + switch($type) { + case ACCOUNT_TYPE_ORGANISATION: + $account_type = t("Organisation"); + break; + case ACCOUNT_TYPE_NEWS: + $account_type = t('News'); + break; + case ACCOUNT_TYPE_COMMUNITY: + $account_type = t("Forum"); + break; + default: + $account_type = ""; + break; + } return $account_type; } From 2a93c5b816b0762699e0fc5691669109a10aaa16 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 1 Oct 2016 20:27:49 +0000 Subject: [PATCH 06/35] Little fix to the utf8mb4: Now here's the changed database.sql --- database.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/database.sql b/database.sql index ecd2be1529..a482b106cf 100644 --- a/database.sql +++ b/database.sql @@ -58,7 +58,7 @@ CREATE TABLE IF NOT EXISTS `cache` ( `v` text, `expire_mode` int(11) NOT NULL DEFAULT 0, `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY(`k`), + PRIMARY KEY(`k`(191)), INDEX `updated` (`updated`) ) DEFAULT CHARSET=utf8mb4; @@ -679,7 +679,7 @@ CREATE TABLE IF NOT EXISTS `oembed` ( `url` varchar(255) NOT NULL, `content` text, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY(`url`), + PRIMARY KEY(`url`(191)), INDEX `created` (`created`) ) DEFAULT CHARSET=utf8mb4; @@ -692,7 +692,7 @@ CREATE TABLE IF NOT EXISTS `parsed_url` ( `oembed` tinyint(1) NOT NULL DEFAULT 0, `content` text, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY(`url`,`guessing`,`oembed`), + PRIMARY KEY(`url`(191),`guessing`,`oembed`), INDEX `created` (`created`) ) DEFAULT CHARSET=utf8mb4; From 3c85fb8c9a94d4856760a15ea98656a44976a8fa Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 1 Oct 2016 21:40:41 -0400 Subject: [PATCH 07/35] Fix Issue #2816 - Change (P)Config::set to use INSERT >>> ON DUPLICATE KEY UPDATE - Add DB update --- include/Core/Config.php | 30 ++++++------------------------ include/Core/PConfig.php | 27 ++++++++------------------- update.php | 12 +++++++++++- 3 files changed, 25 insertions(+), 44 deletions(-) diff --git a/include/Core/Config.php b/include/Core/Config.php index 5703558cf3..e5515efafc 100644 --- a/include/Core/Config.php +++ b/include/Core/Config.php @@ -126,37 +126,19 @@ class Config { public static function set($family,$key,$value) { global $a; - // If $a->config[$family] has been previously set to '!!', then - // $a->config[$family][$key] will evaluate to $a->config[$family][0], and - // $a->config[$family][$key] = $value will be equivalent to - // $a->config[$family][0] = $value[0] (this causes infuriating bugs), - // so unset the family before assigning a value to a family's key - if($a->config[$family] === '!!') - unset($a->config[$family]); + $a->config[$family][$key] = $value; // manage array value $dbvalue = (is_array($value)?serialize($value):$value); $dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue); - if(is_null(self::get($family,$key,null,true))) { - $a->config[$family][$key] = $value; - $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", - dbesc($family), - dbesc($key), - dbesc($dbvalue) - ); - if($ret) - return $value; - return $ret; - } - $ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s'", - dbesc($dbvalue), + $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) +ON DUPLICATE KEY UPDATE `v` = '%s'", dbesc($family), - dbesc($key) + dbesc($key), + dbesc($dbvalue), + dbesc($dbvalue) ); - - $a->config[$family][$key] = $value; - if($ret) return $value; return $ret; diff --git a/include/Core/PConfig.php b/include/Core/PConfig.php index 2bc08667a7..082f1c05c2 100644 --- a/include/Core/PConfig.php +++ b/include/Core/PConfig.php @@ -126,27 +126,16 @@ class PConfig { // manage array value $dbvalue = (is_array($value)?serialize($value):$value); - if(is_null(self::get($uid,$family,$key,null, true))) { - $a->config[$uid][$family][$key] = $value; - $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", - intval($uid), - dbesc($family), - dbesc($key), - dbesc($dbvalue) - ); - if($ret) - return $value; - return $ret; - } - $ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s'", - dbesc($dbvalue), - intval($uid), - dbesc($family), - dbesc($key) - ); - $a->config[$uid][$family][$key] = $value; + $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) +ON DUPLICATE KEY UPDATE `v` = '%s'", + intval($uid), + dbesc($family), + dbesc($key), + dbesc($dbvalue), + dbesc($dbvalue) + ); if($ret) return $value; return $ret; diff --git a/update.php b/update.php index 31f7852a2f..55db8bca9c 100644 --- a/update.php +++ b/update.php @@ -1677,7 +1677,7 @@ function update_1190() { $idx = array_search($plugin, $plugins_arr); if ($idx !== false){ unset($plugins_arr[$idx]); - //delete forumlist manually from addon and hook table + //delete forumlist manually from addon and hook table // since uninstall_plugin() don't work here q("DELETE FROM `addon` WHERE `name` = 'forumlist' "); q("DELETE FROM `hook` WHERE `file` = 'addon/forumlist/forumlist.php' "); @@ -1728,3 +1728,13 @@ function update_1202() { $r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)", dbesc(ACCOUNT_TYPE_COMMUNITY), dbesc(PAGE_COMMUNITY), dbesc(PAGE_PRVGROUP)); } + +function update_1210() { + // Convert config indexes to unique, old_alter_table=1 removes duplicates on ALTER IGNORE + $r = q("SET session old_alter_table=1;"); + $r = q("ALTER TABLE config DROP INDEX cat_k"); + $r = q("ALTER IGNORE TABLE config ADD UNIQUE INDEX cat_k (cat, k)"); + + $r = q("ALTER TABLE pconfig DROP INDEX uid_cat_k"); + $r = q("ALTER IGNORE TABLE pconfig ADD UNIQUE INDEX uid_cat_k (uid, cat, k)"); +} \ No newline at end of file From 3f619726b131296106459544852692aaa54ae7eb Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 1 Oct 2016 23:29:30 -0400 Subject: [PATCH 08/35] Fix Issue #2816 - Update dbstructure instead of update - Add UNIQUE index support to `update_structure()` - Move DB update from `update.php` to `dbstructure.php` - Update DB_VERSION to 1210 --- boot.php | 72 ++++++++++++++++++++--------------------- include/dbstructure.php | 30 +++++++++++++---- update.php | 12 +------ 3 files changed, 61 insertions(+), 53 deletions(-) diff --git a/boot.php b/boot.php index ea14428fd0..97e0c8b367 100644 --- a/boot.php +++ b/boot.php @@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Asparagus'); define ( 'FRIENDICA_VERSION', '3.5.1-dev' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1203 ); +define ( 'DB_UPDATE_VERSION', 1210 ); /** * @brief Constant with a HTML line break. @@ -53,7 +53,7 @@ define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); /** * @brief Image storage quality. - * + * * Lower numbers save space at cost of image detail. * For ease of upgrade, please do not change here. Change jpeg quality with * $a->config['system']['jpeg_quality'] = n; @@ -95,7 +95,7 @@ define ( 'DEFAULT_DB_ENGINE', 'MyISAM' ); /** * @name SSL Policy - * + * * SSL redirection policies * @{ */ @@ -106,7 +106,7 @@ define ( 'SSL_POLICY_SELFSIGN', 2 ); /** * @name Logger - * + * * log levels * @{ */ @@ -119,7 +119,7 @@ define ( 'LOGGER_ALL', 4 ); /** * @name Cache - * + * * Cache levels * @{ */ @@ -131,7 +131,7 @@ define ( 'CACHE_HOUR', 3 ); /** * @name Register - * + * * Registration policies * @{ */ @@ -142,7 +142,7 @@ define ( 'REGISTER_OPEN', 2 ); /** * @name Contact_is - * + * * Relationship types * @{ */ @@ -153,7 +153,7 @@ define ( 'CONTACT_IS_FRIEND', 3); /** * @name Update - * + * * DB update return values * @{ */ @@ -205,7 +205,7 @@ define ( 'ACCOUNT_TYPE_COMMUNITY', 3 ); /** * @name CP - * + * * Type of the community page * @{ */ @@ -216,7 +216,7 @@ define ( 'CP_GLOBAL_COMMUNITY', 1 ); /** * @name Network - * + * * Network and protocol family types * @{ */ @@ -288,7 +288,7 @@ define ( 'ZCURL_TIMEOUT' , (-1)); /** * @name Notify - * + * * Email notification options * @{ */ @@ -310,7 +310,7 @@ define ( 'NOTIFY_SYSTEM', 0x8000 ); /** * @name Term - * + * * Tag/term types * @{ */ @@ -330,7 +330,7 @@ define ( 'TERM_OBJ_PHOTO', 2 ); /** * @name Namespaces - * + * * Various namespaces we may need to parse * @{ */ @@ -353,7 +353,7 @@ define ( 'NAMESPACE_ATOM1', 'http://www.w3.org/2005/Atom' ); /** * @name Activity - * + * * Activity stream defines * @{ */ @@ -399,7 +399,7 @@ define ( 'ACTIVITY_OBJ_QUESTION', 'http://activityschema.org/object/question' ); /** * @name Gravity - * + * * Item weight for query ordering * @{ */ @@ -466,9 +466,9 @@ function startup() { /** * * class: App - * + * * @brief Our main application structure for the life of this page. - * + * * Primarily deals with the URL that got us here * and tries to make some sense of it, and * stores our page contents and config storage @@ -1015,9 +1015,9 @@ class App { /** * @brief Register template engine class - * + * * If $name is "", is used class static property $class::$name - * + * * @param string $class * @param string $name */ @@ -1035,7 +1035,7 @@ class App { /** * @brief Return template engine instance. - * + * * If $name is not defined, return engine defined by theme, * or default * @@ -1358,7 +1358,7 @@ class App { /** * @brief Retrieve the App structure - * + * * Useful in functions which require it but don't get it passed to them */ function get_app() { @@ -1612,7 +1612,7 @@ function run_update_function($x) { * and mark it uninstalled in the database (for now we'll remove it). * Then go through the config list and if we have a plugin that isn't installed, * call the install procedure and add it to the database. - * + * * @param App $a * */ @@ -1678,17 +1678,17 @@ function get_guid($size=16, $prefix = "") { } } -/** +/** * @brief Wrapper for adding a login box. - * + * * @param bool $register * If $register == true provide a registration link. * This will most always depend on the value of $a->config['register_policy']. * @param bool $hiddens - * + * * @return string * Returns the complete html for inserting into the page - * + * * @hooks 'login_hook' * string $o */ @@ -1778,7 +1778,7 @@ function goaway($s) { /** * @brief Returns the user id of locally logged in user or false. - * + * * @return int|bool user id or false */ function local_user() { @@ -1789,7 +1789,7 @@ function local_user() { /** * @brief Returns contact id of authenticated site visitor or false - * + * * @return int|bool visitor_id or false */ function remote_user() { @@ -1846,13 +1846,13 @@ function get_max_import_size() { * so plugins can take part in process :) * * @param (string|integer) $cmd program to run or priority - * + * * next args are passed as $cmd command line * e.g.: proc_run("ls","-la","/tmp"); * or: proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); * * @note $cmd and string args are surrounded with "" - * + * * @hooks 'proc_run' * array $arr */ @@ -2011,9 +2011,9 @@ function current_theme(){ /** * @brief Return full URL to theme which is currently in effect. - * + * * Provide a sane default if nothing is chosen or the specified theme does not exist. - * + * * @return string */ function current_theme_url() { @@ -2360,7 +2360,7 @@ function current_load() { /** * @brief get c-style args - * + * * @return int */ function argc() { @@ -2369,7 +2369,7 @@ function argc() { /** * @brief Returns the value of a argv key - * + * * @param int $x argv key * @return string Value of the argv key */ @@ -2382,12 +2382,12 @@ function argv($x) { /** * @brief Get the data which is needed for infinite scroll - * + * * For invinite scroll we need the page number of the actual page * and the the URI where the content of the next page comes from. * This data is needed for the js part in main.js. * Note: infinite scroll does only work for the network page (module) - * + * * @param string $module The name of the module (e.g. "network") * @return array Of infinite scroll data * 'pageno' => $pageno The number of the actual page diff --git a/include/dbstructure.php b/include/dbstructure.php index 0c933c6648..f5a1d4fde4 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -78,6 +78,10 @@ function table_structure($table) { if ($index["Index_type"] == "FULLTEXT") continue; + if ($index['Key_name'] != 'PRIMARY' && $index['Non_unique'] == '0' && !isset($indexdata[$index["Key_name"]])) { + $indexdata[$index["Key_name"]] = array('UNIQUE'); + } + $column = $index["Column_name"]; // On utf8mb4 a varchar index can only have a length of 191 // To avoid the need to add this to every index definition we just ignore it here. @@ -151,6 +155,12 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { if (is_null($definition)) $definition = db_definition($charset); + // Ensure index conversion to unique removes duplicates + $sql_config = "SET session old_alter_table=1;"; + if ($verbose) + echo $sql_config."\n"; + if ($action) + @$db->q($sql_config); // Compare it foreach ($definition AS $name => $structure) { @@ -176,7 +186,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { if ($current_index_definition != $new_index_definition && substr($indexname, 0, 6) != 'local_') { $sql2=db_drop_index($indexname); if ($sql3 == "") - $sql3 = "ALTER TABLE `".$name."` ".$sql2; + $sql3 = "ALTER IGNORE TABLE `".$name."` ".$sql2; else $sql3 .= ", ".$sql2; } @@ -186,7 +196,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { if (!isset($database[$name]["fields"][$fieldname])) { $sql2=db_add_table_field($fieldname, $parameters); if ($sql3 == "") - $sql3 = "ALTER TABLE `".$name."` ".$sql2; + $sql3 = "ALTER IGNORE TABLE `".$name."` ".$sql2; else $sql3 .= ", ".$sql2; } else { @@ -196,7 +206,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { if ($current_field_definition != $new_field_definition) { $sql2=db_modify_table_field($fieldname, $parameters); if ($sql3 == "") - $sql3 = "ALTER TABLE `".$name."` ".$sql2; + $sql3 = "ALTER IGNORE TABLE `".$name."` ".$sql2; else $sql3 .= ", ".$sql2; } @@ -220,7 +230,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $sql2=db_create_index($indexname, $fieldnames); if ($sql2 != "") { if ($sql3 == "") - $sql3 = "ALTER TABLE `".$name."` ".$sql2; + $sql3 = "ALTER IGNORE TABLE `".$name."` ".$sql2; else $sql3 .= ", ".$sql2; } @@ -324,6 +334,11 @@ function db_create_index($indexname, $fieldnames, $method="ADD") { killme(); } + if ($fieldnames[0] == "UNIQUE") { + array_shift($fieldnames); + $method .= ' UNIQUE'; + } + $names = ""; foreach ($fieldnames AS $fieldname) { if ($names != "") @@ -451,7 +466,7 @@ function db_definition($charset) { ), "indexes" => array( "PRIMARY" => array("id"), - "cat_k" => array("cat(30)","k(30)"), + "cat_k" => array("UNIQUE", "cat(30)","k(30)"), ) ); $database["contact"] = array( @@ -1060,7 +1075,7 @@ function db_definition($charset) { ), "indexes" => array( "PRIMARY" => array("id"), - "uid_cat_k" => array("uid","cat(30)","k(30)"), + "uid_cat_k" => array("UNIQUE", "uid","cat(30)","k(30)"), ) ); $database["photo"] = array( @@ -1484,6 +1499,9 @@ function dbstructure_run(&$argv, &$argc) { if ($argc==2) { switch ($argv[1]) { + case "dryrun": + update_structure(true, false); + return; case "update": update_structure(true, true); set_config('system','build',DB_UPDATE_VERSION); diff --git a/update.php b/update.php index 55db8bca9c..3315beea24 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ Date: Sun, 2 Oct 2016 06:04:34 +0200 Subject: [PATCH 09/35] fix @brief in doxygen for function oembed_iframe() --- include/oembed.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/oembed.php b/include/oembed.php index 9c1b3d431f..898d900f43 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -210,8 +210,10 @@ function oembed_format_object($j){ } /** - * Generates the iframe HTML for an oembed attachment. Width and height are given - * by the remote, and are regularly too small for the generated iframe. + * @brief Generates the iframe HTML for an oembed attachment. + * + * Width and height are given by the remote, and are regularly too small for + * the generated iframe. * * The width is entirely discarded for the actual width of the post, while fixed * height is used as a starting point before the inevitable resizing. @@ -222,7 +224,7 @@ function oembed_format_object($j){ * @param string $src Original remote URL to embed * @param string $width * @param string $height - * @return string + * @return string formatted HTML * * @see oembed_format_object() */ From 28d13f80605e5f2fa1ee2e42fda8cd58ed17ee47 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 2 Oct 2016 00:23:11 -0400 Subject: [PATCH 10/35] Fix Issue #2816 - Update database.sql --- database.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/database.sql b/database.sql index ecd2be1529..155feb6706 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 3.5.1-dev (Asparagus) --- DB_UPDATE_VERSION 1203 +-- DB_UPDATE_VERSION 1210 -- ------------------------------------------ @@ -58,7 +58,7 @@ CREATE TABLE IF NOT EXISTS `cache` ( `v` text, `expire_mode` int(11) NOT NULL DEFAULT 0, `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY(`k`), + PRIMARY KEY(`k`(191)), INDEX `updated` (`updated`) ) DEFAULT CHARSET=utf8mb4; @@ -97,7 +97,7 @@ CREATE TABLE IF NOT EXISTS `config` ( `k` varchar(255) NOT NULL DEFAULT '', `v` text, PRIMARY KEY(`id`), - INDEX `cat_k` (`cat`(30),`k`(30)) + UNIQUE INDEX `cat_k` (`cat`(30),`k`(30)) ) DEFAULT CHARSET=utf8mb4; -- @@ -679,7 +679,7 @@ CREATE TABLE IF NOT EXISTS `oembed` ( `url` varchar(255) NOT NULL, `content` text, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY(`url`), + PRIMARY KEY(`url`(191)), INDEX `created` (`created`) ) DEFAULT CHARSET=utf8mb4; @@ -692,7 +692,7 @@ CREATE TABLE IF NOT EXISTS `parsed_url` ( `oembed` tinyint(1) NOT NULL DEFAULT 0, `content` text, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY(`url`,`guessing`,`oembed`), + PRIMARY KEY(`url`(191),`guessing`,`oembed`), INDEX `created` (`created`) ) DEFAULT CHARSET=utf8mb4; @@ -706,7 +706,7 @@ CREATE TABLE IF NOT EXISTS `pconfig` ( `k` varchar(255) NOT NULL DEFAULT '', `v` mediumtext, PRIMARY KEY(`id`), - INDEX `uid_cat_k` (`uid`,`cat`(30),`k`(30)) + UNIQUE INDEX `uid_cat_k` (`uid`,`cat`(30),`k`(30)) ) DEFAULT CHARSET=utf8mb4; -- From ca53881cd3b4807425fc04d24e27417cc9564042 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 2 Oct 2016 06:40:08 +0000 Subject: [PATCH 11/35] Some more explanations --- include/Contact.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/Contact.php b/include/Contact.php index 936589be98..458f56ce52 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -694,6 +694,9 @@ function formatted_location($profile) { function account_type($contact) { // There are several fields that indicate that the contact or user is a forum + // "page-flags" is a field in the user table, + // "forum" and "prv" are used in the contact table. They stand for PAGE_COMMUNITY and PAGE_PRVGROUP. + // "community" is used in the gcontact table and is true if the contact is PAGE_COMMUNITY or PAGE_PRVGROUP. if((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY)) || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP)) || (isset($contact['forum']) && intval($contact['forum'])) @@ -703,7 +706,7 @@ function account_type($contact) { else $type = ACCOUNT_TYPE_PERSON; - // The field is named differently in the user and the contact record + // The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above. if (isset($contact["contact-type"])) $type = $contact["contact-type"]; if (isset($contact["account-type"])) From ed631ba959ee0c33d6378420c5b4b635673be3a8 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 2 Oct 2016 09:26:35 +0200 Subject: [PATCH 12/35] fallback to generic language for specific (de-CH => de) --- include/pgettext.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/pgettext.php b/include/pgettext.php index 3c389ce2e5..ed924fa337 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -26,16 +26,29 @@ function get_browser_language() { $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse); if (count($lang_parse[1])) { + for ($i=0; $i2 ) { + if (! in_array(substr($lang_parse[1][$i], 0, 2), $lang_parse[1] ) ) { + array_push($lang_parse[1], substr($lang_parse[1][$i], 0, 2)); + if (floatval($lang_parse[4][$i])>0) + array_push($lang_parse[4], strval(floatval($lang_parse[4][$i])-0.0001)); + else + array_push($lang_parse[4], '0.9999'); + } + } + } // create a list like "en" => 0.8 $langs = array_combine($lang_parse[1], $lang_parse[4]); // set default to 1 for any without q factor foreach ($langs as $lang => $val) { if ($val === '') $langs[$lang] = 1; + if ($val === '0') $langs[$lang] = 1; } // sort list based on value arsort($langs, SORT_NUMERIC); + print_r($langs); } } From 6d16c39b7eff0eb4e7283e2b768a0608752f4b7b Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 2 Oct 2016 13:52:52 +0000 Subject: [PATCH 13/35] dbstructure now switches in the maintenance mode when updating --- include/dbstructure.php | 6 ++++++ include/poller.php | 8 ++++++++ mod/maintenance.php | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/include/dbstructure.php b/include/dbstructure.php index 0c933c6648..6224b434d8 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -126,6 +126,9 @@ function print_structure($database, $charset) { function update_structure($verbose, $action, $tables=null, $definition=null) { global $a, $db; + if ($action) + set_config('system', 'maintenance', 1); + if (isset($a->config["system"]["db_charset"])) $charset = $a->config["system"]["db_charset"]; else @@ -241,6 +244,9 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } } + if ($action) + set_config('system', 'maintenance', 0); + return $errors; } diff --git a/include/poller.php b/include/poller.php index ce2a6be0fa..fe4d4245af 100644 --- a/include/poller.php +++ b/include/poller.php @@ -29,6 +29,10 @@ function poller_run(&$argv, &$argc){ unset($db_host, $db_user, $db_pass, $db_data); }; + // Quit when in maintenance + if (get_config('system', 'maintenance', true)) + return; + $a->start_process(); $mypid = getmypid(); @@ -71,6 +75,10 @@ function poller_run(&$argv, &$argc){ while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `priority`, `created` LIMIT 1")) { + // Quit when in maintenance + if (get_config('system', 'maintenance', true)) + return; + // Constantly check the number of parallel database processes if ($a->max_processes_reached()) return; diff --git a/mod/maintenance.php b/mod/maintenance.php index b50c94c9b9..3d21ce40b7 100644 --- a/mod/maintenance.php +++ b/mod/maintenance.php @@ -1,6 +1,10 @@ t('System down for maintenance') )); From 72521cd9c8b38475a990d3c0631d053029dd57f4 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 2 Oct 2016 13:16:31 -0400 Subject: [PATCH 14/35] Fix Issue #2816 - Change new database version number --- boot.php | 2 +- update.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 97e0c8b367..4970574635 100644 --- a/boot.php +++ b/boot.php @@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Asparagus'); define ( 'FRIENDICA_VERSION', '3.5.1-dev' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1210 ); +define ( 'DB_UPDATE_VERSION', 1204 ); /** * @brief Constant with a HTML line break. diff --git a/update.php b/update.php index 3315beea24..b659336abf 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ Date: Mon, 3 Oct 2016 21:12:47 +0200 Subject: [PATCH 15/35] rework fallback code --- include/pgettext.php | 53 +++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/include/pgettext.php b/include/pgettext.php index ed924fa337..f1eb75752c 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -1,13 +1,7 @@ 2 ) { - if (! in_array(substr($lang_parse[1][$i], 0, 2), $lang_parse[1] ) ) { - array_push($lang_parse[1], substr($lang_parse[1][$i], 0, 2)); - if (floatval($lang_parse[4][$i])>0) - array_push($lang_parse[4], strval(floatval($lang_parse[4][$i])-0.0001)); - else - array_push($lang_parse[4], '0.9999'); + $lang_list[] = strtolower($lang_parse[1][$i]); + if ( strlen($lang_parse[1][$i])>3 ) { + $dashpos = strpos($lang_parse[1][$i], '-'); + if (! in_array(substr($lang_parse[1][$i], 0, $dashpos), $lang_list ) ) { + $lang_list[] = strtolower(substr($lang_parse[1][$i], 0, $dashpos)); } } } - // create a list like "en" => 0.8 - $langs = array_combine($lang_parse[1], $lang_parse[4]); - - // set default to 1 for any without q factor - foreach ($langs as $lang => $val) { - if ($val === '') $langs[$lang] = 1; - if ($val === '0') $langs[$lang] = 1; - } - - // sort list based on value - arsort($langs, SORT_NUMERIC); - print_r($langs); } } - if(isset($langs) && count($langs)) { - foreach ($langs as $lang => $v) { - if(file_exists("view/lang/$lang") && is_dir("view/lang/$lang")) { - $preferred = $lang; - break; - } + // check if we have translations for the preferred languages and pick the 1st that has + for ($i=0; $iconfig['system']['language'])) ? $a->config['system']['language'] : 'en'); }} From 0e8ae82a5cf72b24124112c1e8a11b28a83f141d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 3 Oct 2016 19:06:47 -0400 Subject: [PATCH 16/35] Fix Issue #2816 - Add MySQL version condition for IGNORE - Checks for MySQL version before adding the IGNORE keyword on index creation - Added new dryrun command to usage text --- include/dbstructure.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index 11b5ded896..6d9485b6e2 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -165,6 +165,13 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { if ($action) @$db->q($sql_config); + // MySQL >= 5.7 doesn't support the IGNORE keyword in ALTER TABLE statements + if (version_compare($db->getdb()->server_info, '5.7') >= 0) { + $ignore = ''; + }else { + $ignore = ' IGNORE'; + } + // Compare it foreach ($definition AS $name => $structure) { $is_new_table = False; @@ -189,7 +196,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { if ($current_index_definition != $new_index_definition && substr($indexname, 0, 6) != 'local_') { $sql2=db_drop_index($indexname); if ($sql3 == "") - $sql3 = "ALTER IGNORE TABLE `".$name."` ".$sql2; + $sql3 = "ALTER TABLE `".$name."` ".$sql2; else $sql3 .= ", ".$sql2; } @@ -199,7 +206,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { if (!isset($database[$name]["fields"][$fieldname])) { $sql2=db_add_table_field($fieldname, $parameters); if ($sql3 == "") - $sql3 = "ALTER IGNORE TABLE `".$name."` ".$sql2; + $sql3 = "ALTER TABLE `".$name."` ".$sql2; else $sql3 .= ", ".$sql2; } else { @@ -209,7 +216,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { if ($current_field_definition != $new_field_definition) { $sql2=db_modify_table_field($fieldname, $parameters); if ($sql3 == "") - $sql3 = "ALTER IGNORE TABLE `".$name."` ".$sql2; + $sql3 = "ALTER TABLE `".$name."` ".$sql2; else $sql3 .= ", ".$sql2; } @@ -233,7 +240,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $sql2=db_create_index($indexname, $fieldnames); if ($sql2 != "") { if ($sql3 == "") - $sql3 = "ALTER IGNORE TABLE `".$name."` ".$sql2; + $sql3 = "ALTER" . $ignore . " TABLE `".$name."` ".$sql2; else $sql3 .= ", ".$sql2; } @@ -1524,7 +1531,8 @@ function dbstructure_run(&$argv, &$argc) { // print help echo $argv[0]." \n"; echo "\n"; - echo "commands:\n"; + echo "Commands:\n"; + echo "dryrun show database update schema queries without running them\n"; echo "update update database schema\n"; echo "dumpsql dump database schema\n"; return; From a052fe4a98daa10be1656120ec0eb268f3113ecd Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 3 Oct 2016 19:17:40 -0400 Subject: [PATCH 17/35] Fix Issue #2816 - MySQL version typo --- include/dbstructure.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index 6d9485b6e2..9e0020fdbe 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -165,8 +165,8 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { if ($action) @$db->q($sql_config); - // MySQL >= 5.7 doesn't support the IGNORE keyword in ALTER TABLE statements - if (version_compare($db->getdb()->server_info, '5.7') >= 0) { + // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements + if (version_compare($db->getdb()->server_info, '5.7.4') >= 0) { $ignore = ''; }else { $ignore = ' IGNORE'; From 095fa872ed885abb6351879169cce391dc64a75e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 4 Oct 2016 03:48:01 +0000 Subject: [PATCH 18/35] Contact Type is now transmitted via poco --- include/dbstructure.php | 17 ++++++++++++++++ include/dfrn.php | 3 ++- include/socgraph.php | 44 ++++++++++++++++++++++++++++------------- mod/poco.php | 15 ++++++++++++-- 4 files changed, 62 insertions(+), 17 deletions(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index 6224b434d8..32d5986fe9 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -686,6 +686,7 @@ function db_definition($charset) { "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"), "community" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), + "contact-type" => array("type" => "tinyint(1)", "not null" => "1", "default" => "-1"), "hide" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "nsfw" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "network" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), @@ -1492,6 +1493,22 @@ function dbstructure_run(&$argv, &$argc) { switch ($argv[1]) { case "update": update_structure(true, true); + + $build = get_config('system','build'); + if (!x($build)) { + set_config('system','build',DB_UPDATE_VERSION); + $build = DB_UPDATE_VERSION; + } + + $stored = intval($build); + $current = intval(DB_UPDATE_VERSION); + + // run any left update_nnnn functions in update.php + for($x = $stored; $x < $current; $x ++) { + $r = run_update_function($x); + if (!$r) break; + } + set_config('system','build',DB_UPDATE_VERSION); return; case "dumpsql": diff --git a/include/dfrn.php b/include/dfrn.php index c5d00e8a67..3b06932d8a 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -1147,7 +1147,7 @@ class dfrn { $author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue; $r = q("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`, - `name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden` + `name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'", intval($importer["uid"]), dbesc(normalise_link($author["link"])), dbesc(NETWORK_STATUSNET)); if ($r) { @@ -1336,6 +1336,7 @@ class dfrn { $poco["generation"] = 2; $poco["photo"] = $author["avatar"]; $poco["hide"] = $hide; + $poco["contact-type"] = $contact["contact-type"]; update_gcontact($poco); } diff --git a/include/socgraph.php b/include/socgraph.php index 89897aaa7c..a41861d6ea 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -52,7 +52,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { if(! $url) return; - $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation') ; + $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation') ; logger('poco_load: ' . $url, LOGGER_DEBUG); @@ -86,6 +86,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { $about = ''; $keywords = ''; $gender = ''; + $contact_type = -1; $generation = 0; $name = $entry->displayName; @@ -133,6 +134,9 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { foreach($entry->tags as $tag) $keywords = implode(", ", $tag); + if(isset($entry->contactType) AND ($entry->contactType >= 0)) + $contact_type = $entry->contactType; + // If you query a Friendica server for its profiles, the network has to be Friendica /// TODO It could also be a Redmatrix server //if ($uid == 0) @@ -140,6 +144,9 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid); + $gcontact = array("url" => $profile_url, "contact-type" => $contact_type, "generation" => $generation); + update_gcontact($gcontact); + // Update the Friendica contacts. Diaspora is doing it via a message. (See include/diaspora.php) // Deactivated because we now update Friendica contacts in dfrn.php //if (($location != "") OR ($about != "") OR ($keywords != "") OR ($gender != "")) @@ -1236,7 +1243,7 @@ function poco_discover($complete = false) { } // Fetch all users from the other server - $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation"; + $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation"; logger("Fetch all users from the server ".$server["nurl"], LOGGER_DEBUG); @@ -1255,7 +1262,7 @@ function poco_discover($complete = false) { $updatedSince = date("Y-m-d H:i:s", time() - $timeframe * 86400); // Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3) - $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation"; + $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation"; $success = false; @@ -1303,7 +1310,7 @@ function poco_discover_server_users($data, $server) { logger("Fetch contacts for the user ".$username." from the server ".$server["nurl"], LOGGER_DEBUG); // Fetch all contacts from a given user from the other server - $url = $server["poco"]."/".$username."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation"; + $url = $server["poco"]."/".$username."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation"; $retdata = z_fetch_url($url); if ($retdata["success"]) @@ -1330,6 +1337,7 @@ function poco_discover_server($data, $default_generation = 0) { $about = ''; $keywords = ''; $gender = ''; + $contact_type = -1; $generation = $default_generation; $name = $entry->displayName; @@ -1374,6 +1382,9 @@ function poco_discover_server($data, $default_generation = 0) { if(isset($entry->generation) AND ($entry->generation > 0)) $generation = ++$entry->generation; + if(isset($entry->contactType) AND ($entry->contactType >= 0)) + $contact_type = $entry->contactType; + if(isset($entry->tags)) foreach($entry->tags as $tag) $keywords = implode(", ", $tag); @@ -1383,6 +1394,10 @@ function poco_discover_server($data, $default_generation = 0) { logger("Store profile ".$profile_url, LOGGER_DEBUG); poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, 0, 0, 0); + + $gcontact = array("url" => $profile_url, "contact-type" => $contact_type, "generation" => $generation); + update_gcontact($gcontact); + logger("Done for profile ".$profile_url, LOGGER_DEBUG); } } @@ -1534,7 +1549,7 @@ function update_gcontact($contact) { return false; $r = q("SELECT `name`, `nick`, `photo`, `location`, `about`, `addr`, `generation`, `birthday`, `gender`, `keywords`, - `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url` + `contact-type`, `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url` FROM `gcontact` WHERE `id` = %d LIMIT 1", intval($gcontact_id)); @@ -1614,20 +1629,20 @@ function update_gcontact($contact) { } if ($update) { - logger("Update gcontact for ".$contact["url"]." Callstack: ".App::callstack(), LOGGER_DEBUG); + logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG); q("UPDATE `gcontact` SET `photo` = '%s', `name` = '%s', `nick` = '%s', `addr` = '%s', `network` = '%s', `birthday` = '%s', `gender` = '%s', `keywords` = '%s', `hide` = %d, `nsfw` = %d, - `alias` = '%s', `notify` = '%s', `url` = '%s', + `contact-type` = %d, `alias` = '%s', `notify` = '%s', `url` = '%s', `location` = '%s', `about` = '%s', `generation` = %d, `updated` = '%s', `server_url` = '%s', `connect` = '%s' WHERE `nurl` = '%s' AND (`generation` = 0 OR `generation` >= %d)", dbesc($contact["photo"]), dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["addr"]), dbesc($contact["network"]), dbesc($contact["birthday"]), dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]), - intval($contact["nsfw"]), dbesc($contact["alias"]), dbesc($contact["notify"]), - dbesc($contact["url"]), dbesc($contact["location"]), dbesc($contact["about"]), - intval($contact["generation"]), dbesc($contact["updated"]), + intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]), + dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]), + dbesc($contact["about"]), intval($contact["generation"]), dbesc($contact["updated"]), dbesc($contact["server_url"]), dbesc($contact["connect"]), dbesc(normalise_link($contact["url"])), intval($contact["generation"])); @@ -1644,13 +1659,14 @@ function update_gcontact($contact) { q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `network` = '%s', `bd` = '%s', `gender` = '%s', - `keywords` = '%s', `alias` = '%s', `url` = '%s', - `location` = '%s', `about` = '%s' + `keywords` = '%s', `alias` = '%s', `contact-type` = %d, + `url` = '%s', `location` = '%s', `about` = '%s' WHERE `id` = %d", dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["addr"]), dbesc($contact["network"]), dbesc($contact["birthday"]), dbesc($contact["gender"]), - dbesc($contact["keywords"]), dbesc($contact["alias"]), dbesc($contact["url"]), - dbesc($contact["location"]), dbesc($contact["about"]), intval($r[0]["id"])); + dbesc($contact["keywords"]), dbesc($contact["alias"]), intval($contact["contact-type"]), + dbesc($contact["url"]), dbesc($contact["location"]), dbesc($contact["about"]), + intval($r[0]["id"])); } } diff --git a/mod/poco.php b/mod/poco.php index 0a1b392169..1ec5b2d4e1 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -1,4 +1,6 @@ false, 'tags' => false, 'address' => false, + 'contactType' => false, 'generation' => false ); @@ -207,6 +212,9 @@ function poco_init(&$a) { if (($rr['keywords'] == "") AND isset($rr['pub_keywords'])) $rr['keywords'] = $rr['pub_keywords']; + if (isset($rr['account-type'])) + $rr['contact-type'] = $rr['account-type']; + $about = Cache::get("about:".$rr['updated'].":".$rr['nurl']); if (is_null($about)) { $about = bbcode($rr['about'], false, false); @@ -300,6 +308,9 @@ function poco_init(&$a) { $entry['address']['country'] = $rr['pcountry']; } + if($fields_ret['contactType']) + $entry['contactType'] = intval($rr['contact-type']); + $ret['entry'][] = $entry; } } From 66bec9475dcd888482382128867f08a70709def4 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 4 Oct 2016 03:51:13 +0000 Subject: [PATCH 19/35] Improved queries for the nodeinfo functionality and the admin page --- mod/admin.php | 27 ++++++++++++++++++--------- mod/nodeinfo.php | 11 +++++++++-- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 4dc6064a7d..2856c16401 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1277,14 +1277,14 @@ function admin_page_users(&$a){ /* ordering */ $valid_orders = array( - 'contact.name', + 'contact.name', 'user.email', 'user.register_date', 'user.login_date', - 'lastitem.lastitem_date', + 'lastitem_date', 'user.page-flags' ); - + $order = "contact.name"; $order_direction = "+"; if (x($_GET,'o')){ @@ -1293,19 +1293,18 @@ function admin_page_users(&$a){ $order_direction = "-"; $new_order = substr($new_order,1); } - + if (in_array($new_order, $valid_orders)){ $order = $new_order; } if (x($_GET,'d')){ $new_direction = $_GET['d']; - } } $sql_order = "`".str_replace('.','`.`',$order)."`"; $sql_order_direction = ($order_direction==="+")?"ASC":"DESC"; - - $users = q("SELECT `user`.* , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired` + +/* $users = q("SELECT `user`.* , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired` FROM (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid` FROM `item` @@ -1322,9 +1321,19 @@ function admin_page_users(&$a){ intval($a->pager['start']), intval($a->pager['itemspage']) ); - +*/ + $users = q("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`, + (SELECT `changed` FROM `item` WHERE `wall` AND `uid` = `user`.`uid` ORDER BY `changed` DESC LIMIT 1) AS `lastitem_date` + FROM `user` + INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self` + WHERE `user`.`verified` + ORDER BY $sql_order $sql_order_direction LIMIT %d, %d", + intval($a->pager['start']), + intval($a->pager['itemspage']) + ); + //echo "
$users"; killme();
-				
+
 	$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
 	$_setup_users = function ($e) use ($adminlist){
 		$accounts = array(
diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index ba310a1051..fae2b10522 100644
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -184,7 +184,7 @@ function nodeinfo_cron() {
 		}
 	}
         logger("cron_start");
-
+/*
 	$users = q("SELECT profile.*, `user`.`login_date`, `lastitem`.`lastitem_date`
 			FROM (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
 				FROM `item`
@@ -198,7 +198,14 @@ function nodeinfo_cron() {
 					AND NOT `user`.`blocked`
 					AND NOT `user`.`account_removed`
 					AND NOT `user`.`account_expired`");
-
+*/
+	$users = q("SELECT `user`.`uid`, `user`.`login_date`,
+			(SELECT `changed` FROM `item` WHERE `wall` AND `uid` = `user`.`uid` ORDER BY `changed` DESC LIMIT 1) AS `lastitem_date`
+			FROM `user`
+			INNER JOIN `profile` ON `profile`.`uid` = `user`.`uid` AND `profile`.`is-default`
+			WHERE (`profile`.`publish` OR `profile`.`net-publish`) AND `user`.`verified`
+				AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
+				AND NOT `user`.`account_expired`");
 	if (is_array($users)) {
 			$total_users = count($users);
 			$active_users_halfyear = 0;

From 5f9f3b3570e68a232d51acf57f096163b9c74451 Mon Sep 17 00:00:00 2001
From: Michael Vogel 
Date: Tue, 4 Oct 2016 03:53:31 +0000
Subject: [PATCH 20/35] Added the database field to database.sql

---
 boot.php     | 2 +-
 database.sql | 3 ++-
 update.php   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/boot.php b/boot.php
index ea14428fd0..1c475ca935 100644
--- a/boot.php
+++ b/boot.php
@@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.1-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1203      );
+define ( 'DB_UPDATE_VERSION',      1204      );
 
 /**
  * @brief Constant with a HTML line break.
diff --git a/database.sql b/database.sql
index a482b106cf..4133d3e825 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.5.1-dev (Asparagus)
--- DB_UPDATE_VERSION 1203
+-- DB_UPDATE_VERSION 1204
 -- ------------------------------------------
 
 
@@ -328,6 +328,7 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
 	`gender` varchar(32) NOT NULL DEFAULT '',
 	`birthday` varchar(32) NOT NULL DEFAULT '0000-00-00',
 	`community` tinyint(1) NOT NULL DEFAULT 0,
+	`contact-type` tinyint(1) NOT NULL DEFAULT -1,
 	`hide` tinyint(1) NOT NULL DEFAULT 0,
 	`nsfw` tinyint(1) NOT NULL DEFAULT 0,
 	`network` varchar(255) NOT NULL DEFAULT '',
diff --git a/update.php b/update.php
index 31f7852a2f..863025ccc7 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 
Date: Tue, 4 Oct 2016 03:58:47 +0000
Subject: [PATCH 21/35] When we have the field, we should use it :)

---
 include/Contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/Contact.php b/include/Contact.php
index 458f56ce52..6daba33844 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -223,7 +223,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 	// Fetch the data from the gcontact table
 	if (!$r)
 		$r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
-			`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, 0 AS `contact-type`, `birthday`, 0 AS `self`
+			`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
 			FROM `gcontact` WHERE `nurl` = '%s'",
 				dbesc(normalise_link($url)));
 

From aab6ec0ede0de22305fd0ecde147d6331a1419b1 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff 
Date: Tue, 4 Oct 2016 07:59:35 +0200
Subject: [PATCH 22/35] DE update to the translation

---
 view/lang/de/messages.po | 3525 +++++++++++++++++++-------------------
 view/lang/de/strings.php |  801 ++++-----
 2 files changed, 2197 insertions(+), 2129 deletions(-)

diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po
index 80aa2cd6f8..f0c7d99b04 100644
--- a/view/lang/de/messages.po
+++ b/view/lang/de/messages.po
@@ -35,9 +35,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-24 09:44+0200\n"
-"PO-Revision-Date: 2016-09-24 12:16+0000\n"
-"Last-Translator: Tobias Diekershoff \n"
+"POT-Creation-Date: 2016-09-27 21:32+0200\n"
+"PO-Revision-Date: 2016-10-03 11:51+0000\n"
+"Last-Translator: Andreas H.\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"
@@ -45,15 +45,15 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:698
+#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:705
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: include/datetime.php:183 include/identity.php:627
+#: include/datetime.php:183 include/identity.php:630
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
-#: include/datetime.php:185 mod/profiles.php:721
+#: include/datetime.php:185 mod/profiles.php:728
 msgid "Age: "
 msgstr "Alter: "
 
@@ -138,7 +138,7 @@ msgstr "%1$d %2$s her"
 msgid "%s's birthday"
 msgstr "%ss Geburtstag"
 
-#: include/datetime.php:579 include/dfrn.php:1111
+#: include/datetime.php:579 include/dfrn.php:1115
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Herzlichen Glückwunsch %s"
@@ -175,10 +175,10 @@ msgstr "Leute finden"
 msgid "Enter name or interest"
 msgstr "Name oder Interessen eingeben"
 
-#: include/contact_widgets.php:32 include/Contact.php:324
-#: include/conversation.php:976 mod/match.php:72 mod/allfriends.php:66
-#: mod/follow.php:103 mod/suggest.php:83 mod/contacts.php:602
-#: mod/dirfind.php:204
+#: include/contact_widgets.php:32 include/conversation.php:976
+#: include/Contact.php:324 mod/match.php:72 mod/allfriends.php:66
+#: mod/follow.php:103 mod/suggest.php:83 mod/dirfind.php:204
+#: mod/contacts.php:602
 msgid "Connect/Follow"
 msgstr "Verbinden/Folgen"
 
@@ -186,7 +186,7 @@ msgstr "Verbinden/Folgen"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Beispiel: Robert Morgenstein, Angeln"
 
-#: include/contact_widgets.php:34 mod/directory.php:212 mod/contacts.php:796
+#: include/contact_widgets.php:34 mod/directory.php:212 mod/contacts.php:798
 msgid "Find"
 msgstr "Finde"
 
@@ -238,7 +238,7 @@ msgstr[1] "%d gemeinsame Kontakte"
 
 #: include/contact_widgets.php:242 include/ForumManager.php:119
 #: include/items.php:2122 mod/content.php:624 object/Item.php:432
-#: view/theme/vier/theme.php:260 boot.php:904
+#: view/theme/vier/theme.php:260 boot.php:926
 msgid "show more"
 msgstr "mehr anzeigen"
 
@@ -813,8 +813,8 @@ msgid "Finishes:"
 msgstr "Endet:"
 
 #: include/bb2diaspora.php:170 include/event.php:39 include/event.php:63
-#: include/identity.php:329 mod/directory.php:145 mod/contacts.php:628
-#: mod/events.php:495 mod/notifications.php:232
+#: include/identity.php:329 mod/directory.php:145 mod/events.php:495
+#: mod/notifications.php:232 mod/contacts.php:628
 msgid "Location:"
 msgstr "Ort:"
 
@@ -902,10 +902,6 @@ msgstr "hinzufügen"
 msgid "Wall Photos"
 msgstr "Pinnwand-Bilder"
 
-#: include/delivery.php:439
-msgid "(no subject)"
-msgstr "(kein Betreff)"
-
 #: include/user.php:39 mod/settings.php:370
 msgid "Passwords do not match. Password unchanged."
 msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
@@ -1045,7 +1041,7 @@ msgstr "Bereinige Benachrichtigungen"
 msgid "@name, !forum, #tags, content"
 msgstr "@name, !forum, #tags, content"
 
-#: include/nav.php:75 view/theme/frio/theme.php:243 boot.php:1704
+#: include/nav.php:75 view/theme/frio/theme.php:243 boot.php:1726
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -1053,8 +1049,8 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: include/nav.php:78 include/identity.php:712 mod/contacts.php:635
-#: mod/contacts.php:831 view/theme/frio/theme.php:246
+#: include/nav.php:78 include/identity.php:715 mod/contacts.php:637
+#: mod/contacts.php:833 view/theme/frio/theme.php:246
 msgid "Status"
 msgstr "Status"
 
@@ -1063,9 +1059,9 @@ msgstr "Status"
 msgid "Your posts and conversations"
 msgstr "Deine Beiträge und Unterhaltungen"
 
-#: include/nav.php:79 include/identity.php:603 include/identity.php:689
-#: include/identity.php:720 mod/profperm.php:104 mod/newmember.php:32
-#: mod/contacts.php:637 mod/contacts.php:839 view/theme/frio/theme.php:247
+#: include/nav.php:79 include/identity.php:606 include/identity.php:692
+#: include/identity.php:723 mod/profperm.php:104 mod/newmember.php:32
+#: mod/contacts.php:639 mod/contacts.php:841 view/theme/frio/theme.php:247
 #: view/theme/diabook/theme.php:124
 msgid "Profile"
 msgstr "Profil"
@@ -1075,7 +1071,7 @@ msgstr "Profil"
 msgid "Your profile page"
 msgstr "Deine Profilseite"
 
-#: include/nav.php:80 include/identity.php:728 mod/fbrowser.php:32
+#: include/nav.php:80 include/identity.php:731 mod/fbrowser.php:32
 #: view/theme/frio/theme.php:248 view/theme/diabook/theme.php:126
 msgid "Photos"
 msgstr "Bilder"
@@ -1085,7 +1081,7 @@ msgstr "Bilder"
 msgid "Your photos"
 msgstr "Deine Fotos"
 
-#: include/nav.php:81 include/identity.php:736 include/identity.php:739
+#: include/nav.php:81 include/identity.php:739 include/identity.php:742
 #: view/theme/frio/theme.php:249
 msgid "Videos"
 msgstr "Videos"
@@ -1094,8 +1090,8 @@ msgstr "Videos"
 msgid "Your videos"
 msgstr "Deine Videos"
 
-#: include/nav.php:82 include/nav.php:146 include/identity.php:748
-#: include/identity.php:759 mod/cal.php:278 mod/events.php:379
+#: include/nav.php:82 include/nav.php:146 include/identity.php:751
+#: include/identity.php:762 mod/cal.php:278 mod/events.php:379
 #: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254
 #: view/theme/diabook/theme.php:127
 msgid "Events"
@@ -1114,7 +1110,7 @@ msgstr "Persönliche Notizen"
 msgid "Your personal notes"
 msgstr "Deine persönlichen Notizen"
 
-#: include/nav.php:94 mod/bookmarklet.php:12 boot.php:1705
+#: include/nav.php:94 mod/bookmarklet.php:12 boot.php:1727
 msgid "Login"
 msgstr "Anmeldung"
 
@@ -1131,7 +1127,7 @@ msgstr "Pinnwand"
 msgid "Home Page"
 msgstr "Homepage"
 
-#: include/nav.php:111 mod/register.php:280 boot.php:1680
+#: include/nav.php:111 mod/register.php:280 boot.php:1702
 msgid "Register"
 msgstr "Registrieren"
 
@@ -1171,9 +1167,9 @@ msgstr "Volltext"
 msgid "Tags"
 msgstr "Tags"
 
-#: include/nav.php:127 include/nav.php:193 include/identity.php:781
-#: include/identity.php:784 include/text.php:1004 mod/viewcontacts.php:116
-#: mod/contacts.php:790 mod/contacts.php:851 view/theme/frio/theme.php:257
+#: include/nav.php:127 include/nav.php:193 include/text.php:1004
+#: include/identity.php:784 include/identity.php:787 mod/viewcontacts.php:116
+#: mod/contacts.php:792 mod/contacts.php:853 view/theme/frio/theme.php:257
 #: view/theme/diabook/theme.php:125
 msgid "Contacts"
 msgstr "Kontakte"
@@ -1191,7 +1187,7 @@ msgstr "Unterhaltungen auf dieser Seite"
 msgid "Conversations on the network"
 msgstr "Unterhaltungen im Netzwerk"
 
-#: include/nav.php:146 include/identity.php:751 include/identity.php:762
+#: include/nav.php:146 include/identity.php:754 include/identity.php:765
 #: view/theme/frio/theme.php:254
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
@@ -1245,7 +1241,7 @@ msgstr "Benachrichtigungen"
 msgid "See all notifications"
 msgstr "Alle Benachrichtigungen anzeigen"
 
-#: include/nav.php:173 mod/settings.php:887
+#: include/nav.php:173 mod/settings.php:899
 msgid "Mark as seen"
 msgstr "Als gelesen markieren"
 
@@ -1289,8 +1285,8 @@ msgstr "Delegationen"
 msgid "Delegate Page Management"
 msgstr "Delegiere das Management für die Seite"
 
-#: include/nav.php:188 mod/newmember.php:22 mod/settings.php:111
-#: mod/admin.php:1502 mod/admin.php:1760 view/theme/frio/theme.php:256
+#: include/nav.php:188 mod/newmember.php:22 mod/admin.php:1502
+#: mod/admin.php:1760 mod/settings.php:111 view/theme/frio/theme.php:256
 #: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:648
 msgid "Settings"
 msgstr "Einstellungen"
@@ -1393,7 +1389,7 @@ msgid "Email"
 msgstr "E-Mail"
 
 #: include/contact_selectors.php:80 mod/dfrn_request.php:869
-#: mod/settings.php:827
+#: mod/settings.php:839
 msgid "Diaspora"
 msgstr "Diaspora"
 
@@ -1449,45 +1445,6 @@ msgstr "Hubzilla/Redmatrix"
 msgid "view full size"
 msgstr "Volle Größe anzeigen"
 
-#: include/Contact.php:119
-msgid "stopped following"
-msgstr "wird nicht mehr gefolgt"
-
-#: include/Contact.php:310 include/Contact.php:323 include/Contact.php:365
-#: include/conversation.php:964 include/conversation.php:978
-#: mod/directory.php:163 mod/match.php:71 mod/allfriends.php:65
-#: mod/suggest.php:82 mod/dirfind.php:203
-msgid "View Profile"
-msgstr "Profil anschauen"
-
-#: include/Contact.php:364 include/conversation.php:963
-msgid "View Status"
-msgstr "Pinnwand anschauen"
-
-#: include/Contact.php:366 include/conversation.php:965
-msgid "View Photos"
-msgstr "Bilder anschauen"
-
-#: include/Contact.php:367 include/conversation.php:966
-msgid "Network Posts"
-msgstr "Netzwerkbeiträge"
-
-#: include/Contact.php:368 include/conversation.php:967
-msgid "Edit Contact"
-msgstr "Kontakt bearbeiten"
-
-#: include/Contact.php:369
-msgid "Drop Contact"
-msgstr "Kontakt löschen"
-
-#: include/Contact.php:370 include/conversation.php:968
-msgid "Send PM"
-msgstr "Private Nachricht senden"
-
-#: include/Contact.php:371 include/conversation.php:972
-msgid "Poke"
-msgstr "Anstupsen"
-
 #: include/acl_selectors.php:327
 msgid "Post to Email"
 msgstr "An E-Mail senden"
@@ -1497,7 +1454,7 @@ msgstr "An E-Mail senden"
 msgid "Connectors disabled, since \"%s\" is enabled."
 msgstr "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."
 
-#: include/acl_selectors.php:333 mod/settings.php:1131
+#: include/acl_selectors.php:333 mod/settings.php:1171
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
 
@@ -1532,11 +1489,6 @@ msgstr "Berechtigungen"
 msgid "Close"
 msgstr "Schließen"
 
-#: include/dfrn.php:1110
-#, php-format
-msgid "%s\\'s birthday"
-msgstr "%ss Geburtstag"
-
 #: include/follow.php:77 mod/dfrn_request.php:507
 msgid "Disallowed profile URL."
 msgstr "Nicht erlaubte Profil-URL."
@@ -1612,21 +1564,21 @@ msgstr "Möchtest Du wirklich dieses Item löschen?"
 
 #: include/items.php:1846 mod/follow.php:110 mod/suggest.php:29
 #: mod/api.php:105 mod/message.php:217 mod/dfrn_request.php:861
-#: mod/contacts.php:442 mod/profiles.php:641 mod/profiles.php:644
-#: mod/profiles.php:670 mod/register.php:238 mod/settings.php:1113
-#: mod/settings.php:1119 mod/settings.php:1127 mod/settings.php:1131
-#: mod/settings.php:1136 mod/settings.php:1142 mod/settings.php:1148
-#: mod/settings.php:1154 mod/settings.php:1180 mod/settings.php:1181
-#: mod/settings.php:1182 mod/settings.php:1183 mod/settings.php:1184
+#: mod/register.php:238 mod/contacts.php:442 mod/profiles.php:648
+#: mod/profiles.php:651 mod/profiles.php:677 mod/settings.php:1153
+#: mod/settings.php:1159 mod/settings.php:1167 mod/settings.php:1171
+#: mod/settings.php:1176 mod/settings.php:1182 mod/settings.php:1188
+#: mod/settings.php:1194 mod/settings.php:1220 mod/settings.php:1221
+#: mod/settings.php:1222 mod/settings.php:1223 mod/settings.php:1224
 msgid "Yes"
 msgstr "Ja"
 
 #: include/items.php:1849 include/conversation.php:1272 mod/fbrowser.php:101
 #: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121
 #: mod/suggest.php:32 mod/editpost.php:148 mod/message.php:220
-#: mod/dfrn_request.php:875 mod/contacts.php:445 mod/settings.php:664
-#: mod/settings.php:690 mod/videos.php:131 mod/photos.php:248
-#: mod/photos.php:337
+#: mod/dfrn_request.php:875 mod/videos.php:131 mod/photos.php:248
+#: mod/photos.php:337 mod/contacts.php:445 mod/settings.php:676
+#: mod/settings.php:702
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1640,15 +1592,15 @@ msgstr "Abbrechen"
 #: mod/wallmessage.php:9 mod/wallmessage.php:33 mod/wallmessage.php:79
 #: mod/wallmessage.php:103 mod/api.php:26 mod/api.php:31
 #: mod/ostatus_subscribe.php:9 mod/message.php:46 mod/message.php:182
-#: mod/manage.php:96 mod/crepair.php:100 mod/contacts.php:350
-#: mod/dfrn_confirm.php:57 mod/dirfind.php:11 mod/fsuggest.php:78
-#: mod/item.php:185 mod/item.php:197 mod/mood.php:114 mod/poke.php:150
-#: mod/profile_photo.php:19 mod/profile_photo.php:175
-#: mod/profile_photo.php:186 mod/profile_photo.php:199 mod/profiles.php:166
-#: mod/profiles.php:598 mod/register.php:42 mod/regmod.php:110
-#: mod/settings.php:22 mod/settings.php:128 mod/settings.php:650
+#: mod/manage.php:96 mod/crepair.php:100 mod/dfrn_confirm.php:57
+#: mod/dirfind.php:11 mod/fsuggest.php:78 mod/item.php:185 mod/item.php:197
+#: mod/mood.php:114 mod/poke.php:150 mod/profile_photo.php:19
+#: mod/profile_photo.php:175 mod/profile_photo.php:186
+#: mod/profile_photo.php:199 mod/register.php:42 mod/regmod.php:110
 #: mod/photos.php:172 mod/photos.php:1093 mod/cal.php:308 mod/events.php:190
-#: mod/notifications.php:71 index.php:397
+#: mod/notifications.php:71 mod/contacts.php:350 mod/profiles.php:166
+#: mod/profiles.php:605 mod/settings.php:22 mod/settings.php:128
+#: mod/settings.php:662 index.php:397
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
@@ -1758,7 +1710,7 @@ msgid "System"
 msgstr "System"
 
 #: include/NotificationsManager.php:167 mod/network.php:844
-#: mod/profiles.php:696
+#: mod/profiles.php:703
 msgid "Personal"
 msgstr "Persönlich"
 
@@ -1846,31 +1798,6 @@ msgstr "$1 hat geschrieben:"
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
-#: include/dbstructure.php:26
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\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."
-
-#: include/dbstructure.php:31
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]"
-
-#: include/dbstructure.php:153
-msgid "Errors encountered creating database tables."
-msgstr "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."
-
-#: include/dbstructure.php:230
-msgid "Errors encountered performing database changes."
-msgstr "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten."
-
 #: include/diaspora.php:1954
 msgid "Sharing notification from Diaspora network"
 msgstr "Freigabe-Benachrichtigung von Diaspora"
@@ -1907,11 +1834,11 @@ msgstr "Fr"
 msgid "Sat"
 msgstr "Sa"
 
-#: include/event.php:448 include/text.php:1112 mod/settings.php:955
+#: include/event.php:448 include/text.php:1112 mod/settings.php:967
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: include/event.php:449 include/text.php:1112 mod/settings.php:955
+#: include/event.php:449 include/text.php:1112 mod/settings.php:967
 msgid "Monday"
 msgstr "Montag"
 
@@ -2055,231 +1982,6 @@ msgstr "Kalender als ical exportieren"
 msgid "Export calendar as csv"
 msgstr "Kalender als csv exportieren"
 
-#: include/identity.php:42
-msgid "Requested account is not available."
-msgstr "Das angefragte Profil ist nicht vorhanden."
-
-#: include/identity.php:51 mod/profile.php:21
-msgid "Requested profile is not available."
-msgstr "Das angefragte Profil ist nicht vorhanden."
-
-#: include/identity.php:95 include/identity.php:305 include/identity.php:686
-msgid "Edit profile"
-msgstr "Profil bearbeiten"
-
-#: include/identity.php:245
-msgid "Atom feed"
-msgstr "Atom-Feed"
-
-#: include/identity.php:250 include/conversation.php:1285 mod/editpost.php:152
-msgid "Message"
-msgstr "Nachricht"
-
-#: include/identity.php:276
-msgid "Manage/edit profiles"
-msgstr "Profile verwalten/editieren"
-
-#: include/identity.php:281 include/identity.php:307 mod/profiles.php:787
-msgid "Change profile photo"
-msgstr "Profilbild ändern"
-
-#: include/identity.php:282 mod/profiles.php:788
-msgid "Create New Profile"
-msgstr "Neues Profil anlegen"
-
-#: include/identity.php:292 mod/profiles.php:777
-msgid "Profile Image"
-msgstr "Profilbild"
-
-#: include/identity.php:295 mod/profiles.php:779
-msgid "visible to everybody"
-msgstr "sichtbar für jeden"
-
-#: include/identity.php:296 mod/profiles.php:684 mod/profiles.php:780
-msgid "Edit visibility"
-msgstr "Sichtbarkeit bearbeiten"
-
-#: include/identity.php:319 mod/directory.php:174 mod/match.php:84
-#: mod/viewcontacts.php:105 mod/allfriends.php:79 mod/suggest.php:98
-#: mod/hovercard.php:80 mod/common.php:123 mod/network.php:517
-#: mod/contacts.php:51 mod/contacts.php:626 mod/contacts.php:953
-#: mod/dirfind.php:223 mod/videos.php:37 mod/photos.php:42 mod/cal.php:44
-msgid "Forum"
-msgstr "Forum"
-
-#: include/identity.php:331 include/identity.php:614 mod/directory.php:147
-#: mod/notifications.php:238
-msgid "Gender:"
-msgstr "Geschlecht:"
-
-#: include/identity.php:334 include/identity.php:634 mod/directory.php:149
-msgid "Status:"
-msgstr "Status:"
-
-#: include/identity.php:336 include/identity.php:645 mod/directory.php:151
-msgid "Homepage:"
-msgstr "Homepage:"
-
-#: include/identity.php:338 include/identity.php:655 mod/directory.php:153
-#: mod/contacts.php:630 mod/notifications.php:234
-msgid "About:"
-msgstr "Über:"
-
-#: include/identity.php:420 mod/contacts.php:50 mod/notifications.php:246
-msgid "Network:"
-msgstr "Netzwerk:"
-
-#: include/identity.php:449 include/identity.php:533
-msgid "g A l F d"
-msgstr "l, d. F G \\U\\h\\r"
-
-#: include/identity.php:450 include/identity.php:534
-msgid "F d"
-msgstr "d. F"
-
-#: include/identity.php:495 include/identity.php:580
-msgid "[today]"
-msgstr "[heute]"
-
-#: include/identity.php:507
-msgid "Birthday Reminders"
-msgstr "Geburtstagserinnerungen"
-
-#: include/identity.php:508
-msgid "Birthdays this week:"
-msgstr "Geburtstage diese Woche:"
-
-#: include/identity.php:567
-msgid "[No description]"
-msgstr "[keine Beschreibung]"
-
-#: include/identity.php:591
-msgid "Event Reminders"
-msgstr "Veranstaltungserinnerungen"
-
-#: include/identity.php:592
-msgid "Events this week:"
-msgstr "Veranstaltungen diese Woche"
-
-#: include/identity.php:612 mod/settings.php:1229
-msgid "Full Name:"
-msgstr "Kompletter Name:"
-
-#: include/identity.php:619
-msgid "j F, Y"
-msgstr "j F, Y"
-
-#: include/identity.php:620
-msgid "j F"
-msgstr "j F"
-
-#: include/identity.php:631
-msgid "Age:"
-msgstr "Alter:"
-
-#: include/identity.php:640
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "für %1$d %2$s"
-
-#: include/identity.php:643 mod/profiles.php:703
-msgid "Sexual Preference:"
-msgstr "Sexuelle Vorlieben:"
-
-#: include/identity.php:647 mod/profiles.php:729
-msgid "Hometown:"
-msgstr "Heimatort:"
-
-#: include/identity.php:649 mod/follow.php:134 mod/contacts.php:632
-#: mod/notifications.php:236
-msgid "Tags:"
-msgstr "Tags:"
-
-#: include/identity.php:651 mod/profiles.php:730
-msgid "Political Views:"
-msgstr "Politische Ansichten:"
-
-#: include/identity.php:653
-msgid "Religion:"
-msgstr "Religion:"
-
-#: include/identity.php:657
-msgid "Hobbies/Interests:"
-msgstr "Hobbies/Interessen:"
-
-#: include/identity.php:659 mod/profiles.php:734
-msgid "Likes:"
-msgstr "Likes:"
-
-#: include/identity.php:661 mod/profiles.php:735
-msgid "Dislikes:"
-msgstr "Dislikes:"
-
-#: include/identity.php:664
-msgid "Contact information and Social Networks:"
-msgstr "Kontaktinformationen und Soziale Netzwerke:"
-
-#: include/identity.php:666
-msgid "Musical interests:"
-msgstr "Musikalische Interessen:"
-
-#: include/identity.php:668
-msgid "Books, literature:"
-msgstr "Literatur/Bücher:"
-
-#: include/identity.php:670
-msgid "Television:"
-msgstr "Fernsehen:"
-
-#: include/identity.php:672
-msgid "Film/dance/culture/entertainment:"
-msgstr "Filme/Tänze/Kultur/Unterhaltung:"
-
-#: include/identity.php:674
-msgid "Love/Romance:"
-msgstr "Liebesleben:"
-
-#: include/identity.php:676
-msgid "Work/employment:"
-msgstr "Arbeit/Beschäftigung:"
-
-#: include/identity.php:678
-msgid "School/education:"
-msgstr "Schule/Ausbildung:"
-
-#: include/identity.php:682
-msgid "Forums:"
-msgstr "Foren:"
-
-#: include/identity.php:690 mod/events.php:508
-msgid "Basic"
-msgstr "Allgemein"
-
-#: include/identity.php:691 mod/contacts.php:868 mod/events.php:509
-#: mod/admin.php:931
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: include/identity.php:715 mod/follow.php:143 mod/contacts.php:834
-msgid "Status Messages and Posts"
-msgstr "Statusnachrichten und Beiträge"
-
-#: include/identity.php:723 mod/contacts.php:842
-msgid "Profile Details"
-msgstr "Profildetails"
-
-#: include/identity.php:731 mod/photos.php:100
-msgid "Photo Albums"
-msgstr "Fotoalben"
-
-#: include/identity.php:770 mod/notes.php:46
-msgid "Personal Notes"
-msgstr "Persönliche Notizen"
-
-#: include/identity.php:773
-msgid "Only You Can See This"
-msgstr "Nur Du kannst das sehen"
-
 #: include/conversation.php:147
 #, php-format
 msgid "%1$s attends %2$s's %3$s"
@@ -2324,13 +2026,13 @@ msgstr "Nachricht/Beitrag"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
 
-#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:345
-#: mod/photos.php:1634
+#: include/conversation.php:585 mod/content.php:372 mod/photos.php:1634
+#: mod/profiles.php:346
 msgid "Likes"
 msgstr "Likes"
 
-#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:349
-#: mod/photos.php:1634
+#: include/conversation.php:585 mod/content.php:372 mod/photos.php:1634
+#: mod/profiles.php:350
 msgid "Dislikes"
 msgstr "Dislikes"
 
@@ -2355,8 +2057,8 @@ msgid "Select"
 msgstr "Auswählen"
 
 #: include/conversation.php:709 mod/group.php:171 mod/content.php:454
-#: mod/content.php:759 mod/contacts.php:806 mod/contacts.php:1021
-#: mod/settings.php:726 mod/photos.php:1710 mod/admin.php:1392
+#: mod/content.php:759 mod/photos.php:1710 mod/admin.php:1392
+#: mod/contacts.php:808 mod/contacts.php:1023 mod/settings.php:738
 #: object/Item.php:134
 msgid "Delete"
 msgstr "Löschen"
@@ -2404,6 +2106,37 @@ msgstr "Lösche die markierten Beiträge"
 msgid "Follow Thread"
 msgstr "Folge der Unterhaltung"
 
+#: include/conversation.php:963 include/Contact.php:364
+msgid "View Status"
+msgstr "Pinnwand anschauen"
+
+#: include/conversation.php:964 include/conversation.php:978
+#: include/Contact.php:310 include/Contact.php:323 include/Contact.php:365
+#: mod/directory.php:163 mod/match.php:71 mod/allfriends.php:65
+#: mod/suggest.php:82 mod/dirfind.php:203
+msgid "View Profile"
+msgstr "Profil anschauen"
+
+#: include/conversation.php:965 include/Contact.php:366
+msgid "View Photos"
+msgstr "Bilder anschauen"
+
+#: include/conversation.php:966 include/Contact.php:367
+msgid "Network Posts"
+msgstr "Netzwerkbeiträge"
+
+#: include/conversation.php:967 include/Contact.php:368
+msgid "Edit Contact"
+msgstr "Kontakt bearbeiten"
+
+#: include/conversation.php:968 include/Contact.php:370
+msgid "Send PM"
+msgstr "Private Nachricht senden"
+
+#: include/conversation.php:972 include/Contact.php:371
+msgid "Poke"
+msgstr "Anstupsen"
+
 #: include/conversation.php:1086
 #, php-format
 msgid "%s likes this."
@@ -2623,6 +2356,10 @@ msgstr "Poste an Kontakte"
 msgid "Private post"
 msgstr "Privater Beitrag"
 
+#: include/conversation.php:1285 include/identity.php:250 mod/editpost.php:152
+msgid "Message"
+msgstr "Nachricht"
+
 #: include/conversation.php:1286 mod/editpost.php:153
 msgid "Browser"
 msgstr "Browser"
@@ -3070,6 +2807,273 @@ msgstr "Beitrag"
 msgid "Item filed"
 msgstr "Beitrag abgelegt"
 
+#: include/Contact.php:119
+msgid "stopped following"
+msgstr "wird nicht mehr gefolgt"
+
+#: include/Contact.php:369
+msgid "Drop Contact"
+msgstr "Kontakt löschen"
+
+#: include/dbstructure.php:26
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\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."
+
+#: include/dbstructure.php:31
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]"
+
+#: include/dbstructure.php:153
+msgid "Errors encountered creating database tables."
+msgstr "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."
+
+#: include/dbstructure.php:230
+msgid "Errors encountered performing database changes."
+msgstr "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten."
+
+#: include/delivery.php:439
+msgid "(no subject)"
+msgstr "(kein Betreff)"
+
+#: include/dfrn.php:1114
+#, php-format
+msgid "%s\\'s birthday"
+msgstr "%ss Geburtstag"
+
+#: include/identity.php:42
+msgid "Requested account is not available."
+msgstr "Das angefragte Profil ist nicht vorhanden."
+
+#: include/identity.php:51 mod/profile.php:21
+msgid "Requested profile is not available."
+msgstr "Das angefragte Profil ist nicht vorhanden."
+
+#: include/identity.php:95 include/identity.php:305 include/identity.php:689
+msgid "Edit profile"
+msgstr "Profil bearbeiten"
+
+#: include/identity.php:245
+msgid "Atom feed"
+msgstr "Atom-Feed"
+
+#: include/identity.php:276
+msgid "Manage/edit profiles"
+msgstr "Profile verwalten/editieren"
+
+#: include/identity.php:281 include/identity.php:307 mod/profiles.php:795
+msgid "Change profile photo"
+msgstr "Profilbild ändern"
+
+#: include/identity.php:282 mod/profiles.php:796
+msgid "Create New Profile"
+msgstr "Neues Profil anlegen"
+
+#: include/identity.php:292 mod/profiles.php:785
+msgid "Profile Image"
+msgstr "Profilbild"
+
+#: include/identity.php:295 mod/profiles.php:787
+msgid "visible to everybody"
+msgstr "sichtbar für jeden"
+
+#: include/identity.php:296 mod/profiles.php:691 mod/profiles.php:788
+msgid "Edit visibility"
+msgstr "Sichtbarkeit bearbeiten"
+
+#: include/identity.php:319 mod/directory.php:174 mod/match.php:84
+#: mod/viewcontacts.php:105 mod/allfriends.php:79 mod/suggest.php:98
+#: mod/hovercard.php:80 mod/common.php:123 mod/network.php:517
+#: mod/dirfind.php:223 mod/videos.php:37 mod/photos.php:42 mod/cal.php:44
+#: mod/contacts.php:51 mod/contacts.php:626 mod/contacts.php:955
+msgid "Forum"
+msgstr "Forum"
+
+#: include/identity.php:331 include/identity.php:617 mod/directory.php:147
+#: mod/notifications.php:238
+msgid "Gender:"
+msgstr "Geschlecht:"
+
+#: include/identity.php:334 include/identity.php:637 mod/directory.php:149
+msgid "Status:"
+msgstr "Status:"
+
+#: include/identity.php:336 include/identity.php:648 mod/directory.php:151
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: include/identity.php:338 include/identity.php:658 mod/directory.php:153
+#: mod/notifications.php:234 mod/contacts.php:632
+msgid "About:"
+msgstr "Über:"
+
+#: include/identity.php:340 mod/contacts.php:630
+msgid "XMPP:"
+msgstr "XMPP:"
+
+#: include/identity.php:423 mod/notifications.php:246 mod/contacts.php:50
+msgid "Network:"
+msgstr "Netzwerk:"
+
+#: include/identity.php:452 include/identity.php:536
+msgid "g A l F d"
+msgstr "l, d. F G \\U\\h\\r"
+
+#: include/identity.php:453 include/identity.php:537
+msgid "F d"
+msgstr "d. F"
+
+#: include/identity.php:498 include/identity.php:583
+msgid "[today]"
+msgstr "[heute]"
+
+#: include/identity.php:510
+msgid "Birthday Reminders"
+msgstr "Geburtstagserinnerungen"
+
+#: include/identity.php:511
+msgid "Birthdays this week:"
+msgstr "Geburtstage diese Woche:"
+
+#: include/identity.php:570
+msgid "[No description]"
+msgstr "[keine Beschreibung]"
+
+#: include/identity.php:594
+msgid "Event Reminders"
+msgstr "Veranstaltungserinnerungen"
+
+#: include/identity.php:595
+msgid "Events this week:"
+msgstr "Veranstaltungen diese Woche"
+
+#: include/identity.php:615 mod/settings.php:1269
+msgid "Full Name:"
+msgstr "Kompletter Name:"
+
+#: include/identity.php:622
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: include/identity.php:623
+msgid "j F"
+msgstr "j F"
+
+#: include/identity.php:634
+msgid "Age:"
+msgstr "Alter:"
+
+#: include/identity.php:643
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "für %1$d %2$s"
+
+#: include/identity.php:646 mod/profiles.php:710
+msgid "Sexual Preference:"
+msgstr "Sexuelle Vorlieben:"
+
+#: include/identity.php:650 mod/profiles.php:737
+msgid "Hometown:"
+msgstr "Heimatort:"
+
+#: include/identity.php:652 mod/follow.php:134 mod/notifications.php:236
+#: mod/contacts.php:634
+msgid "Tags:"
+msgstr "Tags:"
+
+#: include/identity.php:654 mod/profiles.php:738
+msgid "Political Views:"
+msgstr "Politische Ansichten:"
+
+#: include/identity.php:656
+msgid "Religion:"
+msgstr "Religion:"
+
+#: include/identity.php:660
+msgid "Hobbies/Interests:"
+msgstr "Hobbies/Interessen:"
+
+#: include/identity.php:662 mod/profiles.php:742
+msgid "Likes:"
+msgstr "Likes:"
+
+#: include/identity.php:664 mod/profiles.php:743
+msgid "Dislikes:"
+msgstr "Dislikes:"
+
+#: include/identity.php:667
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktinformationen und Soziale Netzwerke:"
+
+#: include/identity.php:669
+msgid "Musical interests:"
+msgstr "Musikalische Interessen:"
+
+#: include/identity.php:671
+msgid "Books, literature:"
+msgstr "Literatur/Bücher:"
+
+#: include/identity.php:673
+msgid "Television:"
+msgstr "Fernsehen:"
+
+#: include/identity.php:675
+msgid "Film/dance/culture/entertainment:"
+msgstr "Filme/Tänze/Kultur/Unterhaltung:"
+
+#: include/identity.php:677
+msgid "Love/Romance:"
+msgstr "Liebesleben:"
+
+#: include/identity.php:679
+msgid "Work/employment:"
+msgstr "Arbeit/Beschäftigung:"
+
+#: include/identity.php:681
+msgid "School/education:"
+msgstr "Schule/Ausbildung:"
+
+#: include/identity.php:685
+msgid "Forums:"
+msgstr "Foren:"
+
+#: include/identity.php:693 mod/events.php:508
+msgid "Basic"
+msgstr "Allgemein"
+
+#: include/identity.php:694 mod/events.php:509 mod/admin.php:931
+#: mod/contacts.php:870
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: include/identity.php:718 mod/follow.php:143 mod/contacts.php:836
+msgid "Status Messages and Posts"
+msgstr "Statusnachrichten und Beiträge"
+
+#: include/identity.php:726 mod/contacts.php:844
+msgid "Profile Details"
+msgstr "Profildetails"
+
+#: include/identity.php:734 mod/photos.php:100
+msgid "Photo Albums"
+msgstr "Fotoalben"
+
+#: include/identity.php:773 mod/notes.php:46
+msgid "Personal Notes"
+msgstr "Persönliche Notizen"
+
+#: include/identity.php:776
+msgid "Only You Can See This"
+msgstr "Nur Du kannst das sehen"
+
 #: mod/oexchange.php:25
 msgid "Post successful."
 msgstr "Beitrag erfolgreich veröffentlicht."
@@ -3128,7 +3132,7 @@ msgstr "Keine Ergebnisse."
 msgid "Items tagged with: %s"
 msgstr "Beiträge die mit %s getaggt sind"
 
-#: mod/search.php:232 mod/network.php:146 mod/contacts.php:795
+#: mod/search.php:232 mod/network.php:146 mod/contacts.php:797
 #, php-format
 msgid "Results for: %s"
 msgstr "Ergebnisse für: %s"
@@ -3221,7 +3225,7 @@ msgid ""
 "Password reset failed."
 msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast Du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: mod/lostpass.php:109 boot.php:1719
+#: mod/lostpass.php:109 boot.php:1741
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
@@ -3287,7 +3291,7 @@ msgid ""
 "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."
 
-#: mod/lostpass.php:161 boot.php:1707
+#: mod/lostpass.php:161 boot.php:1729
 msgid "Nickname or Email: "
 msgstr "Spitzname oder E-Mail:"
 
@@ -3411,12 +3415,12 @@ msgid ""
 msgstr "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""
 
 #: mod/nogroup.php:41 mod/viewcontacts.php:97 mod/contacts.php:586
-#: mod/contacts.php:944
+#: mod/contacts.php:946
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Besuche %ss Profil [%s]"
 
-#: mod/nogroup.php:42 mod/contacts.php:945
+#: mod/nogroup.php:42 mod/contacts.php:947
 msgid "Edit contact"
 msgstr "Kontakt bearbeiten"
 
@@ -3564,11 +3568,11 @@ msgstr "Für weitere Informationen über das Friendica Projekt und warum wir es
 
 #: mod/invite.php:140 mod/localtime.php:45 mod/message.php:357
 #: mod/message.php:547 mod/manage.php:143 mod/crepair.php:154
-#: mod/content.php:728 mod/contacts.php:577 mod/fsuggest.php:107
-#: mod/mood.php:137 mod/poke.php:199 mod/profiles.php:681 mod/install.php:272
-#: mod/install.php:312 mod/photos.php:1125 mod/photos.php:1249
-#: mod/photos.php:1566 mod/photos.php:1617 mod/photos.php:1665
-#: mod/photos.php:1753 mod/events.php:507 object/Item.php:720
+#: mod/content.php:728 mod/fsuggest.php:107 mod/mood.php:137 mod/poke.php:199
+#: mod/install.php:272 mod/install.php:312 mod/photos.php:1125
+#: mod/photos.php:1249 mod/photos.php:1566 mod/photos.php:1617
+#: mod/photos.php:1665 mod/photos.php:1753 mod/events.php:507
+#: mod/contacts.php:577 mod/profiles.php:688 object/Item.php:720
 #: view/theme/frio/config.php:59 view/theme/cleanzero/config.php:80
 #: view/theme/quattro/config.php:64 view/theme/dispy/config.php:70
 #: view/theme/vier/config.php:107 view/theme/diabook/theme.php:633
@@ -3761,12 +3765,12 @@ msgid "Does %s know you?"
 msgstr "Kennt %s Dich?"
 
 #: mod/follow.php:110 mod/api.php:106 mod/dfrn_request.php:861
-#: mod/profiles.php:641 mod/profiles.php:645 mod/profiles.php:670
-#: mod/register.php:239 mod/settings.php:1113 mod/settings.php:1119
-#: mod/settings.php:1127 mod/settings.php:1131 mod/settings.php:1136
-#: mod/settings.php:1142 mod/settings.php:1148 mod/settings.php:1154
-#: mod/settings.php:1180 mod/settings.php:1181 mod/settings.php:1182
-#: mod/settings.php:1183 mod/settings.php:1184
+#: mod/register.php:239 mod/profiles.php:648 mod/profiles.php:652
+#: mod/profiles.php:677 mod/settings.php:1153 mod/settings.php:1159
+#: mod/settings.php:1167 mod/settings.php:1171 mod/settings.php:1176
+#: mod/settings.php:1182 mod/settings.php:1188 mod/settings.php:1194
+#: mod/settings.php:1220 mod/settings.php:1221 mod/settings.php:1222
+#: mod/settings.php:1223 mod/settings.php:1224
 msgid "No"
 msgstr "Nein"
 
@@ -3778,7 +3782,7 @@ msgstr "Eine persönliche Notiz beifügen:"
 msgid "Your Identity Address:"
 msgstr "Adresse Deines Profils:"
 
-#: mod/follow.php:126 mod/contacts.php:624 mod/notifications.php:243
+#: mod/follow.php:126 mod/notifications.php:243 mod/contacts.php:624
 msgid "Profile URL"
 msgstr "Profil URL"
 
@@ -3828,7 +3832,7 @@ msgstr "Eintrag wurde entfernt."
 msgid "No contacts in common."
 msgstr "Keine gemeinsamen Kontakte."
 
-#: mod/common.php:134 mod/contacts.php:861
+#: mod/common.php:134 mod/contacts.php:863
 msgid "Common Friends"
 msgstr "Gemeinsame Kontakte"
 
@@ -3882,7 +3886,7 @@ msgid ""
 "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."
 
-#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:700
+#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:707
 msgid "Upload Profile Photo"
 msgstr "Profilbild hochladen"
 
@@ -4177,7 +4181,7 @@ msgstr "Gruppeneditor"
 msgid "Members"
 msgstr "Mitglieder"
 
-#: mod/group.php:192 mod/contacts.php:690
+#: mod/group.php:192 mod/contacts.php:692
 msgid "All Contacts"
 msgstr "Alle Kontakte"
 
@@ -4473,8 +4477,9 @@ msgid ""
 "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."
 
-#: mod/crepair.php:165 mod/settings.php:665 mod/settings.php:691
-#: mod/admin.php:1375 mod/admin.php:1388 mod/admin.php:1400 mod/admin.php:1416
+#: mod/crepair.php:165 mod/admin.php:1375 mod/admin.php:1388
+#: mod/admin.php:1400 mod/admin.php:1416 mod/settings.php:677
+#: mod/settings.php:703
 msgid "Name"
 msgstr "Name"
 
@@ -4706,7 +4711,7 @@ msgstr "Das bist Du"
 
 #: mod/content.php:727 mod/content.php:945 mod/photos.php:1616
 #: mod/photos.php:1664 mod/photos.php:1752 object/Item.php:403
-#: object/Item.php:719 boot.php:903
+#: object/Item.php:719 boot.php:925
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -4742,7 +4747,7 @@ msgstr "Link"
 msgid "Video"
 msgstr "Video"
 
-#: mod/content.php:746 mod/settings.php:725 object/Item.php:122
+#: mod/content.php:746 mod/settings.php:737 object/Item.php:122
 #: object/Item.php:124
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -4807,353 +4812,8 @@ msgstr "Wall-to-Wall"
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: mod/contacts.php:128
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] "%d Kontakt bearbeitet."
-msgstr[1] "%d Kontakte bearbeitet."
-
-#: mod/contacts.php:159 mod/contacts.php:368
-msgid "Could not access contact record."
-msgstr "Konnte nicht auf die Kontaktdaten zugreifen."
-
-#: mod/contacts.php:173
-msgid "Could not locate selected profile."
-msgstr "Konnte das ausgewählte Profil nicht finden."
-
-#: mod/contacts.php:206
-msgid "Contact updated."
-msgstr "Kontakt aktualisiert."
-
-#: mod/contacts.php:389
-msgid "Contact has been blocked"
-msgstr "Kontakt wurde blockiert"
-
-#: mod/contacts.php:389
-msgid "Contact has been unblocked"
-msgstr "Kontakt wurde wieder freigegeben"
-
-#: mod/contacts.php:400
-msgid "Contact has been ignored"
-msgstr "Kontakt wurde ignoriert"
-
-#: mod/contacts.php:400
-msgid "Contact has been unignored"
-msgstr "Kontakt wird nicht mehr ignoriert"
-
-#: mod/contacts.php:412
-msgid "Contact has been archived"
-msgstr "Kontakt wurde archiviert"
-
-#: mod/contacts.php:412
-msgid "Contact has been unarchived"
-msgstr "Kontakt wurde aus dem Archiv geholt"
-
-#: mod/contacts.php:437
-msgid "Drop contact"
-msgstr "Kontakt löschen"
-
-#: mod/contacts.php:440 mod/contacts.php:799
-msgid "Do you really want to delete this contact?"
-msgstr "Möchtest Du wirklich diesen Kontakt löschen?"
-
-#: mod/contacts.php:457
-msgid "Contact has been removed."
-msgstr "Kontakt wurde entfernt."
-
-#: mod/contacts.php:498
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr "Du hast mit %s eine beidseitige Freundschaft"
-
-#: mod/contacts.php:502
-#, php-format
-msgid "You are sharing with %s"
-msgstr "Du teilst mit %s"
-
-#: mod/contacts.php:507
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s teilt mit Dir"
-
-#: mod/contacts.php:527
-msgid "Private communications are not available for this contact."
-msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar."
-
-#: mod/contacts.php:530 mod/admin.php:860
-msgid "Never"
-msgstr "Niemals"
-
-#: mod/contacts.php:534
-msgid "(Update was successful)"
-msgstr "(Aktualisierung war erfolgreich)"
-
-#: mod/contacts.php:534
-msgid "(Update was not successful)"
-msgstr "(Aktualisierung war nicht erfolgreich)"
-
-#: mod/contacts.php:536 mod/contacts.php:978
-msgid "Suggest friends"
-msgstr "Kontakte vorschlagen"
-
-#: mod/contacts.php:540
-#, php-format
-msgid "Network type: %s"
-msgstr "Netzwerktyp: %s"
-
-#: mod/contacts.php:553
-msgid "Communications lost with this contact!"
-msgstr "Verbindungen mit diesem Kontakt verloren!"
-
-#: mod/contacts.php:556
-msgid "Fetch further information for feeds"
-msgstr "Weitere Informationen zu Feeds holen"
-
-#: mod/contacts.php:557 mod/admin.php:869
-msgid "Disabled"
-msgstr "Deaktiviert"
-
-#: mod/contacts.php:557
-msgid "Fetch information"
-msgstr "Beziehe Information"
-
-#: mod/contacts.php:557
-msgid "Fetch information and keywords"
-msgstr "Beziehe Information und Schlüsselworte"
-
-#: mod/contacts.php:575
-msgid "Contact"
-msgstr "Kontakt: "
-
-#: mod/contacts.php:578
-msgid "Profile Visibility"
-msgstr "Profil-Sichtbarkeit"
-
-#: mod/contacts.php:579
-#, php-format
-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."
-
-#: mod/contacts.php:580
-msgid "Contact Information / Notes"
-msgstr "Kontakt Informationen / Notizen"
-
-#: mod/contacts.php:581
-msgid "Edit contact notes"
-msgstr "Notizen zum Kontakt bearbeiten"
-
-#: mod/contacts.php:587
-msgid "Block/Unblock contact"
-msgstr "Kontakt blockieren/freischalten"
-
-#: mod/contacts.php:588
-msgid "Ignore contact"
-msgstr "Ignoriere den Kontakt"
-
-#: mod/contacts.php:589
-msgid "Repair URL settings"
-msgstr "URL Einstellungen reparieren"
-
-#: mod/contacts.php:590
-msgid "View conversations"
-msgstr "Unterhaltungen anzeigen"
-
-#: mod/contacts.php:596
-msgid "Last update:"
-msgstr "Letzte Aktualisierung: "
-
-#: mod/contacts.php:598
-msgid "Update public posts"
-msgstr "Öffentliche Beiträge aktualisieren"
-
-#: mod/contacts.php:600 mod/contacts.php:988
-msgid "Update now"
-msgstr "Jetzt aktualisieren"
-
-#: mod/contacts.php:605 mod/contacts.php:803 mod/contacts.php:997
-#: mod/admin.php:1394
-msgid "Unblock"
-msgstr "Entsperren"
-
-#: mod/contacts.php:605 mod/contacts.php:803 mod/contacts.php:997
-#: mod/admin.php:1393
-msgid "Block"
-msgstr "Sperren"
-
-#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005
-msgid "Unignore"
-msgstr "Ignorieren aufheben"
-
-#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005
-#: mod/notifications.php:60 mod/notifications.php:179
-#: mod/notifications.php:251
-msgid "Ignore"
-msgstr "Ignorieren"
-
-#: mod/contacts.php:610
-msgid "Currently blocked"
-msgstr "Derzeit geblockt"
-
-#: mod/contacts.php:611
-msgid "Currently ignored"
-msgstr "Derzeit ignoriert"
-
-#: mod/contacts.php:612
-msgid "Currently archived"
-msgstr "Momentan archiviert"
-
-#: mod/contacts.php:613 mod/notifications.php:172 mod/notifications.php:239
-msgid "Hide this contact from others"
-msgstr "Verbirg diesen Kontakt vor andere"
-
-#: mod/contacts.php:613
-msgid ""
-"Replies/likes to your public posts may still be visible"
-msgstr "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein"
-
-#: mod/contacts.php:614
-msgid "Notification for new posts"
-msgstr "Benachrichtigung bei neuen Beiträgen"
-
-#: mod/contacts.php:614
-msgid "Send a notification of every new post of this contact"
-msgstr "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt."
-
-#: mod/contacts.php:617
-msgid "Blacklisted keywords"
-msgstr "Blacklistete Schlüsselworte "
-
-#: mod/contacts.php:617
-msgid ""
-"Comma separated list of keywords that should not be converted to hashtags, "
-"when \"Fetch information and keywords\" is selected"
-msgstr "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde"
-
-#: mod/contacts.php:633
-msgid "Actions"
-msgstr "Aktionen"
-
-#: mod/contacts.php:636
-msgid "Contact Settings"
-msgstr "Kontakteinstellungen"
-
-#: mod/contacts.php:682
-msgid "Suggestions"
-msgstr "Kontaktvorschläge"
-
-#: mod/contacts.php:685
-msgid "Suggest potential friends"
-msgstr "Kontakte vorschlagen"
-
-#: mod/contacts.php:693
-msgid "Show all contacts"
-msgstr "Alle Kontakte anzeigen"
-
-#: mod/contacts.php:698
-msgid "Unblocked"
-msgstr "Ungeblockt"
-
-#: mod/contacts.php:701
-msgid "Only show unblocked contacts"
-msgstr "Nur nicht-blockierte Kontakte anzeigen"
-
-#: mod/contacts.php:707
-msgid "Blocked"
-msgstr "Geblockt"
-
-#: mod/contacts.php:710
-msgid "Only show blocked contacts"
-msgstr "Nur blockierte Kontakte anzeigen"
-
-#: mod/contacts.php:716
-msgid "Ignored"
-msgstr "Ignoriert"
-
-#: mod/contacts.php:719
-msgid "Only show ignored contacts"
-msgstr "Nur ignorierte Kontakte anzeigen"
-
-#: mod/contacts.php:725
-msgid "Archived"
-msgstr "Archiviert"
-
-#: mod/contacts.php:728
-msgid "Only show archived contacts"
-msgstr "Nur archivierte Kontakte anzeigen"
-
-#: mod/contacts.php:734
-msgid "Hidden"
-msgstr "Verborgen"
-
-#: mod/contacts.php:737
-msgid "Only show hidden contacts"
-msgstr "Nur verborgene Kontakte anzeigen"
-
-#: mod/contacts.php:794
-msgid "Search your contacts"
-msgstr "Suche in deinen Kontakten"
-
-#: mod/contacts.php:802 mod/settings.php:158 mod/settings.php:689
-msgid "Update"
-msgstr "Aktualisierungen"
-
-#: mod/contacts.php:805 mod/contacts.php:1013
-msgid "Archive"
-msgstr "Archivieren"
-
-#: mod/contacts.php:805 mod/contacts.php:1013
-msgid "Unarchive"
-msgstr "Aus Archiv zurückholen"
-
-#: mod/contacts.php:808
-msgid "Batch Actions"
-msgstr "Stapelverarbeitung"
-
-#: mod/contacts.php:854
-msgid "View all contacts"
-msgstr "Alle Kontakte anzeigen"
-
-#: mod/contacts.php:864
-msgid "View all common friends"
-msgstr "Alle Kontakte anzeigen"
-
-#: mod/contacts.php:871
-msgid "Advanced Contact Settings"
-msgstr "Fortgeschrittene Kontakteinstellungen"
-
-#: mod/contacts.php:916
-msgid "Mutual Friendship"
-msgstr "Beidseitige Freundschaft"
-
-#: mod/contacts.php:920
-msgid "is a fan of yours"
-msgstr "ist ein Fan von dir"
-
-#: mod/contacts.php:924
-msgid "you are a fan of"
-msgstr "Du bist Fan von"
-
-#: mod/contacts.php:999
-msgid "Toggle Blocked status"
-msgstr "Geblockt-Status ein-/ausschalten"
-
-#: mod/contacts.php:1007
-msgid "Toggle Ignored status"
-msgstr "Ignoriert-Status ein-/ausschalten"
-
-#: mod/contacts.php:1015
-msgid "Toggle Archive status"
-msgstr "Archiviert-Status ein-/ausschalten"
-
-#: mod/contacts.php:1023
-msgid "Delete contact"
-msgstr "Lösche den Kontakt"
-
 #: mod/dfrn_confirm.php:66 mod/profiles.php:19 mod/profiles.php:134
-#: mod/profiles.php:180 mod/profiles.php:610
+#: mod/profiles.php:180 mod/profiles.php:617
 msgid "Profile not found."
 msgstr "Profil nicht gefunden."
 
@@ -5378,295 +5038,6 @@ msgstr "Bearbeitung abgeschlossen"
 msgid "Image uploaded successfully."
 msgstr "Bild erfolgreich hochgeladen."
 
-#: mod/profiles.php:38
-msgid "Profile deleted."
-msgstr "Profil gelöscht."
-
-#: mod/profiles.php:56 mod/profiles.php:90
-msgid "Profile-"
-msgstr "Profil-"
-
-#: mod/profiles.php:75 mod/profiles.php:118
-msgid "New profile created."
-msgstr "Neues Profil angelegt."
-
-#: mod/profiles.php:96
-msgid "Profile unavailable to clone."
-msgstr "Profil nicht zum Duplizieren verfügbar."
-
-#: mod/profiles.php:190
-msgid "Profile Name is required."
-msgstr "Profilname ist erforderlich."
-
-#: mod/profiles.php:337
-msgid "Marital Status"
-msgstr "Familienstand"
-
-#: mod/profiles.php:341
-msgid "Romantic Partner"
-msgstr "Romanze"
-
-#: mod/profiles.php:353
-msgid "Work/Employment"
-msgstr "Arbeit / Beschäftigung"
-
-#: mod/profiles.php:356
-msgid "Religion"
-msgstr "Religion"
-
-#: mod/profiles.php:360
-msgid "Political Views"
-msgstr "Politische Ansichten"
-
-#: mod/profiles.php:364
-msgid "Gender"
-msgstr "Geschlecht"
-
-#: mod/profiles.php:368
-msgid "Sexual Preference"
-msgstr "Sexuelle Vorlieben"
-
-#: mod/profiles.php:372
-msgid "Homepage"
-msgstr "Webseite"
-
-#: mod/profiles.php:376 mod/profiles.php:695
-msgid "Interests"
-msgstr "Interessen"
-
-#: mod/profiles.php:380
-msgid "Address"
-msgstr "Adresse"
-
-#: mod/profiles.php:387 mod/profiles.php:691
-msgid "Location"
-msgstr "Wohnort"
-
-#: mod/profiles.php:470
-msgid "Profile updated."
-msgstr "Profil aktualisiert."
-
-#: mod/profiles.php:557
-msgid " and "
-msgstr " und "
-
-#: mod/profiles.php:565
-msgid "public profile"
-msgstr "öffentliches Profil"
-
-#: mod/profiles.php:568
-#, php-format
-msgid "%1$s changed %2$s to “%3$s”"
-msgstr "%1$s hat %2$s geändert auf “%3$s”"
-
-#: mod/profiles.php:569
-#, php-format
-msgid " - Visit %1$s's %2$s"
-msgstr " – %1$ss %2$s besuchen"
-
-#: mod/profiles.php:572
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s."
-
-#: mod/profiles.php:638
-msgid "Hide contacts and friends:"
-msgstr "Kontakte und Freunde verbergen"
-
-#: mod/profiles.php:643
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"
-
-#: mod/profiles.php:667
-msgid "Show more profile fields:"
-msgstr "Zeige mehr Profil-Felder:"
-
-#: mod/profiles.php:679
-msgid "Profile Actions"
-msgstr "Profilaktionen"
-
-#: mod/profiles.php:680
-msgid "Edit Profile Details"
-msgstr "Profil bearbeiten"
-
-#: mod/profiles.php:682
-msgid "Change Profile Photo"
-msgstr "Profilbild ändern"
-
-#: mod/profiles.php:683
-msgid "View this profile"
-msgstr "Dieses Profil anzeigen"
-
-#: mod/profiles.php:685
-msgid "Create a new profile using these settings"
-msgstr "Neues Profil anlegen und diese Einstellungen verwenden"
-
-#: mod/profiles.php:686
-msgid "Clone this profile"
-msgstr "Dieses Profil duplizieren"
-
-#: mod/profiles.php:687
-msgid "Delete this profile"
-msgstr "Dieses Profil löschen"
-
-#: mod/profiles.php:689
-msgid "Basic information"
-msgstr "Grundinformationen"
-
-#: mod/profiles.php:690
-msgid "Profile picture"
-msgstr "Profilbild"
-
-#: mod/profiles.php:692
-msgid "Preferences"
-msgstr "Vorlieben"
-
-#: mod/profiles.php:693
-msgid "Status information"
-msgstr "Status Informationen"
-
-#: mod/profiles.php:694
-msgid "Additional information"
-msgstr "Zusätzliche Informationen"
-
-#: mod/profiles.php:697
-msgid "Relation"
-msgstr "Beziehung"
-
-#: mod/profiles.php:701
-msgid "Your Gender:"
-msgstr "Dein Geschlecht:"
-
-#: mod/profiles.php:702
-msgid "♥ Marital Status:"
-msgstr "♥ Beziehungsstatus:"
-
-#: mod/profiles.php:704
-msgid "Example: fishing photography software"
-msgstr "Beispiel: Fischen Fotografie Software"
-
-#: mod/profiles.php:709
-msgid "Profile Name:"
-msgstr "Profilname:"
-
-#: mod/profiles.php:709 mod/events.php:485 mod/events.php:497
-msgid "Required"
-msgstr "Benötigt"
-
-#: mod/profiles.php:711
-msgid ""
-"This is your public profile.
It may "
-"be visible to anybody using the internet."
-msgstr "Dies ist Dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein."
-
-#: mod/profiles.php:712
-msgid "Your Full Name:"
-msgstr "Dein kompletter Name:"
-
-#: mod/profiles.php:713
-msgid "Title/Description:"
-msgstr "Titel/Beschreibung:"
-
-#: mod/profiles.php:716
-msgid "Street Address:"
-msgstr "Adresse:"
-
-#: mod/profiles.php:717
-msgid "Locality/City:"
-msgstr "Wohnort:"
-
-#: mod/profiles.php:718
-msgid "Region/State:"
-msgstr "Region/Bundesstaat:"
-
-#: mod/profiles.php:719
-msgid "Postal/Zip Code:"
-msgstr "Postleitzahl:"
-
-#: mod/profiles.php:720
-msgid "Country:"
-msgstr "Land:"
-
-#: mod/profiles.php:724
-msgid "Who: (if applicable)"
-msgstr "Wer: (falls anwendbar)"
-
-#: mod/profiles.php:724
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
-
-#: mod/profiles.php:725
-msgid "Since [date]:"
-msgstr "Seit [Datum]:"
-
-#: mod/profiles.php:727
-msgid "Tell us about yourself..."
-msgstr "Erzähle uns ein bisschen von Dir …"
-
-#: mod/profiles.php:728
-msgid "Homepage URL:"
-msgstr "Adresse der Homepage:"
-
-#: mod/profiles.php:731
-msgid "Religious Views:"
-msgstr "Religiöse Ansichten:"
-
-#: mod/profiles.php:732
-msgid "Public Keywords:"
-msgstr "Öffentliche Schlüsselwörter:"
-
-#: mod/profiles.php:732
-msgid "(Used for suggesting potential friends, can be seen by others)"
-msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"
-
-#: mod/profiles.php:733
-msgid "Private Keywords:"
-msgstr "Private Schlüsselwörter:"
-
-#: mod/profiles.php:733
-msgid "(Used for searching profiles, never shown to others)"
-msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"
-
-#: mod/profiles.php:736
-msgid "Musical interests"
-msgstr "Musikalische Interessen"
-
-#: mod/profiles.php:737
-msgid "Books, literature"
-msgstr "Bücher, Literatur"
-
-#: mod/profiles.php:738
-msgid "Television"
-msgstr "Fernsehen"
-
-#: mod/profiles.php:739
-msgid "Film/dance/culture/entertainment"
-msgstr "Filme/Tänze/Kultur/Unterhaltung"
-
-#: mod/profiles.php:740
-msgid "Hobbies/Interests"
-msgstr "Hobbies/Interessen"
-
-#: mod/profiles.php:741
-msgid "Love/romance"
-msgstr "Liebe/Romantik"
-
-#: mod/profiles.php:742
-msgid "Work/employment"
-msgstr "Arbeit/Anstellung"
-
-#: mod/profiles.php:743
-msgid "School/education"
-msgstr "Schule/Ausbildung"
-
-#: mod/profiles.php:744
-msgid "Contact information and Social Networks"
-msgstr "Kontaktinformationen und Soziale Netzwerke"
-
-#: mod/profiles.php:786
-msgid "Edit/Manage Profiles"
-msgstr "Bearbeite/Verwalte Profile"
-
 #: mod/register.php:92
 msgid ""
 "Registration successful. Please check your email for further instructions."
@@ -5731,7 +5102,7 @@ msgstr "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheine
 msgid "Your Email Address: "
 msgstr "Deine E-Mail-Adresse: "
 
-#: mod/register.php:274 mod/settings.php:1221
+#: mod/register.php:274 mod/settings.php:1261
 msgid "New Password:"
 msgstr "Neues Passwort:"
 
@@ -5739,7 +5110,7 @@ msgstr "Neues Passwort:"
 msgid "Leave empty for an auto generated password."
 msgstr "Leer lassen um das Passwort automatisch zu generieren."
 
-#: mod/register.php:275 mod/settings.php:1222
+#: mod/register.php:275 mod/settings.php:1262
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
@@ -5771,704 +5142,6 @@ msgstr "Registrierung für %s wurde zurückgezogen"
 msgid "Please login."
 msgstr "Bitte melde Dich an."
 
-#: mod/settings.php:36 mod/photos.php:118
-msgid "everybody"
-msgstr "jeder"
-
-#: mod/settings.php:43 mod/admin.php:1375
-msgid "Account"
-msgstr "Nutzerkonto"
-
-#: mod/settings.php:52 mod/admin.php:160
-msgid "Additional features"
-msgstr "Zusätzliche Features"
-
-#: mod/settings.php:60
-msgid "Display"
-msgstr "Anzeige"
-
-#: mod/settings.php:67 mod/settings.php:871
-msgid "Social Networks"
-msgstr "Soziale Netzwerke"
-
-#: mod/settings.php:74 mod/admin.php:158 mod/admin.php:1500 mod/admin.php:1560
-msgid "Plugins"
-msgstr "Plugins"
-
-#: mod/settings.php:88
-msgid "Connected apps"
-msgstr "Verbundene Programme"
-
-#: mod/settings.php:102
-msgid "Remove account"
-msgstr "Konto löschen"
-
-#: mod/settings.php:155
-msgid "Missing some important data!"
-msgstr "Wichtige Daten fehlen!"
-
-#: mod/settings.php:269
-msgid "Failed to connect with email account using the settings provided."
-msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."
-
-#: mod/settings.php:274
-msgid "Email settings updated."
-msgstr "E-Mail Einstellungen bearbeitet."
-
-#: mod/settings.php:289
-msgid "Features updated"
-msgstr "Features aktualisiert"
-
-#: mod/settings.php:356
-msgid "Relocate message has been send to your contacts"
-msgstr "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet."
-
-#: mod/settings.php:375
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
-
-#: mod/settings.php:383
-msgid "Wrong password."
-msgstr "Falsches Passwort."
-
-#: mod/settings.php:394
-msgid "Password changed."
-msgstr "Passwort geändert."
-
-#: mod/settings.php:396
-msgid "Password update failed. Please try again."
-msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
-
-#: mod/settings.php:465
-msgid " Please use a shorter name."
-msgstr " Bitte verwende einen kürzeren Namen."
-
-#: mod/settings.php:467
-msgid " Name too short."
-msgstr " Name ist zu kurz."
-
-#: mod/settings.php:476
-msgid "Wrong Password"
-msgstr "Falsches Passwort"
-
-#: mod/settings.php:481
-msgid " Not valid email."
-msgstr " Keine gültige E-Mail."
-
-#: mod/settings.php:487
-msgid " Cannot change to that email."
-msgstr "Ändern der E-Mail nicht möglich. "
-
-#: mod/settings.php:543
-msgid "Private forum has no privacy permissions. Using default privacy group."
-msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt."
-
-#: mod/settings.php:547
-msgid "Private forum has no privacy permissions and no default privacy group."
-msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte."
-
-#: mod/settings.php:586
-msgid "Settings updated."
-msgstr "Einstellungen aktualisiert."
-
-#: mod/settings.php:662 mod/settings.php:688 mod/settings.php:724
-msgid "Add application"
-msgstr "Programm hinzufügen"
-
-#: mod/settings.php:663 mod/settings.php:773 mod/settings.php:820
-#: mod/settings.php:889 mod/settings.php:976 mod/settings.php:1214
-#: mod/admin.php:927 mod/admin.php:1561 mod/admin.php:1809 mod/admin.php:1883
-#: mod/admin.php:2033
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
-
-#: mod/settings.php:666 mod/settings.php:692
-msgid "Consumer Key"
-msgstr "Consumer Key"
-
-#: mod/settings.php:667 mod/settings.php:693
-msgid "Consumer Secret"
-msgstr "Consumer Secret"
-
-#: mod/settings.php:668 mod/settings.php:694
-msgid "Redirect"
-msgstr "Umleiten"
-
-#: mod/settings.php:669 mod/settings.php:695
-msgid "Icon url"
-msgstr "Icon URL"
-
-#: mod/settings.php:680
-msgid "You can't edit this application."
-msgstr "Du kannst dieses Programm nicht bearbeiten."
-
-#: mod/settings.php:723
-msgid "Connected Apps"
-msgstr "Verbundene Programme"
-
-#: mod/settings.php:727
-msgid "Client key starts with"
-msgstr "Anwenderschlüssel beginnt mit"
-
-#: mod/settings.php:728
-msgid "No name"
-msgstr "Kein Name"
-
-#: mod/settings.php:729
-msgid "Remove authorization"
-msgstr "Autorisierung entziehen"
-
-#: mod/settings.php:741
-msgid "No Plugin settings configured"
-msgstr "Keine Plugin-Einstellungen konfiguriert"
-
-#: mod/settings.php:749
-msgid "Plugin Settings"
-msgstr "Plugin-Einstellungen"
-
-#: mod/settings.php:763 mod/admin.php:2022 mod/admin.php:2023
-msgid "Off"
-msgstr "Aus"
-
-#: mod/settings.php:763 mod/admin.php:2022 mod/admin.php:2023
-msgid "On"
-msgstr "An"
-
-#: mod/settings.php:771
-msgid "Additional Features"
-msgstr "Zusätzliche Features"
-
-#: mod/settings.php:781 mod/settings.php:785
-msgid "General Social Media Settings"
-msgstr "Allgemeine Einstellungen zu Sozialen Medien"
-
-#: mod/settings.php:791
-msgid "Disable intelligent shortening"
-msgstr "Intelligentes Link kürzen ausschalten"
-
-#: mod/settings.php:793
-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."
-
-#: mod/settings.php:799
-msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
-msgstr "Automatisch allen GNU Social (OStatus) Followern/Erwähnern folgen"
-
-#: mod/settings.php:801
-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,."
-
-#: mod/settings.php:807
-msgid "Default group for OStatus contacts"
-msgstr "Voreingestellte Gruppe für OStatus Kontakte"
-
-#: mod/settings.php:813
-msgid "Your legacy GNU Social account"
-msgstr "Dein alter GNU Social Account"
-
-#: mod/settings.php:815
-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 Socual/Statusnet Accountnamen 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:818
-msgid "Repair OStatus subscriptions"
-msgstr "OStatus Abonnements reparieren"
-
-#: mod/settings.php:827 mod/settings.php:828
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
-msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s"
-
-#: mod/settings.php:827 mod/settings.php:828
-msgid "enabled"
-msgstr "eingeschaltet"
-
-#: mod/settings.php:827 mod/settings.php:828
-msgid "disabled"
-msgstr "ausgeschaltet"
-
-#: mod/settings.php:828
-msgid "GNU Social (OStatus)"
-msgstr "GNU Social (OStatus)"
-
-#: mod/settings.php:864
-msgid "Email access is disabled on this site."
-msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
-
-#: mod/settings.php:876
-msgid "Email/Mailbox Setup"
-msgstr "E-Mail/Postfach-Einstellungen"
-
-#: mod/settings.php:877
-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."
-
-#: mod/settings.php:878
-msgid "Last successful email check:"
-msgstr "Letzter erfolgreicher E-Mail Check"
-
-#: mod/settings.php:880
-msgid "IMAP server name:"
-msgstr "IMAP-Server-Name:"
-
-#: mod/settings.php:881
-msgid "IMAP port:"
-msgstr "IMAP-Port:"
-
-#: mod/settings.php:882
-msgid "Security:"
-msgstr "Sicherheit:"
-
-#: mod/settings.php:882 mod/settings.php:887
-msgid "None"
-msgstr "Keine"
-
-#: mod/settings.php:883
-msgid "Email login name:"
-msgstr "E-Mail-Login-Name:"
-
-#: mod/settings.php:884
-msgid "Email password:"
-msgstr "E-Mail-Passwort:"
-
-#: mod/settings.php:885
-msgid "Reply-to address:"
-msgstr "Reply-to Adresse:"
-
-#: mod/settings.php:886
-msgid "Send public posts to all email contacts:"
-msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
-
-#: mod/settings.php:887
-msgid "Action after import:"
-msgstr "Aktion nach Import:"
-
-#: mod/settings.php:887
-msgid "Move to folder"
-msgstr "In einen Ordner verschieben"
-
-#: mod/settings.php:888
-msgid "Move to folder:"
-msgstr "In diesen Ordner verschieben:"
-
-#: mod/settings.php:919 mod/admin.php:834
-msgid "No special theme for mobile devices"
-msgstr "Kein spezielles Theme für mobile Geräte verwenden."
-
-#: mod/settings.php:974
-msgid "Display Settings"
-msgstr "Anzeige-Einstellungen"
-
-#: mod/settings.php:980 mod/settings.php:1001
-msgid "Display Theme:"
-msgstr "Theme:"
-
-#: mod/settings.php:981
-msgid "Mobile Theme:"
-msgstr "Mobiles Theme"
-
-#: mod/settings.php:982
-msgid "Update browser every xx seconds"
-msgstr "Browser alle xx Sekunden aktualisieren"
-
-#: mod/settings.php:982
-msgid "Minimum of 10 seconds. Enter -1 to disable it."
-msgstr "Minimum sind 10 Sekeunden. Gib -1 ein um abzuschalten."
-
-#: mod/settings.php:983
-msgid "Number of items to display per page:"
-msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "
-
-#: mod/settings.php:983 mod/settings.php:984
-msgid "Maximum of 100 items"
-msgstr "Maximal 100 Beiträge"
-
-#: mod/settings.php:984
-msgid "Number of items to display per page when viewed from mobile device:"
-msgstr "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:"
-
-#: mod/settings.php:985
-msgid "Don't show emoticons"
-msgstr "Keine Smilies anzeigen"
-
-#: mod/settings.php:986
-msgid "Calendar"
-msgstr "Kalender"
-
-#: mod/settings.php:987
-msgid "Beginning of week:"
-msgstr "Wochenbeginn:"
-
-#: mod/settings.php:988
-msgid "Don't show notices"
-msgstr "Info-Popups nicht anzeigen"
-
-#: mod/settings.php:989
-msgid "Infinite scroll"
-msgstr "Endloses Scrollen"
-
-#: mod/settings.php:990
-msgid "Automatic updates only at the top of the network page"
-msgstr "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist."
-
-#: mod/settings.php:992
-msgid "General Theme Settings"
-msgstr "Allgemeine Themeneinstellungen"
-
-#: mod/settings.php:993
-msgid "Custom Theme Settings"
-msgstr "Benutzerdefinierte Theme Einstellungen"
-
-#: mod/settings.php:994
-msgid "Content Settings"
-msgstr "Einstellungen zum Inhalt"
-
-#: mod/settings.php:995 view/theme/frio/config.php:61
-#: view/theme/cleanzero/config.php:82 view/theme/quattro/config.php:66
-#: view/theme/dispy/config.php:72 view/theme/vier/config.php:109
-#: view/theme/diabook/config.php:150 view/theme/duepuntozero/config.php:61
-msgid "Theme settings"
-msgstr "Themeneinstellungen"
-
-#: mod/settings.php:1072
-msgid "User Types"
-msgstr "Nutzer Art"
-
-#: mod/settings.php:1073
-msgid "Community Types"
-msgstr "Gemeinschafts Art"
-
-#: mod/settings.php:1074
-msgid "Normal Account Page"
-msgstr "Normales Konto"
-
-#: mod/settings.php:1075
-msgid "This account is a normal personal profile"
-msgstr "Dieses Konto ist ein normales persönliches Profil"
-
-#: mod/settings.php:1078
-msgid "Soapbox Page"
-msgstr "Marktschreier-Konto"
-
-#: mod/settings.php:1079
-msgid "Automatically approve all connection/friend requests as read-only fans"
-msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert"
-
-#: mod/settings.php:1082
-msgid "Community Forum/Celebrity Account"
-msgstr "Forum/Promi-Konto"
-
-#: mod/settings.php:1083
-msgid ""
-"Automatically approve all connection/friend requests as read-write fans"
-msgstr "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"
-
-#: mod/settings.php:1086
-msgid "Automatic Friend Page"
-msgstr "Automatische Freunde Seite"
-
-#: mod/settings.php:1087
-msgid "Automatically approve all connection/friend requests as friends"
-msgstr "Kontaktanfragen werden automatisch als Freund akzeptiert"
-
-#: mod/settings.php:1090
-msgid "Private Forum [Experimental]"
-msgstr "Privates Forum [Versuchsstadium]"
-
-#: mod/settings.php:1091
-msgid "Private forum - approved members only"
-msgstr "Privates Forum, nur für Mitglieder"
-
-#: mod/settings.php:1103
-msgid "OpenID:"
-msgstr "OpenID:"
-
-#: mod/settings.php:1103
-msgid "(Optional) Allow this OpenID to login to this account."
-msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."
-
-#: mod/settings.php:1113
-msgid "Publish your default profile in your local site directory?"
-msgstr "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"
-
-#: mod/settings.php:1119
-msgid "Publish your default profile in the global social directory?"
-msgstr "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"
-
-#: mod/settings.php:1127
-msgid "Hide your contact/friend list from viewers of your default profile?"
-msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"
-
-#: mod/settings.php:1131
-msgid ""
-"If enabled, posting public messages to Diaspora and other networks isn't "
-"possible."
-msgstr "Wenn aktiviert, ist das senden öffentliche Nachrichten zu Diaspora und anderen Netzwerken nicht möglich"
-
-#: mod/settings.php:1136
-msgid "Allow friends to post to your profile page?"
-msgstr "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?"
-
-#: mod/settings.php:1142
-msgid "Allow friends to tag your posts?"
-msgstr "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?"
-
-#: mod/settings.php:1148
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
-
-#: mod/settings.php:1154
-msgid "Permit unknown people to send you private mail?"
-msgstr "Dürfen Dir Unbekannte private Nachrichten schicken?"
-
-#: mod/settings.php:1162
-msgid "Profile is not published."
-msgstr "Profil ist nicht veröffentlicht."
-
-#: mod/settings.php:1170
-#, php-format
-msgid "Your Identity Address is '%s' or '%s'."
-msgstr "Die Adresse deines Profils lautet '%s' oder '%s'."
-
-#: mod/settings.php:1177
-msgid "Automatically expire posts after this many days:"
-msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"
-
-#: mod/settings.php:1177
-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."
-
-#: mod/settings.php:1178
-msgid "Advanced expiration settings"
-msgstr "Erweiterte Verfallseinstellungen"
-
-#: mod/settings.php:1179
-msgid "Advanced Expiration"
-msgstr "Erweitertes Verfallen"
-
-#: mod/settings.php:1180
-msgid "Expire posts:"
-msgstr "Beiträge verfallen lassen:"
-
-#: mod/settings.php:1181
-msgid "Expire personal notes:"
-msgstr "Persönliche Notizen verfallen lassen:"
-
-#: mod/settings.php:1182
-msgid "Expire starred posts:"
-msgstr "Markierte Beiträge verfallen lassen:"
-
-#: mod/settings.php:1183
-msgid "Expire photos:"
-msgstr "Fotos verfallen lassen:"
-
-#: mod/settings.php:1184
-msgid "Only expire posts by others:"
-msgstr "Nur Beiträge anderer verfallen:"
-
-#: mod/settings.php:1212
-msgid "Account Settings"
-msgstr "Kontoeinstellungen"
-
-#: mod/settings.php:1220
-msgid "Password Settings"
-msgstr "Passwort-Einstellungen"
-
-#: mod/settings.php:1222
-msgid "Leave password fields blank unless changing"
-msgstr "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern"
-
-#: mod/settings.php:1223
-msgid "Current Password:"
-msgstr "Aktuelles Passwort:"
-
-#: mod/settings.php:1223 mod/settings.php:1224
-msgid "Your current password to confirm the changes"
-msgstr "Dein aktuelles Passwort um die Änderungen zu bestätigen"
-
-#: mod/settings.php:1224
-msgid "Password:"
-msgstr "Passwort:"
-
-#: mod/settings.php:1228
-msgid "Basic Settings"
-msgstr "Grundeinstellungen"
-
-#: mod/settings.php:1230
-msgid "Email Address:"
-msgstr "E-Mail-Adresse:"
-
-#: mod/settings.php:1231
-msgid "Your Timezone:"
-msgstr "Deine Zeitzone:"
-
-#: mod/settings.php:1232
-msgid "Your Language:"
-msgstr "Deine Sprache:"
-
-#: mod/settings.php:1232
-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"
-
-#: mod/settings.php:1233
-msgid "Default Post Location:"
-msgstr "Standardstandort:"
-
-#: mod/settings.php:1234
-msgid "Use Browser Location:"
-msgstr "Standort des Browsers verwenden:"
-
-#: mod/settings.php:1237
-msgid "Security and Privacy Settings"
-msgstr "Sicherheits- und Privatsphäre-Einstellungen"
-
-#: mod/settings.php:1239
-msgid "Maximum Friend Requests/Day:"
-msgstr "Maximale Anzahl vonKontaktanfragen/Tag:"
-
-#: mod/settings.php:1239 mod/settings.php:1269
-msgid "(to prevent spam abuse)"
-msgstr "(um SPAM zu vermeiden)"
-
-#: mod/settings.php:1240
-msgid "Default Post Permissions"
-msgstr "Standard-Zugriffsrechte für Beiträge"
-
-#: mod/settings.php:1241
-msgid "(click to open/close)"
-msgstr "(klicke zum öffnen/schließen)"
-
-#: mod/settings.php:1250 mod/photos.php:1187 mod/photos.php:1571
-msgid "Show to Groups"
-msgstr "Zeige den Gruppen"
-
-#: mod/settings.php:1251 mod/photos.php:1188 mod/photos.php:1572
-msgid "Show to Contacts"
-msgstr "Zeige den Kontakten"
-
-#: mod/settings.php:1252
-msgid "Default Private Post"
-msgstr "Privater Standardbeitrag"
-
-#: mod/settings.php:1253
-msgid "Default Public Post"
-msgstr "Öffentlicher Standardbeitrag"
-
-#: mod/settings.php:1257
-msgid "Default Permissions for New Posts"
-msgstr "Standardberechtigungen für neue Beiträge"
-
-#: mod/settings.php:1269
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:"
-
-#: mod/settings.php:1272
-msgid "Notification Settings"
-msgstr "Benachrichtigungseinstellungen"
-
-#: mod/settings.php:1273
-msgid "By default post a status message when:"
-msgstr "Standardmäßig eine Statusnachricht posten, wenn:"
-
-#: mod/settings.php:1274
-msgid "accepting a friend request"
-msgstr "– Du eine Kontaktanfrage akzeptierst"
-
-#: mod/settings.php:1275
-msgid "joining a forum/community"
-msgstr "– Du einem Forum/einer Gemeinschaftsseite beitrittst"
-
-#: mod/settings.php:1276
-msgid "making an interesting profile change"
-msgstr "– Du eine interessante Änderung an Deinem Profil durchführst"
-
-#: mod/settings.php:1277
-msgid "Send a notification email when:"
-msgstr "Benachrichtigungs-E-Mail senden wenn:"
-
-#: mod/settings.php:1278
-msgid "You receive an introduction"
-msgstr "– Du eine Kontaktanfrage erhältst"
-
-#: mod/settings.php:1279
-msgid "Your introductions are confirmed"
-msgstr "– eine Deiner Kontaktanfragen akzeptiert wurde"
-
-#: mod/settings.php:1280
-msgid "Someone writes on your profile wall"
-msgstr "– jemand etwas auf Deine Pinnwand schreibt"
-
-#: mod/settings.php:1281
-msgid "Someone writes a followup comment"
-msgstr "– jemand auch einen Kommentar verfasst"
-
-#: mod/settings.php:1282
-msgid "You receive a private message"
-msgstr "– Du eine private Nachricht erhältst"
-
-#: mod/settings.php:1283
-msgid "You receive a friend suggestion"
-msgstr "– Du eine Empfehlung erhältst"
-
-#: mod/settings.php:1284
-msgid "You are tagged in a post"
-msgstr "– Du in einem Beitrag erwähnt wirst"
-
-#: mod/settings.php:1285
-msgid "You are poked/prodded/etc. in a post"
-msgstr "– Du von jemandem angestupst oder sonstwie behandelt wirst"
-
-#: mod/settings.php:1287
-msgid "Activate desktop notifications"
-msgstr "Desktop Benachrichtigungen einschalten"
-
-#: mod/settings.php:1287
-msgid "Show desktop popup on new notifications"
-msgstr "Desktop Benachrichtigungen einschalten"
-
-#: mod/settings.php:1289
-msgid "Text-only notification emails"
-msgstr "Benachrichtigungs E-Mail als Rein-Text."
-
-#: mod/settings.php:1291
-msgid "Send text only notification emails, without the html part"
-msgstr "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil"
-
-#: mod/settings.php:1293
-msgid "Advanced Account/Page Type Settings"
-msgstr "Erweiterte Konto-/Seitentyp-Einstellungen"
-
-#: mod/settings.php:1294
-msgid "Change the behaviour of this account for special situations"
-msgstr "Verhalten dieses Kontos in bestimmten Situationen:"
-
-#: mod/settings.php:1297
-msgid "Relocate"
-msgstr "Umziehen"
-
-#: mod/settings.php:1298
-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."
-
-#: mod/settings.php:1299
-msgid "Resend relocate message to contacts"
-msgstr "Umzugsbenachrichtigung erneut an Kontakte senden"
-
 #: mod/videos.php:123
 msgid "Do you really want to delete this video?"
 msgstr "Möchtest Du dieses Video wirklich löschen?"
@@ -6862,6 +5535,10 @@ msgstr "Neueste Fotos"
 msgid "Upload New Photos"
 msgstr "Neue Fotos hochladen"
 
+#: mod/photos.php:118 mod/settings.php:36
+msgid "everybody"
+msgstr "jeder"
+
 #: mod/photos.php:182
 msgid "Contact information unavailable"
 msgstr "Kontaktinformationen nicht verfügbar"
@@ -6924,6 +5601,14 @@ msgstr "oder existierender Albumname: "
 msgid "Do not show a status post for this upload"
 msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen"
 
+#: mod/photos.php:1187 mod/photos.php:1571 mod/settings.php:1290
+msgid "Show to Groups"
+msgstr "Zeige den Gruppen"
+
+#: mod/photos.php:1188 mod/photos.php:1572 mod/settings.php:1291
+msgid "Show to Contacts"
+msgstr "Zeige den Kontakten"
+
 #: mod/photos.php:1189
 msgid "Private Photo"
 msgstr "Privates Foto"
@@ -7069,6 +5754,10 @@ msgstr "Anfangszeitpunkt und Titel werden benötigt"
 msgid "Event Starts:"
 msgstr "Veranstaltungsbeginn:"
 
+#: mod/events.php:485 mod/events.php:497 mod/profiles.php:716
+msgid "Required"
+msgstr "Benötigt"
+
 #: mod/events.php:487 mod/events.php:503
 msgid "Finish date/time is not known or not relevant"
 msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant"
@@ -7102,6 +5791,12 @@ msgstr "Invalid request identifier."
 msgid "Discard"
 msgstr "Verwerfen"
 
+#: mod/notifications.php:60 mod/notifications.php:179
+#: mod/notifications.php:251 mod/contacts.php:606 mod/contacts.php:806
+#: mod/contacts.php:1007
+msgid "Ignore"
+msgstr "Ignorieren"
+
 #: mod/notifications.php:105
 msgid "Network Notifications"
 msgstr "Netzwerk Benachrichtigungen"
@@ -7131,6 +5826,10 @@ msgstr "Benachrichtigungstyp: "
 msgid "suggested by %s"
 msgstr "vorgeschlagen von %s"
 
+#: mod/notifications.php:172 mod/notifications.php:239 mod/contacts.php:613
+msgid "Hide this contact from others"
+msgstr "Verbirg diesen Kontakt vor andere"
+
 #: mod/notifications.php:173 mod/notifications.php:240
 msgid "Post a new friend activity"
 msgstr "Neue-Kontakt Nachricht senden"
@@ -7222,10 +5921,18 @@ msgstr "Seite"
 msgid "Users"
 msgstr "Nutzer"
 
+#: mod/admin.php:158 mod/admin.php:1500 mod/admin.php:1560 mod/settings.php:74
+msgid "Plugins"
+msgstr "Plugins"
+
 #: mod/admin.php:159 mod/admin.php:1758 mod/admin.php:1808
 msgid "Themes"
 msgstr "Themen"
 
+#: mod/admin.php:160 mod/settings.php:52
+msgid "Additional features"
+msgstr "Zusätzliche Features"
+
 #: mod/admin.php:161
 msgid "DB updates"
 msgstr "DB Updates"
@@ -7377,6 +6084,10 @@ msgstr "RINO2 benötigt die PHP Extension mcrypt."
 msgid "Site settings updated."
 msgstr "Seiteneinstellungen aktualisiert."
 
+#: mod/admin.php:834 mod/settings.php:931
+msgid "No special theme for mobile devices"
+msgstr "Kein spezielles Theme für mobile Geräte verwenden."
+
 #: mod/admin.php:853
 msgid "No community page"
 msgstr "Keine Gemeinschaftsseite"
@@ -7389,10 +6100,18 @@ msgstr "Öffentliche Beiträge von Nutzer_innen dieser Seite"
 msgid "Global community page"
 msgstr "Globale Gemeinschaftsseite"
 
+#: mod/admin.php:860 mod/contacts.php:530
+msgid "Never"
+msgstr "Niemals"
+
 #: mod/admin.php:861
 msgid "At post arrival"
 msgstr "Beim Empfang von Nachrichten"
 
+#: mod/admin.php:869 mod/contacts.php:557
+msgid "Disabled"
+msgstr "Deaktiviert"
+
 #: mod/admin.php:871
 msgid "Users, Global Contacts"
 msgstr "Nutzer, globale Kontakte"
@@ -7445,6 +6164,13 @@ msgstr "SSL für alle Links erzwingen"
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"
 
+#: mod/admin.php:927 mod/admin.php:1561 mod/admin.php:1809 mod/admin.php:1883
+#: mod/admin.php:2033 mod/settings.php:675 mod/settings.php:785
+#: mod/settings.php:832 mod/settings.php:901 mod/settings.php:988
+#: mod/settings.php:1254
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
 #: mod/admin.php:929
 msgid "File upload"
 msgstr "Datei hochladen"
@@ -8340,6 +7066,10 @@ msgstr "Letzte Anmeldung"
 msgid "Last item"
 msgstr "Letzter Beitrag"
 
+#: mod/admin.php:1375 mod/settings.php:43
+msgid "Account"
+msgstr "Nutzerkonto"
+
 #: mod/admin.php:1384
 msgid "Add User"
 msgstr "Nutzer hinzufügen"
@@ -8368,6 +7098,16 @@ msgstr "Keine Neuanmeldungen."
 msgid "Deny"
 msgstr "Verwehren"
 
+#: mod/admin.php:1393 mod/contacts.php:605 mod/contacts.php:805
+#: mod/contacts.php:999
+msgid "Block"
+msgstr "Sperren"
+
+#: mod/admin.php:1394 mod/contacts.php:605 mod/contacts.php:805
+#: mod/contacts.php:999
+msgid "Unblock"
+msgstr "Entsperren"
+
 #: mod/admin.php:1395
 msgid "Site admin"
 msgstr "Seitenadministrator"
@@ -8526,6 +7266,14 @@ msgid ""
 "'display_errors' is to enable these options, set to '0' to disable them."
 msgstr "Um PHP Warnungen und Fehler zu protokollieren, kannst du die folgenden Zeilen zur .htconfig.php Datei deiner Installation hinzufügen. Den Dateinamen der Log-Datei legst du in der Zeile mit dem 'error_log' fest,  Er ist relativ zum Friendica-Stammverzeichnis und muss schreibbar durch den Webserver sein. Eine \"1\" als Option für die Punkte 'log_errors' und 'display_errors' aktiviert die Funktionen zum Protokollieren bzw. Anzeigen der Fehler, eine \"0\" deaktiviert sie."
 
+#: mod/admin.php:2022 mod/admin.php:2023 mod/settings.php:775
+msgid "Off"
+msgstr "Aus"
+
+#: mod/admin.php:2022 mod/admin.php:2023 mod/settings.php:775
+msgid "On"
+msgstr "An"
+
 #: mod/admin.php:2023
 #, php-format
 msgid "Lock feature %s"
@@ -8539,6 +7287,1313 @@ msgstr "Zusätzliche Features Verwalten"
 msgid "Tips for New Members"
 msgstr "Tipps für neue Nutzer"
 
+#: mod/contacts.php:128
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] "%d Kontakt bearbeitet."
+msgstr[1] "%d Kontakte bearbeitet."
+
+#: mod/contacts.php:159 mod/contacts.php:368
+msgid "Could not access contact record."
+msgstr "Konnte nicht auf die Kontaktdaten zugreifen."
+
+#: mod/contacts.php:173
+msgid "Could not locate selected profile."
+msgstr "Konnte das ausgewählte Profil nicht finden."
+
+#: mod/contacts.php:206
+msgid "Contact updated."
+msgstr "Kontakt aktualisiert."
+
+#: mod/contacts.php:389
+msgid "Contact has been blocked"
+msgstr "Kontakt wurde blockiert"
+
+#: mod/contacts.php:389
+msgid "Contact has been unblocked"
+msgstr "Kontakt wurde wieder freigegeben"
+
+#: mod/contacts.php:400
+msgid "Contact has been ignored"
+msgstr "Kontakt wurde ignoriert"
+
+#: mod/contacts.php:400
+msgid "Contact has been unignored"
+msgstr "Kontakt wird nicht mehr ignoriert"
+
+#: mod/contacts.php:412
+msgid "Contact has been archived"
+msgstr "Kontakt wurde archiviert"
+
+#: mod/contacts.php:412
+msgid "Contact has been unarchived"
+msgstr "Kontakt wurde aus dem Archiv geholt"
+
+#: mod/contacts.php:437
+msgid "Drop contact"
+msgstr "Kontakt löschen"
+
+#: mod/contacts.php:440 mod/contacts.php:801
+msgid "Do you really want to delete this contact?"
+msgstr "Möchtest Du wirklich diesen Kontakt löschen?"
+
+#: mod/contacts.php:457
+msgid "Contact has been removed."
+msgstr "Kontakt wurde entfernt."
+
+#: mod/contacts.php:498
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "Du hast mit %s eine beidseitige Freundschaft"
+
+#: mod/contacts.php:502
+#, php-format
+msgid "You are sharing with %s"
+msgstr "Du teilst mit %s"
+
+#: mod/contacts.php:507
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s teilt mit Dir"
+
+#: mod/contacts.php:527
+msgid "Private communications are not available for this contact."
+msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar."
+
+#: mod/contacts.php:534
+msgid "(Update was successful)"
+msgstr "(Aktualisierung war erfolgreich)"
+
+#: mod/contacts.php:534
+msgid "(Update was not successful)"
+msgstr "(Aktualisierung war nicht erfolgreich)"
+
+#: mod/contacts.php:536 mod/contacts.php:980
+msgid "Suggest friends"
+msgstr "Kontakte vorschlagen"
+
+#: mod/contacts.php:540
+#, php-format
+msgid "Network type: %s"
+msgstr "Netzwerktyp: %s"
+
+#: mod/contacts.php:553
+msgid "Communications lost with this contact!"
+msgstr "Verbindungen mit diesem Kontakt verloren!"
+
+#: mod/contacts.php:556
+msgid "Fetch further information for feeds"
+msgstr "Weitere Informationen zu Feeds holen"
+
+#: mod/contacts.php:557
+msgid "Fetch information"
+msgstr "Beziehe Information"
+
+#: mod/contacts.php:557
+msgid "Fetch information and keywords"
+msgstr "Beziehe Information und Schlüsselworte"
+
+#: mod/contacts.php:575
+msgid "Contact"
+msgstr "Kontakt: "
+
+#: mod/contacts.php:578
+msgid "Profile Visibility"
+msgstr "Profil-Sichtbarkeit"
+
+#: mod/contacts.php:579
+#, php-format
+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."
+
+#: mod/contacts.php:580
+msgid "Contact Information / Notes"
+msgstr "Kontakt Informationen / Notizen"
+
+#: mod/contacts.php:581
+msgid "Edit contact notes"
+msgstr "Notizen zum Kontakt bearbeiten"
+
+#: mod/contacts.php:587
+msgid "Block/Unblock contact"
+msgstr "Kontakt blockieren/freischalten"
+
+#: mod/contacts.php:588
+msgid "Ignore contact"
+msgstr "Ignoriere den Kontakt"
+
+#: mod/contacts.php:589
+msgid "Repair URL settings"
+msgstr "URL Einstellungen reparieren"
+
+#: mod/contacts.php:590
+msgid "View conversations"
+msgstr "Unterhaltungen anzeigen"
+
+#: mod/contacts.php:596
+msgid "Last update:"
+msgstr "Letzte Aktualisierung: "
+
+#: mod/contacts.php:598
+msgid "Update public posts"
+msgstr "Öffentliche Beiträge aktualisieren"
+
+#: mod/contacts.php:600 mod/contacts.php:990
+msgid "Update now"
+msgstr "Jetzt aktualisieren"
+
+#: mod/contacts.php:606 mod/contacts.php:806 mod/contacts.php:1007
+msgid "Unignore"
+msgstr "Ignorieren aufheben"
+
+#: mod/contacts.php:610
+msgid "Currently blocked"
+msgstr "Derzeit geblockt"
+
+#: mod/contacts.php:611
+msgid "Currently ignored"
+msgstr "Derzeit ignoriert"
+
+#: mod/contacts.php:612
+msgid "Currently archived"
+msgstr "Momentan archiviert"
+
+#: mod/contacts.php:613
+msgid ""
+"Replies/likes to your public posts may still be visible"
+msgstr "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein"
+
+#: mod/contacts.php:614
+msgid "Notification for new posts"
+msgstr "Benachrichtigung bei neuen Beiträgen"
+
+#: mod/contacts.php:614
+msgid "Send a notification of every new post of this contact"
+msgstr "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt."
+
+#: mod/contacts.php:617
+msgid "Blacklisted keywords"
+msgstr "Blacklistete Schlüsselworte "
+
+#: mod/contacts.php:617
+msgid ""
+"Comma separated list of keywords that should not be converted to hashtags, "
+"when \"Fetch information and keywords\" is selected"
+msgstr "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde"
+
+#: mod/contacts.php:635
+msgid "Actions"
+msgstr "Aktionen"
+
+#: mod/contacts.php:638
+msgid "Contact Settings"
+msgstr "Kontakteinstellungen"
+
+#: mod/contacts.php:684
+msgid "Suggestions"
+msgstr "Kontaktvorschläge"
+
+#: mod/contacts.php:687
+msgid "Suggest potential friends"
+msgstr "Kontakte vorschlagen"
+
+#: mod/contacts.php:695
+msgid "Show all contacts"
+msgstr "Alle Kontakte anzeigen"
+
+#: mod/contacts.php:700
+msgid "Unblocked"
+msgstr "Ungeblockt"
+
+#: mod/contacts.php:703
+msgid "Only show unblocked contacts"
+msgstr "Nur nicht-blockierte Kontakte anzeigen"
+
+#: mod/contacts.php:709
+msgid "Blocked"
+msgstr "Geblockt"
+
+#: mod/contacts.php:712
+msgid "Only show blocked contacts"
+msgstr "Nur blockierte Kontakte anzeigen"
+
+#: mod/contacts.php:718
+msgid "Ignored"
+msgstr "Ignoriert"
+
+#: mod/contacts.php:721
+msgid "Only show ignored contacts"
+msgstr "Nur ignorierte Kontakte anzeigen"
+
+#: mod/contacts.php:727
+msgid "Archived"
+msgstr "Archiviert"
+
+#: mod/contacts.php:730
+msgid "Only show archived contacts"
+msgstr "Nur archivierte Kontakte anzeigen"
+
+#: mod/contacts.php:736
+msgid "Hidden"
+msgstr "Verborgen"
+
+#: mod/contacts.php:739
+msgid "Only show hidden contacts"
+msgstr "Nur verborgene Kontakte anzeigen"
+
+#: mod/contacts.php:796
+msgid "Search your contacts"
+msgstr "Suche in deinen Kontakten"
+
+#: mod/contacts.php:804 mod/settings.php:158 mod/settings.php:701
+msgid "Update"
+msgstr "Aktualisierungen"
+
+#: mod/contacts.php:807 mod/contacts.php:1015
+msgid "Archive"
+msgstr "Archivieren"
+
+#: mod/contacts.php:807 mod/contacts.php:1015
+msgid "Unarchive"
+msgstr "Aus Archiv zurückholen"
+
+#: mod/contacts.php:810
+msgid "Batch Actions"
+msgstr "Stapelverarbeitung"
+
+#: mod/contacts.php:856
+msgid "View all contacts"
+msgstr "Alle Kontakte anzeigen"
+
+#: mod/contacts.php:866
+msgid "View all common friends"
+msgstr "Alle Kontakte anzeigen"
+
+#: mod/contacts.php:873
+msgid "Advanced Contact Settings"
+msgstr "Fortgeschrittene Kontakteinstellungen"
+
+#: mod/contacts.php:918
+msgid "Mutual Friendship"
+msgstr "Beidseitige Freundschaft"
+
+#: mod/contacts.php:922
+msgid "is a fan of yours"
+msgstr "ist ein Fan von dir"
+
+#: mod/contacts.php:926
+msgid "you are a fan of"
+msgstr "Du bist Fan von"
+
+#: mod/contacts.php:1001
+msgid "Toggle Blocked status"
+msgstr "Geblockt-Status ein-/ausschalten"
+
+#: mod/contacts.php:1009
+msgid "Toggle Ignored status"
+msgstr "Ignoriert-Status ein-/ausschalten"
+
+#: mod/contacts.php:1017
+msgid "Toggle Archive status"
+msgstr "Archiviert-Status ein-/ausschalten"
+
+#: mod/contacts.php:1025
+msgid "Delete contact"
+msgstr "Lösche den Kontakt"
+
+#: mod/profiles.php:38
+msgid "Profile deleted."
+msgstr "Profil gelöscht."
+
+#: mod/profiles.php:56 mod/profiles.php:90
+msgid "Profile-"
+msgstr "Profil-"
+
+#: mod/profiles.php:75 mod/profiles.php:118
+msgid "New profile created."
+msgstr "Neues Profil angelegt."
+
+#: mod/profiles.php:96
+msgid "Profile unavailable to clone."
+msgstr "Profil nicht zum Duplizieren verfügbar."
+
+#: mod/profiles.php:190
+msgid "Profile Name is required."
+msgstr "Profilname ist erforderlich."
+
+#: mod/profiles.php:338
+msgid "Marital Status"
+msgstr "Familienstand"
+
+#: mod/profiles.php:342
+msgid "Romantic Partner"
+msgstr "Romanze"
+
+#: mod/profiles.php:354
+msgid "Work/Employment"
+msgstr "Arbeit / Beschäftigung"
+
+#: mod/profiles.php:357
+msgid "Religion"
+msgstr "Religion"
+
+#: mod/profiles.php:361
+msgid "Political Views"
+msgstr "Politische Ansichten"
+
+#: mod/profiles.php:365
+msgid "Gender"
+msgstr "Geschlecht"
+
+#: mod/profiles.php:369
+msgid "Sexual Preference"
+msgstr "Sexuelle Vorlieben"
+
+#: mod/profiles.php:373
+msgid "XMPP"
+msgstr "XMPP"
+
+#: mod/profiles.php:377
+msgid "Homepage"
+msgstr "Webseite"
+
+#: mod/profiles.php:381 mod/profiles.php:702
+msgid "Interests"
+msgstr "Interessen"
+
+#: mod/profiles.php:385
+msgid "Address"
+msgstr "Adresse"
+
+#: mod/profiles.php:392 mod/profiles.php:698
+msgid "Location"
+msgstr "Wohnort"
+
+#: mod/profiles.php:477
+msgid "Profile updated."
+msgstr "Profil aktualisiert."
+
+#: mod/profiles.php:564
+msgid " and "
+msgstr " und "
+
+#: mod/profiles.php:572
+msgid "public profile"
+msgstr "öffentliches Profil"
+
+#: mod/profiles.php:575
+#, php-format
+msgid "%1$s changed %2$s to “%3$s”"
+msgstr "%1$s hat %2$s geändert auf “%3$s”"
+
+#: mod/profiles.php:576
+#, php-format
+msgid " - Visit %1$s's %2$s"
+msgstr " – %1$ss %2$s besuchen"
+
+#: mod/profiles.php:579
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s."
+
+#: mod/profiles.php:645
+msgid "Hide contacts and friends:"
+msgstr "Kontakte und Freunde verbergen"
+
+#: mod/profiles.php:650
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"
+
+#: mod/profiles.php:674
+msgid "Show more profile fields:"
+msgstr "Zeige mehr Profil-Felder:"
+
+#: mod/profiles.php:686
+msgid "Profile Actions"
+msgstr "Profilaktionen"
+
+#: mod/profiles.php:687
+msgid "Edit Profile Details"
+msgstr "Profil bearbeiten"
+
+#: mod/profiles.php:689
+msgid "Change Profile Photo"
+msgstr "Profilbild ändern"
+
+#: mod/profiles.php:690
+msgid "View this profile"
+msgstr "Dieses Profil anzeigen"
+
+#: mod/profiles.php:692
+msgid "Create a new profile using these settings"
+msgstr "Neues Profil anlegen und diese Einstellungen verwenden"
+
+#: mod/profiles.php:693
+msgid "Clone this profile"
+msgstr "Dieses Profil duplizieren"
+
+#: mod/profiles.php:694
+msgid "Delete this profile"
+msgstr "Dieses Profil löschen"
+
+#: mod/profiles.php:696
+msgid "Basic information"
+msgstr "Grundinformationen"
+
+#: mod/profiles.php:697
+msgid "Profile picture"
+msgstr "Profilbild"
+
+#: mod/profiles.php:699
+msgid "Preferences"
+msgstr "Vorlieben"
+
+#: mod/profiles.php:700
+msgid "Status information"
+msgstr "Status Informationen"
+
+#: mod/profiles.php:701
+msgid "Additional information"
+msgstr "Zusätzliche Informationen"
+
+#: mod/profiles.php:704
+msgid "Relation"
+msgstr "Beziehung"
+
+#: mod/profiles.php:708
+msgid "Your Gender:"
+msgstr "Dein Geschlecht:"
+
+#: mod/profiles.php:709
+msgid "♥ Marital Status:"
+msgstr "♥ Beziehungsstatus:"
+
+#: mod/profiles.php:711
+msgid "Example: fishing photography software"
+msgstr "Beispiel: Fischen Fotografie Software"
+
+#: mod/profiles.php:716
+msgid "Profile Name:"
+msgstr "Profilname:"
+
+#: mod/profiles.php:718
+msgid ""
+"This is your public profile.
It may "
+"be visible to anybody using the internet."
+msgstr "Dies ist Dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein."
+
+#: mod/profiles.php:719
+msgid "Your Full Name:"
+msgstr "Dein kompletter Name:"
+
+#: mod/profiles.php:720
+msgid "Title/Description:"
+msgstr "Titel/Beschreibung:"
+
+#: mod/profiles.php:723
+msgid "Street Address:"
+msgstr "Adresse:"
+
+#: mod/profiles.php:724
+msgid "Locality/City:"
+msgstr "Wohnort:"
+
+#: mod/profiles.php:725
+msgid "Region/State:"
+msgstr "Region/Bundesstaat:"
+
+#: mod/profiles.php:726
+msgid "Postal/Zip Code:"
+msgstr "Postleitzahl:"
+
+#: mod/profiles.php:727
+msgid "Country:"
+msgstr "Land:"
+
+#: mod/profiles.php:731
+msgid "Who: (if applicable)"
+msgstr "Wer: (falls anwendbar)"
+
+#: mod/profiles.php:731
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
+
+#: mod/profiles.php:732
+msgid "Since [date]:"
+msgstr "Seit [Datum]:"
+
+#: mod/profiles.php:734
+msgid "Tell us about yourself..."
+msgstr "Erzähle uns ein bisschen von Dir …"
+
+#: mod/profiles.php:735
+msgid "XMPP (Jabber) address:"
+msgstr "XMPP (Jabber) Adresse"
+
+#: mod/profiles.php:735
+msgid ""
+"The XMPP address will be propagated to your contacts so that they can follow"
+" you."
+msgstr "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können."
+
+#: mod/profiles.php:736
+msgid "Homepage URL:"
+msgstr "Adresse der Homepage:"
+
+#: mod/profiles.php:739
+msgid "Religious Views:"
+msgstr "Religiöse Ansichten:"
+
+#: mod/profiles.php:740
+msgid "Public Keywords:"
+msgstr "Öffentliche Schlüsselwörter:"
+
+#: mod/profiles.php:740
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"
+
+#: mod/profiles.php:741
+msgid "Private Keywords:"
+msgstr "Private Schlüsselwörter:"
+
+#: mod/profiles.php:741
+msgid "(Used for searching profiles, never shown to others)"
+msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"
+
+#: mod/profiles.php:744
+msgid "Musical interests"
+msgstr "Musikalische Interessen"
+
+#: mod/profiles.php:745
+msgid "Books, literature"
+msgstr "Bücher, Literatur"
+
+#: mod/profiles.php:746
+msgid "Television"
+msgstr "Fernsehen"
+
+#: mod/profiles.php:747
+msgid "Film/dance/culture/entertainment"
+msgstr "Filme/Tänze/Kultur/Unterhaltung"
+
+#: mod/profiles.php:748
+msgid "Hobbies/Interests"
+msgstr "Hobbies/Interessen"
+
+#: mod/profiles.php:749
+msgid "Love/romance"
+msgstr "Liebe/Romantik"
+
+#: mod/profiles.php:750
+msgid "Work/employment"
+msgstr "Arbeit/Anstellung"
+
+#: mod/profiles.php:751
+msgid "School/education"
+msgstr "Schule/Ausbildung"
+
+#: mod/profiles.php:752
+msgid "Contact information and Social Networks"
+msgstr "Kontaktinformationen und Soziale Netzwerke"
+
+#: mod/profiles.php:794
+msgid "Edit/Manage Profiles"
+msgstr "Bearbeite/Verwalte Profile"
+
+#: mod/settings.php:60
+msgid "Display"
+msgstr "Anzeige"
+
+#: mod/settings.php:67 mod/settings.php:883
+msgid "Social Networks"
+msgstr "Soziale Netzwerke"
+
+#: mod/settings.php:88
+msgid "Connected apps"
+msgstr "Verbundene Programme"
+
+#: mod/settings.php:102
+msgid "Remove account"
+msgstr "Konto löschen"
+
+#: mod/settings.php:155
+msgid "Missing some important data!"
+msgstr "Wichtige Daten fehlen!"
+
+#: mod/settings.php:269
+msgid "Failed to connect with email account using the settings provided."
+msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."
+
+#: mod/settings.php:274
+msgid "Email settings updated."
+msgstr "E-Mail Einstellungen bearbeitet."
+
+#: mod/settings.php:289
+msgid "Features updated"
+msgstr "Features aktualisiert"
+
+#: mod/settings.php:356
+msgid "Relocate message has been send to your contacts"
+msgstr "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet."
+
+#: mod/settings.php:375
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
+
+#: mod/settings.php:383
+msgid "Wrong password."
+msgstr "Falsches Passwort."
+
+#: mod/settings.php:394
+msgid "Password changed."
+msgstr "Passwort geändert."
+
+#: mod/settings.php:396
+msgid "Password update failed. Please try again."
+msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
+
+#: mod/settings.php:476
+msgid " Please use a shorter name."
+msgstr " Bitte verwende einen kürzeren Namen."
+
+#: mod/settings.php:478
+msgid " Name too short."
+msgstr " Name ist zu kurz."
+
+#: mod/settings.php:487
+msgid "Wrong Password"
+msgstr "Falsches Passwort"
+
+#: mod/settings.php:492
+msgid " Not valid email."
+msgstr " Keine gültige E-Mail."
+
+#: mod/settings.php:498
+msgid " Cannot change to that email."
+msgstr "Ändern der E-Mail nicht möglich. "
+
+#: mod/settings.php:554
+msgid "Private forum has no privacy permissions. Using default privacy group."
+msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt."
+
+#: mod/settings.php:558
+msgid "Private forum has no privacy permissions and no default privacy group."
+msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte."
+
+#: mod/settings.php:598
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
+
+#: mod/settings.php:674 mod/settings.php:700 mod/settings.php:736
+msgid "Add application"
+msgstr "Programm hinzufügen"
+
+#: mod/settings.php:678 mod/settings.php:704
+msgid "Consumer Key"
+msgstr "Consumer Key"
+
+#: mod/settings.php:679 mod/settings.php:705
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
+
+#: mod/settings.php:680 mod/settings.php:706
+msgid "Redirect"
+msgstr "Umleiten"
+
+#: mod/settings.php:681 mod/settings.php:707
+msgid "Icon url"
+msgstr "Icon URL"
+
+#: mod/settings.php:692
+msgid "You can't edit this application."
+msgstr "Du kannst dieses Programm nicht bearbeiten."
+
+#: mod/settings.php:735
+msgid "Connected Apps"
+msgstr "Verbundene Programme"
+
+#: mod/settings.php:739
+msgid "Client key starts with"
+msgstr "Anwenderschlüssel beginnt mit"
+
+#: mod/settings.php:740
+msgid "No name"
+msgstr "Kein Name"
+
+#: mod/settings.php:741
+msgid "Remove authorization"
+msgstr "Autorisierung entziehen"
+
+#: mod/settings.php:753
+msgid "No Plugin settings configured"
+msgstr "Keine Plugin-Einstellungen konfiguriert"
+
+#: mod/settings.php:761
+msgid "Plugin Settings"
+msgstr "Plugin-Einstellungen"
+
+#: mod/settings.php:783
+msgid "Additional Features"
+msgstr "Zusätzliche Features"
+
+#: mod/settings.php:793 mod/settings.php:797
+msgid "General Social Media Settings"
+msgstr "Allgemeine Einstellungen zu Sozialen Medien"
+
+#: mod/settings.php:803
+msgid "Disable intelligent shortening"
+msgstr "Intelligentes Link kürzen ausschalten"
+
+#: mod/settings.php:805
+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."
+
+#: mod/settings.php:811
+msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
+msgstr "Automatisch allen GNU Social (OStatus) Followern/Erwähnern folgen"
+
+#: mod/settings.php:813
+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,."
+
+#: mod/settings.php:819
+msgid "Default group for OStatus contacts"
+msgstr "Voreingestellte Gruppe für OStatus Kontakte"
+
+#: mod/settings.php:825
+msgid "Your legacy GNU Social account"
+msgstr "Dein alter GNU Social Account"
+
+#: mod/settings.php:827
+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 Socual/Statusnet Accountnamen 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:830
+msgid "Repair OStatus subscriptions"
+msgstr "OStatus Abonnements reparieren"
+
+#: mod/settings.php:839 mod/settings.php:840
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
+msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s"
+
+#: mod/settings.php:839 mod/settings.php:840
+msgid "enabled"
+msgstr "eingeschaltet"
+
+#: mod/settings.php:839 mod/settings.php:840
+msgid "disabled"
+msgstr "ausgeschaltet"
+
+#: mod/settings.php:840
+msgid "GNU Social (OStatus)"
+msgstr "GNU Social (OStatus)"
+
+#: mod/settings.php:876
+msgid "Email access is disabled on this site."
+msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
+
+#: mod/settings.php:888
+msgid "Email/Mailbox Setup"
+msgstr "E-Mail/Postfach-Einstellungen"
+
+#: mod/settings.php:889
+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."
+
+#: mod/settings.php:890
+msgid "Last successful email check:"
+msgstr "Letzter erfolgreicher E-Mail Check"
+
+#: mod/settings.php:892
+msgid "IMAP server name:"
+msgstr "IMAP-Server-Name:"
+
+#: mod/settings.php:893
+msgid "IMAP port:"
+msgstr "IMAP-Port:"
+
+#: mod/settings.php:894
+msgid "Security:"
+msgstr "Sicherheit:"
+
+#: mod/settings.php:894 mod/settings.php:899
+msgid "None"
+msgstr "Keine"
+
+#: mod/settings.php:895
+msgid "Email login name:"
+msgstr "E-Mail-Login-Name:"
+
+#: mod/settings.php:896
+msgid "Email password:"
+msgstr "E-Mail-Passwort:"
+
+#: mod/settings.php:897
+msgid "Reply-to address:"
+msgstr "Reply-to Adresse:"
+
+#: mod/settings.php:898
+msgid "Send public posts to all email contacts:"
+msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
+
+#: mod/settings.php:899
+msgid "Action after import:"
+msgstr "Aktion nach Import:"
+
+#: mod/settings.php:899
+msgid "Move to folder"
+msgstr "In einen Ordner verschieben"
+
+#: mod/settings.php:900
+msgid "Move to folder:"
+msgstr "In diesen Ordner verschieben:"
+
+#: mod/settings.php:986
+msgid "Display Settings"
+msgstr "Anzeige-Einstellungen"
+
+#: mod/settings.php:992 mod/settings.php:1013
+msgid "Display Theme:"
+msgstr "Theme:"
+
+#: mod/settings.php:993
+msgid "Mobile Theme:"
+msgstr "Mobiles Theme"
+
+#: mod/settings.php:994
+msgid "Update browser every xx seconds"
+msgstr "Browser alle xx Sekunden aktualisieren"
+
+#: mod/settings.php:994
+msgid "Minimum of 10 seconds. Enter -1 to disable it."
+msgstr "Minimum sind 10 Sekeunden. Gib -1 ein um abzuschalten."
+
+#: mod/settings.php:995
+msgid "Number of items to display per page:"
+msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "
+
+#: mod/settings.php:995 mod/settings.php:996
+msgid "Maximum of 100 items"
+msgstr "Maximal 100 Beiträge"
+
+#: mod/settings.php:996
+msgid "Number of items to display per page when viewed from mobile device:"
+msgstr "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:"
+
+#: mod/settings.php:997
+msgid "Don't show emoticons"
+msgstr "Keine Smilies anzeigen"
+
+#: mod/settings.php:998
+msgid "Calendar"
+msgstr "Kalender"
+
+#: mod/settings.php:999
+msgid "Beginning of week:"
+msgstr "Wochenbeginn:"
+
+#: mod/settings.php:1000
+msgid "Don't show notices"
+msgstr "Info-Popups nicht anzeigen"
+
+#: mod/settings.php:1001
+msgid "Infinite scroll"
+msgstr "Endloses Scrollen"
+
+#: mod/settings.php:1002
+msgid "Automatic updates only at the top of the network page"
+msgstr "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist."
+
+#: mod/settings.php:1004
+msgid "General Theme Settings"
+msgstr "Allgemeine Themeneinstellungen"
+
+#: mod/settings.php:1005
+msgid "Custom Theme Settings"
+msgstr "Benutzerdefinierte Theme Einstellungen"
+
+#: mod/settings.php:1006
+msgid "Content Settings"
+msgstr "Einstellungen zum Inhalt"
+
+#: mod/settings.php:1007 view/theme/frio/config.php:61
+#: view/theme/cleanzero/config.php:82 view/theme/quattro/config.php:66
+#: view/theme/dispy/config.php:72 view/theme/vier/config.php:109
+#: view/theme/diabook/config.php:150 view/theme/duepuntozero/config.php:61
+msgid "Theme settings"
+msgstr "Themeneinstellungen"
+
+#: mod/settings.php:1089
+msgid "Account Types"
+msgstr "Kontenarten"
+
+#: mod/settings.php:1090
+msgid "Personal Page Subtypes"
+msgstr "Unterarten der persönlichen Seite"
+
+#: mod/settings.php:1091
+msgid "Community Forum Subtypes"
+msgstr "Unterarten des Gemeinschaftsforums"
+
+#: mod/settings.php:1098
+msgid "Personal Page"
+msgstr "Persönliche Seite"
+
+#: mod/settings.php:1099
+msgid "This account is a regular personal profile"
+msgstr "Dieses Konto ist ein normales persönliches Profil"
+
+#: mod/settings.php:1102
+msgid "Organisation Page"
+msgstr "Organisationsseite"
+
+#: mod/settings.php:1103
+msgid "This account is a profile for an organisation"
+msgstr "Diese Konto ist ein Profil für eine Organisation"
+
+#: mod/settings.php:1106
+msgid "News Page"
+msgstr "Nachrichtenseite"
+
+#: mod/settings.php:1107
+msgid "This account is a news account/reflector"
+msgstr "Dieses Konto ist ein News-Konto bzw. -Spiegel"
+
+#: mod/settings.php:1110
+msgid "Community Forum"
+msgstr "Gemeinschaftsforum"
+
+#: mod/settings.php:1111
+msgid ""
+"This account is a community forum where people can discuss with each other"
+msgstr "Dieses Konto ist ein Gemeinschaftskonto wo sich Leute untereinander austauschen können"
+
+#: mod/settings.php:1114
+msgid "Normal Account Page"
+msgstr "Normales Konto"
+
+#: mod/settings.php:1115
+msgid "This account is a normal personal profile"
+msgstr "Dieses Konto ist ein normales persönliches Profil"
+
+#: mod/settings.php:1118
+msgid "Soapbox Page"
+msgstr "Marktschreier-Konto"
+
+#: mod/settings.php:1119
+msgid "Automatically approve all connection/friend requests as read-only fans"
+msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert"
+
+#: mod/settings.php:1122
+msgid "Public Forum"
+msgstr "Öffentliches Forum"
+
+#: mod/settings.php:1123
+msgid "Automatically approve all contact requests"
+msgstr "Bestätige alle Kontaktanfragen automatisch"
+
+#: mod/settings.php:1126
+msgid "Automatic Friend Page"
+msgstr "Automatische Freunde Seite"
+
+#: mod/settings.php:1127
+msgid "Automatically approve all connection/friend requests as friends"
+msgstr "Kontaktanfragen werden automatisch als Freund akzeptiert"
+
+#: mod/settings.php:1130
+msgid "Private Forum [Experimental]"
+msgstr "Privates Forum [Versuchsstadium]"
+
+#: mod/settings.php:1131
+msgid "Private forum - approved members only"
+msgstr "Privates Forum, nur für Mitglieder"
+
+#: mod/settings.php:1143
+msgid "OpenID:"
+msgstr "OpenID:"
+
+#: mod/settings.php:1143
+msgid "(Optional) Allow this OpenID to login to this account."
+msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."
+
+#: mod/settings.php:1153
+msgid "Publish your default profile in your local site directory?"
+msgstr "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"
+
+#: mod/settings.php:1159
+msgid "Publish your default profile in the global social directory?"
+msgstr "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"
+
+#: mod/settings.php:1167
+msgid "Hide your contact/friend list from viewers of your default profile?"
+msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"
+
+#: mod/settings.php:1171
+msgid ""
+"If enabled, posting public messages to Diaspora and other networks isn't "
+"possible."
+msgstr "Wenn aktiviert, ist das senden öffentliche Nachrichten zu Diaspora und anderen Netzwerken nicht möglich"
+
+#: mod/settings.php:1176
+msgid "Allow friends to post to your profile page?"
+msgstr "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?"
+
+#: mod/settings.php:1182
+msgid "Allow friends to tag your posts?"
+msgstr "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?"
+
+#: mod/settings.php:1188
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
+
+#: mod/settings.php:1194
+msgid "Permit unknown people to send you private mail?"
+msgstr "Dürfen Dir Unbekannte private Nachrichten schicken?"
+
+#: mod/settings.php:1202
+msgid "Profile is not published."
+msgstr "Profil ist nicht veröffentlicht."
+
+#: mod/settings.php:1210
+#, php-format
+msgid "Your Identity Address is '%s' or '%s'."
+msgstr "Die Adresse deines Profils lautet '%s' oder '%s'."
+
+#: mod/settings.php:1217
+msgid "Automatically expire posts after this many days:"
+msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"
+
+#: mod/settings.php:1217
+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."
+
+#: mod/settings.php:1218
+msgid "Advanced expiration settings"
+msgstr "Erweiterte Verfallseinstellungen"
+
+#: mod/settings.php:1219
+msgid "Advanced Expiration"
+msgstr "Erweitertes Verfallen"
+
+#: mod/settings.php:1220
+msgid "Expire posts:"
+msgstr "Beiträge verfallen lassen:"
+
+#: mod/settings.php:1221
+msgid "Expire personal notes:"
+msgstr "Persönliche Notizen verfallen lassen:"
+
+#: mod/settings.php:1222
+msgid "Expire starred posts:"
+msgstr "Markierte Beiträge verfallen lassen:"
+
+#: mod/settings.php:1223
+msgid "Expire photos:"
+msgstr "Fotos verfallen lassen:"
+
+#: mod/settings.php:1224
+msgid "Only expire posts by others:"
+msgstr "Nur Beiträge anderer verfallen:"
+
+#: mod/settings.php:1252
+msgid "Account Settings"
+msgstr "Kontoeinstellungen"
+
+#: mod/settings.php:1260
+msgid "Password Settings"
+msgstr "Passwort-Einstellungen"
+
+#: mod/settings.php:1262
+msgid "Leave password fields blank unless changing"
+msgstr "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern"
+
+#: mod/settings.php:1263
+msgid "Current Password:"
+msgstr "Aktuelles Passwort:"
+
+#: mod/settings.php:1263 mod/settings.php:1264
+msgid "Your current password to confirm the changes"
+msgstr "Dein aktuelles Passwort um die Änderungen zu bestätigen"
+
+#: mod/settings.php:1264
+msgid "Password:"
+msgstr "Passwort:"
+
+#: mod/settings.php:1268
+msgid "Basic Settings"
+msgstr "Grundeinstellungen"
+
+#: mod/settings.php:1270
+msgid "Email Address:"
+msgstr "E-Mail-Adresse:"
+
+#: mod/settings.php:1271
+msgid "Your Timezone:"
+msgstr "Deine Zeitzone:"
+
+#: mod/settings.php:1272
+msgid "Your Language:"
+msgstr "Deine Sprache:"
+
+#: mod/settings.php:1272
+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"
+
+#: mod/settings.php:1273
+msgid "Default Post Location:"
+msgstr "Standardstandort:"
+
+#: mod/settings.php:1274
+msgid "Use Browser Location:"
+msgstr "Standort des Browsers verwenden:"
+
+#: mod/settings.php:1277
+msgid "Security and Privacy Settings"
+msgstr "Sicherheits- und Privatsphäre-Einstellungen"
+
+#: mod/settings.php:1279
+msgid "Maximum Friend Requests/Day:"
+msgstr "Maximale Anzahl vonKontaktanfragen/Tag:"
+
+#: mod/settings.php:1279 mod/settings.php:1309
+msgid "(to prevent spam abuse)"
+msgstr "(um SPAM zu vermeiden)"
+
+#: mod/settings.php:1280
+msgid "Default Post Permissions"
+msgstr "Standard-Zugriffsrechte für Beiträge"
+
+#: mod/settings.php:1281
+msgid "(click to open/close)"
+msgstr "(klicke zum öffnen/schließen)"
+
+#: mod/settings.php:1292
+msgid "Default Private Post"
+msgstr "Privater Standardbeitrag"
+
+#: mod/settings.php:1293
+msgid "Default Public Post"
+msgstr "Öffentlicher Standardbeitrag"
+
+#: mod/settings.php:1297
+msgid "Default Permissions for New Posts"
+msgstr "Standardberechtigungen für neue Beiträge"
+
+#: mod/settings.php:1309
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:"
+
+#: mod/settings.php:1312
+msgid "Notification Settings"
+msgstr "Benachrichtigungseinstellungen"
+
+#: mod/settings.php:1313
+msgid "By default post a status message when:"
+msgstr "Standardmäßig eine Statusnachricht posten, wenn:"
+
+#: mod/settings.php:1314
+msgid "accepting a friend request"
+msgstr "– Du eine Kontaktanfrage akzeptierst"
+
+#: mod/settings.php:1315
+msgid "joining a forum/community"
+msgstr "– Du einem Forum/einer Gemeinschaftsseite beitrittst"
+
+#: mod/settings.php:1316
+msgid "making an interesting profile change"
+msgstr "– Du eine interessante Änderung an Deinem Profil durchführst"
+
+#: mod/settings.php:1317
+msgid "Send a notification email when:"
+msgstr "Benachrichtigungs-E-Mail senden wenn:"
+
+#: mod/settings.php:1318
+msgid "You receive an introduction"
+msgstr "– Du eine Kontaktanfrage erhältst"
+
+#: mod/settings.php:1319
+msgid "Your introductions are confirmed"
+msgstr "– eine Deiner Kontaktanfragen akzeptiert wurde"
+
+#: mod/settings.php:1320
+msgid "Someone writes on your profile wall"
+msgstr "– jemand etwas auf Deine Pinnwand schreibt"
+
+#: mod/settings.php:1321
+msgid "Someone writes a followup comment"
+msgstr "– jemand auch einen Kommentar verfasst"
+
+#: mod/settings.php:1322
+msgid "You receive a private message"
+msgstr "– Du eine private Nachricht erhältst"
+
+#: mod/settings.php:1323
+msgid "You receive a friend suggestion"
+msgstr "– Du eine Empfehlung erhältst"
+
+#: mod/settings.php:1324
+msgid "You are tagged in a post"
+msgstr "– Du in einem Beitrag erwähnt wirst"
+
+#: mod/settings.php:1325
+msgid "You are poked/prodded/etc. in a post"
+msgstr "– Du von jemandem angestupst oder sonstwie behandelt wirst"
+
+#: mod/settings.php:1327
+msgid "Activate desktop notifications"
+msgstr "Desktop Benachrichtigungen einschalten"
+
+#: mod/settings.php:1327
+msgid "Show desktop popup on new notifications"
+msgstr "Desktop Benachrichtigungen einschalten"
+
+#: mod/settings.php:1329
+msgid "Text-only notification emails"
+msgstr "Benachrichtigungs E-Mail als Rein-Text."
+
+#: mod/settings.php:1331
+msgid "Send text only notification emails, without the html part"
+msgstr "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil"
+
+#: mod/settings.php:1333
+msgid "Advanced Account/Page Type Settings"
+msgstr "Erweiterte Konto-/Seitentyp-Einstellungen"
+
+#: mod/settings.php:1334
+msgid "Change the behaviour of this account for special situations"
+msgstr "Verhalten dieses Kontos in bestimmten Situationen:"
+
+#: mod/settings.php:1337
+msgid "Relocate"
+msgstr "Umziehen"
+
+#: mod/settings.php:1338
+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."
+
+#: mod/settings.php:1339
+msgid "Resend relocate message to contacts"
+msgstr "Umzugsbenachrichtigung erneut an Kontakte senden"
+
 #: object/Item.php:370
 msgid "via"
 msgstr "via"
@@ -8798,55 +8853,55 @@ msgstr "slackr"
 msgid "Variations"
 msgstr "Variationen"
 
-#: boot.php:902
+#: index.php:447
+msgid "toggle mobile"
+msgstr "auf/von Mobile Ansicht wechseln"
+
+#: boot.php:924
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: boot.php:905
+#: boot.php:927
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: boot.php:1567
+#: boot.php:1589
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
 
-#: boot.php:1679
+#: boot.php:1701
 msgid "Create a New Account"
 msgstr "Neues Konto erstellen"
 
-#: boot.php:1708
+#: boot.php:1730
 msgid "Password: "
 msgstr "Passwort: "
 
-#: boot.php:1709
+#: boot.php:1731
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: boot.php:1712
+#: boot.php:1734
 msgid "Or login using OpenID: "
 msgstr "Oder melde Dich mit Deiner OpenID an: "
 
-#: boot.php:1718
+#: boot.php:1740
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: boot.php:1721
+#: boot.php:1743
 msgid "Website Terms of Service"
 msgstr "Website Nutzungsbedingungen"
 
-#: boot.php:1722
+#: boot.php:1744
 msgid "terms of service"
 msgstr "Nutzungsbedingungen"
 
-#: boot.php:1724
+#: boot.php:1746
 msgid "Website Privacy Policy"
 msgstr "Website Datenschutzerklärung"
 
-#: boot.php:1725
+#: boot.php:1747
 msgid "privacy policy"
 msgstr "Datenschutzerklärung"
-
-#: index.php:447
-msgid "toggle mobile"
-msgstr "auf/von Mobile Ansicht wechseln"
diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php
index 92ee10a61b..a7694138d6 100644
--- a/view/lang/de/strings.php
+++ b/view/lang/de/strings.php
@@ -205,7 +205,6 @@ $a->strings["Group Name: "] = "Gruppenname:";
 $a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe";
 $a->strings["add"] = "hinzufügen";
 $a->strings["Wall Photos"] = "Pinnwand-Bilder";
-$a->strings["(no subject)"] = "(kein Betreff)";
 $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.";
@@ -326,15 +325,6 @@ $a->strings["GNU Social"] = "GNU Social";
 $a->strings["App.net"] = "App.net";
 $a->strings["Hubzilla/Redmatrix"] = "Hubzilla/Redmatrix";
 $a->strings["view full size"] = "Volle Größe anzeigen";
-$a->strings["stopped following"] = "wird nicht mehr gefolgt";
-$a->strings["View Profile"] = "Profil anschauen";
-$a->strings["View Status"] = "Pinnwand anschauen";
-$a->strings["View Photos"] = "Bilder anschauen";
-$a->strings["Network Posts"] = "Netzwerkbeiträge";
-$a->strings["Edit Contact"] = "Kontakt bearbeiten";
-$a->strings["Drop Contact"] = "Kontakt löschen";
-$a->strings["Send PM"] = "Private Nachricht senden";
-$a->strings["Poke"] = "Anstupsen";
 $a->strings["Post to Email"] = "An E-Mail senden";
 $a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist.";
 $a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?";
@@ -345,7 +335,6 @@ $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["Permissions"] = "Berechtigungen";
 $a->strings["Close"] = "Schließen";
-$a->strings["%s\\'s birthday"] = "%ss Geburtstag";
 $a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL.";
 $a->strings["Connect URL missing."] = "Connect-URL fehlt";
 $a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann.";
@@ -409,10 +398,6 @@ $a->strings["Image/photo"] = "Bild/Foto";
 $a->strings["%2\$s %3\$s"] = "%2\$s %3\$s";
 $a->strings["$1 wrote:"] = "$1 hat geschrieben:";
 $a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
-$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\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["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen.";
-$a->strings["Errors encountered performing database changes."] = "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten.";
 $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
 $a->strings["Attachments:"] = "Anhänge:";
 $a->strings["Sun"] = "So";
@@ -459,60 +444,6 @@ $a->strings["link to source"] = "Link zum Originalbeitrag";
 $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["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden.";
-$a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden.";
-$a->strings["Edit profile"] = "Profil bearbeiten";
-$a->strings["Atom feed"] = "Atom-Feed";
-$a->strings["Message"] = "Nachricht";
-$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren";
-$a->strings["Change profile photo"] = "Profilbild ändern";
-$a->strings["Create New Profile"] = "Neues Profil anlegen";
-$a->strings["Profile Image"] = "Profilbild";
-$a->strings["visible to everybody"] = "sichtbar für jeden";
-$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
-$a->strings["Forum"] = "Forum";
-$a->strings["Gender:"] = "Geschlecht:";
-$a->strings["Status:"] = "Status:";
-$a->strings["Homepage:"] = "Homepage:";
-$a->strings["About:"] = "Über:";
-$a->strings["Network:"] = "Netzwerk:";
-$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r";
-$a->strings["F d"] = "d. F";
-$a->strings["[today]"] = "[heute]";
-$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen";
-$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:";
-$a->strings["[No description]"] = "[keine Beschreibung]";
-$a->strings["Event Reminders"] = "Veranstaltungserinnerungen";
-$a->strings["Events this week:"] = "Veranstaltungen diese Woche";
-$a->strings["Full Name:"] = "Kompletter Name:";
-$a->strings["j F, Y"] = "j F, Y";
-$a->strings["j F"] = "j F";
-$a->strings["Age:"] = "Alter:";
-$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s";
-$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:";
-$a->strings["Hometown:"] = "Heimatort:";
-$a->strings["Tags:"] = "Tags:";
-$a->strings["Political Views:"] = "Politische Ansichten:";
-$a->strings["Religion:"] = "Religion:";
-$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:";
-$a->strings["Likes:"] = "Likes:";
-$a->strings["Dislikes:"] = "Dislikes:";
-$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:";
-$a->strings["Musical interests:"] = "Musikalische Interessen:";
-$a->strings["Books, literature:"] = "Literatur/Bücher:";
-$a->strings["Television:"] = "Fernsehen:";
-$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:";
-$a->strings["Love/Romance:"] = "Liebesleben:";
-$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:";
-$a->strings["School/education:"] = "Schule/Ausbildung:";
-$a->strings["Forums:"] = "Foren:";
-$a->strings["Basic"] = "Allgemein";
-$a->strings["Advanced"] = "Erweitert";
-$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
-$a->strings["Profile Details"] = "Profildetails";
-$a->strings["Photo Albums"] = "Fotoalben";
-$a->strings["Personal Notes"] = "Persönliche Notizen";
-$a->strings["Only You Can See This"] = "Nur Du kannst das sehen";
 $a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil.";
 $a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil.";
 $a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil.";
@@ -541,6 +472,13 @@ $a->strings["Please wait"] = "Bitte warten";
 $a->strings["remove"] = "löschen";
 $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
 $a->strings["Follow Thread"] = "Folge der Unterhaltung";
+$a->strings["View Status"] = "Pinnwand anschauen";
+$a->strings["View Profile"] = "Profil anschauen";
+$a->strings["View Photos"] = "Bilder anschauen";
+$a->strings["Network Posts"] = "Netzwerkbeiträge";
+$a->strings["Edit Contact"] = "Kontakt bearbeiten";
+$a->strings["Send PM"] = "Private Nachricht senden";
+$a->strings["Poke"] = "Anstupsen";
 $a->strings["%s likes this."] = "%s mag das.";
 $a->strings["%s doesn't like this."] = "%s mag das nicht.";
 $a->strings["%s attends."] = "%s nimmt teil.";
@@ -590,6 +528,7 @@ $a->strings["Preview"] = "Vorschau";
 $a->strings["Post to Groups"] = "Poste an Gruppe";
 $a->strings["Post to Contacts"] = "Poste an Kontakte";
 $a->strings["Private post"] = "Privater Beitrag";
+$a->strings["Message"] = "Nachricht";
 $a->strings["Browser"] = "Browser";
 $a->strings["View all"] = "Zeige alle";
 $a->strings["Like"] = array(
@@ -713,6 +652,68 @@ $a->strings["comment"] = array(
 );
 $a->strings["post"] = "Beitrag";
 $a->strings["Item filed"] = "Beitrag abgelegt";
+$a->strings["stopped following"] = "wird nicht mehr gefolgt";
+$a->strings["Drop Contact"] = "Kontakt löschen";
+$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\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["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen.";
+$a->strings["Errors encountered performing database changes."] = "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten.";
+$a->strings["(no subject)"] = "(kein Betreff)";
+$a->strings["%s\\'s birthday"] = "%ss Geburtstag";
+$a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden.";
+$a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden.";
+$a->strings["Edit profile"] = "Profil bearbeiten";
+$a->strings["Atom feed"] = "Atom-Feed";
+$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren";
+$a->strings["Change profile photo"] = "Profilbild ändern";
+$a->strings["Create New Profile"] = "Neues Profil anlegen";
+$a->strings["Profile Image"] = "Profilbild";
+$a->strings["visible to everybody"] = "sichtbar für jeden";
+$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
+$a->strings["Forum"] = "Forum";
+$a->strings["Gender:"] = "Geschlecht:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Homepage:";
+$a->strings["About:"] = "Über:";
+$a->strings["XMPP:"] = "XMPP:";
+$a->strings["Network:"] = "Netzwerk:";
+$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r";
+$a->strings["F d"] = "d. F";
+$a->strings["[today]"] = "[heute]";
+$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen";
+$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:";
+$a->strings["[No description]"] = "[keine Beschreibung]";
+$a->strings["Event Reminders"] = "Veranstaltungserinnerungen";
+$a->strings["Events this week:"] = "Veranstaltungen diese Woche";
+$a->strings["Full Name:"] = "Kompletter Name:";
+$a->strings["j F, Y"] = "j F, Y";
+$a->strings["j F"] = "j F";
+$a->strings["Age:"] = "Alter:";
+$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s";
+$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:";
+$a->strings["Hometown:"] = "Heimatort:";
+$a->strings["Tags:"] = "Tags:";
+$a->strings["Political Views:"] = "Politische Ansichten:";
+$a->strings["Religion:"] = "Religion:";
+$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:";
+$a->strings["Likes:"] = "Likes:";
+$a->strings["Dislikes:"] = "Dislikes:";
+$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:";
+$a->strings["Musical interests:"] = "Musikalische Interessen:";
+$a->strings["Books, literature:"] = "Literatur/Bücher:";
+$a->strings["Television:"] = "Fernsehen:";
+$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:";
+$a->strings["Love/Romance:"] = "Liebesleben:";
+$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:";
+$a->strings["School/education:"] = "Schule/Ausbildung:";
+$a->strings["Forums:"] = "Foren:";
+$a->strings["Basic"] = "Allgemein";
+$a->strings["Advanced"] = "Erweitert";
+$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
+$a->strings["Profile Details"] = "Profildetails";
+$a->strings["Photo Albums"] = "Fotoalben";
+$a->strings["Personal Notes"] = "Persönliche Notizen";
+$a->strings["Only You Can See This"] = "Nur Du kannst das sehen";
 $a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
 $a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
 $a->strings["Access denied."] = "Zugriff verweigert.";
@@ -1100,91 +1101,6 @@ $a->strings["I might attend"] = "Ich werde eventuell teilnehmen";
 $a->strings["to"] = "zu";
 $a->strings["Wall-to-Wall"] = "Wall-to-Wall";
 $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
-$a->strings["%d contact edited."] = array(
-	0 => "%d Kontakt bearbeitet.",
-	1 => "%d Kontakte bearbeitet.",
-);
-$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen.";
-$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden.";
-$a->strings["Contact updated."] = "Kontakt aktualisiert.";
-$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert";
-$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben";
-$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert";
-$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert";
-$a->strings["Contact has been archived"] = "Kontakt wurde archiviert";
-$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt";
-$a->strings["Drop contact"] = "Kontakt löschen";
-$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?";
-$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["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)";
-$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)";
-$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["Disabled"] = "Deaktiviert";
-$a->strings["Fetch information"] = "Beziehe Information";
-$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte";
-$a->strings["Contact"] = "Kontakt: ";
-$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
-$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["Contact Information / Notes"] = "Kontakt Informationen / Notizen";
-$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["View conversations"] = "Unterhaltungen anzeigen";
-$a->strings["Last update:"] = "Letzte Aktualisierung: ";
-$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
-$a->strings["Update now"] = "Jetzt aktualisieren";
-$a->strings["Unblock"] = "Entsperren";
-$a->strings["Block"] = "Sperren";
-$a->strings["Unignore"] = "Ignorieren aufheben";
-$a->strings["Ignore"] = "Ignorieren";
-$a->strings["Currently blocked"] = "Derzeit geblockt";
-$a->strings["Currently ignored"] = "Derzeit ignoriert";
-$a->strings["Currently archived"] = "Momentan archiviert";
-$a->strings["Hide this contact from others"] = "Verbirg diesen Kontakt vor andere";
-$a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge könnten 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["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["Contact Settings"] = "Kontakteinstellungen";
-$a->strings["Suggestions"] = "Kontaktvorschläge";
-$a->strings["Suggest potential friends"] = "Kontakte vorschlagen";
-$a->strings["Show all contacts"] = "Alle Kontakte anzeigen";
-$a->strings["Unblocked"] = "Ungeblockt";
-$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen";
-$a->strings["Blocked"] = "Geblockt";
-$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen";
-$a->strings["Ignored"] = "Ignoriert";
-$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen";
-$a->strings["Archived"] = "Archiviert";
-$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen";
-$a->strings["Hidden"] = "Verborgen";
-$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen";
-$a->strings["Search your contacts"] = "Suche in deinen Kontakten";
-$a->strings["Update"] = "Aktualisierungen";
-$a->strings["Archive"] = "Archivieren";
-$a->strings["Unarchive"] = "Aus Archiv zurückholen";
-$a->strings["Batch Actions"] = "Stapelverarbeitung";
-$a->strings["View all contacts"] = "Alle Kontakte anzeigen";
-$a->strings["View all common friends"] = "Alle Kontakte anzeigen";
-$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen";
-$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft";
-$a->strings["is a fan of yours"] = "ist ein Fan von dir";
-$a->strings["you are a fan of"] = "Du bist Fan von";
-$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
-$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten";
-$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten";
-$a->strings["Delete contact"] = "Lösche den Kontakt";
 $a->strings["Profile not found."] = "Profil nicht gefunden.";
 $a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde.";
 $a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich.";
@@ -1236,77 +1152,6 @@ $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.";
-$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar.";
-$a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
-$a->strings["Marital Status"] = "Familienstand";
-$a->strings["Romantic Partner"] = "Romanze";
-$a->strings["Work/Employment"] = "Arbeit / Beschäftigung";
-$a->strings["Religion"] = "Religion";
-$a->strings["Political Views"] = "Politische Ansichten";
-$a->strings["Gender"] = "Geschlecht";
-$a->strings["Sexual Preference"] = "Sexuelle Vorlieben";
-$a->strings["Homepage"] = "Webseite";
-$a->strings["Interests"] = "Interessen";
-$a->strings["Address"] = "Adresse";
-$a->strings["Location"] = "Wohnort";
-$a->strings["Profile updated."] = "Profil aktualisiert.";
-$a->strings[" and "] = " und ";
-$a->strings["public profile"] = "öffentliches Profil";
-$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”";
-$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen";
-$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s.";
-$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?";
-$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:";
-$a->strings["Profile Actions"] = "Profilaktionen";
-$a->strings["Edit Profile Details"] = "Profil bearbeiten";
-$a->strings["Change Profile Photo"] = "Profilbild ändern";
-$a->strings["View this profile"] = "Dieses Profil anzeigen";
-$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden";
-$a->strings["Clone this profile"] = "Dieses Profil duplizieren";
-$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["Additional information"] = "Zusätzliche Informationen";
-$a->strings["Relation"] = "Beziehung";
-$a->strings["Your Gender:"] = "Dein Geschlecht:";
-$a->strings["♥ Marital Status:"] = "♥ Beziehungsstatus:";
-$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software";
-$a->strings["Profile Name:"] = "Profilname:";
-$a->strings["Required"] = "Benötigt";
-$a->strings["This is your public profile.
It may be visible to anybody using the internet."] = "Dies ist Dein öffentliches Profil.
Es könnte 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:";
-$a->strings["Locality/City:"] = "Wohnort:";
-$a->strings["Region/State:"] = "Region/Bundesstaat:";
-$a->strings["Postal/Zip Code:"] = "Postleitzahl:";
-$a->strings["Country:"] = "Land:";
-$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["Homepage URL:"] = "Adresse der Homepage:";
-$a->strings["Religious Views:"] = "Religiöse Ansichten:";
-$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:";
-$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)";
-$a->strings["Private Keywords:"] = "Private Schlüsselwörter:";
-$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)";
-$a->strings["Musical interests"] = "Musikalische Interessen";
-$a->strings["Books, literature"] = "Bücher, Literatur";
-$a->strings["Television"] = "Fernsehen";
-$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung";
-$a->strings["Hobbies/Interests"] = "Hobbies/Interessen";
-$a->strings["Love/romance"] = "Liebe/Romantik";
-$a->strings["Work/employment"] = "Arbeit/Anstellung";
-$a->strings["School/education"] = "Schule/Ausbildung";
-$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke";
-$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile";
 $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:
 login: %s
 password: %s

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.";
@@ -1330,174 +1175,6 @@ $a->strings["Import your profile to this friendica instance"] = "Importiere Dein
 $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["everybody"] = "jeder";
-$a->strings["Account"] = "Nutzerkonto";
-$a->strings["Additional features"] = "Zusätzliche Features";
-$a->strings["Display"] = "Anzeige";
-$a->strings["Social Networks"] = "Soziale Netzwerke";
-$a->strings["Plugins"] = "Plugins";
-$a->strings["Connected apps"] = "Verbundene Programme";
-$a->strings["Remove account"] = "Konto löschen";
-$a->strings["Missing some important data!"] = "Wichtige Daten fehlen!";
-$a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich.";
-$a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet.";
-$a->strings["Features updated"] = "Features aktualisiert";
-$a->strings["Relocate message has been send to your contacts"] = "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert.";
-$a->strings["Wrong password."] = "Falsches Passwort.";
-$a->strings["Password changed."] = "Passwort geändert.";
-$a->strings["Password update failed. Please try again."] = "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal.";
-$a->strings[" Please use a shorter name."] = " Bitte verwende einen kürzeren Namen.";
-$a->strings[" Name too short."] = " Name ist zu kurz.";
-$a->strings["Wrong Password"] = "Falsches Passwort";
-$a->strings[" Not valid email."] = " Keine gültige E-Mail.";
-$a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. ";
-$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt.";
-$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte.";
-$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["Add application"] = "Programm hinzufügen";
-$a->strings["Save Settings"] = "Einstellungen speichern";
-$a->strings["Consumer Key"] = "Consumer Key";
-$a->strings["Consumer Secret"] = "Consumer Secret";
-$a->strings["Redirect"] = "Umleiten";
-$a->strings["Icon url"] = "Icon URL";
-$a->strings["You can't edit this application."] = "Du kannst dieses Programm nicht bearbeiten.";
-$a->strings["Connected Apps"] = "Verbundene Programme";
-$a->strings["Client key starts with"] = "Anwenderschlüssel beginnt mit";
-$a->strings["No name"] = "Kein Name";
-$a->strings["Remove authorization"] = "Autorisierung entziehen";
-$a->strings["No Plugin settings configured"] = "Keine Plugin-Einstellungen konfiguriert";
-$a->strings["Plugin Settings"] = "Plugin-Einstellungen";
-$a->strings["Off"] = "Aus";
-$a->strings["On"] = "An";
-$a->strings["Additional Features"] = "Zusätzliche Features";
-$a->strings["General Social Media Settings"] = "Allgemeine Einstellungen zu Sozialen Medien";
-$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["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 Socual/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["Built-in support for %s connectivity is %s"] = "Eingebaute Unterstützung für Verbindungen zu %s ist %s";
-$a->strings["enabled"] = "eingeschaltet";
-$a->strings["disabled"] = "ausgeschaltet";
-$a->strings["GNU Social (OStatus)"] = "GNU Social (OStatus)";
-$a->strings["Email access is disabled on this site."] = "Zugriff auf E-Mails für diese Seite deaktiviert.";
-$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["IMAP server name:"] = "IMAP-Server-Name:";
-$a->strings["IMAP port:"] = "IMAP-Port:";
-$a->strings["Security:"] = "Sicherheit:";
-$a->strings["None"] = "Keine";
-$a->strings["Email login name:"] = "E-Mail-Login-Name:";
-$a->strings["Email password:"] = "E-Mail-Passwort:";
-$a->strings["Reply-to address:"] = "Reply-to Adresse:";
-$a->strings["Send public posts to all email contacts:"] = "Sende öffentliche Beiträge an alle E-Mail-Kontakte:";
-$a->strings["Action after import:"] = "Aktion nach Import:";
-$a->strings["Move to folder"] = "In einen Ordner verschieben";
-$a->strings["Move to folder:"] = "In diesen Ordner verschieben:";
-$a->strings["No special theme for mobile devices"] = "Kein spezielles Theme für mobile Geräte verwenden.";
-$a->strings["Display Settings"] = "Anzeige-Einstellungen";
-$a->strings["Display Theme:"] = "Theme:";
-$a->strings["Mobile Theme:"] = "Mobiles Theme";
-$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 Sekeunden. 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["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["General Theme Settings"] = "Allgemeine Themeneinstellungen";
-$a->strings["Custom Theme Settings"] = "Benutzerdefinierte Theme Einstellungen";
-$a->strings["Content Settings"] = "Einstellungen zum Inhalt";
-$a->strings["Theme settings"] = "Themeneinstellungen";
-$a->strings["User Types"] = "Nutzer Art";
-$a->strings["Community Types"] = "Gemeinschafts Art";
-$a->strings["Normal Account Page"] = "Normales Konto";
-$a->strings["This account is a normal personal profile"] = "Dieses Konto ist ein normales persönliches Profil";
-$a->strings["Soapbox Page"] = "Marktschreier-Konto";
-$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert";
-$a->strings["Community Forum/Celebrity Account"] = "Forum/Promi-Konto";
-$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert";
-$a->strings["Automatic Friend Page"] = "Automatische Freunde Seite";
-$a->strings["Automatically approve all connection/friend requests as friends"] = "Kontaktanfragen werden automatisch als Freund akzeptiert";
-$a->strings["Private Forum [Experimental]"] = "Privates Forum [Versuchsstadium]";
-$a->strings["Private forum - approved members only"] = "Privates Forum, nur für Mitglieder";
-$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 the global social directory?"] = "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?";
-$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?";
-$a->strings["If enabled, posting public messages to Diaspora and other networks isn't possible."] = "Wenn aktiviert, ist das senden öffentliche Nachrichten zu Diaspora und anderen Netzwerken nicht möglich";
-$a->strings["Allow friends to post to your profile page?"] = "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?";
-$a->strings["Allow friends to tag your posts?"] = "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern 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["Permit unknown people to send you private mail?"] = "Dürfen Dir Unbekannte private Nachrichten schicken?";
-$a->strings["Profile is not published."] = "Profil ist nicht veröffentlicht.";
-$a->strings["Your Identity Address is '%s' or '%s'."] = "Die Adresse deines Profils lautet '%s' 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["Advanced expiration settings"] = "Erweiterte Verfallseinstellungen";
-$a->strings["Advanced Expiration"] = "Erweitertes Verfallen";
-$a->strings["Expire posts:"] = "Beiträge verfallen lassen:";
-$a->strings["Expire personal notes:"] = "Persönliche Notizen verfallen lassen:";
-$a->strings["Expire starred posts:"] = "Markierte Beiträge verfallen lassen:";
-$a->strings["Expire photos:"] = "Fotos verfallen lassen:";
-$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["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:";
-$a->strings["Basic Settings"] = "Grundeinstellungen";
-$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["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["(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["Show to Groups"] = "Zeige den Gruppen";
-$a->strings["Show to Contacts"] = "Zeige den Kontakten";
-$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["By default post a status message when:"] = "Standardmäßig eine Statusnachricht posten, wenn:";
-$a->strings["accepting a friend request"] = "– Du eine Kontaktanfrage akzeptierst";
-$a->strings["joining a forum/community"] = "– Du einem Forum/einer Gemeinschaftsseite beitrittst";
-$a->strings["making an interesting profile change"] = "– Du eine interessante Änderung an Deinem Profil durchführst";
-$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";
-$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["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["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["Resend relocate message to contacts"] = "Umzugsbenachrichtigung erneut an Kontakte senden";
 $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";
@@ -1583,6 +1260,7 @@ $a->strings["
What next
"] = "
Wie geht es weiter?
";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
 $a->strings["Recent Photos"] = "Neueste Fotos";
 $a->strings["Upload New Photos"] = "Neue Fotos hochladen";
+$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";
@@ -1598,6 +1276,8 @@ $a->strings["Upload Photos"] = "Bilder hochladen";
 $a->strings["New album name: "] = "Name des neuen Albums: ";
 $a->strings["or existing album name: "] = "oder existierender Albumname: ";
 $a->strings["Do not show a status post for this upload"] = "Keine Status-Mitteilung für diesen Beitrag anzeigen";
+$a->strings["Show to Groups"] = "Zeige den Gruppen";
+$a->strings["Show to Contacts"] = "Zeige den Kontakten";
 $a->strings["Private Photo"] = "Privates Foto";
 $a->strings["Public Photo"] = "Öffentliches Foto";
 $a->strings["Edit Album"] = "Album bearbeiten";
@@ -1634,6 +1314,7 @@ $a->strings["Create New Event"] = "Neue Veranstaltung erstellen";
 $a->strings["Event details"] = "Veranstaltungsdetails";
 $a->strings["Starting date and Title are required."] = "Anfangszeitpunkt und Titel werden benötigt";
 $a->strings["Event Starts:"] = "Veranstaltungsbeginn:";
+$a->strings["Required"] = "Benötigt";
 $a->strings["Finish date/time is not known or not relevant"] = "Enddatum/-zeit ist nicht bekannt oder nicht relevant";
 $a->strings["Event Finishes:"] = "Veranstaltungsende:";
 $a->strings["Adjust for viewer timezone"] = "An Zeitzone des Betrachters anpassen";
@@ -1642,6 +1323,7 @@ $a->strings["Title:"] = "Titel:";
 $a->strings["Share this event"] = "Veranstaltung teilen";
 $a->strings["Invalid request identifier."] = "Invalid request identifier.";
 $a->strings["Discard"] = "Verwerfen";
+$a->strings["Ignore"] = "Ignorieren";
 $a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen";
 $a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen";
 $a->strings["Home Notifications"] = "Pinnwand Benachrichtigungen";
@@ -1649,6 +1331,7 @@ $a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen";
 $a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen";
 $a->strings["Notification type: "] = "Benachrichtigungstyp: ";
 $a->strings["suggested by %s"] = "vorgeschlagen von %s";
+$a->strings["Hide this contact from others"] = "Verbirg diesen Kontakt vor andere";
 $a->strings["Post a new friend activity"] = "Neue-Kontakt Nachricht senden";
 $a->strings["if applicable"] = "falls anwendbar";
 $a->strings["Approve"] = "Genehmigen";
@@ -1670,7 +1353,9 @@ $a->strings["{0} requested registration"] = "{0} möchte sich registrieren";
 $a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert.";
 $a->strings["Site"] = "Seite";
 $a->strings["Users"] = "Nutzer";
+$a->strings["Plugins"] = "Plugins";
 $a->strings["Themes"] = "Themen";
+$a->strings["Additional features"] = "Zusätzliche Features";
 $a->strings["DB updates"] = "DB Updates";
 $a->strings["Inspect Queue"] = "Warteschlange Inspizieren";
 $a->strings["Federation Statistics"] = "Federation Statistik";
@@ -1706,10 +1391,13 @@ $a->strings["Active plugins"] = "Aktive Plugins";
 $a->strings["Can not parse base url. Must have at least ://"] = "Die Basis-URL konnte nicht analysiert werden. Sie muss mindestens aus :// bestehen";
 $a->strings["RINO2 needs mcrypt php extension to work."] = "RINO2 benötigt die PHP Extension mcrypt.";
 $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert.";
+$a->strings["No special theme for mobile devices"] = "Kein spezielles Theme für mobile Geräte verwenden.";
 $a->strings["No community page"] = "Keine Gemeinschaftsseite";
 $a->strings["Public postings from users of this site"] = "Öffentliche Beiträge von Nutzer_innen dieser Seite";
 $a->strings["Global community page"] = "Globale Gemeinschaftsseite";
+$a->strings["Never"] = "Niemals";
 $a->strings["At post arrival"] = "Beim Empfang von Nachrichten";
+$a->strings["Disabled"] = "Deaktiviert";
 $a->strings["Users, Global Contacts"] = "Nutzer, globale Kontakte";
 $a->strings["Users, Global Contacts/fallback"] = "Nutzer, globale Kontakte / Fallback";
 $a->strings["One month"] = "ein Monat";
@@ -1723,6 +1411,7 @@ $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["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["Save Settings"] = "Einstellungen speichern";
 $a->strings["File upload"] = "Datei hochladen";
 $a->strings["Policies"] = "Regeln";
 $a->strings["Auto Discovered Contact Directory"] = "Automatisch ein Kontaktverzeichnis erstellen";
@@ -1911,6 +1600,7 @@ $a->strings["User '%s' blocked"] = "Nutzer '%s' gesperrt";
 $a->strings["Register date"] = "Anmeldedatum";
 $a->strings["Last login"] = "Letzte Anmeldung";
 $a->strings["Last item"] = "Letzter Beitrag";
+$a->strings["Account"] = "Nutzerkonto";
 $a->strings["Add User"] = "Nutzer hinzufügen";
 $a->strings["select all"] = "Alle auswählen";
 $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf Deine Bestätigung warten";
@@ -1918,6 +1608,8 @@ $a->strings["User waiting for permanent deletion"] = "Nutzer wartet auf permanen
 $a->strings["Request date"] = "Anfragedatum";
 $a->strings["No registrations."] = "Keine Neuanmeldungen.";
 $a->strings["Deny"] = "Verwehren";
+$a->strings["Block"] = "Sperren";
+$a->strings["Unblock"] = "Entsperren";
 $a->strings["Site admin"] = "Seitenadministrator";
 $a->strings["Account expired"] = "Account ist abgelaufen";
 $a->strings["New User"] = "Neuer Nutzer";
@@ -1953,9 +1645,330 @@ $a->strings["Must be writable by web server. Relative to your Friendica top-leve
 $a->strings["Log level"] = "Protokoll-Level";
 $a->strings["PHP logging"] = "PHP Protokollieren";
 $a->strings["To enable logging of PHP errors and warnings you can add the following to the .htconfig.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 PHP Warnungen und Fehler zu protokollieren, kannst du die folgenden Zeilen zur .htconfig.php Datei deiner Installation hinzufügen. Den Dateinamen der Log-Datei legst du in der Zeile mit dem 'error_log' fest,  Er ist relativ zum Friendica-Stammverzeichnis und muss schreibbar durch den Webserver sein. Eine \"1\" als Option für die Punkte 'log_errors' und 'display_errors' aktiviert die Funktionen zum Protokollieren bzw. Anzeigen der Fehler, eine \"0\" deaktiviert sie.";
+$a->strings["Off"] = "Aus";
+$a->strings["On"] = "An";
 $a->strings["Lock feature %s"] = "Feature festlegen: %s";
 $a->strings["Manage Additional Features"] = "Zusätzliche Features Verwalten";
 $a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
+$a->strings["%d contact edited."] = array(
+	0 => "%d Kontakt bearbeitet.",
+	1 => "%d Kontakte bearbeitet.",
+);
+$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen.";
+$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden.";
+$a->strings["Contact updated."] = "Kontakt aktualisiert.";
+$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert";
+$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben";
+$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert";
+$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert";
+$a->strings["Contact has been archived"] = "Kontakt wurde archiviert";
+$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt";
+$a->strings["Drop contact"] = "Kontakt löschen";
+$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?";
+$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["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar.";
+$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)";
+$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)";
+$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"] = "Beziehe Information";
+$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte";
+$a->strings["Contact"] = "Kontakt: ";
+$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
+$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["Contact Information / Notes"] = "Kontakt Informationen / Notizen";
+$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["View conversations"] = "Unterhaltungen anzeigen";
+$a->strings["Last update:"] = "Letzte Aktualisierung: ";
+$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
+$a->strings["Update now"] = "Jetzt aktualisieren";
+$a->strings["Unignore"] = "Ignorieren aufheben";
+$a->strings["Currently blocked"] = "Derzeit geblockt";
+$a->strings["Currently ignored"] = "Derzeit ignoriert";
+$a->strings["Currently archived"] = "Momentan archiviert";
+$a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge könnten 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["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["Contact Settings"] = "Kontakteinstellungen";
+$a->strings["Suggestions"] = "Kontaktvorschläge";
+$a->strings["Suggest potential friends"] = "Kontakte vorschlagen";
+$a->strings["Show all contacts"] = "Alle Kontakte anzeigen";
+$a->strings["Unblocked"] = "Ungeblockt";
+$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen";
+$a->strings["Blocked"] = "Geblockt";
+$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen";
+$a->strings["Ignored"] = "Ignoriert";
+$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen";
+$a->strings["Archived"] = "Archiviert";
+$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen";
+$a->strings["Hidden"] = "Verborgen";
+$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen";
+$a->strings["Search your contacts"] = "Suche in deinen Kontakten";
+$a->strings["Update"] = "Aktualisierungen";
+$a->strings["Archive"] = "Archivieren";
+$a->strings["Unarchive"] = "Aus Archiv zurückholen";
+$a->strings["Batch Actions"] = "Stapelverarbeitung";
+$a->strings["View all contacts"] = "Alle Kontakte anzeigen";
+$a->strings["View all common friends"] = "Alle Kontakte anzeigen";
+$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen";
+$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft";
+$a->strings["is a fan of yours"] = "ist ein Fan von dir";
+$a->strings["you are a fan of"] = "Du bist Fan von";
+$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
+$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten";
+$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten";
+$a->strings["Delete contact"] = "Lösche den Kontakt";
+$a->strings["Profile deleted."] = "Profil gelöscht.";
+$a->strings["Profile-"] = "Profil-";
+$a->strings["New profile created."] = "Neues Profil angelegt.";
+$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar.";
+$a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
+$a->strings["Marital Status"] = "Familienstand";
+$a->strings["Romantic Partner"] = "Romanze";
+$a->strings["Work/Employment"] = "Arbeit / Beschäftigung";
+$a->strings["Religion"] = "Religion";
+$a->strings["Political Views"] = "Politische Ansichten";
+$a->strings["Gender"] = "Geschlecht";
+$a->strings["Sexual Preference"] = "Sexuelle Vorlieben";
+$a->strings["XMPP"] = "XMPP";
+$a->strings["Homepage"] = "Webseite";
+$a->strings["Interests"] = "Interessen";
+$a->strings["Address"] = "Adresse";
+$a->strings["Location"] = "Wohnort";
+$a->strings["Profile updated."] = "Profil aktualisiert.";
+$a->strings[" and "] = " und ";
+$a->strings["public profile"] = "öffentliches Profil";
+$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”";
+$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s.";
+$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?";
+$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:";
+$a->strings["Profile Actions"] = "Profilaktionen";
+$a->strings["Edit Profile Details"] = "Profil bearbeiten";
+$a->strings["Change Profile Photo"] = "Profilbild ändern";
+$a->strings["View this profile"] = "Dieses Profil anzeigen";
+$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden";
+$a->strings["Clone this profile"] = "Dieses Profil duplizieren";
+$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["Additional information"] = "Zusätzliche Informationen";
+$a->strings["Relation"] = "Beziehung";
+$a->strings["Your Gender:"] = "Dein Geschlecht:";
+$a->strings["♥ Marital Status:"] = "♥ Beziehungsstatus:";
+$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software";
+$a->strings["Profile Name:"] = "Profilname:";
+$a->strings["This is your public profile.
It may be visible to anybody using the internet."] = "Dies ist Dein öffentliches Profil.
Es könnte 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:";
+$a->strings["Locality/City:"] = "Wohnort:";
+$a->strings["Region/State:"] = "Region/Bundesstaat:";
+$a->strings["Postal/Zip Code:"] = "Postleitzahl:";
+$a->strings["Country:"] = "Land:";
+$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["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:";
+$a->strings["Religious Views:"] = "Religiöse Ansichten:";
+$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)";
+$a->strings["Private Keywords:"] = "Private Schlüsselwörter:";
+$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)";
+$a->strings["Musical interests"] = "Musikalische Interessen";
+$a->strings["Books, literature"] = "Bücher, Literatur";
+$a->strings["Television"] = "Fernsehen";
+$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung";
+$a->strings["Hobbies/Interests"] = "Hobbies/Interessen";
+$a->strings["Love/romance"] = "Liebe/Romantik";
+$a->strings["Work/employment"] = "Arbeit/Anstellung";
+$a->strings["School/education"] = "Schule/Ausbildung";
+$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke";
+$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile";
+$a->strings["Display"] = "Anzeige";
+$a->strings["Social Networks"] = "Soziale Netzwerke";
+$a->strings["Connected apps"] = "Verbundene Programme";
+$a->strings["Remove account"] = "Konto löschen";
+$a->strings["Missing some important data!"] = "Wichtige Daten fehlen!";
+$a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich.";
+$a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet.";
+$a->strings["Features updated"] = "Features aktualisiert";
+$a->strings["Relocate message has been send to your contacts"] = "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert.";
+$a->strings["Wrong password."] = "Falsches Passwort.";
+$a->strings["Password changed."] = "Passwort geändert.";
+$a->strings["Password update failed. Please try again."] = "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal.";
+$a->strings[" Please use a shorter name."] = " Bitte verwende einen kürzeren Namen.";
+$a->strings[" Name too short."] = " Name ist zu kurz.";
+$a->strings["Wrong Password"] = "Falsches Passwort";
+$a->strings[" Not valid email."] = " Keine gültige E-Mail.";
+$a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. ";
+$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt.";
+$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Add application"] = "Programm hinzufügen";
+$a->strings["Consumer Key"] = "Consumer Key";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Redirect"] = "Umleiten";
+$a->strings["Icon url"] = "Icon URL";
+$a->strings["You can't edit this application."] = "Du kannst dieses Programm nicht bearbeiten.";
+$a->strings["Connected Apps"] = "Verbundene Programme";
+$a->strings["Client key starts with"] = "Anwenderschlüssel beginnt mit";
+$a->strings["No name"] = "Kein Name";
+$a->strings["Remove authorization"] = "Autorisierung entziehen";
+$a->strings["No Plugin settings configured"] = "Keine Plugin-Einstellungen konfiguriert";
+$a->strings["Plugin Settings"] = "Plugin-Einstellungen";
+$a->strings["Additional Features"] = "Zusätzliche Features";
+$a->strings["General Social Media Settings"] = "Allgemeine Einstellungen zu Sozialen Medien";
+$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["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 Socual/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["Built-in support for %s connectivity is %s"] = "Eingebaute Unterstützung für Verbindungen zu %s ist %s";
+$a->strings["enabled"] = "eingeschaltet";
+$a->strings["disabled"] = "ausgeschaltet";
+$a->strings["GNU Social (OStatus)"] = "GNU Social (OStatus)";
+$a->strings["Email access is disabled on this site."] = "Zugriff auf E-Mails für diese Seite deaktiviert.";
+$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["IMAP server name:"] = "IMAP-Server-Name:";
+$a->strings["IMAP port:"] = "IMAP-Port:";
+$a->strings["Security:"] = "Sicherheit:";
+$a->strings["None"] = "Keine";
+$a->strings["Email login name:"] = "E-Mail-Login-Name:";
+$a->strings["Email password:"] = "E-Mail-Passwort:";
+$a->strings["Reply-to address:"] = "Reply-to Adresse:";
+$a->strings["Send public posts to all email contacts:"] = "Sende öffentliche Beiträge an alle E-Mail-Kontakte:";
+$a->strings["Action after import:"] = "Aktion nach Import:";
+$a->strings["Move to folder"] = "In einen Ordner verschieben";
+$a->strings["Move to folder:"] = "In diesen Ordner verschieben:";
+$a->strings["Display Settings"] = "Anzeige-Einstellungen";
+$a->strings["Display Theme:"] = "Theme:";
+$a->strings["Mobile Theme:"] = "Mobiles Theme";
+$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 Sekeunden. 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["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["General Theme Settings"] = "Allgemeine Themeneinstellungen";
+$a->strings["Custom Theme Settings"] = "Benutzerdefinierte Theme Einstellungen";
+$a->strings["Content Settings"] = "Einstellungen zum Inhalt";
+$a->strings["Theme settings"] = "Themeneinstellungen";
+$a->strings["Account Types"] = "Kontenarten";
+$a->strings["Personal Page Subtypes"] = "Unterarten der persönlichen Seite";
+$a->strings["Community Forum Subtypes"] = "Unterarten des Gemeinschaftsforums";
+$a->strings["Personal Page"] = "Persönliche Seite";
+$a->strings["This account is a regular personal profile"] = "Dieses Konto ist ein normales persönliches Profil";
+$a->strings["Organisation Page"] = "Organisationsseite";
+$a->strings["This account is a profile for an organisation"] = "Diese Konto ist ein Profil für eine Organisation";
+$a->strings["News Page"] = "Nachrichtenseite";
+$a->strings["This account is a news account/reflector"] = "Dieses Konto ist ein News-Konto bzw. -Spiegel";
+$a->strings["Community Forum"] = "Gemeinschaftsforum";
+$a->strings["This account is a community forum where people can discuss with each other"] = "Dieses Konto ist ein Gemeinschaftskonto wo sich Leute untereinander austauschen können";
+$a->strings["Normal Account Page"] = "Normales Konto";
+$a->strings["This account is a normal personal profile"] = "Dieses Konto ist ein normales persönliches Profil";
+$a->strings["Soapbox Page"] = "Marktschreier-Konto";
+$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert";
+$a->strings["Public Forum"] = "Öffentliches Forum";
+$a->strings["Automatically approve all contact requests"] = "Bestätige alle Kontaktanfragen automatisch";
+$a->strings["Automatic Friend Page"] = "Automatische Freunde Seite";
+$a->strings["Automatically approve all connection/friend requests as friends"] = "Kontaktanfragen werden automatisch als Freund akzeptiert";
+$a->strings["Private Forum [Experimental]"] = "Privates Forum [Versuchsstadium]";
+$a->strings["Private forum - approved members only"] = "Privates Forum, nur für Mitglieder";
+$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 the global social directory?"] = "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?";
+$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?";
+$a->strings["If enabled, posting public messages to Diaspora and other networks isn't possible."] = "Wenn aktiviert, ist das senden öffentliche Nachrichten zu Diaspora und anderen Netzwerken nicht möglich";
+$a->strings["Allow friends to post to your profile page?"] = "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?";
+$a->strings["Allow friends to tag your posts?"] = "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern 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["Permit unknown people to send you private mail?"] = "Dürfen Dir Unbekannte private Nachrichten schicken?";
+$a->strings["Profile is not published."] = "Profil ist nicht veröffentlicht.";
+$a->strings["Your Identity Address is '%s' or '%s'."] = "Die Adresse deines Profils lautet '%s' 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["Advanced expiration settings"] = "Erweiterte Verfallseinstellungen";
+$a->strings["Advanced Expiration"] = "Erweitertes Verfallen";
+$a->strings["Expire posts:"] = "Beiträge verfallen lassen:";
+$a->strings["Expire personal notes:"] = "Persönliche Notizen verfallen lassen:";
+$a->strings["Expire starred posts:"] = "Markierte Beiträge verfallen lassen:";
+$a->strings["Expire photos:"] = "Fotos verfallen lassen:";
+$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["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:";
+$a->strings["Basic Settings"] = "Grundeinstellungen";
+$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["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["(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["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["By default post a status message when:"] = "Standardmäßig eine Statusnachricht posten, wenn:";
+$a->strings["accepting a friend request"] = "– Du eine Kontaktanfrage akzeptierst";
+$a->strings["joining a forum/community"] = "– Du einem Forum/einer Gemeinschaftsseite beitrittst";
+$a->strings["making an interesting profile change"] = "– Du eine interessante Änderung an Deinem Profil durchführst";
+$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";
+$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["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["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["Resend relocate message to contacts"] = "Umzugsbenachrichtigung erneut an Kontakte senden";
 $a->strings["via"] = "via";
 $a->strings["Repeat the image"] = "Bild wiederholen";
 $a->strings["Will repeat your image to fill the background."] = "Wiederholt das Bild um den Hintergrund auszufüllen.";
@@ -2017,6 +2030,7 @@ $a->strings["darkzero"] = "darkzero";
 $a->strings["comix"] = "comix";
 $a->strings["slackr"] = "slackr";
 $a->strings["Variations"] = "Variationen";
+$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln";
 $a->strings["Delete this item?"] = "Diesen Beitrag löschen?";
 $a->strings["show fewer"] = "weniger anzeigen";
 $a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen.";
@@ -2029,4 +2043,3 @@ $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["toggle mobile"] = "auf/von Mobile Ansicht wechseln";

From c1611fd3f6b572f17eec04c113272a76667fdad7 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan 
Date: Tue, 4 Oct 2016 23:43:44 -0400
Subject: [PATCH 23/35] Fix Issue #2816 - Add backward compatible server_info
 support

---
 include/dba.php         | 16 ++++++++++++++++
 include/dbstructure.php |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/include/dba.php b/include/dba.php
index 97f6c87956..9ccdcd1304 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -91,6 +91,22 @@ class dba {
 		return $this->db;
 	}
 
+	/** Returns the MySQL server version string
+	 *
+	 * This function discriminate between the deprecated mysql API and the current
+	 * object-oriented mysqli API. Example of returned string: 5.5.46-0+deb8u1
+	 *
+	 * @return string
+	 */
+	public function server_info() {
+		if ($this->mysqli) {
+			$return = $this->db->server_info;
+		} else {
+			$return = mysql_get_server_info($this->db);
+		}
+		return $return;
+	}
+
 	public function q($sql, $onlyquery = false) {
 		global $a;
 
diff --git a/include/dbstructure.php b/include/dbstructure.php
index 9e0020fdbe..d3b148b2a8 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -166,7 +166,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 		@$db->q($sql_config);
 
 	// MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
-	if (version_compare($db->getdb()->server_info, '5.7.4') >= 0) {
+	if (version_compare($db->server_info(), '5.7.4') >= 0) {
 		$ignore = '';
 	}else {
 		$ignore = ' IGNORE';

From 2a3e235f9ac87474d673981bc5cd01bef1168cdc Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Wed, 5 Oct 2016 14:45:19 +0200
Subject: [PATCH 24/35] show/hide page-flags according to the account-type

---
 mod/settings.php                      |  2 +-
 view/global.css                       |  5 ++
 view/templates/pagetypes.tpl          | 26 ----------
 view/templates/settings_pagetypes.tpl | 71 +++++++++++++++++++++++++++
 4 files changed, 77 insertions(+), 27 deletions(-)
 delete mode 100644 view/templates/pagetypes.tpl
 create mode 100644 view/templates/settings_pagetypes.tpl

diff --git a/mod/settings.php b/mod/settings.php
index 908d828456..37498a0dda 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1083,7 +1083,7 @@ function settings_content(&$a) {
 		($a->user['account-type'] != ACCOUNT_TYPE_COMMUNITY))
 		$a->user['account-type'] = ACCOUNT_TYPE_COMMUNITY;
 
-	$pageset_tpl = get_markup_template('pagetypes.tpl');
+	$pageset_tpl = get_markup_template('settings_pagetypes.tpl');
 
 	$pagetype = replace_macros($pageset_tpl, array(
 		'$account_types'	=> t("Account Types"),
diff --git a/view/global.css b/view/global.css
index 40919542de..1bc2f11d68 100644
--- a/view/global.css
+++ b/view/global.css
@@ -455,3 +455,8 @@ td.federation-data {
   display: none;
   margin: 10px 0;
 }
+
+/* settings page */
+#settings-form .pageflags {
+    margin: 0 0 20px 30px;
+}
diff --git a/view/templates/pagetypes.tpl b/view/templates/pagetypes.tpl
deleted file mode 100644
index b970f7745f..0000000000
--- a/view/templates/pagetypes.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-
{{$account_types}}

-{{include file="field_radio.tpl" field=$account_person}}
-{{include file="field_radio.tpl" field=$account_organisation}}
-{{include file="field_radio.tpl" field=$account_news}}
-{{include file="field_radio.tpl" field=$account_community}}
-
-{{if $account_type == $type_person}}
-	
{{$user}}

-	{{include file="field_radio.tpl" field=$page_normal}}
-	{{include file="field_radio.tpl" field=$page_soapbox}}
-	{{include file="field_radio.tpl" field=$page_freelove}}
-{{/if}}
-
-{{if $account_type == $type_organisation}}
-	
-{{/if}}
-
-{{if $account_type == $type_news}}
-	
-{{/if}}
-
-{{if $account_type == $type_community}}
-	
{{$community}}

-	{{include file="field_radio.tpl" field=$page_community}}
-	{{include file="field_radio.tpl" field=$page_prvgroup}}
-{{/if}}
diff --git a/view/templates/settings_pagetypes.tpl b/view/templates/settings_pagetypes.tpl
new file mode 100644
index 0000000000..1c2f96e81f
--- /dev/null
+++ b/view/templates/settings_pagetypes.tpl
@@ -0,0 +1,71 @@
+
+
{{$account_types}}

+{{include file="field_radio.tpl" field=$account_person}}
+

+	
{{$user}}

+	{{include file="field_radio.tpl" field=$page_normal}}
+	{{include file="field_radio.tpl" field=$page_soapbox}}
+	{{include file="field_radio.tpl" field=$page_freelove}}
+

+
+{{include file="field_radio.tpl" field=$account_organisation}}
+{{include file="field_radio.tpl" field=$account_news}}
+
+{{include file="field_radio.tpl" field=$account_community}}
+

+	
{{$community}}

+	{{include file="field_radio.tpl" field=$page_community}}
+	{{include file="field_radio.tpl" field=$page_prvgroup}}
+

+
+

From 88cef50aa2ccb88f62faafa3259e5d07e811bd9a Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Wed, 5 Oct 2016 18:07:58 +0200
Subject: [PATCH 25/35] frio: provide a edit profile button for the advanced
 profile page

---
 view/theme/frio/css/style.css                  | 12 +++++++-----
 view/theme/frio/templates/profile_advanced.tpl | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 84e8b6e7d8..7c6cb43ef6 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -835,17 +835,19 @@ nav.navbar a {
     /*border-left: 3px solid #6fdbe8;*/
     border-left: 3px solid $link_color;
     color: #fff!important;
-    background-color: $menu_background_hover_color !important
+    background-color: $menu_background_hover_color !important;
 }
-.nav-pills.preferences .dropdown .dropdown-toggle {
-    color: #bebebe
+.nav-pills.preferences .dropdown .dropdown-toggle,
+.nav-pills.preferences > li > .btn {
+    color: #bebebe;
 }
 .nav-pills.preferences .dropdown.open .dropdown-toggle,
 .nav-pills.preferences .dropdown.open .dropdown-toggle:hover {
-    background-color: $nav_bg
+    background-color: $nav_bg;
 }
 
-.nav-pills.preferences .dropdown .dropdown-toggle {
+.nav-pills.preferences .dropdown .dropdown-toggle,
+.nav-pills.preferences > li > .btn {
     padding: 2px 10px;
 }
 
diff --git a/view/theme/frio/templates/profile_advanced.tpl b/view/theme/frio/templates/profile_advanced.tpl
index f6941640ab..7c9a7bef1a 100644
--- a/view/theme/frio/templates/profile_advanced.tpl
+++ b/view/theme/frio/templates/profile_advanced.tpl
@@ -1,5 +1,5 @@
 
-