diff --git a/include/features.php b/include/features.php index 263960457..87a9b46d5 100644 --- a/include/features.php +++ b/include/features.php @@ -1,23 +1,25 @@ $uid, 'feature' => $feature, 'enabled' => $x); call_hooks('feature_enabled',$arr); @@ -42,14 +44,17 @@ function get_feature_default($feature) { } /** - * @ brief get a list of all available features + * @brief Get a list of all available features + * * The array includes the setting group, the setting name, * explainations for the setting and if it's enabled or disabled * by default * + * @param bool $filtered True removes any locked features + * * @return array */ -function get_features() { +function get_features($filtered = true) { $arr = array( @@ -57,56 +62,78 @@ function get_features() { 'general' => array( t('General Features'), //array('expire', t('Content Expiration'), t('Remove old posts/comments after a period of time')), - array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles'),false), - array('photo_location', t('Photo Location'), t('Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map.'),false), + array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles'), false, get_config('feature_lock','multi_profiles')), + array('photo_location', t('Photo Location'), t('Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map.'), false, get_config('feature_lock','photo_location')), ), // Post composition 'composition' => array( t('Post Composition Features'), - array('richtext', t('Richtext Editor'), t('Enable richtext editor'),false), - array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them'),false), - array('aclautomention', t('Auto-mention Forums'), t('Add/remove mention when a fourm page is selected/deselected in ACL window.'),false), + array('richtext', t('Richtext Editor'), t('Enable richtext editor'), false, get_config('feature_lock','richtext')), + array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them'), false, get_config('feature_lock','preview')), + array('aclautomention', t('Auto-mention Forums'), t('Add/remove mention when a fourm page is selected/deselected in ACL window.'), false, get_config('feature_lock','aclautomention')), ), // Network sidebar widgets 'widgets' => array( t('Network Sidebar Widgets'), - array('archives', t('Search by Date'), t('Ability to select posts by date ranges'),false), - array('forumlist_widget', t('List Forums'), t('Enable widget to display the forums your are connected with'),true), - array('groups', t('Group Filter'), t('Enable widget to display Network posts only from selected group'),false), - array('networks', t('Network Filter'), t('Enable widget to display Network posts only from selected network'),false), - array('savedsearch', t('Saved Searches'), t('Save search terms for re-use'),false), + array('archives', t('Search by Date'), t('Ability to select posts by date ranges'), false, get_config('feature_lock','archives')), + array('forumlist_widget', t('List Forums'), t('Enable widget to display the forums your are connected with'), true, get_config('feature_lock','forumlist_widget')), + array('groups', t('Group Filter'), t('Enable widget to display Network posts only from selected group'), false, get_config('feature_lock','groups')), + array('networks', t('Network Filter'), t('Enable widget to display Network posts only from selected network'), false, get_config('feature_lock','networks')), + array('savedsearch', t('Saved Searches'), t('Save search terms for re-use'), false, get_config('feature_lock','savedsearch')), ), // Network tabs 'net_tabs' => array( t('Network Tabs'), - array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on'),false), - array('new_tab', t('Network New Tab'), t('Enable tab to display only new Network posts (from the last 12 hours)'),false), - array('link_tab', t('Network Shared Links Tab'), t('Enable tab to display only Network posts with links in them'),false), + array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on'), false, get_config('feature_lock','personal_tab')), + array('new_tab', t('Network New Tab'), t('Enable tab to display only new Network posts (from the last 12 hours)'), false, get_config('feature_lock','new_tab')), + array('link_tab', t('Network Shared Links Tab'), t('Enable tab to display only Network posts with links in them'), false, get_config('feature_lock','link_tab')), ), // Item tools 'tools' => array( t('Post/Comment Tools'), - array('multi_delete', t('Multiple Deletion'), t('Select and delete multiple posts/comments at once'),false), - array('edit_posts', t('Edit Sent Posts'), t('Edit and correct posts and comments after sending'),false), - array('commtag', t('Tagging'), t('Ability to tag existing posts'),false), - array('categories', t('Post Categories'), t('Add categories to your posts'),false), - array('filing', t('Saved Folders'), t('Ability to file posts under folders'),false), - array('dislike', t('Dislike Posts'), t('Ability to dislike posts/comments')), - array('star_posts', t('Star Posts'), t('Ability to mark special posts with a star indicator'),false), - array('ignore_posts', t('Mute Post Notifications'), t('Ability to mute notifications for a thread'),false), + array('multi_delete', t('Multiple Deletion'), t('Select and delete multiple posts/comments at once'), false, get_config('feature_lock','multi_delete')), + array('edit_posts', t('Edit Sent Posts'), t('Edit and correct posts and comments after sending'), false, get_config('feature_lock','edit_posts')), + array('commtag', t('Tagging'), t('Ability to tag existing posts'), false, get_config('feature_lock','commtag')), + array('categories', t('Post Categories'), t('Add categories to your posts'), false, get_config('feature_lock','categories')), + array('filing', t('Saved Folders'), t('Ability to file posts under folders'), false, get_config('feature_lock','filing')), + array('dislike', t('Dislike Posts'), t('Ability to dislike posts/comments'), false, get_config('feature_lock','dislike')), + array('star_posts', t('Star Posts'), t('Ability to mark special posts with a star indicator'), false, get_config('feature_lock','star_posts')), + array('ignore_posts', t('Mute Post Notifications'), t('Ability to mute notifications for a thread'), false, get_config('feature_lock','ignore_posts')), ), // Advanced Profile Settings 'advanced_profile' => array( t('Advanced Profile Settings'), - array('forumlist_profile', t('List Forums'), t('Show visitors public community forums at the Advanced Profile Page'),false), + array('forumlist_profile', t('List Forums'), t('Show visitors public community forums at the Advanced Profile Page'), false, get_config('feature_lock','forumlist_profile')), ), ); + // removed any locked features and remove the entire category if this makes it empty + + if($filtered) { + foreach($arr as $k => $x) { + $has_items = false; + $kquantity = count($arr[$k]); + for($y = 0; $y < $kquantity; $y ++) { + if(is_array($arr[$k][$y])) { + if($arr[$k][$y][4] === false) { + $has_items = true; + } + else { + unset($arr[$k][$y]); + } + } + } + if(! $has_items) { + unset($arr[$k]); + } + } + } + call_hooks('get_features',$arr); return $arr; } diff --git a/mod/admin.php b/mod/admin.php index a035b746a..95ab2b0c5 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1,13 +1,17 @@ argc > 1){ + if($a->argc > 1) { switch ($a->argv[1]){ case 'site': admin_page_site_post($a); @@ -43,8 +47,8 @@ function admin_post(&$a){ admin_page_users_post($a); break; case 'plugins': - if ($a->argc > 2 && - is_file("addon/".$a->argv[2]."/".$a->argv[2].".php")){ + if($a->argc > 2 && + is_file("addon/".$a->argv[2]."/".$a->argv[2].".php")) { @include_once("addon/".$a->argv[2]."/".$a->argv[2].".php"); if(function_exists($a->argv[2].'_plugin_admin_post')) { $func = $a->argv[2].'_plugin_admin_post'; @@ -55,14 +59,14 @@ function admin_post(&$a){ return; // NOTREACHED break; case 'themes': - if ($a->argc < 2) { + if($a->argc < 2) { if(is_ajax()) return; goaway($a->get_baseurl(true) . '/admin/' ); return; } $theme = $a->argv[2]; - if (is_file("view/theme/$theme/config.php")){ + if(is_file("view/theme/$theme/config.php")){ function __call_theme_admin_post(&$a, $theme) { $orig_theme = $a->theme; $orig_page = $a->page; @@ -74,7 +78,7 @@ function admin_post(&$a){ $init = $theme."_init"; if(function_exists($init)) $init($a); - if(function_exists("theme_admin_post")){ + if(function_exists("theme_admin_post")) { $admin_form = theme_admin_post($a); } @@ -91,6 +95,9 @@ function admin_post(&$a){ goaway($a->get_baseurl(true) . '/admin/themes/' . $theme ); return; break; + case 'features': + admin_page_features_post($a); + break; case 'logs': admin_page_logs_post($a); break; @@ -105,7 +112,7 @@ function admin_post(&$a){ } /** - * @brief generates content of the admin panel pages + * @brief Generates content of the admin panel pages * * This function generates the content for the admin panel. * @@ -127,58 +134,62 @@ function admin_content(&$a) { // apc_delete($toDelete); //} - /** + // Header stuff + $a->page['htmlhead'] .= replace_macros(get_markup_template('admin_settings_head.tpl'), array()); + + /* * Side bar links */ - $aside_tools = Array(); + $aside_tools = array(); // array( url, name, extra css classes ) // not part of $aside to make the template more adjustable - $aside_sub = Array( - 'site' => Array($a->get_baseurl(true)."/admin/site/", t("Site") , "site"), - 'users' => Array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"), - 'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"), - 'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"), - 'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"), - 'queue' => Array($a->get_baseurl(true)."/admin/queue/", t('Inspect Queue'), "queue"), - 'federation' => Array($a->get_baseurl(true)."/admin/federation/", t('Federation Statistics'), "federation"), + $aside_sub = array( + 'site' => array($a->get_baseurl(true)."/admin/site/", t("Site") , "site"), + 'users' => array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"), + 'plugins'=> array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"), + 'themes' => array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"), + 'features' => array($a->get_baseurl(true)."/admin/features/", t("Additional features") , "features"), + 'dbsync' => array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"), + 'queue' => array($a->get_baseurl(true)."/admin/queue/", t('Inspect Queue'), "queue"), + 'federation' => array($a->get_baseurl(true)."/admin/federation/", t('Federation Statistics'), "federation"), ); /* get plugins admin page */ $r = q("SELECT `name` FROM `addon` WHERE `plugin_admin`=1 ORDER BY `name`"); - $aside_tools['plugins_admin']=Array(); + $aside_tools['plugins_admin']=array(); foreach ($r as $h){ $plugin =$h['name']; - $aside['plugins_admin'][] = Array($a->get_baseurl(true)."/admin/plugins/".$plugin, $plugin, "plugin"); + $aside['plugins_admin'][] = array($a->get_baseurl(true)."/admin/plugins/".$plugin, $plugin, "plugin"); // temp plugins with admin $a->plugins_admin[] = $plugin; } - $aside_tools['logs'] = Array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs"); - $aside_tools['viewlogs'] = Array($a->get_baseurl(true)."/admin/viewlogs/", t("View Logs"), 'viewlogs'); - $aside_tools['diagnostics_probe'] = Array($a->get_baseurl(true).'/probe/', t('probe address'), 'probe'); - $aside_tools['diagnostics_webfinger'] = Array($a->get_baseurl(true).'/webfinger/', t('check webfinger'), 'webfinger'); + $aside_tools['logs'] = array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs"); + $aside_tools['viewlogs'] = array($a->get_baseurl(true)."/admin/viewlogs/", t("View Logs"), 'viewlogs'); + $aside_tools['diagnostics_probe'] = array($a->get_baseurl(true).'/probe/', t('probe address'), 'probe'); + $aside_tools['diagnostics_webfinger'] = array($a->get_baseurl(true).'/webfinger/', t('check webfinger'), 'webfinger'); $t = get_markup_template("admin_aside.tpl"); $a->page['aside'] .= replace_macros( $t, array( - '$admin' => $aside_tools, - '$subpages' => $aside_sub, - '$admtxt' => t('Admin'), - '$plugadmtxt' => t('Plugin Features'), - '$logtxt' => t('Logs'), - '$diagnosticstxt' => t('diagnostics'), - '$h_pending' => t('User registrations waiting for confirmation'), - '$admurl'=> $a->get_baseurl(true)."/admin/" + '$admin' => $aside_tools, + '$subpages' => $aside_sub, + '$admtxt' => t('Admin'), + '$plugadmtxt' => t('Plugin Features'), + '$logtxt' => t('Logs'), + '$diagnosticstxt' => t('diagnostics'), + '$h_pending' => t('User registrations waiting for confirmation'), + '$admurl'=> $a->get_baseurl(true)."/admin/" )); - /** + /* * Page content */ $o = ''; // urls - if ($a->argc > 1){ + if($a->argc > 1) { switch ($a->argv[1]){ case 'site': $o = admin_page_site($a); @@ -192,6 +203,9 @@ function admin_content(&$a) { case 'themes': $o = admin_page_themes($a); break; + case 'features': + $o = admin_page_features($a); + break; case 'logs': $o = admin_page_logs($a); break; @@ -202,10 +216,10 @@ function admin_content(&$a) { $o = admin_page_dbsync($a); break; case 'queue': - $o = admin_page_queue($a); + $o = admin_page_queue($a); break; case 'federation': - $o = admin_page_federation($a); + $o = admin_page_federation($a); break; default: notice( t("Item not found.") ); @@ -224,7 +238,7 @@ function admin_content(&$a) { } /** - * @brief subpage with some stats about "the federation" network + * @brief Subpage with some stats about "the federation" network * * This function generates the "Federation Statistics" subpage for the admin * panel. The page lists some numbers to the part of "The Federation" known to @@ -238,101 +252,105 @@ function admin_content(&$a) { * @return string */ function admin_page_federation(&$a) { - // get counts on active friendica, diaspora, redmatrix, hubzilla, gnu - // social and statusnet nodes this node is knowing - // - // We are looking for the following platforms in the DB, "Red" should find - // all variants of that platform ID string as the q() function is stripping - // off one % two of them are needed in the query - // Add more platforms if you like, when one returns 0 known nodes it is not - // displayed on the stats page. - $platforms = array('Friendica', 'Diaspora', '%%red%%', 'Hubzilla', 'GNU Social', 'StatusNet'); - $counts = array(); - foreach ($platforms as $p) { - // get a total count for the platform, the name and version of the - // highest version and the protocol tpe - $c = q('SELECT count(*) AS total, platform, network, version FROM gserver - WHERE platform LIKE "%s" AND last_contact > last_failure - ORDER BY version ASC;', $p); - // what versions for that platform do we know at all? - // again only the active nodes - $v = q('SELECT count(*) AS total, version FROM gserver - WHERE last_contact > last_failure AND platform LIKE "%s" - GROUP BY version - ORDER BY version;', $p); + // get counts on active friendica, diaspora, redmatrix, hubzilla, gnu + // social and statusnet nodes this node is knowing // - // clean up version numbers - // - // in the DB the Diaspora versions have the format x.x.x.x-xx the last - // part (-xx) should be removed to clean up the versions from the "head - // commit" information and combined into a single entry for x.x.x.x - if ($p=='Diaspora') { - $newV = array(); - $newVv = array(); - foreach($v as $vv) { - $newVC = $vv['total']; - $newVV = $vv['version']; - $posDash = strpos($newVV, '-'); - if ($posDash) - $newVV = substr($newVV, 0, $posDash); - if (isset($newV[$newVV])) - { - $newV[$newVV] += $newVC; - } else { - $newV[$newVV] = $newVC; + // We are looking for the following platforms in the DB, "Red" should find + // all variants of that platform ID string as the q() function is stripping + // off one % two of them are needed in the query + // Add more platforms if you like, when one returns 0 known nodes it is not + // displayed on the stats page. + $platforms = array('Friendica', 'Diaspora', '%%red%%', 'Hubzilla', 'GNU Social', 'StatusNet'); + $counts = array(); + + foreach ($platforms as $p) { + // get a total count for the platform, the name and version of the + // highest version and the protocol tpe + $c = q('SELECT count(*) AS total, platform, network, version FROM gserver + WHERE platform LIKE "%s" AND last_contact > last_failure + ORDER BY version ASC;', $p); + + // what versions for that platform do we know at all? + // again only the active nodes + $v = q('SELECT count(*) AS total, version FROM gserver + WHERE last_contact > last_failure AND platform LIKE "%s" + GROUP BY version + ORDER BY version;', $p); + + // + // clean up version numbers + // + // in the DB the Diaspora versions have the format x.x.x.x-xx the last + // part (-xx) should be removed to clean up the versions from the "head + // commit" information and combined into a single entry for x.x.x.x + if($p=='Diaspora') { + $newV = array(); + $newVv = array(); + foreach($v as $vv) { + $newVC = $vv['total']; + $newVV = $vv['version']; + $posDash = strpos($newVV, '-'); + if($posDash) + $newVV = substr($newVV, 0, $posDash); + if(isset($newV[$newVV])) + $newV[$newVV] += $newVC; + else + $newV[$newVV] = $newVC; + } + foreach ($newV as $key => $value) { + array_push($newVv, array('total'=>$value, 'version'=>$key)); + } + $v = $newVv; } - } - foreach ($newV as $key => $value) { - array_push($newVv, array('total'=>$value, 'version'=>$key)); - } - $v = $newVv; - } - // early friendica versions have the format x.x.xxxx where xxxx is the - // DB version stamp; those should be operated out and versions be - // conbined - if ($p=='Friendica') { - $newV = array(); - $newVv = array(); - foreach ($v as $vv) { - $newVC = $vv['total']; - $newVV = $vv['version']; - $lastDot = strrpos($newVV,'.'); - $len = strlen($newVV)-1; - if (($lastDot == $len-4) && (!strrpos($newVV,'-rc')==$len-3)) - $newVV = substr($newVV, 0, $lastDot); - if (isset($newV[$newVV])) - { - $newV[$newVV] += $newVC; - } else { - $newV[$newVV] = $newVC; + + // early friendica versions have the format x.x.xxxx where xxxx is the + // DB version stamp; those should be operated out and versions be + // conbined + if($p=='Friendica') { + $newV = array(); + $newVv = array(); + foreach ($v as $vv) { + $newVC = $vv['total']; + $newVV = $vv['version']; + $lastDot = strrpos($newVV,'.'); + $len = strlen($newVV)-1; + if(($lastDot == $len-4) && (!strrpos($newVV,'-rc')==$len-3)) + $newVV = substr($newVV, 0, $lastDot); + if(isset($newV[$newVV])) + $newV[$newVV] += $newVC; + else + $newV[$newVV] = $newVC; + } + foreach ($newV as $key => $value) { + array_push($newVv, array('total'=>$value, 'version'=>$key)); + } + $v = $newVv; } - } - foreach ($newV as $key => $value) { - array_push($newVv, array('total'=>$value, 'version'=>$key)); - } - $v = $newVv; + + // the 3rd array item is needed for the JavaScript graphs as JS does + // not like some characters in the names of variables... + $counts[$p]=array($c[0], $v, str_replace(array(' ','%'),'',$p)); } - // the 3rd array item is needed for the JavaScript graphs as JS does - // not like some characters in the names of variables... - $counts[$p]=array($c[0], $v, str_replace(array(' ','%'),'',$p)); - } - // some helpful text - $intro = t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.'); - $hint = t('The Auto Discovered Contact Directory feature is not enabled, it will improve the data displayed here.'); - // load the template, replace the macros and return the page content - $t = get_markup_template("admin_federation.tpl"); - return replace_macros($t, array( - '$title' => t('Administration'), - '$page' => t('Federation Statistics'), - '$intro' => $intro, - '$hint' => $hint, - '$autoactive' => get_config('system', 'poco_completion'), - '$counts' => $counts, - '$version' => FRIENDICA_VERSION, - '$legendtext' => t('Currently this node is aware of nodes from the following platforms:'), - '$baseurl' => $a->get_baseurl(), - )); + + // some helpful text + $intro = t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.'); + $hint = t('The Auto Discovered Contact Directory feature is not enabled, it will improve the data displayed here.'); + + // load the template, replace the macros and return the page content + $t = get_markup_template("admin_federation.tpl"); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Federation Statistics'), + '$intro' => $intro, + '$hint' => $hint, + '$autoactive' => get_config('system', 'poco_completion'), + '$counts' => $counts, + '$version' => FRIENDICA_VERSION, + '$legendtext' => t('Currently this node is aware of nodes from the following platforms:'), + '$baseurl' => $a->get_baseurl(), + )); } + /** * @brief Admin Inspect Queue Page * @@ -347,8 +365,8 @@ function admin_page_federation(&$a) { * @return string */ function admin_page_queue(&$a) { - // get content from the queue table - $r = q("SELECT c.name,c.nurl,q.id,q.network,q.created,q.last from queue as q, contact as c where c.id=q.cid order by q.cid, q.created;"); + // get content from the queue table + $r = q("SELECT c.name,c.nurl,q.id,q.network,q.created,q.last from queue as q, contact as c where c.id=q.cid order by q.cid, q.created;"); $t = get_markup_template("admin_queue.tpl"); return replace_macros($t, array( @@ -365,6 +383,7 @@ function admin_page_queue(&$a) { '$entries' => $r, )); } + /** * @brief Admin Summary Page * @@ -378,13 +397,13 @@ function admin_page_queue(&$a) { */ function admin_page_summary(&$a) { $r = q("SELECT `page-flags`, COUNT(uid) as `count` FROM `user` GROUP BY `page-flags`"); - $accounts = Array( - Array( t('Normal Account'), 0), - Array( t('Soapbox Account'), 0), - Array( t('Community/Celebrity Account'), 0), - Array( t('Automatic Friend Account'), 0), - Array( t('Blog Account'), 0), - Array( t('Private Forum'), 0) + $accounts = array( + array( t('Normal Account'), 0), + array( t('Soapbox Account'), 0), + array( t('Community/Celebrity Account'), 0), + array( t('Automatic Friend Account'), 0), + array( t('Blog Account'), 0), + array( t('Private Forum'), 0) ); $users=0; @@ -411,37 +430,37 @@ function admin_page_summary(&$a) { '$title' => t('Administration'), '$page' => t('Summary'), '$queues' => $queues, - '$users' => Array( t('Registered users'), $users), + '$users' => array( t('Registered users'), $users), '$accounts' => $accounts, - '$pending' => Array( t('Pending registrations'), $pending), - '$version' => Array( t('Version'), FRIENDICA_VERSION), + '$pending' => array( t('Pending registrations'), $pending), + '$version' => array( t('Version'), FRIENDICA_VERSION), '$baseurl' => $a->get_baseurl(), '$platform' => FRIENDICA_PLATFORM, '$codename' => FRIENDICA_CODENAME, '$build' => get_config('system','build'), - '$plugins' => Array( t('Active plugins'), $a->plugins ) + '$plugins' => array( t('Active plugins'), $a->plugins ) )); } - /** - * @brief process send data from Admin Site Page + * @brief Process send data from Admin Site Page + * * @param App $a */ -function admin_page_site_post(&$a){ - if (!x($_POST,"page_site")){ +function admin_page_site_post(&$a) { + if(!x($_POST,"page_site")) { return; } check_form_security_token_redirectOnErr('/admin/site', 'admin_site'); // relocate - if (x($_POST,'relocate') && x($_POST,'relocate_url') && $_POST['relocate_url']!=""){ + if(x($_POST,'relocate') && x($_POST,'relocate_url') && $_POST['relocate_url']!="") { $new_url = $_POST['relocate_url']; $new_url = rtrim($new_url,"/"); $parsed = @parse_url($new_url); - if (!$parsed || (!x($parsed,'host') || !x($parsed,'scheme'))) { + if(!$parsed || (!x($parsed,'host') || !x($parsed,'scheme'))) { notice(t("Can not parse base url. Must have at least ://")); goaway($a->get_baseurl(true) . '/admin/site' ); } @@ -470,7 +489,7 @@ function admin_page_site_post(&$a){ $q = sprintf("UPDATE %s SET %s;", $table_name, $upds); $r = q($q); - if (!$r) { + if(!$r) { notice( "Failed updating '$table_name': " . $db->error ); goaway($a->get_baseurl(true) . '/admin/site' ); } @@ -506,7 +525,7 @@ function admin_page_site_post(&$a){ $banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false); $shortcut_icon = ((x($_POST,'shortcut_icon')) ? notags(trim($_POST['shortcut_icon'])) : ''); $touch_icon = ((x($_POST,'touch_icon')) ? notags(trim($_POST['touch_icon'])) : ''); - $info = ((x($_POST,'info')) ? trim($_POST['info']) : false); + $info = ((x($_POST,'info')) ? trim($_POST['info']) : false); $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : ''); $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : ''); $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : ''); @@ -525,13 +544,13 @@ function admin_page_site_post(&$a){ $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); $block_public = ((x($_POST,'block_public')) ? True : False); $force_publish = ((x($_POST,'publish_all')) ? True : False); - $global_directory = ((x($_POST,'directory')) ? notags(trim($_POST['directory'])) : ''); + $global_directory = ((x($_POST,'directory')) ? notags(trim($_POST['directory'])) : ''); $thread_allow = ((x($_POST,'thread_allow')) ? True : False); - $newuser_private = ((x($_POST,'newuser_private')) ? True : False); - $enotify_no_content = ((x($_POST,'enotify_no_content')) ? True : False); - $private_addons = ((x($_POST,'private_addons')) ? True : False); - $disable_embedded = ((x($_POST,'disable_embedded')) ? True : False); - $allow_users_remote_self = ((x($_POST,'allow_users_remote_self')) ? True : False); + $newuser_private = ((x($_POST,'newuser_private')) ? True : False); + $enotify_no_content = ((x($_POST,'enotify_no_content')) ? True : False); + $private_addons = ((x($_POST,'private_addons')) ? True : False); + $disable_embedded = ((x($_POST,'disable_embedded')) ? True : False); + $allow_users_remote_self = ((x($_POST,'allow_users_remote_self')) ? True : False); $no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False); $no_openid = !((x($_POST,'no_openid')) ? True : False); @@ -577,13 +596,13 @@ function admin_page_site_post(&$a){ $proxy_disabled = ((x($_POST,'proxy_disabled')) ? True : False); $old_pager = ((x($_POST,'old_pager')) ? True : False); $only_tag_search = ((x($_POST,'only_tag_search')) ? True : False); - $rino = ((x($_POST,'rino')) ? intval($_POST['rino']) : 0); + $rino = ((x($_POST,'rino')) ? intval($_POST['rino']) : 0); $embedly = ((x($_POST,'embedly')) ? notags(trim($_POST['embedly'])) : ''); - if ($a->get_path() != "") + if($a->get_path() != "") $diaspora_enabled = false; - if (!$thread_allow) + if(!$thread_allow) $ostatus_disabled = true; if($ssl_policy != intval(get_config('system','ssl_policy'))) { @@ -647,7 +666,7 @@ function admin_page_site_post(&$a){ set_config('system','shortcut_icon',$shortcut_icon); set_config('system','touch_icon',$touch_icon); - if ($banner==""){ + if($banner=="") { // don't know why, but del_config doesn't work... q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", dbesc("system"), @@ -656,19 +675,21 @@ function admin_page_site_post(&$a){ } else { set_config('system','banner', $banner); } - if ($info=="") { + + if($info=="") { del_config('config','info'); } else { set_config('config','info',$info); } set_config('system','language', $language); set_config('system','theme', $theme); - if ( $theme_mobile === '---' ) { + + if( $theme_mobile === '---' ) { del_config('system','mobile-theme'); } else { set_config('system','mobile-theme', $theme_mobile); } - if ( $singleuser === '---' ) { + if( $singleuser === '---' ) { del_config('system','singleuser'); } else { set_config('system','singleuser', $singleuser); @@ -724,7 +745,7 @@ function admin_page_site_post(&$a){ set_config('system','only_tag_search', $only_tag_search); - if ($rino==2 and !function_exists('mcrypt_create_iv')){ + if($rino==2 and !function_exists('mcrypt_create_iv')) { notice(t("RINO2 needs mcrypt php extension to work.")); } else { set_config('system','rino_encrypt', $rino); @@ -740,7 +761,7 @@ function admin_page_site_post(&$a){ } /** - * @brief generate Admin Site subpage + * @brief Generate Admin Site subpage * * This function generates the main configuration page of the admin panel. * @@ -752,25 +773,25 @@ function admin_page_site(&$a) { /* Installed langs */ $lang_choices = get_avaiable_languages(); - if (strlen(get_config('system','directory_submit_url')) AND + if(strlen(get_config('system','directory_submit_url')) AND !strlen(get_config('system','directory'))) { - set_config('system','directory', dirname(get_config('system','directory_submit_url'))); - del_config('system','directory_submit_url'); + set_config('system','directory', dirname(get_config('system','directory_submit_url'))); + del_config('system','directory_submit_url'); } /* Installed themes */ $theme_choices = array(); $theme_choices_mobile = array(); $theme_choices_mobile["---"] = t("No special theme for mobile devices"); - $files = glob('view/theme/*'); /**/ + $files = glob('view/theme/*'); if($files) { foreach($files as $file) { - if (intval(file_exists($file . '/unsupported'))) + if(intval(file_exists($file . '/unsupported'))) continue; $f = basename($file); $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f); - if (file_exists($file . '/mobile')) { + if(file_exists($file . '/mobile')) { $theme_choices_mobile[$f] = $theme_name; } else { $theme_choices[$f] = $theme_name; @@ -833,7 +854,7 @@ function admin_page_site(&$a) { //echo "
"; var_dump($lang_choices); die("
"); /* Register policy */ - $register_choices = Array( + $register_choices = array( REGISTER_CLOSED => t("Closed"), REGISTER_APPROVE => t("Requires approval"), REGISTER_OPEN => t("Open") @@ -845,7 +866,7 @@ function admin_page_site(&$a) { SSL_POLICY_SELFSIGN => t("Self-signed certificate, use SSL for local links only (discouraged)") ); - if ($a->config['hostname'] == "") + if($a->config['hostname'] == "") $a->config['hostname'] = $a->get_hostname(); $diaspora_able = ($a->get_path() == ""); @@ -870,7 +891,7 @@ function admin_page_site(&$a) { '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), get_config('system','shortcut_icon'), t("Link to an icon that will be used for browsers.")), '$touch_icon' => array('touch_icon', t("Touch icon"), get_config('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")), - '$info' => array('info',t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), + '$info' => array('info',t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile), @@ -880,8 +901,8 @@ function admin_page_site(&$a) { '$hide_help' => array('hide_help', t("Hide help entry from navigation menu"), get_config('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")), '$singleuser' => array('singleuser', t("Single user instance"), get_config('system','singleuser'), t("Make this instance multi-user or single-user for the named user"), $user_names), '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), - '$maximagelength' => array('maximagelength', t("Maximum image length"), get_config('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")), - '$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")), + '$maximagelength' => array('maximagelength', t("Maximum image length"), get_config('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")), + '$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")), '$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices), '$daily_registrations' => array('max_daily_registrations', t("Maximum Daily Registrations"), get_config('system', 'max_daily_registrations'), t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect.")), @@ -897,7 +918,7 @@ function admin_page_site(&$a) { '$enotify_no_content' => array('enotify_no_content', t("Don't include post content in email notifications"), get_config('system','enotify_no_content'), t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")), '$private_addons' => array('private_addons', t("Disallow public access to addons listed in the apps menu."), get_config('config','private_addons'), t("Checking this box will restrict addons listed in the apps menu to members only.")), '$disable_embedded' => array('disable_embedded', t("Don't embed private images in posts"), get_config('system','disable_embedded'), t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")), - '$allow_users_remote_self' => array('allow_users_remote_self', t('Allow Users to set remote_self'), get_config('system','allow_users_remote_self'), t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')), + '$allow_users_remote_self' => array('allow_users_remote_self', t('Allow Users to set remote_self'), get_config('system','allow_users_remote_self'), t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')), '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")), '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")), '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")), @@ -905,12 +926,12 @@ function admin_page_site(&$a) { '$community_page_style' => array('community_page_style', t("Community Page Style"), get_config('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices), '$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), get_config('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")), '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), - '$ostatus_poll_interval' => array('ostatus_poll_interval', t("OStatus conversation completion interval"), (string) intval(get_config('system','ostatus_poll_interval')), t("How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."), $ostatus_poll_choices), + '$ostatus_poll_interval' => array('ostatus_poll_interval', t("OStatus conversation completion interval"), (string) intval(get_config('system','ostatus_poll_interval')), t("How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."), $ostatus_poll_choices), '$ostatus_not_able' => t("OStatus support can only be enabled if threading is enabled."), '$diaspora_able' => $diaspora_able, '$diaspora_not_able' => t("Diaspora support can't be enabled because Friendica was installed into a sub directory."), - '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")), - '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")), + '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")), + '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")), '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")), '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), @@ -948,14 +969,14 @@ function admin_page_site(&$a) { '$rino' => array('rino', t("RINO Encryption"), intval(get_config('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")), '$embedly' => array('embedly', t("Embedly API key"), get_config('system','embedly'), t("Embedly is used to fetch additional data for web pages. This is an optional parameter.")), - '$form_security_token' => get_form_security_token("admin_site") + '$form_security_token' => get_form_security_token("admin_site") )); } /** - * @brief generates admin panel subpage for DB syncronization + * @brief Generates admin panel subpage for DB syncronization * * This page checks if the database of friendica is in sync with the specs. * Should this not be the case, it attemps to sync the structure and notifies @@ -982,17 +1003,17 @@ function admin_page_dbsync(&$a) { if(($a->argc > 2) AND (intval($a->argv[2]) OR ($a->argv[2] === 'check'))) { require_once("include/dbstructure.php"); $retval = update_structure(false, true); - if (!$retval) { + if(!$retval) { $o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION)."
"; set_config('database', 'dbupdate_'.DB_UPDATE_VERSION, 'success'); } else $o .= sprintf(t("Executing of database structure update %s failed with error: %s"), DB_UPDATE_VERSION, $retval)."
"; - if ($a->argv[2] === 'check') + if($a->argv[2] === 'check') return $o; } - if ($a->argc > 2 && intval($a->argv[2])) { + if($a->argc > 2 && intval($a->argv[2])) { require_once('update.php'); $func = 'update_' . intval($a->argv[2]); if(function_exists($func)) { @@ -1045,19 +1066,20 @@ function admin_page_dbsync(&$a) { } /** - * @brief process data send by Users admin page + * @brief Process data send by Users admin page + * * @param App $a */ function admin_page_users_post(&$a){ - $pending = ( x($_POST, 'pending') ? $_POST['pending'] : Array() ); - $users = ( x($_POST, 'user') ? $_POST['user'] : Array() ); - $nu_name = ( x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); - $nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); - $nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); + $pending = ( x($_POST, 'pending') ? $_POST['pending'] : array() ); + $users = ( x($_POST, 'user') ? $_POST['user'] : array() ); + $nu_name = ( x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); + $nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); + $nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); check_form_security_token_redirectOnErr('/admin/users', 'admin_users'); - if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { + if(!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { require_once('include/user.php'); $result = create_user( array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1) ); @@ -1107,7 +1129,7 @@ function admin_page_users_post(&$a){ } - if (x($_POST,'page_users_block')){ + if(x($_POST,'page_users_block')) { foreach($users as $uid){ q("UPDATE `user` SET `blocked`=1-`blocked` WHERE `uid`=%s", intval( $uid ) @@ -1115,7 +1137,7 @@ function admin_page_users_post(&$a){ } notice( sprintf( tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)), count($users)) ); } - if (x($_POST,'page_users_delete')){ + if(x($_POST,'page_users_delete')) { require_once("include/Contact.php"); foreach($users as $uid){ user_remove($uid); @@ -1123,13 +1145,13 @@ function admin_page_users_post(&$a){ notice( sprintf( tt("%s user deleted", "%s users deleted", count($users)), count($users)) ); } - if (x($_POST,'page_users_approve')){ + if(x($_POST,'page_users_approve')) { require_once("mod/regmod.php"); foreach($pending as $hash){ user_allow($hash); } } - if (x($_POST,'page_users_deny')){ + if(x($_POST,'page_users_deny')) { require_once("mod/regmod.php"); foreach($pending as $hash){ user_deny($hash); @@ -1140,7 +1162,7 @@ function admin_page_users_post(&$a){ } /** - * @brief admin panel subpage for User management + * @brief Admin panel subpage for User management * * This function generates the admin panel page for user management of the * node. It offers functionality to add/block/delete users and offers some @@ -1152,10 +1174,10 @@ function admin_page_users_post(&$a){ * @return string */ function admin_page_users(&$a){ - if ($a->argc>2) { + if($a->argc>2) { $uid = $a->argv[3]; $user = q("SELECT username, blocked FROM `user` WHERE `uid`=%d", intval($uid)); - if (count($user)==0){ + if(count($user)==0) { notice( 'User not found' . EOL); goaway($a->get_baseurl(true) . '/admin/users' ); return ''; // NOTREACHED @@ -1191,14 +1213,12 @@ function admin_page_users(&$a){ /* get users */ - $total = q("SELECT count(*) as total FROM `user` where 1"); if(count($total)) { $a->set_pager_total($total[0]['total']); $a->set_pager_itemspage(100); } - $users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired` FROM (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid` @@ -1219,7 +1239,7 @@ function admin_page_users(&$a){ $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email'])); $_setup_users = function ($e) use ($adminlist){ - $accounts = Array( + $accounts = array( t('Normal Account'), t('Soapbox Account'), t('Community/Celebrity Account'), @@ -1241,11 +1261,11 @@ function admin_page_users(&$a){ // Get rid of dashes in key names, Smarty3 can't handle them // and extracting deleted users - $tmp_users = Array(); - $deleted = Array(); + $tmp_users = array(); + $deleted = array(); while(count($users)) { - $new_user = Array(); + $new_user = array(); foreach( array_pop($users) as $k => $v) { $k = str_replace('-','_',$k); $new_user[$k] = $v; @@ -1298,9 +1318,9 @@ function admin_page_users(&$a){ '$pending' => $pending, 'deleted' => $deleted, '$users' => $users, - '$newusername' => array('new_user_name', t("Name"), '', t("Name of the new user.")), - '$newusernickname' => array('new_user_nickname', t("Nickname"), '', t("Nickname of the new user.")), - '$newuseremail' => array('new_user_email', t("Email"), '', t("Email address of the new user."), '', '', 'email'), + '$newusername' => array('new_user_name', t("Name"), '', t("Name of the new user.")), + '$newusernickname' => array('new_user_nickname', t("Nickname"), '', t("Nickname of the new user.")), + '$newuseremail' => array('new_user_email', t("Email"), '', t("Email address of the new user."), '', '', 'email'), )); $o .= paginate($a); return $o; @@ -1325,22 +1345,22 @@ function admin_page_users(&$a){ */ function admin_page_plugins(&$a){ - /** + /* * Single plugin */ - if ($a->argc == 3){ + if($a->argc == 3) { $plugin = $a->argv[2]; - if (!is_file("addon/$plugin/$plugin.php")){ + if(!is_file("addon/$plugin/$plugin.php")) { notice( t("Item not found.") ); return ''; } - if (x($_GET,"a") && $_GET['a']=="t"){ + if(x($_GET,"a") && $_GET['a']=="t") { check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't'); // Toggle plugin status $idx = array_search($plugin, $a->plugins); - if ($idx !== false){ + if($idx !== false) { unset($a->plugins[$idx]); uninstall_plugin($plugin); info( sprintf( t("Plugin %s disabled."), $plugin ) ); @@ -1353,25 +1373,26 @@ function admin_page_plugins(&$a){ goaway($a->get_baseurl(true) . '/admin/plugins' ); return ''; // NOTREACHED } + // display plugin details require_once('library/markdown.php'); - if (in_array($plugin, $a->plugins)){ + if(in_array($plugin, $a->plugins)) { $status="on"; $action= t("Disable"); } else { $status="off"; $action= t("Enable"); } $readme=Null; - if (is_file("addon/$plugin/README.md")){ + if(is_file("addon/$plugin/README.md")) { $readme = file_get_contents("addon/$plugin/README.md"); $readme = Markdown($readme); - } else if (is_file("addon/$plugin/README")){ + } elseif(is_file("addon/$plugin/README")) { $readme = "
". file_get_contents("addon/$plugin/README") ."
"; } $admin_form=""; - if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)){ + if(is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)) { @require_once("addon/$plugin/$plugin.php"); $func = $plugin.'_plugin_admin'; $func($a, $admin_form); @@ -1404,11 +1425,11 @@ function admin_page_plugins(&$a){ - /** + /* * List plugins */ - if (x($_GET,"a") && $_GET['a']=="r"){ + if(x($_GET,"a") && $_GET['a']=="r") { check_form_security_token_redirectOnErr($a->get_baseurl().'/admin/plugins', 'admin_themes', 't'); reload_plugins(); info("Plugins reloaded"); @@ -1416,23 +1437,23 @@ function admin_page_plugins(&$a){ } $plugins = array(); - $files = glob("addon/*/"); /* */ + $files = glob("addon/*/"); if($files) { foreach($files as $file) { - if (is_dir($file)){ + if(is_dir($file)) { list($tmp, $id)=array_map("trim", explode("/",$file)); $info = get_plugin_info($id); $show_plugin = true; // If the addon is unsupported, then only show it, when it is enabled - if ((strtolower($info["status"]) == "unsupported") AND !in_array($id, $a->plugins)) + if((strtolower($info["status"]) == "unsupported") AND !in_array($id, $a->plugins)) $show_plugin = false; // Override the above szenario, when the admin really wants to see outdated stuff - if (get_config("system", "show_unsupported_addons")) + if(get_config("system", "show_unsupported_addons")) $show_plugin = true; - if ($show_plugin) + if($show_plugin) $plugins[] = array($id, (in_array($id, $a->plugins)?"on":"off") , $info); } } @@ -1539,7 +1560,7 @@ function admin_page_themes(&$a){ $allowed_themes[] = trim($x); $themes = array(); - $files = glob('view/theme/*'); /* */ + $files = glob('view/theme/*'); if($files) { foreach($files as $file) { $f = basename($file); @@ -1547,7 +1568,7 @@ function admin_page_themes(&$a){ $is_supported = 1-(intval(file_exists($file . '/unsupported'))); $is_allowed = intval(in_array($f,$allowed_themes)); - if ($is_allowed OR $is_supported OR get_config("system", "show_unsupported_themes")) + if($is_allowed OR $is_supported OR get_config("system", "show_unsupported_themes")) $themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed); } } @@ -1557,18 +1578,18 @@ function admin_page_themes(&$a){ return ''; } - /** + /* * Single theme */ - if ($a->argc == 3){ + if($a->argc == 3) { $theme = $a->argv[2]; - if(! is_dir("view/theme/$theme")){ + if(! is_dir("view/theme/$theme")) { notice( t("Item not found.") ); return ''; } - if (x($_GET,"a") && $_GET['a']=="t"){ + if(x($_GET,"a") && $_GET['a']=="t") { check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't'); // Toggle theme status @@ -1592,22 +1613,22 @@ function admin_page_themes(&$a){ // display theme details require_once('library/markdown.php'); - if (theme_status($themes,$theme)) { + if(theme_status($themes,$theme)) { $status="on"; $action= t("Disable"); } else { $status="off"; $action= t("Enable"); } $readme=Null; - if (is_file("view/theme/$theme/README.md")){ + if(is_file("view/theme/$theme/README.md")) { $readme = file_get_contents("view/theme/$theme/README.md"); $readme = Markdown($readme); - } else if (is_file("view/theme/$theme/README")){ + } elseif(is_file("view/theme/$theme/README")) { $readme = "
". file_get_contents("view/theme/$theme/README") ."
"; } $admin_form=""; - if (is_file("view/theme/$theme/config.php")){ + if(is_file("view/theme/$theme/config.php")) { function __get_theme_admin_form(&$a, $theme) { $orig_theme = $a->theme; $orig_page = $a->page; @@ -1619,7 +1640,7 @@ function admin_page_themes(&$a){ $init = $theme."_init"; if(function_exists($init)) $init($a); - if(function_exists("theme_admin")){ + if(function_exists("theme_admin")) { $admin_form = theme_admin($a); } @@ -1660,11 +1681,11 @@ function admin_page_themes(&$a){ // reload active themes - if (x($_GET,"a") && $_GET['a']=="r"){ + if(x($_GET,"a") && $_GET['a']=="r") { check_form_security_token_redirectOnErr($a->get_baseurl().'/admin/themes', 'admin_themes', 't'); - if ($themes) { + if($themes) { foreach($themes as $th) { - if ($th['allowed']) { + if($th['allowed']) { uninstall_theme($th['name']); install_theme($th['name']); } @@ -1674,7 +1695,7 @@ function admin_page_themes(&$a){ goaway($a->get_baseurl().'/admin/themes'); } - /** + /* * List themes */ @@ -1705,17 +1726,17 @@ function admin_page_themes(&$a){ /** - * @brief prosesses data send by Logs admin page + * @brief Prosesses data send by Logs admin page + * * @param App $a */ - function admin_page_logs_post(&$a) { - if (x($_POST,"page_logs")) { + if(x($_POST,"page_logs")) { check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs'); - $logfile = ((x($_POST,'logfile')) ? notags(trim($_POST['logfile'])) : ''); - $debugging = ((x($_POST,'debugging')) ? true : false); - $loglevel = ((x($_POST,'loglevel')) ? intval(trim($_POST['loglevel'])) : 0); + $logfile = ((x($_POST,'logfile')) ? notags(trim($_POST['logfile'])) : ''); + $debugging = ((x($_POST,'debugging')) ? true : false); + $loglevel = ((x($_POST,'loglevel')) ? intval(trim($_POST['loglevel'])) : 0); set_config('system','logfile', $logfile); set_config('system','debugging', $debugging); @@ -1728,7 +1749,7 @@ function admin_page_logs_post(&$a) { } /** - * @brief generates admin panel subpage for configuration of the logs + * @brief Generates admin panel subpage for configuration of the logs * * This function take the view/templates/admin_logs.tpl file and generates a * page where admin can configure the logging of friendica. @@ -1745,7 +1766,7 @@ function admin_page_logs_post(&$a) { */ function admin_page_logs(&$a){ - $log_choices = Array( + $log_choices = array( LOGGER_NORMAL => 'Normal', LOGGER_TRACE => 'Trace', LOGGER_DEBUG => 'Debug', @@ -1763,10 +1784,10 @@ function admin_page_logs(&$a){ '$baseurl' => $a->get_baseurl(true), '$logname' => get_config('system','logfile'), - // name, label, value, help string, extra data... - '$debugging' => array('debugging', t("Enable Debugging"),get_config('system','debugging'), ""), - '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")), - '$loglevel' => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices), + // name, label, value, help string, extra data... + '$debugging' => array('debugging', t("Enable Debugging"),get_config('system','debugging'), ""), + '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")), + '$loglevel' => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices), '$form_security_token' => get_form_security_token("admin_logs"), '$phpheader' => t("PHP logging"), @@ -1776,7 +1797,7 @@ function admin_page_logs(&$a){ } /** - * @brief generates admin panel subpage to view the Friendica log + * @brief Generates admin panel subpage to view the Friendica log * * This function loads the template view/templates/admin_viewlogs.tpl to * display the systemlog content. The filename for the systemlog of friendica @@ -1809,8 +1830,7 @@ function admin_page_viewlogs(&$a){ else { $fstat = fstat($fp); $size = $fstat['size']; - if($size != 0) - { + if($size != 0) { if($size > 5000000 || $size < 0) $size = 5000000; $seek = fseek($fp,0-$size,SEEK_END); @@ -1830,3 +1850,87 @@ function admin_page_viewlogs(&$a){ '$logname' => get_config('system','logfile') )); } + +/** + * @brief Prosesses data send by the features admin page + * + * @param App $a + */ +function admin_page_features_post(&$a) { + + check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features'); + + logger('postvars: ' . print_r($_POST,true),LOGGER_DATA); + + $arr = array(); + $features = get_features(false); + + foreach($features as $fname => $fdata) { + foreach(array_slice($fdata,1) as $f) { + $feature = $f[0]; + $feature_state = 'feature_' . $feature; + $featurelock = 'featurelock_' . $feature; + + if(x($_POST[$feature_state])) + $val = intval($_POST['feature_' . $feature]); + else + $val = 0; + set_config('feature',$feature,$val); + + if(x($_POST[$featurelock])) + set_config('feature_lock',$feature,$val); + else + del_config('feature_lock',$feature); + } + } + + goaway($a->get_baseurl(true) . '/admin/features' ); + return; // NOTREACHED +} + +/** + * @brief Subpage for global additional feature management + * + * This functin generates the subpage 'Manage Additional Features' + * for the admin panel. At this page the admin can set preferences + * for the user settings of the 'additional features'. If needed this + * preferences can be locked through the admin. + * + * The returned string contains the HTML code of the subpage 'Manage + * Additional Features' + * + * @param App $a + * @return string + */ +function admin_page_features(&$a) { + + if((argc() > 1) && (argv(1) === 'features')) { + $arr = array(); + $features = get_features(false); + + foreach($features as $fname => $fdata) { + $arr[$fname] = array(); + $arr[$fname][0] = $fdata[0]; + foreach(array_slice($fdata,1) as $f) { + + $set = get_config('feature',$f[0]); + if($set === false) + $set = $f[3]; + $arr[$fname][1][] = array( + array('feature_' .$f[0],$f[1],$set,$f[2],array(t('Off'),t('On'))), + array('featurelock_' .$f[0],sprintf( t('Lock feature %s'),$f[1]),(($f[4] !== false) ? "1" : ''),'',array(t('Off'),t('On'))) + ); + } + } + + $tpl = get_markup_template("admin_settings_features.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("admin_manage_features"), + '$title' => t('Manage Additional Features'), + '$features' => $arr, + '$submit' => t('Save Settings'), + )); + + return $o; + } +} diff --git a/mod/friendica.php b/mod/friendica.php index 9fa203f58..aad5964ba 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -29,10 +29,21 @@ function friendica_init(&$a) { $visible_plugins[] = $rr['name']; } + load_config('feature_lock'); + $locked_features = array(); + if(is_array($a->config['feature_lock']) && count($a->config['feature_lock'])) { + foreach($a->config['feature_lock'] as $k => $v) { + if($k === 'config_loaded') + continue; + $locked_features[$k] = intval($v); + } + } + $data = Array( 'version' => FRIENDICA_VERSION, 'url' => z_root(), 'plugins' => $visible_plugins, + 'locked_features' => $locked_features, 'register_policy' => $register_policy[$a->config['register_policy']], 'admin' => $admin, 'site_name' => $a->config['sitename'], diff --git a/mod/settings.php b/mod/settings.php index 02a6955a0..3efdbf6bd 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -43,57 +43,67 @@ function settings_init(&$a) { 'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''), 'accesskey' => 'o', ), - array( - 'label' => t('Additional features'), - 'url' => $a->get_baseurl(true).'/settings/features', - 'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''), - 'accesskey' => 't', - ), - array( - 'label' => t('Display'), - 'url' => $a->get_baseurl(true).'/settings/display', - 'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), - 'accesskey' => 'i', - ), - - array( - 'label' => t('Social Networks'), - 'url' => $a->get_baseurl(true).'/settings/connectors', - 'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''), - 'accesskey' => 'w', - ), - array( - 'label' => t('Plugins'), - 'url' => $a->get_baseurl(true).'/settings/addon', - 'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''), - 'accesskey' => 'l', - ), - array( - 'label' => t('Delegations'), - 'url' => $a->get_baseurl(true).'/delegate', - 'selected' => (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''), - 'accesskey' => 'd', - ), - array( - 'label' => t('Connected apps'), - 'url' => $a->get_baseurl(true) . '/settings/oauth', - 'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''), - 'accesskey' => 'b', - ), - array( - 'label' => t('Export personal data'), - 'url' => $a->get_baseurl(true) . '/uexport', - 'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''), - 'accesskey' => 'e', - ), - array( - 'label' => t('Remove account'), - 'url' => $a->get_baseurl(true) . '/removeme', - 'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''), - 'accesskey' => 'r', - ) ); + if(get_features()) { + $tabs[] = array( + 'label' => t('Additional features'), + 'url' => $a->get_baseurl(true).'/settings/features', + 'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''), + 'accesskey' => 't', + ); + } + + $tabs[] = array( + 'label' => t('Display'), + 'url' => $a->get_baseurl(true).'/settings/display', + 'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), + 'accesskey' => 'i', + ); + + $tabs[] = array( + 'label' => t('Social Networks'), + 'url' => $a->get_baseurl(true).'/settings/connectors', + 'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''), + 'accesskey' => 'w', + ); + + $tabs[] = array( + 'label' => t('Plugins'), + 'url' => $a->get_baseurl(true).'/settings/addon', + 'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''), + 'accesskey' => 'l', + ); + + $tabs[] = array( + 'label' => t('Delegations'), + 'url' => $a->get_baseurl(true).'/delegate', + 'selected' => (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''), + 'accesskey' => 'd', + ); + + $tabs[] = array( + 'label' => t('Connected apps'), + 'url' => $a->get_baseurl(true) . '/settings/oauth', + 'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''), + 'accesskey' => 'b', + ); + + $tabs[] = array( + 'label' => t('Export personal data'), + 'url' => $a->get_baseurl(true) . '/uexport', + 'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''), + 'accesskey' => 'e', + ); + + $tabs[] = array( + 'label' => t('Remove account'), + 'url' => $a->get_baseurl(true) . '/removeme', + 'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''), + 'accesskey' => 'r', + ); + + $tabtpl = get_markup_template("generic_links_widget.tpl"); $a->page['aside'] = replace_macros($tabtpl, array( '$title' => t('Settings'), @@ -622,7 +632,6 @@ function settings_post(&$a) { } -if(! function_exists('settings_content')) { function settings_content(&$a) { $o = ''; @@ -747,7 +756,7 @@ function settings_content(&$a) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach(array_slice($fdata,1) as $f) { - $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(get_pconfig(local_user(),'feature',$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); } } @@ -1287,5 +1296,5 @@ function settings_content(&$a) { return $o; -}} +} diff --git a/view/de/messages.po b/view/de/messages.po index f209b453f..ca8d2d0a2 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -32,8 +32,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-27 08:40+0100\n" -"PO-Revision-Date: 2016-01-03 07:15+0000\n" +"POT-Creation-Date: 2016-01-16 16:21+0100\n" +"PO-Revision-Date: 2016-01-17 21:19+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -42,15 +42,15 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mod/contacts.php:50 include/identity.php:389 +#: mod/contacts.php:50 include/identity.php:395 msgid "Network:" msgstr "Netzwerk" -#: mod/contacts.php:51 mod/contacts.php:986 mod/videos.php:37 -#: mod/viewcontacts.php:105 mod/dirfind.php:208 mod/network.php:596 +#: mod/contacts.php:51 mod/contacts.php:961 mod/videos.php:37 +#: mod/viewcontacts.php:105 mod/dirfind.php:214 mod/network.php:598 #: mod/allfriends.php:77 mod/match.php:82 mod/directory.php:172 #: mod/common.php:123 mod/suggest.php:95 mod/photos.php:41 -#: include/identity.php:295 +#: include/identity.php:298 msgid "Forum" msgstr "Forum" @@ -61,7 +61,7 @@ msgid_plural "%d contacts edited" msgstr[0] "%d Kontakt bearbeitet." msgstr[1] "%d Kontakte bearbeitet" -#: mod/contacts.php:159 mod/contacts.php:382 +#: mod/contacts.php:159 mod/contacts.php:383 msgid "Could not access contact record." msgstr "Konnte nicht auf die Kontaktdaten zugreifen." @@ -73,15 +73,15 @@ msgstr "Konnte das ausgewählte Profil nicht finden." msgid "Contact updated." msgstr "Kontakt aktualisiert." -#: mod/contacts.php:208 mod/dfrn_request.php:578 +#: mod/contacts.php:208 mod/dfrn_request.php:575 msgid "Failed to update contact record." msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." -#: mod/contacts.php:364 mod/manage.php:96 mod/display.php:493 +#: mod/contacts.php:365 mod/manage.php:96 mod/display.php:504 #: mod/profile_photo.php:19 mod/profile_photo.php:175 #: mod/profile_photo.php:186 mod/profile_photo.php:199 -#: mod/ostatus_subscribe.php:9 mod/follow.php:10 mod/follow.php:72 -#: mod/follow.php:137 mod/item.php:169 mod/item.php:181 mod/group.php:19 +#: mod/ostatus_subscribe.php:9 mod/follow.php:11 mod/follow.php:73 +#: mod/follow.php:155 mod/item.php:180 mod/item.php:192 mod/group.php:19 #: mod/dfrn_confirm.php:55 mod/fsuggest.php:78 mod/wall_upload.php:77 #: mod/wall_upload.php:80 mod/viewcontacts.php:40 mod/notifications.php:69 #: mod/message.php:45 mod/message.php:181 mod/crepair.php:117 @@ -95,123 +95,123 @@ msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." #: mod/api.php:26 mod/api.php:31 mod/notes.php:22 mod/poke.php:149 #: mod/repair_ostatus.php:9 mod/invite.php:15 mod/invite.php:101 #: mod/photos.php:171 mod/photos.php:1105 mod/regmod.php:110 -#: mod/uimport.php:23 mod/attach.php:33 include/items.php:5070 index.php:383 +#: mod/uimport.php:23 mod/attach.php:33 include/items.php:5073 index.php:383 msgid "Permission denied." msgstr "Zugriff verweigert." -#: mod/contacts.php:403 +#: mod/contacts.php:404 msgid "Contact has been blocked" msgstr "Kontakt wurde blockiert" -#: mod/contacts.php:403 +#: mod/contacts.php:404 msgid "Contact has been unblocked" msgstr "Kontakt wurde wieder freigegeben" -#: mod/contacts.php:414 +#: mod/contacts.php:415 msgid "Contact has been ignored" msgstr "Kontakt wurde ignoriert" -#: mod/contacts.php:414 +#: mod/contacts.php:415 msgid "Contact has been unignored" msgstr "Kontakt wird nicht mehr ignoriert" -#: mod/contacts.php:426 +#: mod/contacts.php:427 msgid "Contact has been archived" msgstr "Kontakt wurde archiviert" -#: mod/contacts.php:426 +#: mod/contacts.php:427 msgid "Contact has been unarchived" msgstr "Kontakt wurde aus dem Archiv geholt" -#: mod/contacts.php:453 mod/contacts.php:801 +#: mod/contacts.php:454 mod/contacts.php:802 msgid "Do you really want to delete this contact?" msgstr "Möchtest Du wirklich diesen Kontakt löschen?" -#: mod/contacts.php:455 mod/follow.php:105 mod/message.php:216 +#: mod/contacts.php:456 mod/follow.php:110 mod/message.php:216 #: mod/settings.php:1094 mod/settings.php:1100 mod/settings.php:1108 #: mod/settings.php:1112 mod/settings.php:1117 mod/settings.php:1123 #: mod/settings.php:1129 mod/settings.php:1135 mod/settings.php:1161 #: mod/settings.php:1162 mod/settings.php:1163 mod/settings.php:1164 -#: mod/settings.php:1165 mod/dfrn_request.php:850 mod/register.php:238 +#: mod/settings.php:1165 mod/dfrn_request.php:857 mod/register.php:238 #: mod/suggest.php:29 mod/profiles.php:658 mod/profiles.php:661 -#: mod/profiles.php:687 mod/api.php:105 include/items.php:4902 +#: mod/profiles.php:687 mod/api.php:105 include/items.php:4905 msgid "Yes" msgstr "Ja" -#: mod/contacts.php:458 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:116 +#: mod/contacts.php:459 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121 #: mod/videos.php:131 mod/message.php:219 mod/fbrowser.php:93 #: mod/fbrowser.php:128 mod/settings.php:651 mod/settings.php:677 -#: mod/dfrn_request.php:864 mod/suggest.php:32 mod/editpost.php:148 -#: mod/photos.php:247 mod/photos.php:336 include/conversation.php:1221 -#: include/items.php:4905 +#: mod/dfrn_request.php:871 mod/suggest.php:32 mod/editpost.php:148 +#: mod/photos.php:247 mod/photos.php:336 include/conversation.php:1220 +#: include/items.php:4908 msgid "Cancel" msgstr "Abbrechen" -#: mod/contacts.php:470 +#: mod/contacts.php:471 msgid "Contact has been removed." msgstr "Kontakt wurde entfernt." -#: mod/contacts.php:511 +#: mod/contacts.php:512 #, php-format msgid "You are mutual friends with %s" msgstr "Du hast mit %s eine beidseitige Freundschaft" -#: mod/contacts.php:515 +#: mod/contacts.php:516 #, php-format msgid "You are sharing with %s" msgstr "Du teilst mit %s" -#: mod/contacts.php:520 +#: mod/contacts.php:521 #, php-format msgid "%s is sharing with you" msgstr "%s teilt mit Dir" -#: mod/contacts.php:540 +#: mod/contacts.php:541 msgid "Private communications are not available for this contact." msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." -#: mod/contacts.php:543 mod/admin.php:647 +#: mod/contacts.php:544 mod/admin.php:790 msgid "Never" msgstr "Niemals" -#: mod/contacts.php:547 +#: mod/contacts.php:548 msgid "(Update was successful)" msgstr "(Aktualisierung war erfolgreich)" -#: mod/contacts.php:547 +#: mod/contacts.php:548 msgid "(Update was not successful)" msgstr "(Aktualisierung war nicht erfolgreich)" -#: mod/contacts.php:549 +#: mod/contacts.php:550 msgid "Suggest friends" msgstr "Kontakte vorschlagen" -#: mod/contacts.php:553 +#: mod/contacts.php:554 #, php-format msgid "Network type: %s" msgstr "Netzwerktyp: %s" -#: mod/contacts.php:566 +#: mod/contacts.php:567 msgid "Communications lost with this contact!" msgstr "Verbindungen mit diesem Kontakt verloren!" -#: mod/contacts.php:569 +#: mod/contacts.php:570 msgid "Fetch further information for feeds" msgstr "Weitere Informationen zu Feeds holen" -#: mod/contacts.php:570 mod/admin.php:656 +#: mod/contacts.php:571 mod/admin.php:799 msgid "Disabled" msgstr "Deaktiviert" -#: mod/contacts.php:570 +#: mod/contacts.php:571 msgid "Fetch information" msgstr "Beziehe Information" -#: mod/contacts.php:570 +#: mod/contacts.php:571 msgid "Fetch information and keywords" msgstr "Beziehe Information und Schlüsselworte" -#: mod/contacts.php:586 mod/manage.php:143 mod/fsuggest.php:107 +#: mod/contacts.php:587 mod/manage.php:143 mod/fsuggest.php:107 #: mod/message.php:342 mod/message.php:525 mod/crepair.php:196 #: mod/events.php:574 mod/content.php:712 mod/install.php:261 #: mod/install.php:299 mod/mood.php:137 mod/profiles.php:696 @@ -221,308 +221,308 @@ msgstr "Beziehe Information und Schlüsselworte" #: object/Item.php:710 view/theme/cleanzero/config.php:80 #: view/theme/dispy/config.php:70 view/theme/quattro/config.php:64 #: view/theme/diabook/config.php:148 view/theme/diabook/theme.php:633 -#: view/theme/clean/config.php:83 view/theme/vier/config.php:107 -#: view/theme/duepuntozero/config.php:59 +#: view/theme/vier/config.php:107 view/theme/duepuntozero/config.php:59 msgid "Submit" msgstr "Senden" -#: mod/contacts.php:587 +#: mod/contacts.php:588 msgid "Profile Visibility" msgstr "Profil-Sichtbarkeit" -#: mod/contacts.php:588 +#: mod/contacts.php:589 #, 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:589 +#: mod/contacts.php:590 msgid "Contact Information / Notes" msgstr "Kontakt Informationen / Notizen" -#: mod/contacts.php:590 +#: mod/contacts.php:591 msgid "Edit contact notes" msgstr "Notizen zum Kontakt bearbeiten" -#: mod/contacts.php:595 mod/contacts.php:977 mod/viewcontacts.php:97 +#: mod/contacts.php:596 mod/contacts.php:952 mod/viewcontacts.php:97 #: mod/nogroup.php:41 #, php-format msgid "Visit %s's profile [%s]" msgstr "Besuche %ss Profil [%s]" -#: mod/contacts.php:596 +#: mod/contacts.php:597 msgid "Block/Unblock contact" msgstr "Kontakt blockieren/freischalten" -#: mod/contacts.php:597 +#: mod/contacts.php:598 msgid "Ignore contact" msgstr "Ignoriere den Kontakt" -#: mod/contacts.php:598 +#: mod/contacts.php:599 msgid "Repair URL settings" msgstr "URL Einstellungen reparieren" -#: mod/contacts.php:599 +#: mod/contacts.php:600 msgid "View conversations" msgstr "Unterhaltungen anzeigen" -#: mod/contacts.php:601 +#: mod/contacts.php:602 msgid "Delete contact" msgstr "Lösche den Kontakt" -#: mod/contacts.php:605 +#: mod/contacts.php:606 msgid "Last update:" msgstr "Letzte Aktualisierung: " -#: mod/contacts.php:607 +#: mod/contacts.php:608 msgid "Update public posts" msgstr "Öffentliche Beiträge aktualisieren" -#: mod/contacts.php:609 mod/admin.php:1656 +#: mod/contacts.php:610 msgid "Update now" msgstr "Jetzt aktualisieren" -#: mod/contacts.php:611 mod/dirfind.php:190 mod/allfriends.php:65 -#: mod/match.php:71 mod/suggest.php:82 include/contact_widgets.php:32 -#: include/Contact.php:310 include/conversation.php:924 +#: mod/contacts.php:612 mod/follow.php:103 mod/dirfind.php:196 +#: mod/allfriends.php:65 mod/match.php:71 mod/suggest.php:82 +#: include/contact_widgets.php:32 include/Contact.php:297 +#: include/conversation.php:924 msgid "Connect/Follow" msgstr "Verbinden/Folgen" -#: mod/contacts.php:614 mod/contacts.php:805 mod/contacts.php:864 -#: mod/admin.php:1120 +#: mod/contacts.php:615 mod/contacts.php:806 mod/contacts.php:865 +#: mod/admin.php:1281 msgid "Unblock" msgstr "Entsperren" -#: mod/contacts.php:614 mod/contacts.php:805 mod/contacts.php:864 -#: mod/admin.php:1119 +#: mod/contacts.php:615 mod/contacts.php:806 mod/contacts.php:865 +#: mod/admin.php:1280 msgid "Block" msgstr "Sperren" -#: mod/contacts.php:615 mod/contacts.php:806 mod/contacts.php:871 +#: mod/contacts.php:616 mod/contacts.php:807 mod/contacts.php:872 msgid "Unignore" msgstr "Ignorieren aufheben" -#: mod/contacts.php:615 mod/contacts.php:806 mod/contacts.php:871 +#: mod/contacts.php:616 mod/contacts.php:807 mod/contacts.php:872 #: mod/notifications.php:54 mod/notifications.php:179 #: mod/notifications.php:259 msgid "Ignore" msgstr "Ignorieren" -#: mod/contacts.php:618 +#: mod/contacts.php:619 msgid "Currently blocked" msgstr "Derzeit geblockt" -#: mod/contacts.php:619 +#: mod/contacts.php:620 msgid "Currently ignored" msgstr "Derzeit ignoriert" -#: mod/contacts.php:620 +#: mod/contacts.php:621 msgid "Currently archived" msgstr "Momentan archiviert" -#: mod/contacts.php:621 mod/notifications.php:172 mod/notifications.php:251 +#: mod/contacts.php:622 mod/notifications.php:172 mod/notifications.php:251 msgid "Hide this contact from others" msgstr "Verbirg diesen Kontakt vor andere" -#: mod/contacts.php:621 +#: mod/contacts.php:622 msgid "" "Replies/likes to your public posts may still be visible" msgstr "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein" -#: mod/contacts.php:622 +#: mod/contacts.php:623 msgid "Notification for new posts" msgstr "Benachrichtigung bei neuen Beiträgen" -#: mod/contacts.php:622 +#: mod/contacts.php:623 msgid "Send a notification of every new post of this contact" msgstr "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt." -#: mod/contacts.php:625 +#: mod/contacts.php:626 msgid "Blacklisted keywords" msgstr "Blacklistete Schlüsselworte " -#: mod/contacts.php:625 +#: mod/contacts.php:626 msgid "" "Comma separated list of keywords that should not be converted to hashtags, " "when \"Fetch information and keywords\" is selected" msgstr "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde" -#: mod/contacts.php:632 mod/follow.php:121 mod/notifications.php:255 +#: mod/contacts.php:633 mod/follow.php:126 mod/notifications.php:255 msgid "Profile URL" msgstr "Profil URL" -#: mod/contacts.php:635 mod/follow.php:125 mod/notifications.php:244 -#: mod/events.php:566 mod/directory.php:145 include/identity.php:304 -#: include/bb2diaspora.php:170 include/event.php:36 include/event.php:60 +#: mod/contacts.php:636 mod/notifications.php:244 mod/events.php:566 +#: mod/directory.php:145 include/identity.php:308 include/bb2diaspora.php:170 +#: include/event.php:36 include/event.php:60 msgid "Location:" msgstr "Ort:" -#: mod/contacts.php:637 mod/follow.php:127 mod/notifications.php:246 -#: mod/directory.php:153 include/identity.php:313 include/identity.php:630 +#: mod/contacts.php:638 mod/notifications.php:246 mod/directory.php:153 +#: include/identity.php:317 include/identity.php:631 msgid "About:" msgstr "Über:" -#: mod/contacts.php:639 mod/follow.php:129 mod/notifications.php:248 -#: include/identity.php:624 +#: mod/contacts.php:640 mod/follow.php:134 mod/notifications.php:248 +#: include/identity.php:625 msgid "Tags:" msgstr "Tags" -#: mod/contacts.php:684 +#: mod/contacts.php:685 msgid "Suggestions" msgstr "Kontaktvorschläge" -#: mod/contacts.php:687 +#: mod/contacts.php:688 msgid "Suggest potential friends" msgstr "Freunde vorschlagen" -#: mod/contacts.php:692 mod/group.php:192 +#: mod/contacts.php:693 mod/group.php:192 msgid "All Contacts" msgstr "Alle Kontakte" -#: mod/contacts.php:695 +#: mod/contacts.php:696 msgid "Show all contacts" msgstr "Alle Kontakte anzeigen" -#: mod/contacts.php:700 +#: mod/contacts.php:701 msgid "Unblocked" msgstr "Ungeblockt" -#: mod/contacts.php:703 +#: mod/contacts.php:704 msgid "Only show unblocked contacts" msgstr "Nur nicht-blockierte Kontakte anzeigen" -#: mod/contacts.php:709 +#: mod/contacts.php:710 msgid "Blocked" msgstr "Geblockt" -#: mod/contacts.php:712 +#: mod/contacts.php:713 msgid "Only show blocked contacts" msgstr "Nur blockierte Kontakte anzeigen" -#: mod/contacts.php:718 +#: mod/contacts.php:719 msgid "Ignored" msgstr "Ignoriert" -#: mod/contacts.php:721 +#: mod/contacts.php:722 msgid "Only show ignored contacts" msgstr "Nur ignorierte Kontakte anzeigen" -#: mod/contacts.php:727 +#: mod/contacts.php:728 msgid "Archived" msgstr "Archiviert" -#: mod/contacts.php:730 +#: mod/contacts.php:731 msgid "Only show archived contacts" msgstr "Nur archivierte Kontakte anzeigen" -#: mod/contacts.php:736 +#: mod/contacts.php:737 msgid "Hidden" msgstr "Verborgen" -#: mod/contacts.php:739 +#: mod/contacts.php:740 msgid "Only show hidden contacts" msgstr "Nur verborgene Kontakte anzeigen" -#: mod/contacts.php:792 mod/contacts.php:840 mod/viewcontacts.php:116 +#: mod/contacts.php:793 mod/contacts.php:841 mod/viewcontacts.php:116 #: include/identity.php:741 include/identity.php:744 include/text.php:1012 #: include/nav.php:123 include/nav.php:187 view/theme/diabook/theme.php:125 msgid "Contacts" msgstr "Kontakte" -#: mod/contacts.php:796 +#: mod/contacts.php:797 msgid "Search your contacts" msgstr "Suche in deinen Kontakten" -#: mod/contacts.php:797 +#: mod/contacts.php:798 msgid "Finding: " msgstr "Funde: " -#: mod/contacts.php:798 mod/directory.php:210 include/contact_widgets.php:34 +#: mod/contacts.php:799 mod/directory.php:210 include/contact_widgets.php:34 msgid "Find" msgstr "Finde" -#: mod/contacts.php:804 mod/settings.php:146 mod/settings.php:676 +#: mod/contacts.php:805 mod/settings.php:146 mod/settings.php:676 msgid "Update" msgstr "Aktualisierungen" -#: mod/contacts.php:807 mod/contacts.php:878 +#: mod/contacts.php:808 mod/contacts.php:879 msgid "Archive" msgstr "Archivieren" -#: mod/contacts.php:807 mod/contacts.php:878 +#: mod/contacts.php:808 mod/contacts.php:879 msgid "Unarchive" msgstr "Aus Archiv zurückholen" -#: mod/contacts.php:808 mod/group.php:171 mod/admin.php:1118 +#: mod/contacts.php:809 mod/group.php:171 mod/admin.php:1279 #: mod/content.php:440 mod/content.php:743 mod/settings.php:713 #: mod/photos.php:1723 object/Item.php:134 include/conversation.php:635 msgid "Delete" msgstr "Löschen" -#: mod/contacts.php:821 include/identity.php:686 include/nav.php:75 +#: mod/contacts.php:822 include/identity.php:686 include/nav.php:75 msgid "Status" msgstr "Status" -#: mod/contacts.php:824 include/identity.php:689 +#: mod/contacts.php:825 mod/follow.php:143 include/identity.php:689 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" -#: mod/contacts.php:829 mod/profperm.php:104 mod/newmember.php:32 -#: include/identity.php:578 include/identity.php:664 include/identity.php:694 +#: mod/contacts.php:830 mod/profperm.php:104 mod/newmember.php:32 +#: include/identity.php:579 include/identity.php:665 include/identity.php:694 #: include/nav.php:76 view/theme/diabook/theme.php:124 msgid "Profile" msgstr "Profil" -#: mod/contacts.php:832 include/identity.php:697 +#: mod/contacts.php:833 include/identity.php:697 msgid "Profile Details" msgstr "Profildetails" -#: mod/contacts.php:843 +#: mod/contacts.php:844 msgid "View all contacts" msgstr "Alle Kontakte anzeigen" -#: mod/contacts.php:849 mod/common.php:134 +#: mod/contacts.php:850 mod/common.php:134 msgid "Common Friends" msgstr "Gemeinsame Freunde" -#: mod/contacts.php:852 +#: mod/contacts.php:853 msgid "View all common friends" msgstr "Alle Kontakte anzeigen" -#: mod/contacts.php:856 +#: mod/contacts.php:857 msgid "Repair" msgstr "Reparieren" -#: mod/contacts.php:859 +#: mod/contacts.php:860 msgid "Advanced Contact Settings" msgstr "Fortgeschrittene Kontakteinstellungen" -#: mod/contacts.php:867 +#: mod/contacts.php:868 msgid "Toggle Blocked status" msgstr "Geblockt-Status ein-/ausschalten" -#: mod/contacts.php:874 +#: mod/contacts.php:875 msgid "Toggle Ignored status" msgstr "Ignoriert-Status ein-/ausschalten" -#: mod/contacts.php:881 +#: mod/contacts.php:882 msgid "Toggle Archive status" msgstr "Archiviert-Status ein-/ausschalten" -#: mod/contacts.php:949 +#: mod/contacts.php:924 msgid "Mutual Friendship" msgstr "Beidseitige Freundschaft" -#: mod/contacts.php:953 +#: mod/contacts.php:928 msgid "is a fan of yours" msgstr "ist ein Fan von dir" -#: mod/contacts.php:957 +#: mod/contacts.php:932 msgid "you are a fan of" msgstr "Du bist Fan von" -#: mod/contacts.php:978 mod/nogroup.php:42 +#: mod/contacts.php:953 mod/nogroup.php:42 msgid "Edit contact" msgstr "Kontakt bearbeiten" @@ -572,23 +572,23 @@ msgstr "Sichtbar für" msgid "All Contacts (with secure profile access)" msgstr "Alle Kontakte (mit gesichertem Profilzugriff)" -#: mod/display.php:82 mod/display.php:280 mod/display.php:497 -#: mod/viewsrc.php:15 mod/admin.php:196 mod/admin.php:1163 mod/admin.php:1384 -#: mod/notice.php:15 include/items.php:4861 +#: mod/display.php:82 mod/display.php:291 mod/display.php:508 +#: mod/viewsrc.php:15 mod/admin.php:211 mod/admin.php:1334 mod/admin.php:1567 +#: mod/notice.php:15 include/items.php:4864 msgid "Item not found." msgstr "Beitrag nicht gefunden." -#: mod/display.php:209 mod/videos.php:197 mod/viewcontacts.php:35 -#: mod/community.php:18 mod/dfrn_request.php:779 mod/search.php:93 +#: mod/display.php:220 mod/videos.php:197 mod/viewcontacts.php:35 +#: mod/community.php:18 mod/dfrn_request.php:786 mod/search.php:93 #: mod/search.php:99 mod/directory.php:37 mod/photos.php:976 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." -#: mod/display.php:328 mod/profile.php:155 +#: mod/display.php:339 mod/profile.php:155 msgid "Access to this profile has been restricted." msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." -#: mod/display.php:490 +#: mod/display.php:501 msgid "Item has been removed." msgstr "Eintrag wurde entfernt." @@ -623,7 +623,7 @@ msgid "" " join." msgstr "Auf der Quick Start Seite findest Du eine kurze Einleitung in die einzelnen Funktionen Deines Profils und die Netzwerk-Reiter, wo Du interessante Foren findest und neue Kontakte knüpfst." -#: mod/newmember.php:22 mod/admin.php:1215 mod/admin.php:1460 +#: mod/newmember.php:22 mod/admin.php:1386 mod/admin.php:1644 #: mod/settings.php:99 include/nav.php:182 view/theme/diabook/theme.php:544 #: view/theme/diabook/theme.php:648 msgid "Settings" @@ -685,60 +685,44 @@ msgstr "Trage ein paar öffentliche Stichwörter in Dein Standardprofil ein, die msgid "Connecting" msgstr "Verbindungen knüpfen" -#: mod/newmember.php:49 mod/newmember.php:51 include/contact_selectors.php:81 -msgid "Facebook" -msgstr "Facebook" - -#: mod/newmember.php:49 -msgid "" -"Authorise the Facebook Connector if you currently have a Facebook account " -"and we will (optionally) import all your Facebook friends and conversations." -msgstr "Richte die Verbindung zu Facebook ein, wenn Du im Augenblick ein Facebook-Konto hast und (optional) Deine Facebook-Freunde und -Unterhaltungen importieren willst." - #: mod/newmember.php:51 -msgid "" -"If this is your own personal server, installing the Facebook addon " -"may ease your transition to the free social web." -msgstr "Wenn dies Dein privater Server ist, könnte die Installation des Facebook Connectors Deinen Umzug ins freie soziale Netz angenehmer gestalten." - -#: mod/newmember.php:56 msgid "Importing Emails" msgstr "Emails Importieren" -#: mod/newmember.php:56 +#: mod/newmember.php:51 msgid "" "Enter your email access information on your Connector Settings page if you " "wish to import and interact with friends or mailing lists from your email " "INBOX" msgstr "Gib Deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls Du E-Mails aus Deinem Posteingang importieren und mit Freunden und Mailinglisten interagieren willst." -#: mod/newmember.php:58 +#: mod/newmember.php:53 msgid "Go to Your Contacts Page" msgstr "Gehe zu deiner Kontakt-Seite" -#: mod/newmember.php:58 +#: mod/newmember.php:53 msgid "" "Your Contacts page is your gateway to managing friendships and connecting " "with friends on other networks. Typically you enter their address or site " "URL in the Add New Contact dialog." msgstr "Die Kontakte-Seite ist die Einstiegsseite, von der aus Du Kontakte verwalten und Dich mit Freunden in anderen Netzwerken verbinden kannst. Normalerweise gibst Du dazu einfach ihre Adresse oder die URL der Seite im Kasten Neuen Kontakt hinzufügen ein." -#: mod/newmember.php:60 +#: mod/newmember.php:55 msgid "Go to Your Site's Directory" msgstr "Gehe zum Verzeichnis Deiner Friendica Instanz" -#: mod/newmember.php:60 +#: mod/newmember.php:55 msgid "" "The Directory page lets you find other people in this network or other " "federated sites. Look for a Connect or Follow link on " "their profile page. Provide your own Identity Address if requested." msgstr "Über die Verzeichnisseite kannst Du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem Verbinden oder Folgen Link auf deren Profilseiten Ausschau und gib Deine eigene Profiladresse an, falls Du danach gefragt wirst." -#: mod/newmember.php:62 +#: mod/newmember.php:57 msgid "Finding New People" msgstr "Neue Leute kennenlernen" -#: mod/newmember.php:62 +#: mod/newmember.php:57 msgid "" "On the side panel of the Contacts page are several tools to find new " "friends. We can match people by interest, look up people by name or " @@ -747,41 +731,41 @@ msgid "" "hours." msgstr "Im seitlichen Bedienfeld der Kontakteseite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden." -#: mod/newmember.php:66 include/group.php:283 +#: mod/newmember.php:61 include/group.php:283 msgid "Groups" msgstr "Gruppen" -#: mod/newmember.php:70 +#: mod/newmember.php:65 msgid "Group Your Contacts" msgstr "Gruppiere deine Kontakte" -#: mod/newmember.php:70 +#: mod/newmember.php:65 msgid "" "Once you have made some friends, organize them into private conversation " "groups from the sidebar of your Contacts page and then you can interact with" " each group privately on your Network page." msgstr "Sobald Du einige Freunde gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren." -#: mod/newmember.php:73 +#: mod/newmember.php:68 msgid "Why Aren't My Posts Public?" msgstr "Warum sind meine Beiträge nicht öffentlich?" -#: mod/newmember.php:73 +#: mod/newmember.php:68 msgid "" "Friendica respects your privacy. By default, your posts will only show up to" " people you've added as friends. For more information, see the help section " "from the link above." msgstr "Friendica respektiert Deine Privatsphäre. Mit der Grundeinstellung werden Deine Beiträge ausschließlich Deinen Kontakten angezeigt. Für weitere Informationen diesbezüglich lies Dir bitte den entsprechenden Abschnitt in der Hilfe unter dem obigen Link durch." -#: mod/newmember.php:78 +#: mod/newmember.php:73 msgid "Getting Help" msgstr "Hilfe bekommen" -#: mod/newmember.php:82 +#: mod/newmember.php:77 msgid "Go to the Help Section" msgstr "Zum Hilfe Abschnitt gehen" -#: mod/newmember.php:82 +#: mod/newmember.php:77 msgid "" "Our help pages may be consulted for detail on other program" " features and resources." @@ -796,7 +780,7 @@ msgid "" "Account not found and OpenID registration is not permitted on this site." msgstr "Nutzerkonto wurde nicht gefunden und OpenID-Registrierung ist auf diesem Server nicht gestattet." -#: mod/openid.php:93 include/auth.php:112 include/auth.php:175 +#: mod/openid.php:93 include/auth.php:118 include/auth.php:181 msgid "Login failed." msgstr "Anmeldung fehlgeschlagen." @@ -882,18 +866,18 @@ msgstr "Bild erfolgreich hochgeladen." msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." -#: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:168 +#: mod/subthread.php:87 mod/tagger.php:62 include/like.php:165 #: include/conversation.php:130 include/conversation.php:266 #: include/text.php:1993 include/diaspora.php:2147 #: view/theme/diabook/theme.php:471 msgid "photo" msgstr "Foto" -#: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:168 mod/like.php:346 -#: include/conversation.php:125 include/conversation.php:134 -#: include/conversation.php:261 include/conversation.php:270 -#: include/diaspora.php:2147 view/theme/diabook/theme.php:466 -#: view/theme/diabook/theme.php:475 +#: mod/subthread.php:87 mod/tagger.php:62 include/like.php:165 +#: include/like.php:325 include/conversation.php:125 +#: include/conversation.php:134 include/conversation.php:261 +#: include/conversation.php:270 include/diaspora.php:2147 +#: view/theme/diabook/theme.php:466 view/theme/diabook/theme.php:475 msgid "status" msgstr "Status" @@ -954,8 +938,8 @@ msgstr "Ignoriert" msgid "Keep this window open until done." msgstr "Lasse dieses Fenster offen, bis der Vorgang abgeschlossen ist." -#: mod/filer.php:30 include/conversation.php:1133 -#: include/conversation.php:1151 +#: mod/filer.php:30 include/conversation.php:1132 +#: include/conversation.php:1150 msgid "Save to Folder:" msgstr "In diesem Ordner speichern:" @@ -968,54 +952,54 @@ msgstr "- auswählen -" msgid "Save" msgstr "Speichern" -#: mod/follow.php:18 mod/dfrn_request.php:863 +#: mod/follow.php:19 mod/dfrn_request.php:870 msgid "Submit Request" msgstr "Anfrage abschicken" -#: mod/follow.php:29 +#: mod/follow.php:30 msgid "You already added this contact." msgstr "Du hast den Kontakt bereits hinzugefügt." -#: mod/follow.php:38 +#: mod/follow.php:39 msgid "Diaspora support isn't enabled. Contact can't be added." msgstr "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden." -#: mod/follow.php:45 +#: mod/follow.php:46 msgid "OStatus support is disabled. Contact can't be added." msgstr "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden." -#: mod/follow.php:52 +#: mod/follow.php:53 msgid "The network type couldn't be detected. Contact can't be added." msgstr "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden." -#: mod/follow.php:104 mod/dfrn_request.php:849 +#: mod/follow.php:109 mod/dfrn_request.php:856 msgid "Please answer the following:" msgstr "Bitte beantworte folgendes:" -#: mod/follow.php:105 mod/dfrn_request.php:850 +#: mod/follow.php:110 mod/dfrn_request.php:857 #, php-format msgid "Does %s know you?" msgstr "Kennt %s Dich?" -#: mod/follow.php:105 mod/settings.php:1094 mod/settings.php:1100 +#: mod/follow.php:110 mod/settings.php:1094 mod/settings.php:1100 #: mod/settings.php:1108 mod/settings.php:1112 mod/settings.php:1117 #: mod/settings.php:1123 mod/settings.php:1129 mod/settings.php:1135 #: mod/settings.php:1161 mod/settings.php:1162 mod/settings.php:1163 -#: mod/settings.php:1164 mod/settings.php:1165 mod/dfrn_request.php:850 +#: mod/settings.php:1164 mod/settings.php:1165 mod/dfrn_request.php:857 #: mod/register.php:239 mod/profiles.php:658 mod/profiles.php:662 #: mod/profiles.php:687 mod/api.php:106 msgid "No" msgstr "Nein" -#: mod/follow.php:106 mod/dfrn_request.php:854 +#: mod/follow.php:111 mod/dfrn_request.php:861 msgid "Add a personal note:" msgstr "Eine persönliche Notiz beifügen:" -#: mod/follow.php:112 mod/dfrn_request.php:860 +#: mod/follow.php:117 mod/dfrn_request.php:867 msgid "Your Identity Address:" msgstr "Adresse Deines Profils:" -#: mod/follow.php:162 +#: mod/follow.php:180 msgid "Contact added" msgstr "Kontakt hinzugefügt" @@ -1023,39 +1007,39 @@ msgstr "Kontakt hinzugefügt" msgid "Unable to locate original post." msgstr "Konnte den Originalbeitrag nicht finden." -#: mod/item.php:318 +#: mod/item.php:329 msgid "Empty post discarded." msgstr "Leerer Beitrag wurde verworfen." -#: mod/item.php:456 mod/wall_upload.php:213 mod/wall_upload.php:227 +#: mod/item.php:467 mod/wall_upload.php:213 mod/wall_upload.php:227 #: mod/wall_upload.php:234 include/Photo.php:954 include/Photo.php:969 #: include/Photo.php:976 include/Photo.php:998 include/message.php:145 msgid "Wall Photos" msgstr "Pinnwand-Bilder" -#: mod/item.php:830 +#: mod/item.php:842 msgid "System error. Post not saved." msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden." -#: mod/item.php:959 +#: mod/item.php:971 #, 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:961 +#: mod/item.php:973 #, php-format msgid "You may visit them online at %s" msgstr "Du kannst sie online unter %s besuchen" -#: mod/item.php:962 +#: mod/item.php:974 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:966 +#: mod/item.php:978 #, php-format msgid "%s posted an update." msgstr "%s hat ein Update veröffentlicht." @@ -1104,7 +1088,7 @@ msgstr "Gruppeneditor" msgid "Members" msgstr "Mitglieder" -#: mod/group.php:193 mod/network.php:563 mod/content.php:130 +#: mod/group.php:193 mod/network.php:576 mod/content.php:130 msgid "Group is empty" msgstr "Gruppe ist leer" @@ -1206,7 +1190,7 @@ msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werd msgid "Unable to update your contact profile details on our system" msgstr "Die Updates für Dein Profil konnten nicht gespeichert werden" -#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:734 include/items.php:4273 +#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:741 include/items.php:4276 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" @@ -1215,7 +1199,7 @@ msgstr "[Name unterdrückt]" msgid "%1$s has joined %2$s" msgstr "%1$s ist %2$s beigetreten" -#: mod/profile.php:21 include/identity.php:53 +#: mod/profile.php:21 include/identity.php:51 msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." @@ -1275,7 +1259,7 @@ msgstr "Schlage %s einen Kontakt vor" #: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86 #: mod/wall_upload.php:122 mod/wall_upload.php:125 mod/wall_attach.php:17 -#: mod/wall_attach.php:25 mod/wall_attach.php:76 include/api.php:1735 +#: mod/wall_attach.php:25 mod/wall_attach.php:76 include/api.php:1781 msgid "Invalid request." msgstr "Ungültige Anfrage" @@ -1331,7 +1315,7 @@ msgid "" "Password reset failed." msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast Du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert." -#: mod/lostpass.php:109 boot.php:1310 +#: mod/lostpass.php:109 boot.php:1418 msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -1405,37 +1389,6 @@ msgstr "Spitzname oder E-Mail:" msgid "Reset" msgstr "Zurücksetzen" -#: mod/like.php:170 include/conversation.php:122 include/conversation.php:258 -#: include/text.php:1991 view/theme/diabook/theme.php:463 -msgid "event" -msgstr "Event" - -#: mod/like.php:187 include/conversation.php:141 include/diaspora.php:2163 -#: view/theme/diabook/theme.php:480 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "%1$s mag %2$ss %3$s" - -#: mod/like.php:189 include/conversation.php:144 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "%1$s mag %2$ss %3$s nicht" - -#: mod/like.php:191 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "%1$s nimmt an %2$ss %3$s teil." - -#: mod/like.php:193 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "%1$s nimmt nicht an %2$ss %3$s teil." - -#: mod/like.php:195 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "%1$s nimmt eventuell an %2$ss %3$s teil." - #: mod/ping.php:265 msgid "{0} wants to be your friend" msgstr "{0} möchte mit Dir in Kontakt treten" @@ -1465,11 +1418,11 @@ msgstr "Verwerfen" msgid "System" msgstr "System" -#: mod/notifications.php:87 mod/admin.php:228 include/nav.php:154 +#: mod/notifications.php:87 mod/admin.php:361 include/nav.php:154 msgid "Network" msgstr "Netzwerk" -#: mod/notifications.php:93 mod/network.php:381 +#: mod/notifications.php:93 mod/network.php:384 msgid "Personal" msgstr "Persönlich" @@ -1511,7 +1464,7 @@ msgstr "Neue-Kontakt Nachricht senden" msgid "if applicable" msgstr "falls anwendbar" -#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1116 +#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1277 msgid "Approve" msgstr "Genehmigen" @@ -1561,8 +1514,8 @@ msgstr "Kontakt-/Freundschaftsanfrage" msgid "New Follower" msgstr "Neuer Bewunderer" -#: mod/notifications.php:250 mod/directory.php:147 include/identity.php:306 -#: include/identity.php:589 +#: mod/notifications.php:250 mod/directory.php:147 include/identity.php:310 +#: include/identity.php:590 msgid "Gender:" msgstr "Geschlecht:" @@ -1733,7 +1686,7 @@ msgstr "Unterhaltung gelöscht." #: mod/message.php:290 mod/message.php:298 mod/message.php:427 #: mod/message.php:435 mod/wallmessage.php:127 mod/wallmessage.php:135 -#: include/conversation.php:1129 include/conversation.php:1147 +#: include/conversation.php:1128 include/conversation.php:1146 msgid "Please enter a link URL:" msgstr "Bitte gib die URL des Links ein:" @@ -1755,19 +1708,19 @@ msgid "Your message:" msgstr "Deine Nachricht:" #: mod/message.php:339 mod/message.php:523 mod/wallmessage.php:154 -#: mod/editpost.php:110 include/conversation.php:1184 +#: mod/editpost.php:110 include/conversation.php:1183 msgid "Upload photo" msgstr "Foto hochladen" #: mod/message.php:340 mod/message.php:524 mod/wallmessage.php:155 -#: mod/editpost.php:114 include/conversation.php:1188 +#: mod/editpost.php:114 include/conversation.php:1187 msgid "Insert web link" msgstr "Einen Link einfügen" #: mod/message.php:341 mod/message.php:526 mod/content.php:501 #: mod/content.php:885 mod/wallmessage.php:156 mod/editpost.php:124 #: mod/photos.php:1610 object/Item.php:396 include/conversation.php:713 -#: include/conversation.php:1202 +#: include/conversation.php:1201 msgid "Please wait" msgstr "Bitte warten" @@ -1783,7 +1736,7 @@ msgstr "Nachricht nicht verfügbar." msgid "Delete message" msgstr "Nachricht löschen" -#: mod/message.php:507 mod/message.php:582 +#: mod/message.php:507 mod/message.php:584 msgid "Delete conversation" msgstr "Unterhaltung löschen" @@ -1797,26 +1750,26 @@ msgstr "Sichere Kommunikation ist nicht verfügbar. Eventuell k msgid "Send Reply" msgstr "Antwort senden" -#: mod/message.php:555 +#: mod/message.php:557 #, php-format msgid "Unknown sender - %s" msgstr "'Unbekannter Absender - %s" -#: mod/message.php:558 +#: mod/message.php:560 #, php-format msgid "You and %s" msgstr "Du und %s" -#: mod/message.php:561 +#: mod/message.php:563 #, php-format msgid "%s and You" msgstr "%s und Du" -#: mod/message.php:585 +#: mod/message.php:587 msgid "D, d M Y - g:i A" msgstr "D, d. M Y - g:i A" -#: mod/message.php:588 +#: mod/message.php:590 #, php-format msgid "%d message" msgid_plural "%d messages" @@ -1868,8 +1821,8 @@ msgstr "Zurück zum Kontakteditor" msgid "Refetch contact data" msgstr "Kontaktdaten neu laden" -#: mod/crepair.php:170 mod/admin.php:1114 mod/admin.php:1126 -#: mod/admin.php:1127 mod/admin.php:1140 mod/settings.php:652 +#: mod/crepair.php:170 mod/admin.php:1275 mod/admin.php:1287 +#: mod/admin.php:1288 mod/admin.php:1301 mod/settings.php:652 #: mod/settings.php:678 msgid "Name" msgstr "Name" @@ -1920,7 +1873,7 @@ msgid "" "entries from this contact." msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden." -#: mod/bookmarklet.php:12 boot.php:1296 include/nav.php:91 +#: mod/bookmarklet.php:12 boot.php:1404 include/nav.php:91 msgid "Login" msgstr "Anmeldung" @@ -1932,24 +1885,24 @@ msgstr "Der Beitrag wurde angelegt" msgid "Access denied." msgstr "Zugriff verweigert." -#: mod/dirfind.php:188 mod/allfriends.php:80 mod/match.php:85 -#: mod/suggest.php:98 include/contact_widgets.php:10 include/identity.php:209 +#: mod/dirfind.php:194 mod/allfriends.php:80 mod/match.php:85 +#: mod/suggest.php:98 include/contact_widgets.php:10 include/identity.php:212 msgid "Connect" msgstr "Verbinden" -#: mod/dirfind.php:189 mod/allfriends.php:64 mod/match.php:70 -#: mod/directory.php:162 mod/suggest.php:81 include/Contact.php:296 -#: include/Contact.php:309 include/Contact.php:351 +#: mod/dirfind.php:195 mod/allfriends.php:64 mod/match.php:70 +#: mod/directory.php:162 mod/suggest.php:81 include/Contact.php:283 +#: include/Contact.php:296 include/Contact.php:338 #: include/conversation.php:912 include/conversation.php:926 msgid "View Profile" msgstr "Profil anschauen" -#: mod/dirfind.php:218 +#: mod/dirfind.php:224 #, php-format msgid "People Search - %s" msgstr "Personensuche - %s" -#: mod/dirfind.php:225 mod/match.php:105 +#: mod/dirfind.php:231 mod/match.php:105 msgid "No matches" msgstr "Keine Übereinstimmungen" @@ -1973,548 +1926,573 @@ msgstr "Dateien" msgid "Contacts who are not members of a group" msgstr "Kontakte, die keiner Gruppe zugewiesen sind" -#: mod/admin.php:80 +#: mod/admin.php:88 msgid "Theme settings updated." msgstr "Themeneinstellungen aktualisiert." -#: mod/admin.php:127 mod/admin.php:713 +#: mod/admin.php:137 mod/admin.php:856 msgid "Site" msgstr "Seite" -#: mod/admin.php:128 mod/admin.php:657 mod/admin.php:1109 mod/admin.php:1124 +#: mod/admin.php:138 mod/admin.php:800 mod/admin.php:1270 mod/admin.php:1285 msgid "Users" msgstr "Nutzer" -#: mod/admin.php:129 mod/admin.php:1213 mod/admin.php:1273 mod/settings.php:66 +#: mod/admin.php:139 mod/admin.php:1384 mod/admin.php:1444 mod/settings.php:66 msgid "Plugins" msgstr "Plugins" -#: mod/admin.php:130 mod/admin.php:1458 mod/admin.php:1509 +#: mod/admin.php:140 mod/admin.php:1642 mod/admin.php:1692 msgid "Themes" msgstr "Themen" -#: mod/admin.php:131 +#: mod/admin.php:141 msgid "DB updates" msgstr "DB Updates" -#: mod/admin.php:132 mod/admin.php:223 +#: mod/admin.php:142 mod/admin.php:356 msgid "Inspect Queue" msgstr "Warteschlange Inspizieren" -#: mod/admin.php:147 mod/admin.php:156 mod/admin.php:1597 +#: mod/admin.php:143 mod/admin.php:326 +msgid "Federation Statistics" +msgstr "Federation Statistik" + +#: mod/admin.php:157 mod/admin.php:168 mod/admin.php:1760 msgid "Logs" msgstr "Protokolle" -#: mod/admin.php:148 +#: mod/admin.php:158 mod/admin.php:1828 +msgid "View Logs" +msgstr "Protokolle anzeigen" + +#: mod/admin.php:159 msgid "probe address" msgstr "Adresse untersuchen" -#: mod/admin.php:149 +#: mod/admin.php:160 msgid "check webfinger" msgstr "Webfinger überprüfen" -#: mod/admin.php:154 include/nav.php:194 +#: mod/admin.php:166 include/nav.php:194 msgid "Admin" msgstr "Administration" -#: mod/admin.php:155 +#: mod/admin.php:167 msgid "Plugin Features" msgstr "Plugin Features" -#: mod/admin.php:157 +#: mod/admin.php:169 msgid "diagnostics" msgstr "Diagnose" -#: mod/admin.php:158 +#: mod/admin.php:170 msgid "User registrations waiting for confirmation" msgstr "Nutzeranmeldungen die auf Bestätigung warten" -#: mod/admin.php:222 mod/admin.php:272 mod/admin.php:712 mod/admin.php:1108 -#: mod/admin.php:1212 mod/admin.php:1272 mod/admin.php:1457 mod/admin.php:1508 -#: mod/admin.php:1596 +#: mod/admin.php:320 +msgid "" +"This page offers you some numbers to the known part of the federated social " +"network your Friendica node is part of. These numbers are not complete but " +"only reflect the part of the network your node is aware of." +msgstr "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt." + +#: mod/admin.php:321 +msgid "" +"The Auto Discovered Contact Directory feature is not enabled, it " +"will improve the data displayed here." +msgstr "Die Funktion um Automatisch ein Kontaktverzeichnis erstellen ist nicht aktiv. Es wird die hier angezeigten Daten verbessern." + +#: mod/admin.php:325 mod/admin.php:355 mod/admin.php:411 mod/admin.php:855 +#: mod/admin.php:1269 mod/admin.php:1383 mod/admin.php:1443 mod/admin.php:1641 +#: mod/admin.php:1691 mod/admin.php:1759 mod/admin.php:1827 msgid "Administration" msgstr "Administration" -#: mod/admin.php:225 +#: mod/admin.php:332 +msgid "Currently this node is aware of nodes from the following platforms:" +msgstr "Momentan kennt dieser Knoten andere Knoten der folgenden Plattformen:" + +#: mod/admin.php:358 msgid "ID" msgstr "ID" -#: mod/admin.php:226 +#: mod/admin.php:359 msgid "Recipient Name" msgstr "Empfänger Name" -#: mod/admin.php:227 +#: mod/admin.php:360 msgid "Recipient Profile" msgstr "Empfänger Profil" -#: mod/admin.php:229 +#: mod/admin.php:362 msgid "Created" msgstr "Erstellt" -#: mod/admin.php:230 +#: mod/admin.php:363 msgid "Last Tried" msgstr "Zuletzt versucht" -#: mod/admin.php:231 +#: mod/admin.php:364 msgid "" "This page lists the content of the queue for outgoing postings. These are " "postings the initial delivery failed for. They will be resend later and " "eventually deleted if the delivery fails permanently." msgstr "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht die Beiträge zuzustellen, bis sie schließlich gelöscht werden." -#: mod/admin.php:243 mod/admin.php:1062 +#: mod/admin.php:382 mod/admin.php:1223 msgid "Normal Account" msgstr "Normales Konto" -#: mod/admin.php:244 mod/admin.php:1063 +#: mod/admin.php:383 mod/admin.php:1224 msgid "Soapbox Account" msgstr "Marktschreier-Konto" -#: mod/admin.php:245 mod/admin.php:1064 +#: mod/admin.php:384 mod/admin.php:1225 msgid "Community/Celebrity Account" msgstr "Forum/Promi-Konto" -#: mod/admin.php:246 mod/admin.php:1065 +#: mod/admin.php:385 mod/admin.php:1226 msgid "Automatic Friend Account" msgstr "Automatisches Freundekonto" -#: mod/admin.php:247 +#: mod/admin.php:386 msgid "Blog Account" msgstr "Blog-Konto" -#: mod/admin.php:248 +#: mod/admin.php:387 msgid "Private Forum" msgstr "Privates Forum" -#: mod/admin.php:267 +#: mod/admin.php:406 msgid "Message queues" msgstr "Nachrichten-Warteschlangen" -#: mod/admin.php:273 +#: mod/admin.php:412 msgid "Summary" msgstr "Zusammenfassung" -#: mod/admin.php:275 +#: mod/admin.php:414 msgid "Registered users" msgstr "Registrierte Nutzer" -#: mod/admin.php:277 +#: mod/admin.php:416 msgid "Pending registrations" msgstr "Anstehende Anmeldungen" -#: mod/admin.php:278 +#: mod/admin.php:417 msgid "Version" msgstr "Version" -#: mod/admin.php:283 +#: mod/admin.php:422 msgid "Active plugins" msgstr "Aktive Plugins" -#: mod/admin.php:306 +#: mod/admin.php:445 msgid "Can not parse base url. Must have at least ://" msgstr "Die Basis-URL konnte nicht analysiert werden. Sie muss mindestens aus :// bestehen" -#: mod/admin.php:589 +#: mod/admin.php:728 msgid "RINO2 needs mcrypt php extension to work." msgstr "RINO2 benötigt die PHP Extension mcrypt." -#: mod/admin.php:597 +#: mod/admin.php:736 msgid "Site settings updated." msgstr "Seiteneinstellungen aktualisiert." -#: mod/admin.php:621 mod/settings.php:903 +#: mod/admin.php:764 mod/settings.php:903 msgid "No special theme for mobile devices" msgstr "Kein spezielles Theme für mobile Geräte verwenden." -#: mod/admin.php:640 +#: mod/admin.php:783 msgid "No community page" msgstr "Keine Gemeinschaftsseite" -#: mod/admin.php:641 +#: mod/admin.php:784 msgid "Public postings from users of this site" msgstr "Öffentliche Beiträge von Nutzer_innen dieser Seite" -#: mod/admin.php:642 +#: mod/admin.php:785 msgid "Global community page" msgstr "Globale Gemeinschaftsseite" -#: mod/admin.php:648 +#: mod/admin.php:791 msgid "At post arrival" msgstr "Beim Empfang von Nachrichten" -#: mod/admin.php:649 include/contact_selectors.php:56 +#: mod/admin.php:792 include/contact_selectors.php:56 msgid "Frequently" msgstr "immer wieder" -#: mod/admin.php:650 include/contact_selectors.php:57 +#: mod/admin.php:793 include/contact_selectors.php:57 msgid "Hourly" msgstr "Stündlich" -#: mod/admin.php:651 include/contact_selectors.php:58 +#: mod/admin.php:794 include/contact_selectors.php:58 msgid "Twice daily" msgstr "Zweimal täglich" -#: mod/admin.php:652 include/contact_selectors.php:59 +#: mod/admin.php:795 include/contact_selectors.php:59 msgid "Daily" msgstr "Täglich" -#: mod/admin.php:658 +#: mod/admin.php:801 msgid "Users, Global Contacts" msgstr "Nutzer, globale Kontakte" -#: mod/admin.php:659 +#: mod/admin.php:802 msgid "Users, Global Contacts/fallback" msgstr "Nutzer, globale Kontakte / Fallback" -#: mod/admin.php:663 +#: mod/admin.php:806 msgid "One month" msgstr "ein Monat" -#: mod/admin.php:664 +#: mod/admin.php:807 msgid "Three months" msgstr "drei Monate" -#: mod/admin.php:665 +#: mod/admin.php:808 msgid "Half a year" msgstr "ein halbes Jahr" -#: mod/admin.php:666 +#: mod/admin.php:809 msgid "One year" msgstr "ein Jahr" -#: mod/admin.php:671 +#: mod/admin.php:814 msgid "Multi user instance" msgstr "Mehrbenutzer Instanz" -#: mod/admin.php:694 +#: mod/admin.php:837 msgid "Closed" msgstr "Geschlossen" -#: mod/admin.php:695 +#: mod/admin.php:838 msgid "Requires approval" msgstr "Bedarf der Zustimmung" -#: mod/admin.php:696 +#: mod/admin.php:839 msgid "Open" msgstr "Offen" -#: mod/admin.php:700 +#: mod/admin.php:843 msgid "No SSL policy, links will track page SSL state" msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten" -#: mod/admin.php:701 +#: mod/admin.php:844 msgid "Force all links to use SSL" msgstr "SSL für alle Links erzwingen" -#: mod/admin.php:702 +#: mod/admin.php:845 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:714 mod/admin.php:1274 mod/admin.php:1510 mod/admin.php:1598 +#: mod/admin.php:857 mod/admin.php:1445 mod/admin.php:1693 mod/admin.php:1761 #: mod/settings.php:650 mod/settings.php:760 mod/settings.php:804 #: mod/settings.php:873 mod/settings.php:960 mod/settings.php:1195 msgid "Save Settings" msgstr "Einstellungen speichern" -#: mod/admin.php:715 mod/register.php:263 +#: mod/admin.php:858 mod/register.php:263 msgid "Registration" msgstr "Registrierung" -#: mod/admin.php:716 +#: mod/admin.php:859 msgid "File upload" msgstr "Datei hochladen" -#: mod/admin.php:717 +#: mod/admin.php:860 msgid "Policies" msgstr "Regeln" -#: mod/admin.php:718 +#: mod/admin.php:861 msgid "Advanced" msgstr "Erweitert" -#: mod/admin.php:719 +#: mod/admin.php:862 msgid "Auto Discovered Contact Directory" msgstr "Automatisch ein Kontaktverzeichnis erstellen" -#: mod/admin.php:720 +#: mod/admin.php:863 msgid "Performance" msgstr "Performance" -#: mod/admin.php:721 +#: mod/admin.php:864 msgid "" "Relocate - WARNING: advanced function. Could make this server unreachable." msgstr "Umsiedeln - WARNUNG: Könnte diesen Server unerreichbar machen." -#: mod/admin.php:724 +#: mod/admin.php:867 msgid "Site name" msgstr "Seitenname" -#: mod/admin.php:725 +#: mod/admin.php:868 msgid "Host name" msgstr "Host Name" -#: mod/admin.php:726 +#: mod/admin.php:869 msgid "Sender Email" msgstr "Absender für Emails" -#: mod/admin.php:726 +#: mod/admin.php:869 msgid "" "The email address your server shall use to send notification emails from." msgstr "Die E-Mail Adresse die dein Server zum Versenden von Benachrichtigungen verwenden soll." -#: mod/admin.php:727 +#: mod/admin.php:870 msgid "Banner/Logo" msgstr "Banner/Logo" -#: mod/admin.php:728 +#: mod/admin.php:871 msgid "Shortcut icon" msgstr "Shortcut Icon" -#: mod/admin.php:728 +#: mod/admin.php:871 msgid "Link to an icon that will be used for browsers." msgstr "Link zu einem Icon, das Browser verwenden werden." -#: mod/admin.php:729 +#: mod/admin.php:872 msgid "Touch icon" msgstr "Touch Icon" -#: mod/admin.php:729 +#: mod/admin.php:872 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "Link zu einem Icon das Tablets und Handies verwenden sollen." -#: mod/admin.php:730 +#: mod/admin.php:873 msgid "Additional Info" msgstr "Zusätzliche Informationen" -#: mod/admin.php:730 +#: mod/admin.php:873 #, php-format msgid "" "For public servers: you can add additional information here that will be " "listed at %s/siteinfo." msgstr "Für öffentliche Server kannst Du hier zusätzliche Informationen angeben, die dann auf %s/siteinfo angezeigt werden." -#: mod/admin.php:731 +#: mod/admin.php:874 msgid "System language" msgstr "Systemsprache" -#: mod/admin.php:732 +#: mod/admin.php:875 msgid "System theme" msgstr "Systemweites Theme" -#: mod/admin.php:732 +#: mod/admin.php:875 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - Theme-Einstellungen ändern" -#: mod/admin.php:733 +#: mod/admin.php:876 msgid "Mobile system theme" msgstr "Systemweites mobiles Theme" -#: mod/admin.php:733 +#: mod/admin.php:876 msgid "Theme for mobile devices" msgstr "Thema für mobile Geräte" -#: mod/admin.php:734 +#: mod/admin.php:877 msgid "SSL link policy" msgstr "Regeln für SSL Links" -#: mod/admin.php:734 +#: mod/admin.php:877 msgid "Determines whether generated links should be forced to use SSL" msgstr "Bestimmt, ob generierte Links SSL verwenden müssen" -#: mod/admin.php:735 +#: mod/admin.php:878 msgid "Force SSL" msgstr "Erzwinge SSL" -#: mod/admin.php:735 +#: mod/admin.php:878 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead" " to endless loops." msgstr "Erzinge alle Nicht-SSL Anfragen auf SSL - Achtung: auf manchen Systemen verursacht dies eine Endlosschleife." -#: mod/admin.php:736 +#: mod/admin.php:879 msgid "Old style 'Share'" msgstr "Altes \"Teilen\" Element" -#: mod/admin.php:736 +#: mod/admin.php:879 msgid "Deactivates the bbcode element 'share' for repeating items." msgstr "Deaktiviert das BBCode Element \"share\" beim Wiederholen von Beiträgen." -#: mod/admin.php:737 +#: mod/admin.php:880 msgid "Hide help entry from navigation menu" msgstr "Verberge den Menüeintrag für die Hilfe im Navigationsmenü" -#: mod/admin.php:737 +#: mod/admin.php:880 msgid "" "Hides the menu entry for the Help pages from the navigation menu. You can " "still access it calling /help directly." msgstr "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden." -#: mod/admin.php:738 +#: mod/admin.php:881 msgid "Single user instance" msgstr "Ein-Nutzer Instanz" -#: mod/admin.php:738 +#: mod/admin.php:881 msgid "Make this instance multi-user or single-user for the named user" msgstr "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt." -#: mod/admin.php:739 +#: mod/admin.php:882 msgid "Maximum image size" msgstr "Maximale Bildgröße" -#: mod/admin.php:739 +#: mod/admin.php:882 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale Uploadgröße von Bildern in Bytes. Standard ist 0, d.h. ohne Limit." -#: mod/admin.php:740 +#: mod/admin.php:883 msgid "Maximum image length" msgstr "Maximale Bildlänge" -#: mod/admin.php:740 +#: mod/admin.php:883 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet." -#: mod/admin.php:741 +#: mod/admin.php:884 msgid "JPEG image quality" msgstr "Qualität des JPEG Bildes" -#: mod/admin.php:741 +#: mod/admin.php:884 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust." -#: mod/admin.php:743 +#: mod/admin.php:886 msgid "Register policy" msgstr "Registrierungsmethode" -#: mod/admin.php:744 +#: mod/admin.php:887 msgid "Maximum Daily Registrations" msgstr "Maximum täglicher Registrierungen" -#: mod/admin.php:744 +#: mod/admin.php:887 msgid "" "If registration is permitted above, this sets the maximum number of new user" " registrations to accept per day. If register is set to closed, this " "setting has no effect." msgstr "Wenn die Registrierung weiter oben erlaubt ist, regelt dies die maximale Anzahl von Neuanmeldungen pro Tag. Wenn die Registrierung geschlossen ist, hat diese Einstellung keinen Effekt." -#: mod/admin.php:745 +#: mod/admin.php:888 msgid "Register text" msgstr "Registrierungstext" -#: mod/admin.php:745 +#: mod/admin.php:888 msgid "Will be displayed prominently on the registration page." msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt." -#: mod/admin.php:746 +#: mod/admin.php:889 msgid "Accounts abandoned after x days" msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt" -#: mod/admin.php:746 +#: mod/admin.php:889 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit." -#: mod/admin.php:747 +#: mod/admin.php:890 msgid "Allowed friend domains" msgstr "Erlaubte Domains für Kontakte" -#: mod/admin.php:747 +#: mod/admin.php:890 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:748 +#: mod/admin.php:891 msgid "Allowed email domains" msgstr "Erlaubte Domains für E-Mails" -#: mod/admin.php:748 +#: mod/admin.php:891 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:749 +#: mod/admin.php:892 msgid "Block public" msgstr "Öffentlichen Zugriff blockieren" -#: mod/admin.php:749 +#: mod/admin.php:892 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:750 +#: mod/admin.php:893 msgid "Force publish" msgstr "Erzwinge Veröffentlichung" -#: mod/admin.php:750 +#: mod/admin.php:893 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:751 +#: mod/admin.php:894 msgid "Global directory URL" msgstr "URL des weltweiten Verzeichnisses" -#: mod/admin.php:751 +#: mod/admin.php:894 msgid "" "URL to the global directory. If this is not set, the global directory is " "completely unavailable to the application." msgstr "URL des weltweiten Verzeichnisses. Wenn diese nicht gesetzt ist, ist das Verzeichnis für die Applikation nicht erreichbar." -#: mod/admin.php:752 +#: mod/admin.php:895 msgid "Allow threaded items" msgstr "Erlaube Threads in Diskussionen" -#: mod/admin.php:752 +#: mod/admin.php:895 msgid "Allow infinite level threading for items on this site." msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite." -#: mod/admin.php:753 +#: mod/admin.php:896 msgid "Private posts by default for new users" msgstr "Private Beiträge als Standard für neue Nutzer" -#: mod/admin.php:753 +#: mod/admin.php:896 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen." -#: mod/admin.php:754 +#: mod/admin.php:897 msgid "Don't include post content in email notifications" msgstr "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden" -#: mod/admin.php:754 +#: mod/admin.php:897 msgid "" "Don't include the content of a post/comment/private message/etc. in the " "email notifications that are sent out from this site, as a privacy measure." msgstr "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden." -#: mod/admin.php:755 +#: mod/admin.php:898 msgid "Disallow public access to addons listed in the apps menu." msgstr "Öffentlichen Zugriff auf Addons im Apps Menü verbieten." -#: mod/admin.php:755 +#: mod/admin.php:898 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt." -#: mod/admin.php:756 +#: mod/admin.php:899 msgid "Don't embed private images in posts" msgstr "Private Bilder nicht in Beiträgen einbetten." -#: mod/admin.php:756 +#: mod/admin.php:899 msgid "" "Don't replace locally-hosted private photos in posts with an embedded copy " "of the image. This means that contacts who receive posts containing private " @@ -2522,228 +2500,228 @@ msgid "" "while." msgstr "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert." -#: mod/admin.php:757 +#: mod/admin.php:900 msgid "Allow Users to set remote_self" msgstr "Nutzern erlauben das remote_self Flag zu setzen" -#: mod/admin.php:757 +#: mod/admin.php:900 msgid "" "With checking this, every user is allowed to mark every contact as a " "remote_self in the repair contact dialog. Setting this flag on a contact " "causes mirroring every posting of that contact in the users stream." msgstr "Ist dies ausgewählt kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im Kontakt reparieren Dialog markieren. Nach dem setzten dieses Flags werden alle Top-Level Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet." -#: mod/admin.php:758 +#: mod/admin.php:901 msgid "Block multiple registrations" msgstr "Unterbinde Mehrfachregistrierung" -#: mod/admin.php:758 +#: mod/admin.php:901 msgid "Disallow users to register additional accounts for use as pages." msgstr "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen." -#: mod/admin.php:759 +#: mod/admin.php:902 msgid "OpenID support" msgstr "OpenID Unterstützung" -#: mod/admin.php:759 +#: mod/admin.php:902 msgid "OpenID support for registration and logins." msgstr "OpenID-Unterstützung für Registrierung und Login." -#: mod/admin.php:760 +#: mod/admin.php:903 msgid "Fullname check" msgstr "Namen auf Vollständigkeit überprüfen" -#: mod/admin.php:760 +#: mod/admin.php:903 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:761 +#: mod/admin.php:904 msgid "UTF-8 Regular expressions" msgstr "UTF-8 Reguläre Ausdrücke" -#: mod/admin.php:761 +#: mod/admin.php:904 msgid "Use PHP UTF8 regular expressions" msgstr "PHP UTF8 Ausdrücke verwenden" -#: mod/admin.php:762 +#: mod/admin.php:905 msgid "Community Page Style" msgstr "Art der Gemeinschaftsseite" -#: mod/admin.php:762 +#: mod/admin.php:905 msgid "" "Type of community page to show. 'Global community' shows every public " "posting from an open distributed network that arrived on this server." msgstr "Welche Art der Gemeinschaftsseite soll verwendet werden? Globale Gemeinschaftsseite zeigt alle öffentlichen Beiträge eines offenen dezentralen Netzwerks an die auf diesem Server eintreffen." -#: mod/admin.php:763 +#: mod/admin.php:906 msgid "Posts per user on community page" msgstr "Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite" -#: mod/admin.php:763 +#: mod/admin.php:906 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "'Global Community')" msgstr "Die Anzahl der Beiträge die von jedem Nutzer maximal auf der Gemeinschaftsseite angezeigt werden sollen. Dieser Parameter wird nicht für die Globale Gemeinschaftsseite genutzt." -#: mod/admin.php:764 +#: mod/admin.php:907 msgid "Enable OStatus support" msgstr "OStatus Unterstützung aktivieren" -#: mod/admin.php:764 +#: mod/admin.php:907 msgid "" "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "Biete die eingebaute OStatus (iStatusNet, GNU Social, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre Warnungen werden nur bei Bedarf angezeigt." -#: mod/admin.php:765 +#: mod/admin.php:908 msgid "OStatus conversation completion interval" msgstr "Intervall zum Vervollständigen von OStatus Unterhaltungen" -#: mod/admin.php:765 +#: mod/admin.php:908 msgid "" "How often shall the poller check for new entries in OStatus conversations? " "This can be a very ressource task." msgstr "Wie oft soll der Poller checken ob es neue Nachrichten in OStatus Unterhaltungen gibt die geladen werden müssen. Je nach Anzahl der OStatus Kontakte könnte dies ein sehr Ressourcen lastiger Job sein." -#: mod/admin.php:766 +#: mod/admin.php:909 msgid "OStatus support can only be enabled if threading is enabled." msgstr "OStatus Unterstützung kann nur aktiviert werden wenn \"Threading\" aktiviert ist. " -#: mod/admin.php:768 +#: mod/admin.php:911 msgid "" "Diaspora support can't be enabled because Friendica was installed into a sub" " directory." msgstr "Diaspora Unterstützung kann nicht aktiviert werden da Friendica in ein Unterverzeichnis installiert ist." -#: mod/admin.php:769 +#: mod/admin.php:912 msgid "Enable Diaspora support" msgstr "Diaspora Unterstützung aktivieren" -#: mod/admin.php:769 +#: mod/admin.php:912 msgid "Provide built-in Diaspora network compatibility." msgstr "Verwende die eingebaute Diaspora-Verknüpfung." -#: mod/admin.php:770 +#: mod/admin.php:913 msgid "Only allow Friendica contacts" msgstr "Nur Friendica-Kontakte erlauben" -#: mod/admin.php:770 +#: mod/admin.php:913 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:771 +#: mod/admin.php:914 msgid "Verify SSL" msgstr "SSL Überprüfen" -#: mod/admin.php:771 +#: mod/admin.php:914 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you" " cannot connect (at all) to self-signed SSL sites." msgstr "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann." -#: mod/admin.php:772 +#: mod/admin.php:915 msgid "Proxy user" msgstr "Proxy Nutzer" -#: mod/admin.php:773 +#: mod/admin.php:916 msgid "Proxy URL" msgstr "Proxy URL" -#: mod/admin.php:774 +#: mod/admin.php:917 msgid "Network timeout" msgstr "Netzwerk Wartezeit" -#: mod/admin.php:774 +#: mod/admin.php:917 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:775 +#: mod/admin.php:918 msgid "Delivery interval" msgstr "Zustellungsintervall" -#: mod/admin.php:775 +#: mod/admin.php:918 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server." -#: mod/admin.php:776 +#: mod/admin.php:919 msgid "Poll interval" msgstr "Abfrageintervall" -#: mod/admin.php:776 +#: mod/admin.php:919 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "Verzögere Hintergrundprozesse um diese Anzahl an Sekunden, um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet." -#: mod/admin.php:777 +#: mod/admin.php:920 msgid "Maximum Load Average" msgstr "Maximum Load Average" -#: mod/admin.php:777 +#: mod/admin.php:920 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50" -#: mod/admin.php:778 +#: mod/admin.php:921 msgid "Maximum Load Average (Frontend)" msgstr "Maximum Load Average (Frontend)" -#: mod/admin.php:778 +#: mod/admin.php:921 msgid "Maximum system load before the frontend quits service - default 50." msgstr "Maximale Systemlast bevor Vordergrundprozesse pausiert werden - Standard 50." -#: mod/admin.php:779 +#: mod/admin.php:922 msgid "Maximum table size for optimization" msgstr "Maximale Tabellengröße zur Optimierung" -#: mod/admin.php:779 +#: mod/admin.php:922 msgid "" "Maximum table size (in MB) for the automatic optimization - default 100 MB. " "Enter -1 to disable it." msgstr "Maximale Tabellengröße (in MB) für die automatische Optimierung - Standard 100 MB. Gib -1 für Deaktivierung ein." -#: mod/admin.php:780 +#: mod/admin.php:923 msgid "Minimum level of fragmentation" msgstr "Minimaler Fragmentationsgrad" -#: mod/admin.php:780 +#: mod/admin.php:923 msgid "" "Minimum fragmenation level to start the automatic optimization - default " "value is 30%." msgstr "Minimales Fragmentationsgrad von Datenbanktabellen um die automatische Optimierung einzuleiten - Standardwert ist 30%" -#: mod/admin.php:782 +#: mod/admin.php:925 msgid "Periodical check of global contacts" msgstr "Regelmäßig globale Kontakte überprüfen" -#: mod/admin.php:782 +#: mod/admin.php:925 msgid "" "If enabled, the global contacts are checked periodically for missing or " "outdated data and the vitality of the contacts and servers." msgstr "Wenn diese Option aktiviert ist, werden die globalen Kontakte regelmäßig auf fehlende oder veraltete Daten sowie auf Erreichbarkeit des Kontakts und des Servers überprüft." -#: mod/admin.php:783 +#: mod/admin.php:926 msgid "Days between requery" msgstr "Tage zwischen erneuten Abfragen" -#: mod/admin.php:783 +#: mod/admin.php:926 msgid "Number of days after which a server is requeried for his contacts." msgstr "Legt das Abfrageintervall fest, nachdem ein Server erneut nach Kontakten abgefragt werden soll." -#: mod/admin.php:784 +#: mod/admin.php:927 msgid "Discover contacts from other servers" msgstr "Neue Kontakte auf anderen Servern entdecken" -#: mod/admin.php:784 +#: mod/admin.php:927 msgid "" "Periodically query other servers for contacts. You can choose between " "'users': the users on the remote system, 'Global Contacts': active contacts " @@ -2753,32 +2731,32 @@ msgid "" "Global Contacts'." msgstr "Regelmäßig andere Server nach potentiellen Kontakten absuchen. Du kannst zwischen 'Nutzern', den tatsächlichen Nutzern des anderen Systems und 'globalen Kontakten', aktiven Kontakten die auf dem System bekannt sind, wählen. Der Fallback-Mechanismus ist für ältere Friendica und Redmatrix Server gedacht, bei denen globale Kontakte noch nicht verfügbar sind. Durch den Fallbackmodus entsteht auf deinem Server eine wesentlich höhere Last, empfohlen wird der Modus 'Nutzer, globale Kontakte'." -#: mod/admin.php:785 +#: mod/admin.php:928 msgid "Timeframe for fetching global contacts" msgstr "Zeitfenster für globale Kontakte" -#: mod/admin.php:785 +#: mod/admin.php:928 msgid "" "When the discovery is activated, this value defines the timeframe for the " "activity of the global contacts that are fetched from other servers." msgstr "Wenn die Entdeckung neuer Kontakte aktiv ist, definiert dieses Zeitfenster den Zeitraum in dem globale Kontakte als aktiv gelten und von anderen Servern importiert werden." -#: mod/admin.php:786 +#: mod/admin.php:929 msgid "Search the local directory" msgstr "Lokales Verzeichnis durchsuchen" -#: mod/admin.php:786 +#: mod/admin.php:929 msgid "" "Search the local directory instead of the global directory. When searching " "locally, every search will be executed on the global directory in the " "background. This improves the search results when the search is repeated." msgstr "Suche im lokalen Verzeichnis anstelle des globalen Verzeichnisses durchführen. Jede Suche wird im Hintergrund auch im globalen Verzeichnis durchgeführt umd die Suchresultate zu verbessern, wenn diese Suche wiederholt wird." -#: mod/admin.php:788 +#: mod/admin.php:931 msgid "Publish server information" msgstr "Server Informationen veröffentlichen" -#: mod/admin.php:788 +#: mod/admin.php:931 msgid "" "If enabled, general server and usage data will be published. The data " "contains the name and version of the server, number of users with public " @@ -2786,205 +2764,205 @@ msgid "" " href='http://the-federation.info/'>the-federation.info for details." msgstr "Wenn aktiviert, werden allgemeine Informationen über den Server und Nutzungsdaten veröffentlicht. Die Daten beinhalten den Namen sowie die Version des Servers, die Anzahl der Nutzer_innen mit öffentlichen Profilen, die Anzahl der Beiträge sowie aktivierte Protokolle und Connectoren. Für Details bitte the-federation.info aufrufen." -#: mod/admin.php:790 +#: mod/admin.php:933 msgid "Use MySQL full text engine" msgstr "Nutze MySQL full text engine" -#: mod/admin.php:790 +#: mod/admin.php:933 msgid "" "Activates the full text engine. Speeds up search - but can only search for " "four and more characters." msgstr "Aktiviert die 'full text engine'. Beschleunigt die Suche - aber es kann nur nach vier oder mehr Zeichen gesucht werden." -#: mod/admin.php:791 +#: mod/admin.php:934 msgid "Suppress Language" msgstr "Sprachinformation unterdrücken" -#: mod/admin.php:791 +#: mod/admin.php:934 msgid "Suppress language information in meta information about a posting." msgstr "Verhindert das Erzeugen der Meta-Information zur Spracherkennung eines Beitrags." -#: mod/admin.php:792 +#: mod/admin.php:935 msgid "Suppress Tags" msgstr "Tags Unterdrücken" -#: mod/admin.php:792 +#: mod/admin.php:935 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "Unterdrückt die Anzeige von Tags am Ende eines Beitrags." -#: mod/admin.php:793 +#: mod/admin.php:936 msgid "Path to item cache" msgstr "Pfad zum Eintrag Cache" -#: mod/admin.php:793 +#: mod/admin.php:936 msgid "The item caches buffers generated bbcode and external images." msgstr "Im Item-Cache werden externe Bilder und geparster BBCode zwischen gespeichert." -#: mod/admin.php:794 +#: mod/admin.php:937 msgid "Cache duration in seconds" msgstr "Cache-Dauer in Sekunden" -#: mod/admin.php:794 +#: mod/admin.php:937 msgid "" "How long should the cache files be hold? Default value is 86400 seconds (One" " day). To disable the item cache, set the value to -1." msgstr "Wie lange sollen die gecachedten Dateien vorgehalten werden? Grundeinstellung sind 86400 Sekunden (ein Tag). Um den Item Cache zu deaktivieren, setze diesen Wert auf -1." -#: mod/admin.php:795 +#: mod/admin.php:938 msgid "Maximum numbers of comments per post" msgstr "Maximale Anzahl von Kommentaren pro Beitrag" -#: mod/admin.php:795 +#: mod/admin.php:938 msgid "How much comments should be shown for each post? Default value is 100." msgstr "Wie viele Kommentare sollen pro Beitrag angezeigt werden? Standardwert sind 100." -#: mod/admin.php:796 +#: mod/admin.php:939 msgid "Path for lock file" msgstr "Pfad für die Sperrdatei" -#: mod/admin.php:796 +#: mod/admin.php:939 msgid "" "The lock file is used to avoid multiple pollers at one time. Only define a " "folder here." msgstr "Die lock-Datei wird benutzt, damit nicht mehrere poller auf einmal laufen. Definiere hier einen Dateiverzeichnis." -#: mod/admin.php:797 +#: mod/admin.php:940 msgid "Temp path" msgstr "Temp Pfad" -#: mod/admin.php:797 +#: mod/admin.php:940 msgid "" "If you have a restricted system where the webserver can't access the system " "temp path, enter another path here." msgstr "Solltest du ein eingeschränktes System haben, auf dem der Webserver nicht auf das temp Verzeichnis des Systems zugreifen kann, setze hier einen anderen Pfad." -#: mod/admin.php:798 +#: mod/admin.php:941 msgid "Base path to installation" msgstr "Basis-Pfad zur Installation" -#: mod/admin.php:798 +#: mod/admin.php:941 msgid "" "If the system cannot detect the correct path to your installation, enter the" " correct path here. This setting should only be set if you are using a " "restricted system and symbolic links to your webroot." msgstr "Falls das System nicht den korrekten Pfad zu deiner Installation gefunden hat, gib den richtigen Pfad bitte hier ein. Du solltest hier den Pfad nur auf einem eingeschränkten System angeben müssen, bei dem du mit symbolischen Links auf dein Webverzeichnis verweist." -#: mod/admin.php:799 +#: mod/admin.php:942 msgid "Disable picture proxy" msgstr "Bilder Proxy deaktivieren" -#: mod/admin.php:799 +#: mod/admin.php:942 msgid "" "The picture proxy increases performance and privacy. It shouldn't be used on" " systems with very low bandwith." msgstr "Der Proxy für Bilder verbessert die Leistung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen." -#: mod/admin.php:800 +#: mod/admin.php:943 msgid "Enable old style pager" msgstr "Den Old-Style Pager aktiviren" -#: mod/admin.php:800 +#: mod/admin.php:943 msgid "" "The old style pager has page numbers but slows down massively the page " "speed." msgstr "Der Old-Style Pager zeigt Seitennummern an, verlangsamt aber auch drastisch das Laden einer Seite." -#: mod/admin.php:801 +#: mod/admin.php:944 msgid "Only search in tags" msgstr "Nur in Tags suchen" -#: mod/admin.php:801 +#: mod/admin.php:944 msgid "On large systems the text search can slow down the system extremely." msgstr "Auf großen Knoten kann die Volltext-Suche das System ausbremsen." -#: mod/admin.php:803 +#: mod/admin.php:946 msgid "New base url" msgstr "Neue Basis-URL" -#: mod/admin.php:803 +#: mod/admin.php:946 msgid "" "Change base url for this server. Sends relocate message to all DFRN contacts" " of all users." msgstr "Ändert die Basis-URL dieses Servers und sendet eine Umzugsmitteilung an alle DFRN Kontakte deiner Nutzer_innen." -#: mod/admin.php:805 +#: mod/admin.php:948 msgid "RINO Encryption" msgstr "RINO Verschlüsselung" -#: mod/admin.php:805 +#: mod/admin.php:948 msgid "Encryption layer between nodes." msgstr "Verschlüsselung zwischen Friendica Instanzen" -#: mod/admin.php:806 +#: mod/admin.php:949 msgid "Embedly API key" msgstr "Embedly API Schlüssel" -#: mod/admin.php:806 +#: mod/admin.php:949 msgid "" "Embedly is used to fetch additional data for " "web pages. This is an optional parameter." msgstr "Embedly wird verwendet um zusätzliche Informationen von Webseiten zu laden. Dies ist ein optionaler Parameter." -#: mod/admin.php:824 +#: mod/admin.php:978 msgid "Update has been marked successful" msgstr "Update wurde als erfolgreich markiert" -#: mod/admin.php:832 +#: mod/admin.php:986 #, php-format msgid "Database structure update %s was successfully applied." msgstr "Das Update %s der Struktur der Datenbank wurde erfolgreich angewandt." -#: mod/admin.php:835 +#: mod/admin.php:989 #, php-format msgid "Executing of database structure update %s failed with error: %s" msgstr "Das Update %s der Struktur der Datenbank schlug mit folgender Fehlermeldung fehl: %s" -#: mod/admin.php:847 +#: mod/admin.php:1001 #, php-format msgid "Executing %s failed with error: %s" msgstr "Die Ausführung von %s schlug fehl. Fehlermeldung: %s" -#: mod/admin.php:850 +#: mod/admin.php:1004 #, php-format msgid "Update %s was successfully applied." msgstr "Update %s war erfolgreich." -#: mod/admin.php:854 +#: mod/admin.php:1008 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "Update %s hat keinen Status zurückgegeben. Unbekannter Status." -#: mod/admin.php:856 +#: mod/admin.php:1010 #, php-format msgid "There was no additional update function %s that needed to be called." msgstr "Es gab keine weitere Update-Funktion, die von %s ausgeführt werden musste." -#: mod/admin.php:875 +#: mod/admin.php:1029 msgid "No failed updates." msgstr "Keine fehlgeschlagenen Updates." -#: mod/admin.php:876 +#: mod/admin.php:1030 msgid "Check database structure" msgstr "Datenbank Struktur überprüfen" -#: mod/admin.php:881 +#: mod/admin.php:1035 msgid "Failed Updates" msgstr "Fehlgeschlagene Updates" -#: mod/admin.php:882 +#: mod/admin.php:1036 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben." -#: mod/admin.php:883 +#: mod/admin.php:1037 msgid "Mark success (if update was manually applied)" msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)" -#: mod/admin.php:884 +#: mod/admin.php:1038 msgid "Attempt to execute this update step automatically" msgstr "Versuchen, diesen Schritt automatisch auszuführen" -#: mod/admin.php:916 +#: mod/admin.php:1069 #, php-format msgid "" "\n" @@ -2992,7 +2970,7 @@ msgid "" "\t\t\t\tthe administrator of %2$s has set up an account for you." msgstr "\nHallo %1$s,\n\nauf %2$s wurde ein Account für Dich angelegt." -#: mod/admin.php:919 +#: mod/admin.php:1072 #, php-format msgid "" "\n" @@ -3022,233 +3000,238 @@ msgid "" "\t\t\tThank you and welcome to %4$s." msgstr "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1$s\n\tBenutzername:\t%2$s\n\tPasswort:\t%3$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4$s." -#: mod/admin.php:951 include/user.php:423 +#: mod/admin.php:1104 include/user.php:423 #, php-format msgid "Registration details for %s" msgstr "Details der Registration von %s" -#: mod/admin.php:963 +#: mod/admin.php:1116 #, 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:970 +#: mod/admin.php:1123 #, 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:1009 +#: mod/admin.php:1170 #, php-format msgid "User '%s' deleted" msgstr "Nutzer '%s' gelöscht" -#: mod/admin.php:1017 +#: mod/admin.php:1178 #, php-format msgid "User '%s' unblocked" msgstr "Nutzer '%s' entsperrt" -#: mod/admin.php:1017 +#: mod/admin.php:1178 #, php-format msgid "User '%s' blocked" msgstr "Nutzer '%s' gesperrt" -#: mod/admin.php:1110 +#: mod/admin.php:1271 msgid "Add User" msgstr "Nutzer hinzufügen" -#: mod/admin.php:1111 +#: mod/admin.php:1272 msgid "select all" msgstr "Alle auswählen" -#: mod/admin.php:1112 +#: mod/admin.php:1273 msgid "User registrations waiting for confirm" msgstr "Neuanmeldungen, die auf Deine Bestätigung warten" -#: mod/admin.php:1113 +#: mod/admin.php:1274 msgid "User waiting for permanent deletion" msgstr "Nutzer wartet auf permanente Löschung" -#: mod/admin.php:1114 +#: mod/admin.php:1275 msgid "Request date" msgstr "Anfragedatum" -#: mod/admin.php:1114 mod/admin.php:1126 mod/admin.php:1127 mod/admin.php:1142 +#: mod/admin.php:1275 mod/admin.php:1287 mod/admin.php:1288 mod/admin.php:1303 #: include/contact_selectors.php:79 include/contact_selectors.php:86 msgid "Email" msgstr "E-Mail" -#: mod/admin.php:1115 +#: mod/admin.php:1276 msgid "No registrations." msgstr "Keine Neuanmeldungen." -#: mod/admin.php:1117 +#: mod/admin.php:1278 msgid "Deny" msgstr "Verwehren" -#: mod/admin.php:1121 +#: mod/admin.php:1282 msgid "Site admin" msgstr "Seitenadministrator" -#: mod/admin.php:1122 +#: mod/admin.php:1283 msgid "Account expired" msgstr "Account ist abgelaufen" -#: mod/admin.php:1125 +#: mod/admin.php:1286 msgid "New User" msgstr "Neuer Nutzer" -#: mod/admin.php:1126 mod/admin.php:1127 +#: mod/admin.php:1287 mod/admin.php:1288 msgid "Register date" msgstr "Anmeldedatum" -#: mod/admin.php:1126 mod/admin.php:1127 +#: mod/admin.php:1287 mod/admin.php:1288 msgid "Last login" msgstr "Letzte Anmeldung" -#: mod/admin.php:1126 mod/admin.php:1127 +#: mod/admin.php:1287 mod/admin.php:1288 msgid "Last item" msgstr "Letzter Beitrag" -#: mod/admin.php:1126 +#: mod/admin.php:1287 msgid "Deleted since" msgstr "Gelöscht seit" -#: mod/admin.php:1127 mod/settings.php:41 +#: mod/admin.php:1288 mod/settings.php:41 msgid "Account" msgstr "Nutzerkonto" -#: mod/admin.php:1129 +#: mod/admin.php:1290 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:1130 +#: mod/admin.php:1291 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:1140 +#: mod/admin.php:1301 msgid "Name of the new user." msgstr "Name des neuen Nutzers" -#: mod/admin.php:1141 +#: mod/admin.php:1302 msgid "Nickname" msgstr "Spitzname" -#: mod/admin.php:1141 +#: mod/admin.php:1302 msgid "Nickname of the new user." msgstr "Spitznamen für den neuen Nutzer" -#: mod/admin.php:1142 +#: mod/admin.php:1303 msgid "Email address of the new user." msgstr "Email Adresse des neuen Nutzers" -#: mod/admin.php:1175 +#: mod/admin.php:1346 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s deaktiviert." -#: mod/admin.php:1179 +#: mod/admin.php:1350 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s aktiviert." -#: mod/admin.php:1189 mod/admin.php:1413 +#: mod/admin.php:1360 mod/admin.php:1596 msgid "Disable" msgstr "Ausschalten" -#: mod/admin.php:1191 mod/admin.php:1415 +#: mod/admin.php:1362 mod/admin.php:1598 msgid "Enable" msgstr "Einschalten" -#: mod/admin.php:1214 mod/admin.php:1459 +#: mod/admin.php:1385 mod/admin.php:1643 msgid "Toggle" msgstr "Umschalten" -#: mod/admin.php:1222 mod/admin.php:1469 +#: mod/admin.php:1393 mod/admin.php:1652 msgid "Author: " msgstr "Autor:" -#: mod/admin.php:1223 mod/admin.php:1470 +#: mod/admin.php:1394 mod/admin.php:1653 msgid "Maintainer: " msgstr "Betreuer:" -#: mod/admin.php:1275 -#: view/smarty3/compiled/f835364006028b1061f37be121c9bd9db5fa50a9.file.admin_plugins.tpl.php:42 +#: mod/admin.php:1446 msgid "Reload active plugins" msgstr "Aktive Plugins neu laden" -#: mod/admin.php:1373 +#: mod/admin.php:1451 +#, php-format +msgid "" +"There are currently no plugins available on your node. You can find the " +"official plugin repository at %1$s and might find other interesting plugins " +"in the open plugin registry at %2$s" +msgstr "Es sind derzeit keine Plugins auf diesem Knoten verfügbar. Du findest das offizielle Plugin-Repository unter %1$s und weitere eventuell interessante Plugins im offenen Plugins-Verzeichnis auf %2$s." + +#: mod/admin.php:1556 msgid "No themes found." msgstr "Keine Themen gefunden." -#: mod/admin.php:1451 +#: mod/admin.php:1634 msgid "Screenshot" msgstr "Bildschirmfoto" -#: mod/admin.php:1511 +#: mod/admin.php:1694 msgid "Reload active themes" msgstr "Aktives Theme neu laden" -#: mod/admin.php:1515 +#: mod/admin.php:1699 +#, php-format +msgid "No themes found on the system. They should be paced in %1$s" +msgstr "Es wurden keine Themes auf dem System gefunden. Diese sollten in %1$s patziert werden." + +#: mod/admin.php:1700 msgid "[Experimental]" msgstr "[Experimentell]" -#: mod/admin.php:1516 +#: mod/admin.php:1701 msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: mod/admin.php:1543 +#: mod/admin.php:1725 msgid "Log settings updated." msgstr "Protokolleinstellungen aktualisiert." -#: mod/admin.php:1599 +#: mod/admin.php:1762 msgid "Clear" msgstr "löschen" -#: mod/admin.php:1605 +#: mod/admin.php:1767 msgid "Enable Debugging" msgstr "Protokoll führen" -#: mod/admin.php:1606 +#: mod/admin.php:1768 msgid "Log file" msgstr "Protokolldatei" -#: mod/admin.php:1606 +#: mod/admin.php:1768 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:1607 +#: mod/admin.php:1769 msgid "Log level" msgstr "Protokoll-Level" -#: mod/admin.php:1657 include/acl_selectors.php:348 -msgid "Close" -msgstr "Schließen" +#: mod/admin.php:1772 +msgid "PHP logging" +msgstr "PHP Protokollieren" -#: mod/admin.php:1663 -msgid "FTP Host" -msgstr "FTP Host" - -#: mod/admin.php:1664 -msgid "FTP Path" -msgstr "FTP Pfad" - -#: mod/admin.php:1665 -msgid "FTP User" -msgstr "FTP Nutzername" - -#: mod/admin.php:1666 -msgid "FTP Password" -msgstr "FTP Passwort" +#: mod/admin.php:1773 +msgid "" +"To enable logging of PHP errors and warnings you can add the following to " +"the .htconfig.php file of your installation. The filename set in the " +"'error_log' line is relative to the friendica top-level directory and must " +"be writeable by the web server. The option '1' for 'log_errors' and " +"'display_errors' is to enable these options, set to '0' to disable them." +msgstr "Um PHP Warnungen und Fehler zu protokollieren, kannst du die folgenden Zeilen zur .htconfig.php Datei deiner Installation hinzufügen. Den Dateinamen der Log-Datei legst du in der Zeile mit dem 'error_log' fest, Er ist relativ zum Friendica-Stammverzeichnis und muss schreibbar durch den Webserver sein. Eine \"1\" als Option für die Punkte 'log_errors' und 'display_errors' aktiviert die Funktionen zum Protokollieren bzw. Anzeigen der Fehler, eine \"0\" deaktiviert sie." #: mod/network.php:146 #, php-format @@ -3267,51 +3250,51 @@ msgstr "Gespeicherte Suchen" msgid "add" msgstr "hinzufügen" -#: mod/network.php:362 +#: mod/network.php:365 msgid "Commented Order" msgstr "Neueste Kommentare" -#: mod/network.php:365 +#: mod/network.php:368 msgid "Sort by Comment Date" msgstr "Nach Kommentardatum sortieren" -#: mod/network.php:370 +#: mod/network.php:373 msgid "Posted Order" msgstr "Neueste Beiträge" -#: mod/network.php:373 +#: mod/network.php:376 msgid "Sort by Post Date" msgstr "Nach Beitragsdatum sortieren" -#: mod/network.php:384 +#: mod/network.php:387 msgid "Posts that mention or involve you" msgstr "Beiträge, in denen es um Dich geht" -#: mod/network.php:392 +#: mod/network.php:395 msgid "New" msgstr "Neue" -#: mod/network.php:395 +#: mod/network.php:398 msgid "Activity Stream - by date" msgstr "Aktivitäten-Stream - nach Datum" -#: mod/network.php:403 +#: mod/network.php:406 msgid "Shared Links" msgstr "Geteilte Links" -#: mod/network.php:406 +#: mod/network.php:409 msgid "Interesting Links" msgstr "Interessante Links" -#: mod/network.php:414 +#: mod/network.php:417 msgid "Starred" msgstr "Markierte" -#: mod/network.php:417 +#: mod/network.php:420 msgid "Favourite Posts" msgstr "Favorisierte Beiträge" -#: mod/network.php:476 +#: mod/network.php:479 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -3319,24 +3302,24 @@ msgid_plural "" msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk." msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken." -#: mod/network.php:479 +#: mod/network.php:482 msgid "Private messages to this group are at risk of public disclosure." msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten." -#: mod/network.php:546 mod/content.php:119 +#: mod/network.php:549 mod/content.php:119 msgid "No such group" msgstr "Es gibt keine solche Gruppe" -#: mod/network.php:574 mod/content.php:135 +#: mod/network.php:580 mod/content.php:135 #, php-format msgid "Group: %s" msgstr "Gruppe: %s" -#: mod/network.php:606 +#: mod/network.php:608 msgid "Private messages to this person are at risk of public disclosure." msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." -#: mod/network.php:611 +#: mod/network.php:613 msgid "Invalid contact." msgstr "Ungültiger Kontakt." @@ -3587,7 +3570,7 @@ msgstr "Veranstaltung teilen" #: mod/events.php:572 mod/content.php:721 mod/editpost.php:145 #: mod/photos.php:1631 mod/photos.php:1679 mod/photos.php:1767 -#: object/Item.php:719 include/conversation.php:1217 +#: object/Item.php:719 include/conversation.php:1216 msgid "Preview" msgstr "Vorschau" @@ -3637,9 +3620,9 @@ msgid_plural "comments" msgstr[0] "Kommentar" msgstr[1] "Kommentare" -#: mod/content.php:608 boot.php:788 object/Item.php:422 +#: mod/content.php:608 boot.php:863 object/Item.php:422 #: include/contact_widgets.php:242 include/forums.php:110 -#: include/items.php:5181 view/theme/vier/theme.php:264 +#: include/items.php:5184 view/theme/vier/theme.php:264 msgid "show more" msgstr "mehr anzeigen" @@ -3677,7 +3660,7 @@ msgid "This is you" msgstr "Das bist Du" #: mod/content.php:711 mod/photos.php:1629 mod/photos.php:1677 -#: mod/photos.php:1765 boot.php:787 object/Item.php:393 object/Item.php:709 +#: mod/photos.php:1765 boot.php:862 object/Item.php:393 object/Item.php:709 msgid "Comment" msgstr "Kommentar" @@ -4109,19 +4092,19 @@ 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/help.php:31 +#: mod/help.php:41 msgid "Help:" msgstr "Hilfe:" -#: mod/help.php:36 include/nav.php:113 view/theme/vier/theme.php:302 +#: mod/help.php:47 include/nav.php:113 view/theme/vier/theme.php:302 msgid "Help" msgstr "Hilfe" -#: mod/help.php:42 mod/p.php:16 mod/p.php:25 index.php:270 +#: mod/help.php:53 mod/p.php:16 mod/p.php:25 index.php:270 msgid "Not Found" msgstr "Nicht gefunden" -#: mod/help.php:45 index.php:273 +#: mod/help.php:56 index.php:273 msgid "Page not found." msgstr "Seite nicht gefunden." @@ -4391,7 +4374,7 @@ msgstr "OStatus Abonnements reparieren" msgid "Built-in support for %s connectivity is %s" msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s" -#: mod/settings.php:811 mod/dfrn_request.php:858 +#: mod/settings.php:811 mod/dfrn_request.php:865 #: include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" @@ -4532,8 +4515,8 @@ msgstr "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist." #: mod/settings.php:976 view/theme/cleanzero/config.php:82 #: view/theme/dispy/config.php:72 view/theme/quattro/config.php:66 -#: view/theme/diabook/config.php:150 view/theme/clean/config.php:85 -#: view/theme/vier/config.php:109 view/theme/duepuntozero/config.php:61 +#: view/theme/diabook/config.php:150 view/theme/vier/config.php:109 +#: view/theme/duepuntozero/config.php:61 msgid "Theme settings" msgstr "Themeneinstellungen" @@ -4713,7 +4696,7 @@ msgstr "Passwort:" msgid "Basic Settings" msgstr "Grundeinstellungen" -#: mod/settings.php:1210 include/identity.php:587 +#: mod/settings.php:1210 include/identity.php:588 msgid "Full Name:" msgstr "Kompletter Name:" @@ -4881,126 +4864,128 @@ msgstr "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige D msgid "Resend relocate message to contacts" msgstr "Umzugsbenachrichtigung erneut an Kontakte senden" -#: mod/dfrn_request.php:95 +#: mod/dfrn_request.php:96 msgid "This introduction has already been accepted." msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." -#: mod/dfrn_request.php:120 mod/dfrn_request.php:519 +#: mod/dfrn_request.php:119 mod/dfrn_request.php:516 msgid "Profile location is not valid or does not contain profile information." msgstr "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung." -#: mod/dfrn_request.php:125 mod/dfrn_request.php:524 +#: mod/dfrn_request.php:124 mod/dfrn_request.php:521 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:127 mod/dfrn_request.php:526 +#: mod/dfrn_request.php:126 mod/dfrn_request.php:523 msgid "Warning: profile location has no profile photo." msgstr "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse." -#: mod/dfrn_request.php:130 mod/dfrn_request.php:529 +#: mod/dfrn_request.php:129 mod/dfrn_request.php:526 #, php-format msgid "%d required parameter was not found at the given location" msgid_plural "%d required parameters were not found at the given location" msgstr[0] "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden" msgstr[1] "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden" -#: mod/dfrn_request.php:173 +#: mod/dfrn_request.php:172 msgid "Introduction complete." msgstr "Kontaktanfrage abgeschlossen." -#: mod/dfrn_request.php:215 +#: mod/dfrn_request.php:214 msgid "Unrecoverable protocol error." msgstr "Nicht behebbarer Protokollfehler." -#: mod/dfrn_request.php:243 +#: mod/dfrn_request.php:242 msgid "Profile unavailable." msgstr "Profil nicht verfügbar." -#: mod/dfrn_request.php:268 +#: mod/dfrn_request.php:267 #, php-format msgid "%s has received too many connection requests today." msgstr "%s hat heute zu viele Freundschaftsanfragen erhalten." -#: mod/dfrn_request.php:269 +#: mod/dfrn_request.php:268 msgid "Spam protection measures have been invoked." msgstr "Maßnahmen zum Spamschutz wurden ergriffen." -#: mod/dfrn_request.php:270 +#: mod/dfrn_request.php:269 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:332 +#: mod/dfrn_request.php:331 msgid "Invalid locator" msgstr "Ungültiger Locator" -#: mod/dfrn_request.php:341 +#: mod/dfrn_request.php:340 msgid "Invalid email address." msgstr "Ungültige E-Mail-Adresse." -#: mod/dfrn_request.php:368 +#: mod/dfrn_request.php:367 msgid "This account has not been configured for email. Request failed." msgstr "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen." -#: mod/dfrn_request.php:464 -msgid "Unable to resolve your name at the provided location." -msgstr "Konnte Deinen Namen an der angegebenen Stelle nicht finden." - -#: mod/dfrn_request.php:477 +#: mod/dfrn_request.php:474 msgid "You have already introduced yourself here." msgstr "Du hast Dich hier bereits vorgestellt." -#: mod/dfrn_request.php:481 +#: mod/dfrn_request.php:478 #, 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:502 +#: mod/dfrn_request.php:499 msgid "Invalid profile URL." msgstr "Ungültige Profil-URL." -#: mod/dfrn_request.php:508 include/follow.php:72 +#: mod/dfrn_request.php:505 include/follow.php:72 msgid "Disallowed profile URL." msgstr "Nicht erlaubte Profil-URL." -#: mod/dfrn_request.php:599 +#: mod/dfrn_request.php:596 msgid "Your introduction has been sent." msgstr "Deine Kontaktanfrage wurde gesendet." -#: mod/dfrn_request.php:652 +#: mod/dfrn_request.php:636 +msgid "" +"Remote subscription can't be done for your network. Please subscribe " +"directly on your system." +msgstr "Entferntes abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems. " + +#: mod/dfrn_request.php:659 msgid "Please login to confirm introduction." msgstr "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen." -#: mod/dfrn_request.php:662 +#: mod/dfrn_request.php:669 msgid "" "Incorrect identity currently logged in. Please login to " "this profile." msgstr "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit diesem Profil an." -#: mod/dfrn_request.php:676 mod/dfrn_request.php:693 +#: mod/dfrn_request.php:683 mod/dfrn_request.php:700 msgid "Confirm" msgstr "Bestätigen" -#: mod/dfrn_request.php:688 +#: mod/dfrn_request.php:695 msgid "Hide this contact" msgstr "Verberge diesen Kontakt" -#: mod/dfrn_request.php:691 +#: mod/dfrn_request.php:698 #, php-format msgid "Welcome home %s." msgstr "Willkommen zurück %s." -#: mod/dfrn_request.php:692 +#: mod/dfrn_request.php:699 #, php-format msgid "Please confirm your introduction/connection request to %s." msgstr "Bitte bestätige Deine Kontaktanfrage bei %s." -#: mod/dfrn_request.php:821 +#: mod/dfrn_request.php:828 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:842 +#: mod/dfrn_request.php:849 #, php-format msgid "" "If you are not yet a member of the free social web, ." msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, folge diesem Link um einen öffentlichen Friendica-Server zu finden und beizutreten." -#: mod/dfrn_request.php:847 +#: mod/dfrn_request.php:854 msgid "Friend/Connection Request" msgstr "Freundschafts-/Kontaktanfrage" -#: mod/dfrn_request.php:848 +#: mod/dfrn_request.php:855 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:856 include/contact_selectors.php:76 +#: mod/dfrn_request.php:863 include/contact_selectors.php:76 msgid "Friendica" msgstr "Friendica" -#: mod/dfrn_request.php:857 +#: mod/dfrn_request.php:864 msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federated Social Web" -#: mod/dfrn_request.php:859 +#: mod/dfrn_request.php:866 #, php-format msgid "" " - please do not use this form. Instead, enter %s into your Diaspora search" @@ -5114,7 +5099,7 @@ msgstr "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstab msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: mod/register.php:280 boot.php:1271 include/nav.php:108 +#: mod/register.php:280 boot.php:1379 include/nav.php:108 msgid "Register" msgstr "Registrieren" @@ -5156,11 +5141,11 @@ msgstr "Beiträge markiert mit: %s" msgid "Search results for: %s" msgstr "Suchergebnisse für: %s" -#: mod/directory.php:149 include/identity.php:309 include/identity.php:609 +#: mod/directory.php:149 include/identity.php:313 include/identity.php:610 msgid "Status:" msgstr "Status:" -#: mod/directory.php:151 include/identity.php:311 include/identity.php:620 +#: mod/directory.php:151 include/identity.php:315 include/identity.php:621 msgid "Homepage:" msgstr "Homepage:" @@ -5488,7 +5473,7 @@ msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" msgid "Since [date]:" msgstr "Seit [Datum]:" -#: mod/profiles.php:724 include/identity.php:618 +#: mod/profiles.php:724 include/identity.php:619 msgid "Sexual Preference:" msgstr "Sexuelle Vorlieben:" @@ -5496,11 +5481,11 @@ msgstr "Sexuelle Vorlieben:" msgid "Homepage URL:" msgstr "Adresse der Homepage:" -#: mod/profiles.php:726 include/identity.php:622 +#: mod/profiles.php:726 include/identity.php:623 msgid "Hometown:" msgstr "Heimatort:" -#: mod/profiles.php:727 include/identity.php:626 +#: mod/profiles.php:727 include/identity.php:627 msgid "Political Views:" msgstr "Politische Ansichten:" @@ -5516,11 +5501,11 @@ msgstr "Öffentliche Schlüsselwörter:" msgid "Private Keywords:" msgstr "Private Schlüsselwörter:" -#: mod/profiles.php:731 include/identity.php:634 +#: mod/profiles.php:731 include/identity.php:635 msgid "Likes:" msgstr "Likes:" -#: mod/profiles.php:732 include/identity.php:636 +#: mod/profiles.php:732 include/identity.php:637 msgid "Dislikes:" msgstr "Dislikes:" @@ -5590,23 +5575,23 @@ msgstr "Alter: " msgid "Edit/Manage Profiles" msgstr "Bearbeite/Verwalte Profile" -#: mod/profiles.php:814 include/identity.php:257 include/identity.php:283 +#: mod/profiles.php:814 include/identity.php:260 include/identity.php:286 msgid "Change profile photo" msgstr "Profilbild ändern" -#: mod/profiles.php:815 include/identity.php:258 +#: mod/profiles.php:815 include/identity.php:261 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: mod/profiles.php:826 include/identity.php:268 +#: mod/profiles.php:826 include/identity.php:271 msgid "Profile Image" msgstr "Profilbild" -#: mod/profiles.php:828 include/identity.php:271 +#: mod/profiles.php:828 include/identity.php:274 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: mod/profiles.php:829 include/identity.php:272 +#: mod/profiles.php:829 include/identity.php:275 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" @@ -5618,55 +5603,55 @@ msgstr "Beitrag nicht gefunden" msgid "Edit post" msgstr "Beitrag bearbeiten" -#: mod/editpost.php:111 include/conversation.php:1185 +#: mod/editpost.php:111 include/conversation.php:1184 msgid "upload photo" msgstr "Bild hochladen" -#: mod/editpost.php:112 include/conversation.php:1186 +#: mod/editpost.php:112 include/conversation.php:1185 msgid "Attach file" msgstr "Datei anhängen" -#: mod/editpost.php:113 include/conversation.php:1187 +#: mod/editpost.php:113 include/conversation.php:1186 msgid "attach file" msgstr "Datei anhängen" -#: mod/editpost.php:115 include/conversation.php:1189 +#: mod/editpost.php:115 include/conversation.php:1188 msgid "web link" msgstr "Weblink" -#: mod/editpost.php:116 include/conversation.php:1190 +#: mod/editpost.php:116 include/conversation.php:1189 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: mod/editpost.php:117 include/conversation.php:1191 +#: mod/editpost.php:117 include/conversation.php:1190 msgid "video link" msgstr "Video-Link" -#: mod/editpost.php:118 include/conversation.php:1192 +#: mod/editpost.php:118 include/conversation.php:1191 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: mod/editpost.php:119 include/conversation.php:1193 +#: mod/editpost.php:119 include/conversation.php:1192 msgid "audio link" msgstr "Audio-Link" -#: mod/editpost.php:120 include/conversation.php:1194 +#: mod/editpost.php:120 include/conversation.php:1193 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: mod/editpost.php:121 include/conversation.php:1195 +#: mod/editpost.php:121 include/conversation.php:1194 msgid "set location" msgstr "Ort setzen" -#: mod/editpost.php:122 include/conversation.php:1196 +#: mod/editpost.php:122 include/conversation.php:1195 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: mod/editpost.php:123 include/conversation.php:1197 +#: mod/editpost.php:123 include/conversation.php:1196 msgid "clear location" msgstr "Ort löschen" -#: mod/editpost.php:125 include/conversation.php:1203 +#: mod/editpost.php:125 include/conversation.php:1202 msgid "Permission settings" msgstr "Berechtigungseinstellungen" @@ -5674,15 +5659,15 @@ msgstr "Berechtigungseinstellungen" msgid "CC: email addresses" msgstr "Cc: E-Mail-Addressen" -#: mod/editpost.php:134 include/conversation.php:1212 +#: mod/editpost.php:134 include/conversation.php:1211 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: mod/editpost.php:137 include/conversation.php:1199 +#: mod/editpost.php:137 include/conversation.php:1198 msgid "Set title" msgstr "Titel setzen" -#: mod/editpost.php:139 include/conversation.php:1201 +#: mod/editpost.php:139 include/conversation.php:1200 msgid "Categories (comma-separated list)" msgstr "Kategorien (kommasepariert)" @@ -6080,12 +6065,12 @@ msgstr "Privates Foto" msgid "Public photo" msgstr "Öffentliches Foto" -#: mod/photos.php:1609 include/conversation.php:1183 +#: mod/photos.php:1609 include/conversation.php:1182 msgid "Share" msgstr "Teilen" #: mod/photos.php:1648 include/conversation.php:509 -#: include/conversation.php:1414 +#: include/conversation.php:1413 msgid "Attending" msgid_plural "Attending" msgstr[0] "Teilnehmend" @@ -6159,60 +6144,60 @@ msgstr "Beitrag nicht verfügbar." msgid "Item was not found." msgstr "Beitrag konnte nicht gefunden werden." -#: boot.php:786 +#: boot.php:861 msgid "Delete this item?" msgstr "Diesen Beitrag löschen?" -#: boot.php:789 +#: boot.php:864 msgid "show fewer" msgstr "weniger anzeigen" -#: boot.php:1163 +#: boot.php:1266 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." -#: boot.php:1270 +#: boot.php:1378 msgid "Create a New Account" msgstr "Neues Konto erstellen" -#: boot.php:1295 include/nav.php:72 +#: boot.php:1403 include/nav.php:72 msgid "Logout" msgstr "Abmelden" -#: boot.php:1298 +#: boot.php:1406 msgid "Nickname or Email address: " msgstr "Spitzname oder E-Mail-Adresse: " -#: boot.php:1299 +#: boot.php:1407 msgid "Password: " msgstr "Passwort: " -#: boot.php:1300 +#: boot.php:1408 msgid "Remember me" msgstr "Anmeldedaten merken" -#: boot.php:1303 +#: boot.php:1411 msgid "Or login using OpenID: " msgstr "Oder melde Dich mit Deiner OpenID an: " -#: boot.php:1309 +#: boot.php:1417 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: boot.php:1312 +#: boot.php:1420 msgid "Website Terms of Service" msgstr "Website Nutzungsbedingungen" -#: boot.php:1313 +#: boot.php:1421 msgid "terms of service" msgstr "Nutzungsbedingungen" -#: boot.php:1315 +#: boot.php:1423 msgid "Website Privacy Policy" msgstr "Website Datenschutzerklärung" -#: boot.php:1316 +#: boot.php:1424 msgid "privacy policy" msgstr "Datenschutzerklärung" @@ -6273,25 +6258,25 @@ msgid "" "[pre]%s[/pre]" msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]" -#: include/dbstructure.php:151 +#: include/dbstructure.php:153 msgid "Errors encountered creating database tables." msgstr "Fehler aufgetreten während der Erzeugung der Datenbanktabellen." -#: include/dbstructure.php:209 +#: include/dbstructure.php:230 msgid "Errors encountered performing database changes." msgstr "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten." -#: include/auth.php:38 +#: include/auth.php:44 msgid "Logged out." msgstr "Abgemeldet." -#: include/auth.php:128 include/user.php:75 +#: include/auth.php:134 include/user.php:75 msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast." -#: include/auth.php:128 include/user.php:75 +#: include/auth.php:134 include/user.php:75 msgid "The error message was:" msgstr "Die Fehlermeldung lautete:" @@ -6713,134 +6698,134 @@ msgstr "Sekunden" msgid "%1$d %2$s ago" msgstr "%1$d %2$s her" -#: include/datetime.php:474 include/items.php:2473 +#: include/datetime.php:474 include/items.php:2477 #, php-format msgid "%s's birthday" msgstr "%ss Geburtstag" -#: include/datetime.php:475 include/items.php:2474 +#: include/datetime.php:475 include/items.php:2478 #, php-format msgid "Happy Birthday %s" msgstr "Herzlichen Glückwunsch %s" -#: include/identity.php:44 +#: include/identity.php:42 msgid "Requested account is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: include/identity.php:97 include/identity.php:281 include/identity.php:661 +#: include/identity.php:95 include/identity.php:284 include/identity.php:662 msgid "Edit profile" msgstr "Profil bearbeiten" -#: include/identity.php:241 +#: include/identity.php:244 msgid "Atom feed" msgstr "Atom-Feed" -#: include/identity.php:246 +#: include/identity.php:249 msgid "Message" msgstr "Nachricht" -#: include/identity.php:252 include/nav.php:185 +#: include/identity.php:255 include/nav.php:185 msgid "Profiles" msgstr "Profile" -#: include/identity.php:252 +#: include/identity.php:255 msgid "Manage/edit profiles" msgstr "Profile verwalten/editieren" -#: include/identity.php:421 include/identity.php:507 +#: include/identity.php:425 include/identity.php:509 msgid "g A l F d" msgstr "l, d. F G \\U\\h\\r" -#: include/identity.php:422 include/identity.php:508 +#: include/identity.php:426 include/identity.php:510 msgid "F d" msgstr "d. F" -#: include/identity.php:467 include/identity.php:554 +#: include/identity.php:471 include/identity.php:556 msgid "[today]" msgstr "[heute]" -#: include/identity.php:479 +#: include/identity.php:483 msgid "Birthday Reminders" msgstr "Geburtstagserinnerungen" -#: include/identity.php:480 +#: include/identity.php:484 msgid "Birthdays this week:" msgstr "Geburtstage diese Woche:" -#: include/identity.php:541 +#: include/identity.php:543 msgid "[No description]" msgstr "[keine Beschreibung]" -#: include/identity.php:565 +#: include/identity.php:567 msgid "Event Reminders" msgstr "Veranstaltungserinnerungen" -#: include/identity.php:566 +#: include/identity.php:568 msgid "Events this week:" msgstr "Veranstaltungen diese Woche" -#: include/identity.php:594 +#: include/identity.php:595 msgid "j F, Y" msgstr "j F, Y" -#: include/identity.php:595 +#: include/identity.php:596 msgid "j F" msgstr "j F" -#: include/identity.php:602 +#: include/identity.php:603 msgid "Birthday:" msgstr "Geburtstag:" -#: include/identity.php:606 +#: include/identity.php:607 msgid "Age:" msgstr "Alter:" -#: include/identity.php:615 +#: include/identity.php:616 #, php-format msgid "for %1$d %2$s" msgstr "für %1$d %2$s" -#: include/identity.php:628 +#: include/identity.php:629 msgid "Religion:" msgstr "Religion:" -#: include/identity.php:632 +#: include/identity.php:633 msgid "Hobbies/Interests:" msgstr "Hobbies/Interessen:" -#: include/identity.php:639 +#: include/identity.php:640 msgid "Contact information and Social Networks:" msgstr "Kontaktinformationen und Soziale Netzwerke:" -#: include/identity.php:641 +#: include/identity.php:642 msgid "Musical interests:" msgstr "Musikalische Interessen:" -#: include/identity.php:643 +#: include/identity.php:644 msgid "Books, literature:" msgstr "Literatur/Bücher:" -#: include/identity.php:645 +#: include/identity.php:646 msgid "Television:" msgstr "Fernsehen:" -#: include/identity.php:647 +#: include/identity.php:648 msgid "Film/dance/culture/entertainment:" msgstr "Filme/Tänze/Kultur/Unterhaltung:" -#: include/identity.php:649 +#: include/identity.php:650 msgid "Love/Romance:" msgstr "Liebesleben:" -#: include/identity.php:651 +#: include/identity.php:652 msgid "Work/employment:" msgstr "Arbeit/Beschäftigung:" -#: include/identity.php:653 +#: include/identity.php:654 msgid "School/education:" msgstr "Schule/Ausbildung:" -#: include/identity.php:657 +#: include/identity.php:658 msgid "Forums:" msgstr "Foren:" @@ -6856,6 +6841,38 @@ msgstr "Ereignisse und Kalender" msgid "Only You Can See This" msgstr "Nur Du kannst das sehen" +#: include/like.php:167 include/conversation.php:122 +#: include/conversation.php:258 include/text.php:1991 +#: view/theme/diabook/theme.php:463 +msgid "event" +msgstr "Event" + +#: include/like.php:184 include/conversation.php:141 include/diaspora.php:2163 +#: view/theme/diabook/theme.php:480 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "%1$s mag %2$ss %3$s" + +#: include/like.php:186 include/conversation.php:144 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "%1$s mag %2$ss %3$s nicht" + +#: include/like.php:188 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "%1$s nimmt an %2$ss %3$s teil." + +#: include/like.php:190 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "%1$s nimmt nicht an %2$ss %3$s teil." + +#: include/like.php:192 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "%1$s nimmt eventuell an %2$ss %3$s teil." + #: include/acl_selectors.php:325 msgid "Post to Email" msgstr "An E-Mail senden" @@ -6879,6 +6896,10 @@ msgstr "zeigen" msgid "don't show" msgstr "nicht zeigen" +#: include/acl_selectors.php:348 +msgid "Close" +msgstr "Schließen" + #: include/message.php:15 include/message.php:173 msgid "[no subject]" msgstr "[kein Betreff]" @@ -6887,31 +6908,31 @@ msgstr "[kein Betreff]" msgid "stopped following" msgstr "wird nicht mehr gefolgt" -#: include/Contact.php:350 include/conversation.php:911 +#: include/Contact.php:337 include/conversation.php:911 msgid "View Status" msgstr "Pinnwand anschauen" -#: include/Contact.php:352 include/conversation.php:913 +#: include/Contact.php:339 include/conversation.php:913 msgid "View Photos" msgstr "Bilder anschauen" -#: include/Contact.php:353 include/conversation.php:914 +#: include/Contact.php:340 include/conversation.php:914 msgid "Network Posts" msgstr "Netzwerkbeiträge" -#: include/Contact.php:354 include/conversation.php:915 +#: include/Contact.php:341 include/conversation.php:915 msgid "Edit Contact" msgstr "Kontakt bearbeiten" -#: include/Contact.php:355 +#: include/Contact.php:342 msgid "Drop Contact" msgstr "Kontakt löschen" -#: include/Contact.php:356 include/conversation.php:916 +#: include/Contact.php:343 include/conversation.php:916 msgid "Send PM" msgstr "Private Nachricht senden" -#: include/Contact.php:357 include/conversation.php:920 +#: include/Contact.php:344 include/conversation.php:920 msgid "Poke" msgstr "Anstupsen" @@ -6974,153 +6995,153 @@ msgstr "Lösche die markierten Beiträge" msgid "Follow Thread" msgstr "Folge der Unterhaltung" -#: include/conversation.php:1035 +#: include/conversation.php:1034 #, php-format msgid "%s likes this." msgstr "%s mag das." -#: include/conversation.php:1038 +#: include/conversation.php:1037 #, php-format msgid "%s doesn't like this." msgstr "%s mag das nicht." -#: include/conversation.php:1041 +#: include/conversation.php:1040 #, php-format msgid "%s attends." msgstr "%s nimmt teil." -#: include/conversation.php:1044 +#: include/conversation.php:1043 #, php-format msgid "%s doesn't attend." msgstr "%s nimmt nicht teil." -#: include/conversation.php:1047 +#: include/conversation.php:1046 #, php-format msgid "%s attends maybe." msgstr "%s nimmt eventuell teil." -#: include/conversation.php:1057 +#: include/conversation.php:1056 msgid "and" msgstr "und" -#: include/conversation.php:1063 +#: include/conversation.php:1062 #, php-format msgid ", and %d other people" msgstr " und %d andere" -#: include/conversation.php:1072 +#: include/conversation.php:1071 #, php-format msgid "%2$d people like this" msgstr "%2$d Personen mögen das" -#: include/conversation.php:1073 +#: include/conversation.php:1072 #, php-format msgid "%s like this." msgstr "%s mögen das." -#: include/conversation.php:1076 +#: include/conversation.php:1075 #, php-format msgid "%2$d people don't like this" msgstr "%2$d Personen mögen das nicht" -#: include/conversation.php:1077 +#: include/conversation.php:1076 #, php-format msgid "%s don't like this." msgstr "%s mögen dies nicht." -#: include/conversation.php:1080 +#: include/conversation.php:1079 #, php-format msgid "%2$d people attend" msgstr "%2$d Personen nehmen teil" -#: include/conversation.php:1081 +#: include/conversation.php:1080 #, php-format msgid "%s attend." msgstr "%s nehmen teil." -#: include/conversation.php:1084 +#: include/conversation.php:1083 #, php-format msgid "%2$d people don't attend" msgstr "%2$d Personen nehmen nicht teil" -#: include/conversation.php:1085 +#: include/conversation.php:1084 #, php-format msgid "%s don't attend." msgstr "%s nehmen nicht teil." -#: include/conversation.php:1088 +#: include/conversation.php:1087 #, php-format msgid "%2$d people anttend maybe" msgstr "%2$d Personen nehmen eventuell teil" -#: include/conversation.php:1089 +#: include/conversation.php:1088 #, php-format msgid "%s anttend maybe." msgstr "%s nehmen vielleicht teil." -#: include/conversation.php:1128 include/conversation.php:1146 +#: include/conversation.php:1127 include/conversation.php:1145 msgid "Visible to everybody" msgstr "Für jedermann sichtbar" -#: include/conversation.php:1130 include/conversation.php:1148 +#: include/conversation.php:1129 include/conversation.php:1147 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: include/conversation.php:1131 include/conversation.php:1149 +#: include/conversation.php:1130 include/conversation.php:1148 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: include/conversation.php:1132 include/conversation.php:1150 +#: include/conversation.php:1131 include/conversation.php:1149 msgid "Tag term:" msgstr "Tag:" -#: include/conversation.php:1134 include/conversation.php:1152 +#: include/conversation.php:1133 include/conversation.php:1151 msgid "Where are you right now?" msgstr "Wo hältst Du Dich jetzt gerade auf?" -#: include/conversation.php:1135 +#: include/conversation.php:1134 msgid "Delete item(s)?" msgstr "Einträge löschen?" -#: include/conversation.php:1204 +#: include/conversation.php:1203 msgid "permissions" msgstr "Zugriffsrechte" -#: include/conversation.php:1227 +#: include/conversation.php:1226 msgid "Post to Groups" msgstr "Poste an Gruppe" -#: include/conversation.php:1228 +#: include/conversation.php:1227 msgid "Post to Contacts" msgstr "Poste an Kontakte" -#: include/conversation.php:1229 +#: include/conversation.php:1228 msgid "Private post" msgstr "Privater Beitrag" -#: include/conversation.php:1386 +#: include/conversation.php:1385 msgid "View all" msgstr "Zeige alle" -#: include/conversation.php:1408 +#: include/conversation.php:1407 msgid "Like" msgid_plural "Likes" msgstr[0] "mag ich" msgstr[1] "Mag ich" -#: include/conversation.php:1411 +#: include/conversation.php:1410 msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "mag ich nicht" msgstr[1] "Mag ich nicht" -#: include/conversation.php:1417 +#: include/conversation.php:1416 msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "Nicht teilnehmend " msgstr[1] "Nicht teilnehmend" -#: include/conversation.php:1420 include/profile_selectors.php:6 +#: include/conversation.php:1419 include/profile_selectors.php:6 msgid "Undecided" msgid_plural "Undecided" msgstr[0] "Unentschieden" @@ -7350,38 +7371,30 @@ msgstr "Beitrag" msgid "Item filed" msgstr "Beitrag abgelegt" -#: include/bbcode.php:483 include/bbcode.php:1143 include/bbcode.php:1144 +#: include/bbcode.php:482 include/bbcode.php:1157 include/bbcode.php:1158 msgid "Image/photo" msgstr "Bild/Foto" -#: include/bbcode.php:581 +#: include/bbcode.php:595 #, php-format msgid "%2$s %3$s" msgstr "%2$s %3$s" -#: include/bbcode.php:615 +#: include/bbcode.php:629 #, php-format msgid "" "%s wrote the following post" msgstr "%s schrieb den folgenden Beitrag" -#: include/bbcode.php:1103 include/bbcode.php:1123 +#: include/bbcode.php:1117 include/bbcode.php:1137 msgid "$1 wrote:" msgstr "$1 hat geschrieben:" -#: include/bbcode.php:1152 include/bbcode.php:1153 +#: include/bbcode.php:1166 include/bbcode.php:1167 msgid "Encrypted content" msgstr "Verschlüsselter Inhalt" -#: include/notifier.php:843 include/delivery.php:459 -msgid "(no subject)" -msgstr "(kein Betreff)" - -#: include/notifier.php:853 include/delivery.php:470 include/enotify.php:37 -msgid "noreply" -msgstr "noreply" - #: include/dba_pdo.php:72 include/dba.php:55 #, php-format msgid "Cannot locate DNS info for database server '%s'" @@ -7427,6 +7440,10 @@ msgstr "OStatus" msgid "RSS/Atom" msgstr "RSS/Atom" +#: include/contact_selectors.php:81 +msgid "Facebook" +msgstr "Facebook" + #: include/contact_selectors.php:82 msgid "Zot!" msgstr "Zott" @@ -7471,7 +7488,7 @@ msgstr "App.net" msgid "Redmatrix" msgstr "Redmatrix" -#: include/Scrape.php:610 +#: include/Scrape.php:624 msgid " on Last.fm" msgstr " bei Last.fm" @@ -7647,46 +7664,21 @@ msgstr "Navigation" msgid "Site map" msgstr "Sitemap" -#: include/api.php:345 include/api.php:356 include/api.php:465 -#: include/api.php:1184 include/api.php:1186 -msgid "User not found." -msgstr "Nutzer nicht gefunden." - -#: include/api.php:832 +#: include/api.php:878 #, php-format msgid "Daily posting limit of %d posts reached. The post was rejected." msgstr "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen." -#: include/api.php:851 +#: include/api.php:897 #, php-format msgid "Weekly posting limit of %d posts reached. The post was rejected." msgstr "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen." -#: include/api.php:870 +#: include/api.php:916 #, php-format msgid "Monthly posting limit of %d posts reached. The post was rejected." msgstr "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen." -#: include/api.php:1393 -msgid "There is no status with this id." -msgstr "Es gibt keinen Status mit dieser ID." - -#: include/api.php:1467 -msgid "There is no conversation with this id." -msgstr "Es existiert keine Unterhaltung mit dieser ID." - -#: include/api.php:1746 -msgid "Invalid item." -msgstr "Ungültiges Objekt" - -#: include/api.php:1756 -msgid "Invalid action. " -msgstr "Ungültige Aktion" - -#: include/api.php:1764 -msgid "DB error" -msgstr "DB Error" - #: include/user.php:48 msgid "An invitation is required." msgstr "Du benötigst eine Einladung." @@ -7749,8 +7741,7 @@ msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden." msgid "An error occurred during registration. Please try again." msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal." -#: include/user.php:256 view/theme/clean/config.php:56 -#: view/theme/duepuntozero/config.php:44 +#: include/user.php:256 view/theme/duepuntozero/config.php:44 msgid "default" msgstr "Standard" @@ -7805,15 +7796,23 @@ msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\ msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" -#: include/diaspora.php:2607 +#: include/diaspora.php:2604 msgid "Attachments:" msgstr "Anhänge:" -#: include/items.php:4900 +#: include/delivery.php:533 +msgid "(no subject)" +msgstr "(kein Betreff)" + +#: include/delivery.php:544 include/enotify.php:37 +msgid "noreply" +msgstr "noreply" + +#: include/items.php:4903 msgid "Do you really want to delete this item?" msgstr "Möchtest Du wirklich dieses Item löschen?" -#: include/items.php:5175 +#: include/items.php:5178 msgid "Archives" msgstr "Archiv" @@ -8329,11 +8328,11 @@ msgstr "Kompletter Name:\t%1$s\\nURL der Seite:\t%2$s\\nLogin Name:\t%3$s (%4$s) msgid "Please visit %s to approve or reject the request." msgstr "Bitte besuche %s um die Anfrage zu bearbeiten." -#: include/oembed.php:220 +#: include/oembed.php:214 msgid "Embedded content" msgstr "Eingebetteter Inhalt" -#: include/oembed.php:229 +#: include/oembed.php:223 msgid "Embedding disabled" msgstr "Einbettungen deaktiviert" @@ -8391,7 +8390,6 @@ msgid "Set theme width" msgstr "Theme Breite festlegen" #: view/theme/cleanzero/config.php:86 view/theme/quattro/config.php:68 -#: view/theme/clean/config.php:88 msgid "Color scheme" msgstr "Farbschema" @@ -8513,56 +8511,6 @@ msgstr "Zoomfaktor der Earth Layer" msgid "Show/hide boxes at right-hand column:" msgstr "Rahmen auf der rechten Seite anzeigen/verbergen" -#: view/theme/clean/config.php:57 -msgid "Midnight" -msgstr "Mitternacht" - -#: view/theme/clean/config.php:58 -msgid "Zenburn" -msgstr "Zenburn" - -#: view/theme/clean/config.php:59 -msgid "Bootstrap" -msgstr "Bootstrap" - -#: view/theme/clean/config.php:60 -msgid "Shades of Pink" -msgstr "Shades of Pink" - -#: view/theme/clean/config.php:61 -msgid "Lime and Orange" -msgstr "Lime and Orange" - -#: view/theme/clean/config.php:62 -msgid "GeoCities Retro" -msgstr "GeoCities Retro" - -#: view/theme/clean/config.php:86 -msgid "Background Image" -msgstr "Hintergrundbild" - -#: view/theme/clean/config.php:86 -msgid "" -"The URL to a picture (e.g. from your photo album) that should be used as " -"background image." -msgstr "Die URL eines Bildes (z.B. aus deinem Fotoalbum), das als Hintergrundbild verwendet werden soll." - -#: view/theme/clean/config.php:87 -msgid "Background Color" -msgstr "Hintergrundfarbe" - -#: view/theme/clean/config.php:87 -msgid "HEX value for the background color. Don't include the #" -msgstr "HEX Wert der Hintergrundfarbe. Gib die # nicht mit an." - -#: view/theme/clean/config.php:89 -msgid "font size" -msgstr "Schriftgröße" - -#: view/theme/clean/config.php:89 -msgid "base font size for your interface" -msgstr "Basis-Schriftgröße für dein Interface." - #: view/theme/vier/config.php:64 msgid "Comma separated list of helper forums" msgstr "Komma-Separierte Liste der Helfer-Foren" diff --git a/view/de/strings.php b/view/de/strings.php index 2a9a4afb8..ca06284c4 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -142,9 +142,6 @@ $a->strings["Edit your default profile to your liking. Review t $a->strings["Profile Keywords"] = "Profil Schlüsselbegriffe"; $a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Trage ein paar öffentliche Stichwörter in Dein Standardprofil ein, die Deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die Deine Interessen teilen und können Dir dann Kontakte vorschlagen."; $a->strings["Connecting"] = "Verbindungen knüpfen"; -$a->strings["Facebook"] = "Facebook"; -$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Richte die Verbindung zu Facebook ein, wenn Du im Augenblick ein Facebook-Konto hast und (optional) Deine Facebook-Freunde und -Unterhaltungen importieren willst."; -$a->strings["If this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "Wenn dies Dein privater Server ist, könnte die Installation des Facebook Connectors Deinen Umzug ins freie soziale Netz angenehmer gestalten."; $a->strings["Importing Emails"] = "Emails Importieren"; $a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Gib Deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls Du E-Mails aus Deinem Posteingang importieren und mit Freunden und Mailinglisten interagieren willst."; $a->strings["Go to Your Contacts Page"] = "Gehe zu deiner Kontakt-Seite"; @@ -290,12 +287,6 @@ $a->strings["Forgot your Password?"] = "Hast Du Dein Passwort vergessen?"; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden Dir dann weitere Informationen per Mail zugesendet."; $a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:"; $a->strings["Reset"] = "Zurücksetzen"; -$a->strings["event"] = "Event"; -$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s"; -$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht"; -$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil."; -$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil."; -$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil."; $a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten"; $a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht"; $a->strings["{0} requested registration"] = "{0} möchte sich registrieren"; @@ -427,14 +418,19 @@ $a->strings["Plugins"] = "Plugins"; $a->strings["Themes"] = "Themen"; $a->strings["DB updates"] = "DB Updates"; $a->strings["Inspect Queue"] = "Warteschlange Inspizieren"; +$a->strings["Federation Statistics"] = "Federation Statistik"; $a->strings["Logs"] = "Protokolle"; +$a->strings["View Logs"] = "Protokolle anzeigen"; $a->strings["probe address"] = "Adresse untersuchen"; $a->strings["check webfinger"] = "Webfinger überprüfen"; $a->strings["Admin"] = "Administration"; $a->strings["Plugin Features"] = "Plugin Features"; $a->strings["diagnostics"] = "Diagnose"; $a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten"; +$a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt."; +$a->strings["The Auto Discovered Contact Directory feature is not enabled, it will improve the data displayed here."] = "Die Funktion um Automatisch ein Kontaktverzeichnis erstellen ist nicht aktiv. Es wird die hier angezeigten Daten verbessern."; $a->strings["Administration"] = "Administration"; +$a->strings["Currently this node is aware of nodes from the following platforms:"] = "Momentan kennt dieser Knoten andere Knoten der folgenden Plattformen:"; $a->strings["ID"] = "ID"; $a->strings["Recipient Name"] = "Empfänger Name"; $a->strings["Recipient Profile"] = "Empfänger Profil"; @@ -686,9 +682,11 @@ $a->strings["Toggle"] = "Umschalten"; $a->strings["Author: "] = "Autor:"; $a->strings["Maintainer: "] = "Betreuer:"; $a->strings["Reload active plugins"] = "Aktive Plugins neu laden"; +$a->strings["There are currently no plugins available on your node. You can find the official plugin repository at %1\$s and might find other interesting plugins in the open plugin registry at %2\$s"] = "Es sind derzeit keine Plugins auf diesem Knoten verfügbar. Du findest das offizielle Plugin-Repository unter %1\$s und weitere eventuell interessante Plugins im offenen Plugins-Verzeichnis auf %2\$s."; $a->strings["No themes found."] = "Keine Themen gefunden."; $a->strings["Screenshot"] = "Bildschirmfoto"; $a->strings["Reload active themes"] = "Aktives Theme neu laden"; +$a->strings["No themes found on the system. They should be paced in %1\$s"] = "Es wurden keine Themes auf dem System gefunden. Diese sollten in %1\$s patziert werden."; $a->strings["[Experimental]"] = "[Experimentell]"; $a->strings["[Unsupported]"] = "[Nicht unterstützt]"; $a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert."; @@ -697,11 +695,8 @@ $a->strings["Enable Debugging"] = "Protokoll führen"; $a->strings["Log file"] = "Protokolldatei"; $a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."; $a->strings["Log level"] = "Protokoll-Level"; -$a->strings["Close"] = "Schließen"; -$a->strings["FTP Host"] = "FTP Host"; -$a->strings["FTP Path"] = "FTP Pfad"; -$a->strings["FTP User"] = "FTP Nutzername"; -$a->strings["FTP Password"] = "FTP Passwort"; +$a->strings["PHP logging"] = "PHP Protokollieren"; +$a->strings["To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "Um PHP Warnungen und Fehler zu protokollieren, kannst du die folgenden Zeilen zur .htconfig.php Datei deiner Installation hinzufügen. Den Dateinamen der Log-Datei legst du in der Zeile mit dem 'error_log' fest, Er ist relativ zum Friendica-Stammverzeichnis und muss schreibbar durch den Webserver sein. Eine \"1\" als Option für die Punkte 'log_errors' und 'display_errors' aktiviert die Funktionen zum Protokollieren bzw. Anzeigen der Fehler, eine \"0\" deaktiviert sie."; $a->strings["Search Results For: %s"] = "Suchergebnisse für: %s"; $a->strings["Remove term"] = "Begriff entfernen"; $a->strings["Saved Searches"] = "Gespeicherte Suchen"; @@ -1108,12 +1103,12 @@ $a->strings["Friends are advised to please try again in 24 hours."] = "Freunde s $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."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen."; -$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."; $a->strings["Invalid profile URL."] = "Ungültige Profil-URL."; $a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL."; $a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet."; +$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Entferntes abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems. "; $a->strings["Please login to confirm introduction."] = "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen."; $a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit diesem Profil an."; $a->strings["Confirm"] = "Bestätigen"; @@ -1565,11 +1560,18 @@ $a->strings["Forums:"] = "Foren:"; $a->strings["Videos"] = "Videos"; $a->strings["Events and Calendar"] = "Ereignisse und Kalender"; $a->strings["Only You Can See This"] = "Nur Du kannst das sehen"; +$a->strings["event"] = "Event"; +$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s"; +$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht"; +$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil."; +$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil."; +$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil."; $a->strings["Post to Email"] = "An E-Mail senden"; $a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."; $a->strings["Visible to everybody"] = "Für jeden sichtbar"; $a->strings["show"] = "zeigen"; $a->strings["don't show"] = "nicht zeigen"; +$a->strings["Close"] = "Schließen"; $a->strings["[no subject]"] = "[kein Betreff]"; $a->strings["stopped following"] = "wird nicht mehr gefolgt"; $a->strings["View Status"] = "Pinnwand anschauen"; @@ -1699,8 +1701,6 @@ $a->strings["%2\$s %3\$s"] = "strings["%s wrote the following post"] = "%s schrieb den folgenden Beitrag"; $a->strings["$1 wrote:"] = "$1 hat geschrieben:"; $a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; -$a->strings["(no subject)"] = "(kein Betreff)"; -$a->strings["noreply"] = "noreply"; $a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln."; $a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert"; $a->strings["Block immediately"] = "Sofort blockieren"; @@ -1712,6 +1712,7 @@ $a->strings["Weekly"] = "Wöchentlich"; $a->strings["Monthly"] = "Monatlich"; $a->strings["OStatus"] = "OStatus"; $a->strings["RSS/Atom"] = "RSS/Atom"; +$a->strings["Facebook"] = "Facebook"; $a->strings["Zot!"] = "Zott"; $a->strings["LinkedIn"] = "LinkedIn"; $a->strings["XMPP/IM"] = "XMPP/Chat"; @@ -1767,15 +1768,9 @@ $a->strings["Manage/edit friends and contacts"] = "Freunde und Kontakte verwalte $a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration"; $a->strings["Navigation"] = "Navigation"; $a->strings["Site map"] = "Sitemap"; -$a->strings["User not found."] = "Nutzer nicht gefunden."; $a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; $a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; $a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; -$a->strings["There is no status with this id."] = "Es gibt keinen Status mit dieser ID."; -$a->strings["There is no conversation with this id."] = "Es existiert keine Unterhaltung mit dieser ID."; -$a->strings["Invalid item."] = "Ungültiges Objekt"; -$a->strings["Invalid action. "] = "Ungültige Aktion"; -$a->strings["DB error"] = "DB Error"; $a->strings["An invitation is required."] = "Du benötigst eine Einladung."; $a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden."; $a->strings["Invalid OpenID url"] = "Ungültige OpenID URL"; @@ -1798,6 +1793,8 @@ $a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your a $a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s."; $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; $a->strings["Attachments:"] = "Anhänge:"; +$a->strings["(no subject)"] = "(kein Betreff)"; +$a->strings["noreply"] = "noreply"; $a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?"; $a->strings["Archives"] = "Archiv"; $a->strings["Male"] = "Männlich"; @@ -1958,18 +1955,6 @@ $a->strings["Your personal photos"] = "Deine privaten Fotos"; $a->strings["Local Directory"] = "Lokales Verzeichnis"; $a->strings["Set zoomfactor for Earth Layers"] = "Zoomfaktor der Earth Layer"; $a->strings["Show/hide boxes at right-hand column:"] = "Rahmen auf der rechten Seite anzeigen/verbergen"; -$a->strings["Midnight"] = "Mitternacht"; -$a->strings["Zenburn"] = "Zenburn"; -$a->strings["Bootstrap"] = "Bootstrap"; -$a->strings["Shades of Pink"] = "Shades of Pink"; -$a->strings["Lime and Orange"] = "Lime and Orange"; -$a->strings["GeoCities Retro"] = "GeoCities Retro"; -$a->strings["Background Image"] = "Hintergrundbild"; -$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "Die URL eines Bildes (z.B. aus deinem Fotoalbum), das als Hintergrundbild verwendet werden soll."; -$a->strings["Background Color"] = "Hintergrundfarbe"; -$a->strings["HEX value for the background color. Don't include the #"] = "HEX Wert der Hintergrundfarbe. Gib die # nicht mit an."; -$a->strings["font size"] = "Schriftgröße"; -$a->strings["base font size for your interface"] = "Basis-Schriftgröße für dein Interface."; $a->strings["Comma separated list of helper forums"] = "Komma-Separierte Liste der Helfer-Foren"; $a->strings["Set style"] = "Stil auswählen"; $a->strings["Quick Start"] = "Schnell-Start"; diff --git a/view/templates/admin_settings_features.tpl b/view/templates/admin_settings_features.tpl new file mode 100644 index 000000000..abcc527d4 --- /dev/null +++ b/view/templates/admin_settings_features.tpl @@ -0,0 +1,21 @@ +

{{$title}}

+ +
+ + +{{foreach $features as $g => $f}} +

{{$f.0}}

+ +
+ {{foreach $f.1 as $fcat}} + {{include file="field_yesno.tpl" field=$fcat.0}} + {{include file="field_yesno.tpl" field=$fcat.1}} + {{/foreach}} + +
+ +
+
+{{/foreach}} + +
diff --git a/view/templates/admin_settings_head.tpl b/view/templates/admin_settings_head.tpl new file mode 100644 index 000000000..25c0f804e --- /dev/null +++ b/view/templates/admin_settings_head.tpl @@ -0,0 +1,9 @@ + diff --git a/view/templates/events.tpl b/view/templates/events.tpl index 525a5e067..f723cb44c 100644 --- a/view/templates/events.tpl +++ b/view/templates/events.tpl @@ -1,6 +1,6 @@ {{$tabs}} -

{{$title}}

+{{include file="section_title.tpl"}} diff --git a/view/templates/profile_advanced.tpl b/view/templates/profile_advanced.tpl index 084fdf3b7..32de6bfa9 100644 --- a/view/templates/profile_advanced.tpl +++ b/view/templates/profile_advanced.tpl @@ -1,5 +1,5 @@ -

{{$title}}

+{{include file="section_title.tpl"}}
{{$profile.fullname.0}}
diff --git a/view/theme/vier/templates/profile_advanced.tpl b/view/theme/vier/templates/profile_advanced.tpl index 809aa4c13..8451188f0 100644 --- a/view/theme/vier/templates/profile_advanced.tpl +++ b/view/theme/vier/templates/profile_advanced.tpl @@ -4,7 +4,7 @@ {{/if}} -

{{$title}}

+{{include file="section_title.tpl"}}
{{$profile.fullname.0}}
@@ -171,6 +171,9 @@
{{/if}} - - - +{{if $profile.forumlist}} +
+
{{$profile.forumlist.0}}
+
{{$profile.forumlist.1}}
+
+{{/if}}