Merge pull request #241 from simonlnu/master

rip out fpostit

diff --git a/boot.php b/boot.php
index 36e725c7fddf1da8f584f08864b51abda56d52a5..73f2aa882fd90a9c4786b1aeb96f9d287c775e78 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1313' );
+define ( 'FRIENDICA_VERSION',      '2.3.1314' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1138      );
 

diff --git a/include/Scrape.php b/include/Scrape.php
index 141c90dcfd6a92bbb5246ee78fc61a040ba06a05..b20d7d6046dec03ce419b54b34e5cc1ae660da9b 100644 (file)
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -593,7 +593,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
                        logger('probe_url: fetch feed: ' . $poll . ' returns: ' . $xml, LOGGER_DATA);
                        $a = get_app();
 
-                       logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), $LOGGER_DATA);
+                       logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), LOGGER_DATA);
 
                        $feed->set_raw_data($xml);
 

diff --git a/include/conversation.php b/include/conversation.php
index e5549a9c101ecfc810962dd4b19dc18bb6e67c0e..1b869b91e4a694354e48805268b9ac402b42bebb 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -342,7 +342,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        'body' => template_escape($body),
                                        'text' => strip_tags(template_escape($body)),
                                        'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-                                       'lock' => $lock,
                                        'location' => template_escape($location),
                                        'indent' => '',
                                        'owner_name' => template_escape($owner_name),
@@ -400,6 +399,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                        }
 
                        $comments_collapsed = false;
+                       $comments_seen = 0;
                        $comment_lastcollapsed = false;
                        $comment_firstcollapsed = false;
                        $blowhard = 0;
@@ -709,7 +709,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
        }
 
        $page_template = get_markup_template("conversation.tpl");
-       $o .= replace_macros($page_template, array(
+       $o = replace_macros($page_template, array(
                '$baseurl' => $a->get_baseurl($ssl_state),
                '$mode' => $mode,
                '$user' => $a->user,
@@ -1074,7 +1074,6 @@ function find_thread_parent_index($arr,$x) {
 }
 
 function render_location_google($item) {
-       $location = '';
        $location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
        $coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
        if($coord) {

diff --git a/include/items.php b/include/items.php
index e005ffaef7a6fe3fe5127cbc3f6be7c2cf15176a..63450cff5e3851997c9c1c87fbc0d58b74d43470 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -107,7 +107,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
        if(! strlen($last_update))
                $last_update = 'now -30 days';
 
-       if(x($category)) {
+       if(isset($category)) {
                $sql_extra .= file_tag_file_query('item',$category,'category');
        }
 
@@ -588,20 +588,21 @@ function get_atom_elements($feed,$item) {
 
        if($rawobj) {
                $res['object'] = '<object>' . "\n";
-               if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-                       $res['object-type'] = $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'];
-                       $res['object'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
+               $child = $rawobj[0]['child'];
+               if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+                       $res['object-type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
+                       $res['object'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
                }       
-               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-                       $res['object'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-                       $res['object'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
-               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-                       $res['object'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
-               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-                       $body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+                       $res['object'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
+               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+                       $res['object'] .= '<link>' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
+               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'title') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
+                       $res['object'] .= '<title>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
+               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+                       $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
                        if(! $body)
-                               $body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+                               $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
                        // preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
                        $res['object'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
                        if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
@@ -626,20 +627,20 @@ function get_atom_elements($feed,$item) {
 
        if($rawobj) {
                $res['target'] = '<target>' . "\n";
-               if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-                       $res['target'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
+               $child = $rawobj[0]['child'];
+               if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+                       $res['target'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
                }       
-               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-                       $res['target'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-
-               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-                       $res['target'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
-               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-                       $res['target'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
-               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-                       $body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+                       $res['target'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
+               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+                       $res['target'] .= '<link>' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
+               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
+                       $res['target'] .= '<title>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
+               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+                       $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
                        if(! $body)
-                               $body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+                               $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
                        // preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
                        $res['target'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
                        if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
@@ -2476,7 +2477,7 @@ function local_delivery($importer,$data) {
 
                                // find out if our user is involved in this conversation and wants to be notified.
                        
-                               if($datarray['type'] != 'activity') {
+                               if(!x($datarray['type']) || $datarray['type'] != 'activity') {
 
                                        $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
                                                dbesc($parent_uri),
@@ -3048,7 +3049,7 @@ function item_expire($uid,$days) {
 function drop_items($items) {
        $uid = 0;
 
-       if((! local_user()) && (! $remote_user()))
+       if(! local_user() && ! remote_user())
                return;
 
        if(count($items)) {

diff --git a/include/network.php b/include/network.php
index 8c678a443a6b9840b122a123b6435af8be2312cb..4bec4a172778db2c1c452b937787fe25a9f7aaac 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -172,7 +172,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
         $url_parsed = @parse_url($newurl);
         if (isset($url_parsed)) {
             $redirects++;
-            return fetch_url($newurl,$binary,$redirects,$timeout);
+            return fetch_url($newurl,false,$redirects,$timeout);
         }
     }
        $a->set_curl_code($http_code);
@@ -206,6 +206,7 @@ function xml_status($st, $message = '') {
 if(! function_exists('http_status_exit')) {
 function http_status_exit($val) {
 
+    $err = '';
        if($val >= 400)
                $err = 'Error';
        if($val >= 200 && $val < 300)
@@ -452,7 +453,7 @@ function lrdd($uri, $debug = false) {
                        logger('lrdd: parse error: ' . $e);
                }
 
-               if($dom) {
+               if(isset($dom) && $dom) {
                        $items = $dom->getElementsByTagName('link');
                        foreach($items as $item) {
                                $x = $item->getAttribute('rel');

diff --git a/include/pgettext.php b/include/pgettext.php
index 83e76ba9d60b9b1c0d05254a53b3647fb64090bc..a079a468789909c9cebc6c5cfb2150c743986eb9 100644 (file)
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -49,6 +49,7 @@ function get_language() {
        if(isset($preferred))
                return $preferred;
 
+    $a = get_app();
        return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
 }}
 

diff --git a/include/profile_advanced.php b/include/profile_advanced.php
index 004a58524b53385c03e32b43feca2759fb59301d..bb9850cd0279e2d93400a7b01fb76c45c7e54467 100644 (file)
--- a/include/profile_advanced.php
+++ b/include/profile_advanced.php
@@ -2,7 +2,7 @@
 
 function advanced_profile(&$a) {
 
-       $o .= '';
+       $o = '';
 
        $o .= '<h2>' . t('Profile') . '</h2>';
 
@@ -69,13 +69,12 @@ function advanced_profile(&$a) {
                if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
 
                if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
-       }
-
-               
-       return replace_macros($tpl, array(
-               '$title' => t('Profile'),
-               '$profile' => $profile,
-       ));
 
+        return replace_macros($tpl, array(
+            '$title' => t('Profile'),
+            '$profile' => $profile,
+        ));
+    }
 
+       return '';
 }

diff --git a/include/security.php b/include/security.php
index fc816e5d73ca2137c8b3342359efc475d549b0b0..a92400b5c401a4d419a027f8d42e836ee6dce46c 100755 (executable)
--- a/include/security.php
+++ b/include/security.php
@@ -339,6 +339,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
 }
 function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
        if (!check_form_security_token($typename, $formname)) {
+           $a = get_app();
                logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
                logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
                header('HTTP/1.1 403 Forbidden');

diff --git a/mod/install.php b/mod/install.php
index 2eb98ee916a8d0f5dab4d0678bdb0e5b187b2988..6f5552076c9594ad015e5d4b5934eb7a46c34214 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -380,9 +380,9 @@ function check_funcs(&$checks) {
        
        if(function_exists('apache_get_modules')){
                if (! in_array('mod_rewrite',apache_get_modules())) {
-                       check_add($ck_funcs, t('Apace mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
+                       check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
                } else {
-                       check_add($ck_funcs, t('Apace mod_rewrite module'), true, true, "");
+                       check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
                }
        }
        if(! function_exists('curl_init')){
@@ -464,3 +464,6 @@ function load_database($db) {
        }
        return $errors;
 }
+
+
+

diff --git a/mod/photo.php b/mod/photo.php
index ec53af899625e854048b9a0765ce1899a54a6c70..1d38fe8e45189c67ccc7f572a881763453e0f67a 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -170,7 +170,7 @@ function photo_init(&$a) {
        }
 
        // Writing in cachefile
-       if ($cachefile != '')
+       if (isset($cachefile) && $cachefile != '')
                file_put_contents($cachefile, $data);
 
        if(function_exists('header_remove')) {

diff --git a/mod/photos.php b/mod/photos.php
index 2a808cb41d3456fea5253ecfca44964066bc8ff4..8da94841e684f35ba5d08238b283f876c2bf6547 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -330,7 +330,6 @@ function photos_post(&$a) {
                        // Create item container
 
                        $title = '';
-                       $basename = basename($filename);
                        $uri = item_new_uri($a->get_hostname(),$page_owner_uid);
 
                        $arr = array();

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index bee7c29dc9684230db3c5b76a66ef9fc062f5d47..03d9f51055aa43f9920aa4dcbb7f602bfa4d0483 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -98,8 +98,13 @@ function wall_attach_post(&$a) {
                killme();
        }
 
-       echo  '<br /><br />[attachment]' . $r[0]['id'] . '[/attachment]' . '<br />';
+       $lf = '<br />';
 
+       if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+               $lf = "\n";
+
+       echo  $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;
+       
        killme();
        // NOTREACHED
 }

diff --git a/util/messages.po b/util/messages.po
index 9eef043ccb01d30126e24da5687a68ae74062a97..b25e7654c8745554aea364d41f5c45f6bddd9d99 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1313\n"
+"Project-Id-Version: 2.3.1314\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-15 10:00-0700\n"
+"POT-Creation-Date: 2012-04-16 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
 #: ../../mod/profiles.php:7 ../../mod/profiles.php:329
 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
-#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3142
+#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3170
 #: ../../index.php:309
 msgid "Permission denied."
 msgstr ""
@@ -142,8 +142,8 @@ msgstr ""
 #: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
-#: ../../addon/gravatar/gravatar.php:86
+#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
+#: ../../addon/blackout/blackout.php:94 ../../addon/gravatar/gravatar.php:86
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/statusnet/statusnet.php:278
 #: ../../addon/statusnet/statusnet.php:292
@@ -540,14 +540,14 @@ msgstr ""
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1214 ../../include/conversation.php:960
+#: ../../mod/photos.php:1214 ../../include/conversation.php:956
 msgid "Share"
 msgstr ""
 
 #: ../../mod/photos.php:1215 ../../mod/editpost.php:104
 #: ../../mod/wallmessage.php:145 ../../mod/message.php:188
 #: ../../mod/message.php:357 ../../include/conversation.php:362
-#: ../../include/conversation.php:702 ../../include/conversation.php:979
+#: ../../include/conversation.php:698 ../../include/conversation.php:975
 msgid "Please wait"
 msgstr ""
 
@@ -563,7 +563,7 @@ msgid "Comment"
 msgstr ""
 
 #: ../../mod/photos.php:1235 ../../mod/editpost.php:125
-#: ../../include/conversation.php:556 ../../include/conversation.php:997
+#: ../../include/conversation.php:556 ../../include/conversation.php:993
 msgid "Preview"
 msgstr ""
 
@@ -636,7 +636,7 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:946
+#: ../../mod/editpost.php:80 ../../include/conversation.php:942
 msgid "Post to Email"
 msgstr ""
 
@@ -647,17 +647,17 @@ msgstr ""
 
 #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
 #: ../../mod/message.php:186 ../../mod/message.php:355
-#: ../../include/conversation.php:961
+#: ../../include/conversation.php:957
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:963
+#: ../../mod/editpost.php:97 ../../include/conversation.php:959
 msgid "Attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
 #: ../../mod/message.php:187 ../../mod/message.php:356
-#: ../../include/conversation.php:965
+#: ../../include/conversation.php:961
 msgid "Insert web link"
 msgstr ""
 
@@ -673,35 +673,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:971
+#: ../../mod/editpost.php:102 ../../include/conversation.php:967
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:973
+#: ../../mod/editpost.php:103 ../../include/conversation.php:969
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:980
+#: ../../mod/editpost.php:105 ../../include/conversation.php:976
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:989
+#: ../../mod/editpost.php:113 ../../include/conversation.php:985
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:990
+#: ../../mod/editpost.php:114 ../../include/conversation.php:986
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:976
+#: ../../mod/editpost.php:117 ../../include/conversation.php:972
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:978
+#: ../../mod/editpost.php:119 ../../include/conversation.php:974
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:992
+#: ../../mod/editpost.php:120 ../../include/conversation.php:988
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -818,7 +818,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:628 ../../include/items.php:2662
+#: ../../mod/dfrn_request.php:628 ../../include/items.php:2690
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -1645,9 +1645,9 @@ msgstr ""
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
 #: ../../mod/register.php:388 ../../mod/register.php:442
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
-#: ../../addon/facebook/facebook.php:622
-#: ../../addon/facebook/facebook.php:1076
-#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2671
+#: ../../addon/facebook/facebook.php:625
+#: ../../addon/facebook/facebook.php:1090
+#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2699
 msgid "Administrator"
 msgstr ""
 
@@ -1726,7 +1726,7 @@ msgid "Export personal data"
 msgstr ""
 
 #: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817
-#: ../../include/nav.php:137
+#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""
 
@@ -1782,7 +1782,8 @@ msgstr ""
 #: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450
 #: ../../addon/impressum/impressum.php:75
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370
+#: ../../addon/mathjax/mathjax.php:64 ../../addon/piwik/piwik.php:105
+#: ../../addon/twitter/twitter.php:370
 msgid "Settings updated."
 msgstr ""
 
@@ -2279,7 +2280,7 @@ msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:680 ../../include/text.php:652
+#: ../../addon/facebook/facebook.php:683 ../../include/text.php:652
 msgid "Save"
 msgstr ""
 
@@ -2313,7 +2314,7 @@ msgid "No recipient."
 msgstr ""
 
 #: ../../mod/wallmessage.php:124 ../../mod/message.php:169
-#: ../../include/conversation.php:914
+#: ../../include/conversation.php:910
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2707,7 +2708,7 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1549
+#: ../../addon/facebook/facebook.php:1574
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../view/theme/diabook-red/theme.php:80
@@ -2723,7 +2724,7 @@ msgstr ""
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1553
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1578
 #: ../../addon/communityhome/communityhome.php:172
 #: ../../view/theme/diabook-red/theme.php:94
 #: ../../view/theme/diabook-blue/theme.php:94
@@ -2741,7 +2742,7 @@ msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141
 #: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3054
+#: ../../mod/display.php:142 ../../include/items.php:3082
 msgid "Item not found."
 msgstr ""
 
@@ -3845,7 +3846,7 @@ msgstr ""
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:918
+#: ../../mod/filer.php:29 ../../include/conversation.php:914
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4176,110 +4177,110 @@ msgstr ""
 msgid "Comma separated applications to ignore"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:620
+#: ../../addon/facebook/facebook.php:623
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:644
+#: ../../addon/facebook/facebook.php:647
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:645
+#: ../../addon/facebook/facebook.php:648
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:656
+#: ../../addon/facebook/facebook.php:659
 msgid "Facebook API Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:665
+#: ../../addon/facebook/facebook.php:668
 msgid ""
 "Error: it appears that you have specified the App-ID and -Secret in your ."
 "htconfig.php file. As long as they are specified there, they cannot be set "
 "using this form.<br><br>"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:670
+#: ../../addon/facebook/facebook.php:673
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token "
 "could not be retrieved)."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:672
+#: ../../addon/facebook/facebook.php:675
 msgid "The given API Key seems to work correctly."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:674
+#: ../../addon/facebook/facebook.php:677
 msgid ""
 "The correctness of the API Key could not be detected. Somthing strange's "
 "going on."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:677
+#: ../../addon/facebook/facebook.php:680
 msgid "App-ID / API-Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:678
+#: ../../addon/facebook/facebook.php:681
 msgid "Application secret"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:679
+#: ../../addon/facebook/facebook.php:682
 #, php-format
 msgid "Polling Interval (min. %1$s minutes)"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:683
+#: ../../addon/facebook/facebook.php:686
 msgid "Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:687
+#: ../../addon/facebook/facebook.php:690
 msgid "Real-Time Updates are activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:688
+#: ../../addon/facebook/facebook.php:691
 msgid "Deactivate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:690
+#: ../../addon/facebook/facebook.php:693
 msgid "Real-Time Updates not activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:690
+#: ../../addon/facebook/facebook.php:693
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:704
+#: ../../addon/facebook/facebook.php:707
 msgid "The new values have been saved."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:723
+#: ../../addon/facebook/facebook.php:726
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:815
+#: ../../addon/facebook/facebook.php:818
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1033
+#: ../../addon/facebook/facebook.php:1039
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1058
+#: ../../addon/facebook/facebook.php:1072
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1094
+#: ../../addon/facebook/facebook.php:1108
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1095
+#: ../../addon/facebook/facebook.php:1109
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1096
+#: ../../addon/facebook/facebook.php:1110
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -4801,6 +4802,27 @@ msgstr ""
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
 
+#: ../../addon/mathjax/mathjax.php:37
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:38
+msgid "Use the MathJax renderer"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:72
+msgid "MathJax Base URL"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:72
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr ""
+
 #: ../../addon/editplain/editplain.php:46
 msgid "Editplain settings updated."
 msgstr ""
@@ -6611,11 +6633,11 @@ msgstr ""
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/items.php:2669
+#: ../../include/items.php:2697
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2669
+#: ../../include/items.php:2697
 msgid "You have a new follower at "
 msgstr ""
 
@@ -6646,30 +6668,30 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/Contact.php:145 ../../include/conversation.php:813
+#: ../../include/Contact.php:145 ../../include/conversation.php:809
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:146 ../../include/conversation.php:814
+#: ../../include/Contact.php:146 ../../include/conversation.php:810
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:147 ../../include/conversation.php:815
+#: ../../include/Contact.php:147 ../../include/conversation.php:811
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:148 ../../include/Contact.php:161
-#: ../../include/conversation.php:816
+#: ../../include/conversation.php:812
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:149 ../../include/Contact.php:161
-#: ../../include/conversation.php:817
+#: ../../include/conversation.php:813
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:150 ../../include/Contact.php:161
-#: ../../include/conversation.php:818
+#: ../../include/conversation.php:814
 msgid "Send PM"
 msgstr ""
 
@@ -6686,13 +6708,13 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:334 ../../include/conversation.php:672
-#: ../../include/conversation.php:673
+#: ../../include/conversation.php:334 ../../include/conversation.php:668
+#: ../../include/conversation.php:669
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:344 ../../include/conversation.php:684
+#: ../../include/conversation.php:344 ../../include/conversation.php:680
 #, php-format
 msgid "%s from %s"
 msgstr ""
@@ -6748,118 +6770,118 @@ msgstr ""
 msgid "save to folder"
 msgstr ""
 
-#: ../../include/conversation.php:674
+#: ../../include/conversation.php:670
 msgid "to"
 msgstr ""
 
-#: ../../include/conversation.php:675
+#: ../../include/conversation.php:671
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/conversation.php:676
+#: ../../include/conversation.php:672
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/conversation.php:721
+#: ../../include/conversation.php:717
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:868
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:868
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:876
+#: ../../include/conversation.php:872
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:878
+#: ../../include/conversation.php:874
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:884
+#: ../../include/conversation.php:880
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:887
+#: ../../include/conversation.php:883
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:884
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:884
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:913
+#: ../../include/conversation.php:909
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:915
+#: ../../include/conversation.php:911
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:916
+#: ../../include/conversation.php:912
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:917
+#: ../../include/conversation.php:913
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:919
+#: ../../include/conversation.php:915
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:962
+#: ../../include/conversation.php:958
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:960
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:966
+#: ../../include/conversation.php:962
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:967
+#: ../../include/conversation.php:963
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:968
+#: ../../include/conversation.php:964
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:969
+#: ../../include/conversation.php:965
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:970
+#: ../../include/conversation.php:966
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:972
+#: ../../include/conversation.php:968
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:974
+#: ../../include/conversation.php:970
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:981
+#: ../../include/conversation.php:977
 msgid "permissions"
 msgstr ""
 

diff --git a/view/de/messages.po b/view/de/messages.po
index c834ec328d2d8e32efadfe2e8e7c63dbd2a468be..e3f38f66cc437800eb122fa194c8b023551b3d9b 100644 (file)
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -5,10 +5,12 @@
 # Translators:
 # bavatar <tobias.diekershoff@gmx.net>, 2011.
 # Erkan Yilmaz <erkan77@gmail.com>, 2011.
+# Fabian Dost <friends@dostmusik.de>, 2012.
 #   <friends@dostmusik.de>, 2012.
 #   <greeneyedred@googlemail.com>, 2012.
 #   <hzuehl@phone-talk.de>, 2011.
 #   <marmor69@web.de>, 2012.
+# Martin Schmitt <mas@scsy.de>, 2012.
 #   <tobias.diekershoff@gmx.net>, 2011, 2012.
 #   <transifex@zottel.net>, 2011, 2012.
 #   <ts+transifex@ml.tschlotfeldt.de>, 2011.
@@ -16,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-04-06 10:00-0700\n"
-"PO-Revision-Date: 2012-04-08 23:57+0000\n"
-"Last-Translator: zottel <transifex@zottel.net>\n"
+"POT-Creation-Date: 2012-04-16 10:00-0700\n"
+"PO-Revision-Date: 2012-04-17 15:40+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,13 +45,13 @@ msgstr "Einstellungen zum Kontakt angewandt."
 msgid "Contact update failed."
 msgstr "Konnte den Kontakt nicht aktualisieren."
 
-#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43
+#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866
 #: ../../mod/editpost.php:10 ../../mod/install.php:171
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125
-#: ../../mod/settings.php:62 ../../mod/settings.php:473
-#: ../../mod/settings.php:478 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/settings.php:99 ../../mod/settings.php:514
+#: ../../mod/settings.php:519 ../../mod/manage.php:86 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -58,13 +60,14 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/item.php:140 ../../mod/profile_photo.php:19
 #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
 #: ../../mod/profile_photo.php:163 ../../mod/message.php:38
-#: ../../mod/message.php:91 ../../mod/allfriends.php:9
-#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
-#: ../../mod/display.php:138 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:232 ../../mod/delegate.php:6
-#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:456
-#: ../../include/items.php:3118 ../../index.php:294
+#: ../../mod/message.php:90 ../../mod/allfriends.php:9
+#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:46
+#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
+#: ../../mod/profiles.php:7 ../../mod/profiles.php:329
+#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
+#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
+#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3170
+#: ../../index.php:309
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
@@ -93,8 +96,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, w
 msgid "Return to contact editor"
 msgstr "Zurück zum Kontakteditor"
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:531
-#: ../../mod/settings.php:558 ../../mod/admin.php:528 ../../mod/admin.php:537
+#: ../../mod/crepair.php:148 ../../mod/settings.php:534
+#: ../../mod/settings.php:560 ../../mod/admin.php:544 ../../mod/admin.php:553
 msgid "Name"
 msgstr "Name"
 
@@ -135,34 +138,42 @@ msgstr "Neues Foto von dieser URL"
 #: ../../mod/photos.php:1194 ../../mod/photos.php:1234
 #: ../../mod/photos.php:1274 ../../mod/photos.php:1305
 #: ../../mod/install.php:251 ../../mod/install.php:289
-#: ../../mod/localtime.php:45 ../../mod/contacts.php:319
-#: ../../mod/settings.php:529 ../../mod/settings.php:679
-#: ../../mod/settings.php:741 ../../mod/settings.php:926
-#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:357
-#: ../../mod/admin.php:525 ../../mod/admin.php:654 ../../mod/admin.php:826
-#: ../../mod/admin.php:906 ../../mod/profiles.php:390 ../../mod/invite.php:119
-#: ../../addon/facebook/facebook.php:547 ../../addon/yourls/yourls.php:76
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:325
+#: ../../mod/settings.php:532 ../../mod/settings.php:678
+#: ../../mod/settings.php:739 ../../mod/settings.php:930
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:374
+#: ../../mod/admin.php:541 ../../mod/admin.php:670 ../../mod/admin.php:850
+#: ../../mod/admin.php:930 ../../mod/profiles.php:498 ../../mod/invite.php:119
+#: ../../addon/facebook/facebook.php:552 ../../addon/yourls/yourls.php:76
 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
+#: ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
-#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:93
+#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
-#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
+#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
+#: ../../addon/blackout/blackout.php:94 ../../addon/gravatar/gravatar.php:86
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/statusnet/statusnet.php:278
 #: ../../addon/statusnet/statusnet.php:292
 #: ../../addon/statusnet/statusnet.php:318
 #: ../../addon/statusnet/statusnet.php:325
 #: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:547 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/statusnet/statusnet.php:553 ../../addon/tumblr/tumblr.php:90
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:369
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
+#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
 #: ../../addon/posterous/posterous.php:90
-#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555
+#: ../../view/theme/diabook-red/config.php:64
+#: ../../view/theme/diabook-blue/config.php:64
+#: ../../view/theme/diabook/config.php:76
+#: ../../view/theme/quattro/config.php:52
+#: ../../view/theme/diabook-aerith/config.php:64
+#: ../../include/conversation.php:555
 msgid "Submit"
 msgstr "Senden"
 
@@ -174,20 +185,20 @@ msgstr "Hilfe:"
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../../mod/help.php:38 ../../index.php:225
+#: ../../mod/help.php:38 ../../index.php:228
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
-#: ../../mod/help.php:41 ../../index.php:228
+#: ../../mod/help.php:41 ../../index.php:231
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
-#: ../../mod/wall_attach.php:57
+#: ../../mod/wall_attach.php:58
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "Die Datei ist größer als das erlaubte Limit von %d"
 
-#: ../../mod/wall_attach.php:85 ../../mod/wall_attach.php:96
+#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97
 msgid "File upload failed."
 msgstr "Hochladen der Datei fehlgeschlagen."
 
@@ -220,11 +231,11 @@ msgstr "Veranstaltung bearbeiten"
 msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
-#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:240
-#: ../../view/theme/diabook-blue/theme.php:240
-#: ../../view/theme/diabook/theme.php:248
-#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52
-#: ../../boot.php:1421
+#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:243
+#: ../../view/theme/diabook-blue/theme.php:243
+#: ../../view/theme/diabook/theme.php:253
+#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
+#: ../../boot.php:1471
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -274,7 +285,7 @@ msgid "Description:"
 msgstr "Beschreibung"
 
 #: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:1042
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1083
 msgid "Location:"
 msgstr "Ort:"
 
@@ -283,8 +294,8 @@ msgid "Share this event"
 msgstr "Veranstaltung teilen"
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:707 ../../mod/settings.php:530
-#: ../../mod/settings.php:557 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:533
+#: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -304,7 +315,7 @@ msgstr "Wähle ein Tag zum Entfernen aus: "
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:520
+#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:522
 #, php-format
 msgid "%s welcomes %s"
 msgstr "%s heißt %s herzlich willkommen"
@@ -327,25 +338,25 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?"
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:695
-#: ../../mod/settings.php:841 ../../mod/settings.php:847
-#: ../../mod/settings.php:855 ../../mod/settings.php:859
-#: ../../mod/settings.php:864 ../../mod/settings.php:870
-#: ../../mod/settings.php:876 ../../mod/settings.php:882
-#: ../../mod/settings.php:916 ../../mod/settings.php:917
-#: ../../mod/settings.php:918 ../../mod/settings.php:919
-#: ../../mod/register.php:536 ../../mod/profiles.php:369
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:740
+#: ../../mod/settings.php:844 ../../mod/settings.php:850
+#: ../../mod/settings.php:858 ../../mod/settings.php:862
+#: ../../mod/settings.php:867 ../../mod/settings.php:873
+#: ../../mod/settings.php:879 ../../mod/settings.php:885
+#: ../../mod/settings.php:921 ../../mod/settings.php:922
+#: ../../mod/settings.php:923 ../../mod/settings.php:924
+#: ../../mod/register.php:532 ../../mod/profiles.php:475
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:696
-#: ../../mod/settings.php:841 ../../mod/settings.php:847
-#: ../../mod/settings.php:855 ../../mod/settings.php:859
-#: ../../mod/settings.php:864 ../../mod/settings.php:870
-#: ../../mod/settings.php:876 ../../mod/settings.php:882
-#: ../../mod/settings.php:916 ../../mod/settings.php:917
-#: ../../mod/settings.php:918 ../../mod/settings.php:919
-#: ../../mod/register.php:537 ../../mod/profiles.php:370
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:741
+#: ../../mod/settings.php:844 ../../mod/settings.php:850
+#: ../../mod/settings.php:858 ../../mod/settings.php:862
+#: ../../mod/settings.php:867 ../../mod/settings.php:873
+#: ../../mod/settings.php:879 ../../mod/settings.php:885
+#: ../../mod/settings.php:921 ../../mod/settings.php:922
+#: ../../mod/settings.php:923 ../../mod/settings.php:924
+#: ../../mod/register.php:533 ../../mod/profiles.php:476
 msgid "No"
 msgstr "Nein"
 
@@ -356,10 +367,10 @@ msgstr "Fotoalben"
 #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880
 #: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383
 #: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook-red/theme.php:110
-#: ../../view/theme/diabook-blue/theme.php:110
-#: ../../view/theme/diabook/theme.php:114
-#: ../../view/theme/diabook-aerith/theme.php:110
+#: ../../view/theme/diabook-red/theme.php:113
+#: ../../view/theme/diabook-blue/theme.php:113
+#: ../../view/theme/diabook/theme.php:119
+#: ../../view/theme/diabook-aerith/theme.php:114
 msgid "Contact Photos"
 msgstr "Kontaktbilder"
 
@@ -367,7 +378,7 @@ msgstr "Kontaktbilder"
 msgid "Upload New Photos"
 msgstr "Weitere Fotos hochladen"
 
-#: ../../mod/photos.php:69 ../../mod/settings.php:24
+#: ../../mod/photos.php:69 ../../mod/settings.php:20
 msgid "everybody"
 msgstr "jeder"
 
@@ -376,16 +387,16 @@ msgid "Contact information unavailable"
 msgstr "Kontaktinformationen nicht verfügbar"
 
 #: ../../mod/photos.php:151 ../../mod/photos.php:598 ../../mod/photos.php:951
-#: ../../mod/photos.php:966 ../../mod/register.php:339
-#: ../../mod/register.php:346 ../../mod/register.php:353
+#: ../../mod/photos.php:966 ../../mod/register.php:335
+#: ../../mod/register.php:342 ../../mod/register.php:349
 #: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook-red/theme.php:111
-#: ../../view/theme/diabook-blue/theme.php:111
-#: ../../view/theme/diabook/theme.php:115
-#: ../../view/theme/diabook-aerith/theme.php:111
+#: ../../view/theme/diabook-red/theme.php:114
+#: ../../view/theme/diabook-blue/theme.php:114
+#: ../../view/theme/diabook/theme.php:120
+#: ../../view/theme/diabook-aerith/theme.php:115
 msgid "Profile Photos"
 msgstr "Profilbilder"
 
@@ -407,10 +418,10 @@ msgstr "wurde getaggt in einem"
 
 #: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook-red/theme.php:82
-#: ../../view/theme/diabook-blue/theme.php:82
-#: ../../view/theme/diabook/theme.php:86
-#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1297
+#: ../../view/theme/diabook-red/theme.php:85
+#: ../../view/theme/diabook-blue/theme.php:85
+#: ../../view/theme/diabook/theme.php:91
+#: ../../view/theme/diabook-aerith/theme.php:86 ../../include/text.php:1304
 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
@@ -429,17 +440,17 @@ msgid "Image file is empty."
 msgstr "Bilddatei ist leer."
 
 #: ../../mod/photos.php:654 ../../mod/profile_photo.php:124
-#: ../../mod/wall_upload.php:65
+#: ../../mod/wall_upload.php:69
 msgid "Unable to process image."
 msgstr "Konnte das Bild nicht bearbeiten."
 
 #: ../../mod/photos.php:674 ../../mod/profile_photo.php:257
-#: ../../mod/wall_upload.php:84
+#: ../../mod/wall_upload.php:88
 msgid "Image upload failed."
 msgstr "Hochladen des Bildes gescheitert."
 
 #: ../../mod/photos.php:760 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:626 ../../mod/viewcontacts.php:17
+#: ../../mod/dfrn_request.php:671 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr "Öffentlicher Zugriff verweigert."
@@ -541,14 +552,14 @@ msgstr "Ich mag das (toggle)"
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (toggle)"
 
-#: ../../mod/photos.php:1214 ../../include/conversation.php:960
+#: ../../mod/photos.php:1214 ../../include/conversation.php:956
 msgid "Share"
 msgstr "Teilen"
 
 #: ../../mod/photos.php:1215 ../../mod/editpost.php:104
-#: ../../mod/wallmessage.php:145 ../../mod/message.php:189
-#: ../../mod/message.php:358 ../../include/conversation.php:362
-#: ../../include/conversation.php:702 ../../include/conversation.php:979
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:188
+#: ../../mod/message.php:357 ../../include/conversation.php:362
+#: ../../include/conversation.php:698 ../../include/conversation.php:975
 msgid "Please wait"
 msgstr "Bitte warten"
 
@@ -559,17 +570,17 @@ msgstr "Das bist du"
 
 #: ../../mod/photos.php:1233 ../../mod/photos.php:1273
 #: ../../mod/photos.php:1304 ../../include/conversation.php:554
-#: ../../boot.php:494
+#: ../../boot.php:495
 msgid "Comment"
 msgstr "Kommentar"
 
 #: ../../mod/photos.php:1235 ../../mod/editpost.php:125
-#: ../../include/conversation.php:556 ../../include/conversation.php:997
+#: ../../include/conversation.php:556 ../../include/conversation.php:993
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../mod/photos.php:1332 ../../mod/settings.php:593
-#: ../../mod/settings.php:677 ../../mod/group.php:168 ../../mod/admin.php:532
+#: ../../mod/photos.php:1332 ../../mod/settings.php:595
+#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:548
 #: ../../include/conversation.php:318 ../../include/conversation.php:576
 msgid "Delete"
 msgstr "Löschen"
@@ -586,11 +597,10 @@ msgstr "Neueste Fotos"
 msgid "Not available."
 msgstr "Nicht verfügbar."
 
-#: ../../mod/community.php:30 ../../addon/pages/pages.php:75
-#: ../../view/theme/diabook-red/theme.php:242
-#: ../../view/theme/diabook-blue/theme.php:242
-#: ../../view/theme/diabook/theme.php:250
-#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:101
+#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:245
+#: ../../view/theme/diabook-blue/theme.php:245
+#: ../../view/theme/diabook/theme.php:255
+#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:101
 msgid "Community"
 msgstr "Gemeinschaft"
 
@@ -638,28 +648,28 @@ msgstr "Beitrag nicht gefunden"
 msgid "Edit post"
 msgstr "Beitrag bearbeiten"
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:946
+#: ../../mod/editpost.php:80 ../../include/conversation.php:942
 msgid "Post to Email"
 msgstr "An E-Mail senden"
 
-#: ../../mod/editpost.php:95 ../../mod/settings.php:592
+#: ../../mod/editpost.php:95 ../../mod/settings.php:594
 #: ../../include/conversation.php:563
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
-#: ../../mod/message.php:187 ../../mod/message.php:356
-#: ../../include/conversation.php:961
+#: ../../mod/message.php:186 ../../mod/message.php:355
+#: ../../include/conversation.php:957
 msgid "Upload photo"
 msgstr "Foto hochladen"
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:963
+#: ../../mod/editpost.php:97 ../../include/conversation.php:959
 msgid "Attach file"
 msgstr "Datei anhängen"
 
 #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
-#: ../../mod/message.php:188 ../../mod/message.php:357
-#: ../../include/conversation.php:965
+#: ../../mod/message.php:187 ../../mod/message.php:356
+#: ../../include/conversation.php:961
 msgid "Insert web link"
 msgstr "eine Kontaktanfrage"
 
@@ -675,35 +685,35 @@ msgstr "Vorbis [.ogg] Video einfügen"
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Vorbis [.ogg] Audio einfügen"
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:971
+#: ../../mod/editpost.php:102 ../../include/conversation.php:967
 msgid "Set your location"
 msgstr "Deinen Standort festlegen"
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:973
+#: ../../mod/editpost.php:103 ../../include/conversation.php:969
 msgid "Clear browser location"
 msgstr "Browser-Standort leeren"
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:980
+#: ../../mod/editpost.php:105 ../../include/conversation.php:976
 msgid "Permission settings"
 msgstr "Berechtigungseinstellungen"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:989
+#: ../../mod/editpost.php:113 ../../include/conversation.php:985
 msgid "CC: email addresses"
 msgstr "Cc:-E-Mail-Addressen"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:990
+#: ../../mod/editpost.php:114 ../../include/conversation.php:986
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:976
+#: ../../mod/editpost.php:117 ../../include/conversation.php:972
 msgid "Set title"
 msgstr "Titel setzen"
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:978
+#: ../../mod/editpost.php:119 ../../include/conversation.php:974
 msgid "Categories (comma-separated list)"
 msgstr "Kategorien (mit Komma separierte Liste)"
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:992
+#: ../../mod/editpost.php:120 ../../include/conversation.php:988
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Z.B.: bob@example.com, mary@example.com"
 
@@ -711,19 +721,19 @@ msgstr "Z.B.: bob@example.com, mary@example.com"
 msgid "This introduction has already been accepted."
 msgstr "Diese Kontaktanfrage wurde bereits akzeptiert."
 
-#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:382
+#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:427
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung."
 
-#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:387
+#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:432
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden."
 
-#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:389
+#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:434
 msgid "Warning: profile location has no profile photo."
 msgstr "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden."
 
-#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:392
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:437
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
@@ -755,132 +765,140 @@ msgstr "Maßnahmen zum Spamschutz wurden ergriffen."
 msgid "Friends are advised to please try again in 24 hours."
 msgstr "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."
 
-#: ../../mod/dfrn_request.php:307
+#: ../../mod/dfrn_request.php:309
 msgid "Invalid locator"
 msgstr "Ungültiger Locator"
 
-#: ../../mod/dfrn_request.php:327
+#: ../../mod/dfrn_request.php:318
+msgid "Invalid email address."
+msgstr "Ungültige E-Mail Adresse."
+
+#: ../../mod/dfrn_request.php:344
+msgid "This account has not been configured for email. Request failed."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:372
 msgid "Unable to resolve your name at the provided location."
 msgstr "Konnte deinen Namen an der angegebenen Stelle nicht finden."
 
-#: ../../mod/dfrn_request.php:340
+#: ../../mod/dfrn_request.php:385
 msgid "You have already introduced yourself here."
 msgstr "Du hast dich hier bereits vorgestellt."
 
-#: ../../mod/dfrn_request.php:344
+#: ../../mod/dfrn_request.php:389
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "Es scheint so, als ob du bereits mit %s befreundet bist."
 
-#: ../../mod/dfrn_request.php:365
+#: ../../mod/dfrn_request.php:410
 msgid "Invalid profile URL."
 msgstr "Ungültige Profil-URL."
 
-#: ../../mod/dfrn_request.php:371 ../../mod/follow.php:20
+#: ../../mod/dfrn_request.php:416 ../../mod/follow.php:20
 msgid "Disallowed profile URL."
 msgstr "Nicht erlaubte Profil-URL."
 
-#: ../../mod/dfrn_request.php:440 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:485 ../../mod/contacts.php:102
 msgid "Failed to update contact record."
 msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen."
 
-#: ../../mod/dfrn_request.php:461
+#: ../../mod/dfrn_request.php:506
 msgid "Your introduction has been sent."
 msgstr "Deine Kontaktanfrage wurde gesendet."
 
-#: ../../mod/dfrn_request.php:514
+#: ../../mod/dfrn_request.php:559
 msgid "Please login to confirm introduction."
 msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen."
 
-#: ../../mod/dfrn_request.php:528
+#: ../../mod/dfrn_request.php:573
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an."
 
-#: ../../mod/dfrn_request.php:540
+#: ../../mod/dfrn_request.php:585
 #, php-format
 msgid "Welcome home %s."
 msgstr "Willkommen zurück %s."
 
-#: ../../mod/dfrn_request.php:541
+#: ../../mod/dfrn_request.php:586
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "Bitte bestätige deine Kontaktanfrage bei %s."
 
-#: ../../mod/dfrn_request.php:542
+#: ../../mod/dfrn_request.php:587
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../../mod/dfrn_request.php:583 ../../include/items.php:2649
+#: ../../mod/dfrn_request.php:628 ../../include/items.php:2690
 msgid "[Name Withheld]"
 msgstr "[Name unterdrückt]"
 
-#: ../../mod/dfrn_request.php:670
+#: ../../mod/dfrn_request.php:715
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:"
 
-#: ../../mod/dfrn_request.php:686
+#: ../../mod/dfrn_request.php:731
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr "<strike>Als E-Mail-Kontakt verbinden</strike> (In Kürze verfügbar)"
 
-#: ../../mod/dfrn_request.php:688
+#: ../../mod/dfrn_request.php:733
 msgid ""
 "If you are not yet a member of the free social web, <a "
 "href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public"
 " Friendica site and join us today</a>."
 msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"http://dir.friendica.com/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten."
 
-#: ../../mod/dfrn_request.php:691
+#: ../../mod/dfrn_request.php:736
 msgid "Friend/Connection Request"
 msgstr "Freundschafts-/Kontaktanfrage"
 
-#: ../../mod/dfrn_request.php:692
+#: ../../mod/dfrn_request.php:737
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
 
-#: ../../mod/dfrn_request.php:693
+#: ../../mod/dfrn_request.php:738
 msgid "Please answer the following:"
 msgstr "Bitte beantworte Folgendes:"
 
-#: ../../mod/dfrn_request.php:694
+#: ../../mod/dfrn_request.php:739
 #, php-format
 msgid "Does %s know you?"
 msgstr "Kennt %s dich?"
 
-#: ../../mod/dfrn_request.php:697
+#: ../../mod/dfrn_request.php:742
 msgid "Add a personal note:"
 msgstr "Eine persönliche Notiz beifügen:"
 
-#: ../../mod/dfrn_request.php:699 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:744 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../mod/dfrn_request.php:700
+#: ../../mod/dfrn_request.php:745
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet/Federated Social Web"
 
-#: ../../mod/dfrn_request.php:701 ../../mod/settings.php:629
+#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:629
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../mod/dfrn_request.php:702
+#: ../../mod/dfrn_request.php:747
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
 msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste."
 
-#: ../../mod/dfrn_request.php:703
+#: ../../mod/dfrn_request.php:748
 msgid "Your Identity Address:"
 msgstr "Adresse deines Profils:"
 
-#: ../../mod/dfrn_request.php:706
+#: ../../mod/dfrn_request.php:751
 msgid "Submit Request"
 msgstr "Anfrage abschicken"
 
@@ -1176,7 +1194,7 @@ msgid "is interested in:"
 msgstr "ist interessiert an:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:986
+#: ../../include/contact_widgets.php:9 ../../boot.php:1027
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1207,8 +1225,8 @@ msgid "Discard"
 msgstr "Verwerfen"
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:160
-#: ../../mod/notifications.php:206 ../../mod/contacts.php:302
-#: ../../mod/contacts.php:345
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:308
+#: ../../mod/contacts.php:351
 msgid "Ignore"
 msgstr "Ignorieren"
 
@@ -1224,10 +1242,10 @@ msgstr "Netzwerk"
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:236
-#: ../../view/theme/diabook-blue/theme.php:236
-#: ../../view/theme/diabook/theme.php:244
-#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:77
+#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:239
+#: ../../view/theme/diabook-blue/theme.php:239
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:77
 #: ../../include/nav.php:115
 msgid "Home"
 msgstr "Pinnwand"
@@ -1236,7 +1254,7 @@ msgstr "Pinnwand"
 msgid "Introductions"
 msgstr "Kontaktanfragen"
 
-#: ../../mod/notifications.php:100 ../../mod/message.php:103
+#: ../../mod/notifications.php:100 ../../mod/message.php:102
 #: ../../include/nav.php:128
 msgid "Messages"
 msgstr "Nachrichten"
@@ -1263,7 +1281,7 @@ msgid "suggested by %s"
 msgstr "vorgeschlagen von %s"
 
 #: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:356
 msgid "Hide this contact from others"
 msgstr "Verberge diesen Kontakt vor anderen"
 
@@ -1276,7 +1294,7 @@ msgid "if applicable"
 msgstr "falls anwendbar"
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:530
+#: ../../mod/admin.php:546
 msgid "Approve"
 msgstr "Genehmigen"
 
@@ -1421,207 +1439,206 @@ msgstr "wird nicht mehr gefolgt"
 msgid "Contact has been removed."
 msgstr "Kontakt wurde entfernt."
 
-#: ../../mod/contacts.php:245
+#: ../../mod/contacts.php:251
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "Du hast mit %s eine beidseitige Freundschaft"
 
-#: ../../mod/contacts.php:249
+#: ../../mod/contacts.php:255
 #, php-format
 msgid "You are sharing with %s"
 msgstr "Du teilst mit %s"
 
-#: ../../mod/contacts.php:254
+#: ../../mod/contacts.php:260
 #, php-format
 msgid "%s is sharing with you"
 msgstr "%s teilt mit Dir"
 
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:277
 msgid "Private communications are not available for this contact."
 msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar."
 
-#: ../../mod/contacts.php:274
+#: ../../mod/contacts.php:280
 msgid "Never"
 msgstr "Niemals"
 
-#: ../../mod/contacts.php:278
+#: ../../mod/contacts.php:284
 msgid "(Update was successful)"
 msgstr "(Aktualisierung war erfolgreich)"
 
-#: ../../mod/contacts.php:278
+#: ../../mod/contacts.php:284
 msgid "(Update was not successful)"
 msgstr "(Aktualisierung war nicht erfolgreich)"
 
-#: ../../mod/contacts.php:280
+#: ../../mod/contacts.php:286
 msgid "Suggest friends"
 msgstr "Kontakte vorschlagen"
 
-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:290
 #, php-format
 msgid "Network type: %s"
 msgstr "Netzwerk Typ: %s"
 
-#: ../../mod/contacts.php:287
+#: ../../mod/contacts.php:293
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] "%d gemeinsamer Kontakt"
 msgstr[1] "%d gemeinsame Kontakte"
 
-#: ../../mod/contacts.php:292
+#: ../../mod/contacts.php:298
 msgid "View all contacts"
 msgstr "Alle Kontakte anzeigen"
 
-#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:534
+#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/admin.php:550
 msgid "Unblock"
 msgstr "Entsperren"
 
-#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:533
+#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/admin.php:549
 msgid "Block"
 msgstr "Sperren"
 
-#: ../../mod/contacts.php:302 ../../mod/contacts.php:345
+#: ../../mod/contacts.php:308 ../../mod/contacts.php:351
 msgid "Unignore"
 msgstr "Ignorieren aufheben"
 
-#: ../../mod/contacts.php:307
+#: ../../mod/contacts.php:313
 msgid "Repair"
 msgstr "Reparieren"
 
-#: ../../mod/contacts.php:317
+#: ../../mod/contacts.php:323
 msgid "Contact Editor"
 msgstr "Kontakt Editor"
 
-#: ../../mod/contacts.php:320
+#: ../../mod/contacts.php:326
 msgid "Profile Visibility"
 msgstr "Profil Anzeige"
 
-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:327
 #, 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:322
+#: ../../mod/contacts.php:328
 msgid "Contact Information / Notes"
 msgstr "Kontakt Informationen / Notizen"
 
-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:329
 msgid "Edit contact notes"
 msgstr "Notizen zum Kontakt bearbiten"
 
-#: ../../mod/contacts.php:328 ../../mod/contacts.php:501
-#: ../../mod/viewcontacts.php:62
+#: ../../mod/contacts.php:334 ../../mod/contacts.php:507
+#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Besuche %ss Profil [%s]"
 
-#: ../../mod/contacts.php:329
+#: ../../mod/contacts.php:335
 msgid "Block/Unblock contact"
 msgstr "Kontakt blockieren/freischalten"
 
-#: ../../mod/contacts.php:330
+#: ../../mod/contacts.php:336
 msgid "Ignore contact"
 msgstr "Ignoriere den Kontakt"
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:337
 msgid "Repair URL settings"
 msgstr "URL Einstellungen reparieren"
 
-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:338
 msgid "View conversations"
 msgstr "Unterhaltungen anzeigen"
 
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:340
 msgid "Delete contact"
 msgstr "Lösche den Kontakt"
 
-#: ../../mod/contacts.php:338
+#: ../../mod/contacts.php:344
 msgid "Last update:"
 msgstr "letzte Aktualisierung:"
 
-#: ../../mod/contacts.php:339
+#: ../../mod/contacts.php:345
 msgid "Update public posts"
 msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/contacts.php:341 ../../mod/admin.php:955
+#: ../../mod/contacts.php:347 ../../mod/admin.php:979
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
-#: ../../mod/contacts.php:348
+#: ../../mod/contacts.php:354
 msgid "Currently blocked"
 msgstr "Derzeit geblockt"
 
-#: ../../mod/contacts.php:349
+#: ../../mod/contacts.php:355
 msgid "Currently ignored"
 msgstr "Derzeit ignoriert"
 
-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:356
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"
 
-#: ../../mod/contacts.php:399
+#: ../../mod/contacts.php:405
 msgid "Suggestions"
 msgstr "Kontaktvorschläge"
 
-#: ../../mod/contacts.php:404 ../../mod/group.php:191
+#: ../../mod/contacts.php:410 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr "Alle Kontakte"
 
-#: ../../mod/contacts.php:409
+#: ../../mod/contacts.php:415
 msgid "Unblocked Contacts"
 msgstr "Nicht blockierte Kontakte"
 
-#: ../../mod/contacts.php:415
+#: ../../mod/contacts.php:421
 msgid "Blocked Contacts"
 msgstr "Blockierte Kontakte"
 
-#: ../../mod/contacts.php:421
+#: ../../mod/contacts.php:427
 msgid "Ignored Contacts"
 msgstr "Ignorierte Kontakte"
 
-#: ../../mod/contacts.php:427
+#: ../../mod/contacts.php:433
 msgid "Hidden Contacts"
 msgstr "Verborgene Kontakte"
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:483
 msgid "Mutual Friendship"
 msgstr "Beidseitige Freundschaft"
 
-#: ../../mod/contacts.php:481
+#: ../../mod/contacts.php:487
 msgid "is a fan of yours"
 msgstr "ist ein Fan von dir"
 
-#: ../../mod/contacts.php:485
+#: ../../mod/contacts.php:491
 msgid "you are a fan of"
 msgstr "du bist Fan von"
 
-#: ../../mod/contacts.php:502 ../../include/Contact.php:141
-#: ../../include/conversation.php:817
+#: ../../mod/contacts.php:508 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "Kontakt bearbeiten"
 
-#: ../../mod/contacts.php:523 ../../view/theme/diabook-red/theme.php:238
-#: ../../view/theme/diabook-blue/theme.php:238
-#: ../../view/theme/diabook/theme.php:246
-#: ../../view/theme/diabook-aerith/theme.php:238 ../../include/nav.php:139
+#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:241
+#: ../../view/theme/diabook-blue/theme.php:241
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:139
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: ../../mod/contacts.php:527
+#: ../../mod/contacts.php:533
 msgid "Search your contacts"
 msgstr "Suche in deinen Kontakten"
 
-#: ../../mod/contacts.php:528 ../../mod/directory.php:57
+#: ../../mod/contacts.php:534 ../../mod/directory.php:57
 msgid "Finding: "
 msgstr "Funde: "
 
-#: ../../mod/contacts.php:529 ../../mod/directory.php:59
-#: ../../include/contact_widgets.php:32
+#: ../../mod/contacts.php:535 ../../mod/directory.php:59
+#: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr "Finde"
 
@@ -1639,10 +1656,11 @@ msgid "Password reset requested at %s"
 msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:392 ../../mod/register.php:446
+#: ../../mod/register.php:388 ../../mod/register.php:442
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
-#: ../../addon/facebook/facebook.php:617
-#: ../../addon/facebook/facebook.php:1069 ../../include/items.php:2658
+#: ../../addon/facebook/facebook.php:625
+#: ../../addon/facebook/facebook.php:1090
+#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2699
 msgid "Administrator"
 msgstr "Administrator"
 
@@ -1652,7 +1670,7 @@ msgid ""
 "Password reset failed."
 msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: ../../mod/lostpass.php:83 ../../boot.php:779
+#: ../../mod/lostpass.php:83 ../../boot.php:809
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
@@ -1696,151 +1714,140 @@ msgstr "Spitzname oder Email:"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../../mod/settings.php:89
+#: ../../mod/settings.php:49 ../../include/nav.php:137
+msgid "Account settings"
+msgstr "Account Einstellungen"
+
+#: ../../mod/settings.php:54
+msgid "Display settings"
+msgstr "Anzeige Einstellungen"
+
+#: ../../mod/settings.php:60
+msgid "Connector settings"
+msgstr "Connector-Einstellungen"
+
+#: ../../mod/settings.php:65
+msgid "Plugin settings"
+msgstr "Plugin-Einstellungen"
+
+#: ../../mod/settings.php:70
+msgid "Connected apps"
+msgstr "Verbundene Programme"
+
+#: ../../mod/settings.php:75
+msgid "Export personal data"
+msgstr "Persönliche Daten exportieren"
+
+#: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817
+#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../../mod/settings.php:126
 msgid "Missing some important data!"
 msgstr "Wichtige Daten fehlen!"
 
-#: ../../mod/settings.php:92 ../../mod/settings.php:556 ../../mod/admin.php:75
+#: ../../mod/settings.php:129 ../../mod/settings.php:558
+#: ../../mod/admin.php:89
 msgid "Update"
 msgstr "Aktualisierungen"
 
-#: ../../mod/settings.php:197
+#: ../../mod/settings.php:234
 msgid "Failed to connect with email account using the settings provided."
 msgstr "Konnte das Email Konto mit den angegebenen Einstellungen nicht erreichen."
 
-#: ../../mod/settings.php:202
+#: ../../mod/settings.php:239
 msgid "Email settings updated."
 msgstr "EMail Einstellungen bearbeitet."
 
-#: ../../mod/settings.php:261
+#: ../../mod/settings.php:298
 msgid "Passwords do not match. Password unchanged."
 msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
 
-#: ../../mod/settings.php:266
+#: ../../mod/settings.php:303
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
 
-#: ../../mod/settings.php:277
+#: ../../mod/settings.php:314
 msgid "Password changed."
 msgstr "Passwort ändern."
 
-#: ../../mod/settings.php:279
+#: ../../mod/settings.php:316
 msgid "Password update failed. Please try again."
 msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
 
-#: ../../mod/settings.php:340
+#: ../../mod/settings.php:379
 msgid " Please use a shorter name."
 msgstr " Bitte verwende einen kürzeren Namen."
 
-#: ../../mod/settings.php:342
+#: ../../mod/settings.php:381
 msgid " Name too short."
 msgstr " Name ist zu kurz."
 
-#: ../../mod/settings.php:348
+#: ../../mod/settings.php:387
 msgid " Not valid email."
 msgstr " Keine gültige E-Mail."
 
-#: ../../mod/settings.php:350
+#: ../../mod/settings.php:389
 msgid " Cannot change to that email."
 msgstr "Ändern der E-Mail nicht möglich. "
 
-#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:445
-#: ../../addon/impressum/impressum.php:64
+#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450
+#: ../../addon/impressum/impressum.php:75
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:364
+#: ../../addon/mathjax/mathjax.php:64 ../../addon/piwik/piwik.php:105
+#: ../../addon/twitter/twitter.php:370
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:284
-#: ../../view/theme/diabook-blue/theme.php:283
-#: ../../view/theme/diabook/theme.php:293
-#: ../../view/theme/diabook-aerith/theme.php:283 ../../include/nav.php:137
-msgid "Account settings"
-msgstr "Account Einstellungen"
-
-#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:289
-#: ../../view/theme/diabook-blue/theme.php:288
-#: ../../view/theme/diabook/theme.php:298
-#: ../../view/theme/diabook-aerith/theme.php:288
-msgid "Display settings"
-msgstr "Anzeige Einstellungen"
-
-#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:298
-#: ../../view/theme/diabook-blue/theme.php:297
-#: ../../view/theme/diabook/theme.php:307
-#: ../../view/theme/diabook-aerith/theme.php:297
-msgid "Connector settings"
-msgstr "Connector-Einstellungen"
-
-#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:303
-#: ../../view/theme/diabook-blue/theme.php:302
-#: ../../view/theme/diabook/theme.php:312
-#: ../../view/theme/diabook-aerith/theme.php:302
-msgid "Plugin settings"
-msgstr "Plugin-Einstellungen"
-
-#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:308
-#: ../../view/theme/diabook-blue/theme.php:307
-#: ../../view/theme/diabook/theme.php:317
-#: ../../view/theme/diabook-aerith/theme.php:307
-msgid "Connections"
-msgstr "Verbindungen"
-
-#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:313
-#: ../../view/theme/diabook-blue/theme.php:312
-#: ../../view/theme/diabook/theme.php:322
-#: ../../view/theme/diabook-aerith/theme.php:312
-msgid "Export personal data"
-msgstr "Persönliche Daten exportieren"
-
-#: ../../mod/settings.php:528 ../../mod/settings.php:555
-#: ../../mod/settings.php:591
+#: ../../mod/settings.php:531 ../../mod/settings.php:557
+#: ../../mod/settings.php:593
 msgid "Add application"
 msgstr "Programm hinzufügen"
 
-#: ../../mod/settings.php:532 ../../mod/settings.php:559
-#: ../../addon/statusnet/statusnet.php:541
+#: ../../mod/settings.php:535 ../../mod/settings.php:561
+#: ../../addon/statusnet/statusnet.php:547
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:533 ../../mod/settings.php:560
-#: ../../addon/statusnet/statusnet.php:540
+#: ../../mod/settings.php:536 ../../mod/settings.php:562
+#: ../../addon/statusnet/statusnet.php:546
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:534 ../../mod/settings.php:561
+#: ../../mod/settings.php:537 ../../mod/settings.php:563
 msgid "Redirect"
 msgstr "Umleiten"
 
-#: ../../mod/settings.php:535 ../../mod/settings.php:562
+#: ../../mod/settings.php:538 ../../mod/settings.php:564
 msgid "Icon url"
 msgstr "Icon URL"
 
-#: ../../mod/settings.php:546
+#: ../../mod/settings.php:549
 msgid "You can't edit this application."
 msgstr "Du kannst dieses Programm nicht bearbeiten."
 
-#: ../../mod/settings.php:590
+#: ../../mod/settings.php:592
 msgid "Connected Apps"
 msgstr "Verbundene Programme"
 
-#: ../../mod/settings.php:594
+#: ../../mod/settings.php:596
 msgid "Client key starts with"
 msgstr "Anwender Schlüssel beginnt mit"
 
-#: ../../mod/settings.php:595
+#: ../../mod/settings.php:597
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../../mod/settings.php:596
+#: ../../mod/settings.php:598
 msgid "Remove authorization"
 msgstr "Autorisierung entziehen"
 
-#: ../../mod/settings.php:608
+#: ../../mod/settings.php:609
 msgid "No Plugin settings configured"
 msgstr "Keine Plugin-Einstellungen konfiguriert"
 
-#: ../../mod/settings.php:616 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:617 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr "Plugin-Einstellungen"
 
@@ -1865,322 +1872,334 @@ msgstr "StatusNet"
 msgid "Connector Settings"
 msgstr "Verbindungs-Einstellungen"
 
-#: ../../mod/settings.php:666
+#: ../../mod/settings.php:665
 msgid "Email/Mailbox Setup"
 msgstr "E-Mail/Postfach-Einstellungen"
 
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:666
 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:668
+#: ../../mod/settings.php:667
 msgid "Last successful email check:"
 msgstr "Letzter erfolgreicher Email Check"
 
-#: ../../mod/settings.php:669
+#: ../../mod/settings.php:668
 msgid "Email access is disabled on this site."
 msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
 
-#: ../../mod/settings.php:670
+#: ../../mod/settings.php:669
 msgid "IMAP server name:"
 msgstr "IMAP-Server-Name:"
 
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:670
 msgid "IMAP port:"
 msgstr "IMAP-Port:"
 
-#: ../../mod/settings.php:672
+#: ../../mod/settings.php:671
 msgid "Security:"
 msgstr "Sicherheit:"
 
-#: ../../mod/settings.php:672 ../../mod/settings.php:677
+#: ../../mod/settings.php:671 ../../mod/settings.php:676
 msgid "None"
 msgstr "Keine"
 
-#: ../../mod/settings.php:673
+#: ../../mod/settings.php:672
 msgid "Email login name:"
 msgstr "E-Mail-Login-Name:"
 
-#: ../../mod/settings.php:674
+#: ../../mod/settings.php:673
 msgid "Email password:"
 msgstr "E-Mail-Passwort:"
 
-#: ../../mod/settings.php:675
+#: ../../mod/settings.php:674
 msgid "Reply-to address:"
 msgstr "Reply-to Adresse:"
 
-#: ../../mod/settings.php:676
+#: ../../mod/settings.php:675
 msgid "Send public posts to all email contacts:"
 msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
 
-#: ../../mod/settings.php:677
+#: ../../mod/settings.php:676
 msgid "Action after import:"
 msgstr "Aktion nach Import:"
 
-#: ../../mod/settings.php:677
+#: ../../mod/settings.php:676
 msgid "Mark as seen"
 msgstr "Als gelesen markieren"
 
-#: ../../mod/settings.php:677
+#: ../../mod/settings.php:676
 msgid "Move to folder"
 msgstr "In einen Ordner verschieben"
 
-#: ../../mod/settings.php:678
+#: ../../mod/settings.php:677
 msgid "Move to folder:"
 msgstr "In diesen Ordner verschieben:"
 
-#: ../../mod/settings.php:739
+#: ../../mod/settings.php:737
 msgid "Display Settings"
 msgstr "Anzeige Einstellungen"
 
-#: ../../mod/settings.php:745
+#: ../../mod/settings.php:743
 msgid "Display Theme:"
 msgstr "Theme:"
 
-#: ../../mod/settings.php:746
+#: ../../mod/settings.php:744
 msgid "Update browser every xx seconds"
 msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../mod/settings.php:746
+#: ../../mod/settings.php:744
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimal 10 Sekunden, kein Maximum"
 
-#: ../../mod/settings.php:747
+#: ../../mod/settings.php:745
 msgid "Number of items to display on the network page:"
 msgstr "Zahl der Beiträge, welche pro Netzwerkseite angezeigt werden sollen: "
 
-#: ../../mod/settings.php:747
+#: ../../mod/settings.php:745
 msgid "Maximum of 100 items"
 msgstr "Maximal 100 Beiträge"
 
-#: ../../mod/settings.php:748
+#: ../../mod/settings.php:746
 msgid "Don't show emoticons"
 msgstr "Keine Smilies anzeigen"
 
-#: ../../mod/settings.php:808 ../../mod/admin.php:142 ../../mod/admin.php:506
+#: ../../mod/settings.php:811 ../../mod/admin.php:162 ../../mod/admin.php:522
 msgid "Normal Account"
 msgstr "Normaler Account"
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:812
 msgid "This account is a normal personal profile"
 msgstr "Dieser Account ist ein normales persönliches Profil"
 
-#: ../../mod/settings.php:812 ../../mod/admin.php:143 ../../mod/admin.php:507
+#: ../../mod/settings.php:815 ../../mod/admin.php:163 ../../mod/admin.php:523
 msgid "Soapbox Account"
 msgstr "Sandkasten-Account"
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:816
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert"
 
-#: ../../mod/settings.php:816 ../../mod/admin.php:144 ../../mod/admin.php:508
+#: ../../mod/settings.php:819 ../../mod/admin.php:164 ../../mod/admin.php:524
 msgid "Community/Celebrity Account"
 msgstr "Gemeinschafts/Promi-Account"
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:820
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"
 
-#: ../../mod/settings.php:820 ../../mod/admin.php:145 ../../mod/admin.php:509
+#: ../../mod/settings.php:823 ../../mod/admin.php:165 ../../mod/admin.php:525
 msgid "Automatic Friend Account"
 msgstr "Automatischer Freundesaccount"
 
-#: ../../mod/settings.php:821
+#: ../../mod/settings.php:824
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Freundschaftsanfragen werden automatisch als Freund akzeptiert"
 
-#: ../../mod/settings.php:831
+#: ../../mod/settings.php:834
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:831
+#: ../../mod/settings.php:834
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID."
 
-#: ../../mod/settings.php:841
+#: ../../mod/settings.php:844
 msgid "Publish your default profile in your local site directory?"
 msgstr "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?"
 
-#: ../../mod/settings.php:847
+#: ../../mod/settings.php:850
 msgid "Publish your default profile in the global social directory?"
 msgstr "Veröffentliche dein Standardprofil im weltweiten Verzeichnis?"
 
-#: ../../mod/settings.php:855
+#: ../../mod/settings.php:858
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"
 
-#: ../../mod/settings.php:859
+#: ../../mod/settings.php:862
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
 
-#: ../../mod/settings.php:864
+#: ../../mod/settings.php:867
 msgid "Allow friends to post to your profile page?"
 msgstr "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?"
 
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:873
 msgid "Allow friends to tag your posts?"
 msgstr "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?"
 
-#: ../../mod/settings.php:876
+#: ../../mod/settings.php:879
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?"
 
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:885
 msgid "Permit unknown people to send you private mail?"
 msgstr "Erlaube es Unbekannten dir private Nachrichten zu schicken?"
 
-#: ../../mod/settings.php:891
+#: ../../mod/settings.php:896
 msgid "Profile is <strong>not published</strong>."
 msgstr "Profil ist <strong>nicht veröffentlicht</strong>."
 
-#: ../../mod/settings.php:897 ../../mod/profile_photo.php:211
+#: ../../mod/settings.php:902 ../../mod/profile_photo.php:211
 msgid "or"
 msgstr "oder"
 
-#: ../../mod/settings.php:902
+#: ../../mod/settings.php:907
 msgid "Your Identity Address is"
 msgstr "Die Adresse deines Profils lautet:"
 
-#: ../../mod/settings.php:913
+#: ../../mod/settings.php:918
 msgid "Automatically expire posts after this many days:"
 msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen"
 
-#: ../../mod/settings.php:913
+#: ../../mod/settings.php:918
 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:914
+#: ../../mod/settings.php:919
 msgid "Advanced expiration settings"
 msgstr "Erweiterte Verfallseinstellungen"
 
-#: ../../mod/settings.php:915
+#: ../../mod/settings.php:920
 msgid "Advanced Expiration"
 msgstr "Erweitertes Verfallen"
 
-#: ../../mod/settings.php:916
+#: ../../mod/settings.php:921
 msgid "Expire posts:"
 msgstr "Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:917
+#: ../../mod/settings.php:922
 msgid "Expire personal notes:"
 msgstr "Persönliche Notizen verfallen lassen:"
 
-#: ../../mod/settings.php:918
+#: ../../mod/settings.php:923
 msgid "Expire starred posts:"
 msgstr "Markierte Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:919
+#: ../../mod/settings.php:924
 msgid "Expire photos:"
 msgstr "Fotos verfallen lassen:"
 
-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:928
 msgid "Account Settings"
 msgstr "Account-Einstellungen"
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:937
 msgid "Password Settings"
 msgstr "Passwort-Einstellungen"
 
-#: ../../mod/settings.php:934
+#: ../../mod/settings.php:938
 msgid "New Password:"
 msgstr "Neues Passwort:"
 
-#: ../../mod/settings.php:935
+#: ../../mod/settings.php:939
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: ../../mod/settings.php:935
+#: ../../mod/settings.php:939
 msgid "Leave password fields blank unless changing"
 msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern"
 
-#: ../../mod/settings.php:939
+#: ../../mod/settings.php:943
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../mod/settings.php:940 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:944 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr "Kompletter Name:"
 
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:945
 msgid "Email Address:"
 msgstr "Emailadresse:"
 
-#: ../../mod/settings.php:942
+#: ../../mod/settings.php:946
 msgid "Your Timezone:"
 msgstr "Deine Zeitzone:"
 
-#: ../../mod/settings.php:943
+#: ../../mod/settings.php:947
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../mod/settings.php:944
+#: ../../mod/settings.php:948
 msgid "Use Browser Location:"
 msgstr "Verwende den Standort des Browsers:"
 
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:951
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Privatsphäre-Einstellungen"
 
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:953
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:"
 
-#: ../../mod/settings.php:949 ../../mod/settings.php:964
+#: ../../mod/settings.php:953 ../../mod/settings.php:968
 msgid "(to prevent spam abuse)"
 msgstr "(um SPAM zu vermeiden)"
 
-#: ../../mod/settings.php:950
+#: ../../mod/settings.php:954
 msgid "Default Post Permissions"
 msgstr "Standard-Zugriffsrechte für Beiträge"
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:955
 msgid "(click to open/close)"
 msgstr "(klicke zum öffnen/schließen)"
 
-#: ../../mod/settings.php:964
+#: ../../mod/settings.php:968
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:"
 
-#: ../../mod/settings.php:967
+#: ../../mod/settings.php:971
 msgid "Notification Settings"
 msgstr "Benachrichtigungseinstellungen"
 
-#: ../../mod/settings.php:968
+#: ../../mod/settings.php:972
+msgid "By default post a status message when:"
+msgstr ""
+
+#: ../../mod/settings.php:973
+msgid "accepting a friend request"
+msgstr "akzeptieren einer Freundschaftsanfrage"
+
+#: ../../mod/settings.php:974
+msgid "making an <em>interesting</em> profile change"
+msgstr ""
+
+#: ../../mod/settings.php:975
 msgid "Send a notification email when:"
 msgstr "Benachrichtigungs-E-Mail senden wenn:"
 
-#: ../../mod/settings.php:969
+#: ../../mod/settings.php:976
 msgid "You receive an introduction"
 msgstr "- du eine Kontaktanfrage erhältst"
 
-#: ../../mod/settings.php:970
+#: ../../mod/settings.php:977
 msgid "Your introductions are confirmed"
 msgstr "- eine deiner Kontaktanfragen akzeptiert wurde"
 
-#: ../../mod/settings.php:971
+#: ../../mod/settings.php:978
 msgid "Someone writes on your profile wall"
 msgstr "- jemand etwas auf deine Pinnwand schreibt"
 
-#: ../../mod/settings.php:972
+#: ../../mod/settings.php:979
 msgid "Someone writes a followup comment"
 msgstr "- jemand auch einen Kommentar verfasst"
 
-#: ../../mod/settings.php:973
+#: ../../mod/settings.php:980
 msgid "You receive a private message"
 msgstr "- du eine private Nachricht erhältst"
 
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:981
 msgid "You receive a friend suggestion"
 msgstr "- du eine Empfehlung erhältst"
 
-#: ../../mod/settings.php:975
+#: ../../mod/settings.php:982
 msgid "You are tagged in a post"
-msgstr "Du wurdest in einem Beitrag erwähnt."
+msgstr "- du in einem Beitrag erwähnt wurdest"
 
-#: ../../mod/settings.php:978
+#: ../../mod/settings.php:985
 msgid "Advanced Page Settings"
 msgstr "Erweiterte Seiten-Einstellungen"
 
@@ -2210,7 +2229,7 @@ msgstr "Begriff entfernen"
 msgid "Saved Searches"
 msgstr "Gespeicherte Suchen"
 
-#: ../../mod/network.php:92 ../../include/group.php:216
+#: ../../mod/network.php:92 ../../include/group.php:217
 msgid "add"
 msgstr "hinzufügen"
 
@@ -2270,12 +2289,12 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1426
+#: ../../mod/notes.php:44 ../../boot.php:1476
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:673 ../../include/text.php:652
+#: ../../addon/facebook/facebook.php:683 ../../include/text.php:652
 msgid "Save"
 msgstr "Speichern"
 
@@ -2284,7 +2303,7 @@ msgstr "Speichern"
 msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."
 
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:60
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:59
 msgid "No recipient selected."
 msgstr "Kein Empfänger gewählt."
 
@@ -2292,15 +2311,15 @@ msgstr "Kein Empfänger gewählt."
 msgid "Unable to check your home location."
 msgstr "Konnte deinen Heimatort nicht bestimmen."
 
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:67
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
 msgid "Message could not be sent."
 msgstr "Nachricht konnte nicht gesendet werden."
 
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:70
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
 msgid "Message collection failure."
 msgstr "Konnte Nachrichten nicht abrufen."
 
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:73
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
 msgid "Message sent."
 msgstr "Nachricht gesendet."
 
@@ -2308,12 +2327,12 @@ msgstr "Nachricht gesendet."
 msgid "No recipient."
 msgstr "Kein Empfänger."
 
-#: ../../mod/wallmessage.php:124 ../../mod/message.php:170
-#: ../../include/conversation.php:914
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:169
+#: ../../include/conversation.php:910
 msgid "Please enter a link URL:"
 msgstr "Bitte gib die URL des Links ein:"
 
-#: ../../mod/wallmessage.php:131 ../../mod/message.php:178
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:177
 msgid "Send Private Message"
 msgstr "Private Nachricht senden"
 
@@ -2324,18 +2343,18 @@ msgid ""
 "your site allow private mail from unknown senders."
 msgstr "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."
 
-#: ../../mod/wallmessage.php:133 ../../mod/message.php:179
-#: ../../mod/message.php:348
+#: ../../mod/wallmessage.php:133 ../../mod/message.php:178
+#: ../../mod/message.php:347
 msgid "To:"
 msgstr "An:"
 
-#: ../../mod/wallmessage.php:134 ../../mod/message.php:180
-#: ../../mod/message.php:349
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:179
+#: ../../mod/message.php:348
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:184
-#: ../../mod/message.php:352 ../../mod/invite.php:113
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:183
+#: ../../mod/message.php:351 ../../mod/invite.php:113
 msgid "Your message:"
 msgstr "Deine Nachricht:"
 
@@ -2477,7 +2496,7 @@ msgstr "Gruppe nicht gefunden."
 msgid "Group name changed."
 msgstr "Gruppenname geändert."
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:293
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
@@ -2517,12 +2536,12 @@ msgstr "Ungültiger Profil-Bezeichner"
 msgid "Profile Visibility Editor"
 msgstr "Editor für die Profil-Sichtbarkeit"
 
-#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:237
-#: ../../view/theme/diabook-blue/theme.php:237
-#: ../../view/theme/diabook/theme.php:245
-#: ../../view/theme/diabook-aerith/theme.php:237
+#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:240
+#: ../../view/theme/diabook-blue/theme.php:240
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook-aerith/theme.php:241
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
-#: ../../include/nav.php:50 ../../boot.php:1408
+#: ../../include/nav.php:50 ../../boot.php:1458
 msgid "Profile"
 msgstr "Profil"
 
@@ -2610,91 +2629,91 @@ msgstr "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
-#: ../../mod/register.php:390 ../../mod/regmod.php:52
+#: ../../mod/register.php:386 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr "Details der Registration von %s"
 
-#: ../../mod/register.php:398
+#: ../../mod/register.php:394
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet."
 
-#: ../../mod/register.php:402
+#: ../../mod/register.php:398
 msgid "Failed to send email message. Here is the message that failed."
 msgstr "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte."
 
-#: ../../mod/register.php:407
+#: ../../mod/register.php:403
 msgid "Your registration can not be processed."
 msgstr "Deine Registrierung konnte nicht verarbeitet werden."
 
-#: ../../mod/register.php:444
+#: ../../mod/register.php:440
 #, php-format
 msgid "Registration request at %s"
 msgstr "Registrierungsanfrage auf %s"
 
-#: ../../mod/register.php:453
+#: ../../mod/register.php:449
 msgid "Your registration is pending approval by the site owner."
 msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
 
-#: ../../mod/register.php:491
+#: ../../mod/register.php:487
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
 
-#: ../../mod/register.php:517
+#: ../../mod/register.php:513
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen, indem du deine OpenID angibst und 'Registrieren' klickst."
 
-#: ../../mod/register.php:518
+#: ../../mod/register.php:514
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."
 
-#: ../../mod/register.php:519
+#: ../../mod/register.php:515
 msgid "Your OpenID (optional): "
 msgstr "Deine OpenID (optional): "
 
-#: ../../mod/register.php:533
+#: ../../mod/register.php:529
 msgid "Include your profile in member directory?"
 msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?"
 
-#: ../../mod/register.php:553
+#: ../../mod/register.php:549
 msgid "Membership on this site is by invitation only."
 msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
 
-#: ../../mod/register.php:554
+#: ../../mod/register.php:550
 msgid "Your invitation ID: "
 msgstr "ID deiner Einladung: "
 
-#: ../../mod/register.php:557 ../../mod/admin.php:358
+#: ../../mod/register.php:553 ../../mod/admin.php:375
 msgid "Registration"
 msgstr "Registrierung"
 
-#: ../../mod/register.php:565
+#: ../../mod/register.php:561
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Vollständiger Name (z.B. Max Mustermann): "
 
-#: ../../mod/register.php:566
+#: ../../mod/register.php:562
 msgid "Your Email Address: "
 msgstr "Deine E-Mail-Adresse: "
 
-#: ../../mod/register.php:567
+#: ../../mod/register.php:563
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@$sitename</strong>' sein."
 
-#: ../../mod/register.php:568
+#: ../../mod/register.php:564
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
-#: ../../mod/register.php:571 ../../include/nav.php:81 ../../boot.php:745
+#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:775
 msgid "Register"
 msgstr "Registrieren"
 
@@ -2703,28 +2722,28 @@ msgid "People Search"
 msgstr "Personen Suche"
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1440
+#: ../../addon/facebook/facebook.php:1574
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook-red/theme.php:77
-#: ../../view/theme/diabook-red/theme.php:86
-#: ../../view/theme/diabook-blue/theme.php:77
-#: ../../view/theme/diabook-blue/theme.php:86
-#: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90
-#: ../../view/theme/diabook-aerith/theme.php:77
-#: ../../view/theme/diabook-aerith/theme.php:86
+#: ../../view/theme/diabook-red/theme.php:80
+#: ../../view/theme/diabook-red/theme.php:89
+#: ../../view/theme/diabook-blue/theme.php:80
+#: ../../view/theme/diabook-blue/theme.php:89
+#: ../../view/theme/diabook/theme.php:86 ../../view/theme/diabook/theme.php:95
+#: ../../view/theme/diabook-aerith/theme.php:81
+#: ../../view/theme/diabook-aerith/theme.php:90
 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48
 #: ../../include/conversation.php:57 ../../include/conversation.php:121
 #: ../../include/conversation.php:130
 msgid "status"
 msgstr "Status"
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1444
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1578
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook-red/theme.php:91
-#: ../../view/theme/diabook-blue/theme.php:91
-#: ../../view/theme/diabook/theme.php:95
-#: ../../view/theme/diabook-aerith/theme.php:91
+#: ../../view/theme/diabook-red/theme.php:94
+#: ../../view/theme/diabook-blue/theme.php:94
+#: ../../view/theme/diabook/theme.php:100
+#: ../../view/theme/diabook-aerith/theme.php:95
 #: ../../include/diaspora.php:1670 ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -2735,9 +2754,9 @@ msgstr "%1$s mag %2$ss %3$s"
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s mag %2$ss %3$s nicht"
 
-#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
-#: ../../mod/admin.php:566 ../../mod/admin.php:745 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3030
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141
+#: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3082
 msgid "Item not found."
 msgstr "Beitrag nicht gefunden."
 
@@ -2766,35 +2785,35 @@ msgstr "Konnte den Originalbeitrag nicht finden."
 msgid "Empty post discarded."
 msgstr "Leerer Beitrag wurde verworfen."
 
-#: ../../mod/item.php:373 ../../mod/wall_upload.php:81
-#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
+#: ../../mod/item.php:372 ../../mod/wall_upload.php:85
+#: ../../mod/wall_upload.php:94 ../../mod/wall_upload.php:101
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr "Pinnwand-Bilder"
 
-#: ../../mod/item.php:763
+#: ../../mod/item.php:762
 msgid "System error. Post not saved."
 msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden."
 
-#: ../../mod/item.php:788
+#: ../../mod/item.php:787
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."
 
-#: ../../mod/item.php:790
+#: ../../mod/item.php:789
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "Du kannst sie online unter %s besuchen"
 
-#: ../../mod/item.php:791
+#: ../../mod/item.php:790
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem du auf diese Nachricht antwortest."
 
-#: ../../mod/item.php:793
+#: ../../mod/item.php:792
 #, php-format
 msgid "%s posted an update."
 msgstr "%s hat ein Update veröffentlicht."
@@ -2819,7 +2838,7 @@ msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue
 msgid "Unable to process image"
 msgstr "Bild konnte nicht verarbeitet werden"
 
-#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:56
+#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:60
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr "Bildgröße überschreitet das Limit von %d"
@@ -2882,67 +2901,67 @@ msgstr "Bitte gib dein Passwort zur Verifikation ein:"
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: ../../mod/message.php:64
+#: ../../mod/message.php:63
 msgid "Unable to locate contact information."
 msgstr "Konnte die Kontaktinformationen nicht finden."
 
-#: ../../mod/message.php:118
+#: ../../mod/message.php:117
 msgid "Message deleted."
 msgstr "Nachricht gelöscht."
 
-#: ../../mod/message.php:148
+#: ../../mod/message.php:147
 msgid "Conversation removed."
 msgstr "Unterhaltung gelöscht."
 
-#: ../../mod/message.php:220
+#: ../../mod/message.php:219
 msgid "No messages."
 msgstr "Keine Nachrichten."
 
-#: ../../mod/message.php:227
+#: ../../mod/message.php:226
 #, php-format
 msgid "Unknown sender - %s"
 msgstr "'Unbekannter Absender - %s"
 
-#: ../../mod/message.php:230
+#: ../../mod/message.php:229
 #, php-format
 msgid "You and %s"
 msgstr "Du und %s"
 
-#: ../../mod/message.php:233
+#: ../../mod/message.php:232
 #, php-format
 msgid "%s and You"
 msgstr "%s und Du"
 
-#: ../../mod/message.php:243 ../../mod/message.php:341
+#: ../../mod/message.php:242 ../../mod/message.php:340
 msgid "Delete conversation"
 msgstr "Unterhaltung löschen"
 
-#: ../../mod/message.php:246
+#: ../../mod/message.php:245
 msgid "D, d M Y - g:i A"
 msgstr "D, d. M Y - g:i A"
 
-#: ../../mod/message.php:248
+#: ../../mod/message.php:247
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] "%d Nachricht"
 msgstr[1] "%d Nachrichten"
 
-#: ../../mod/message.php:283
+#: ../../mod/message.php:282
 msgid "Message not available."
 msgstr "Nachricht nicht verfügbar."
 
-#: ../../mod/message.php:325
+#: ../../mod/message.php:324
 msgid "Delete message"
 msgstr "Nachricht löschen"
 
-#: ../../mod/message.php:343
+#: ../../mod/message.php:342
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst du auf der Profilseite des Absenders antworten."
 
-#: ../../mod/message.php:347
+#: ../../mod/message.php:346
 msgid "Send Reply"
 msgstr "Antwort senden"
 
@@ -2955,499 +2974,493 @@ msgstr "Freunde von %s"
 msgid "No friends to display."
 msgstr "Keine Freunde zum Anzeigen."
 
-#: ../../mod/admin.php:71 ../../mod/admin.php:356
+#: ../../mod/admin.php:51
+msgid "Theme settings updated."
+msgstr "Themen Einstellungen aktualisiert."
+
+#: ../../mod/admin.php:85 ../../mod/admin.php:373
 msgid "Site"
 msgstr "Seite"
 
-#: ../../mod/admin.php:72 ../../mod/admin.php:524 ../../mod/admin.php:536
+#: ../../mod/admin.php:86 ../../mod/admin.php:540 ../../mod/admin.php:552
 msgid "Users"
 msgstr "Nutzer"
 
-#: ../../mod/admin.php:73 ../../mod/admin.php:613 ../../mod/admin.php:653
+#: ../../mod/admin.php:87 ../../mod/admin.php:629 ../../mod/admin.php:669
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../../mod/admin.php:74 ../../mod/admin.php:791 ../../mod/admin.php:825
+#: ../../mod/admin.php:88 ../../mod/admin.php:815 ../../mod/admin.php:849
 msgid "Themes"
 msgstr "Themen"
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:905
+#: ../../mod/admin.php:103 ../../mod/admin.php:929
 msgid "Logs"
 msgstr "Protokolle"
 
-#: ../../mod/admin.php:94
+#: ../../mod/admin.php:108
 msgid "User registrations waiting for confirmation"
 msgstr "Nutzeranmeldungen die auf Bestätigung warten"
 
-#: ../../mod/admin.php:157 ../../mod/admin.php:355 ../../mod/admin.php:523
-#: ../../mod/admin.php:612 ../../mod/admin.php:652 ../../mod/admin.php:790
-#: ../../mod/admin.php:824 ../../mod/admin.php:904
+#: ../../mod/admin.php:177 ../../mod/admin.php:372 ../../mod/admin.php:539
+#: ../../mod/admin.php:628 ../../mod/admin.php:668 ../../mod/admin.php:814
+#: ../../mod/admin.php:848 ../../mod/admin.php:928
 msgid "Administration"
 msgstr "Administration"
 
-#: ../../mod/admin.php:158
+#: ../../mod/admin.php:178
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: ../../mod/admin.php:159
+#: ../../mod/admin.php:179
 msgid "Registered users"
 msgstr "Registrierte Nutzer"
 
-#: ../../mod/admin.php:161
+#: ../../mod/admin.php:181
 msgid "Pending registrations"
 msgstr "Anstehende Anmeldungen"
 
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:182
 msgid "Version"
 msgstr "Version"
 
-#: ../../mod/admin.php:164
+#: ../../mod/admin.php:184
 msgid "Active plugins"
 msgstr "Aktive Plugins"
 
-#: ../../mod/admin.php:298
+#: ../../mod/admin.php:315
 msgid "Site settings updated."
 msgstr "Seiteneinstellungen aktualisiert."
 
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:359
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:360
 msgid "Requires approval"
 msgstr "Bedarf der Zustimmung"
 
-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:361
 msgid "Open"
 msgstr "Offen"
 
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:365
 msgid "No SSL policy, links will track page SSL state"
 msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
 
-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:366
 msgid "Force all links to use SSL"
 msgstr "SSL für alle Links erzwingen"
 
-#: ../../mod/admin.php:350
+#: ../../mod/admin.php:367
 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:359
+#: ../../mod/admin.php:376
 msgid "File upload"
 msgstr "Datei hochladen"
 
-#: ../../mod/admin.php:360
+#: ../../mod/admin.php:377
 msgid "Policies"
 msgstr "Regeln"
 
-#: ../../mod/admin.php:361
+#: ../../mod/admin.php:378
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:538
+#: ../../mod/admin.php:382 ../../addon/statusnet/statusnet.php:544
 msgid "Site name"
 msgstr "Seitenname"
 
-#: ../../mod/admin.php:366
+#: ../../mod/admin.php:383
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../mod/admin.php:367
+#: ../../mod/admin.php:384
 msgid "System language"
 msgstr "Systemsprache"
 
-#: ../../mod/admin.php:368
+#: ../../mod/admin.php:385
 msgid "System theme"
 msgstr "Systemweites Thema"
 
-#: ../../mod/admin.php:368
-msgid "Default system theme - may be over-ridden by user profiles"
-msgstr "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden."
+#: ../../mod/admin.php:385
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr ""
 
-#: ../../mod/admin.php:369
+#: ../../mod/admin.php:386
 msgid "SSL link policy"
 msgstr "Regeln für SSL Links"
 
-#: ../../mod/admin.php:369
+#: ../../mod/admin.php:386
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
 
-#: ../../mod/admin.php:370
+#: ../../mod/admin.php:387
 msgid "Maximum image size"
 msgstr "Maximale Größe von Bildern"
 
-#: ../../mod/admin.php:370
+#: ../../mod/admin.php:387
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."
 
-#: ../../mod/admin.php:372
+#: ../../mod/admin.php:389
 msgid "Register policy"
 msgstr "Registrierungsmethode"
 
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:390
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:390
 msgid "Will be displayed prominently on the registration page."
 msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
 
-#: ../../mod/admin.php:374
+#: ../../mod/admin.php:391
 msgid "Accounts abandoned after x days"
 msgstr "Accounts gelten nach x Tagen als unbenutzt"
 
-#: ../../mod/admin.php:374
+#: ../../mod/admin.php:391
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."
 
-#: ../../mod/admin.php:375
+#: ../../mod/admin.php:392
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../mod/admin.php:375
+#: ../../mod/admin.php:392
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/admin.php:376
+#: ../../mod/admin.php:393
 msgid "Allowed email domains"
 msgstr "Erlaubte Domains für Emails"
 
-#: ../../mod/admin.php:376
+#: ../../mod/admin.php:393
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/admin.php:377
+#: ../../mod/admin.php:394
 msgid "Block public"
 msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../mod/admin.php:377
+#: ../../mod/admin.php:394
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
 
-#: ../../mod/admin.php:378
+#: ../../mod/admin.php:395
 msgid "Force publish"
 msgstr "Erzwinge Veröffentlichung"
 
-#: ../../mod/admin.php:378
+#: ../../mod/admin.php:395
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
 
-#: ../../mod/admin.php:379
+#: ../../mod/admin.php:396
 msgid "Global directory update URL"
 msgstr "URL für Updates beim weltweiten Verzeichnis"
 
-#: ../../mod/admin.php:379
+#: ../../mod/admin.php:396
 msgid ""
 "URL to update the global directory. If this is not set, the global directory"
 " is completely unavailable to the application."
 msgstr "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar."
 
-#: ../../mod/admin.php:381
+#: ../../mod/admin.php:398
 msgid "Block multiple registrations"
 msgstr "Unterbinde Mehrfachregistrierung"
 
-#: ../../mod/admin.php:381
+#: ../../mod/admin.php:398
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen."
 
-#: ../../mod/admin.php:382
+#: ../../mod/admin.php:399
 msgid "OpenID support"
 msgstr "OpenID Unterstützung"
 
-#: ../../mod/admin.php:382
+#: ../../mod/admin.php:399
 msgid "OpenID support for registration and logins."
 msgstr "OpenID-Unterstützung für Registrierung und Login."
 
-#: ../../mod/admin.php:383
-msgid "Gravatar support"
-msgstr "Gravatar Unterstützung"
-
-#: ../../mod/admin.php:383
-msgid "Search new user's photo on Gravatar."
-msgstr "Suchfunktion bei Gravatar für Profilbilder neuer Nutzer."
-
-#: ../../mod/admin.php:384
+#: ../../mod/admin.php:400
 msgid "Fullname check"
 msgstr "Namen auf Vollständigkeit überprüfen"
 
-#: ../../mod/admin.php:384
+#: ../../mod/admin.php:400
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden."
 
-#: ../../mod/admin.php:385
+#: ../../mod/admin.php:401
 msgid "UTF-8 Regular expressions"
 msgstr "UTF-8 Reguläre Ausdrücke"
 
-#: ../../mod/admin.php:385
+#: ../../mod/admin.php:401
 msgid "Use PHP UTF8 regular expressions"
 msgstr "PHP UTF8 Ausdrücke verwenden"
 
-#: ../../mod/admin.php:386
+#: ../../mod/admin.php:402
 msgid "Show Community Page"
 msgstr "Gemeinschaftsseite anzeigen"
 
-#: ../../mod/admin.php:386
+#: ../../mod/admin.php:402
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server."
 
-#: ../../mod/admin.php:387
+#: ../../mod/admin.php:403
 msgid "Enable OStatus support"
 msgstr "OStatus Unterstützung aktivieren"
 
-#: ../../mod/admin.php:387
+#: ../../mod/admin.php:403
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt."
 
-#: ../../mod/admin.php:388
+#: ../../mod/admin.php:404
 msgid "Enable Diaspora support"
 msgstr "Diaspora-Support aktivieren"
 
-#: ../../mod/admin.php:388
+#: ../../mod/admin.php:404
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
 
-#: ../../mod/admin.php:389
+#: ../../mod/admin.php:405
 msgid "Only allow Friendica contacts"
 msgstr "Nur Friendica-Kontakte erlauben"
 
-#: ../../mod/admin.php:389
+#: ../../mod/admin.php:405
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."
 
-#: ../../mod/admin.php:390
+#: ../../mod/admin.php:406
 msgid "Verify SSL"
 msgstr "SSL Überprüfen"
 
-#: ../../mod/admin.php:390
+#: ../../mod/admin.php:406
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
-msgstr "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle anstellen. Das bedeutet, das man zu keinen Seiten mit selbst unterzeichneten SSL eine Verbindung herstellen kann."
+msgstr "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann."
 
-#: ../../mod/admin.php:391
+#: ../../mod/admin.php:407
 msgid "Proxy user"
 msgstr "Proxy Nutzer"
 
-#: ../../mod/admin.php:392
+#: ../../mod/admin.php:408
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: ../../mod/admin.php:393
+#: ../../mod/admin.php:409
 msgid "Network timeout"
 msgstr "Netzwerk Wartezeit"
 
-#: ../../mod/admin.php:393
+#: ../../mod/admin.php:409
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
 
-#: ../../mod/admin.php:414
+#: ../../mod/admin.php:430
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s Benutzer geblockt/freigegeben"
 msgstr[1] "%s Benutzer geblockt/freigegeben"
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:437
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s Nutzer gelöscht"
 msgstr[1] "%s Nutzer gelöscht"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:471
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Nutzer '%s' gelöscht"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:478
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Nutzer '%s' entsperrt"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:478
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Nutzer '%s' gesperrt"
 
-#: ../../mod/admin.php:526
+#: ../../mod/admin.php:542
 msgid "select all"
 msgstr "Alle auswählen"
 
-#: ../../mod/admin.php:527
+#: ../../mod/admin.php:543
 msgid "User registrations waiting for confirm"
 msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
 
-#: ../../mod/admin.php:528
+#: ../../mod/admin.php:544
 msgid "Request date"
 msgstr "Anfrage Datum"
 
-#: ../../mod/admin.php:528 ../../mod/admin.php:537
+#: ../../mod/admin.php:544 ../../mod/admin.php:553
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr "Email"
 
-#: ../../mod/admin.php:529
+#: ../../mod/admin.php:545
 msgid "No registrations."
 msgstr "Keine Neuanmeldungen."
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:547
 msgid "Deny"
 msgstr "Verwehren"
 
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:553
 msgid "Register date"
 msgstr "Anmeldedatum"
 
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:553
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:553
 msgid "Last item"
 msgstr "Letzter Beitrag"
 
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:553
 msgid "Account"
 msgstr "Nutzerkonto"
 
-#: ../../mod/admin.php:539
+#: ../../mod/admin.php:555
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:540
+#: ../../mod/admin.php:556
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:576
+#: ../../mod/admin.php:592
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s deaktiviert."
 
-#: ../../mod/admin.php:580
+#: ../../mod/admin.php:596
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s aktiviert."
 
-#: ../../mod/admin.php:590 ../../mod/admin.php:769
+#: ../../mod/admin.php:606 ../../mod/admin.php:785
 msgid "Disable"
 msgstr "Ausschalten"
 
-#: ../../mod/admin.php:592 ../../mod/admin.php:771
+#: ../../mod/admin.php:608 ../../mod/admin.php:787
 msgid "Enable"
 msgstr "Einschalten"
 
-#: ../../mod/admin.php:614 ../../mod/admin.php:792
+#: ../../mod/admin.php:630 ../../mod/admin.php:816
 msgid "Toggle"
 msgstr "Umschalten"
 
-#: ../../mod/admin.php:615 ../../mod/admin.php:793 ../../include/nav.php:137
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ../../mod/admin.php:622 ../../mod/admin.php:802
+#: ../../mod/admin.php:638 ../../mod/admin.php:826
 msgid "Author: "
 msgstr "Autor:"
 
-#: ../../mod/admin.php:623 ../../mod/admin.php:803
+#: ../../mod/admin.php:639 ../../mod/admin.php:827
 msgid "Maintainer: "
 msgstr "Betreuer:"
 
-#: ../../mod/admin.php:734
+#: ../../mod/admin.php:750
 msgid "No themes found."
 msgstr "Keine Themen gefunden."
 
-#: ../../mod/admin.php:784
+#: ../../mod/admin.php:808
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: ../../mod/admin.php:830
+#: ../../mod/admin.php:854
 msgid "[Experimental]"
 msgstr "[Experimentell]"
 
-#: ../../mod/admin.php:831
+#: ../../mod/admin.php:855
 msgid "[Unsupported]"
 msgstr "[Nicht unterstützt]"
 
-#: ../../mod/admin.php:854
+#: ../../mod/admin.php:878
 msgid "Log settings updated."
 msgstr "Protokolleinstellungen aktualisiert."
 
-#: ../../mod/admin.php:907
+#: ../../mod/admin.php:931
 msgid "Clear"
 msgstr "löschen"
 
-#: ../../mod/admin.php:913
+#: ../../mod/admin.php:937
 msgid "Debugging"
 msgstr "Protokoll führen"
 
-#: ../../mod/admin.php:914
+#: ../../mod/admin.php:938
 msgid "Log file"
 msgstr "Protokolldatei"
 
-#: ../../mod/admin.php:914
+#: ../../mod/admin.php:938
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."
 
-#: ../../mod/admin.php:915
+#: ../../mod/admin.php:939
 msgid "Log level"
 msgstr "Protokoll-Level"
 
-#: ../../mod/admin.php:956
+#: ../../mod/admin.php:980
 msgid "Close"
 msgstr "Schließen"
 
-#: ../../mod/admin.php:962
+#: ../../mod/admin.php:986
 msgid "FTP Host"
 msgstr "FTP Host"
 
-#: ../../mod/admin.php:963
+#: ../../mod/admin.php:987
 msgid "FTP Path"
 msgstr "FTP Pfad"
 
-#: ../../mod/admin.php:964
+#: ../../mod/admin.php:988
 msgid "FTP User"
 msgstr "FTP Nutzername"
 
-#: ../../mod/admin.php:965
+#: ../../mod/admin.php:989
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
-#: ../../mod/profile.php:20 ../../boot.php:901
+#: ../../mod/profile.php:21 ../../boot.php:940
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../mod/profile.php:123 ../../mod/display.php:75
+#: ../../mod/profile.php:124 ../../mod/display.php:75
 msgid "Access to this profile has been restricted."
 msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
 
-#: ../../mod/profile.php:144
+#: ../../mod/profile.php:145
 msgid "Tips for New Members"
 msgstr "Tipps für neue Nutzer"
 
@@ -3496,6 +3509,10 @@ msgstr "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen"
 msgid "{0} mentioned you in a post"
 msgstr "{0} hat dich in einem Beitrag erwähnt"
 
+#: ../../mod/nogroup.php:58
+msgid "Contacts who are not members of a group"
+msgstr ""
+
 #: ../../mod/openid.php:24
 msgid "OpenID protocol error. No ID returned."
 msgstr "OpenID Protokollfehler. Keine ID zurückgegeben."
@@ -3579,8 +3596,8 @@ msgstr "Keine Applikationen installiert."
 msgid "Search This Site"
 msgstr "Diese Seite durchsuchen"
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:242
-#: ../../mod/profiles.php:356 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:339
+#: ../../mod/profiles.php:453 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr "Profil nicht gefunden."
 
@@ -3588,217 +3605,263 @@ msgstr "Profil nicht gefunden."
 msgid "Profile Name is required."
 msgstr "Profilname ist erforderlich."
 
-#: ../../mod/profiles.php:201
+#: ../../mod/profiles.php:143
+msgid "Marital Status"
+msgstr ""
+
+#: ../../mod/profiles.php:144
+msgid "Romantic Partner"
+msgstr ""
+
+#: ../../mod/profiles.php:145
+msgid "Work/Employment"
+msgstr ""
+
+#: ../../mod/profiles.php:146
+msgid "Religion"
+msgstr "Religion"
+
+#: ../../mod/profiles.php:147
+msgid "Political Views"
+msgstr "Politische Ansichten"
+
+#: ../../mod/profiles.php:148
+msgid "Gender"
+msgstr "Geschlecht"
+
+#: ../../mod/profiles.php:149
+msgid "Sexual Preference"
+msgstr "Sexuelle Vorlieben"
+
+#: ../../mod/profiles.php:150
+msgid "Homepage"
+msgstr "Webseite"
+
+#: ../../mod/profiles.php:151
+msgid "Interests"
+msgstr "Interessen"
+
+#: ../../mod/profiles.php:154
+msgid "Location"
+msgstr ""
+
+#: ../../mod/profiles.php:225
 msgid "Profile updated."
 msgstr "Profil aktualisiert."
 
-#: ../../mod/profiles.php:261
+#: ../../mod/profiles.php:300
+msgid "public profile"
+msgstr ""
+
+#: ../../mod/profiles.php:302
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr ""
+
+#: ../../mod/profiles.php:358
 msgid "Profile deleted."
 msgstr "Profil gelöscht."
 
-#: ../../mod/profiles.php:279 ../../mod/profiles.php:313
+#: ../../mod/profiles.php:376 ../../mod/profiles.php:410
 msgid "Profile-"
 msgstr "Profil-"
 
-#: ../../mod/profiles.php:298 ../../mod/profiles.php:340
+#: ../../mod/profiles.php:395 ../../mod/profiles.php:437
 msgid "New profile created."
 msgstr "Neues Profil angelegt."
 
-#: ../../mod/profiles.php:319
+#: ../../mod/profiles.php:416
 msgid "Profile unavailable to clone."
 msgstr "Profil nicht zum Duplizieren verfügbar."
 
-#: ../../mod/profiles.php:368
+#: ../../mod/profiles.php:474
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"
 
-#: ../../mod/profiles.php:389
+#: ../../mod/profiles.php:497
 msgid "Edit Profile Details"
 msgstr "Profil bearbeiten"
 
-#: ../../mod/profiles.php:391
+#: ../../mod/profiles.php:499
 msgid "View this profile"
 msgstr "Dieses Profil anzeigen"
 
-#: ../../mod/profiles.php:392
+#: ../../mod/profiles.php:500
 msgid "Create a new profile using these settings"
 msgstr "Neues Profil anlegen und diese Einstellungen verwenden"
 
-#: ../../mod/profiles.php:393
+#: ../../mod/profiles.php:501
 msgid "Clone this profile"
 msgstr "Dieses Profil duplizieren"
 
-#: ../../mod/profiles.php:394
+#: ../../mod/profiles.php:502
 msgid "Delete this profile"
 msgstr "Dieses Profil löschen"
 
-#: ../../mod/profiles.php:395
+#: ../../mod/profiles.php:503
 msgid "Profile Name:"
 msgstr "Profilname:"
 
-#: ../../mod/profiles.php:396
+#: ../../mod/profiles.php:504
 msgid "Your Full Name:"
 msgstr "Dein kompletter Name:"
 
-#: ../../mod/profiles.php:397
+#: ../../mod/profiles.php:505
 msgid "Title/Description:"
 msgstr "Titel/Beschreibung:"
 
-#: ../../mod/profiles.php:398
+#: ../../mod/profiles.php:506
 msgid "Your Gender:"
 msgstr "Dein Geschlecht:"
 
-#: ../../mod/profiles.php:399
+#: ../../mod/profiles.php:507
 #, php-format
 msgid "Birthday (%s):"
 msgstr "Geburtstag (%s):"
 
-#: ../../mod/profiles.php:400
+#: ../../mod/profiles.php:508
 msgid "Street Address:"
 msgstr "Adresse:"
 
-#: ../../mod/profiles.php:401
+#: ../../mod/profiles.php:509
 msgid "Locality/City:"
 msgstr "Wohnort/Stadt:"
 
-#: ../../mod/profiles.php:402
+#: ../../mod/profiles.php:510
 msgid "Postal/Zip Code:"
 msgstr "Postleitzahl:"
 
-#: ../../mod/profiles.php:403
+#: ../../mod/profiles.php:511
 msgid "Country:"
 msgstr "Land:"
 
-#: ../../mod/profiles.php:404
+#: ../../mod/profiles.php:512
 msgid "Region/State:"
 msgstr "Region/Bundesstaat:"
 
-#: ../../mod/profiles.php:405
+#: ../../mod/profiles.php:513
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Beziehungsstatus:"
 
-#: ../../mod/profiles.php:406
+#: ../../mod/profiles.php:514
 msgid "Who: (if applicable)"
 msgstr "Wer: (falls anwendbar)"
 
-#: ../../mod/profiles.php:407
+#: ../../mod/profiles.php:515
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/profiles.php:408 ../../include/profile_advanced.php:43
+#: ../../mod/profiles.php:516 ../../include/profile_advanced.php:43
 msgid "Sexual Preference:"
 msgstr "Sexuelle Vorlieben:"
 
-#: ../../mod/profiles.php:409
+#: ../../mod/profiles.php:517
 msgid "Homepage URL:"
 msgstr "Adresse der Homepage:"
 
-#: ../../mod/profiles.php:410 ../../include/profile_advanced.php:49
+#: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49
 msgid "Political Views:"
 msgstr "Politische Ansichten:"
 
-#: ../../mod/profiles.php:411
+#: ../../mod/profiles.php:519
 msgid "Religious Views:"
 msgstr "Religiöse Ansichten:"
 
-#: ../../mod/profiles.php:412
+#: ../../mod/profiles.php:520
 msgid "Public Keywords:"
 msgstr "Öffentliche Schlüsselwörter:"
 
-#: ../../mod/profiles.php:413
+#: ../../mod/profiles.php:521
 msgid "Private Keywords:"
 msgstr "Private Schlüsselwörter:"
 
-#: ../../mod/profiles.php:414
+#: ../../mod/profiles.php:522
 msgid "Example: fishing photography software"
 msgstr "Beispiel: Fischen Fotografie Software"
 
-#: ../../mod/profiles.php:415
+#: ../../mod/profiles.php:523
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(Wird verwendet um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)"
 
-#: ../../mod/profiles.php:416
+#: ../../mod/profiles.php:524
 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:417
+#: ../../mod/profiles.php:525
 msgid "Tell us about yourself..."
 msgstr "Erzähle uns ein bisschen von dir …"
 
-#: ../../mod/profiles.php:418
+#: ../../mod/profiles.php:526
 msgid "Hobbies/Interests"
 msgstr "Hobbies/Interessen"
 
-#: ../../mod/profiles.php:419
+#: ../../mod/profiles.php:527
 msgid "Contact information and Social Networks"
 msgstr "Kontaktinformationen und Soziale Netzwerke"
 
-#: ../../mod/profiles.php:420
+#: ../../mod/profiles.php:528
 msgid "Musical interests"
 msgstr "Musikalische Interessen"
 
-#: ../../mod/profiles.php:421
+#: ../../mod/profiles.php:529
 msgid "Books, literature"
 msgstr "Literatur/Bücher"
 
-#: ../../mod/profiles.php:422
+#: ../../mod/profiles.php:530
 msgid "Television"
 msgstr "Fernsehen"
 
-#: ../../mod/profiles.php:423
+#: ../../mod/profiles.php:531
 msgid "Film/dance/culture/entertainment"
 msgstr "Filme/Tänze/Kultur/Unterhaltung"
 
-#: ../../mod/profiles.php:424
+#: ../../mod/profiles.php:532
 msgid "Love/romance"
 msgstr "Liebesleben"
 
-#: ../../mod/profiles.php:425
+#: ../../mod/profiles.php:533
 msgid "Work/employment"
 msgstr "Arbeit/Beschäftigung"
 
-#: ../../mod/profiles.php:426
+#: ../../mod/profiles.php:534
 msgid "School/education"
 msgstr "Schule/Ausbildung"
 
-#: ../../mod/profiles.php:431
+#: ../../mod/profiles.php:539
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr "Dies ist dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."
 
-#: ../../mod/profiles.php:441 ../../mod/directory.php:111
+#: ../../mod/profiles.php:549 ../../mod/directory.php:111
 msgid "Age: "
 msgstr "Alter: "
 
-#: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:294
-#: ../../view/theme/diabook-blue/theme.php:293
-#: ../../view/theme/diabook/theme.php:303
-#: ../../view/theme/diabook-aerith/theme.php:293
+#: ../../mod/profiles.php:584
 msgid "Edit/Manage Profiles"
 msgstr "Verwalte/Editiere Profile"
 
-#: ../../mod/profiles.php:477 ../../boot.php:1008
+#: ../../mod/profiles.php:585 ../../boot.php:1049
 msgid "Change profile photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:478 ../../boot.php:1009
+#: ../../mod/profiles.php:586 ../../boot.php:1050
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: ../../mod/profiles.php:489 ../../boot.php:1019
+#: ../../mod/profiles.php:597 ../../boot.php:1060
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: ../../mod/profiles.php:491 ../../boot.php:1022
+#: ../../mod/profiles.php:599 ../../boot.php:1063
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:492 ../../boot.php:1023
+#: ../../mod/profiles.php:600 ../../boot.php:1064
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:918
+#: ../../mod/filer.php:29 ../../include/conversation.php:914
 msgid "Save to Folder:"
 msgstr "In diesen Ordner verschieben:"
 
@@ -3846,11 +3909,11 @@ msgstr "Hinzufügen"
 msgid "No entries."
 msgstr "Keine Einträge"
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:146
-#: ../../view/theme/diabook-blue/theme.php:146
-#: ../../view/theme/diabook/theme.php:150
-#: ../../view/theme/diabook-aerith/theme.php:146
-#: ../../include/contact_widgets.php:33
+#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:149
+#: ../../view/theme/diabook-blue/theme.php:149
+#: ../../view/theme/diabook/theme.php:155
+#: ../../view/theme/diabook-aerith/theme.php:150
+#: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr "Kontaktvorschläge"
 
@@ -3864,10 +3927,10 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es
 msgid "Ignore/Hide"
 msgstr "Ignorieren/Verbergen"
 
-#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:144
-#: ../../view/theme/diabook-blue/theme.php:144
-#: ../../view/theme/diabook/theme.php:148
-#: ../../view/theme/diabook-aerith/theme.php:144
+#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:147
+#: ../../view/theme/diabook-blue/theme.php:147
+#: ../../view/theme/diabook/theme.php:153
+#: ../../view/theme/diabook-aerith/theme.php:148
 msgid "Global Directory"
 msgstr "Weltweites Verzeichnis"
 
@@ -4053,71 +4116,71 @@ msgstr "Die Updates für dein Profil konnten nicht gespeichert werden"
 msgid "Connection accepted at %s"
 msgstr "Auf %s wurde die Verbindung akzeptiert"
 
-#: ../../addon/facebook/facebook.php:462
+#: ../../addon/facebook/facebook.php:467
 msgid "Facebook disabled"
 msgstr "Facebook deaktiviert"
 
-#: ../../addon/facebook/facebook.php:467
+#: ../../addon/facebook/facebook.php:472
 msgid "Updating contacts"
 msgstr "Aktualisiere Kontakte"
 
-#: ../../addon/facebook/facebook.php:488
+#: ../../addon/facebook/facebook.php:493
 msgid "Facebook API key is missing."
 msgstr "Facebook-API-Schlüssel nicht gefunden"
 
-#: ../../addon/facebook/facebook.php:495
+#: ../../addon/facebook/facebook.php:500
 msgid "Facebook Connect"
 msgstr "Mit Facebook verbinden"
 
-#: ../../addon/facebook/facebook.php:501
+#: ../../addon/facebook/facebook.php:506
 msgid "Install Facebook connector for this account."
 msgstr "Facebook-Connector für diesen Account installieren."
 
-#: ../../addon/facebook/facebook.php:508
+#: ../../addon/facebook/facebook.php:513
 msgid "Remove Facebook connector"
 msgstr "Facebook-Connector entfernen"
 
-#: ../../addon/facebook/facebook.php:513
+#: ../../addon/facebook/facebook.php:518
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]"
 
-#: ../../addon/facebook/facebook.php:520
+#: ../../addon/facebook/facebook.php:525
 msgid "Post to Facebook by default"
 msgstr "Veröffentliche standardmäßig bei Facebook"
 
-#: ../../addon/facebook/facebook.php:524
+#: ../../addon/facebook/facebook.php:529
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren"
 
-#: ../../addon/facebook/facebook.php:526
+#: ../../addon/facebook/facebook.php:531
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend"
 " <em>stream</em>."
 msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>."
 
-#: ../../addon/facebook/facebook.php:527
+#: ../../addon/facebook/facebook.php:532
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen."
 
-#: ../../addon/facebook/facebook.php:528
+#: ../../addon/facebook/facebook.php:533
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen."
 
-#: ../../addon/facebook/facebook.php:532
+#: ../../addon/facebook/facebook.php:537
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen"
 
-#: ../../addon/facebook/facebook.php:537
+#: ../../addon/facebook/facebook.php:542
 msgid "Do not import your Facebook profile wall conversations"
 msgstr "Facebook-Pinnwand nicht importieren"
 
-#: ../../addon/facebook/facebook.php:539
+#: ../../addon/facebook/facebook.php:544
 msgid ""
 "If you choose to link conversations and leave both of these boxes unchecked,"
 " your Facebook profile wall will be merged with your profile wall on this "
@@ -4125,114 +4188,114 @@ msgid ""
 "who may see the conversations."
 msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann."
 
-#: ../../addon/facebook/facebook.php:544
+#: ../../addon/facebook/facebook.php:549
 msgid "Comma separated applications to ignore"
 msgstr "Komma separiert Anwendungen, die ignoriert werden sollen"
 
-#: ../../addon/facebook/facebook.php:615
+#: ../../addon/facebook/facebook.php:623
 msgid "Problems with Facebook Real-Time Updates"
 msgstr "Probleme mit Facebook Echtzeit-Updates"
 
-#: ../../addon/facebook/facebook.php:639
+#: ../../addon/facebook/facebook.php:647
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../../addon/facebook/facebook.php:640
+#: ../../addon/facebook/facebook.php:648
 msgid "Facebook Connector Settings"
 msgstr "Facebook-Verbindungseinstellungen"
 
-#: ../../addon/facebook/facebook.php:649
+#: ../../addon/facebook/facebook.php:659
 msgid "Facebook API Key"
 msgstr "Facebook API Schlüssel"
 
-#: ../../addon/facebook/facebook.php:658
+#: ../../addon/facebook/facebook.php:668
 msgid ""
 "Error: it appears that you have specified the App-ID and -Secret in your "
 ".htconfig.php file. As long as they are specified there, they cannot be set "
 "using this form.<br><br>"
 msgstr "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>"
 
-#: ../../addon/facebook/facebook.php:663
+#: ../../addon/facebook/facebook.php:673
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token"
 " could not be retrieved)."
 msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)."
 
-#: ../../addon/facebook/facebook.php:665
+#: ../../addon/facebook/facebook.php:675
 msgid "The given API Key seems to work correctly."
-msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren."
+msgstr "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren."
 
-#: ../../addon/facebook/facebook.php:667
+#: ../../addon/facebook/facebook.php:677
 msgid ""
 "The correctness of the API Key could not be detected. Somthing strange's "
 "going on."
 msgstr "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."
 
-#: ../../addon/facebook/facebook.php:670
+#: ../../addon/facebook/facebook.php:680
 msgid "App-ID / API-Key"
 msgstr "App-ID / API-Key"
 
-#: ../../addon/facebook/facebook.php:671
+#: ../../addon/facebook/facebook.php:681
 msgid "Application secret"
 msgstr "Anwendungs-Geheimnis"
 
-#: ../../addon/facebook/facebook.php:672
+#: ../../addon/facebook/facebook.php:682
 #, php-format
 msgid "Polling Interval (min. %1$s minutes)"
 msgstr "Abrufintervall (min. %1$s Minuten)"
 
-#: ../../addon/facebook/facebook.php:676
+#: ../../addon/facebook/facebook.php:686
 msgid "Real-Time Updates"
 msgstr "Echt-Zeit Aktualisierungen"
 
-#: ../../addon/facebook/facebook.php:680
+#: ../../addon/facebook/facebook.php:690
 msgid "Real-Time Updates are activated."
 msgstr "Echtzeit-Updates sind aktiviert."
 
-#: ../../addon/facebook/facebook.php:681
+#: ../../addon/facebook/facebook.php:691
 msgid "Deactivate Real-Time Updates"
 msgstr "Echtzeit-Updates deaktivieren"
 
-#: ../../addon/facebook/facebook.php:683
+#: ../../addon/facebook/facebook.php:693
 msgid "Real-Time Updates not activated."
 msgstr "Echtzeit-Updates nicht aktiviert."
 
-#: ../../addon/facebook/facebook.php:683
+#: ../../addon/facebook/facebook.php:693
 msgid "Activate Real-Time Updates"
 msgstr "Echtzeit-Updates aktivieren"
 
-#: ../../addon/facebook/facebook.php:697
+#: ../../addon/facebook/facebook.php:707
 msgid "The new values have been saved."
 msgstr "Die neuen Einstellungen wurden gespeichert."
 
-#: ../../addon/facebook/facebook.php:716
+#: ../../addon/facebook/facebook.php:726
 msgid "Post to Facebook"
 msgstr "Bei Facebook veröffentlichen"
 
-#: ../../addon/facebook/facebook.php:808
+#: ../../addon/facebook/facebook.php:818
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen."
 
-#: ../../addon/facebook/facebook.php:1026
+#: ../../addon/facebook/facebook.php:1039
 msgid "View on Friendica"
 msgstr "In Friendica betrachten"
 
-#: ../../addon/facebook/facebook.php:1051
+#: ../../addon/facebook/facebook.php:1072
 msgid "Facebook post failed. Queued for retry."
 msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut."
 
-#: ../../addon/facebook/facebook.php:1087
+#: ../../addon/facebook/facebook.php:1108
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich."
 
-#: ../../addon/facebook/facebook.php:1088
+#: ../../addon/facebook/facebook.php:1109
 msgid "Facebook connection became invalid"
 msgstr "Facebook Anmeldedaten sind ungültig geworden"
 
-#: ../../addon/facebook/facebook.php:1089
+#: ../../addon/facebook/facebook.php:1110
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -4240,11 +4303,6 @@ msgid ""
 "The connection between your accounts on %2$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
 msgstr "Hi %1$s,\n\ndie Verbindung von deinem Account auf %2$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du  %3$sden Facebook-Connector neu Authentifizieren%4$s."
 
-#: ../../addon/facebook/facebook.php:1214
-#: ../../addon/facebook/facebook.php:1223 ../../include/bb2diaspora.php:102
-msgid "link"
-msgstr "Verweis"
-
 #: ../../addon/widgets/widget_like.php:58
 #, php-format
 msgid "%d person likes this"
@@ -4362,11 +4420,19 @@ msgstr "%s – Zum Öffnen/Schließen klicken"
 msgid "Forums"
 msgstr "Foren"
 
+#: ../../addon/planets/planets.php:150
+msgid "Planets Settings"
+msgstr "Planeten Einstellungen"
+
+#: ../../addon/planets/planets.php:152
+msgid "Enable Planets Plugin"
+msgstr "Aktiviere Planeten Plugin"
+
 #: ../../addon/communityhome/communityhome.php:28
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:766
+#: ../../include/nav.php:64 ../../boot.php:796
 msgid "Login"
 msgstr "Anmeldung"
 
@@ -4394,10 +4460,10 @@ msgid "Latest likes"
 msgstr "Neueste Favoriten"
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook-red/theme.php:74
-#: ../../view/theme/diabook-blue/theme.php:74
-#: ../../view/theme/diabook/theme.php:78
-#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1295
+#: ../../view/theme/diabook-red/theme.php:77
+#: ../../view/theme/diabook-blue/theme.php:77
+#: ../../view/theme/diabook/theme.php:83
+#: ../../view/theme/diabook-aerith/theme.php:78 ../../include/text.php:1302
 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr "Veranstaltung"
@@ -4481,11 +4547,11 @@ msgstr "Unentschieden!"
 msgid "I won!"
 msgstr "Ich gewinne!"
 
-#: ../../addon/randplace/randplace.php:171
+#: ../../addon/randplace/randplace.php:169
 msgid "Randplace Settings"
 msgstr "Randplace-Einstellungen"
 
-#: ../../addon/randplace/randplace.php:173
+#: ../../addon/randplace/randplace.php:171
 msgid "Enable Randplace Plugin"
 msgstr "Randplace-Plugin aktivieren"
 
@@ -4550,7 +4616,7 @@ msgid "Post to Drupal by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal"
 
 #: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
-#: ../../addon/posterous/posterous.php:173
+#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:173
 msgid "Post from Friendica"
 msgstr "Beitrag via Friendica"
 
@@ -4606,41 +4672,69 @@ msgstr "OEmbed für Youtube Videos verwenden"
 msgid "URL to embed:"
 msgstr "URL zum Einbetten:"
 
-#: ../../addon/impressum/impressum.php:25
+#: ../../addon/impressum/impressum.php:34
 msgid "Impressum"
 msgstr "Impressum"
 
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:40
-#: ../../addon/impressum/impressum.php:70
+#: ../../addon/impressum/impressum.php:47
+#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:81
 msgid "Site Owner"
 msgstr "Betreiber der Seite"
 
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:74
+#: ../../addon/impressum/impressum.php:47
+#: ../../addon/impressum/impressum.php:85
 msgid "Email Address"
 msgstr "Email Adresse"
 
-#: ../../addon/impressum/impressum.php:43
-#: ../../addon/impressum/impressum.php:72
+#: ../../addon/impressum/impressum.php:52
+#: ../../addon/impressum/impressum.php:83
 msgid "Postal Address"
 msgstr "Postalische Anschrift"
 
-#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:58
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
 msgstr "Das Impressums-Plugin muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert."
 
-#: ../../addon/impressum/impressum.php:71
+#: ../../addon/impressum/impressum.php:81
+msgid "The page operators name."
+msgstr "Name des Server-Administrators"
+
+#: ../../addon/impressum/impressum.php:82
 msgid "Site Owners Profile"
 msgstr "Profil des Seitenbetreibers"
 
-#: ../../addon/impressum/impressum.php:73
+#: ../../addon/impressum/impressum.php:82
+msgid "Profile address of the operator."
+msgstr "Profil-Adresse des Server-Administrators"
+
+#: ../../addon/impressum/impressum.php:83
+msgid "How to contact the operator via snail mail."
+msgstr "Wie erreicht man den Betreiber der Seite postalisch."
+
+#: ../../addon/impressum/impressum.php:84
 msgid "Notes"
 msgstr "Hinweise"
 
+#: ../../addon/impressum/impressum.php:84
+msgid "Additional notes that are displayed beneath the contact information."
+msgstr "Zusätzliche Angaben, die unterhalb der Kontakt-Informationen angezeigt werden."
+
+#: ../../addon/impressum/impressum.php:85
+msgid "How to contact the operator via email. (will be displayed obfuscated)"
+msgstr "Wie erreichts man den Betreiber per Email. (Adresse wird verschleiert dargestellt)"
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Footer note"
+msgstr "Fußnote"
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Text for the footer."
+msgstr "Text für die Fußnote"
+
 #: ../../addon/buglink/buglink.php:15
 msgid "Report Bug"
 msgstr "Fehlerreport erstellen"
@@ -4722,6 +4816,27 @@ msgstr "Standard Zoom"
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr "Standard Zoomlevel (1: Welt; 18: höchstes)"
 
+#: ../../addon/mathjax/mathjax.php:37
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerk-Stream sowie privaten Nachrichten gerendert."
+
+#: ../../addon/mathjax/mathjax.php:38
+msgid "Use the MathJax renderer"
+msgstr "MathJax verwenden"
+
+#: ../../addon/mathjax/mathjax.php:72
+msgid "MathJax Base URL"
+msgstr "MathJax Basis-URL"
+
+#: ../../addon/mathjax/mathjax.php:72
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen."
+
 #: ../../addon/editplain/editplain.php:46
 msgid "Editplain settings updated."
 msgstr "Editplain Einstellungen aktualisiert"
@@ -4734,6 +4849,63 @@ msgstr "Editplain Einstellungen"
 msgid "Disable richtext status editor"
 msgstr "RichText Editor deaktivieren"
 
+#: ../../addon/gravatar/gravatar.php:71
+msgid "generic profile image"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:72
+msgid "random geometric pattern"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:73
+msgid "monster face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:74
+msgid "computer generated face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:75
+msgid "retro arcade style face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Default avatar image"
+msgstr "Standard Profilbild "
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Rating of images"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:102
+msgid "Gravatar settings updated."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:85
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr "Dein Konto auf %s wird in ein paar Tagen verfallen."
+
+#: ../../addon/testdrive/testdrive.php:86
+msgid "Your Friendica test account is about to expire."
+msgstr "Dein Friendica Test Konto wird bald verfallen."
+
+#: ../../addon/testdrive/testdrive.php:87
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
+msgstr ""
+
 #: ../../addon/pageheader/pageheader.php:50
 msgid "\"pageheader\" Settings"
 msgstr "\"pageheader\"-Einstellungen"
@@ -4891,7 +5063,7 @@ msgstr "#Tags nach StatusNet senden"
 msgid "Clear OAuth configuration"
 msgstr "OAuth-Konfiguration löschen"
 
-#: ../../addon/statusnet/statusnet.php:539
+#: ../../addon/statusnet/statusnet.php:545
 msgid "API URL"
 msgstr "API-URL"
 
@@ -4994,12 +5166,12 @@ msgstr "Aktiviere \"Mehr zeigen\""
 msgid "Cutting posts after how much characters"
 msgstr "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben"
 
-#: ../../addon/showmore/showmore.php:64
+#: ../../addon/showmore/showmore.php:65
 msgid "Show More Settings saved."
 msgstr "\"Mehr zeigen\" Einstellungen gesichert."
 
-#: ../../addon/showmore/showmore.php:86 ../../include/conversation.php:466
-#: ../../boot.php:495
+#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466
+#: ../../boot.php:496
 msgid "show more"
 msgstr "mehr anzeigen"
 
@@ -5101,22 +5273,66 @@ msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"
 msgid "Send #tag links to Twitter"
 msgstr "#Tags nach Twitter senden"
 
-#: ../../addon/twitter/twitter.php:371
+#: ../../addon/twitter/twitter.php:377
 msgid "Consumer key"
 msgstr "Consumer Key"
 
-#: ../../addon/twitter/twitter.php:372
+#: ../../addon/twitter/twitter.php:378
 msgid "Consumer secret"
 msgstr "Consumer Secret"
 
-#: ../../addon/irc/irc.php:25
+#: ../../addon/irc/irc.php:44
+msgid "IRC Settings"
+msgstr "IRC Einstellungen"
+
+#: ../../addon/irc/irc.php:46
+msgid "Channel(s) to auto connect (comma separated)"
+msgstr ""
+
+#: ../../addon/irc/irc.php:51
+msgid "Popular Channels (comma separated)"
+msgstr ""
+
+#: ../../addon/irc/irc.php:69
+msgid "IRC settings saved."
+msgstr "IRC Einstellungen gespeichert."
+
+#: ../../addon/irc/irc.php:74
 msgid "IRC Chatroom"
 msgstr "IRC Chatraum"
 
-#: ../../addon/irc/irc.php:46
+#: ../../addon/irc/irc.php:96
 msgid "Popular Channels"
 msgstr "Beliebte Räume"
 
+#: ../../addon/blogger/blogger.php:42
+msgid "Post to blogger"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:74
+msgid "Blogger Post Settings"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:76
+msgid "Enable Blogger Post Plugin"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:81
+msgid "Blogger username"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:86
+msgid "Blogger password"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:91
+msgid "Blogger API URL"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:96
+msgid "Post to Blogger by default"
+msgstr ""
+
 #: ../../addon/posterous/posterous.php:36
 msgid "Post to Posterous"
 msgstr "Nach Posterous senden"
@@ -5141,183 +5357,204 @@ msgstr "Posterous-Passwort"
 msgid "Post to Posterous by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous"
 
-#: ../../view/theme/diabook-red/theme.php:23
-#: ../../view/theme/diabook-blue/theme.php:23
-#: ../../view/theme/diabook/theme.php:27
-#: ../../view/theme/dispy-dark/theme.php:116
-#: ../../view/theme/diabook-aerith/theme.php:23
+#: ../../view/theme/diabook-red/theme.php:26
+#: ../../view/theme/diabook-blue/theme.php:26
+#: ../../view/theme/diabook/theme.php:32
+#: ../../view/theme/diabook-aerith/theme.php:27
 msgid "Last users"
 msgstr "Letzte Nutzer"
 
-#: ../../view/theme/diabook-red/theme.php:52
-#: ../../view/theme/diabook-blue/theme.php:52
-#: ../../view/theme/diabook/theme.php:56
-#: ../../view/theme/diabook-aerith/theme.php:52
+#: ../../view/theme/diabook-red/theme.php:55
+#: ../../view/theme/diabook-blue/theme.php:55
+#: ../../view/theme/diabook/theme.php:61
+#: ../../view/theme/diabook-aerith/theme.php:56
 msgid "Last likes"
 msgstr "Zuletzt gemocht"
 
-#: ../../view/theme/diabook-red/theme.php:97
-#: ../../view/theme/diabook-blue/theme.php:97
-#: ../../view/theme/diabook/theme.php:101
-#: ../../view/theme/diabook-aerith/theme.php:97
+#: ../../view/theme/diabook-red/theme.php:100
+#: ../../view/theme/diabook-blue/theme.php:100
+#: ../../view/theme/diabook/theme.php:106
+#: ../../view/theme/diabook-aerith/theme.php:101
 msgid "Last photos"
 msgstr "Letzte Fotos"
 
-#: ../../view/theme/diabook-red/theme.php:142
-#: ../../view/theme/diabook-blue/theme.php:142
-#: ../../view/theme/diabook/theme.php:146
-#: ../../view/theme/diabook-aerith/theme.php:142
+#: ../../view/theme/diabook-red/theme.php:145
+#: ../../view/theme/diabook-blue/theme.php:145
+#: ../../view/theme/diabook/theme.php:151
+#: ../../view/theme/diabook-aerith/theme.php:146
 msgid "Find Friends"
 msgstr "Freunde finden"
 
-#: ../../view/theme/diabook-red/theme.php:143
-#: ../../view/theme/diabook-blue/theme.php:143
-#: ../../view/theme/diabook/theme.php:147
-#: ../../view/theme/diabook-aerith/theme.php:143
+#: ../../view/theme/diabook-red/theme.php:146
+#: ../../view/theme/diabook-blue/theme.php:146
+#: ../../view/theme/diabook/theme.php:152
+#: ../../view/theme/diabook-aerith/theme.php:147
 msgid "Local Directory"
 msgstr "Lokales Verzeichnis"
 
-#: ../../view/theme/diabook-red/theme.php:145
-#: ../../view/theme/diabook-blue/theme.php:145
-#: ../../view/theme/diabook/theme.php:149
-#: ../../view/theme/diabook-aerith/theme.php:145
-#: ../../include/contact_widgets.php:34
+#: ../../view/theme/diabook-red/theme.php:148
+#: ../../view/theme/diabook-blue/theme.php:148
+#: ../../view/theme/diabook/theme.php:154
+#: ../../view/theme/diabook-aerith/theme.php:149
+#: ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr "Ähnliche Interessen"
 
-#: ../../view/theme/diabook-red/theme.php:147
-#: ../../view/theme/diabook-blue/theme.php:147
-#: ../../view/theme/diabook/theme.php:151
-#: ../../view/theme/diabook-aerith/theme.php:147
-#: ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook-red/theme.php:150
+#: ../../view/theme/diabook-blue/theme.php:150
+#: ../../view/theme/diabook/theme.php:156
+#: ../../view/theme/diabook-aerith/theme.php:151
+#: ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr "Freunde einladen"
 
-#: ../../view/theme/diabook-red/theme.php:162
-#: ../../view/theme/diabook-red/theme.php:243
-#: ../../view/theme/diabook-blue/theme.php:162
-#: ../../view/theme/diabook-blue/theme.php:243
-#: ../../view/theme/diabook/theme.php:167
-#: ../../view/theme/diabook/theme.php:251
-#: ../../view/theme/diabook-aerith/theme.php:162
-#: ../../view/theme/diabook-aerith/theme.php:243
+#: ../../view/theme/diabook-red/theme.php:165
+#: ../../view/theme/diabook-red/theme.php:246
+#: ../../view/theme/diabook-blue/theme.php:165
+#: ../../view/theme/diabook-blue/theme.php:246
+#: ../../view/theme/diabook/theme.php:172
+#: ../../view/theme/diabook/theme.php:256
+#: ../../view/theme/diabook-aerith/theme.php:166
+#: ../../view/theme/diabook-aerith/theme.php:247
 msgid "Community Pages"
 msgstr "Foren"
 
-#: ../../view/theme/diabook-red/theme.php:195
-#: ../../view/theme/diabook-blue/theme.php:195
-#: ../../view/theme/diabook/theme.php:200
-#: ../../view/theme/diabook-aerith/theme.php:195
+#: ../../view/theme/diabook-red/theme.php:198
+#: ../../view/theme/diabook-blue/theme.php:198
+#: ../../view/theme/diabook/theme.php:205
+#: ../../view/theme/diabook-aerith/theme.php:199
 msgid "Help or @NewHere ?"
 msgstr "Hilfe oder @NewHere"
 
-#: ../../view/theme/diabook-red/theme.php:201
-#: ../../view/theme/diabook-blue/theme.php:201
-#: ../../view/theme/diabook/theme.php:206
-#: ../../view/theme/diabook-aerith/theme.php:201
+#: ../../view/theme/diabook-red/theme.php:204
+#: ../../view/theme/diabook-blue/theme.php:204
+#: ../../view/theme/diabook/theme.php:211
+#: ../../view/theme/diabook-aerith/theme.php:205
 msgid "Connect Services"
 msgstr "Verbinde Dienste"
 
-#: ../../view/theme/diabook-red/theme.php:207
-#: ../../view/theme/diabook-blue/theme.php:207
-#: ../../view/theme/diabook/theme.php:212
-#: ../../view/theme/diabook-aerith/theme.php:207
+#: ../../view/theme/diabook-red/theme.php:210
+#: ../../view/theme/diabook-blue/theme.php:210
+#: ../../view/theme/diabook/theme.php:217
+#: ../../view/theme/diabook-aerith/theme.php:211
 msgid "PostIt to Friendica"
 msgstr "Bei Friendica posten"
 
-#: ../../view/theme/diabook-red/theme.php:207
-#: ../../view/theme/diabook-blue/theme.php:207
-#: ../../view/theme/diabook/theme.php:212
-#: ../../view/theme/diabook-aerith/theme.php:207
+#: ../../view/theme/diabook-red/theme.php:210
+#: ../../view/theme/diabook-blue/theme.php:210
+#: ../../view/theme/diabook/theme.php:217
+#: ../../view/theme/diabook-aerith/theme.php:211
 msgid "Post to Friendica"
 msgstr "Wenn du diesen Link"
 
-#: ../../view/theme/diabook-red/theme.php:208
-#: ../../view/theme/diabook-blue/theme.php:208
-#: ../../view/theme/diabook/theme.php:213
-#: ../../view/theme/diabook-aerith/theme.php:208
+#: ../../view/theme/diabook-red/theme.php:211
+#: ../../view/theme/diabook-blue/theme.php:211
+#: ../../view/theme/diabook/theme.php:218
+#: ../../view/theme/diabook-aerith/theme.php:212
 msgid " from anywhere by bookmarking this Link."
 msgstr "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen."
 
-#: ../../view/theme/diabook-red/theme.php:236
-#: ../../view/theme/diabook-blue/theme.php:236
-#: ../../view/theme/diabook/theme.php:244
-#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:49
+#: ../../view/theme/diabook-red/theme.php:239
+#: ../../view/theme/diabook-blue/theme.php:239
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:49
 #: ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr "Deine Beiträge und Unterhaltungen"
 
-#: ../../view/theme/diabook-red/theme.php:237
-#: ../../view/theme/diabook-blue/theme.php:237
-#: ../../view/theme/diabook/theme.php:245
-#: ../../view/theme/diabook-aerith/theme.php:237 ../../include/nav.php:50
+#: ../../view/theme/diabook-red/theme.php:240
+#: ../../view/theme/diabook-blue/theme.php:240
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr "Deine Profilseite"
 
-#: ../../view/theme/diabook-red/theme.php:238
-#: ../../view/theme/diabook-blue/theme.php:238
-#: ../../view/theme/diabook/theme.php:246
-#: ../../view/theme/diabook-aerith/theme.php:238
+#: ../../view/theme/diabook-red/theme.php:241
+#: ../../view/theme/diabook-blue/theme.php:241
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook-aerith/theme.php:242
 msgid "Your contacts"
 msgstr "Deine Kontakte"
 
-#: ../../view/theme/diabook-red/theme.php:239
-#: ../../view/theme/diabook-blue/theme.php:239
-#: ../../view/theme/diabook/theme.php:247
-#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51
-#: ../../boot.php:1413
+#: ../../view/theme/diabook-red/theme.php:242
+#: ../../view/theme/diabook-blue/theme.php:242
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
+#: ../../boot.php:1463
 msgid "Photos"
 msgstr "Bilder"
 
-#: ../../view/theme/diabook-red/theme.php:239
-#: ../../view/theme/diabook-blue/theme.php:239
-#: ../../view/theme/diabook/theme.php:247
-#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51
+#: ../../view/theme/diabook-red/theme.php:242
+#: ../../view/theme/diabook-blue/theme.php:242
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
 msgid "Your photos"
 msgstr "Deine Fotos"
 
-#: ../../view/theme/diabook-red/theme.php:240
-#: ../../view/theme/diabook-blue/theme.php:240
-#: ../../view/theme/diabook/theme.php:248
-#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52
+#: ../../view/theme/diabook-red/theme.php:243
+#: ../../view/theme/diabook-blue/theme.php:243
+#: ../../view/theme/diabook/theme.php:253
+#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
 msgid "Your events"
 msgstr "Deine Ereignisse"
 
-#: ../../view/theme/diabook-red/theme.php:241
-#: ../../view/theme/diabook-blue/theme.php:241
-#: ../../view/theme/diabook/theme.php:249
-#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53
+#: ../../view/theme/diabook-red/theme.php:244
+#: ../../view/theme/diabook-blue/theme.php:244
+#: ../../view/theme/diabook/theme.php:254
+#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr "Persönliche Notizen"
 
-#: ../../view/theme/diabook-red/theme.php:241
-#: ../../view/theme/diabook-blue/theme.php:241
-#: ../../view/theme/diabook/theme.php:249
-#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53
+#: ../../view/theme/diabook-red/theme.php:244
+#: ../../view/theme/diabook-blue/theme.php:244
+#: ../../view/theme/diabook/theme.php:254
+#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr "Deine privaten Fotos"
 
-#: ../../view/theme/quattro/config.php:23
+#: ../../view/theme/diabook-red/config.php:66
+#: ../../view/theme/diabook-blue/config.php:66
+#: ../../view/theme/diabook/config.php:78
+#: ../../view/theme/quattro/config.php:54
+#: ../../view/theme/diabook-aerith/config.php:66
 msgid "Theme settings"
 msgstr "Themen Einstellungen"
 
-#: ../../view/theme/quattro/config.php:24
+#: ../../view/theme/diabook-red/config.php:67
+#: ../../view/theme/diabook-blue/config.php:67
+#: ../../view/theme/diabook/config.php:79
+#: ../../view/theme/diabook-aerith/config.php:67
+msgid "Set font-size for posts and comments"
+msgstr ""
+
+#: ../../view/theme/diabook-red/config.php:68
+#: ../../view/theme/diabook-blue/config.php:68
+#: ../../view/theme/diabook/config.php:80
+#: ../../view/theme/diabook-aerith/config.php:68
+msgid "Set line-height for posts and comments"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:81
+msgid "Set resolution for middle column"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:55
 msgid "Alignment"
 msgstr "Ausrichtung"
 
-#: ../../view/theme/quattro/config.php:24
+#: ../../view/theme/quattro/config.php:55
 msgid "Left"
 msgstr "Links"
 
-#: ../../view/theme/quattro/config.php:24
+#: ../../view/theme/quattro/config.php:55
 msgid "Center"
 msgstr "Mitte"
 
-#: ../../view/theme/quattro/config.php:25
+#: ../../view/theme/quattro/config.php:56
 msgid "Color scheme"
 msgstr "Farbschema"
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:1044
+#: ../../include/profile_advanced.php:17 ../../boot.php:1085
 msgid "Gender:"
 msgstr "Geschlecht:"
 
@@ -5329,8 +5566,8 @@ msgstr "j F, Y"
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
-#: ../../include/items.php:1392
+#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
+#: ../../include/items.php:1402
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
@@ -5338,11 +5575,11 @@ msgstr "Geburtstag:"
 msgid "Age:"
 msgstr "Alter:"
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:1047
+#: ../../include/profile_advanced.php:37 ../../boot.php:1088
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:1049
+#: ../../include/profile_advanced.php:45 ../../boot.php:1090
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -5556,7 +5793,7 @@ msgstr "Abstinent"
 
 #: ../../include/profile_selectors.php:19
 msgid "Virgin"
-msgstr "Jungfrau"
+msgstr "Jungfrauen"
 
 #: ../../include/profile_selectors.php:19
 msgid "Deviant"
@@ -5590,6 +5827,14 @@ msgstr "Verfügbar"
 msgid "Unavailable"
 msgstr "Nicht verfügbar"
 
+#: ../../include/profile_selectors.php:33
+msgid "Has crush"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Infatuated"
+msgstr ""
+
 #: ../../include/profile_selectors.php:33
 msgid "Dating"
 msgstr "Dating"
@@ -5622,6 +5867,10 @@ msgstr "Verlobt"
 msgid "Married"
 msgstr "Verheiratet"
 
+#: ../../include/profile_selectors.php:33
+msgid "Imaginarily married"
+msgstr ""
+
 #: ../../include/profile_selectors.php:33
 msgid "Partners"
 msgstr "Partner"
@@ -5630,12 +5879,16 @@ msgstr "Partner"
 msgid "Cohabiting"
 msgstr "zusammenlebend"
 
+#: ../../include/profile_selectors.php:33
+msgid "Common law"
+msgstr ""
+
 #: ../../include/profile_selectors.php:33
 msgid "Happy"
 msgstr "Glücklich"
 
 #: ../../include/profile_selectors.php:33
-msgid "Not Looking"
+msgid "Not looking"
 msgstr "Nicht auf der Suche"
 
 #: ../../include/profile_selectors.php:33
@@ -5658,6 +5911,10 @@ msgstr "Unstabil"
 msgid "Divorced"
 msgstr "Geschieden"
 
+#: ../../include/profile_selectors.php:33
+msgid "Imaginarily divorced"
+msgstr ""
+
 #: ../../include/profile_selectors.php:33
 msgid "Widowed"
 msgstr "Verwitwet"
@@ -5667,8 +5924,8 @@ msgid "Uncertain"
 msgstr "Unsicher"
 
 #: ../../include/profile_selectors.php:33
-msgid "Complicated"
-msgstr "Kompliziert"
+msgid "It's complicated"
+msgstr "Ist kompliziert"
 
 #: ../../include/profile_selectors.php:33
 msgid "Don't care"
@@ -5826,27 +6083,27 @@ msgstr "Abgelegt unter:"
 msgid "Click to open/close"
 msgstr "Zum öffnen/schließen klicken"
 
-#: ../../include/text.php:1071
-msgid "Select an alternate language"
-msgstr "Alternative Sprache auswählen"
-
-#: ../../include/text.php:1083
+#: ../../include/text.php:1084
 msgid "default"
 msgstr "standard"
 
-#: ../../include/text.php:1299
+#: ../../include/text.php:1096
+msgid "Select an alternate language"
+msgstr "Alternative Sprache auswählen"
+
+#: ../../include/text.php:1306
 msgid "activity"
 msgstr "Aktivität"
 
-#: ../../include/text.php:1301
+#: ../../include/text.php:1308
 msgid "comment"
 msgstr "Kommentar"
 
-#: ../../include/text.php:1302
+#: ../../include/text.php:1309
 msgid "post"
 msgstr "Beitrag"
 
-#: ../../include/text.php:1457
+#: ../../include/text.php:1464
 msgid "Item filed"
 msgstr "Beitrag abgelegt"
 
@@ -5863,7 +6120,7 @@ msgstr "Anhänge:"
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"
 
-#: ../../include/network.php:817
+#: ../../include/network.php:823
 msgid "view full size"
 msgstr "Volle Größe anzeigen"
 
@@ -5902,7 +6159,11 @@ msgstr "Gruppe bearbeiten"
 msgid "Create a new group"
 msgstr "Neue Gruppe erstellen"
 
-#: ../../include/nav.php:46 ../../boot.php:765
+#: ../../include/group.php:215
+msgid "Contacts not in any group"
+msgstr ""
+
+#: ../../include/nav.php:46 ../../boot.php:795
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -5910,7 +6171,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:49 ../../boot.php:1403
+#: ../../include/nav.php:49 ../../boot.php:1453
 msgid "Status"
 msgstr "Status"
 
@@ -5990,11 +6251,11 @@ msgstr "Verwalten"
 msgid "Manage other pages"
 msgstr "Andere Seiten verwalten"
 
-#: ../../include/nav.php:138 ../../boot.php:1002
+#: ../../include/nav.php:138 ../../boot.php:1043
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../include/nav.php:138 ../../boot.php:1002
+#: ../../include/nav.php:138 ../../boot.php:1043
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
 
@@ -6026,46 +6287,50 @@ msgstr "Adresse oder Web-Link eingeben"
 msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "Beispiel: bob@example.com, http://example.com/barbara"
 
-#: ../../include/contact_widgets.php:22
+#: ../../include/contact_widgets.php:23
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] "%d Einladung verfügbar"
 msgstr[1] "%d Einladungen verfügbar"
 
-#: ../../include/contact_widgets.php:28
+#: ../../include/contact_widgets.php:29
 msgid "Find People"
 msgstr "Leute finden"
 
-#: ../../include/contact_widgets.php:29
+#: ../../include/contact_widgets.php:30
 msgid "Enter name or interest"
 msgstr "Name oder Interessen eingeben"
 
-#: ../../include/contact_widgets.php:30
+#: ../../include/contact_widgets.php:31
 msgid "Connect/Follow"
 msgstr "Verbinden/Folgen"
 
-#: ../../include/contact_widgets.php:31
+#: ../../include/contact_widgets.php:32
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Beispiel: Robert Morgenstein, Angeln"
 
-#: ../../include/contact_widgets.php:66
+#: ../../include/contact_widgets.php:36
+msgid "Random Profile"
+msgstr "Zufälliges Profil"
+
+#: ../../include/contact_widgets.php:68
 msgid "Networks"
 msgstr "Netzwerke"
 
-#: ../../include/contact_widgets.php:69
+#: ../../include/contact_widgets.php:71
 msgid "All Networks"
 msgstr "Alle Netzwerke"
 
-#: ../../include/contact_widgets.php:96
+#: ../../include/contact_widgets.php:98
 msgid "Saved Folders"
 msgstr "Gespeicherte Ordner"
 
-#: ../../include/contact_widgets.php:99 ../../include/contact_widgets.php:127
+#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
 msgid "Everything"
 msgstr "Alles"
 
-#: ../../include/contact_widgets.php:124
+#: ../../include/contact_widgets.php:126
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -6087,76 +6352,76 @@ msgstr "Die Fehlermeldung lautete:"
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: ../../include/datetime.php:121 ../../include/datetime.php:253
+#: ../../include/datetime.php:131 ../../include/datetime.php:263
 msgid "year"
 msgstr "Jahr"
 
-#: ../../include/datetime.php:126 ../../include/datetime.php:254
+#: ../../include/datetime.php:136 ../../include/datetime.php:264
 msgid "month"
 msgstr "Monat"
 
-#: ../../include/datetime.php:131 ../../include/datetime.php:256
+#: ../../include/datetime.php:141 ../../include/datetime.php:266
 msgid "day"
 msgstr "Tag"
 
-#: ../../include/datetime.php:244
+#: ../../include/datetime.php:254
 msgid "never"
 msgstr "nie"
 
-#: ../../include/datetime.php:250
+#: ../../include/datetime.php:260
 msgid "less than a second ago"
 msgstr "vor weniger als einer Sekunde"
 
-#: ../../include/datetime.php:253
+#: ../../include/datetime.php:263
 msgid "years"
 msgstr "Jahre"
 
-#: ../../include/datetime.php:254
+#: ../../include/datetime.php:264
 msgid "months"
 msgstr "Monate"
 
-#: ../../include/datetime.php:255
+#: ../../include/datetime.php:265
 msgid "week"
 msgstr "Woche"
 
-#: ../../include/datetime.php:255
+#: ../../include/datetime.php:265
 msgid "weeks"
 msgstr "Wochen"
 
-#: ../../include/datetime.php:256
+#: ../../include/datetime.php:266
 msgid "days"
 msgstr "Tage"
 
-#: ../../include/datetime.php:257
+#: ../../include/datetime.php:267
 msgid "hour"
 msgstr "Stunde"
 
-#: ../../include/datetime.php:257
+#: ../../include/datetime.php:267
 msgid "hours"
 msgstr "Stunden"
 
-#: ../../include/datetime.php:258
+#: ../../include/datetime.php:268
 msgid "minute"
 msgstr "Minute"
 
-#: ../../include/datetime.php:258
+#: ../../include/datetime.php:268
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../../include/datetime.php:259
+#: ../../include/datetime.php:269
 msgid "second"
 msgstr "Sekunde"
 
-#: ../../include/datetime.php:259
+#: ../../include/datetime.php:269
 msgid "seconds"
 msgstr "Sekunden"
 
-#: ../../include/datetime.php:267
+#: ../../include/datetime.php:277
 #, php-format
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s her"
 
-#: ../../include/poller.php:533
+#: ../../include/poller.php:543
 msgid "From: "
 msgstr "Von: "
 
@@ -6164,7 +6429,7 @@ msgstr "Von: "
 msgid "$1 wrote:"
 msgstr "$1 hat geschrieben:"
 
-#: ../../include/bbcode.php:237 ../../include/bbcode.php:303
+#: ../../include/bbcode.php:238 ../../include/bbcode.php:304
 msgid "Image/photo"
 msgstr "Bild/Foto"
 
@@ -6377,11 +6642,11 @@ msgstr "Foto:"
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."
 
-#: ../../include/items.php:2656
+#: ../../include/items.php:2697
 msgid "A new person is sharing with you at "
 msgstr "Eine neue Person teilt mit dir auf "
 
-#: ../../include/items.php:2656
+#: ../../include/items.php:2697
 msgid "You have a new follower at "
 msgstr "Du hast einen neuen Kontakt auf "
 
@@ -6390,6 +6655,10 @@ msgstr "Du hast einen neuen Kontakt auf "
 msgid "image/photo"
 msgstr "Bild/Foto"
 
+#: ../../include/bb2diaspora.php:102
+msgid "link"
+msgstr "Verweis"
+
 #: ../../include/security.php:21
 msgid "Welcome "
 msgstr "Willkommen "
@@ -6406,27 +6675,32 @@ msgstr "Willkommen zurück "
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
-msgstr "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
+msgstr ""
 
-#: ../../include/Contact.php:137 ../../include/conversation.php:813
-msgid "View status"
-msgstr "Status anzeigen"
+#: ../../include/Contact.php:145 ../../include/conversation.php:809
+msgid "View Status"
+msgstr "Pinnwand anschauen"
 
-#: ../../include/Contact.php:138 ../../include/conversation.php:814
-msgid "View profile"
-msgstr "Profil anzeigen"
+#: ../../include/Contact.php:146 ../../include/conversation.php:810
+msgid "View Profile"
+msgstr "Profil anschauen"
 
-#: ../../include/Contact.php:139 ../../include/conversation.php:815
-msgid "View photos"
-msgstr "Fotos ansehen"
+#: ../../include/Contact.php:147 ../../include/conversation.php:811
+msgid "View Photos"
+msgstr "Bilder anschauen"
 
-#: ../../include/Contact.php:140 ../../include/Contact.php:153
-#: ../../include/conversation.php:816
-msgid "View recent"
-msgstr "Neueste anzeigen"
+#: ../../include/Contact.php:148 ../../include/Contact.php:161
+#: ../../include/conversation.php:812
+msgid "Network Posts"
+msgstr "Netzwerk Beiträge"
 
-#: ../../include/Contact.php:142 ../../include/Contact.php:153
-#: ../../include/conversation.php:818
+#: ../../include/Contact.php:149 ../../include/Contact.php:161
+#: ../../include/conversation.php:813
+msgid "Edit Contact"
+msgstr "Kontakt bearbeiten"
+
+#: ../../include/Contact.php:150 ../../include/Contact.php:161
+#: ../../include/conversation.php:814
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
@@ -6443,13 +6717,13 @@ msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../../include/conversation.php:334 ../../include/conversation.php:672
-#: ../../include/conversation.php:673
+#: ../../include/conversation.php:334 ../../include/conversation.php:668
+#: ../../include/conversation.php:669
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Das Profil von %s auf %s betrachten."
 
-#: ../../include/conversation.php:344 ../../include/conversation.php:684
+#: ../../include/conversation.php:344 ../../include/conversation.php:680
 #, php-format
 msgid "%s from %s"
 msgstr "%s von %s"
@@ -6505,185 +6779,185 @@ msgstr "Tag hinzufügen"
 msgid "save to folder"
 msgstr "In Ordner speichern"
 
-#: ../../include/conversation.php:674
+#: ../../include/conversation.php:670
 msgid "to"
 msgstr "zu"
 
-#: ../../include/conversation.php:675
+#: ../../include/conversation.php:671
 msgid "Wall-to-Wall"
 msgstr "Wall-to-Wall"
 
-#: ../../include/conversation.php:676
+#: ../../include/conversation.php:672
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../include/conversation.php:721
+#: ../../include/conversation.php:717
 msgid "Delete Selected Items"
 msgstr "Lösche die markierten Beiträge"
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:868
 #, php-format
 msgid "%s likes this."
 msgstr "%s mag das."
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:868
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s mag das nicht."
 
-#: ../../include/conversation.php:876
+#: ../../include/conversation.php:872
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "<span  %1$s>%2$d Leute</span> mögen das."
 
-#: ../../include/conversation.php:878
+#: ../../include/conversation.php:874
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr "<span  %1$s>%2$d Leute</span> mögen das nicht."
 
-#: ../../include/conversation.php:884
+#: ../../include/conversation.php:880
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:887
+#: ../../include/conversation.php:883
 #, php-format
 msgid ", and %d other people"
 msgstr " und %d andere"
 
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:884
 #, php-format
 msgid "%s like this."
 msgstr "%s mögen das."
 
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:884
 #, php-format
 msgid "%s don't like this."
 msgstr "%s mögen das nicht."
 
-#: ../../include/conversation.php:913
+#: ../../include/conversation.php:909
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Für <strong>jedermann</strong> sichtbar"
 
-#: ../../include/conversation.php:915
+#: ../../include/conversation.php:911
 msgid "Please enter a video link/URL:"
 msgstr "Bitte Link/URL zum Video einfügen:"
 
-#: ../../include/conversation.php:916
+#: ../../include/conversation.php:912
 msgid "Please enter an audio link/URL:"
 msgstr "Bitte Link/URL zum Audio einfügen:"
 
-#: ../../include/conversation.php:917
+#: ../../include/conversation.php:913
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:919
+#: ../../include/conversation.php:915
 msgid "Where are you right now?"
 msgstr "Wo hältst du dich jetzt gerade auf?"
 
-#: ../../include/conversation.php:962
+#: ../../include/conversation.php:958
 msgid "upload photo"
 msgstr "Bild hochladen"
 
-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:960
 msgid "attach file"
 msgstr "Datei anhängen"
 
-#: ../../include/conversation.php:966
+#: ../../include/conversation.php:962
 msgid "web link"
 msgstr "Weblink"
 
-#: ../../include/conversation.php:967
+#: ../../include/conversation.php:963
 msgid "Insert video link"
 msgstr "Video-Adresse einfügen"
 
-#: ../../include/conversation.php:968
+#: ../../include/conversation.php:964
 msgid "video link"
 msgstr "Video-Link"
 
-#: ../../include/conversation.php:969
+#: ../../include/conversation.php:965
 msgid "Insert audio link"
 msgstr "Audio-Adresse einfügen"
 
-#: ../../include/conversation.php:970
+#: ../../include/conversation.php:966
 msgid "audio link"
 msgstr "Audio-Link"
 
-#: ../../include/conversation.php:972
+#: ../../include/conversation.php:968
 msgid "set location"
 msgstr "Ort setzen"
 
-#: ../../include/conversation.php:974
+#: ../../include/conversation.php:970
 msgid "clear location"
 msgstr "Ort löschen"
 
-#: ../../include/conversation.php:981
+#: ../../include/conversation.php:977
 msgid "permissions"
 msgstr "Zugriffsrechte"
 
-#: ../../boot.php:493
+#: ../../boot.php:494
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: ../../boot.php:496
+#: ../../boot.php:497
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: ../../boot.php:744
+#: ../../boot.php:774
 msgid "Create a New Account"
 msgstr "Neuen Account erstellen"
 
-#: ../../boot.php:768
+#: ../../boot.php:798
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder Email-Adresse: "
 
-#: ../../boot.php:769
+#: ../../boot.php:799
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:772
+#: ../../boot.php:802
 msgid "Or login using OpenID: "
 msgstr "Oder melde dich mit deiner OpenID an: "
 
-#: ../../boot.php:778
+#: ../../boot.php:808
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:935
+#: ../../boot.php:975
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: ../../boot.php:994
+#: ../../boot.php:1035
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../boot.php:1109 ../../boot.php:1180
+#: ../../boot.php:1151 ../../boot.php:1223
 msgid "g A l F d"
-msgstr "l. d, F G \\U\\h\\\\r"
+msgstr "l, d. F G \\U\\h\\r"
 
-#: ../../boot.php:1110 ../../boot.php:1181
+#: ../../boot.php:1152 ../../boot.php:1224
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1135
+#: ../../boot.php:1177
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:1136
+#: ../../boot.php:1178
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:1159 ../../boot.php:1223
+#: ../../boot.php:1201 ../../boot.php:1266
 msgid "[today]"
 msgstr "[heute]"
 
-#: ../../boot.php:1204
+#: ../../boot.php:1247
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: ../../boot.php:1205
+#: ../../boot.php:1248
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1217
+#: ../../boot.php:1260
 msgid "[No description]"
 msgstr "[keine Beschreibung]"

diff --git a/view/de/strings.php b/view/de/strings.php
index 91c01f8cd841a7c57778991b15119103b80f5c22..b0b68fc1eb3b14e59cea66e3f1d2ade89ecb7e96 100644 (file)
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -128,7 +128,7 @@ $a->strings["Post to Email"] = "An E-Mail senden";
 $a->strings["Edit"] = "Bearbeiten";
 $a->strings["Upload photo"] = "Foto hochladen";
 $a->strings["Attach file"] = "Datei anhängen";
-$a->strings["Insert web link"] = "einen Weblink einfügen";
+$a->strings["Insert web link"] = "eine Kontaktanfrage";
 $a->strings["Insert YouTube video"] = "YouTube-Video einfügen";
 $a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen";
 $a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen";
@@ -155,6 +155,8 @@ $a->strings["%s has received too many connection requests today."] = "%s hat heu
 $a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen.";
 $a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen.";
 $a->strings["Invalid locator"] = "Ungültiger Locator";
+$a->strings["Invalid email address."] = "Ungültige E-Mail Adresse.";
+$a->strings["This account has not been configured for email. Request failed."] = "";
 $a->strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen an der angegebenen Stelle nicht finden.";
 $a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
 $a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits mit %s befreundet bist.";
@@ -365,6 +367,13 @@ $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
 $a->strings["Nickname or Email: "] = "Spitzname oder Email:";
 $a->strings["Reset"] = "Zurücksetzen";
+$a->strings["Account settings"] = "Account Einstellungen";
+$a->strings["Display settings"] = "Anzeige Einstellungen";
+$a->strings["Connector settings"] = "Connector-Einstellungen";
+$a->strings["Plugin settings"] = "Plugin-Einstellungen";
+$a->strings["Connected apps"] = "Verbundene Programme";
+$a->strings["Export personal data"] = "Persönliche Daten exportieren";
+$a->strings["Settings"] = "Einstellungen";
 $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!";
 $a->strings["Update"] = "Aktualisierungen";
 $a->strings["Failed to connect with email account using the settings provided."] = "Konnte das Email Konto mit den angegebenen Einstellungen nicht erreichen.";
@@ -378,12 +387,6 @@ $a->strings[" Name too short."] = " Name ist zu kurz.";
 $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["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["Account settings"] = "Account Einstellungen";
-$a->strings["Display settings"] = "Anzeige Einstellungen";
-$a->strings["Connector settings"] = "Connector-Einstellungen";
-$a->strings["Plugin settings"] = "Plugin-Einstellungen";
-$a->strings["Connections"] = "Verbindungen";
-$a->strings["Export personal data"] = "Persönliche Daten exportieren";
 $a->strings["Add application"] = "Programm hinzufügen";
 $a->strings["Consumer Key"] = "Consumer Key";
 $a->strings["Consumer Secret"] = "Consumer Secret";
@@ -471,6 +474,9 @@ $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträg
 $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)";
 $a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:";
 $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
+$a->strings["By default post a status message when:"] = "";
+$a->strings["accepting a friend request"] = "akzeptieren einer Freundschaftsanfrage";
+$a->strings["making an <em>interesting</em> profile change"] = "";
 $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";
@@ -478,7 +484,7 @@ $a->strings["Someone writes on your profile wall"] = "- jemand etwas auf deine P
 $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 wurdest in einem Beitrag erwähnt.";
+$a->strings["You are tagged in a post"] = "- du in einem Beitrag erwähnt wurdest";
 $a->strings["Advanced Page Settings"] = "Erweiterte Seiten-Einstellungen";
 $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast.";
@@ -646,6 +652,7 @@ $a->strings["No secure communications available. You <strong>may</strong> be abl
 $a->strings["Send Reply"] = "Antwort senden";
 $a->strings["Friends of %s"] = "Freunde von %s";
 $a->strings["No friends to display."] = "Keine Freunde zum Anzeigen.";
+$a->strings["Theme settings updated."] = "Themen Einstellungen aktualisiert.";
 $a->strings["Site"] = "Seite";
 $a->strings["Users"] = "Nutzer";
 $a->strings["Plugins"] = "Plugins";
@@ -672,7 +679,7 @@ $a->strings["Site name"] = "Seitenname";
 $a->strings["Banner/Logo"] = "Banner/Logo";
 $a->strings["System language"] = "Systemsprache";
 $a->strings["System theme"] = "Systemweites Thema";
-$a->strings["Default system theme - may be over-ridden by user profiles"] = "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden.";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "";
 $a->strings["SSL link policy"] = "Regeln für SSL Links";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen";
 $a->strings["Maximum image size"] = "Maximale Größe von Bildern";
@@ -696,8 +703,6 @@ $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung"
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen.";
 $a->strings["OpenID support"] = "OpenID Unterstützung";
 $a->strings["OpenID support for registration and logins."] = "OpenID-Unterstützung für Registrierung und Login.";
-$a->strings["Gravatar support"] = "Gravatar Unterstützung";
-$a->strings["Search new user's photo on Gravatar."] = "Suchfunktion bei Gravatar für Profilbilder neuer Nutzer.";
 $a->strings["Fullname check"] = "Namen auf Vollständigkeit überprüfen";
 $a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden.";
 $a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
@@ -711,7 +716,7 @@ $a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die
 $a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben";
 $a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert.";
 $a->strings["Verify SSL"] = "SSL Überprüfen";
-$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle anstellen. Das bedeutet, das man zu keinen Seiten mit selbst unterzeichneten SSL eine Verbindung herstellen kann.";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann.";
 $a->strings["Proxy user"] = "Proxy Nutzer";
 $a->strings["Proxy URL"] = "Proxy URL";
 $a->strings["Network timeout"] = "Netzwerk Wartezeit";
@@ -744,7 +749,6 @@ $a->strings["Plugin %s enabled."] = "Plugin %s aktiviert.";
 $a->strings["Disable"] = "Ausschalten";
 $a->strings["Enable"] = "Einschalten";
 $a->strings["Toggle"] = "Umschalten";
-$a->strings["Settings"] = "Einstellungen";
 $a->strings["Author: "] = "Autor:";
 $a->strings["Maintainer: "] = "Betreuer:";
 $a->strings["No themes found."] = "Keine Themen gefunden.";
@@ -775,9 +779,10 @@ $a->strings["{0} is now friends with %s"] = "{0} ist jetzt mit %s befreundet";
 $a->strings["{0} posted"] = "{0} hat etwas veröffentlicht";
 $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen";
 $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt";
+$a->strings["Contacts who are not members of a group"] = "";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet.";
-$a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
+$a->strings["Login failed."] = "Annmeldung fehlgeschlagen.";
 $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.";
 $a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden.";
@@ -796,7 +801,19 @@ $a->strings["No installed applications."] = "Keine Applikationen installiert.";
 $a->strings["Search This Site"] = "Diese Seite durchsuchen";
 $a->strings["Profile not found."] = "Profil nicht gefunden.";
 $a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
+$a->strings["Marital Status"] = "";
+$a->strings["Romantic Partner"] = "";
+$a->strings["Work/Employment"] = "";
+$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["Location"] = "";
 $a->strings["Profile updated."] = "Profil aktualisiert.";
+$a->strings["public profile"] = "";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "";
 $a->strings["Profile deleted."] = "Profil gelöscht.";
 $a->strings["Profile-"] = "Profil-";
 $a->strings["New profile created."] = "Neues Profil angelegt.";
@@ -924,7 +941,7 @@ $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen"
 $a->strings["Facebook API Key"] = "Facebook API Schlüssel";
 $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>";
 $a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden).";
-$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint korrekt zu funktionieren.";
+$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren.";
 $a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange.";
 $a->strings["App-ID / API-Key"] = "App-ID / API-Key";
 $a->strings["Application secret"] = "Anwendungs-Geheimnis";
@@ -942,7 +959,6 @@ $a->strings["Facebook post failed. Queued for retry."] = "Veröffentlichung bei
 $a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich.";
 $a->strings["Facebook connection became invalid"] = "Facebook Anmeldedaten sind ungültig geworden";
 $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hi %1\$s,\n\ndie Verbindung von deinem Account auf %2\$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du  %3\$sden Facebook-Connector neu Authentifizieren%4\$s.";
-$a->strings["link"] = "Verweis";
 $a->strings["%d person likes this"] = array(
        0 => "%d Person mag das",
        1 => "%d Leuten mögen das",
@@ -975,6 +991,8 @@ $a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expr
 $a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert";
 $a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken";
 $a->strings["Forums"] = "Foren";
+$a->strings["Planets Settings"] = "Planeten Einstellungen";
+$a->strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin";
 $a->strings["Login"] = "Anmeldung";
 $a->strings["OpenID"] = "OpenID";
 $a->strings["Latest users"] = "Letzte Benutzer";
@@ -1035,8 +1053,15 @@ $a->strings["Site Owner"] = "Betreiber der Seite";
 $a->strings["Email Address"] = "Email Adresse";
 $a->strings["Postal Address"] = "Postalische Anschrift";
 $a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Das Impressums-Plugin muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert.";
+$a->strings["The page operators name."] = "Name des Server-Administrators";
 $a->strings["Site Owners Profile"] = "Profil des Seitenbetreibers";
+$a->strings["Profile address of the operator."] = "Profil-Adresse des Server-Administrators";
+$a->strings["How to contact the operator via snail mail."] = "Wie erreicht man den Betreiber der Seite postalisch.";
 $a->strings["Notes"] = "Hinweise";
+$a->strings["Additional notes that are displayed beneath the contact information."] = "Zusätzliche Angaben, die unterhalb der Kontakt-Informationen angezeigt werden.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie erreichts man den Betreiber per Email. (Adresse wird verschleiert dargestellt)";
+$a->strings["Footer note"] = "Fußnote";
+$a->strings["Text for the footer."] = "Text für die Fußnote";
 $a->strings["Report Bug"] = "Fehlerreport erstellen";
 $a->strings["\"Blockem\" Settings"] = "\"Blockem\"-Einstellungen";
 $a->strings["Comma separated profile URLS to block"] = "Profil-URLs, die blockiert werden sollen (durch Kommas getrennt)";
@@ -1056,9 +1081,26 @@ $a->strings["Tile Server URL"] = "Tile Server URL";
 $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>";
 $a->strings["Default zoom"] = "Standard Zoom";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerk-Stream sowie privaten Nachrichten gerendert.";
+$a->strings["Use the MathJax renderer"] = "MathJax verwenden";
+$a->strings["MathJax Base URL"] = "MathJax Basis-URL";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen.";
 $a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert";
 $a->strings["Editplain Settings"] = "Editplain Einstellungen";
 $a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren";
+$a->strings["generic profile image"] = "";
+$a->strings["random geometric pattern"] = "";
+$a->strings["monster face"] = "";
+$a->strings["computer generated face"] = "";
+$a->strings["retro arcade style face"] = "";
+$a->strings["Default avatar image"] = "Standard Profilbild ";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
+$a->strings["Rating of images"] = "";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "";
+$a->strings["Gravatar settings updated."] = "";
+$a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen.";
+$a->strings["Your Friendica test account is about to expire."] = "Dein Friendica Test Konto wird bald verfallen.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "";
 $a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen";
 $a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert.";
 $a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten.";
@@ -1141,8 +1183,19 @@ $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öf
 $a->strings["Send #tag links to Twitter"] = "#Tags nach Twitter senden";
 $a->strings["Consumer key"] = "Consumer Key";
 $a->strings["Consumer secret"] = "Consumer Secret";
+$a->strings["IRC Settings"] = "IRC Einstellungen";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "";
+$a->strings["Popular Channels (comma separated)"] = "";
+$a->strings["IRC settings saved."] = "IRC Einstellungen gespeichert.";
 $a->strings["IRC Chatroom"] = "IRC Chatraum";
 $a->strings["Popular Channels"] = "Beliebte Räume";
+$a->strings["Post to blogger"] = "";
+$a->strings["Blogger Post Settings"] = "";
+$a->strings["Enable Blogger Post Plugin"] = "";
+$a->strings["Blogger username"] = "";
+$a->strings["Blogger password"] = "";
+$a->strings["Blogger API URL"] = "";
+$a->strings["Post to Blogger by default"] = "";
 $a->strings["Post to Posterous"] = "Nach Posterous senden";
 $a->strings["Posterous Post Settings"] = "Posterous Beitrags-Einstellungen";
 $a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren";
@@ -1161,7 +1214,7 @@ $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
 $a->strings["Connect Services"] = "Verbinde Dienste";
 $a->strings["PostIt to Friendica"] = "Bei Friendica posten";
 $a->strings["Post to Friendica"] = "Wenn du diesen Link";
-$a->strings[" from anywhere by bookmarking this Link."] = "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
+$a->strings[" from anywhere by bookmarking this Link."] = " zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
 $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
 $a->strings["Your profile page"] = "Deine Profilseite";
 $a->strings["Your contacts"] = "Deine Kontakte";
@@ -1171,6 +1224,9 @@ $a->strings["Your events"] = "Deine Ereignisse";
 $a->strings["Personal notes"] = "Persönliche Notizen";
 $a->strings["Your personal photos"] = "Deine privaten Fotos";
 $a->strings["Theme settings"] = "Themen Einstellungen";
+$a->strings["Set font-size for posts and comments"] = "";
+$a->strings["Set line-height for posts and comments"] = "";
+$a->strings["Set resolution for middle column"] = "";
 $a->strings["Alignment"] = "Ausrichtung";
 $a->strings["Left"] = "Links";
 $a->strings["Center"] = "Mitte";
@@ -1234,7 +1290,7 @@ $a->strings["No Preference"] = "Keine Vorlieben";
 $a->strings["Bisexual"] = "Bisexuell";
 $a->strings["Autosexual"] = "Autosexual";
 $a->strings["Abstinent"] = "Abstinent";
-$a->strings["Virgin"] = "Jungfrau";
+$a->strings["Virgin"] = "Jungfrauen";
 $a->strings["Deviant"] = "Deviant";
 $a->strings["Fetish"] = "Fetish";
 $a->strings["Oodles"] = "Oodles";
@@ -1243,6 +1299,8 @@ $a->strings["Single"] = "Single";
 $a->strings["Lonely"] = "Einsam";
 $a->strings["Available"] = "Verfügbar";
 $a->strings["Unavailable"] = "Nicht verfügbar";
+$a->strings["Has crush"] = "";
+$a->strings["Infatuated"] = "";
 $a->strings["Dating"] = "Dating";
 $a->strings["Unfaithful"] = "Untreu";
 $a->strings["Sex Addict"] = "Sexbesessen";
@@ -1251,18 +1309,21 @@ $a->strings["Friends/Benefits"] = "Freunde/Zuwendungen";
 $a->strings["Casual"] = "Casual";
 $a->strings["Engaged"] = "Verlobt";
 $a->strings["Married"] = "Verheiratet";
+$a->strings["Imaginarily married"] = "";
 $a->strings["Partners"] = "Partner";
 $a->strings["Cohabiting"] = "zusammenlebend";
+$a->strings["Common law"] = "";
 $a->strings["Happy"] = "Glücklich";
-$a->strings["Not Looking"] = "Nicht auf der Suche";
+$a->strings["Not looking"] = "Nicht auf der Suche";
 $a->strings["Swinger"] = "Swinger";
 $a->strings["Betrayed"] = "Betrogen";
 $a->strings["Separated"] = "Getrennt";
 $a->strings["Unstable"] = "Unstabil";
 $a->strings["Divorced"] = "Geschieden";
+$a->strings["Imaginarily divorced"] = "";
 $a->strings["Widowed"] = "Verwitwet";
 $a->strings["Uncertain"] = "Unsicher";
-$a->strings["Complicated"] = "Kompliziert";
+$a->strings["It's complicated"] = "Ist kompliziert";
 $a->strings["Don't care"] = "Ist mir nicht wichtig";
 $a->strings["Ask me"] = "Frag mich";
 $a->strings["Starts:"] = "Beginnt:";
@@ -1304,8 +1365,8 @@ $a->strings["remove"] = "löschen";
 $a->strings["[remove]"] = "[löschen]";
 $a->strings["Filed under:"] = "Abgelegt unter:";
 $a->strings["Click to open/close"] = "Zum öffnen/schließen klicken";
-$a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
 $a->strings["default"] = "standard";
+$a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
 $a->strings["activity"] = "Aktivität";
 $a->strings["comment"] = "Kommentar";
 $a->strings["post"] = "Beitrag";
@@ -1322,6 +1383,7 @@ $a->strings["edit"] = "bearbeiten";
 $a->strings["Groups"] = "Gruppen";
 $a->strings["Edit group"] = "Gruppe bearbeiten";
 $a->strings["Create a new group"] = "Neue Gruppe erstellen";
+$a->strings["Contacts not in any group"] = "";
 $a->strings["Logout"] = "Abmelden";
 $a->strings["End this session"] = "Diese Sitzung beenden";
 $a->strings["Status"] = "Status";
@@ -1361,6 +1423,7 @@ $a->strings["Find People"] = "Leute finden";
 $a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
 $a->strings["Connect/Follow"] = "Verbinden/Folgen";
 $a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln";
+$a->strings["Random Profile"] = "Zufälliges Profil";
 $a->strings["Networks"] = "Netzwerke";
 $a->strings["All Networks"] = "Alle Netzwerke";
 $a->strings["Saved Folders"] = "Gespeicherte Ordner";
@@ -1438,14 +1501,16 @@ $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte bes
 $a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf ";
 $a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
 $a->strings["image/photo"] = "Bild/Foto";
+$a->strings["link"] = "Verweis";
 $a->strings["Welcome "] = "Willkommen ";
 $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
 $a->strings["Welcome back "] = "Willkommen zurück ";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
-$a->strings["View status"] = "Status anzeigen";
-$a->strings["View profile"] = "Profil anzeigen";
-$a->strings["View photos"] = "Fotos ansehen";
-$a->strings["View recent"] = "Neueste anzeigen";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "";
+$a->strings["View Status"] = "Pinnwand anschauen";
+$a->strings["View Profile"] = "Profil anschauen";
+$a->strings["View Photos"] = "Bilder anschauen";
+$a->strings["Network Posts"] = "Netzwerk Beiträge";
+$a->strings["Edit Contact"] = "Kontakt bearbeiten";
 $a->strings["Send PM"] = "Private Nachricht senden";
 $a->strings["post/item"] = "Nachricht/Beitrag";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s hat %2\$s\\s %3\$s als Favorit markiert";
@@ -1503,7 +1568,7 @@ $a->strings["Or login using OpenID: "] = "Oder melde dich mit deiner OpenID an:
 $a->strings["Forgot your password?"] = "Passwort vergessen?";
 $a->strings["Edit profile"] = "Profil bearbeiten";
 $a->strings["Message"] = "Nachricht";
-$a->strings["g A l F d"] = "l. d, F G \\U\\h\\\\r";
+$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r";
 $a->strings["F d"] = "d. F";
 $a->strings["Birthday Reminders"] = "Geburtstagserinnerungen";
 $a->strings["Birthdays this week:"] = "Geburtstage diese Woche:";
@@ -1511,4 +1576,3 @@ $a->strings["[today]"] = "[heute]";
 $a->strings["Event Reminders"] = "Veranstaltungserinnerungen";
 $a->strings["Events this week:"] = "Veranstaltungen diese Woche";
 $a->strings["[No description]"] = "[keine Beschreibung]";
-$a->strings['Update Error at %s'] = 'Fehler beim Updaten von %s'; 

diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
index 4873cdd14b20d26c3f809da29437070527ebb4a7..875d83f1b5a774cbfe3d79337c9022ae651a53af 100644 (file)
--- a/view/theme/diabook-aerith/communityhome.tpl
+++ b/view/theme/diabook-aerith/communityhome.tpl
@@ -42,13 +42,6 @@ $nv.search
 {{ endif }}
 </div>
 
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
-{{ endif }}
-</div>
-
 <div id="close_lastusers">
 {{ if $lastusers_title }}
 <h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>

diff --git a/view/theme/diabook-aerith/fpostit/README b/view/theme/diabook-aerith/fpostit/README
deleted file mode 100644 (file)
index 39b7c57..0000000
--- a/view/theme/diabook-aerith/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet

diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js
deleted file mode 100644 (file)
index d183c75..0000000
--- a/view/theme/diabook-aerith/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
-                                       the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-                                               a_funct = function() {
-                                                       if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-                                                       if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-                                                       else {a_funct()}})()"
\ No newline at end of file

diff --git a/view/theme/diabook-aerith/fpostit/fpostit.php b/view/theme/diabook-aerith/fpostit/fpostit.php
deleted file mode 100644 (file)
index 4505c99..0000000
--- a/view/theme/diabook-aerith/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-       setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-       setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-       <style>
-               body {
-                       font-family: arial, Helvetica,sans-serif;
-                       margin: 0px;
-               }
-               .wrap1 {
-                       padding: 2px 5px;
-                       background-color: #000;
-                       margin-bottom: 10px;
-               }
-               .wrap2 {
-                       margin-left: 10px;
-                       font-size: 12px;
-               }
-               .logo {
-                       margin-left: 3px;
-                       margin-right: 5px;
-                       float: left;
-               }
-               h2 {
-                       color: #ffffff;
-               }
-               .error {
-                       background-color: #FFFF66;
-                       font-size: 12px;
-                       margin-left: 10px;
-               }
-       </style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-       $title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-       $text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-       $url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-       $content = "$title\nsource:$url\n\n$text";
-} else {
-       $content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-       
-       if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-               $acctname = $_POST["friendika_acct_name"];
-               $tmp_account_array = explode("@", $acctname);
-               if (isset($tmp_account_array[1])) {
-                       $username = $tmp_account_array[0];
-                       $hostname = $tmp_account_array[1];
-               }
-               $password = $_POST["friendika_password"];
-               $content = $_POST["content"];
-
-               $url = "http://" . $hostname . '/api/statuses/update';
-               $data = array('status' => $content);
-               
-               // echo "posting to: $url<br/>";
-
-               $c = curl_init();
-               curl_setopt($c, CURLOPT_URL, $url); 
-               curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-               curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-               curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-               curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-               $c_result = curl_exec($c); 
-               if(curl_errno($c)){ 
-                       $error = curl_error($c);
-                       showForm($error, $content);
-               }
-               
-               curl_close($c);
-               if (!isset($error)) {
-                       echo '<script language="javascript" type="text/javascript">window.close();</script>';
-               }
-               
-       } else {
-               $error = "Missing account name and/or password...try again please";
-               showForm($error, $content);
-       }
-       
-} else {
-       showForm(null, $content);
-}
-
-function showForm($error, $content) {
-       $username_cookie = $_COOKIE['username'];
-       $password_cookie = $_COOKIE['password'];
-       
-       echo <<<EOF
-       <div class='wrap1'>
-               <h2><img class='logo' src='friendika-32.png' align='middle';/>
-               Friendica Bookmarklet</h2>
-       </div>
-
-       <div class="wrap2">
-               <form method="post" action="{$_SERVER['PHP_SELF']}">
-                       Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-                       Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-                       Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-                       <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-                       <input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-               </form>
-               <p></p>
-       </div>
-EOF;
-       
-}
-?>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/view/theme/diabook-aerith/fpostit/friendika-32.png b/view/theme/diabook-aerith/fpostit/friendika-32.png
deleted file mode 100644 (file)
index 61764bf..0000000
Binary files a/view/theme/diabook-aerith/fpostit/friendika-32.png and /dev/null differ

diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index 82c5a257554f05ec47ebbbbf911d8beb89a25374..abab80a6af55874e92bf76612754c89bce1a4a4b 100644 (file)
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -1393,7 +1393,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px; 
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index 3471b67ad2016bbd0405ef88b0654812154fedc0..dc1fbd2851868d29ff92abb23e4d6e36e43ee04b 100644 (file)
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -1367,7 +1367,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index c798643b5c2ad8049ef2d0ec8ea545efc844eac0..358d284983313e7c0731c2445e9fad10aec502a9 100644 (file)
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-aerith
  * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.019)
+ * Version: (Version: 1.020)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.019)";
+$diabook_version = "Diabook-aerith (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 
@@ -131,14 +131,7 @@ function diabook_aerith_community_info(){
                }
        }
        
-       $fostitJS = "javascript: (function() {
-                                       the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-                                               a_funct = function() {
-                                                       if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-                                                       if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-                                                       else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
+       
    
    //nav FIND FRIENDS
        if(local_user()) {
@@ -206,13 +199,7 @@ function diabook_aerith_community_info(){
        
        $aside['$con_services'] = $con_services;
    //end connectable services
-   //postit
-   $postit = array();
-       $postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
-       $postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
-       
-       $aside['$postit'] = $postit;
-   //end postit
+   
   
    //get_baseurl             
    $url = $a->get_baseurl($ssl_state);   
@@ -255,9 +242,9 @@ if ($a->argv[0] === "network" && local_user()){
 
        }
        
-       $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+       $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
        
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
        // COMMUNITY
        diabook_aerith_community_info();
        
@@ -270,7 +257,7 @@ if ($a->argv[0] === "network" && local_user()){
 
 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
        // COMMUNITY
        diabook_aerith_community_info();
        
@@ -369,7 +356,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -394,10 +381,6 @@ $("right_aside").ready(function(){
                document.getElementById( "close_friends" ).style.display = "none";
                        };
        
-       if($.cookie("close_postit") == "1") 
-               {
-               document.getElementById( "close_postit" ).style.display = "none";
-                       };
                        
        if($.cookie("close_lastusers") == "1") 
                {
@@ -436,10 +419,6 @@ function close_friends(){
  $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
 
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
@@ -464,7 +443,6 @@ function restore_boxes(){
        $.cookie("close_helpers","2", { expires: 365, path: "/" });
        $.cookie("close_services","2", { expires: 365, path: "/" });
        $.cookie("close_friends","2", { expires: 365, path: "/" });
-       $.cookie("close_postit","2", { expires: 365, path: "/" });
        $.cookie("close_lastusers","2", { expires: 365, path: "/" });
        $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
        $.cookie("close_lastlikes","2", { expires: 365, path: "/" });

diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
index 6e126827b548c6924ae0389ca3e1a65566429b59..6ac414ef44bef7c97d55c09f43f14c58962794b9 100644 (file)
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -42,12 +42,6 @@ $nv.search
 {{ endif }}
 </div>
 
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
-{{ endif }}
-</div>
 
 <div id="close_lastusers">
 {{ if $lastusers_title }}

diff --git a/view/theme/diabook-blue/fpostit/README b/view/theme/diabook-blue/fpostit/README
deleted file mode 100644 (file)
index 39b7c57..0000000
--- a/view/theme/diabook-blue/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet

diff --git a/view/theme/diabook-blue/fpostit/fpostit.js b/view/theme/diabook-blue/fpostit/fpostit.js
deleted file mode 100644 (file)
index d183c75..0000000
--- a/view/theme/diabook-blue/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
-                                       the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-                                               a_funct = function() {
-                                                       if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-                                                       if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-                                                       else {a_funct()}})()"
\ No newline at end of file

diff --git a/view/theme/diabook-blue/fpostit/fpostit.php b/view/theme/diabook-blue/fpostit/fpostit.php
deleted file mode 100644 (file)
index 4505c99..0000000
--- a/view/theme/diabook-blue/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-       setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-       setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-       <style>
-               body {
-                       font-family: arial, Helvetica,sans-serif;
-                       margin: 0px;
-               }
-               .wrap1 {
-                       padding: 2px 5px;
-                       background-color: #000;
-                       margin-bottom: 10px;
-               }
-               .wrap2 {
-                       margin-left: 10px;
-                       font-size: 12px;
-               }
-               .logo {
-                       margin-left: 3px;
-                       margin-right: 5px;
-                       float: left;
-               }
-               h2 {
-                       color: #ffffff;
-               }
-               .error {
-                       background-color: #FFFF66;
-                       font-size: 12px;
-                       margin-left: 10px;
-               }
-       </style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-       $title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-       $text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-       $url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-       $content = "$title\nsource:$url\n\n$text";
-} else {
-       $content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-       
-       if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-               $acctname = $_POST["friendika_acct_name"];
-               $tmp_account_array = explode("@", $acctname);
-               if (isset($tmp_account_array[1])) {
-                       $username = $tmp_account_array[0];
-                       $hostname = $tmp_account_array[1];
-               }
-               $password = $_POST["friendika_password"];
-               $content = $_POST["content"];
-
-               $url = "http://" . $hostname . '/api/statuses/update';
-               $data = array('status' => $content);
-               
-               // echo "posting to: $url<br/>";
-
-               $c = curl_init();
-               curl_setopt($c, CURLOPT_URL, $url); 
-               curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-               curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-               curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-               curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-               $c_result = curl_exec($c); 
-               if(curl_errno($c)){ 
-                       $error = curl_error($c);
-                       showForm($error, $content);
-               }
-               
-               curl_close($c);
-               if (!isset($error)) {
-                       echo '<script language="javascript" type="text/javascript">window.close();</script>';
-               }
-               
-       } else {
-               $error = "Missing account name and/or password...try again please";
-               showForm($error, $content);
-       }
-       
-} else {
-       showForm(null, $content);
-}
-
-function showForm($error, $content) {
-       $username_cookie = $_COOKIE['username'];
-       $password_cookie = $_COOKIE['password'];
-       
-       echo <<<EOF
-       <div class='wrap1'>
-               <h2><img class='logo' src='friendika-32.png' align='middle';/>
-               Friendica Bookmarklet</h2>
-       </div>
-
-       <div class="wrap2">
-               <form method="post" action="{$_SERVER['PHP_SELF']}">
-                       Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-                       Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-                       Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-                       <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-                       <input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-               </form>
-               <p></p>
-       </div>
-EOF;
-       
-}
-?>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/view/theme/diabook-blue/fpostit/friendika-32.png b/view/theme/diabook-blue/fpostit/friendika-32.png
deleted file mode 100644 (file)
index 61764bf..0000000
Binary files a/view/theme/diabook-blue/fpostit/friendika-32.png and /dev/null differ

diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index d8e569338a586f5c58915833aa541a05fc7c878e..3f4756ccc8f82204156d61231e21b6ae0c1c8f58 100644 (file)
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1355,7 +1355,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px; 
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index 135cdb1c6374440cd733ff10289715cbeec3b3c8..c7b33dbc701d01db8705d89692e8f281a020cdea 100644 (file)
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -1334,7 +1334,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 9aac48c382eda50ab3eee6547f6713f8e859daff..827e36cb09bb4046b59de8c8075c18f8d5888f53 100644 (file)
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-blue
  * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.019)
+ * Version: (Version: 1.020)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-blue (Version: 1.019)";
+$diabook_version = "Diabook-blue (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -130,14 +130,6 @@ function diabook_blue_community_info(){
                }
        }
        
-       $fostitJS = "javascript: (function() {
-                                       the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-blue/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-                                               a_funct = function() {
-                                                       if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-                                                       if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-                                                       else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
    
    //nav FIND FRIENDS
        if(local_user()) {
@@ -205,13 +197,7 @@ function diabook_blue_community_info(){
        
        $aside['$con_services'] = $con_services;
    //end connectable services
-   //postit
-   $postit = array();
-       $postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
-       $postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
-       
-       $aside['$postit'] = $postit;
-   //end postit
+   
   
    //get_baseurl   
    $url = $a->get_baseurl($ssl_state);   
@@ -254,9 +240,9 @@ if ($a->argv[0] === "network" && local_user()){
 
        }
        
-       $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+       $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
        
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
        // COMMUNITY
        diabook_blue_community_info();
        
@@ -269,7 +255,7 @@ if ($a->argv[0] === "network" && local_user()){
 
 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
        // COMMUNITY
        diabook_blue_community_info();
        
@@ -369,7 +355,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -394,10 +380,6 @@ $("right_aside").ready(function(){
                document.getElementById( "close_friends" ).style.display = "none";
                        };
        
-       if($.cookie("close_postit") == "1") 
-               {
-               document.getElementById( "close_postit" ).style.display = "none";
-                       };
                        
        if($.cookie("close_lastusers") == "1") 
                {
@@ -435,11 +417,6 @@ function close_friends(){
  document.getElementById( "close_friends" ).style.display = "none";
  $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
-
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
@@ -464,7 +441,6 @@ function restore_boxes(){
        $.cookie("close_helpers","2", { expires: 365, path: "/" });
        $.cookie("close_services","2", { expires: 365, path: "/" });
        $.cookie("close_friends","2", { expires: 365, path: "/" });
-       $.cookie("close_postit","2", { expires: 365, path: "/" });
        $.cookie("close_lastusers","2", { expires: 365, path: "/" });
        $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
        $.cookie("close_lastlikes","2", { expires: 365, path: "/" });

diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl
index c47bfbda5f3a6ae27bdfc48ff434df2ff456d041..179757f4a78bb421d3ed655ca3df2a3b179cedfd 100644 (file)
--- a/view/theme/diabook-red/communityhome.tpl
+++ b/view/theme/diabook-red/communityhome.tpl
@@ -42,12 +42,6 @@ $nv.search
 {{ endif }}
 </div>
 
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
-{{ endif }}
-</div>
 
 <div id="close_lastusers">
 {{ if $lastusers_title }}

diff --git a/view/theme/diabook-red/fpostit/README b/view/theme/diabook-red/fpostit/README
deleted file mode 100644 (file)
index 39b7c57..0000000
--- a/view/theme/diabook-red/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet

diff --git a/view/theme/diabook-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js
deleted file mode 100644 (file)
index d183c75..0000000
--- a/view/theme/diabook-red/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
-                                       the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-                                               a_funct = function() {
-                                                       if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-                                                       if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-                                                       else {a_funct()}})()"
\ No newline at end of file

diff --git a/view/theme/diabook-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php
deleted file mode 100644 (file)
index 4505c99..0000000
--- a/view/theme/diabook-red/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-       setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-       setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-       <style>
-               body {
-                       font-family: arial, Helvetica,sans-serif;
-                       margin: 0px;
-               }
-               .wrap1 {
-                       padding: 2px 5px;
-                       background-color: #000;
-                       margin-bottom: 10px;
-               }
-               .wrap2 {
-                       margin-left: 10px;
-                       font-size: 12px;
-               }
-               .logo {
-                       margin-left: 3px;
-                       margin-right: 5px;
-                       float: left;
-               }
-               h2 {
-                       color: #ffffff;
-               }
-               .error {
-                       background-color: #FFFF66;
-                       font-size: 12px;
-                       margin-left: 10px;
-               }
-       </style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-       $title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-       $text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-       $url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-       $content = "$title\nsource:$url\n\n$text";
-} else {
-       $content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-       
-       if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-               $acctname = $_POST["friendika_acct_name"];
-               $tmp_account_array = explode("@", $acctname);
-               if (isset($tmp_account_array[1])) {
-                       $username = $tmp_account_array[0];
-                       $hostname = $tmp_account_array[1];
-               }
-               $password = $_POST["friendika_password"];
-               $content = $_POST["content"];
-
-               $url = "http://" . $hostname . '/api/statuses/update';
-               $data = array('status' => $content);
-               
-               // echo "posting to: $url<br/>";
-
-               $c = curl_init();
-               curl_setopt($c, CURLOPT_URL, $url); 
-               curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-               curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-               curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-               curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-               $c_result = curl_exec($c); 
-               if(curl_errno($c)){ 
-                       $error = curl_error($c);
-                       showForm($error, $content);
-               }
-               
-               curl_close($c);
-               if (!isset($error)) {
-                       echo '<script language="javascript" type="text/javascript">window.close();</script>';
-               }
-               
-       } else {
-               $error = "Missing account name and/or password...try again please";
-               showForm($error, $content);
-       }
-       
-} else {
-       showForm(null, $content);
-}
-
-function showForm($error, $content) {
-       $username_cookie = $_COOKIE['username'];
-       $password_cookie = $_COOKIE['password'];
-       
-       echo <<<EOF
-       <div class='wrap1'>
-               <h2><img class='logo' src='friendika-32.png' align='middle';/>
-               Friendica Bookmarklet</h2>
-       </div>
-
-       <div class="wrap2">
-               <form method="post" action="{$_SERVER['PHP_SELF']}">
-                       Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-                       Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-                       Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-                       <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-                       <input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-               </form>
-               <p></p>
-       </div>
-EOF;
-       
-}
-?>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/view/theme/diabook-red/fpostit/friendika-32.png b/view/theme/diabook-red/fpostit/friendika-32.png
deleted file mode 100644 (file)
index 61764bf..0000000
Binary files a/view/theme/diabook-red/fpostit/friendika-32.png and /dev/null differ

diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index 1158687113d8df9f374508c46e85eab9bc223ab0..8c0600b5a863b2850946b785efdfdaa967b434e4 100644 (file)
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -1389,7 +1389,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px; 
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index 1b2caa6c00774d41499913a1294837bf8e5ca0a8..4f5de365bfcd4fe548b3524834ecf5258ae0d666 100644 (file)
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -1347,7 +1347,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index 1ef65d83e6dc39153c8d07c5d279afb9fea44457..02b6ee5a4db7079c05688b9035129d464e9e01f7 100644 (file)
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-red
  * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.019)
+ * Version: (Version: 1.020)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-red (Version: 1.019)";
+$diabook_version = "Diabook-red (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -130,14 +130,6 @@ function diabook_red_community_info(){
                }
        }
        
-       $fostitJS = "javascript: (function() {
-                                       the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-red/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-                                               a_funct = function() {
-                                                       if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-                                                       if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-                                                       else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
    
    //nav FIND FRIENDS
        if(local_user()) {
@@ -205,13 +197,7 @@ function diabook_red_community_info(){
        
        $aside['$con_services'] = $con_services;
    //end connectable services
-   //postit
-   $postit = array();
-       $postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
-       $postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
-       
-       $aside['$postit'] = $postit;
-   //end postit
+   
   
    //get_baseurl   
    $url = $a->get_baseurl($ssl_state);   
@@ -254,9 +240,9 @@ if ($a->argv[0] === "network" && local_user()){
 
        }
        
-       $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+       $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
        
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
        // COMMUNITY
        diabook_red_community_info();
        
@@ -269,7 +255,7 @@ if ($a->argv[0] === "network" && local_user()){
 
 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
        // COMMUNITY
        diabook_red_community_info();
        
@@ -367,7 +353,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -391,11 +377,6 @@ $("right_aside").ready(function(){
                {
                document.getElementById( "close_friends" ).style.display = "none";
                        };
-       
-       if($.cookie("close_postit") == "1") 
-               {
-               document.getElementById( "close_postit" ).style.display = "none";
-                       };
                        
        if($.cookie("close_lastusers") == "1") 
                {
@@ -433,11 +414,6 @@ function close_friends(){
  document.getElementById( "close_friends" ).style.display = "none";
  $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
-
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
@@ -462,7 +438,6 @@ function restore_boxes(){
        $.cookie("close_helpers","2", { expires: 365, path: "/" });
        $.cookie("close_services","2", { expires: 365, path: "/" });
        $.cookie("close_friends","2", { expires: 365, path: "/" });
-       $.cookie("close_postit","2", { expires: 365, path: "/" });
        $.cookie("close_lastusers","2", { expires: 365, path: "/" });
        $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
        $.cookie("close_lastlikes","2", { expires: 365, path: "/" });

diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 5c2164b50aa87dd3989e4ab96286ca3a681d37ef..ff04d9da0db0657b7e6f2136ee905c388c980d74 100755 (executable)
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -42,13 +42,6 @@ $nv.search
 {{ endif }}
 </div>
 
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
-{{ endif }}
-</div>
-
 <div id="close_lastusers">
 {{ if $lastusers_title }}
 <h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>

diff --git a/view/theme/diabook/fpostit/README b/view/theme/diabook/fpostit/README
deleted file mode 100644 (file)
index 39b7c57..0000000
--- a/view/theme/diabook/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet

diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js
deleted file mode 100755 (executable)
index d183c75..0000000
--- a/view/theme/diabook/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
-                                       the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-                                               a_funct = function() {
-                                                       if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-                                                       if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-                                                       else {a_funct()}})()"
\ No newline at end of file

diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php
deleted file mode 100644 (file)
index 4505c99..0000000
--- a/view/theme/diabook/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-       setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-       setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-       <style>
-               body {
-                       font-family: arial, Helvetica,sans-serif;
-                       margin: 0px;
-               }
-               .wrap1 {
-                       padding: 2px 5px;
-                       background-color: #000;
-                       margin-bottom: 10px;
-               }
-               .wrap2 {
-                       margin-left: 10px;
-                       font-size: 12px;
-               }
-               .logo {
-                       margin-left: 3px;
-                       margin-right: 5px;
-                       float: left;
-               }
-               h2 {
-                       color: #ffffff;
-               }
-               .error {
-                       background-color: #FFFF66;
-                       font-size: 12px;
-                       margin-left: 10px;
-               }
-       </style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-       $title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-       $text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-       $url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-       $content = "$title\nsource:$url\n\n$text";
-} else {
-       $content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-       
-       if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-               $acctname = $_POST["friendika_acct_name"];
-               $tmp_account_array = explode("@", $acctname);
-               if (isset($tmp_account_array[1])) {
-                       $username = $tmp_account_array[0];
-                       $hostname = $tmp_account_array[1];
-               }
-               $password = $_POST["friendika_password"];
-               $content = $_POST["content"];
-
-               $url = "http://" . $hostname . '/api/statuses/update';
-               $data = array('status' => $content);
-               
-               // echo "posting to: $url<br/>";
-
-               $c = curl_init();
-               curl_setopt($c, CURLOPT_URL, $url); 
-               curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-               curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-               curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-               curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-               $c_result = curl_exec($c); 
-               if(curl_errno($c)){ 
-                       $error = curl_error($c);
-                       showForm($error, $content);
-               }
-               
-               curl_close($c);
-               if (!isset($error)) {
-                       echo '<script language="javascript" type="text/javascript">window.close();</script>';
-               }
-               
-       } else {
-               $error = "Missing account name and/or password...try again please";
-               showForm($error, $content);
-       }
-       
-} else {
-       showForm(null, $content);
-}
-
-function showForm($error, $content) {
-       $username_cookie = $_COOKIE['username'];
-       $password_cookie = $_COOKIE['password'];
-       
-       echo <<<EOF
-       <div class='wrap1'>
-               <h2><img class='logo' src='friendika-32.png' align='middle';/>
-               Friendica Bookmarklet</h2>
-       </div>
-
-       <div class="wrap2">
-               <form method="post" action="{$_SERVER['PHP_SELF']}">
-                       Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-                       Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-                       Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-                       <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-                       <input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-               </form>
-               <p></p>
-       </div>
-EOF;
-       
-}
-?>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/view/theme/diabook/fpostit/friendika-32.png b/view/theme/diabook/fpostit/friendika-32.png
deleted file mode 100644 (file)
index 61764bf..0000000
Binary files a/view/theme/diabook/fpostit/friendika-32.png and /dev/null differ

diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index ba45f757e2f0029846f72ca5dc69be7021d893fd..21c08e856bcc4f94c9eed1bc0c9264d7fb81573a 100644 (file)
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1331,7 +1331,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index ebde6ecfc89c4badfca073e45ba1ecca20a68500..71b0348659400360ded530b8f9c6d4fb756a660f 100644 (file)
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -1307,7 +1307,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 0fdcbf701eee91ad735e95ab6bb71be3e0314814..3ce0cc39d0b092e8a07c952d429a41f6bb3ec63e 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.019)
+ * Version: (Version: 1.020)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.019)";
+$diabook_version = "Diabook (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -136,14 +136,7 @@ function diabook_community_info(){
                }
        }
        
-       $fostitJS = "javascript: (function() {
-                                       the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-                                               a_funct = function() {
-                                                       if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-                                                       if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-                                                       else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
+       
    
    //right_aside FIND FRIENDS
        if(local_user()) {
@@ -212,13 +205,7 @@ function diabook_community_info(){
        
        $aside['$con_services'] = $con_services;
    //end connectable services
-   //postit
-   $postit = array();
-       $postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
-       $postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
-       
-       $aside['$postit'] = $postit;
-   //end postit
+  
   
    //get_baseurl
    $url = $a->get_baseurl($ssl_state);   
@@ -264,9 +251,9 @@ if ($a->argv[0] === "network" && local_user()){
 
        }
        
-       $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+       $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
        
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
        // COMMUNITY
        diabook_community_info();
 
@@ -280,7 +267,7 @@ if ($a->argv[0] === "network" && local_user()){
 
 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
        // COMMUNITY
        diabook_community_info();
        
@@ -383,7 +370,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -408,10 +395,6 @@ $("right_aside").ready(function(){
                document.getElementById( "close_friends" ).style.display = "none";
                        };
        
-       if($.cookie("close_postit") == "1") 
-               {
-               document.getElementById( "close_postit" ).style.display = "none";
-                       };
                        
        if($.cookie("close_lastusers") == "1") 
                {
@@ -450,10 +433,6 @@ function close_friends(){
  $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
 
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
@@ -478,7 +457,6 @@ function restore_boxes(){
        $.cookie("close_helpers","2", { expires: 365, path: "/" });
        $.cookie("close_services","2", { expires: 365, path: "/" });
        $.cookie("close_friends","2", { expires: 365, path: "/" });
-       $.cookie("close_postit","2", { expires: 365, path: "/" });
        $.cookie("close_lastusers","2", { expires: 365, path: "/" });
        $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
        $.cookie("close_lastlikes","2", { expires: 365, path: "/" });